clash-controller 0.2.1__tar.gz → 0.2.3__tar.gz

{clash_controller-0.2.1 → clash_controller-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clash_controller
-Version: 0.2.1
+Version: 0.2.3
 Summary: A Textual TUI for managing Clash proxy instances
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{clash_controller-0.2.1 → clash_controller-0.2.3}/clash_controller/__init__.py

@@ -2,4 +2,4 @@
 Clash Controller - A Textual TUI for managing Clash proxy instances.
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.3"

{clash_controller-0.2.1 → clash_controller-0.2.3}/clash_controller/app.py

@@ -2,16 +2,63 @@
 from datetime import datetime
 from pathlib import Path
 
+from rich.spinner import SPINNERS
+from rich.text import Text
 from textual import work
 from textual.app import App, ComposeResult
 from textual.binding import Binding
+from textual.widget import Widget
 from textual.widgets import Static
 
 from .api import ClashAPI
+from .widgets import ProgressCover
+
+_DOTS = SPINNERS["dots"]
 
 
 class StatusBar(Static):
-    """底部状态栏：展示最近一次操作结果 / 进行中提示。"""
+    """底部状态栏：展示最近一次操作结果 / 进行中提示；spinner=True 时显示点阵转圈。"""
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self._text = ""
+        self._busy = False
+        self._frame = 0
+        self._timer = None
+
+    def render(self) -> Text:
+        if self._busy:
+            glyph = _DOTS["frames"][self._frame % len(_DOTS["frames"])]
+            return Text.assemble((glyph, "bold"), " ", self._text)
+        return Text(self._text)
+
+    def set_status(self, text: str) -> None:
+        self._busy = False
+        self._text = text
+        self._stop_timer()
+        self.refresh()
+
+    def set_spinner(self, text: str) -> None:
+        self._busy = True
+        self._text = text
+        self._ensure_timer()
+        self.refresh()
+
+    def _ensure_timer(self) -> None:
+        if self._timer is None and self.is_mounted:
+            self._timer = self.set_interval(_DOTS["interval"] / 1000, self._tick)
+
+    def _stop_timer(self) -> None:
+        if self._timer is not None:
+            self._timer.stop()
+            self._timer = None
+
+    def _tick(self) -> None:
+        self._frame += 1
+        self.refresh()
+
+    def on_mount(self) -> None:
+        self._ensure_timer()
 
 
 class ClashControllerApp(App):
@@ -67,13 +114,29 @@ class ClashControllerApp(App):
     def compose(self) -> ComposeResult:
         yield StatusBar("", id="status")
 
+    def get_loading_widget(self) -> Widget:
+        """全局默认：任意控件 .loading=True 时用 indeterminate 进度条覆盖其区域。"""
+        return ProgressCover()
+
     def status(self, message: str, kind: str = "") -> None:
         try:
             bar = self.query_one("#status", StatusBar)
-        except Exception:
+        except Exception:  # noqa: BLE001
             return
         bar.update_classes({"ok": kind == "ok", "warn": kind == "warn", "err": kind == "err"})
-        bar.update(message)
+        bar.set_status(message)
+
+    def spinner(self, on: bool, message: str = "加载中…") -> None:
+        """状态栏点阵 spinner（无遮罩、不阻断输入）：适合轻量、即时的后台动作。"""
+        try:
+            bar = self.query_one("#status", StatusBar)
+        except Exception:  # noqa: BLE001
+            return
+        bar.update_classes({})
+        if on:
+            bar.set_spinner(message)
+        else:
+            bar.set_status("")
 
     def notify_ok(self, message: str) -> None:
         self.status(message, "ok")

{clash_controller-0.2.1 → clash_controller-0.2.3}/clash_controller/app.tcss

@@ -4,6 +4,23 @@ Screen {
     background: $surface;
 }
 
+/* ---------- 按钮：全局单行（替代 compact，无边框；三项目一致） ---------- */
+Button {
+    height: 1;
+    border: none;
+    min-width: 0;
+    padding: 0 1;
+}
+
+Button:focus {
+    border: none;
+    text-style: bold reverse;
+}
+
+Button:disabled {
+    text-opacity: 60%;
+}
+
 /* ---------- 模态三段式：标题栏 / 内容 / 按钮栏 ---------- */
 .modal-box {
     layout: vertical;
@@ -40,7 +57,7 @@ Screen {
 
 /* ---------- 页面公共 ---------- */
 .page-hint {
-    height: auto;
+    height: 1;
     padding: 0 1;
     color: $text-muted;
 }
@@ -104,7 +121,7 @@ Screen {
 }
 
 .tbl:focus {
-    border: tall $primary;
+    border: round $primary;
 }
 
 /* ---------- 信息面板 ---------- */
@@ -165,12 +182,17 @@ Screen {
 }
 
 #home-col {
-    width: 72;
+    width: auto;
     max-width: 90%;
     height: auto;
 }
 
-#home-banner,
+#home-banner {
+    width: 1fr;
+    text-align: left;
+    color: $primary;
+}
+
 #home-plain {
     width: 1fr;
     text-align: center;

{clash_controller-0.2.1 → clash_controller-0.2.3}/clash_controller/screens/config.py

@@ -4,14 +4,14 @@ import asyncio
 from rich.text import Text
 from textual import on, work
 from textual.binding import Binding
-from textual.containers import Horizontal
+from textual.containers import Horizontal, Vertical
 from textual.widgets import Button, DataTable, Static
 
 from ..config import load_config_providers, save_config_providers
 from ..deploy import compute_sha256, evaluate_update, fetch_remote_config, read_current_config
 from ..ssh import apply_local_config_file, apply_remote_config_via_ssh
 from ..ui import PageScreen
-from ..widgets import ConfirmModal, FormField, FormModal, fit_table_columns, load_rows, make_table, shorten
+from ..widgets import ConfirmModal, FormField, FormModal, busy, fit_table_columns, load_rows, make_table, shorten
 
 COLUMN_WEIGHTS = [2, 7]
 
@@ -32,14 +32,15 @@ class ConfigScreen(PageScreen):
         self._display: list = []
 
     def compose_page(self):
-        with Horizontal(classes="filter-row"):
-            yield Button("拉取并部署", id="deploy", variant="primary", compact=True)
-            yield Button("＋ 新增", id="add", compact=True)
-            yield Button("编辑", id="edit", compact=True)
-            yield Button("删除", id="delete", variant="error", compact=True)
-            yield Button("重载配置", id="reload-api", compact=True)
-            yield Static("", classes="fill")
-            yield Static("单击行 = 部署该提供方", classes="fl-label")
+        with Vertical(classes="panel"):
+            with Horizontal(classes="filter-row"):
+                yield Button("拉取并部署", id="deploy", variant="primary")
+                yield Button("＋ 新增", id="add")
+                yield Button("编辑", id="edit")
+                yield Button("删除", id="delete", variant="error")
+                yield Button("重载配置", id="reload-api")
+                yield Static("", classes="fill")
+                yield Static("单击行 = 部署该提供方", classes="fl-label")
         yield make_table("名称", "地址", id="cf-table")
 
     def on_mount(self) -> None:
@@ -175,61 +176,62 @@ class ConfigScreen(PageScreen):
         debug = self.app.debug_mode or bool(profile.get("debug_ssh"))
         url = provider.get("url", "")
 
-        self.app.status(f"正在从 {url} 拉取配置…")
-        self.app.add_log(f"Fetching config from {url}...")
-        try:
-            remote_payload, remote_hash, remote_mod_time = await asyncio.to_thread(fetch_remote_config, url)
-            local_mtime, local_bytes = await asyncio.to_thread(
-                read_current_config, profile, self.app.add_log, debug
-            )
-        except Exception as e:  # noqa: BLE001
-            self.app.notify_err(f"拉取或读取配置失败: {type(e).__name__}: {e}")
-            return
+        async with busy(self.app, "正在拉取远程配置…", mode="bar") as ov:
+            self.app.add_log(f"Fetching config from {url}...")
+            try:
+                remote_payload, remote_hash, remote_mod_time = await asyncio.to_thread(fetch_remote_config, url)
+                ov.set_message("正在读取目标配置…")
+                local_mtime, local_bytes = await asyncio.to_thread(
+                    read_current_config, profile, self.app.add_log, debug
+                )
+            except Exception as e:  # noqa: BLE001
+                self.app.notify_err(f"拉取或读取配置失败: {type(e).__name__}: {e}")
+                return
 
-        local_hash = compute_sha256(local_bytes)
-        decision = evaluate_update(remote_hash, remote_mod_time, local_hash, local_mtime)
-
-        proceed = True
-        if decision == "auto":
-            self.app.add_log("Remote config newer with different hash. Proceeding without prompt.")
-        elif decision == "confirm_older":
-            proceed = await self.app.push_screen_wait(
-                ConfirmModal("远程配置可能比本地更旧，仍要覆盖目标配置吗？", default_yes=False)
-            )
-        elif decision == "confirm_unknown":
-            proceed = await self.app.push_screen_wait(
-                ConfirmModal("远程配置内容不同，但无法获取更新时间。是否继续覆盖目标配置？", default_yes=True)
-            )
-        else:  # confirm_same
-            proceed = await self.app.push_screen_wait(
-                ConfirmModal("远程配置与目标配置内容相同，仍要覆盖吗？", default_yes=False)
-            )
-
-        if not proceed:
-            self.app.status("已取消更新", "warn")
-            self.app.add_log("Config update cancelled by user after comparison.")
-            return
+            local_hash = compute_sha256(local_bytes)
+            decision = evaluate_update(remote_hash, remote_mod_time, local_hash, local_mtime)
 
-        self.app.status("正在部署配置…")
-        try:
-            if profile.get("endpoint_type") == "remote":
-                self.app.add_log("Deploying config to remote endpoint via SSH.")
-                await asyncio.to_thread(
-                    apply_remote_config_via_ssh, profile, remote_payload, self.app.add_log, debug
+            proceed = True
+            if decision == "auto":
+                self.app.add_log("Remote config newer with different hash. Proceeding without prompt.")
+            elif decision == "confirm_older":
+                proceed = await self.app.push_screen_wait(
+                    ConfirmModal("远程配置可能比本地更旧，仍要覆盖目标配置吗？", default_yes=False)
+                )
+            elif decision == "confirm_unknown":
+                proceed = await self.app.push_screen_wait(
+                    ConfirmModal("远程配置内容不同，但无法获取更新时间。是否继续覆盖目标配置？", default_yes=True)
+                )
+            else:  # confirm_same
+                proceed = await self.app.push_screen_wait(
+                    ConfirmModal("远程配置与目标配置内容相同，仍要覆盖吗？", default_yes=False)
                 )
-            else:
-                self.app.add_log("Deploying config to local endpoint file.")
-                await asyncio.to_thread(apply_local_config_file, profile, remote_payload)
-        except Exception as e:  # noqa: BLE001
-            self.app.notify_err(f"部署配置失败: {type(e).__name__}: {e}")
-            return
 
-        self.app.status("正在通过 Clash API 重载配置…")
-        try:
-            result, error = await asyncio.to_thread(self.app.get_api().reload_configs)
-        except Exception as e:  # noqa: BLE001
-            self.app.notify_err(f"重载配置失败: {type(e).__name__}: {e}")
-            return
+            if not proceed:
+                self.app.status("已取消更新", "warn")
+                self.app.add_log("Config update cancelled by user after comparison.")
+                return
+
+            ov.set_message("正在部署配置…")
+            try:
+                if profile.get("endpoint_type") == "remote":
+                    self.app.add_log("Deploying config to remote endpoint via SSH.")
+                    await asyncio.to_thread(
+                        apply_remote_config_via_ssh, profile, remote_payload, self.app.add_log, debug
+                    )
+                else:
+                    self.app.add_log("Deploying config to local endpoint file.")
+                    await asyncio.to_thread(apply_local_config_file, profile, remote_payload)
+            except Exception as e:  # noqa: BLE001
+                self.app.notify_err(f"部署配置失败: {type(e).__name__}: {e}")
+                return
+
+            ov.set_message("正在通过 Clash API 重载配置…")
+            try:
+                result, error = await asyncio.to_thread(self.app.get_api().reload_configs)
+            except Exception as e:  # noqa: BLE001
+                self.app.notify_err(f"重载配置失败: {type(e).__name__}: {e}")
+                return
         self.app.report("重载配置", result, error)
 
     @on(Button.Pressed, "#reload-api")

{clash_controller-0.2.1 → clash_controller-0.2.3}/clash_controller/screens/home.py

@@ -7,19 +7,13 @@ from textual.screen import Screen
 from textual.widgets import OptionList, Static
 
 from .. import __version__
-from ..ui import LOGO_WIDTH, logo_text
-
-try:  # textual 各版本 Option 导出位置不同
-    from textual.widgets.option_list import Option
-except ImportError:  # pragma: no cover
-    from textual.widgets._option_list import Option
+from ..ui import LOGO_WIDTH, home_col_width, logo_text
+from ..widgets import HintBar, MenuMarquee
 
 
 class HomeScreen(Screen):
     """功能主菜单：概览 / 配置管理 / 设置 / 切换端点。"""
 
-    CSS_CLASSES = "logo-page"
-
     def __init__(self) -> None:
         super().__init__(classes="logo-page")
 
@@ -46,29 +40,29 @@ class HomeScreen(Screen):
                 name = (self.app.profile or {}).get("name", "")
                 yield Static(f"v{__version__}" + (f" · {name}" if name else ""), id="home-version")
                 yield OptionList(id="home-list")
-        yield Static("↑↓ 选择 · 回车 进入 · 1-4 直达 · Esc/Ctrl+C 退出", classes="page-hint")
+        yield HintBar("↑↓ 选择 · 回车 进入 · 1-4 直达 · Esc/Ctrl+C 退出", classes="page-hint")
 
     def on_mount(self) -> None:
         ol = self.query_one("#home-list", OptionList)
-        ol.add_options(self._options())
+        self._marquee = MenuMarquee(
+            self, "home-list", [(label, desc) for _, label, desc in self.ITEMS]
+        )
+        ol.add_options(self._marquee.placeholder_options())
         ol.highlighted = 0
         ol.focus()
         self._apply_breakpoint()
+        self.call_after_refresh(self._marquee.start)
 
     def on_resize(self, event) -> None:
         self._apply_breakpoint()
+        if getattr(self, "_marquee", None) is not None:
+            self._marquee.sync()
 
     def _apply_breakpoint(self) -> None:
-        """宽度不足以容纳艺术字时降级为普通标题文本。"""
-        self.set_class(self.size.width < LOGO_WIDTH + 6, "-sm")
-
-    def _options(self):
-        for i, (_, label, desc) in enumerate(self.ITEMS, start=1):
-            t = Text()
-            t.append(f" {i}  ", style="bold")
-            t.append(f"{label:<14}", style="bold")
-            t.append(desc, style="dim")
-            yield Option(t)
+        """宽度不足以容纳艺术字时降级为普通标题文本；列宽跟随 logo。"""
+        small = self.size.width < LOGO_WIDTH + 6
+        self.set_class(small, "-sm")
+        self.query_one("#home-col").styles.width = None if small else home_col_width()
 
     def _open(self, key: str) -> None:
         from .config import ConfigScreen

{clash_controller-0.2.1 → clash_controller-0.2.3}/clash_controller/screens/overview.py

@@ -1,6 +1,7 @@
 """概览屏：版本 + 实时流量 / 内存（流式接口）+ 当前活动连接表（每秒轮询）。"""
 import asyncio
 import json
+import time
 from collections.abc import Callable
 from datetime import datetime
 
@@ -10,7 +11,7 @@ from textual.containers import Horizontal, Vertical
 from textual.widgets import DataTable, Static
 
 from ..ui import PageScreen
-from ..widgets import fit_table_columns, load_rows, make_table, shorten
+from ..widgets import fit_table_columns, hold_busy, load_rows, make_table, shorten
 
 COLUMN_WEIGHTS = [4, 1.5, 1.5, 3, 3]
 
@@ -55,7 +56,7 @@ class OverviewScreen(PageScreen):
         self._consume("内存", api.get_memory_stream, self._on_memory)
         self.query_one(DataTable).focus()
         self._timer = self.set_interval(1.0, self._refresh_connections)
-        self._refresh_connections()
+        self._refresh_connections(show_overlay=True)
 
     def on_unmount(self) -> None:
         self._stop = True
@@ -72,7 +73,7 @@ class OverviewScreen(PageScreen):
 
     def reload_page(self) -> None:
         self._fetch_version()
-        self._refresh_connections()
+        self._refresh_connections(show_overlay=True)
 
     # ------------------------------------------------------------ 后台线程
 
@@ -130,50 +131,64 @@ class OverviewScreen(PageScreen):
         fit_table_columns(self.query_one("#cn-table", DataTable), COLUMN_WEIGHTS, rows=self._count)
 
     @work(exclusive=False)
-    async def _refresh_connections(self) -> None:
-        if self._busy or not self.is_mounted:
+    async def _refresh_connections(self, show_overlay: bool = False) -> None:
+        if self._busy:
             return
         self._busy = True
+        started = time.monotonic()
+        table = self.query_one("#cn-table", DataTable)
+        if show_overlay:
+            table.loading = True
         try:
-            data, error = await asyncio.to_thread(self.app.get_api().get_connections)
-        except Exception as e:  # noqa: BLE001
-            self._busy = False
-            self.app.notify_err(f"获取连接失败: {type(e).__name__}: {e}")
-            return
-        self._busy = False
-        if not self.is_mounted:
-            return
-
-        if error:
-            self.app.notify_err(f"获取连接失败: {error}")
-            return
-
-        data = data if isinstance(data, dict) else {}
-        connections = data.get("connections", []) or []
-        total_dl = data.get("downloadTotal", 0) / (1024 * 1024)
-        total_ul = data.get("uploadTotal", 0) / (1024 * 1024)
-
-        rows = []
-        for conn in connections:
-            metadata = conn.get("metadata", {}) or {}
-            host = metadata.get("host") or metadata.get("destinationIP", "未知")
-            rows.append([
-                Text(shorten(str(host), 40)),
-                Text(str(metadata.get("network", "?"))),
-                Text(str(metadata.get("type", "?"))),
-                Text(shorten(str(conn.get("rule", "?")), 30)),
-                Text(shorten(" -> ".join(conn.get("chains", []) or []), 30)),
-            ])
-        self._count = len(rows)
-        load_rows(self.query_one("#cn-table", DataTable), rows)
-        self._refit()
-        self.query_one("#cn-summary", Static).update(
-            Text(
-                f"{len(connections)} 条 · 上传 {total_ul:.2f} MB / 下载 {total_dl:.2f} MB"
-                f" · 更新于 {datetime.now():%H:%M:%S}"
+            try:
+                data, error = await asyncio.to_thread(self.app.get_api().get_connections)
+            except Exception as e:  # noqa: BLE001
+                self.app.notify_err(f"获取连接失败: {type(e).__name__}: {e}")
+                return
+            if not self.is_mounted:
+                return
+            if error:
+                self.app.notify_err(f"获取连接失败: {error}")
+                return
+
+            data = data if isinstance(data, dict) else {}
+            connections = data.get("connections", []) or []
+            total_dl = data.get("downloadTotal", 0) / (1024 * 1024)
+            total_ul = data.get("uploadTotal", 0) / (1024 * 1024)
+
+            rows = []
+            for conn in connections:
+                metadata = conn.get("metadata", {}) or {}
+                host = metadata.get("host") or metadata.get("destinationIP", "未知")
+                rows.append([
+                    Text(shorten(str(host), 40)),
+                    Text(str(metadata.get("network", "?"))),
+                    Text(str(metadata.get("type", "?"))),
+                    Text(shorten(str(conn.get("rule", "?")), 30)),
+                    Text(shorten(" -> ".join(conn.get("chains", []) or []), 30)),
+                ])
+            self._count = len(rows)
+            load_rows(table, rows)
+            self._refit()
+            self.query_one("#cn-summary", Static).update(
+                Text(
+                    f"{len(connections)} 条 · 上传 {total_ul:.2f} MB / 下载 {total_dl:.2f} MB"
+                    f" · 更新于 {datetime.now():%H:%M:%S}"
+                )
             )
-        )
-        self.app.status(f"连接总数 {len(connections)}")
+            self.app.status(f"连接总数 {len(connections)}")
+        finally:
+            self._busy = False
+            if show_overlay:
+                # 无论正常/异常/取消，覆盖层都必须撤下
+                try:
+                    if self.is_mounted:
+                        await hold_busy(started)
+                finally:
+                    table.loading = False
+                if self.is_mounted:
+                    self.call_after_refresh(self._refit)  # 覆盖层撤下后区域宽可能变化，按最终宽度重排
+                    table.focus()
 
     # ------------------------------------------------------------ UI 更新
 

{clash_controller-0.2.1 → clash_controller-0.2.3}/clash_controller/screens/profiles.py

@@ -11,8 +11,8 @@ from textual.widgets import Button, OptionList, Static
 from .. import __version__
 from ..config import load_profiles, save_profiles
 from ..deploy import default_endpoint_type
-from ..ui import LOGO_WIDTH, logo_text
-from ..widgets import ConfirmModal, FormField, FormModal, shorten
+from ..ui import LOGO_WIDTH, home_col_width, logo_text
+from ..widgets import ConfirmModal, FormField, FormModal, HintBar, MenuMarquee
 
 try:  # textual 各版本 Option 导出位置不同
     from textual.widgets.option_list import Option
@@ -20,8 +20,6 @@ except ImportError:  # pragma: no cover
     from textual.widgets._option_list import Option
 
 REQUIRED_FIELDS = ["endpoint_type", "config_directory", "use_sudo"]
-NAME_MAX = 14
-URL_MAX = 30
 
 
 def validate_profile(profile: dict) -> str | None:
@@ -210,6 +208,7 @@ class ProfileListScreen(Screen):
         super().__init__(classes="logo-page")
         self._profiles: list = []
         self._display: list = []
+        self._marquee = None
 
     # ------------------------------------------------------------ 组合
 
@@ -221,15 +220,17 @@ class ProfileListScreen(Screen):
                 yield Static(f"v{__version__}", id="home-version")
                 yield OptionList(id="pf-list")
                 with Horizontal(id="pf-actions"):
-                    yield Button("＋ 新增端点", id="add", variant="primary", compact=True)
-                    yield Button("编辑", id="edit", compact=True)
-                    yield Button("删除", id="delete", variant="error", compact=True)
-        yield Static(self.HINT, classes="page-hint")
+                    yield Button("＋ 新增端点", id="add", variant="primary")
+                    yield Button("编辑", id="edit")
+                    yield Button("删除", id="delete", variant="error")
+        yield HintBar(self.HINT, classes="page-hint")
 
     def on_mount(self) -> None:
+        self._marquee = MenuMarquee(self, "pf-list", [])
         self._load()
         self.query_one("#pf-list", OptionList).focus()
         self._apply_breakpoint()
+        self.call_after_refresh(self._marquee.start)
 
     def on_resize(self, event) -> None:
         self._apply_breakpoint()
@@ -237,8 +238,10 @@ class ProfileListScreen(Screen):
             self._rebuild()
 
     def _apply_breakpoint(self) -> None:
-        """宽度不足以容纳艺术字时降级为普通标题文本（与首页一致）。"""
-        self.set_class(self.size.width < LOGO_WIDTH + 6, "-sm")
+        """宽度不足以容纳艺术字时降级为普通标题文本；列宽跟随 logo。"""
+        small = self.size.width < LOGO_WIDTH + 6
+        self.set_class(small, "-sm")
+        self.query_one("#home-col").styles.width = None if small else home_col_width()
 
     # ------------------------------------------------------------ 数据加载
 
@@ -252,31 +255,28 @@ class ProfileListScreen(Screen):
     def action_refresh_page(self) -> None:
         self._load()
 
-    def _options(self) -> list[Option]:
-        if not self._display:
-            return [Option(Text("（暂无端点，Ctrl+N 创建）", style="dim"), disabled=True)]
+    def _rows(self) -> list[tuple[str, str]]:
         labels = {"local": "本地", "remote": "远程"}
-        opts = []
-        w = self.size.width or 120
-        col_width = min(72, w)
-        url_cap = max(10, col_width - 29 - 4)
-        for i, p in enumerate(self._display, start=1):
-            t = Text()
-            t.append(f" {i}  ", style="bold")
-            t.append(f"{shorten(str(p.get('name', '?')), NAME_MAX):<{NAME_MAX}}", style="bold")
-            t.append(" · ", style="dim")
-            t.append(f"{shorten(str(p.get('url', '')), url_cap):<{url_cap}}", style="dim")
-            t.append(" · ", style="dim")
-            t.append(labels.get(p.get("endpoint_type", ""), p.get("endpoint_type", "?")))
-            opts.append(Option(t))
-        return opts
+        rows = []
+        for p in self._display:
+            kind = labels.get(p.get("endpoint_type", ""), p.get("endpoint_type", "?"))
+            name = str(p.get("name", "?") or "?")
+            rows.append((name, f"{p.get('url', '')} · {kind}"))
+        return rows
 
     def _rebuild(self) -> None:
+        if self._marquee is None:
+            return
         self._display = list(self._profiles)
         ol = self.query_one("#pf-list", OptionList)
         prev = ol.highlighted
         ol.clear_options()
-        ol.add_options(self._options())
+        if self._display:
+            self._marquee.rows = self._rows()
+            ol.add_options(self._marquee.placeholder_options())
+            self._marquee.set_rows(self._rows())
+        else:
+            ol.add_options([Option(Text("（暂无端点，Ctrl+N 创建）", style="dim"), disabled=True)])
         ol.highlighted = prev if prev is not None and 0 <= prev < len(self._display) else (0 if self._display else None)
         n = len(self._profiles)
         self.query_one("#home-version", Static).update(f"v{__version__} · {n} 个端点")