2025-11-17 15:46:05 +00:00
105 changed files with 16070 additions and 2882 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -84,7 +84,8 @@ jobs:
          labels: |
            org.opencontainers.image.source=https://github.com/${{ github.repository }}
            org.opencontainers.image.revision=${{ github.sha }}
-          outputs: type=registry,compression=zstd,compression-level=19
+            org.opencontainers.image.created=${{ github.run_id }}
+          outputs: type=registry,compression=gzip,compression-level=9

      - name: Cleanup Docker
        if: always()
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron.yml
@@ -746,7 +746,6 @@ jobs:
          mkdir -p homebrew-submission/Casks/t

          cp homebrew/termix.rb homebrew-submission/Casks/t/termix.rb
-          cp homebrew/README.md homebrew-submission/

          sed -i '' "s/VERSION_PLACEHOLDER/$VERSION/g" homebrew-submission/Casks/t/termix.rb
          sed -i '' "s/CHECKSUM_PLACEHOLDER/$CHECKSUM/g" homebrew-submission/Casks/t/termix.rb
--- a/DOWNLOADS.md
+++ b/DOWNLOADS.md
@@ -1,61 +0,0 @@
-# Termix Download Links
-
-## Windows
-
-| Architecture | Type     | Download Link                                                                                              |
-| ------------ | -------- | ---------------------------------------------------------------------------------------------------------- |
-| x64          | NSIS     | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_x64_nsis.exe)      |
-| x64          | MSI      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_x64_msi.msi)       |
-| x64          | Portable | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_x64_portable.zip)  |
-| ia32         | NSIS     | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_ia32_nsis.exe)     |
-| ia32         | MSI      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_ia32_msi.msi)      |
-| ia32         | Portable | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_ia32_portable.zip) |
-
-## Linux
-
-| Architecture | Type     | Download Link                                                                                                   |
-| ------------ | -------- | --------------------------------------------------------------------------------------------------------------- |
-| x64          | AppImage | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_x64_appimage.AppImage)    |
-| x64          | DEB      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_x64_deb.deb)              |
-| x64          | Portable | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_x64_portable.tar.gz)      |
-| arm64        | AppImage | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_arm64_appimage.AppImage)  |
-| arm64        | DEB      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_arm64_deb.deb)            |
-| arm64        | Portable | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_arm64_portable.tar.gz)    |
-| armv7l       | AppImage | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_armv7l_appimage.AppImage) |
-| armv7l       | DEB      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_armv7l_deb.deb)           |
-| armv7l       | Portable | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_armv7l_portable.tar.gz)   |
-
-## macOS
-
-| Architecture | Type          | Download Link                                                                                            |
-| ------------ | ------------- | -------------------------------------------------------------------------------------------------------- |
-| Universal    | DMG           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_universal_dmg.dmg) |
-| Universal    | Mac App Store | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_universal_mas.pkg) |
-| x64          | DMG           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_x64_dmg.dmg)       |
-| arm64        | DMG           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_arm64_dmg.dmg)     |
-
---
-
-## All Platforms - Complete Download List
-
-| Platform | Architecture | Type          | Download Link                                                                                                   |
-| -------- | ------------ | ------------- | --------------------------------------------------------------------------------------------------------------- |
-| Windows  | x64          | NSIS          | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_x64_nsis.exe)           |
-| Windows  | x64          | MSI           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_x64_msi.msi)            |
-| Windows  | x64          | Portable      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_x64_portable.zip)       |
-| Windows  | ia32         | NSIS          | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_ia32_nsis.exe)          |
-| Windows  | ia32         | MSI           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_ia32_msi.msi)           |
-| Windows  | ia32         | Portable      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_windows_ia32_portable.zip)      |
-| Linux    | x64          | AppImage      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_x64_appimage.AppImage)    |
-| Linux    | x64          | DEB           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_x64_deb.deb)              |
-| Linux    | x64          | Portable      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_x64_portable.tar.gz)      |
-| Linux    | arm64        | AppImage      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_arm64_appimage.AppImage)  |
-| Linux    | arm64        | DEB           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_arm64_deb.deb)            |
-| Linux    | arm64        | Portable      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_arm64_portable.tar.gz)    |
-| Linux    | armv7l       | AppImage      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_armv7l_appimage.AppImage) |
-| Linux    | armv7l       | DEB           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_armv7l_deb.deb)           |
-| Linux    | armv7l       | Portable      | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_linux_armv7l_portable.tar.gz)   |
-| macOS    | Universal    | DMG           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_universal_dmg.dmg)        |
-| macOS    | Universal    | Mac App Store | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_universal_mas.pkg)        |
-| macOS    | x64          | DMG           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_x64_dmg.dmg)              |
-| macOS    | arm64        | DMG           | [Download](https://github.com/Termix-SSH/Termix/releases/latest/download/termix_macos_arm64_dmg.dmg)            |
--- a/README-CN.md
+++ b/README-CN.md
@@ -54,14 +54,17 @@ Termix 是一个开源、永久免费、自托管的一体化服务器管理平
 - **SSH 主机管理器** - 保存、组织和管理您的 SSH 连接，支持标签和文件夹，并轻松保存可重用的登录信息，同时能够自动部署 SSH 密钥
 - **服务器统计** - 在任何 SSH 服务器上查看 CPU、内存和磁盘使用情况以及网络、正常运行时间和系统信息
 - **仪表板** - 在仪表板上一目了然地查看服务器信息
- **用户认证** - 安全的用户管理，具有管理员控制以及 OIDC 和 2FA (TOTP) 支持。查看所有平台上的活动用户会话并撤销权限。
- **数据库加密** - 后端存储为加密的 SQLite 数据库文件
+- **用户认证** - 安全的用户管理，具有管理员控制以及 OIDC 和 2FA (TOTP) 支持。查看所有平台上的活动用户会话并撤销权限。将您的 OIDC/本地帐户链接在一起。
+- **数据库加密** - 后端存储为加密的 SQLite 数据库文件。查看[文档](https://docs.termix.site/security)了解更多信息。
 - **数据导出/导入** - 导出和导入 SSH 主机、凭据和文件管理器数据
 - **自动 SSL 设置** - 内置 SSL 证书生成和管理，支持 HTTPS 重定向
 - **现代用户界面** - 使用 React、Tailwind CSS 和 Shadcn 构建的简洁的桌面/移动设备友好界面
 - **语言** - 内置支持英语、中文、德语和葡萄牙语
 - **平台支持** - 可作为 Web 应用程序、桌面应用程序（Windows、Linux 和 macOS）以及适用于 iOS 和 Android 的专用移动/平板电脑应用程序。
 - **SSH 工具** - 创建可重用的命令片段，单击即可执行。在多个打开的终端上同时运行一个命令。
+- **命令历史** - 自动完成并查看以前运行的 SSH 命令
+- **命令面板** - 双击左 Shift 键可快速使用键盘访问 SSH 连接
+- **SSH 功能丰富** - 支持跳板机、warpgate、基于 TOTP 的连接等。

 # 计划功能

@@ -75,16 +78,16 @@ Termix 是一个开源、永久免费、自托管的一体化服务器管理平
 - Windows（x64/ia32）
  - 便携版
  - MSI 安装程序
-  - Chocolatey 软件包管理器
+  - Chocolatey 软件包管理器（即将推出）
 - Linux（x64/ia32）
  - 便携版
  - AppImage
  - Deb
-  - Flatpak
+  - Flatpak（即将推出）
 - macOS（x64/ia32 on v12.0+）
-  - Apple App Store
+  - Apple App Store（即将推出）
  - DMG
-  - Homebrew
+  - Homebrew（即将推出）
 - iOS/iPadOS（v15.1+）
  - Apple App Store
  - ISO
--- a/README.md
+++ b/README.md
@@ -56,14 +56,17 @@ free and self-hosted alternative to Termius available for all platforms.
 - **SSH Host Manager** - Save, organize, and manage your SSH connections with tags and folders, and easily save reusable login info while being able to automate the deployment of SSH keys
 - **Server Stats** - View CPU, memory, and disk usage along with network, uptime, and system information on any SSH server
 - **Dashboard** - View server information at a glance on your dashboard
- **User Authentication** - Secure user management with admin controls and OIDC and 2FA (TOTP) support. View active user sessions across all platforms and revoke permissions.
- **Database Encryption** - Backend stored as encrypted SQLite database files
+- **User Authentication** - Secure user management with admin controls and OIDC and 2FA (TOTP) support. View active user sessions across all platforms and revoke permissions. Link your OIDC/Local accounts together.
+- **Database Encryption** - Backend stored as encrypted SQLite database files. View [docs](https://docs.termix.site/security) for more.
 - **Data Export/Import** - Export and import SSH hosts, credentials, and file manager data
 - **Automatic SSL Setup** - Built-in SSL certificate generation and management with HTTPS redirects
 - **Modern UI** - Clean desktop/mobile-friendly interface built with React, Tailwind CSS, and Shadcn
 - **Languages** - Built-in support for English, Chinese, German, and Portuguese
 - **Platform Support** - Available as a web app, desktop application (Windows, Linux, and macOS), and dedicated mobile/tablet app for iOS and Android.
 - **SSH Tools** - Create reusable command snippets that execute with a single click. Run one command simultaneously across multiple open terminals.
+- **Command History** - Auto-complete and view previously ran SSH commands
+- **Command Palette** - Double tap left shift to quickly access SSH connections with your keyboard
+- **SSH Feature Rich** - Supports jump hosts, warpgate, TOTP based connections, etc.

 # Planned Features

@@ -77,16 +80,16 @@ Supported Devices:
 - Windows (x64/ia32)
  - Portable
  - MSI Installer
-  - Chocolatey Package Manager
+  - Chocolatey Package Manager (coming soon)
 - Linux (x64/ia32)
  - Portable
  - AppImage
  - Deb
-  - Flatpak
+  - Flatpak (coming soon)
 - macOS (x64/ia32 on v12.0+)
-  - Apple App Store
+  - Apple App Store (coming soon)
  - DMG
-  - Homebrew
+  - Homebrew (coming soon)
 - iOS/iPadOS (v15.1+)
  - Apple App Store
  - ISO
--- a/docker/nginx-https.conf
+++ b/docker/nginx-https.conf
@@ -115,6 +115,15 @@ http {
            proxy_set_header X-Forwarded-Proto $scheme;
        }

+        location ~ ^/terminal(/.*)?$ {
+            proxy_pass http://127.0.0.1:30001;
+            proxy_http_version 1.1;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
        location ~ ^/database(/.*)?$ {
            client_max_body_size 5G;
            client_body_timeout 300s;
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -112,6 +112,15 @@ http {
            proxy_set_header X-Forwarded-Proto $scheme;
        }

+        location ~ ^/terminal(/.*)?$ {
+            proxy_pass http://127.0.0.1:30001;
+            proxy_http_version 1.1;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
        location ~ ^/database(/.*)?$ {
            client_max_body_size 5G;
            client_body_timeout 300s;
--- a/electron/main.cjs
+++ b/electron/main.cjs
@@ -395,6 +395,48 @@ ipcMain.handle("save-server-config", (event, config) => {
  }
 });

+ipcMain.handle("get-setting", (event, key) => {
+  try {
+    const userDataPath = app.getPath("userData");
+    const settingsPath = path.join(userDataPath, "settings.json");
+
+    if (!fs.existsSync(settingsPath)) {
+      return null;
+    }
+
+    const settingsData = fs.readFileSync(settingsPath, "utf8");
+    const settings = JSON.parse(settingsData);
+    return settings[key] !== undefined ? settings[key] : null;
+  } catch (error) {
+    console.error("Error reading setting:", error);
+    return null;
+  }
+});
+
+ipcMain.handle("set-setting", (event, key, value) => {
+  try {
+    const userDataPath = app.getPath("userData");
+    const settingsPath = path.join(userDataPath, "settings.json");
+
+    if (!fs.existsSync(userDataPath)) {
+      fs.mkdirSync(userDataPath, { recursive: true });
+    }
+
+    let settings = {};
+    if (fs.existsSync(settingsPath)) {
+      const settingsData = fs.readFileSync(settingsPath, "utf8");
+      settings = JSON.parse(settingsData);
+    }
+
+    settings[key] = value;
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+    return { success: true };
+  } catch (error) {
+    console.error("Error saving setting:", error);
+    return { success: false, error: error.message };
+  }
+});
+
 ipcMain.handle("test-server-connection", async (event, serverUrl) => {
  try {
    const https = require("https");
--- a/electron/preload.js
+++ b/electron/preload.js
@@ -22,6 +22,9 @@ contextBridge.exposeInMainWorld("electronAPI", {
  isElectron: true,
  isDev: process.env.NODE_ENV === "development",

+  getSetting: (key) => ipcRenderer.invoke("get-setting", key),
+  setSetting: (key, value) => ipcRenderer.invoke("set-setting", key, value),
+
  invoke: (channel, ...args) => ipcRenderer.invoke(channel, ...args),
 });

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "termix",
-  "version": "1.8.0",
+  "version": "1.8.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "termix",
-      "version": "1.8.0",
+      "version": "1.8.1",
      "dependencies": {
        "@codemirror/autocomplete": "^6.18.7",
        "@codemirror/commands": "^6.3.3",
@@ -51,6 +51,7 @@
        "chalk": "^4.1.2",
        "class-variance-authority": "^0.7.1",
        "clsx": "^2.1.1",
+        "cmdk": "^1.1.1",
        "cookie-parser": "^1.4.7",
        "cors": "^2.8.5",
        "dotenv": "^17.2.0",
@@ -153,7 +154,6 @@
      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.27.1",
        "@babel/generator": "^7.28.5",
@@ -439,7 +439,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.19.1.tgz",
      "integrity": "sha512-q6NenYkEy2fn9+JyjIxMWcNjzTL/IhwqfzOut1/G3PrIFkrbl4AL7Wkse5tLrQUUyqGoAKU5+Pi5jnnXxH5HGw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/language": "^6.0.0",
        "@codemirror/state": "^6.0.0",
@@ -488,7 +487,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz",
      "integrity": "sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/autocomplete": "^6.0.0",
        "@codemirror/language": "^6.0.0",
@@ -515,7 +513,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz",
      "integrity": "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/autocomplete": "^6.0.0",
        "@codemirror/lang-css": "^6.0.0",
@@ -543,7 +540,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
      "integrity": "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/autocomplete": "^6.0.0",
        "@codemirror/language": "^6.6.0",
@@ -744,7 +740,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.3.tgz",
      "integrity": "sha512-9HBM2XnwDj7fnu0551HkGdrUrrqmYq/WC5iv6nbY2WdicXdGbhR/gfbZOH73Aqj4351alY1+aoG9rCNfiwS1RA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/state": "^6.0.0",
        "@codemirror/view": "^6.23.0",
@@ -821,7 +816,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@marijn/find-cluster-break": "^1.0.0"
      }
@@ -843,7 +837,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.6.tgz",
      "integrity": "sha512-qiS0z1bKs5WOvHIAC0Cybmv4AJSkAXgX5aD6Mqd2epSLlVJsQl8NG23jCVouIgkh4All/mrbdsf2UOLFnJw0tw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/state": "^6.5.0",
        "crelt": "^1.0.6",
@@ -1171,7 +1164,6 @@
      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
@@ -1558,6 +1550,7 @@
      "dev": true,
      "license": "BSD-2-Clause",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "cross-dirname": "^0.1.0",
        "debug": "^4.3.4",
@@ -1579,6 +1572,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "graceful-fs": "^4.2.0",
        "jsonfile": "^6.0.1",
@@ -2535,8 +2529,7 @@
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.3.0.tgz",
      "integrity": "sha512-L9X8uHCYU310o99L3/MpJKYxPzXPOS7S0NmBaM7UO/x2Kb2WbmMLSkfvdr1KxRIFYOpbY0Jhn7CfLSUDzL8arQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/@lezer/cpp": {
      "version": "1.1.3",
@@ -2576,7 +2569,6 @@
      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz",
      "integrity": "sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@lezer/common": "^1.3.0"
      }
@@ -2608,7 +2600,6 @@
      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.4.tgz",
      "integrity": "sha512-vvYx3MhWqeZtGPwDStM2dwgljd5smolYD2lR2UyFcHfxbBQebqx8yjmFmxtJ/E6nN6u1D9srOiVWm3Rb4tmcUA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@lezer/common": "^1.2.0",
        "@lezer/highlight": "^1.1.3",
@@ -2631,7 +2622,6 @@
      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@lezer/common": "^1.0.0"
      }
@@ -4855,7 +4845,6 @@
      "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/node": "*"
      }
@@ -5013,7 +5002,6 @@
      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.5.tgz",
      "integrity": "sha512-LuIQOcb6UmnF7C1PCFmEU1u2hmiHL43fgFQX67sN3H4Z+0Yk0Neo++mFsBjhOAuLzvlQeqAAkeDOZrJs9rzumQ==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/body-parser": "*",
        "@types/express-serve-static-core": "^5.0.0",
@@ -5136,7 +5124,6 @@
      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.2.tgz",
      "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "undici-types": "~7.16.0"
      }
@@ -5179,7 +5166,6 @@
      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
      "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "csstype": "^3.0.2"
      }
@@ -5190,7 +5176,6 @@
      "integrity": "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "peerDependencies": {
        "@types/react": "^19.2.0"
      }
@@ -5358,7 +5343,6 @@
      "integrity": "sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.46.2",
        "@typescript-eslint/types": "8.46.2",
@@ -5735,8 +5719,7 @@
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
      "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/7zip-bin": {
      "version": "5.2.0",
@@ -5771,7 +5754,6 @@
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -6194,7 +6176,6 @@
      "integrity": "sha512-3yVdyZhklTiNrtg+4WqHpJpFDd+WHTg2oM7UcR80GqL05AOV0xEJzc6qNvFYoEtE+hRp1n9MpN6/+4yhlGkDXQ==",
      "hasInstallScript": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "bindings": "^1.5.0",
        "prebuild-install": "^7.1.1"
@@ -6329,7 +6310,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "baseline-browser-mapping": "^2.8.19",
        "caniuse-lite": "^1.0.30001751",
@@ -6936,6 +6916,22 @@
        "node": ">=6"
      }
    },
+    "node_modules/cmdk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz",
+      "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "^1.1.1",
+        "@radix-ui/react-dialog": "^1.1.6",
+        "@radix-ui/react-id": "^1.1.0",
+        "@radix-ui/react-primitive": "^2.0.2"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19 || ^19.0.0-rc",
+        "react-dom": "^18 || ^19 || ^19.0.0-rc"
+      }
+    },
    "node_modules/codem-isoboxer": {
      "version": "0.3.10",
      "resolved": "https://registry.npmjs.org/codem-isoboxer/-/codem-isoboxer-0.3.10.tgz",
@@ -7317,7 +7313,6 @@
      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "env-paths": "^2.2.1",
        "import-fresh": "^3.3.0",
@@ -7394,7 +7389,8 @@
      "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
      "dev": true,
      "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "node_modules/cross-spawn": {
      "version": "7.0.6",
@@ -7853,7 +7849,6 @@
      "integrity": "sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "app-builder-lib": "26.0.12",
        "builder-util": "26.0.11",
@@ -7951,7 +7946,8 @@
      "version": "3.1.7",
      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
      "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==",
-      "license": "(MPL-2.0 OR Apache-2.0)"
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "peer": true
    },
    "node_modules/dot-prop": {
      "version": "5.3.0",
@@ -8303,6 +8299,7 @@
      "dev": true,
      "hasInstallScript": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@electron/asar": "^3.2.1",
        "debug": "^4.1.1",
@@ -8323,6 +8320,7 @@
      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "graceful-fs": "^4.1.2",
        "jsonfile": "^4.0.0",
@@ -8338,6 +8336,7 @@
      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "optionalDependencies": {
        "graceful-fs": "^4.1.6"
      }
@@ -8348,6 +8347,7 @@
      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 4.0.0"
      }
@@ -8610,7 +8610,6 @@
      "integrity": "sha512-iy2GE3MHrYTL5lrCtMZ0X1KLEKKUjmK0kzwcnefhR66txcEmXZD2YWgR5GNdcEwkNx3a0siYkSvl0vIC+Svjmg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.8.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -10209,7 +10208,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.27.6"
      },
@@ -10735,9 +10733,9 @@
      "license": "MIT"
    },
    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -11751,6 +11749,7 @@
      "resolved": "https://registry.npmjs.org/marked/-/marked-14.0.0.tgz",
      "integrity": "sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==",
      "license": "MIT",
+      "peer": true,
      "bin": {
        "marked": "bin/marked.js"
      },
@@ -13778,6 +13777,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "commander": "^9.4.0"
      },
@@ -13795,6 +13795,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": "^12.20.0 || >=14"
      }
@@ -14246,7 +14247,6 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -14256,7 +14256,6 @@
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
      "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "scheduler": "^0.27.0"
      },
@@ -14283,7 +14282,6 @@
      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.66.0.tgz",
      "integrity": "sha512-xXBqsWGKrY46ZqaHDo+ZUYiMUgi8suYu5kdrS20EG8KiL7VRQitEbNjm+UcrDYrNi1YLyfpmAeGjCZYXLT9YBw==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=18.0.0"
      },
@@ -14431,7 +14429,6 @@
      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/use-sync-external-store": "^0.0.6",
        "use-sync-external-store": "^1.4.0"
@@ -14640,8 +14637,7 @@
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/redux-thunk": {
      "version": "3.1.0",
@@ -15962,6 +15958,7 @@
      "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "mkdirp": "^0.5.1",
        "rimraf": "~2.6.2"
@@ -16002,6 +15999,7 @@
      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "minimist": "^1.2.6"
      },
@@ -16016,6 +16014,7 @@
      "deprecated": "Rimraf versions prior to v4 are no longer supported",
      "dev": true,
      "license": "ISC",
+      "peer": true,
      "dependencies": {
        "glob": "^7.1.3"
      },
@@ -16120,7 +16119,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -16326,7 +16324,6 @@
      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
      "devOptional": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -16739,7 +16736,6 @@
      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
      "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.5.0",
@@ -16831,7 +16827,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "termix",
  "private": true,
-  "version": "1.8.0",
+  "version": "1.9.0",
  "description": "A web-based server management platform with SSH terminal, tunneling, and file editing capabilities",
  "author": "Karmaa",
  "main": "electron/main.cjs",
@@ -70,6 +70,7 @@
    "chalk": "^4.1.2",
    "class-variance-authority": "^0.7.1",
    "clsx": "^2.1.1",
+    "cmdk": "^1.1.1",
    "cookie-parser": "^1.4.7",
    "cors": "^2.8.5",
    "dotenv": "^17.2.0",
--- a/src/backend/database/database.ts
+++ b/src/backend/database/database.ts
@@ -7,6 +7,7 @@ import sshRoutes from "./routes/ssh.js";
 import alertRoutes from "./routes/alerts.js";
 import credentialsRoutes from "./routes/credentials.js";
 import snippetsRoutes from "./routes/snippets.js";
+import terminalRoutes from "./routes/terminal.js";
 import cors from "cors";
 import fetch from "node-fetch";
 import fs from "fs";
@@ -21,6 +22,7 @@ import { DatabaseMigration } from "../utils/database-migration.js";
 import { UserDataExport } from "../utils/user-data-export.js";
 import { AutoSSLSetup } from "../utils/auto-ssl-setup.js";
 import { eq, and } from "drizzle-orm";
+import { parseUserAgent } from "../utils/user-agent-parser.js";
 import {
  users,
  sshData,
@@ -456,8 +458,12 @@ app.post("/database/export", authenticateJWT, async (req, res) => {
        code: "PASSWORD_REQUIRED",
      });
    }
-
-    const unlocked = await authManager.authenticateUser(userId, password);
+    const deviceInfo = parseUserAgent(req);
+    const unlocked = await authManager.authenticateUser(
+      userId,
+      password,
+      deviceInfo.type,
+    );
    if (!unlocked) {
      return res.status(401).json({ error: "Invalid password" });
    }
@@ -904,6 +910,7 @@ app.post(
      const userId = (req as AuthenticatedRequest).userId;
      const { password } = req.body;
      const mainDb = getDb();
+      const deviceInfo = parseUserAgent(req);

      const userRecords = await mainDb
        .select()
@@ -924,12 +931,19 @@ app.post(
          });
        }

-        const unlocked = await authManager.authenticateUser(userId, password);
+        const unlocked = await authManager.authenticateUser(
+          userId,
+          password,
+          deviceInfo.type,
+        );
        if (!unlocked) {
          return res.status(401).json({ error: "Invalid password" });
        }
      } else if (!DataCrypto.getUserDataKey(userId)) {
-        const oidcUnlocked = await authManager.authenticateOIDCUser(userId);
+        const oidcUnlocked = await authManager.authenticateOIDCUser(
+          userId,
+          deviceInfo.type,
+        );
        if (!oidcUnlocked) {
          return res.status(403).json({
            error: "Failed to unlock user data with SSO credentials",
@@ -947,7 +961,10 @@ app.post(

      let userDataKey = DataCrypto.getUserDataKey(userId);
      if (!userDataKey && isOidcUser) {
-        const oidcUnlocked = await authManager.authenticateOIDCUser(userId);
+        const oidcUnlocked = await authManager.authenticateOIDCUser(
+          userId,
+          deviceInfo.type,
+        );
        if (oidcUnlocked) {
          userDataKey = DataCrypto.getUserDataKey(userId);
        }
@@ -1418,6 +1435,7 @@ app.use("/ssh", sshRoutes);
 app.use("/alerts", alertRoutes);
 app.use("/credentials", credentialsRoutes);
 app.use("/snippets", snippetsRoutes);
+app.use("/terminal", terminalRoutes);

 app.use(
  (
@@ -1480,13 +1498,13 @@ app.get(
      if (status.hasUnencryptedDb) {
        try {
          unencryptedSize = fs.statSync(dbPath).size;
-        } catch {}
+        } catch (error) {}
      }

      if (status.hasEncryptedDb) {
        try {
          encryptedSize = fs.statSync(encryptedDbPath).size;
-        } catch {}
+        } catch (error) {}
      }

      res.json({
--- a/src/backend/database/db/index.ts
+++ b/src/backend/database/db/index.ts
@@ -95,6 +95,26 @@ async function initializeDatabaseAsync(): Promise<void> {
        databaseKeyLength: process.env.DATABASE_KEY?.length || 0,
      });

+      try {
+        const diagnosticInfo =
+          DatabaseFileEncryption.getDiagnosticInfo(encryptedDbPath);
+        databaseLogger.error(
+          "Database encryption diagnostic completed - check logs above for details",
+          null,
+          {
+            operation: "db_encryption_diagnostic_completed",
+            filesConsistent: diagnosticInfo.validation.filesConsistent,
+            sizeMismatch: diagnosticInfo.validation.sizeMismatch,
+          },
+        );
+      } catch (diagError) {
+        databaseLogger.warn("Failed to generate diagnostic information", {
+          operation: "db_diagnostic_failed",
+          error:
+            diagError instanceof Error ? diagError.message : "Unknown error",
+        });
+      }
+
      throw new Error(
        `Database decryption failed: ${error instanceof Error ? error.message : "Unknown error"}. This prevents data loss.`,
      );
@@ -120,6 +140,8 @@ async function initializeCompleteDatabase(): Promise<void> {

  sqlite = memoryDatabase;

+  sqlite.exec("PRAGMA foreign_keys = ON");
+
  db = drizzle(sqlite, { schema });

  sqlite.exec(`
@@ -157,7 +179,7 @@ async function initializeCompleteDatabase(): Promise<void> {
        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
        expires_at TEXT NOT NULL,
        last_active_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS ssh_data (
@@ -188,7 +210,7 @@ async function initializeCompleteDatabase(): Promise<void> {
        terminal_config TEXT,
        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS file_manager_recent (
@@ -198,8 +220,8 @@ async function initializeCompleteDatabase(): Promise<void> {
        name TEXT NOT NULL,
        path TEXT NOT NULL,
        last_opened TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id),
-        FOREIGN KEY (host_id) REFERENCES ssh_data (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS file_manager_pinned (
@@ -209,8 +231,8 @@ async function initializeCompleteDatabase(): Promise<void> {
        name TEXT NOT NULL,
        path TEXT NOT NULL,
        pinned_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id),
-        FOREIGN KEY (host_id) REFERENCES ssh_data (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS file_manager_shortcuts (
@@ -220,8 +242,8 @@ async function initializeCompleteDatabase(): Promise<void> {
        name TEXT NOT NULL,
        path TEXT NOT NULL,
        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id),
-        FOREIGN KEY (host_id) REFERENCES ssh_data (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS dismissed_alerts (
@@ -229,7 +251,7 @@ async function initializeCompleteDatabase(): Promise<void> {
        user_id TEXT NOT NULL,
        alert_id TEXT NOT NULL,
        dismissed_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS ssh_credentials (
@@ -249,7 +271,7 @@ async function initializeCompleteDatabase(): Promise<void> {
        last_used TEXT,
        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS ssh_credential_usage (
@@ -258,9 +280,9 @@ async function initializeCompleteDatabase(): Promise<void> {
        host_id INTEGER NOT NULL,
        user_id TEXT NOT NULL,
        used_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (credential_id) REFERENCES ssh_credentials (id),
-        FOREIGN KEY (host_id) REFERENCES ssh_data (id),
-        FOREIGN KEY (user_id) REFERENCES users (id)
+        FOREIGN KEY (credential_id) REFERENCES ssh_credentials (id) ON DELETE CASCADE,
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id) ON DELETE CASCADE,
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS snippets (
@@ -271,7 +293,18 @@ async function initializeCompleteDatabase(): Promise<void> {
        description TEXT,
        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS ssh_folders (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        color TEXT,
+        icon TEXT,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
    );

    CREATE TABLE IF NOT EXISTS recent_activity (
@@ -279,10 +312,20 @@ async function initializeCompleteDatabase(): Promise<void> {
        user_id TEXT NOT NULL,
        type TEXT NOT NULL,
        host_id INTEGER NOT NULL,
-        host_name TEXT NOT NULL,
+        host_name TEXT,
        timestamp TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id),
-        FOREIGN KEY (host_id) REFERENCES ssh_data (id)
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS command_history (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        user_id TEXT NOT NULL,
+        host_id INTEGER NOT NULL,
+        command TEXT NOT NULL,
+        executed_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
+        FOREIGN KEY (host_id) REFERENCES ssh_data (id) ON DELETE CASCADE
    );

 `);
@@ -343,14 +386,14 @@ const addColumnIfNotExists = (
  try {
    sqlite
      .prepare(
-        `SELECT ${column}
+        `SELECT "${column}"
                        FROM ${table} LIMIT 1`,
      )
      .get();
  } catch {
    try {
      sqlite.exec(`ALTER TABLE ${table}
-                ADD COLUMN ${column} ${definition};`);
+                ADD COLUMN "${column}" ${definition};`);
    } catch (alterError) {
      databaseLogger.warn(`Failed to add column ${column} to ${table}`, {
        operation: "schema_migration",
@@ -405,6 +448,7 @@ const migrateSchema = () => {
    "INTEGER NOT NULL DEFAULT 1",
  );
  addColumnIfNotExists("ssh_data", "tunnel_connections", "TEXT");
+  addColumnIfNotExists("ssh_data", "jump_hosts", "TEXT");
  addColumnIfNotExists(
    "ssh_data",
    "enable_file_manager",
@@ -428,7 +472,12 @@ const migrateSchema = () => {
  addColumnIfNotExists(
    "ssh_data",
    "credential_id",
-    "INTEGER REFERENCES ssh_credentials(id)",
+    "INTEGER REFERENCES ssh_credentials(id) ON DELETE SET NULL",
+  );
+  addColumnIfNotExists(
+    "ssh_data",
+    "override_credential_username",
+    "INTEGER",
  );

  addColumnIfNotExists("ssh_data", "autostart_password", "TEXT");
@@ -436,6 +485,7 @@ const migrateSchema = () => {
  addColumnIfNotExists("ssh_data", "autostart_key_password", "TEXT");
  addColumnIfNotExists("ssh_data", "stats_config", "TEXT");
  addColumnIfNotExists("ssh_data", "terminal_config", "TEXT");
+  addColumnIfNotExists("ssh_data", "quick_actions", "TEXT");

  addColumnIfNotExists("ssh_credentials", "private_key", "TEXT");
  addColumnIfNotExists("ssh_credentials", "public_key", "TEXT");
@@ -445,6 +495,35 @@ const migrateSchema = () => {
  addColumnIfNotExists("file_manager_pinned", "host_id", "INTEGER NOT NULL");
  addColumnIfNotExists("file_manager_shortcuts", "host_id", "INTEGER NOT NULL");

+  addColumnIfNotExists("snippets", "folder", "TEXT");
+  addColumnIfNotExists("snippets", "order", "INTEGER NOT NULL DEFAULT 0");
+
+  try {
+    sqlite
+      .prepare("SELECT id FROM snippet_folders LIMIT 1")
+      .get();
+  } catch {
+    try {
+      sqlite.exec(`
+        CREATE TABLE IF NOT EXISTS snippet_folders (
+          id INTEGER PRIMARY KEY AUTOINCREMENT,
+          user_id TEXT NOT NULL,
+          name TEXT NOT NULL,
+          color TEXT,
+          icon TEXT,
+          created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
+        );
+      `);
+    } catch (createError) {
+      databaseLogger.warn("Failed to create snippet_folders table", {
+        operation: "schema_migration",
+        error: createError,
+      });
+    }
+  }
+
  try {
    sqlite
      .prepare("SELECT id FROM sessions LIMIT 1")
--- a/src/backend/database/db/schema.ts
+++ b/src/backend/database/db/schema.ts
@@ -34,7 +34,7 @@ export const sessions = sqliteTable("sessions", {
  id: text("id").primaryKey(),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  jwtToken: text("jwt_token").notNull(),
  deviceType: text("device_type").notNull(),
  deviceInfo: text("device_info").notNull(),
@@ -51,7 +51,7 @@ export const sshData = sqliteTable("ssh_data", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  name: text("name"),
  ip: text("ip").notNull(),
  port: integer("port").notNull(),
@@ -71,7 +71,10 @@ export const sshData = sqliteTable("ssh_data", {
  autostartKey: text("autostart_key", { length: 8192 }),
  autostartKeyPassword: text("autostart_key_password"),

-  credentialId: integer("credential_id").references(() => sshCredentials.id),
+  credentialId: integer("credential_id").references(() => sshCredentials.id, { onDelete: "set null" }),
+  overrideCredentialUsername: integer("override_credential_username", {
+    mode: "boolean",
+  }),
  enableTerminal: integer("enable_terminal", { mode: "boolean" })
    .notNull()
    .default(true),
@@ -79,12 +82,14 @@ export const sshData = sqliteTable("ssh_data", {
    .notNull()
    .default(true),
  tunnelConnections: text("tunnel_connections"),
+  jumpHosts: text("jump_hosts"),
  enableFileManager: integer("enable_file_manager", { mode: "boolean" })
    .notNull()
    .default(true),
  defaultPath: text("default_path"),
  statsConfig: text("stats_config"),
  terminalConfig: text("terminal_config"),
+  quickActions: text("quick_actions"),
  createdAt: text("created_at")
    .notNull()
    .default(sql`CURRENT_TIMESTAMP`),
@@ -97,10 +102,10 @@ export const fileManagerRecent = sqliteTable("file_manager_recent", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  hostId: integer("host_id")
    .notNull()
-    .references(() => sshData.id),
+    .references(() => sshData.id, { onDelete: "cascade" }),
  name: text("name").notNull(),
  path: text("path").notNull(),
  lastOpened: text("last_opened")
@@ -112,10 +117,10 @@ export const fileManagerPinned = sqliteTable("file_manager_pinned", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  hostId: integer("host_id")
    .notNull()
-    .references(() => sshData.id),
+    .references(() => sshData.id, { onDelete: "cascade" }),
  name: text("name").notNull(),
  path: text("path").notNull(),
  pinnedAt: text("pinned_at")
@@ -127,10 +132,10 @@ export const fileManagerShortcuts = sqliteTable("file_manager_shortcuts", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  hostId: integer("host_id")
    .notNull()
-    .references(() => sshData.id),
+    .references(() => sshData.id, { onDelete: "cascade" }),
  name: text("name").notNull(),
  path: text("path").notNull(),
  createdAt: text("created_at")
@@ -142,7 +147,7 @@ export const dismissedAlerts = sqliteTable("dismissed_alerts", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  alertId: text("alert_id").notNull(),
  dismissedAt: text("dismissed_at")
    .notNull()
@@ -153,7 +158,7 @@ export const sshCredentials = sqliteTable("ssh_credentials", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  name: text("name").notNull(),
  description: text("description"),
  folder: text("folder"),
@@ -181,13 +186,13 @@ export const sshCredentialUsage = sqliteTable("ssh_credential_usage", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  credentialId: integer("credential_id")
    .notNull()
-    .references(() => sshCredentials.id),
+    .references(() => sshCredentials.id, { onDelete: "cascade" }),
  hostId: integer("host_id")
    .notNull()
-    .references(() => sshData.id),
+    .references(() => sshData.id, { onDelete: "cascade" }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  usedAt: text("used_at")
    .notNull()
    .default(sql`CURRENT_TIMESTAMP`),
@@ -197,10 +202,44 @@ export const snippets = sqliteTable("snippets", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  name: text("name").notNull(),
  content: text("content").notNull(),
  description: text("description"),
+  folder: text("folder"),
+  order: integer("order").notNull().default(0),
+  createdAt: text("created_at")
+    .notNull()
+    .default(sql`CURRENT_TIMESTAMP`),
+  updatedAt: text("updated_at")
+    .notNull()
+    .default(sql`CURRENT_TIMESTAMP`),
+});
+
+export const snippetFolders = sqliteTable("snippet_folders", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  userId: text("user_id")
+    .notNull()
+    .references(() => users.id, { onDelete: "cascade" }),
+  name: text("name").notNull(),
+  color: text("color"),
+  icon: text("icon"),
+  createdAt: text("created_at")
+    .notNull()
+    .default(sql`CURRENT_TIMESTAMP`),
+  updatedAt: text("updated_at")
+    .notNull()
+    .default(sql`CURRENT_TIMESTAMP`),
+});
+
+export const sshFolders = sqliteTable("ssh_folders", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  userId: text("user_id")
+    .notNull()
+    .references(() => users.id, { onDelete: "cascade" }),
+  name: text("name").notNull(),
+  color: text("color"),
+  icon: text("icon"),
  createdAt: text("created_at")
    .notNull()
    .default(sql`CURRENT_TIMESTAMP`),
@@ -213,13 +252,27 @@ export const recentActivity = sqliteTable("recent_activity", {
  id: integer("id").primaryKey({ autoIncrement: true }),
  userId: text("user_id")
    .notNull()
-    .references(() => users.id),
+    .references(() => users.id, { onDelete: "cascade" }),
  type: text("type").notNull(),
  hostId: integer("host_id")
    .notNull()
-    .references(() => sshData.id),
-  hostName: text("host_name").notNull(),
+    .references(() => sshData.id, { onDelete: "cascade" }),
+  hostName: text("host_name"),
  timestamp: text("timestamp")
    .notNull()
    .default(sql`CURRENT_TIMESTAMP`),
 });
+
+export const commandHistory = sqliteTable("command_history", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  userId: text("user_id")
+    .notNull()
+    .references(() => users.id, { onDelete: "cascade" }),
+  hostId: integer("host_id")
+    .notNull()
+    .references(() => sshData.id, { onDelete: "cascade" }),
+  command: text("command").notNull(),
+  executedAt: text("executed_at")
+    .notNull()
+    .default(sql`CURRENT_TIMESTAMP`),
+});
--- a/src/backend/database/routes/credentials.ts
+++ b/src/backend/database/routes/credentials.ts
@@ -524,6 +524,8 @@ router.delete(
        return res.status(404).json({ error: "Credential not found" });
      }

+      // Update hosts using this credential to set credentialId to null
+      // This prevents orphaned references before deletion
      const hostsUsingCredential = await db
        .select()
        .from(sshData)
@@ -552,14 +554,8 @@ router.delete(
          );
      }

-      await db
-        .delete(sshCredentialUsage)
-        .where(
-          and(
-            eq(sshCredentialUsage.credentialId, parseInt(id)),
-            eq(sshCredentialUsage.userId, userId),
-          ),
-        );
+      // sshCredentialUsage will be automatically deleted by ON DELETE CASCADE
+      // No need for manual deletion

      await db
        .delete(sshCredentials)
@@ -1259,6 +1255,10 @@ async function deploySSHKeyToHost(
                return rejectAdd(err);
              }

+              stream.on("data", () => {
+                // Consume output
+              });
+
              stream.on("close", (code) => {
                clearTimeout(addTimeout);
                if (code === 0) {
@@ -1519,7 +1519,8 @@ router.post(
        });
      }

-      if (!credData.publicKey) {
+      const publicKey = credData.public_key || credData.publicKey;
+      if (!publicKey) {
        return res.status(400).json({
          success: false,
          error: "Public key is required for deployment",
@@ -1600,7 +1601,7 @@ router.post(

      const deployResult = await deploySSHKeyToHost(
        hostConfig,
-        credData.publicKey as string,
+        publicKey as string,
        credData,
      );

--- a/src/backend/database/routes/snippets.ts
+++ b/src/backend/database/routes/snippets.ts
@@ -1,8 +1,8 @@
 import type { AuthenticatedRequest } from "../../../types/index.js";
 import express from "express";
 import { db } from "../db/index.js";
-import { snippets } from "../db/schema.js";
-import { eq, and, desc, sql } from "drizzle-orm";
+import { snippets, snippetFolders } from "../db/schema.js";
+import { eq, and, desc, asc, sql } from "drizzle-orm";
 import type { Request, Response } from "express";
 import { authLogger } from "../../utils/logger.js";
 import { AuthManager } from "../../utils/auth-manager.js";
@@ -17,6 +17,651 @@ const authManager = AuthManager.getInstance();
 const authenticateJWT = authManager.createAuthMiddleware();
 const requireDataAccess = authManager.createDataAccessMiddleware();

+// Get all snippet folders
+// GET /snippets/folders
+router.get(
+  "/folders",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+
+    if (!isNonEmptyString(userId)) {
+      authLogger.warn("Invalid userId for snippet folders fetch");
+      return res.status(400).json({ error: "Invalid userId" });
+    }
+
+    try {
+      const result = await db
+        .select()
+        .from(snippetFolders)
+        .where(eq(snippetFolders.userId, userId))
+        .orderBy(asc(snippetFolders.name));
+
+      res.json(result);
+    } catch (err) {
+      authLogger.error("Failed to fetch snippet folders", err);
+      res.status(500).json({ error: "Failed to fetch snippet folders" });
+    }
+  },
+);
+
+// Create a new snippet folder
+// POST /snippets/folders
+router.post(
+  "/folders",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { name, color, icon } = req.body;
+
+    if (!isNonEmptyString(userId) || !isNonEmptyString(name)) {
+      authLogger.warn("Invalid snippet folder creation data", {
+        operation: "snippet_folder_create",
+        userId,
+        hasName: !!name,
+      });
+      return res.status(400).json({ error: "Folder name is required" });
+    }
+
+    try {
+      const existing = await db
+        .select()
+        .from(snippetFolders)
+        .where(
+          and(eq(snippetFolders.userId, userId), eq(snippetFolders.name, name)),
+        );
+
+      if (existing.length > 0) {
+        return res
+          .status(409)
+          .json({ error: "Folder with this name already exists" });
+      }
+
+      const insertData = {
+        userId,
+        name: name.trim(),
+        color: color?.trim() || null,
+        icon: icon?.trim() || null,
+      };
+
+      const result = await db
+        .insert(snippetFolders)
+        .values(insertData)
+        .returning();
+
+      authLogger.success(`Snippet folder created: ${name} by user ${userId}`, {
+        operation: "snippet_folder_create_success",
+        userId,
+        name,
+      });
+
+      res.status(201).json(result[0]);
+    } catch (err) {
+      authLogger.error("Failed to create snippet folder", err);
+      res.status(500).json({
+        error:
+          err instanceof Error
+            ? err.message
+            : "Failed to create snippet folder",
+      });
+    }
+  },
+);
+
+// Update snippet folder metadata (color, icon)
+// PUT /snippets/folders/:name/metadata
+router.put(
+  "/folders/:name/metadata",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { name } = req.params;
+    const { color, icon } = req.body;
+
+    if (!isNonEmptyString(userId) || !name) {
+      authLogger.warn("Invalid request for snippet folder metadata update");
+      return res.status(400).json({ error: "Invalid request" });
+    }
+
+    try {
+      const existing = await db
+        .select()
+        .from(snippetFolders)
+        .where(
+          and(
+            eq(snippetFolders.userId, userId),
+            eq(snippetFolders.name, decodeURIComponent(name)),
+          ),
+        );
+
+      if (existing.length === 0) {
+        return res.status(404).json({ error: "Folder not found" });
+      }
+
+      const updateFields: Partial<{
+        color: string | null;
+        icon: string | null;
+        updatedAt: ReturnType<typeof sql.raw>;
+      }> = {
+        updatedAt: sql`CURRENT_TIMESTAMP`,
+      };
+
+      if (color !== undefined) updateFields.color = color?.trim() || null;
+      if (icon !== undefined) updateFields.icon = icon?.trim() || null;
+
+      await db
+        .update(snippetFolders)
+        .set(updateFields)
+        .where(
+          and(
+            eq(snippetFolders.userId, userId),
+            eq(snippetFolders.name, decodeURIComponent(name)),
+          ),
+        );
+
+      const updated = await db
+        .select()
+        .from(snippetFolders)
+        .where(
+          and(
+            eq(snippetFolders.userId, userId),
+            eq(snippetFolders.name, decodeURIComponent(name)),
+          ),
+        );
+
+      authLogger.success(
+        `Snippet folder metadata updated: ${name} by user ${userId}`,
+        {
+          operation: "snippet_folder_metadata_update_success",
+          userId,
+          name,
+        },
+      );
+
+      res.json(updated[0]);
+    } catch (err) {
+      authLogger.error("Failed to update snippet folder metadata", err);
+      res.status(500).json({
+        error:
+          err instanceof Error
+            ? err.message
+            : "Failed to update snippet folder metadata",
+      });
+    }
+  },
+);
+
+// Rename snippet folder
+// PUT /snippets/folders/rename
+router.put(
+  "/folders/rename",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { oldName, newName } = req.body;
+
+    if (
+      !isNonEmptyString(userId) ||
+      !isNonEmptyString(oldName) ||
+      !isNonEmptyString(newName)
+    ) {
+      authLogger.warn("Invalid request for snippet folder rename");
+      return res.status(400).json({ error: "Invalid request" });
+    }
+
+    try {
+      const existing = await db
+        .select()
+        .from(snippetFolders)
+        .where(
+          and(
+            eq(snippetFolders.userId, userId),
+            eq(snippetFolders.name, oldName),
+          ),
+        );
+
+      if (existing.length === 0) {
+        return res.status(404).json({ error: "Folder not found" });
+      }
+
+      const nameExists = await db
+        .select()
+        .from(snippetFolders)
+        .where(
+          and(
+            eq(snippetFolders.userId, userId),
+            eq(snippetFolders.name, newName),
+          ),
+        );
+
+      if (nameExists.length > 0) {
+        return res
+          .status(409)
+          .json({ error: "Folder with new name already exists" });
+      }
+
+      await db
+        .update(snippetFolders)
+        .set({ name: newName, updatedAt: sql`CURRENT_TIMESTAMP` })
+        .where(
+          and(
+            eq(snippetFolders.userId, userId),
+            eq(snippetFolders.name, oldName),
+          ),
+        );
+
+      await db
+        .update(snippets)
+        .set({ folder: newName })
+        .where(and(eq(snippets.userId, userId), eq(snippets.folder, oldName)));
+
+      authLogger.success(
+        `Snippet folder renamed: ${oldName} -> ${newName} by user ${userId}`,
+        {
+          operation: "snippet_folder_rename_success",
+          userId,
+          oldName,
+          newName,
+        },
+      );
+
+      res.json({ success: true, oldName, newName });
+    } catch (err) {
+      authLogger.error("Failed to rename snippet folder", err);
+      res.status(500).json({
+        error:
+          err instanceof Error
+            ? err.message
+            : "Failed to rename snippet folder",
+      });
+    }
+  },
+);
+
+// Delete snippet folder
+// DELETE /snippets/folders/:name
+router.delete(
+  "/folders/:name",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { name } = req.params;
+
+    if (!isNonEmptyString(userId) || !name) {
+      authLogger.warn("Invalid request for snippet folder delete");
+      return res.status(400).json({ error: "Invalid request" });
+    }
+
+    try {
+      const folderName = decodeURIComponent(name);
+
+      await db
+        .update(snippets)
+        .set({ folder: null })
+        .where(
+          and(eq(snippets.userId, userId), eq(snippets.folder, folderName)),
+        );
+
+      await db
+        .delete(snippetFolders)
+        .where(
+          and(
+            eq(snippetFolders.userId, userId),
+            eq(snippetFolders.name, folderName),
+          ),
+        );
+
+      authLogger.success(
+        `Snippet folder deleted: ${folderName} by user ${userId}`,
+        {
+          operation: "snippet_folder_delete_success",
+          userId,
+          name: folderName,
+        },
+      );
+
+      res.json({ success: true });
+    } catch (err) {
+      authLogger.error("Failed to delete snippet folder", err);
+      res.status(500).json({
+        error:
+          err instanceof Error
+            ? err.message
+            : "Failed to delete snippet folder",
+      });
+    }
+  },
+);
+
+// Reorder snippets (bulk update)
+// PUT /snippets/reorder
+router.put(
+  "/reorder",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { snippets: snippetUpdates } = req.body;
+
+    if (!isNonEmptyString(userId)) {
+      authLogger.warn("Invalid userId for snippet reorder");
+      return res.status(400).json({ error: "Invalid userId" });
+    }
+
+    if (!Array.isArray(snippetUpdates) || snippetUpdates.length === 0) {
+      authLogger.warn("Invalid snippet reorder data", {
+        operation: "snippet_reorder",
+        userId,
+      });
+      return res
+        .status(400)
+        .json({ error: "snippets array is required and must not be empty" });
+    }
+
+    try {
+      for (const update of snippetUpdates) {
+        const { id, order, folder } = update;
+
+        if (!id || order === undefined) {
+          continue;
+        }
+
+        const updateFields: Partial<{
+          order: number;
+          folder: string | null;
+        }> = {
+          order,
+        };
+
+        if (folder !== undefined) {
+          updateFields.folder = folder?.trim() || null;
+        }
+
+        await db
+          .update(snippets)
+          .set(updateFields)
+          .where(and(eq(snippets.id, id), eq(snippets.userId, userId)));
+      }
+
+      authLogger.success(`Snippets reordered by user ${userId}`, {
+        operation: "snippet_reorder_success",
+        userId,
+        count: snippetUpdates.length,
+      });
+
+      res.json({ success: true, updated: snippetUpdates.length });
+    } catch (err) {
+      authLogger.error("Failed to reorder snippets", err);
+      res.status(500).json({
+        error:
+          err instanceof Error ? err.message : "Failed to reorder snippets",
+      });
+    }
+  },
+);
+
+// Execute a snippet on a host
+// POST /snippets/execute
+router.post(
+  "/execute",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { snippetId, hostId } = req.body;
+
+    if (!isNonEmptyString(userId) || !snippetId || !hostId) {
+      authLogger.warn("Invalid snippet execution request", {
+        userId,
+        snippetId,
+        hostId,
+      });
+      return res
+        .status(400)
+        .json({ error: "Snippet ID and Host ID are required" });
+    }
+
+    try {
+      const snippetResult = await db
+        .select()
+        .from(snippets)
+        .where(
+          and(
+            eq(snippets.id, parseInt(snippetId)),
+            eq(snippets.userId, userId),
+          ),
+        );
+
+      if (snippetResult.length === 0) {
+        return res.status(404).json({ error: "Snippet not found" });
+      }
+
+      const snippet = snippetResult[0];
+
+      const { Client } = await import("ssh2");
+      const { sshData, sshCredentials } = await import("../db/schema.js");
+
+      const { SimpleDBOps } = await import("../../utils/simple-db-ops.js");
+
+      const hostResult = await SimpleDBOps.select(
+        db
+          .select()
+          .from(sshData)
+          .where(
+            and(eq(sshData.id, parseInt(hostId)), eq(sshData.userId, userId)),
+          ),
+        "ssh_data",
+        userId,
+      );
+
+      if (hostResult.length === 0) {
+        return res.status(404).json({ error: "Host not found" });
+      }
+
+      const host = hostResult[0];
+
+      let password = host.password;
+      let privateKey = host.key;
+      let passphrase = host.key_password;
+      let authType = host.authType;
+
+      if (host.credentialId) {
+        const credResult = await SimpleDBOps.select(
+          db
+            .select()
+            .from(sshCredentials)
+            .where(
+              and(
+                eq(sshCredentials.id, host.credentialId as number),
+                eq(sshCredentials.userId, userId),
+              ),
+            ),
+          "ssh_credentials",
+          userId,
+        );
+
+        if (credResult.length > 0) {
+          const cred = credResult[0];
+          authType = (cred.auth_type || cred.authType || authType) as string;
+          password = (cred.password || undefined) as string | undefined;
+          privateKey = (cred.private_key || cred.key || undefined) as
+            | string
+            | undefined;
+          passphrase = (cred.key_password || undefined) as string | undefined;
+        }
+      }
+
+      const conn = new Client();
+      let output = "";
+      let errorOutput = "";
+
+      const executePromise = new Promise<{
+        success: boolean;
+        output: string;
+        error?: string;
+      }>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          conn.end();
+          reject(new Error("Command execution timeout (30s)"));
+        }, 30000);
+
+        conn.on("ready", () => {
+          conn.exec(snippet.content, (err, stream) => {
+            if (err) {
+              clearTimeout(timeout);
+              conn.end();
+              return reject(err);
+            }
+
+            stream.on("close", () => {
+              clearTimeout(timeout);
+              conn.end();
+              if (errorOutput) {
+                resolve({ success: false, output, error: errorOutput });
+              } else {
+                resolve({ success: true, output });
+              }
+            });
+
+            stream.on("data", (data: Buffer) => {
+              output += data.toString();
+            });
+
+            stream.stderr.on("data", (data: Buffer) => {
+              errorOutput += data.toString();
+            });
+          });
+        });
+
+        conn.on("error", (err) => {
+          clearTimeout(timeout);
+          reject(err);
+        });
+
+        const config: any = {
+          host: host.ip,
+          port: host.port,
+          username: host.username,
+          tryKeyboard: true,
+          keepaliveInterval: 30000,
+          keepaliveCountMax: 3,
+          readyTimeout: 30000,
+          tcpKeepAlive: true,
+          tcpKeepAliveInitialDelay: 30000,
+          timeout: 30000,
+          env: {
+            TERM: "xterm-256color",
+            LANG: "en_US.UTF-8",
+            LC_ALL: "en_US.UTF-8",
+            LC_CTYPE: "en_US.UTF-8",
+            LC_MESSAGES: "en_US.UTF-8",
+            LC_MONETARY: "en_US.UTF-8",
+            LC_NUMERIC: "en_US.UTF-8",
+            LC_TIME: "en_US.UTF-8",
+            LC_COLLATE: "en_US.UTF-8",
+            COLORTERM: "truecolor",
+          },
+          algorithms: {
+            kex: [
+              "curve25519-sha256",
+              "curve25519-sha256@libssh.org",
+              "ecdh-sha2-nistp521",
+              "ecdh-sha2-nistp384",
+              "ecdh-sha2-nistp256",
+              "diffie-hellman-group-exchange-sha256",
+              "diffie-hellman-group14-sha256",
+              "diffie-hellman-group14-sha1",
+              "diffie-hellman-group-exchange-sha1",
+              "diffie-hellman-group1-sha1",
+            ],
+            serverHostKey: [
+              "ssh-ed25519",
+              "ecdsa-sha2-nistp521",
+              "ecdsa-sha2-nistp384",
+              "ecdsa-sha2-nistp256",
+              "rsa-sha2-512",
+              "rsa-sha2-256",
+              "ssh-rsa",
+              "ssh-dss",
+            ],
+            cipher: [
+              "chacha20-poly1305@openssh.com",
+              "aes256-gcm@openssh.com",
+              "aes128-gcm@openssh.com",
+              "aes256-ctr",
+              "aes192-ctr",
+              "aes128-ctr",
+              "aes256-cbc",
+              "aes192-cbc",
+              "aes128-cbc",
+              "3des-cbc",
+            ],
+            hmac: [
+              "hmac-sha2-512-etm@openssh.com",
+              "hmac-sha2-256-etm@openssh.com",
+              "hmac-sha2-512",
+              "hmac-sha2-256",
+              "hmac-sha1",
+              "hmac-md5",
+            ],
+            compress: ["none", "zlib@openssh.com", "zlib"],
+          },
+        };
+
+        if (authType === "password" && password) {
+          config.password = password;
+        } else if (authType === "key" && privateKey) {
+          const cleanKey = (privateKey as string)
+            .trim()
+            .replace(/\r\n/g, "\n")
+            .replace(/\r/g, "\n");
+          config.privateKey = Buffer.from(cleanKey, "utf8");
+          if (passphrase) {
+            config.passphrase = passphrase;
+          }
+        } else if (password) {
+          config.password = password;
+        } else if (privateKey) {
+          const cleanKey = (privateKey as string)
+            .trim()
+            .replace(/\r\n/g, "\n")
+            .replace(/\r/g, "\n");
+          config.privateKey = Buffer.from(cleanKey, "utf8");
+          if (passphrase) {
+            config.passphrase = passphrase;
+          }
+        }
+
+        conn.connect(config);
+      });
+
+      const result = await executePromise;
+
+      authLogger.success(
+        `Snippet executed: ${snippet.name} on host ${hostId}`,
+        {
+          operation: "snippet_execute_success",
+          userId,
+          snippetId,
+          hostId,
+        },
+      );
+
+      res.json(result);
+    } catch (err) {
+      authLogger.error("Failed to execute snippet", err);
+      res.status(500).json({
+        error: err instanceof Error ? err.message : "Failed to execute snippet",
+      });
+    }
+  },
+);
+
 // Get all snippets for the authenticated user
 // GET /snippets
 router.get(
@@ -36,7 +681,12 @@ router.get(
        .select()
        .from(snippets)
        .where(eq(snippets.userId, userId))
-        .orderBy(desc(snippets.updatedAt));
+        .orderBy(
+          sql`CASE WHEN ${snippets.folder} IS NULL OR ${snippets.folder} = '' THEN 0 ELSE 1 END`,
+          asc(snippets.folder),
+          asc(snippets.order),
+          desc(snippets.updatedAt),
+        );

      res.json(result);
    } catch (err) {
@@ -93,7 +743,7 @@ router.post(
  requireDataAccess,
  async (req: Request, res: Response) => {
    const userId = (req as AuthenticatedRequest).userId;
-    const { name, content, description } = req.body;
+    const { name, content, description, folder, order } = req.body;

    if (
      !isNonEmptyString(userId) ||
@@ -110,11 +760,31 @@ router.post(
    }

    try {
+      let snippetOrder = order;
+      if (snippetOrder === undefined || snippetOrder === null) {
+        const folderValue = folder?.trim() || "";
+        const maxOrderResult = await db
+          .select({ maxOrder: sql<number>`MAX(${snippets.order})` })
+          .from(snippets)
+          .where(
+            and(
+              eq(snippets.userId, userId),
+              folderValue
+                ? eq(snippets.folder, folderValue)
+                : sql`(${snippets.folder} IS NULL OR ${snippets.folder} = '')`,
+            ),
+          );
+        const maxOrder = maxOrderResult[0]?.maxOrder ?? -1;
+        snippetOrder = maxOrder + 1;
+      }
+
      const insertData = {
        userId,
        name: name.trim(),
        content: content.trim(),
        description: description?.trim() || null,
+        folder: folder?.trim() || null,
+        order: snippetOrder,
      };

      const result = await db.insert(snippets).values(insertData).returning();
@@ -167,6 +837,8 @@ router.put(
        name: string;
        content: string;
        description: string | null;
+        folder: string | null;
+        order: number;
      }> = {
        updatedAt: sql`CURRENT_TIMESTAMP`,
      };
@@ -177,6 +849,9 @@ router.put(
        updateFields.content = updateData.content.trim();
      if (updateData.description !== undefined)
        updateFields.description = updateData.description?.trim() || null;
+      if (updateData.folder !== undefined)
+        updateFields.folder = updateData.folder?.trim() || null;
+      if (updateData.order !== undefined) updateFields.order = updateData.order;

      await db
        .update(snippets)
--- a/src/backend/database/routes/ssh.ts
+++ b/src/backend/database/routes/ssh.ts
@@ -8,6 +8,9 @@ import {
  fileManagerRecent,
  fileManagerPinned,
  fileManagerShortcuts,
+  sshFolders,
+  commandHistory,
+  recentActivity,
 } from "../db/schema.js";
 import { eq, and, desc, isNotNull, or } from "drizzle-orm";
 import type { Request, Response } from "express";
@@ -234,6 +237,8 @@ router.post(
      enableFileManager,
      defaultPath,
      tunnelConnections,
+      jumpHosts,
+      quickActions,
      statsConfig,
      terminalConfig,
      forceKeyboardInteractive,
@@ -270,6 +275,10 @@ router.post(
      tunnelConnections: Array.isArray(tunnelConnections)
        ? JSON.stringify(tunnelConnections)
        : null,
+      jumpHosts: Array.isArray(jumpHosts) ? JSON.stringify(jumpHosts) : null,
+      quickActions: Array.isArray(quickActions)
+        ? JSON.stringify(quickActions)
+        : null,
      enableFileManager: enableFileManager ? 1 : 0,
      defaultPath: defaultPath || null,
      statsConfig: statsConfig ? JSON.stringify(statsConfig) : null,
@@ -328,6 +337,9 @@ router.post(
        tunnelConnections: createdHost.tunnelConnections
          ? JSON.parse(createdHost.tunnelConnections as string)
          : [],
+        jumpHosts: createdHost.jumpHosts
+          ? JSON.parse(createdHost.jumpHosts as string)
+          : [],
        enableFileManager: !!createdHost.enableFileManager,
        statsConfig: createdHost.statsConfig
          ? JSON.parse(createdHost.statsConfig as string)
@@ -349,6 +361,28 @@ router.post(
        },
      );

+      try {
+        const axios = (await import("axios")).default;
+        const statsPort = process.env.STATS_PORT || 30005;
+        await axios.post(
+          `http://localhost:${statsPort}/host-updated`,
+          { hostId: createdHost.id },
+          {
+            headers: {
+              Authorization: req.headers.authorization || "",
+              Cookie: req.headers.cookie || "",
+            },
+            timeout: 5000,
+          },
+        );
+      } catch (err) {
+        sshLogger.warn("Failed to notify stats server of new host", {
+          operation: "host_create",
+          hostId: createdHost.id as number,
+          error: err instanceof Error ? err.message : String(err),
+        });
+      }
+
      res.json(resolvedHost);
    } catch (err) {
      sshLogger.error("Failed to save SSH host to database", err, {
@@ -369,6 +403,7 @@ router.post(
 router.put(
  "/db/host/:id",
  authenticateJWT,
+  requireDataAccess,
  upload.single("key"),
  async (req: Request, res: Response) => {
    const hostId = req.params.id;
@@ -424,6 +459,8 @@ router.put(
      enableFileManager,
      defaultPath,
      tunnelConnections,
+      jumpHosts,
+      quickActions,
      statsConfig,
      terminalConfig,
      forceKeyboardInteractive,
@@ -461,6 +498,10 @@ router.put(
      tunnelConnections: Array.isArray(tunnelConnections)
        ? JSON.stringify(tunnelConnections)
        : null,
+      jumpHosts: Array.isArray(jumpHosts) ? JSON.stringify(jumpHosts) : null,
+      quickActions: Array.isArray(quickActions)
+        ? JSON.stringify(quickActions)
+        : null,
      enableFileManager: enableFileManager ? 1 : 0,
      defaultPath: defaultPath || null,
      statsConfig: statsConfig ? JSON.stringify(statsConfig) : null,
@@ -537,6 +578,9 @@ router.put(
        tunnelConnections: updatedHost.tunnelConnections
          ? JSON.parse(updatedHost.tunnelConnections as string)
          : [],
+        jumpHosts: updatedHost.jumpHosts
+          ? JSON.parse(updatedHost.jumpHosts as string)
+          : [],
        enableFileManager: !!updatedHost.enableFileManager,
        statsConfig: updatedHost.statsConfig
          ? JSON.parse(updatedHost.statsConfig as string)
@@ -558,6 +602,28 @@ router.put(
        },
      );

+      try {
+        const axios = (await import("axios")).default;
+        const statsPort = process.env.STATS_PORT || 30005;
+        await axios.post(
+          `http://localhost:${statsPort}/host-updated`,
+          { hostId: parseInt(hostId) },
+          {
+            headers: {
+              Authorization: req.headers.authorization || "",
+              Cookie: req.headers.cookie || "",
+            },
+            timeout: 5000,
+          },
+        );
+      } catch (err) {
+        sshLogger.warn("Failed to notify stats server of host update", {
+          operation: "host_update",
+          hostId: parseInt(hostId),
+          error: err instanceof Error ? err.message : String(err),
+        });
+      }
+
      res.json(resolvedHost);
    } catch (err) {
      sshLogger.error("Failed to update SSH host in database", err, {
@@ -576,67 +642,77 @@ router.put(

 // Route: Get SSH data for the authenticated user (requires JWT)
 // GET /ssh/host
-router.get("/db/host", authenticateJWT, async (req: Request, res: Response) => {
-  const userId = (req as AuthenticatedRequest).userId;
-  if (!isNonEmptyString(userId)) {
-    sshLogger.warn("Invalid userId for SSH data fetch", {
-      operation: "host_fetch",
-      userId,
-    });
-    return res.status(400).json({ error: "Invalid userId" });
-  }
-  try {
-    const data = await SimpleDBOps.select(
-      db.select().from(sshData).where(eq(sshData.userId, userId)),
-      "ssh_data",
-      userId,
-    );
+router.get(
+  "/db/host",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    if (!isNonEmptyString(userId)) {
+      sshLogger.warn("Invalid userId for SSH data fetch", {
+        operation: "host_fetch",
+        userId,
+      });
+      return res.status(400).json({ error: "Invalid userId" });
+    }
+    try {
+      const data = await SimpleDBOps.select(
+        db.select().from(sshData).where(eq(sshData.userId, userId)),
+        "ssh_data",
+        userId,
+      );

-    const result = await Promise.all(
-      data.map(async (row: Record<string, unknown>) => {
-        const baseHost = {
-          ...row,
-          tags:
-            typeof row.tags === "string"
-              ? row.tags
-                ? row.tags.split(",").filter(Boolean)
-                : []
+      const result = await Promise.all(
+        data.map(async (row: Record<string, unknown>) => {
+          const baseHost = {
+            ...row,
+            tags:
+              typeof row.tags === "string"
+                ? row.tags
+                  ? row.tags.split(",").filter(Boolean)
+                  : []
+                : [],
+            pin: !!row.pin,
+            enableTerminal: !!row.enableTerminal,
+            enableTunnel: !!row.enableTunnel,
+            tunnelConnections: row.tunnelConnections
+              ? JSON.parse(row.tunnelConnections as string)
              : [],
-          pin: !!row.pin,
-          enableTerminal: !!row.enableTerminal,
-          enableTunnel: !!row.enableTunnel,
-          tunnelConnections: row.tunnelConnections
-            ? JSON.parse(row.tunnelConnections as string)
-            : [],
-          enableFileManager: !!row.enableFileManager,
-          statsConfig: row.statsConfig
-            ? JSON.parse(row.statsConfig as string)
-            : undefined,
-          terminalConfig: row.terminalConfig
-            ? JSON.parse(row.terminalConfig as string)
-            : undefined,
-          forceKeyboardInteractive: row.forceKeyboardInteractive === "true",
-        };
+            jumpHosts: row.jumpHosts ? JSON.parse(row.jumpHosts as string) : [],
+            quickActions: row.quickActions
+              ? JSON.parse(row.quickActions as string)
+              : [],
+            enableFileManager: !!row.enableFileManager,
+            statsConfig: row.statsConfig
+              ? JSON.parse(row.statsConfig as string)
+              : undefined,
+            terminalConfig: row.terminalConfig
+              ? JSON.parse(row.terminalConfig as string)
+              : undefined,
+            forceKeyboardInteractive: row.forceKeyboardInteractive === "true",
+          };

-        return (await resolveHostCredentials(baseHost)) || baseHost;
-      }),
-    );
+          return (await resolveHostCredentials(baseHost)) || baseHost;
+        }),
+      );

-    res.json(result);
-  } catch (err) {
-    sshLogger.error("Failed to fetch SSH hosts from database", err, {
-      operation: "host_fetch",
-      userId,
-    });
-    res.status(500).json({ error: "Failed to fetch SSH data" });
-  }
-});
+      res.json(result);
+    } catch (err) {
+      sshLogger.error("Failed to fetch SSH hosts from database", err, {
+        operation: "host_fetch",
+        userId,
+      });
+      res.status(500).json({ error: "Failed to fetch SSH data" });
+    }
+  },
+);

 // Route: Get SSH host by ID (requires JWT)
 // GET /ssh/host/:id
 router.get(
  "/db/host/:id",
  authenticateJWT,
+  requireDataAccess,
  async (req: Request, res: Response) => {
    const hostId = req.params.id;
    const userId = (req as AuthenticatedRequest).userId;
@@ -679,6 +755,8 @@ router.get(
        tunnelConnections: host.tunnelConnections
          ? JSON.parse(host.tunnelConnections)
          : [],
+        jumpHosts: host.jumpHosts ? JSON.parse(host.jumpHosts) : [],
+        quickActions: host.quickActions ? JSON.parse(host.quickActions) : [],
        enableFileManager: !!host.enableFileManager,
        statsConfig: host.statsConfig
          ? JSON.parse(host.statsConfig)
@@ -783,6 +861,7 @@ router.get(
 router.delete(
  "/db/host/:id",
  authenticateJWT,
+  requireDataAccess,
  async (req: Request, res: Response) => {
    const userId = (req as AuthenticatedRequest).userId;
    const hostId = req.params.id;
@@ -816,8 +895,8 @@ router.delete(
        .delete(fileManagerRecent)
        .where(
          and(
-            eq(fileManagerRecent.userId, userId),
            eq(fileManagerRecent.hostId, numericHostId),
+            eq(fileManagerRecent.userId, userId),
          ),
        );

@@ -825,8 +904,8 @@ router.delete(
        .delete(fileManagerPinned)
        .where(
          and(
-            eq(fileManagerPinned.userId, userId),
            eq(fileManagerPinned.hostId, numericHostId),
+            eq(fileManagerPinned.userId, userId),
          ),
        );

@@ -834,8 +913,17 @@ router.delete(
        .delete(fileManagerShortcuts)
        .where(
          and(
-            eq(fileManagerShortcuts.userId, userId),
            eq(fileManagerShortcuts.hostId, numericHostId),
+            eq(fileManagerShortcuts.userId, userId),
+          ),
+        );
+
+      await db
+        .delete(commandHistory)
+        .where(
+          and(
+            eq(commandHistory.hostId, numericHostId),
+            eq(commandHistory.userId, userId),
          ),
        );

@@ -843,8 +931,17 @@ router.delete(
        .delete(sshCredentialUsage)
        .where(
          and(
-            eq(sshCredentialUsage.userId, userId),
            eq(sshCredentialUsage.hostId, numericHostId),
+            eq(sshCredentialUsage.userId, userId),
+          ),
+        );
+
+      await db
+        .delete(recentActivity)
+        .where(
+          and(
+            eq(recentActivity.hostId, numericHostId),
+            eq(recentActivity.userId, userId),
          ),
        );

@@ -865,6 +962,28 @@ router.delete(
        },
      );

+      try {
+        const axios = (await import("axios")).default;
+        const statsPort = process.env.STATS_PORT || 30005;
+        await axios.post(
+          `http://localhost:${statsPort}/host-deleted`,
+          { hostId: numericHostId },
+          {
+            headers: {
+              Authorization: req.headers.authorization || "",
+              Cookie: req.headers.cookie || "",
+            },
+            timeout: 5000,
+          },
+        );
+      } catch (err) {
+        sshLogger.warn("Failed to notify stats server of host deletion", {
+          operation: "host_delete",
+          hostId: numericHostId,
+          error: err instanceof Error ? err.message : String(err),
+        });
+      }
+
      res.json({ message: "SSH host deleted" });
    } catch (err) {
      sshLogger.error("Failed to delete SSH host from database", err, {
@@ -1241,6 +1360,94 @@ router.delete(
  },
 );

+// Route: Get command history for a host
+// GET /ssh/command-history/:hostId
+router.get(
+  "/command-history/:hostId",
+  authenticateJWT,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const hostId = parseInt(req.params.hostId, 10);
+
+    if (!isNonEmptyString(userId) || !hostId) {
+      sshLogger.warn("Invalid userId or hostId for command history fetch", {
+        operation: "command_history_fetch",
+        hostId,
+        userId,
+      });
+      return res.status(400).json({ error: "Invalid userId or hostId" });
+    }
+
+    try {
+      const history = await db
+        .select({
+          id: commandHistory.id,
+          command: commandHistory.command,
+        })
+        .from(commandHistory)
+        .where(
+          and(
+            eq(commandHistory.userId, userId),
+            eq(commandHistory.hostId, hostId),
+          ),
+        )
+        .orderBy(desc(commandHistory.executedAt))
+        .limit(200);
+
+      res.json(history.map((h) => h.command));
+    } catch (err) {
+      sshLogger.error("Failed to fetch command history from database", err, {
+        operation: "command_history_fetch",
+        hostId,
+        userId,
+      });
+      res.status(500).json({ error: "Failed to fetch command history" });
+    }
+  },
+);
+
+// Route: Delete command from history
+// DELETE /ssh/command-history
+router.delete(
+  "/command-history",
+  authenticateJWT,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { hostId, command } = req.body;
+
+    if (!isNonEmptyString(userId) || !hostId || !command) {
+      sshLogger.warn("Invalid data for command history deletion", {
+        operation: "command_history_delete",
+        hostId,
+        userId,
+      });
+      return res.status(400).json({ error: "Invalid data" });
+    }
+
+    try {
+      await db
+        .delete(commandHistory)
+        .where(
+          and(
+            eq(commandHistory.userId, userId),
+            eq(commandHistory.hostId, hostId),
+            eq(commandHistory.command, command),
+          ),
+        );
+
+      res.json({ message: "Command deleted from history" });
+    } catch (err) {
+      sshLogger.error("Failed to delete command from history", err, {
+        operation: "command_history_delete",
+        hostId,
+        userId,
+        command,
+      });
+      res.status(500).json({ error: "Failed to delete command" });
+    }
+  },
+);
+
 async function resolveHostCredentials(
  host: Record<string, unknown>,
 ): Promise<Record<string, unknown>> {
@@ -1341,6 +1548,16 @@ router.put(

      DatabaseSaveTrigger.triggerSave("folder_rename");

+      await db
+        .update(sshFolders)
+        .set({
+          name: newName,
+          updatedAt: new Date().toISOString(),
+        })
+        .where(
+          and(eq(sshFolders.userId, userId), eq(sshFolders.name, oldName)),
+        );
+
      res.json({
        message: "Folder renamed successfully",
        updatedHosts: updatedHosts.length,
@@ -1358,6 +1575,170 @@ router.put(
  },
 );

+// Route: Get all folders with metadata (requires JWT)
+// GET /ssh/db/folders
+router.get("/folders", authenticateJWT, async (req: Request, res: Response) => {
+  const userId = (req as AuthenticatedRequest).userId;
+
+  if (!isNonEmptyString(userId)) {
+    return res.status(400).json({ error: "Invalid user ID" });
+  }
+
+  try {
+    const folders = await db
+      .select()
+      .from(sshFolders)
+      .where(eq(sshFolders.userId, userId));
+
+    res.json(folders);
+  } catch (err) {
+    sshLogger.error("Failed to fetch folders", err, {
+      operation: "fetch_folders",
+      userId,
+    });
+    res.status(500).json({ error: "Failed to fetch folders" });
+  }
+});
+
+// Route: Update folder metadata (requires JWT)
+// PUT /ssh/db/folders/metadata
+router.put(
+  "/folders/metadata",
+  authenticateJWT,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { name, color, icon } = req.body;
+
+    if (!isNonEmptyString(userId) || !name) {
+      return res.status(400).json({ error: "Folder name is required" });
+    }
+
+    try {
+      const existing = await db
+        .select()
+        .from(sshFolders)
+        .where(and(eq(sshFolders.userId, userId), eq(sshFolders.name, name)))
+        .limit(1);
+
+      if (existing.length > 0) {
+        await db
+          .update(sshFolders)
+          .set({
+            color,
+            icon,
+            updatedAt: new Date().toISOString(),
+          })
+          .where(and(eq(sshFolders.userId, userId), eq(sshFolders.name, name)));
+      } else {
+        await db.insert(sshFolders).values({
+          userId,
+          name,
+          color,
+          icon,
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
+        });
+      }
+
+      DatabaseSaveTrigger.triggerSave("folder_metadata_update");
+
+      res.json({ message: "Folder metadata updated successfully" });
+    } catch (err) {
+      sshLogger.error("Failed to update folder metadata", err, {
+        operation: "update_folder_metadata",
+        userId,
+        name,
+      });
+      res.status(500).json({ error: "Failed to update folder metadata" });
+    }
+  },
+);
+
+// Route: Delete all hosts in folder (requires JWT)
+// DELETE /ssh/db/folders/:name/hosts
+router.delete(
+  "/folders/:name/hosts",
+  authenticateJWT,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const folderName = req.params.name;
+
+    if (!isNonEmptyString(userId) || !folderName) {
+      return res.status(400).json({ error: "Invalid folder name" });
+    }
+
+    try {
+      const hostsToDelete = await db
+        .select()
+        .from(sshData)
+        .where(and(eq(sshData.userId, userId), eq(sshData.folder, folderName)));
+
+      if (hostsToDelete.length === 0) {
+        return res.json({
+          message: "No hosts found in folder",
+          deletedCount: 0,
+        });
+      }
+
+      await db
+        .delete(sshData)
+        .where(and(eq(sshData.userId, userId), eq(sshData.folder, folderName)));
+
+      await db
+        .delete(sshFolders)
+        .where(
+          and(eq(sshFolders.userId, userId), eq(sshFolders.name, folderName)),
+        );
+
+      DatabaseSaveTrigger.triggerSave("folder_hosts_delete");
+
+      try {
+        const axios = (await import("axios")).default;
+        const statsPort = process.env.STATS_PORT || 30005;
+        for (const host of hostsToDelete) {
+          try {
+            await axios.post(
+              `http://localhost:${statsPort}/host-deleted`,
+              { hostId: host.id },
+              {
+                headers: {
+                  Authorization: req.headers.authorization || "",
+                  Cookie: req.headers.cookie || "",
+                },
+                timeout: 5000,
+              },
+            );
+          } catch (err) {
+            sshLogger.warn("Failed to notify stats server of host deletion", {
+              operation: "folder_hosts_delete",
+              hostId: host.id,
+              error: err instanceof Error ? err.message : String(err),
+            });
+          }
+        }
+      } catch (err) {
+        sshLogger.warn("Failed to notify stats server of folder deletion", {
+          operation: "folder_hosts_delete",
+          folderName,
+          error: err instanceof Error ? err.message : String(err),
+        });
+      }
+
+      res.json({
+        message: "All hosts in folder deleted successfully",
+        deletedCount: hostsToDelete.length,
+      });
+    } catch (err) {
+      sshLogger.error("Failed to delete hosts in folder", err, {
+        operation: "delete_folder_hosts",
+        userId,
+        folderName,
+      });
+      res.status(500).json({ error: "Failed to delete hosts in folder" });
+    }
+  },
+);
+
 // Route: Bulk import SSH hosts (requires JWT)
 // POST /ssh/bulk-import
 router.post(
--- a/src/backend/database/routes/terminal.ts
+++ b/src/backend/database/routes/terminal.ts
@@ -0,0 +1,195 @@
+import type { AuthenticatedRequest } from "../../../types/index.js";
+import express from "express";
+import { db } from "../db/index.js";
+import { commandHistory } from "../db/schema.js";
+import { eq, and, desc, sql } from "drizzle-orm";
+import type { Request, Response } from "express";
+import { authLogger } from "../../utils/logger.js";
+import { AuthManager } from "../../utils/auth-manager.js";
+
+const router = express.Router();
+
+function isNonEmptyString(val: unknown): val is string {
+  return typeof val === "string" && val.trim().length > 0;
+}
+
+const authManager = AuthManager.getInstance();
+const authenticateJWT = authManager.createAuthMiddleware();
+const requireDataAccess = authManager.createDataAccessMiddleware();
+
+// Save command to history
+// POST /terminal/command_history
+router.post(
+  "/command_history",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { hostId, command } = req.body;
+
+    if (!isNonEmptyString(userId) || !hostId || !isNonEmptyString(command)) {
+      authLogger.warn("Invalid command history save request", {
+        operation: "command_history_save",
+        userId,
+        hasHostId: !!hostId,
+        hasCommand: !!command,
+      });
+      return res.status(400).json({ error: "Missing required parameters" });
+    }
+
+    try {
+      const insertData = {
+        userId,
+        hostId: parseInt(hostId, 10),
+        command: command.trim(),
+      };
+
+      const result = await db
+        .insert(commandHistory)
+        .values(insertData)
+        .returning();
+
+      res.status(201).json(result[0]);
+    } catch (err) {
+      authLogger.error("Failed to save command to history", err);
+      res.status(500).json({
+        error: err instanceof Error ? err.message : "Failed to save command",
+      });
+    }
+  },
+);
+
+// Get command history for a specific host
+// GET /terminal/command_history/:hostId
+router.get(
+  "/command_history/:hostId",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { hostId } = req.params;
+    const hostIdNum = parseInt(hostId, 10);
+
+    if (!isNonEmptyString(userId) || isNaN(hostIdNum)) {
+      authLogger.warn("Invalid command history fetch request", {
+        userId,
+        hostId: hostIdNum,
+      });
+      return res.status(400).json({ error: "Invalid request parameters" });
+    }
+
+    try {
+      const result = await db
+        .select({
+          command: commandHistory.command,
+          maxExecutedAt: sql<number>`MAX(${commandHistory.executedAt})`,
+        })
+        .from(commandHistory)
+        .where(
+          and(
+            eq(commandHistory.userId, userId),
+            eq(commandHistory.hostId, hostIdNum),
+          ),
+        )
+        .groupBy(commandHistory.command)
+        .orderBy(desc(sql`MAX(${commandHistory.executedAt})`))
+        .limit(500);
+
+      const uniqueCommands = result.map((r) => r.command);
+
+      res.json(uniqueCommands);
+    } catch (err) {
+      authLogger.error("Failed to fetch command history", err);
+      res.status(500).json({
+        error: err instanceof Error ? err.message : "Failed to fetch history",
+      });
+    }
+  },
+);
+
+// Delete a specific command from history
+// POST /terminal/command_history/delete
+router.post(
+  "/command_history/delete",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { hostId, command } = req.body;
+
+    if (!isNonEmptyString(userId) || !hostId || !isNonEmptyString(command)) {
+      authLogger.warn("Invalid command delete request", {
+        operation: "command_history_delete",
+        userId,
+        hasHostId: !!hostId,
+        hasCommand: !!command,
+      });
+      return res.status(400).json({ error: "Missing required parameters" });
+    }
+
+    try {
+      const hostIdNum = parseInt(hostId, 10);
+
+      await db
+        .delete(commandHistory)
+        .where(
+          and(
+            eq(commandHistory.userId, userId),
+            eq(commandHistory.hostId, hostIdNum),
+            eq(commandHistory.command, command.trim()),
+          ),
+        );
+
+      res.json({ success: true });
+    } catch (err) {
+      authLogger.error("Failed to delete command from history", err);
+      res.status(500).json({
+        error: err instanceof Error ? err.message : "Failed to delete command",
+      });
+    }
+  },
+);
+
+// Clear command history for a specific host (optional feature)
+// DELETE /terminal/command_history/:hostId
+router.delete(
+  "/command_history/:hostId",
+  authenticateJWT,
+  requireDataAccess,
+  async (req: Request, res: Response) => {
+    const userId = (req as AuthenticatedRequest).userId;
+    const { hostId } = req.params;
+    const hostIdNum = parseInt(hostId, 10);
+
+    if (!isNonEmptyString(userId) || isNaN(hostIdNum)) {
+      authLogger.warn("Invalid command history clear request");
+      return res.status(400).json({ error: "Invalid request" });
+    }
+
+    try {
+      await db
+        .delete(commandHistory)
+        .where(
+          and(
+            eq(commandHistory.userId, userId),
+            eq(commandHistory.hostId, hostIdNum),
+          ),
+        );
+
+      authLogger.success(`Command history cleared for host ${hostId}`, {
+        operation: "command_history_clear_success",
+        userId,
+        hostId: hostIdNum,
+      });
+
+      res.json({ success: true });
+    } catch (err) {
+      authLogger.error("Failed to clear command history", err);
+      res.status(500).json({
+        error: err instanceof Error ? err.message : "Failed to clear history",
+      });
+    }
+  },
+);
+
+export default router;
--- a/src/backend/database/routes/users.ts
+++ b/src/backend/database/routes/users.ts
@@ -22,11 +22,12 @@ import { nanoid } from "nanoid";
 import speakeasy from "speakeasy";
 import QRCode from "qrcode";
 import type { Request, Response } from "express";
-import { authLogger } from "../../utils/logger.js";
+import { authLogger, databaseLogger } from "../../utils/logger.js";
 import { AuthManager } from "../../utils/auth-manager.js";
 import { DataCrypto } from "../../utils/data-crypto.js";
 import { LazyFieldEncryption } from "../../utils/lazy-field-encryption.js";
 import { parseUserAgent } from "../../utils/user-agent-parser.js";
+import { loginRateLimiter } from "../../utils/login-rate-limiter.js";

 const authManager = AuthManager.getInstance();

@@ -226,6 +227,16 @@ router.post("/create", async (req, res) => {
      });
    }

+    try {
+      const { saveMemoryDatabaseToFile } = await import("../db/index.js");
+      await saveMemoryDatabaseToFile();
+    } catch (saveError) {
+      authLogger.error("Failed to persist user to disk", saveError, {
+        operation: "user_create_save_failed",
+        userId: id,
+      });
+    }
+
    authLogger.success(
      `Traditional user created: ${username} (is_admin: ${isFirstUser})`,
      {
@@ -587,6 +598,7 @@ router.get("/oidc/callback", async (req, res) => {
      method: "POST",
      headers: {
        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json",
      },
      body: new URLSearchParams({
        grant_type: "authorization_code",
@@ -736,12 +748,11 @@ router.get("/oidc/callback", async (req, res) => {
      });
    }

+    const deviceInfo = parseUserAgent(req);
    let user = await db
      .select()
      .from(users)
-      .where(
-        and(eq(users.is_oidc, true), eq(users.oidc_identifier, identifier)),
-      );
+      .where(eq(users.oidc_identifier, identifier));

    let isFirstUser = false;
    if (!user || user.length === 0) {
@@ -750,6 +761,43 @@ router.get("/oidc/callback", async (req, res) => {
        .get();
      isFirstUser = ((countResult as { count?: number })?.count || 0) === 0;

+      if (!isFirstUser) {
+        try {
+          const regRow = db.$client
+            .prepare(
+              "SELECT value FROM settings WHERE key = 'allow_registration'",
+            )
+            .get();
+          if (regRow && (regRow as Record<string, unknown>).value !== "true") {
+            authLogger.warn(
+              "OIDC user attempted to register when registration is disabled",
+              {
+                operation: "oidc_registration_disabled",
+                identifier,
+                name,
+              },
+            );
+
+            let frontendUrl = (redirectUri as string).replace(
+              "/users/oidc/callback",
+              "",
+            );
+            if (frontendUrl.includes("localhost")) {
+              frontendUrl = "http://localhost:5173";
+            }
+            const redirectUrl = new URL(frontendUrl);
+            redirectUrl.searchParams.set("error", "registration_disabled");
+
+            return res.redirect(redirectUrl.toString());
+          }
+        } catch (e) {
+          authLogger.warn("Failed to check registration status during OIDC", {
+            operation: "oidc_registration_check",
+            error: e,
+          });
+        }
+      }
+
      const id = nanoid();
      await db.insert(users).values({
        id,
@@ -769,7 +817,11 @@ router.get("/oidc/callback", async (req, res) => {
      });

      try {
-        await authManager.registerOIDCUser(id);
+        const sessionDurationMs =
+          deviceInfo.type === "desktop" || deviceInfo.type === "mobile"
+            ? 30 * 24 * 60 * 60 * 1000
+            : 7 * 24 * 60 * 60 * 1000;
+        await authManager.registerOIDCUser(id, sessionDurationMs);
      } catch (encryptionError) {
        await db.delete(users).where(eq(users.id, id));
        authLogger.error(
@@ -785,12 +837,27 @@ router.get("/oidc/callback", async (req, res) => {
        });
      }

+      try {
+        const { saveMemoryDatabaseToFile } = await import("../db/index.js");
+        await saveMemoryDatabaseToFile();
+      } catch (saveError) {
+        authLogger.error("Failed to persist OIDC user to disk", saveError, {
+          operation: "oidc_user_create_save_failed",
+          userId: id,
+        });
+      }
+
      user = await db.select().from(users).where(eq(users.id, id));
    } else {
-      await db
-        .update(users)
-        .set({ username: name })
-        .where(eq(users.id, user[0].id));
+      const isDualAuth =
+        user[0].password_hash && user[0].password_hash.trim() !== "";
+
+      if (!isDualAuth) {
+        await db
+          .update(users)
+          .set({ username: name })
+          .where(eq(users.id, user[0].id));
+      }

      user = await db.select().from(users).where(eq(users.id, user[0].id));
    }
@@ -798,7 +865,7 @@ router.get("/oidc/callback", async (req, res) => {
    const userRecord = user[0];

    try {
-      await authManager.authenticateOIDCUser(userRecord.id);
+      await authManager.authenticateOIDCUser(userRecord.id, deviceInfo.type);
    } catch (setupError) {
      authLogger.error("Failed to setup OIDC user encryption", setupError, {
        operation: "oidc_user_encryption_setup_failed",
@@ -806,7 +873,6 @@ router.get("/oidc/callback", async (req, res) => {
      });
    }

-    const deviceInfo = parseUserAgent(req);
    const token = await authManager.generateJWTToken(userRecord.id, {
      deviceType: deviceInfo.type,
      deviceInfo: deviceInfo.deviceInfo,
@@ -836,6 +902,8 @@ router.get("/oidc/callback", async (req, res) => {
        ? 30 * 24 * 60 * 60 * 1000
        : 7 * 24 * 60 * 60 * 1000;

+    res.clearCookie("jwt", authManager.getSecureCookieOptions(req));
+
    return res
      .cookie("jwt", token, authManager.getSecureCookieOptions(req, maxAge))
      .redirect(redirectUrl.toString());
@@ -862,6 +930,7 @@ router.get("/oidc/callback", async (req, res) => {
 // POST /users/login
 router.post("/login", async (req, res) => {
  const { username, password } = req.body;
+  const clientIp = req.ip || req.socket.remoteAddress || "unknown";

  if (!isNonEmptyString(username) || !isNonEmptyString(password)) {
    authLogger.warn("Invalid traditional login attempt", {
@@ -872,6 +941,20 @@ router.post("/login", async (req, res) => {
    return res.status(400).json({ error: "Invalid username or password" });
  }

+  const lockStatus = loginRateLimiter.isLocked(clientIp, username);
+  if (lockStatus.locked) {
+    authLogger.warn("Login attempt blocked due to rate limiting", {
+      operation: "user_login_blocked",
+      username,
+      ip: clientIp,
+      remainingTime: lockStatus.remainingTime,
+    });
+    return res.status(429).json({
+      error: "Too many login attempts. Please try again later.",
+      remainingTime: lockStatus.remainingTime,
+    });
+  }
+
  try {
    const row = db.$client
      .prepare("SELECT value FROM settings WHERE key = 'allow_password_login'")
@@ -896,17 +979,26 @@ router.post("/login", async (req, res) => {
      .where(eq(users.username, username));

    if (!user || user.length === 0) {
-      authLogger.warn(`User not found: ${username}`, {
+      loginRateLimiter.recordFailedAttempt(clientIp, username);
+      authLogger.warn(`Login failed: user not found`, {
        operation: "user_login",
        username,
+        ip: clientIp,
+        remainingAttempts: loginRateLimiter.getRemainingAttempts(
+          clientIp,
+          username,
+        ),
      });
-      return res.status(404).json({ error: "User not found" });
+      return res.status(401).json({ error: "Invalid username or password" });
    }

    const userRecord = user[0];

-    if (userRecord.is_oidc) {
-      authLogger.warn("OIDC user attempted traditional login", {
+    if (
+      userRecord.is_oidc &&
+      (!userRecord.password_hash || userRecord.password_hash.trim() === "")
+    ) {
+      authLogger.warn("OIDC-only user attempted traditional login", {
        operation: "user_login",
        username,
        userId: userRecord.id,
@@ -918,12 +1010,18 @@ router.post("/login", async (req, res) => {

    const isMatch = await bcrypt.compare(password, userRecord.password_hash);
    if (!isMatch) {
-      authLogger.warn(`Incorrect password for user: ${username}`, {
+      loginRateLimiter.recordFailedAttempt(clientIp, username);
+      authLogger.warn(`Login failed: incorrect password`, {
        operation: "user_login",
        username,
        userId: userRecord.id,
+        ip: clientIp,
+        remainingAttempts: loginRateLimiter.getRemainingAttempts(
+          clientIp,
+          username,
+        ),
      });
-      return res.status(401).json({ error: "Incorrect password" });
+      return res.status(401).json({ error: "Invalid username or password" });
    }

    try {
@@ -935,12 +1033,24 @@ router.post("/login", async (req, res) => {
      if (kekSalt.length === 0) {
        await authManager.registerUser(userRecord.id, password);
      }
-    } catch {}
+    } catch (error) {}
+
+    const deviceInfo = parseUserAgent(req);
+
+    let dataUnlocked = false;
+    if (userRecord.is_oidc) {
+      dataUnlocked = await authManager.authenticateOIDCUser(
+        userRecord.id,
+        deviceInfo.type,
+      );
+    } else {
+      dataUnlocked = await authManager.authenticateUser(
+        userRecord.id,
+        password,
+        deviceInfo.type,
+      );
+    }

-    const dataUnlocked = await authManager.authenticateUser(
-      userRecord.id,
-      password,
-    );
    if (!dataUnlocked) {
      return res.status(401).json({ error: "Incorrect password" });
    }
@@ -957,12 +1067,13 @@ router.post("/login", async (req, res) => {
      });
    }

-    const deviceInfo = parseUserAgent(req);
    const token = await authManager.generateJWTToken(userRecord.id, {
      deviceType: deviceInfo.type,
      deviceInfo: deviceInfo.deviceInfo,
    });

+    loginRateLimiter.resetAttempts(clientIp, username);
+
    authLogger.success(`User logged in successfully: ${username}`, {
      operation: "user_login_success",
      username,
@@ -970,6 +1081,7 @@ router.post("/login", async (req, res) => {
      dataUnlocked: true,
      deviceType: deviceInfo.type,
      deviceInfo: deviceInfo.deviceInfo,
+      ip: clientIp,
    });

    const response: Record<string, unknown> = {
@@ -1016,7 +1128,15 @@ router.post("/logout", authenticateJWT, async (req, res) => {
        try {
          const payload = await authManager.verifyJWTToken(token);
          sessionId = payload?.sessionId;
-        } catch (error) {}
+        } catch (error) {
+          authLogger.debug(
+            "Token verification failed during logout (expected if token expired)",
+            {
+              operation: "logout_token_verify_failed",
+              userId,
+            },
+          );
+        }
      }

      await authManager.logoutUser(userId, sessionId);
@@ -1052,11 +1172,17 @@ router.get("/me", authenticateJWT, async (req: Request, res: Response) => {
      return res.status(401).json({ error: "User not found" });
    }

+    const hasPassword =
+      user[0].password_hash && user[0].password_hash.trim() !== "";
+    const hasOidc = user[0].is_oidc && user[0].oidc_identifier;
+    const isDualAuth = hasPassword && hasOidc;
+
    res.json({
      userId: user[0].id,
      username: user[0].username,
      is_admin: !!user[0].is_admin,
      is_oidc: !!user[0].is_oidc,
+      is_dual_auth: isDualAuth,
      totp_enabled: !!user[0].totp_enabled,
    });
  } catch (err) {
@@ -1610,6 +1736,7 @@ router.get("/list", authenticateJWT, async (req, res) => {
        username: users.username,
        is_admin: users.is_admin,
        is_oidc: users.is_oidc,
+        password_hash: users.password_hash,
      })
      .from(users);

@@ -1653,6 +1780,16 @@ router.post("/make-admin", authenticateJWT, async (req, res) => {
      .set({ is_admin: true })
      .where(eq(users.username, username));

+    try {
+      const { saveMemoryDatabaseToFile } = await import("../db/index.js");
+      await saveMemoryDatabaseToFile();
+    } catch (saveError) {
+      authLogger.error("Failed to persist admin promotion to disk", saveError, {
+        operation: "make_admin_save_failed",
+        username,
+      });
+    }
+
    authLogger.success(
      `User ${username} made admin by ${adminUser[0].username}`,
    );
@@ -1702,6 +1839,16 @@ router.post("/remove-admin", authenticateJWT, async (req, res) => {
      .set({ is_admin: false })
      .where(eq(users.username, username));

+    try {
+      const { saveMemoryDatabaseToFile } = await import("../db/index.js");
+      await saveMemoryDatabaseToFile();
+    } catch (saveError) {
+      authLogger.error("Failed to persist admin removal to disk", saveError, {
+        operation: "remove_admin_save_failed",
+        username,
+      });
+    }
+
    authLogger.success(
      `Admin status removed from ${username} by ${adminUser[0].username}`,
    );
@@ -2106,7 +2253,6 @@ router.delete("/delete-user", authenticateJWT, async (req, res) => {
    const targetUserId = targetUser[0].id;

    try {
-      // Delete all user-related data to avoid foreign key constraints
      await db
        .delete(sshCredentialUsage)
        .where(eq(sshCredentialUsage.userId, targetUserId));
@@ -2426,4 +2572,295 @@ router.post("/sessions/revoke-all", authenticateJWT, async (req, res) => {
  }
 });

+// Route: Link OIDC user to existing password account (merge accounts)
+// POST /users/link-oidc-to-password
+router.post("/link-oidc-to-password", authenticateJWT, async (req, res) => {
+  const adminUserId = (req as AuthenticatedRequest).userId;
+  const { oidcUserId, targetUsername } = req.body;
+
+  if (!isNonEmptyString(oidcUserId) || !isNonEmptyString(targetUsername)) {
+    return res.status(400).json({
+      error: "OIDC user ID and target username are required",
+    });
+  }
+
+  try {
+    const adminUser = await db
+      .select()
+      .from(users)
+      .where(eq(users.id, adminUserId));
+    if (!adminUser || adminUser.length === 0 || !adminUser[0].is_admin) {
+      return res.status(403).json({ error: "Admin access required" });
+    }
+
+    const oidcUserRecords = await db
+      .select()
+      .from(users)
+      .where(eq(users.id, oidcUserId));
+    if (!oidcUserRecords || oidcUserRecords.length === 0) {
+      return res.status(404).json({ error: "OIDC user not found" });
+    }
+
+    const oidcUser = oidcUserRecords[0];
+
+    if (!oidcUser.is_oidc) {
+      return res.status(400).json({
+        error: "Source user is not an OIDC user",
+      });
+    }
+
+    const targetUserRecords = await db
+      .select()
+      .from(users)
+      .where(eq(users.username, targetUsername));
+    if (!targetUserRecords || targetUserRecords.length === 0) {
+      return res.status(404).json({ error: "Target password user not found" });
+    }
+
+    const targetUser = targetUserRecords[0];
+
+    if (targetUser.is_oidc || !targetUser.password_hash) {
+      return res.status(400).json({
+        error: "Target user must be a password-based account",
+      });
+    }
+
+    if (targetUser.client_id && targetUser.oidc_identifier) {
+      return res.status(400).json({
+        error: "Target user already has OIDC authentication configured",
+      });
+    }
+
+    authLogger.info("Linking OIDC user to password account", {
+      operation: "link_oidc_to_password",
+      oidcUserId,
+      oidcUsername: oidcUser.username,
+      targetUserId: targetUser.id,
+      targetUsername: targetUser.username,
+      adminUserId,
+    });
+
+    await db
+      .update(users)
+      .set({
+        is_oidc: true,
+        oidc_identifier: oidcUser.oidc_identifier,
+        client_id: oidcUser.client_id,
+        client_secret: oidcUser.client_secret,
+        issuer_url: oidcUser.issuer_url,
+        authorization_url: oidcUser.authorization_url,
+        token_url: oidcUser.token_url,
+        identifier_path: oidcUser.identifier_path,
+        name_path: oidcUser.name_path,
+        scopes: oidcUser.scopes || "openid email profile",
+      })
+      .where(eq(users.id, targetUser.id));
+
+    try {
+      await authManager.convertToOIDCEncryption(targetUser.id);
+    } catch (encryptionError) {
+      authLogger.error(
+        "Failed to convert encryption to OIDC during linking",
+        encryptionError,
+        {
+          operation: "link_convert_encryption_failed",
+          userId: targetUser.id,
+        },
+      );
+      await db
+        .update(users)
+        .set({
+          is_oidc: false,
+          oidc_identifier: null,
+          client_id: "",
+          client_secret: "",
+          issuer_url: "",
+          authorization_url: "",
+          token_url: "",
+          identifier_path: "",
+          name_path: "",
+          scopes: "openid email profile",
+        })
+        .where(eq(users.id, targetUser.id));
+
+      return res.status(500).json({
+        error:
+          "Failed to convert encryption for dual-auth. Please ensure the password account has encryption setup.",
+        details:
+          encryptionError instanceof Error
+            ? encryptionError.message
+            : "Unknown error",
+      });
+    }
+
+    await authManager.revokeAllUserSessions(oidcUserId);
+    authManager.logoutUser(oidcUserId);
+
+    await db
+      .delete(recentActivity)
+      .where(eq(recentActivity.userId, oidcUserId));
+
+    await db.delete(users).where(eq(users.id, oidcUserId));
+
+    db.$client
+      .prepare("DELETE FROM settings WHERE key LIKE ?")
+      .run(`user_%_${oidcUserId}`);
+
+    try {
+      const { saveMemoryDatabaseToFile } = await import("../db/index.js");
+      await saveMemoryDatabaseToFile();
+    } catch (saveError) {
+      authLogger.error("Failed to persist account linking to disk", saveError, {
+        operation: "link_oidc_save_failed",
+        oidcUserId,
+        targetUserId: targetUser.id,
+      });
+    }
+
+    authLogger.success(
+      `OIDC user ${oidcUser.username} linked to password account ${targetUser.username}`,
+      {
+        operation: "link_oidc_to_password_success",
+        oidcUserId,
+        oidcUsername: oidcUser.username,
+        targetUserId: targetUser.id,
+        targetUsername: targetUser.username,
+        adminUserId,
+      },
+    );
+
+    res.json({
+      success: true,
+      message: `OIDC user ${oidcUser.username} has been linked to ${targetUser.username}. The password account can now use both password and OIDC login.`,
+    });
+  } catch (err) {
+    authLogger.error("Failed to link OIDC user to password account", err, {
+      operation: "link_oidc_to_password_failed",
+      oidcUserId,
+      targetUsername,
+      adminUserId,
+    });
+    res.status(500).json({
+      error: "Failed to link accounts",
+      details: err instanceof Error ? err.message : "Unknown error",
+    });
+  }
+});
+
+// Route: Unlink OIDC from password account (admin only)
+// POST /users/unlink-oidc-from-password
+router.post("/unlink-oidc-from-password", authenticateJWT, async (req, res) => {
+  const adminUserId = (req as AuthenticatedRequest).userId;
+  const { userId } = req.body;
+
+  if (!userId) {
+    return res.status(400).json({
+      error: "User ID is required",
+    });
+  }
+
+  try {
+    const adminUser = await db
+      .select()
+      .from(users)
+      .where(eq(users.id, adminUserId));
+
+    if (!adminUser || adminUser.length === 0 || !adminUser[0].is_admin) {
+      authLogger.warn("Non-admin attempted to unlink OIDC from password", {
+        operation: "unlink_oidc_unauthorized",
+        adminUserId,
+        targetUserId: userId,
+      });
+      return res.status(403).json({
+        error: "Admin privileges required",
+      });
+    }
+
+    const targetUserRecords = await db
+      .select()
+      .from(users)
+      .where(eq(users.id, userId));
+
+    if (!targetUserRecords || targetUserRecords.length === 0) {
+      return res.status(404).json({
+        error: "User not found",
+      });
+    }
+
+    const targetUser = targetUserRecords[0];
+
+    if (!targetUser.is_oidc) {
+      return res.status(400).json({
+        error: "User does not have OIDC authentication enabled",
+      });
+    }
+
+    if (!targetUser.password_hash || targetUser.password_hash === "") {
+      return res.status(400).json({
+        error:
+          "Cannot unlink OIDC from a user without password authentication. This would leave the user unable to login.",
+      });
+    }
+
+    authLogger.info("Unlinking OIDC from password account", {
+      operation: "unlink_oidc_from_password_start",
+      targetUserId: targetUser.id,
+      targetUsername: targetUser.username,
+      adminUserId,
+    });
+
+    await db
+      .update(users)
+      .set({
+        is_oidc: false,
+        oidc_identifier: null,
+        client_id: "",
+        client_secret: "",
+        issuer_url: "",
+        authorization_url: "",
+        token_url: "",
+        identifier_path: "",
+        name_path: "",
+        scopes: "openid email profile",
+      })
+      .where(eq(users.id, targetUser.id));
+
+    try {
+      const { saveMemoryDatabaseToFile } = await import("../db/index.js");
+      await saveMemoryDatabaseToFile();
+    } catch (saveError) {
+      authLogger.error(
+        "Failed to save database after unlinking OIDC",
+        saveError,
+        {
+          operation: "unlink_oidc_save_failed",
+          targetUserId: targetUser.id,
+        },
+      );
+    }
+
+    authLogger.success("OIDC unlinked from password account successfully", {
+      operation: "unlink_oidc_from_password_success",
+      targetUserId: targetUser.id,
+      targetUsername: targetUser.username,
+      adminUserId,
+    });
+
+    res.json({
+      success: true,
+      message: `OIDC authentication has been removed from ${targetUser.username}. User can now only login with password.`,
+    });
+  } catch (err) {
+    authLogger.error("Failed to unlink OIDC from password account", err, {
+      operation: "unlink_oidc_from_password_failed",
+      targetUserId: userId,
+      adminUserId,
+    });
+    res.status(500).json({
+      error: "Failed to unlink OIDC",
+      details: err instanceof Error ? err.message : "Unknown error",
+    });
+  }
+});
+
 export default router;
--- a/src/backend/ssh/file-manager.ts
+++ b/src/backend/ssh/file-manager.ts
@@ -6,7 +6,7 @@ import { Client as SSHClient } from "ssh2";
 import { getDb } from "../database/db/index.js";
 import { sshCredentials, sshData } from "../database/db/schema.js";
 import { eq, and } from "drizzle-orm";
-import { fileLogger } from "../utils/logger.js";
+import { fileLogger, sshLogger } from "../utils/logger.js";
 import { SimpleDBOps } from "../utils/simple-db-ops.js";
 import { AuthManager } from "../utils/auth-manager.js";
 import type { AuthenticatedRequest } from "../../types/index.js";
@@ -89,11 +89,179 @@ app.use(express.raw({ limit: "5gb", type: "application/octet-stream" }));
 const authManager = AuthManager.getInstance();
 app.use(authManager.createAuthMiddleware());

+async function resolveJumpHost(
+  hostId: number,
+  userId: string,
+): Promise<any | null> {
+  try {
+    const hosts = await SimpleDBOps.select(
+      getDb()
+        .select()
+        .from(sshData)
+        .where(and(eq(sshData.id, hostId), eq(sshData.userId, userId))),
+      "ssh_data",
+      userId,
+    );
+
+    if (hosts.length === 0) {
+      return null;
+    }
+
+    const host = hosts[0];
+
+    if (host.credentialId) {
+      const credentials = await SimpleDBOps.select(
+        getDb()
+          .select()
+          .from(sshCredentials)
+          .where(
+            and(
+              eq(sshCredentials.id, host.credentialId as number),
+              eq(sshCredentials.userId, userId),
+            ),
+          ),
+        "ssh_credentials",
+        userId,
+      );
+
+      if (credentials.length > 0) {
+        const credential = credentials[0];
+        return {
+          ...host,
+          password: credential.password,
+          key:
+            credential.private_key || credential.privateKey || credential.key,
+          keyPassword: credential.key_password || credential.keyPassword,
+          keyType: credential.key_type || credential.keyType,
+          authType: credential.auth_type || credential.authType,
+        };
+      }
+    }
+
+    return host;
+  } catch (error) {
+    fileLogger.error("Failed to resolve jump host", error, {
+      operation: "resolve_jump_host",
+      hostId,
+      userId,
+    });
+    return null;
+  }
+}
+
+async function createJumpHostChain(
+  jumpHosts: Array<{ hostId: number }>,
+  userId: string,
+): Promise<SSHClient | null> {
+  if (!jumpHosts || jumpHosts.length === 0) {
+    return null;
+  }
+
+  let currentClient: SSHClient | null = null;
+  const clients: SSHClient[] = [];
+
+  try {
+    for (let i = 0; i < jumpHosts.length; i++) {
+      const jumpHostConfig = await resolveJumpHost(jumpHosts[i].hostId, userId);
+
+      if (!jumpHostConfig) {
+        fileLogger.error(`Jump host ${i + 1} not found`, undefined, {
+          operation: "jump_host_chain",
+          hostId: jumpHosts[i].hostId,
+        });
+        clients.forEach((c) => c.end());
+        return null;
+      }
+
+      const jumpClient = new SSHClient();
+      clients.push(jumpClient);
+
+      const connected = await new Promise<boolean>((resolve) => {
+        const timeout = setTimeout(() => {
+          resolve(false);
+        }, 30000);
+
+        jumpClient.on("ready", () => {
+          clearTimeout(timeout);
+          resolve(true);
+        });
+
+        jumpClient.on("error", (err) => {
+          clearTimeout(timeout);
+          fileLogger.error(`Jump host ${i + 1} connection failed`, err, {
+            operation: "jump_host_connect",
+            hostId: jumpHostConfig.id,
+            ip: jumpHostConfig.ip,
+          });
+          resolve(false);
+        });
+
+        const connectConfig: any = {
+          host: jumpHostConfig.ip,
+          port: jumpHostConfig.port || 22,
+          username: jumpHostConfig.username,
+          tryKeyboard: true,
+          readyTimeout: 30000,
+        };
+
+        if (jumpHostConfig.authType === "password" && jumpHostConfig.password) {
+          connectConfig.password = jumpHostConfig.password;
+        } else if (jumpHostConfig.authType === "key" && jumpHostConfig.key) {
+          const cleanKey = jumpHostConfig.key
+            .trim()
+            .replace(/\r\n/g, "\n")
+            .replace(/\r/g, "\n");
+          connectConfig.privateKey = Buffer.from(cleanKey, "utf8");
+          if (jumpHostConfig.keyPassword) {
+            connectConfig.passphrase = jumpHostConfig.keyPassword;
+          }
+        }
+
+        if (currentClient) {
+          currentClient.forwardOut(
+            "127.0.0.1",
+            0,
+            jumpHostConfig.ip,
+            jumpHostConfig.port || 22,
+            (err, stream) => {
+              if (err) {
+                clearTimeout(timeout);
+                resolve(false);
+                return;
+              }
+              connectConfig.sock = stream;
+              jumpClient.connect(connectConfig);
+            },
+          );
+        } else {
+          jumpClient.connect(connectConfig);
+        }
+      });
+
+      if (!connected) {
+        clients.forEach((c) => c.end());
+        return null;
+      }
+
+      currentClient = jumpClient;
+    }
+
+    return currentClient;
+  } catch (error) {
+    fileLogger.error("Failed to create jump host chain", error, {
+      operation: "jump_host_chain",
+    });
+    clients.forEach((c) => c.end());
+    return null;
+  }
+}
+
 interface SSHSession {
  client: SSHClient;
  isConnected: boolean;
  lastActive: number;
  timeout?: NodeJS.Timeout;
+  activeOperations: number;
 }

 interface PendingTOTPSession {
@@ -118,9 +286,22 @@ const pendingTOTPSessions: Record<string, PendingTOTPSession> = {};
 function cleanupSession(sessionId: string) {
  const session = sshSessions[sessionId];
  if (session) {
+    if (session.activeOperations > 0) {
+      fileLogger.warn(
+        `Deferring session cleanup for ${sessionId} - ${session.activeOperations} active operations`,
+        {
+          operation: "cleanup_deferred",
+          sessionId,
+          activeOperations: session.activeOperations,
+        },
+      );
+      scheduleSessionCleanup(sessionId);
+      return;
+    }
+
    try {
      session.client.end();
-    } catch {}
+    } catch (error) {}
    clearTimeout(session.timeout);
    delete sshSessions[sessionId];
  }
@@ -174,6 +355,7 @@ app.post("/ssh/file_manager/ssh/connect", async (req, res) => {
    credentialId,
    userProvidedPassword,
    forceKeyboardInteractive,
+    jumpHosts,
  } = req.body;

  const userId = (req as AuthenticatedRequest).userId;
@@ -393,6 +575,7 @@ app.post("/ssh/file_manager/ssh/connect", async (req, res) => {
      client,
      isConnected: true,
      lastActive: Date.now(),
+      activeOperations: 0,
    };
    scheduleSessionCleanup(sessionId);
    res.json({ status: "success", message: "SSH connection established" });
@@ -625,7 +808,52 @@ app.post("/ssh/file_manager/ssh/connect", async (req, res) => {
    },
  );

-  client.connect(config);
+  if (jumpHosts && jumpHosts.length > 0 && userId) {
+    try {
+      const jumpClient = await createJumpHostChain(jumpHosts, userId);
+
+      if (!jumpClient) {
+        fileLogger.error("Failed to establish jump host chain", {
+          operation: "file_jump_chain",
+          sessionId,
+          hostId,
+        });
+        return res
+          .status(500)
+          .json({ error: "Failed to connect through jump hosts" });
+      }
+
+      jumpClient.forwardOut("127.0.0.1", 0, ip, port, (err, stream) => {
+        if (err) {
+          fileLogger.error("Failed to forward through jump host", err, {
+            operation: "file_jump_forward",
+            sessionId,
+            hostId,
+            ip,
+            port,
+          });
+          jumpClient.end();
+          return res.status(500).json({
+            error: "Failed to forward through jump host: " + err.message,
+          });
+        }
+
+        config.sock = stream;
+        client.connect(config);
+      });
+    } catch (error) {
+      fileLogger.error("Jump host error", error, {
+        operation: "file_jump_host",
+        sessionId,
+        hostId,
+      });
+      return res
+        .status(500)
+        .json({ error: "Failed to connect through jump hosts" });
+    }
+  } else {
+    client.connect(config);
+  }
 });

 app.post("/ssh/file_manager/ssh/connect-totp", async (req, res) => {
@@ -663,7 +891,9 @@ app.post("/ssh/file_manager/ssh/connect-totp", async (req, res) => {
    delete pendingTOTPSessions[sessionId];
    try {
      session.client.end();
-    } catch {}
+    } catch (error) {
+      sshLogger.debug("Operation failed, continuing", { error });
+    }
    fileLogger.warn("TOTP session timeout before code submission", {
      operation: "file_totp_verify",
      sessionId,
@@ -700,6 +930,7 @@ app.post("/ssh/file_manager/ssh/connect-totp", async (req, res) => {
        client: session.client,
        isConnected: true,
        lastActive: Date.now(),
+        activeOperations: 0,
      };
      scheduleSessionCleanup(sessionId);

@@ -843,10 +1074,12 @@ app.get("/ssh/file_manager/ssh/listFiles", (req, res) => {
  }

  sshConn.lastActive = Date.now();
+  sshConn.activeOperations++;

  const escapedPath = sshPath.replace(/'/g, "'\"'\"'");
-  sshConn.client.exec(`ls -la '${escapedPath}'`, (err, stream) => {
+  sshConn.client.exec(`command ls -la '${escapedPath}'`, (err, stream) => {
    if (err) {
+      sshConn.activeOperations--;
      fileLogger.error("SSH listFiles error:", err);
      return res.status(500).json({ error: err.message });
    }
@@ -863,6 +1096,7 @@ app.get("/ssh/file_manager/ssh/listFiles", (req, res) => {
    });

    stream.on("close", (code) => {
+      sshConn.activeOperations--;
      if (code !== 0) {
        fileLogger.error(
          `SSH listFiles command failed with code ${code}: ${errorData.replace(/\n/g, " ").trim()}`,
@@ -2486,6 +2720,516 @@ app.post("/ssh/file_manager/ssh/executeFile", async (req, res) => {
  });
 });

+app.post("/ssh/file_manager/ssh/changePermissions", async (req, res) => {
+  const { sessionId, path, permissions } = req.body;
+  const sshConn = sshSessions[sessionId];
+
+  if (!sshConn || !sshConn.isConnected) {
+    fileLogger.error(
+      "SSH connection not found or not connected for changePermissions",
+      {
+        operation: "change_permissions",
+        sessionId,
+        hasConnection: !!sshConn,
+        isConnected: sshConn?.isConnected,
+      },
+    );
+    return res.status(400).json({ error: "SSH connection not available" });
+  }
+
+  if (!path) {
+    return res.status(400).json({ error: "File path is required" });
+  }
+
+  if (!permissions || !/^\d{3,4}$/.test(permissions)) {
+    return res.status(400).json({
+      error: "Valid permissions required (e.g., 755, 644)",
+    });
+  }
+
+  sshConn.lastActive = Date.now();
+  scheduleSessionCleanup(sessionId);
+
+  const octalPerms = permissions.slice(-3);
+  const escapedPath = path.replace(/'/g, "'\"'\"'");
+  const command = `chmod ${octalPerms} '${escapedPath}' && echo "SUCCESS"`;
+
+  fileLogger.info("Changing file permissions", {
+    operation: "change_permissions",
+    sessionId,
+    path,
+    permissions: octalPerms,
+  });
+
+  const commandTimeout = setTimeout(() => {
+    if (!res.headersSent) {
+      fileLogger.error("changePermissions command timeout", {
+        operation: "change_permissions",
+        sessionId,
+        path,
+        permissions: octalPerms,
+      });
+      res.status(408).json({
+        error: "Permission change timed out. SSH connection may be unstable.",
+      });
+    }
+  }, 10000);
+
+  sshConn.client.exec(command, (err, stream) => {
+    if (err) {
+      clearTimeout(commandTimeout);
+      fileLogger.error("SSH changePermissions exec error:", err, {
+        operation: "change_permissions",
+        sessionId,
+        path,
+        permissions: octalPerms,
+      });
+      if (!res.headersSent) {
+        return res.status(500).json({ error: "Failed to change permissions" });
+      }
+      return;
+    }
+
+    let outputData = "";
+    let errorOutput = "";
+
+    stream.on("data", (chunk: Buffer) => {
+      outputData += chunk.toString();
+    });
+
+    stream.stderr.on("data", (data: Buffer) => {
+      errorOutput += data.toString();
+    });
+
+    stream.on("close", (code) => {
+      clearTimeout(commandTimeout);
+
+      if (outputData.includes("SUCCESS")) {
+        fileLogger.success("File permissions changed successfully", {
+          operation: "change_permissions",
+          sessionId,
+          path,
+          permissions: octalPerms,
+        });
+
+        if (!res.headersSent) {
+          res.json({
+            success: true,
+            message: "Permissions changed successfully",
+          });
+        }
+        return;
+      }
+
+      if (code !== 0) {
+        fileLogger.error("chmod command failed", {
+          operation: "change_permissions",
+          sessionId,
+          path,
+          permissions: octalPerms,
+          exitCode: code,
+          error: errorOutput,
+        });
+        if (!res.headersSent) {
+          return res.status(500).json({
+            error: errorOutput || "Failed to change permissions",
+          });
+        }
+        return;
+      }
+
+      fileLogger.success("File permissions changed successfully", {
+        operation: "change_permissions",
+        sessionId,
+        path,
+        permissions: octalPerms,
+      });
+
+      if (!res.headersSent) {
+        res.json({
+          success: true,
+          message: "Permissions changed successfully",
+        });
+      }
+    });
+
+    stream.on("error", (streamErr) => {
+      clearTimeout(commandTimeout);
+      fileLogger.error("SSH changePermissions stream error:", streamErr, {
+        operation: "change_permissions",
+        sessionId,
+        path,
+        permissions: octalPerms,
+      });
+      if (!res.headersSent) {
+        res
+          .status(500)
+          .json({ error: "Stream error while changing permissions" });
+      }
+    });
+  });
+});
+
+// Route: Extract archive file (requires JWT)
+// POST /ssh/file_manager/ssh/extractArchive
+app.post("/ssh/file_manager/ssh/extractArchive", async (req, res) => {
+  const { sessionId, archivePath, extractPath } = req.body;
+
+  if (!sessionId || !archivePath) {
+    return res.status(400).json({ error: "Missing required parameters" });
+  }
+
+  const session = sshSessions[sessionId];
+  if (!session || !session.isConnected) {
+    return res.status(400).json({ error: "SSH session not connected" });
+  }
+
+  session.lastActive = Date.now();
+  scheduleSessionCleanup(sessionId);
+
+  const fileName = archivePath.split("/").pop() || "";
+  const fileExt = fileName.toLowerCase();
+
+  let extractCommand = "";
+  const targetPath =
+    extractPath || archivePath.substring(0, archivePath.lastIndexOf("/"));
+
+  if (fileExt.endsWith(".tar.gz") || fileExt.endsWith(".tgz")) {
+    extractCommand = `tar -xzf "${archivePath}" -C "${targetPath}"`;
+  } else if (fileExt.endsWith(".tar.bz2") || fileExt.endsWith(".tbz2")) {
+    extractCommand = `tar -xjf "${archivePath}" -C "${targetPath}"`;
+  } else if (fileExt.endsWith(".tar.xz")) {
+    extractCommand = `tar -xJf "${archivePath}" -C "${targetPath}"`;
+  } else if (fileExt.endsWith(".tar")) {
+    extractCommand = `tar -xf "${archivePath}" -C "${targetPath}"`;
+  } else if (fileExt.endsWith(".zip")) {
+    extractCommand = `unzip -o "${archivePath}" -d "${targetPath}"`;
+  } else if (fileExt.endsWith(".gz") && !fileExt.endsWith(".tar.gz")) {
+    extractCommand = `gunzip -c "${archivePath}" > "${archivePath.replace(/\.gz$/, "")}"`;
+  } else if (fileExt.endsWith(".bz2") && !fileExt.endsWith(".tar.bz2")) {
+    extractCommand = `bunzip2 -k "${archivePath}"`;
+  } else if (fileExt.endsWith(".xz") && !fileExt.endsWith(".tar.xz")) {
+    extractCommand = `unxz -k "${archivePath}"`;
+  } else if (fileExt.endsWith(".7z")) {
+    extractCommand = `7z x "${archivePath}" -o"${targetPath}"`;
+  } else if (fileExt.endsWith(".rar")) {
+    extractCommand = `unrar x "${archivePath}" "${targetPath}/"`;
+  } else {
+    return res.status(400).json({ error: "Unsupported archive format" });
+  }
+
+  fileLogger.info("Extracting archive", {
+    operation: "extract_archive",
+    sessionId,
+    archivePath,
+    extractPath: targetPath,
+    command: extractCommand,
+  });
+
+  session.client.exec(extractCommand, (err, stream) => {
+    if (err) {
+      fileLogger.error("SSH exec error during extract:", err, {
+        operation: "extract_archive",
+        sessionId,
+        archivePath,
+      });
+      return res
+        .status(500)
+        .json({ error: "Failed to execute extract command" });
+    }
+
+    let errorOutput = "";
+
+    stream.on("data", (data: Buffer) => {
+      fileLogger.debug("Extract stdout", {
+        operation: "extract_archive",
+        sessionId,
+        output: data.toString(),
+      });
+    });
+
+    stream.stderr.on("data", (data: Buffer) => {
+      errorOutput += data.toString();
+      fileLogger.debug("Extract stderr", {
+        operation: "extract_archive",
+        sessionId,
+        error: data.toString(),
+      });
+    });
+
+    stream.on("close", (code: number) => {
+      if (code !== 0) {
+        fileLogger.error("Extract command failed", {
+          operation: "extract_archive",
+          sessionId,
+          archivePath,
+          exitCode: code,
+          error: errorOutput,
+        });
+
+        let friendlyError = errorOutput || "Failed to extract archive";
+        if (
+          errorOutput.includes("command not found") ||
+          errorOutput.includes("not found")
+        ) {
+          let missingCmd = "";
+          let installHint = "";
+
+          if (fileExt.endsWith(".zip")) {
+            missingCmd = "unzip";
+            installHint =
+              "apt install unzip / yum install unzip / brew install unzip";
+          } else if (
+            fileExt.endsWith(".tar.gz") ||
+            fileExt.endsWith(".tgz") ||
+            fileExt.endsWith(".tar.bz2") ||
+            fileExt.endsWith(".tbz2") ||
+            fileExt.endsWith(".tar.xz") ||
+            fileExt.endsWith(".tar")
+          ) {
+            missingCmd = "tar";
+            installHint = "Usually pre-installed on Linux/Unix systems";
+          } else if (fileExt.endsWith(".gz")) {
+            missingCmd = "gunzip";
+            installHint =
+              "apt install gzip / yum install gzip / Usually pre-installed";
+          } else if (fileExt.endsWith(".bz2")) {
+            missingCmd = "bunzip2";
+            installHint =
+              "apt install bzip2 / yum install bzip2 / brew install bzip2";
+          } else if (fileExt.endsWith(".xz")) {
+            missingCmd = "unxz";
+            installHint =
+              "apt install xz-utils / yum install xz / brew install xz";
+          } else if (fileExt.endsWith(".7z")) {
+            missingCmd = "7z";
+            installHint =
+              "apt install p7zip-full / yum install p7zip / brew install p7zip";
+          } else if (fileExt.endsWith(".rar")) {
+            missingCmd = "unrar";
+            installHint =
+              "apt install unrar / yum install unrar / brew install unrar";
+          }
+
+          if (missingCmd) {
+            friendlyError = `Command '${missingCmd}' not found on remote server. Please install it first: ${installHint}`;
+          }
+        }
+
+        return res.status(500).json({ error: friendlyError });
+      }
+
+      fileLogger.success("Archive extracted successfully", {
+        operation: "extract_archive",
+        sessionId,
+        archivePath,
+        extractPath: targetPath,
+      });
+
+      res.json({
+        success: true,
+        message: "Archive extracted successfully",
+        extractPath: targetPath,
+      });
+    });
+
+    stream.on("error", (streamErr) => {
+      fileLogger.error("SSH extractArchive stream error:", streamErr, {
+        operation: "extract_archive",
+        sessionId,
+        archivePath,
+      });
+      if (!res.headersSent) {
+        res
+          .status(500)
+          .json({ error: "Stream error while extracting archive" });
+      }
+    });
+  });
+});
+
+// Route: Compress files/folders (requires JWT)
+// POST /ssh/file_manager/ssh/compressFiles
+app.post("/ssh/file_manager/ssh/compressFiles", async (req, res) => {
+  const { sessionId, paths, archiveName, format } = req.body;
+
+  if (
+    !sessionId ||
+    !paths ||
+    !Array.isArray(paths) ||
+    paths.length === 0 ||
+    !archiveName
+  ) {
+    return res.status(400).json({ error: "Missing required parameters" });
+  }
+
+  const session = sshSessions[sessionId];
+  if (!session || !session.isConnected) {
+    return res.status(400).json({ error: "SSH session not connected" });
+  }
+
+  session.lastActive = Date.now();
+  scheduleSessionCleanup(sessionId);
+
+  const compressionFormat = format || "zip";
+  let compressCommand = "";
+
+  const firstPath = paths[0];
+  const workingDir = firstPath.substring(0, firstPath.lastIndexOf("/")) || "/";
+
+  const fileNames = paths
+    .map((p) => {
+      const name = p.split("/").pop();
+      return `"${name}"`;
+    })
+    .join(" ");
+
+  let archivePath = "";
+  if (archiveName.includes("/")) {
+    archivePath = archiveName;
+  } else {
+    archivePath = workingDir.endsWith("/")
+      ? `${workingDir}${archiveName}`
+      : `${workingDir}/${archiveName}`;
+  }
+
+  if (compressionFormat === "zip") {
+    compressCommand = `cd "${workingDir}" && zip -r "${archivePath}" ${fileNames}`;
+  } else if (compressionFormat === "tar.gz" || compressionFormat === "tgz") {
+    compressCommand = `cd "${workingDir}" && tar -czf "${archivePath}" ${fileNames}`;
+  } else if (compressionFormat === "tar.bz2" || compressionFormat === "tbz2") {
+    compressCommand = `cd "${workingDir}" && tar -cjf "${archivePath}" ${fileNames}`;
+  } else if (compressionFormat === "tar.xz") {
+    compressCommand = `cd "${workingDir}" && tar -cJf "${archivePath}" ${fileNames}`;
+  } else if (compressionFormat === "tar") {
+    compressCommand = `cd "${workingDir}" && tar -cf "${archivePath}" ${fileNames}`;
+  } else if (compressionFormat === "7z") {
+    compressCommand = `cd "${workingDir}" && 7z a "${archivePath}" ${fileNames}`;
+  } else {
+    return res.status(400).json({ error: "Unsupported compression format" });
+  }
+
+  fileLogger.info("Compressing files", {
+    operation: "compress_files",
+    sessionId,
+    paths,
+    archivePath,
+    format: compressionFormat,
+    command: compressCommand,
+  });
+
+  session.client.exec(compressCommand, (err, stream) => {
+    if (err) {
+      fileLogger.error("SSH exec error during compress:", err, {
+        operation: "compress_files",
+        sessionId,
+        paths,
+      });
+      return res
+        .status(500)
+        .json({ error: "Failed to execute compress command" });
+    }
+
+    let errorOutput = "";
+
+    stream.on("data", (data: Buffer) => {
+      fileLogger.debug("Compress stdout", {
+        operation: "compress_files",
+        sessionId,
+        output: data.toString(),
+      });
+    });
+
+    stream.stderr.on("data", (data: Buffer) => {
+      errorOutput += data.toString();
+      fileLogger.debug("Compress stderr", {
+        operation: "compress_files",
+        sessionId,
+        error: data.toString(),
+      });
+    });
+
+    stream.on("close", (code: number) => {
+      if (code !== 0) {
+        fileLogger.error("Compress command failed", {
+          operation: "compress_files",
+          sessionId,
+          paths,
+          archivePath,
+          exitCode: code,
+          error: errorOutput,
+        });
+
+        let friendlyError = errorOutput || "Failed to compress files";
+        if (
+          errorOutput.includes("command not found") ||
+          errorOutput.includes("not found")
+        ) {
+          const commandMap: Record<string, { cmd: string; install: string }> = {
+            zip: {
+              cmd: "zip",
+              install: "apt install zip / yum install zip / brew install zip",
+            },
+            "tar.gz": {
+              cmd: "tar",
+              install: "Usually pre-installed on Linux/Unix systems",
+            },
+            "tar.bz2": {
+              cmd: "tar",
+              install: "Usually pre-installed on Linux/Unix systems",
+            },
+            "tar.xz": {
+              cmd: "tar",
+              install: "Usually pre-installed on Linux/Unix systems",
+            },
+            tar: {
+              cmd: "tar",
+              install: "Usually pre-installed on Linux/Unix systems",
+            },
+            "7z": {
+              cmd: "7z",
+              install:
+                "apt install p7zip-full / yum install p7zip / brew install p7zip",
+            },
+          };
+
+          const info = commandMap[compressionFormat];
+          if (info) {
+            friendlyError = `Command '${info.cmd}' not found on remote server. Please install it first: ${info.install}`;
+          }
+        }
+
+        return res.status(500).json({ error: friendlyError });
+      }
+
+      fileLogger.success("Files compressed successfully", {
+        operation: "compress_files",
+        sessionId,
+        paths,
+        archivePath,
+        format: compressionFormat,
+      });
+
+      res.json({
+        success: true,
+        message: "Files compressed successfully",
+        archivePath: archivePath,
+      });
+    });
+
+    stream.on("error", (streamErr) => {
+      fileLogger.error("SSH compressFiles stream error:", streamErr, {
+        operation: "compress_files",
+        sessionId,
+        paths,
+      });
+      if (!res.headersSent) {
+        res.status(500).json({ error: "Stream error while compressing files" });
+      }
+    });
+  });
+});
+
 process.on("SIGINT", () => {
  Object.keys(sshSessions).forEach(cleanupSession);
  process.exit(0);
--- a/src/backend/ssh/server-stats.ts
+++ b/src/backend/ssh/server-stats.ts
@@ -6,10 +6,185 @@ import { Client, type ConnectConfig } from "ssh2";
 import { getDb } from "../database/db/index.js";
 import { sshData, sshCredentials } from "../database/db/schema.js";
 import { eq, and } from "drizzle-orm";
-import { statsLogger } from "../utils/logger.js";
+import { statsLogger, sshLogger } from "../utils/logger.js";
 import { SimpleDBOps } from "../utils/simple-db-ops.js";
 import { AuthManager } from "../utils/auth-manager.js";
 import type { AuthenticatedRequest } from "../../types/index.js";
+import { collectCpuMetrics } from "./widgets/cpu-collector.js";
+import { collectMemoryMetrics } from "./widgets/memory-collector.js";
+import { collectDiskMetrics } from "./widgets/disk-collector.js";
+import { collectNetworkMetrics } from "./widgets/network-collector.js";
+import { collectUptimeMetrics } from "./widgets/uptime-collector.js";
+import { collectProcessesMetrics } from "./widgets/processes-collector.js";
+import { collectSystemMetrics } from "./widgets/system-collector.js";
+import { collectLoginStats } from "./widgets/login-stats-collector.js";
+
+async function resolveJumpHost(
+  hostId: number,
+  userId: string,
+): Promise<any | null> {
+  try {
+    const hosts = await SimpleDBOps.select(
+      getDb()
+        .select()
+        .from(sshData)
+        .where(and(eq(sshData.id, hostId), eq(sshData.userId, userId))),
+      "ssh_data",
+      userId,
+    );
+
+    if (hosts.length === 0) {
+      return null;
+    }
+
+    const host = hosts[0];
+
+    if (host.credentialId) {
+      const credentials = await SimpleDBOps.select(
+        getDb()
+          .select()
+          .from(sshCredentials)
+          .where(
+            and(
+              eq(sshCredentials.id, host.credentialId as number),
+              eq(sshCredentials.userId, userId),
+            ),
+          ),
+        "ssh_credentials",
+        userId,
+      );
+
+      if (credentials.length > 0) {
+        const credential = credentials[0];
+        return {
+          ...host,
+          password: credential.password,
+          key:
+            credential.private_key || credential.privateKey || credential.key,
+          keyPassword: credential.key_password || credential.keyPassword,
+          keyType: credential.key_type || credential.keyType,
+          authType: credential.auth_type || credential.authType,
+        };
+      }
+    }
+
+    return host;
+  } catch (error) {
+    statsLogger.error("Failed to resolve jump host", error, {
+      operation: "resolve_jump_host",
+      hostId,
+      userId,
+    });
+    return null;
+  }
+}
+
+async function createJumpHostChain(
+  jumpHosts: Array<{ hostId: number }>,
+  userId: string,
+): Promise<Client | null> {
+  if (!jumpHosts || jumpHosts.length === 0) {
+    return null;
+  }
+
+  let currentClient: Client | null = null;
+  const clients: Client[] = [];
+
+  try {
+    for (let i = 0; i < jumpHosts.length; i++) {
+      const jumpHostConfig = await resolveJumpHost(jumpHosts[i].hostId, userId);
+
+      if (!jumpHostConfig) {
+        statsLogger.error(`Jump host ${i + 1} not found`, undefined, {
+          operation: "jump_host_chain",
+          hostId: jumpHosts[i].hostId,
+        });
+        clients.forEach((c) => c.end());
+        return null;
+      }
+
+      const jumpClient = new Client();
+      clients.push(jumpClient);
+
+      const connected = await new Promise<boolean>((resolve) => {
+        const timeout = setTimeout(() => {
+          resolve(false);
+        }, 30000);
+
+        jumpClient.on("ready", () => {
+          clearTimeout(timeout);
+          resolve(true);
+        });
+
+        jumpClient.on("error", (err) => {
+          clearTimeout(timeout);
+          statsLogger.error(`Jump host ${i + 1} connection failed`, err, {
+            operation: "jump_host_connect",
+            hostId: jumpHostConfig.id,
+            ip: jumpHostConfig.ip,
+          });
+          resolve(false);
+        });
+
+        const connectConfig: any = {
+          host: jumpHostConfig.ip,
+          port: jumpHostConfig.port || 22,
+          username: jumpHostConfig.username,
+          tryKeyboard: true,
+          readyTimeout: 30000,
+        };
+
+        if (jumpHostConfig.authType === "password" && jumpHostConfig.password) {
+          connectConfig.password = jumpHostConfig.password;
+        } else if (jumpHostConfig.authType === "key" && jumpHostConfig.key) {
+          const cleanKey = jumpHostConfig.key
+            .trim()
+            .replace(/\r\n/g, "\n")
+            .replace(/\r/g, "\n");
+          connectConfig.privateKey = Buffer.from(cleanKey, "utf8");
+          if (jumpHostConfig.keyPassword) {
+            connectConfig.passphrase = jumpHostConfig.keyPassword;
+          }
+        }
+
+        if (currentClient) {
+          currentClient.forwardOut(
+            "127.0.0.1",
+            0,
+            jumpHostConfig.ip,
+            jumpHostConfig.port || 22,
+            (err, stream) => {
+              if (err) {
+                clearTimeout(timeout);
+                resolve(false);
+                return;
+              }
+              connectConfig.sock = stream;
+              jumpClient.connect(connectConfig);
+            },
+          );
+        } else {
+          jumpClient.connect(connectConfig);
+        }
+      });
+
+      if (!connected) {
+        clients.forEach((c) => c.end());
+        return null;
+      }
+
+      currentClient = jumpClient;
+    }
+
+    return currentClient;
+  } catch (error) {
+    statsLogger.error("Failed to create jump host chain", error, {
+      operation: "jump_host_chain",
+    });
+    clients.forEach((c) => c.end());
+    return null;
+  }
+}

 interface PooledConnection {
  client: Client;
@@ -79,7 +254,7 @@ class SSHConnectionPool {
  private async createConnection(
    host: SSHHostWithCredentials,
  ): Promise<Client> {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
      const client = new Client();
      const timeout = setTimeout(() => {
        client.end();
@@ -120,7 +295,12 @@ class SSHConnectionPool {
              ),
            );
          } else if (host.password) {
-            const responses = prompts.map(() => host.password || "");
+            const responses = prompts.map((p) => {
+              if (/password/i.test(p.prompt)) {
+                return host.password || "";
+              }
+              return "";
+            });
            finish(responses);
          } else {
            finish(prompts.map(() => ""));
@@ -129,7 +309,44 @@ class SSHConnectionPool {
      );

      try {
-        client.connect(buildSshConfig(host));
+        const config = buildSshConfig(host);
+
+        if (host.jumpHosts && host.jumpHosts.length > 0 && host.userId) {
+          const jumpClient = await createJumpHostChain(
+            host.jumpHosts,
+            host.userId,
+          );
+
+          if (!jumpClient) {
+            clearTimeout(timeout);
+            reject(new Error("Failed to establish jump host chain"));
+            return;
+          }
+
+          jumpClient.forwardOut(
+            "127.0.0.1",
+            0,
+            host.ip,
+            host.port,
+            (err, stream) => {
+              if (err) {
+                clearTimeout(timeout);
+                jumpClient.end();
+                reject(
+                  new Error(
+                    "Failed to forward through jump host: " + err.message,
+                  ),
+                );
+                return;
+              }
+
+              config.sock = stream;
+              client.connect(config);
+            },
+          );
+        } else {
+          client.connect(config);
+        }
      } catch (err) {
        clearTimeout(timeout);
        reject(err);
@@ -156,7 +373,7 @@ class SSHConnectionPool {
        if (!conn.inUse && now - conn.lastUsed > maxAge) {
          try {
            conn.client.end();
-          } catch {}
+          } catch (error) {}
          return false;
        }
        return true;
@@ -176,7 +393,7 @@ class SSHConnectionPool {
      for (const conn of connections) {
        try {
          conn.client.end();
-        } catch {}
+        } catch (error) {}
      }
    }
    this.connections.clear();
@@ -214,7 +431,7 @@ class RequestQueue {
      if (request) {
        try {
          await request();
-        } catch {}
+        } catch (error) {}
      }
    }

@@ -382,7 +599,8 @@ interface SSHHostWithCredentials {
  enableFileManager: boolean;
  defaultPath: string;
  tunnelConnections: unknown[];
-  statsConfig?: string;
+  jumpHosts?: Array<{ hostId: number }>;
+  statsConfig?: string | StatsConfig;
  createdAt: string;
  updatedAt: string;
  userId: string;
@@ -427,34 +645,64 @@ class PollingManager {
    }
  >();

-  parseStatsConfig(statsConfigStr?: string): StatsConfig {
+  parseStatsConfig(statsConfigStr?: string | StatsConfig): StatsConfig {
    if (!statsConfigStr) {
      return DEFAULT_STATS_CONFIG;
    }
-    try {
-      const parsed = JSON.parse(statsConfigStr);
-      return { ...DEFAULT_STATS_CONFIG, ...parsed };
-    } catch (error) {
-      statsLogger.warn(
-        `Failed to parse statsConfig: ${error instanceof Error ? error.message : "Unknown error"}`,
-      );
-      return DEFAULT_STATS_CONFIG;
+
+    let parsed: StatsConfig;
+
+    if (typeof statsConfigStr === "object") {
+      parsed = statsConfigStr;
+    } else {
+      try {
+        let temp: any = JSON.parse(statsConfigStr);
+
+        if (typeof temp === "string") {
+          temp = JSON.parse(temp);
+        }
+
+        parsed = temp;
+      } catch (error) {
+        statsLogger.warn(
+          `Failed to parse statsConfig: ${error instanceof Error ? error.message : "Unknown error"}`,
+          {
+            operation: "parse_stats_config_error",
+            statsConfigStr,
+          },
+        );
+        return DEFAULT_STATS_CONFIG;
+      }
    }
+
+    const result = { ...DEFAULT_STATS_CONFIG, ...parsed };
+
+    return result;
  }

  async startPollingForHost(host: SSHHostWithCredentials): Promise<void> {
    const statsConfig = this.parseStatsConfig(host.statsConfig);
+
    const existingConfig = this.pollingConfigs.get(host.id);

    if (existingConfig) {
      if (existingConfig.statusTimer) {
        clearInterval(existingConfig.statusTimer);
+        existingConfig.statusTimer = undefined;
      }
      if (existingConfig.metricsTimer) {
        clearInterval(existingConfig.metricsTimer);
+        existingConfig.metricsTimer = undefined;
      }
    }

+    if (!statsConfig.statusCheckEnabled && !statsConfig.metricsEnabled) {
+      this.pollingConfigs.delete(host.id);
+      this.statusStore.delete(host.id);
+      this.metricsStore.delete(host.id);
+      return;
+    }
+
    const config: HostPollingConfig = {
      host,
      statsConfig,
@@ -466,7 +714,10 @@ class PollingManager {
      this.pollHostStatus(host);

      config.statusTimer = setInterval(() => {
-        this.pollHostStatus(host);
+        const latestConfig = this.pollingConfigs.get(host.id);
+        if (latestConfig && latestConfig.statsConfig.statusCheckEnabled) {
+          this.pollHostStatus(latestConfig.host);
+        }
      }, intervalMs);
    } else {
      this.statusStore.delete(host.id);
@@ -478,7 +729,10 @@ class PollingManager {
      this.pollHostMetrics(host);

      config.metricsTimer = setInterval(() => {
-        this.pollHostMetrics(host);
+        const latestConfig = this.pollingConfigs.get(host.id);
+        if (latestConfig && latestConfig.statsConfig.metricsEnabled) {
+          this.pollHostMetrics(latestConfig.host);
+        }
      }, intervalMs);
    } else {
      this.metricsStore.delete(host.id);
@@ -505,27 +759,51 @@ class PollingManager {
  }

  private async pollHostMetrics(host: SSHHostWithCredentials): Promise<void> {
+    const config = this.pollingConfigs.get(host.id);
+    if (!config || !config.statsConfig.metricsEnabled) {
+      return;
+    }
+
+    const currentHost = config.host;
+
    try {
-      const metrics = await collectMetrics(host);
-      this.metricsStore.set(host.id, {
+      const metrics = await collectMetrics(currentHost);
+      this.metricsStore.set(currentHost.id, {
        data: metrics,
        timestamp: Date.now(),
      });
-    } catch (error) {}
+    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+
+      const latestConfig = this.pollingConfigs.get(currentHost.id);
+      if (latestConfig && latestConfig.statsConfig.metricsEnabled) {
+        statsLogger.warn("Failed to collect metrics for host", {
+          operation: "metrics_poll_failed",
+          hostId: currentHost.id,
+          hostName: currentHost.name,
+          error: errorMessage,
+        });
+      }
+    }
  }

-  stopPollingForHost(hostId: number): void {
+  stopPollingForHost(hostId: number, clearData = true): void {
    const config = this.pollingConfigs.get(hostId);
    if (config) {
      if (config.statusTimer) {
        clearInterval(config.statusTimer);
+        config.statusTimer = undefined;
      }
      if (config.metricsTimer) {
        clearInterval(config.metricsTimer);
+        config.metricsTimer = undefined;
      }
      this.pollingConfigs.delete(hostId);
-      this.statusStore.delete(hostId);
-      this.metricsStore.delete(hostId);
+      if (clearData) {
+        this.statusStore.delete(hostId);
+        this.metricsStore.delete(hostId);
+      }
    }
  }

@@ -554,11 +832,23 @@ class PollingManager {
  }

  async refreshHostPolling(userId: string): Promise<void> {
+    const hosts = await fetchAllHosts(userId);
+    const currentHostIds = new Set(hosts.map((h) => h.id));
+
    for (const hostId of this.pollingConfigs.keys()) {
-      this.stopPollingForHost(hostId);
+      this.stopPollingForHost(hostId, false);
    }

-    await this.initializePolling(userId);
+    for (const hostId of this.statusStore.keys()) {
+      if (!currentHostIds.has(hostId)) {
+        this.statusStore.delete(hostId);
+        this.metricsStore.delete(hostId);
+      }
+    }
+
+    for (const host of hosts) {
+      await this.startPollingForHost(host);
+    }
  }

  destroy(): void {
@@ -712,6 +1002,7 @@ async function resolveHostCredentials(
      tunnelConnections: host.tunnelConnections
        ? JSON.parse(host.tunnelConnections as string)
        : [],
+      jumpHosts: host.jumpHosts ? JSON.parse(host.jumpHosts as string) : [],
      statsConfig: host.statsConfig || undefined,
      createdAt: host.createdAt,
      updatedAt: host.updatedAt,
@@ -911,59 +1202,6 @@ async function withSshConnection<T>(
  }
 }

-function execCommand(
-  client: Client,
-  command: string,
-): Promise<{
-  stdout: string;
-  stderr: string;
-  code: number | null;
-}> {
-  return new Promise((resolve, reject) => {
-    client.exec(command, { pty: false }, (err, stream) => {
-      if (err) return reject(err);
-      let stdout = "";
-      let stderr = "";
-      let exitCode: number | null = null;
-      stream
-        .on("close", (code: number | undefined) => {
-          exitCode = typeof code === "number" ? code : null;
-          resolve({ stdout, stderr, code: exitCode });
-        })
-        .on("data", (data: Buffer) => {
-          stdout += data.toString("utf8");
-        })
-        .stderr.on("data", (data: Buffer) => {
-          stderr += data.toString("utf8");
-        });
-    });
-  });
-}
-
-function parseCpuLine(
-  cpuLine: string,
-): { total: number; idle: number } | undefined {
-  const parts = cpuLine.trim().split(/\s+/);
-  if (parts[0] !== "cpu") return undefined;
-  const nums = parts
-    .slice(1)
-    .map((n) => Number(n))
-    .filter((n) => Number.isFinite(n));
-  if (nums.length < 4) return undefined;
-  const idle = (nums[3] ?? 0) + (nums[4] ?? 0);
-  const total = nums.reduce((a, b) => a + b, 0);
-  return { total, idle };
-}
-
-function toFixedNum(n: number | null | undefined, digits = 2): number | null {
-  if (typeof n !== "number" || !Number.isFinite(n)) return null;
-  return Number(n.toFixed(digits));
-}
-
-function kibToGiB(kib: number): number {
-  return kib / (1024 * 1024);
-}
-
 async function collectMetrics(host: SSHHostWithCredentials): Promise<{
  cpu: {
    percent: number | null;
@@ -1026,298 +1264,38 @@ async function collectMetrics(host: SSHHostWithCredentials): Promise<{
  return requestQueue.queueRequest(host.id, async () => {
    try {
      return await withSshConnection(host, async (client) => {
-        let cpuPercent: number | null = null;
-        let cores: number | null = null;
-        let loadTriplet: [number, number, number] | null = null;
+        const cpu = await collectCpuMetrics(client);
+        const memory = await collectMemoryMetrics(client);
+        const disk = await collectDiskMetrics(client);
+        const network = await collectNetworkMetrics(client);
+        const uptime = await collectUptimeMetrics(client);
+        const processes = await collectProcessesMetrics(client);
+        const system = await collectSystemMetrics(client);

+        let login_stats = {
+          recentLogins: [],
+          failedLogins: [],
+          totalLogins: 0,
+          uniqueIPs: 0,
+        };
        try {
-          const [stat1, loadAvgOut, coresOut] = await Promise.all([
-            execCommand(client, "cat /proc/stat"),
-            execCommand(client, "cat /proc/loadavg"),
-            execCommand(
-              client,
-              "nproc 2>/dev/null || grep -c ^processor /proc/cpuinfo",
-            ),
-          ]);
-
-          await new Promise((r) => setTimeout(r, 500));
-          const stat2 = await execCommand(client, "cat /proc/stat");
-
-          const cpuLine1 = (
-            stat1.stdout.split("\n").find((l) => l.startsWith("cpu ")) || ""
-          ).trim();
-          const cpuLine2 = (
-            stat2.stdout.split("\n").find((l) => l.startsWith("cpu ")) || ""
-          ).trim();
-          const a = parseCpuLine(cpuLine1);
-          const b = parseCpuLine(cpuLine2);
-          if (a && b) {
-            const totalDiff = b.total - a.total;
-            const idleDiff = b.idle - a.idle;
-            const used = totalDiff - idleDiff;
-            if (totalDiff > 0)
-              cpuPercent = Math.max(0, Math.min(100, (used / totalDiff) * 100));
-          }
-
-          const laParts = loadAvgOut.stdout.trim().split(/\s+/);
-          if (laParts.length >= 3) {
-            loadTriplet = [
-              Number(laParts[0]),
-              Number(laParts[1]),
-              Number(laParts[2]),
-            ].map((v) => (Number.isFinite(v) ? Number(v) : 0)) as [
-              number,
-              number,
-              number,
-            ];
-          }
-
-          const coresNum = Number((coresOut.stdout || "").trim());
-          cores = Number.isFinite(coresNum) && coresNum > 0 ? coresNum : null;
+          login_stats = await collectLoginStats(client);
        } catch (e) {
-          cpuPercent = null;
-          cores = null;
-          loadTriplet = null;
+          statsLogger.debug("Failed to collect login stats", {
+            operation: "login_stats_failed",
+            error: e instanceof Error ? e.message : String(e),
+          });
        }

-        let memPercent: number | null = null;
-        let usedGiB: number | null = null;
-        let totalGiB: number | null = null;
-        try {
-          const memInfo = await execCommand(client, "cat /proc/meminfo");
-          const lines = memInfo.stdout.split("\n");
-          const getVal = (key: string) => {
-            const line = lines.find((l) => l.startsWith(key));
-            if (!line) return null;
-            const m = line.match(/\d+/);
-            return m ? Number(m[0]) : null;
-          };
-          const totalKb = getVal("MemTotal:");
-          const availKb = getVal("MemAvailable:");
-          if (totalKb && availKb && totalKb > 0) {
-            const usedKb = totalKb - availKb;
-            memPercent = Math.max(0, Math.min(100, (usedKb / totalKb) * 100));
-            usedGiB = kibToGiB(usedKb);
-            totalGiB = kibToGiB(totalKb);
-          }
-        } catch (e) {
-          memPercent = null;
-          usedGiB = null;
-          totalGiB = null;
-        }
-
-        let diskPercent: number | null = null;
-        let usedHuman: string | null = null;
-        let totalHuman: string | null = null;
-        let availableHuman: string | null = null;
-        try {
-          const [diskOutHuman, diskOutBytes] = await Promise.all([
-            execCommand(client, "df -h -P / | tail -n +2"),
-            execCommand(client, "df -B1 -P / | tail -n +2"),
-          ]);
-
-          const humanLine =
-            diskOutHuman.stdout
-              .split("\n")
-              .map((l) => l.trim())
-              .filter(Boolean)[0] || "";
-          const bytesLine =
-            diskOutBytes.stdout
-              .split("\n")
-              .map((l) => l.trim())
-              .filter(Boolean)[0] || "";
-
-          const humanParts = humanLine.split(/\s+/);
-          const bytesParts = bytesLine.split(/\s+/);
-
-          if (humanParts.length >= 6 && bytesParts.length >= 6) {
-            totalHuman = humanParts[1] || null;
-            usedHuman = humanParts[2] || null;
-            availableHuman = humanParts[3] || null;
-
-            const totalBytes = Number(bytesParts[1]);
-            const usedBytes = Number(bytesParts[2]);
-
-            if (
-              Number.isFinite(totalBytes) &&
-              Number.isFinite(usedBytes) &&
-              totalBytes > 0
-            ) {
-              diskPercent = Math.max(
-                0,
-                Math.min(100, (usedBytes / totalBytes) * 100),
-              );
-            }
-          }
-        } catch (e) {
-          diskPercent = null;
-          usedHuman = null;
-          totalHuman = null;
-          availableHuman = null;
-        }
-
-        const interfaces: Array<{
-          name: string;
-          ip: string;
-          state: string;
-          rxBytes: string | null;
-          txBytes: string | null;
-        }> = [];
-        try {
-          const ifconfigOut = await execCommand(
-            client,
-            "ip -o addr show | awk '{print $2,$4}' | grep -v '^lo'",
-          );
-          const netStatOut = await execCommand(
-            client,
-            "ip -o link show | awk '{gsub(/:/, \"\", $2); print $2,$9}'",
-          );
-
-          const addrs = ifconfigOut.stdout
-            .split("\n")
-            .map((l) => l.trim())
-            .filter(Boolean);
-          const states = netStatOut.stdout
-            .split("\n")
-            .map((l) => l.trim())
-            .filter(Boolean);
-
-          const ifMap = new Map<string, { ip: string; state: string }>();
-          for (const line of addrs) {
-            const parts = line.split(/\s+/);
-            if (parts.length >= 2) {
-              const name = parts[0];
-              const ip = parts[1].split("/")[0];
-              if (!ifMap.has(name)) ifMap.set(name, { ip, state: "UNKNOWN" });
-            }
-          }
-          for (const line of states) {
-            const parts = line.split(/\s+/);
-            if (parts.length >= 2) {
-              const name = parts[0];
-              const state = parts[1];
-              const existing = ifMap.get(name);
-              if (existing) {
-                existing.state = state;
-              }
-            }
-          }
-
-          for (const [name, data] of ifMap.entries()) {
-            interfaces.push({
-              name,
-              ip: data.ip,
-              state: data.state,
-              rxBytes: null,
-              txBytes: null,
-            });
-          }
-        } catch (e) {}
-
-        let uptimeSeconds: number | null = null;
-        let uptimeFormatted: string | null = null;
-        try {
-          const uptimeOut = await execCommand(client, "cat /proc/uptime");
-          const uptimeParts = uptimeOut.stdout.trim().split(/\s+/);
-          if (uptimeParts.length >= 1) {
-            uptimeSeconds = Number(uptimeParts[0]);
-            if (Number.isFinite(uptimeSeconds)) {
-              const days = Math.floor(uptimeSeconds / 86400);
-              const hours = Math.floor((uptimeSeconds % 86400) / 3600);
-              const minutes = Math.floor((uptimeSeconds % 3600) / 60);
-              uptimeFormatted = `${days}d ${hours}h ${minutes}m`;
-            }
-          }
-        } catch (e) {}
-
-        let totalProcesses: number | null = null;
-        let runningProcesses: number | null = null;
-        const topProcesses: Array<{
-          pid: string;
-          user: string;
-          cpu: string;
-          mem: string;
-          command: string;
-        }> = [];
-        try {
-          const psOut = await execCommand(
-            client,
-            "ps aux --sort=-%cpu | head -n 11",
-          );
-          const psLines = psOut.stdout
-            .split("\n")
-            .map((l) => l.trim())
-            .filter(Boolean);
-          if (psLines.length > 1) {
-            for (let i = 1; i < Math.min(psLines.length, 11); i++) {
-              const parts = psLines[i].split(/\s+/);
-              if (parts.length >= 11) {
-                topProcesses.push({
-                  pid: parts[1],
-                  user: parts[0],
-                  cpu: parts[2],
-                  mem: parts[3],
-                  command: parts.slice(10).join(" ").substring(0, 50),
-                });
-              }
-            }
-          }
-
-          const procCount = await execCommand(client, "ps aux | wc -l");
-          const runningCount = await execCommand(
-            client,
-            "ps aux | grep -c ' R '",
-          );
-          totalProcesses = Number(procCount.stdout.trim()) - 1;
-          runningProcesses = Number(runningCount.stdout.trim());
-        } catch (e) {}
-
-        let hostname: string | null = null;
-        let kernel: string | null = null;
-        let os: string | null = null;
-        try {
-          const hostnameOut = await execCommand(client, "hostname");
-          const kernelOut = await execCommand(client, "uname -r");
-          const osOut = await execCommand(
-            client,
-            "cat /etc/os-release | grep '^PRETTY_NAME=' | cut -d'\"' -f2",
-          );
-
-          hostname = hostnameOut.stdout.trim() || null;
-          kernel = kernelOut.stdout.trim() || null;
-          os = osOut.stdout.trim() || null;
-        } catch (e) {}
-
        const result = {
-          cpu: { percent: toFixedNum(cpuPercent, 0), cores, load: loadTriplet },
-          memory: {
-            percent: toFixedNum(memPercent, 0),
-            usedGiB: usedGiB ? toFixedNum(usedGiB, 2) : null,
-            totalGiB: totalGiB ? toFixedNum(totalGiB, 2) : null,
-          },
-          disk: {
-            percent: toFixedNum(diskPercent, 0),
-            usedHuman,
-            totalHuman,
-            availableHuman,
-          },
-          network: {
-            interfaces,
-          },
-          uptime: {
-            seconds: uptimeSeconds,
-            formatted: uptimeFormatted,
-          },
-          processes: {
-            total: totalProcesses,
-            running: runningProcesses,
-            top: topProcesses,
-          },
-          system: {
-            hostname,
-            kernel,
-            os,
-          },
+          cpu,
+          memory,
+          disk,
+          network,
+          uptime,
+          processes,
+          system,
+          login_stats,
        };

        metricsCache.set(host.id, result);
@@ -1365,7 +1343,7 @@ function tcpPing(
      settled = true;
      try {
        socket.destroy();
-      } catch {}
+      } catch (error) {}
      resolve(result);
    };

@@ -1438,6 +1416,67 @@ app.post("/refresh", async (req, res) => {
  res.json({ message: "Polling refreshed" });
 });

+app.post("/host-updated", async (req, res) => {
+  const userId = (req as AuthenticatedRequest).userId;
+  const { hostId } = req.body;
+
+  if (!SimpleDBOps.isUserDataUnlocked(userId)) {
+    return res.status(401).json({
+      error: "Session expired - please log in again",
+      code: "SESSION_EXPIRED",
+    });
+  }
+
+  if (!hostId || typeof hostId !== "number") {
+    return res.status(400).json({ error: "Invalid hostId" });
+  }
+
+  try {
+    const host = await fetchHostById(hostId, userId);
+    if (host) {
+      await pollingManager.startPollingForHost(host);
+      res.json({ message: "Host polling started" });
+    } else {
+      res.status(404).json({ error: "Host not found" });
+    }
+  } catch (error) {
+    statsLogger.error("Failed to start polling for host", error, {
+      operation: "host_updated",
+      hostId,
+      userId,
+    });
+    res.status(500).json({ error: "Failed to start polling" });
+  }
+});
+
+app.post("/host-deleted", async (req, res) => {
+  const userId = (req as AuthenticatedRequest).userId;
+  const { hostId } = req.body;
+
+  if (!SimpleDBOps.isUserDataUnlocked(userId)) {
+    return res.status(401).json({
+      error: "Session expired - please log in again",
+      code: "SESSION_EXPIRED",
+    });
+  }
+
+  if (!hostId || typeof hostId !== "number") {
+    return res.status(400).json({ error: "Invalid hostId" });
+  }
+
+  try {
+    pollingManager.stopPollingForHost(hostId, true);
+    res.json({ message: "Host polling stopped" });
+  } catch (error) {
+    statsLogger.error("Failed to stop polling for host", error, {
+      operation: "host_deleted",
+      hostId,
+      userId,
+    });
+    res.status(500).json({ error: "Failed to stop polling" });
+  }
+});
+
 app.get("/metrics/:id", validateHostId, async (req, res) => {
  const id = Number(req.params.id);
  const userId = (req as AuthenticatedRequest).userId;
--- a/src/backend/ssh/terminal.ts
+++ b/src/backend/ssh/terminal.ts
@@ -31,6 +31,7 @@ interface ConnectToHostData {
    credentialId?: number;
    userId?: string;
    forceKeyboardInteractive?: boolean;
+    jumpHosts?: Array<{ hostId: number }>;
  };
  initialPath?: string;
  executeCommand?: string;
@@ -57,6 +58,173 @@ const userCrypto = UserCrypto.getInstance();

 const userConnections = new Map<string, Set<WebSocket>>();

+async function resolveJumpHost(
+  hostId: number,
+  userId: string,
+): Promise<any | null> {
+  try {
+    const hosts = await SimpleDBOps.select(
+      getDb()
+        .select()
+        .from(sshData)
+        .where(and(eq(sshData.id, hostId), eq(sshData.userId, userId))),
+      "ssh_data",
+      userId,
+    );
+
+    if (hosts.length === 0) {
+      return null;
+    }
+
+    const host = hosts[0];
+
+    if (host.credentialId) {
+      const credentials = await SimpleDBOps.select(
+        getDb()
+          .select()
+          .from(sshCredentials)
+          .where(
+            and(
+              eq(sshCredentials.id, host.credentialId as number),
+              eq(sshCredentials.userId, userId),
+            ),
+          ),
+        "ssh_credentials",
+        userId,
+      );
+
+      if (credentials.length > 0) {
+        const credential = credentials[0];
+        return {
+          ...host,
+          password: credential.password,
+          key:
+            credential.private_key || credential.privateKey || credential.key,
+          keyPassword: credential.key_password || credential.keyPassword,
+          keyType: credential.key_type || credential.keyType,
+          authType: credential.auth_type || credential.authType,
+        };
+      }
+    }
+
+    return host;
+  } catch (error) {
+    sshLogger.error("Failed to resolve jump host", error, {
+      operation: "resolve_jump_host",
+      hostId,
+      userId,
+    });
+    return null;
+  }
+}
+
+async function createJumpHostChain(
+  jumpHosts: Array<{ hostId: number }>,
+  userId: string,
+): Promise<Client | null> {
+  if (!jumpHosts || jumpHosts.length === 0) {
+    return null;
+  }
+
+  let currentClient: Client | null = null;
+  const clients: Client[] = [];
+
+  try {
+    for (let i = 0; i < jumpHosts.length; i++) {
+      const jumpHostConfig = await resolveJumpHost(jumpHosts[i].hostId, userId);
+
+      if (!jumpHostConfig) {
+        sshLogger.error(`Jump host ${i + 1} not found`, undefined, {
+          operation: "jump_host_chain",
+          hostId: jumpHosts[i].hostId,
+        });
+        clients.forEach((c) => c.end());
+        return null;
+      }
+
+      const jumpClient = new Client();
+      clients.push(jumpClient);
+
+      const connected = await new Promise<boolean>((resolve) => {
+        const timeout = setTimeout(() => {
+          resolve(false);
+        }, 30000);
+
+        jumpClient.on("ready", () => {
+          clearTimeout(timeout);
+          resolve(true);
+        });
+
+        jumpClient.on("error", (err) => {
+          clearTimeout(timeout);
+          sshLogger.error(`Jump host ${i + 1} connection failed`, err, {
+            operation: "jump_host_connect",
+            hostId: jumpHostConfig.id,
+            ip: jumpHostConfig.ip,
+          });
+          resolve(false);
+        });
+
+        const connectConfig: any = {
+          host: jumpHostConfig.ip,
+          port: jumpHostConfig.port || 22,
+          username: jumpHostConfig.username,
+          tryKeyboard: true,
+          readyTimeout: 30000,
+        };
+
+        if (jumpHostConfig.authType === "password" && jumpHostConfig.password) {
+          connectConfig.password = jumpHostConfig.password;
+        } else if (jumpHostConfig.authType === "key" && jumpHostConfig.key) {
+          const cleanKey = jumpHostConfig.key
+            .trim()
+            .replace(/\r\n/g, "\n")
+            .replace(/\r/g, "\n");
+          connectConfig.privateKey = Buffer.from(cleanKey, "utf8");
+          if (jumpHostConfig.keyPassword) {
+            connectConfig.passphrase = jumpHostConfig.keyPassword;
+          }
+        }
+
+        if (currentClient) {
+          currentClient.forwardOut(
+            "127.0.0.1",
+            0,
+            jumpHostConfig.ip,
+            jumpHostConfig.port || 22,
+            (err, stream) => {
+              if (err) {
+                clearTimeout(timeout);
+                resolve(false);
+                return;
+              }
+              connectConfig.sock = stream;
+              jumpClient.connect(connectConfig);
+            },
+          );
+        } else {
+          jumpClient.connect(connectConfig);
+        }
+      });
+
+      if (!connected) {
+        clients.forEach((c) => c.end());
+        return null;
+      }
+
+      currentClient = jumpClient;
+    }
+
+    return currentClient;
+  } catch (error) {
+    sshLogger.error("Failed to create jump host chain", error, {
+      operation: "jump_host_chain",
+    });
+    clients.forEach((c) => c.end());
+    return null;
+  }
+}
+
 const wss = new WebSocketServer({
  port: 30002,
  verifyClient: async (info) => {
@@ -79,6 +247,7 @@ const wss = new WebSocketServer({
      }

      const existingConnections = userConnections.get(payload.userId);
+
      if (existingConnections && existingConnections.size >= 3) {
        return false;
      }
@@ -152,6 +321,10 @@ wss.on("connection", async (ws: WebSocket, req) => {
  let totpPromptSent = false;
  let isKeyboardInteractive = false;
  let keyboardInteractiveResponded = false;
+  let isConnecting = false;
+  let isConnected = false;
+  let isCleaningUp = false;
+  let isShellInitializing = false;

  ws.on("close", () => {
    const userWs = userConnections.get(userId);
@@ -417,10 +590,21 @@ wss.on("connection", async (ws: WebSocket, req) => {
      return;
    }

+    if (isConnecting || isConnected) {
+      sshLogger.warn("Connection already in progress or established", {
+        operation: "ssh_connect",
+        hostId: id,
+        isConnecting,
+        isConnected,
+      });
+      return;
+    }
+
+    isConnecting = true;
    sshConn = new Client();

    const connectionTimeout = setTimeout(() => {
-      if (sshConn) {
+      if (sshConn && isConnecting && !isConnected) {
        sshLogger.error("SSH connection timeout", undefined, {
          operation: "ssh_connect",
          hostId: id,
@@ -433,7 +617,7 @@ wss.on("connection", async (ws: WebSocket, req) => {
        );
        cleanupSSH(connectionTimeout);
      }
-    }, 60000);
+    }, 120000);

    let resolvedCredentials = { password, key, keyPassword, keyType, authType };
    let authMethodNotAvailable = false;
@@ -498,7 +682,9 @@ wss.on("connection", async (ws: WebSocket, req) => {
    sshConn.on("ready", () => {
      clearTimeout(connectionTimeout);

-      if (!sshConn) {
+      const conn = sshConn;
+
+      if (!conn || isCleaningUp || !sshConn) {
        sshLogger.warn(
          "SSH connection was cleaned up before shell could be created",
          {
@@ -507,6 +693,9 @@ wss.on("connection", async (ws: WebSocket, req) => {
            ip,
            port,
            username,
+            isCleaningUp,
+            connNull: !conn,
+            sshConnNull: !sshConn,
          },
        );
        ws.send(
@@ -519,13 +708,37 @@ wss.on("connection", async (ws: WebSocket, req) => {
        return;
      }

-      sshConn.shell(
+      isShellInitializing = true;
+      isConnecting = false;
+      isConnected = true;
+
+      if (!sshConn) {
+        sshLogger.error(
+          "SSH connection became null right before shell creation",
+          {
+            operation: "ssh_shell",
+            hostId: id,
+          },
+        );
+        ws.send(
+          JSON.stringify({
+            type: "error",
+            message: "SSH connection lost during setup",
+          }),
+        );
+        isShellInitializing = false;
+        return;
+      }
+
+      conn.shell(
        {
          rows: data.rows,
          cols: data.cols,
          term: "xterm-256color",
        } as PseudoTtyOptions,
        (err, stream) => {
+          isShellInitializing = false;
+
          if (err) {
            sshLogger.error("Shell error", err, {
              operation: "ssh_shell",
@@ -836,9 +1049,10 @@ wss.on("connection", async (ws: WebSocket, req) => {
      tryKeyboard: true,
      keepaliveInterval: 30000,
      keepaliveCountMax: 3,
-      readyTimeout: 60000,
+      readyTimeout: 120000,
      tcpKeepAlive: true,
      tcpKeepAliveInitialDelay: 30000,
+      timeout: 120000,
      env: {
        TERM: "xterm-256color",
        LANG: "en_US.UTF-8",
@@ -969,7 +1183,68 @@ wss.on("connection", async (ws: WebSocket, req) => {
      return;
    }

-    sshConn.connect(connectConfig);
+    if (
+      hostConfig.jumpHosts &&
+      hostConfig.jumpHosts.length > 0 &&
+      hostConfig.userId
+    ) {
+      try {
+        const jumpClient = await createJumpHostChain(
+          hostConfig.jumpHosts,
+          hostConfig.userId,
+        );
+
+        if (!jumpClient) {
+          sshLogger.error("Failed to establish jump host chain");
+          ws.send(
+            JSON.stringify({
+              type: "error",
+              message: "Failed to connect through jump hosts",
+            }),
+          );
+          cleanupSSH(connectionTimeout);
+          return;
+        }
+
+        jumpClient.forwardOut("127.0.0.1", 0, ip, port, (err, stream) => {
+          if (err) {
+            sshLogger.error("Failed to forward through jump host", err, {
+              operation: "ssh_jump_forward",
+              hostId: id,
+              ip,
+              port,
+            });
+            ws.send(
+              JSON.stringify({
+                type: "error",
+                message: "Failed to forward through jump host: " + err.message,
+              }),
+            );
+            jumpClient.end();
+            cleanupSSH(connectionTimeout);
+            return;
+          }
+
+          connectConfig.sock = stream;
+          sshConn.connect(connectConfig);
+        });
+      } catch (error) {
+        sshLogger.error("Jump host error", error, {
+          operation: "ssh_jump_host",
+          hostId: id,
+        });
+        ws.send(
+          JSON.stringify({
+            type: "error",
+            message: "Failed to connect through jump hosts",
+          }),
+        );
+        cleanupSSH(connectionTimeout);
+        return;
+      }
+    } else {
+      sshConn.connect(connectConfig);
+    }
  }

  function handleResize(data: ResizeData) {
@@ -982,6 +1257,24 @@ wss.on("connection", async (ws: WebSocket, req) => {
  }

  function cleanupSSH(timeoutId?: NodeJS.Timeout) {
+    if (isCleaningUp) {
+      return;
+    }
+
+    if (isShellInitializing) {
+      sshLogger.warn(
+        "Cleanup attempted during shell initialization, deferring",
+        {
+          operation: "cleanup_deferred",
+          userId,
+        },
+      );
+      setTimeout(() => cleanupSSH(timeoutId), 100);
+      return;
+    }
+
+    isCleaningUp = true;
+
    if (timeoutId) {
      clearTimeout(timeoutId);
    }
@@ -1019,6 +1312,12 @@ wss.on("connection", async (ws: WebSocket, req) => {
    isKeyboardInteractive = false;
    keyboardInteractiveResponded = false;
    keyboardInteractiveFinish = null;
+    isConnecting = false;
+    isConnected = false;
+
+    setTimeout(() => {
+      isCleaningUp = false;
+    }, 100);
  }

  function setupPingInterval() {
@@ -1033,7 +1332,12 @@ wss.on("connection", async (ws: WebSocket, req) => {
          );
          cleanupSSH();
        }
+      } else if (!sshConn || !sshStream) {
+        if (pingInterval) {
+          clearInterval(pingInterval);
+          pingInterval = null;
+        }
      }
-    }, 60000);
+    }, 30000);
  }
 });
--- a/src/backend/ssh/tunnel.ts
+++ b/src/backend/ssh/tunnel.ts
@@ -15,7 +15,7 @@ import type {
  ErrorType,
 } from "../../types/index.js";
 import { CONNECTION_STATES } from "../../types/index.js";
-import { tunnelLogger } from "../utils/logger.js";
+import { tunnelLogger, sshLogger } from "../utils/logger.js";
 import { SystemCrypto } from "../utils/system-crypto.js";
 import { SimpleDBOps } from "../utils/simple-db-ops.js";
 import { DataCrypto } from "../utils/data-crypto.js";
@@ -217,7 +217,7 @@ function cleanupTunnelResources(
    if (verification?.timeout) clearTimeout(verification.timeout);
    try {
      verification?.conn.end();
-    } catch {}
+    } catch (error) {}
    tunnelVerifications.delete(tunnelName);
  }

@@ -282,7 +282,7 @@ function handleDisconnect(
      const verification = tunnelVerifications.get(tunnelName);
      if (verification?.timeout) clearTimeout(verification.timeout);
      verification?.conn.end();
-    } catch {}
+    } catch (error) {}
    tunnelVerifications.delete(tunnelName);
  }

@@ -638,7 +638,7 @@ async function connectSSHTunnel(

      try {
        conn.end();
-      } catch {}
+      } catch (error) {}

      activeTunnels.delete(tunnelName);

@@ -778,7 +778,7 @@ async function connectSSHTunnel(
            const verification = tunnelVerifications.get(tunnelName);
            if (verification?.timeout) clearTimeout(verification.timeout);
            verification?.conn.end();
-          } catch {}
+          } catch (error) {}
          tunnelVerifications.delete(tunnelName);
        }

--- a/src/backend/ssh/widgets/common-utils.ts
+++ b/src/backend/ssh/widgets/common-utils.ts
@@ -0,0 +1,42 @@
+import type { Client } from "ssh2";
+
+export function execCommand(
+  client: Client,
+  command: string,
+): Promise<{
+  stdout: string;
+  stderr: string;
+  code: number | null;
+}> {
+  return new Promise((resolve, reject) => {
+    client.exec(command, { pty: false }, (err, stream) => {
+      if (err) return reject(err);
+      let stdout = "";
+      let stderr = "";
+      let exitCode: number | null = null;
+      stream
+        .on("close", (code: number | undefined) => {
+          exitCode = typeof code === "number" ? code : null;
+          resolve({ stdout, stderr, code: exitCode });
+        })
+        .on("data", (data: Buffer) => {
+          stdout += data.toString("utf8");
+        })
+        .stderr.on("data", (data: Buffer) => {
+          stderr += data.toString("utf8");
+        });
+    });
+  });
+}
+
+export function toFixedNum(
+  n: number | null | undefined,
+  digits = 2,
+): number | null {
+  if (typeof n !== "number" || !Number.isFinite(n)) return null;
+  return Number(n.toFixed(digits));
+}
+
+export function kibToGiB(kib: number): number {
+  return kib / (1024 * 1024);
+}
--- a/src/backend/ssh/widgets/cpu-collector.ts
+++ b/src/backend/ssh/widgets/cpu-collector.ts
@@ -0,0 +1,83 @@
+import type { Client } from "ssh2";
+import { execCommand, toFixedNum } from "./common-utils.js";
+
+function parseCpuLine(
+  cpuLine: string,
+): { total: number; idle: number } | undefined {
+  const parts = cpuLine.trim().split(/\s+/);
+  if (parts[0] !== "cpu") return undefined;
+  const nums = parts
+    .slice(1)
+    .map((n) => Number(n))
+    .filter((n) => Number.isFinite(n));
+  if (nums.length < 4) return undefined;
+  const idle = (nums[3] ?? 0) + (nums[4] ?? 0);
+  const total = nums.reduce((a, b) => a + b, 0);
+  return { total, idle };
+}
+
+export async function collectCpuMetrics(client: Client): Promise<{
+  percent: number | null;
+  cores: number | null;
+  load: [number, number, number] | null;
+}> {
+  let cpuPercent: number | null = null;
+  let cores: number | null = null;
+  let loadTriplet: [number, number, number] | null = null;
+
+  try {
+    const [stat1, loadAvgOut, coresOut] = await Promise.all([
+      execCommand(client, "cat /proc/stat"),
+      execCommand(client, "cat /proc/loadavg"),
+      execCommand(
+        client,
+        "nproc 2>/dev/null || grep -c ^processor /proc/cpuinfo",
+      ),
+    ]);
+
+    await new Promise((r) => setTimeout(r, 500));
+    const stat2 = await execCommand(client, "cat /proc/stat");
+
+    const cpuLine1 = (
+      stat1.stdout.split("\n").find((l) => l.startsWith("cpu ")) || ""
+    ).trim();
+    const cpuLine2 = (
+      stat2.stdout.split("\n").find((l) => l.startsWith("cpu ")) || ""
+    ).trim();
+    const a = parseCpuLine(cpuLine1);
+    const b = parseCpuLine(cpuLine2);
+    if (a && b) {
+      const totalDiff = b.total - a.total;
+      const idleDiff = b.idle - a.idle;
+      const used = totalDiff - idleDiff;
+      if (totalDiff > 0)
+        cpuPercent = Math.max(0, Math.min(100, (used / totalDiff) * 100));
+    }
+
+    const laParts = loadAvgOut.stdout.trim().split(/\s+/);
+    if (laParts.length >= 3) {
+      loadTriplet = [
+        Number(laParts[0]),
+        Number(laParts[1]),
+        Number(laParts[2]),
+      ].map((v) => (Number.isFinite(v) ? Number(v) : 0)) as [
+        number,
+        number,
+        number,
+      ];
+    }
+
+    const coresNum = Number((coresOut.stdout || "").trim());
+    cores = Number.isFinite(coresNum) && coresNum > 0 ? coresNum : null;
+  } catch (e) {
+    cpuPercent = null;
+    cores = null;
+    loadTriplet = null;
+  }
+
+  return {
+    percent: toFixedNum(cpuPercent, 0),
+    cores,
+    load: loadTriplet,
+  };
+}
--- a/src/backend/ssh/widgets/disk-collector.ts
+++ b/src/backend/ssh/widgets/disk-collector.ts
@@ -0,0 +1,67 @@
+import type { Client } from "ssh2";
+import { execCommand, toFixedNum } from "./common-utils.js";
+
+export async function collectDiskMetrics(client: Client): Promise<{
+  percent: number | null;
+  usedHuman: string | null;
+  totalHuman: string | null;
+  availableHuman: string | null;
+}> {
+  let diskPercent: number | null = null;
+  let usedHuman: string | null = null;
+  let totalHuman: string | null = null;
+  let availableHuman: string | null = null;
+
+  try {
+    const [diskOutHuman, diskOutBytes] = await Promise.all([
+      execCommand(client, "df -h -P / | tail -n +2"),
+      execCommand(client, "df -B1 -P / | tail -n +2"),
+    ]);
+
+    const humanLine =
+      diskOutHuman.stdout
+        .split("\n")
+        .map((l) => l.trim())
+        .filter(Boolean)[0] || "";
+    const bytesLine =
+      diskOutBytes.stdout
+        .split("\n")
+        .map((l) => l.trim())
+        .filter(Boolean)[0] || "";
+
+    const humanParts = humanLine.split(/\s+/);
+    const bytesParts = bytesLine.split(/\s+/);
+
+    if (humanParts.length >= 6 && bytesParts.length >= 6) {
+      totalHuman = humanParts[1] || null;
+      usedHuman = humanParts[2] || null;
+      availableHuman = humanParts[3] || null;
+
+      const totalBytes = Number(bytesParts[1]);
+      const usedBytes = Number(bytesParts[2]);
+
+      if (
+        Number.isFinite(totalBytes) &&
+        Number.isFinite(usedBytes) &&
+        totalBytes > 0
+      ) {
+        diskPercent = Math.max(
+          0,
+          Math.min(100, (usedBytes / totalBytes) * 100),
+        );
+      }
+    }
+  } catch (e) {
+    diskPercent = null;
+    usedHuman = null;
+    totalHuman = null;
+    availableHuman = null;
+  }
+
+  return {
+    percent: toFixedNum(diskPercent, 0),
+    usedHuman,
+    totalHuman,
+    availableHuman,
+  };
+}
--- a/src/backend/ssh/widgets/login-stats-collector.ts
+++ b/src/backend/ssh/widgets/login-stats-collector.ts
@@ -0,0 +1,122 @@
+import type { Client } from "ssh2";
+import { execCommand } from "./common-utils.js";
+
+export interface LoginRecord {
+  user: string;
+  ip: string;
+  time: string;
+  status: "success" | "failed";
+}
+
+export interface LoginStats {
+  recentLogins: LoginRecord[];
+  failedLogins: LoginRecord[];
+  totalLogins: number;
+  uniqueIPs: number;
+}
+
+export async function collectLoginStats(client: Client): Promise<LoginStats> {
+  const recentLogins: LoginRecord[] = [];
+  const failedLogins: LoginRecord[] = [];
+  const ipSet = new Set<string>();
+
+  try {
+    const lastOut = await execCommand(
+      client,
+      "last -n 20 -F -w | grep -v 'reboot' | grep -v 'wtmp' | head -20",
+    );
+
+    const lastLines = lastOut.stdout
+      .split("\n")
+      .map((l) => l.trim())
+      .filter(Boolean);
+
+    for (const line of lastLines) {
+      const parts = line.split(/\s+/);
+      if (parts.length >= 10) {
+        const user = parts[0];
+        const tty = parts[1];
+        const ip =
+          parts[2] === ":" || parts[2].startsWith(":") ? "local" : parts[2];
+
+        const timeStart = parts.indexOf(
+          parts.find((p) => /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun)/.test(p)) || "",
+        );
+        if (timeStart > 0 && parts.length > timeStart + 4) {
+          const timeStr = parts.slice(timeStart, timeStart + 5).join(" ");
+
+          if (user && user !== "wtmp" && tty !== "system") {
+            recentLogins.push({
+              user,
+              ip,
+              time: new Date(timeStr).toISOString(),
+              status: "success",
+            });
+            if (ip !== "local") {
+              ipSet.add(ip);
+            }
+          }
+        }
+      }
+    }
+  } catch (e) {
+    // Ignore errors
+  }
+
+  try {
+    const failedOut = await execCommand(
+      client,
+      "grep 'Failed password' /var/log/auth.log 2>/dev/null | tail -10 || grep 'authentication failure' /var/log/secure 2>/dev/null | tail -10 || echo ''",
+    );
+
+    const failedLines = failedOut.stdout
+      .split("\n")
+      .map((l) => l.trim())
+      .filter(Boolean);
+
+    for (const line of failedLines) {
+      let user = "unknown";
+      let ip = "unknown";
+      let timeStr = "";
+
+      const userMatch = line.match(/for (?:invalid user )?(\S+)/);
+      if (userMatch) {
+        user = userMatch[1];
+      }
+
+      const ipMatch = line.match(/from (\d+\.\d+\.\d+\.\d+)/);
+      if (ipMatch) {
+        ip = ipMatch[1];
+      }
+
+      const dateMatch = line.match(/^(\w+\s+\d+\s+\d+:\d+:\d+)/);
+      if (dateMatch) {
+        const currentYear = new Date().getFullYear();
+        timeStr = `${currentYear} ${dateMatch[1]}`;
+      }
+
+      if (user && ip) {
+        failedLogins.push({
+          user,
+          ip,
+          time: timeStr
+            ? new Date(timeStr).toISOString()
+            : new Date().toISOString(),
+          status: "failed",
+        });
+        if (ip !== "unknown") {
+          ipSet.add(ip);
+        }
+      }
+    }
+  } catch (e) {
+    // Ignore errors
+  }
+
+  return {
+    recentLogins: recentLogins.slice(0, 10),
+    failedLogins: failedLogins.slice(0, 10),
+    totalLogins: recentLogins.length,
+    uniqueIPs: ipSet.size,
+  };
+}
--- a/src/backend/ssh/widgets/memory-collector.ts
+++ b/src/backend/ssh/widgets/memory-collector.ts
@@ -0,0 +1,41 @@
+import type { Client } from "ssh2";
+import { execCommand, toFixedNum, kibToGiB } from "./common-utils.js";
+
+export async function collectMemoryMetrics(client: Client): Promise<{
+  percent: number | null;
+  usedGiB: number | null;
+  totalGiB: number | null;
+}> {
+  let memPercent: number | null = null;
+  let usedGiB: number | null = null;
+  let totalGiB: number | null = null;
+
+  try {
+    const memInfo = await execCommand(client, "cat /proc/meminfo");
+    const lines = memInfo.stdout.split("\n");
+    const getVal = (key: string) => {
+      const line = lines.find((l) => l.startsWith(key));
+      if (!line) return null;
+      const m = line.match(/\d+/);
+      return m ? Number(m[0]) : null;
+    };
+    const totalKb = getVal("MemTotal:");
+    const availKb = getVal("MemAvailable:");
+    if (totalKb && availKb && totalKb > 0) {
+      const usedKb = totalKb - availKb;
+      memPercent = Math.max(0, Math.min(100, (usedKb / totalKb) * 100));
+      usedGiB = kibToGiB(usedKb);
+      totalGiB = kibToGiB(totalKb);
+    }
+  } catch (e) {
+    memPercent = null;
+    usedGiB = null;
+    totalGiB = null;
+  }
+
+  return {
+    percent: toFixedNum(memPercent, 0),
+    usedGiB: usedGiB ? toFixedNum(usedGiB, 2) : null,
+    totalGiB: totalGiB ? toFixedNum(totalGiB, 2) : null,
+  };
+}
--- a/src/backend/ssh/widgets/network-collector.ts
+++ b/src/backend/ssh/widgets/network-collector.ts
@@ -0,0 +1,79 @@
+import type { Client } from "ssh2";
+import { execCommand } from "./common-utils.js";
+import { statsLogger } from "../../utils/logger.js";
+
+export async function collectNetworkMetrics(client: Client): Promise<{
+  interfaces: Array<{
+    name: string;
+    ip: string;
+    state: string;
+    rxBytes: string | null;
+    txBytes: string | null;
+  }>;
+}> {
+  const interfaces: Array<{
+    name: string;
+    ip: string;
+    state: string;
+    rxBytes: string | null;
+    txBytes: string | null;
+  }> = [];
+
+  try {
+    const ifconfigOut = await execCommand(
+      client,
+      "ip -o addr show | awk '{print $2,$4}' | grep -v '^lo'",
+    );
+    const netStatOut = await execCommand(
+      client,
+      "ip -o link show | awk '{gsub(/:/, \"\", $2); print $2,$9}'",
+    );
+
+    const addrs = ifconfigOut.stdout
+      .split("\n")
+      .map((l) => l.trim())
+      .filter(Boolean);
+    const states = netStatOut.stdout
+      .split("\n")
+      .map((l) => l.trim())
+      .filter(Boolean);
+
+    const ifMap = new Map<string, { ip: string; state: string }>();
+    for (const line of addrs) {
+      const parts = line.split(/\s+/);
+      if (parts.length >= 2) {
+        const name = parts[0];
+        const ip = parts[1].split("/")[0];
+        if (!ifMap.has(name)) ifMap.set(name, { ip, state: "UNKNOWN" });
+      }
+    }
+    for (const line of states) {
+      const parts = line.split(/\s+/);
+      if (parts.length >= 2) {
+        const name = parts[0];
+        const state = parts[1];
+        const existing = ifMap.get(name);
+        if (existing) {
+          existing.state = state;
+        }
+      }
+    }
+
+    for (const [name, data] of ifMap.entries()) {
+      interfaces.push({
+        name,
+        ip: data.ip,
+        state: data.state,
+        rxBytes: null,
+        txBytes: null,
+      });
+    }
+  } catch (e) {
+    statsLogger.debug("Failed to collect network interface stats", {
+      operation: "network_stats_failed",
+      error: e instanceof Error ? e.message : String(e),
+    });
+  }
+
+  return { interfaces };
+}
--- a/src/backend/ssh/widgets/processes-collector.ts
+++ b/src/backend/ssh/widgets/processes-collector.ts
@@ -0,0 +1,63 @@
+import type { Client } from "ssh2";
+import { execCommand } from "./common-utils.js";
+import { statsLogger } from "../../utils/logger.js";
+
+export async function collectProcessesMetrics(client: Client): Promise<{
+  total: number | null;
+  running: number | null;
+  top: Array<{
+    pid: string;
+    user: string;
+    cpu: string;
+    mem: string;
+    command: string;
+  }>;
+}> {
+  let totalProcesses: number | null = null;
+  let runningProcesses: number | null = null;
+  const topProcesses: Array<{
+    pid: string;
+    user: string;
+    cpu: string;
+    mem: string;
+    command: string;
+  }> = [];
+
+  try {
+    const psOut = await execCommand(client, "ps aux --sort=-%cpu | head -n 11");
+    const psLines = psOut.stdout
+      .split("\n")
+      .map((l) => l.trim())
+      .filter(Boolean);
+    if (psLines.length > 1) {
+      for (let i = 1; i < Math.min(psLines.length, 11); i++) {
+        const parts = psLines[i].split(/\s+/);
+        if (parts.length >= 11) {
+          topProcesses.push({
+            pid: parts[1],
+            user: parts[0],
+            cpu: parts[2],
+            mem: parts[3],
+            command: parts.slice(10).join(" ").substring(0, 50),
+          });
+        }
+      }
+    }
+
+    const procCount = await execCommand(client, "ps aux | wc -l");
+    const runningCount = await execCommand(client, "ps aux | grep -c ' R '");
+    totalProcesses = Number(procCount.stdout.trim()) - 1;
+    runningProcesses = Number(runningCount.stdout.trim());
+  } catch (e) {
+    statsLogger.debug("Failed to collect process stats", {
+      operation: "process_stats_failed",
+      error: e instanceof Error ? e.message : String(e),
+    });
+  }
+
+  return {
+    total: totalProcesses,
+    running: runningProcesses,
+    top: topProcesses,
+  };
+}
--- a/src/backend/ssh/widgets/system-collector.ts
+++ b/src/backend/ssh/widgets/system-collector.ts
@@ -0,0 +1,37 @@
+import type { Client } from "ssh2";
+import { execCommand } from "./common-utils.js";
+import { statsLogger } from "../../utils/logger.js";
+
+export async function collectSystemMetrics(client: Client): Promise<{
+  hostname: string | null;
+  kernel: string | null;
+  os: string | null;
+}> {
+  let hostname: string | null = null;
+  let kernel: string | null = null;
+  let os: string | null = null;
+
+  try {
+    const hostnameOut = await execCommand(client, "hostname");
+    const kernelOut = await execCommand(client, "uname -r");
+    const osOut = await execCommand(
+      client,
+      "cat /etc/os-release | grep '^PRETTY_NAME=' | cut -d'\"' -f2",
+    );
+
+    hostname = hostnameOut.stdout.trim() || null;
+    kernel = kernelOut.stdout.trim() || null;
+    os = osOut.stdout.trim() || null;
+  } catch (e) {
+    statsLogger.debug("Failed to collect system info", {
+      operation: "system_info_failed",
+      error: e instanceof Error ? e.message : String(e),
+    });
+  }
+
+  return {
+    hostname,
+    kernel,
+    os,
+  };
+}
--- a/src/backend/ssh/widgets/uptime-collector.ts
+++ b/src/backend/ssh/widgets/uptime-collector.ts
@@ -0,0 +1,35 @@
+import type { Client } from "ssh2";
+import { execCommand } from "./common-utils.js";
+import { statsLogger } from "../../utils/logger.js";
+
+export async function collectUptimeMetrics(client: Client): Promise<{
+  seconds: number | null;
+  formatted: string | null;
+}> {
+  let uptimeSeconds: number | null = null;
+  let uptimeFormatted: string | null = null;
+
+  try {
+    const uptimeOut = await execCommand(client, "cat /proc/uptime");
+    const uptimeParts = uptimeOut.stdout.trim().split(/\s+/);
+    if (uptimeParts.length >= 1) {
+      uptimeSeconds = Number(uptimeParts[0]);
+      if (Number.isFinite(uptimeSeconds)) {
+        const days = Math.floor(uptimeSeconds / 86400);
+        const hours = Math.floor((uptimeSeconds % 86400) / 3600);
+        const minutes = Math.floor((uptimeSeconds % 3600) / 60);
+        uptimeFormatted = `${days}d ${hours}h ${minutes}m`;
+      }
+    }
+  } catch (e) {
+    statsLogger.debug("Failed to collect uptime", {
+      operation: "uptime_failed",
+      error: e instanceof Error ? e.message : String(e),
+    });
+  }
+
+  return {
+    seconds: uptimeSeconds,
+    formatted: uptimeFormatted,
+  };
+}
--- a/src/backend/starter.ts
+++ b/src/backend/starter.ts
@@ -21,7 +21,7 @@ import { systemLogger, versionLogger } from "./utils/logger.js";
      if (persistentConfig.parsed) {
        Object.assign(process.env, persistentConfig.parsed);
      }
-    } catch {}
+    } catch (error) {}

    let version = "unknown";

--- a/src/backend/utils/auth-manager.ts
+++ b/src/backend/utils/auth-manager.ts
@@ -85,24 +85,25 @@ class AuthManager {
    await this.userCrypto.setupUserEncryption(userId, password);
  }

-  async registerOIDCUser(userId: string): Promise<void> {
-    await this.userCrypto.setupOIDCUserEncryption(userId);
+  async registerOIDCUser(
+    userId: string,
+    sessionDurationMs: number,
+  ): Promise<void> {
+    await this.userCrypto.setupOIDCUserEncryption(userId, sessionDurationMs);
  }

-  async authenticateOIDCUser(userId: string): Promise<boolean> {
-    const authenticated = await this.userCrypto.authenticateOIDCUser(userId);
+  async authenticateOIDCUser(
+    userId: string,
+    deviceType?: DeviceType,
+  ): Promise<boolean> {
+    const sessionDurationMs =
+      deviceType === "desktop" || deviceType === "mobile"
+        ? 30 * 24 * 60 * 60 * 1000
+        : 7 * 24 * 60 * 60 * 1000;

-    if (authenticated) {
-      await this.performLazyEncryptionMigration(userId);
-    }
-
-    return authenticated;
-  }
-
-  async authenticateUser(userId: string, password: string): Promise<boolean> {
-    const authenticated = await this.userCrypto.authenticateUser(
+    const authenticated = await this.userCrypto.authenticateOIDCUser(
      userId,
-      password,
+      sessionDurationMs,
    );

    if (authenticated) {
@@ -112,6 +113,33 @@ class AuthManager {
    return authenticated;
  }

+  async authenticateUser(
+    userId: string,
+    password: string,
+    deviceType?: DeviceType,
+  ): Promise<boolean> {
+    const sessionDurationMs =
+      deviceType === "desktop" || deviceType === "mobile"
+        ? 30 * 24 * 60 * 60 * 1000
+        : 7 * 24 * 60 * 60 * 1000;
+
+    const authenticated = await this.userCrypto.authenticateUser(
+      userId,
+      password,
+      sessionDurationMs,
+    );
+
+    if (authenticated) {
+      await this.performLazyEncryptionMigration(userId);
+    }
+
+    return authenticated;
+  }
+
+  async convertToOIDCEncryption(userId: string): Promise<void> {
+    await this.userCrypto.convertToOIDCEncryption(userId);
+  }
+
  private async performLazyEncryptionMigration(userId: string): Promise<void> {
    try {
      const userDataKey = this.getUserDataKey(userId);
--- a/src/backend/utils/auto-ssl-setup.ts
+++ b/src/backend/utils/auto-ssl-setup.ts
@@ -233,7 +233,7 @@ IP.3 = 0.0.0.0
    let envContent = "";
    try {
      envContent = await fs.readFile(this.ENV_FILE, "utf8");
-    } catch {}
+    } catch (error) {}

    let updatedContent = envContent;
    let hasChanges = false;
--- a/src/backend/utils/database-file-encryption.ts
+++ b/src/backend/utils/database-file-encryption.ts
@@ -12,6 +12,7 @@ interface EncryptedFileMetadata {
  algorithm: string;
  keySource?: string;
  salt?: string;
+  dataSize?: number;
 }

 class DatabaseFileEncryption {
@@ -25,11 +26,12 @@ class DatabaseFileEncryption {
    buffer: Buffer,
    targetPath: string,
  ): Promise<string> {
+    const tmpPath = `${targetPath}.tmp-${Date.now()}-${process.pid}`;
+    const metadataPath = `${targetPath}${this.METADATA_FILE_SUFFIX}`;
+
    try {
      const key = await this.systemCrypto.getDatabaseKey();
-
      const iv = crypto.randomBytes(16);
-
      const cipher = crypto.createCipheriv(
        this.ALGORITHM,
        key,
@@ -45,14 +47,55 @@ class DatabaseFileEncryption {
        fingerprint: "termix-v2-systemcrypto",
        algorithm: this.ALGORITHM,
        keySource: "SystemCrypto",
+        dataSize: encrypted.length,
      };

-      const metadataPath = `${targetPath}${this.METADATA_FILE_SUFFIX}`;
-      fs.writeFileSync(targetPath, encrypted);
-      fs.writeFileSync(metadataPath, JSON.stringify(metadata, null, 2));
+      const metadataJson = JSON.stringify(metadata, null, 2);
+      const metadataBuffer = Buffer.from(metadataJson, "utf8");
+      const metadataLengthBuffer = Buffer.alloc(4);
+      metadataLengthBuffer.writeUInt32BE(metadataBuffer.length, 0);
+
+      const finalBuffer = Buffer.concat([
+        metadataLengthBuffer,
+        metadataBuffer,
+        encrypted,
+      ]);
+
+      fs.writeFileSync(tmpPath, finalBuffer);
+      fs.renameSync(tmpPath, targetPath);
+
+      try {
+        if (fs.existsSync(metadataPath)) {
+          fs.unlinkSync(metadataPath);
+        }
+      } catch (cleanupError) {
+        databaseLogger.warn("Failed to cleanup old metadata file", {
+          operation: "old_meta_cleanup_failed",
+          path: metadataPath,
+          error:
+            cleanupError instanceof Error
+              ? cleanupError.message
+              : "Unknown error",
+        });
+      }

      return targetPath;
    } catch (error) {
+      try {
+        if (fs.existsSync(tmpPath)) {
+          fs.unlinkSync(tmpPath);
+        }
+      } catch (cleanupError) {
+        databaseLogger.warn("Failed to cleanup temporary files", {
+          operation: "temp_file_cleanup_failed",
+          tmpPath,
+          error:
+            cleanupError instanceof Error
+              ? cleanupError.message
+              : "Unknown error",
+        });
+      }
+
      databaseLogger.error("Failed to encrypt database buffer", error, {
        operation: "database_buffer_encryption_failed",
        targetPath,
@@ -74,6 +117,8 @@ class DatabaseFileEncryption {
    const encryptedPath =
      targetPath || `${sourcePath}${this.ENCRYPTED_FILE_SUFFIX}`;
    const metadataPath = `${encryptedPath}${this.METADATA_FILE_SUFFIX}`;
+    const tmpPath = `${encryptedPath}.tmp-${Date.now()}-${process.pid}`;
+    const tmpMetadataPath = `${tmpPath}${this.METADATA_FILE_SUFFIX}`;

    try {
      const sourceData = fs.readFileSync(sourcePath);
@@ -93,6 +138,12 @@ class DatabaseFileEncryption {
      ]);
      const tag = cipher.getAuthTag();

+      const keyFingerprint = crypto
+        .createHash("sha256")
+        .update(key)
+        .digest("hex")
+        .substring(0, 16);
+
      const metadata: EncryptedFileMetadata = {
        iv: iv.toString("hex"),
        tag: tag.toString("hex"),
@@ -100,10 +151,14 @@ class DatabaseFileEncryption {
        fingerprint: "termix-v2-systemcrypto",
        algorithm: this.ALGORITHM,
        keySource: "SystemCrypto",
+        dataSize: encrypted.length,
      };

-      fs.writeFileSync(encryptedPath, encrypted);
-      fs.writeFileSync(metadataPath, JSON.stringify(metadata, null, 2));
+      fs.writeFileSync(tmpPath, encrypted);
+      fs.writeFileSync(tmpMetadataPath, JSON.stringify(metadata, null, 2));
+
+      fs.renameSync(tmpPath, encryptedPath);
+      fs.renameSync(tmpMetadataPath, metadataPath);

      databaseLogger.info("Database file encrypted successfully", {
        operation: "database_file_encryption",
@@ -111,11 +166,30 @@ class DatabaseFileEncryption {
        encryptedPath,
        fileSize: sourceData.length,
        encryptedSize: encrypted.length,
+        keyFingerprint,
        fingerprintPrefix: metadata.fingerprint,
      });

      return encryptedPath;
    } catch (error) {
+      try {
+        if (fs.existsSync(tmpPath)) {
+          fs.unlinkSync(tmpPath);
+        }
+        if (fs.existsSync(tmpMetadataPath)) {
+          fs.unlinkSync(tmpMetadataPath);
+        }
+      } catch (cleanupError) {
+        databaseLogger.warn("Failed to cleanup temporary files", {
+          operation: "temp_file_cleanup_failed",
+          tmpPath,
+          error:
+            cleanupError instanceof Error
+              ? cleanupError.message
+              : "Unknown error",
+        });
+      }
+
      databaseLogger.error("Failed to encrypt database file", error, {
        operation: "database_file_encryption_failed",
        sourcePath,
@@ -134,16 +208,69 @@ class DatabaseFileEncryption {
      );
    }

-    const metadataPath = `${encryptedPath}${this.METADATA_FILE_SUFFIX}`;
-    if (!fs.existsSync(metadataPath)) {
-      throw new Error(`Metadata file does not exist: ${metadataPath}`);
+    let metadata: EncryptedFileMetadata;
+    let encryptedData: Buffer;
+
+    const fileBuffer = fs.readFileSync(encryptedPath);
+
+    try {
+      const metadataLength = fileBuffer.readUInt32BE(0);
+      const metadataEnd = 4 + metadataLength;
+
+      if (
+        metadataLength <= 0 ||
+        metadataEnd > fileBuffer.length ||
+        metadataEnd <= 4
+      ) {
+        throw new Error("Invalid metadata length in single-file format");
+      }
+
+      const metadataJson = fileBuffer.slice(4, metadataEnd).toString("utf8");
+      metadata = JSON.parse(metadataJson);
+      encryptedData = fileBuffer.slice(metadataEnd);
+
+      if (!metadata.iv || !metadata.tag || !metadata.version) {
+        throw new Error("Invalid metadata structure in single-file format");
+      }
+    } catch (singleFileError) {
+      const metadataPath = `${encryptedPath}${this.METADATA_FILE_SUFFIX}`;
+      if (!fs.existsSync(metadataPath)) {
+        throw new Error(
+          `Could not read database: Not a valid single-file format and metadata file is missing: ${metadataPath}. Error: ${singleFileError.message}`,
+        );
+      }
+
+      try {
+        const metadataContent = fs.readFileSync(metadataPath, "utf8");
+        metadata = JSON.parse(metadataContent);
+        encryptedData = fileBuffer;
+      } catch (twoFileError) {
+        throw new Error(
+          `Failed to read database using both single-file and two-file formats. Error: ${twoFileError.message}`,
+        );
+      }
    }

    try {
-      const metadataContent = fs.readFileSync(metadataPath, "utf8");
-      const metadata: EncryptedFileMetadata = JSON.parse(metadataContent);
-
-      const encryptedData = fs.readFileSync(encryptedPath);
+      if (
+        metadata.dataSize !== undefined &&
+        encryptedData.length !== metadata.dataSize
+      ) {
+        databaseLogger.error(
+          "Encrypted file size mismatch - possible corrupted write or mismatched metadata",
+          null,
+          {
+            operation: "database_file_size_mismatch",
+            encryptedPath,
+            actualSize: encryptedData.length,
+            expectedSize: metadata.dataSize,
+          },
+        );
+        throw new Error(
+          `Encrypted file size mismatch: expected ${metadata.dataSize} bytes but got ${encryptedData.length} bytes. ` +
+            `This indicates corrupted files or interrupted write operation.`,
+        );
+      }

      let key: Buffer;
      if (metadata.version === "v2") {
@@ -181,13 +308,67 @@ class DatabaseFileEncryption {

      return decryptedBuffer;
    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : "Unknown error";
+      const isAuthError =
+        errorMessage.includes("Unsupported state") ||
+        errorMessage.includes("authenticate data") ||
+        errorMessage.includes("auth");
+
+      if (isAuthError) {
+        const dataDir = process.env.DATA_DIR || "./db/data";
+        const envPath = path.join(dataDir, ".env");
+
+        let envFileExists = false;
+        let envFileReadable = false;
+        try {
+          envFileExists = fs.existsSync(envPath);
+          if (envFileExists) {
+            fs.accessSync(envPath, fs.constants.R_OK);
+            envFileReadable = true;
+          }
+        } catch (error) {
+          databaseLogger.debug("Operation failed, continuing", {
+            error: error instanceof Error ? error.message : String(error),
+          });
+        }
+
+        databaseLogger.error(
+          "Database decryption authentication failed - possible causes: wrong DATABASE_KEY, corrupted files, or interrupted write",
+          error,
+          {
+            operation: "database_buffer_decryption_auth_failed",
+            encryptedPath,
+            dataDir,
+            envPath,
+            envFileExists,
+            envFileReadable,
+            hasEnvKey: !!process.env.DATABASE_KEY,
+            envKeyLength: process.env.DATABASE_KEY?.length || 0,
+            suggestion:
+              "Check if DATABASE_KEY in .env matches the key used for encryption",
+          },
+        );
+        throw new Error(
+          `Database decryption authentication failed. This usually means:\n` +
+            `1. DATABASE_KEY has changed or is missing from ${dataDir}/.env\n` +
+            `2. Encrypted file was corrupted during write (system crash/restart)\n` +
+            `3. Metadata file does not match encrypted data\n` +
+            `\nDebug info:\n` +
+            `- DATA_DIR: ${dataDir}\n` +
+            `- .env file exists: ${envFileExists}\n` +
+            `- .env file readable: ${envFileReadable}\n` +
+            `- DATABASE_KEY in environment: ${!!process.env.DATABASE_KEY}\n` +
+            `Original error: ${errorMessage}`,
+        );
+      }
+
      databaseLogger.error("Failed to decrypt database to buffer", error, {
        operation: "database_buffer_decryption_failed",
        encryptedPath,
+        errorMessage,
      });
-      throw new Error(
-        `Database buffer decryption failed: ${error instanceof Error ? error.message : "Unknown error"}`,
-      );
+      throw new Error(`Database buffer decryption failed: ${errorMessage}`);
    }
  }

@@ -215,6 +396,26 @@ class DatabaseFileEncryption {

      const encryptedData = fs.readFileSync(encryptedPath);

+      if (
+        metadata.dataSize !== undefined &&
+        encryptedData.length !== metadata.dataSize
+      ) {
+        databaseLogger.error(
+          "Encrypted file size mismatch - possible corrupted write or mismatched metadata",
+          null,
+          {
+            operation: "database_file_size_mismatch",
+            encryptedPath,
+            actualSize: encryptedData.length,
+            expectedSize: metadata.dataSize,
+          },
+        );
+        throw new Error(
+          `Encrypted file size mismatch: expected ${metadata.dataSize} bytes but got ${encryptedData.length} bytes. ` +
+            `This indicates corrupted files or interrupted write operation.`,
+        );
+      }
+
      let key: Buffer;
      if (metadata.version === "v2") {
        key = await this.systemCrypto.getDatabaseKey();
@@ -274,18 +475,43 @@ class DatabaseFileEncryption {
  }

  static isEncryptedDatabaseFile(filePath: string): boolean {
-    const metadataPath = `${filePath}${this.METADATA_FILE_SUFFIX}`;
-
-    if (!fs.existsSync(filePath) || !fs.existsSync(metadataPath)) {
+    if (!fs.existsSync(filePath)) {
      return false;
    }

+    const metadataPath = `${filePath}${this.METADATA_FILE_SUFFIX}`;
+    if (fs.existsSync(metadataPath)) {
+      try {
+        const metadataContent = fs.readFileSync(metadataPath, "utf8");
+        const metadata: EncryptedFileMetadata = JSON.parse(metadataContent);
+        return (
+          metadata.version === this.VERSION &&
+          metadata.algorithm === this.ALGORITHM
+        );
+      } catch {
+        return false;
+      }
+    }
+
    try {
-      const metadataContent = fs.readFileSync(metadataPath, "utf8");
-      const metadata: EncryptedFileMetadata = JSON.parse(metadataContent);
+      const fileBuffer = fs.readFileSync(filePath);
+      if (fileBuffer.length < 4) return false;
+
+      const metadataLength = fileBuffer.readUInt32BE(0);
+      const metadataEnd = 4 + metadataLength;
+
+      if (metadataLength <= 0 || metadataEnd > fileBuffer.length) {
+        return false;
+      }
+
+      const metadataJson = fileBuffer.slice(4, metadataEnd).toString("utf8");
+      const metadata: EncryptedFileMetadata = JSON.parse(metadataJson);
+
      return (
        metadata.version === this.VERSION &&
-        metadata.algorithm === this.ALGORITHM
+        metadata.algorithm === this.ALGORITHM &&
+        !!metadata.iv &&
+        !!metadata.tag
      );
    } catch {
      return false;
@@ -322,6 +548,125 @@ class DatabaseFileEncryption {
    }
  }

+  static getDiagnosticInfo(encryptedPath: string): {
+    dataFile: {
+      exists: boolean;
+      size?: number;
+      mtime?: string;
+      readable?: boolean;
+    };
+    metadataFile: {
+      exists: boolean;
+      size?: number;
+      mtime?: string;
+      readable?: boolean;
+      content?: EncryptedFileMetadata;
+    };
+    environment: {
+      dataDir: string;
+      envPath: string;
+      envFileExists: boolean;
+      envFileReadable: boolean;
+      hasEnvKey: boolean;
+      envKeyLength: number;
+    };
+    validation: {
+      filesConsistent: boolean;
+      sizeMismatch?: boolean;
+      expectedSize?: number;
+      actualSize?: number;
+    };
+  } {
+    const metadataPath = `${encryptedPath}${this.METADATA_FILE_SUFFIX}`;
+    const dataDir = process.env.DATA_DIR || "./db/data";
+    const envPath = path.join(dataDir, ".env");
+
+    const result: ReturnType<typeof this.getDiagnosticInfo> = {
+      dataFile: { exists: false },
+      metadataFile: { exists: false },
+      environment: {
+        dataDir,
+        envPath,
+        envFileExists: false,
+        envFileReadable: false,
+        hasEnvKey: !!process.env.DATABASE_KEY,
+        envKeyLength: process.env.DATABASE_KEY?.length || 0,
+      },
+      validation: {
+        filesConsistent: false,
+      },
+    };
+
+    try {
+      result.dataFile.exists = fs.existsSync(encryptedPath);
+      if (result.dataFile.exists) {
+        try {
+          fs.accessSync(encryptedPath, fs.constants.R_OK);
+          result.dataFile.readable = true;
+          const stats = fs.statSync(encryptedPath);
+          result.dataFile.size = stats.size;
+          result.dataFile.mtime = stats.mtime.toISOString();
+        } catch {
+          result.dataFile.readable = false;
+        }
+      }
+
+      result.metadataFile.exists = fs.existsSync(metadataPath);
+      if (result.metadataFile.exists) {
+        try {
+          fs.accessSync(metadataPath, fs.constants.R_OK);
+          result.metadataFile.readable = true;
+          const stats = fs.statSync(metadataPath);
+          result.metadataFile.size = stats.size;
+          result.metadataFile.mtime = stats.mtime.toISOString();
+
+          const content = fs.readFileSync(metadataPath, "utf8");
+          result.metadataFile.content = JSON.parse(content);
+        } catch {
+          result.metadataFile.readable = false;
+        }
+      }
+
+      result.environment.envFileExists = fs.existsSync(envPath);
+      if (result.environment.envFileExists) {
+        try {
+          fs.accessSync(envPath, fs.constants.R_OK);
+          result.environment.envFileReadable = true;
+        } catch (error) {}
+      }
+
+      if (
+        result.dataFile.exists &&
+        result.metadataFile.exists &&
+        result.metadataFile.content
+      ) {
+        result.validation.filesConsistent = true;
+
+        if (result.metadataFile.content.dataSize !== undefined) {
+          result.validation.expectedSize = result.metadataFile.content.dataSize;
+          result.validation.actualSize = result.dataFile.size;
+          result.validation.sizeMismatch =
+            result.metadataFile.content.dataSize !== result.dataFile.size;
+          if (result.validation.sizeMismatch) {
+            result.validation.filesConsistent = false;
+          }
+        }
+      }
+    } catch (error) {
+      databaseLogger.error("Failed to generate diagnostic info", error, {
+        operation: "diagnostic_info_failed",
+        encryptedPath,
+      });
+    }
+
+    databaseLogger.info("Database encryption diagnostic info", {
+      operation: "diagnostic_info_generated",
+      ...result,
+    });
+
+    return result;
+  }
+
  static async createEncryptedBackup(
    databasePath: string,
    backupDir: string,
--- a/src/backend/utils/lazy-field-encryption.ts
+++ b/src/backend/utils/lazy-field-encryption.ts
@@ -82,7 +82,7 @@ export class LazyFieldEncryption {
              legacyFieldName,
            );
            return decrypted;
-          } catch {}
+          } catch (error) {}
        }

        const sensitiveFields = [
@@ -174,7 +174,7 @@ export class LazyFieldEncryption {
              wasPlaintext: false,
              wasLegacyEncryption: true,
            };
-          } catch {}
+          } catch (error) {}
        }
        return {
          encrypted: fieldValue,
--- a/src/backend/utils/login-rate-limiter.ts
+++ b/src/backend/utils/login-rate-limiter.ts
@@ -0,0 +1,146 @@
+interface LoginAttempt {
+  count: number;
+  firstAttempt: number;
+  lockedUntil?: number;
+}
+
+class LoginRateLimiter {
+  private ipAttempts = new Map<string, LoginAttempt>();
+  private usernameAttempts = new Map<string, LoginAttempt>();
+
+  private readonly MAX_ATTEMPTS = 5;
+  private readonly WINDOW_MS = 10 * 60 * 1000;
+  private readonly LOCKOUT_MS = 10 * 60 * 1000;
+
+  constructor() {
+    setInterval(() => this.cleanup(), 5 * 60 * 1000);
+  }
+
+  private cleanup(): void {
+    const now = Date.now();
+
+    for (const [ip, attempt] of this.ipAttempts.entries()) {
+      if (attempt.lockedUntil && attempt.lockedUntil < now) {
+        this.ipAttempts.delete(ip);
+      } else if (
+        !attempt.lockedUntil &&
+        now - attempt.firstAttempt > this.WINDOW_MS
+      ) {
+        this.ipAttempts.delete(ip);
+      }
+    }
+
+    for (const [username, attempt] of this.usernameAttempts.entries()) {
+      if (attempt.lockedUntil && attempt.lockedUntil < now) {
+        this.usernameAttempts.delete(username);
+      } else if (
+        !attempt.lockedUntil &&
+        now - attempt.firstAttempt > this.WINDOW_MS
+      ) {
+        this.usernameAttempts.delete(username);
+      }
+    }
+  }
+
+  recordFailedAttempt(ip: string, username?: string): void {
+    const now = Date.now();
+
+    const ipAttempt = this.ipAttempts.get(ip);
+    if (!ipAttempt) {
+      this.ipAttempts.set(ip, {
+        count: 1,
+        firstAttempt: now,
+      });
+    } else if (now - ipAttempt.firstAttempt > this.WINDOW_MS) {
+      this.ipAttempts.set(ip, {
+        count: 1,
+        firstAttempt: now,
+      });
+    } else {
+      ipAttempt.count++;
+      if (ipAttempt.count >= this.MAX_ATTEMPTS) {
+        ipAttempt.lockedUntil = now + this.LOCKOUT_MS;
+      }
+    }
+
+    if (username) {
+      const userAttempt = this.usernameAttempts.get(username);
+      if (!userAttempt) {
+        this.usernameAttempts.set(username, {
+          count: 1,
+          firstAttempt: now,
+        });
+      } else if (now - userAttempt.firstAttempt > this.WINDOW_MS) {
+        this.usernameAttempts.set(username, {
+          count: 1,
+          firstAttempt: now,
+        });
+      } else {
+        userAttempt.count++;
+        if (userAttempt.count >= this.MAX_ATTEMPTS) {
+          userAttempt.lockedUntil = now + this.LOCKOUT_MS;
+        }
+      }
+    }
+  }
+
+  resetAttempts(ip: string, username?: string): void {
+    this.ipAttempts.delete(ip);
+    if (username) {
+      this.usernameAttempts.delete(username);
+    }
+  }
+
+  isLocked(
+    ip: string,
+    username?: string,
+  ): { locked: boolean; remainingTime?: number } {
+    const now = Date.now();
+
+    const ipAttempt = this.ipAttempts.get(ip);
+    if (ipAttempt?.lockedUntil && ipAttempt.lockedUntil > now) {
+      return {
+        locked: true,
+        remainingTime: Math.ceil((ipAttempt.lockedUntil - now) / 1000),
+      };
+    }
+
+    if (username) {
+      const userAttempt = this.usernameAttempts.get(username);
+      if (userAttempt?.lockedUntil && userAttempt.lockedUntil > now) {
+        return {
+          locked: true,
+          remainingTime: Math.ceil((userAttempt.lockedUntil - now) / 1000),
+        };
+      }
+    }
+
+    return { locked: false };
+  }
+
+  getRemainingAttempts(ip: string, username?: string): number {
+    const now = Date.now();
+    let minRemaining = this.MAX_ATTEMPTS;
+
+    const ipAttempt = this.ipAttempts.get(ip);
+    if (ipAttempt && now - ipAttempt.firstAttempt <= this.WINDOW_MS) {
+      const ipRemaining = Math.max(0, this.MAX_ATTEMPTS - ipAttempt.count);
+      minRemaining = Math.min(minRemaining, ipRemaining);
+    }
+
+    if (username) {
+      const userAttempt = this.usernameAttempts.get(username);
+      if (userAttempt && now - userAttempt.firstAttempt <= this.WINDOW_MS) {
+        const userRemaining = Math.max(
+          0,
+          this.MAX_ATTEMPTS - userAttempt.count,
+        );
+        minRemaining = Math.min(minRemaining, userRemaining);
+      }
+    }
+
+    return minRemaining;
+  }
+}
+
+export const loginRateLimiter = new LoginRateLimiter();
--- a/src/backend/utils/ssh-key-utils.ts
+++ b/src/backend/utils/ssh-key-utils.ts
@@ -1,4 +1,5 @@
 import ssh2Pkg from "ssh2";
+import { sshLogger } from "./logger.js";
 const ssh2Utils = ssh2Pkg.utils;

 function detectKeyTypeFromContent(keyContent: string): string {
@@ -84,7 +85,7 @@ function detectKeyTypeFromContent(keyContent: string): string {
      } else if (decodedString.includes("1.3.101.112")) {
        return "ssh-ed25519";
      }
-    } catch {}
+    } catch (error) {}

    if (content.length < 800) {
      return "ssh-ed25519";
@@ -140,7 +141,7 @@ function detectPublicKeyTypeFromContent(publicKeyContent: string): string {
      } else if (decodedString.includes("1.3.101.112")) {
        return "ssh-ed25519";
      }
-    } catch {}
+    } catch (error) {}

    if (content.length < 400) {
      return "ssh-ed25519";
@@ -242,7 +243,7 @@ export function parseSSHKey(

          useSSH2 = true;
        }
-      } catch {}
+      } catch (error) {}
    }

    if (!useSSH2) {
@@ -268,7 +269,7 @@ export function parseSSHKey(
          success: true,
        };
      }
-    } catch {}
+    } catch (error) {}

    return {
      privateKey: privateKeyData,
--- a/src/backend/utils/system-crypto.ts
+++ b/src/backend/utils/system-crypto.ts
@@ -51,17 +51,8 @@ class SystemCrypto {
            },
          );
        }
-      } catch (fileError) {
-        databaseLogger.warn("Failed to read .env file for JWT secret", {
-          operation: "jwt_init_file_read_failed",
-          error:
-            fileError instanceof Error ? fileError.message : "Unknown error",
-        });
-      }
+      } catch (fileError) {}

-      databaseLogger.warn("Generating new JWT secret", {
-        operation: "jwt_generating_new_secret",
-      });
      await this.generateAndGuideUser();
    } catch (error) {
      databaseLogger.error("Failed to initialize JWT secret", error, {
@@ -80,29 +71,44 @@ class SystemCrypto {

  async initializeDatabaseKey(): Promise<void> {
    try {
+      const dataDir = process.env.DATA_DIR || "./db/data";
+      const envPath = path.join(dataDir, ".env");
+
      const envKey = process.env.DATABASE_KEY;
      if (envKey && envKey.length >= 64) {
        this.databaseKey = Buffer.from(envKey, "hex");
+        const keyFingerprint = crypto
+          .createHash("sha256")
+          .update(this.databaseKey)
+          .digest("hex")
+          .substring(0, 16);
+
        return;
      }

-      const dataDir = process.env.DATA_DIR || "./db/data";
-      const envPath = path.join(dataDir, ".env");
-
      try {
        const envContent = await fs.readFile(envPath, "utf8");
        const dbKeyMatch = envContent.match(/^DATABASE_KEY=(.+)$/m);
        if (dbKeyMatch && dbKeyMatch[1] && dbKeyMatch[1].length >= 64) {
          this.databaseKey = Buffer.from(dbKeyMatch[1], "hex");
          process.env.DATABASE_KEY = dbKeyMatch[1];
+
+          const keyFingerprint = crypto
+            .createHash("sha256")
+            .update(this.databaseKey)
+            .digest("hex")
+            .substring(0, 16);
+
          return;
+        } else {
        }
-      } catch {}
+      } catch (fileError) {}

      await this.generateAndGuideDatabaseKey();
    } catch (error) {
      databaseLogger.error("Failed to initialize database key", error, {
        operation: "db_key_init_failed",
+        dataDir: process.env.DATA_DIR || "./db/data",
      });
      throw new Error("Database key initialization failed");
    }
@@ -134,7 +140,7 @@ class SystemCrypto {
          process.env.INTERNAL_AUTH_TOKEN = tokenMatch[1];
          return;
        }
-      } catch {}
+      } catch (error) {}

      await this.generateAndGuideInternalAuthToken();
    } catch (error) {
--- a/src/backend/utils/user-crypto.ts
+++ b/src/backend/utils/user-crypto.ts
@@ -21,8 +21,8 @@ interface EncryptedDEK {

 interface UserSession {
  dataKey: Buffer;
-  lastActivity: number;
  expiresAt: number;
+  lastActivity?: number;
 }

 class UserCrypto {
@@ -33,8 +33,6 @@ class UserCrypto {
  private static readonly PBKDF2_ITERATIONS = 100000;
  private static readonly KEK_LENGTH = 32;
  private static readonly DEK_LENGTH = 32;
-  private static readonly SESSION_DURATION = 24 * 60 * 60 * 1000;
-  private static readonly MAX_INACTIVITY = 6 * 60 * 60 * 1000;

  private constructor() {
    setInterval(
@@ -69,7 +67,10 @@ class UserCrypto {
    DEK.fill(0);
  }

-  async setupOIDCUserEncryption(userId: string): Promise<void> {
+  async setupOIDCUserEncryption(
+    userId: string,
+    sessionDurationMs: number,
+  ): Promise<void> {
    const existingEncryptedDEK = await this.getEncryptedDEK(userId);

    let DEK: Buffer;
@@ -104,14 +105,17 @@ class UserCrypto {
    const now = Date.now();
    this.userSessions.set(userId, {
      dataKey: Buffer.from(DEK),
-      lastActivity: now,
-      expiresAt: now + UserCrypto.SESSION_DURATION,
+      expiresAt: now + sessionDurationMs,
    });

    DEK.fill(0);
  }

-  async authenticateUser(userId: string, password: string): Promise<boolean> {
+  async authenticateUser(
+    userId: string,
+    password: string,
+    sessionDurationMs: number,
+  ): Promise<boolean> {
    try {
      const kekSalt = await this.getKEKSalt(userId);
      if (!kekSalt) return false;
@@ -144,8 +148,7 @@ class UserCrypto {

      this.userSessions.set(userId, {
        dataKey: Buffer.from(DEK),
-        lastActivity: now,
-        expiresAt: now + UserCrypto.SESSION_DURATION,
+        expiresAt: now + sessionDurationMs,
      });

      DEK.fill(0);
@@ -161,13 +164,49 @@ class UserCrypto {
    }
  }

-  async authenticateOIDCUser(userId: string): Promise<boolean> {
+  async authenticateOIDCUser(
+    userId: string,
+    sessionDurationMs: number,
+  ): Promise<boolean> {
    try {
+      const oidcEncryptedDEK = await this.getOIDCEncryptedDEK(userId);
+
+      if (oidcEncryptedDEK) {
+        const systemKey = this.deriveOIDCSystemKey(userId);
+        const DEK = this.decryptDEK(oidcEncryptedDEK, systemKey);
+        systemKey.fill(0);
+
+        if (!DEK || DEK.length === 0) {
+          databaseLogger.error(
+            "Failed to decrypt OIDC DEK for dual-auth user",
+            {
+              operation: "oidc_auth_dual_decrypt_failed",
+              userId,
+            },
+          );
+          return false;
+        }
+
+        const now = Date.now();
+        const oldSession = this.userSessions.get(userId);
+        if (oldSession) {
+          oldSession.dataKey.fill(0);
+        }
+
+        this.userSessions.set(userId, {
+          dataKey: Buffer.from(DEK),
+          expiresAt: now + sessionDurationMs,
+        });
+
+        DEK.fill(0);
+        return true;
+      }
+
      const kekSalt = await this.getKEKSalt(userId);
      const encryptedDEK = await this.getEncryptedDEK(userId);

      if (!kekSalt || !encryptedDEK) {
-        await this.setupOIDCUserEncryption(userId);
+        await this.setupOIDCUserEncryption(userId, sessionDurationMs);
        return true;
      }

@@ -176,7 +215,7 @@ class UserCrypto {
      systemKey.fill(0);

      if (!DEK || DEK.length === 0) {
-        await this.setupOIDCUserEncryption(userId);
+        await this.setupOIDCUserEncryption(userId, sessionDurationMs);
        return true;
      }

@@ -189,15 +228,19 @@ class UserCrypto {

      this.userSessions.set(userId, {
        dataKey: Buffer.from(DEK),
-        lastActivity: now,
-        expiresAt: now + UserCrypto.SESSION_DURATION,
+        expiresAt: now + sessionDurationMs,
      });

      DEK.fill(0);

      return true;
-    } catch {
-      await this.setupOIDCUserEncryption(userId);
+    } catch (error) {
+      databaseLogger.error("OIDC authentication failed", error, {
+        operation: "oidc_auth_error",
+        userId,
+        error: error instanceof Error ? error.message : "Unknown",
+      });
+      await this.setupOIDCUserEncryption(userId, sessionDurationMs);
      return true;
    }
  }
@@ -219,16 +262,6 @@ class UserCrypto {
      return null;
    }

-    if (now - session.lastActivity > UserCrypto.MAX_INACTIVITY) {
-      this.userSessions.delete(userId);
-      session.dataKey.fill(0);
-      if (this.sessionExpiredCallback) {
-        this.sessionExpiredCallback(userId);
-      }
-      return null;
-    }
-
-    session.lastActivity = now;
    return session.dataKey;
  }

@@ -331,6 +364,83 @@ class UserCrypto {
    }
  }

+  /**
+   * Convert a password-based user's encryption to DUAL-AUTH encryption.
+   * This is used when linking an OIDC account to a password account for dual-auth.
+   *
+   * IMPORTANT: This does NOT delete the password-based KEK salt!
+   * The user needs to maintain BOTH password and OIDC authentication methods.
+   * We keep the password KEK salt so password login still works.
+   * We also store the DEK encrypted with OIDC system key for OIDC login.
+   */
+  async convertToOIDCEncryption(userId: string): Promise<void> {
+    try {
+      const existingEncryptedDEK = await this.getEncryptedDEK(userId);
+      const existingKEKSalt = await this.getKEKSalt(userId);
+
+      if (!existingEncryptedDEK && !existingKEKSalt) {
+        databaseLogger.warn("No existing encryption to convert for user", {
+          operation: "convert_to_oidc_encryption_skip",
+          userId,
+        });
+        return;
+      }
+
+      const existingDEK = this.getUserDataKey(userId);
+
+      if (!existingDEK) {
+        throw new Error(
+          "Cannot convert to OIDC encryption - user session not active. Please log in with password first.",
+        );
+      }
+
+      const systemKey = this.deriveOIDCSystemKey(userId);
+      const oidcEncryptedDEK = this.encryptDEK(existingDEK, systemKey);
+      systemKey.fill(0);
+
+      const key = `user_encrypted_dek_oidc_${userId}`;
+      const value = JSON.stringify(oidcEncryptedDEK);
+
+      const { getDb } = await import("../database/db/index.js");
+      const { settings } = await import("../database/db/schema.js");
+      const { eq } = await import("drizzle-orm");
+
+      const existing = await getDb()
+        .select()
+        .from(settings)
+        .where(eq(settings.key, key));
+
+      if (existing.length > 0) {
+        await getDb()
+          .update(settings)
+          .set({ value })
+          .where(eq(settings.key, key));
+      } else {
+        await getDb().insert(settings).values({ key, value });
+      }
+
+      databaseLogger.info(
+        "Converted user encryption to dual-auth (password + OIDC)",
+        {
+          operation: "convert_to_oidc_encryption_preserved",
+          userId,
+        },
+      );
+
+      const { saveMemoryDatabaseToFile } = await import(
+        "../database/db/index.js"
+      );
+      await saveMemoryDatabaseToFile();
+    } catch (error) {
+      databaseLogger.error("Failed to convert to OIDC encryption", error, {
+        operation: "convert_to_oidc_encryption_error",
+        userId,
+        error: error instanceof Error ? error.message : "Unknown error",
+      });
+      throw error;
+    }
+  }
+
  private async validatePassword(
    userId: string,
    password: string,
@@ -359,10 +469,7 @@ class UserCrypto {
    const expiredUsers: string[] = [];

    for (const [userId, session] of this.userSessions.entries()) {
-      if (
-        now > session.expiresAt ||
-        now - session.lastActivity > UserCrypto.MAX_INACTIVITY
-      ) {
+      if (now > session.expiresAt) {
        session.dataKey.fill(0);
        expiredUsers.push(userId);
      }
@@ -512,6 +619,26 @@ class UserCrypto {
      return null;
    }
  }
+
+  private async getOIDCEncryptedDEK(
+    userId: string,
+  ): Promise<EncryptedDEK | null> {
+    try {
+      const key = `user_encrypted_dek_oidc_${userId}`;
+      const result = await getDb()
+        .select()
+        .from(settings)
+        .where(eq(settings.key, key));
+
+      if (result.length === 0) {
+        return null;
+      }
+
+      return JSON.parse(result[0].value);
+    } catch {
+      return null;
+    }
+  }
 }

 export { UserCrypto, type KEKSalt, type EncryptedDEK };
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -6,7 +6,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "@/lib/utils";

 const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all duration-100 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive active:scale-95",
  {
    variants: {
      variant: {
--- a/src/components/ui/command.tsx
+++ b/src/components/ui/command.tsx
@@ -0,0 +1,184 @@
+"use client";
+
+import * as React from "react";
+import { Command as CommandPrimitive } from "cmdk";
+import { SearchIcon } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+
+function Command({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive>) {
+  return (
+    <CommandPrimitive
+      data-slot="command"
+      className={cn(
+        "bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandDialog({
+  title = "Command Palette",
+  description = "Search for a command to run...",
+  children,
+  className,
+  showCloseButton = true,
+  ...props
+}: React.ComponentProps<typeof Dialog> & {
+  title?: string;
+  description?: string;
+  className?: string;
+  showCloseButton?: boolean;
+}) {
+  return (
+    <Dialog {...props}>
+      <DialogHeader className="sr-only">
+        <DialogTitle>{title}</DialogTitle>
+        <DialogDescription>{description}</DialogDescription>
+      </DialogHeader>
+      <DialogContent
+        className={cn("overflow-hidden p-0", className)}
+        showCloseButton={showCloseButton}
+      >
+        <Command className="[&_[cmdk-group-heading]]:text-muted-foreground **:data-[slot=command-input-wrapper]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+          {children}
+        </Command>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+function CommandInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Input>) {
+  return (
+    <div
+      data-slot="command-input-wrapper"
+      className="flex h-9 items-center gap-2 border-b px-3"
+    >
+      <SearchIcon className="size-4 shrink-0 opacity-50" />
+      <CommandPrimitive.Input
+        data-slot="command-input"
+        className={cn(
+          "placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50",
+          className,
+        )}
+        {...props}
+      />
+    </div>
+  );
+}
+
+function CommandList({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.List>) {
+  return (
+    <CommandPrimitive.List
+      data-slot="command-list"
+      className={cn(
+        "max-h-[300px] scroll-py-1 overflow-x-hidden overflow-y-auto",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandEmpty({
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Empty>) {
+  return (
+    <CommandPrimitive.Empty
+      data-slot="command-empty"
+      className="py-6 text-center text-sm"
+      {...props}
+    />
+  );
+}
+
+function CommandGroup({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Group>) {
+  return (
+    <CommandPrimitive.Group
+      data-slot="command-group"
+      className={cn(
+        "text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Separator>) {
+  return (
+    <CommandPrimitive.Separator
+      data-slot="command-separator"
+      className={cn("bg-border -mx-1 h-px", className)}
+      {...props}
+    />
+  );
+}
+
+function CommandItem({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Item>) {
+  return (
+    <CommandPrimitive.Item
+      data-slot="command-item"
+      className={cn(
+        "data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandShortcut({
+  className,
+  ...props
+}: React.ComponentProps<"span">) {
+  return (
+    <span
+      data-slot="command-shortcut"
+      className={cn(
+        "text-muted-foreground ml-auto text-xs tracking-widest",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  Command,
+  CommandDialog,
+  CommandInput,
+  CommandList,
+  CommandEmpty,
+  CommandGroup,
+  CommandItem,
+  CommandShortcut,
+  CommandSeparator,
+};
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -0,0 +1,141 @@
+import * as React from "react";
+import * as DialogPrimitive from "@radix-ui/react-dialog";
+import { XIcon } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+
+function Dialog({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Root>) {
+  return <DialogPrimitive.Root data-slot="dialog" {...props} />;
+}
+
+function DialogTrigger({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
+  return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
+}
+
+function DialogPortal({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Portal>) {
+  return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
+}
+
+function DialogClose({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Close>) {
+  return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
+}
+
+function DialogOverlay({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
+  return (
+    <DialogPrimitive.Overlay
+      data-slot="dialog-overlay"
+      className={cn(
+        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function DialogContent({
+  className,
+  children,
+  showCloseButton = true,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Content> & {
+  showCloseButton?: boolean;
+}) {
+  return (
+    <DialogPortal data-slot="dialog-portal">
+      <DialogOverlay />
+      <DialogPrimitive.Content
+        data-slot="dialog-content"
+        className={cn(
+          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
+          className,
+        )}
+        {...props}
+      >
+        {children}
+        {showCloseButton && (
+          <DialogPrimitive.Close
+            data-slot="dialog-close"
+            className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
+          >
+            <XIcon />
+            <span className="sr-only">Close</span>
+          </DialogPrimitive.Close>
+        )}
+      </DialogPrimitive.Content>
+    </DialogPortal>
+  );
+}
+
+function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="dialog-header"
+      className={cn("flex flex-col gap-2 text-center sm:text-left", className)}
+      {...props}
+    />
+  );
+}
+
+function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="dialog-footer"
+      className={cn(
+        "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function DialogTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+  return (
+    <DialogPrimitive.Title
+      data-slot="dialog-title"
+      className={cn("text-lg leading-none font-semibold", className)}
+      {...props}
+    />
+  );
+}
+
+function DialogDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+  return (
+    <DialogPrimitive.Description
+      data-slot="dialog-description"
+      className={cn("text-muted-foreground text-sm", className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+};
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<"input">) {
      type={type}
      data-slot="input"
      className={cn(
-        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] duration-200 outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
        "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
        "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
        className,
--- a/src/components/ui/kbd.tsx
+++ b/src/components/ui/kbd.tsx
@@ -0,0 +1,28 @@
+import { cn } from "@/lib/utils";
+
+function Kbd({ className, ...props }: React.ComponentProps<"kbd">) {
+  return (
+    <kbd
+      data-slot="kbd"
+      className={cn(
+        "bg-muted text-muted-foreground pointer-events-none inline-flex h-5 w-fit min-w-5 items-center justify-center gap-1 rounded-sm px-1 font-sans text-xs font-medium select-none",
+        "[&_svg:not([class*='size-'])]:size-3",
+        "[[data-slot=tooltip-content]_&]:bg-background/20 [[data-slot=tooltip-content]_&]:text-background dark:[[data-slot=tooltip-content]_&]:bg-background/10",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function KbdGroup({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <kbd
+      data-slot="kbd-group"
+      className={cn("inline-flex items-center gap-1", className)}
+      {...props}
+    />
+  );
+}
+
+export { Kbd, KbdGroup };
--- a/src/components/ui/tabs.tsx
+++ b/src/components/ui/tabs.tsx
@@ -40,7 +40,7 @@ function TabsTrigger({
    <TabsPrimitive.Trigger
      data-slot="tabs-trigger"
      className={cn(
-        "data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] duration-200 focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
        className,
      )}
      {...props}
@@ -55,7 +55,13 @@ function TabsContent({
  return (
    <TabsPrimitive.Content
      data-slot="tabs-content"
-      className={cn("flex-1 outline-none", className)}
+      className={cn(
+        "flex-1 outline-none",
+        "data-[state=active]:animate-in data-[state=inactive]:animate-out",
+        "data-[state=inactive]:fade-out-0 data-[state=active]:fade-in-0",
+        "duration-150",
+        className,
+      )}
      {...props}
    />
  );
--- a/src/constants/terminal-themes.ts
+++ b/src/constants/terminal-themes.ts
@@ -617,7 +617,6 @@ export const TERMINAL_THEMES: Record<string, TerminalTheme> = {
  },
 };

-// Font families available for terminal
 export const TERMINAL_FONTS = [
  {
    value: "Caskaydia Cove Nerd Font Mono",
--- a/src/i18n/i18n.ts
+++ b/src/i18n/i18n.ts
@@ -7,12 +7,13 @@ import zhTranslation from "../locales/zh/translation.json";
 import deTranslation from "../locales/de/translation.json";
 import ptbrTranslation from "../locales/pt-BR/translation.json";
 import ruTranslation from "../locales/ru/translation.json";
+import frTranslation from "../locales/fr/translation.json";

 i18n
  .use(LanguageDetector)
  .use(initReactI18next)
  .init({
-    supportedLngs: ["en", "zh", "de", "ptbr", "ru"],
+    supportedLngs: ["en", "zh", "de", "ptbr", "ru", "fr"],
    fallbackLng: "en",
    debug: false,

@@ -40,6 +41,9 @@ i18n
      ru: {
        translation: ruTranslation,
      },
+      fr: {
+        translation: frTranslation,
+      },
    },

    interpolation: {
--- a/src/locales/de/translation.json
+++ b/src/locales/de/translation.json
@@ -187,11 +187,25 @@
    "commandsWillBeSent": "Befehle werden an {{count}} ausgewählte Terminals gesendet.",
    "settings": "Einstellungen",
    "enableRightClickCopyPaste": "Rechtsklick-Kopieren\/Einfügen aktivieren",
-    "shareIdeas": "Haben Sie Ideen, was als nächstes für SSH-Tools kommen sollte? Teilen Sie diese mit uns"
+    "shareIdeas": "Haben Sie Vorschläge welche weiteren SSH-Tools ergänzt werden sollen? Dann teilen Sie diese gerne mit uns auf"
+  },
+  "commandHistory": {
+    "title": "Verlauf",
+    "searchPlaceholder": "Befehle suchen...",
+    "noTerminal": "Kein aktives Terminal",
+    "noTerminalHint": "Öffnen Sie ein Terminal, um dessen Befehlsverlauf anzuzeigen.",
+    "empty": "Noch kein Befehlsverlauf",
+    "emptyHint": "Führen Sie Befehle im aktiven Terminal aus, um einen Verlauf zu erstellen.",
+    "noResults": "Keine Befehle gefunden",
+    "noResultsHint": "Keine Befehle mit \"{{query}}\" gefunden",
+    "deleteSuccess": "Befehl aus Verlauf gelöscht",
+    "deleteFailed": "Befehl konnte nicht gelöscht werden.",
+    "deleteTooltip": "Befehl löschen",
+    "tabHint": "Verwenden Sie Tab im Terminal, um aus dem Befehlsverlauf zu vervollständigen"
  },
  "homepage": {
    "loggedInTitle": "Eingeloggt!",
-    "loggedInMessage": "Sie sind angemeldet! Über die Seitenleiste haben Sie Zugriff auf alle verfügbaren Tools. Erstellen Sie zunächst einen SSH-Host im Tab „SSH-Manager“. Anschließend können Sie sich über die anderen Apps in der Seitenleiste mit diesem Host verbinden.",
+    "loggedInMessage": "Sie sind angemeldet! Über die Seitenleiste haben Sie Zugriff auf alle verfügbaren Tools. Erstellen Sie zunächst einen SSH-Host im Tab SSH-Manager. Anschließend können Sie sich über die anderen Apps in der Seitenleiste mit diesem Host verbinden.",
    "failedToLoadAlerts": "Warnmeldungen konnten nicht geladen werden",
    "failedToDismissAlert": "Benachrichtigung konnte nicht geschlossen werden"
  },
@@ -295,6 +309,7 @@
    "submit": "Senden",
    "change": "Ändern",
    "save": "Speichern",
+    "saving": "Speichern...",
    "delete": "Löschen",
    "edit": "Bearbeiten",
    "add": "Hinzufügen",
@@ -355,7 +370,7 @@
    "tabNavigation": "Registerkarte Navigation"
  },
  "admin": {
-    "title": "Administratoreinstellungen",
+    "title": "Admin-Einstellungen",
    "oidc": "OIDC",
    "users": "Benutzer",
    "userManagement": "Benutzerverwaltung",
@@ -390,11 +405,11 @@
    "actions": "Aktionen",
    "external": "Extern",
    "local": "Lokal",
-    "adminManagement": "Verwaltung von Administratoren",
+    "adminManagement": "Admin Verwaltung",
    "makeUserAdmin": "Benutzer zum Administrator machen",
    "adding": "Hinzufügen...",
    "currentAdmins": "Aktuelle Administratoren",
-    "adminBadge": "Administrator",
+    "adminBadge": "Admin",
    "removeAdminButton": "Administrator entfernen",
    "general": "Allgemein",
    "userRegistration": "Benutzerregistrierung",
@@ -416,6 +431,13 @@
    "userDeletedSuccessfully": "Benutzer {{username}} wurde erfolgreich gelöscht",
    "failedToDeleteUser": "Benutzer konnte nicht gelöscht werden",
    "overrideUserInfoUrl": "URL für Benutzerinformationen überschreiben (nicht erforderlich)",
+    "failedToFetchSessions": "Fehler beim Abrufen der Sitzungen",
+    "sessionRevokedSuccessfully": "Sitzung erfolgreich widerrufen",
+    "failedToRevokeSession": "Sitzung konnte nicht widerrufen werden",
+    "confirmRevokeSession": "Möchten Sie diese Sitzung wirklich beenden?",
+    "confirmRevokeAllSessions": "Möchten Sie wirklich alle Sitzungen dieses Benutzers beenden?",
+    "failedToRevokeSessions": "Sitzungen konnten nicht widerrufen werden",
+    "sessionsRevokedSuccessfully": "Sitzungen erfolgreich beendet",
    "databaseSecurity": "Datenbanksicherheit",
    "encryptionStatus": "Verschlüsselungsstatus",
    "encryptionEnabled": "Verschlüsselung aktiviert",
@@ -620,7 +642,7 @@
    "autoStartContainer": "Automatischer Start beim Container-Start",
    "autoStartDesc": "Diesen Tunnel beim Start des Containers automatisch starten",
    "addConnection": "Tunnelverbindung hinzufügen",
-    "sshpassRequired": "Sshpass erforderlich für die Passwort-Authentifizierung",
+    "sshpassRequired": "sshpass erforderlich für die Passwort-Authentifizierung",
    "sshpassRequiredDesc": "Für die Passwortauthentifizierung in Tunneln muss sshpass auf dem System installiert sein.",
    "otherInstallMethods": "Andere Installationsmethoden:",
    "debianUbuntuEquivalent": "(Debian\/Ubuntu) oder das entsprechende Pendant für Ihr Betriebssystem.",
@@ -699,11 +721,85 @@
    "statusMonitoring": "Status",
    "metricsMonitoring": "Metriken",
    "terminalCustomizationNotice": "Hinweis: Terminal-Anpassungen funktionieren nur in der Desktop-Website-Version. Mobile und Electron-Apps verwenden die Standard-Terminaleinstellungen des Systems.",
+    "terminalCustomization": "Terminal-Anpassung",
+    "appearance": "Aussehen",
+    "behavior": "Verhalten",
+    "advanced": "Erweitert",
+    "themePreview": "Themen-Vorschau",
+    "theme": "Thema",
+    "selectTheme": "Thema auswählen",
+    "chooseColorTheme": "Wählen Sie ein Farbthema für das Terminal",
+    "fontFamily": "Schriftfamilie",
+    "selectFont": "Schriftart auswählen",
+    "selectFontDesc": "Wählen Sie die im Terminal zu verwendende Schriftart",
+    "fontSize": "Schriftgröße",
+    "fontSizeValue": "Schriftgröße: {{value}}px",
+    "adjustFontSize": "Terminal-Schriftgröße anpassen",
+    "letterSpacing": "Zeichenabstand",
+    "letterSpacingValue": "Zeichenabstand: {{value}}px",
+    "adjustLetterSpacing": "Abstand zwischen Zeichen anpassen",
+    "lineHeight": "Zeilenhöhe",
+    "lineHeightValue": "Zeilenhöhe: {{value}}",
+    "adjustLineHeight": "Abstand zwischen Zeilen anpassen",
+    "cursorStyle": "Cursor-Stil",
+    "selectCursorStyle": "Cursor-Stil auswählen",
+    "cursorStyleBlock": "Block",
+    "cursorStyleUnderline": "Unterstrich",
+    "cursorStyleBar": "Balken",
+    "chooseCursorAppearance": "Cursor-Erscheinungsbild wählen",
+    "cursorBlink": "Cursor-Blinken",
+    "enableCursorBlink": "Cursor-Blinkanimation aktivieren",
+    "scrollbackBuffer": "Rückwärts-Puffer",
+    "scrollbackBufferValue": "Rückwärts-Puffer: {{value}} Zeilen",
+    "scrollbackBufferDesc": "Anzahl der Zeilen im Rückwärtsverlauf",
+    "bellStyle": "Signalton-Stil",
+    "selectBellStyle": "Signalton-Stil auswählen",
+    "bellStyleNone": "Keine",
+    "bellStyleSound": "Ton",
+    "bellStyleVisual": "Visuell",
+    "bellStyleBoth": "Beides",
+    "bellStyleDesc": "Behandlung des Terminal-Signaltons (BEL-Zeichen, \\x07). Programme lösen dies aus, wenn Aufgaben abgeschlossen werden, Fehler auftreten oder für Benachrichtigungen. \"Ton\" spielt einen akustischen Signalton ab, \"Visuell\" lässt den Bildschirm kurz aufblinken, \"Beides\" macht beides, \"Keine\" deaktiviert Signalton-Benachrichtigungen.",
+    "rightClickSelectsWord": "Rechtsklick wählt Wort",
+    "rightClickSelectsWordDesc": "Rechtsklick wählt das Wort unter dem Cursor aus",
+    "fastScrollModifier": "Schnellscroll-Modifikator",
+    "selectModifier": "Modifikator auswählen",
+    "modifierAlt": "Alt",
+    "modifierCtrl": "Strg",
+    "modifierShift": "Umschalt",
+    "fastScrollModifierDesc": "Modifikatortaste für schnelles Scrollen",
+    "fastScrollSensitivity": "Schnellscroll-Empfindlichkeit",
+    "fastScrollSensitivityValue": "Schnellscroll-Empfindlichkeit: {{value}}",
+    "fastScrollSensitivityDesc": "Scroll-Geschwindigkeitsmultiplikator bei gedrücktem Modifikator",
+    "minimumContrastRatio": "Minimales Kontrastverhältnis",
+    "minimumContrastRatioValue": "Minimales Kontrastverhältnis: {{value}}",
+    "minimumContrastRatioDesc": "Farben automatisch für bessere Lesbarkeit anpassen",
+    "sshAgentForwarding": "SSH-Agent-Weiterleitung",
+    "sshAgentForwardingDesc": "SSH-Authentifizierungsagent an Remote-Host weiterleiten",
+    "backspaceMode": "Rücktaste-Modus",
+    "selectBackspaceMode": "Rücktaste-Modus auswählen",
+    "backspaceModeNormal": "Normal (DEL)",
+    "backspaceModeControlH": "Control-H (^H)",
+    "backspaceModeDesc": "Rücktasten-Verhalten für Kompatibilität",
+    "startupSnippet": "Start-Snippet",
+    "selectSnippet": "Snippet auswählen",
+    "searchSnippets": "Snippets durchsuchen...",
+    "snippetNone": "Keine",
    "noneAuthTitle": "Keyboard-Interactive-Authentifizierung",
    "noneAuthDescription": "Diese Authentifizierungsmethode verwendet beim Herstellen der Verbindung zum SSH-Server die Keyboard-Interactive-Authentifizierung.",
    "noneAuthDetails": "Keyboard-Interactive-Authentifizierung ermöglicht dem Server, Sie während der Verbindung zur Eingabe von Anmeldeinformationen aufzufordern. Dies ist nützlich für Server, die eine Multi-Faktor-Authentifizierung oder eine dynamische Passworteingabe erfordern.",
    "forceKeyboardInteractive": "Tastatur-Interaktiv erzwingen",
-    "forceKeyboardInteractiveDesc": "Erzwingt die Verwendung der tastatur-interaktiven Authentifizierung. Dies ist oft für Server erforderlich, die eine Zwei-Faktor-Authentifizierung (TOTP/2FA) verwenden."
+    "forceKeyboardInteractiveDesc": "Erzwingt die Verwendung der tastatur-interaktiven Authentifizierung. Dies ist oft für Server erforderlich, die eine Zwei-Faktor-Authentifizierung (TOTP/2FA) verwenden.",
+    "overrideCredentialUsername": "Benutzernamen der Anmeldedaten überschreiben",
+    "overrideCredentialUsernameDesc": "Verwenden Sie einen anderen Benutzernamen als den, der in den Anmeldedaten gespeichert ist. Dadurch können Sie dieselben Anmeldedaten mit unterschiedlichen Benutzernamen verwenden.",
+    "jumpHosts": "Jump-Hosts",
+    "jumpHostsDescription": "Jump-Hosts (auch bekannt als Bastion-Hosts) ermöglichen es Ihnen, sich über einen oder mehrere Zwischen-Server mit einem Ziel-Server zu verbinden. Dies ist nützlich für den Zugriff auf Server hinter Firewalls oder in privaten Netzwerken.",
+    "jumpHostChain": "Jump-Host-Kette",
+    "addJumpHost": "Jump-Host hinzufügen",
+    "selectServer": "Server auswählen",
+    "searchServers": "Server durchsuchen...",
+    "noServerFound": "Kein Server gefunden",
+    "jumpHostsOrder": "Verbindungen werden in dieser Reihenfolge hergestellt: Jump-Host 1 → Jump-Host 2 → ... → Ziel-Server",
+    "advancedAuthSettings": "Erweiterte Authentifizierungseinstellungen"
  },
  "terminal": {
    "title": "Terminal",
@@ -819,6 +915,8 @@
    "copy": "Kopieren",
    "cut": "Ausschneiden",
    "paste": "Einfügen",
+    "copyPath": "Pfad kopieren",
+    "copyPaths": "Pfade kopieren",
    "delete": "Löschen",
    "properties": "Eigenschaften",
    "refresh": "Aktualisieren",
@@ -828,6 +926,9 @@
    "deleteFiles": "{{count}} Element(e) löschen",
    "filesCopiedToClipboard": "{{count}} Element(e) in die Zwischenablage kopiert",
    "filesCutToClipboard": "{{count}} Element(e) in die Zwischenablage ausschneiden",
+    "pathCopiedToClipboard": "Pfad in Zwischenablage kopiert",
+    "pathsCopiedToClipboard": "{{count}} Pfade in Zwischenablage kopiert",
+    "failedToCopyPath": "Fehler beim Kopieren des Pfades in die Zwischenablage",
    "movedItems": "{{count}} Element(e) verschoben",
    "failedToDeleteItem": "Das Löschen des Elements ist fehlgeschlagen.",
    "itemRenamedSuccessfully": "{{type}} erfolgreich umbenannt",
@@ -1072,7 +1173,7 @@
    "used": "Gebraucht",
    "percentage": "Prozentsatz",
    "refreshStatusAndMetrics": "Aktualisierungsstatus und Metriken",
-    "refreshStatus": "Aktualisierungsstatus",
+    "refreshStatus": "Aktualisieren",
    "fileManagerAlreadyOpen": "Der Dateimanager ist für diesen Host bereits geöffnet",
    "openFileManager": "Dateimanager öffnen",
    "cpuCores_one": "{{count}} CPU",
@@ -1081,9 +1182,10 @@
    "loadAverageNA": "Durchschnitt: N\/A",
    "cpuUsage": "CPU-Auslastung",
    "memoryUsage": "Speicherauslastung",
+    "diskUsage": "Festplattennutzung",
    "rootStorageSpace": "Root-Speicherplatz",
    "of": "von",
-    "feedbackMessage": "Haben Sie Ideen für die nächsten Schritte im Bereich der Serververwaltung? Teilen Sie diese mit uns",
+    "feedbackMessage": "Haben Sie Ideen, wie es bei der Serververwaltung weitergehen könnte? Dann teilen Sie diese gerne mit uns auf",
    "failedToFetchHostConfig": "Abrufen der Hostkonfiguration fehlgeschlagen",
    "failedToFetchStatus": "Abrufen des Serverstatus fehlgeschlagen",
    "failedToFetchMetrics": "Abrufen der Servermetriken fehlgeschlagen",
@@ -1092,9 +1194,40 @@
    "refreshing": "Aktualisieren...",
    "serverOffline": "Server offline",
    "cannotFetchMetrics": "Metriken können nicht vom Offline-Server abgerufen werden",
-    "load": "Laden"
+    "load": "Last",
+    "available": "Verfügbar",
+    "editLayout": "Layout anpassen",
+    "cancelEdit": "Abbrechen",
+    "addWidget": "Widget hinzufügen",
+    "saveLayout": "Layout speichern",
+    "unsavedChanges": "Ungespeicherte Änderungen",
+    "layoutSaved": "Layout erfolgreich gespeichert",
+    "failedToSaveLayout": "Speichern des Layout fehlgeschlagen",
+    "systemInfo": "System Information",
+    "hostname": "Hostname",
+    "operatingSystem": "Betriebssystem",
+    "kernel": "Kernel",
+    "totalUptime": "Gesamte Betriebszeit",
+    "seconds": "Sekunden",
+    "networkInterfaces": "Netzwerkschnittstellen",
+    "noInterfacesFound": "Keine Netzwerkschnittstellen gefunden",
+    "totalProcesses": "Gesamtprozesse",
+    "running": "läuft",
+    "noProcessesFound": "Keine Prozesse gefunden",
+    "loginStats": "SSH-Anmeldestatistiken",
+    "totalLogins": "Gesamtanmeldungen",
+    "uniqueIPs": "Eindeutige IPs",
+    "recentSuccessfulLogins": "Letzte erfolgreiche Anmeldungen",
+    "recentFailedAttempts": "Letzte fehlgeschlagene Versuche",
+    "noRecentLoginData": "Keine aktuellen Anmeldedaten",
+    "from": "von"
  },
  "auth": {
+    "tagline": "SSH SERVER MANAGER",
+    "description": "Sichere, leistungsstarke und intuitive SSH-Verbindungsverwaltung",
+    "welcomeBack": "Willkommen zurück bei TERMIX",
+    "createAccount": "Erstellen Sie Ihr TERMIX-Konto",
+    "continueExternal": "Mit externem Anbieter fortfahren",
    "loginTitle": "Melden Sie sich bei Termix an",
    "registerTitle": "Benutzerkonto erstellen",
    "loginButton": "Anmelden",
@@ -1260,6 +1393,10 @@
    "local": "Lokal",
    "external": "Extern (OIDC)",
    "selectPreferredLanguage": "Wählen Sie Ihre bevorzugte Sprache für die Benutzeroberfläche",
+    "fileColorCoding": "Dateifarb-Codierung",
+    "fileColorCodingDesc": "Farbcodierung von Dateien nach Typ: Ordner (rot), Dateien (blau), Symlinks (grün)",
+    "commandAutocomplete": "Befehlsautovervollständigung",
+    "commandAutocompleteDesc": "Tab-Taste Autovervollständigung für Terminal-Befehle basierend auf Ihrem Befehlsverlauf aktivieren",
    "currentPassword": "Aktuelles Passwort",
    "passwordChangedSuccess": "Passwort erfolgreich geändert! Bitte melden Sie sich erneut an.",
    "failedToChangePassword": "Passwort konnte nicht geändert werden. Bitte überprüfen Sie Ihr aktuelles Passwort und versuchen Sie es erneut."
@@ -1372,7 +1509,7 @@
    "disconnected": "Getrennt",
    "maxRetriesExhausted": "Maximale Wiederholungsversuche ausgeschöpft",
    "endpointHostNotFound": "Endpunkthost nicht gefunden",
-    "administrator": "Administrator",
+    "administrator": "Admin",
    "user": "Benutzer",
    "external": "Extern",
    "local": "Lokal",
@@ -1474,5 +1611,28 @@
    "cpu": "CPU",
    "ram": "RAM",
    "notAvailable": "Nicht verfügbar"
+  },
+  "commandPalette": {
+    "searchPlaceholder": "Nach Hosts oder Schnellaktionen suchen...",
+    "recentActivity": "Kürzliche Aktivität",
+    "navigation": "Navigation",
+    "addHost": "Host hinzufügen",
+    "addCredential": "Anmeldedaten hinzufügen",
+    "adminSettings": "Admin-Einstellungen",
+    "userProfile": "Benutzerprofil",
+    "updateLog": "Aktualisierungsprotokoll",
+    "hosts": "Hosts",
+    "openServerDetails": "Serverdetails öffnen",
+    "openFileManager": "Dateimanager öffnen",
+    "edit": "Bearbeiten",
+    "links": "Links",
+    "github": "GitHub",
+    "support": "Support",
+    "discord": "Discord",
+    "donate": "Spenden",
+    "press": "Drücken Sie",
+    "toToggle": "zum Umschalten",
+    "close": "Schließen",
+    "hostManager": "Host-Manager"
  }
 }
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -109,6 +109,7 @@
    "orCreateNewFolder": "Or create new folder",
    "addTag": "Add tag",
    "saving": "Saving...",
+    "credentialId": "Credential ID",
    "overview": "Overview",
    "security": "Security",
    "usage": "Usage",
@@ -225,6 +226,20 @@
    "editTooltip": "Edit this snippet",
    "deleteTooltip": "Delete this snippet"
  },
+  "commandHistory": {
+    "title": "History",
+    "searchPlaceholder": "Search commands...",
+    "noTerminal": "No active terminal",
+    "noTerminalHint": "Open a terminal to see its command history.",
+    "empty": "No command history yet",
+    "emptyHint": "Execute commands in the active terminal to build its history.",
+    "noResults": "No commands found",
+    "noResultsHint": "No commands matching \"{{query}}\"",
+    "deleteSuccess": "Command deleted from history",
+    "deleteFailed": "Failed to delete command.",
+    "deleteTooltip": "Delete command",
+    "tabHint": "Use Tab in Terminal to autocomplete from command history"
+  },
  "homepage": {
    "loggedInTitle": "Logged in!",
    "loggedInMessage": "You are logged in! Use the sidebar to access all available tools. To get started, create an SSH Host in the SSH Manager tab. Once created, you can connect to that host using the other apps in the sidebar.",
@@ -343,6 +358,7 @@
    "cancel": "Cancel",
    "change": "Change",
    "save": "Save",
+    "saving": "Saving...",
    "delete": "Delete",
    "edit": "Edit",
    "add": "Add",
@@ -480,6 +496,24 @@
    "confirmRevokeAllSessions": "Are you sure you want to revoke all sessions for this user?",
    "failedToRevokeSessions": "Failed to revoke sessions",
    "sessionsRevokedSuccessfully": "Sessions revoked successfully",
+    "linkToPasswordAccount": "Link to Password Account",
+    "linkOIDCDialogTitle": "Link OIDC Account to Password Account",
+    "linkOIDCDialogDescription": "Link {{username}} (OIDC user) to an existing password account. This will enable dual authentication for the password account.",
+    "linkOIDCWarningTitle": "Warning: OIDC User Data Will Be Deleted",
+    "linkOIDCActionDeleteUser": "Delete the OIDC user account and all their data",
+    "linkOIDCActionAddCapability": "Add OIDC login capability to the target password account",
+    "linkOIDCActionDualAuth": "Allow the password account to login with both password and OIDC",
+    "linkTargetUsernameLabel": "Target Password Account Username",
+    "linkTargetUsernamePlaceholder": "Enter username of password account",
+    "linkAccountsButton": "Link Accounts",
+    "linkingAccounts": "Linking...",
+    "accountsLinkedSuccessfully": "OIDC user {{oidcUsername}} has been linked to {{targetUsername}}",
+    "failedToLinkAccounts": "Failed to link accounts",
+    "linkTargetUsernameRequired": "Target username is required",
+    "unlinkOIDCTitle": "Unlink OIDC Authentication",
+    "unlinkOIDCDescription": "Remove OIDC authentication from {{username}}? The user will only be able to login with username/password after this.",
+    "unlinkOIDCSuccess": "OIDC unlinked from {{username}}",
+    "failedToUnlinkOIDC": "Failed to unlink OIDC",
    "databaseSecurity": "Database Security",
    "encryptionStatus": "Encryption Status",
    "encryptionEnabled": "Encryption Enabled",
@@ -754,6 +788,17 @@
    "failedToRemoveFromFolder": "Failed to remove host from folder",
    "folderRenamed": "Folder \"{{oldName}}\" renamed to \"{{newName}}\" successfully",
    "failedToRenameFolder": "Failed to rename folder",
+    "editFolderAppearance": "Edit Folder Appearance",
+    "editFolderAppearanceDesc": "Customize the color and icon for folder",
+    "folderColor": "Folder Color",
+    "folderIcon": "Folder Icon",
+    "preview": "Preview",
+    "folderAppearanceUpdated": "Folder appearance updated successfully",
+    "failedToUpdateFolderAppearance": "Failed to update folder appearance",
+    "deleteAllHostsInFolder": "Delete All Hosts in Folder",
+    "confirmDeleteAllHostsInFolder": "Are you sure you want to delete all {{count}} hosts in folder \"{{folder}}\"? This action cannot be undone.",
+    "allHostsInFolderDeleted": "Deleted {{count}} hosts from folder \"{{folder}}\" successfully",
+    "failedToDeleteHostsInFolder": "Failed to delete hosts in folder",
    "movedToFolder": "Host \"{{name}}\" moved to \"{{folder}}\" successfully",
    "failedToMoveToFolder": "Failed to move host to folder",
    "statistics": "Statistics",
@@ -778,11 +823,92 @@
    "statusMonitoring": "Status",
    "metricsMonitoring": "Metrics",
    "terminalCustomizationNotice": "Note: Terminal customizations only work on desktop (website and Electron app). Mobile apps and mobile website use system default terminal settings.",
+    "terminalCustomization": "Terminal Customization",
+    "appearance": "Appearance",
+    "behavior": "Behavior",
+    "advanced": "Advanced",
+    "themePreview": "Theme Preview",
+    "theme": "Theme",
+    "selectTheme": "Select theme",
+    "chooseColorTheme": "Choose a color theme for the terminal",
+    "fontFamily": "Font Family",
+    "selectFont": "Select font",
+    "selectFontDesc": "Select the font to use in the terminal",
+    "fontSize": "Font Size",
+    "fontSizeValue": "Font Size: {{value}}px",
+    "adjustFontSize": "Adjust the terminal font size",
+    "letterSpacing": "Letter Spacing",
+    "letterSpacingValue": "Letter Spacing: {{value}}px",
+    "adjustLetterSpacing": "Adjust spacing between characters",
+    "lineHeight": "Line Height",
+    "lineHeightValue": "Line Height: {{value}}",
+    "adjustLineHeight": "Adjust spacing between lines",
+    "cursorStyle": "Cursor Style",
+    "selectCursorStyle": "Select cursor style",
+    "cursorStyleBlock": "Block",
+    "cursorStyleUnderline": "Underline",
+    "cursorStyleBar": "Bar",
+    "chooseCursorAppearance": "Choose the cursor appearance",
+    "cursorBlink": "Cursor Blink",
+    "enableCursorBlink": "Enable cursor blinking animation",
+    "scrollbackBuffer": "Scrollback Buffer",
+    "scrollbackBufferValue": "Scrollback Buffer: {{value}} lines",
+    "scrollbackBufferDesc": "Number of lines to keep in scrollback history",
+    "bellStyle": "Bell Style",
+    "selectBellStyle": "Select bell style",
+    "bellStyleNone": "None",
+    "bellStyleSound": "Sound",
+    "bellStyleVisual": "Visual",
+    "bellStyleBoth": "Both",
+    "bellStyleDesc": "How to handle terminal bell (BEL character, \\x07). Programs trigger this when completing tasks, encountering errors, or for notifications. \"Sound\" plays an audio beep, \"Visual\" flashes the screen briefly, \"Both\" does both, \"None\" disables bell alerts.",
+    "rightClickSelectsWord": "Right Click Selects Word",
+    "rightClickSelectsWordDesc": "Right-clicking selects the word under cursor",
+    "fastScrollModifier": "Fast Scroll Modifier",
+    "selectModifier": "Select modifier",
+    "modifierAlt": "Alt",
+    "modifierCtrl": "Ctrl",
+    "modifierShift": "Shift",
+    "fastScrollModifierDesc": "Modifier key for fast scrolling",
+    "fastScrollSensitivity": "Fast Scroll Sensitivity",
+    "fastScrollSensitivityValue": "Fast Scroll Sensitivity: {{value}}",
+    "fastScrollSensitivityDesc": "Scroll speed multiplier when modifier is held",
+    "minimumContrastRatio": "Minimum Contrast Ratio",
+    "minimumContrastRatioValue": "Minimum Contrast Ratio: {{value}}",
+    "minimumContrastRatioDesc": "Automatically adjust colors for better readability",
+    "sshAgentForwarding": "SSH Agent Forwarding",
+    "sshAgentForwardingDesc": "Forward SSH authentication agent to remote host",
+    "backspaceMode": "Backspace Mode",
+    "selectBackspaceMode": "Select backspace mode",
+    "backspaceModeNormal": "Normal (DEL)",
+    "backspaceModeControlH": "Control-H (^H)",
+    "backspaceModeDesc": "Backspace key behavior for compatibility",
+    "startupSnippet": "Startup Snippet",
+    "selectSnippet": "Select snippet",
+    "searchSnippets": "Search snippets...",
+    "snippetNone": "None",
    "noneAuthTitle": "Keyboard-Interactive Authentication",
    "noneAuthDescription": "This authentication method will use keyboard-interactive authentication when connecting to the SSH server.",
    "noneAuthDetails": "Keyboard-interactive authentication allows the server to prompt you for credentials during connection. This is useful for servers that require multi-factor authentication or if you do not want to save credentials locally.",
    "forceKeyboardInteractive": "Force Keyboard-Interactive",
-    "forceKeyboardInteractiveDesc": "Forces the use of keyboard-interactive authentication. This is often required for servers that use Two-Factor Authentication (TOTP/2FA)."
+    "forceKeyboardInteractiveDesc": "Forces the use of keyboard-interactive authentication. This is often required for servers that use Two-Factor Authentication (TOTP/2FA).",
+    "overrideCredentialUsername": "Override Credential Username",
+    "overrideCredentialUsernameDesc": "Use a different username than the one stored in the credential. This allows you to use the same credential with different usernames.",
+    "jumpHosts": "Jump Hosts",
+    "jumpHostsDescription": "Jump hosts (also known as bastion hosts) allow you to connect to a target server through one or more intermediate servers. This is useful for accessing servers behind firewalls or in private networks.",
+    "jumpHostChain": "Jump Host Chain",
+    "addJumpHost": "Add Jump Host",
+    "selectServer": "Select Server",
+    "searchServers": "Search servers...",
+    "noServerFound": "No server found",
+    "jumpHostsOrder": "Connections will be made in order: Jump Host 1 → Jump Host 2 → ... → Target Server",
+    "quickActions": "Quick Actions",
+    "quickActionsDescription": "Quick actions allow you to create custom buttons that execute SSH snippets on this server. These buttons will appear at the top of the Server Stats page for quick access.",
+    "quickActionsList": "Quick Actions List",
+    "addQuickAction": "Add Quick Action",
+    "quickActionName": "Action name",
+    "noSnippetFound": "No snippet found",
+    "quickActionsOrder": "Quick action buttons will appear in the order listed above on the Server Stats page",
+    "advancedAuthSettings": "Advanced Authentication Settings"
  },
  "terminal": {
    "title": "Terminal",
@@ -829,6 +955,22 @@
    "connectToSsh": "Connect to SSH to use file operations",
    "uploadFile": "Upload File",
    "downloadFile": "Download",
+    "extractArchive": "Extract Archive",
+    "extractingArchive": "Extracting {{name}}...",
+    "archiveExtractedSuccessfully": "{{name}} extracted successfully",
+    "extractFailed": "Extract failed",
+    "compressFile": "Compress File",
+    "compressFiles": "Compress Files",
+    "compressFilesDesc": "Compress {{count}} items into an archive",
+    "archiveName": "Archive Name",
+    "enterArchiveName": "Enter archive name...",
+    "compressionFormat": "Compression Format",
+    "selectedFiles": "Selected files",
+    "andMoreFiles": "and {{count}} more...",
+    "compress": "Compress",
+    "compressingFiles": "Compressing {{count}} items into {{name}}...",
+    "filesCompressedSuccessfully": "{{name}} created successfully",
+    "compressFailed": "Compression failed",
    "edit": "Edit",
    "preview": "Preview",
    "previous": "Previous",
@@ -902,6 +1044,8 @@
    "copy": "Copy",
    "cut": "Cut",
    "paste": "Paste",
+    "copyPath": "Copy Path",
+    "copyPaths": "Copy Paths",
    "delete": "Delete",
    "properties": "Properties",
    "preview": "Preview",
@@ -912,6 +1056,9 @@
    "deleteFiles": "Delete {{count}} items",
    "filesCopiedToClipboard": "{{count}} items copied to clipboard",
    "filesCutToClipboard": "{{count}} items cut to clipboard",
+    "pathCopiedToClipboard": "Path copied to clipboard",
+    "pathsCopiedToClipboard": "{{count}} paths copied to clipboard",
+    "failedToCopyPath": "Failed to copy path to clipboard",
    "movedItems": "Moved {{count}} items",
    "failedToDeleteItem": "Failed to delete item",
    "itemRenamedSuccessfully": "{{type}} renamed successfully",
@@ -1106,7 +1253,19 @@
    "sshConnectionFailed": "SSH connection failed. Please check your connection to {{name}} ({{ip}}:{{port}})",
    "loadFileFailed": "Failed to load file: {{error}}",
    "connectedSuccessfully": "Connected successfully",
-    "totpVerificationFailed": "TOTP verification failed"
+    "totpVerificationFailed": "TOTP verification failed",
+    "changePermissions": "Change Permissions",
+    "changePermissionsDesc": "Modify file permissions for",
+    "currentPermissions": "Current Permissions",
+    "newPermissions": "New Permissions",
+    "owner": "Owner",
+    "group": "Group",
+    "others": "Others",
+    "read": "Read",
+    "write": "Write",
+    "execute": "Execute",
+    "permissionsChangedSuccessfully": "Permissions changed successfully",
+    "failedToChangePermissions": "Failed to change permissions"
  },
  "tunnels": {
    "title": "SSH Tunnels",
@@ -1210,7 +1369,6 @@
    "totpRequired": "TOTP Authentication Required",
    "totpUnavailable": "Server Stats unavailable for TOTP-enabled servers",
    "load": "Load",
-    "free": "Free",
    "available": "Available",
    "editLayout": "Edit Layout",
    "cancelEdit": "Cancel",
@@ -1229,9 +1387,27 @@
    "noInterfacesFound": "No network interfaces found",
    "totalProcesses": "Total Processes",
    "running": "Running",
-    "noProcessesFound": "No processes found"
+    "noProcessesFound": "No processes found",
+    "loginStats": "SSH Login Statistics",
+    "totalLogins": "Total Logins",
+    "uniqueIPs": "Unique IPs",
+    "recentSuccessfulLogins": "Recent Successful Logins",
+    "recentFailedAttempts": "Recent Failed Attempts",
+    "noRecentLoginData": "No recent login data",
+    "from": "from",
+    "quickActions": "Quick Actions",
+    "executeQuickAction": "Execute {{name}}",
+    "executingQuickAction": "Executing {{name}}...",
+    "quickActionSuccess": "{{name}} completed successfully",
+    "quickActionFailed": "{{name}} failed",
+    "quickActionError": "Failed to execute {{name}}"
  },
  "auth": {
+    "tagline": "SSH SERVER MANAGER",
+    "description": "Secure, powerful, and intuitive SSH connection management",
+    "welcomeBack": "Welcome back to TERMIX",
+    "createAccount": "Create your TERMIX account",
+    "continueExternal": "Continue with external provider",
    "loginTitle": "Login to Termix",
    "registerTitle": "Create Account",
    "loginButton": "Login",
@@ -1404,7 +1580,12 @@
    "authMethod": "Authentication Method",
    "local": "Local",
    "external": "External (OIDC)",
+    "externalAndLocal": "Dual Auth",
    "selectPreferredLanguage": "Select your preferred language for the interface",
+    "fileColorCoding": "File Color Coding",
+    "fileColorCodingDesc": "Color-code files by type: folders (red), files (blue), symlinks (green)",
+    "commandAutocomplete": "Command Autocomplete",
+    "commandAutocompleteDesc": "Enable Tab key autocomplete suggestions for terminal commands based on your command history",
    "currentPassword": "Current Password",
    "passwordChangedSuccess": "Password changed successfully! Please log in again.",
    "failedToChangePassword": "Failed to change password. Please check your current password and try again."
@@ -1620,5 +1801,28 @@
    "cpu": "CPU",
    "ram": "RAM",
    "notAvailable": "N/A"
+  },
+  "commandPalette": {
+    "searchPlaceholder": "Search for hosts or quick actions...",
+    "recentActivity": "Recent Activity",
+    "navigation": "Navigation",
+    "addHost": "Add Host",
+    "addCredential": "Add Credential",
+    "adminSettings": "Admin Settings",
+    "userProfile": "User Profile",
+    "updateLog": "Update Log",
+    "hosts": "Hosts",
+    "openServerDetails": "Open Server Details",
+    "openFileManager": "Open File Manager",
+    "edit": "Edit",
+    "links": "Links",
+    "github": "GitHub",
+    "support": "Support",
+    "discord": "Discord",
+    "donate": "Donate",
+    "press": "Press",
+    "toToggle": "to toggle",
+    "close": "Close",
+    "hostManager": "Host Manager"
  }
 }
--- a/src/locales/fr/translation.json
+++ b/src/locales/fr/translation.json
--- a/src/locales/pt-BR/translation.json
+++ b/src/locales/pt-BR/translation.json
@@ -191,6 +191,20 @@
    "enableRightClickCopyPaste": "Habilitar copiar/colar com botão direito",
    "shareIdeas": "Tem ideias sobre o que deve vir a seguir nas ferramentas SSH? Compartilhe em"
  },
+  "commandHistory": {
+    "title": "Histórico",
+    "searchPlaceholder": "Pesquisar comandos...",
+    "noTerminal": "Nenhum terminal ativo",
+    "noTerminalHint": "Abra um terminal para ver seu histórico de comandos.",
+    "empty": "Ainda não há histórico de comandos",
+    "emptyHint": "Execute comandos no terminal ativo para criar um histórico.",
+    "noResults": "Nenhum comando encontrado",
+    "noResultsHint": "Nenhum comando correspondente a \"{{query}}\"",
+    "deleteSuccess": "Comando removido do histórico",
+    "deleteFailed": "Falha ao excluir comando.",
+    "deleteTooltip": "Excluir comando",
+    "tabHint": "Use Tab no Terminal para autocompletar do histórico de comandos"
+  },
  "homepage": {
    "loggedInTitle": "Conectado!",
    "loggedInMessage": "Você está conectado! Use a barra lateral para acessar todas as ferramentas disponíveis. Para começar, crie um Host SSH na aba Gerenciador SSH. Depois de criado, você pode se conectar a esse host usando os outros apps na barra lateral.",
@@ -720,7 +734,18 @@
    "noneAuthDescription": "Este método de autenticação usará autenticação interativa por teclado ao conectar ao servidor SSH.",
    "noneAuthDetails": "A autenticação interativa por teclado permite que o servidor solicite credenciais durante a conexão. Isso é útil para servidores que requerem autenticação multifator ou entrada de senha dinâmica.",
    "forceKeyboardInteractive": "Forçar Interativo com Teclado",
-    "forceKeyboardInteractiveDesc": "Força o uso da autenticação interativa com teclado. Isso é frequentemente necessário para servidores que usam Autenticação de Dois Fatores (TOTP/2FA)."
+    "forceKeyboardInteractiveDesc": "Força o uso da autenticação interativa com teclado. Isso é frequentemente necessário para servidores que usam Autenticação de Dois Fatores (TOTP/2FA).",
+    "overrideCredentialUsername": "Substituir Nome de Usuário da Credencial",
+    "overrideCredentialUsernameDesc": "Use um nome de usuário diferente daquele armazenado na credencial. Isso permite que você use a mesma credencial com diferentes nomes de usuário.",
+    "jumpHosts": "Hosts de Salto",
+    "jumpHostsDescription": "Hosts de salto (também conhecidos como bastions) permitem que você se conecte a um servidor de destino através de um ou mais servidores intermediários. Isso é útil para acessar servidores atrás de firewalls ou em redes privadas.",
+    "jumpHostChain": "Cadeia de Hosts de Salto",
+    "addJumpHost": "Adicionar Host de Salto",
+    "selectServer": "Selecionar Servidor",
+    "searchServers": "Pesquisar servidores...",
+    "noServerFound": "Nenhum servidor encontrado",
+    "jumpHostsOrder": "As conexões serão feitas na ordem: Host de Salto 1 → Host de Salto 2 → ... → Servidor de Destino",
+    "advancedAuthSettings": "Configurações Avançadas de Autenticação"
  },
  "terminal": {
    "title": "Terminal",
@@ -836,6 +861,8 @@
    "copy": "Copiar",
    "cut": "Recortar",
    "paste": "Colar",
+    "copyPath": "Copiar caminho",
+    "copyPaths": "Copiar caminhos",
    "delete": "Excluir",
    "properties": "Propriedades",
    "preview": "Visualizar",
@@ -846,6 +873,9 @@
    "deleteFiles": "Excluir {{count}} itens",
    "filesCopiedToClipboard": "{{count}} itens copiados para a área de transferência",
    "filesCutToClipboard": "{{count}} itens recortados para a área de transferência",
+    "pathCopiedToClipboard": "Caminho copiado para a área de transferência",
+    "pathsCopiedToClipboard": "{{count}} caminhos copiados para a área de transferência",
+    "failedToCopyPath": "Falha ao copiar caminho para a área de transferência",
    "movedItems": "{{count}} itens movidos",
    "failedToDeleteItem": "Falha ao excluir item",
    "itemRenamedSuccessfully": "{{type}} renomeado com sucesso",
@@ -1143,6 +1173,11 @@
    "available": "Disponível"
  },
  "auth": {
+    "tagline": "GERENCIADOR DE TERMINAL SSH",
+    "description": "Gerenciamento de conexão SSH seguro, poderoso e intuitivo",
+    "welcomeBack": "Bem-vindo de volta ao TERMIX",
+    "createAccount": "Crie sua conta TERMIX",
+    "continueExternal": "Continuar com provedor externo",
    "loginTitle": "Entrar no Termix",
    "registerTitle": "Criar Conta",
    "loginButton": "Entrar",
@@ -1306,6 +1341,10 @@
    "local": "Local",
    "external": "Externo (OIDC)",
    "selectPreferredLanguage": "Selecione seu idioma preferido para a interface",
+    "fileColorCoding": "Codificação de Cores de Arquivos",
+    "fileColorCodingDesc": "Codificar arquivos por cores por tipo: pastas (vermelho), arquivos (azul), links simbólicos (verde)",
+    "commandAutocomplete": "Autocompletar Comandos",
+    "commandAutocompleteDesc": "Ativar sugestões de autocompletar com a tecla Tab para comandos do terminal baseado no seu histórico",
    "currentPassword": "Senha Atual",
    "passwordChangedSuccess": "Senha alterada com sucesso! Por favor, faça login novamente.",
    "failedToChangePassword": "Falha ao alterar a senha. Por favor, verifique sua senha atual e tente novamente."
--- a/src/locales/ru/translation.json
+++ b/src/locales/ru/translation.json
@@ -225,6 +225,20 @@
    "editTooltip": "Редактировать этот сниппет",
    "deleteTooltip": "Удалить этот сниппет"
  },
+  "commandHistory": {
+    "title": "История",
+    "searchPlaceholder": "Поиск команд...",
+    "noTerminal": "Нет активного терминала",
+    "noTerminalHint": "Откройте терминал, чтобы увидеть историю команд.",
+    "empty": "История команд пока пуста",
+    "emptyHint": "Выполните команды в активном терминале, чтобы создать историю.",
+    "noResults": "Команды не найдены",
+    "noResultsHint": "Нет команд, соответствующих \"{{query}}\"",
+    "deleteSuccess": "Команда удалена из истории",
+    "deleteFailed": "Не удалось удалить команду.",
+    "deleteTooltip": "Удалить команду",
+    "tabHint": "Используйте Tab в Терминале для автозаполнения из истории команд"
+  },
  "homepage": {
    "loggedInTitle": "Вы вошли в систему!",
    "loggedInMessage": "Вы вошли в систему! Используйте боковую панель для доступа ко всем доступным инструментам. Чтобы начать, создайте SSH-хост в разделе SSH-менеджера. После создания вы можете подключиться к этому хосту, используя другие приложения на боковой панели.",
@@ -766,9 +780,85 @@
    "statusMonitoring": "Статус",
    "metricsMonitoring": "Метрики",
    "terminalCustomizationNotice": "Примечание: Настройки терминала работают только на рабочем столе (веб-сайт и Electron-приложение). Мобильные приложения и мобильный веб-сайт используют системные настройки терминала по умолчанию.",
+    "terminalCustomization": "Настройка терминала",
+    "appearance": "Внешний вид",
+    "behavior": "Поведение",
+    "advanced": "Расширенные",
+    "themePreview": "Предпросмотр темы",
+    "theme": "Тема",
+    "selectTheme": "Выбрать тему",
+    "chooseColorTheme": "Выберите цветовую тему для терминала",
+    "fontFamily": "Семейство шрифтов",
+    "selectFont": "Выбрать шрифт",
+    "selectFontDesc": "Выберите шрифт для использования в терминале",
+    "fontSize": "Размер шрифта",
+    "fontSizeValue": "Размер шрифта: {{value}}px",
+    "adjustFontSize": "Настроить размер шрифта терминала",
+    "letterSpacing": "Межбуквенный интервал",
+    "letterSpacingValue": "Межбуквенный интервал: {{value}}px",
+    "adjustLetterSpacing": "Настроить расстояние между символами",
+    "lineHeight": "Высота строки",
+    "lineHeightValue": "Высота строки: {{value}}",
+    "adjustLineHeight": "Настроить расстояние между строками",
+    "cursorStyle": "Стиль курсора",
+    "selectCursorStyle": "Выбрать стиль курсора",
+    "cursorStyleBlock": "Блок",
+    "cursorStyleUnderline": "Подчеркивание",
+    "cursorStyleBar": "Полоса",
+    "chooseCursorAppearance": "Выбрать внешний вид курсора",
+    "cursorBlink": "Мигание курсора",
+    "enableCursorBlink": "Включить анимацию мигания курсора",
+    "scrollbackBuffer": "Буфер прокрутки",
+    "scrollbackBufferValue": "Буфер прокрутки: {{value}} строк",
+    "scrollbackBufferDesc": "Количество строк для хранения в истории прокрутки",
+    "bellStyle": "Стиль звонка",
+    "selectBellStyle": "Выбрать стиль звонка",
+    "bellStyleNone": "Нет",
+    "bellStyleSound": "Звук",
+    "bellStyleVisual": "Визуальный",
+    "bellStyleBoth": "Оба",
+    "bellStyleDesc": "Как обрабатывать звонок терминала (символ BEL, \\x07). Программы вызывают его при завершении задач, возникновении ошибок или для уведомлений. \"Звук\" воспроизводит звуковой сигнал, \"Визуальный\" кратковременно мигает экран, \"Оба\" делает и то, и другое, \"Нет\" отключает звуковые оповещения.",
+    "rightClickSelectsWord": "Правый клик выбирает слово",
+    "rightClickSelectsWordDesc": "Правый клик выбирает слово под курсором",
+    "fastScrollModifier": "Модификатор быстрой прокрутки",
+    "selectModifier": "Выбрать модификатор",
+    "modifierAlt": "Alt",
+    "modifierCtrl": "Ctrl",
+    "modifierShift": "Shift",
+    "fastScrollModifierDesc": "Клавиша-модификатор для быстрой прокрутки",
+    "fastScrollSensitivity": "Чувствительность быстрой прокрутки",
+    "fastScrollSensitivityValue": "Чувствительность быстрой прокрутки: {{value}}",
+    "fastScrollSensitivityDesc": "Множитель скорости прокрутки при удержании модификатора",
+    "minimumContrastRatio": "Минимальная контрастность",
+    "minimumContrastRatioValue": "Минимальная контрастность: {{value}}",
+    "minimumContrastRatioDesc": "Автоматически настраивать цвета для лучшей читаемости",
+    "sshAgentForwarding": "Переадресация SSH-агента",
+    "sshAgentForwardingDesc": "Переадресовать агент SSH-аутентификации на удаленный хост",
+    "backspaceMode": "Режим Backspace",
+    "selectBackspaceMode": "Выбрать режим Backspace",
+    "backspaceModeNormal": "Обычный (DEL)",
+    "backspaceModeControlH": "Control-H (^H)",
+    "backspaceModeDesc": "Поведение клавиши Backspace для совместимости",
+    "startupSnippet": "Сниппет запуска",
+    "selectSnippet": "Выбрать сниппет",
+    "searchSnippets": "Поиск сниппетов...",
+    "snippetNone": "Нет",
    "noneAuthTitle": "Интерактивная аутентификация по клавиатуре",
    "noneAuthDescription": "Этот метод аутентификации будет использовать интерактивную аутентификацию по клавиатуре при подключении к SSH-серверу.",
-    "noneAuthDetails": "Интерактивная аутентификация по клавиатуре позволяет серверу запрашивать у вас учетные данные во время подключения. Это полезно для серверов, которые требуют многофакторную аутентификацию или динамический ввод пароля."
+    "noneAuthDetails": "Интерактивная аутентификация по клавиатуре позволяет серверу запрашивать у вас учетные данные во время подключения. Это полезно для серверов, которые требуют многофакторную аутентификацию или динамический ввод пароля.",
+    "forceKeyboardInteractive": "Принудительная клавиатурная аутентификация",
+    "forceKeyboardInteractiveDesc": "Принудительно использует интерактивную аутентификацию по клавиатуре. Часто требуется для серверов с двухфакторной аутентификацией (TOTP/2FA).",
+    "overrideCredentialUsername": "Переопределить имя пользователя учетных данных",
+    "overrideCredentialUsernameDesc": "Используйте другое имя пользователя, отличное от того, что хранится в учетных данных. Это позволяет использовать одни и те же учетные данные с разными именами пользователей.",
+    "jumpHosts": "Промежуточные хосты",
+    "jumpHostsDescription": "Промежуточные хосты (также известные как бастионы) позволяют подключаться к целевому серверу через один или несколько промежуточных серверов. Это полезно для доступа к серверам за брандмауэрами или в частных сетях.",
+    "jumpHostChain": "Цепочка промежуточных хостов",
+    "addJumpHost": "Добавить промежуточный хост",
+    "selectServer": "Выбрать сервер",
+    "searchServers": "Поиск серверов...",
+    "noServerFound": "Сервер не найден",
+    "jumpHostsOrder": "Подключения будут выполнены в порядке: Промежуточный хост 1 → Промежуточный хост 2 → ... → Целевой сервер",
+    "advancedAuthSettings": "Расширенные настройки аутентификации"
  },
  "terminal": {
    "title": "Терминал",
@@ -888,6 +978,8 @@
    "copy": "Копировать",
    "cut": "Вырезать",
    "paste": "Вставить",
+    "copyPath": "Копировать путь",
+    "copyPaths": "Копировать пути",
    "delete": "Удалить",
    "properties": "Свойства",
    "preview": "Просмотр",
@@ -898,6 +990,9 @@
    "deleteFiles": "Удалить {{count}} элементов",
    "filesCopiedToClipboard": "{{count}} элементов скопировано в буфер обмена",
    "filesCutToClipboard": "{{count}} элементов вырезано в буфер обмена",
+    "pathCopiedToClipboard": "Путь скопирован в буфер обмена",
+    "pathsCopiedToClipboard": "{{count}} путей скопировано в буфер обмена",
+    "failedToCopyPath": "Не удалось скопировать путь в буфер обмена",
    "movedItems": "Перемещено {{count}} элементов",
    "failedToDeleteItem": "Не удалось удалить элемент",
    "itemRenamedSuccessfully": "{{type}} успешно переименован",
@@ -1215,9 +1310,21 @@
    "noInterfacesFound": "Сетевые интерфейсы не найдены",
    "totalProcesses": "Всего процессов",
    "running": "Запущено",
-    "noProcessesFound": "Процессы не найдены"
+    "noProcessesFound": "Процессы не найдены",
+    "loginStats": "Статистика входов SSH",
+    "totalLogins": "Всего входов",
+    "uniqueIPs": "Уникальные IP",
+    "recentSuccessfulLogins": "Последние успешные входы",
+    "recentFailedAttempts": "Последние неудачные попытки",
+    "noRecentLoginData": "Нет данных о недавних входах",
+    "from": "с"
  },
  "auth": {
+    "tagline": "SSH ТЕРМИНАЛ МЕНЕДЖЕР",
+    "description": "Безопасное, мощное и интуитивное управление SSH-соединениями",
+    "welcomeBack": "Добро пожаловать обратно в TERMIX",
+    "createAccount": "Создайте вашу учетную запись TERMIX",
+    "continueExternal": "Продолжить с внешним провайдером",
    "loginTitle": "Вход в Termix",
    "registerTitle": "Создать учетную запись",
    "loginButton": "Войти",
@@ -1373,6 +1480,10 @@
    "local": "Локальный",
    "external": "Внешний (OIDC)",
    "selectPreferredLanguage": "Выберите предпочитаемый язык интерфейса",
+    "fileColorCoding": "Цветовое кодирование файлов",
+    "fileColorCodingDesc": "Цветовая кодировка файлов по типу: папки (красный), файлы (синий), символические ссылки (зелёный)",
+    "commandAutocomplete": "Автодополнение команд",
+    "commandAutocompleteDesc": "Включить автодополнение команд терминала клавишей Tab на основе вашей истории команд",
    "currentPassword": "Текущий пароль",
    "passwordChangedSuccess": "Пароль успешно изменен! Пожалуйста, войдите снова.",
    "failedToChangePassword": "Не удалось изменить пароль. Пожалуйста, проверьте ваш текущий пароль и попробуйте снова."
@@ -1587,5 +1698,28 @@
    "cpu": "CPU",
    "ram": "RAM",
    "notAvailable": "N/A"
+  },
+  "commandPalette": {
+    "searchPlaceholder": "Поиск хостов или быстрых действий...",
+    "recentActivity": "Недавняя активность",
+    "navigation": "Навигация",
+    "addHost": "Добавить хост",
+    "addCredential": "Добавить учетные данные",
+    "adminSettings": "Настройки администратора",
+    "userProfile": "Профиль пользователя",
+    "updateLog": "Журнал обновлений",
+    "hosts": "Хосты",
+    "openServerDetails": "Открыть детали сервера",
+    "openFileManager": "Открыть файловый менеджер",
+    "edit": "Редактировать",
+    "links": "Ссылки",
+    "github": "GitHub",
+    "support": "Поддержка",
+    "discord": "Discord",
+    "donate": "Пожертвовать",
+    "press": "Нажмите",
+    "toToggle": "для переключения",
+    "close": "Закрыть",
+    "hostManager": "Менеджер хостов"
  }
 }
--- a/src/locales/zh/translation.json
+++ b/src/locales/zh/translation.json
@@ -223,6 +223,20 @@
    "editTooltip": "编辑此片段",
    "deleteTooltip": "删除此片段"
  },
+  "commandHistory": {
+    "title": "历史记录",
+    "searchPlaceholder": "搜索命令...",
+    "noTerminal": "无活动终端",
+    "noTerminalHint": "打开终端以查看其命令历史记录。",
+    "empty": "暂无命令历史记录",
+    "emptyHint": "在活动终端中执行命令以建立历史记录。",
+    "noResults": "未找到命令",
+    "noResultsHint": "没有匹配 \"{{query}}\" 的命令",
+    "deleteSuccess": "命令已从历史记录中删除",
+    "deleteFailed": "删除命令失败。",
+    "deleteTooltip": "删除命令",
+    "tabHint": "在终端中使用 Tab 键从命令历史记录自动完成"
+  },
  "homepage": {
    "loggedInTitle": "登录成功！",
    "loggedInMessage": "您已登录！使用侧边栏访问所有可用工具。要开始使用，请在 SSH 管理器选项卡中创建 SSH 主机。创建后，您可以使用侧边栏中的其他应用程序连接到该主机。",
@@ -766,6 +780,17 @@
    "failedToRemoveFromFolder": "从文件夹中移除主机失败",
    "folderRenamed": "文件夹\"{{oldName}}\"已成功重命名为\"{{newName}}\"",
    "failedToRenameFolder": "重命名文件夹失败",
+    "editFolderAppearance": "编辑文件夹外观",
+    "editFolderAppearanceDesc": "自定义文件夹的颜色和图标",
+    "folderColor": "文件夹颜色",
+    "folderIcon": "文件夹图标",
+    "preview": "预览",
+    "folderAppearanceUpdated": "文件夹外观更新成功",
+    "failedToUpdateFolderAppearance": "更新文件夹外观失败",
+    "deleteAllHostsInFolder": "删除文件夹内所有主机",
+    "confirmDeleteAllHostsInFolder": "确定要删除文件夹\"{{folder}}\"中的全部 {{count}} 个主机吗？此操作无法撤销。",
+    "allHostsInFolderDeleted": "已成功从文件夹\"{{folder}}\"删除 {{count}} 个主机",
+    "failedToDeleteHostsInFolder": "删除文件夹中的主机失败",
    "movedToFolder": "主机\"{{name}}\"已成功移动到\"{{folder}}\"",
    "failedToMoveToFolder": "移动主机到文件夹失败",
    "statistics": "统计",
@@ -790,11 +815,85 @@
    "statusMonitoring": "状态",
    "metricsMonitoring": "指标",
    "terminalCustomizationNotice": "注意：终端自定义仅在桌面网站版本中有效。移动和 Electron 应用程序使用系统默认终端设置。",
+    "terminalCustomization": "终端自定义",
+    "appearance": "外观",
+    "behavior": "行为",
+    "advanced": "高级",
+    "themePreview": "主题预览",
+    "theme": "主题",
+    "selectTheme": "选择主题",
+    "chooseColorTheme": "选择终端的颜色主题",
+    "fontFamily": "字体系列",
+    "selectFont": "选择字体",
+    "selectFontDesc": "选择终端使用的字体",
+    "fontSize": "字体大小",
+    "fontSizeValue": "字体大小：{{value}}px",
+    "adjustFontSize": "调整终端字体大小",
+    "letterSpacing": "字母间距",
+    "letterSpacingValue": "字母间距：{{value}}px",
+    "adjustLetterSpacing": "调整字符之间的间距",
+    "lineHeight": "行高",
+    "lineHeightValue": "行高：{{value}}",
+    "adjustLineHeight": "调整行之间的间距",
+    "cursorStyle": "光标样式",
+    "selectCursorStyle": "选择光标样式",
+    "cursorStyleBlock": "块状",
+    "cursorStyleUnderline": "下划线",
+    "cursorStyleBar": "竖线",
+    "chooseCursorAppearance": "选择光标外观",
+    "cursorBlink": "光标闪烁",
+    "enableCursorBlink": "启用光标闪烁动画",
+    "scrollbackBuffer": "回滚缓冲区",
+    "scrollbackBufferValue": "回滚缓冲区：{{value}} 行",
+    "scrollbackBufferDesc": "保留在回滚历史记录中的行数",
+    "bellStyle": "铃声样式",
+    "selectBellStyle": "选择铃声样式",
+    "bellStyleNone": "无",
+    "bellStyleSound": "声音",
+    "bellStyleVisual": "视觉",
+    "bellStyleBoth": "两者",
+    "bellStyleDesc": "如何处理终端铃声（BEL字符，\\x07）。程序在完成任务、遇到错误或通知时会触发此功能。\"声音\"播放音频提示音，\"视觉\"短暂闪烁屏幕，\"两者\"同时执行，\"无\"禁用铃声提醒。",
+    "rightClickSelectsWord": "右键选择单词",
+    "rightClickSelectsWordDesc": "右键单击选择光标下的单词",
+    "fastScrollModifier": "快速滚动修饰键",
+    "selectModifier": "选择修饰键",
+    "modifierAlt": "Alt",
+    "modifierCtrl": "Ctrl",
+    "modifierShift": "Shift",
+    "fastScrollModifierDesc": "快速滚动的修饰键",
+    "fastScrollSensitivity": "快速滚动灵敏度",
+    "fastScrollSensitivityValue": "快速滚动灵敏度：{{value}}",
+    "fastScrollSensitivityDesc": "按住修饰键时的滚动速度倍数",
+    "minimumContrastRatio": "最小对比度",
+    "minimumContrastRatioValue": "最小对比度：{{value}}",
+    "minimumContrastRatioDesc": "自动调整颜色以获得更好的可读性",
+    "sshAgentForwarding": "SSH 代理转发",
+    "sshAgentForwardingDesc": "将 SSH 身份验证代理转发到远程主机",
+    "backspaceMode": "退格模式",
+    "selectBackspaceMode": "选择退格模式",
+    "backspaceModeNormal": "正常 (DEL)",
+    "backspaceModeControlH": "Control-H (^H)",
+    "backspaceModeDesc": "退格键行为兼容性",
+    "startupSnippet": "启动代码片段",
+    "selectSnippet": "选择代码片段",
+    "searchSnippets": "搜索代码片段...",
+    "snippetNone": "无",
    "noneAuthTitle": "键盘交互式认证",
    "noneAuthDescription": "此认证方法在连接到 SSH 服务器时将使用键盘交互式认证。",
    "noneAuthDetails": "键盘交互式认证允许服务器在连接期间提示您输入凭据。这对于需要多因素认证或动态密码输入的服务器很有用。",
    "forceKeyboardInteractive": "强制键盘交互式认证",
-    "forceKeyboardInteractiveDesc": "强制使用键盘交互式认证。这通常是使用双因素认证（TOTP/2FA）的服务器所必需的。"
+    "forceKeyboardInteractiveDesc": "强制使用键盘交互式认证。这通常是使用双因素认证（TOTP/2FA）的服务器所必需的。",
+    "overrideCredentialUsername": "覆盖凭据用户名",
+    "overrideCredentialUsernameDesc": "使用与凭据中存储的用户名不同的用户名。这允许您对不同的用户名使用相同的凭据。",
+    "jumpHosts": "跳板主机",
+    "jumpHostsDescription": "跳板主机（也称为堡垒主机）允许您通过一个或多个中间服务器连接到目标服务器。这对于访问防火墙后或私有网络中的服务器很有用。",
+    "jumpHostChain": "跳板主机链",
+    "addJumpHost": "添加跳板主机",
+    "selectServer": "选择服务器",
+    "searchServers": "搜索服务器...",
+    "noServerFound": "未找到服务器",
+    "jumpHostsOrder": "连接将按顺序进行：跳板主机 1 → 跳板主机 2 → ... → 目标服务器",
+    "advancedAuthSettings": "高级身份验证设置"
  },
  "terminal": {
    "title": "终端",
@@ -841,6 +940,22 @@
    "connectToSsh": "连接 SSH 以使用文件操作",
    "uploadFile": "上传文件",
    "downloadFile": "下载",
+    "extractArchive": "解压文件",
+    "extractingArchive": "正在解压 {{name}}...",
+    "archiveExtractedSuccessfully": "{{name}} 解压成功",
+    "extractFailed": "解压失败",
+    "compressFile": "压缩文件",
+    "compressFiles": "压缩文件",
+    "compressFilesDesc": "将 {{count}} 个项目压缩为归档文件",
+    "archiveName": "归档文件名",
+    "enterArchiveName": "输入归档文件名...",
+    "compressionFormat": "压缩格式",
+    "selectedFiles": "已选文件",
+    "andMoreFiles": "以及其他 {{count}} 个...",
+    "compress": "压缩",
+    "compressingFiles": "正在将 {{count}} 个项目压缩到 {{name}}...",
+    "filesCompressedSuccessfully": "{{name}} 创建成功",
+    "compressFailed": "压缩失败",
    "edit": "编辑",
    "preview": "预览",
    "previous": "上一页",
@@ -910,7 +1025,11 @@
    "noSSHConnection": "无SSH连接可用",
    "enterFolderName": "输入文件夹名称：",
    "enterFileName": "输入文件名称：",
+    "copy": "复制",
    "cut": "剪切",
+    "paste": "粘贴",
+    "copyPath": "复制路径",
+    "copyPaths": "复制路径",
    "properties": "属性",
    "refresh": "刷新",
    "downloadFiles": "下载 {{count}} 个文件",
@@ -919,6 +1038,9 @@
    "deleteFiles": "删除 {{count}} 个项目",
    "filesCopiedToClipboard": "{{count}} 个项目已复制到剪贴板",
    "filesCutToClipboard": "{{count}} 个项目已剪切到剪贴板",
+    "pathCopiedToClipboard": "路径已复制到剪贴板",
+    "pathsCopiedToClipboard": "{{count}} 个路径已复制到剪贴板",
+    "failedToCopyPath": "复制路径到剪贴板失败",
    "movedItems": "已移动 {{count}} 个项目",
    "unknownSize": "未知大小",
    "fileIsEmpty": "文件为空",
@@ -1088,7 +1210,19 @@
    "sshConnectionFailed": "SSH 连接失败。请检查与 {{name}} ({{ip}}:{{port}}) 的连接",
    "loadFileFailed": "加载文件失败：{{error}}",
    "connectedSuccessfully": "连接成功",
-    "totpVerificationFailed": "TOTP 验证失败"
+    "totpVerificationFailed": "TOTP 验证失败",
+    "changePermissions": "修改权限",
+    "changePermissionsDesc": "修改文件权限",
+    "currentPermissions": "当前权限",
+    "newPermissions": "新权限",
+    "owner": "所有者",
+    "group": "组",
+    "others": "其他",
+    "read": "读取",
+    "write": "写入",
+    "execute": "执行",
+    "permissionsChangedSuccessfully": "权限修改成功",
+    "failedToChangePermissions": "权限修改失败"
  },
  "tunnels": {
    "title": "SSH 隧道",
@@ -1199,9 +1333,21 @@
    "noInterfacesFound": "未找到网络接口",
    "totalProcesses": "总进程数",
    "running": "运行中",
-    "noProcessesFound": "未找到进程"
+    "noProcessesFound": "未找到进程",
+    "loginStats": "SSH 登录统计",
+    "totalLogins": "总登录次数",
+    "uniqueIPs": "唯一 IP 数",
+    "recentSuccessfulLogins": "最近成功登录",
+    "recentFailedAttempts": "最近失败尝试",
+    "noRecentLoginData": "无最近登录数据",
+    "from": "来自"
  },
  "auth": {
+    "tagline": "SSH 终端管理器",
+    "description": "安全、强大、直观的 SSH 连接管理",
+    "welcomeBack": "欢迎回到 TERMIX",
+    "createAccount": "创建您的 TERMIX 账户",
+    "continueExternal": "使用外部提供商继续",
    "loginTitle": "登录 Termix",
    "registerTitle": "创建账户",
    "loginButton": "登录",
@@ -1367,6 +1513,10 @@
    "local": "本地",
    "external": "外部 (OIDC)",
    "selectPreferredLanguage": "选择您的界面首选语言",
+    "fileColorCoding": "文件颜色编码",
+    "fileColorCodingDesc": "按类型对文件进行颜色编码：文件夹（红色）、文件（蓝色）、符号链接（绿色）",
+    "commandAutocomplete": "命令自动补全",
+    "commandAutocompleteDesc": "启用基于命令历史记录的 Tab 键终端命令自动补全建议",
    "currentPassword": "当前密码",
    "passwordChangedSuccess": "密码修改成功！请重新登录。",
    "failedToChangePassword": "修改密码失败。请检查您当前的密码并重试。"
@@ -1512,5 +1662,28 @@
    "cpu": "CPU",
    "ram": "内存",
    "notAvailable": "不可用"
+  },
+  "commandPalette": {
+    "searchPlaceholder": "搜索主机或快速操作...",
+    "recentActivity": "最近活动",
+    "navigation": "导航",
+    "addHost": "添加主机",
+    "addCredential": "添加凭据",
+    "adminSettings": "管理员设置",
+    "userProfile": "用户资料",
+    "updateLog": "更新日志",
+    "hosts": "主机",
+    "openServerDetails": "打开服务器详情",
+    "openFileManager": "打开文件管理器",
+    "edit": "编辑",
+    "links": "链接",
+    "github": "GitHub",
+    "support": "支持",
+    "discord": "Discord",
+    "donate": "捐赠",
+    "press": "按下",
+    "toToggle": "来切换",
+    "close": "关闭",
+    "hostManager": "主机管理器"
  }
 }
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -5,6 +5,15 @@ import type { Request } from "express";
 // SSH HOST TYPES
 // ============================================================================

+export interface JumpHost {
+  hostId: number;
+}
+
+export interface QuickAction {
+  name: string;
+  snippetId: number;
+}
+
 export interface SSHHost {
  id: number;
  name: string;
@@ -26,18 +35,30 @@ export interface SSHHost {
  autostartKeyPassword?: string;

  credentialId?: number;
+  overrideCredentialUsername?: boolean;
  userId?: string;
  enableTerminal: boolean;
  enableTunnel: boolean;
  enableFileManager: boolean;
  defaultPath: string;
  tunnelConnections: TunnelConnection[];
+  jumpHosts?: JumpHost[];
+  quickActions?: QuickAction[];
  statsConfig?: string;
  terminalConfig?: TerminalConfig;
  createdAt: string;
  updatedAt: string;
 }

+export interface JumpHostData {
+  hostId: number;
+}
+
+export interface QuickActionData {
+  name: string;
+  snippetId: number;
+}
+
 export interface SSHHostData {
  name?: string;
  ip: string;
@@ -52,16 +73,29 @@ export interface SSHHostData {
  keyPassword?: string;
  keyType?: string;
  credentialId?: number | null;
+  overrideCredentialUsername?: boolean;
  enableTerminal?: boolean;
  enableTunnel?: boolean;
  enableFileManager?: boolean;
  defaultPath?: string;
  forceKeyboardInteractive?: boolean;
  tunnelConnections?: TunnelConnection[];
+  jumpHosts?: JumpHostData[];
+  quickActions?: QuickActionData[];
  statsConfig?: string | Record<string, unknown>;
  terminalConfig?: TerminalConfig;
 }

+export interface SSHFolder {
+  id: number;
+  userId: string;
+  name: string;
+  color?: string;
+  icon?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
 // ============================================================================
 // CREDENTIAL TYPES
 // ============================================================================
@@ -295,6 +329,21 @@ export interface TabContextTab {
  initialTab?: string;
 }

+export type SplitLayout = "2h" | "2v" | "3l" | "3r" | "3t" | "4grid";
+
+export interface SplitConfiguration {
+  layout: SplitLayout;
+  positions: Map<number, number>;
+}
+
+export interface SplitLayoutOption {
+  id: SplitLayout;
+  name: string;
+  description: string;
+  cellCount: number;
+  icon: string; // lucide icon name
+}
+
 // ============================================================================
 // CONNECTION STATES
 // ============================================================================
@@ -369,6 +418,8 @@ export interface HostManagerProps {
  isTopbarOpen?: boolean;
  initialTab?: string;
  hostConfig?: SSHHost;
+  rightSidebarOpen?: boolean;
+  rightSidebarWidth?: number;
 }

 export interface SSHManagerHostEditorProps {
@@ -455,6 +506,8 @@ export interface Snippet {
  name: string;
  content: string;
  description?: string;
+  folder?: string;
+  order?: number;
  createdAt: string;
  updatedAt: string;
 }
@@ -463,6 +516,18 @@ export interface SnippetData {
  name: string;
  content: string;
  description?: string;
+  folder?: string;
+  order?: number;
+}
+
+export interface SnippetFolder {
+  id: number;
+  userId: string;
+  name: string;
+  color?: string;
+  icon?: string;
+  createdAt: string;
+  updatedAt: string;
 }

 // ============================================================================
--- a/src/types/stats-widgets.ts
+++ b/src/types/stats-widgets.ts
@@ -5,7 +5,8 @@ export type WidgetType =
  | "network"
  | "uptime"
  | "processes"
-  | "system";
+  | "system"
+  | "login_stats";

 export interface StatsConfig {
  enabledWidgets: WidgetType[];
@@ -16,7 +17,15 @@ export interface StatsConfig {
 }

 export const DEFAULT_STATS_CONFIG: StatsConfig = {
-  enabledWidgets: ["cpu", "memory", "disk", "network", "uptime", "system"],
+  enabledWidgets: [
+    "cpu",
+    "memory",
+    "disk",
+    "network",
+    "uptime",
+    "system",
+    "login_stats",
+  ],
  statusCheckEnabled: true,
  statusCheckInterval: 30,
  metricsEnabled: true,
--- a/src/ui/desktop/DesktopApp.tsx
+++ b/src/ui/desktop/DesktopApp.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from "react";
+import React, { useState, useEffect, useCallback, useRef } from "react";
 import { LeftSidebar } from "@/ui/desktop/navigation/LeftSidebar.tsx";
 import { Dashboard } from "@/ui/desktop/apps/dashboard/Dashboard.tsx";
 import { AppView } from "@/ui/desktop/navigation/AppView.tsx";
@@ -8,9 +8,11 @@ import {
  useTabs,
 } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
 import { TopNavbar } from "@/ui/desktop/navigation/TopNavbar.tsx";
+import { CommandHistoryProvider } from "@/ui/desktop/apps/terminal/command-history/CommandHistoryContext.tsx";
 import { AdminSettings } from "@/ui/desktop/admin/AdminSettings.tsx";
 import { UserProfile } from "@/ui/desktop/user/UserProfile.tsx";
 import { Toaster } from "@/components/ui/sonner.tsx";
+import { CommandPalette } from "@/ui/desktop/apps/command-palette/CommandPalette.tsx";
 import { getUserInfo } from "@/ui/main-axios.ts";

 function AppContent() {
@@ -22,7 +24,41 @@ function AppContent() {
    const saved = localStorage.getItem("topNavbarOpen");
    return saved !== null ? JSON.parse(saved) : true;
  });
+  const [isTransitioning, setIsTransitioning] = useState(false);
+  const [transitionPhase, setTransitionPhase] = useState<
+    "idle" | "fadeOut" | "fadeIn"
+  >("idle");
  const { currentTab, tabs } = useTabs();
+  const [isCommandPaletteOpen, setIsCommandPaletteOpen] = useState(false);
+  const [rightSidebarOpen, setRightSidebarOpen] = useState(false);
+  const [rightSidebarWidth, setRightSidebarWidth] = useState(400);
+
+  const lastShiftPressTime = useRef(0);
+
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.code === "ShiftLeft") {
+        if (event.repeat) {
+          return;
+        }
+        const now = Date.now();
+        if (now - lastShiftPressTime.current < 300) {
+          setIsCommandPaletteOpen((isOpen) => !isOpen);
+          lastShiftPressTime.current = 0;
+        } else {
+          lastShiftPressTime.current = now;
+        }
+      }
+      if (event.key === "Escape") {
+        setIsCommandPaletteOpen(false);
+      }
+    };
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => {
+      window.removeEventListener("keydown", handleKeyDown);
+    };
+  }, []);

  useEffect(() => {
    const checkAuth = () => {
@@ -33,6 +69,7 @@ function AppContent() {
            setIsAuthenticated(false);
            setIsAdmin(false);
            setUsername(null);
+            localStorage.removeItem("jwt");
          } else {
            setIsAuthenticated(true);
            setIsAdmin(!!meRes.is_admin);
@@ -44,6 +81,8 @@ function AppContent() {
          setIsAdmin(false);
          setUsername(null);

+          localStorage.removeItem("jwt");
+
          const errorCode = err?.response?.data?.code;
          if (errorCode === "SESSION_EXPIRED") {
            console.warn("Session expired - please log in again");
@@ -74,13 +113,44 @@ function AppContent() {
      username: string | null;
      userId: string | null;
    }) => {
-      setIsAuthenticated(true);
-      setIsAdmin(authData.isAdmin);
-      setUsername(authData.username);
+      setIsTransitioning(true);
+      setTransitionPhase("fadeOut");
+
+      setTimeout(() => {
+        setIsAuthenticated(true);
+        setIsAdmin(authData.isAdmin);
+        setUsername(authData.username);
+        setTransitionPhase("fadeIn");
+
+        setTimeout(() => {
+          setIsTransitioning(false);
+          setTransitionPhase("idle");
+        }, 800);
+      }, 1200);
    },
    [],
  );

+  const handleLogout = useCallback(async () => {
+    setIsTransitioning(true);
+    setTransitionPhase("fadeOut");
+
+    setTimeout(async () => {
+      try {
+        const { logoutUser, isElectron } = await import("@/ui/main-axios.ts");
+        await logoutUser();
+
+        if (isElectron()) {
+          localStorage.removeItem("jwt");
+        }
+      } catch (error) {
+        console.error("Logout failed:", error);
+      }
+
+      window.location.reload();
+    }, 1200);
+  }, []);
+
  const currentTabData = tabs.find((tab) => tab.id === currentTab);
  const showTerminalView =
    currentTabData?.type === "terminal" ||
@@ -91,10 +161,35 @@ function AppContent() {
  const showAdmin = currentTabData?.type === "admin";
  const showProfile = currentTabData?.type === "user_profile";

+  if (authLoading) {
+    return (
+      <div
+        className="h-screen w-screen flex items-center justify-center bg-dark-bg-darkest"
+        style={{
+          backgroundImage: `repeating-linear-gradient(
+            225deg,
+            transparent,
+            transparent 35px,
+            rgba(255, 255, 255, 0.03) 35px,
+            rgba(255, 255, 255, 0.03) 37px
+          )`,
+        }}
+      >
+        <div className="text-center">
+          <div className="w-16 h-16 border-4 border-primary/30 border-t-primary rounded-full animate-spin mx-auto" />
+        </div>
+      </div>
+    );
+  }
+
  return (
-    <div>
-      {!isAuthenticated && !authLoading && (
-        <div className="fixed inset-0 flex items-center justify-center z-[10000]">
+    <div className="h-screen w-screen overflow-hidden bg-background">
+      <CommandPalette
+        isOpen={isCommandPaletteOpen}
+        setIsOpen={setIsCommandPaletteOpen}
+      />
+      {!isAuthenticated && (
+        <div className="fixed inset-0 flex items-center justify-center z-[10000] bg-background">
          <Dashboard
            onSelectView={handleSelectView}
            isAuthenticated={isAuthenticated}
@@ -111,12 +206,17 @@ function AppContent() {
          disabled={!isAuthenticated || authLoading}
          isAdmin={isAdmin}
          username={username}
+          onLogout={handleLogout}
        >
          <div
            className="h-screen w-full visible pointer-events-auto static overflow-hidden"
            style={{ display: showTerminalView ? "block" : "none" }}
          >
-            <AppView isTopbarOpen={isTopbarOpen} />
+            <AppView
+              isTopbarOpen={isTopbarOpen}
+              rightSidebarOpen={rightSidebarOpen}
+              rightSidebarWidth={rightSidebarWidth}
+            />
          </div>

          {showHome && (
@@ -127,6 +227,8 @@ function AppContent() {
                authLoading={authLoading}
                onAuthSuccess={handleAuthSuccess}
                isTopbarOpen={isTopbarOpen}
+                rightSidebarOpen={rightSidebarOpen}
+                rightSidebarWidth={rightSidebarWidth}
              />
            </div>
          )}
@@ -138,28 +240,210 @@ function AppContent() {
                isTopbarOpen={isTopbarOpen}
                initialTab={currentTabData?.initialTab}
                hostConfig={currentTabData?.hostConfig}
+                rightSidebarOpen={rightSidebarOpen}
+                rightSidebarWidth={rightSidebarWidth}
              />
            </div>
          )}

          {showAdmin && (
            <div className="h-screen w-full visible pointer-events-auto static overflow-hidden">
-              <AdminSettings isTopbarOpen={isTopbarOpen} />
+              <AdminSettings
+                isTopbarOpen={isTopbarOpen}
+                rightSidebarOpen={rightSidebarOpen}
+                rightSidebarWidth={rightSidebarWidth}
+              />
            </div>
          )}

          {showProfile && (
            <div className="h-screen w-full visible pointer-events-auto static overflow-auto">
-              <UserProfile isTopbarOpen={isTopbarOpen} />
+              <UserProfile
+                isTopbarOpen={isTopbarOpen}
+                rightSidebarOpen={rightSidebarOpen}
+                rightSidebarWidth={rightSidebarWidth}
+              />
            </div>
          )}

          <TopNavbar
            isTopbarOpen={isTopbarOpen}
            setIsTopbarOpen={setIsTopbarOpen}
+            onOpenCommandPalette={() => setIsCommandPaletteOpen(true)}
+            onRightSidebarStateChange={(isOpen, width) => {
+              setRightSidebarOpen(isOpen);
+              setRightSidebarWidth(width);
+            }}
          />
        </LeftSidebar>
      )}
+
+      {isTransitioning && (
+        <div
+          className={`fixed inset-0 bg-background z-[20000] transition-opacity duration-700 ${
+            transitionPhase === "fadeOut" ? "opacity-100" : "opacity-0"
+          }`}
+        >
+          {transitionPhase === "fadeOut" && (
+            <>
+              <div className="absolute inset-0 flex items-center justify-center overflow-hidden">
+                <div
+                  className="absolute w-0 h-0 bg-primary/10 rounded-full"
+                  style={{
+                    animation:
+                      "ripple 2.5s cubic-bezier(0.4, 0, 0.2, 1) forwards",
+                    animationDelay: "0ms",
+                    willChange: "width, height, opacity",
+                    transform: "translateZ(0)",
+                  }}
+                />
+                <div
+                  className="absolute w-0 h-0 bg-primary/7 rounded-full"
+                  style={{
+                    animation:
+                      "ripple 2.5s cubic-bezier(0.4, 0, 0.2, 1) forwards",
+                    animationDelay: "200ms",
+                    willChange: "width, height, opacity",
+                    transform: "translateZ(0)",
+                  }}
+                />
+                <div
+                  className="absolute w-0 h-0 bg-primary/5 rounded-full"
+                  style={{
+                    animation:
+                      "ripple 2.5s cubic-bezier(0.4, 0, 0.2, 1) forwards",
+                    animationDelay: "400ms",
+                    willChange: "width, height, opacity",
+                    transform: "translateZ(0)",
+                  }}
+                />
+                <div
+                  className="absolute w-0 h-0 bg-primary/3 rounded-full"
+                  style={{
+                    animation:
+                      "ripple 2.5s cubic-bezier(0.4, 0, 0.2, 1) forwards",
+                    animationDelay: "600ms",
+                    willChange: "width, height, opacity",
+                    transform: "translateZ(0)",
+                  }}
+                />
+                <div
+                  className="relative z-10 text-center"
+                  style={{
+                    animation:
+                      "logoFade 1.6s cubic-bezier(0.4, 0, 0.2, 1) forwards",
+                    willChange: "opacity, transform",
+                  }}
+                >
+                  <div
+                    className="text-7xl font-bold tracking-wider"
+                    style={{
+                      fontFamily:
+                        "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace",
+                      animation:
+                        "logoGlow 1.6s cubic-bezier(0.4, 0, 0.2, 1) forwards",
+                      willChange: "color, text-shadow",
+                    }}
+                  >
+                    TERMIX
+                  </div>
+                  <div
+                    className="text-sm text-muted-foreground mt-3 tracking-widest"
+                    style={{
+                      animation:
+                        "subtitleFade 1.6s cubic-bezier(0.4, 0, 0.2, 1) forwards",
+                      willChange: "opacity, transform",
+                    }}
+                  >
+                    SSH SERVER MANAGER
+                  </div>
+                </div>
+              </div>
+              <style>{`
+                @keyframes ripple {
+                  0% {
+                    width: 0;
+                    height: 0;
+                    opacity: 1;
+                  }
+                  30% {
+                    opacity: 0.6;
+                  }
+                  70% {
+                    opacity: 0.3;
+                  }
+                  100% {
+                    width: 200vmax;
+                    height: 200vmax;
+                    opacity: 0;
+                  }
+                }
+                @keyframes logoFade {
+                  0% {
+                    opacity: 0;
+                    transform: scale(0.85) translateZ(0);
+                  }
+                  25% {
+                    opacity: 1;
+                    transform: scale(1) translateZ(0);
+                  }
+                  75% {
+                    opacity: 1;
+                    transform: scale(1) translateZ(0);
+                  }
+                  100% {
+                    opacity: 0;
+                    transform: scale(1.05) translateZ(0);
+                  }
+                }
+                @keyframes logoGlow {
+                  0% {
+                    color: hsl(var(--primary));
+                    text-shadow: none;
+                  }
+                  25% {
+                    color: hsl(var(--primary));
+                    text-shadow:
+                      0 0 20px hsla(var(--primary), 0.3),
+                      0 0 40px hsla(var(--primary), 0.2),
+                      0 0 60px hsla(var(--primary), 0.1);
+                  }
+                  75% {
+                    color: hsl(var(--primary));
+                    text-shadow:
+                      0 0 20px hsla(var(--primary), 0.3),
+                      0 0 40px hsla(var(--primary), 0.2),
+                      0 0 60px hsla(var(--primary), 0.1);
+                  }
+                  100% {
+                    color: hsl(var(--primary));
+                    text-shadow: none;
+                  }
+                }
+                @keyframes subtitleFade {
+                  0%, 30% {
+                    opacity: 0;
+                    transform: translateY(10px) translateZ(0);
+                  }
+                  50% {
+                    opacity: 1;
+                    transform: translateY(0) translateZ(0);
+                  }
+                  75% {
+                    opacity: 1;
+                    transform: translateY(0) translateZ(0);
+                  }
+                  100% {
+                    opacity: 0;
+                    transform: translateY(-5px) translateZ(0);
+                  }
+                }
+              `}</style>
+            </>
+          )}
+        </div>
+      )}
+
      <Toaster
        position="bottom-right"
        richColors={false}
@@ -174,7 +458,9 @@ function AppContent() {
 function DesktopApp() {
  return (
    <TabProvider>
-      <AppContent />
+      <CommandHistoryProvider>
+        <AppContent />
+      </CommandHistoryProvider>
    </TabProvider>
  );
 }
--- a/src/ui/desktop/admin/AdminSettings.tsx
+++ b/src/ui/desktop/admin/AdminSettings.tsx
@@ -13,6 +13,14 @@ import {
  TabsList,
  TabsTrigger,
 } from "@/components/ui/tabs.tsx";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog.tsx";
 import {
  Table,
  TableBody,
@@ -26,7 +34,8 @@ import {
  Trash2,
  Users,
  Database,
-  Lock,
+  Link2,
+  Unlink,
  Download,
  Upload,
  Monitor,
@@ -55,14 +64,20 @@ import {
  getSessions,
  revokeSession,
  revokeAllUserSessions,
+  linkOIDCToPasswordAccount,
+  unlinkOIDCFromPasswordAccount,
 } from "@/ui/main-axios.ts";

 interface AdminSettingsProps {
  isTopbarOpen?: boolean;
+  rightSidebarOpen?: boolean;
+  rightSidebarWidth?: number;
 }

 export function AdminSettings({
  isTopbarOpen = true,
+  rightSidebarOpen = false,
+  rightSidebarWidth = 400,
 }: AdminSettingsProps): React.ReactElement {
  const { t } = useTranslation();
  const { confirmWithToast } = useConfirmation();
@@ -94,6 +109,7 @@ export function AdminSettings({
      username: string;
      is_admin: boolean;
      is_oidc: boolean;
+      password_hash?: string;
    }>
  >([]);
  const [usersLoading, setUsersLoading] = React.useState(false);
@@ -134,6 +150,14 @@ export function AdminSettings({
  >([]);
  const [sessionsLoading, setSessionsLoading] = React.useState(false);

+  const [linkAccountAlertOpen, setLinkAccountAlertOpen] = React.useState(false);
+  const [linkOidcUser, setLinkOidcUser] = React.useState<{
+    id: string;
+    username: string;
+  } | null>(null);
+  const [linkTargetUsername, setLinkTargetUsername] = React.useState("");
+  const [linkLoading, setLinkLoading] = React.useState(false);
+
  const requiresImportPassword = React.useMemo(
    () => !currentUser?.is_oidc,
    [currentUser?.is_oidc],
@@ -632,15 +656,82 @@ export function AdminSettings({
    );
  };

+  const handleLinkOIDCUser = (user: { id: string; username: string }) => {
+    setLinkOidcUser(user);
+    setLinkTargetUsername("");
+    setLinkAccountAlertOpen(true);
+  };
+
+  const handleLinkSubmit = async () => {
+    if (!linkOidcUser || !linkTargetUsername.trim()) {
+      toast.error("Target username is required");
+      return;
+    }
+
+    setLinkLoading(true);
+    try {
+      const result = await linkOIDCToPasswordAccount(
+        linkOidcUser.id,
+        linkTargetUsername.trim(),
+      );
+
+      toast.success(
+        result.message ||
+          `OIDC user ${linkOidcUser.username} linked to ${linkTargetUsername}`,
+      );
+      setLinkAccountAlertOpen(false);
+      setLinkTargetUsername("");
+      setLinkOidcUser(null);
+      fetchUsers();
+      fetchSessions();
+    } catch (error: unknown) {
+      const err = error as {
+        response?: { data?: { error?: string; code?: string } };
+      };
+      toast.error(err.response?.data?.error || "Failed to link accounts");
+    } finally {
+      setLinkLoading(false);
+    }
+  };
+
+  const handleUnlinkOIDC = async (userId: string, username: string) => {
+    confirmWithToast(
+      t("admin.unlinkOIDCDescription", { username }),
+      async () => {
+        try {
+          const result = await unlinkOIDCFromPasswordAccount(userId);
+
+          toast.success(
+            result.message || t("admin.unlinkOIDCSuccess", { username }),
+          );
+          fetchUsers();
+          fetchSessions();
+        } catch (error: unknown) {
+          const err = error as {
+            response?: { data?: { error?: string; code?: string } };
+          };
+          toast.error(
+            err.response?.data?.error || t("admin.failedToUnlinkOIDC"),
+          );
+        }
+      },
+      "destructive",
+    );
+  };
+
  const topMarginPx = isTopbarOpen ? 74 : 26;
  const leftMarginPx = sidebarState === "collapsed" ? 26 : 8;
  const bottomMarginPx = 8;
  const wrapperStyle: React.CSSProperties = {
    marginLeft: leftMarginPx,
-    marginRight: 17,
+    marginRight: rightSidebarOpen
+      ? `calc(var(--right-sidebar-width, ${rightSidebarWidth}px) + 8px)`
+      : 17,
    marginTop: topMarginPx,
    marginBottom: bottomMarginPx,
    height: `calc(100vh - ${topMarginPx + bottomMarginPx}px)`,
+    transition:
+      "margin-left 200ms linear, margin-right 200ms linear, margin-top 200ms linear",
  };

  return (
@@ -1017,20 +1108,55 @@ export function AdminSettings({
                              )}
                            </TableCell>
                            <TableCell className="px-4">
-                              {user.is_oidc
-                                ? t("admin.external")
-                                : t("admin.local")}
+                              {user.is_oidc && user.password_hash
+                                ? "Dual Auth"
+                                : user.is_oidc
+                                  ? t("admin.external")
+                                  : t("admin.local")}
                            </TableCell>
                            <TableCell className="px-4">
-                              <Button
-                                variant="ghost"
-                                size="sm"
-                                onClick={() => handleDeleteUser(user.username)}
-                                className="text-red-600 hover:text-red-700 hover:bg-red-50"
-                                disabled={user.is_admin}
-                              >
-                                <Trash2 className="h-4 w-4" />
-                              </Button>
+                              <div className="flex gap-2">
+                                {user.is_oidc && !user.password_hash && (
+                                  <Button
+                                    variant="ghost"
+                                    size="sm"
+                                    onClick={() =>
+                                      handleLinkOIDCUser({
+                                        id: user.id,
+                                        username: user.username,
+                                      })
+                                    }
+                                    className="text-blue-600 hover:text-blue-700 hover:bg-blue-50"
+                                    title="Link to password account"
+                                  >
+                                    <Link2 className="h-4 w-4" />
+                                  </Button>
+                                )}
+                                {user.is_oidc && user.password_hash && (
+                                  <Button
+                                    variant="ghost"
+                                    size="sm"
+                                    onClick={() =>
+                                      handleUnlinkOIDC(user.id, user.username)
+                                    }
+                                    className="text-orange-600 hover:text-orange-700 hover:bg-orange-50"
+                                    title="Unlink OIDC (keep password only)"
+                                  >
+                                    <Unlink className="h-4 w-4" />
+                                  </Button>
+                                )}
+                                <Button
+                                  variant="ghost"
+                                  size="sm"
+                                  onClick={() =>
+                                    handleDeleteUser(user.username)
+                                  }
+                                  className="text-red-600 hover:text-red-700 hover:bg-red-50"
+                                  disabled={user.is_admin}
+                                >
+                                  <Trash2 className="h-4 w-4" />
+                                </Button>
+                              </div>
                            </TableCell>
                          </TableRow>
                        ))}
@@ -1064,109 +1190,113 @@ export function AdminSettings({
                  </div>
                ) : (
                  <div className="border rounded-md overflow-hidden">
-                    <Table>
-                      <TableHeader>
-                        <TableRow>
-                          <TableHead className="px-4">Device</TableHead>
-                          <TableHead className="px-4">User</TableHead>
-                          <TableHead className="px-4">Created</TableHead>
-                          <TableHead className="px-4">Last Active</TableHead>
-                          <TableHead className="px-4">Expires</TableHead>
-                          <TableHead className="px-4">
-                            {t("admin.actions")}
-                          </TableHead>
-                        </TableRow>
-                      </TableHeader>
-                      <TableBody>
-                        {sessions.map((session) => {
-                          const DeviceIcon =
-                            session.deviceType === "desktop"
-                              ? Monitor
-                              : session.deviceType === "mobile"
-                                ? Smartphone
-                                : Globe;
+                    <div className="overflow-x-auto">
+                      <Table>
+                        <TableHeader>
+                          <TableRow>
+                            <TableHead className="px-4">Device</TableHead>
+                            <TableHead className="px-4">User</TableHead>
+                            <TableHead className="px-4">Created</TableHead>
+                            <TableHead className="px-4">Last Active</TableHead>
+                            <TableHead className="px-4">Expires</TableHead>
+                            <TableHead className="px-4">
+                              {t("admin.actions")}
+                            </TableHead>
+                          </TableRow>
+                        </TableHeader>
+                        <TableBody>
+                          {sessions.map((session) => {
+                            const DeviceIcon =
+                              session.deviceType === "desktop"
+                                ? Monitor
+                                : session.deviceType === "mobile"
+                                  ? Smartphone
+                                  : Globe;

-                          const createdDate = new Date(session.createdAt);
-                          const lastActiveDate = new Date(session.lastActiveAt);
-                          const expiresDate = new Date(session.expiresAt);
+                            const createdDate = new Date(session.createdAt);
+                            const lastActiveDate = new Date(
+                              session.lastActiveAt,
+                            );
+                            const expiresDate = new Date(session.expiresAt);

-                          const formatDate = (date: Date) =>
-                            date.toLocaleDateString() +
-                            " " +
-                            date.toLocaleTimeString([], {
-                              hour: "2-digit",
-                              minute: "2-digit",
-                            });
+                            const formatDate = (date: Date) =>
+                              date.toLocaleDateString() +
+                              " " +
+                              date.toLocaleTimeString([], {
+                                hour: "2-digit",
+                                minute: "2-digit",
+                              });

-                          return (
-                            <TableRow
-                              key={session.id}
-                              className={
-                                session.isRevoked ? "opacity-50" : undefined
-                              }
-                            >
-                              <TableCell className="px-4">
-                                <div className="flex items-center gap-2">
-                                  <DeviceIcon className="h-4 w-4" />
-                                  <div className="flex flex-col">
-                                    <span className="font-medium text-sm">
-                                      {session.deviceInfo}
-                                    </span>
-                                    {session.isRevoked && (
-                                      <span className="text-xs text-red-600">
-                                        Revoked
+                            return (
+                              <TableRow
+                                key={session.id}
+                                className={
+                                  session.isRevoked ? "opacity-50" : undefined
+                                }
+                              >
+                                <TableCell className="px-4">
+                                  <div className="flex items-center gap-2">
+                                    <DeviceIcon className="h-4 w-4" />
+                                    <div className="flex flex-col">
+                                      <span className="font-medium text-sm">
+                                        {session.deviceInfo}
                                      </span>
-                                    )}
+                                      {session.isRevoked && (
+                                        <span className="text-xs text-red-600">
+                                          Revoked
+                                        </span>
+                                      )}
+                                    </div>
                                  </div>
-                                </div>
-                              </TableCell>
-                              <TableCell className="px-4">
-                                {session.username || session.userId}
-                              </TableCell>
-                              <TableCell className="px-4 text-sm text-muted-foreground">
-                                {formatDate(createdDate)}
-                              </TableCell>
-                              <TableCell className="px-4 text-sm text-muted-foreground">
-                                {formatDate(lastActiveDate)}
-                              </TableCell>
-                              <TableCell className="px-4 text-sm text-muted-foreground">
-                                {formatDate(expiresDate)}
-                              </TableCell>
-                              <TableCell className="px-4">
-                                <div className="flex gap-2">
-                                  <Button
-                                    variant="ghost"
-                                    size="sm"
-                                    onClick={() =>
-                                      handleRevokeSession(session.id)
-                                    }
-                                    className="text-red-600 hover:text-red-700 hover:bg-red-50"
-                                    disabled={session.isRevoked}
-                                  >
-                                    <Trash2 className="h-4 w-4" />
-                                  </Button>
-                                  {session.username && (
+                                </TableCell>
+                                <TableCell className="px-4">
+                                  {session.username || session.userId}
+                                </TableCell>
+                                <TableCell className="px-4 text-sm text-muted-foreground">
+                                  {formatDate(createdDate)}
+                                </TableCell>
+                                <TableCell className="px-4 text-sm text-muted-foreground">
+                                  {formatDate(lastActiveDate)}
+                                </TableCell>
+                                <TableCell className="px-4 text-sm text-muted-foreground">
+                                  {formatDate(expiresDate)}
+                                </TableCell>
+                                <TableCell className="px-4">
+                                  <div className="flex gap-2">
                                    <Button
                                      variant="ghost"
                                      size="sm"
                                      onClick={() =>
-                                        handleRevokeAllUserSessions(
-                                          session.userId,
-                                        )
+                                        handleRevokeSession(session.id)
                                      }
-                                      className="text-orange-600 hover:text-orange-700 hover:bg-orange-50 text-xs"
-                                      title="Revoke all sessions for this user"
+                                      className="text-red-600 hover:text-red-700 hover:bg-red-50"
+                                      disabled={session.isRevoked}
                                    >
-                                      Revoke All
+                                      <Trash2 className="h-4 w-4" />
                                    </Button>
-                                  )}
-                                </div>
-                              </TableCell>
-                            </TableRow>
-                          );
-                        })}
-                      </TableBody>
-                    </Table>
+                                    {session.username && (
+                                      <Button
+                                        variant="ghost"
+                                        size="sm"
+                                        onClick={() =>
+                                          handleRevokeAllUserSessions(
+                                            session.userId,
+                                          )
+                                        }
+                                        className="text-orange-600 hover:text-orange-700 hover:bg-orange-50 text-xs"
+                                        title="Revoke all sessions for this user"
+                                      >
+                                        Revoke All
+                                      </Button>
+                                    )}
+                                  </div>
+                                </TableCell>
+                              </TableRow>
+                            );
+                          })}
+                        </TableBody>
+                      </Table>
+                    </div>
                  </div>
                )}
              </div>
@@ -1177,8 +1307,8 @@ export function AdminSettings({
                <h3 className="text-lg font-semibold">
                  {t("admin.adminManagement")}
                </h3>
-                <div className="space-y-4 p-6 border rounded-md bg-muted/50">
-                  <h4 className="font-medium">{t("admin.makeUserAdmin")}</h4>
+                <div className="space-y-4 p-4 border rounded-md bg-dark-bg-panel">
+                  <h4 className="font-semibold">{t("admin.makeUserAdmin")}</h4>
                  <form onSubmit={handleMakeUserAdmin} className="space-y-4">
                    <div className="space-y-2">
                      <Label htmlFor="new-admin-username">
@@ -1271,32 +1401,17 @@ export function AdminSettings({
            <TabsContent value="security" className="space-y-6">
              <div className="space-y-4">
                <div className="flex items-center gap-3">
-                  <Database className="h-5 w-5" />
                  <h3 className="text-lg font-semibold">
                    {t("admin.databaseSecurity")}
                  </h3>
                </div>

-                <div className="p-4 border rounded bg-card">
-                  <div className="flex items-center gap-2">
-                    <Lock className="h-4 w-4 text-green-500" />
-                    <div>
-                      <div className="text-sm font-medium">
-                        {t("admin.encryptionStatus")}
-                      </div>
-                      <div className="text-xs text-green-500">
-                        {t("admin.encryptionEnabled")}
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
                <div className="grid gap-3 md:grid-cols-2">
-                  <div className="p-4 border rounded bg-card">
+                  <div className="p-4 border rounded-lg bg-dark-bg-panel">
                    <div className="space-y-3">
                      <div className="flex items-center gap-2">
                        <Download className="h-4 w-4 text-blue-500" />
-                        <h4 className="font-medium">{t("admin.export")}</h4>
+                        <h4 className="font-semibold">{t("admin.export")}</h4>
                      </div>
                      <p className="text-xs text-muted-foreground">
                        {t("admin.exportDescription")}
@@ -1343,11 +1458,11 @@ export function AdminSettings({
                    </div>
                  </div>

-                  <div className="p-4 border rounded bg-card">
+                  <div className="p-4 border rounded-lg bg-dark-bg-panel">
                    <div className="space-y-3">
                      <div className="flex items-center gap-2">
                        <Upload className="h-4 w-4 text-green-500" />
-                        <h4 className="font-medium">{t("admin.import")}</h4>
+                        <h4 className="font-semibold">{t("admin.import")}</h4>
                      </div>
                      <p className="text-xs text-muted-foreground">
                        {t("admin.importDescription")}
@@ -1417,6 +1532,87 @@ export function AdminSettings({
          </Tabs>
        </div>
      </div>
+
+      {linkAccountAlertOpen && (
+        <Dialog
+          open={linkAccountAlertOpen}
+          onOpenChange={setLinkAccountAlertOpen}
+        >
+          <DialogContent className="sm:max-w-[500px] bg-dark-bg border-2 border-dark-border">
+            <DialogHeader>
+              <DialogTitle className="flex items-center gap-2">
+                <Link2 className="w-5 h-5" />
+                Link OIDC Account to Password Account
+              </DialogTitle>
+              <DialogDescription className="text-muted-foreground">
+                Link{" "}
+                <span className="font-mono text-foreground">
+                  {linkOidcUser?.username}
+                </span>{" "}
+                (OIDC user) to an existing password account. This will enable
+                dual authentication for the password account.
+              </DialogDescription>
+            </DialogHeader>
+
+            <div className="space-y-4 py-4">
+              <Alert variant="destructive">
+                <AlertTitle>Warning: OIDC User Data Will Be Deleted</AlertTitle>
+                <AlertDescription>
+                  This action will:
+                  <ul className="list-disc list-inside mt-2 space-y-1">
+                    <li>Delete the OIDC user account and all their data</li>
+                    <li>
+                      Add OIDC login capability to the target password account
+                    </li>
+                    <li>
+                      Allow the password account to login with both password and
+                      OIDC
+                    </li>
+                  </ul>
+                </AlertDescription>
+              </Alert>
+
+              <div className="space-y-2">
+                <Label
+                  htmlFor="link-target-username"
+                  className="text-base font-semibold text-foreground"
+                >
+                  Target Password Account Username
+                </Label>
+                <Input
+                  id="link-target-username"
+                  value={linkTargetUsername}
+                  onChange={(e) => setLinkTargetUsername(e.target.value)}
+                  placeholder="Enter username of password account"
+                  disabled={linkLoading}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter" && linkTargetUsername.trim()) {
+                      handleLinkSubmit();
+                    }
+                  }}
+                />
+              </div>
+            </div>
+
+            <DialogFooter>
+              <Button
+                variant="outline"
+                onClick={() => setLinkAccountAlertOpen(false)}
+                disabled={linkLoading}
+              >
+                {t("common.cancel")}
+              </Button>
+              <Button
+                onClick={handleLinkSubmit}
+                disabled={linkLoading || !linkTargetUsername.trim()}
+                variant="destructive"
+              >
+                {linkLoading ? "Linking..." : "Link Accounts"}
+              </Button>
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
+      )}
    </div>
  );
 }
--- a/src/ui/desktop/apps/command-palette/CommandPalette.tsx
+++ b/src/ui/desktop/apps/command-palette/CommandPalette.tsx
@@ -0,0 +1,420 @@
+import {
+  Command,
+  CommandInput,
+  CommandItem,
+  CommandList,
+  CommandGroup,
+  CommandSeparator,
+} from "@/components/ui/command.tsx";
+import React, { useEffect, useRef, useState } from "react";
+import { cn } from "@/lib/utils";
+import { Kbd, KbdGroup } from "@/components/ui/kbd";
+import {
+  Key,
+  Server,
+  Settings,
+  User,
+  Github,
+  Terminal,
+  FolderOpen,
+  Pencil,
+  EllipsisVertical,
+} from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { BiMoney, BiSupport } from "react-icons/bi";
+import { BsDiscord } from "react-icons/bs";
+import { GrUpdate } from "react-icons/gr";
+import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
+import { getRecentActivity, getSSHHosts } from "@/ui/main-axios.ts";
+import type { RecentActivityItem } from "@/ui/main-axios.ts";
+import {
+  DropdownMenu,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
+import { Button } from "@/components/ui/button.tsx";
+
+interface SSHHost {
+  id: number;
+  name: string;
+  ip: string;
+  port: number;
+  username: string;
+  folder: string;
+  tags: string[];
+  pin: boolean;
+  authType: string;
+  password?: string;
+  key?: string;
+  keyPassword?: string;
+  keyType?: string;
+  enableTerminal: boolean;
+  enableTunnel: boolean;
+  enableFileManager: boolean;
+  defaultPath: string;
+  tunnelConnections: unknown[];
+  createdAt: string;
+  updatedAt: string;
+}
+
+export function CommandPalette({
+  isOpen,
+  setIsOpen,
+}: {
+  isOpen: boolean;
+  setIsOpen: (isOpen: boolean) => void;
+}) {
+  const { t } = useTranslation();
+  const inputRef = useRef<HTMLInputElement>(null);
+  const { addTab, setCurrentTab, tabs: tabList, updateTab } = useTabs();
+  const [recentActivity, setRecentActivity] = useState<RecentActivityItem[]>(
+    [],
+  );
+  const [hosts, setHosts] = useState<SSHHost[]>([]);
+
+  useEffect(() => {
+    if (isOpen) {
+      inputRef.current?.focus();
+      getRecentActivity(50).then((activity) => {
+        setRecentActivity(activity.slice(0, 5));
+      });
+      getSSHHosts().then((allHosts) => {
+        setHosts(allHosts);
+      });
+    }
+  }, [isOpen]);
+
+  const handleAddHost = () => {
+    const sshManagerTab = tabList.find((t) => t.type === "ssh_manager");
+    if (sshManagerTab) {
+      updateTab(sshManagerTab.id, { initialTab: "add_host" });
+      setCurrentTab(sshManagerTab.id);
+    } else {
+      const id = addTab({
+        type: "ssh_manager",
+        title: t("commandPalette.hostManager"),
+        initialTab: "add_host",
+      });
+      setCurrentTab(id);
+    }
+    setIsOpen(false);
+  };
+
+  const handleAddCredential = () => {
+    const sshManagerTab = tabList.find((t) => t.type === "ssh_manager");
+    if (sshManagerTab) {
+      updateTab(sshManagerTab.id, { initialTab: "add_credential" });
+      setCurrentTab(sshManagerTab.id);
+    } else {
+      const id = addTab({
+        type: "ssh_manager",
+        title: t("commandPalette.hostManager"),
+        initialTab: "add_credential",
+      });
+      setCurrentTab(id);
+    }
+    setIsOpen(false);
+  };
+
+  const handleOpenAdminSettings = () => {
+    const adminTab = tabList.find((t) => t.type === "admin");
+    if (adminTab) {
+      setCurrentTab(adminTab.id);
+    } else {
+      const id = addTab({
+        type: "admin",
+        title: t("commandPalette.adminSettings"),
+      });
+      setCurrentTab(id);
+    }
+    setIsOpen(false);
+  };
+
+  const handleOpenUserProfile = () => {
+    const userProfileTab = tabList.find((t) => t.type === "user_profile");
+    if (userProfileTab) {
+      setCurrentTab(userProfileTab.id);
+    } else {
+      const id = addTab({
+        type: "user_profile",
+        title: t("commandPalette.userProfile"),
+      });
+      setCurrentTab(id);
+    }
+    setIsOpen(false);
+  };
+
+  const handleOpenUpdateLog = () => {
+    window.open("https://github.com/Termix-SSH/Termix/releases", "_blank");
+    setIsOpen(false);
+  };
+
+  const handleGitHub = () => {
+    window.open("https://github.com/Termix-SSH/Termix", "_blank");
+    setIsOpen(false);
+  };
+
+  const handleSupport = () => {
+    window.open("https://github.com/Termix-SSH/Support/issues/new", "_blank");
+    setIsOpen(false);
+  };
+
+  const handleDiscord = () => {
+    window.open("https://discord.com/invite/jVQGdvHDrf", "_blank");
+    setIsOpen(false);
+  };
+
+  const handleDonate = () => {
+    window.open("https://github.com/sponsors/LukeGus", "_blank");
+    setIsOpen(false);
+  };
+
+  const handleActivityClick = (item: RecentActivityItem) => {
+    getSSHHosts().then((hosts) => {
+      const host = hosts.find((h: { id: number }) => h.id === item.hostId);
+      if (!host) return;
+
+      if (item.type === "terminal") {
+        addTab({
+          type: "terminal",
+          title: item.hostName,
+          hostConfig: host,
+        });
+      } else if (item.type === "file_manager") {
+        addTab({
+          type: "file_manager",
+          title: item.hostName,
+          hostConfig: host,
+        });
+      }
+    });
+    setIsOpen(false);
+  };
+
+  const handleHostTerminalClick = (host: SSHHost) => {
+    const title = host.name?.trim()
+      ? host.name
+      : `${host.username}@${host.ip}:${host.port}`;
+    addTab({ type: "terminal", title, hostConfig: host });
+    setIsOpen(false);
+  };
+
+  const handleHostFileManagerClick = (host: SSHHost) => {
+    const title = host.name?.trim()
+      ? host.name
+      : `${host.username}@${host.ip}:${host.port}`;
+    addTab({ type: "file_manager", title, hostConfig: host });
+    setIsOpen(false);
+  };
+
+  const handleHostServerDetailsClick = (host: SSHHost) => {
+    const title = host.name?.trim()
+      ? host.name
+      : `${host.username}@${host.ip}:${host.port}`;
+    addTab({ type: "server", title, hostConfig: host });
+    setIsOpen(false);
+  };
+
+  const handleHostEditClick = (host: SSHHost) => {
+    const title = host.name?.trim()
+      ? host.name
+      : `${host.username}@${host.ip}:${host.port}`;
+    addTab({
+      type: "ssh_manager",
+      title: t("commandPalette.hostManager"),
+      hostConfig: host,
+      initialTab: "add_host",
+    });
+    setIsOpen(false);
+  };
+
+  return (
+    <div
+      className={cn(
+        "fixed inset-0 z-50 flex items-center justify-center bg-black/30 transition-opacity duration-200",
+        !isOpen && "opacity-0 pointer-events-none",
+      )}
+      onClick={() => setIsOpen(false)}
+    >
+      <Command
+        className={cn(
+          "w-3/4 max-w-2xl max-h-[60vh] rounded-lg border-2 border-dark-border shadow-md flex flex-col",
+          "transition-all duration-200 ease-out",
+          !isOpen && "scale-95 opacity-0",
+        )}
+        onClick={(e) => e.stopPropagation()}
+      >
+        <CommandInput
+          ref={inputRef}
+          placeholder={t("commandPalette.searchPlaceholder")}
+        />
+        <CommandList
+          key={recentActivity.length}
+          className="w-full h-auto flex-grow overflow-y-auto"
+          style={{ maxHeight: "inherit" }}
+        >
+          {recentActivity.length > 0 && (
+            <>
+              <CommandGroup heading={t("commandPalette.recentActivity")}>
+                {recentActivity.map((item, index) => (
+                  <CommandItem
+                    key={`recent-activity-${index}-${item.type}-${item.hostId}-${item.timestamp}`}
+                    value={`recent-activity-${index}-${item.hostName}-${item.type}`}
+                    onSelect={() => handleActivityClick(item)}
+                  >
+                    {item.type === "terminal" ? <Terminal /> : <FolderOpen />}
+                    <span>{item.hostName}</span>
+                  </CommandItem>
+                ))}
+              </CommandGroup>
+              <CommandSeparator />
+            </>
+          )}
+          <CommandGroup heading={t("commandPalette.navigation")}>
+            <CommandItem onSelect={handleAddHost}>
+              <Server />
+              <span>{t("commandPalette.addHost")}</span>
+            </CommandItem>
+            <CommandItem onSelect={handleAddCredential}>
+              <Key />
+              <span>{t("commandPalette.addCredential")}</span>
+            </CommandItem>
+            <CommandItem onSelect={handleOpenAdminSettings}>
+              <Settings />
+              <span>{t("commandPalette.adminSettings")}</span>
+            </CommandItem>
+            <CommandItem onSelect={handleOpenUserProfile}>
+              <User />
+              <span>{t("commandPalette.userProfile")}</span>
+            </CommandItem>
+            <CommandItem onSelect={handleOpenUpdateLog}>
+              <GrUpdate />
+              <span>{t("commandPalette.updateLog")}</span>
+            </CommandItem>
+          </CommandGroup>
+          <CommandSeparator />
+          {hosts.length > 0 && (
+            <>
+              <CommandGroup heading={t("commandPalette.hosts")}>
+                {hosts.map((host, index) => {
+                  const title = host.name?.trim()
+                    ? host.name
+                    : `${host.username}@${host.ip}:${host.port}`;
+                  return (
+                    <CommandItem
+                      key={`host-${index}-${host.id}`}
+                      value={`host-${index}-${title}-${host.id}`}
+                      onSelect={() => {
+                        if (host.enableTerminal) {
+                          handleHostTerminalClick(host);
+                        }
+                      }}
+                      className="flex items-center justify-between"
+                    >
+                      <div className="flex items-center gap-2">
+                        <Server className="h-4 w-4" />
+                        <span>{title}</span>
+                      </div>
+                      <div
+                        className="flex items-center gap-1"
+                        onClick={(e) => e.stopPropagation()}
+                      >
+                        <DropdownMenu modal={false}>
+                          <DropdownMenuTrigger asChild>
+                            <Button
+                              variant="outline"
+                              className="!px-2 h-7 border-1 border-dark-border"
+                              onClick={(e) => e.stopPropagation()}
+                            >
+                              <EllipsisVertical className="h-3 w-3" />
+                            </Button>
+                          </DropdownMenuTrigger>
+                          <DropdownMenuContent
+                            align="end"
+                            side="right"
+                            className="w-56 bg-dark-bg border-dark-border text-white"
+                          >
+                            <DropdownMenuItem
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                handleHostServerDetailsClick(host);
+                              }}
+                              className="flex items-center gap-2 cursor-pointer px-3 py-2 hover:bg-dark-hover text-gray-300"
+                            >
+                              <Server className="h-4 w-4" />
+                              <span className="flex-1">
+                                {t("commandPalette.openServerDetails")}
+                              </span>
+                            </DropdownMenuItem>
+                            <DropdownMenuItem
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                handleHostFileManagerClick(host);
+                              }}
+                              className="flex items-center gap-2 cursor-pointer px-3 py-2 hover:bg-dark-hover text-gray-300"
+                            >
+                              <FolderOpen className="h-4 w-4" />
+                              <span className="flex-1">
+                                {t("commandPalette.openFileManager")}
+                              </span>
+                            </DropdownMenuItem>
+                            <DropdownMenuItem
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                handleHostEditClick(host);
+                              }}
+                              className="flex items-center gap-2 cursor-pointer px-3 py-2 hover:bg-dark-hover text-gray-300"
+                            >
+                              <Pencil className="h-4 w-4" />
+                              <span className="flex-1">
+                                {t("commandPalette.edit")}
+                              </span>
+                            </DropdownMenuItem>
+                          </DropdownMenuContent>
+                        </DropdownMenu>
+                      </div>
+                    </CommandItem>
+                  );
+                })}
+              </CommandGroup>
+              <CommandSeparator />
+            </>
+          )}
+          <CommandGroup heading={t("commandPalette.links")}>
+            <CommandItem onSelect={handleGitHub}>
+              <Github />
+              <span>{t("commandPalette.github")}</span>
+            </CommandItem>
+            <CommandItem onSelect={handleSupport}>
+              <BiSupport />
+              <span>{t("commandPalette.support")}</span>
+            </CommandItem>
+            <CommandItem onSelect={handleDiscord}>
+              <BsDiscord />
+              <span>{t("commandPalette.discord")}</span>
+            </CommandItem>
+            <CommandItem onSelect={handleDonate}>
+              <BiMoney />
+              <span>{t("commandPalette.donate")}</span>
+            </CommandItem>
+          </CommandGroup>
+        </CommandList>
+        <div className="border-t border-dark-border px-4 py-2 bg-dark-hover/50 flex items-center justify-between text-xs text-muted-foreground">
+          <div className="flex items-center gap-2">
+            <span>{t("commandPalette.press")}</span>
+            <KbdGroup>
+              <Kbd>Shift</Kbd>
+              <Kbd>Shift</Kbd>
+            </KbdGroup>
+            <span>{t("commandPalette.toToggle")}</span>
+          </div>
+          <div className="flex items-center gap-2">
+            <span>{t("commandPalette.close")}</span>
+            <Kbd>Esc</Kbd>
+          </div>
+        </div>
+      </Command>
+    </div>
+  );
+}
--- a/src/ui/desktop/apps/credentials/CredentialEditor.tsx
+++ b/src/ui/desktop/apps/credentials/CredentialEditor.tsx
@@ -15,6 +15,7 @@ import { PasswordInput } from "@/components/ui/password-input";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Separator } from "@/components/ui/separator";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Alert, AlertDescription } from "@/components/ui/alert";
 import React, { useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 import {
@@ -52,6 +53,8 @@ export function CredentialEditor({
  const [detectedKeyType, setDetectedKeyType] = useState<string | null>(null);
  const [keyDetectionLoading, setKeyDetectionLoading] = useState(false);
  const keyDetectionTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+  const [activeTab, setActiveTab] = useState("general");
+  const [formError, setFormError] = useState<string | null>(null);

  const [detectedPublicKeyType, setDetectedPublicKeyType] = useState<
    string | null
@@ -60,6 +63,10 @@ export function CredentialEditor({
    useState(false);
  const publicKeyDetectionTimeoutRef = useRef<NodeJS.Timeout | null>(null);

+  useEffect(() => {
+    setFormError(null);
+  }, [activeTab]);
+
  useEffect(() => {
    const fetchData = async () => {
      try {
@@ -320,6 +327,8 @@ export function CredentialEditor({

  const onSubmit = async (data: FormData) => {
    try {
+      setFormError(null);
+
      if (!data.name || data.name.trim() === "") {
        data.name = data.username;
      }
@@ -378,6 +387,28 @@ export function CredentialEditor({
    }
  };

+  const handleFormError = () => {
+    const errors = form.formState.errors;
+
+    if (
+      errors.name ||
+      errors.username ||
+      errors.description ||
+      errors.folder ||
+      errors.tags
+    ) {
+      setActiveTab("general");
+    } else if (
+      errors.password ||
+      errors.key ||
+      errors.publicKey ||
+      errors.keyPassword ||
+      errors.keyType
+    ) {
+      setActiveTab("authentication");
+    }
+  };
+
  const [tagInput, setTagInput] = useState("");

  const [folderDropdownOpen, setFolderDropdownOpen] = useState(false);
@@ -427,11 +458,20 @@ export function CredentialEditor({
    >
      <Form {...form}>
        <form
-          onSubmit={form.handleSubmit(onSubmit)}
+          onSubmit={form.handleSubmit(onSubmit, handleFormError)}
          className="flex flex-col flex-1 min-h-0 h-full"
        >
          <ScrollArea className="flex-1 min-h-0 w-full my-1 pb-2">
-            <Tabs defaultValue="general" className="w-full">
+            {formError && (
+              <Alert variant="destructive" className="mb-4">
+                <AlertDescription>{formError}</AlertDescription>
+              </Alert>
+            )}
+            <Tabs
+              value={activeTab}
+              onValueChange={setActiveTab}
+              className="w-full"
+            >
              <TabsList>
                <TabsTrigger value="general">
                  {t("credentials.general")}
--- a/src/ui/desktop/apps/credentials/CredentialsManager.tsx
+++ b/src/ui/desktop/apps/credentials/CredentialsManager.tsx
@@ -16,6 +16,18 @@ import {
  TooltipProvider,
  TooltipTrigger,
 } from "@/components/ui/tooltip";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+} from "@/components/ui/command";
 import {
  Search,
  Key,
@@ -32,7 +44,9 @@ import {
  Upload,
  Server,
  User,
+  ChevronsUpDown,
 } from "lucide-react";
+import { cn } from "@/lib/utils";
 import {
  getCredentials,
  deleteCredential,
@@ -82,9 +96,7 @@ export function CredentialsManager({
  >([]);
  const [selectedHostId, setSelectedHostId] = useState<string>("");
  const [deployLoading, setDeployLoading] = useState(false);
-  const [hostSearchQuery, setHostSearchQuery] = useState("");
-  const [dropdownOpen, setDropdownOpen] = useState(false);
-  const dropdownRef = useRef<HTMLDivElement>(null);
+  const [hostComboboxOpen, setHostComboboxOpen] = useState(false);
  const dragCounter = useRef(0);

  useEffect(() => {
@@ -94,41 +106,11 @@ export function CredentialsManager({

  useEffect(() => {
    if (showDeployDialog) {
-      setDropdownOpen(false);
-      setHostSearchQuery("");
+      setHostComboboxOpen(false);
      setSelectedHostId("");
-      setTimeout(() => {
-        if (
-          document.activeElement &&
-          (document.activeElement as HTMLElement).blur
-        ) {
-          (document.activeElement as HTMLElement).blur();
-        }
-      }, 50);
    }
  }, [showDeployDialog]);

-  useEffect(() => {
-    function handleClickOutside(event: MouseEvent) {
-      if (
-        dropdownRef.current &&
-        !dropdownRef.current.contains(event.target as Node)
-      ) {
-        setDropdownOpen(false);
-      }
-    }
-
-    if (dropdownOpen) {
-      document.addEventListener("mousedown", handleClickOutside);
-    } else {
-      document.removeEventListener("mousedown", handleClickOutside);
-    }
-
-    return () => {
-      document.removeEventListener("mousedown", handleClickOutside);
-    };
-  }, [dropdownOpen]);
-
  const fetchHosts = async () => {
    try {
      const hosts = await getSSHHosts();
@@ -168,8 +150,7 @@ export function CredentialsManager({
    }
    setDeployingCredential(credential);
    setSelectedHostId("");
-    setHostSearchQuery("");
-    setDropdownOpen(false);
+    setHostComboboxOpen(false);
    setShowDeployDialog(true);
  };

@@ -640,6 +621,9 @@ export function CredentialsManager({
                                      <p className="text-xs text-muted-foreground truncate">
                                        {credential.username}
                                      </p>
+                                      <p className="text-xs text-muted-foreground truncate">
+                                        ID: {credential.id}
+                                      </p>
                                      <p className="text-xs text-muted-foreground truncate">
                                        {credential.authType === "password"
                                          ? t("credentials.password")
@@ -824,13 +808,10 @@ export function CredentialsManager({
      )}

      <Sheet open={showDeployDialog} onOpenChange={setShowDeployDialog}>
-        <SheetContent className="w-[500px] max-w-[50vw] overflow-y-auto">
+        <SheetContent className="w-[500px] max-w-[50vw] overflow-y-auto bg-dark-bg">
          <div className="px-4 py-4">
            <div className="space-y-3 pb-4">
              <div className="flex items-center space-x-3">
-                <div className="p-2 rounded-lg bg-green-100 dark:bg-green-900/30">
-                  <Upload className="h-5 w-5 text-green-600 dark:text-green-400" />
-                </div>
                <div className="flex-1">
                  <div className="text-lg font-semibold">
                    {t("credentials.deploySSHKey")}
@@ -899,67 +880,62 @@ export function CredentialsManager({
                  <Server className="h-4 w-4 mr-2 text-muted-foreground" />
                  {t("credentials.targetHost")}
                </label>
-                <div className="relative" ref={dropdownRef}>
-                  <Input
-                    placeholder={t("credentials.chooseHostToDeploy")}
-                    value={hostSearchQuery}
-                    onChange={(e) => {
-                      setHostSearchQuery(e.target.value);
-                    }}
-                    onClick={() => {
-                      setDropdownOpen(true);
-                    }}
-                    className="w-full"
-                    autoFocus={false}
-                    tabIndex={0}
-                  />
-                  {dropdownOpen && (
-                    <div className="absolute top-full left-0 z-50 mt-1 w-full bg-card border border-border rounded-lg shadow-lg max-h-60 overflow-y-auto">
-                      {availableHosts.length === 0 ? (
-                        <div className="p-3 text-sm text-muted-foreground text-center">
-                          {t("credentials.noHostsAvailable")}
-                        </div>
-                      ) : availableHosts.filter(
-                          (host) =>
-                            !hostSearchQuery ||
-                            host.name
-                              ?.toLowerCase()
-                              .includes(hostSearchQuery.toLowerCase()) ||
-                            host.ip
-                              ?.toLowerCase()
-                              .includes(hostSearchQuery.toLowerCase()) ||
-                            host.username
-                              ?.toLowerCase()
-                              .includes(hostSearchQuery.toLowerCase()),
-                        ).length === 0 ? (
-                        <div className="p-3 text-sm text-muted-foreground text-center">
-                          {t("credentials.noHostsMatchSearch")}
-                        </div>
-                      ) : (
-                        availableHosts
-                          .filter(
-                            (host) =>
-                              !hostSearchQuery ||
-                              host.name
-                                ?.toLowerCase()
-                                .includes(hostSearchQuery.toLowerCase()) ||
-                              host.ip
-                                ?.toLowerCase()
-                                .includes(hostSearchQuery.toLowerCase()) ||
-                              host.username
-                                ?.toLowerCase()
-                                .includes(hostSearchQuery.toLowerCase()),
-                          )
-                          .map((host) => (
-                            <div
-                              key={host.id}
-                              className="flex items-center gap-3 py-2 px-3 hover:bg-muted cursor-pointer"
-                              onClick={() => {
-                                setSelectedHostId(host.id.toString());
-                                setHostSearchQuery(host.name || host.ip);
-                                setDropdownOpen(false);
-                              }}
-                            >
+                <Popover
+                  open={hostComboboxOpen}
+                  onOpenChange={setHostComboboxOpen}
+                >
+                  <PopoverTrigger asChild>
+                    <Button
+                      variant="outline"
+                      role="combobox"
+                      aria-expanded={hostComboboxOpen}
+                      className="w-full justify-between"
+                    >
+                      {selectedHostId
+                        ? (() => {
+                            const host = availableHosts.find(
+                              (h) => h.id.toString() === selectedHostId,
+                            );
+                            return host
+                              ? `${host.name || host.ip}`
+                              : t("credentials.chooseHostToDeploy");
+                          })()
+                        : t("credentials.chooseHostToDeploy")}
+                      <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                    </Button>
+                  </PopoverTrigger>
+                  <PopoverContent
+                    className="p-0"
+                    style={{ width: "var(--radix-popover-trigger-width)" }}
+                  >
+                    <Command>
+                      <CommandInput
+                        placeholder={t("credentials.chooseHostToDeploy")}
+                      />
+                      <CommandEmpty>
+                        {availableHosts.length === 0
+                          ? t("credentials.noHostsAvailable")
+                          : t("credentials.noHostsMatchSearch")}
+                      </CommandEmpty>
+                      <CommandGroup className="max-h-[300px] overflow-y-auto">
+                        {availableHosts.map((host) => (
+                          <CommandItem
+                            key={host.id}
+                            value={`${host.name} ${host.ip} ${host.username} ${host.id}`}
+                            onSelect={() => {
+                              setSelectedHostId(host.id.toString());
+                              setHostComboboxOpen(false);
+                            }}
+                          >
+                            <Check
+                              className={cn(
+                                "mr-2 h-4 w-4",
+                                selectedHostId === host.id.toString()
+                                  ? "opacity-100"
+                                  : "opacity-0",
+                              )}
+                            />
+                            <div className="flex items-center gap-3">
                              <div className="p-1.5 rounded bg-muted">
                                <Server className="h-3 w-3 text-muted-foreground" />
                              </div>
@@ -972,11 +948,12 @@ export function CredentialsManager({
                                </div>
                              </div>
                            </div>
-                          ))
-                      )}
-                    </div>
-                  )}
-                </div>
+                          </CommandItem>
+                        ))}
+                      </CommandGroup>
+                    </Command>
+                  </PopoverContent>
+                </Popover>
              </div>

              <div className="border border-blue-200 dark:border-blue-800 rounded-lg p-3 bg-blue-50 dark:bg-blue-900/20">
@@ -1006,7 +983,7 @@ export function CredentialsManager({
                  <Button
                    onClick={performDeploy}
                    disabled={!selectedHostId || deployLoading}
-                    className="flex-1 bg-green-600 hover:bg-green-700 text-white"
+                    className="flex-1"
                  >
                    {deployLoading ? (
                      <div className="flex items-center">
--- a/src/ui/desktop/apps/dashboard/Dashboard.tsx
+++ b/src/ui/desktop/apps/dashboard/Dashboard.tsx
@@ -20,6 +20,7 @@ import {
 import { useSidebar } from "@/components/ui/sidebar.tsx";
 import { Separator } from "@/components/ui/separator.tsx";
 import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
+import { Kbd, KbdGroup } from "@/components/ui/kbd";
 import {
  ChartLine,
  Clock,
@@ -50,6 +51,8 @@ interface DashboardProps {
    userId: string | null;
  }) => void;
  isTopbarOpen: boolean;
+  rightSidebarOpen?: boolean;
+  rightSidebarWidth?: number;
 }

 export function Dashboard({
@@ -58,6 +61,8 @@ export function Dashboard({
  onAuthSuccess,
  isTopbarOpen,
  onSelectView,
+  rightSidebarOpen = false,
+  rightSidebarWidth = 400,
 }: DashboardProps): React.ReactElement {
  const { t } = useTranslation();
  const [loggedIn, setLoggedIn] = useState(isAuthenticated);
@@ -85,16 +90,19 @@ export function Dashboard({
  >([]);
  const [serverStatsLoading, setServerStatsLoading] = useState<boolean>(true);

-  const { addTab, setCurrentTab, tabs: tabList } = useTabs();
+  const { addTab, setCurrentTab, tabs: tabList, updateTab } = useTabs();

  let sidebarState: "expanded" | "collapsed" = "expanded";
  try {
    const sidebar = useSidebar();
    sidebarState = sidebar.state;
-  } catch {}
+  } catch (error) {
+    console.error("Dashboard operation failed:", error);
+  }

  const topMarginPx = isTopbarOpen ? 74 : 26;
  const leftMarginPx = sidebarState === "collapsed" ? 26 : 8;
+  const rightMarginPx = 17;
  const bottomMarginPx = 8;

  useEffect(() => {
@@ -173,7 +181,9 @@ export function Dashboard({
              if (Array.isArray(tunnelConnections)) {
                totalTunnelsCount += tunnelConnections.length;
              }
-            } catch {}
+            } catch (error) {
+              console.error("Dashboard operation failed:", error);
+            }
          }
        }
        setTotalTunnels(totalTunnelsCount);
@@ -194,27 +204,57 @@ export function Dashboard({

        setServerStatsLoading(true);
        const serversWithStats = await Promise.all(
-          hosts.slice(0, 50).map(async (host: { id: number; name: string }) => {
-            try {
-              const metrics = await getServerMetricsById(host.id);
-              return {
-                id: host.id,
-                name: host.name || `Host ${host.id}`,
-                cpu: metrics.cpu.percent,
-                ram: metrics.memory.percent,
-              };
-            } catch {
-              return {
-                id: host.id,
-                name: host.name || `Host ${host.id}`,
-                cpu: null,
-                ram: null,
-              };
-            }
-          }),
+          hosts
+            .slice(0, 50)
+            .map(
+              async (host: {
+                id: number;
+                name: string;
+                statsConfig?: string | { metricsEnabled?: boolean };
+              }) => {
+                try {
+                  let statsConfig: { metricsEnabled?: boolean } = {
+                    metricsEnabled: true,
+                  };
+                  if (host.statsConfig) {
+                    if (typeof host.statsConfig === "string") {
+                      statsConfig = JSON.parse(host.statsConfig);
+                    } else {
+                      statsConfig = host.statsConfig;
+                    }
+                  }
+
+                  if (statsConfig.metricsEnabled === false) {
+                    return null;
+                  }
+
+                  const metrics = await getServerMetricsById(host.id);
+                  return {
+                    id: host.id,
+                    name: host.name || `Host ${host.id}`,
+                    cpu: metrics.cpu.percent,
+                    ram: metrics.memory.percent,
+                  };
+                } catch {
+                  return {
+                    id: host.id,
+                    name: host.name || `Host ${host.id}`,
+                    cpu: null,
+                    ram: null,
+                  };
+                }
+              },
+            ),
        );
        const validServerStats = serversWithStats.filter(
-          (server) => server.cpu !== null && server.ram !== null,
+          (
+            server,
+          ): server is {
+            id: number;
+            name: string;
+            cpu: number | null;
+            ram: number | null;
+          } => server !== null && server.cpu !== null && server.ram !== null,
        );
        setServerStats(validServerStats);
        setServerStatsLoading(false);
@@ -264,6 +304,7 @@ export function Dashboard({
  const handleAddHost = () => {
    const sshManagerTab = tabList.find((t) => t.type === "ssh_manager");
    if (sshManagerTab) {
+      updateTab(sshManagerTab.id, { initialTab: "add_host" });
      setCurrentTab(sshManagerTab.id);
    } else {
      const id = addTab({
@@ -278,6 +319,7 @@ export function Dashboard({
  const handleAddCredential = () => {
    const sshManagerTab = tabList.find((t) => t.type === "ssh_manager");
    if (sshManagerTab) {
+      updateTab(sshManagerTab.id, { initialTab: "add_credential" });
      setCurrentTab(sshManagerTab.id);
    } else {
      const id = addTab({
@@ -327,23 +369,32 @@ export function Dashboard({
        </div>
      ) : (
        <div
-          className="bg-dark-bg text-white rounded-lg border-2 border-dark-border overflow-hidden flex"
+          className="bg-dark-bg text-white rounded-lg border-2 border-dark-border overflow-hidden flex min-w-0"
          style={{
            marginLeft: leftMarginPx,
-            marginRight: 17,
+            marginRight: rightSidebarOpen
+              ? `calc(var(--right-sidebar-width, ${rightSidebarWidth}px) + 8px)`
+              : rightMarginPx,
            marginTop: topMarginPx,
            marginBottom: bottomMarginPx,
            height: `calc(100vh - ${topMarginPx + bottomMarginPx}px)`,
+            transition:
+              "margin-left 200ms linear, margin-right 200ms linear, margin-top 200ms linear",
          }}
        >
-          <div className="flex flex-col relative z-10 w-full h-full">
-            <div className="flex flex-row items-center justify-between w-full px-3 mt-3">
-              <div className="text-2xl text-white font-semibold">
+          <div className="flex flex-col relative z-10 w-full h-full min-w-0">
+            <div className="flex flex-row items-center justify-between w-full px-3 mt-3 min-w-0 flex-wrap gap-2">
+              <div className="text-2xl text-white font-semibold shrink-0">
                {t("dashboard.title")}
              </div>
-              <div className="flex flex-row gap-3">
+              <div className="flex flex-row gap-3 flex-wrap min-w-0">
+                <div className="flex flex-col items-center gap-4 justify-center mr-5 min-w-0 shrink">
+                  <p className="text-muted-foreground text-sm whitespace-nowrap">
+                    Press <Kbd>LShift</Kbd> twice to open the command palette
+                  </p>
+                </div>
                <Button
-                  className="font-semibold"
+                  className="font-semibold shrink-0"
                  variant="outline"
                  onClick={() =>
                    window.open(
@@ -355,7 +406,7 @@ export function Dashboard({
                  {t("dashboard.github")}
                </Button>
                <Button
-                  className="font-semibold"
+                  className="font-semibold shrink-0"
                  variant="outline"
                  onClick={() =>
                    window.open(
@@ -367,7 +418,7 @@ export function Dashboard({
                  {t("dashboard.support")}
                </Button>
                <Button
-                  className="font-semibold"
+                  className="font-semibold shrink-0"
                  variant="outline"
                  onClick={() =>
                    window.open(
@@ -379,7 +430,7 @@ export function Dashboard({
                  {t("dashboard.discord")}
                </Button>
                <Button
-                  className="font-semibold"
+                  className="font-semibold shrink-0"
                  variant="outline"
                  onClick={() =>
                    window.open("https://github.com/sponsors/LukeGus", "_blank")
@@ -392,23 +443,23 @@ export function Dashboard({

            <Separator className="mt-3 p-0.25" />

-            <div className="flex flex-col flex-1 my-5 mx-5 gap-4 min-h-0">
-              <div className="flex flex-row flex-1 gap-4 min-h-0">
-                <div className="flex-1 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden">
+            <div className="flex flex-col flex-1 my-5 mx-5 gap-4 min-h-0 min-w-0">
+              <div className="flex flex-row flex-1 gap-4 min-h-0 min-w-0">
+                <div className="flex-1 min-w-0 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden">
                  <div className="flex flex-col mx-3 my-2 overflow-y-auto overflow-x-hidden">
                    <p className="text-xl font-semibold mb-3 mt-1 flex flex-row items-center">
                      <Server className="mr-3" />
                      {t("dashboard.serverOverview")}
                    </p>
                    <div className="bg-dark-bg w-full h-auto border-2 border-dark-border rounded-md px-3 py-3">
-                      <div className="flex flex-row items-center justify-between mb-3">
-                        <div className="flex flex-row items-center">
+                      <div className="flex flex-row items-center justify-between mb-3 min-w-0 gap-2">
+                        <div className="flex flex-row items-center min-w-0">
                          <History
                            size={20}
                            color="#FFFFFF"
                            className="shrink-0"
                          />
-                          <p className="ml-2 leading-none">
+                          <p className="ml-2 leading-none truncate">
                            {t("dashboard.version")}
                          </p>
                        </div>
@@ -430,14 +481,14 @@ export function Dashboard({
                        </div>
                      </div>

-                      <div className="flex flex-row items-center justify-between mb-5">
-                        <div className="flex flex-row items-center">
+                      <div className="flex flex-row items-center justify-between mb-5 min-w-0 gap-2">
+                        <div className="flex flex-row items-center min-w-0">
                          <Clock
                            size={20}
                            color="#FFFFFF"
                            className="shrink-0"
                          />
-                          <p className="ml-2 leading-none">
+                          <p className="ml-2 leading-none truncate">
                            {t("dashboard.uptime")}
                          </p>
                        </div>
@@ -449,14 +500,14 @@ export function Dashboard({
                        </div>
                      </div>

-                      <div className="flex flex-row items-center justify-between">
-                        <div className="flex flex-row items-center">
+                      <div className="flex flex-row items-center justify-between min-w-0 gap-2">
+                        <div className="flex flex-row items-center min-w-0">
                          <Database
                            size={20}
                            color="#FFFFFF"
                            className="shrink-0"
                          />
-                          <p className="ml-2 leading-none">
+                          <p className="ml-2 leading-none truncate">
                            {t("dashboard.database")}
                          </p>
                        </div>
@@ -473,14 +524,14 @@ export function Dashboard({
                      </div>
                    </div>
                    <div className="flex flex-col grid grid-cols-2 gap-2 mt-2">
-                      <div className="flex flex-row items-center justify-between bg-dark-bg w-full h-auto mt-3 border-2 border-dark-border rounded-md px-3 py-3">
-                        <div className="flex flex-row items-center">
+                      <div className="flex flex-row items-center justify-between bg-dark-bg w-full h-auto mt-3 border-2 border-dark-border rounded-md px-3 py-3 min-w-0 gap-2">
+                        <div className="flex flex-row items-center min-w-0">
                          <Server
                            size={16}
                            color="#FFFFFF"
                            className="mr-3 shrink-0"
                          />
-                          <p className="m-0 leading-none">
+                          <p className="m-0 leading-none truncate">
                            {t("dashboard.totalServers")}
                          </p>
                        </div>
@@ -488,14 +539,14 @@ export function Dashboard({
                          {totalServers}
                        </p>
                      </div>
-                      <div className="flex flex-row items-center justify-between bg-dark-bg w-full h-auto mt-3 border-2 border-dark-border rounded-md px-3 py-3">
-                        <div className="flex flex-row items-center">
+                      <div className="flex flex-row items-center justify-between bg-dark-bg w-full h-auto mt-3 border-2 border-dark-border rounded-md px-3 py-3 min-w-0 gap-2">
+                        <div className="flex flex-row items-center min-w-0">
                          <Network
                            size={16}
                            color="#FFFFFF"
                            className="mr-3 shrink-0"
                          />
-                          <p className="m-0 leading-none">
+                          <p className="m-0 leading-none truncate">
                            {t("dashboard.totalTunnels")}
                          </p>
                        </div>
@@ -505,14 +556,14 @@ export function Dashboard({
                      </div>
                    </div>
                    <div className="flex flex-col grid grid-cols-2 gap-2 mt-2">
-                      <div className="flex flex-row items-center justify-between bg-dark-bg w-full h-auto mt-3 border-2 border-dark-border rounded-md px-3 py-3">
-                        <div className="flex flex-row items-center">
+                      <div className="flex flex-row items-center justify-between bg-dark-bg w-full h-auto mt-3 border-2 border-dark-border rounded-md px-3 py-3 min-w-0 gap-2">
+                        <div className="flex flex-row items-center min-w-0">
                          <Key
                            size={16}
                            color="#FFFFFF"
                            className="mr-3 shrink-0"
                          />
-                          <p className="m-0 leading-none">
+                          <p className="m-0 leading-none truncate">
                            {t("dashboard.totalCredentials")}
                          </p>
                        </div>
@@ -523,7 +574,7 @@ export function Dashboard({
                    </div>
                  </div>
                </div>
-                <div className="flex-1 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden">
+                <div className="flex-1 min-w-0 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden transition-all duration-150 hover:border-primary/20">
                  <div className="flex flex-col mx-3 my-2 flex-1 overflow-hidden">
                    <div className="flex flex-row items-center justify-between mb-3 mt-1">
                      <p className="text-xl font-semibold flex flex-row items-center">
@@ -540,10 +591,10 @@ export function Dashboard({
                      </Button>
                    </div>
                    <div
-                      className={`grid gap-4 grid-cols-[repeat(auto-fit,minmax(200px,1fr))] auto-rows-min overflow-x-hidden ${recentActivityLoading ? "overflow-y-hidden" : "overflow-y-auto"}`}
+                      className={`grid gap-4 grid-cols-3 auto-rows-min overflow-x-hidden ${recentActivityLoading ? "overflow-y-hidden" : "overflow-y-auto"}`}
                    >
                      {recentActivityLoading ? (
-                        <div className="flex flex-row items-center text-muted-foreground text-sm">
+                        <div className="flex flex-row items-center text-muted-foreground text-sm animate-pulse">
                          <Loader2 className="animate-spin mr-2" size={16} />
                          <span>{t("dashboard.loadingRecentActivity")}</span>
                        </div>
@@ -556,7 +607,7 @@ export function Dashboard({
                          <Button
                            key={item.id}
                            variant="outline"
-                            className="border-2 !border-dark-border bg-dark-bg"
+                            className="border-2 !border-dark-border bg-dark-bg min-w-0"
                            onClick={() => handleActivityClick(item)}
                          >
                            {item.type === "terminal" ? (
@@ -574,17 +625,17 @@ export function Dashboard({
                  </div>
                </div>
              </div>
-              <div className="flex flex-row flex-1 gap-4 min-h-0">
-                <div className="flex-1 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden">
+              <div className="flex flex-row flex-1 gap-4 min-h-0 min-w-0">
+                <div className="flex-1 min-w-0 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden transition-all duration-150 hover:border-primary/20">
                  <div className="flex flex-col mx-3 my-2 overflow-y-auto overflow-x-hidden">
                    <p className="text-xl font-semibold mb-3 mt-1 flex flex-row items-center">
                      <FastForward className="mr-3" />
                      {t("dashboard.quickActions")}
                    </p>
-                    <div className="grid gap-4 grid-cols-[repeat(auto-fit,minmax(200px,1fr))] auto-rows-min overflow-y-auto overflow-x-hidden">
+                    <div className="grid gap-4 grid-cols-3 auto-rows-min overflow-y-auto overflow-x-hidden">
                      <Button
                        variant="outline"
-                        className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3"
+                        className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3 min-w-0"
                        onClick={handleAddHost}
                      >
                        <Server
@@ -597,7 +648,7 @@ export function Dashboard({
                      </Button>
                      <Button
                        variant="outline"
-                        className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3"
+                        className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3 min-w-0"
                        onClick={handleAddCredential}
                      >
                        <Key
@@ -611,7 +662,7 @@ export function Dashboard({
                      {isAdmin && (
                        <Button
                          variant="outline"
-                          className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3"
+                          className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3 min-w-0"
                          onClick={handleOpenAdminSettings}
                        >
                          <Settings
@@ -625,7 +676,7 @@ export function Dashboard({
                      )}
                      <Button
                        variant="outline"
-                        className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3"
+                        className="border-2 !border-dark-border flex flex-col items-center justify-center h-auto p-3 min-w-0"
                        onClick={handleOpenUserProfile}
                      >
                        <User
@@ -639,17 +690,17 @@ export function Dashboard({
                    </div>
                  </div>
                </div>
-                <div className="flex-1 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden">
+                <div className="flex-1 min-w-0 border-2 border-dark-border rounded-md bg-dark-bg-darker flex flex-col overflow-hidden transition-all duration-150 hover:border-primary/20">
                  <div className="flex flex-col mx-3 my-2 flex-1 overflow-hidden">
                    <p className="text-xl font-semibold mb-3 mt-1 flex flex-row items-center">
                      <ChartLine className="mr-3" />
                      {t("dashboard.serverStats")}
                    </p>
                    <div
-                      className={`grid gap-4 grid-cols-[repeat(auto-fit,minmax(200px,1fr))] auto-rows-min overflow-x-hidden ${serverStatsLoading ? "overflow-y-hidden" : "overflow-y-auto"}`}
+                      className={`grid gap-4 grid-cols-3 auto-rows-min overflow-x-hidden ${serverStatsLoading ? "overflow-y-hidden" : "overflow-y-auto"}`}
                    >
                      {serverStatsLoading ? (
-                        <div className="flex flex-row items-center text-muted-foreground text-sm">
+                        <div className="flex flex-row items-center text-muted-foreground text-sm animate-pulse">
                          <Loader2 className="animate-spin mr-2" size={16} />
                          <span>{t("dashboard.loadingServerStats")}</span>
                        </div>
@@ -662,7 +713,7 @@ export function Dashboard({
                          <Button
                            key={server.id}
                            variant="outline"
-                            className="border-2 !border-dark-border bg-dark-bg h-auto p-3"
+                            className="border-2 !border-dark-border bg-dark-bg h-auto p-3 min-w-0"
                          >
                            <div className="flex flex-col w-full">
                              <div className="flex flex-row items-center mb-2">
@@ -671,7 +722,7 @@ export function Dashboard({
                                  {server.name}
                                </p>
                              </div>
-                              <div className="flex flex-row justify-between text-xs text-muted-foreground">
+                              <div className="flex flex-row justify-start gap-4 text-xs text-muted-foreground">
                                <span>
                                  {t("dashboard.cpu")}:{" "}
                                  {server.cpu !== null
--- a/src/ui/desktop/apps/file-manager/FileManager.tsx
+++ b/src/ui/desktop/apps/file-manager/FileManager.tsx
@@ -16,6 +16,8 @@ import { toast } from "sonner";
 import { useTranslation } from "react-i18next";
 import { TOTPDialog } from "@/ui/desktop/navigation/TOTPDialog.tsx";
 import { SSHAuthDialog } from "@/ui/desktop/navigation/SSHAuthDialog.tsx";
+import { PermissionsDialog } from "./components/PermissionsDialog";
+import { CompressDialog } from "./components/CompressDialog";
 import {
  Upload,
  FolderPlus,
@@ -49,6 +51,9 @@ import {
  addFolderShortcut,
  getPinnedFiles,
  logActivity,
+  changeSSHPermissions,
+  extractSSHArchive,
+  compressSSHFiles,
 } from "@/ui/main-axios.ts";
 import type { SidebarItem } from "./FileManagerSidebar";

@@ -97,7 +102,10 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
  const [isReconnecting, setIsReconnecting] = useState<boolean>(false);
  const [searchQuery, setSearchQuery] = useState("");
  const [lastRefreshTime, setLastRefreshTime] = useState<number>(0);
-  const [viewMode, setViewMode] = useState<"grid" | "list">("grid");
+  const [viewMode, setViewMode] = useState<"grid" | "list">(() => {
+    const saved = localStorage.getItem("fileManagerViewMode");
+    return saved === "grid" || saved === "list" ? saved : "grid";
+  });
  const [totpRequired, setTotpRequired] = useState(false);
  const [totpSessionId, setTotpSessionId] = useState<string | null>(null);
  const [totpPrompt, setTotpPrompt] = useState<string>("");
@@ -146,6 +154,11 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {

  const [createIntent, setCreateIntent] = useState<CreateIntent | null>(null);
  const [editingFile, setEditingFile] = useState<FileItem | null>(null);
+  const [permissionsDialogFile, setPermissionsDialogFile] =
+    useState<FileItem | null>(null);
+  const [compressDialogFiles, setCompressDialogFiles] = useState<FileItem[]>(
+    [],
+  );

  const { selectedFiles, clearSelection, setSelection } = useFileSelection();

@@ -527,41 +540,20 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
        const reader = new FileReader();
        reader.onerror = () => reject(reader.error);

-        const isTextFile =
-          file.type.startsWith("text/") ||
-          file.type === "application/json" ||
-          file.type === "application/javascript" ||
-          file.type === "application/xml" ||
-          file.type === "image/svg+xml" ||
-          file.name.match(
-            /\.(txt|json|js|ts|jsx|tsx|css|scss|less|html|htm|xml|svg|yaml|yml|md|markdown|mdown|mkdn|mdx|py|java|c|cpp|h|sh|bash|zsh|bat|ps1|toml|ini|conf|config|sql|vue|svelte)$/i,
-          );
-
-        if (isTextFile) {
-          reader.onload = () => {
-            if (reader.result) {
-              resolve(reader.result as string);
-            } else {
-              reject(new Error("Failed to read text file content"));
+        reader.onload = () => {
+          if (reader.result instanceof ArrayBuffer) {
+            const bytes = new Uint8Array(reader.result);
+            let binary = "";
+            for (let i = 0; i < bytes.byteLength; i++) {
+              binary += String.fromCharCode(bytes[i]);
            }
-          };
-          reader.readAsText(file);
-        } else {
-          reader.onload = () => {
-            if (reader.result instanceof ArrayBuffer) {
-              const bytes = new Uint8Array(reader.result);
-              let binary = "";
-              for (let i = 0; i < bytes.byteLength; i++) {
-                binary += String.fromCharCode(bytes[i]);
-              }
-              const base64 = btoa(binary);
-              resolve(base64);
-            } else {
-              reject(new Error("Failed to read binary file"));
-            }
-          };
-          reader.readAsArrayBuffer(file);
-        }
+            const base64 = btoa(binary);
+            resolve(base64);
+          } else {
+            reject(new Error("Failed to read file"));
+          }
+        };
+        reader.readAsArrayBuffer(file);
      });

      await uploadSSHFile(
@@ -911,6 +903,26 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
    );
  }

+  function handleCopyPath(files: FileItem[]) {
+    if (files.length === 0) return;
+
+    const paths = files.map((file) => file.path).join("\n");
+
+    navigator.clipboard.writeText(paths).then(
+      () => {
+        toast.success(
+          files.length === 1
+            ? t("fileManager.pathCopiedToClipboard")
+            : t("fileManager.pathsCopiedToClipboard", { count: files.length }),
+        );
+      },
+      (err) => {
+        console.error("Failed to copy path to clipboard:", err);
+        toast.error(t("fileManager.failedToCopyPath"));
+      },
+    );
+  }
+
  async function handlePasteFiles() {
    if (!clipboard || !sshSessionId) return;

@@ -1058,6 +1070,80 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
    }
  }

+  async function handleExtractArchive(file: FileItem) {
+    if (!sshSessionId) return;
+
+    try {
+      await ensureSSHConnection();
+
+      toast.info(t("fileManager.extractingArchive", { name: file.name }));
+
+      await extractSSHArchive(
+        sshSessionId,
+        file.path,
+        undefined,
+        currentHost?.id,
+        currentHost?.userId?.toString(),
+      );
+
+      toast.success(
+        t("fileManager.archiveExtractedSuccessfully", { name: file.name }),
+      );
+
+      handleRefreshDirectory();
+    } catch (error: unknown) {
+      const err = error as { message?: string };
+      toast.error(
+        `${t("fileManager.extractFailed")}: ${err.message || t("fileManager.unknownError")}`,
+      );
+    }
+  }
+
+  function handleOpenCompressDialog(files: FileItem[]) {
+    setCompressDialogFiles(files);
+  }
+
+  async function handleCompress(archiveName: string, format: string) {
+    if (!sshSessionId || compressDialogFiles.length === 0) return;
+
+    try {
+      await ensureSSHConnection();
+
+      const paths = compressDialogFiles.map((f) => f.path);
+      const fileNames = compressDialogFiles.map((f) => f.name);
+
+      toast.info(
+        t("fileManager.compressingFiles", {
+          count: fileNames.length,
+          name: archiveName,
+        }),
+      );
+
+      await compressSSHFiles(
+        sshSessionId,
+        paths,
+        archiveName,
+        format,
+        currentHost?.id,
+        currentHost?.userId?.toString(),
+      );
+
+      toast.success(
+        t("fileManager.filesCompressedSuccessfully", {
+          name: archiveName,
+        }),
+      );
+
+      handleRefreshDirectory();
+      clearSelection();
+    } catch (error: unknown) {
+      const err = error as { message?: string };
+      toast.error(
+        `${t("fileManager.compressFailed")}: ${err.message || t("fileManager.unknownError")}`,
+      );
+    }
+  }
+
  async function handleUndo() {
    if (undoHistory.length === 0) {
      toast.info(t("fileManager.noUndoableActions"));
@@ -1180,6 +1266,34 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
    setEditingFile(file);
  }

+  function handleOpenPermissionsDialog(file: FileItem) {
+    setPermissionsDialogFile(file);
+  }
+
+  async function handleSavePermissions(file: FileItem, permissions: string) {
+    if (!sshSessionId) {
+      toast.error(t("fileManager.noSSHConnection"));
+      return;
+    }
+
+    try {
+      await changeSSHPermissions(
+        sshSessionId,
+        file.path,
+        permissions,
+        currentHost?.id,
+        currentHost?.userId?.toString(),
+      );
+
+      toast.success(t("fileManager.permissionsChangedSuccessfully"));
+      await handleRefreshDirectory();
+    } catch (error: unknown) {
+      console.error("Failed to change permissions:", error);
+      toast.error(t("fileManager.failedToChangePermissions"));
+      throw error;
+    }
+  }
+
  async function ensureSSHConnection() {
    if (!sshSessionId || !currentHost || isReconnecting) return;

@@ -1775,6 +1889,12 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
    }
  }, [currentHost?.id]);

+  useEffect(() => {
+    console.log("Saving viewMode to localStorage:", viewMode);
+    localStorage.setItem("fileManagerViewMode", viewMode);
+    console.log("Saved value:", localStorage.getItem("fileManagerViewMode"));
+  }, [viewMode]);
+
  const filteredFiles = files.filter((file) =>
    file.name.toLowerCase().includes(searchQuery.toLowerCase()),
  );
@@ -1928,6 +2048,8 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
            createIntent={createIntent}
            onConfirmCreate={handleConfirmCreate}
            onCancelCreate={handleCancelCreate}
+            onNewFile={handleCreateNewFile}
+            onNewFolder={handleCreateNewFolder}
          />

          <FileManagerContextMenu
@@ -1966,10 +2088,21 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
            onAddShortcut={handleAddShortcut}
            isPinned={isPinnedFile}
            currentPath={currentPath}
+            onProperties={handleOpenPermissionsDialog}
+            onExtractArchive={handleExtractArchive}
+            onCompress={handleOpenCompressDialog}
+            onCopyPath={handleCopyPath}
          />
        </div>
      </div>

+      <CompressDialog
+        open={compressDialogFiles.length > 0}
+        onOpenChange={(open) => !open && setCompressDialogFiles([])}
+        fileNames={compressDialogFiles.map((f) => f.name)}
+        onCompress={handleCompress}
+      />
+
      <TOTPDialog
        isOpen={totpRequired}
        prompt={totpPrompt}
@@ -1991,6 +2124,15 @@ function FileManagerContent({ initialHost, onClose }: FileManagerProps) {
          }}
        />
      )}
+
+      <PermissionsDialog
+        file={permissionsDialogFile}
+        open={permissionsDialogFile !== null}
+        onOpenChange={(open) => {
+          if (!open) setPermissionsDialogFile(null);
+        }}
+        onSave={handleSavePermissions}
+      />
    </div>
  );
 }
--- a/src/ui/desktop/apps/file-manager/FileManagerContextMenu.tsx
+++ b/src/ui/desktop/apps/file-manager/FileManagerContextMenu.tsx
@@ -17,8 +17,10 @@ import {
  Play,
  Star,
  Bookmark,
+  FileArchive,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
+import { Kbd, KbdGroup } from "@/components/ui/kbd";

 interface FileItem {
  name: string;
@@ -59,6 +61,9 @@ interface ContextMenuProps {
  onAddShortcut?: (path: string) => void;
  isPinned?: (file: FileItem) => boolean;
  currentPath?: string;
+  onExtractArchive?: (file: FileItem) => void;
+  onCompress?: (files: FileItem[]) => void;
+  onCopyPath?: (files: FileItem[]) => void;
 }

 interface MenuItem {
@@ -98,12 +103,21 @@ export function FileManagerContextMenu({
  onAddShortcut,
  isPinned,
  currentPath,
+  onExtractArchive,
+  onCompress,
+  onCopyPath,
 }: ContextMenuProps) {
  const { t } = useTranslation();
  const [menuPosition, setMenuPosition] = useState({ x, y });
+  const [isMounted, setIsMounted] = useState(false);

  useEffect(() => {
-    if (!isVisible) return;
+    if (!isVisible) {
+      setIsMounted(false);
+      return;
+    }
+
+    setIsMounted(true);

    const adjustPosition = () => {
      const menuWidth = 200;
@@ -182,8 +196,6 @@ export function FileManagerContextMenu({
    };
  }, [isVisible, x, y, onClose]);

-  if (!isVisible) return null;
-
  const isFileContext = files.length > 0;
  const isSingleFile = files.length === 1;
  const isMultipleFiles = files.length > 1;
@@ -249,6 +261,43 @@ export function FileManagerContextMenu({
      });
    }

+    if (isSingleFile && files[0].type === "file" && onExtractArchive) {
+      const fileName = files[0].name.toLowerCase();
+      const isArchive =
+        fileName.endsWith(".zip") ||
+        fileName.endsWith(".tar") ||
+        fileName.endsWith(".tar.gz") ||
+        fileName.endsWith(".tgz") ||
+        fileName.endsWith(".tar.bz2") ||
+        fileName.endsWith(".tbz2") ||
+        fileName.endsWith(".tar.xz") ||
+        fileName.endsWith(".gz") ||
+        fileName.endsWith(".bz2") ||
+        fileName.endsWith(".xz") ||
+        fileName.endsWith(".7z") ||
+        fileName.endsWith(".rar");
+
+      if (isArchive) {
+        menuItems.push({
+          icon: <FileArchive className="w-4 h-4" />,
+          label: t("fileManager.extractArchive"),
+          action: () => onExtractArchive(files[0]),
+          shortcut: "Ctrl+E",
+        });
+      }
+    }
+
+    if (isFileContext && onCompress) {
+      menuItems.push({
+        icon: <FileArchive className="w-4 h-4" />,
+        label: isMultipleFiles
+          ? t("fileManager.compressFiles")
+          : t("fileManager.compressFile"),
+        action: () => onCompress(files),
+        shortcut: "Ctrl+Shift+C",
+      });
+    }
+
    if (isSingleFile && files[0].type === "file") {
      const isCurrentlyPinned = isPinned ? isPinned(files[0]) : false;

@@ -316,7 +365,30 @@ export function FileManagerContextMenu({
      });
    }

-    if ((isSingleFile && onRename) || onCopy || onCut) {
+    if (onCopyPath) {
+      menuItems.push({
+        icon: <Clipboard className="w-4 h-4" />,
+        label: isMultipleFiles
+          ? t("fileManager.copyPaths")
+          : t("fileManager.copyPath"),
+        action: () => onCopyPath(files),
+        shortcut: "Ctrl+Shift+P",
+      });
+    }
+
+    if ((isSingleFile && onRename) || onCopy || onCut || onCopyPath) {
+      menuItems.push({ separator: true } as MenuItem);
+    }
+
+    if (isSingleFile && onProperties) {
+      menuItems.push({
+        icon: <Info className="w-4 h-4" />,
+        label: t("fileManager.properties"),
+        action: () => onProperties(files[0]),
+      });
+    }
+
+    if ((isSingleFile && onProperties) || onDelete) {
      menuItems.push({ separator: true } as MenuItem);
    }

@@ -331,18 +403,6 @@ export function FileManagerContextMenu({
        danger: true,
      });
    }
-
-    if (onDelete) {
-      menuItems.push({ separator: true } as MenuItem);
-    }
-
-    if (isSingleFile && onProperties) {
-      menuItems.push({
-        icon: <Info className="w-4 h-4" />,
-        label: t("fileManager.properties"),
-        action: () => onProperties(files[0]),
-      });
-    }
  } else {
    if (onOpenTerminal && currentPath) {
      menuItems.push({
@@ -425,13 +485,36 @@ export function FileManagerContextMenu({
    return index > 0 && index < filteredMenuItems.length - 1;
  });

+  const renderShortcut = (shortcut: string) => {
+    const keys = shortcut.split("+");
+    if (keys.length === 1) {
+      return <Kbd>{keys[0]}</Kbd>;
+    }
+    return (
+      <KbdGroup>
+        {keys.map((key, index) => (
+          <Kbd key={index}>{key}</Kbd>
+        ))}
+      </KbdGroup>
+    );
+  };
+
+  if (!isVisible && !isMounted) return null;
+
  return (
    <>
-      <div className="fixed inset-0 z-[99990]" />
+      <div
+        className={cn(
+          "fixed inset-0 z-[99990] transition-opacity duration-150",
+          !isMounted && "opacity-0",
+        )}
+      />

      <div
        data-context-menu
-        className="fixed bg-dark-bg border border-dark-border rounded-lg shadow-xl min-w-[180px] max-w-[250px] z-[99995] overflow-hidden"
+        className={cn(
+          "fixed bg-dark-bg border border-dark-border rounded-lg shadow-xl min-w-[180px] max-w-[250px] z-[99995] overflow-hidden",
+        )}
        style={{
          left: menuPosition.x,
          top: menuPosition.y,
@@ -470,9 +553,9 @@ export function FileManagerContextMenu({
                <span className="flex-1">{item.label}</span>
              </div>
              {item.shortcut && (
-                <span className="text-xs text-muted-foreground ml-2 flex-shrink-0">
-                  {item.shortcut}
-                </span>
+                <div className="ml-2 flex-shrink-0">
+                  {renderShortcut(item.shortcut)}
+                </div>
              )}
            </button>
          );
--- a/src/ui/desktop/apps/file-manager/FileManagerGrid.tsx
+++ b/src/ui/desktop/apps/file-manager/FileManagerGrid.tsx
@@ -24,6 +24,7 @@ import {
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import type { FileItem } from "../../../types/index.js";
+import { SimpleLoader } from "@/ui/desktop/navigation/animations/SimpleLoader.tsx";

 interface CreateIntent {
  id: string;
@@ -92,17 +93,37 @@ interface FileManagerGridProps {
  createIntent?: CreateIntent | null;
  onConfirmCreate?: (name: string) => void;
  onCancelCreate?: () => void;
+  onNewFile?: () => void;
+  onNewFolder?: () => void;
 }

-const getFileIcon = (file: FileItem, viewMode: "grid" | "list" = "grid") => {
-  const iconClass = viewMode === "grid" ? "w-8 h-8" : "w-6 h-6";
+const getFileTypeColor = (file: FileItem): string => {
+  const colorEnabled = localStorage.getItem("fileColorCoding") !== "false";
+  if (!colorEnabled) {
+    return "text-muted-foreground";
+  }

  if (file.type === "directory") {
-    return <Folder className={`${iconClass} text-muted-foreground`} />;
+    return "text-red-400";
  }

  if (file.type === "link") {
-    return <FileSymlink className={`${iconClass} text-muted-foreground`} />;
+    return "text-green-400";
+  }
+
+  return "text-blue-400";
+};
+
+const getFileIcon = (file: FileItem, viewMode: "grid" | "list" = "grid") => {
+  const iconClass = viewMode === "grid" ? "w-8 h-8" : "w-6 h-6";
+  const colorClass = getFileTypeColor(file);
+
+  if (file.type === "directory") {
+    return <Folder className={`${iconClass} ${colorClass}`} />;
+  }
+
+  if (file.type === "link") {
+    return <FileSymlink className={`${iconClass} ${colorClass}`} />;
  }

  const ext = file.name.split(".").pop()?.toLowerCase();
@@ -111,30 +132,30 @@ const getFileIcon = (file: FileItem, viewMode: "grid" | "list" = "grid") => {
    case "txt":
    case "md":
    case "readme":
-      return <FileText className={`${iconClass} text-muted-foreground`} />;
+      return <FileText className={`${iconClass} ${colorClass}`} />;
    case "png":
    case "jpg":
    case "jpeg":
    case "gif":
    case "bmp":
    case "svg":
-      return <FileImage className={`${iconClass} text-muted-foreground`} />;
+      return <FileImage className={`${iconClass} ${colorClass}`} />;
    case "mp4":
    case "avi":
    case "mkv":
    case "mov":
-      return <FileVideo className={`${iconClass} text-muted-foreground`} />;
+      return <FileVideo className={`${iconClass} ${colorClass}`} />;
    case "mp3":
    case "wav":
    case "flac":
    case "ogg":
-      return <FileAudio className={`${iconClass} text-muted-foreground`} />;
+      return <FileAudio className={`${iconClass} ${colorClass}`} />;
    case "zip":
    case "tar":
    case "gz":
    case "rar":
    case "7z":
-      return <Archive className={`${iconClass} text-muted-foreground`} />;
+      return <Archive className={`${iconClass} ${colorClass}`} />;
    case "js":
    case "ts":
    case "jsx":
@@ -148,7 +169,7 @@ const getFileIcon = (file: FileItem, viewMode: "grid" | "list" = "grid") => {
    case "rb":
    case "go":
    case "rs":
-      return <Code className={`${iconClass} text-muted-foreground`} />;
+      return <Code className={`${iconClass} ${colorClass}`} />;
    case "json":
    case "xml":
    case "yaml":
@@ -157,9 +178,9 @@ const getFileIcon = (file: FileItem, viewMode: "grid" | "list" = "grid") => {
    case "ini":
    case "conf":
    case "config":
-      return <Settings className={`${iconClass} text-muted-foreground`} />;
+      return <Settings className={`${iconClass} ${colorClass}`} />;
    default:
-      return <File className={`${iconClass} text-muted-foreground`} />;
+      return <File className={`${iconClass} ${colorClass}`} />;
  }
 };

@@ -192,6 +213,8 @@ export function FileManagerGrid({
  createIntent,
  onConfirmCreate,
  onCancelCreate,
+  onNewFile,
+  onNewFolder,
 }: FileManagerGridProps) {
  const { t } = useTranslation();
  const gridRef = useRef<HTMLDivElement>(null);
@@ -772,6 +795,42 @@ export function FileManagerGrid({
            onUndo();
          }
          break;
+        case "d":
+        case "D":
+          if (
+            (event.ctrlKey || event.metaKey) &&
+            selectedFiles.length > 0 &&
+            onDownload
+          ) {
+            event.preventDefault();
+            onDownload(selectedFiles);
+          }
+          break;
+        case "n":
+        case "N":
+          if (event.ctrlKey || event.metaKey) {
+            event.preventDefault();
+            if (event.shiftKey && onNewFolder) {
+              onNewFolder();
+            } else if (!event.shiftKey && onNewFile) {
+              onNewFile();
+            }
+          }
+          break;
+        case "u":
+        case "U":
+          if ((event.ctrlKey || event.metaKey) && onUpload) {
+            event.preventDefault();
+            const input = document.createElement("input");
+            input.type = "file";
+            input.multiple = true;
+            input.onchange = (e) => {
+              const files = (e.target as HTMLInputElement).files;
+              if (files) onUpload(files);
+            };
+            input.click();
+          }
+          break;
        case "Delete":
          if (selectedFiles.length > 0 && onDelete) {
            onDelete(selectedFiles);
@@ -783,6 +842,12 @@ export function FileManagerGrid({
            onStartEdit(selectedFiles[0]);
          }
          break;
+        case "Enter":
+          if (selectedFiles.length === 1) {
+            event.preventDefault();
+            onFileOpen(selectedFiles[0]);
+          }
+          break;
        case "y":
        case "Y":
          if (event.ctrlKey || event.metaKey) {
@@ -807,19 +872,8 @@ export function FileManagerGrid({
    onUndo,
  ]);

-  if (isLoading) {
-    return (
-      <div className="h-full flex items-center justify-center">
-        <div className="text-center">
-          <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-500 mx-auto mb-2"></div>
-          <p className="text-sm text-muted-foreground">{t("common.loading")}</p>
-        </div>
-      </div>
-    );
-  }
-
  return (
-    <div className="h-full flex flex-col bg-dark-bg overflow-hidden">
+    <div className="h-full flex flex-col bg-dark-bg overflow-hidden relative">
      <div className="flex-shrink-0 border-b border-dark-border">
        <div className="flex items-center gap-1 p-2 border-b border-dark-border">
          <button
@@ -950,7 +1004,7 @@ export function FileManagerGrid({
          tabIndex={0}
        >
          {dragState.type === "external" && (
-            <div className="absolute inset-0 flex items-center justify-center bg-background/50 backdrop-blur-sm z-10 pointer-events-none animate-in fade-in-0">
+            <div className="absolute inset-0 flex items-center justify-center bg-background/50 backdrop-blur-sm z-10 pointer-events-none">
              <div className="text-center p-8 bg-background/95 border-2 border-dashed border-primary rounded-lg shadow-lg">
                <Upload className="w-16 h-16 mx-auto mb-4 text-primary" />
                <p className="text-xl font-semibold text-foreground mb-2">
@@ -1003,8 +1057,9 @@ export function FileManagerGrid({
                    draggable={true}
                    className={cn(
                      "group p-3 rounded-lg cursor-pointer",
-                      "hover:bg-accent hover:text-accent-foreground border-2 border-transparent",
-                      isSelected && "bg-primary/20 border-primary",
+                      "hover:bg-accent hover:text-accent-foreground hover:scale-[1.02] border-2 border-transparent",
+                      isSelected &&
+                        "bg-primary/20 border-primary ring-2 ring-primary/20",
                      dragState.target?.path === file.path &&
                        "bg-muted border-primary border-dashed relative z-10",
                      dragState.files.some((f) => f.path === file.path) &&
@@ -1093,7 +1148,7 @@ export function FileManagerGrid({
                    className={cn(
                      "flex items-center gap-3 p-2 rounded cursor-pointer",
                      "hover:bg-accent hover:text-accent-foreground",
-                      isSelected && "bg-primary/20",
+                      isSelected && "bg-primary/20 ring-2 ring-primary/20",
                      dragState.target?.path === file.path &&
                        "bg-muted border-primary border-dashed relative z-10",
                      dragState.files.some((f) => f.path === file.path) &&
@@ -1264,6 +1319,8 @@ export function FileManagerGrid({
          </div>,
          document.body,
        )}
+
+      <SimpleLoader visible={isLoading} message={t("common.loading")} />
    </div>
  );
 }
--- a/src/ui/desktop/apps/file-manager/components/CompressDialog.tsx
+++ b/src/ui/desktop/apps/file-manager/components/CompressDialog.tsx
@@ -0,0 +1,158 @@
+import React, { useState, useEffect } from "react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { useTranslation } from "react-i18next";
+
+interface CompressDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  fileNames: string[];
+  onCompress: (archiveName: string, format: string) => void;
+}
+
+export function CompressDialog({
+  open,
+  onOpenChange,
+  fileNames,
+  onCompress,
+}: CompressDialogProps) {
+  const { t } = useTranslation();
+  const [archiveName, setArchiveName] = useState("");
+  const [format, setFormat] = useState("zip");
+
+  useEffect(() => {
+    if (open && fileNames.length > 0) {
+      if (fileNames.length === 1) {
+        const baseName = fileNames[0].replace(/\.[^/.]+$/, "");
+        setArchiveName(baseName);
+      } else {
+        setArchiveName("archive");
+      }
+    }
+  }, [open, fileNames]);
+
+  const handleCompress = () => {
+    if (!archiveName.trim()) return;
+
+    let finalName = archiveName.trim();
+    const extensions: Record<string, string> = {
+      zip: ".zip",
+      "tar.gz": ".tar.gz",
+      "tar.bz2": ".tar.bz2",
+      "tar.xz": ".tar.xz",
+      tar: ".tar",
+      "7z": ".7z",
+    };
+
+    const expectedExtension = extensions[format];
+    if (expectedExtension && !finalName.endsWith(expectedExtension)) {
+      finalName += expectedExtension;
+    }
+
+    onCompress(finalName, format);
+    onOpenChange(false);
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-[500px] bg-dark-bg border-2 border-dark-border">
+        <DialogHeader>
+          <DialogTitle>{t("fileManager.compressFiles")}</DialogTitle>
+          <DialogDescription className="text-muted-foreground">
+            {t("fileManager.compressFilesDesc", { count: fileNames.length })}
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-6 py-4">
+          <div className="space-y-3">
+            <Label
+              className="text-base font-semibold text-foreground"
+              htmlFor="archiveName"
+            >
+              {t("fileManager.archiveName")}
+            </Label>
+            <Input
+              id="archiveName"
+              value={archiveName}
+              onChange={(e) => setArchiveName(e.target.value)}
+              placeholder={t("fileManager.enterArchiveName")}
+              onKeyDown={(e) => {
+                if (e.key === "Enter") {
+                  e.preventDefault();
+                  handleCompress();
+                }
+              }}
+            />
+          </div>
+
+          <div className="space-y-3">
+            <Label
+              className="text-base font-semibold text-foreground"
+              htmlFor="format"
+            >
+              {t("fileManager.compressionFormat")}
+            </Label>
+            <Select value={format} onValueChange={setFormat}>
+              <SelectTrigger id="format">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="zip">ZIP (.zip)</SelectItem>
+                <SelectItem value="tar.gz">TAR.GZ (.tar.gz)</SelectItem>
+                <SelectItem value="tar.bz2">TAR.BZ2 (.tar.bz2)</SelectItem>
+                <SelectItem value="tar.xz">TAR.XZ (.tar.xz)</SelectItem>
+                <SelectItem value="tar">TAR (.tar)</SelectItem>
+                <SelectItem value="7z">7-Zip (.7z)</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+
+          <div className="rounded-md bg-dark-hover/50 border border-dark-border p-3">
+            <p className="text-sm text-gray-400 mb-2">
+              {t("fileManager.selectedFiles")}:
+            </p>
+            <ul className="text-sm space-y-1">
+              {fileNames.slice(0, 5).map((name, index) => (
+                <li key={index} className="truncate text-foreground">
+                  • {name}
+                </li>
+              ))}
+              {fileNames.length > 5 && (
+                <li className="text-gray-400 italic">
+                  {t("fileManager.andMoreFiles", {
+                    count: fileNames.length - 5,
+                  })}
+                </li>
+              )}
+            </ul>
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button variant="outline" onClick={() => onOpenChange(false)}>
+            {t("common.cancel")}
+          </Button>
+          <Button onClick={handleCompress} disabled={!archiveName.trim()}>
+            {t("fileManager.compress")}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
--- a/src/ui/desktop/apps/file-manager/components/PermissionsDialog.tsx
+++ b/src/ui/desktop/apps/file-manager/components/PermissionsDialog.tsx
@@ -0,0 +1,318 @@
+import React, { useState, useEffect } from "react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogFooter,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { Label } from "@/components/ui/label";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Input } from "@/components/ui/input";
+import { useTranslation } from "react-i18next";
+import { Shield } from "lucide-react";
+
+interface FileItem {
+  name: string;
+  type: "file" | "directory" | "link";
+  path: string;
+  permissions?: string;
+  owner?: string;
+  group?: string;
+}
+
+interface PermissionsDialogProps {
+  file: FileItem | null;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onSave: (file: FileItem, permissions: string) => Promise<void>;
+}
+
+const parsePermissions = (
+  perms: string,
+): { owner: number; group: number; other: number } => {
+  if (!perms) {
+    return { owner: 0, group: 0, other: 0 };
+  }
+
+  if (/^\d{3,4}$/.test(perms)) {
+    const numStr = perms.slice(-3);
+    return {
+      owner: parseInt(numStr[0] || "0", 10),
+      group: parseInt(numStr[1] || "0", 10),
+      other: parseInt(numStr[2] || "0", 10),
+    };
+  }
+  const cleanPerms = perms.replace(/^-/, "").substring(0, 9);
+
+  const calcBits = (str: string): number => {
+    let value = 0;
+    if (str[0] === "r") value += 4;
+    if (str[1] === "w") value += 2;
+    if (str[2] === "x") value += 1;
+    return value;
+  };
+
+  return {
+    owner: calcBits(cleanPerms.substring(0, 3)),
+    group: calcBits(cleanPerms.substring(3, 6)),
+    other: calcBits(cleanPerms.substring(6, 9)),
+  };
+};
+
+const toNumeric = (owner: number, group: number, other: number): string => {
+  return `${owner}${group}${other}`;
+};
+
+export function PermissionsDialog({
+  file,
+  open,
+  onOpenChange,
+  onSave,
+}: PermissionsDialogProps) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+
+  const initialPerms = parsePermissions(file?.permissions || "644");
+  const [ownerRead, setOwnerRead] = useState((initialPerms.owner & 4) !== 0);
+  const [ownerWrite, setOwnerWrite] = useState((initialPerms.owner & 2) !== 0);
+  const [ownerExecute, setOwnerExecute] = useState(
+    (initialPerms.owner & 1) !== 0,
+  );
+
+  const [groupRead, setGroupRead] = useState((initialPerms.group & 4) !== 0);
+  const [groupWrite, setGroupWrite] = useState((initialPerms.group & 2) !== 0);
+  const [groupExecute, setGroupExecute] = useState(
+    (initialPerms.group & 1) !== 0,
+  );
+
+  const [otherRead, setOtherRead] = useState((initialPerms.other & 4) !== 0);
+  const [otherWrite, setOtherWrite] = useState((initialPerms.other & 2) !== 0);
+  const [otherExecute, setOtherExecute] = useState(
+    (initialPerms.other & 1) !== 0,
+  );
+
+  useEffect(() => {
+    if (file) {
+      const perms = parsePermissions(file.permissions || "644");
+      setOwnerRead((perms.owner & 4) !== 0);
+      setOwnerWrite((perms.owner & 2) !== 0);
+      setOwnerExecute((perms.owner & 1) !== 0);
+      setGroupRead((perms.group & 4) !== 0);
+      setGroupWrite((perms.group & 2) !== 0);
+      setGroupExecute((perms.group & 1) !== 0);
+      setOtherRead((perms.other & 4) !== 0);
+      setOtherWrite((perms.other & 2) !== 0);
+      setOtherExecute((perms.other & 1) !== 0);
+    }
+  }, [file]);
+
+  const calculateOctal = (): string => {
+    const owner =
+      (ownerRead ? 4 : 0) + (ownerWrite ? 2 : 0) + (ownerExecute ? 1 : 0);
+    const group =
+      (groupRead ? 4 : 0) + (groupWrite ? 2 : 0) + (groupExecute ? 1 : 0);
+    const other =
+      (otherRead ? 4 : 0) + (otherWrite ? 2 : 0) + (otherExecute ? 1 : 0);
+    return toNumeric(owner, group, other);
+  };
+
+  const handleSave = async () => {
+    if (!file) return;
+
+    setLoading(true);
+    try {
+      const permissions = calculateOctal();
+      await onSave(file, permissions);
+      onOpenChange(false);
+    } catch (error) {
+      console.error("Failed to update permissions:", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  if (!file) return null;
+
+  const octal = calculateOctal();
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-[500px] bg-dark-bg border-2 border-dark-border">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            <Shield className="w-5 h-5" />
+            {t("fileManager.changePermissions")}
+          </DialogTitle>
+          <DialogDescription className="text-muted-foreground">
+            {t("fileManager.changePermissionsDesc")}:{" "}
+            <span className="font-mono text-foreground">{file.name}</span>
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-6 py-4">
+          <div className="grid grid-cols-2 gap-4 text-sm">
+            <div>
+              <Label className="text-gray-400">
+                {t("fileManager.currentPermissions")}
+              </Label>
+              <p className="font-mono text-lg mt-1">
+                {file.permissions || "644"}
+              </p>
+            </div>
+            <div>
+              <Label className="text-gray-400">
+                {t("fileManager.newPermissions")}
+              </Label>
+              <p className="font-mono text-lg mt-1">{octal}</p>
+            </div>
+          </div>
+
+          <div className="space-y-3">
+            <Label className="text-base font-semibold text-foreground">
+              {t("fileManager.owner")} {file.owner && `(${file.owner})`}
+            </Label>
+            <div className="flex gap-6 ml-4">
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="owner-read"
+                  checked={ownerRead}
+                  onCheckedChange={(checked) => setOwnerRead(checked === true)}
+                />
+                <label htmlFor="owner-read" className="text-sm cursor-pointer">
+                  {t("fileManager.read")}
+                </label>
+              </div>
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="owner-write"
+                  checked={ownerWrite}
+                  onCheckedChange={(checked) => setOwnerWrite(checked === true)}
+                />
+                <label htmlFor="owner-write" className="text-sm cursor-pointer">
+                  {t("fileManager.write")}
+                </label>
+              </div>
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="owner-execute"
+                  checked={ownerExecute}
+                  onCheckedChange={(checked) =>
+                    setOwnerExecute(checked === true)
+                  }
+                />
+                <label
+                  htmlFor="owner-execute"
+                  className="text-sm cursor-pointer"
+                >
+                  {t("fileManager.execute")}
+                </label>
+              </div>
+            </div>
+          </div>
+
+          <div className="space-y-3">
+            <Label className="text-base font-semibold text-foreground">
+              {t("fileManager.group")} {file.group && `(${file.group})`}
+            </Label>
+            <div className="flex gap-6 ml-4">
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="group-read"
+                  checked={groupRead}
+                  onCheckedChange={(checked) => setGroupRead(checked === true)}
+                />
+                <label htmlFor="group-read" className="text-sm cursor-pointer">
+                  {t("fileManager.read")}
+                </label>
+              </div>
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="group-write"
+                  checked={groupWrite}
+                  onCheckedChange={(checked) => setGroupWrite(checked === true)}
+                />
+                <label htmlFor="group-write" className="text-sm cursor-pointer">
+                  {t("fileManager.write")}
+                </label>
+              </div>
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="group-execute"
+                  checked={groupExecute}
+                  onCheckedChange={(checked) =>
+                    setGroupExecute(checked === true)
+                  }
+                />
+                <label
+                  htmlFor="group-execute"
+                  className="text-sm cursor-pointer"
+                >
+                  {t("fileManager.execute")}
+                </label>
+              </div>
+            </div>
+          </div>
+
+          <div className="space-y-3">
+            <Label className="text-base font-semibold text-foreground">
+              {t("fileManager.others")}
+            </Label>
+            <div className="flex gap-6 ml-4">
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="other-read"
+                  checked={otherRead}
+                  onCheckedChange={(checked) => setOtherRead(checked === true)}
+                />
+                <label htmlFor="other-read" className="text-sm cursor-pointer">
+                  {t("fileManager.read")}
+                </label>
+              </div>
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="other-write"
+                  checked={otherWrite}
+                  onCheckedChange={(checked) => setOtherWrite(checked === true)}
+                />
+                <label htmlFor="other-write" className="text-sm cursor-pointer">
+                  {t("fileManager.write")}
+                </label>
+              </div>
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="other-execute"
+                  checked={otherExecute}
+                  onCheckedChange={(checked) =>
+                    setOtherExecute(checked === true)
+                  }
+                />
+                <label
+                  htmlFor="other-execute"
+                  className="text-sm cursor-pointer"
+                >
+                  {t("fileManager.execute")}
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button
+            variant="outline"
+            onClick={() => onOpenChange(false)}
+            disabled={loading}
+          >
+            {t("common.cancel")}
+          </Button>
+          <Button onClick={handleSave} disabled={loading}>
+            {loading ? t("common.saving") : t("common.save")}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
--- a/src/ui/desktop/apps/host-manager/HostManager.tsx
+++ b/src/ui/desktop/apps/host-manager/HostManager.tsx
@@ -18,6 +18,8 @@ export function HostManager({
  isTopbarOpen,
  initialTab = "host_viewer",
  hostConfig,
+  rightSidebarOpen = false,
+  rightSidebarWidth = 400,
 }: HostManagerProps): React.ReactElement {
  const { t } = useTranslation();
  const [activeTab, setActiveTab] = useState(initialTab);
@@ -35,28 +37,10 @@ export function HostManager({
  const lastProcessedHostIdRef = useRef<number | undefined>(undefined);

  useEffect(() => {
-    if (ignoreNextHostConfigChangeRef.current) {
-      ignoreNextHostConfigChangeRef.current = false;
-      return;
+    if (initialTab) {
+      setActiveTab(initialTab);
    }
-
-    if (hostConfig && initialTab === "add_host") {
-      const currentHostId = hostConfig.id;
-
-      if (currentHostId !== lastProcessedHostIdRef.current) {
-        setEditingHost(hostConfig);
-        setActiveTab("add_host");
-        lastProcessedHostIdRef.current = currentHostId;
-      } else if (
-        activeTab === "host_viewer" ||
-        activeTab === "credentials" ||
-        activeTab === "add_credential"
-      ) {
-        setEditingHost(hostConfig);
-        setActiveTab("add_host");
-      }
-    }
-  }, [hostConfig, initialTab]);
+  }, [initialTab]);

  const handleEditHost = (host: SSHHost) => {
    setEditingHost(host);
@@ -88,13 +72,13 @@ export function HostManager({
  };

  const handleTabChange = (value: string) => {
-    setActiveTab(value);
-    if (value !== "add_host") {
+    if (activeTab === "add_host" && value !== "add_host") {
      setEditingHost(null);
    }
-    if (value !== "add_credential") {
+    if (activeTab === "add_credential" && value !== "add_credential") {
      setEditingCredential(null);
    }
+    setActiveTab(value);
  };

  const topMarginPx = isTopbarOpen ? 74 : 26;
@@ -108,10 +92,14 @@ export function HostManager({
          className="bg-dark-bg text-white p-4 pt-0 rounded-lg border-2 border-dark-border flex flex-col min-h-0 overflow-hidden"
          style={{
            marginLeft: leftMarginPx,
-            marginRight: 17,
+            marginRight: rightSidebarOpen
+              ? `calc(var(--right-sidebar-width, ${rightSidebarWidth}px) + 8px)`
+              : 17,
            marginTop: topMarginPx,
            marginBottom: bottomMarginPx,
            height: `calc(100vh - ${topMarginPx + bottomMarginPx}px)`,
+            transition:
+              "margin-left 200ms linear, margin-right 200ms linear, margin-top 200ms linear",
          }}
        >
          <Tabs
--- a/src/ui/desktop/apps/host-manager/HostManagerEditor.tsx
+++ b/src/ui/desktop/apps/host-manager/HostManagerEditor.tsx
--- a/src/ui/desktop/apps/host-manager/HostManagerViewer.tsx
+++ b/src/ui/desktop/apps/host-manager/HostManagerViewer.tsx
@@ -22,10 +22,15 @@ import {
  updateSSHHost,
  renameFolder,
  exportSSHHostWithCredentials,
+  getSSHFolders,
+  updateFolderMetadata,
+  deleteAllHostsInFolder,
+  getServerStatusById,
 } from "@/ui/main-axios.ts";
 import { toast } from "sonner";
 import { useTranslation } from "react-i18next";
 import { useConfirmation } from "@/hooks/use-confirmation.ts";
+import { Status, StatusIndicator } from "@/components/ui/shadcn-io/status";
 import {
  Edit,
  Trash2,
@@ -45,16 +50,31 @@ import {
  Copy,
  Activity,
  Clock,
+  Palette,
+  Trash,
+  Cloud,
+  Database,
+  Box,
+  Package,
+  Layers,
+  Archive,
+  HardDrive,
+  Globe,
+  FolderOpen,
 } from "lucide-react";
 import type {
  SSHHost,
+  SSHFolder,
  SSHManagerHostViewerProps,
 } from "../../../../types/index.js";
 import { DEFAULT_STATS_CONFIG } from "@/types/stats-widgets";
+import { FolderEditDialog } from "./components/FolderEditDialog";
+import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext";

 export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
  const { t } = useTranslation();
  const { confirmWithToast } = useConfirmation();
+  const { addTab } = useTabs();
  const [hosts, setHosts] = useState<SSHHost[]>([]);
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState<string | null>(null);
@@ -65,23 +85,38 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
  const [editingFolder, setEditingFolder] = useState<string | null>(null);
  const [editingFolderName, setEditingFolderName] = useState("");
  const [operationLoading, setOperationLoading] = useState(false);
+  const [folderMetadata, setFolderMetadata] = useState<Map<string, SSHFolder>>(
+    new Map(),
+  );
+  const [editingFolderAppearance, setEditingFolderAppearance] = useState<
+    string | null
+  >(null);
+  const [serverStatuses, setServerStatuses] = useState<
+    Map<number, "online" | "offline" | "degraded">
+  >(new Map());
  const dragCounter = useRef(0);

  useEffect(() => {
    fetchHosts();
+    fetchFolderMetadata();

    const handleHostsRefresh = () => {
      fetchHosts();
+      fetchFolderMetadata();
+    };
+
+    const handleFoldersRefresh = () => {
+      fetchFolderMetadata();
    };

    window.addEventListener("hosts:refresh", handleHostsRefresh);
    window.addEventListener("ssh-hosts:changed", handleHostsRefresh);
-    window.addEventListener("folders:changed", handleHostsRefresh);
+    window.addEventListener("folders:changed", handleFoldersRefresh);

    return () => {
      window.removeEventListener("hosts:refresh", handleHostsRefresh);
      window.removeEventListener("ssh-hosts:changed", handleHostsRefresh);
-      window.removeEventListener("folders:changed", handleHostsRefresh);
+      window.removeEventListener("folders:changed", handleFoldersRefresh);
    };
  }, []);

@@ -116,6 +151,156 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
    }
  };

+  const fetchFolderMetadata = async () => {
+    try {
+      const folders = await getSSHFolders();
+      const metadataMap = new Map<string, SSHFolder>();
+      folders.forEach((folder) => {
+        metadataMap.set(folder.name, folder);
+      });
+      setFolderMetadata(metadataMap);
+    } catch (error) {
+      console.error("Failed to fetch folder metadata:", error);
+    }
+  };
+
+  const handleSaveFolderAppearance = async (
+    folderName: string,
+    color: string,
+    icon: string,
+  ) => {
+    try {
+      await updateFolderMetadata(folderName, color, icon);
+      toast.success(t("hosts.folderAppearanceUpdated"));
+      await fetchFolderMetadata();
+      window.dispatchEvent(new CustomEvent("folders:changed"));
+    } catch (error) {
+      console.error("Failed to update folder appearance:", error);
+      toast.error(t("hosts.failedToUpdateFolderAppearance"));
+    }
+  };
+
+  const handleDeleteAllHostsInFolder = async (folderName: string) => {
+    const hostsInFolder = hostsByFolder[folderName] || [];
+    confirmWithToast(
+      t("hosts.confirmDeleteAllHostsInFolder", {
+        folder: folderName,
+        count: hostsInFolder.length,
+      }),
+      async () => {
+        try {
+          const result = await deleteAllHostsInFolder(folderName);
+          toast.success(
+            t("hosts.allHostsInFolderDeleted", {
+              folder: folderName,
+              count: result.deletedCount,
+            }),
+          );
+          await fetchHosts();
+          await fetchFolderMetadata();
+          window.dispatchEvent(new CustomEvent("ssh-hosts:changed"));
+        } catch (error) {
+          console.error("Failed to delete hosts in folder:", error);
+          toast.error(t("hosts.failedToDeleteHostsInFolder"));
+        }
+      },
+      "destructive",
+    );
+  };
+
+  useEffect(() => {
+    if (hosts.length === 0) return;
+
+    const statusIntervals: NodeJS.Timeout[] = [];
+    const statusCancelled: boolean[] = [];
+
+    hosts.forEach((host, index) => {
+      const statsConfig = (() => {
+        try {
+          return host.statsConfig
+            ? JSON.parse(host.statsConfig)
+            : DEFAULT_STATS_CONFIG;
+        } catch {
+          return DEFAULT_STATS_CONFIG;
+        }
+      })();
+
+      const shouldShowStatus = statsConfig.statusCheckEnabled !== false;
+
+      if (!shouldShowStatus) {
+        setServerStatuses((prev) => {
+          const next = new Map(prev);
+          next.set(host.id, "offline");
+          return next;
+        });
+        return;
+      }
+
+      const fetchStatus = async () => {
+        try {
+          const res = await getServerStatusById(host.id);
+          if (!statusCancelled[index]) {
+            setServerStatuses((prev) => {
+              const next = new Map(prev);
+              next.set(
+                host.id,
+                res?.status === "online" ? "online" : "offline",
+              );
+              return next;
+            });
+          }
+        } catch (error: unknown) {
+          if (!statusCancelled[index]) {
+            const err = error as { response?: { status?: number } };
+            let status: "online" | "offline" | "degraded" = "offline";
+            if (err?.response?.status === 504) {
+              status = "degraded";
+            }
+            setServerStatuses((prev) => {
+              const next = new Map(prev);
+              next.set(host.id, status);
+              return next;
+            });
+          }
+        }
+      };
+
+      fetchStatus();
+      const intervalId = setInterval(fetchStatus, 10000);
+      statusIntervals.push(intervalId);
+    });
+
+    return () => {
+      statusCancelled.fill(true);
+      statusIntervals.forEach((interval) => clearInterval(interval));
+    };
+  }, [hosts]);
+
+  const getFolderIcon = (folderName: string) => {
+    const metadata = folderMetadata.get(folderName);
+    if (!metadata?.icon) return Folder;
+
+    const iconMap: Record<string, React.ComponentType> = {
+      Folder,
+      Server,
+      Cloud,
+      Database,
+      Box,
+      Package,
+      Layers,
+      Archive,
+      HardDrive,
+      Globe,
+    };
+
+    return iconMap[metadata.icon] || Folder;
+  };
+
+  const getFolderColor = (folderName: string) => {
+    const metadata = folderMetadata.get(folderName);
+    return metadata?.color;
+  };
+
  const handleDelete = async (hostId: number, hostName: string) => {
    confirmWithToast(
      t("hosts.confirmDelete", { name: hostName }),
@@ -854,7 +1039,18 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
                <AccordionItem value={folder} className="border-none">
                  <AccordionTrigger className="px-2 py-1 bg-muted/20 border-b hover:no-underline rounded-t-md">
                    <div className="flex items-center gap-2 flex-1">
-                      <Folder className="h-4 w-4" />
+                      {(() => {
+                        const FolderIcon = getFolderIcon(folder);
+                        const folderColor = getFolderColor(folder);
+                        return (
+                          <FolderIcon
+                            className="h-4 w-4"
+                            style={
+                              folderColor ? { color: folderColor } : undefined
+                            }
+                          />
+                        );
+                      })()}
                      {editingFolder === folder ? (
                        <div
                          className="flex items-center gap-2"
@@ -935,6 +1131,50 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
                      <Badge variant="secondary" className="text-xs">
                        {folderHosts.length}
                      </Badge>
+                      {folder !== t("hosts.uncategorized") && (
+                        <div className="flex items-center gap-1 ml-auto">
+                          <TooltipProvider>
+                            <Tooltip>
+                              <TooltipTrigger asChild>
+                                <Button
+                                  size="sm"
+                                  variant="ghost"
+                                  onClick={(e) => {
+                                    e.stopPropagation();
+                                    setEditingFolderAppearance(folder);
+                                  }}
+                                  className="h-6 w-6 p-0 opacity-50 hover:opacity-100 transition-opacity"
+                                >
+                                  <Palette className="h-3 w-3" />
+                                </Button>
+                              </TooltipTrigger>
+                              <TooltipContent>
+                                {t("hosts.editFolderAppearance")}
+                              </TooltipContent>
+                            </Tooltip>
+                          </TooltipProvider>
+                          <TooltipProvider>
+                            <Tooltip>
+                              <TooltipTrigger asChild>
+                                <Button
+                                  size="sm"
+                                  variant="ghost"
+                                  onClick={(e) => {
+                                    e.stopPropagation();
+                                    handleDeleteAllHostsInFolder(folder);
+                                  }}
+                                  className="h-6 w-6 p-0 opacity-50 hover:opacity-100 hover:text-red-400 transition-all"
+                                >
+                                  <Trash className="h-3 w-3" />
+                                </Button>
+                              </TooltipTrigger>
+                              <TooltipContent>
+                                {t("hosts.deleteAllHostsInFolder")}
+                              </TooltipContent>
+                            </Tooltip>
+                          </TooltipProvider>
+                        </div>
+                      )}
                    </div>
                  </AccordionTrigger>
                  <AccordionContent className="p-2">
@@ -957,6 +1197,32 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
                                <div className="flex items-start justify-between">
                                  <div className="flex-1 min-w-0">
                                    <div className="flex items-center gap-1">
+                                      {(() => {
+                                        const statsConfig = (() => {
+                                          try {
+                                            return host.statsConfig
+                                              ? JSON.parse(host.statsConfig)
+                                              : DEFAULT_STATS_CONFIG;
+                                          } catch {
+                                            return DEFAULT_STATS_CONFIG;
+                                          }
+                                        })();
+                                        const shouldShowStatus =
+                                          statsConfig.statusCheckEnabled !==
+                                          false;
+                                        const serverStatus =
+                                          serverStatuses.get(host.id) ||
+                                          "degraded";
+
+                                        return shouldShowStatus ? (
+                                          <Status
+                                            status={serverStatus}
+                                            className="!bg-transparent !p-0.75 flex-shrink-0"
+                                          >
+                                            <StatusIndicator />
+                                          </Status>
+                                        ) : null;
+                                      })()}
                                      {host.pin && (
                                        <Pin className="h-3 w-3 text-yellow-500 flex-shrink-0" />
                                      )}
@@ -971,6 +1237,9 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
                                    <p className="text-xs text-muted-foreground truncate">
                                      {host.username}
                                    </p>
+                                    <p className="text-xs text-muted-foreground truncate">
+                                      ID: {host.id}
+                                    </p>
                                  </div>
                                  <div className="flex gap-1 flex-shrink-0 ml-1">
                                    {host.folder && host.folder !== "" && (
@@ -1179,6 +1448,88 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
                                    })()}
                                  </div>
                                </div>
+
+                                <div className="mt-3 pt-3 border-t border-border/50 flex items-center justify-center gap-1">
+                                  {host.enableTerminal && (
+                                    <Tooltip>
+                                      <TooltipTrigger asChild>
+                                        <Button
+                                          size="sm"
+                                          variant="outline"
+                                          onClick={(e) => {
+                                            e.stopPropagation();
+                                            const title = host.name?.trim()
+                                              ? host.name
+                                              : `${host.username}@${host.ip}:${host.port}`;
+                                            addTab({
+                                              type: "terminal",
+                                              title,
+                                              hostConfig: host,
+                                            });
+                                          }}
+                                          className="h-7 px-2 hover:bg-blue-500/10 hover:border-blue-500/50 flex-1"
+                                        >
+                                          <Terminal className="h-3.5 w-3.5" />
+                                        </Button>
+                                      </TooltipTrigger>
+                                      <TooltipContent>
+                                        <p>Open Terminal</p>
+                                      </TooltipContent>
+                                    </Tooltip>
+                                  )}
+                                  {host.enableFileManager && (
+                                    <Tooltip>
+                                      <TooltipTrigger asChild>
+                                        <Button
+                                          size="sm"
+                                          variant="outline"
+                                          onClick={(e) => {
+                                            e.stopPropagation();
+                                            const title = host.name?.trim()
+                                              ? host.name
+                                              : `${host.username}@${host.ip}:${host.port}`;
+                                            addTab({
+                                              type: "file_manager",
+                                              title,
+                                              hostConfig: host,
+                                            });
+                                          }}
+                                          className="h-7 px-2 hover:bg-emerald-500/10 hover:border-emerald-500/50 flex-1"
+                                        >
+                                          <FolderOpen className="h-3.5 w-3.5" />
+                                        </Button>
+                                      </TooltipTrigger>
+                                      <TooltipContent>
+                                        <p>Open File Manager</p>
+                                      </TooltipContent>
+                                    </Tooltip>
+                                  )}
+                                  <Tooltip>
+                                    <TooltipTrigger asChild>
+                                      <Button
+                                        size="sm"
+                                        variant="outline"
+                                        onClick={(e) => {
+                                          e.stopPropagation();
+                                          const title = host.name?.trim()
+                                            ? host.name
+                                            : `${host.username}@${host.ip}:${host.port}`;
+                                          addTab({
+                                            type: "server",
+                                            title,
+                                            hostConfig: host,
+                                          });
+                                        }}
+                                        className="h-7 px-2 hover:bg-purple-500/10 hover:border-purple-500/50 flex-1"
+                                      >
+                                        <Server className="h-3.5 w-3.5" />
+                                      </Button>
+                                    </TooltipTrigger>
+                                    <TooltipContent>
+                                      <p>Open Server Details</p>
+                                    </TooltipContent>
+                                  </Tooltip>
+                                </div>
                              </div>
                            </TooltipTrigger>
                            <TooltipContent>
@@ -1202,6 +1553,26 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
          ))}
        </div>
      </ScrollArea>
+
+      {editingFolderAppearance && (
+        <FolderEditDialog
+          folderName={editingFolderAppearance}
+          currentColor={getFolderColor(editingFolderAppearance)}
+          currentIcon={folderMetadata.get(editingFolderAppearance)?.icon}
+          open={editingFolderAppearance !== null}
+          onOpenChange={(open) => {
+            if (!open) setEditingFolderAppearance(null);
+          }}
+          onSave={async (color, icon) => {
+            await handleSaveFolderAppearance(
+              editingFolderAppearance,
+              color,
+              icon,
+            );
+            setEditingFolderAppearance(null);
+          }}
+        />
+      )}
    </div>
  );
 }
--- a/src/ui/desktop/apps/host-manager/components/FolderEditDialog.tsx
+++ b/src/ui/desktop/apps/host-manager/components/FolderEditDialog.tsx
@@ -0,0 +1,191 @@
+import React, { useState, useEffect } from "react";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogFooter,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { Label } from "@/components/ui/label";
+import { useTranslation } from "react-i18next";
+import {
+  Folder,
+  Server,
+  Cloud,
+  Database,
+  Box,
+  Package,
+  Layers,
+  Archive,
+  HardDrive,
+  Globe,
+} from "lucide-react";
+
+interface FolderEditDialogProps {
+  folderName: string;
+  currentColor?: string;
+  currentIcon?: string;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onSave: (color: string, icon: string) => Promise<void>;
+}
+
+const AVAILABLE_COLORS = [
+  { value: "#ef4444", label: "Red" },
+  { value: "#f97316", label: "Orange" },
+  { value: "#eab308", label: "Yellow" },
+  { value: "#22c55e", label: "Green" },
+  { value: "#3b82f6", label: "Blue" },
+  { value: "#a855f7", label: "Purple" },
+  { value: "#ec4899", label: "Pink" },
+  { value: "#6b7280", label: "Gray" },
+];
+
+const AVAILABLE_ICONS = [
+  { value: "Folder", label: "Folder", Icon: Folder },
+  { value: "Server", label: "Server", Icon: Server },
+  { value: "Cloud", label: "Cloud", Icon: Cloud },
+  { value: "Database", label: "Database", Icon: Database },
+  { value: "Box", label: "Box", Icon: Box },
+  { value: "Package", label: "Package", Icon: Package },
+  { value: "Layers", label: "Layers", Icon: Layers },
+  { value: "Archive", label: "Archive", Icon: Archive },
+  { value: "HardDrive", label: "HardDrive", Icon: HardDrive },
+  { value: "Globe", label: "Globe", Icon: Globe },
+];
+
+export function FolderEditDialog({
+  folderName,
+  currentColor,
+  currentIcon,
+  open,
+  onOpenChange,
+  onSave,
+}: FolderEditDialogProps) {
+  const { t } = useTranslation();
+  const [selectedColor, setSelectedColor] = useState(
+    currentColor || AVAILABLE_COLORS[0].value,
+  );
+  const [selectedIcon, setSelectedIcon] = useState(
+    currentIcon || AVAILABLE_ICONS[0].value,
+  );
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    if (open) {
+      setSelectedColor(currentColor || AVAILABLE_COLORS[0].value);
+      setSelectedIcon(currentIcon || AVAILABLE_ICONS[0].value);
+    }
+  }, [open, currentColor, currentIcon]);
+
+  const handleSave = async () => {
+    setLoading(true);
+    try {
+      await onSave(selectedColor, selectedIcon);
+      onOpenChange(false);
+    } catch (error) {
+      console.error("Failed to save folder metadata:", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-[500px] bg-dark-bg border-2 border-dark-border">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            <Folder className="w-5 h-5" />
+            {t("hosts.editFolderAppearance")}
+          </DialogTitle>
+          <DialogDescription className="text-muted-foreground">
+            {t("hosts.editFolderAppearanceDesc")}:{" "}
+            <span className="font-mono text-foreground">{folderName}</span>
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-6 py-4">
+          <div className="space-y-3">
+            <Label className="text-base font-semibold text-foreground">
+              {t("hosts.folderColor")}
+            </Label>
+            <div className="grid grid-cols-4 gap-3">
+              {AVAILABLE_COLORS.map((color) => (
+                <button
+                  key={color.value}
+                  type="button"
+                  className={`h-12 rounded-md border-2 transition-all hover:scale-105 ${
+                    selectedColor === color.value
+                      ? "border-white shadow-lg scale-105"
+                      : "border-dark-border"
+                  }`}
+                  style={{ backgroundColor: color.value }}
+                  onClick={() => setSelectedColor(color.value)}
+                  title={color.label}
+                />
+              ))}
+            </div>
+          </div>
+
+          <div className="space-y-3">
+            <Label className="text-base font-semibold text-foreground">
+              {t("hosts.folderIcon")}
+            </Label>
+            <div className="grid grid-cols-5 gap-3">
+              {AVAILABLE_ICONS.map(({ value, label, Icon }) => (
+                <button
+                  key={value}
+                  type="button"
+                  className={`h-14 rounded-md border-2 transition-all hover:scale-105 flex items-center justify-center ${
+                    selectedIcon === value
+                      ? "border-primary bg-primary/10"
+                      : "border-dark-border bg-dark-bg-darker"
+                  }`}
+                  onClick={() => setSelectedIcon(value)}
+                  title={label}
+                >
+                  <Icon className="w-6 h-6" />
+                </button>
+              ))}
+            </div>
+          </div>
+
+          <div className="space-y-3">
+            <Label className="text-base font-semibold text-foreground">
+              {t("hosts.preview")}
+            </Label>
+            <div className="flex items-center gap-3 p-4 rounded-md bg-dark-bg-darker border border-dark-border">
+              {(() => {
+                const IconComponent =
+                  AVAILABLE_ICONS.find((i) => i.value === selectedIcon)?.Icon ||
+                  Folder;
+                return (
+                  <IconComponent
+                    className="w-5 h-5"
+                    style={{ color: selectedColor }}
+                  />
+                );
+              })()}
+              <span className="font-medium">{folderName}</span>
+            </div>
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button
+            variant="outline"
+            onClick={() => onOpenChange(false)}
+            disabled={loading}
+          >
+            {t("common.cancel")}
+          </Button>
+          <Button onClick={handleSave} disabled={loading}>
+            {loading ? t("common.saving") : t("common.save")}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
--- a/src/ui/desktop/apps/server/Server.tsx
+++ b/src/ui/desktop/apps/server/Server.tsx
@@ -7,6 +7,7 @@ import { Tunnel } from "@/ui/desktop/apps/tunnel/Tunnel.tsx";
 import {
  getServerStatusById,
  getServerMetricsById,
+  executeSnippet,
  type ServerMetrics,
 } from "@/ui/main-axios.ts";
 import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
@@ -25,7 +26,14 @@ import {
  UptimeWidget,
  ProcessesWidget,
  SystemWidget,
+  LoginStatsWidget,
 } from "./widgets";
+import { SimpleLoader } from "@/ui/desktop/navigation/animations/SimpleLoader.tsx";
+
+interface QuickAction {
+  name: string;
+  snippetId: number;
+}

 interface HostConfig {
  id: number;
@@ -35,6 +43,7 @@ interface HostConfig {
  folder?: string;
  enableFileManager?: boolean;
  tunnelConnections?: unknown[];
+  quickActions?: QuickAction[];
  statsConfig?: string | StatsConfig;
  [key: string]: unknown;
 }
@@ -79,6 +88,9 @@ export function Server({
  const [isLoadingMetrics, setIsLoadingMetrics] = React.useState(false);
  const [isRefreshing, setIsRefreshing] = React.useState(false);
  const [showStatsUI, setShowStatsUI] = React.useState(true);
+  const [executingActions, setExecutingActions] = React.useState<Set<number>>(
+    new Set(),
+  );

  const statsConfig = React.useMemo((): StatsConfig => {
    if (!currentHostConfig?.statsConfig) {
@@ -101,8 +113,14 @@ export function Server({
  const metricsEnabled = statsConfig.metricsEnabled !== false;

  React.useEffect(() => {
+    if (hostConfig?.id !== currentHostConfig?.id) {
+      setServerStatus("offline");
+      setMetrics(null);
+      setMetricsHistory([]);
+      setShowStatsUI(true);
+    }
    setCurrentHostConfig(hostConfig);
-  }, [hostConfig]);
+  }, [hostConfig?.id]);

  const renderWidget = (widgetType: WidgetType) => {
    switch (widgetType) {
@@ -137,6 +155,11 @@ export function Server({
          <SystemWidget metrics={metrics} metricsHistory={metricsHistory} />
        );

+      case "login_stats":
+        return (
+          <LoginStatsWidget metrics={metrics} metricsHistory={metricsHistory} />
+        );
+
      default:
        return null;
    }
@@ -436,42 +459,147 @@ export function Server({
        <Separator className="p-0.25 w-full" />

        <div className="flex-1 overflow-y-auto min-h-0">
-          {metricsEnabled && showStatsUI && (
-            <div className="rounded-lg border-2 border-dark-border m-3 bg-dark-bg-darker p-4 max-h-[50vh] overflow-y-auto">
-              {isLoadingMetrics && !metrics ? (
-                <div className="flex items-center justify-center py-8">
-                  <div className="flex items-center gap-3">
-                    <div className="w-6 h-6 border-2 border-blue-400 border-t-transparent rounded-full animate-spin"></div>
-                    <span className="text-gray-300">
-                      {t("serverStats.loadingMetrics")}
-                    </span>
-                  </div>
-                </div>
-              ) : !metrics && serverStatus === "offline" ? (
-                <div className="flex items-center justify-center py-8">
-                  <div className="text-center">
-                    <div className="w-12 h-12 mx-auto mb-3 rounded-full bg-red-500/20 flex items-center justify-center">
-                      <div className="w-6 h-6 border-2 border-red-400 rounded-full"></div>
+          {(metricsEnabled && showStatsUI) ||
+          (currentHostConfig?.quickActions &&
+            currentHostConfig.quickActions.length > 0) ? (
+            <div className="rounded-lg border-2 border-dark-border m-3 bg-dark-bg-darker p-4 overflow-y-auto relative flex-1 flex flex-col">
+              {currentHostConfig?.quickActions &&
+                currentHostConfig.quickActions.length > 0 && (
+                  <div className={metricsEnabled && showStatsUI ? "mb-4" : ""}>
+                    <h3 className="text-sm font-semibold text-gray-400 mb-2">
+                      {t("serverStats.quickActions")}
+                    </h3>
+                    <div className="flex flex-wrap gap-2">
+                      {currentHostConfig.quickActions.map((action, index) => {
+                        const isExecuting = executingActions.has(
+                          action.snippetId,
+                        );
+                        return (
+                          <Button
+                            key={index}
+                            variant="outline"
+                            size="sm"
+                            className="font-semibold"
+                            disabled={isExecuting}
+                            onClick={async () => {
+                              if (!currentHostConfig) return;
+
+                              setExecutingActions((prev) =>
+                                new Set(prev).add(action.snippetId),
+                              );
+                              toast.loading(
+                                t("serverStats.executingQuickAction", {
+                                  name: action.name,
+                                }),
+                                { id: `quick-action-${action.snippetId}` },
+                              );
+
+                              try {
+                                const result = await executeSnippet(
+                                  action.snippetId,
+                                  currentHostConfig.id,
+                                );
+
+                                if (result.success) {
+                                  toast.success(
+                                    t("serverStats.quickActionSuccess", {
+                                      name: action.name,
+                                    }),
+                                    {
+                                      id: `quick-action-${action.snippetId}`,
+                                      description: result.output
+                                        ? result.output.substring(0, 200)
+                                        : undefined,
+                                      duration: 5000,
+                                    },
+                                  );
+                                } else {
+                                  toast.error(
+                                    t("serverStats.quickActionFailed", {
+                                      name: action.name,
+                                    }),
+                                    {
+                                      id: `quick-action-${action.snippetId}`,
+                                      description:
+                                        result.error ||
+                                        result.output ||
+                                        undefined,
+                                      duration: 5000,
+                                    },
+                                  );
+                                }
+                              } catch (error: any) {
+                                toast.error(
+                                  t("serverStats.quickActionError", {
+                                    name: action.name,
+                                  }),
+                                  {
+                                    id: `quick-action-${action.snippetId}`,
+                                    description:
+                                      error?.message || "Unknown error",
+                                    duration: 5000,
+                                  },
+                                );
+                              } finally {
+                                setExecutingActions((prev) => {
+                                  const next = new Set(prev);
+                                  next.delete(action.snippetId);
+                                  return next;
+                                });
+                              }
+                            }}
+                            title={t("serverStats.executeQuickAction", {
+                              name: action.name,
+                            })}
+                          >
+                            {isExecuting ? (
+                              <div className="flex items-center gap-2">
+                                <div className="w-3 h-3 border-2 border-gray-300 border-t-transparent rounded-full animate-spin"></div>
+                                {action.name}
+                              </div>
+                            ) : (
+                              action.name
+                            )}
+                          </Button>
+                        );
+                      })}
                    </div>
-                    <p className="text-gray-300 mb-1">
-                      {t("serverStats.serverOffline")}
-                    </p>
-                    <p className="text-sm text-gray-500">
-                      {t("serverStats.cannotFetchMetrics")}
-                    </p>
                  </div>
-                </div>
-              ) : (
-                <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                  {enabledWidgets.map((widgetType) => (
-                    <div key={widgetType} className="h-[280px]">
-                      {renderWidget(widgetType)}
+                )}
+              {metricsEnabled &&
+                showStatsUI &&
+                (!metrics && serverStatus === "offline" ? (
+                  <div className="flex items-center justify-center py-8">
+                    <div className="text-center">
+                      <div className="w-12 h-12 mx-auto mb-3 rounded-full bg-red-500/20 flex items-center justify-center">
+                        <div className="w-6 h-6 border-2 border-red-400 rounded-full"></div>
+                      </div>
+                      <p className="text-gray-300 mb-1">
+                        {t("serverStats.serverOffline")}
+                      </p>
+                      <p className="text-sm text-gray-500">
+                        {t("serverStats.cannotFetchMetrics")}
+                      </p>
                    </div>
-                  ))}
-                </div>
+                  </div>
+                ) : (
+                  <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                    {enabledWidgets.map((widgetType) => (
+                      <div key={widgetType} className="h-[280px]">
+                        {renderWidget(widgetType)}
+                      </div>
+                    ))}
+                  </div>
+                ))}
+
+              {metricsEnabled && showStatsUI && (
+                <SimpleLoader
+                  visible={isLoadingMetrics && !metrics}
+                  message={t("serverStats.loadingMetrics")}
+                />
              )}
            </div>
-          )}
+          ) : null}

          {currentHostConfig?.tunnelConnections &&
            currentHostConfig.tunnelConnections.length > 0 && (
@@ -487,19 +615,6 @@ export function Server({
              </div>
            )}
        </div>
-
-        <p className="px-4 pt-2 pb-2 text-sm text-gray-500">
-          {t("serverStats.feedbackMessage")}{" "}
-          <a
-            href="https://github.com/Termix-SSH/Termix/issues/new"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="text-blue-500 hover:underline"
-          >
-            GitHub
-          </a>
-          !
-        </p>
      </div>
    </div>
  );
--- a/src/ui/desktop/apps/server/widgets/LoginStatsWidget.tsx
+++ b/src/ui/desktop/apps/server/widgets/LoginStatsWidget.tsx
@@ -0,0 +1,142 @@
+import React from "react";
+import { UserCheck, UserX, MapPin, Activity } from "lucide-react";
+import { useTranslation } from "react-i18next";
+
+interface LoginRecord {
+  user: string;
+  ip: string;
+  time: string;
+  status: "success" | "failed";
+}
+
+interface LoginStatsMetrics {
+  recentLogins: LoginRecord[];
+  failedLogins: LoginRecord[];
+  totalLogins: number;
+  uniqueIPs: number;
+}
+
+interface ServerMetrics {
+  login_stats?: LoginStatsMetrics;
+}
+
+interface LoginStatsWidgetProps {
+  metrics: ServerMetrics | null;
+  metricsHistory: ServerMetrics[];
+}
+
+export function LoginStatsWidget({ metrics }: LoginStatsWidgetProps) {
+  const { t } = useTranslation();
+
+  const loginStats = metrics?.login_stats;
+  const recentLogins = loginStats?.recentLogins || [];
+  const failedLogins = loginStats?.failedLogins || [];
+  const totalLogins = loginStats?.totalLogins || 0;
+  const uniqueIPs = loginStats?.uniqueIPs || 0;
+
+  return (
+    <div className="h-full w-full p-4 rounded-lg bg-dark-bg/50 border border-dark-border/50 hover:bg-dark-bg/70 transition-colors duration-200 flex flex-col overflow-hidden">
+      <div className="flex items-center gap-2 flex-shrink-0 mb-3">
+        <UserCheck className="h-5 w-5 text-green-400" />
+        <h3 className="font-semibold text-lg text-white">
+          {t("serverStats.loginStats")}
+        </h3>
+      </div>
+
+      <div className="flex flex-col flex-1 min-h-0 gap-3">
+        <div className="grid grid-cols-2 gap-2 flex-shrink-0">
+          <div className="bg-dark-bg-darker p-2 rounded border border-dark-border/30">
+            <div className="flex items-center gap-1 text-xs text-gray-400 mb-1">
+              <Activity className="h-3 w-3" />
+              <span>{t("serverStats.totalLogins")}</span>
+            </div>
+            <div className="text-xl font-bold text-green-400">
+              {totalLogins}
+            </div>
+          </div>
+          <div className="bg-dark-bg-darker p-2 rounded border border-dark-border/30">
+            <div className="flex items-center gap-1 text-xs text-gray-400 mb-1">
+              <MapPin className="h-3 w-3" />
+              <span>{t("serverStats.uniqueIPs")}</span>
+            </div>
+            <div className="text-xl font-bold text-blue-400">{uniqueIPs}</div>
+          </div>
+        </div>
+
+        <div className="flex-1 min-h-0 overflow-y-auto space-y-2">
+          <div className="flex-shrink-0">
+            <div className="flex items-center gap-2 mb-1">
+              <UserCheck className="h-4 w-4 text-green-400" />
+              <span className="text-sm font-semibold text-gray-300">
+                {t("serverStats.recentSuccessfulLogins")}
+              </span>
+            </div>
+            {recentLogins.length === 0 ? (
+              <div className="text-xs text-gray-500 italic p-2">
+                {t("serverStats.noRecentLoginData")}
+              </div>
+            ) : (
+              <div className="space-y-1">
+                {recentLogins.slice(0, 5).map((login, idx) => (
+                  <div
+                    key={idx}
+                    className="text-xs bg-dark-bg-darker p-2 rounded border border-dark-border/30 flex justify-between items-center"
+                  >
+                    <div className="flex items-center gap-2 min-w-0">
+                      <span className="text-green-400 font-mono truncate">
+                        {login.user}
+                      </span>
+                      <span className="text-gray-500">
+                        {t("serverStats.from")}
+                      </span>
+                      <span className="text-blue-400 font-mono truncate">
+                        {login.ip}
+                      </span>
+                    </div>
+                    <span className="text-gray-500 text-[10px] flex-shrink-0 ml-2">
+                      {new Date(login.time).toLocaleString()}
+                    </span>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
+
+          {failedLogins.length > 0 && (
+            <div className="flex-shrink-0">
+              <div className="flex items-center gap-2 mb-1">
+                <UserX className="h-4 w-4 text-red-400" />
+                <span className="text-sm font-semibold text-gray-300">
+                  {t("serverStats.recentFailedAttempts")}
+                </span>
+              </div>
+              <div className="space-y-1">
+                {failedLogins.slice(0, 3).map((login, idx) => (
+                  <div
+                    key={idx}
+                    className="text-xs bg-red-900/20 p-2 rounded border border-red-500/30 flex justify-between items-center"
+                  >
+                    <div className="flex items-center gap-2 min-w-0">
+                      <span className="text-red-400 font-mono truncate">
+                        {login.user}
+                      </span>
+                      <span className="text-gray-500">
+                        {t("serverStats.from")}
+                      </span>
+                      <span className="text-blue-400 font-mono truncate">
+                        {login.ip}
+                      </span>
+                    </div>
+                    <span className="text-gray-500 text-[10px] flex-shrink-0 ml-2">
+                      {new Date(login.time).toLocaleString()}
+                    </span>
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
--- a/src/ui/desktop/apps/server/widgets/index.ts
+++ b/src/ui/desktop/apps/server/widgets/index.ts
@@ -5,3 +5,4 @@ export { NetworkWidget } from "./NetworkWidget";
 export { UptimeWidget } from "./UptimeWidget";
 export { ProcessesWidget } from "./ProcessesWidget";
 export { SystemWidget } from "./SystemWidget";
+export { LoginStatsWidget } from "./LoginStatsWidget";
--- a/src/ui/desktop/apps/terminal/SnippetsSidebar.tsx
+++ b/src/ui/desktop/apps/terminal/SnippetsSidebar.tsx
@@ -1,480 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Textarea } from "@/components/ui/textarea";
-import { Separator } from "@/components/ui/separator";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { Plus, Play, Edit, Trash2, Copy, X } from "lucide-react";
-import { toast } from "sonner";
-import { useTranslation } from "react-i18next";
-import { useConfirmation } from "@/hooks/use-confirmation.ts";
-import {
-  getSnippets,
-  createSnippet,
-  updateSnippet,
-  deleteSnippet,
-} from "@/ui/main-axios";
-import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
-import type { Snippet, SnippetData } from "../../../../types/index.js";
-
-interface TabData {
-  id: number;
-  type: string;
-  title: string;
-  terminalRef?: {
-    current?: {
-      sendInput?: (data: string) => void;
-    };
-  };
-  [key: string]: unknown;
-}
-
-interface SnippetsSidebarProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onExecute: (content: string) => void;
-}
-
-export function SnippetsSidebar({
-  isOpen,
-  onClose,
-  onExecute,
-}: SnippetsSidebarProps) {
-  const { t } = useTranslation();
-  const { confirmWithToast } = useConfirmation();
-  const { tabs } = useTabs() as { tabs: TabData[] };
-  const [snippets, setSnippets] = useState<Snippet[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [showDialog, setShowDialog] = useState(false);
-  const [editingSnippet, setEditingSnippet] = useState<Snippet | null>(null);
-  const [formData, setFormData] = useState<SnippetData>({
-    name: "",
-    content: "",
-    description: "",
-  });
-  const [formErrors, setFormErrors] = useState({
-    name: false,
-    content: false,
-  });
-  const [selectedTabIds, setSelectedTabIds] = useState<number[]>([]);
-
-  useEffect(() => {
-    if (isOpen) {
-      fetchSnippets();
-    }
-  }, [isOpen]);
-
-  const fetchSnippets = async () => {
-    try {
-      setLoading(true);
-      const data = await getSnippets();
-      setSnippets(Array.isArray(data) ? data : []);
-    } catch {
-      toast.error(t("snippets.failedToFetch"));
-      setSnippets([]);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handleCreate = () => {
-    setEditingSnippet(null);
-    setFormData({ name: "", content: "", description: "" });
-    setFormErrors({ name: false, content: false });
-    setShowDialog(true);
-  };
-
-  const handleEdit = (snippet: Snippet) => {
-    setEditingSnippet(snippet);
-    setFormData({
-      name: snippet.name,
-      content: snippet.content,
-      description: snippet.description || "",
-    });
-    setFormErrors({ name: false, content: false });
-    setShowDialog(true);
-  };
-
-  const handleDelete = (snippet: Snippet) => {
-    confirmWithToast(
-      t("snippets.deleteConfirmDescription", { name: snippet.name }),
-      async () => {
-        try {
-          await deleteSnippet(snippet.id);
-          toast.success(t("snippets.deleteSuccess"));
-          fetchSnippets();
-        } catch {
-          toast.error(t("snippets.deleteFailed"));
-        }
-      },
-      "destructive",
-    );
-  };
-
-  const handleSubmit = async () => {
-    const errors = {
-      name: !formData.name.trim(),
-      content: !formData.content.trim(),
-    };
-
-    setFormErrors(errors);
-
-    if (errors.name || errors.content) {
-      return;
-    }
-
-    try {
-      if (editingSnippet) {
-        await updateSnippet(editingSnippet.id, formData);
-        toast.success(t("snippets.updateSuccess"));
-      } else {
-        await createSnippet(formData);
-        toast.success(t("snippets.createSuccess"));
-      }
-      setShowDialog(false);
-      fetchSnippets();
-    } catch {
-      toast.error(
-        editingSnippet
-          ? t("snippets.updateFailed")
-          : t("snippets.createFailed"),
-      );
-    }
-  };
-
-  const handleTabToggle = (tabId: number) => {
-    setSelectedTabIds((prev) =>
-      prev.includes(tabId)
-        ? prev.filter((id) => id !== tabId)
-        : [...prev, tabId],
-    );
-  };
-
-  const handleExecute = (snippet: Snippet) => {
-    if (selectedTabIds.length > 0) {
-      selectedTabIds.forEach((tabId) => {
-        const tab = tabs.find((t: TabData) => t.id === tabId);
-        if (tab?.terminalRef?.current?.sendInput) {
-          tab.terminalRef.current.sendInput(snippet.content + "\n");
-        }
-      });
-      toast.success(
-        t("snippets.executeSuccess", {
-          name: snippet.name,
-          count: selectedTabIds.length,
-        }),
-      );
-    } else {
-      onExecute(snippet.content);
-      toast.success(t("snippets.executeSuccess", { name: snippet.name }));
-    }
-  };
-
-  const handleCopy = (snippet: Snippet) => {
-    navigator.clipboard.writeText(snippet.content);
-    toast.success(t("snippets.copySuccess", { name: snippet.name }));
-  };
-
-  const terminalTabs = tabs.filter((tab: TabData) => tab.type === "terminal");
-
-  if (!isOpen) return null;
-
-  return (
-    <>
-      <div
-        className="fixed top-0 left-0 right-0 bottom-0 z-[999999] flex justify-end pointer-events-auto isolate"
-        style={{
-          transform: "translateZ(0)",
-        }}
-      >
-        <div className="flex-1 cursor-pointer" onClick={onClose} />
-
-        <div
-          className="w-[400px] h-full bg-dark-bg border-l-2 border-dark-border flex flex-col shadow-2xl relative isolate z-[999999]"
-          style={{
-            boxShadow: "-4px 0 20px rgba(0, 0, 0, 0.5)",
-            transform: "translateZ(0)",
-          }}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <div className="flex items-center justify-between p-4 border-b border-dark-border">
-            <h2 className="text-lg font-semibold text-white">
-              {t("snippets.title")}
-            </h2>
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={onClose}
-              className="h-8 w-8 p-0 hover:bg-red-500 hover:text-white transition-colors flex items-center justify-center"
-              title={t("common.close")}
-            >
-              <X />
-            </Button>
-          </div>
-
-          <div className="flex-1 overflow-y-auto p-4">
-            <div className="space-y-4">
-              {terminalTabs.length > 0 && (
-                <>
-                  <div className="space-y-2">
-                    <label className="text-sm font-medium text-white">
-                      {t("snippets.selectTerminals", {
-                        defaultValue: "Select Terminals (optional)",
-                      })}
-                    </label>
-                    <p className="text-xs text-muted-foreground">
-                      {selectedTabIds.length > 0
-                        ? t("snippets.executeOnSelected", {
-                            defaultValue: `Execute on ${selectedTabIds.length} selected terminal(s)`,
-                            count: selectedTabIds.length,
-                          })
-                        : t("snippets.executeOnCurrent", {
-                            defaultValue:
-                              "Execute on current terminal (click to select multiple)",
-                          })}
-                    </p>
-                    <div className="flex flex-wrap gap-2 max-h-32 overflow-y-auto">
-                      {terminalTabs.map((tab) => (
-                        <Button
-                          key={tab.id}
-                          type="button"
-                          variant="outline"
-                          size="sm"
-                          className={`rounded-full px-3 py-1 text-xs flex items-center gap-1 ${
-                            selectedTabIds.includes(tab.id)
-                              ? "text-white bg-gray-700"
-                              : "text-gray-500"
-                          }`}
-                          onClick={() => handleTabToggle(tab.id)}
-                        >
-                          {tab.title}
-                        </Button>
-                      ))}
-                    </div>
-                  </div>
-                  <Separator className="my-4" />
-                </>
-              )}
-
-              <Button
-                onClick={handleCreate}
-                className="w-full"
-                variant="outline"
-              >
-                <Plus className="w-4 h-4 mr-2" />
-                {t("snippets.new")}
-              </Button>
-
-              {loading ? (
-                <div className="text-center text-muted-foreground py-8">
-                  <p>{t("common.loading")}</p>
-                </div>
-              ) : snippets.length === 0 ? (
-                <div className="text-center text-muted-foreground py-8">
-                  <p className="mb-2 font-medium">{t("snippets.empty")}</p>
-                  <p className="text-sm">{t("snippets.emptyHint")}</p>
-                </div>
-              ) : (
-                <TooltipProvider>
-                  <div className="space-y-3">
-                    {snippets.map((snippet) => (
-                      <div
-                        key={snippet.id}
-                        className="bg-dark-bg-input border border-input rounded-lg cursor-pointer hover:shadow-lg hover:border-blue-400/50 hover:bg-dark-hover-alt transition-all duration-200 p-3 group"
-                      >
-                        <div className="mb-2">
-                          <h3 className="text-sm font-medium text-white mb-1">
-                            {snippet.name}
-                          </h3>
-                          {snippet.description && (
-                            <p className="text-xs text-muted-foreground">
-                              {snippet.description}
-                            </p>
-                          )}
-                        </div>
-
-                        <div className="bg-muted/30 rounded p-2 mb-3">
-                          <code className="text-xs font-mono break-all line-clamp-2 text-muted-foreground">
-                            {snippet.content}
-                          </code>
-                        </div>
-
-                        <div className="flex items-center gap-2">
-                          <Tooltip>
-                            <TooltipTrigger asChild>
-                              <Button
-                                size="sm"
-                                variant="default"
-                                className="flex-1"
-                                onClick={() => handleExecute(snippet)}
-                              >
-                                <Play className="w-3 h-3 mr-1" />
-                                {t("snippets.run")}
-                              </Button>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                              <p>{t("snippets.runTooltip")}</p>
-                            </TooltipContent>
-                          </Tooltip>
-
-                          <Tooltip>
-                            <TooltipTrigger asChild>
-                              <Button
-                                size="sm"
-                                variant="outline"
-                                onClick={() => handleCopy(snippet)}
-                              >
-                                <Copy className="w-3 h-3" />
-                              </Button>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                              <p>{t("snippets.copyTooltip")}</p>
-                            </TooltipContent>
-                          </Tooltip>
-
-                          <Tooltip>
-                            <TooltipTrigger asChild>
-                              <Button
-                                size="sm"
-                                variant="outline"
-                                onClick={() => handleEdit(snippet)}
-                              >
-                                <Edit className="w-3 h-3" />
-                              </Button>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                              <p>{t("snippets.editTooltip")}</p>
-                            </TooltipContent>
-                          </Tooltip>
-
-                          <Tooltip>
-                            <TooltipTrigger asChild>
-                              <Button
-                                size="sm"
-                                variant="outline"
-                                onClick={() => handleDelete(snippet)}
-                                className="hover:bg-destructive hover:text-destructive-foreground"
-                              >
-                                <Trash2 className="w-3 h-3" />
-                              </Button>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                              <p>{t("snippets.deleteTooltip")}</p>
-                            </TooltipContent>
-                          </Tooltip>
-                        </div>
-                      </div>
-                    ))}
-                  </div>
-                </TooltipProvider>
-              )}
-            </div>
-          </div>
-        </div>
-      </div>
-
-      {showDialog && (
-        <div
-          className="fixed inset-0 flex items-center justify-center z-[9999999] bg-black/50 backdrop-blur-sm"
-          onClick={() => setShowDialog(false)}
-        >
-          <div
-            className="bg-dark-bg border-2 border-dark-border rounded-lg p-6 max-w-2xl w-full mx-4 max-h-[90vh] overflow-y-auto"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="mb-6">
-              <h2 className="text-xl font-semibold text-white">
-                {editingSnippet ? t("snippets.edit") : t("snippets.create")}
-              </h2>
-              <p className="text-sm text-muted-foreground mt-1">
-                {editingSnippet
-                  ? t("snippets.editDescription")
-                  : t("snippets.createDescription")}
-              </p>
-            </div>
-
-            <div className="space-y-5">
-              <div className="space-y-2">
-                <label className="text-sm font-medium text-white flex items-center gap-1">
-                  {t("snippets.name")}
-                  <span className="text-destructive">*</span>
-                </label>
-                <Input
-                  value={formData.name}
-                  onChange={(e) =>
-                    setFormData({ ...formData, name: e.target.value })
-                  }
-                  placeholder={t("snippets.namePlaceholder")}
-                  className={`${formErrors.name ? "border-destructive focus-visible:ring-destructive" : ""}`}
-                  autoFocus
-                />
-                {formErrors.name && (
-                  <p className="text-xs text-destructive mt-1">
-                    {t("snippets.nameRequired")}
-                  </p>
-                )}
-              </div>
-
-              <div className="space-y-2">
-                <label className="text-sm font-medium text-white">
-                  {t("snippets.description")}
-                  <span className="text-muted-foreground ml-1">
-                    ({t("common.optional")})
-                  </span>
-                </label>
-                <Input
-                  value={formData.description}
-                  onChange={(e) =>
-                    setFormData({ ...formData, description: e.target.value })
-                  }
-                  placeholder={t("snippets.descriptionPlaceholder")}
-                />
-              </div>
-
-              <div className="space-y-2">
-                <label className="text-sm font-medium text-white flex items-center gap-1">
-                  {t("snippets.content")}
-                  <span className="text-destructive">*</span>
-                </label>
-                <Textarea
-                  value={formData.content}
-                  onChange={(e) =>
-                    setFormData({ ...formData, content: e.target.value })
-                  }
-                  placeholder={t("snippets.contentPlaceholder")}
-                  className={`font-mono text-sm ${formErrors.content ? "border-destructive focus-visible:ring-destructive" : ""}`}
-                  rows={10}
-                />
-                {formErrors.content && (
-                  <p className="text-xs text-destructive mt-1">
-                    {t("snippets.contentRequired")}
-                  </p>
-                )}
-              </div>
-            </div>
-
-            <Separator className="my-6" />
-
-            <div className="flex gap-3">
-              <Button
-                variant="outline"
-                onClick={() => setShowDialog(false)}
-                className="flex-1"
-              >
-                {t("common.cancel")}
-              </Button>
-              <Button onClick={handleSubmit} className="flex-1">
-                {editingSnippet ? t("snippets.edit") : t("snippets.create")}
-              </Button>
-            </div>
-          </div>
-        </div>
-      )}
-    </>
-  );
-}
--- a/src/ui/desktop/apps/terminal/Terminal.tsx
+++ b/src/ui/desktop/apps/terminal/Terminal.tsx
@@ -4,6 +4,7 @@ import {
  useState,
  useImperativeHandle,
  forwardRef,
+  useCallback,
 } from "react";
 import { useXTerm } from "react-xtermjs";
 import { FitAddon } from "@xterm/addon-fit";
@@ -26,6 +27,11 @@ import {
  TERMINAL_FONTS,
 } from "@/constants/terminal-themes";
 import type { TerminalConfig } from "@/types";
+import { useCommandTracker } from "@/ui/hooks/useCommandTracker";
+import { useCommandHistory as useCommandHistoryHook } from "@/ui/hooks/useCommandHistory";
+import { useCommandHistory } from "@/ui/desktop/apps/terminal/command-history/CommandHistoryContext.tsx";
+import { CommandAutocomplete } from "./command-history/CommandAutocomplete.tsx";
+import { SimpleLoader } from "@/ui/desktop/navigation/animations/SimpleLoader.tsx";

 interface HostConfig {
  id?: number;
@@ -85,6 +91,7 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(

    const { t } = useTranslation();
    const { instance: terminal, ref: xtermRef } = useXTerm();
+    const commandHistoryContext = useCommandHistory();

    const config = { ...DEFAULT_TERMINAL_CONFIG, ...hostConfig.terminalConfig };
    const themeColors =
@@ -99,7 +106,7 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
    const [isReady, setIsReady] = useState(false);
    const [isConnected, setIsConnected] = useState(false);
    const [isConnecting, setIsConnecting] = useState(false);
-    const [isFitted, setIsFitted] = useState(false);
+    const [isFitted, setIsFitted] = useState(true);
    const [, setConnectionError] = useState<string | null>(null);
    const [, setIsAuthenticated] = useState(false);
    const [totpRequired, setTotpRequired] = useState(false);
@@ -122,11 +129,126 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
    const isConnectingRef = useRef(false);
    const connectionTimeoutRef = useRef<NodeJS.Timeout | null>(null);
    const activityLoggedRef = useRef(false);
+    const keyHandlerAttachedRef = useRef(false);
+
+    const { trackInput, getCurrentCommand, updateCurrentCommand } =
+      useCommandTracker({
+        hostId: hostConfig.id,
+        enabled: true,
+        onCommandExecuted: (command) => {
+          if (!autocompleteHistory.current.includes(command)) {
+            autocompleteHistory.current = [
+              command,
+              ...autocompleteHistory.current,
+            ];
+          }
+        },
+      });
+
+    const getCurrentCommandRef = useRef(getCurrentCommand);
+    const updateCurrentCommandRef = useRef(updateCurrentCommand);
+
+    useEffect(() => {
+      getCurrentCommandRef.current = getCurrentCommand;
+      updateCurrentCommandRef.current = updateCurrentCommand;
+    }, [getCurrentCommand, updateCurrentCommand]);
+
+    const [showAutocomplete, setShowAutocomplete] = useState(false);
+    const [autocompleteSuggestions, setAutocompleteSuggestions] = useState<
+      string[]
+    >([]);
+    const [autocompleteSelectedIndex, setAutocompleteSelectedIndex] =
+      useState(0);
+    const [autocompletePosition, setAutocompletePosition] = useState({
+      top: 0,
+      left: 0,
+    });
+    const autocompleteHistory = useRef<string[]>([]);
+    const currentAutocompleteCommand = useRef<string>("");
+
+    const showAutocompleteRef = useRef(false);
+    const autocompleteSuggestionsRef = useRef<string[]>([]);
+    const autocompleteSelectedIndexRef = useRef(0);
+
+    const [showHistoryDialog, setShowHistoryDialog] = useState(false);
+    const [commandHistory, setCommandHistory] = useState<string[]>([]);
+    const [isLoadingHistory, setIsLoadingHistory] = useState(false);
+
+    const setIsLoadingRef = useRef(commandHistoryContext.setIsLoading);
+    const setCommandHistoryContextRef = useRef(
+      commandHistoryContext.setCommandHistory,
+    );
+
+    useEffect(() => {
+      setIsLoadingRef.current = commandHistoryContext.setIsLoading;
+      setCommandHistoryContextRef.current =
+        commandHistoryContext.setCommandHistory;
+    }, [
+      commandHistoryContext.setIsLoading,
+      commandHistoryContext.setCommandHistory,
+    ]);
+
+    useEffect(() => {
+      if (showHistoryDialog && hostConfig.id) {
+        setIsLoadingHistory(true);
+        setIsLoadingRef.current(true);
+        import("@/ui/main-axios.ts")
+          .then((module) => module.getCommandHistory(hostConfig.id!))
+          .then((history) => {
+            setCommandHistory(history);
+            setCommandHistoryContextRef.current(history);
+          })
+          .catch((error) => {
+            console.error("Failed to load command history:", error);
+            setCommandHistory([]);
+            setCommandHistoryContextRef.current([]);
+          })
+          .finally(() => {
+            setIsLoadingHistory(false);
+            setIsLoadingRef.current(false);
+          });
+      }
+    }, [showHistoryDialog, hostConfig.id]);
+
+    useEffect(() => {
+      const autocompleteEnabled =
+        localStorage.getItem("commandAutocomplete") !== "false";
+
+      if (hostConfig.id && autocompleteEnabled) {
+        import("@/ui/main-axios.ts")
+          .then((module) => module.getCommandHistory(hostConfig.id!))
+          .then((history) => {
+            autocompleteHistory.current = history;
+          })
+          .catch((error) => {
+            console.error("Failed to load autocomplete history:", error);
+            autocompleteHistory.current = [];
+          });
+      } else {
+        autocompleteHistory.current = [];
+      }
+    }, [hostConfig.id]);
+
+    useEffect(() => {
+      showAutocompleteRef.current = showAutocomplete;
+    }, [showAutocomplete]);
+
+    useEffect(() => {
+      autocompleteSuggestionsRef.current = autocompleteSuggestions;
+    }, [autocompleteSuggestions]);
+
+    useEffect(() => {
+      autocompleteSelectedIndexRef.current = autocompleteSelectedIndex;
+    }, [autocompleteSelectedIndex]);
+
    const activityLoggingRef = useRef(false);

    const lastSentSizeRef = useRef<{ cols: number; rows: number } | null>(null);
    const pendingSizeRef = useRef<{ cols: number; rows: number } | null>(null);
    const notifyTimerRef = useRef<NodeJS.Timeout | null>(null);
+    const lastFittedSizeRef = useRef<{ cols: number; rows: number } | null>(
+      null,
+    );
    const DEBOUNCE_MS = 140;

    const logTerminalActivity = async () => {
@@ -189,7 +311,9 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
            terminal as { refresh?: (start: number, end: number) => void }
          ).refresh(0, terminal.rows - 1);
        }
-      } catch {}
+      } catch (error) {
+        console.error("Terminal operation failed:", error);
+      }
    }

    function performFit() {
@@ -202,20 +326,30 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
        return;
      }

+      const lastSize = lastFittedSizeRef.current;
+      if (
+        lastSize &&
+        lastSize.cols === terminal.cols &&
+        lastSize.rows === terminal.rows
+      ) {
+        return;
+      }
+
      isFittingRef.current = true;

-      requestAnimationFrame(() => {
-        try {
-          fitAddonRef.current?.fit();
-          if (terminal && terminal.cols > 0 && terminal.rows > 0) {
-            scheduleNotify(terminal.cols, terminal.rows);
-          }
-          hardRefresh();
-          setIsFitted(true);
-        } finally {
-          isFittingRef.current = false;
+      try {
+        fitAddonRef.current?.fit();
+        if (terminal && terminal.cols > 0 && terminal.rows > 0) {
+          scheduleNotify(terminal.cols, terminal.rows);
+          lastFittedSizeRef.current = {
+            cols: terminal.cols,
+            rows: terminal.rows,
+          };
        }
-      });
+        setIsFitted(true);
+      } finally {
+        isFittingRef.current = false;
+      }
    }

    function handleTotpSubmit(code: string) {
@@ -331,7 +465,9 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
              scheduleNotify(cols, rows);
              hardRefresh();
            }
-          } catch {}
+          } catch (error) {
+            console.error("Terminal operation failed:", error);
+          }
        },
        refresh: () => hardRefresh(),
      }),
@@ -507,6 +643,7 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
          }),
        );
        terminal.onData((data) => {
+          trackInput(data);
          ws.send(JSON.stringify({ type: "input", data }));
        });

@@ -738,7 +875,9 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
          await navigator.clipboard.writeText(text);
          return;
        }
-      } catch {}
+      } catch (error) {
+        console.error("Terminal operation failed:", error);
+      }
      const textarea = document.createElement("textarea");
      textarea.value = text;
      textarea.style.position = "fixed";
@@ -758,10 +897,93 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
        if (navigator.clipboard && navigator.clipboard.readText) {
          return await navigator.clipboard.readText();
        }
-      } catch {}
+      } catch (error) {
+        console.error("Terminal operation failed:", error);
+      }
      return "";
    }

+    const handleSelectCommand = useCallback(
+      (command: string) => {
+        if (!terminal || !webSocketRef.current) return;
+
+        for (const char of command) {
+          webSocketRef.current.send(
+            JSON.stringify({ type: "input", data: char }),
+          );
+        }
+
+        setTimeout(() => {
+          terminal.focus();
+        }, 100);
+      },
+      [terminal],
+    );
+
+    useEffect(() => {
+      commandHistoryContext.setOnSelectCommand(handleSelectCommand);
+    }, [handleSelectCommand]);
+
+    const handleAutocompleteSelect = useCallback(
+      (selectedCommand: string) => {
+        if (!webSocketRef.current) return;
+
+        const currentCmd = currentAutocompleteCommand.current;
+        const completion = selectedCommand.substring(currentCmd.length);
+
+        for (const char of completion) {
+          webSocketRef.current.send(
+            JSON.stringify({ type: "input", data: char }),
+          );
+        }
+
+        updateCurrentCommand(selectedCommand);
+
+        setShowAutocomplete(false);
+        setAutocompleteSuggestions([]);
+        currentAutocompleteCommand.current = "";
+
+        setTimeout(() => {
+          terminal?.focus();
+        }, 50);
+
+        console.log(`[Autocomplete] ${currentCmd} → ${selectedCommand}`);
+      },
+      [terminal, updateCurrentCommand],
+    );
+
+    const handleDeleteCommand = useCallback(
+      async (command: string) => {
+        if (!hostConfig.id) return;
+
+        try {
+          const { deleteCommandFromHistory } = await import(
+            "@/ui/main-axios.ts"
+          );
+          await deleteCommandFromHistory(hostConfig.id, command);
+
+          setCommandHistory((prev) => {
+            const newHistory = prev.filter((cmd) => cmd !== command);
+            setCommandHistoryContextRef.current(newHistory);
+            return newHistory;
+          });
+
+          autocompleteHistory.current = autocompleteHistory.current.filter(
+            (cmd) => cmd !== command,
+          );
+
+          console.log(`[Terminal] Command deleted from history: ${command}`);
+        } catch (error) {
+          console.error("Failed to delete command from history:", error);
+        }
+      },
+      [hostConfig.id],
+    );
+
+    useEffect(() => {
+      commandHistoryContext.setOnDeleteCommand(handleDeleteCommand);
+    }, [handleDeleteCommand]);
+
    useEffect(() => {
      if (!terminal || !xtermRef.current) return;

@@ -855,7 +1077,9 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
            const pasteText = await readTextFromClipboard();
            if (pasteText) terminal.paste(pasteText);
          }
-        } catch {}
+        } catch (error) {
+          console.error("Terminal operation failed:", error);
+        }
      };
      element?.addEventListener("contextmenu", handleContextMenu);

@@ -864,6 +1088,22 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
          navigator.platform.toUpperCase().indexOf("MAC") >= 0 ||
          navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;

+        if (
+          e.ctrlKey &&
+          e.key === "r" &&
+          !e.shiftKey &&
+          !e.altKey &&
+          !e.metaKey
+        ) {
+          e.preventDefault();
+          e.stopPropagation();
+          setShowHistoryDialog(true);
+          if (commandHistoryContext.openCommandHistory) {
+            commandHistoryContext.openCommandHistory();
+          }
+          return false;
+        }
+
        if (
          config.backspaceMode === "control-h" &&
          e.key === "Backspace" &&
@@ -952,6 +1192,191 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
      };
    }, [xtermRef, terminal, hostConfig]);

+    useEffect(() => {
+      if (!terminal) return;
+
+      const handleCustomKey = (e: KeyboardEvent): boolean => {
+        if (e.type !== "keydown") {
+          return true;
+        }
+
+        if (showAutocompleteRef.current) {
+          if (e.key === "Escape") {
+            e.preventDefault();
+            e.stopPropagation();
+            setShowAutocomplete(false);
+            setAutocompleteSuggestions([]);
+            currentAutocompleteCommand.current = "";
+            return false;
+          }
+
+          if (e.key === "ArrowDown" || e.key === "ArrowUp") {
+            e.preventDefault();
+            e.stopPropagation();
+
+            const currentIndex = autocompleteSelectedIndexRef.current;
+            const suggestionsLength = autocompleteSuggestionsRef.current.length;
+
+            if (e.key === "ArrowDown") {
+              const newIndex =
+                currentIndex < suggestionsLength - 1 ? currentIndex + 1 : 0;
+              setAutocompleteSelectedIndex(newIndex);
+            } else if (e.key === "ArrowUp") {
+              const newIndex =
+                currentIndex > 0 ? currentIndex - 1 : suggestionsLength - 1;
+              setAutocompleteSelectedIndex(newIndex);
+            }
+            return false;
+          }
+
+          if (
+            e.key === "Enter" &&
+            autocompleteSuggestionsRef.current.length > 0
+          ) {
+            e.preventDefault();
+            e.stopPropagation();
+
+            const selectedCommand =
+              autocompleteSuggestionsRef.current[
+                autocompleteSelectedIndexRef.current
+              ];
+            const currentCmd = currentAutocompleteCommand.current;
+            const completion = selectedCommand.substring(currentCmd.length);
+
+            if (webSocketRef.current?.readyState === 1) {
+              for (const char of completion) {
+                webSocketRef.current.send(
+                  JSON.stringify({ type: "input", data: char }),
+                );
+              }
+            }
+
+            updateCurrentCommandRef.current(selectedCommand);
+
+            setShowAutocomplete(false);
+            setAutocompleteSuggestions([]);
+            currentAutocompleteCommand.current = "";
+
+            return false;
+          }
+
+          if (
+            e.key === "Tab" &&
+            !e.ctrlKey &&
+            !e.altKey &&
+            !e.metaKey &&
+            !e.shiftKey
+          ) {
+            e.preventDefault();
+            e.stopPropagation();
+            const currentIndex = autocompleteSelectedIndexRef.current;
+            const suggestionsLength = autocompleteSuggestionsRef.current.length;
+            const newIndex =
+              currentIndex < suggestionsLength - 1 ? currentIndex + 1 : 0;
+            setAutocompleteSelectedIndex(newIndex);
+            return false;
+          }
+
+          setShowAutocomplete(false);
+          setAutocompleteSuggestions([]);
+          currentAutocompleteCommand.current = "";
+          return true;
+        }
+
+        if (
+          e.key === "Tab" &&
+          !e.ctrlKey &&
+          !e.altKey &&
+          !e.metaKey &&
+          !e.shiftKey
+        ) {
+          e.preventDefault();
+          e.stopPropagation();
+
+          const autocompleteEnabled =
+            localStorage.getItem("commandAutocomplete") !== "false";
+
+          if (!autocompleteEnabled) {
+            if (webSocketRef.current?.readyState === 1) {
+              webSocketRef.current.send(
+                JSON.stringify({ type: "input", data: "\t" }),
+              );
+            }
+            return false;
+          }
+
+          const currentCmd = getCurrentCommandRef.current().trim();
+          if (currentCmd.length > 0 && webSocketRef.current?.readyState === 1) {
+            const matches = autocompleteHistory.current
+              .filter(
+                (cmd) =>
+                  cmd.startsWith(currentCmd) &&
+                  cmd !== currentCmd &&
+                  cmd.length > currentCmd.length,
+              )
+              .slice(0, 5);
+
+            if (matches.length === 1) {
+              const completedCommand = matches[0];
+              const completion = completedCommand.substring(currentCmd.length);
+
+              for (const char of completion) {
+                webSocketRef.current.send(
+                  JSON.stringify({ type: "input", data: char }),
+                );
+              }
+
+              updateCurrentCommandRef.current(completedCommand);
+            } else if (matches.length > 1) {
+              currentAutocompleteCommand.current = currentCmd;
+              setAutocompleteSuggestions(matches);
+              setAutocompleteSelectedIndex(0);
+
+              const cursorY = terminal.buffer.active.cursorY;
+              const cursorX = terminal.buffer.active.cursorX;
+              const rect = xtermRef.current?.getBoundingClientRect();
+
+              if (rect) {
+                const cellHeight =
+                  terminal.rows > 0 ? rect.height / terminal.rows : 20;
+                const cellWidth =
+                  terminal.cols > 0 ? rect.width / terminal.cols : 10;
+
+                const itemHeight = 32;
+                const footerHeight = 32;
+                const maxMenuHeight = 240;
+                const estimatedMenuHeight = Math.min(
+                  matches.length * itemHeight + footerHeight,
+                  maxMenuHeight,
+                );
+                const cursorBottomY = rect.top + (cursorY + 1) * cellHeight;
+                const cursorTopY = rect.top + cursorY * cellHeight;
+                const spaceBelow = window.innerHeight - cursorBottomY;
+                const spaceAbove = cursorTopY;
+
+                const showAbove =
+                  spaceBelow < estimatedMenuHeight && spaceAbove > spaceBelow;
+
+                setAutocompletePosition({
+                  top: showAbove
+                    ? Math.max(0, cursorTopY - estimatedMenuHeight)
+                    : cursorBottomY,
+                  left: Math.max(0, rect.left + cursorX * cellWidth),
+                });
+              }
+
+              setShowAutocomplete(true);
+            }
+          }
+          return false;
+        }
+
+        return true;
+      };
+
+      terminal.attachCustomKeyEventHandler(handleCustomKey);
+    }, [terminal]);
+
    useEffect(() => {
      if (!terminal || !hostConfig || !visible) return;

@@ -999,27 +1424,17 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(

    useEffect(() => {
      if (!isVisible || !isReady || !fitAddonRef.current || !terminal) {
-        if (!isVisible && isFitted) {
-          setIsFitted(false);
-        }
        return;
      }

-      setIsFitted(false);
+      let rafId: number;

-      let rafId1: number;
-      let rafId2: number;
-
-      rafId1 = requestAnimationFrame(() => {
-        rafId2 = requestAnimationFrame(() => {
-          hardRefresh();
-          performFit();
-        });
+      rafId = requestAnimationFrame(() => {
+        performFit();
      });

      return () => {
-        if (rafId1) cancelAnimationFrame(rafId1);
-        if (rafId2) cancelAnimationFrame(rafId2);
+        if (rafId) cancelAnimationFrame(rafId);
      };
    }, [isVisible, isReady, splitScreen, terminal]);

@@ -1045,9 +1460,8 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
          ref={xtermRef}
          className="h-full w-full"
          style={{
-            visibility:
-              isReady && !isConnecting && isFitted ? "visible" : "hidden",
-            opacity: isReady && !isConnecting && isFitted ? 1 : 0,
+            visibility: isReady ? "visible" : "hidden",
+            pointerEvents: isReady ? "auto" : "none",
          }}
          onClick={() => {
            if (terminal && !splitScreen) {
@@ -1078,17 +1492,19 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
          backgroundColor={backgroundColor}
        />

-        {isConnecting && (
-          <div
-            className="absolute inset-0 flex items-center justify-center"
-            style={{ backgroundColor }}
-          >
-            <div className="flex items-center gap-3">
-              <div className="w-6 h-6 border-2 border-blue-400 border-t-transparent rounded-full animate-spin"></div>
-              <span className="text-gray-300">{t("terminal.connecting")}</span>
-            </div>
-          </div>
-        )}
+        <CommandAutocomplete
+          visible={showAutocomplete}
+          suggestions={autocompleteSuggestions}
+          selectedIndex={autocompleteSelectedIndex}
+          position={autocompletePosition}
+          onSelect={handleAutocompleteSelect}
+        />
+
+        <SimpleLoader
+          visible={isConnecting}
+          message={t("terminal.connecting")}
+          backgroundColor={backgroundColor}
+        />
      </div>
    );
  },
--- a/src/ui/desktop/apps/terminal/command-history/CommandAutocomplete.tsx
+++ b/src/ui/desktop/apps/terminal/command-history/CommandAutocomplete.tsx
@@ -0,0 +1,73 @@
+import React, { useEffect, useRef } from "react";
+import { cn } from "@/lib/utils.ts";
+
+interface CommandAutocompleteProps {
+  suggestions: string[];
+  selectedIndex: number;
+  onSelect: (command: string) => void;
+  position: { top: number; left: number };
+  visible: boolean;
+}
+
+export function CommandAutocomplete({
+  suggestions,
+  selectedIndex,
+  onSelect,
+  position,
+  visible,
+}: CommandAutocompleteProps) {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const selectedRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (selectedRef.current && containerRef.current) {
+      selectedRef.current.scrollIntoView({
+        block: "nearest",
+        behavior: "smooth",
+      });
+    }
+  }, [selectedIndex]);
+
+  if (!visible || suggestions.length === 0) {
+    return null;
+  }
+
+  const footerHeight = 32;
+  const maxSuggestionsHeight = 240 - footerHeight;
+
+  return (
+    <div
+      ref={containerRef}
+      className="fixed z-[9999] bg-dark-bg border border-dark-border rounded-md shadow-lg min-w-[200px] max-w-[600px] flex flex-col"
+      style={{
+        top: `${position.top}px`,
+        left: `${position.left}px`,
+        maxHeight: "240px",
+      }}
+    >
+      <div
+        className="overflow-y-auto"
+        style={{ maxHeight: `${maxSuggestionsHeight}px` }}
+      >
+        {suggestions.map((suggestion, index) => (
+          <div
+            key={index}
+            ref={index === selectedIndex ? selectedRef : null}
+            className={cn(
+              "px-3 py-1.5 text-sm font-mono cursor-pointer transition-colors",
+              "hover:bg-dark-hover",
+              index === selectedIndex && "bg-gray-500/20 text-gray-400",
+            )}
+            onClick={() => onSelect(suggestion)}
+            onMouseEnter={() => {}}
+          >
+            {suggestion}
+          </div>
+        ))}
+      </div>
+      <div className="px-3 py-1 text-xs text-muted-foreground border-t border-dark-border bg-dark-bg/50 shrink-0">
+        Tab/Enter to complete • ↑↓ to navigate • Esc to close
+      </div>
+    </div>
+  );
+}
--- a/src/ui/desktop/apps/terminal/command-history/CommandHistoryContext.tsx
+++ b/src/ui/desktop/apps/terminal/command-history/CommandHistoryContext.tsx
@@ -0,0 +1,85 @@
+import React, {
+  createContext,
+  useContext,
+  useState,
+  useCallback,
+  ReactNode,
+} from "react";
+
+interface CommandHistoryContextType {
+  commandHistory: string[];
+  isLoading: boolean;
+  setCommandHistory: (history: string[]) => void;
+  setIsLoading: (loading: boolean) => void;
+  onSelectCommand?: (command: string) => void;
+  setOnSelectCommand: (callback: (command: string) => void) => void;
+  onDeleteCommand?: (command: string) => void;
+  setOnDeleteCommand: (callback: (command: string) => void) => void;
+  openCommandHistory: () => void;
+  setOpenCommandHistory: (callback: () => void) => void;
+}
+
+const CommandHistoryContext = createContext<
+  CommandHistoryContextType | undefined
+>(undefined);
+
+export function CommandHistoryProvider({ children }: { children: ReactNode }) {
+  const [commandHistory, setCommandHistory] = useState<string[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [onSelectCommand, setOnSelectCommand] = useState<
+    ((command: string) => void) | undefined
+  >(undefined);
+  const [onDeleteCommand, setOnDeleteCommand] = useState<
+    ((command: string) => void) | undefined
+  >(undefined);
+  const [openCommandHistory, setOpenCommandHistory] = useState<
+    (() => void) | undefined
+  >(() => () => {});
+
+  const handleSetOnSelectCommand = useCallback(
+    (callback: (command: string) => void) => {
+      setOnSelectCommand(() => callback);
+    },
+    [],
+  );
+
+  const handleSetOnDeleteCommand = useCallback(
+    (callback: (command: string) => void) => {
+      setOnDeleteCommand(() => callback);
+    },
+    [],
+  );
+
+  const handleSetOpenCommandHistory = useCallback((callback: () => void) => {
+    setOpenCommandHistory(() => callback);
+  }, []);
+
+  return (
+    <CommandHistoryContext.Provider
+      value={{
+        commandHistory,
+        isLoading,
+        setCommandHistory,
+        setIsLoading,
+        onSelectCommand,
+        setOnSelectCommand: handleSetOnSelectCommand,
+        onDeleteCommand,
+        setOnDeleteCommand: handleSetOnDeleteCommand,
+        openCommandHistory: openCommandHistory || (() => {}),
+        setOpenCommandHistory: handleSetOpenCommandHistory,
+      }}
+    >
+      {children}
+    </CommandHistoryContext.Provider>
+  );
+}
+
+export function useCommandHistory() {
+  const context = useContext(CommandHistoryContext);
+  if (context === undefined) {
+    throw new Error(
+      "useCommandHistory must be used within a CommandHistoryProvider",
+    );
+  }
+  return context;
+}
--- a/src/ui/desktop/apps/tools/SSHToolsSidebar.tsx
+++ b/src/ui/desktop/apps/tools/SSHToolsSidebar.tsx
--- a/src/ui/desktop/apps/tools/ToolsMenu.tsx
+++ b/src/ui/desktop/apps/tools/ToolsMenu.tsx
@@ -1,55 +0,0 @@
-import React from "react";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu.tsx";
-import { Button } from "@/components/ui/button.tsx";
-import { Hammer, Wrench, FileText } from "lucide-react";
-import { useTranslation } from "react-i18next";
-
-interface ToolsMenuProps {
-  onOpenSshTools: () => void;
-  onOpenSnippets: () => void;
-}
-
-export function ToolsMenu({
-  onOpenSshTools,
-  onOpenSnippets,
-}: ToolsMenuProps): React.ReactElement {
-  const { t } = useTranslation();
-
-  return (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button
-          variant="outline"
-          className="w-[30px] h-[30px] border-dark-border"
-          title={t("nav.tools")}
-        >
-          <Hammer className="h-4 w-4" />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent
-        align="end"
-        className="w-56 bg-dark-bg border-dark-border text-white"
-      >
-        <DropdownMenuItem
-          onClick={onOpenSshTools}
-          className="flex items-center gap-2 cursor-pointer px-3 py-2 hover:bg-dark-hover text-gray-300"
-        >
-          <Wrench className="h-4 w-4" />
-          <span className="flex-1">{t("sshTools.title")}</span>
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          onClick={onOpenSnippets}
-          className="flex items-center gap-2 cursor-pointer px-3 py-2 hover:bg-dark-hover text-gray-300"
-        >
-          <FileText className="h-4 w-4" />
-          <span className="flex-1">{t("snippets.title")}</span>
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}
--- a/src/ui/desktop/authentication/Auth.tsx
+++ b/src/ui/desktop/authentication/Auth.tsx
--- a/src/ui/desktop/authentication/ElectronLoginForm.tsx
+++ b/src/ui/desktop/authentication/ElectronLoginForm.tsx
@@ -25,6 +25,10 @@ export function ElectronLoginForm({
  const [currentUrl, setCurrentUrl] = useState(serverUrl);
  const hasLoadedOnce = useRef(false);

+  useEffect(() => {
+    localStorage.removeItem("jwt");
+  }, []);
+
  useEffect(() => {
    const handleMessage = async (event: MessageEvent) => {
      try {
@@ -63,7 +67,9 @@ export function ElectronLoginForm({
            }
          }
        }
-      } catch (err) {}
+      } catch (err) {
+        console.error("Authentication operation failed:", err);
+      }
    };

    window.addEventListener("message", handleMessage);
@@ -190,8 +196,12 @@ export function ElectronLoginForm({
              );
            }
          }
-        } catch (err) {}
-      } catch (err) {}
+        } catch (err) {
+          console.error("Authentication operation failed:", err);
+        }
+      } catch (err) {
+        console.error("Authentication operation failed:", err);
+      }
    };

    const handleError = () => {
--- a/src/ui/desktop/authentication/ElectronServerConfig.tsx
+++ b/src/ui/desktop/authentication/ElectronServerConfig.tsx
@@ -37,7 +37,9 @@ export function ElectronServerConfig({
      if (config?.serverUrl) {
        setServerUrl(config.serverUrl);
      }
-    } catch {}
+    } catch (error) {
+      console.error("Server config operation failed:", error);
+    }
  };

  const handleSaveConfig = async () => {
--- a/src/ui/desktop/navigation/AppView.tsx
+++ b/src/ui/desktop/navigation/AppView.tsx
@@ -35,10 +35,14 @@ interface TabData {

 interface TerminalViewProps {
  isTopbarOpen?: boolean;
+  rightSidebarOpen?: boolean;
+  rightSidebarWidth?: number;
 }

 export function AppView({
  isTopbarOpen = true,
+  rightSidebarOpen = false,
+  rightSidebarWidth = 400,
 }: TerminalViewProps): React.ReactElement {
  const { tabs, currentTab, allSplitScreenTab, removeTab } = useTabs() as {
    tabs: TabData[];
@@ -66,16 +70,17 @@ export function AppView({
  );
  const [ready, setReady] = useState<boolean>(true);
  const [resetKey, setResetKey] = useState<number>(0);
+  const previousStylesRef = useRef<Record<number, React.CSSProperties>>({});

-  const updatePanelRects = () => {
+  const updatePanelRects = React.useCallback(() => {
    const next: Record<string, DOMRect | null> = {};
    Object.entries(panelRefs.current).forEach(([id, el]) => {
      if (el) next[id] = el.getBoundingClientRect();
    });
    setPanelRects(next);
-  };
+  }, []);

-  const fitActiveAndNotify = () => {
+  const fitActiveAndNotify = React.useCallback(() => {
    const visibleIds: number[] = [];
    if (allSplitScreenTab.length === 0) {
      if (currentTab) visibleIds.push(currentTab);
@@ -91,10 +96,10 @@ export function AppView({
        if (ref?.refresh) ref.refresh();
      }
    });
-  };
+  }, [allSplitScreenTab, currentTab, terminalTabs]);

  const layoutScheduleRef = useRef<number | null>(null);
-  const scheduleMeasureAndFit = () => {
+  const scheduleMeasureAndFit = React.useCallback(() => {
    if (layoutScheduleRef.current)
      cancelAnimationFrame(layoutScheduleRef.current);
    layoutScheduleRef.current = requestAnimationFrame(() => {
@@ -103,18 +108,16 @@ export function AppView({
        fitActiveAndNotify();
      });
    });
-  };
+  }, [updatePanelRects, fitActiveAndNotify]);

-  const hideThenFit = () => {
-    setReady(false);
+  const hideThenFit = React.useCallback(() => {
    requestAnimationFrame(() => {
      updatePanelRects();
      requestAnimationFrame(() => {
        fitActiveAndNotify();
-        setReady(true);
      });
    });
-  };
+  }, [updatePanelRects, fitActiveAndNotify]);

  const prevStateRef = useRef({
    terminalTabsLength: terminalTabs.length,
@@ -154,11 +157,20 @@ export function AppView({
    terminalTabs.length,
    allSplitScreenTab.join(","),
    terminalTabs,
+    hideThenFit,
  ]);

  useEffect(() => {
    scheduleMeasureAndFit();
-  }, [allSplitScreenTab.length, isTopbarOpen, sidebarState, resetKey]);
+  }, [
+    scheduleMeasureAndFit,
+    allSplitScreenTab.length,
+    isTopbarOpen,
+    sidebarState,
+    resetKey,
+    rightSidebarOpen,
+    rightSidebarWidth,
+  ]);

  useEffect(() => {
    const roContainer = containerRef.current
@@ -170,7 +182,7 @@ export function AppView({
    if (containerRef.current && roContainer)
      roContainer.observe(containerRef.current);
    return () => roContainer?.disconnect();
-  }, []);
+  }, [updatePanelRects, fitActiveAndNotify]);

  useEffect(() => {
    const onWinResize = () => {
@@ -179,7 +191,7 @@ export function AppView({
    };
    window.addEventListener("resize", onWinResize);
    return () => window.removeEventListener("resize", onWinResize);
-  }, []);
+  }, [updatePanelRects, fitActiveAndNotify]);

  const HEADER_H = 28;

@@ -191,46 +203,47 @@ export function AppView({

  const renderTerminalsLayer = () => {
    const styles: Record<number, React.CSSProperties> = {};
-    const splitTabs = terminalTabs.filter((tab: TabData) =>
-      allSplitScreenTab.includes(tab.id),
-    );
+    const layoutTabs = allSplitScreenTab
+      .map((tabId) => terminalTabs.find((tab: TabData) => tab.id === tabId))
+      .filter((t): t is TabData => t !== null && t !== undefined);
+
    const mainTab = terminalTabs.find((tab: TabData) => tab.id === currentTab);
-    const layoutTabs = [
-      mainTab,
-      ...splitTabs.filter(
-        (t: TabData) => t && t.id !== (mainTab && (mainTab as TabData).id),
-      ),
-    ].filter((t): t is TabData => t !== null && t !== undefined);

    if (allSplitScreenTab.length === 0 && mainTab) {
      const isFileManagerTab = mainTab.type === "file_manager";
-      styles[mainTab.id] = {
-        position: "absolute",
+      const newStyle = {
+        position: "absolute" as const,
        top: isFileManagerTab ? 0 : 4,
        left: isFileManagerTab ? 0 : 4,
        right: isFileManagerTab ? 0 : 4,
        bottom: isFileManagerTab ? 0 : 4,
        zIndex: 20,
-        display: "block",
-        pointerEvents: "auto",
-        opacity: ready ? 1 : 0,
+        display: "block" as const,
+        pointerEvents: "auto" as const,
+        opacity: 1,
+        transition: "opacity 150ms ease-in-out",
      };
+      styles[mainTab.id] = newStyle;
+      previousStylesRef.current[mainTab.id] = newStyle;
    } else {
      layoutTabs.forEach((t: TabData) => {
        const rect = panelRects[String(t.id)];
        const parentRect = containerRef.current?.getBoundingClientRect();
        if (rect && parentRect) {
-          styles[t.id] = {
-            position: "absolute",
+          const newStyle = {
+            position: "absolute" as const,
            top: rect.top - parentRect.top + HEADER_H + 4,
            left: rect.left - parentRect.left + 4,
            width: rect.width - 8,
            height: rect.height - HEADER_H - 8,
            zIndex: 20,
-            display: "block",
-            pointerEvents: "auto",
-            opacity: ready ? 1 : 0,
+            display: "block" as const,
+            pointerEvents: "auto" as const,
+            opacity: 1,
+            transition: "opacity 150ms ease-in-out",
          };
+          styles[t.id] = newStyle;
+          previousStylesRef.current[t.id] = newStyle;
        }
      });
    }
@@ -244,17 +257,29 @@ export function AppView({
          const isVisible =
            hasStyle || (allSplitScreenTab.length === 0 && t.id === currentTab);

+          const previousStyle = previousStylesRef.current[t.id];
+
+          const isFileManagerTab = t.type === "file_manager";
+          const standardStyle = {
+            position: "absolute" as const,
+            top: isFileManagerTab ? 0 : 4,
+            left: isFileManagerTab ? 0 : 4,
+            right: isFileManagerTab ? 0 : 4,
+            bottom: isFileManagerTab ? 0 : 4,
+          };
+
          const finalStyle: React.CSSProperties = hasStyle
            ? { ...styles[t.id], overflow: "hidden" }
            : ({
-                position: "absolute",
-                inset: 0,
-                visibility: "hidden",
+                ...(previousStyle || standardStyle),
+                opacity: 0,
                pointerEvents: "none",
                zIndex: 0,
+                transition: "opacity 150ms ease-in-out",
+                overflow: "hidden",
              } as React.CSSProperties);

-          const effectiveVisible = isVisible && ready;
+          const effectiveVisible = isVisible;

          const isTerminal = t.type === "terminal";
          const terminalConfig = {
@@ -325,16 +350,9 @@ export function AppView({
  };

  const renderSplitOverlays = () => {
-    const splitTabs = terminalTabs.filter((tab: TabData) =>
-      allSplitScreenTab.includes(tab.id),
-    );
-    const mainTab = terminalTabs.find((tab: TabData) => tab.id === currentTab);
-    const layoutTabs = [
-      mainTab,
-      ...splitTabs.filter(
-        (t: TabData) => t && t.id !== (mainTab && (mainTab as TabData).id),
-      ),
-    ].filter((t): t is TabData => t !== null && t !== undefined);
+    const layoutTabs = allSplitScreenTab
+      .map((tabId) => terminalTabs.find((tab: TabData) => tab.id === tabId))
+      .filter((t): t is TabData => t !== null && t !== undefined);
    if (allSplitScreenTab.length === 0) return null;

    const handleStyle = {
@@ -648,10 +666,14 @@ export function AppView({
      style={{
        background: containerBackground,
        marginLeft: leftMarginPx,
-        marginRight: 17,
+        marginRight: rightSidebarOpen
+          ? `calc(var(--right-sidebar-width, ${rightSidebarWidth}px) + 8px)`
+          : 17,
        marginTop: topMarginPx,
        marginBottom: bottomMarginPx,
        height: `calc(100vh - ${topMarginPx + bottomMarginPx}px)`,
+        transition:
+          "margin-left 200ms linear, margin-right 200ms linear, margin-top 200ms linear",
      }}
    >
      {renderTerminalsLayer()}
--- a/src/ui/desktop/navigation/LeftSidebar.tsx
+++ b/src/ui/desktop/navigation/LeftSidebar.tsx
@@ -34,8 +34,9 @@ import {
 import { Input } from "@/components/ui/input.tsx";
 import { Button } from "@/components/ui/button.tsx";
 import { FolderCard } from "@/ui/desktop/navigation/hosts/FolderCard.tsx";
-import { getSSHHosts } from "@/ui/main-axios.ts";
+import { getSSHHosts, getSSHFolders } from "@/ui/main-axios.ts";
 import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
+import type { SSHFolder } from "@/types/index.ts";

 interface SSHHost {
  id: number;
@@ -65,6 +66,7 @@ interface SidebarProps {
  isAdmin?: boolean;
  username?: string | null;
  children?: React.ReactNode;
+  onLogout?: () => void;
 }

 async function handleLogout() {
@@ -87,6 +89,7 @@ export function LeftSidebar({
  isAdmin,
  username,
  children,
+  onLogout,
 }: SidebarProps): React.ReactElement {
  const { t } = useTranslation();

@@ -112,7 +115,11 @@ export function LeftSidebar({
    Array.isArray(allSplitScreenTab) && allSplitScreenTab.length > 0;
  const sshManagerTab = tabList.find((t) => t.type === "ssh_manager");
  const openSshManagerTab = () => {
-    if (sshManagerTab || isSplitScreenActive) return;
+    if (isSplitScreenActive) return;
+    if (sshManagerTab) {
+      setCurrentTab(sshManagerTab.id);
+      return;
+    }
    const id = addTab({ type: "ssh_manager", title: "Host Manager" });
    setCurrentTab(id);
  };
@@ -143,6 +150,22 @@ export function LeftSidebar({
  const prevHostsRef = React.useRef<SSHHost[]>([]);
  const [search, setSearch] = useState("");
  const [debouncedSearch, setDebouncedSearch] = useState("");
+  const [folderMetadata, setFolderMetadata] = useState<Map<string, SSHFolder>>(
+    new Map(),
+  );
+
+  const fetchFolderMetadata = React.useCallback(async () => {
+    try {
+      const folders = await getSSHFolders();
+      const metadataMap = new Map<string, SSHFolder>();
+      folders.forEach((folder) => {
+        metadataMap.set(folder.name, folder);
+      });
+      setFolderMetadata(metadataMap);
+    } catch (error) {
+      console.error("Failed to fetch folder metadata:", error);
+    }
+  }, []);

  const fetchHosts = React.useCallback(async () => {
    try {
@@ -208,17 +231,25 @@ export function LeftSidebar({

  React.useEffect(() => {
    fetchHosts();
-    const interval = setInterval(fetchHosts, 300000);
+    fetchFolderMetadata();
+    const interval = setInterval(() => {
+      fetchHosts();
+      fetchFolderMetadata();
+    }, 300000);
    return () => clearInterval(interval);
-  }, [fetchHosts]);
+  }, [fetchHosts, fetchFolderMetadata]);

  React.useEffect(() => {
    const handleHostsChanged = () => {
      fetchHosts();
+      fetchFolderMetadata();
    };
    const handleCredentialsChanged = () => {
      fetchHosts();
    };
+    const handleFoldersChanged = () => {
+      fetchFolderMetadata();
+    };
    window.addEventListener(
      "ssh-hosts:changed",
      handleHostsChanged as EventListener,
@@ -227,6 +258,10 @@ export function LeftSidebar({
      "credentials:changed",
      handleCredentialsChanged as EventListener,
    );
+    window.addEventListener(
+      "folders:changed",
+      handleFoldersChanged as EventListener,
+    );
    return () => {
      window.removeEventListener(
        "ssh-hosts:changed",
@@ -236,8 +271,12 @@ export function LeftSidebar({
        "credentials:changed",
        handleCredentialsChanged as EventListener,
      );
+      window.removeEventListener(
+        "folders:changed",
+        handleFoldersChanged as EventListener,
+      );
    };
-  }, [fetchHosts]);
+  }, [fetchHosts, fetchFolderMetadata]);

  React.useEffect(() => {
    const handler = setTimeout(() => setDebouncedSearch(search), 200);
@@ -250,7 +289,11 @@ export function LeftSidebar({

  const [sidebarWidth, setSidebarWidth] = useState<number>(() => {
    const saved = localStorage.getItem("leftSidebarWidth");
-    return saved !== null ? parseInt(saved, 10) : 250;
+    const defaultWidth = 250;
+    const savedWidth = saved !== null ? parseInt(saved, 10) : defaultWidth;
+    const minWidth = Math.min(200, Math.floor(window.innerWidth * 0.15));
+    const maxWidth = Math.floor(window.innerWidth * 0.3);
+    return Math.min(savedWidth, Math.max(minWidth, maxWidth));
  });

  const [isResizing, setIsResizing] = useState(false);
@@ -261,6 +304,20 @@ export function LeftSidebar({
    localStorage.setItem("leftSidebarWidth", String(sidebarWidth));
  }, [sidebarWidth]);

+  React.useEffect(() => {
+    const handleResize = () => {
+      const minWidth = Math.min(200, Math.floor(window.innerWidth * 0.15));
+      const maxWidth = Math.floor(window.innerWidth * 0.3);
+      if (sidebarWidth > maxWidth) {
+        setSidebarWidth(Math.max(minWidth, maxWidth));
+      } else if (sidebarWidth < minWidth) {
+        setSidebarWidth(minWidth);
+      }
+    };
+    window.addEventListener("resize", handleResize);
+    return () => window.removeEventListener("resize", handleResize);
+  }, [sidebarWidth]);
+
  const handleMouseDown = (e: React.MouseEvent) => {
    e.preventDefault();
    setIsResizing(true);
@@ -275,8 +332,8 @@ export function LeftSidebar({
      if (startXRef.current == null) return;
      const dx = e.clientX - startXRef.current;
      const newWidth = Math.round(startWidthRef.current + dx);
-      const minWidth = 200;
-      const maxWidth = Math.round(window.innerWidth * 0.5);
+      const minWidth = Math.min(200, Math.floor(window.innerWidth * 0.15));
+      const maxWidth = Math.round(window.innerWidth * 0.3);
      if (newWidth >= minWidth && newWidth <= maxWidth) {
        setSidebarWidth(newWidth);
      } else if (newWidth < minWidth) {
@@ -355,14 +412,14 @@ export function LeftSidebar({
  }, []);

  return (
-    <div className="min-h-svh">
+    <div className="h-screen w-screen overflow-hidden">
      <SidebarProvider
        open={isSidebarOpen}
        style={
          { "--sidebar-width": `${sidebarWidth}px` } as React.CSSProperties
        }
      >
-        <div className="flex h-screen w-full">
+        <div className="flex h-screen w-screen overflow-hidden">
          <Sidebar variant="floating">
            <SidebarHeader>
              <SidebarGroupLabel className="text-lg font-bold text-white">
@@ -394,13 +451,11 @@ export function LeftSidebar({
                  className="m-2 flex flex-row font-semibold border-2 !border-dark-border"
                  variant="outline"
                  onClick={openSshManagerTab}
-                  disabled={!!sshManagerTab || isSplitScreenActive}
+                  disabled={isSplitScreenActive}
                  title={
-                    sshManagerTab
-                      ? t("interface.sshManagerAlreadyOpen")
-                      : isSplitScreenActive
-                        ? t("interface.disabledDuringSplitScreen")
-                        : undefined
+                    isSplitScreenActive
+                      ? t("interface.disabledDuringSplitScreen")
+                      : undefined
                  }
                >
                  <HardDrive strokeWidth="2.5" />
@@ -435,15 +490,20 @@ export function LeftSidebar({
                  </div>
                )}

-                {sortedFolders.map((folder, idx) => (
-                  <FolderCard
-                    key={`folder-${folder}-${hostsByFolder[folder]?.length || 0}`}
-                    folderName={folder}
-                    hosts={getSortedHosts(hostsByFolder[folder])}
-                    isFirst={idx === 0}
-                    isLast={idx === sortedFolders.length - 1}
-                  />
-                ))}
+                {sortedFolders.map((folder, idx) => {
+                  const metadata = folderMetadata.get(folder);
+                  return (
+                    <FolderCard
+                      key={`folder-${folder}-${hostsByFolder[folder]?.length || 0}`}
+                      folderName={folder}
+                      hosts={getSortedHosts(hostsByFolder[folder])}
+                      isFirst={idx === 0}
+                      isLast={idx === sortedFolders.length - 1}
+                      folderColor={metadata?.color}
+                      folderIcon={metadata?.icon}
+                    />
+                  );
+                })}
              </SidebarGroup>
            </SidebarContent>
            <Separator className="p-0.25 mt-1 mb-1" />
@@ -486,7 +546,7 @@ export function LeftSidebar({
                      )}
                      <DropdownMenuItem
                        className="rounded px-2 py-1.5 hover:bg-white/15 hover:text-accent-foreground focus:bg-white/20 focus:text-accent-foreground cursor-pointer focus:outline-none"
-                        onClick={handleLogout}
+                        onClick={onLogout || handleLogout}
                      >
                        <span>{t("common.logout")}</span>
                      </DropdownMenuItem>
--- a/src/ui/desktop/navigation/SSHAuthDialog.tsx
+++ b/src/ui/desktop/navigation/SSHAuthDialog.tsx
@@ -137,10 +137,10 @@ export function SSHAuthDialog({

  return (
    <div
-      className="absolute inset-0 z-50 flex items-center justify-center bg-dark-bg"
+      className="absolute inset-0 z-9999 flex items-center justify-center bg-dark-bg animate-in fade-in duration-200"
      style={{ backgroundColor }}
    >
-      <Card className="w-full max-w-2xl mx-4 border-2">
+      <Card className="w-full max-w-2xl mx-4 border-2 animate-in fade-in zoom-in-95 duration-200">
        <CardHeader>
          <CardTitle className="flex items-center gap-2">
            <Shield className="w-5 h-5" />
--- a/src/ui/desktop/navigation/TOTPDialog.tsx
+++ b/src/ui/desktop/navigation/TOTPDialog.tsx
@@ -25,12 +25,12 @@ export function TOTPDialog({
  if (!isOpen) return null;

  return (
-    <div className="absolute inset-0 flex items-center justify-center z-50">
+    <div className="absolute inset-0 flex items-center justify-center z-500 animate-in fade-in duration-200">
      <div
        className="absolute inset-0 bg-dark-bg rounded-md"
        style={{ backgroundColor: backgroundColor || undefined }}
      />
-      <div className="bg-dark-bg border-2 border-dark-border rounded-lg p-6 max-w-md w-full mx-4 relative z-10">
+      <div className="bg-dark-bg border-2 border-dark-border rounded-lg p-6 max-w-md w-full mx-4 relative z-10 animate-in fade-in zoom-in-95 duration-200">
        <div className="mb-4 flex items-center gap-2">
          <Shield className="w-5 h-5 text-primary" />
          <h3 className="text-lg font-semibold">
--- a/src/ui/desktop/navigation/TopNavbar.tsx
+++ b/src/ui/desktop/navigation/TopNavbar.tsx
@@ -2,14 +2,13 @@ import React, { useState } from "react";
 import { flushSync } from "react-dom";
 import { useSidebar } from "@/components/ui/sidebar.tsx";
 import { Button } from "@/components/ui/button.tsx";
-import { ChevronDown, ChevronUpIcon } from "lucide-react";
+import { ChevronDown, ChevronUpIcon, Hammer } from "lucide-react";
 import { Tab } from "@/ui/desktop/navigation/tabs/Tab.tsx";
 import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
 import { useTranslation } from "react-i18next";
 import { TabDropdown } from "@/ui/desktop/navigation/tabs/TabDropdown.tsx";
-import { SnippetsSidebar } from "@/ui/desktop/apps/terminal/SnippetsSidebar.tsx";
 import { SSHToolsSidebar } from "@/ui/desktop/apps/tools/SSHToolsSidebar.tsx";
-import { ToolsMenu } from "@/ui/desktop/apps/tools/ToolsMenu.tsx";
+import { useCommandHistory } from "@/ui/desktop/apps/terminal/command-history/CommandHistoryContext.tsx";

 interface TabData {
  id: number;
@@ -26,11 +25,15 @@ interface TabData {
 interface TopNavbarProps {
  isTopbarOpen: boolean;
  setIsTopbarOpen: (open: boolean) => void;
+  onOpenCommandPalette: () => void;
+  onRightSidebarStateChange?: (isOpen: boolean, width: number) => void;
 }

 export function TopNavbar({
  isTopbarOpen,
  setIsTopbarOpen,
+  onOpenCommandPalette,
+  onRightSidebarStateChange,
 }: TopNavbarProps): React.ReactElement {
  const { state } = useSidebar();
  const {
@@ -53,9 +56,56 @@ export function TopNavbar({
  const leftPosition =
    state === "collapsed" ? "26px" : "calc(var(--sidebar-width) + 8px)";
  const { t } = useTranslation();
+  const commandHistory = useCommandHistory();

-  const [toolsSheetOpen, setToolsSheetOpen] = useState(false);
-  const [snippetsSidebarOpen, setSnippetsSidebarOpen] = useState(false);
+  const [toolsSidebarOpen, setToolsSidebarOpen] = useState(false);
+  const [commandHistoryTabActive, setCommandHistoryTabActive] = useState(false);
+  const [splitScreenTabActive, setSplitScreenTabActive] = useState(false);
+  const [rightSidebarWidth, setRightSidebarWidth] = useState<number>(() => {
+    const saved = localStorage.getItem("rightSidebarWidth");
+    const defaultWidth = 400;
+    const savedWidth = saved !== null ? parseInt(saved, 10) : defaultWidth;
+    const minWidth = Math.min(300, Math.floor(window.innerWidth * 0.2));
+    const maxWidth = Math.floor(window.innerWidth * 0.3);
+    return Math.min(savedWidth, Math.max(minWidth, maxWidth));
+  });
+
+  React.useEffect(() => {
+    localStorage.setItem("rightSidebarWidth", String(rightSidebarWidth));
+  }, [rightSidebarWidth]);
+
+  React.useEffect(() => {
+    const handleResize = () => {
+      const minWidth = Math.min(300, Math.floor(window.innerWidth * 0.2));
+      const maxWidth = Math.floor(window.innerWidth * 0.3);
+      if (rightSidebarWidth > maxWidth) {
+        setRightSidebarWidth(Math.max(minWidth, maxWidth));
+      } else if (rightSidebarWidth < minWidth) {
+        setRightSidebarWidth(minWidth);
+      }
+    };
+    window.addEventListener("resize", handleResize);
+    return () => window.removeEventListener("resize", handleResize);
+  }, [rightSidebarWidth]);
+
+  React.useEffect(() => {
+    if (onRightSidebarStateChange) {
+      onRightSidebarStateChange(toolsSidebarOpen, rightSidebarWidth);
+    }
+  }, [toolsSidebarOpen, rightSidebarWidth, onRightSidebarStateChange]);
+
+  const openCommandHistorySidebar = React.useCallback(() => {
+    setToolsSidebarOpen(true);
+    setCommandHistoryTabActive(true);
+  }, []);
+
+  React.useEffect(() => {
+    commandHistory.setOpenCommandHistory(openCommandHistorySidebar);
+  }, [commandHistory, openCommandHistorySidebar]);
+
+  const rightPosition = toolsSidebarOpen
+    ? `calc(var(--right-sidebar-width, ${rightSidebarWidth}px) + 8px)`
+    : "17px";
  const [justDroppedTabId, setJustDroppedTabId] = useState<number | null>(null);
  const [isInDropAnimation, setIsInDropAnimation] = useState(false);
  const [dragState, setDragState] = useState<{
@@ -82,7 +132,9 @@ export function TopNavbar({
  };

  const handleTabSplit = (tabId: number) => {
-    setSplitScreenTab(tabId);
+    setToolsSidebarOpen(true);
+    setCommandHistoryTabActive(false);
+    setSplitScreenTabActive(true);
  };

  const handleTabClose = (tabId: number) => {
@@ -296,12 +348,13 @@ export function TopNavbar({
  return (
    <div>
      <div
-        className="fixed z-10 h-[50px] border-2 border-dark-border rounded-lg transition-all duration-200 ease-linear flex flex-row transform-none m-0 p-0"
+        className="fixed z-10 h-[50px] border-2 border-dark-border rounded-lg flex flex-row transform-none m-0 p-0"
        style={{
          top: isTopbarOpen ? "0.5rem" : "-3rem",
          left: leftPosition,
-          right: "17px",
+          right: rightPosition,
          backgroundColor: "#18181b",
+          transition: "top 200ms linear, left 200ms linear, right 200ms linear",
        }}
      >
        <div
@@ -320,17 +373,7 @@ export function TopNavbar({
            const isAdmin = tab.type === "admin";
            const isUserProfile = tab.type === "user_profile";
            const isSplittable = isTerminal || isServer || isFileManager;
-            const isSplitButtonDisabled =
-              (isActive && !isSplitScreenActive) ||
-              ((allSplitScreenTab?.length || 0) >= 3 && !isSplit);
-            const disableSplit =
-              !isSplittable ||
-              isSplitButtonDisabled ||
-              isActive ||
-              currentTabIsHome ||
-              currentTabIsSshManager ||
-              currentTabIsAdmin ||
-              currentTabIsUserProfile;
+            const disableSplit = !isSplittable;
            const disableActivate =
              isSplit ||
              ((tab.type === "home" ||
@@ -339,8 +382,7 @@ export function TopNavbar({
                tab.type === "user_profile") &&
                isSplitScreenActive);
            const isHome = tab.type === "home";
-            const disableClose =
-              (isSplitScreenActive && isActive) || isSplit || isHome;
+            const disableClose = isHome;

            const isDraggingThisTab = dragState.draggedIndex === index;
            const isTheDraggedTab = tab.id === dragState.draggedId;
@@ -428,6 +470,7 @@ export function TopNavbar({
                  WebkitUserSelect: "none",
                  flex: tab.type === "home" ? "0 0 auto" : "1 1 150px",
                  minWidth: tab.type === "home" ? "auto" : "150px",
+                  maxWidth: tab.type === "home" ? "auto" : "450px",
                  display: "flex",
                }}
              >
@@ -473,10 +516,14 @@ export function TopNavbar({
        <div className="flex items-center justify-center gap-2 flex-1 px-2">
          <TabDropdown />

-          <ToolsMenu
-            onOpenSshTools={() => setToolsSheetOpen(true)}
-            onOpenSnippets={() => setSnippetsSidebarOpen(true)}
-          />
+          <Button
+            variant="outline"
+            onClick={() => setToolsSidebarOpen(!toolsSidebarOpen)}
+            className="w-[30px] h-[30px] border-dark-border"
+            title={t("nav.tools")}
+          >
+            <Hammer className="h-4 w-4" />
+          </Button>

          <Button
            variant="outline"
@@ -494,7 +541,7 @@ export function TopNavbar({
          className="fixed top-0 cursor-pointer flex items-center justify-center rounded-bl-md rounded-br-md"
          style={{
            left: leftPosition,
-            right: "17px",
+            right: rightPosition,
            height: "10px",
            zIndex: 9999,
            backgroundColor: "#18181b",
@@ -507,14 +554,22 @@ export function TopNavbar({
      )}

      <SSHToolsSidebar
-        isOpen={toolsSheetOpen}
-        onClose={() => setToolsSheetOpen(false)}
-      />
-
-      <SnippetsSidebar
-        isOpen={snippetsSidebarOpen}
-        onClose={() => setSnippetsSidebarOpen(false)}
-        onExecute={handleSnippetExecute}
+        isOpen={toolsSidebarOpen}
+        onClose={() => setToolsSidebarOpen(false)}
+        onSnippetExecute={handleSnippetExecute}
+        sidebarWidth={rightSidebarWidth}
+        setSidebarWidth={setRightSidebarWidth}
+        initialTab={
+          commandHistoryTabActive
+            ? "command-history"
+            : splitScreenTabActive
+              ? "split-screen"
+              : undefined
+        }
+        onTabChange={() => {
+          setCommandHistoryTabActive(false);
+          setSplitScreenTabActive(false);
+        }}
      />
    </div>
  );
--- a/src/ui/desktop/navigation/animations/SimpleLoader.tsx
+++ b/src/ui/desktop/navigation/animations/SimpleLoader.tsx
@@ -0,0 +1,61 @@
+import React from "react";
+import { cn } from "@/lib/utils.ts";
+
+interface SimpleLoaderProps {
+  visible: boolean;
+  message?: string;
+  className?: string;
+  backgroundColor?: string;
+}
+
+export function SimpleLoader({
+  visible,
+  message,
+  className,
+  backgroundColor,
+}: SimpleLoaderProps) {
+  if (!visible) {
+    return null;
+  }
+
+  return (
+    <>
+      <style>
+        {`
+          @keyframes spin {
+            0% {
+              transform: rotate(0deg);
+            }
+            100% {
+              transform: rotate(360deg);
+            }
+          }
+
+          .simple-spinner {
+            width: 40px;
+            height: 40px;
+            border: 4px solid rgba(255, 255, 255, 0.1);
+            border-top-color: rgba(255, 255, 255, 0.8);
+            border-radius: 50%;
+            animation: spin 0.8s linear infinite;
+          }
+        `}
+      </style>
+
+      <div
+        className={cn(
+          "absolute inset-0 flex items-center justify-center z-50",
+          className,
+        )}
+        style={{ backgroundColor: backgroundColor || "#18181b" }}
+      >
+        <div className="flex flex-col items-center gap-4">
+          <div className="simple-spinner"></div>
+          {message && (
+            <p className="text-sm text-gray-300 font-medium">{message}</p>
+          )}
+        </div>
+      </div>
+    </>
+  );
+}
--- a/src/ui/desktop/navigation/hosts/FolderCard.tsx
+++ b/src/ui/desktop/navigation/hosts/FolderCard.tsx
@@ -1,6 +1,18 @@
 import React, { useState } from "react";
 import { CardTitle } from "@/components/ui/card.tsx";
-import { ChevronDown, Folder } from "lucide-react";
+import {
+  ChevronDown,
+  Folder,
+  Server,
+  Cloud,
+  Database,
+  Box,
+  Package,
+  Layers,
+  Archive,
+  HardDrive,
+  Globe,
+} from "lucide-react";
 import { Button } from "@/components/ui/button.tsx";
 import { Host } from "@/ui/desktop/navigation/hosts/Host.tsx";
 import { Separator } from "@/components/ui/separator.tsx";
@@ -40,11 +52,15 @@ interface FolderCardProps {
  hosts: SSHHost[];
  isFirst: boolean;
  isLast: boolean;
+  folderColor?: string;
+  folderIcon?: string;
 }

 export function FolderCard({
  folderName,
  hosts,
+  folderColor,
+  folderIcon,
 }: FolderCardProps): React.ReactElement {
  const [isExpanded, setIsExpanded] = useState(true);

@@ -52,6 +68,30 @@ export function FolderCard({
    setIsExpanded(!isExpanded);
  };

+  const iconMap: Record<
+    string,
+    React.ComponentType<{
+      size?: number;
+      strokeWidth?: number;
+      className?: string;
+      style?: React.CSSProperties;
+    }>
+  > = {
+    Folder,
+    Server,
+    Cloud,
+    Database,
+    Box,
+    Package,
+    Layers,
+    Archive,
+    HardDrive,
+    Globe,
+  };
+
+  const FolderIcon =
+    folderIcon && iconMap[folderIcon] ? iconMap[folderIcon] : Folder;
+
  return (
    <div className="bg-dark-bg-darker border-2 border-dark-border rounded-lg overflow-hidden p-0 m-0">
      <div
@@ -59,7 +99,11 @@ export function FolderCard({
      >
        <div className="flex gap-2 pr-10">
          <div className="flex-shrink-0 flex items-center">
-            <Folder size={16} strokeWidth={3} />
+            <FolderIcon
+              size={16}
+              strokeWidth={3}
+              style={folderColor ? { color: folderColor } : undefined}
+            />
          </div>
          <div className="flex-1 min-w-0">
            <CardTitle className="mb-0 leading-tight break-words text-md">
--- a/src/ui/desktop/navigation/tabs/Tab.tsx
+++ b/src/ui/desktop/navigation/tabs/Tab.tsx
@@ -27,6 +27,8 @@ interface TabProps {
  disableClose?: boolean;
  isDragging?: boolean;
  isDragOver?: boolean;
+  isValidDropTarget?: boolean;
+  isHoveredDropTarget?: boolean;
 }

 export function Tab({
@@ -44,6 +46,8 @@ export function Tab({
  disableClose = false,
  isDragging = false,
  isDragOver = false,
+  isValidDropTarget = false,
+  isHoveredDropTarget = false,
 }: TabProps): React.ReactElement {
  const { t } = useTranslation();

@@ -54,12 +58,21 @@ export function Tab({
    isDragOver &&
      "bg-background/40 text-muted-foreground border-border opacity-60",
    isDragging && "opacity-70",
+    isHoveredDropTarget &&
+      "bg-blue-500/20 border-blue-500 ring-2 ring-blue-500/50",
+    !isHoveredDropTarget &&
+      isValidDropTarget &&
+      "border-blue-400/50 bg-background/90",
    !isDragOver &&
      !isDragging &&
+      !isValidDropTarget &&
+      !isHoveredDropTarget &&
      isActive &&
      "bg-background text-foreground border-border z-10",
    !isDragOver &&
      !isDragging &&
+      !isValidDropTarget &&
+      !isHoveredDropTarget &&
      !isActive &&
      "bg-background/80 text-muted-foreground border-border hover:bg-background/90",
  );
@@ -130,7 +143,7 @@ export function Tab({
        onClick={!disableActivate ? onActivate : undefined}
        style={{
          marginBottom: "-2px",
-          borderBottom: isActive ? "2px solid white" : "none",
+          borderBottom: isActive || isSplit ? "2px solid white" : "none",
        }}
      >
        <div className="flex items-center gap-1.5 flex-1 min-w-0">
@@ -162,7 +175,10 @@ export function Tab({
            }
          >
            <SeparatorVertical
-              className={cn("h-4 w-4", isSplit && "text-white")}
+              className={cn(
+                "h-4 w-4",
+                isSplit ? "text-white" : "text-muted-foreground",
+              )}
            />
          </Button>
        )}
--- a/src/ui/desktop/navigation/tabs/TabContext.tsx
+++ b/src/ui/desktop/navigation/tabs/TabContext.tsx
@@ -49,13 +49,24 @@ interface TabProviderProps {

 export function TabProvider({ children }: TabProviderProps) {
  const { t } = useTranslation();
-  const [tabs, setTabs] = useState<Tab[]>([
-    { id: 1, type: "home", title: t("nav.home") },
+  const [tabs, setTabs] = useState<Tab[]>(() => [
+    { id: 1, type: "home", title: "Home" },
  ]);
  const [currentTab, setCurrentTab] = useState<number>(1);
  const [allSplitScreenTab, setAllSplitScreenTab] = useState<number[]>([]);
  const nextTabId = useRef(2);

+  // Update home tab title when translation changes
+  React.useEffect(() => {
+    setTabs((prev) =>
+      prev.map((tab) =>
+        tab.id === 1 && tab.type === "home"
+          ? { ...tab, title: t("nav.home") }
+          : tab,
+      ),
+    );
+  }, [t]);
+
  function computeUniqueTitle(
    tabType: Tab["type"],
    desiredTitle: string | undefined,
@@ -156,11 +167,32 @@ export function TabProvider({ children }: TabProviderProps) {
    }

    setTabs((prev) => prev.filter((tab) => tab.id !== tabId));
-    setAllSplitScreenTab((prev) => prev.filter((id) => id !== tabId));
+
+    // Remove from split screen
+    setAllSplitScreenTab((prev) => {
+      const newSplits = prev.filter((id) => id !== tabId);
+      // Auto-clear split mode if only 1 or fewer tabs remain in split
+      if (newSplits.length <= 1) {
+        return [];
+      }
+      return newSplits;
+    });

    if (currentTab === tabId) {
      const remainingTabs = tabs.filter((tab) => tab.id !== tabId);
-      setCurrentTab(remainingTabs.length > 0 ? remainingTabs[0].id : 1);
+      if (remainingTabs.length > 0) {
+        // Try to set current tab to another split tab first, if any remain
+        const remainingSplitTabs = allSplitScreenTab.filter(
+          (id) => id !== tabId,
+        );
+        if (remainingSplitTabs.length > 0) {
+          setCurrentTab(remainingSplitTabs[0]);
+        } else {
+          setCurrentTab(remainingTabs[0].id);
+        }
+      } else {
+        setCurrentTab(1); // Home tab
+      }
    }
  };

@@ -168,7 +200,7 @@ export function TabProvider({ children }: TabProviderProps) {
    setAllSplitScreenTab((prev) => {
      if (prev.includes(tabId)) {
        return prev.filter((id) => id !== tabId);
-      } else if (prev.length < 3) {
+      } else if (prev.length < 4) {
        return [...prev, tabId];
      }
      return prev;
--- a/src/ui/desktop/user/ElectronVersionCheck.tsx
+++ b/src/ui/desktop/user/ElectronVersionCheck.tsx
@@ -35,20 +35,17 @@ export function ElectronVersionCheck({
      const updateInfo = await checkElectronUpdate();
      setVersionInfo(updateInfo);

-      // Get current app version
      const currentVersion = await (window as any).electronAPI?.getAppVersion();
      const dismissedVersion = localStorage.getItem(
        "electron-version-check-dismissed",
      );

-      // If this version was already dismissed, skip the modal
      if (dismissedVersion === currentVersion) {
        onContinue();
        return;
      }

      if (updateInfo?.status === "up_to_date") {
-        // Store this version as checked (but don't show modal since up to date)
        if (currentVersion) {
          localStorage.setItem(
            "electron-version-check-dismissed",
@@ -73,7 +70,6 @@ export function ElectronVersionCheck({
  };

  const handleContinue = async () => {
-    // Store the current version as dismissed
    const currentVersion = await (window as any).electronAPI?.getAppVersion();
    if (currentVersion) {
      localStorage.setItem("electron-version-check-dismissed", currentVersion);
--- a/src/ui/desktop/user/LanguageSwitcher.tsx
+++ b/src/ui/desktop/user/LanguageSwitcher.tsx
@@ -19,6 +19,7 @@ const languages = [
    nativeName: "Português Brasileiro",
  },
  { code: "ru", name: "Russian", nativeName: "Русский" },
+  { code: "fr", name: "French", nativeName: "Français" },
 ];

 export function LanguageSwitcher() {
--- a/src/ui/desktop/user/UserProfile.tsx
+++ b/src/ui/desktop/user/UserProfile.tsx
@@ -10,6 +10,7 @@ import {
  TabsTrigger,
 } from "@/components/ui/tabs.tsx";
 import { Separator } from "@/components/ui/separator.tsx";
+import { Switch } from "@/components/ui/switch.tsx";
 import { User, Shield, AlertCircle } from "lucide-react";
 import { TOTPSetup } from "@/ui/desktop/user/TOTPSetup.tsx";
 import {
@@ -26,6 +27,8 @@ import { useSidebar } from "@/components/ui/sidebar.tsx";

 interface UserProfileProps {
  isTopbarOpen?: boolean;
+  rightSidebarOpen?: boolean;
+  rightSidebarWidth?: number;
 }

 async function handleLogout() {
@@ -54,7 +57,9 @@ async function handleLogout() {
              },
              serverOrigin,
            );
-          } catch (err) {}
+          } catch (err) {
+            console.error("User profile operation failed:", err);
+          }
        }
      }
    }
@@ -66,13 +71,18 @@ async function handleLogout() {
  }
 }

-export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
+export function UserProfile({
+  isTopbarOpen = true,
+  rightSidebarOpen = false,
+  rightSidebarWidth = 400,
+}: UserProfileProps) {
  const { t } = useTranslation();
  const { state: sidebarState } = useSidebar();
  const [userInfo, setUserInfo] = useState<{
    username: string;
    is_admin: boolean;
    is_oidc: boolean;
+    is_dual_auth: boolean;
    totp_enabled: boolean;
  } | null>(null);
  const [loading, setLoading] = useState(true);
@@ -85,6 +95,12 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
  const [deletePassword, setDeletePassword] = useState("");
  const [deleteLoading, setDeleteLoading] = useState(false);
  const [deleteError, setDeleteError] = useState<string | null>(null);
+  const [fileColorCoding, setFileColorCoding] = useState<boolean>(
+    localStorage.getItem("fileColorCoding") !== "false",
+  );
+  const [commandAutocomplete, setCommandAutocomplete] = useState<boolean>(
+    localStorage.getItem("commandAutocomplete") !== "false",
+  );

  useEffect(() => {
    fetchUserInfo();
@@ -110,6 +126,7 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
        username: info.username,
        is_admin: info.is_admin,
        is_oidc: info.is_oidc,
+        is_dual_auth: info.is_dual_auth || false,
        totp_enabled: info.totp_enabled || false,
      });
    } catch (err: unknown) {
@@ -126,6 +143,17 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
    }
  };

+  const handleFileColorCodingToggle = (enabled: boolean) => {
+    setFileColorCoding(enabled);
+    localStorage.setItem("fileColorCoding", enabled.toString());
+    window.dispatchEvent(new Event("fileColorCodingChanged"));
+  };
+
+  const handleCommandAutocompleteToggle = (enabled: boolean) => {
+    setCommandAutocomplete(enabled);
+    localStorage.setItem("commandAutocomplete", enabled.toString());
+  };
+
  const handleDeleteAccount = async (e: React.FormEvent) => {
    e.preventDefault();
    setDeleteLoading(true);
@@ -154,10 +182,14 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
  const bottomMarginPx = 8;
  const wrapperStyle: React.CSSProperties = {
    marginLeft: leftMarginPx,
-    marginRight: 17,
+    marginRight: rightSidebarOpen
+      ? `calc(var(--right-sidebar-width, ${rightSidebarWidth}px) + 8px)`
+      : 17,
    marginTop: topMarginPx,
    marginBottom: bottomMarginPx,
    height: `calc(100vh - ${topMarginPx + bottomMarginPx}px)`,
+    transition:
+      "margin-left 200ms linear, margin-right 200ms linear, margin-top 200ms linear",
  };

  if (loading) {
@@ -233,7 +265,7 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
                  <User className="w-4 h-4" />
                  {t("nav.userProfile")}
                </TabsTrigger>
-                {!userInfo.is_oidc && (
+                {(!userInfo.is_oidc || userInfo.is_dual_auth) && (
                  <TabsTrigger
                    value="security"
                    className="flex items-center gap-2 data-[state=active]:bg-dark-bg-button"
@@ -273,9 +305,11 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
                        {t("profile.authMethod")}
                      </Label>
                      <p className="text-lg font-medium mt-1 text-white">
-                        {userInfo.is_oidc
-                          ? t("profile.external")
-                          : t("profile.local")}
+                        {userInfo.is_dual_auth
+                          ? t("profile.externalAndLocal")
+                          : userInfo.is_oidc
+                            ? t("profile.external")
+                            : t("profile.local")}
                      </p>
                    </div>
                    <div>
@@ -283,7 +317,7 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
                        {t("profile.twoFactorAuth")}
                      </Label>
                      <p className="text-lg font-medium mt-1">
-                        {userInfo.is_oidc ? (
+                        {userInfo.is_oidc && !userInfo.is_dual_auth ? (
                          <span className="text-gray-400">
                            {t("auth.lockedOidcAuth")}
                          </span>
@@ -323,6 +357,40 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
                    </div>
                  </div>

+                  <div className="mt-6 pt-6 border-t border-dark-border">
+                    <div className="flex items-center justify-between">
+                      <div>
+                        <Label className="text-gray-300">
+                          {t("profile.fileColorCoding")}
+                        </Label>
+                        <p className="text-sm text-gray-400 mt-1">
+                          {t("profile.fileColorCodingDesc")}
+                        </p>
+                      </div>
+                      <Switch
+                        checked={fileColorCoding}
+                        onCheckedChange={handleFileColorCodingToggle}
+                      />
+                    </div>
+                  </div>
+
+                  <div className="mt-6 pt-6 border-t border-dark-border">
+                    <div className="flex items-center justify-between">
+                      <div>
+                        <Label className="text-gray-300">
+                          {t("profile.commandAutocomplete")}
+                        </Label>
+                        <p className="text-sm text-gray-400 mt-1">
+                          {t("profile.commandAutocompleteDesc")}
+                        </p>
+                      </div>
+                      <Switch
+                        checked={commandAutocomplete}
+                        onCheckedChange={handleCommandAutocompleteToggle}
+                      />
+                    </div>
+                  </div>
+
                  <div className="mt-6 pt-6 border-t border-dark-border">
                    <div className="flex items-center justify-between">
                      <div>
@@ -353,7 +421,9 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
                  onStatusChange={handleTOTPStatusChange}
                />

-                {!userInfo.is_oidc && <PasswordReset userInfo={userInfo} />}
+                {(!userInfo.is_oidc || userInfo.is_dual_auth) && (
+                  <PasswordReset userInfo={userInfo} />
+                )}
              </TabsContent>
            </Tabs>
          </div>
@@ -398,7 +468,7 @@ export function UserProfile({ isTopbarOpen = true }: UserProfileProps) {
              <div className="space-y-4">
                <div className="text-sm text-gray-300">
                  {t("leftSidebar.deleteAccountWarning")}
-                  <Alert variant="destructive">
+                  <Alert variant="destructive" className="mb-5 mt-5">
                    <AlertTitle>{t("common.warning")}</AlertTitle>
                    <AlertDescription>
                      {t("leftSidebar.deleteAccountWarningDetails")}
--- a/src/ui/hooks/useCommandHistory.ts
+++ b/src/ui/hooks/useCommandHistory.ts
@@ -0,0 +1,126 @@
+import { useState, useEffect, useCallback, useRef } from "react";
+import { getCommandHistory, saveCommandToHistory } from "@/ui/main-axios.ts";
+
+interface UseCommandHistoryOptions {
+  hostId?: number;
+  enabled?: boolean;
+}
+
+interface CommandHistoryResult {
+  suggestions: string[];
+  getSuggestions: (input: string) => string[];
+  saveCommand: (command: string) => Promise<void>;
+  clearSuggestions: () => void;
+  isLoading: boolean;
+}
+
+export function useCommandHistory({
+  hostId,
+  enabled = true,
+}: UseCommandHistoryOptions): CommandHistoryResult {
+  const [commandHistory, setCommandHistory] = useState<string[]>([]);
+  const [suggestions, setSuggestions] = useState<string[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const historyCache = useRef<Map<number, string[]>>(new Map());
+  s;
+  useEffect(() => {
+    if (!enabled || !hostId) {
+      setCommandHistory([]);
+      setSuggestions([]);
+      return;
+    }
+
+    const cached = historyCache.current.get(hostId);
+    if (cached) {
+      setCommandHistory(cached);
+      return;
+    }
+
+    const fetchHistory = async () => {
+      setIsLoading(true);
+      try {
+        const history = await getCommandHistory(hostId);
+        setCommandHistory(history);
+        historyCache.current.set(hostId, history);
+      } catch (error) {
+        console.error("Failed to fetch command history:", error);
+        setCommandHistory([]);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    fetchHistory();
+  }, [hostId, enabled]);
+
+  const getSuggestions = useCallback(
+    (input: string): string[] => {
+      if (!input || input.trim().length === 0) {
+        return [];
+      }
+
+      const trimmedInput = input.trim();
+      const matches = commandHistory.filter((cmd) =>
+        cmd.startsWith(trimmedInput),
+      );
+
+      const filtered = matches
+        .filter((cmd) => cmd !== trimmedInput)
+        .slice(0, 10);
+
+      setSuggestions(filtered);
+      return filtered;
+    },
+    [commandHistory],
+  );
+
+  const saveCommand = useCallback(
+    async (command: string) => {
+      if (!enabled || !hostId || !command || command.trim().length === 0) {
+        return;
+      }
+
+      const trimmedCommand = command.trim();
+
+      if (commandHistory.length > 0 && commandHistory[0] === trimmedCommand) {
+        return;
+      }
+
+      try {
+        await saveCommandToHistory(hostId, trimmedCommand);
+
+        setCommandHistory((prev) => {
+          const newHistory = [
+            trimmedCommand,
+            ...prev.filter((c) => c !== trimmedCommand),
+          ];
+          const limited = newHistory.slice(0, 500);
+          historyCache.current.set(hostId, limited);
+          return limited;
+        });
+      } catch (error) {
+        console.error("Failed to save command to history:", error);
+        setCommandHistory((prev) => {
+          const newHistory = [
+            trimmedCommand,
+            ...prev.filter((c) => c !== trimmedCommand),
+          ];
+          return newHistory.slice(0, 500);
+        });
+      }
+    },
+    [enabled, hostId, commandHistory],
+  );
+
+  const clearSuggestions = useCallback(() => {
+    setSuggestions([]);
+  }, []);
+
+  return {
+    suggestions,
+    getSuggestions,
+    saveCommand,
+    clearSuggestions,
+    isLoading,
+  };
+}
--- a/src/ui/hooks/useCommandTracker.ts
+++ b/src/ui/hooks/useCommandTracker.ts
@@ -0,0 +1,111 @@
+import { useRef, useCallback } from "react";
+import { saveCommandToHistory } from "@/ui/main-axios.ts";
+
+interface UseCommandTrackerOptions {
+  hostId?: number;
+  enabled?: boolean;
+  onCommandExecuted?: (command: string) => void;
+}
+
+interface CommandTrackerResult {
+  trackInput: (data: string) => void;
+  getCurrentCommand: () => string;
+  clearCurrentCommand: () => void;
+  updateCurrentCommand: (command: string) => void;
+}
+
+export function useCommandTracker({
+  hostId,
+  enabled = true,
+  onCommandExecuted,
+}: UseCommandTrackerOptions): CommandTrackerResult {
+  const currentCommandRef = useRef<string>("");
+  const isInEscapeSequenceRef = useRef<boolean>(false);
+
+  const trackInput = useCallback(
+    (data: string) => {
+      if (!enabled || !hostId) {
+        return;
+      }
+
+      for (let i = 0; i < data.length; i++) {
+        const char = data[i];
+        const charCode = char.charCodeAt(0);
+
+        if (charCode === 27) {
+          isInEscapeSequenceRef.current = true;
+          continue;
+        }
+
+        if (isInEscapeSequenceRef.current) {
+          if (
+            (charCode >= 65 && charCode <= 90) ||
+            (charCode >= 97 && charCode <= 122) ||
+            charCode === 126 // ~
+          ) {
+            isInEscapeSequenceRef.current = false;
+          }
+          continue;
+        }
+
+        if (charCode === 13 || charCode === 10) {
+          const command = currentCommandRef.current.trim();
+
+          if (command.length > 0) {
+            saveCommandToHistory(hostId, command).catch((error) => {
+              console.error("Failed to save command to history:", error);
+            });
+
+            if (onCommandExecuted) {
+              onCommandExecuted(command);
+            }
+          }
+
+          currentCommandRef.current = "";
+          continue;
+        }
+
+        if (charCode === 8 || charCode === 127) {
+          if (currentCommandRef.current.length > 0) {
+            currentCommandRef.current = currentCommandRef.current.slice(0, -1);
+          }
+          continue;
+        }
+
+        if (charCode === 3 || charCode === 4) {
+          currentCommandRef.current = "";
+          continue;
+        }
+
+        if (charCode === 21) {
+          currentCommandRef.current = "";
+          continue;
+        }
+
+        if (charCode >= 32 && charCode <= 126) {
+          currentCommandRef.current += char;
+        }
+      }
+    },
+    [enabled, hostId, onCommandExecuted],
+  );
+
+  const getCurrentCommand = useCallback(() => {
+    return currentCommandRef.current;
+  }, []);
+
+  const clearCurrentCommand = useCallback(() => {
+    currentCommandRef.current = "";
+  }, []);
+
+  const updateCurrentCommand = useCallback((command: string) => {
+    currentCommandRef.current = command;
+  }, []);
+
+  return {
+    trackInput,
+    getCurrentCommand,
+    clearCurrentCommand,
+    updateCurrentCommand,
+  };
+}
--- a/src/ui/hooks/useDragToSystemDesktop.ts
+++ b/src/ui/hooks/useDragToSystemDesktop.ts
@@ -48,7 +48,9 @@ export function useDragToSystemDesktop({ sshSessionId }: UseDragToSystemProps) {
          store.put({ handle: dirHandle }, "lastSaveDir");
        };
      }
-    } catch {}
+    } catch (error) {
+      console.error("Drag operation failed:", error);
+    }
  };

  const isFileSystemAPISupported = () => {
--- a/src/ui/main-axios.ts
+++ b/src/ui/main-axios.ts
@@ -2,6 +2,7 @@ import axios, { AxiosError, type AxiosInstance } from "axios";
 import type {
  SSHHost,
  SSHHostData,
+  SSHFolder,
  TunnelConfig,
  TunnelStatus,
  FileManagerFile,
@@ -76,6 +77,7 @@ interface UserInfo {
  is_admin: boolean;
  is_oidc: boolean;
  data_unlocked: boolean;
+  password_hash?: string;
 }

 interface UserCount {
@@ -136,9 +138,58 @@ function getLoggerForService(serviceName: string) {
  }
 }

+const electronSettingsCache = new Map<string, string>();
+
+if (isElectron()) {
+  (async () => {
+    try {
+      const electronAPI = (
+        window as Window &
+          typeof globalThis & {
+            electronAPI?: any;
+          }
+      ).electronAPI;
+
+      if (electronAPI?.getSetting) {
+        const settingsToLoad = ["rightClickCopyPaste", "jwt"];
+        for (const key of settingsToLoad) {
+          const value = await electronAPI.getSetting(key);
+          if (value !== null && value !== undefined) {
+            electronSettingsCache.set(key, value);
+            localStorage.setItem(key, value);
+          }
+        }
+      }
+    } catch (error) {
+      console.error("[Electron] Failed to load settings cache:", error);
+    }
+  })();
+}
+
 export function setCookie(name: string, value: string, days = 7): void {
  if (isElectron()) {
-    localStorage.setItem(name, value);
+    try {
+      electronSettingsCache.set(name, value);
+
+      localStorage.setItem(name, value);
+
+      const electronAPI = (
+        window as Window &
+          typeof globalThis & {
+            electronAPI?: any;
+          }
+      ).electronAPI;
+
+      if (electronAPI?.setSetting) {
+        electronAPI.setSetting(name, value).catch((err: Error) => {
+          console.error(`[Electron] Failed to persist setting ${name}:`, err);
+        });
+      }
+
+      console.log(`[Electron] Set setting: ${name} = ${value}`);
+    } catch (error) {
+      console.error(`[Electron] Failed to set setting: ${name}`, error);
+    }
  } else {
    const expires = new Date(Date.now() + days * 864e5).toUTCString();
    document.cookie = `${name}=${encodeURIComponent(value)}; expires=${expires}; path=/`;
@@ -147,8 +198,21 @@ export function setCookie(name: string, value: string, days = 7): void {

 export function getCookie(name: string): string | undefined {
  if (isElectron()) {
-    const token = localStorage.getItem(name) || undefined;
-    return token;
+    try {
+      if (electronSettingsCache.has(name)) {
+        return electronSettingsCache.get(name);
+      }
+
+      const token = localStorage.getItem(name) || undefined;
+      if (token) {
+        electronSettingsCache.set(name, token);
+      }
+      console.log(`[Electron] Get setting: ${name} = ${token}`);
+      return token;
+    } catch (error) {
+      console.error(`[Electron] Failed to get setting: ${name}`, error);
+      return undefined;
+    }
  } else {
    const value = `; ${document.cookie}`;
    const parts = value.split(`; ${name}=`);
@@ -318,34 +382,30 @@ function createApiInstance(
        const errorMessage = (error.response?.data as Record<string, unknown>)
          ?.error;
        const isSessionExpired = errorCode === "SESSION_EXPIRED";
+        const isSessionNotFound = errorCode === "SESSION_NOT_FOUND";
        const isInvalidToken =
          errorCode === "AUTH_REQUIRED" ||
          errorMessage === "Invalid token" ||
          errorMessage === "Authentication required";

-        if (isElectron()) {
+        if (isSessionExpired || isSessionNotFound || isInvalidToken) {
          localStorage.removeItem("jwt");
-        } else {
-          localStorage.removeItem("jwt");
-        }

-        if (
-          (isSessionExpired || isInvalidToken) &&
-          typeof window !== "undefined"
-        ) {
-          console.warn(
-            "Session expired or invalid token - please log in again",
-          );
+          if (isElectron()) {
+            electronSettingsCache.delete("jwt");
+          }

-          document.cookie =
-            "jwt=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+          if (typeof window !== "undefined") {
+            document.cookie =
+              "jwt=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+          }

-          import("sonner").then(({ toast }) => {
-            toast.warning("Session expired. Please log in again.");
-            window.location.reload();
-          });
-
-          setTimeout(() => window.location.reload(), 1000);
+          if (isSessionExpired && typeof window !== "undefined") {
+            console.warn("Session expired - please log in again");
+            import("sonner").then(({ toast }) => {
+              toast.warning("Session expired. Please log in again.");
+            });
+          }
        }
      }

@@ -792,11 +852,14 @@ export async function createSSHHost(hostData: SSHHostData): Promise<SSHHost> {
      keyType: hostData.authType === "key" ? hostData.keyType : null,
      credentialId:
        hostData.authType === "credential" ? hostData.credentialId : null,
+      overrideCredentialUsername: Boolean(hostData.overrideCredentialUsername),
      enableTerminal: Boolean(hostData.enableTerminal),
      enableTunnel: Boolean(hostData.enableTunnel),
      enableFileManager: Boolean(hostData.enableFileManager),
      defaultPath: hostData.defaultPath || "/",
      tunnelConnections: hostData.tunnelConnections || [],
+      jumpHosts: hostData.jumpHosts || [],
+      quickActions: hostData.quickActions || [],
      statsConfig: hostData.statsConfig
        ? typeof hostData.statsConfig === "string"
          ? hostData.statsConfig
@@ -855,11 +918,14 @@ export async function updateSSHHost(
      keyType: hostData.authType === "key" ? hostData.keyType : null,
      credentialId:
        hostData.authType === "credential" ? hostData.credentialId : null,
+      overrideCredentialUsername: Boolean(hostData.overrideCredentialUsername),
      enableTerminal: Boolean(hostData.enableTerminal),
      enableTunnel: Boolean(hostData.enableTunnel),
      enableFileManager: Boolean(hostData.enableFileManager),
      defaultPath: hostData.defaultPath || "/",
      tunnelConnections: hostData.tunnelConnections || [],
+      jumpHosts: hostData.jumpHosts || [],
+      quickActions: hostData.quickActions || [],
      statsConfig: hostData.statsConfig
        ? typeof hostData.statsConfig === "string"
          ? hostData.statsConfig
@@ -1515,11 +1581,149 @@ export async function moveSSHItem(
  }
 }

+export async function changeSSHPermissions(
+  sessionId: string,
+  path: string,
+  permissions: string,
+  hostId?: number,
+  userId?: string,
+): Promise<{ success: boolean; message: string }> {
+  try {
+    fileLogger.info("Changing SSH file permissions", {
+      operation: "change_permissions",
+      sessionId,
+      path,
+      permissions,
+      hostId,
+      userId,
+    });
+
+    const response = await fileManagerApi.post("/ssh/changePermissions", {
+      sessionId,
+      path,
+      permissions,
+      hostId,
+      userId,
+    });
+
+    fileLogger.success("SSH file permissions changed successfully", {
+      operation: "change_permissions",
+      sessionId,
+      path,
+      permissions,
+    });
+
+    return response.data;
+  } catch (error) {
+    fileLogger.error("Failed to change SSH file permissions", error, {
+      operation: "change_permissions",
+      sessionId,
+      path,
+      permissions,
+    });
+    handleApiError(error, "change SSH permissions");
+    throw error;
+  }
+}
+
+export async function extractSSHArchive(
+  sessionId: string,
+  archivePath: string,
+  extractPath?: string,
+  hostId?: number,
+  userId?: string,
+): Promise<{ success: boolean; message: string; extractPath: string }> {
+  try {
+    fileLogger.info("Extracting archive", {
+      operation: "extract_archive",
+      sessionId,
+      archivePath,
+      extractPath,
+      hostId,
+      userId,
+    });
+
+    const response = await fileManagerApi.post("/ssh/extractArchive", {
+      sessionId,
+      archivePath,
+      extractPath,
+      hostId,
+      userId,
+    });
+
+    fileLogger.success("Archive extracted successfully", {
+      operation: "extract_archive",
+      sessionId,
+      archivePath,
+      extractPath: response.data.extractPath,
+    });
+
+    return response.data;
+  } catch (error) {
+    fileLogger.error("Failed to extract archive", error, {
+      operation: "extract_archive",
+      sessionId,
+      archivePath,
+      extractPath,
+    });
+    handleApiError(error, "extract archive");
+    throw error;
+  }
+}
+
+export async function compressSSHFiles(
+  sessionId: string,
+  paths: string[],
+  archiveName: string,
+  format?: string,
+  hostId?: number,
+  userId?: string,
+): Promise<{ success: boolean; message: string; archivePath: string }> {
+  try {
+    fileLogger.info("Compressing files", {
+      operation: "compress_files",
+      sessionId,
+      paths,
+      archiveName,
+      format,
+      hostId,
+      userId,
+    });
+
+    const response = await fileManagerApi.post("/ssh/compressFiles", {
+      sessionId,
+      paths,
+      archiveName,
+      format: format || "zip",
+      hostId,
+      userId,
+    });
+
+    fileLogger.success("Files compressed successfully", {
+      operation: "compress_files",
+      sessionId,
+      paths,
+      archivePath: response.data.archivePath,
+    });
+
+    return response.data;
+  } catch (error) {
+    fileLogger.error("Failed to compress files", error, {
+      operation: "compress_files",
+      sessionId,
+      paths,
+      archiveName,
+      format,
+    });
+    handleApiError(error, "compress files");
+    throw error;
+  }
+}
+
 // ============================================================================
 // FILE MANAGER DATA
 // ============================================================================

-// Recent Files
 export async function getRecentFiles(
  hostId: number,
 ): Promise<Record<string, unknown>> {
@@ -1698,11 +1902,20 @@ export async function refreshServerPolling(): Promise<void> {
  try {
    await statsApi.post("/refresh");
  } catch (error) {
-    // Silently fail - this is a background operation
    console.warn("Failed to refresh server polling:", error);
  }
 }

+export async function notifyHostCreatedOrUpdated(
+  hostId: number,
+): Promise<void> {
+  try {
+    await statsApi.post("/host-updated", { hostId });
+  } catch (error) {
+    console.warn("Failed to notify stats server of host update:", error);
+  }
+}
+
 // ============================================================================
 // AUTHENTICATION
 // ============================================================================
@@ -2406,6 +2619,92 @@ export async function renameFolder(
  }
 }

+export async function getSSHFolders(): Promise<SSHFolder[]> {
+  try {
+    sshLogger.info("Fetching SSH folders", {
+      operation: "fetch_ssh_folders",
+    });
+
+    const response = await authApi.get("/ssh/folders");
+
+    sshLogger.success("SSH folders fetched successfully", {
+      operation: "fetch_ssh_folders",
+      count: response.data.length,
+    });
+
+    return response.data;
+  } catch (error) {
+    sshLogger.error("Failed to fetch SSH folders", error, {
+      operation: "fetch_ssh_folders",
+    });
+    handleApiError(error, "fetch SSH folders");
+    throw error;
+  }
+}
+
+export async function updateFolderMetadata(
+  name: string,
+  color?: string,
+  icon?: string,
+): Promise<void> {
+  try {
+    sshLogger.info("Updating folder metadata", {
+      operation: "update_folder_metadata",
+      name,
+      color,
+      icon,
+    });
+
+    await authApi.put("/ssh/folders/metadata", {
+      name,
+      color,
+      icon,
+    });
+
+    sshLogger.success("Folder metadata updated successfully", {
+      operation: "update_folder_metadata",
+      name,
+    });
+  } catch (error) {
+    sshLogger.error("Failed to update folder metadata", error, {
+      operation: "update_folder_metadata",
+      name,
+    });
+    handleApiError(error, "update folder metadata");
+    throw error;
+  }
+}
+
+export async function deleteAllHostsInFolder(
+  folderName: string,
+): Promise<{ deletedCount: number }> {
+  try {
+    sshLogger.info("Deleting all hosts in folder", {
+      operation: "delete_folder_hosts",
+      folderName,
+    });
+
+    const response = await authApi.delete(
+      `/ssh/folders/${encodeURIComponent(folderName)}/hosts`,
+    );
+
+    sshLogger.success("All hosts in folder deleted successfully", {
+      operation: "delete_folder_hosts",
+      folderName,
+      deletedCount: response.data.deletedCount,
+    });
+
+    return response.data;
+  } catch (error) {
+    sshLogger.error("Failed to delete hosts in folder", error, {
+      operation: "delete_folder_hosts",
+      folderName,
+    });
+    handleApiError(error, "delete hosts in folder");
+    throw error;
+  }
+}
+
 export async function renameCredentialFolder(
  oldName: string,
  newName: string,
@@ -2560,6 +2859,97 @@ export async function deleteSnippet(
  }
 }

+export async function executeSnippet(
+  snippetId: number,
+  hostId: number,
+): Promise<{ success: boolean; output: string; error?: string }> {
+  try {
+    const response = await authApi.post("/snippets/execute", {
+      snippetId,
+      hostId,
+    });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "execute snippet");
+  }
+}
+
+export async function reorderSnippets(
+  snippets: Array<{ id: number; order: number; folder?: string }>,
+): Promise<{ success: boolean; updated: number }> {
+  try {
+    const response = await authApi.put("/snippets/reorder", { snippets });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "reorder snippets");
+  }
+}
+
+export async function getSnippetFolders(): Promise<Record<string, unknown>> {
+  try {
+    const response = await authApi.get("/snippets/folders");
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "fetch snippet folders");
+  }
+}
+
+export async function createSnippetFolder(folderData: {
+  name: string;
+  color?: string;
+  icon?: string;
+}): Promise<Record<string, unknown>> {
+  try {
+    const response = await authApi.post("/snippets/folders", folderData);
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "create snippet folder");
+  }
+}
+
+export async function updateSnippetFolderMetadata(
+  folderName: string,
+  metadata: { color?: string; icon?: string },
+): Promise<Record<string, unknown>> {
+  try {
+    const response = await authApi.put(
+      `/snippets/folders/${encodeURIComponent(folderName)}/metadata`,
+      metadata,
+    );
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "update snippet folder metadata");
+  }
+}
+
+export async function renameSnippetFolder(
+  oldName: string,
+  newName: string,
+): Promise<{ success: boolean; oldName: string; newName: string }> {
+  try {
+    const response = await authApi.put("/snippets/folders/rename", {
+      oldName,
+      newName,
+    });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "rename snippet folder");
+  }
+}
+
+export async function deleteSnippetFolder(
+  folderName: string,
+): Promise<{ success: boolean }> {
+  try {
+    const response = await authApi.delete(
+      `/snippets/folders/${encodeURIComponent(folderName)}`,
+    );
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "delete snippet folder");
+  }
+}
+
 // ============================================================================
 // HOMEPAGE API
 // ============================================================================
@@ -2626,3 +3016,96 @@ export async function resetRecentActivity(): Promise<{ message: string }> {
    throw handleApiError(error, "reset recent activity");
  }
 }
+
+// ============================================================================
+// COMMAND HISTORY API
+// ============================================================================
+
+export async function saveCommandToHistory(
+  hostId: number,
+  command: string,
+): Promise<{ id: number; command: string; executedAt: string }> {
+  try {
+    const response = await authApi.post("/terminal/command_history", {
+      hostId,
+      command,
+    });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "save command to history");
+  }
+}
+
+export async function getCommandHistory(
+  hostId: number,
+  limit: number = 100,
+): Promise<string[]> {
+  try {
+    const response = await authApi.get(`/terminal/command_history/${hostId}`, {
+      params: { limit },
+    });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "fetch command history");
+  }
+}
+
+export async function deleteCommandFromHistory(
+  hostId: number,
+  command: string,
+): Promise<{ success: boolean }> {
+  try {
+    const response = await authApi.post("/terminal/command_history/delete", {
+      hostId,
+      command,
+    });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "delete command from history");
+  }
+}
+
+export async function clearCommandHistory(
+  hostId: number,
+): Promise<{ success: boolean }> {
+  try {
+    const response = await authApi.delete(
+      `/terminal/command_history/${hostId}`,
+    );
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "clear command history");
+  }
+}
+
+// ============================================================================
+// OIDC ACCOUNT LINKING
+// ============================================================================
+
+export async function linkOIDCToPasswordAccount(
+  oidcUserId: string,
+  targetUsername: string,
+): Promise<{ success: boolean; message: string }> {
+  try {
+    const response = await authApi.post("/users/link-oidc-to-password", {
+      oidcUserId,
+      targetUsername,
+    });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "link OIDC account to password account");
+  }
+}
+
+export async function unlinkOIDCFromPasswordAccount(
+  userId: string,
+): Promise<{ success: boolean; message: string }> {
+  try {
+    const response = await authApi.post("/users/unlink-oidc-from-password", {
+      userId,
+    });
+    return response.data;
+  } catch (error) {
+    throw handleApiError(error, "unlink OIDC from password account");
+  }
+}
--- a/Show More
+++ b/Show More