xg-cli 1.0__py3-none-any.whl

xg/tui/widgets/config_panel.py

@@ -0,0 +1,198 @@
+"""统一配置面板（TUI，Ctrl+T）：Provider 与 SmartRouter 同级展示。
+
+仅于 TUI 运行时 import。Provider 列表与 SmartRouter 四档配置在同一个
+Modal 内左右分栏平级呈现；编辑/新建仍走各自的 Form Modal，开关状态变更
+即时同步顶部 Header。动作落 :class:`provider_service.ProviderConfigService`
+与 :class:`smart_router_service.SmartRouterConfigService`。
+"""
+
+from __future__ import annotations
+
+from textual.app import ComposeResult
+from textual.containers import Horizontal, Vertical
+from textual.screen import ModalScreen
+from textual.widgets import Button, OptionList, Static
+from textual.widgets.option_list import Option
+
+from xg.config.provider_service import ProviderConfigService
+from xg.config.smart_router_service import SmartRouterConfigService
+from xg.tui.widgets.provider_form import ProviderForm
+from xg.tui.widgets.smart_router_form import SmartRouterForm
+
+
+class ConfigScreen(ModalScreen[None]):
+    BINDINGS = [("escape", "close", "关闭")]
+
+    def __init__(self, manager, settings=None) -> None:
+        super().__init__()
+        self.manager = manager
+        self.settings = settings
+        self.provider_service = ProviderConfigService(manager, settings)
+        self.router_service = SmartRouterConfigService(manager, settings)
+        self._rows: list[dict] = []
+        self._sel = 0
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="config-dialog"):
+            yield Static("配置中心", id="cfg-title")
+            with Vertical(id="cfg-body"):
+                with Vertical(id="provider-section"):
+                    yield Static("Provider 管理（或 /provider 命令）", id="cfg-sec-title")
+                    yield Static("↑↓ 选中行 · 操作作用于当前选中", id="provider-hint")
+                    yield OptionList(id="provider-list")
+                    yield Static("", id="provider-detail")
+                    with Horizontal(id="provider-actions"):
+                        yield Button("新增", id="add", variant="primary")
+                        yield Button("编辑", id="edit")
+                        yield Button("设为base", id="switch")
+                        yield Button("删除", id="remove", variant="error")
+                        yield Button("写Key", id="key")
+                with Vertical(id="sr-section"):
+                    yield Static("SmartRouter（或 /tier 命令）", id="cfg-sec-title")
+                    yield Static(self._render_router(), id="sr-body")
+                    with Horizontal(id="sr-actions"):
+                        yield Button("开关", id="toggle")
+                        yield Button("编辑档位", id="tier", variant="primary")
+                        yield Button("刷新", id="refresh")
+                        yield Button("关闭", id="close")
+
+    def _provider_label(self, row: dict) -> str:
+        return (
+            f"{row['name']:<12}"
+            f"{row['default_model'][:16]:<16}"
+            f"{'✓' if row['has_key'] else '✗':^5}"
+            f"{'●' if row['is_base'] else ' ':^6}"
+            f"{row['layer']}"
+        )
+
+    def _rebuild_provider_list(self, ol: OptionList) -> None:
+        self._rows = self.provider_service.list()
+        ol.clear_options()
+        if not self._rows:
+            self._sel = 0
+            return
+        for row in self._rows:
+            ol.add_option(Option(self._provider_label(row), id=row["name"]))
+        if self._sel >= len(self._rows):
+            self._sel = 0
+        ol.highlighted = self._sel
+
+    async def on_mount(self) -> None:
+        self._rebuild_provider_list(self.query_one("#provider-list", OptionList))
+        self.query_one("#sr-body", Static).update(self._render_router())
+        self._update_detail()
+
+    def on_option_list_option_highlighted(self, event: OptionList.OptionHighlighted) -> None:
+        self._sel = event.option_index
+        self._update_detail()
+
+    def _update_detail(self) -> None:
+        """展示当前选中 provider 的详情（等价 /provider show，key 脱敏）。"""
+        if not self._rows:
+            detail = "（无 provider，请新增）"
+        else:
+            name = self._rows[self._sel]["name"]
+            info = self.provider_service.get(name)
+            if info is None:
+                detail = f"{name}: 未知 provider"
+            else:
+                lines = [
+                    f"{info['name']}{'  ●base' if info['is_base'] else ''}  [{info['layer']} 层]",
+                    f"api_base     : {info['api_base']}",
+                    f"default_model: {info['default_model']}",
+                ]
+                if info.get("display_name"):
+                    lines.insert(1, f"display_name : {info['display_name']}")
+                models = info.get("models") or []
+                lines.append(f"models({len(models)})    : {', '.join(models) if models else '（空）'}")
+                lines.append(
+                    f"api_key      : {info['api_key_masked'] if info['has_key'] else '（未配置）'}"
+                )
+                refs = self.provider_service.referenced_by(name)
+                if refs:
+                    lines.append(f"SmartRouter 引用: {', '.join(refs)}")
+                detail = "\n".join(lines)
+        self.query_one("#provider-detail", Static).update(detail)
+
+    def _render_router(self) -> str:
+        cfg = self.router_service.get()
+        enabled = bool(cfg.get("enabled", False))
+        rows = self.router_service.list_tiers()
+        lines = [f"SmartRouter: {'开启' if enabled else '关闭'}",
+                 "TIER       PROVIDER       MODEL"]
+        for row in rows:
+            if row["configured"]:
+                lines.append(f"{row['name']:<10}{row['provider']:<14}{row['model']}")
+            else:
+                lines.append(f"{row['name']:<10}{'（回落 active）':<14}-")
+        return "\n".join(lines)
+
+    def _refresh(self) -> None:
+        self._rebuild_provider_list(self.query_one("#provider-list", OptionList))
+        self.query_one("#sr-body", Static).update(self._render_router())
+        self._update_detail()
+
+    def _sync_header(self) -> None:
+        """开关 / 档位变更后即时重建顶部 Header 路由行。"""
+        controller = getattr(self.app, "controller", None)
+        if controller is not None:
+            controller._sync_smart_router_snapshot()
+
+    def action_close(self) -> None:
+        self.dismiss(None)
+
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        bid = event.button.id or ""
+        if bid == "close":
+            self.dismiss(None)
+            return
+        if bid == "refresh":
+            self._refresh()
+            return
+        if bid == "add":
+            return self.app.push_screen(
+                ProviderForm(self.provider_service, mode="add"),
+                callback=self._after_form,
+            )
+        if bid == "toggle":
+            cfg = self.router_service.get()
+            on = not bool(cfg.get("enabled", False))
+            self.notify(self.router_service.set_enabled(on).message)
+            self._refresh()
+            self._sync_header()
+            return
+        if bid == "tier":
+            return self.app.push_screen(
+                SmartRouterForm(self.router_service), callback=self._after_form
+            )
+        if not self._rows:
+            self.notify("请先新增 provider", severity="warning")
+            return
+        if bid == "edit":
+            return self.app.push_screen(
+                ProviderForm(self.provider_service, name=self._rows[self._sel]["name"], mode="edit"),
+                callback=self._after_form,
+            )
+        if bid == "switch":
+            self.notify(self.provider_service.switch(self._rows[self._sel]["name"]).message)
+            self._refresh()
+            return
+        if bid == "remove":
+            result = self.provider_service.remove(self._rows[self._sel]["name"], yes=True)
+            self.notify(result.message, severity="error" if not result.ok else "information")
+            self._refresh()
+            return
+        if bid == "key":
+            return self.app.push_screen(
+                ProviderForm(self.provider_service, name=self._rows[self._sel]["name"], mode="key"),
+                callback=self._after_form,
+            )
+
+    def _after_form(self, _result: object) -> None:
+        self._refresh()
+        self._sync_header()
+
+
+def open_config_screen(app, manager, settings=None) -> None:
+    """外部调用：打开统一配置面板（Ctrl+T）。"""
+    app.push_screen(ConfigScreen(manager, settings))

xg/tui/widgets/confirm_modal.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from textual.app import ComposeResult
+from textual.containers import Vertical
+from textual.screen import ModalScreen
+from textual.widgets import Button, Static
+
+from xg.tui.state import ConfirmationRequest
+
+
+class ConfirmModal(ModalScreen[str]):
+    BINDINGS = [("escape", "cancel", "取消"), ("enter", "confirm", "确认"), ("y", "confirm", "确认")]
+
+    def __init__(self, request: ConfirmationRequest) -> None:
+        super().__init__()
+        self.request = request
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="confirm-dialog"):
+            yield Static(f"{self.request.title}\n\n{self.request.body}")
+            yield Button("确认 (y/Enter)", id="confirm", variant="warning")
+            yield Button("取消 (Esc)", id="cancel")
+
+    def action_confirm(self) -> None:
+        self.dismiss("confirm")
+
+    def action_cancel(self) -> None:
+        self.dismiss("cancel")
+
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        self.dismiss(event.button.id or "cancel")

xg/tui/widgets/footer.py

@@ -0,0 +1,9 @@
+from textual.widgets import Static
+
+
+class FooterBar(Static):
+    def __init__(self) -> None:
+        super().__init__(
+            "Enter 发送   /help 帮助   ↑/↓ 历史   Ctrl+C 取消   Ctrl+L 清屏   Ctrl+R 侧栏   Ctrl+T 配置   Esc 关闭弹窗",
+            id="footer",
+        )

xg/tui/widgets/header.py

@@ -0,0 +1,118 @@
+from __future__ import annotations
+
+import os
+
+from rich.text import Text
+from textual.widgets import Static
+
+from xg.tui.state import SmartRouterSnapshot, SmartRouterTierSnapshot, TuiState
+
+
+def _compact(value: int) -> str:
+    if value <= 0:
+        return "-"
+    if value < 1_000:
+        return str(value)
+    if value < 1_000_000:
+        return f"{value / 1_000:.1f}k".replace(".0k", "k")
+    return f"{value / 1_000_000:.1f}m".replace(".0m", "m")
+
+
+def _watermelon_mark() -> str:
+    """Return the brand mark with a safe ASCII fallback for dumb terminals."""
+    return "[XG CLI]" if os.environ.get("TERM", "").lower() == "dumb" else "🍉 XG CLI"
+
+
+def _status_label(phase: str) -> str:
+    return {
+        "idle": "Idle",
+        "running": "Working",
+        "awaiting_approval": "Waiting approval",
+        "awaiting_plan_review": "Plan review",
+        "awaiting_team_input": "Waiting team input",
+        "error": "Error",
+    }.get(phase, phase)
+
+
+def _tier_segment(tier: SmartRouterTierSnapshot) -> Text:
+    """Render one tier entry on the routing row.
+
+    当前档 bold reverse；未配置档 dim + ``model (x)``；其余档 dim。
+    """
+    label = f"{tier.tier}: {tier.model}"
+    if not tier.configured:
+        label += " (x)"
+    if tier.is_active:
+        return Text(label, style="bold reverse")
+    return Text(label, style="dim")
+
+
+def _routing_row(snapshot: SmartRouterSnapshot) -> Text:
+    """Assemble the four-tier routing row (only when enabled)."""
+    row = Text()
+    for index, tier in enumerate(snapshot.tiers):
+        if index:
+            row.append("  ")
+        row.append(_tier_segment(tier))
+    return row
+
+
+class HeaderBar(Static):
+    def __init__(self, *args, **kwargs) -> None:
+        # The ASCII fallback is rendered literally; otherwise Textual markup
+        # would treat the square brackets in ``[XG]`` as a tag.
+        kwargs.setdefault("markup", False)
+        super().__init__(*args, **kwargs)
+
+    def update_state(self, state: TuiState) -> None:
+        status = _status_label(state.phase)
+        inspector = state.inspector
+        usage = inspector.usage
+        level = "usage-normal"
+        highest_ratio = max(usage.window_ratio, usage.budget_usage_ratio)
+        if highest_ratio > 1.0:
+            level = "usage-error"
+        elif highest_ratio >= 0.7:
+            level = "usage-warning"
+        for class_name in ("usage-normal", "usage-warning", "usage-error"):
+            self.remove_class(class_name)
+        self.add_class(level)
+        available = usage.estimated_prompt_tokens > 0 and usage.context_window > 0
+        context = (
+            f"{_compact(usage.estimated_prompt_tokens)}/{_compact(usage.context_window)}"
+            if available else "-/-"
+        )
+        percentage = f"{usage.window_ratio * 100:.1f}%" if available else "-"
+        provider_model = f"{inspector.provider}/{inspector.model}".strip("/") or "provider/model unavailable"
+        hitl_enabled = inspector.safety.hitl_enabled if inspector.safety else inspector.hitl_enabled
+        queue = f"  ·  Queue {len(state.queue)}" if state.queue else ""
+
+        # Textual terminals cannot reliably display an SVG/PNG in the normal
+        # text pipeline. The watermelon emoji is the color-capable mark, with
+        # [XG] retained for TERM=dumb and other low-capability environments.
+        mark = _watermelon_mark()
+        # This is intentionally a welcome/brand block rather than a one-line
+        # status bar.  Keeping the runtime fields in the same widget preserves
+        # the existing state-update contract while giving the left column a
+        # useful visual hierarchy.
+        text = Text()
+        text.append(mark, style="bold bright_green")
+        text.append("\n")
+        text.append(provider_model, style="bold")
+        text.append("\n")
+        # SmartRouter routing row (phase-02): rendered only when enabled so the
+        # off-state output stays byte-identical to the pre-feature Header.
+        if inspector.smart_router.enabled and inspector.smart_router.tiers:
+            text.append(_routing_row(inspector.smart_router))
+            text.append("\n")
+        status_style = "red" if state.phase == "error" else "yellow" if state.phase != "idle" else "dim"
+        text.append(status, style=status_style)
+        text.append("  ·  ")
+        text.append(f"Context {context} · {percentage}")
+        text.append("\n")
+        text.append("HITL ON" if hitl_enabled else "HITL OFF", style="yellow" if not hitl_enabled else "dim")
+        text.append(queue, style="cyan")
+        # Static.update(Rich Text) needs an active Textual app console in
+        # Textual 8.x. Keep standalone render tests and lightweight adapters
+        # usable by falling back to the plain representation when unmounted.
+        self.update(text if self.is_mounted else text.plain)