From 3577d7a0e582fe34d5e9f647df2b0cd7ac63f013 Mon Sep 17 00:00:00 2001
From: ZiChuanShanFeng <270144683+WMU-Demo@users.noreply.github.com>
Date: Thu, 24 Sep 2026 00:28:44 +0800
Subject: [PATCH 1/2] feat(launcher): show configured SSH host names in
 launcher rows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new-tab launcher, Quick Jump and the command-palette SSH rows used
to render the raw destination (user@host) as their label, ignoring the
user-configured "主机名称" (host name) from SSH settings.

- Add ssh_host_labels() alongside ssh_host_icon_ids() and pass the
  label map into shell_palette_rows().
- Share a single ssh_host_display() rule across the launcher, Quick
  Jump and palette rows: a named host shows its alias as the label with
  the real destination as the metadata hint; unnamed hosts keep the
  previous label=destination, hint="SSH" presentation.
- Search now matches both the alias and the destination.

Tests: launcher rows with and without a configured name, including the
existing no-label fallback.
---
 nebula_app/src/gpui_shell/workspace.rs        | 10 +++++
 .../workspace/launcher_menu/tests.rs          |  1 +
 .../src/gpui_shell/workspace/palette.rs       | 13 ++++--
 .../src/gpui_shell/workspace/quick_jump.rs    | 10 +++--
 .../src/gpui_shell/workspace/shell_picker.rs  | 24 +++++++++--
 nebula_app/src/gpui_shell/workspace/tests.rs  | 40 ++++++++++++++++++-
 6 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/nebula_app/src/gpui_shell/workspace.rs b/nebula_app/src/gpui_shell/workspace.rs
index 818accb..567d976 100644
--- a/nebula_app/src/gpui_shell/workspace.rs
+++ b/nebula_app/src/gpui_shell/workspace.rs
@@ -636,6 +636,15 @@ fn ssh_host_icon_ids(data_dir: &Path) -> std::collections::HashMap<String, Strin
         .unwrap_or_default()
 }
 
+/// 地址 → 展示名（用户在 SSH 设置里起的"主机名称"），与 `ssh_host_icon_ids`
+/// 同一缓存策略：启动器 / Quick Jump / 命令面板在打开时各读一次，编辑保存后
+/// 由下一轮打开刷新。没起名的主机不在这里，展示端回落地址本身。
+fn ssh_host_labels(data_dir: &Path) -> std::collections::HashMap<String, String> {
+    crate::ssh_profiles::SshProfiles::load(&data_dir.join("ssh_profiles.json"))
+        .map(|profiles| profiles.labels())
+        .unwrap_or_default()
+}
+
 /// 标签的用户可编辑元数据：重命名与色标（旧壳 `TabEntry::custom_name` /
 /// `custom_color` 的对应物，字段与共享 session v4 的 `TabSession` 同名同义，
 /// 所以导出/恢复不需要转换层）。
@@ -2229,6 +2238,7 @@ impl NebulaWorkspace {
                 .map(|store| store.as_config_profiles())
                 .unwrap_or_default(),
             crate::gpui_shell::ssh_hosts::SshHostLists::load().merged(),
+            &ssh_host_labels(&crate::display::nebula_data_dir()),
             &default_shell_id,
             language,
             window.scale_factor().max(0.5),
diff --git a/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs b/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs
index 7fe6cc3..3a4d0d1 100644
--- a/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs
+++ b/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs
@@ -38,6 +38,7 @@ fn open(cx: &mut TestAppContext) -> (Entity<NebulaWorkspace>, VisualTestContext)
                 vec![shell("cmd"), shell("pwsh")],
                 vec![],
                 ["test-host".into()],
+                &std::collections::HashMap::new(),
                 "cmd",
                 workspace_ui_language(),
                 1.0,
diff --git a/nebula_app/src/gpui_shell/workspace/palette.rs b/nebula_app/src/gpui_shell/workspace/palette.rs
index 6fe7e0d..b4ad9e1 100644
--- a/nebula_app/src/gpui_shell/workspace/palette.rs
+++ b/nebula_app/src/gpui_shell/workspace/palette.rs
@@ -99,6 +99,7 @@ impl NebulaWorkspace {
             // 启动器混排（旧壳 ⌘K 裁定）：SSH 主机与命令同列，置顶/隐藏
             // 次序由共享 merge 权威裁定。
             let ssh_icons = ssh_host_icon_ids(&crate::display::nebula_data_dir());
+            let ssh_labels = ssh_host_labels(&crate::display::nebula_data_dir());
             rows.extend(
                 crate::gpui_shell::ssh_hosts::SshHostLists::load().merged().into_iter().map(
                     |host| {
@@ -106,13 +107,19 @@ impl NebulaWorkspace {
                             ssh_icons.get(&host).map(String::as_str),
                         )
                         .glyph;
+                        let (label, hint) = shell_picker::ssh_host_display(
+                            ssh_labels.get(&host).map(String::as_str),
+                            &host,
+                        );
+                        let search = format!("{label} {host} ssh host remote lianjie 连接")
+                            .to_lowercase();
                         WorkspacePaletteRow {
                             group_order: usize::MAX,
                             group: language.pick("SSH 主机", "SSH HOSTS").to_owned(),
-                            label: host.clone(),
-                            hint: "SSH".to_owned(),
+                            label,
+                            hint,
                             hint_style: WorkspacePaletteHintStyle::Metadata,
-                            search: format!("{host} ssh host remote lianjie 连接").to_lowercase(),
+                            search,
                             action: WorkspacePaletteAction::LaunchSshHost(host),
                             icon: None,
                             icon_glyph: Some(glyph),
diff --git a/nebula_app/src/gpui_shell/workspace/quick_jump.rs b/nebula_app/src/gpui_shell/workspace/quick_jump.rs
index 6417753..4ab3d5d 100644
--- a/nebula_app/src/gpui_shell/workspace/quick_jump.rs
+++ b/nebula_app/src/gpui_shell/workspace/quick_jump.rs
@@ -142,19 +142,23 @@ fn directory_rows(language: crate::display::UiLanguage) -> Vec<WorkspacePaletteR
 fn ssh_rows(language: crate::display::UiLanguage) -> Vec<WorkspacePaletteRow> {
     let group = language.pick("SSH 主机", "SSH hosts");
     let icons = ssh_host_icon_ids(&crate::display::nebula_data_dir());
+    let labels = ssh_host_labels(&crate::display::nebula_data_dir());
     crate::gpui_shell::ssh_hosts::SshHostLists::load()
         .merged()
         .into_iter()
         .map(|host| {
             let glyph =
                 crate::display::ui::os_icons::resolve(icons.get(&host).map(String::as_str)).glyph;
+            let (label, hint) =
+                super::shell_picker::ssh_host_display(labels.get(&host).map(String::as_str), &host);
+            let search = format!("{label} {host} ssh host remote 远程 连接").to_lowercase();
             WorkspacePaletteRow {
                 group_order: 3,
                 group: group.to_owned(),
-                label: host.clone(),
-                hint: "SSH".to_owned(),
+                label,
+                hint,
                 hint_style: super::WorkspacePaletteHintStyle::Metadata,
-                search: format!("{host} ssh host remote 远程 连接").to_lowercase(),
+                search,
                 action: WorkspacePaletteAction::LaunchSshHost(host),
                 icon: None,
                 icon_glyph: Some(glyph),
diff --git a/nebula_app/src/gpui_shell/workspace/shell_picker.rs b/nebula_app/src/gpui_shell/workspace/shell_picker.rs
index d4dde13..c0a9b8a 100644
--- a/nebula_app/src/gpui_shell/workspace/shell_picker.rs
+++ b/nebula_app/src/gpui_shell/workspace/shell_picker.rs
@@ -15,6 +15,20 @@ fn fallback_shell_glyph(id: &str, has_brand: bool) -> Option<char> {
     crate::shell_detect::icon_for_id(id).chars().next()
 }
 
+/// SSH 主机的展示名与次要信息，与旧壳 `SshRow` 同口径：
+///
+/// - 用户在 SSH 设置里起过"主机名称"：label 显示别名，hint 给真实连接地址；
+/// - 没起名：回落地址本身当 label，hint 保持 "SSH" 类型标签，避免重复。
+pub(super) fn ssh_host_display(
+    label: Option<&str>,
+    host: &str,
+) -> (String, String) {
+    match label {
+        Some(label) if !label.trim().is_empty() => (label.trim().to_owned(), host.to_owned()),
+        _ => (host.to_owned(), "SSH".to_owned()),
+    }
+}
+
 /// 新建终端弹窗的行：已检测 shell + SSH 主机，分组对照旧壳
 /// `CommandPalette::open_profiles`（推荐 / 所有 Shell / SSH 主机）。
 /// 三点菜单与 Ctrl+K 打开的是这份列表，不是通用命令面板。
@@ -22,6 +36,7 @@ pub(super) fn shell_palette_rows(
     shells: Vec<crate::shell_detect::DetectedShell>,
     profiles: Vec<crate::config::ui_config::Profile>,
     ssh_hosts: impl IntoIterator<Item = String>,
+    ssh_labels: &std::collections::HashMap<String, String>,
     default_shell_id: &str,
     language: crate::display::UiLanguage,
     scale_factor: f32,
@@ -88,13 +103,16 @@ pub(super) fn shell_palette_rows(
     rows.extend(ssh_hosts.into_iter().map(|host| {
         let glyph =
             crate::display::ui::os_icons::resolve(ssh_icons.get(&host).map(String::as_str)).glyph;
+        let (label, hint) =
+            ssh_host_display(ssh_labels.get(&host).map(String::as_str), &host);
+        let search = format!("{label} {host} ssh host remote lianjie 连接").to_lowercase();
         WorkspacePaletteRow {
             group_order: 2,
             group: ssh_group.to_owned(),
-            label: host.clone(),
-            hint: "SSH".to_owned(),
+            label,
+            hint,
             hint_style: WorkspacePaletteHintStyle::Metadata,
-            search: format!("{host} ssh host remote lianjie 连接").to_lowercase(),
+            search,
             action: WorkspacePaletteAction::LaunchSshHost(host),
             icon: None,
             icon_glyph: Some(glyph),
diff --git a/nebula_app/src/gpui_shell/workspace/tests.rs b/nebula_app/src/gpui_shell/workspace/tests.rs
index a9da3d8..0c0bc03 100644
--- a/nebula_app/src/gpui_shell/workspace/tests.rs
+++ b/nebula_app/src/gpui_shell/workspace/tests.rs
@@ -557,6 +557,7 @@ fn shell_palette_puts_the_default_shell_first() {
         shells.clone(),
         Vec::new(),
         ["box.example".to_owned()],
+        &std::collections::HashMap::new(),
         "nu",
         language,
         1.0,
@@ -583,7 +584,7 @@ fn shell_palette_puts_the_default_shell_first() {
     assert_eq!(rows[4].group, "SSH 主机");
 
     // 默认 id 没在检测结果里（WSL 发行版被卸载等）：不置顶也不 panic。
-    let rows = shell_palette_rows(shells, Vec::new(), None::<String>, "wsl:Ghost", language, 1.0);
+    let rows = shell_palette_rows(shells, Vec::new(), None::<String>, &std::collections::HashMap::new(), "wsl:Ghost", language, 1.0);
     assert!(matches!(
         &rows[0].action,
         WorkspacePaletteAction::LaunchShell(shell) if shell.id == "pwsh"
@@ -591,6 +592,41 @@ fn shell_palette_puts_the_default_shell_first() {
     assert_eq!(rows[0].group, "所有 Shell");
 }
 
+/// 启动器 SSH 行的"主机名称"：起过名的显示别名、hint 给真实地址；没起名
+/// 回落地址本身、hint 保持 "SSH"。搜索词必须同时覆盖别名与地址。
+#[test]
+fn shell_palette_ssh_rows_show_the_configured_host_name() {
+    let labels = [("root@box.example".to_owned(), "生产机".to_owned())].into();
+    let rows = shell_palette_rows(
+        Vec::new(),
+        Vec::new(),
+        ["root@box.example".to_owned(), "plain.example".to_owned()],
+        &labels,
+        "cmd",
+        crate::display::UiLanguage::ZhCn,
+        1.0,
+    );
+    assert_eq!(rows.len(), 2);
+
+    let named = &rows[0];
+    assert_eq!(named.label, "生产机");
+    assert_eq!(named.hint, "root@box.example");
+    assert!(named.search.contains("生产机"));
+    assert!(named.search.contains("root@box.example"));
+    assert!(matches!(
+        &named.action,
+        WorkspacePaletteAction::LaunchSshHost(host) if host == "root@box.example"
+    ));
+
+    let plain = &rows[1];
+    assert_eq!(plain.label, "plain.example");
+    assert_eq!(plain.hint, "SSH");
+    assert!(matches!(
+        &plain.action,
+        WorkspacePaletteAction::LaunchSshHost(host) if host == "plain.example"
+    ));
+}
+
 /// 回归锁：新建终端弹窗里，没有品牌贴图的 shell 不能空着——必须回落到按 id
 /// 取字的 Nerd Font 字形。之前这一列只填了 `icon`，于是 zsh、csh、ksh 这些
 /// 整行左边什么都没有。
@@ -609,6 +645,7 @@ fn shell_palette_falls_back_to_an_id_glyph_when_brand_art_is_absent() {
         shells,
         Vec::new(),
         None::<String>,
+        &std::collections::HashMap::new(),
         "zsh",
         crate::display::UiLanguage::ZhCn,
         1.0,
@@ -650,6 +687,7 @@ fn shell_palette_includes_imported_terminal_profiles() {
         Vec::new(),
         vec![profile],
         None::<String>,
+        &std::collections::HashMap::new(),
         &id,
         crate::display::UiLanguage::ZhCn,
         1.0,

From 98fad00b01da9dd089581e4d4f66a251bfc1404d Mon Sep 17 00:00:00 2001
From: ZiChuanShanFeng <270144683+WMU-Demo@users.noreply.github.com>
Date: Thu, 24 Sep 2026 01:00:33 +0800
Subject: [PATCH 2/2] refactor(launcher): keep workspace.rs within its line
 budget

The architecture contracts check enforces max(target, base) lines per
exception file, and workspace.rs is already at its base size. Move the
SSH label lookup out of workspace.rs instead of growing it:

- ssh_hosts.rs: add `merged_with_labels()` which reuses the profiles
  already loaded by `SshHostLists::load()` (no extra JSON parse) and
  yields (host, label) pairs in the same authoritative merge order.
- shell_picker.rs / quick_jump.rs / palette.rs: consume the label from
  those pairs; `ssh_host_display()` keeps the alias-or-fallback rule.
- workspace.rs: net zero lines (helper and extra argument removed).

Also apply the pinned rustfmt (1.97.1) to the touched files.

Verified locally: check_architecture.py --base origin/main passes,
architecture guardrail tests 53/53, file_line_budget 2/2,
workspace:: tests 107/107, gpui-shell --tests check clean.
---
 nebula_app/src/gpui_shell/ssh_hosts.rs        | 15 +++++++++++
 nebula_app/src/gpui_shell/workspace.rs        | 12 +--------
 .../workspace/launcher_menu/tests.rs          |  3 +--
 .../src/gpui_shell/workspace/palette.rs       | 20 +++++++--------
 .../src/gpui_shell/workspace/quick_jump.rs    |  9 +++----
 .../src/gpui_shell/workspace/shell_picker.rs  | 15 +++++------
 nebula_app/src/gpui_shell/workspace/tests.rs  | 25 +++++++++++--------
 7 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/nebula_app/src/gpui_shell/ssh_hosts.rs b/nebula_app/src/gpui_shell/ssh_hosts.rs
index 6267a37..9b9c0be 100644
--- a/nebula_app/src/gpui_shell/ssh_hosts.rs
+++ b/nebula_app/src/gpui_shell/ssh_hosts.rs
@@ -64,6 +64,21 @@ impl SshHostLists {
         )
     }
 
+    /// 与 [`Self::merged`] 同一顺序权威，同时带出用户在 SSH 设置里起的
+    /// 主机名称（地址 → 别名；没起名的是空串，展示端回落地址本身）。
+    /// profiles 在 [`Self::load`] 时已经读盘，这里不重复读 JSON；launcher /
+    /// Quick Jump / 命令面板三处 SSH 行共用，避免各自再解析一次。
+    pub fn merged_with_labels(&self) -> Vec<(String, String)> {
+        let labels = self.profiles.labels();
+        self.merged()
+            .into_iter()
+            .map(|host| {
+                let label = labels.get(&host).cloned().unwrap_or_default();
+                (host, label)
+            })
+            .collect()
+    }
+
     /// 隐藏区（设置页"已隐藏"折叠列表的数据源）。
     pub fn hidden_hosts(&self) -> Vec<String> {
         self.hidden.iter().filter(|host| self.configured.contains(host)).cloned().collect()
diff --git a/nebula_app/src/gpui_shell/workspace.rs b/nebula_app/src/gpui_shell/workspace.rs
index 567d976..f0d7be7 100644
--- a/nebula_app/src/gpui_shell/workspace.rs
+++ b/nebula_app/src/gpui_shell/workspace.rs
@@ -636,15 +636,6 @@ fn ssh_host_icon_ids(data_dir: &Path) -> std::collections::HashMap<String, Strin
         .unwrap_or_default()
 }
 
-/// 地址 → 展示名（用户在 SSH 设置里起的"主机名称"），与 `ssh_host_icon_ids`
-/// 同一缓存策略：启动器 / Quick Jump / 命令面板在打开时各读一次，编辑保存后
-/// 由下一轮打开刷新。没起名的主机不在这里，展示端回落地址本身。
-fn ssh_host_labels(data_dir: &Path) -> std::collections::HashMap<String, String> {
-    crate::ssh_profiles::SshProfiles::load(&data_dir.join("ssh_profiles.json"))
-        .map(|profiles| profiles.labels())
-        .unwrap_or_default()
-}
-
 /// 标签的用户可编辑元数据：重命名与色标（旧壳 `TabEntry::custom_name` /
 /// `custom_color` 的对应物，字段与共享 session v4 的 `TabSession` 同名同义，
 /// 所以导出/恢复不需要转换层）。
@@ -2237,8 +2228,7 @@ impl NebulaWorkspace {
             crate::terminal_profiles::TerminalProfiles::load()
                 .map(|store| store.as_config_profiles())
                 .unwrap_or_default(),
-            crate::gpui_shell::ssh_hosts::SshHostLists::load().merged(),
-            &ssh_host_labels(&crate::display::nebula_data_dir()),
+            crate::gpui_shell::ssh_hosts::SshHostLists::load().merged_with_labels(),
             &default_shell_id,
             language,
             window.scale_factor().max(0.5),
diff --git a/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs b/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs
index 3a4d0d1..d8caafd 100644
--- a/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs
+++ b/nebula_app/src/gpui_shell/workspace/launcher_menu/tests.rs
@@ -37,8 +37,7 @@ fn open(cx: &mut TestAppContext) -> (Entity<NebulaWorkspace>, VisualTestContext)
             workspace.palette_override = Some(shell_palette_rows(
                 vec![shell("cmd"), shell("pwsh")],
                 vec![],
-                ["test-host".into()],
-                &std::collections::HashMap::new(),
+                [("test-host".into(), String::new())],
                 "cmd",
                 workspace_ui_language(),
                 1.0,
diff --git a/nebula_app/src/gpui_shell/workspace/palette.rs b/nebula_app/src/gpui_shell/workspace/palette.rs
index b4ad9e1..63b49c3 100644
--- a/nebula_app/src/gpui_shell/workspace/palette.rs
+++ b/nebula_app/src/gpui_shell/workspace/palette.rs
@@ -99,20 +99,19 @@ impl NebulaWorkspace {
             // 启动器混排（旧壳 ⌘K 裁定）：SSH 主机与命令同列，置顶/隐藏
             // 次序由共享 merge 权威裁定。
             let ssh_icons = ssh_host_icon_ids(&crate::display::nebula_data_dir());
-            let ssh_labels = ssh_host_labels(&crate::display::nebula_data_dir());
             rows.extend(
-                crate::gpui_shell::ssh_hosts::SshHostLists::load().merged().into_iter().map(
-                    |host| {
+                crate::gpui_shell::ssh_hosts::SshHostLists::load()
+                    .merged_with_labels()
+                    .into_iter()
+                    .map(|(host, label)| {
                         let glyph = crate::display::ui::os_icons::resolve(
                             ssh_icons.get(&host).map(String::as_str),
                         )
                         .glyph;
-                        let (label, hint) = shell_picker::ssh_host_display(
-                            ssh_labels.get(&host).map(String::as_str),
-                            &host,
-                        );
-                        let search = format!("{label} {host} ssh host remote lianjie 连接")
-                            .to_lowercase();
+                        let named = (!label.is_empty()).then_some(label.as_str());
+                        let (label, hint) = shell_picker::ssh_host_display(named, &host);
+                        let search =
+                            format!("{label} {host} ssh host remote lianjie 连接").to_lowercase();
                         WorkspacePaletteRow {
                             group_order: usize::MAX,
                             group: language.pick("SSH 主机", "SSH HOSTS").to_owned(),
@@ -125,8 +124,7 @@ impl NebulaWorkspace {
                             icon_glyph: Some(glyph),
                             icon_path: None,
                         }
-                    },
-                ),
+                    }),
             );
             rows
         });
diff --git a/nebula_app/src/gpui_shell/workspace/quick_jump.rs b/nebula_app/src/gpui_shell/workspace/quick_jump.rs
index 4ab3d5d..234f40e 100644
--- a/nebula_app/src/gpui_shell/workspace/quick_jump.rs
+++ b/nebula_app/src/gpui_shell/workspace/quick_jump.rs
@@ -142,15 +142,14 @@ fn directory_rows(language: crate::display::UiLanguage) -> Vec<WorkspacePaletteR
 fn ssh_rows(language: crate::display::UiLanguage) -> Vec<WorkspacePaletteRow> {
     let group = language.pick("SSH 主机", "SSH hosts");
     let icons = ssh_host_icon_ids(&crate::display::nebula_data_dir());
-    let labels = ssh_host_labels(&crate::display::nebula_data_dir());
     crate::gpui_shell::ssh_hosts::SshHostLists::load()
-        .merged()
+        .merged_with_labels()
         .into_iter()
-        .map(|host| {
+        .map(|(host, label)| {
             let glyph =
                 crate::display::ui::os_icons::resolve(icons.get(&host).map(String::as_str)).glyph;
-            let (label, hint) =
-                super::shell_picker::ssh_host_display(labels.get(&host).map(String::as_str), &host);
+            let named = (!label.is_empty()).then_some(label.as_str());
+            let (label, hint) = shell_picker::ssh_host_display(named, &host);
             let search = format!("{label} {host} ssh host remote 远程 连接").to_lowercase();
             WorkspacePaletteRow {
                 group_order: 3,
diff --git a/nebula_app/src/gpui_shell/workspace/shell_picker.rs b/nebula_app/src/gpui_shell/workspace/shell_picker.rs
index c0a9b8a..4702c6d 100644
--- a/nebula_app/src/gpui_shell/workspace/shell_picker.rs
+++ b/nebula_app/src/gpui_shell/workspace/shell_picker.rs
@@ -19,10 +19,7 @@ fn fallback_shell_glyph(id: &str, has_brand: bool) -> Option<char> {
 ///
 /// - 用户在 SSH 设置里起过"主机名称"：label 显示别名，hint 给真实连接地址；
 /// - 没起名：回落地址本身当 label，hint 保持 "SSH" 类型标签，避免重复。
-pub(super) fn ssh_host_display(
-    label: Option<&str>,
-    host: &str,
-) -> (String, String) {
+pub(super) fn ssh_host_display(label: Option<&str>, host: &str) -> (String, String) {
     match label {
         Some(label) if !label.trim().is_empty() => (label.trim().to_owned(), host.to_owned()),
         _ => (host.to_owned(), "SSH".to_owned()),
@@ -35,8 +32,7 @@ pub(super) fn ssh_host_display(
 pub(super) fn shell_palette_rows(
     shells: Vec<crate::shell_detect::DetectedShell>,
     profiles: Vec<crate::config::ui_config::Profile>,
-    ssh_hosts: impl IntoIterator<Item = String>,
-    ssh_labels: &std::collections::HashMap<String, String>,
+    ssh_hosts: impl IntoIterator<Item = (String, String)>,
     default_shell_id: &str,
     language: crate::display::UiLanguage,
     scale_factor: f32,
@@ -100,11 +96,12 @@ pub(super) fn shell_palette_rows(
         rows.insert(0, default_row);
     }
     let ssh_icons = ssh_host_icon_ids(&crate::display::nebula_data_dir());
-    rows.extend(ssh_hosts.into_iter().map(|host| {
+    rows.extend(ssh_hosts.into_iter().map(|(host, label)| {
         let glyph =
             crate::display::ui::os_icons::resolve(ssh_icons.get(&host).map(String::as_str)).glyph;
-        let (label, hint) =
-            ssh_host_display(ssh_labels.get(&host).map(String::as_str), &host);
+        // 空串 = 没起名：`ssh_host_display` 回落地址本身，hint 保持 "SSH"。
+        let named = (!label.is_empty()).then_some(label.as_str());
+        let (label, hint) = ssh_host_display(named, &host);
         let search = format!("{label} {host} ssh host remote lianjie 连接").to_lowercase();
         WorkspacePaletteRow {
             group_order: 2,
diff --git a/nebula_app/src/gpui_shell/workspace/tests.rs b/nebula_app/src/gpui_shell/workspace/tests.rs
index 0c0bc03..fb76b4b 100644
--- a/nebula_app/src/gpui_shell/workspace/tests.rs
+++ b/nebula_app/src/gpui_shell/workspace/tests.rs
@@ -556,8 +556,7 @@ fn shell_palette_puts_the_default_shell_first() {
     let rows = shell_palette_rows(
         shells.clone(),
         Vec::new(),
-        ["box.example".to_owned()],
-        &std::collections::HashMap::new(),
+        [("box.example".to_owned(), String::new())],
         "nu",
         language,
         1.0,
@@ -584,7 +583,14 @@ fn shell_palette_puts_the_default_shell_first() {
     assert_eq!(rows[4].group, "SSH 主机");
 
     // 默认 id 没在检测结果里（WSL 发行版被卸载等）：不置顶也不 panic。
-    let rows = shell_palette_rows(shells, Vec::new(), None::<String>, &std::collections::HashMap::new(), "wsl:Ghost", language, 1.0);
+    let rows = shell_palette_rows(
+        shells,
+        Vec::new(),
+        None::<(String, String)>,
+        "wsl:Ghost",
+        language,
+        1.0,
+    );
     assert!(matches!(
         &rows[0].action,
         WorkspacePaletteAction::LaunchShell(shell) if shell.id == "pwsh"
@@ -596,12 +602,13 @@ fn shell_palette_puts_the_default_shell_first() {
 /// 回落地址本身、hint 保持 "SSH"。搜索词必须同时覆盖别名与地址。
 #[test]
 fn shell_palette_ssh_rows_show_the_configured_host_name() {
-    let labels = [("root@box.example".to_owned(), "生产机".to_owned())].into();
     let rows = shell_palette_rows(
         Vec::new(),
         Vec::new(),
-        ["root@box.example".to_owned(), "plain.example".to_owned()],
-        &labels,
+        [
+            ("root@box.example".to_owned(), "生产机".to_owned()),
+            ("plain.example".to_owned(), String::new()),
+        ],
         "cmd",
         crate::display::UiLanguage::ZhCn,
         1.0,
@@ -644,8 +651,7 @@ fn shell_palette_falls_back_to_an_id_glyph_when_brand_art_is_absent() {
     let rows = shell_palette_rows(
         shells,
         Vec::new(),
-        None::<String>,
-        &std::collections::HashMap::new(),
+        None::<(String, String)>,
         "zsh",
         crate::display::UiLanguage::ZhCn,
         1.0,
@@ -686,8 +692,7 @@ fn shell_palette_includes_imported_terminal_profiles() {
     let rows = shell_palette_rows(
         Vec::new(),
         vec![profile],
-        None::<String>,
-        &std::collections::HashMap::new(),
+        None::<(String, String)>,
         &id,
         crate::display::UiLanguage::ZhCn,
         1.0,