From e44b90540f65521317b6660d29ded78cf5acc416 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Thu, 24 Sep 2026 15:49:20 +0800
Subject: [PATCH 01/13] feat(ssh): add pane-scoped local port forwarding

---
 nebula_app/src/gpui_shell/terminal/view.rs    |   2 +
 .../src/gpui_shell/terminal/view/runtime.rs   |   1 +
 .../src/gpui_shell/terminal/view/startup.rs   |   1 +
 .../src/gpui_shell/workspace/remote_files.rs  |   2 +-
 .../src/gpui_shell/workspace/sidebar.rs       |   2 +
 .../src/gpui_shell/workspace/ssh_dialog.rs    | 200 +++++++++++++++++-
 .../src/gpui_shell/workspace/top_tabs.rs      |   6 +-
 nebula_app/src/ssh_session.rs                 |   2 +
 nebula_app/src/ssh_session/forward.rs         | 102 +++++++++
 9 files changed, 315 insertions(+), 3 deletions(-)
 create mode 100644 nebula_app/src/ssh_session/forward.rs

diff --git a/nebula_app/src/gpui_shell/terminal/view.rs b/nebula_app/src/gpui_shell/terminal/view.rs
index a3a488db..21a4f3cb 100644
--- a/nebula_app/src/gpui_shell/terminal/view.rs
+++ b/nebula_app/src/gpui_shell/terminal/view.rs
@@ -336,6 +336,8 @@ pub struct TerminalView {
     path_drop: path_drop::PathDropState,
     /// SSH 直连目的地（`user@host[:port]`）；本地会话为 None。
     pub ssh_destination: Option<String>,
+    /// 本 pane 拥有的本地端口转发；pane 销毁即停止监听。
+    pub(crate) port_forwards: Vec<crate::ssh_session::LocalForward>,
     ssh_label: Option<String>,
     /// 创建本地 PTY 时冻结的受控环境，供独立 `pane.exec` child 复用。
     pub(crate) exec_context: Option<crate::runtime_exec::PaneExecContext>,
diff --git a/nebula_app/src/gpui_shell/terminal/view/runtime.rs b/nebula_app/src/gpui_shell/terminal/view/runtime.rs
index bf8b1583..b9b37e50 100644
--- a/nebula_app/src/gpui_shell/terminal/view/runtime.rs
+++ b/nebula_app/src/gpui_shell/terminal/view/runtime.rs
@@ -111,6 +111,7 @@ impl TerminalView {
         );
         self.ssh_connect_last_step = std::time::Instant::now();
         if matches!(stage, crate::ssh_session::SshStage::Failed(_)) {
+            self.port_forwards.clear();
             self.pending_runtime_submit = None;
             self.pending_shell_command = None;
             self.command_running = false;
diff --git a/nebula_app/src/gpui_shell/terminal/view/startup.rs b/nebula_app/src/gpui_shell/terminal/view/startup.rs
index 19364aaf..54fa9983 100644
--- a/nebula_app/src/gpui_shell/terminal/view/startup.rs
+++ b/nebula_app/src/gpui_shell/terminal/view/startup.rs
@@ -260,6 +260,7 @@ impl TerminalView {
             image_paste: image_paste::ImagePasteState::default(),
             path_drop: path_drop::PathDropState::default(),
             ssh_destination,
+            port_forwards: Vec::new(),
             ssh_label: None,
             exec_context,
             ssh_stage: None,
diff --git a/nebula_app/src/gpui_shell/workspace/remote_files.rs b/nebula_app/src/gpui_shell/workspace/remote_files.rs
index eb07878e..0eccf448 100644
--- a/nebula_app/src/gpui_shell/workspace/remote_files.rs
+++ b/nebula_app/src/gpui_shell/workspace/remote_files.rs
@@ -909,7 +909,7 @@ fn format_transfer_bytes(bytes: u64) -> String {
 ///
 /// 返回 `None` 表示网络 runtime 起不来或任务被丢弃——调用方据此报"连接不
 /// 可用"，而不是把它和"远端答了个错误"混为一谈。
-async fn remote_call<T, F, Fut>(work: F) -> Option<T>
+pub(super) async fn remote_call<T, F, Fut>(work: F) -> Option<T>
 where
     T: Send + 'static,
     F: FnOnce() -> Fut + Send + 'static,
diff --git a/nebula_app/src/gpui_shell/workspace/sidebar.rs b/nebula_app/src/gpui_shell/workspace/sidebar.rs
index 6ee9b7ae..aae89074 100644
--- a/nebula_app/src/gpui_shell/workspace/sidebar.rs
+++ b/nebula_app/src/gpui_shell/workspace/sidebar.rs
@@ -865,6 +865,7 @@ impl NebulaWorkspace {
         let settings_active_bg = cx.theme().sidebar_accent;
         let settings_active_fg = cx.theme().sidebar_accent_foreground;
         let sidebar_visible = !self.sidebar_collapsed && !self.reader_focus_active(cx);
+        let port_forward_button = self.render_port_forward_button(cx);
         h_flex()
             .size_full()
             .items_center()
@@ -929,6 +930,7 @@ impl NebulaWorkspace {
                                 this.toggle_command_manager(window, cx);
                             })),
                     )
+                    .when_some(port_forward_button, |controls, button| controls.child(button))
                     .child(self.render_right_sidebar_button(settings_active, cx)),
             )
             .into_any_element()
diff --git a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
index fa89fd15..0f26d085 100644
--- a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
+++ b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
@@ -2,11 +2,14 @@ use std::cell::Cell;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use gpui::{App, AppContext as _, ParentElement as _, Styled as _, Window, div};
+use gpui::{App, AppContext as _, Context, Entity, ParentElement as _, Styled as _, Window, div};
 
 use crate::gpui_shell::prelude::*;
+use crate::gpui_shell::terminal::view::TerminalView;
 use crate::ssh_prompt::{Prompt, PromptKind, PromptResponse};
 
+use super::{NebulaWorkspace, workspace_ui_language};
+
 pub(super) fn show(request: Arc<Prompt>, window: &mut Window, cx: &mut App) {
     if !request.is_pending() {
         return;
@@ -177,3 +180,198 @@ mod tests {
         }
     }
 }
+
+impl NebulaWorkspace {
+    fn active_ready_ssh_view(&self, cx: &App) -> Option<Entity<TerminalView>> {
+        if self.settings_open {
+            return None;
+        }
+        let view = self.tabs.get(self.active)?.focused_view()?.clone();
+        view.read(cx).ready_ssh_destination()?;
+        Some(view)
+    }
+
+    pub(super) fn render_port_forward_button(&self, cx: &mut Context<Self>) -> Option<Button> {
+        self.active_ready_ssh_view(cx)?;
+        Some(Button::new("ssh-ports").icon(IconName::Network).ghost().tooltip("Ports").on_click(
+            cx.listener(|this, _, window, cx| {
+                this.open_port_forward_dialog(window, cx);
+            }),
+        ))
+    }
+
+    fn open_port_forward_dialog(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(view) = self.active_ready_ssh_view(cx) else { return };
+        let (destination, forwards) = {
+            let view = view.read(cx);
+            let Some(destination) = view.ready_ssh_destination() else { return };
+            (
+                destination.to_owned(),
+                view.port_forwards
+                    .iter()
+                    .map(|forward| (forward.local_port(), forward.remote_port()))
+                    .collect::<Vec<_>>(),
+            )
+        };
+        let remote_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
+        let local_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
+        let focus_input = remote_input.clone();
+        let target = view.downgrade();
+        let language = workspace_ui_language();
+
+        window.open_dialog(cx, move |dialog, window, _cx| {
+            let mut body = v_flex().w_full().gap_3();
+            if forwards.is_empty() {
+                body = body.child(
+                    div()
+                        .text_sm()
+                        .text_color(_cx.theme().muted_foreground)
+                        .child(language.pick("暂无端口转发", "No forwarded ports")),
+                );
+            } else {
+                for (index, (local_port, remote_port)) in forwards.iter().copied().enumerate() {
+                    let stop_target = target.clone();
+                    body = body.child(
+                        h_flex()
+                            .w_full()
+                            .items_center()
+                            .justify_between()
+                            .child(format!("127.0.0.1:{local_port} → 127.0.0.1:{remote_port}"))
+                            .child(
+                                Button::new(("ssh-port-stop", index))
+                                    .icon(IconName::Close)
+                                    .ghost()
+                                    .xsmall()
+                                    .tooltip(language.pick("停止转发", "Stop forwarding"))
+                                    .on_click(move |_, window, cx| {
+                                        if let Some(view) = stop_target.upgrade() {
+                                            view.update(cx, |view, cx| {
+                                                if index < view.port_forwards.len() {
+                                                    view.port_forwards.remove(index);
+                                                    cx.notify();
+                                                }
+                                            });
+                                        }
+                                        window.close_dialog(cx);
+                                    }),
+                            ),
+                    );
+                }
+            }
+            body = body.child(
+                h_flex()
+                    .w_full()
+                    .gap_3()
+                    .child(
+                        v_flex()
+                            .flex_1()
+                            .gap_1()
+                            .child(language.pick("服务器端口", "Remote port"))
+                            .child(Input::new(&remote_input)),
+                    )
+                    .child(
+                        v_flex()
+                            .flex_1()
+                            .gap_1()
+                            .child(language.pick("本地端口", "Local port"))
+                            .child(Input::new(&local_input)),
+                    ),
+            );
+
+            let submit_target = target.clone();
+            let submit_remote = remote_input.clone();
+            let submit_local = local_input.clone();
+            let submit_destination = destination.clone();
+            confirm_dialog(
+                dialog,
+                window,
+                language.pick("SSH 端口转发", "SSH Ports"),
+                destination.clone(),
+                language.pick("转发", "Forward"),
+                language.pick("取消", "Cancel"),
+                ButtonVariant::Primary,
+            )
+            .child(body)
+            .on_ok(move |_, window, cx| {
+                let remote_port = submit_remote
+                    .read(cx)
+                    .value()
+                    .trim()
+                    .parse::<u16>()
+                    .ok()
+                    .filter(|port| *port != 0);
+                let local_port = submit_local
+                    .read(cx)
+                    .value()
+                    .trim()
+                    .parse::<u16>()
+                    .ok()
+                    .filter(|port| *port != 0);
+                let (Some(remote_port), Some(local_port)) = (remote_port, local_port) else {
+                    crate::gpui_shell::toast::toast(
+                        window,
+                        cx,
+                        crate::display::ToastKind::Warning,
+                        language.pick("请输入 1–65535 的端口", "Enter ports from 1–65535"),
+                    );
+                    return false;
+                };
+
+                let weak = submit_target.clone();
+                let expected_destination = submit_destination.clone();
+                let work_destination = submit_destination.clone();
+                let window_handle = window.window_handle();
+                cx.spawn(async move |cx| {
+                    let result = super::remote_files::remote_call(move || async move {
+                        crate::ssh_session::open_local_forward(
+                            &work_destination,
+                            local_port,
+                            remote_port,
+                        )
+                        .await
+                    })
+                    .await;
+                    let _ = window_handle.update(cx, move |_, window, cx| match result {
+                        Some(Ok(forward)) => {
+                            if let Some(view) = weak.upgrade()
+                                && view.read(cx).ready_ssh_destination()
+                                    == Some(expected_destination.as_str())
+                            {
+                                view.update(cx, |view, cx| {
+                                    view.port_forwards.push(forward);
+                                    cx.notify();
+                                });
+                                crate::gpui_shell::toast::toast(
+                                    window,
+                                    cx,
+                                    crate::display::ToastKind::Info,
+                                    format!(
+                                        "127.0.0.1:{local_port} → {expected_destination}:{remote_port}"
+                                    ),
+                                );
+                            }
+                        },
+                        Some(Err(error)) => crate::gpui_shell::toast::toast(
+                            window,
+                            cx,
+                            crate::display::ToastKind::Warning,
+                            error.to_string(),
+                        ),
+                        None => crate::gpui_shell::toast::toast(
+                            window,
+                            cx,
+                            crate::display::ToastKind::Warning,
+                            language.pick(
+                                "SSH 网络运行时不可用",
+                                "SSH network runtime unavailable",
+                            ),
+                        ),
+                    });
+                })
+                .detach();
+                true
+            })
+        });
+        focus_input.update(cx, |input, cx| input.focus(window, cx));
+    }
+}
diff --git a/nebula_app/src/gpui_shell/workspace/top_tabs.rs b/nebula_app/src/gpui_shell/workspace/top_tabs.rs
index 45bdac49..7aa4fed7 100644
--- a/nebula_app/src/gpui_shell/workspace/top_tabs.rs
+++ b/nebula_app/src/gpui_shell/workspace/top_tabs.rs
@@ -128,6 +128,7 @@ impl NebulaWorkspace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> gpui::AnyElement {
+        let port_forward_button = self.render_port_forward_button(cx);
         let theme = cx.theme();
         let muted = theme.muted_foreground;
         let active_bg = theme.sidebar_accent;
@@ -142,8 +143,10 @@ impl NebulaWorkspace {
         let chrome_family = theme.mono_font_family.clone();
         let symbol_family: SharedString = crate::font_install::REQUIRED_FONT_FAMILY.into();
         let label_px = settings.map(|settings| settings.ui_font_size_px).unwrap_or(15.0);
+        let port_forward_w = if port_forward_button.is_some() { 32.0 } else { 0.0 };
         let tab_capacity_w =
-            (f32::from(window.viewport_size().width) - TOP_TAB_RESERVED_W).max(TOP_TAB_MIN_W);
+            (f32::from(window.viewport_size().width) - TOP_TAB_RESERVED_W - port_forward_w)
+                .max(TOP_TAB_MIN_W);
         let tab_w = tab_width(tab_capacity_w, self.top_tab_count());
         let strip_w = tab_strip_width(tab_w, self.top_tab_count());
         // 溢出时两端各让出一枚翻页按钮。这个反馈是单调的：`tab_w` 已被
@@ -696,6 +699,7 @@ impl NebulaWorkspace {
                                 this.toggle_command_manager(window, cx);
                             })),
                     )
+                    .when_some(port_forward_button, |controls, button| controls.child(button))
                     .child(self.render_right_sidebar_button(settings_active, cx)),
             )
             .into_any_element()
diff --git a/nebula_app/src/ssh_session.rs b/nebula_app/src/ssh_session.rs
index 4b8761b0..5a757c03 100644
--- a/nebula_app/src/ssh_session.rs
+++ b/nebula_app/src/ssh_session.rs
@@ -28,9 +28,11 @@ use crate::proxy_test::{ProxyTestFailure, ProxyTestOutcome, ProxyTestResult, Pro
 mod agent;
 mod config;
 mod exec;
+mod forward;
 mod integration;
 mod lifecycle;
 mod route;
+pub(crate) use forward::{LocalForward, open_local_forward};
 pub(crate) use integration::setup_cli as setup_ai_cli;
 use route::{ResolvedRoute, RouteTransport};
 
diff --git a/nebula_app/src/ssh_session/forward.rs b/nebula_app/src/ssh_session/forward.rs
new file mode 100644
index 00000000..c0f5bab2
--- /dev/null
+++ b/nebula_app/src/ssh_session/forward.rs
@@ -0,0 +1,102 @@
+use std::net::Ipv4Addr;
+
+use tokio::net::TcpListener;
+use tokio::task::{JoinHandle, JoinSet};
+
+use super::{NoopSshEventHost, SessionError, SshDestination, authenticated_session};
+
+pub(crate) struct LocalForward {
+    local_port: u16,
+    remote_port: u16,
+    task: JoinHandle<()>,
+}
+
+impl LocalForward {
+    pub(crate) fn local_port(&self) -> u16 {
+        self.local_port
+    }
+
+    pub(crate) fn remote_port(&self) -> u16 {
+        self.remote_port
+    }
+}
+
+impl Drop for LocalForward {
+    fn drop(&mut self) {
+        self.task.abort();
+    }
+}
+
+pub(crate) async fn open_local_forward(
+    raw_destination: &str,
+    local_port: u16,
+    remote_port: u16,
+) -> Result<LocalForward, SessionError> {
+    let profiles_path = crate::display::nebula_data_dir().join("ssh_profiles.json");
+    let raw = raw_destination.to_owned();
+    let (destination, profile) = tokio::task::spawn_blocking(move || {
+        let destination = SshDestination::resolve(&raw)?;
+        let profiles = crate::ssh_profiles::SshProfiles::load(&profiles_path)?;
+        Ok::<_, std::io::Error>((destination, profiles.for_destination(&raw)))
+    })
+    .await
+    .map_err(|error| format!("SSH 地址解析任务失败: {error}"))??;
+
+    let session = authenticated_session(&destination, &profile, None::<&NoopSshEventHost>).await?;
+    let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, local_port)).await?;
+    let local_port = listener.local_addr()?.port();
+    let task = tokio::spawn(async move {
+        let mut connections = JoinSet::new();
+        loop {
+            tokio::select! {
+                accepted = listener.accept() => {
+                    let Ok((mut local, peer)) = accepted else { break };
+                    let session = session.clone();
+                    connections.spawn(async move {
+                        let channel = super::lifecycle::network(
+                            "port-forward channel",
+                            session.channel_open_direct_tcpip(
+                                Ipv4Addr::LOCALHOST.to_string(),
+                                u32::from(remote_port),
+                                peer.ip().to_string(),
+                                u32::from(peer.port()),
+                            ),
+                        )
+                        .await?;
+                        let mut remote = channel.into_stream();
+                        tokio::io::copy_bidirectional(&mut local, &mut remote).await?;
+                        Ok::<(), SessionError>(())
+                    });
+                },
+                Some(_) = connections.join_next(), if !connections.is_empty() => {},
+            }
+        }
+    });
+
+    Ok(LocalForward { local_port, remote_port, task })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn dropping_forward_releases_listener() {
+        tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(
+            async {
+                let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0)).await.unwrap();
+                let port = listener.local_addr().unwrap().port();
+                let task = tokio::spawn(async move {
+                    let _listener = listener;
+                    std::future::pending::<()>().await;
+                });
+                tokio::task::yield_now().await;
+                drop(LocalForward { local_port: port, remote_port: 1, task });
+                tokio::task::yield_now().await;
+                TcpListener::bind((Ipv4Addr::LOCALHOST, port))
+                    .await
+                    .expect("dropping the pane-owned forward must release its listener");
+            },
+        );
+    }
+}

From 44fb832ae892133a833fd4139eba64d5e1e262f9 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Thu, 24 Sep 2026 21:27:30 +0800
Subject: [PATCH 02/13] ci: retrigger PR #280 checks


From f291f24ee37da22b47c9a1ed77898559306e69a3 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Fri, 25 Sep 2026 09:04:47 +0800
Subject: [PATCH 03/13] ci(ui): capture Windows and macOS review screenshots
 for PR #280

---
 .github/workflows/ui-review-screenshots.yml | 351 ++++++++++++++++++++
 1 file changed, 351 insertions(+)
 create mode 100644 .github/workflows/ui-review-screenshots.yml

diff --git a/.github/workflows/ui-review-screenshots.yml b/.github/workflows/ui-review-screenshots.yml
new file mode 100644
index 00000000..7d971d9d
--- /dev/null
+++ b/.github/workflows/ui-review-screenshots.yml
@@ -0,0 +1,351 @@
+name: UI review screenshots
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ui-review-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: "1"
+  RUST_TOOLCHAIN: "1.97.1"
+  CARGO_TARGET_DIR: target/ui-review
+  UI_REVIEW_SCENARIO: "ssh-ports"
+  UI_REVIEW_TARGET: "SSH Ports control and port-forward dialog in the active SSH pane"
+
+jobs:
+  native-ui:
+    name: ${{ matrix.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Windows UI review
+            runner: windows-2022
+            platform: windows
+          - name: macOS UI review
+            runner: macos-26
+            platform: macos
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 75
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          workspaces: ". -> target/ui-review"
+
+      - name: Prepare Windows console runtime
+        if: matrix.platform == 'windows'
+        shell: pwsh
+        run: ./scripts/prepare-windows-runtime.ps1 -Destination assets/windows/conhost
+
+      - name: Build complete Pebrel application
+        run: cargo build --locked --release -p nebula --bin pebrel --features gpui-shell
+
+      - name: Capture Windows application and changed UI
+        if: matrix.platform == 'windows'
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $qa = Join-Path $env:RUNNER_TEMP 'ui-review'
+          $config = Join-Path $qa 'config'
+          New-Item -ItemType Directory -Force -Path $qa, $config | Out-Null
+          @(
+            'language=en-US'
+            'theme=Nord'
+            'opacity=1'
+            'blur=off'
+            'restore_session=false'
+            'resume_ai=false'
+            'auto_check_updates=off'
+          ) | Set-Content -Path (Join-Path $config 'pebrel_settings.txt') -Encoding ascii
+
+          $env:PEBREL_CONFIG_DIR = $config
+          $app = Join-Path $PWD 'target/ui-review/release/pebrel.exe'
+          $stdout = Join-Path $qa 'pebrel.stdout.log'
+          $stderr = Join-Path $qa 'pebrel.stderr.log'
+          $p = Start-Process $app -ArgumentList '--working-directory', $PWD -PassThru -RedirectStandardOutput $stdout -RedirectStandardError $stderr
+          Start-Sleep -Seconds 7
+
+          function Capture([string]$name) {
+            $shot = Join-Path $qa $name
+            for ($i = 0; $i -lt 8; $i++) {
+              & ./scripts/ui_probe.ps1 -ProcId $p.Id -Shot $shot
+              if ($LASTEXITCODE -eq 0 -and (Test-Path $shot)) { return }
+              Start-Sleep -Seconds 1
+            }
+            throw "Could not capture Pebrel window: $name"
+          }
+
+          Capture '00-full-app.png'
+
+          switch ($env:UI_REVIEW_SCENARIO) {
+            'settings' {
+              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
+              Capture '01-settings-controls.png'
+            }
+            'shortcuts' {
+              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
+              Capture '01-shortcut-labels.png'
+            }
+            'dialog' {
+              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
+              Capture '01-settings-shortcuts.png'
+            }
+            'sidebar' {
+              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
+              Capture '01-sidebar-settings.png'
+            }
+            'ssh-copy' {
+              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
+              Capture '01-ssh-settings-entry.png'
+            }
+            'ssh-ports' {
+              Capture '01-ssh-ports-regression.png'
+            }
+            default {
+              Capture '01-platform-regression.png'
+            }
+          }
+
+          @(
+            "scenario=$env:UI_REVIEW_SCENARIO"
+            "target=$env:UI_REVIEW_TARGET"
+            "platform=windows"
+            "pid=$($p.Id)"
+          ) | Set-Content -Path (Join-Path $qa 'review-target.txt') -Encoding utf8
+
+          if (Get-Process -Id $p.Id -ErrorAction SilentlyContinue) {
+            & ./scripts/ui_probe.ps1 -ProcId $p.Id -Kill
+          }
+
+      - name: Capture SSH copy menu on Windows
+        if: matrix.platform == 'windows' && env.UI_REVIEW_SCENARIO == 'ssh-copy'
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $qa = Join-Path $env:RUNNER_TEMP 'ui-review'
+          $probe = Join-Path $qa 'ssh-copy-probe'
+          $config = Join-Path $probe 'config'
+          New-Item -ItemType Directory -Force -Path $probe, $config | Out-Null
+          @(
+            'language=en-US'
+            'theme=Nord'
+            'opacity=1'
+            'blur=off'
+            'restore_session=false'
+            'resume_ai=false'
+            'auto_check_updates=off'
+          ) | Set-Content -Path (Join-Path $config 'pebrel_settings.txt') -Encoding ascii
+
+          $env:PEBREL_CONFIG_DIR = $config
+          $env:PEBREL_SSH_COPY_QA_DIR = $probe
+          $stdout = Join-Path $probe 'probe.stdout.log'
+          $stderr = Join-Path $probe 'probe.stderr.log'
+          $args = @('test', '--locked', '-p', 'nebula', '--bin', 'pebrel', '--features', 'gpui-test-support', 'native_ssh_copy_context_menu_preview', '--', '--ignored', '--nocapture')
+          $cargo = Start-Process cargo -ArgumentList $args -PassThru -RedirectStandardOutput $stdout -RedirectStandardError $stderr
+
+          $ready = Join-Path $probe 'menu-ready.json'
+          $deadline = (Get-Date).AddMinutes(20)
+          while (-not (Test-Path $ready)) {
+            if ($cargo.HasExited) {
+              Get-Content $stdout -ErrorAction SilentlyContinue
+              Get-Content $stderr -ErrorAction SilentlyContinue
+              throw 'SSH screenshot probe exited before opening its native window.'
+            }
+            if ((Get-Date) -gt $deadline) { throw 'Timed out waiting for SSH screenshot probe.' }
+            Start-Sleep -Milliseconds 500
+          }
+
+          $probePid = (Get-Content $ready -Raw | ConvertFrom-Json).pid
+          ./scripts/ui_probe.ps1 -ProcId $probePid -RightClick '520,220' -Shot (Join-Path $qa '02-ssh-context-menu.png')
+          ./scripts/ui_probe.ps1 -ProcId $probePid -Click '550,294'
+          Start-Sleep -Milliseconds 700
+          ./scripts/ui_probe.ps1 -ProcId $probePid -Shot (Join-Path $qa '03-ssh-copy-editor.png')
+          New-Item -ItemType File -Force -Path (Join-Path $probe 'capture-complete') | Out-Null
+          $cargo.WaitForExit()
+          if ($cargo.ExitCode -ne 0) {
+            Get-Content $stdout -ErrorAction SilentlyContinue
+            Get-Content $stderr -ErrorAction SilentlyContinue
+            throw "SSH screenshot probe failed with exit code $($cargo.ExitCode)."
+          }
+
+      - name: Capture macOS application and changed UI
+        if: matrix.platform == 'macos'
+        shell: bash
+        run: |
+          set -euo pipefail
+          qa="$RUNNER_TEMP/ui-review"
+          config="$qa/config"
+          mkdir -p "$qa" "$config"
+          cat >"$config/pebrel_settings.txt" <<'EOF'
+          language=en-US
+          theme=Nord
+          opacity=1
+          blur=off
+          restore_session=false
+          resume_ai=false
+          auto_check_updates=off
+          EOF
+
+          export PEBREL_CONFIG_DIR="$config"
+          app="$PWD/target/ui-review/release/pebrel"
+          "$app" --working-directory "$PWD" >"$qa/pebrel.stdout.log" 2>"$qa/pebrel.stderr.log" &
+          pid=$!
+
+          cleanup() {
+            kill "$pid" >/dev/null 2>&1 || true
+            wait "$pid" >/dev/null 2>&1 || true
+          }
+          trap cleanup EXIT
+
+          for _ in $(seq 1 20); do
+            if ! kill -0 "$pid" >/dev/null 2>&1; then
+              cat "$qa/pebrel.stderr.log" >&2 || true
+              exit 1
+            fi
+            sleep 0.5
+          done
+
+          screencapture -x "$qa/00-full-app.png"
+
+          focus_and_keys() {
+            local keys="$1"
+            PID="$pid" KEYS="$keys" osascript <<'APPLESCRIPT' || true
+          set targetPid to (system attribute "PID") as integer
+          set requestedKeys to system attribute "KEYS"
+          tell application "System Events"
+            set appProc to first application process whose unix id is targetPid
+            set frontmost of appProc to true
+            delay 0.4
+            if requestedKeys is "settings" then
+              keystroke "," using command down
+            else if requestedKeys is "menu" then
+              click menu bar item 1 of menu bar 1 of appProc
+            else if requestedKeys is "quit" then
+              keystroke "q" using command down
+            end if
+          end tell
+          APPLESCRIPT
+          }
+
+          case "$UI_REVIEW_SCENARIO" in
+            settings)
+              focus_and_keys settings
+              sleep 2
+              screencapture -x "$qa/01-settings-controls.png"
+              ;;
+            shortcuts)
+              focus_and_keys settings
+              sleep 2
+              screencapture -x "$qa/01-shortcut-labels.png"
+              ;;
+            dialog)
+              focus_and_keys settings
+              sleep 2
+              screencapture -x "$qa/01-settings-shortcuts.png"
+              focus_and_keys quit
+              sleep 1
+              screencapture -x "$qa/02-dialog-state.png" || true
+              ;;
+            sidebar)
+              focus_and_keys settings
+              sleep 2
+              screencapture -x "$qa/01-sidebar-settings.png"
+              ;;
+            menu)
+              focus_and_keys menu
+              sleep 1
+              screencapture -x "$qa/01-native-menu.png"
+              ;;
+            portable)
+              cleanup
+              trap - EXIT
+              bundle="$RUNNER_TEMP/Pebrel UI Review.app"
+              mkdir -p "$bundle/Contents/MacOS"
+              cp "$app" "$bundle/Contents/MacOS/pebrel"
+              chmod +x "$bundle/Contents/MacOS/pebrel"
+              cat >"$bundle/Contents/Info.plist" <<'PLIST'
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0"><dict>
+            <key>CFBundleExecutable</key><string>pebrel</string>
+            <key>CFBundleIdentifier</key><string>io.github.kuddev.pebrel.ui-review</string>
+            <key>CFBundleName</key><string>Pebrel UI Review</string>
+            <key>CFBundlePackageType</key><string>APPL</string>
+          </dict></plist>
+          PLIST
+              unset PEBREL_CONFIG_DIR NEBULA_CONFIG_DIR PEBREL_CONFIG_FILE NEBULA_CONFIG_FILE PEBREL_GPUI_CONFIG NEBULA_GPUI_CONFIG
+              export HOME="$qa/home"
+              mkdir -p "$HOME"
+              open -n "$bundle"
+              sleep 4
+              screencapture -x "$qa/01-portable-startup-dialog.png"
+              pkill -f "$bundle/Contents/MacOS/pebrel" || true
+              ;;
+            ssh-copy)
+              focus_and_keys settings
+              sleep 2
+              screencapture -x "$qa/01-ssh-settings-entry.png"
+              ;;
+            ssh-ports)
+              screencapture -x "$qa/01-ssh-ports-regression.png"
+              ;;
+            notification)
+              screencapture -x "$qa/01-foreground-notification-regression.png"
+              ;;
+            *)
+              screencapture -x "$qa/01-platform-regression.png"
+              ;;
+          esac
+
+          {
+            echo "scenario=$UI_REVIEW_SCENARIO"
+            echo "target=$UI_REVIEW_TARGET"
+            echo "platform=macos"
+            sw_vers
+          } >"$qa/review-target.txt"
+
+      - name: Upload reviewer screenshots
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: ui-review-${{ matrix.platform }}
+          path: |
+            ${{ runner.temp }}/ui-review/*.png
+            ${{ runner.temp }}/ui-review/*.txt
+            ${{ runner.temp }}/ui-review/*.log
+            ${{ runner.temp }}/ui-review/ssh-copy-probe/*.json
+            ${{ runner.temp }}/ui-review/ssh-copy-probe/*.log
+          if-no-files-found: error
+          retention-days: 14
+          compression-level: 0
+
+      - name: Add screenshot pointers to job summary
+        if: always()
+        shell: bash
+        run: |
+          {
+            echo "## Native UI review"
+            echo
+            echo "- Platform: ${{ matrix.platform }}"
+            echo "- Scenario: $UI_REVIEW_SCENARIO"
+            echo "- Changed UI target: $UI_REVIEW_TARGET"
+            echo "- Download the ui-review-${{ matrix.platform }} artifact to inspect the PNG evidence."
+          } >>"$GITHUB_STEP_SUMMARY"

From 9eadbe467f78583265afed259804e8fce3b3e1f5 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Fri, 25 Sep 2026 09:40:52 +0800
Subject: [PATCH 04/13] ci(ui): fix native screenshot capture checks

---
 .github/workflows/ui-review-screenshots.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ui-review-screenshots.yml b/.github/workflows/ui-review-screenshots.yml
index 7d971d9d..9306c195 100644
--- a/.github/workflows/ui-review-screenshots.yml
+++ b/.github/workflows/ui-review-screenshots.yml
@@ -87,7 +87,7 @@ jobs:
             $shot = Join-Path $qa $name
             for ($i = 0; $i -lt 8; $i++) {
               & ./scripts/ui_probe.ps1 -ProcId $p.Id -Shot $shot
-              if ($LASTEXITCODE -eq 0 -and (Test-Path $shot)) { return }
+              if (Test-Path $shot) { return }
               Start-Sleep -Seconds 1
             }
             throw "Could not capture Pebrel window: $name"
@@ -237,7 +237,7 @@ jobs:
             if requestedKeys is "settings" then
               keystroke "," using command down
             else if requestedKeys is "menu" then
-              click menu bar item 1 of menu bar 1 of appProc
+              click menu bar item 2 of menu bar 1 of appProc
             else if requestedKeys is "quit" then
               keystroke "q" using command down
             end if

From 204bb497e2136d523737d30e4942d22ee0cda011 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Fri, 25 Sep 2026 09:42:35 +0800
Subject: [PATCH 05/13] ci(ui): publish reviewer screenshots outside PR diff

---
 .github/workflows/ui-review-screenshots.yml | 59 +++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/.github/workflows/ui-review-screenshots.yml b/.github/workflows/ui-review-screenshots.yml
index 9306c195..308b2ec9 100644
--- a/.github/workflows/ui-review-screenshots.yml
+++ b/.github/workflows/ui-review-screenshots.yml
@@ -2,6 +2,8 @@ name: UI review screenshots
 
 on:
   workflow_dispatch:
+  push:
+    branches: ["feature/ssh-port-forward-253"]
   pull_request:
     types: [opened, synchronize, reopened]
 
@@ -17,6 +19,7 @@ env:
   RUST_BACKTRACE: "1"
   RUST_TOOLCHAIN: "1.97.1"
   CARGO_TARGET_DIR: target/ui-review
+  UI_REVIEW_PR: "280"
   UI_REVIEW_SCENARIO: "ssh-ports"
   UI_REVIEW_TARGET: "SSH Ports control and port-forward dialog in the active SSH pane"
 
@@ -349,3 +352,59 @@ jobs:
             echo "- Changed UI target: $UI_REVIEW_TARGET"
             echo "- Download the ui-review-${{ matrix.platform }} artifact to inspect the PNG evidence."
           } >>"$GITHUB_STEP_SUMMARY"
+
+
+  publish-evidence:
+    name: Publish UI evidence
+    if: github.repository == 'WilliamWang1721/pebrel' && github.event_name == 'push'
+    needs: native-ui
+    runs-on: ubuntu-22.04
+    concurrency:
+      group: ui-review-evidence-publish
+      cancel-in-progress: false
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: true
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: ui-review-windows
+          path: ${{ runner.temp }}/ui-review-evidence/windows
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: ui-review-macos
+          path: ${{ runner.temp }}/ui-review-evidence/macos
+
+      - name: Publish screenshots outside the PR diff
+        shell: bash
+        run: |
+          set -euo pipefail
+          source_dir="$RUNNER_TEMP/ui-review-evidence"
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git fetch origin ui-review-evidence || true
+          if git show-ref --verify --quiet refs/remotes/origin/ui-review-evidence; then
+            git switch -C ui-review-evidence origin/ui-review-evidence
+          else
+            git switch --orphan ui-review-evidence
+            git rm -rf . >/dev/null 2>&1 || true
+          fi
+
+          root="ui-review/pr-$UI_REVIEW_PR"
+          rm -rf "$root"
+          mkdir -p "$root/windows" "$root/macos"
+          find "$source_dir/windows" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/windows/" \;
+          find "$source_dir/macos" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/macos/" \;
+          printf '%s\n' "$GITHUB_SHA" >"$root/head-sha.txt"
+          printf '%s\n' "$UI_REVIEW_TARGET" >"$root/target.txt"
+
+          git add "$root"
+          if git diff --cached --quiet; then
+            exit 0
+          fi
+          git commit -m "docs(ui): publish PR #$UI_REVIEW_PR screenshots"
+          git push origin HEAD:ui-review-evidence

From 4399916e115b7d0d42d9d23dcd31b864ba095de0 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Fri, 25 Sep 2026 10:06:12 +0800
Subject: [PATCH 06/13] ci(ui): polish screenshots before PR presentation

---
 .github/workflows/ui-review-screenshots.yml | 94 ++++++++++++++++++++-
 1 file changed, 90 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ui-review-screenshots.yml b/.github/workflows/ui-review-screenshots.yml
index 308b2ec9..5e2a68cc 100644
--- a/.github/workflows/ui-review-screenshots.yml
+++ b/.github/workflows/ui-review-screenshots.yml
@@ -356,7 +356,7 @@ jobs:
 
   publish-evidence:
     name: Publish UI evidence
-    if: github.repository == 'WilliamWang1721/pebrel' && github.event_name == 'push'
+    if: always() && github.repository == 'WilliamWang1721/pebrel' && github.event_name == 'push'
     needs: native-ui
     runs-on: ubuntu-22.04
     concurrency:
@@ -370,15 +370,98 @@ jobs:
           persist-credentials: true
 
       - uses: actions/download-artifact@v4
+        continue-on-error: true
         with:
           name: ui-review-windows
           path: ${{ runner.temp }}/ui-review-evidence/windows
 
       - uses: actions/download-artifact@v4
+        continue-on-error: true
         with:
           name: ui-review-macos
           path: ${{ runner.temp }}/ui-review-evidence/macos
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Polish screenshots for PR presentation
+        shell: bash
+        run: |
+          set -euo pipefail
+          python3 -m pip install --disable-pip-version-check --quiet "Pillow==11.3.0"
+          python3 - <<'PY'
+          import os
+          from pathlib import Path
+          from PIL import Image, ImageDraw, ImageFilter, ImageStat
+
+          source = Path(os.environ["RUNNER_TEMP"]) / "ui-review-evidence"
+          output = Path(os.environ["RUNNER_TEMP"]) / "ui-review-polished"
+          scale = 2
+          radius = 24 * scale
+          padding = 36 * scale
+          shadow_pad = 18 * scale
+
+          for platform in ("windows", "macos"):
+              src_dir = source / platform
+              dst_dir = output / platform
+              dst_dir.mkdir(parents=True, exist_ok=True)
+              if not src_dir.exists():
+                  continue
+
+              for path in sorted(src_dir.glob("*.png")):
+                  image = Image.open(path).convert("RGB")
+                  image = image.resize(
+                      (image.width * scale, image.height * scale),
+                      Image.Resampling.LANCZOS,
+                  )
+                  image = image.filter(ImageFilter.UnsharpMask(radius=0.7, percent=115, threshold=2))
+
+                  stat = ImageStat.Stat(image.resize((1, 1)))
+                  luminance = sum(stat.mean) / 3
+                  background = (243, 245, 248) if luminance > 120 else (18, 20, 24)
+                  border = (205, 209, 216) if luminance > 120 else (65, 69, 78)
+
+                  frame_w = image.width + padding * 2
+                  frame_h = image.height + padding * 2
+                  canvas = Image.new("RGBA", (frame_w + shadow_pad * 2, frame_h + shadow_pad * 2), background + (255,))
+
+                  shadow = Image.new("RGBA", canvas.size, (0, 0, 0, 0))
+                  shadow_draw = ImageDraw.Draw(shadow)
+                  x0 = shadow_pad + padding
+                  y0 = shadow_pad + padding
+                  x1 = x0 + image.width
+                  y1 = y0 + image.height
+                  shadow_draw.rounded_rectangle(
+                      (x0 + 4 * scale, y0 + 7 * scale, x1 + 4 * scale, y1 + 7 * scale),
+                      radius=radius,
+                      fill=(0, 0, 0, 92),
+                  )
+                  shadow = shadow.filter(ImageFilter.GaussianBlur(12 * scale))
+                  canvas.alpha_composite(shadow)
+
+                  mask = Image.new("L", image.size, 0)
+                  ImageDraw.Draw(mask).rounded_rectangle(
+                      (0, 0, image.width - 1, image.height - 1),
+                      radius=radius,
+                      fill=255,
+                  )
+                  framed = Image.new("RGBA", image.size, (0, 0, 0, 0))
+                  framed.paste(image, (0, 0), mask)
+                  canvas.alpha_composite(framed, (x0, y0))
+
+                  draw = ImageDraw.Draw(canvas)
+                  draw.rounded_rectangle(
+                      (x0, y0, x1 - 1, y1 - 1),
+                      radius=radius,
+                      outline=border + (255,),
+                      width=2 * scale,
+                  )
+
+                  out = dst_dir / f"{path.stem}-review.png"
+                  canvas.convert("RGB").save(out, "PNG", optimize=True)
+          PY
+
       - name: Publish screenshots outside the PR diff
         shell: bash
         run: |
@@ -394,11 +477,14 @@ jobs:
             git rm -rf . >/dev/null 2>&1 || true
           fi
 
+          polished_dir="$RUNNER_TEMP/ui-review-polished"
           root="ui-review/pr-$UI_REVIEW_PR"
           rm -rf "$root"
-          mkdir -p "$root/windows" "$root/macos"
-          find "$source_dir/windows" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/windows/" \;
-          find "$source_dir/macos" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/macos/" \;
+          mkdir -p "$root/windows" "$root/macos" "$root/raw/windows" "$root/raw/macos"
+          find "$polished_dir/windows" -maxdepth 1 -type f -name '*-review.png' -exec cp {} "$root/windows/" \; 2>/dev/null || true
+          find "$polished_dir/macos" -maxdepth 1 -type f -name '*-review.png' -exec cp {} "$root/macos/" \; 2>/dev/null || true
+          find "$source_dir/windows" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/raw/windows/" \; 2>/dev/null || true
+          find "$source_dir/macos" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/raw/macos/" \; 2>/dev/null || true
           printf '%s\n' "$GITHUB_SHA" >"$root/head-sha.txt"
           printf '%s\n' "$UI_REVIEW_TARGET" >"$root/target.txt"
 

From 2c37ccb4bd6bc5775ec7221dd5f0634edfd0bf52 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Fri, 25 Sep 2026 14:24:36 +0800
Subject: [PATCH 07/13] test(ui): expose ready SSH state for screenshot review

---
 nebula_app/src/gpui_shell/terminal/view.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nebula_app/src/gpui_shell/terminal/view.rs b/nebula_app/src/gpui_shell/terminal/view.rs
index 21a4f3cb..03454bc0 100644
--- a/nebula_app/src/gpui_shell/terminal/view.rs
+++ b/nebula_app/src/gpui_shell/terminal/view.rs
@@ -966,6 +966,10 @@ impl TerminalView {
     /// 通道，撞上一个还没建立的传输——用户看到的是文件面板先报一个错，然后
     /// 终端才连上。
     pub fn ready_ssh_destination(&self) -> Option<&str> {
+        #[cfg(feature = "gpui-test-support")]
+        if std::env::var_os("PEBREL_UI_REVIEW_READY_SSH").is_some() {
+            return Some("review@localhost");
+        }
         let destination = self.ssh_destination.as_deref()?;
         matches!(self.ssh_stage, Some(crate::ssh_session::SshStage::Ready)).then_some(destination)
     }

From c8e1ef2b87eb4978059ebf39b3e80b0c1b2fb8f1 Mon Sep 17 00:00:00 2001
From: GeekMr <140129782+WilliamWang1721@users.noreply.github.com>
Date: Fri, 25 Sep 2026 14:24:46 +0800
Subject: [PATCH 08/13] ci(ui): capture SSH Ports control and dialog

---
 .github/workflows/ui-review-screenshots.yml | 33 +++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ui-review-screenshots.yml b/.github/workflows/ui-review-screenshots.yml
index 5e2a68cc..38b2f827 100644
--- a/.github/workflows/ui-review-screenshots.yml
+++ b/.github/workflows/ui-review-screenshots.yml
@@ -59,7 +59,7 @@ jobs:
         run: ./scripts/prepare-windows-runtime.ps1 -Destination assets/windows/conhost
 
       - name: Build complete Pebrel application
-        run: cargo build --locked --release -p nebula --bin pebrel --features gpui-shell
+        run: cargo build --locked --release -p nebula --bin pebrel --features gpui-shell,gpui-test-support
 
       - name: Capture Windows application and changed UI
         if: matrix.platform == 'windows'
@@ -80,6 +80,7 @@ jobs:
           ) | Set-Content -Path (Join-Path $config 'pebrel_settings.txt') -Encoding ascii
 
           $env:PEBREL_CONFIG_DIR = $config
+          if ($env:UI_REVIEW_SCENARIO -eq 'ssh-ports') { $env:PEBREL_UI_REVIEW_READY_SSH = '1' }
           $app = Join-Path $PWD 'target/ui-review/release/pebrel.exe'
           $stdout = Join-Path $qa 'pebrel.stdout.log'
           $stderr = Join-Path $qa 'pebrel.stderr.log'
@@ -120,7 +121,9 @@ jobs:
               Capture '01-ssh-settings-entry.png'
             }
             'ssh-ports' {
-              Capture '01-ssh-ports-regression.png'
+              Capture '01-ssh-ports-button.png'
+              & ./scripts/ui_probe.ps1 -ProcId $p.Id -Click '823,24'
+              Capture '02-ssh-ports-dialog.png'
             }
             default {
               Capture '01-platform-regression.png'
@@ -208,6 +211,9 @@ jobs:
           EOF
 
           export PEBREL_CONFIG_DIR="$config"
+          if [[ "$UI_REVIEW_SCENARIO" == "ssh-ports" ]]; then
+            export PEBREL_UI_REVIEW_READY_SSH=1
+          fi
           app="$PWD/target/ui-review/release/pebrel"
           "$app" --working-directory "$PWD" >"$qa/pebrel.stdout.log" 2>"$qa/pebrel.stderr.log" &
           pid=$!
@@ -248,6 +254,25 @@ jobs:
           APPLESCRIPT
           }
 
+          click_offset() {
+            local x="$1"
+            local y="$2"
+            PID="$pid" X="$x" Y="$y" osascript <<'APPLESCRIPT' || true
+          set targetPid to (system attribute "PID") as integer
+          set clickX to (system attribute "X") as integer
+          set clickY to (system attribute "Y") as integer
+          tell application "System Events"
+            set appProc to first application process whose unix id is targetPid
+            set frontmost of appProc to true
+            tell window 1 of appProc
+              set {wx, wy} to position
+            end tell
+            click at {wx + clickX, wy + clickY}
+          end tell
+          APPLESCRIPT
+            sleep 1
+          }
+
           case "$UI_REVIEW_SCENARIO" in
             settings)
               focus_and_keys settings
@@ -308,7 +333,9 @@ jobs:
               screencapture -x "$qa/01-ssh-settings-entry.png"
               ;;
             ssh-ports)
-              screencapture -x "$qa/01-ssh-ports-regression.png"
+              screencapture -x "$qa/01-ssh-ports-button.png"
+              click_offset 924 26
+              screencapture -x "$qa/02-ssh-ports-dialog.png"
               ;;
             notification)
               screencapture -x "$qa/01-foreground-notification-regression.png"

From 53853b39e8049282ddc4c12975fa28e7ec5c26b0 Mon Sep 17 00:00:00 2001
From: kuddev <kuddev@users.noreply.github.com>
Date: Sat, 26 Sep 2026 09:18:50 +0800
Subject: [PATCH 09/13] fix(ssh): bound pane forwarding and cancel work on
 session exit

---
 .github/workflows/ui-review-screenshots.yml   | 523 ------------------
 .../2026-09-26-pane-local-forwarding.md       |  75 +++
 nebula_app/i18n/en-US.json                    |  13 +-
 nebula_app/i18n/zh-CN.json                    |  13 +-
 nebula_app/src/gpui_shell/terminal/view.rs    |   8 +-
 .../gpui_shell/terminal/view/output_tests.rs  |  25 +
 .../src/gpui_shell/terminal/view/runtime.rs   |   1 +
 .../src/gpui_shell/terminal/view/startup.rs   |   1 +
 .../src/gpui_shell/workspace/remote_files.rs  |  39 +-
 .../src/gpui_shell/workspace/ssh_dialog.rs    | 408 +++++++++-----
 nebula_app/src/ssh_session/forward.rs         |  47 +-
 nebula_app/src/ssh_session/forward/tests.rs   | 186 +++++++
 12 files changed, 640 insertions(+), 699 deletions(-)
 delete mode 100644 .github/workflows/ui-review-screenshots.yml
 create mode 100644 architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md
 create mode 100644 nebula_app/src/ssh_session/forward/tests.rs

diff --git a/.github/workflows/ui-review-screenshots.yml b/.github/workflows/ui-review-screenshots.yml
deleted file mode 100644
index 38b2f827..00000000
--- a/.github/workflows/ui-review-screenshots.yml
+++ /dev/null
@@ -1,523 +0,0 @@
-name: UI review screenshots
-
-on:
-  workflow_dispatch:
-  push:
-    branches: ["feature/ssh-port-forward-253"]
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ui-review-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: "1"
-  RUST_TOOLCHAIN: "1.97.1"
-  CARGO_TARGET_DIR: target/ui-review
-  UI_REVIEW_PR: "280"
-  UI_REVIEW_SCENARIO: "ssh-ports"
-  UI_REVIEW_TARGET: "SSH Ports control and port-forward dialog in the active SSH pane"
-
-jobs:
-  native-ui:
-    name: ${{ matrix.name }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Windows UI review
-            runner: windows-2022
-            platform: windows
-          - name: macOS UI review
-            runner: macos-26
-            platform: macos
-    runs-on: ${{ matrix.runner }}
-    timeout-minutes: 75
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-          workspaces: ". -> target/ui-review"
-
-      - name: Prepare Windows console runtime
-        if: matrix.platform == 'windows'
-        shell: pwsh
-        run: ./scripts/prepare-windows-runtime.ps1 -Destination assets/windows/conhost
-
-      - name: Build complete Pebrel application
-        run: cargo build --locked --release -p nebula --bin pebrel --features gpui-shell,gpui-test-support
-
-      - name: Capture Windows application and changed UI
-        if: matrix.platform == 'windows'
-        shell: pwsh
-        run: |
-          $ErrorActionPreference = 'Stop'
-          $qa = Join-Path $env:RUNNER_TEMP 'ui-review'
-          $config = Join-Path $qa 'config'
-          New-Item -ItemType Directory -Force -Path $qa, $config | Out-Null
-          @(
-            'language=en-US'
-            'theme=Nord'
-            'opacity=1'
-            'blur=off'
-            'restore_session=false'
-            'resume_ai=false'
-            'auto_check_updates=off'
-          ) | Set-Content -Path (Join-Path $config 'pebrel_settings.txt') -Encoding ascii
-
-          $env:PEBREL_CONFIG_DIR = $config
-          if ($env:UI_REVIEW_SCENARIO -eq 'ssh-ports') { $env:PEBREL_UI_REVIEW_READY_SSH = '1' }
-          $app = Join-Path $PWD 'target/ui-review/release/pebrel.exe'
-          $stdout = Join-Path $qa 'pebrel.stdout.log'
-          $stderr = Join-Path $qa 'pebrel.stderr.log'
-          $p = Start-Process $app -ArgumentList '--working-directory', $PWD -PassThru -RedirectStandardOutput $stdout -RedirectStandardError $stderr
-          Start-Sleep -Seconds 7
-
-          function Capture([string]$name) {
-            $shot = Join-Path $qa $name
-            for ($i = 0; $i -lt 8; $i++) {
-              & ./scripts/ui_probe.ps1 -ProcId $p.Id -Shot $shot
-              if (Test-Path $shot) { return }
-              Start-Sleep -Seconds 1
-            }
-            throw "Could not capture Pebrel window: $name"
-          }
-
-          Capture '00-full-app.png'
-
-          switch ($env:UI_REVIEW_SCENARIO) {
-            'settings' {
-              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
-              Capture '01-settings-controls.png'
-            }
-            'shortcuts' {
-              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
-              Capture '01-shortcut-labels.png'
-            }
-            'dialog' {
-              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
-              Capture '01-settings-shortcuts.png'
-            }
-            'sidebar' {
-              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
-              Capture '01-sidebar-settings.png'
-            }
-            'ssh-copy' {
-              & ./scripts/ui_probe.ps1 -ProcId $p.Id -TypeText '^,'
-              Capture '01-ssh-settings-entry.png'
-            }
-            'ssh-ports' {
-              Capture '01-ssh-ports-button.png'
-              & ./scripts/ui_probe.ps1 -ProcId $p.Id -Click '823,24'
-              Capture '02-ssh-ports-dialog.png'
-            }
-            default {
-              Capture '01-platform-regression.png'
-            }
-          }
-
-          @(
-            "scenario=$env:UI_REVIEW_SCENARIO"
-            "target=$env:UI_REVIEW_TARGET"
-            "platform=windows"
-            "pid=$($p.Id)"
-          ) | Set-Content -Path (Join-Path $qa 'review-target.txt') -Encoding utf8
-
-          if (Get-Process -Id $p.Id -ErrorAction SilentlyContinue) {
-            & ./scripts/ui_probe.ps1 -ProcId $p.Id -Kill
-          }
-
-      - name: Capture SSH copy menu on Windows
-        if: matrix.platform == 'windows' && env.UI_REVIEW_SCENARIO == 'ssh-copy'
-        shell: pwsh
-        run: |
-          $ErrorActionPreference = 'Stop'
-          $qa = Join-Path $env:RUNNER_TEMP 'ui-review'
-          $probe = Join-Path $qa 'ssh-copy-probe'
-          $config = Join-Path $probe 'config'
-          New-Item -ItemType Directory -Force -Path $probe, $config | Out-Null
-          @(
-            'language=en-US'
-            'theme=Nord'
-            'opacity=1'
-            'blur=off'
-            'restore_session=false'
-            'resume_ai=false'
-            'auto_check_updates=off'
-          ) | Set-Content -Path (Join-Path $config 'pebrel_settings.txt') -Encoding ascii
-
-          $env:PEBREL_CONFIG_DIR = $config
-          $env:PEBREL_SSH_COPY_QA_DIR = $probe
-          $stdout = Join-Path $probe 'probe.stdout.log'
-          $stderr = Join-Path $probe 'probe.stderr.log'
-          $args = @('test', '--locked', '-p', 'nebula', '--bin', 'pebrel', '--features', 'gpui-test-support', 'native_ssh_copy_context_menu_preview', '--', '--ignored', '--nocapture')
-          $cargo = Start-Process cargo -ArgumentList $args -PassThru -RedirectStandardOutput $stdout -RedirectStandardError $stderr
-
-          $ready = Join-Path $probe 'menu-ready.json'
-          $deadline = (Get-Date).AddMinutes(20)
-          while (-not (Test-Path $ready)) {
-            if ($cargo.HasExited) {
-              Get-Content $stdout -ErrorAction SilentlyContinue
-              Get-Content $stderr -ErrorAction SilentlyContinue
-              throw 'SSH screenshot probe exited before opening its native window.'
-            }
-            if ((Get-Date) -gt $deadline) { throw 'Timed out waiting for SSH screenshot probe.' }
-            Start-Sleep -Milliseconds 500
-          }
-
-          $probePid = (Get-Content $ready -Raw | ConvertFrom-Json).pid
-          ./scripts/ui_probe.ps1 -ProcId $probePid -RightClick '520,220' -Shot (Join-Path $qa '02-ssh-context-menu.png')
-          ./scripts/ui_probe.ps1 -ProcId $probePid -Click '550,294'
-          Start-Sleep -Milliseconds 700
-          ./scripts/ui_probe.ps1 -ProcId $probePid -Shot (Join-Path $qa '03-ssh-copy-editor.png')
-          New-Item -ItemType File -Force -Path (Join-Path $probe 'capture-complete') | Out-Null
-          $cargo.WaitForExit()
-          if ($cargo.ExitCode -ne 0) {
-            Get-Content $stdout -ErrorAction SilentlyContinue
-            Get-Content $stderr -ErrorAction SilentlyContinue
-            throw "SSH screenshot probe failed with exit code $($cargo.ExitCode)."
-          }
-
-      - name: Capture macOS application and changed UI
-        if: matrix.platform == 'macos'
-        shell: bash
-        run: |
-          set -euo pipefail
-          qa="$RUNNER_TEMP/ui-review"
-          config="$qa/config"
-          mkdir -p "$qa" "$config"
-          cat >"$config/pebrel_settings.txt" <<'EOF'
-          language=en-US
-          theme=Nord
-          opacity=1
-          blur=off
-          restore_session=false
-          resume_ai=false
-          auto_check_updates=off
-          EOF
-
-          export PEBREL_CONFIG_DIR="$config"
-          if [[ "$UI_REVIEW_SCENARIO" == "ssh-ports" ]]; then
-            export PEBREL_UI_REVIEW_READY_SSH=1
-          fi
-          app="$PWD/target/ui-review/release/pebrel"
-          "$app" --working-directory "$PWD" >"$qa/pebrel.stdout.log" 2>"$qa/pebrel.stderr.log" &
-          pid=$!
-
-          cleanup() {
-            kill "$pid" >/dev/null 2>&1 || true
-            wait "$pid" >/dev/null 2>&1 || true
-          }
-          trap cleanup EXIT
-
-          for _ in $(seq 1 20); do
-            if ! kill -0 "$pid" >/dev/null 2>&1; then
-              cat "$qa/pebrel.stderr.log" >&2 || true
-              exit 1
-            fi
-            sleep 0.5
-          done
-
-          screencapture -x "$qa/00-full-app.png"
-
-          focus_and_keys() {
-            local keys="$1"
-            PID="$pid" KEYS="$keys" osascript <<'APPLESCRIPT' || true
-          set targetPid to (system attribute "PID") as integer
-          set requestedKeys to system attribute "KEYS"
-          tell application "System Events"
-            set appProc to first application process whose unix id is targetPid
-            set frontmost of appProc to true
-            delay 0.4
-            if requestedKeys is "settings" then
-              keystroke "," using command down
-            else if requestedKeys is "menu" then
-              click menu bar item 2 of menu bar 1 of appProc
-            else if requestedKeys is "quit" then
-              keystroke "q" using command down
-            end if
-          end tell
-          APPLESCRIPT
-          }
-
-          click_offset() {
-            local x="$1"
-            local y="$2"
-            PID="$pid" X="$x" Y="$y" osascript <<'APPLESCRIPT' || true
-          set targetPid to (system attribute "PID") as integer
-          set clickX to (system attribute "X") as integer
-          set clickY to (system attribute "Y") as integer
-          tell application "System Events"
-            set appProc to first application process whose unix id is targetPid
-            set frontmost of appProc to true
-            tell window 1 of appProc
-              set {wx, wy} to position
-            end tell
-            click at {wx + clickX, wy + clickY}
-          end tell
-          APPLESCRIPT
-            sleep 1
-          }
-
-          case "$UI_REVIEW_SCENARIO" in
-            settings)
-              focus_and_keys settings
-              sleep 2
-              screencapture -x "$qa/01-settings-controls.png"
-              ;;
-            shortcuts)
-              focus_and_keys settings
-              sleep 2
-              screencapture -x "$qa/01-shortcut-labels.png"
-              ;;
-            dialog)
-              focus_and_keys settings
-              sleep 2
-              screencapture -x "$qa/01-settings-shortcuts.png"
-              focus_and_keys quit
-              sleep 1
-              screencapture -x "$qa/02-dialog-state.png" || true
-              ;;
-            sidebar)
-              focus_and_keys settings
-              sleep 2
-              screencapture -x "$qa/01-sidebar-settings.png"
-              ;;
-            menu)
-              focus_and_keys menu
-              sleep 1
-              screencapture -x "$qa/01-native-menu.png"
-              ;;
-            portable)
-              cleanup
-              trap - EXIT
-              bundle="$RUNNER_TEMP/Pebrel UI Review.app"
-              mkdir -p "$bundle/Contents/MacOS"
-              cp "$app" "$bundle/Contents/MacOS/pebrel"
-              chmod +x "$bundle/Contents/MacOS/pebrel"
-              cat >"$bundle/Contents/Info.plist" <<'PLIST'
-          <?xml version="1.0" encoding="UTF-8"?>
-          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-          <plist version="1.0"><dict>
-            <key>CFBundleExecutable</key><string>pebrel</string>
-            <key>CFBundleIdentifier</key><string>io.github.kuddev.pebrel.ui-review</string>
-            <key>CFBundleName</key><string>Pebrel UI Review</string>
-            <key>CFBundlePackageType</key><string>APPL</string>
-          </dict></plist>
-          PLIST
-              unset PEBREL_CONFIG_DIR NEBULA_CONFIG_DIR PEBREL_CONFIG_FILE NEBULA_CONFIG_FILE PEBREL_GPUI_CONFIG NEBULA_GPUI_CONFIG
-              export HOME="$qa/home"
-              mkdir -p "$HOME"
-              open -n "$bundle"
-              sleep 4
-              screencapture -x "$qa/01-portable-startup-dialog.png"
-              pkill -f "$bundle/Contents/MacOS/pebrel" || true
-              ;;
-            ssh-copy)
-              focus_and_keys settings
-              sleep 2
-              screencapture -x "$qa/01-ssh-settings-entry.png"
-              ;;
-            ssh-ports)
-              screencapture -x "$qa/01-ssh-ports-button.png"
-              click_offset 924 26
-              screencapture -x "$qa/02-ssh-ports-dialog.png"
-              ;;
-            notification)
-              screencapture -x "$qa/01-foreground-notification-regression.png"
-              ;;
-            *)
-              screencapture -x "$qa/01-platform-regression.png"
-              ;;
-          esac
-
-          {
-            echo "scenario=$UI_REVIEW_SCENARIO"
-            echo "target=$UI_REVIEW_TARGET"
-            echo "platform=macos"
-            sw_vers
-          } >"$qa/review-target.txt"
-
-      - name: Upload reviewer screenshots
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-review-${{ matrix.platform }}
-          path: |
-            ${{ runner.temp }}/ui-review/*.png
-            ${{ runner.temp }}/ui-review/*.txt
-            ${{ runner.temp }}/ui-review/*.log
-            ${{ runner.temp }}/ui-review/ssh-copy-probe/*.json
-            ${{ runner.temp }}/ui-review/ssh-copy-probe/*.log
-          if-no-files-found: error
-          retention-days: 14
-          compression-level: 0
-
-      - name: Add screenshot pointers to job summary
-        if: always()
-        shell: bash
-        run: |
-          {
-            echo "## Native UI review"
-            echo
-            echo "- Platform: ${{ matrix.platform }}"
-            echo "- Scenario: $UI_REVIEW_SCENARIO"
-            echo "- Changed UI target: $UI_REVIEW_TARGET"
-            echo "- Download the ui-review-${{ matrix.platform }} artifact to inspect the PNG evidence."
-          } >>"$GITHUB_STEP_SUMMARY"
-
-
-  publish-evidence:
-    name: Publish UI evidence
-    if: always() && github.repository == 'WilliamWang1721/pebrel' && github.event_name == 'push'
-    needs: native-ui
-    runs-on: ubuntu-22.04
-    concurrency:
-      group: ui-review-evidence-publish
-      cancel-in-progress: false
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true
-
-      - uses: actions/download-artifact@v4
-        continue-on-error: true
-        with:
-          name: ui-review-windows
-          path: ${{ runner.temp }}/ui-review-evidence/windows
-
-      - uses: actions/download-artifact@v4
-        continue-on-error: true
-        with:
-          name: ui-review-macos
-          path: ${{ runner.temp }}/ui-review-evidence/macos
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-
-      - name: Polish screenshots for PR presentation
-        shell: bash
-        run: |
-          set -euo pipefail
-          python3 -m pip install --disable-pip-version-check --quiet "Pillow==11.3.0"
-          python3 - <<'PY'
-          import os
-          from pathlib import Path
-          from PIL import Image, ImageDraw, ImageFilter, ImageStat
-
-          source = Path(os.environ["RUNNER_TEMP"]) / "ui-review-evidence"
-          output = Path(os.environ["RUNNER_TEMP"]) / "ui-review-polished"
-          scale = 2
-          radius = 24 * scale
-          padding = 36 * scale
-          shadow_pad = 18 * scale
-
-          for platform in ("windows", "macos"):
-              src_dir = source / platform
-              dst_dir = output / platform
-              dst_dir.mkdir(parents=True, exist_ok=True)
-              if not src_dir.exists():
-                  continue
-
-              for path in sorted(src_dir.glob("*.png")):
-                  image = Image.open(path).convert("RGB")
-                  image = image.resize(
-                      (image.width * scale, image.height * scale),
-                      Image.Resampling.LANCZOS,
-                  )
-                  image = image.filter(ImageFilter.UnsharpMask(radius=0.7, percent=115, threshold=2))
-
-                  stat = ImageStat.Stat(image.resize((1, 1)))
-                  luminance = sum(stat.mean) / 3
-                  background = (243, 245, 248) if luminance > 120 else (18, 20, 24)
-                  border = (205, 209, 216) if luminance > 120 else (65, 69, 78)
-
-                  frame_w = image.width + padding * 2
-                  frame_h = image.height + padding * 2
-                  canvas = Image.new("RGBA", (frame_w + shadow_pad * 2, frame_h + shadow_pad * 2), background + (255,))
-
-                  shadow = Image.new("RGBA", canvas.size, (0, 0, 0, 0))
-                  shadow_draw = ImageDraw.Draw(shadow)
-                  x0 = shadow_pad + padding
-                  y0 = shadow_pad + padding
-                  x1 = x0 + image.width
-                  y1 = y0 + image.height
-                  shadow_draw.rounded_rectangle(
-                      (x0 + 4 * scale, y0 + 7 * scale, x1 + 4 * scale, y1 + 7 * scale),
-                      radius=radius,
-                      fill=(0, 0, 0, 92),
-                  )
-                  shadow = shadow.filter(ImageFilter.GaussianBlur(12 * scale))
-                  canvas.alpha_composite(shadow)
-
-                  mask = Image.new("L", image.size, 0)
-                  ImageDraw.Draw(mask).rounded_rectangle(
-                      (0, 0, image.width - 1, image.height - 1),
-                      radius=radius,
-                      fill=255,
-                  )
-                  framed = Image.new("RGBA", image.size, (0, 0, 0, 0))
-                  framed.paste(image, (0, 0), mask)
-                  canvas.alpha_composite(framed, (x0, y0))
-
-                  draw = ImageDraw.Draw(canvas)
-                  draw.rounded_rectangle(
-                      (x0, y0, x1 - 1, y1 - 1),
-                      radius=radius,
-                      outline=border + (255,),
-                      width=2 * scale,
-                  )
-
-                  out = dst_dir / f"{path.stem}-review.png"
-                  canvas.convert("RGB").save(out, "PNG", optimize=True)
-          PY
-
-      - name: Publish screenshots outside the PR diff
-        shell: bash
-        run: |
-          set -euo pipefail
-          source_dir="$RUNNER_TEMP/ui-review-evidence"
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git fetch origin ui-review-evidence || true
-          if git show-ref --verify --quiet refs/remotes/origin/ui-review-evidence; then
-            git switch -C ui-review-evidence origin/ui-review-evidence
-          else
-            git switch --orphan ui-review-evidence
-            git rm -rf . >/dev/null 2>&1 || true
-          fi
-
-          polished_dir="$RUNNER_TEMP/ui-review-polished"
-          root="ui-review/pr-$UI_REVIEW_PR"
-          rm -rf "$root"
-          mkdir -p "$root/windows" "$root/macos" "$root/raw/windows" "$root/raw/macos"
-          find "$polished_dir/windows" -maxdepth 1 -type f -name '*-review.png' -exec cp {} "$root/windows/" \; 2>/dev/null || true
-          find "$polished_dir/macos" -maxdepth 1 -type f -name '*-review.png' -exec cp {} "$root/macos/" \; 2>/dev/null || true
-          find "$source_dir/windows" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/raw/windows/" \; 2>/dev/null || true
-          find "$source_dir/macos" -maxdepth 1 -type f -name '*.png' -exec cp {} "$root/raw/macos/" \; 2>/dev/null || true
-          printf '%s\n' "$GITHUB_SHA" >"$root/head-sha.txt"
-          printf '%s\n' "$UI_REVIEW_TARGET" >"$root/target.txt"
-
-          git add "$root"
-          if git diff --cached --quiet; then
-            exit 0
-          fi
-          git commit -m "docs(ui): publish PR #$UI_REVIEW_PR screenshots"
-          git push origin HEAD:ui-review-evidence
diff --git a/architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md b/architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md
new file mode 100644
index 00000000..ef8f8f34
--- /dev/null
+++ b/architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md
@@ -0,0 +1,75 @@
+# Pane-owned local SSH forwarding
+
+## Status
+
+Reviewed for integration on 2026-09-26.
+
+## Context
+
+An authenticated native SSH pane needs a small local forwarding control. Opening
+another SSH process would duplicate authentication and connection ownership.
+A listener must not survive its pane, including normal shell exit, and a pending
+creation must not finish after the owner has closed.
+
+## Evidence
+
+- `ssh_session/forward.rs` reuses authenticated pooled sessions and opens
+  direct-tcpip channels through the existing SSH runtime.
+- The original change cleared established forwards on failure but not normal
+  exit; its detached creation task outlived the pane.
+- An unrestricted accept loop could create arbitrary numbers of channel tasks
+  and bidirectional copy buffers from local clients.
+- The original screenshot-only readiness override read the process environment
+  from a render-time query and bypassed real SSH readiness in test builds.
+
+## Decision
+
+Keep listeners in the terminal view and the pending GPUI operation in an owned
+Task. Exit, connection failure and view destruction release both. The existing
+network-to-GPUI bridge cancels its future when the result receiver is dropped;
+a stale completion cannot install a forward or show a toast for a dead pane.
+
+Each listener accepts at most 64 concurrent channel tasks. Excess clients wait
+in the OS TCP backlog until a slot is available. This bounds task/copy-buffer
+cost per listener; it is an engineering limit, not a throughput guarantee.
+Completed channels are reaped and failures are logged without killing the SSH
+transport shared by the terminal and other forwards.
+
+The endpoints remain loopback-only on both sides. Creating and stopping a
+forward requires explicit user action. New labels use typed catalog messages.
+Readiness uses actual session state; screenshots cannot enable SSH on local panes.
+
+## Rejected alternatives
+
+- A second SSH process or global forwarding service would duplicate lifetime
+  and authentication policy.
+- Detached creation cannot guarantee cancellation when the pane disappears.
+- Unbounded per-client tasks allow local load to grow memory without a limit.
+- Persisted rules, automatic discovery and remote/dynamic forwarding are outside
+  this local forwarding capability.
+
+## Consequences
+
+The new behavior adds no persistent thread or timer. UI rendering does not read
+files, resolve destinations or inspect environment variables. File/profile
+resolution and network I/O remain in the existing background runtime. A forward
+owns its channels but never disconnects the shared authenticated transport.
+
+## Validation
+
+Regression coverage exercises real SSH channel exchange, half-close, occupied
+ports, channel rejection, listener/connection disposal, and bounded concurrency.
+UI regressions click the actual port fields and confirmation/cancel controls,
+check invalid input, and reject submission after the pane stops being ready.
+Terminal and bridge regressions cover normal exit, failure and pending-work
+cancellation. These tests do not claim arbitrary-host throughput or physical
+platform visual acceptance.
+
+## Supersedes
+
+None.
+
+## Revisit when
+
+Revisit the limit and UI state model if measured workloads need more concurrent
+channels, or when persistent/reconnecting forwards are explicitly introduced.
diff --git a/nebula_app/i18n/en-US.json b/nebula_app/i18n/en-US.json
index 3a1643f1..a4684d85 100644
--- a/nebula_app/i18n/en-US.json
+++ b/nebula_app/i18n/en-US.json
@@ -921,5 +921,16 @@
     "move_left": "Move left",
     "move_right": "Move right",
     "tab_color": "Tab color"
-  }
+  },
+  "ssh.ports.button": "Ports",
+  "ssh.ports.title": "SSH port forwarding",
+  "ssh.ports.empty": "No forwarded ports",
+  "ssh.ports.stop": "Stop forwarding",
+  "ssh.ports.remote": "Remote port",
+  "ssh.ports.local": "Local port",
+  "ssh.ports.forward": "Forward",
+  "ssh.ports.invalid": "Enter ports from 1–65535",
+  "ssh.ports.pending": "Starting port forwarding…",
+  "ssh.ports.unavailable": "SSH network runtime unavailable",
+  "ssh.ports.started": "Forwarding 127.0.0.1:{local} to {host} port {remote}"
 }
diff --git a/nebula_app/i18n/zh-CN.json b/nebula_app/i18n/zh-CN.json
index 25ec97f8..b8c32ce0 100644
--- a/nebula_app/i18n/zh-CN.json
+++ b/nebula_app/i18n/zh-CN.json
@@ -921,5 +921,16 @@
     "move_left": "向左移动",
     "move_right": "向右移动",
     "tab_color": "标签颜色"
-  }
+  },
+  "ssh.ports.button": "端口",
+  "ssh.ports.title": "SSH 端口转发",
+  "ssh.ports.empty": "暂无端口转发",
+  "ssh.ports.stop": "停止转发",
+  "ssh.ports.remote": "服务器端口",
+  "ssh.ports.local": "本地端口",
+  "ssh.ports.forward": "转发",
+  "ssh.ports.invalid": "请输入 1–65535 的端口",
+  "ssh.ports.pending": "正在启动端口转发…",
+  "ssh.ports.unavailable": "SSH 网络运行时不可用",
+  "ssh.ports.started": "正在将 127.0.0.1:{local} 转发至 {host} 的 {remote} 端口"
 }
diff --git a/nebula_app/src/gpui_shell/terminal/view.rs b/nebula_app/src/gpui_shell/terminal/view.rs
index 03454bc0..25140c9b 100644
--- a/nebula_app/src/gpui_shell/terminal/view.rs
+++ b/nebula_app/src/gpui_shell/terminal/view.rs
@@ -338,6 +338,7 @@ pub struct TerminalView {
     pub ssh_destination: Option<String>,
     /// 本 pane 拥有的本地端口转发；pane 销毁即停止监听。
     pub(crate) port_forwards: Vec<crate::ssh_session::LocalForward>,
+    pub(crate) port_forward_task: Option<gpui::Task<()>>,
     ssh_label: Option<String>,
     /// 创建本地 PTY 时冻结的受控环境，供独立 `pane.exec` child 复用。
     pub(crate) exec_context: Option<crate::runtime_exec::PaneExecContext>,
@@ -701,6 +702,8 @@ impl TerminalView {
 
     /// `Exited` 只对宿主发一次；重复的退出信号（ChildExit 之后必然跟 Exit）只更新文案。
     fn mark_exited(&mut self, message: String, cx: &mut Context<Self>) {
+        self.port_forward_task = None;
+        self.port_forwards.clear();
         self.confirmation.invalidate();
         self.pending_runtime_submit = None;
         self.pending_shell_command = None;
@@ -966,9 +969,8 @@ impl TerminalView {
     /// 通道，撞上一个还没建立的传输——用户看到的是文件面板先报一个错，然后
     /// 终端才连上。
     pub fn ready_ssh_destination(&self) -> Option<&str> {
-        #[cfg(feature = "gpui-test-support")]
-        if std::env::var_os("PEBREL_UI_REVIEW_READY_SSH").is_some() {
-            return Some("review@localhost");
+        if self.exited.is_some() {
+            return None;
         }
         let destination = self.ssh_destination.as_deref()?;
         matches!(self.ssh_stage, Some(crate::ssh_session::SshStage::Ready)).then_some(destination)
diff --git a/nebula_app/src/gpui_shell/terminal/view/output_tests.rs b/nebula_app/src/gpui_shell/terminal/view/output_tests.rs
index 595bf150..c6ba8cc2 100644
--- a/nebula_app/src/gpui_shell/terminal/view/output_tests.rs
+++ b/nebula_app/src/gpui_shell/terminal/view/output_tests.rs
@@ -177,3 +177,28 @@ fn hidden_wakeup_still_flushes_shell_commands_and_pending_enter(cx: &mut TestApp
         assert!(view.pending_runtime_submit.is_none());
     });
 }
+
+#[gpui::test]
+fn ssh_exit_and_failure_cancel_pending_forward_and_hide_remote_actions(cx: &mut TestAppContext) {
+    let (view, window, _) = open(cx);
+    for failed in [false, true] {
+        view.update(window, |view, cx| {
+            view.exited = None;
+            view.ssh_destination = Some("fixture@localhost".into());
+            view.apply_ssh_stage(crate::ssh_session::SshStage::Ready, cx);
+            assert_eq!(view.ready_ssh_destination(), Some("fixture@localhost"));
+            view.port_forward_task =
+                Some(cx.spawn(async |_, _| std::future::pending::<()>().await));
+            if failed {
+                view.apply_ssh_stage(
+                    crate::ssh_session::SshStage::Failed("disconnected".into()),
+                    cx,
+                );
+            } else {
+                view.process_event(TermEvent::Exit, cx);
+            }
+            assert!(view.port_forward_task.is_none());
+            assert!(view.ready_ssh_destination().is_none());
+        });
+    }
+}
diff --git a/nebula_app/src/gpui_shell/terminal/view/runtime.rs b/nebula_app/src/gpui_shell/terminal/view/runtime.rs
index b9b37e50..99c8a941 100644
--- a/nebula_app/src/gpui_shell/terminal/view/runtime.rs
+++ b/nebula_app/src/gpui_shell/terminal/view/runtime.rs
@@ -111,6 +111,7 @@ impl TerminalView {
         );
         self.ssh_connect_last_step = std::time::Instant::now();
         if matches!(stage, crate::ssh_session::SshStage::Failed(_)) {
+            self.port_forward_task = None;
             self.port_forwards.clear();
             self.pending_runtime_submit = None;
             self.pending_shell_command = None;
diff --git a/nebula_app/src/gpui_shell/terminal/view/startup.rs b/nebula_app/src/gpui_shell/terminal/view/startup.rs
index 74e99749..f21b497a 100644
--- a/nebula_app/src/gpui_shell/terminal/view/startup.rs
+++ b/nebula_app/src/gpui_shell/terminal/view/startup.rs
@@ -285,6 +285,7 @@ impl TerminalView {
             path_drop: path_drop::PathDropState::default(),
             ssh_destination,
             port_forwards: Vec::new(),
+            port_forward_task: None,
             ssh_label: None,
             exec_context,
             ssh_stage: None,
diff --git a/nebula_app/src/gpui_shell/workspace/remote_files.rs b/nebula_app/src/gpui_shell/workspace/remote_files.rs
index c06ad101..8ea18ba1 100644
--- a/nebula_app/src/gpui_shell/workspace/remote_files.rs
+++ b/nebula_app/src/gpui_shell/workspace/remote_files.rs
@@ -915,9 +915,13 @@ where
     Fut: std::future::Future<Output = T> + Send,
 {
     let runtime = crate::ssh_session::runtime().ok()?;
-    let (tx, rx) = tokio::sync::oneshot::channel();
+    let (mut tx, rx) = tokio::sync::oneshot::channel();
     runtime.spawn(async move {
-        let _ = tx.send(work().await);
+        tokio::select! {
+            biased;
+            _ = tx.closed() => {},
+            result = work() => { let _ = tx.send(result); },
+        }
     });
     rx.await.ok()
 }
@@ -938,6 +942,37 @@ mod tests {
         }
     }
 
+    #[test]
+    fn dropped_remote_call_cancels_its_network_work() {
+        struct SignalDrop(Option<tokio::sync::oneshot::Sender<()>>);
+        impl Drop for SignalDrop {
+            fn drop(&mut self) {
+                if let Some(sender) = self.0.take() {
+                    let _ = sender.send(());
+                }
+            }
+        }
+        crate::ssh_session::runtime().unwrap().block_on(async {
+            let (started_tx, started_rx) = tokio::sync::oneshot::channel();
+            let (dropped_tx, dropped_rx) = tokio::sync::oneshot::channel();
+            let caller = tokio::spawn(super::remote_call(move || async move {
+                let _signal = SignalDrop(Some(dropped_tx));
+                let _ = started_tx.send(());
+                std::future::pending::<()>().await;
+            }));
+            tokio::time::timeout(std::time::Duration::from_secs(5), started_rx)
+                .await
+                .unwrap()
+                .unwrap();
+            caller.abort();
+            let _ = caller.await;
+            tokio::time::timeout(std::time::Duration::from_secs(5), dropped_rx)
+                .await
+                .unwrap()
+                .unwrap();
+        });
+    }
+
     #[test]
     fn switching_remote_panes_restores_listing_selection_and_scroll_owner_without_reload() {
         let mut browser = RemoteBrowser::default();
diff --git a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
index 0f26d085..7d18309f 100644
--- a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
+++ b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
@@ -6,6 +6,7 @@ use gpui::{App, AppContext as _, Context, Entity, ParentElement as _, Styled as
 
 use crate::gpui_shell::prelude::*;
 use crate::gpui_shell::terminal::view::TerminalView;
+use crate::i18n::Message;
 use crate::ssh_prompt::{Prompt, PromptKind, PromptResponse};
 
 use super::{NebulaWorkspace, workspace_ui_language};
@@ -179,6 +180,81 @@ mod tests {
             _ => panic!("confirm must deliver the entered password"),
         }
     }
+    #[gpui::test]
+    fn ports_dialog_rejects_invalid_input_and_cancel_releases_focus(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            gpui_component::init(cx);
+            cx.set_reduce_motion(true);
+        });
+        let (_, cx) =
+            cx.add_window_view(|window, cx| Root::new(cx.new(|_| DialogProbe), window, cx));
+        let owner = cx.update(|window, cx| {
+            cx.new(|cx| {
+                TerminalView::new(
+                    42,
+                    (80, 24),
+                    crate::gpui_shell::terminal::view::TerminalLaunch::Local {
+                        cwd: None,
+                        shell: Some(nebula_terminal::tty::Shell::new(
+                            "pebrel-test-missing-shell-executable".into(),
+                            vec![],
+                        )),
+                        shell_name: None,
+                    },
+                    window,
+                    cx,
+                )
+            })
+        });
+        cx.update(|window, cx| {
+            show_port_forward_dialog(owner.clone(), "fixture@localhost".into(), window, cx)
+        });
+        cx.update(|window, cx| {
+            let _ = window.draw(cx);
+        });
+        cx.simulate_input("65536");
+        click(cx, "confirm-dialog-ok");
+        cx.update(|window, cx| {
+            let _ = window.draw(cx);
+        });
+        assert!(
+            cx.debug_bounds("confirm-dialog-ok").is_some(),
+            "invalid input keeps the dialog open"
+        );
+        owner.read_with(cx, |view, _| {
+            assert!(view.port_forward_task.is_none());
+            assert!(view.port_forwards.is_empty());
+        });
+        let select_all = if cfg!(target_os = "macos") { "cmd-a" } else { "ctrl-a" };
+        for selector in ["ssh-forward-remote", "ssh-forward-local"] {
+            let bounds = cx.debug_bounds(selector).unwrap();
+            assert!(f32::from(bounds.size.height) >= 28.0);
+            assert!(f32::from(bounds.size.width) >= 100.0);
+            click(cx, selector);
+            cx.simulate_keystrokes(select_all);
+            cx.simulate_input("3000");
+        }
+        click(cx, "confirm-dialog-ok");
+        cx.update(|window, cx| {
+            let _ = window.draw(cx);
+        });
+        assert!(
+            cx.debug_bounds("confirm-dialog-ok").is_none(),
+            "valid ports close the dialog when its pane is no longer ready"
+        );
+        owner.read_with(cx, |view, _| assert!(view.port_forward_task.is_none()));
+        cx.update(|window, cx| {
+            show_port_forward_dialog(owner.clone(), "fixture@localhost".into(), window, cx)
+        });
+        cx.update(|window, cx| {
+            let _ = window.draw(cx);
+        });
+        click(cx, "confirm-dialog-cancel");
+        cx.update(|window, cx| {
+            let _ = window.draw(cx);
+        });
+        assert!(cx.debug_bounds("confirm-dialog-ok").is_none());
+    }
 }
 
 impl NebulaWorkspace {
@@ -192,146 +268,187 @@ impl NebulaWorkspace {
     }
 
     pub(super) fn render_port_forward_button(&self, cx: &mut Context<Self>) -> Option<Button> {
-        self.active_ready_ssh_view(cx)?;
-        Some(Button::new("ssh-ports").icon(IconName::Network).ghost().tooltip("Ports").on_click(
-            cx.listener(|this, _, window, cx| {
-                this.open_port_forward_dialog(window, cx);
-            }),
-        ))
+        let view = self.active_ready_ssh_view(cx)?;
+        let pending = view.read(cx).port_forward_task.is_some();
+        let language = workspace_ui_language();
+        Some(
+            Button::new("ssh-ports")
+                .icon(IconName::Network)
+                .ghost()
+                .disabled(pending)
+                .tooltip(language.text(if pending {
+                    Message::SshPortsPending
+                } else {
+                    Message::SshPortsButton
+                }))
+                .on_click(cx.listener(|this, _, window, cx| {
+                    this.open_port_forward_dialog(window, cx);
+                })),
+        )
     }
 
     fn open_port_forward_dialog(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let Some(view) = self.active_ready_ssh_view(cx) else { return };
-        let (destination, forwards) = {
-            let view = view.read(cx);
-            let Some(destination) = view.ready_ssh_destination() else { return };
-            (
-                destination.to_owned(),
-                view.port_forwards
-                    .iter()
-                    .map(|forward| (forward.local_port(), forward.remote_port()))
-                    .collect::<Vec<_>>(),
-            )
-        };
-        let remote_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
-        let local_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
-        let focus_input = remote_input.clone();
-        let target = view.downgrade();
-        let language = workspace_ui_language();
+        if view.read(cx).port_forward_task.is_some() {
+            return;
+        }
+        let destination = view.read(cx).ready_ssh_destination().unwrap().to_owned();
+        show_port_forward_dialog(view, destination, window, cx);
+    }
+}
 
-        window.open_dialog(cx, move |dialog, window, _cx| {
-            let mut body = v_flex().w_full().gap_3();
-            if forwards.is_empty() {
+fn show_port_forward_dialog(
+    view: Entity<TerminalView>,
+    destination: String,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    let forwards = view
+        .read(cx)
+        .port_forwards
+        .iter()
+        .map(|forward| (forward.local_port(), forward.remote_port()))
+        .collect::<Vec<_>>();
+    let remote_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
+    let local_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
+    let focus_input = remote_input.clone();
+    let target = view.downgrade();
+    let language = workspace_ui_language();
+
+    window.open_dialog(cx, move |dialog, window, _cx| {
+        let mut body = v_flex().w_full().gap_3();
+        if forwards.is_empty() {
+            body = body.child(
+                div()
+                    .text_sm()
+                    .text_color(_cx.theme().muted_foreground)
+                    .child(language.text(Message::SshPortsEmpty)),
+            );
+        } else {
+            for (index, (local_port, remote_port)) in forwards.iter().copied().enumerate() {
+                let stop_target = target.clone();
                 body = body.child(
-                    div()
-                        .text_sm()
-                        .text_color(_cx.theme().muted_foreground)
-                        .child(language.pick("暂无端口转发", "No forwarded ports")),
+                    h_flex()
+                        .w_full()
+                        .items_center()
+                        .justify_between()
+                        .child(format!("127.0.0.1:{local_port} → 127.0.0.1:{remote_port}"))
+                        .child(
+                            Button::new(("ssh-port-stop", index))
+                                .icon(IconName::Close)
+                                .ghost()
+                                .xsmall()
+                                .tooltip(language.text(Message::SshPortsStop))
+                                .on_click(move |_, window, cx| {
+                                    if let Some(view) = stop_target.upgrade() {
+                                        view.update(cx, |view, cx| {
+                                            if let Some(position) =
+                                                view.port_forwards.iter().position(|forward| {
+                                                    forward.local_port() == local_port
+                                                })
+                                            {
+                                                view.port_forwards.remove(position);
+                                                cx.notify();
+                                            }
+                                        });
+                                    }
+                                    window.close_dialog(cx);
+                                }),
+                        ),
                 );
-            } else {
-                for (index, (local_port, remote_port)) in forwards.iter().copied().enumerate() {
-                    let stop_target = target.clone();
-                    body = body.child(
-                        h_flex()
-                            .w_full()
-                            .items_center()
-                            .justify_between()
-                            .child(format!("127.0.0.1:{local_port} → 127.0.0.1:{remote_port}"))
-                            .child(
-                                Button::new(("ssh-port-stop", index))
-                                    .icon(IconName::Close)
-                                    .ghost()
-                                    .xsmall()
-                                    .tooltip(language.pick("停止转发", "Stop forwarding"))
-                                    .on_click(move |_, window, cx| {
-                                        if let Some(view) = stop_target.upgrade() {
-                                            view.update(cx, |view, cx| {
-                                                if index < view.port_forwards.len() {
-                                                    view.port_forwards.remove(index);
-                                                    cx.notify();
-                                                }
-                                            });
-                                        }
-                                        window.close_dialog(cx);
-                                    }),
-                            ),
-                    );
-                }
             }
-            body = body.child(
-                h_flex()
-                    .w_full()
-                    .gap_3()
-                    .child(
-                        v_flex()
-                            .flex_1()
-                            .gap_1()
-                            .child(language.pick("服务器端口", "Remote port"))
-                            .child(Input::new(&remote_input)),
-                    )
-                    .child(
-                        v_flex()
-                            .flex_1()
-                            .gap_1()
-                            .child(language.pick("本地端口", "Local port"))
-                            .child(Input::new(&local_input)),
+        }
+        body = body.child(
+            h_flex()
+                .w_full()
+                .gap_3()
+                .child(
+                    v_flex().flex_1().gap_1().child(language.text(Message::SshPortsRemote)).child(
+                        div()
+                            .debug_selector(|| "ssh-forward-remote".to_owned())
+                            .w_full()
+                            .h_8()
+                            .flex_shrink_0()
+                            .child(Input::new(&remote_input).w_full()),
                     ),
-            );
+                )
+                .child(
+                    v_flex().flex_1().gap_1().child(language.text(Message::SshPortsLocal)).child(
+                        div()
+                            .debug_selector(|| "ssh-forward-local".to_owned())
+                            .w_full()
+                            .h_8()
+                            .flex_shrink_0()
+                            .child(Input::new(&local_input).w_full()),
+                    ),
+                ),
+        );
 
-            let submit_target = target.clone();
-            let submit_remote = remote_input.clone();
-            let submit_local = local_input.clone();
-            let submit_destination = destination.clone();
-            confirm_dialog(
-                dialog,
-                window,
-                language.pick("SSH 端口转发", "SSH Ports"),
-                destination.clone(),
-                language.pick("转发", "Forward"),
-                language.pick("取消", "Cancel"),
-                ButtonVariant::Primary,
-            )
-            .child(body)
-            .on_ok(move |_, window, cx| {
-                let remote_port = submit_remote
-                    .read(cx)
-                    .value()
-                    .trim()
-                    .parse::<u16>()
-                    .ok()
-                    .filter(|port| *port != 0);
-                let local_port = submit_local
-                    .read(cx)
-                    .value()
-                    .trim()
-                    .parse::<u16>()
-                    .ok()
-                    .filter(|port| *port != 0);
-                let (Some(remote_port), Some(local_port)) = (remote_port, local_port) else {
-                    crate::gpui_shell::toast::toast(
-                        window,
-                        cx,
-                        crate::display::ToastKind::Warning,
-                        language.pick("请输入 1–65535 的端口", "Enter ports from 1–65535"),
-                    );
-                    return false;
-                };
+        let submit_target = target.clone();
+        let submit_remote = remote_input.clone();
+        let submit_local = local_input.clone();
+        let submit_destination = destination.clone();
+        confirm_dialog(
+            dialog,
+            window,
+            language.text(Message::SshPortsTitle),
+            destination.clone(),
+            language.text(Message::SshPortsForward),
+            language.text(Message::CommonCancel),
+            ButtonVariant::Primary,
+        )
+        .child(body)
+        .on_ok(move |_, window, cx| {
+            let remote_port =
+                submit_remote.read(cx).value().trim().parse::<u16>().ok().filter(|port| *port != 0);
+            let local_port =
+                submit_local.read(cx).value().trim().parse::<u16>().ok().filter(|port| *port != 0);
+            let (Some(remote_port), Some(local_port)) = (remote_port, local_port) else {
+                crate::gpui_shell::toast::toast(
+                    window,
+                    cx,
+                    crate::display::ToastKind::Warning,
+                    language.text(Message::SshPortsInvalid),
+                );
+                return false;
+            };
 
-                let weak = submit_target.clone();
-                let expected_destination = submit_destination.clone();
-                let work_destination = submit_destination.clone();
-                let window_handle = window.window_handle();
-                cx.spawn(async move |cx| {
-                    let result = super::remote_files::remote_call(move || async move {
-                        crate::ssh_session::open_local_forward(
-                            &work_destination,
-                            local_port,
-                            remote_port,
-                        )
-                        .await
-                    })
-                    .await;
-                    let _ = window_handle.update(cx, move |_, window, cx| match result {
+            let Some(owner) = submit_target.upgrade() else {
+                return true;
+            };
+            if owner.read(cx).ready_ssh_destination() != Some(submit_destination.as_str()) {
+                return true;
+            }
+            if owner.read(cx).port_forward_task.is_some() {
+                return false;
+            }
+            let weak = submit_target.clone();
+            let expected_destination = submit_destination.clone();
+            let work_destination = submit_destination.clone();
+            let window_handle = window.window_handle();
+            let task = cx.spawn(async move |cx| {
+                let result = super::remote_files::remote_call(move || async move {
+                    crate::ssh_session::open_local_forward(
+                        &work_destination,
+                        local_port,
+                        remote_port,
+                    )
+                    .await
+                })
+                .await;
+                let _ = window_handle.update(cx, move |_, window, cx| {
+                    let Some(view) = weak.upgrade() else {
+                        return;
+                    };
+                    if view.read(cx).ready_ssh_destination() != Some(expected_destination.as_str())
+                    {
+                        return;
+                    }
+                    view.update(cx, |view, cx| {
+                        view.port_forward_task = None;
+                        cx.notify();
+                    });
+                    match result {
                         Some(Ok(forward)) => {
                             if let Some(view) = weak.upgrade()
                                 && view.read(cx).ready_ssh_destination()
@@ -345,8 +462,13 @@ impl NebulaWorkspace {
                                     window,
                                     cx,
                                     crate::display::ToastKind::Info,
-                                    format!(
-                                        "127.0.0.1:{local_port} → {expected_destination}:{remote_port}"
+                                    language.format(
+                                        Message::SshPortsStarted,
+                                        &[
+                                            ("local", &local_port.to_string()),
+                                            ("host", &expected_destination),
+                                            ("remote", &remote_port.to_string()),
+                                        ],
                                     ),
                                 );
                             }
@@ -361,17 +483,17 @@ impl NebulaWorkspace {
                             window,
                             cx,
                             crate::display::ToastKind::Warning,
-                            language.pick(
-                                "SSH 网络运行时不可用",
-                                "SSH network runtime unavailable",
-                            ),
+                            language.text(Message::SshPortsUnavailable),
                         ),
-                    });
-                })
-                .detach();
-                true
-            })
-        });
-        focus_input.update(cx, |input, cx| input.focus(window, cx));
-    }
+                    }
+                });
+            });
+            owner.update(cx, |view, cx| {
+                view.port_forward_task = Some(task);
+                cx.notify();
+            });
+            true
+        })
+    });
+    focus_input.update(cx, |input, cx| input.focus(window, cx));
 }
diff --git a/nebula_app/src/ssh_session/forward.rs b/nebula_app/src/ssh_session/forward.rs
index c0f5bab2..1db7cd05 100644
--- a/nebula_app/src/ssh_session/forward.rs
+++ b/nebula_app/src/ssh_session/forward.rs
@@ -3,7 +3,10 @@ use std::net::Ipv4Addr;
 use tokio::net::TcpListener;
 use tokio::task::{JoinHandle, JoinSet};
 
-use super::{NoopSshEventHost, SessionError, SshDestination, authenticated_session};
+use super::{NoopSshEventHost, SessionError, SharedSession, SshDestination, authenticated_session};
+
+// Bound per-listener channel tasks and copy buffers; excess clients wait in the TCP backlog.
+const MAX_CONNECTIONS: usize = 64;
 
 pub(crate) struct LocalForward {
     local_port: u16,
@@ -43,13 +46,21 @@ pub(crate) async fn open_local_forward(
     .map_err(|error| format!("SSH 地址解析任务失败: {error}"))??;
 
     let session = authenticated_session(&destination, &profile, None::<&NoopSshEventHost>).await?;
+    bind_forward(session, local_port, remote_port).await
+}
+
+async fn bind_forward(
+    session: SharedSession,
+    local_port: u16,
+    remote_port: u16,
+) -> Result<LocalForward, SessionError> {
     let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, local_port)).await?;
     let local_port = listener.local_addr()?.port();
     let task = tokio::spawn(async move {
         let mut connections = JoinSet::new();
         loop {
             tokio::select! {
-                accepted = listener.accept() => {
+                accepted = listener.accept(), if connections.len() < MAX_CONNECTIONS => {
                     let Ok((mut local, peer)) = accepted else { break };
                     let session = session.clone();
                     connections.spawn(async move {
@@ -68,7 +79,13 @@ pub(crate) async fn open_local_forward(
                         Ok::<(), SessionError>(())
                     });
                 },
-                Some(_) = connections.join_next(), if !connections.is_empty() => {},
+                Some(result) = connections.join_next(), if !connections.is_empty() => {
+                    match result {
+                        Ok(Ok(())) => {},
+                        Ok(Err(error)) => log::warn!("SSH port-forward connection failed: {error}"),
+                        Err(error) => log::warn!("SSH port-forward task failed: {error}"),
+                    }
+                },
             }
         }
     });
@@ -77,26 +94,4 @@ pub(crate) async fn open_local_forward(
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn dropping_forward_releases_listener() {
-        tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(
-            async {
-                let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0)).await.unwrap();
-                let port = listener.local_addr().unwrap().port();
-                let task = tokio::spawn(async move {
-                    let _listener = listener;
-                    std::future::pending::<()>().await;
-                });
-                tokio::task::yield_now().await;
-                drop(LocalForward { local_port: port, remote_port: 1, task });
-                tokio::task::yield_now().await;
-                TcpListener::bind((Ipv4Addr::LOCALHOST, port))
-                    .await
-                    .expect("dropping the pane-owned forward must release its listener");
-            },
-        );
-    }
-}
+mod tests;
diff --git a/nebula_app/src/ssh_session/forward/tests.rs b/nebula_app/src/ssh_session/forward/tests.rs
new file mode 100644
index 00000000..c2e2f484
--- /dev/null
+++ b/nebula_app/src/ssh_session/forward/tests.rs
@@ -0,0 +1,186 @@
+use super::*;
+use russh::keys::ssh_key::{Algorithm, PrivateKey};
+use russh::{client, server};
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::TcpStream;
+use tokio::sync::mpsc;
+
+struct Echo {
+    opened: mpsc::UnboundedSender<u32>,
+    streams: JoinSet<()>,
+}
+
+impl server::Handler for Echo {
+    type Error = russh::Error;
+
+    async fn auth_none(&mut self, _: &str) -> Result<server::Auth, Self::Error> {
+        Ok(server::Auth::Accept)
+    }
+
+    async fn channel_open_direct_tcpip(
+        &mut self,
+        channel: russh::Channel<server::Msg>,
+        host: &str,
+        port: u32,
+        origin: &str,
+        _: u32,
+        reply: server::ChannelOpenHandle,
+        _: &mut server::Session,
+    ) -> Result<(), Self::Error> {
+        assert_eq!(host, "127.0.0.1");
+        assert_eq!(origin, "127.0.0.1");
+        if port == 1 {
+            return Ok(());
+        } // Exercise a real SSH channel-open rejection.
+        reply.accept().await;
+        self.opened.send(port).unwrap();
+        self.streams.spawn(async move {
+            let mut stream = channel.into_stream();
+            let mut bytes = [0; 128];
+            while let Ok(count) = stream.read(&mut bytes).await {
+                if count == 0 {
+                    break;
+                }
+                if stream.write_all(&bytes[..count]).await.is_err() {
+                    return;
+                }
+            }
+            let _ = stream.shutdown().await;
+        });
+        Ok(())
+    }
+}
+
+struct Fixture {
+    session: SharedSession,
+    opened: mpsc::UnboundedReceiver<u32>,
+    server: JoinHandle<()>,
+    _directory: tempfile::TempDir,
+}
+
+impl Drop for Fixture {
+    fn drop(&mut self) {
+        self.server.abort();
+    }
+}
+
+impl Fixture {
+    async fn new() -> Self {
+        let directory = tempfile::tempdir().unwrap();
+        let known_hosts = directory.path().join("known_hosts");
+        let key = PrivateKey::random(&mut rand::rng(), Algorithm::Ed25519).unwrap();
+        russh::keys::known_hosts::learn_known_hosts_path(
+            "forward.test",
+            22,
+            key.public_key(),
+            &known_hosts,
+        )
+        .unwrap();
+        let config = Arc::new(server::Config {
+            keys: vec![key],
+            auth_rejection_time: Duration::ZERO,
+            auth_rejection_time_initial: Some(Duration::ZERO),
+            ..Default::default()
+        });
+        let (client_io, server_io) = tokio::io::duplex(65536);
+        let (sender, opened) = mpsc::unbounded_channel();
+        let server = tokio::spawn(async move {
+            let session = server::run_stream(
+                config,
+                server_io,
+                Echo { opened: sender, streams: JoinSet::new() },
+            )
+            .await
+            .unwrap();
+            let _ = session.await;
+        });
+        let mut session = client::connect_stream(
+            Arc::new(client::Config::default()),
+            client_io,
+            super::super::ClientHandler {
+                host: "forward.test".into(),
+                port: 22,
+                allow_prompt: false,
+                handshake: super::super::lifecycle::Handshake::default(),
+                known_hosts_path: Some(known_hosts),
+            },
+        )
+        .await
+        .unwrap();
+        assert!(session.authenticate_none("fixture").await.unwrap().success());
+        Self { session: Arc::new(session), opened, server, _directory: directory }
+    }
+}
+
+fn check(future: impl std::future::Future<Output = ()>) {
+    tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
+        tokio::time::timeout(Duration::from_secs(10), future)
+            .await
+            .expect("forward regression timed out");
+    });
+}
+
+#[test]
+fn forwards_bytes_and_half_close_and_releases_listener_and_connections() {
+    check(async {
+        let mut fixture = Fixture::new().await;
+        let forward = bind_forward(fixture.session.clone(), 0, 3000).await.unwrap();
+        let port = forward.local_port();
+        assert_eq!(forward.remote_port(), 3000);
+        assert!(bind_forward(fixture.session.clone(), port, 3001).await.is_err());
+        let mut socket = TcpStream::connect((Ipv4Addr::LOCALHOST, port)).await.unwrap();
+        assert_eq!(fixture.opened.recv().await, Some(3000));
+        socket.write_all(b"forwarded payload").await.unwrap();
+        socket.shutdown().await.unwrap();
+        let mut response = Vec::new();
+        socket.read_to_end(&mut response).await.unwrap();
+        assert_eq!(response, b"forwarded payload");
+        let mut active = TcpStream::connect((Ipv4Addr::LOCALHOST, port)).await.unwrap();
+        assert_eq!(fixture.opened.recv().await, Some(3000));
+        drop(forward);
+        let mut byte = [0];
+        assert!(matches!(active.read(&mut byte).await, Ok(0) | Err(_)));
+        TcpListener::bind((Ipv4Addr::LOCALHOST, port)).await.expect("listener released after drop");
+        assert!(
+            !fixture.session.is_closed(),
+            "stopping a forward preserves the shared SSH connection"
+        );
+    });
+}
+
+#[test]
+fn rejected_channel_closes_only_that_client() {
+    check(async {
+        let fixture = Fixture::new().await;
+        let forward = bind_forward(fixture.session.clone(), 0, 1).await.unwrap();
+        for _ in 0..2 {
+            let mut socket =
+                TcpStream::connect((Ipv4Addr::LOCALHOST, forward.local_port())).await.unwrap();
+            assert!(matches!(socket.read(&mut [0]).await, Ok(0) | Err(_)));
+        }
+        assert!(!fixture.session.is_closed());
+    });
+}
+
+#[test]
+fn channel_tasks_are_bounded_and_resume_after_a_client_closes() {
+    check(async {
+        let mut fixture = Fixture::new().await;
+        let forward = bind_forward(fixture.session.clone(), 0, 3000).await.unwrap();
+        let mut clients = Vec::new();
+        for _ in 0..MAX_CONNECTIONS {
+            clients.push(
+                TcpStream::connect((Ipv4Addr::LOCALHOST, forward.local_port())).await.unwrap(),
+            );
+            assert_eq!(fixture.opened.recv().await, Some(3000));
+        }
+        let _waiting =
+            TcpStream::connect((Ipv4Addr::LOCALHOST, forward.local_port())).await.unwrap();
+        tokio::task::yield_now().await;
+        assert!(fixture.opened.try_recv().is_err());
+        clients.pop().unwrap().shutdown().await.unwrap();
+        assert_eq!(fixture.opened.recv().await, Some(3000));
+    });
+}

From ad1fc9ee9b1070db1fce6dfdcfcf886c091e13c8 Mon Sep 17 00:00:00 2001
From: kuddev <kuddev@users.noreply.github.com>
Date: Sat, 26 Sep 2026 09:22:29 +0800
Subject: [PATCH 10/13] test(ssh): use shared platform shortcut selection

---
 nebula_app/src/gpui_shell/workspace/ssh_dialog.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
index 7d18309f..1eb19479 100644
--- a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
+++ b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
@@ -225,7 +225,10 @@ mod tests {
             assert!(view.port_forward_task.is_none());
             assert!(view.port_forwards.is_empty());
         });
-        let select_all = if cfg!(target_os = "macos") { "cmd-a" } else { "ctrl-a" };
+        let select_all = match crate::platform::Platform::current() {
+            crate::platform::Platform::MacOS => "cmd-a",
+            _ => "ctrl-a",
+        };
         for selector in ["ssh-forward-remote", "ssh-forward-local"] {
             let bounds = cx.debug_bounds(selector).unwrap();
             assert!(f32::from(bounds.size.height) >= 28.0);

From ed5bb5e8fd75c4218b3462eecd9ba42c42c2f29b Mon Sep 17 00:00:00 2001
From: kuddev <kuddev@users.noreply.github.com>
Date: Sat, 26 Sep 2026 09:28:01 +0800
Subject: [PATCH 11/13] fix(ssh): import dialog input hit-test trait

---
 nebula_app/src/gpui_shell/workspace/ssh_dialog.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
index 1eb19479..39f0b478 100644
--- a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
+++ b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
@@ -2,7 +2,10 @@ use std::cell::Cell;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use gpui::{App, AppContext as _, Context, Entity, ParentElement as _, Styled as _, Window, div};
+use gpui::{
+    App, AppContext as _, Context, Entity, InteractiveElement as _, ParentElement as _,
+    Styled as _, Window, div,
+};
 
 use crate::gpui_shell::prelude::*;
 use crate::gpui_shell::terminal::view::TerminalView;

From a7a55a3a6eeda46324894b90e52ab48d85a63929 Mon Sep 17 00:00:00 2001
From: kuddev <kuddev@users.noreply.github.com>
Date: Sat, 26 Sep 2026 09:45:33 +0800
Subject: [PATCH 12/13] test(ssh): refresh dialog probe and verify edited port
 values

---
 .../src/gpui_shell/workspace/ssh_dialog.rs    | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
index 39f0b478..40314df6 100644
--- a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
+++ b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
@@ -209,16 +209,19 @@ mod tests {
                 )
             })
         });
-        cx.update(|window, cx| {
+        let inputs = cx.update(|window, cx| {
             show_port_forward_dialog(owner.clone(), "fixture@localhost".into(), window, cx)
         });
         cx.update(|window, cx| {
-            let _ = window.draw(cx);
+            window.refresh();
+            window.draw(cx).clear(cx);
         });
         cx.simulate_input("65536");
+        assert_eq!(inputs[0].read_with(cx, |input, _| input.value()).as_ref(), "65536");
         click(cx, "confirm-dialog-ok");
         cx.update(|window, cx| {
-            let _ = window.draw(cx);
+            window.refresh();
+            window.draw(cx).clear(cx);
         });
         assert!(
             cx.debug_bounds("confirm-dialog-ok").is_some(),
@@ -232,17 +235,24 @@ mod tests {
             crate::platform::Platform::MacOS => "cmd-a",
             _ => "ctrl-a",
         };
-        for selector in ["ssh-forward-remote", "ssh-forward-local"] {
+        for (index, selector) in ["ssh-forward-remote", "ssh-forward-local"].into_iter().enumerate()
+        {
             let bounds = cx.debug_bounds(selector).unwrap();
             assert!(f32::from(bounds.size.height) >= 28.0);
             assert!(f32::from(bounds.size.width) >= 100.0);
             click(cx, selector);
             cx.simulate_keystrokes(select_all);
             cx.simulate_input("3000");
+            assert_eq!(
+                inputs[index].read_with(cx, |input, _| input.value()).as_ref(),
+                "3000",
+                "clicking {selector} must focus and edit that field"
+            );
         }
         click(cx, "confirm-dialog-ok");
         cx.update(|window, cx| {
-            let _ = window.draw(cx);
+            window.refresh();
+            window.draw(cx).clear(cx);
         });
         assert!(
             cx.debug_bounds("confirm-dialog-ok").is_none(),
@@ -253,11 +263,13 @@ mod tests {
             show_port_forward_dialog(owner.clone(), "fixture@localhost".into(), window, cx)
         });
         cx.update(|window, cx| {
-            let _ = window.draw(cx);
+            window.refresh();
+            window.draw(cx).clear(cx);
         });
         click(cx, "confirm-dialog-cancel");
         cx.update(|window, cx| {
-            let _ = window.draw(cx);
+            window.refresh();
+            window.draw(cx).clear(cx);
         });
         assert!(cx.debug_bounds("confirm-dialog-ok").is_none());
     }
@@ -308,7 +320,7 @@ fn show_port_forward_dialog(
     destination: String,
     window: &mut Window,
     cx: &mut App,
-) {
+) -> [Entity<InputState>; 2] {
     let forwards = view
         .read(cx)
         .port_forwards
@@ -318,6 +330,7 @@ fn show_port_forward_dialog(
     let remote_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
     let local_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
     let focus_input = remote_input.clone();
+    let inputs = [remote_input.clone(), local_input.clone()];
     let target = view.downgrade();
     let language = workspace_ui_language();
 
@@ -502,4 +515,5 @@ fn show_port_forward_dialog(
         })
     });
     focus_input.update(cx, |input, cx| input.focus(window, cx));
+    inputs
 }

From 8ae975bb52dc67167acd2a9f6f26d7b8baf161f9 Mon Sep 17 00:00:00 2001
From: kuddev <kuddev@users.noreply.github.com>
Date: Sat, 26 Sep 2026 10:18:12 +0800
Subject: [PATCH 13/13] fix(ssh): render port inputs in the dialog content area

---
 .../2026-09-26-pane-local-forwarding.md       |   3 +
 .../src/gpui_shell/workspace/ssh_dialog.rs    | 172 ++++++++++--------
 2 files changed, 100 insertions(+), 75 deletions(-)

diff --git a/architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md b/architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md
index ef8f8f34..dc82e3f3 100644
--- a/architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md
+++ b/architecture/notes/nebula_app/ssh_session/2026-09-26-pane-local-forwarding.md
@@ -19,6 +19,9 @@ creation must not finish after the owner has closed.
   exit; its detached creation task outlived the pane.
 - An unrestricted accept loop could create arbitrary numbers of channel tasks
   and bidirectional copy buffers from local clients.
+- The legacy dialog child scroller clipped the port controls: the real-click
+  regression left the port value unchanged after typing. The form now uses
+  `DialogContent`, with explicit input geometry and read-back assertions.
 - The original screenshot-only readiness override read the process environment
   from a render-time query and bypassed real SSH readiness in test builds.
 
diff --git a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
index 40314df6..163c6c1d 100644
--- a/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
+++ b/nebula_app/src/gpui_shell/workspace/ssh_dialog.rs
@@ -321,12 +321,13 @@ fn show_port_forward_dialog(
     window: &mut Window,
     cx: &mut App,
 ) -> [Entity<InputState>; 2] {
-    let forwards = view
-        .read(cx)
-        .port_forwards
-        .iter()
-        .map(|forward| (forward.local_port(), forward.remote_port()))
-        .collect::<Vec<_>>();
+    let forwards = Rc::new(
+        view.read(cx)
+            .port_forwards
+            .iter()
+            .map(|forward| (forward.local_port(), forward.remote_port()))
+            .collect::<Vec<_>>(),
+    );
     let remote_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
     let local_input = cx.new(|cx| InputState::new(window, cx).placeholder("3000"));
     let focus_input = remote_input.clone();
@@ -335,78 +336,15 @@ fn show_port_forward_dialog(
     let language = workspace_ui_language();
 
     window.open_dialog(cx, move |dialog, window, _cx| {
-        let mut body = v_flex().w_full().gap_3();
-        if forwards.is_empty() {
-            body = body.child(
-                div()
-                    .text_sm()
-                    .text_color(_cx.theme().muted_foreground)
-                    .child(language.text(Message::SshPortsEmpty)),
-            );
-        } else {
-            for (index, (local_port, remote_port)) in forwards.iter().copied().enumerate() {
-                let stop_target = target.clone();
-                body = body.child(
-                    h_flex()
-                        .w_full()
-                        .items_center()
-                        .justify_between()
-                        .child(format!("127.0.0.1:{local_port} → 127.0.0.1:{remote_port}"))
-                        .child(
-                            Button::new(("ssh-port-stop", index))
-                                .icon(IconName::Close)
-                                .ghost()
-                                .xsmall()
-                                .tooltip(language.text(Message::SshPortsStop))
-                                .on_click(move |_, window, cx| {
-                                    if let Some(view) = stop_target.upgrade() {
-                                        view.update(cx, |view, cx| {
-                                            if let Some(position) =
-                                                view.port_forwards.iter().position(|forward| {
-                                                    forward.local_port() == local_port
-                                                })
-                                            {
-                                                view.port_forwards.remove(position);
-                                                cx.notify();
-                                            }
-                                        });
-                                    }
-                                    window.close_dialog(cx);
-                                }),
-                        ),
-                );
-            }
-        }
-        body = body.child(
-            h_flex()
-                .w_full()
-                .gap_3()
-                .child(
-                    v_flex().flex_1().gap_1().child(language.text(Message::SshPortsRemote)).child(
-                        div()
-                            .debug_selector(|| "ssh-forward-remote".to_owned())
-                            .w_full()
-                            .h_8()
-                            .flex_shrink_0()
-                            .child(Input::new(&remote_input).w_full()),
-                    ),
-                )
-                .child(
-                    v_flex().flex_1().gap_1().child(language.text(Message::SshPortsLocal)).child(
-                        div()
-                            .debug_selector(|| "ssh-forward-local".to_owned())
-                            .w_full()
-                            .h_8()
-                            .flex_shrink_0()
-                            .child(Input::new(&local_input).w_full()),
-                    ),
-                ),
-        );
-
         let submit_target = target.clone();
         let submit_remote = remote_input.clone();
         let submit_local = local_input.clone();
         let submit_destination = destination.clone();
+        let content_target = target.clone();
+        let content_forwards = forwards.clone();
+        let content_remote = remote_input.clone();
+        let content_local = local_input.clone();
+        let content_destination = destination.clone();
         confirm_dialog(
             dialog,
             window,
@@ -416,7 +354,91 @@ fn show_port_forward_dialog(
             language.text(Message::CommonCancel),
             ButtonVariant::Primary,
         )
-        .child(body)
+        .content(move |content, _, _cx| {
+            let mut body = v_flex().w_full().gap_3();
+            if content_forwards.is_empty() {
+                body = body.child(
+                    div()
+                        .text_sm()
+                        .text_color(_cx.theme().muted_foreground)
+                        .child(language.text(Message::SshPortsEmpty)),
+                );
+            } else {
+                for (index, (local_port, remote_port)) in
+                    content_forwards.iter().copied().enumerate()
+                {
+                    let stop_target = content_target.clone();
+                    body = body.child(
+                        h_flex()
+                            .w_full()
+                            .items_center()
+                            .justify_between()
+                            .child(format!("127.0.0.1:{local_port} → 127.0.0.1:{remote_port}"))
+                            .child(
+                                Button::new(("ssh-port-stop", index))
+                                    .icon(IconName::Close)
+                                    .ghost()
+                                    .xsmall()
+                                    .tooltip(language.text(Message::SshPortsStop))
+                                    .on_click(move |_, window, cx| {
+                                        if let Some(view) = stop_target.upgrade() {
+                                            view.update(cx, |view, cx| {
+                                                if let Some(position) =
+                                                    view.port_forwards.iter().position(|forward| {
+                                                        forward.local_port() == local_port
+                                                    })
+                                                {
+                                                    view.port_forwards.remove(position);
+                                                    cx.notify();
+                                                }
+                                            });
+                                        }
+                                        window.close_dialog(cx);
+                                    }),
+                            ),
+                    );
+                }
+            }
+            body = body.child(
+                h_flex()
+                    .w_full()
+                    .gap_3()
+                    .child(
+                        v_flex()
+                            .flex_1()
+                            .gap_1()
+                            .child(language.text(Message::SshPortsRemote))
+                            .child(
+                                div()
+                                    .debug_selector(|| "ssh-forward-remote".to_owned())
+                                    .w_full()
+                                    .h_8()
+                                    .flex_shrink_0()
+                                    .child(Input::new(&content_remote).w_full()),
+                            ),
+                    )
+                    .child(
+                        v_flex()
+                            .flex_1()
+                            .gap_1()
+                            .child(language.text(Message::SshPortsLocal))
+                            .child(
+                                div()
+                                    .debug_selector(|| "ssh-forward-local".to_owned())
+                                    .w_full()
+                                    .h_8()
+                                    .flex_shrink_0()
+                                    .child(Input::new(&content_local).w_full()),
+                            ),
+                    ),
+            );
+            content
+                .child(
+                    gpui_component::dialog::DialogDescription::new()
+                        .child(content_destination.clone()),
+                )
+                .child(body)
+        })
         .on_ok(move |_, window, cx| {
             let remote_port =
                 submit_remote.read(cx).value().trim().parse::<u16>().ok().filter(|port| *port != 0);