fix: title bar buttons unresponsive on windows in integrated mode

Introduced a new configuration setting allowing users to choose between:
1. Native: Standard OS title bar with the tab bar rendered below it.
2. Integrated: Custom title bar with Mac-style controls and embedded tabs.

Updated:
- ConfigFile/Store to include title_bar_style (defaulting to Native).
- localization files for English and Chinese with 'Restart required' hints.
- Settings dialog with a new dropdown in the Appearance group.
- Startup and UI logic to handle conditional title bar and tab bar rendering.
- UI now uses the title bar style detected at startup to ensure consistency
  until the application is restarted.
- Restored Windows app icon loading in startup.rs.
- Fixed Native mode layout to match previous standard behavior.

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
   workflow_dispatch:
 
 permissions:
-  contents: write   # needed to create / update the GitHub Release
+  contents: write # needed to create / update the GitHub Release
 
 jobs:
   build:
@@ -26,15 +26,15 @@ jobs:
             target: x86_64-pc-windows-msvc
             name: windows-x86_64
             bin: ashell.exe
-          - os: ubuntu-22.04            # build on the oldest supported runner for broader glibc compatibility
+          - os: ubuntu-22.04 # build on the oldest supported runner for broader glibc compatibility
             target: x86_64-unknown-linux-gnu
             name: linux-x86_64
             bin: ashell
-          - os: macos-14               # Apple Silicon
+          - os: macos-14 # Apple Silicon
             target: aarch64-apple-darwin
             name: macos-aarch64
             bin: ashell
-          - os: macos-14               # Intel (cross-compiled from Apple Silicon to avoid queue delays)
+          - os: macos-14 # Intel (cross-compiled from Apple Silicon to avoid queue delays)
             target: x86_64-apple-darwin
             name: macos-x86_64
             bin: ashell
@@ -80,7 +80,7 @@ jobs:
             # Note: We build the bundle manually here rather than running
             # scripts/package-macos-app.sh, because that script runs `cargo build`
             # without respecting the `--target` flag from the matrix.
-            
+
             APP="ashell.app"
             CONTENTS="$APP/Contents"
             mkdir -p "$CONTENTS/MacOS" "$CONTENTS/Resources"
@@ -168,3 +168,84 @@ jobs:
           files: dist/**/*
           generate_release_notes: true
           fail_on_unmatched_files: true
+
+  cask:
+    name: Update Homebrew Cask
+    needs: publish
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Homebrew Tap
+        uses: actions/checkout@v4
+        with:
+          repository: rust-kotlin/homebrew-taps
+          token: ${{ secrets.TAP_GITHUB_TOKEN }}
+          path: tap
+
+      - name: Download all macOS artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: macos-*
+          path: dist
+
+      - name: Update Cask
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          SHA_ARM=$(sha256sum dist/macos-aarch64/*.zip | cut -d' ' -f1)
+          SHA_INTEL=$(sha256sum dist/macos-x86_64/*.zip | cut -d' ' -f1)
+
+          mkdir -p tap/Casks
+          CASK_FILE="tap/Casks/ashell.rb"
+
+          cat > "$CASK_FILE" <<EOF
+          cask "ashell" do
+            version "${VERSION}"
+
+            on_arm do
+              sha256 "${SHA_ARM}"
+              url "https://github.com/rust-kotlin/ashell/releases/download/v#{version}/ashell-v#{version}-macos-aarch64.zip"
+            end
+            on_intel do
+              sha256 "${SHA_INTEL}"
+              url "https://github.com/rust-kotlin/ashell/releases/download/v#{version}/ashell-v#{version}-macos-x86_64.zip"
+            end
+
+            name "ashell"
+            desc "ashell is a modern, fast, GPUI Component-based desktop terminal client written in Rust."
+            homepage "https://github.com/rust-kotlin/ashell"
+
+            app "ashell.app"
+
+            postflight do
+              puts "Removing quarantine flag from ashell.app..."
+              system_command "/usr/bin/xattr",
+                             args: ["-rd", "com.apple.quarantine", "#{appdir}/ashell.app"],
+                             sudo: true
+            end
+
+            caveats <<~EOS
+              ashell uses ad-hoc signing. The installation includes a postflight script
+              that removes the 'com.apple.quarantine' attribute from the application
+              to allow it to run. This will require your administrator password.
+
+              ashell 采用本地签名。安装程序包含一个后置脚本，用于移除应用程序的
+              'com.apple.quarantine' 属性以允许其运行。这需要您的管理员密码。
+            EOS
+          end
+          EOF
+          # Remove the 10 leading spaces added for YAML formatting
+          sed -i 's/^          //' "$CASK_FILE"
+
+      - name: Commit and Push
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          cd tap
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          if [[ -n $(git status -s) ]]; then
+            git add Casks/ashell.rb
+            git commit -m "chore: bump ashell to v${VERSION}"
+            git push
+          else
+            echo "No changes to commit"
+          fi

Cargo.lock

@@ -303,7 +303,7 @@ dependencies = [
 
 [[package]]
 name = "ashell"
-version = "0.4.1"
+version = "0.4.6"
 dependencies = [
  "alacritty_terminal",
  "anyhow",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ashell"
-version = "0.4.1"
+version = "0.4.6"
 edition = "2024"
 authors = ["ashell contributors"]
 description = "A GPUI Component based SSH and local terminal client"

README.en.md

@@ -8,15 +8,15 @@
 
 This project focuses on providing a high-performance and visually appealing shell workspace by combining local and remote environments with a rich set of built-in features. 
 
-## 🚀 v0.3 Massive Update!
+## 🚀 v0.4 Major Upgrades
 
-The brand-new v0.3 introduces comprehensive upgrades to both architecture and user experience:
-- ✨ **Global Real-Time Font Settings** (Thanks to [@ancion](https://github.com/ancion) for [PR #6](https://github.com/rust-kotlin/ashell/pull/6)): Customize your global UI fonts and terminal rendering fonts independently. Adjust text size in real-time with automatic persistence.
-- ✨ **Concurrent SFTP Transfers**: A dedicated Transfers dialog now supports highly optimized, concurrent file uploads and downloads with precise progress display.
-- ✨ **Persistent Workspace State**: Your sidebar width adjustments, terminal themes, font settings, and file visibility preferences are completely restored upon your next launch!
-- ✨ **Intelligent SSH Disconnect/Reconnect**: Greatly enhanced SSH connection resilience. Provides a beautiful and localized overlay for one-click re-connection on unexpected disconnections.
-- ✨ **Hot-Swappable i18n System**: Deeply optimized internationalization. Switch instantly between English and Simplified Chinese without restarting the application.
-- ✨ **Smart Right-Click Actions**: Added intelligent right-click copy and paste for the terminal, featuring a dedicated settings toggle and OS-native keyboard shortcut hints.
+v0.4 builds on the v0.3 foundation and focuses on more capable workspace operations and a smoother daily workflow:
+- ✨ **Keybinding Management**: View and edit common shortcuts from the settings UI with conflict hints.
+- ✨ **Settings Page Polish**: A more compact and clearer settings experience with improved layout and interaction flow.
+- ✨ **Multi-Pane Tabs with a tmux-like Workflow**: A single tab can now host multiple panes, with split, focus, and switching actions for a tmux-inspired experience.
+- ✨ **Transfer History Improvements**: The transfer history panel now presents richer task details, making upload and download activity easier to review.
+- ✨ **SSH Passphrase Support**: Private keys can now store a passphrase, and SSH connections will use it automatically.
+- ✨ **Terminal Rendering Enhancements**: Terminal rendering now handles Block Elements and similar custom glyphs more completely.
 
 ## Download
 
@@ -24,8 +24,28 @@ You can download the latest pre-compiled releases for macOS, Windows, and Linux
 
 ## Mac Installation Guide
 
-After downloading, please unzip the file and move `ashell.app` to your **Applications** folder. 
-Since the app uses ad-hoc signing, macOS may warn that the app is "damaged" upon first launch. If this happens, open Terminal and run the following command:
+### Method 1: Homebrew (Recommended)
+
+If you use [Homebrew](https://brew.sh/), you can install it quickly with:
+
+```bash
+brew install rust-kotlin/taps/ashell --cask
+```
+
+To update the app:
+
+```bash
+brew update
+brew upgrade ashell --cask
+```
+
+> **Note**: Since the app uses ad-hoc signing, the Homebrew installation or update includes a postflight script to automatically handle the quarantine flag. This will require you to enter your administrator password for authorization.
+
+### Method 2: Manual Download
+
+1. Download and unzip from the [Releases page](https://github.com/rust-kotlin/ashell/releases/latest).
+2. Move `ashell.app` to your **Applications** folder. 
+3. Since the app uses ad-hoc signing, macOS may warn that the app is "damaged" upon first launch. If this happens, open Terminal and run:
 
 ```bash
 sudo xattr -cr /Applications/ashell.app
@@ -43,6 +63,7 @@ The current version provides a fully-featured GPUI-native workspace:
 - **System Telemetry:** Real-time visualization of CPU, memory, swap, network, and disk metrics in the left cockpit sidebar.
 - **Theming System:** Switch between multiple GPUI Component themes directly from the top toolbar.
 - **Embedded Fonts:** Uses embedded Maple Mono NF CN fonts out-of-the-box for excellent CJK character and Nerd Font icon support.
+- **v0.3 Core Enhancements:** Global font and font-size controls, concurrent SFTP transfers, persistent layout state, disconnect awareness, hot-swappable i18n, and smart terminal right-click copy/paste.
 
 ## Run
 

README.md

@@ -8,15 +8,15 @@
 
 该项目旨在通过结合本地和远程环境，并内置丰富的核心功能，提供一个高性能且美观的 Shell 工作区。
 
-## 🚀 v0.3 版本重磅更新！
+## 🚀 v0.4 版本重要升级
 
-全新发布的 v0.3 迎来了架构和体验的全面升级：
-- ✨ **全局实时字体设置与字号调节**（感谢 [@ancion](https://github.com/ancion) 提供的 [PR #6](https://github.com/rust-kotlin/ashell/pull/6)）：支持自定义全局 UI 字体和终端渲染字体，支持实时字号调节并自动记忆。
-- ✨ **SFTP 多任务并发传输队列**：引入全新的独立传输对话框，支持多文件并发上传下载，提供精准的进度展示。
-- ✨ **持久化工作区记忆**：您对侧边栏的尺寸拖拽、终端主题、字体、隐藏文件开关等一切设置都会在下次启动时原样恢复！
-- ✨ **智能断线重连与状态感知**：全面增强的 SSH 网络异常处理机制，断线后直接提供美观的覆盖层用于一键重连或关闭。
-- ✨ **多语言热切换增强**：深度优化的 i18n 系统，包含中文与英文在内的所有界面文案现在均支持热切换。
-- ✨ **智能右键快捷操作**：新增终端右键智能复制与粘贴功能，提供专属设置项自由控制开关，并支持根据不同操作系统自适应显示原生快捷键提示。
+v0.4 在 v0.3 打下的基础上，重点带来了更完整的工作区操作能力和更顺手的日常体验：
+- ✨ **键位管理功能**：支持在设置中可视化查看和修改常用快捷键，并提供冲突提示。
+- ✨ **设置页优化**：设置页的布局和交互更加紧凑顺手，整体信息层级更清晰。
+- ✨ **Tab 内多 Pane 与类 tmux 体验**：一个 tab 内现在可以管理多个 pane，支持分屏、聚焦和切换，提供更接近 tmux 的工作流。
+- ✨ **传输历史增强**：传输历史面板展示更完整的任务信息，便于回溯上传和下载过程。
+- ✨ **SSH passphrase 支持**：现在可以为私钥填写 passphrase，并在连接时自动使用保存的口令。
+- ✨ **终端显示优化**：终端渲染进一步增强，支持 Block Elements 等自定义图形字符的更完整显示。
 
 ## 下载
 
@@ -24,8 +24,28 @@
 
 ## Mac 安装指南
 
-下载并解压后，请先将 `ashell.app` 拖入或移动到 **应用程序 (Applications)** 目录。
-由于应用采用本地签名，初次启动时如果系统提示“App 已损坏，无法打开”，请打开终端（Terminal）并执行以下命令：
+### 方法 1: Homebrew 安装 (推荐)
+
+如果您使用 [Homebrew](https://brew.sh/)，可以通过以下命令快速安装：
+
+```bash
+brew install rust-kotlin/taps/ashell --cask
+```
+
+更新应用：
+
+```bash
+brew update
+brew upgrade ashell --cask
+```
+
+> **注意**: 由于应用采用本地签名，Homebrew 在安装或更新过程中会执行一个后置脚本来自动处理隔离属性（quarantine flag），这需要您输入管理员密码以授权。
+
+### 方法 2: 手动下载
+
+1. 从 [Releases 页面](https://github.com/rust-kotlin/ashell/releases/latest) 下载并解压。
+2. 将 `ashell.app` 拖入或移动到 **应用程序 (Applications)** 目录。
+3. 由于应用采用本地签名，初次启动时如果系统提示“App 已损坏，无法打开”，请打开终端（Terminal）并执行以下命令：
 
 ```bash
 sudo xattr -cr /Applications/ashell.app
@@ -43,6 +63,7 @@ sudo xattr -cr /Applications/ashell.app
 - **系统遥测**：在左侧边栏实时可视化显示 CPU、内存、Swap、网络和磁盘的使用指标。
 - **主题系统**：支持直接从顶部工具栏切换多种 GPUI Component 颜色主题。
 - **内置字体**：开箱即用，内置 Maple Mono NF CN 字体，提供卓越的中日韩（CJK）字符与 Nerd Font 图标支持。
+- **v0.3 核心增强**：全局字体与字号可调，支持 SFTP 并发传输、布局记忆、断线感知、多语言热切换，以及终端右键复制粘贴等增强能力。
 
 ## 运行
 

locales/en.yml

@@ -124,6 +124,10 @@ settings_about: "About"
 settings_group_appearance: "Appearance"
 settings_group_font: "Font"
 settings_group_other: "Other"
+settings_group_keybind_general: "General"
+settings_group_keybind_zoom: "Zoom"
+settings_group_keybind_focus: "Focus"
+settings_group_keybind_panel: "Panel"
 theme: "Theme"
 theme_mode: "Theme Mode"
 clear_transfers: "Clear History"
@@ -132,7 +136,13 @@ transfers_limit: " (Max 100 records)"
 press_new_key: "Press new key..."
 settings_open_settings: "Open Settings"
 settings_open_session: "Open Session"
+settings_open_transfers: "Open Transfer History"
+files_downloading: "%{count} files downloading"
+files_uploading: "%{count} files uploading"
+panel_minimize: "Minimize Panel"
+panel_expand: "Expand Panel"
 settings_new_ssh: "New SSH"
+settings_toggle_sidebar: "Toggle Sidebar"
 settings_toggle_sftp_zoom: "Toggle SFTP Zoom"
 settings_focus_pane_left: "Focus Pane Left"
 settings_focus_pane_right: "Focus Pane Right"
@@ -144,3 +154,7 @@ settings_split_pane_up: "Split Pane Up"
 settings_split_pane_down: "Split Pane Down"
 settings_close_pane: "Close Pane"
 keybind_conflict: '"%{key}" is already used by "%{action}", please choose another key'
+title_bar_style: "Title Bar Style"
+title_bar_native: "Native"
+title_bar_integrated: "Integrated"
+restart_hint: " (Restart required)"

locales/zh-CN.yml

@@ -23,7 +23,6 @@ system_path_warning: "警告：您即将删除系统关键路径！这可能会
 delete_success: "成功删除 %{count} 个项"
 delete_failed: "删除失败: %{err}"
 deleting_paths: "正在删除 %{count} 个项..."
-cancel: "取消"
 confirm: "确认"
 local_terminal: "本地终端"
 open_local_shell_tab: "打开一个新的本地终端页面"
@@ -127,6 +126,10 @@ settings_about: "关于"
 settings_group_appearance: "外观"
 settings_group_font: "字体"
 settings_group_other: "其它"
+settings_group_keybind_general: "常规"
+settings_group_keybind_zoom: "缩放"
+settings_group_keybind_focus: "焦点"
+settings_group_keybind_panel: "面板"
 theme: "主题"
 theme_mode: "主题模式"
 clear_transfers: "清空记录"
@@ -135,7 +138,13 @@ transfers_limit: " (最多保留 100 条)"
 press_new_key: "请按下新的快捷键..."
 settings_open_settings: "打开设置"
 settings_open_session: "打开会话"
+settings_open_transfers: "打开传输历史"
+files_downloading: "%{count} 个文件正在下载"
+files_uploading: "%{count} 个文件正在上传"
+panel_minimize: "折叠面板"
+panel_expand: "展开面板"
 settings_new_ssh: "新建 SSH"
+settings_toggle_sidebar: "缩放侧边栏"
 settings_toggle_sftp_zoom: "缩放 SFTP 面板"
 settings_focus_pane_left: "向左切换焦点"
 settings_focus_pane_right: "向右切换焦点"
@@ -146,4 +155,8 @@ settings_split_pane_right: "向右拆分面板"
 settings_split_pane_up: "向上拆分面板"
 settings_split_pane_down: "向下拆分面板"
 settings_close_pane: "关闭当前面板"
-keybind_conflict: "\"%{key}\" 已被「%{action}」使用，请选择其他快捷键"
+keybind_conflict: '"%{key}" 已被「%{action}」使用，请选择其他快捷键'
+title_bar_style: "标题栏样式"
+title_bar_native: "原生"
+title_bar_integrated: "融合"
+restart_hint: " (修改后重启生效)"

src/app/constants.rs

@@ -1,6 +1,7 @@
 pub(crate) const DEFAULT_COLS: u16 = 100;
 pub(crate) const DEFAULT_ROWS: u16 = 30;
 pub(crate) const SIDEBAR_WIDTH: f32 = 306.0;
+pub(crate) const COLLAPSED_SIDEBAR_WIDTH: f32 = 52.0;
 pub(crate) const TAB_BAR_HEIGHT: f32 = 52.0;
 pub(crate) const TERMINAL_PADDING_X: f32 = 32.0;
 pub(crate) const TERMINAL_PADDING_Y: f32 = 32.0;

src/app/dialogs.rs

@@ -21,6 +21,11 @@ use crate::{Ashell, session::config::AuthMethod, system::format_bytes};
 
 impl Ashell {
     pub(crate) fn show_ssh_dialog(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.active_dialog.is_some() {
+            return;
+        }
+        self.active_dialog = Some(crate::app::DialogKind::NewSsh);
+
         let view = cx.entity();
         let session_name_input = self.session_name_input.clone();
         let host_input = self.host_input.clone();
@@ -30,12 +35,22 @@ impl Ashell {
         let password_input = self.password_input.clone();
         let key_path_input = self.key_path_input.clone();
         let key_inline_input = self.key_inline_input.clone();
+        let passphrase_input = self.passphrase_input.clone();
 
         window.open_dialog(cx, move |dialog: Dialog, _window, _cx| {
             dialog
                 .title(t!("new_ssh_connection"))
                 .w(px(520.))
                 .overlay_closable(true)
+                .on_close({
+                    let view = view.clone();
+                    move |_, _, cx| {
+                        view.update(cx, |this, cx| {
+                            this.active_dialog = None;
+                            cx.notify();
+                        });
+                    }
+                })
                 .content({
                     let view = view.clone();
                     let session_name_input = session_name_input.clone();
@@ -45,6 +60,7 @@ impl Ashell {
                     let password_input = password_input.clone();
                     let key_path_input = key_path_input.clone();
                     let key_inline_input = key_inline_input.clone();
+                    let passphrase_input = passphrase_input.clone();
                     move |content, window, cx| {
                         let is_password = view.read(cx).ssh_auth_method == AuthMethod::Password;
                         let is_editing = view.read(cx).editing_session_id.is_some();
@@ -114,7 +130,7 @@ impl Ashell {
                                                         ),
                                                     )
                                                     .child(
-                                                        Input::new(&key_path_input).tab_index(5),
+                                                        Input::new(&key_path_input).tab_index(4),
                                                     ),
                                             )
                                             .child(
@@ -134,7 +150,8 @@ impl Ashell {
                                                     )),
                                             ),
                                     )
-                                    .child(Input::new(&key_inline_input).h(px(128.)).tab_index(6))
+                                    .child(Input::new(&key_inline_input).h(px(128.)).tab_index(5))
+                                    .child(Input::new(&passphrase_input).mask_toggle().tab_index(6))
                                 })
                                 .child(
                                     h_flex()
@@ -143,7 +160,11 @@ impl Ashell {
                                         .child(
                                             Button::new("connect-ssh-cancel")
                                                 .label(t!("cancel").to_string())
-                                                .on_click(|_, window, cx| window.close_dialog(cx)),
+                                                .on_click(window.listener_for(&view, |this, _, window, cx| {
+                                                    this.active_dialog = None;
+                                                    window.close_dialog(cx);
+                                                    cx.notify();
+                                                })),
                                         )
                                         .child(
                                             Button::new("connect-ssh-confirm")
@@ -170,6 +191,11 @@ impl Ashell {
         });
     }
     pub(crate) fn show_selector_dialog(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.active_dialog.is_some() {
+            return;
+        }
+        self.active_dialog = Some(crate::app::DialogKind::SessionSelector);
+
         let view = cx.entity();
         let selector_focus_handle = self.selector_focus_handle.clone();
         let deferred_selector_focus_handle = selector_focus_handle.clone();
@@ -180,6 +206,15 @@ impl Ashell {
             dialog
                 .title(t!("open_session").to_string())
                 .w(px(520.))
+                .on_close({
+                    let view = view.clone();
+                    move |_, _, cx| {
+                        view.update(cx, |this, cx| {
+                            this.active_dialog = None;
+                            cx.notify();
+                        });
+                    }
+                })
                 .on_ok({
                     let view = view.clone();
                     move |_, window, cx| {
@@ -228,8 +263,10 @@ impl Ashell {
                                         .on_mouse_down(
                                             MouseButton::Left,
                                             window.listener_for(&view, |this, _, window, cx| {
+                                                this.active_dialog = None;
                                                 this.open_local(cx);
                                                 window.close_dialog(cx);
+                                                cx.notify();
                                             }),
                                         )
                                         .child(
@@ -270,8 +307,10 @@ impl Ashell {
                                         .on_mouse_down(
                                             MouseButton::Left,
                                             window.listener_for(&view, |this, _, window, cx| {
+                                                this.active_dialog = None;
                                                 window.close_dialog(cx);
                                                 this.open_new_ssh_dialog(window, cx);
+                                                cx.notify();
                                             }),
                                         )
                                         .child(
@@ -339,11 +378,13 @@ impl Ashell {
                                                         window.listener_for(
                                                             &view,
                                                             move |this, _, window, cx| {
+                                                                this.active_dialog = None;
                                                                 this.connect_saved_session(
                                                                     connect_id.clone(),
                                                                     cx,
                                                                 );
                                                                 window.close_dialog(cx);
+                                                                cx.notify();
                                                             },
                                                         ),
                                                     )
@@ -402,9 +443,26 @@ impl Ashell {
         });
     }
     pub(crate) fn show_transfers_dialog(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.active_dialog.is_some() {
+            return;
+        }
+        self.active_dialog = Some(crate::app::DialogKind::Transfers);
+
         let view = cx.entity();
         window.open_dialog(cx, move |dialog: Dialog, _window, _| {
-            dialog.w(px(600.)).close_button(false).content({
+            dialog
+                .w(px(600.))
+                .close_button(false)
+                .on_close({
+                    let view = view.clone();
+                    move |_, _, cx| {
+                        view.update(cx, |this, cx| {
+                            this.active_dialog = None;
+                            cx.notify();
+                        });
+                    }
+                })
+                .content({
                 let view = view.clone();
                 move |content, window, cx| {
                     let can_clear = view.read(cx).transfers.iter().any(|t| {
@@ -465,9 +523,11 @@ impl Ashell {
                                     .small()
                                     .ghost()
                                     .icon(IconName::Close)
-                                    .on_click(|_, window, cx| {
+                                    .on_click(window.listener_for(&view, |this, _, window, cx| {
+                                        this.active_dialog = None;
                                         window.close_dialog(cx);
-                                    }),
+                                        cx.notify();
+                                    })),
                             ),
                         );
 
@@ -994,6 +1054,11 @@ impl Ashell {
         });
     }
     pub(crate) fn show_settings_dialog(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.active_dialog.is_some() {
+            return;
+        }
+        self.active_dialog = Some(crate::app::DialogKind::Settings);
+
         let view = cx.entity();
 
         // Unbind all workspace keys so they don't interfere with keybinding recording
@@ -1010,6 +1075,7 @@ impl Ashell {
                     move |_, _window, cx| {
                         // Re-register all workspace keys when closing settings
                         view.update(cx, |this, cx| {
+                            this.active_dialog = None;
                             this.keybinds_suspended = false;
                             this.recording_action = None;
                             this.keybind_error = None;
@@ -1231,6 +1297,50 @@ impl Ashell {
                                                         })
                                                     )
                                                 )
+                                                .item(
+                                                    SettingItem::new(
+                                                        format!("{}{}", t!("title_bar_style"), t!("restart_hint")),
+                                                        SettingField::render({
+                                                            let view = view_clone_for_general.clone();
+                                                            move |_, _window, cx| {
+                                                                let current_style = view.read(cx).config.title_bar_style();
+                                                                Button::new("title-bar-style-dropdown")
+                                                                    .small()
+                                                                    .label(match current_style {
+                                                                        crate::session::config::TitleBarStyle::Native => t!("title_bar_native").to_string(),
+                                                                        crate::session::config::TitleBarStyle::Integrated => t!("title_bar_integrated").to_string(),
+                                                                    })
+                                                                    .dropdown_menu_with_anchor(Anchor::BottomRight, {
+                                                                        let view = view.clone();
+                                                                        move |mut menu, window, cx| {
+                                                                            let current_style = view.read(cx).config.title_bar_style();
+                                                                            menu = menu.min_w(160.)
+                                                                                .item(
+                                                                                    PopupMenuItem::new(t!("title_bar_native").to_string())
+                                                                                        .checked(current_style == crate::session::config::TitleBarStyle::Native)
+                                                                                        .on_click(window.listener_for(&view, |this, _, _, cx| {
+                                                                                            this.config.set_title_bar_style(crate::session::config::TitleBarStyle::Native);
+                                                                                            let _ = this.config.save();
+                                                                                            cx.notify();
+                                                                                        }))
+                                                                                )
+                                                                                .item(
+                                                                                    PopupMenuItem::new(t!("title_bar_integrated").to_string())
+                                                                                        .checked(current_style == crate::session::config::TitleBarStyle::Integrated)
+                                                                                        .on_click(window.listener_for(&view, |this, _, _, cx| {
+                                                                                            this.config.set_title_bar_style(crate::session::config::TitleBarStyle::Integrated);
+                                                                                            let _ = this.config.save();
+                                                                                            cx.notify();
+                                                                                        }))
+                                                                                );
+                                                                            menu
+                                                                        }
+                                                                    })
+                                                                    .into_any_element()
+                                                            }
+                                                        })
+                                                    )
+                                                )
                                         )
                                         .group(
                                             SettingGroup::new()
@@ -1538,11 +1648,15 @@ impl Ashell {
                                                 )
                                         )
                                 )
-                                .page(
-                                    SettingPage::new(t!("settings_key_bindings").to_string())
+                                .page({
+                                    let mut page = SettingPage::new(t!("settings_key_bindings").to_string())
                                         .icon(IconName::SquareTerminal)
-                                        .group(crate::app::keybinding_recorder::KeybindingsPage::render(&view, cx))
-                                )
+                                        .default_open(true);
+                                    for group in crate::app::keybinding_recorder::KeybindingsPage::render_groups(&view, cx) {
+                                        page = page.group(group);
+                                    }
+                                    page
+                                })
                                 .page(
                                     SettingPage::new(t!("settings_help").to_string())
                                         .icon(IconName::BookOpen)

src/app/keybinding_recorder.rs

@@ -16,7 +16,9 @@ gpui::actions!(
     [
         OpenSettings,
         OpenSession,
+        OpenTransfers,
         NewSsh,
+        ToggleSidebar,
         ToggleSftpZoom,
         FocusPaneLeft,
         FocusPaneRight,
@@ -50,11 +52,21 @@ pub(crate) const WORKSPACE_ACTIONS: &[WorkspaceAction] = &[
         label_key: "settings_open_session",
         default_suffix: "o",
     },
+    WorkspaceAction {
+        id: "OpenTransfers",
+        label_key: "settings_open_transfers",
+        default_suffix: "t",
+    },
     WorkspaceAction {
         id: "NewSsh",
         label_key: "settings_new_ssh",
         default_suffix: "n",
     },
+    WorkspaceAction {
+        id: "ToggleSidebar",
+        label_key: "settings_toggle_sidebar",
+        default_suffix: "s",
+    },
     WorkspaceAction {
         id: "ToggleSftpZoom",
         label_key: "settings_toggle_sftp_zoom",
@@ -192,7 +204,9 @@ pub(crate) fn unbind_all_workspace_keys(cx: &mut App, config: &ConfigStore) {
 
     unbind_action!("OpenSettings", crate::OpenSettings);
     unbind_action!("OpenSession", crate::OpenSession);
+    unbind_action!("OpenTransfers", crate::OpenTransfers);
     unbind_action!("NewSsh", crate::NewSsh);
+    unbind_action!("ToggleSidebar", crate::ToggleSidebar);
     unbind_action!("ToggleSftpZoom", crate::ToggleSftpZoom);
     unbind_action!("FocusPaneLeft", crate::FocusPaneLeft);
     unbind_action!("FocusPaneRight", crate::FocusPaneRight);
@@ -245,7 +259,9 @@ fn bind_workspace_actions(cx: &mut App, config: &ConfigStore) {
 
     bind_action!("OpenSettings", crate::OpenSettings);
     bind_action!("OpenSession", crate::OpenSession);
+    bind_action!("OpenTransfers", crate::OpenTransfers);
     bind_action!("NewSsh", crate::NewSsh);
+    bind_action!("ToggleSidebar", crate::ToggleSidebar);
     bind_action!("ToggleSftpZoom", crate::ToggleSftpZoom);
     bind_action!("FocusPaneLeft", crate::FocusPaneLeft);
     bind_action!("FocusPaneRight", crate::FocusPaneRight);
@@ -261,74 +277,115 @@ fn bind_workspace_actions(cx: &mut App, config: &ConfigStore) {
 }
 
 impl KeybindingsPage {
-    pub fn render(view: &Entity<Ashell>, cx: &mut App) -> SettingGroup {
-        let mut group = SettingGroup::new();
+    pub fn render_groups(view: &Entity<Ashell>, cx: &mut App) -> Vec<SettingGroup> {
+        let groups = [
+            (
+                "settings_group_keybind_general",
+                vec!["OpenSettings", "OpenSession", "OpenTransfers", "NewSsh"],
+            ),
+            (
+                "settings_group_keybind_zoom",
+                vec!["ToggleSidebar", "ToggleSftpZoom"],
+            ),
+            (
+                "settings_group_keybind_focus",
+                vec![
+                    "FocusPaneLeft",
+                    "FocusPaneRight",
+                    "FocusPaneUp",
+                    "FocusPaneDown",
+                ],
+            ),
+            (
+                "settings_group_keybind_panel",
+                vec![
+                    "SplitPaneLeft",
+                    "SplitPaneRight",
+                    "SplitPaneUp",
+                    "SplitPaneDown",
+                    "ClosePane",
+                ],
+            ),
+        ];
 
-        for action in WORKSPACE_ACTIONS {
-            let recording = view.read(cx).recording_action.as_deref() == Some(action.id);
-            let has_error = view
-                .read(cx)
-                .keybind_error
-                .as_ref()
-                .is_some_and(|(id, _)| id == action.id);
-            let error_msg = if has_error {
-                view.read(cx)
+        let mut result = Vec::new();
+
+        for (group_label, action_ids) in groups {
+            let mut group = SettingGroup::new().title(t!(group_label).to_string());
+
+            for action_id in action_ids {
+                let action = WORKSPACE_ACTIONS
+                    .iter()
+                    .find(|a| a.id == action_id)
+                    .expect("action exists");
+
+                let recording = view.read(cx).recording_action.as_deref() == Some(action.id);
+                let has_error = view
+                    .read(cx)
                     .keybind_error
                     .as_ref()
-                    .map(|(_, msg)| msg.clone())
-            } else {
-                None
-            };
+                    .is_some_and(|(id, _)| id == action.id);
+                let error_msg = if has_error {
+                    view.read(cx)
+                        .keybind_error
+                        .as_ref()
+                        .map(|(_, msg)| msg.clone())
+                } else {
+                    None
+                };
 
-            let keystroke = {
-                let config = &view.read(cx).config;
-                configured_keystroke(config, action.id).unwrap_or_default()
-            };
+                let keystroke = {
+                    let config = &view.read(cx).config;
+                    configured_keystroke(config, action.id).unwrap_or_default()
+                };
 
-            let btn_label = if recording {
-                t!("press_new_key").to_string()
-            } else if keystroke.is_empty() {
-                t!("none").to_string()
-            } else {
-                format_keystroke(&keystroke)
-            };
+                let btn_label = if recording {
+                    t!("press_new_key").to_string()
+                } else if keystroke.is_empty() {
+                    t!("none").to_string()
+                } else {
+                    format_keystroke(&keystroke)
+                };
 
-            let mut item = SettingItem::new(
-                t!(action.label_key).to_string(),
-                SettingField::render({
-                    let view = view.clone();
-                    let action_id = action.id.to_string();
-                    move |_, _window, _cx| {
-                        Button::new(gpui::SharedString::from(format!("keybind-{action_id}")))
-                            .label(btn_label.clone())
-                            .small()
-                            .when(recording, |this| this.primary())
-                            .when(has_error, |this| this.danger())
-                            .on_click({
-                                let view = view.clone();
-                                let action_id = action_id.clone();
-                                move |_event, window, cx| {
-                                    view.update(cx, |this, cx| {
-                                        // Clear any previous error when starting new recording
-                                        this.keybind_error = None;
-                                        this.recording_action = Some(action_id.clone());
-                                        this.focus_handle.focus(window, cx);
-                                        cx.notify();
-                                    });
-                                }
-                            })
-                            .into_any_element()
-                    }
-                }),
-            );
+                let mut item = SettingItem::new(
+                    t!(action.label_key).to_string(),
+                    SettingField::render({
+                        let view = view.clone();
+                        let action_id = action.id.to_string();
+                        move |_, _window, _cx| {
+                            Button::new(gpui::SharedString::from(format!("keybind-{action_id}")))
+                                .label(btn_label.clone())
+                                .small()
+                                .when(recording, |this| this.primary())
+                                .when(has_error, |this| this.danger())
+                                .on_click({
+                                    let view = view.clone();
+                                    let action_id = action_id.clone();
+                                    move |_event, window, cx| {
+                                        view.update(cx, |this, cx| {
+                                            // Clear any previous error when starting new recording
+                                            this.keybind_error = None;
+                                            this.recording_action = Some(action_id.clone());
+                                            this.focus_handle.focus(window, cx);
+                                            cx.notify();
+                                        });
+                                    }
+                                })
+                                .into_any_element()
+                        }
+                    }),
+                );
 
-            if let Some(msg) = error_msg {
-                item = item.description(msg);
+                if let Some(msg) = error_msg {
+                    item = item.description(msg);
+                }
+
+                group = group.item(item);
             }
 
-            group = group.item(item);
+            result.push(group);
         }
 
-        group
+        result
     }
 }

src/app/mod.rs

@@ -189,6 +189,14 @@ impl ScrollbarHandle for TerminalScrollbarHandle {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) enum DialogKind {
+    Settings,
+    SessionSelector,
+    Transfers,
+    NewSsh,
+}
+
 pub(crate) struct Ashell {
     pub(crate) focus_handle: FocusHandle,
     pub(crate) selector_focus_handle: FocusHandle,
@@ -199,6 +207,7 @@ pub(crate) struct Ashell {
     pub(crate) password_input: Entity<InputState>,
     pub(crate) key_path_input: Entity<InputState>,
     pub(crate) key_inline_input: Entity<InputState>,
+    pub(crate) passphrase_input: Entity<InputState>,
     pub(crate) sftp_path_input: Entity<InputState>,
     pub(crate) ssh_auth_method: AuthMethod,
     pub(crate) editing_session_id: Option<String>,
@@ -237,17 +246,22 @@ pub(crate) struct Ashell {
     pub(crate) system_status: Option<SharedString>,
     pub(crate) pane_root: PaneLayout,
     pub(crate) focused_pane_path: Vec<usize>,
+    pub(crate) terminal_panel_bounds: Option<Bounds<Pixels>>,
     pub(crate) terminal_bounds: HashMap<String, Bounds<Pixels>>,
     pub(crate) terminal_selecting: bool,
     pub(crate) dragging_splitter: Option<(Vec<usize>, usize)>, // (parent_path, child_index)
     pub(crate) drag_split_origin: Option<gpui::Point<Pixels>>,
     pub(crate) terminal_marked_text: Option<String>,
     pub(crate) sftp_panel_minimized: bool,
+    pub(crate) sidebar_collapsed: bool,
+    pub(crate) collapsed_saved_scroll_handle: gpui::ScrollHandle,
     pub(crate) prev_monitoring_size: Option<Pixels>,
     pub(crate) status: SharedString,
     pub(crate) config: ConfigStore,
+    pub(crate) active_title_bar_style: crate::session::config::TitleBarStyle,
     pub(crate) system_sampler: SystemSampler,
     pub(crate) recording_action: Option<String>,
+    pub(crate) active_dialog: Option<DialogKind>,
     /// Error message when a recorded keybinding conflicts with another
     pub(crate) keybind_error: Option<(String, String)>, // (action_id, error_message)
     /// Whether workspace keybindings are currently suspended (during settings)
@@ -331,6 +345,11 @@ impl Ashell {
                 .rows(5)
                 .placeholder("-----BEGIN OPENSSH PRIVATE KEY-----")
         });
+        let passphrase_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .placeholder("SSH private key passphrase (optional)")
+                .masked(true)
+        });
         let sftp_path_input = cx.new(|cx| InputState::new(window, cx).default_value("/"));
         let sftp_new_folder_input =
             cx.new(|cx| InputState::new(window, cx).placeholder(t!("new_folder").to_string()));
@@ -343,6 +362,7 @@ impl Ashell {
             cx.subscribe_in(&password_input, window, Self::on_input_event),
             cx.subscribe_in(&key_path_input, window, Self::on_input_event),
             cx.subscribe_in(&key_inline_input, window, Self::on_input_event),
+            cx.subscribe_in(&passphrase_input, window, Self::on_input_event),
             cx.subscribe_in(&sftp_path_input, window, Self::on_input_event),
             cx.subscribe_in(&sftp_new_folder_input, window, Self::on_input_event),
         ];
@@ -358,12 +378,7 @@ impl Ashell {
             tracing::warn!("failed to load config: {err:#}");
             ConfigStore::in_memory()
         });
-        let follow_system_theme =
-            if config.light_theme_name().is_empty() && config.dark_theme_name().is_empty() {
-                true
-            } else {
-                config.follow_system_theme()
-            };
+        let follow_system_theme = config.follow_system_theme();
 
         let theme_mode = match config.theme_mode() {
             "light" => ThemeMode::Light,
@@ -405,6 +420,7 @@ impl Ashell {
             password_input,
             key_path_input,
             key_inline_input,
+            passphrase_input,
             sftp_path_input,
             ssh_auth_method: AuthMethod::Password,
             editing_session_id: None,
@@ -422,6 +438,7 @@ impl Ashell {
             active_group: None,
             pane_root: PaneLayout::Single(String::new()),
             focused_pane_path: Vec::new(),
+            terminal_panel_bounds: None,
             selector_selection: 0,
             workspace_panels,
             body_panels,
@@ -443,8 +460,13 @@ impl Ashell {
             transfers: {
                 let mut transfers = config.transfers();
                 for t in transfers.iter_mut() {
-                    if matches!(t.state, crate::terminal::TransferState::Running | crate::terminal::TransferState::Paused) {
-                        t.state = crate::terminal::TransferState::Zombie(t!("zombie_reason").to_string());
+                    if matches!(
+                        t.state,
+                        crate::terminal::TransferState::Running
+                            | crate::terminal::TransferState::Paused
+                    ) {
+                        t.state =
+                            crate::terminal::TransferState::Zombie(t!("zombie_reason").to_string());
                     }
                 }
                 transfers
@@ -457,11 +479,15 @@ impl Ashell {
             dragging_splitter: None,
             drag_split_origin: None,
             sftp_panel_minimized: false,
+            sidebar_collapsed: config.sidebar_collapsed(),
+            collapsed_saved_scroll_handle: gpui::ScrollHandle::new(),
             prev_monitoring_size: None,
             status: "ready".into(),
+            active_title_bar_style: config.title_bar_style(),
             config,
             system_sampler,
             recording_action: None,
+            active_dialog: None,
             keybind_error: None,
             keybinds_suspended: false,
             system,
@@ -868,6 +894,4 @@ impl Ashell {
         self.config.set_transfers(self.transfers.clone());
         cx.notify();
     }
-
-
 }

src/app/startup.rs

@@ -176,14 +176,23 @@ pub(crate) fn sync_macos_launch_environment() {
 pub(crate) fn sync_macos_launch_environment() {}
 
 pub(crate) fn open_main_window(cx: &mut App) {
+    let config = ConfigStore::load().unwrap_or_else(|_| ConfigStore::in_memory());
+
     let mut window_options = WindowOptions::default();
 
+    if config.title_bar_style() == crate::session::config::TitleBarStyle::Integrated {
+        window_options.titlebar = Some(gpui::TitlebarOptions {
+            title: None,
+            appears_transparent: true,
+            traffic_light_position: Some(gpui::point(px(9.0), px(9.0))),
+        });
+    }
+
     #[cfg(not(target_os = "macos"))]
     if let Ok(img) = image::load_from_memory(include_bytes!("../../assets/icons/ashell.png")) {
         window_options.icon = Some(std::sync::Arc::new(img.into_rgba8()));
     }
 
-    let config = ConfigStore::load().unwrap_or_else(|_| ConfigStore::in_memory());
     if let Some(bounds) = config.window_bounds() {
         window_options.window_bounds = Some(match bounds {
             crate::session::config::SavedWindowBounds::Fullscreen {
@@ -239,6 +248,20 @@ pub(crate) fn open_main_window(cx: &mut App) {
         let view = cx.new(|cx| Ashell::new(window, cx));
 
         tracing::info!("[ui] main application window opened");
+        let focus_handle = view.read(cx).focus_handle.clone();
+        window.focus(&focus_handle, cx);
+
+        let sftp_minimized = view.read(cx).config.sftp_panel_minimized();
+        if sftp_minimized {
+            window.defer(cx, {
+                let view = view.clone();
+                move |window, cx| {
+                    view.update(cx, |this, cx| {
+                        this.toggle_sftp_minimized(window, cx);
+                    });
+                }
+            });
+        }
 
         let workspace_panels_clone = view.read(cx).workspace_panels.clone();
         let body_panels_clone = view.read(cx).body_panels.clone();
@@ -283,13 +306,24 @@ pub(crate) fn open_main_window(cx: &mut App) {
                 .iter()
                 .map(|s| s.into())
                 .collect();
-            let body_sizes: Vec<f32> = body_panels_clone
+            let mut body_sizes: Vec<f32> = body_panels_clone
                 .read(cx)
                 .sizes()
                 .iter()
                 .map(|s| s.into())
                 .collect();
+
+            if view_clone.read(cx).sftp_panel_minimized {
+                if let Some(prev) = view_clone.read(cx).prev_monitoring_size {
+                    if body_sizes.len() > 1 {
+                        body_sizes[1] = prev.into();
+                    }
+                }
+            }
+
             config.set_layout_state(Some(saved_bounds), Some(workspace_sizes), Some(body_sizes));
+            config.set_sidebar_collapsed(view_clone.read(cx).sidebar_collapsed);
+            config.set_sftp_panel_minimized(view_clone.read(cx).sftp_panel_minimized);
             let _ = config.save();
             true
         });

src/backend/ssh.rs

@@ -352,6 +352,8 @@ async fn connect_and_authenticate(
 fn load_session_private_key(session: &Session) -> Result<PrivateKey> {
     let inline_key = normalize_inline_private_key(&session.private_key_inline);
     let key_path = expand_key_path(session.private_key_path.trim());
+    let passphrase = session.passphrase.trim();
+    let passphrase = (!passphrase.is_empty()).then_some(passphrase);
     let has_inline = !inline_key.is_empty();
     let has_path = key_path.is_some();
 
@@ -362,14 +364,14 @@ fn load_session_private_key(session: &Session) -> Result<PrivateKey> {
     let mut errors = Vec::new();
 
     if has_inline {
-        match decode_secret_key(&inline_key, None) {
+        match decode_secret_key(&inline_key, passphrase) {
             Ok(key) => return Ok(key),
             Err(err) => errors.push(format!("decode private key content: {err}")),
         }
     }
 
     if let Some(path) = key_path {
-        match load_secret_key(path.as_path(), None) {
+        match load_secret_key(path.as_path(), passphrase) {
             Ok(key) => return Ok(key),
             Err(err) => errors.push(format!("load key {}: {err}", path.display())),
         }

src/main.rs

@@ -16,7 +16,8 @@ gpui::actions!(ashell_terminal, [TerminalTabKey, TerminalBacktabKey]);
 
 pub(crate) use app::keybinding_recorder::{
     ClosePane, FocusPaneDown, FocusPaneLeft, FocusPaneRight, FocusPaneUp, NewSsh, OpenSession,
-    OpenSettings, SplitPaneDown, SplitPaneLeft, SplitPaneRight, SplitPaneUp, ToggleSftpZoom,
+    OpenSettings, OpenTransfers, SplitPaneDown, SplitPaneLeft, SplitPaneRight, SplitPaneUp,
+    ToggleSftpZoom, ToggleSidebar,
 };
 
 pub(crate) use app::{
@@ -30,10 +31,11 @@ fn main() {
     #[cfg(target_os = "macos")]
     let app = gpui_platform::application()
         .with_assets(Assets)
-        .with_quit_mode(gpui::QuitMode::Explicit);
+        .with_quit_mode(gpui::QuitMode::LastWindowClosed);
 
     #[cfg(not(target_os = "macos"))]
     let app = gpui_platform::application().with_assets(Assets);
+
     app.on_reopen(|cx| {
         if cx.windows().is_empty() {
             app::startup::open_main_window(cx);

src/session/config.rs

@@ -27,6 +27,8 @@ pub struct Session {
     #[serde(default)]
     pub private_key_inline: String,
     #[serde(default)]
+    pub passphrase: String,
+    #[serde(default)]
     pub last_used: Option<String>,
 }
 
@@ -43,6 +45,7 @@ impl Session {
             password,
             private_key_path: String::new(),
             private_key_inline: String::new(),
+            passphrase: String::new(),
             last_used: None,
         }
     }
@@ -53,6 +56,7 @@ impl Session {
         user: String,
         private_key_path: String,
         private_key_inline: String,
+        passphrase: String,
     ) -> Self {
         let name = format!("{user}@{host}");
         Self {
@@ -65,6 +69,7 @@ impl Session {
             password: String::new(),
             private_key_path,
             private_key_inline,
+            passphrase,
             last_used: None,
         }
     }
@@ -93,9 +98,17 @@ pub enum SavedWindowBounds {
     },
 }
 
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[serde(rename_all = "lowercase")]
+pub enum TitleBarStyle {
+    #[default]
+    Native,
+    Integrated,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ConfigFile {
-    #[serde(default)]
+    #[serde(default = "default_follow_system_theme")]
     pub follow_system_theme: bool,
     #[serde(default)]
     pub theme_mode: String,
@@ -116,6 +129,8 @@ pub struct ConfigFile {
     #[serde(default = "default_terminal_font_family")]
     pub terminal_font_family: String,
     #[serde(default)]
+    pub title_bar_style: TitleBarStyle,
+    #[serde(default)]
     pub sessions: Vec<Session>,
     #[serde(default)]
     pub window_bounds: Option<SavedWindowBounds>,
@@ -130,6 +145,10 @@ pub struct ConfigFile {
     #[serde(default = "default_monitoring_position")]
     pub monitoring_position: String,
     #[serde(default)]
+    pub sidebar_collapsed: bool,
+    #[serde(default)]
+    pub sftp_panel_minimized: bool,
+    #[serde(default)]
     pub key_bindings: std::collections::HashMap<String, String>,
 }
 
@@ -137,6 +156,10 @@ fn default_monitoring_position() -> String {
     "Sidebar".to_string()
 }
 
+fn default_follow_system_theme() -> bool {
+    true
+}
+
 fn default_locale() -> String {
     "system".to_string()
 }
@@ -188,7 +211,26 @@ impl ConfigStore {
         let cache = if path.exists() {
             let raw = fs::read_to_string(&path)
                 .with_context(|| format!("failed to read {}", path.display()))?;
-            serde_json::from_str::<ConfigFile>(&raw).unwrap_or_default()
+            match serde_json::from_str::<ConfigFile>(&raw) {
+                Ok(cache) => cache,
+                Err(err) => {
+                    let backup_path = path.with_extension("json.bak");
+                    if let Err(backup_err) = fs::write(&backup_path, raw.as_bytes()) {
+                        tracing::warn!(
+                            "failed to parse config {}; backup to {} also failed: {backup_err:#}; parse error: {err:#}",
+                            path.display(),
+                            backup_path.display(),
+                        );
+                    } else {
+                        tracing::warn!(
+                            "failed to parse config {}; backed up the original to {} and loaded defaults: {err:#}",
+                            path.display(),
+                            backup_path.display(),
+                        );
+                    }
+                    ConfigFile::default()
+                }
+            }
         } else {
             ConfigFile::default()
         };
@@ -374,6 +416,14 @@ impl ConfigStore {
         self.cache.terminal_font_family = family.to_string();
     }
 
+    pub fn title_bar_style(&self) -> TitleBarStyle {
+        self.cache.title_bar_style
+    }
+
+    pub fn set_title_bar_style(&mut self, style: TitleBarStyle) {
+        self.cache.title_bar_style = style;
+    }
+
     pub fn show_hidden_files(&self) -> bool {
         self.cache.show_hidden_files
     }
@@ -382,6 +432,22 @@ impl ConfigStore {
         self.cache.show_hidden_files = val;
     }
 
+    pub fn sidebar_collapsed(&self) -> bool {
+        self.cache.sidebar_collapsed
+    }
+
+    pub fn set_sidebar_collapsed(&mut self, val: bool) {
+        self.cache.sidebar_collapsed = val;
+    }
+
+    pub fn sftp_panel_minimized(&self) -> bool {
+        self.cache.sftp_panel_minimized
+    }
+
+    pub fn set_sftp_panel_minimized(&mut self, val: bool) {
+        self.cache.sftp_panel_minimized = val;
+    }
+
     pub fn get(&self, id: &str) -> Option<&Session> {
         self.cache.sessions.iter().find(|s| s.id == id)
     }

src/session/mod.rs

@@ -71,6 +71,7 @@ impl Ashell {
         let password = self.password_input.read(cx).value().to_string();
         let key_path = self.key_path_input.read(cx).value().trim().to_string();
         let key_inline = self.key_inline_input.read(cx).value().to_string();
+        let passphrase = self.passphrase_input.read(cx).value().to_string();
 
         if host.is_empty() || user.is_empty() {
             self.status = t!("host_and_user_required").into();
@@ -97,7 +98,7 @@ impl Ashell {
                     cx.notify();
                     return;
                 }
-                Session::key(host, port, user, key_path, key_inline)
+                Session::key(host, port, user, key_path, key_inline, passphrase)
             }
         };
         session.name = name;
@@ -112,7 +113,9 @@ impl Ashell {
 
         self.open_ssh_session(session, cx);
         self.editing_session_id = None;
+        self.active_dialog = None;
         window.close_dialog(cx);
+        cx.notify();
     }
 
     pub(crate) fn set_input_value(
@@ -134,6 +137,7 @@ impl Ashell {
         Self::set_input_value(&self.password_input, "", window, cx);
         Self::set_input_value(&self.key_path_input, "", window, cx);
         Self::set_input_value(&self.key_inline_input, "", window, cx);
+        Self::set_input_value(&self.passphrase_input, "", window, cx);
     }
 
     pub(crate) fn load_session_into_form(
@@ -161,6 +165,12 @@ impl Ashell {
             window,
             cx,
         );
+        Self::set_input_value(
+            &self.passphrase_input,
+            session.passphrase.clone(),
+            window,
+            cx,
+        );
     }
 
     pub(crate) fn pick_ssh_key_path(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -360,6 +370,7 @@ impl Ashell {
             return;
         };
 
+        self.active_dialog = None;
         match entry {
             SelectorEntry::Local => {
                 self.open_local(cx);
@@ -374,6 +385,7 @@ impl Ashell {
                 window.close_dialog(cx);
             }
         }
+        cx.notify();
     }
 
     pub(crate) fn on_selector_key_down(
@@ -867,16 +879,26 @@ impl Ashell {
             .first()
             .map(|size| size.as_f32())
             .unwrap_or(SIDEBAR_WIDTH);
-        let terminal_height = self
-            .body_panels
-            .read(cx)
-            .sizes()
-            .first()
-            .map(|size| size.as_f32())
-            .unwrap_or(viewport.height.as_f32() - TAB_BAR_HEIGHT - 248.0);
-        let width = (viewport.width.as_f32() - sidebar_width - TERMINAL_PADDING_X - 8.0)
-            .max(self.terminal_cell_width());
-        let height = (terminal_height - TERMINAL_PADDING_Y).max(self.terminal_line_height());
+
+        // Use the whole terminal panel bounds for PTY sizing.
+        // Individual pane bounds are smaller when split, so using them here
+        // would shrink the root PTY dimensions a second time.
+        let (width, height) = if let Some(bounds) = self.terminal_panel_bounds {
+            (bounds.size.width.as_f32(), bounds.size.height.as_f32())
+        } else {
+            let terminal_height = self
+                .body_panels
+                .read(cx)
+                .sizes()
+                .first()
+                .map(|size| size.as_f32())
+                .unwrap_or(viewport.height.as_f32() - TAB_BAR_HEIGHT - 248.0);
+            (
+                (viewport.width.as_f32() - sidebar_width - TERMINAL_PADDING_X - 8.0)
+                    .max(self.terminal_cell_width()),
+                (terminal_height - TERMINAL_PADDING_Y).max(self.terminal_line_height()),
+            )
+        };
         let total_cols = (width / self.terminal_cell_width()).floor().max(1.0) as u16;
         let total_rows = (height / self.terminal_line_height()).floor().max(1.0) as u16;
 

src/sftp/mod.rs

@@ -381,16 +381,18 @@ async fn run_sftp(
                             let err_msg = format!("{err:#}");
                             let is_cancelled = err_msg.contains("transfer cancelled");
                             let state = if is_cancelled {
-                                crate::terminal::TransferState::Interrupted("User cancelled".to_string())
+                                crate::terminal::TransferState::Interrupted(
+                                    "User cancelled".to_string(),
+                                )
                             } else {
                                 crate::terminal::TransferState::Failed(err_msg.clone())
                             };
                             let _ = events_clone.send(BackendEvent::SftpStatus {
                                 tab_id: tab_id_clone.clone(),
-                                text: if is_cancelled { 
+                                text: if is_cancelled {
                                     "Transmission cancelled".to_string()
-                                } else { 
-                                    t!("download_failed", err = err_msg.clone()).to_string() 
+                                } else {
+                                    t!("download_failed", err = err_msg.clone()).to_string()
                                 },
                             });
                             let _ = events_clone.send(BackendEvent::TransferProgress {
@@ -492,16 +494,18 @@ async fn run_sftp(
                             let err_msg = format!("{err:#}");
                             let is_cancelled = err_msg.contains("transfer cancelled");
                             let state = if is_cancelled {
-                                crate::terminal::TransferState::Interrupted("User cancelled".to_string())
+                                crate::terminal::TransferState::Interrupted(
+                                    "User cancelled".to_string(),
+                                )
                             } else {
                                 crate::terminal::TransferState::Failed(err_msg.clone())
                             };
                             let _ = events_clone.send(BackendEvent::SftpStatus {
                                 tab_id: tab_id_clone.clone(),
-                                text: if is_cancelled { 
+                                text: if is_cancelled {
                                     "Transmission cancelled".to_string()
-                                } else { 
-                                    t!("upload_failed", err = err_msg.clone()).to_string() 
+                                } else {
+                                    t!("upload_failed", err = err_msg.clone()).to_string()
                                 },
                             });
                             let _ = events_clone.send(BackendEvent::TransferProgress {
@@ -888,6 +892,8 @@ async fn connect_and_authenticate(
 fn load_session_private_key(session: &Session) -> Result<PrivateKey> {
     let inline_key = normalize_inline_private_key(&session.private_key_inline);
     let key_path = expand_key_path(session.private_key_path.trim());
+    let passphrase = session.passphrase.trim();
+    let passphrase = (!passphrase.is_empty()).then_some(passphrase);
     let has_inline = !inline_key.is_empty();
     let has_path = key_path.is_some();
 
@@ -898,14 +904,14 @@ fn load_session_private_key(session: &Session) -> Result<PrivateKey> {
     let mut errors = Vec::new();
 
     if has_inline {
-        match decode_secret_key(&inline_key, None) {
+        match decode_secret_key(&inline_key, passphrase) {
             Ok(key) => return Ok(key),
             Err(err) => errors.push(format!("decode private key content: {err}")),
         }
     }
 
     if let Some(path) = key_path {
-        match load_secret_key(path.as_path(), None) {
+        match load_secret_key(path.as_path(), passphrase) {
             Ok(key) => return Ok(key),
             Err(err) => errors.push(format!("load key {}: {err}", path.display())),
         }
@@ -1594,14 +1600,14 @@ async fn exec_remote_command(
     let mut stderr = Vec::new();
     let mut stdout = Vec::new();
     let mut exit_status = None;
-    
+
     // Add timeout to prevent indefinite blocking (300 seconds = 5 minutes)
     let timeout = tokio::time::Duration::from_secs(300);
     let result = tokio::time::timeout(timeout, async {
         loop {
             // Yield to allow cancellation
             tokio::task::yield_now().await;
-            
+
             if let Some(msg) = channel.wait().await {
                 match msg {
                     russh::ChannelMsg::Data { data } => stdout.extend_from_slice(&data),
@@ -1782,8 +1788,6 @@ async fn extract_archive_to(path: &Path, target_dir: &Path) -> Result<()> {
     Ok(())
 }
 
-
-
 #[derive(Clone)]
 struct SftpClientHandler;
 

src/terminal/mod.rs

@@ -678,7 +678,7 @@ pub enum TransferType {
     Download,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize)]
 pub enum TransferState {
     Running,
     Paused,
@@ -686,6 +686,42 @@ pub enum TransferState {
     Failed(String),
     Interrupted(String), // 中断传输：包含原因（例如 "User cancelled", "Network timeout"）
     Zombie(String),      // 程序重启后残留的 Running/Paused 任务
+                         // 兼容 v0.3.11 -> v0.4.x：旧配置里曾保存过 `Cancelled`，
+                         // 新版本改成了带原因的状态，因此要手动接住旧枚举值。
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, serde::Deserialize)]
+enum TransferStateCompat {
+    Running,
+    Paused,
+    Completed,
+    Failed(String),
+    Interrupted(String),
+    Zombie(String),
+    Cancelled,
+}
+
+impl From<TransferStateCompat> for TransferState {
+    fn from(value: TransferStateCompat) -> Self {
+        match value {
+            TransferStateCompat::Running => Self::Running,
+            TransferStateCompat::Paused => Self::Paused,
+            TransferStateCompat::Completed => Self::Completed,
+            TransferStateCompat::Failed(reason) => Self::Failed(reason),
+            TransferStateCompat::Interrupted(reason) => Self::Interrupted(reason),
+            TransferStateCompat::Zombie(reason) => Self::Zombie(reason),
+            TransferStateCompat::Cancelled => Self::Interrupted("Cancelled".to_string()),
+        }
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for TransferState {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        TransferStateCompat::deserialize(deserializer).map(Into::into)
+    }
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]