fix: correctly reset active_dialog in session selector and ssh dialog

.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"
@@ -193,14 +193,14 @@ jobs:
           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"
@@ -224,9 +224,12 @@ jobs:
             end
 
             caveats <<~EOS
-              ashell is not notarized. The installation includes a postflight script
+              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

Cargo.lock

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

Cargo.toml

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

README.en.md

@@ -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

README.md

@@ -24,8 +24,28 @@ v0.4 在 v0.3 打下的基础上，重点带来了更完整的工作区操作能
 
 ## 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

src/app/dialogs.rs

@@ -160,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")
@@ -259,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(
@@ -301,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(
@@ -370,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();
                                                             },
                                                         ),
                                                     )
@@ -513,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();
+                                    })),
                             ),
                         );
 

src/session/mod.rs

@@ -113,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(
@@ -368,6 +370,7 @@ impl Ashell {
             return;
         };
 
+        self.active_dialog = None;
         match entry {
             SelectorEntry::Local => {
                 self.open_local(cx);
@@ -382,6 +385,7 @@ impl Ashell {
                 window.close_dialog(cx);
             }
         }
+        cx.notify();
     }
 
     pub(crate) fn on_selector_key_down(