comate-cli 0.7.0a11__tar.gz → 0.7.1__tar.gz

{comate_cli-0.7.0a11 → comate_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.7.0a11
+Version: 0.7.1
 Summary: Comate terminal CLI built on comate-agent-sdk
 Project-URL: Homepage, https://github.com/AndyLee1024/agent-sdk
 Project-URL: Repository, https://github.com/AndyLee1024/agent-sdk

{comate_cli-0.7.0a11 → comate_cli-0.7.1}/comate_cli/terminal_agent/animations.py

@@ -253,10 +253,8 @@ LOADING_SPINNER_FRAMES: tuple[str, ...] = (
 
 HIDDEN_THINKING_BADGES: tuple[str, ...] = (
     "ultra thinking",
-    "deep reasoning",
-    "thinking deeper",
-    "extended thinking",
-    "working through it",
+    "deep thinking",
+    "extended thinking"
 )
 
 

{comate_cli-0.7.0a11 → comate_cli-0.7.1}/comate_cli/terminal_agent/app.py

@@ -394,6 +394,11 @@ async def run(
 
     status_bar = StatusBar(session)
     status_bar.set_mode(session.get_mode())
+    try:
+        from comate_cli.terminal_agent.statusline import store as statusline_store
+        status_bar.apply_config(statusline_store.load())
+    except Exception:
+        pass
     if mode == "resume":
         await status_bar.refresh()
 

{comate_cli-0.7.0a11 → comate_cli-0.7.1}/comate_cli/terminal_agent/logo.py

@@ -48,7 +48,10 @@ def _format_directory_for_display(project_root: Path) -> str:
     home = Path.home().expanduser().resolve()
     if resolved_root == home:
         return "~/"
-    return str(resolved_root)
+    try:
+        return f"~/{resolved_root.relative_to(home)}"
+    except ValueError:
+        return str(resolved_root)
 
 
 def print_logo(console: Console, *, project_root: PathInput | None = None) -> None:

{comate_cli-0.7.0a11 → comate_cli-0.7.1}/comate_cli/terminal_agent/preflight.py

@@ -5,7 +5,7 @@ import logging
 import os
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Callable, Literal, Mapping
+from typing import Any, Callable, Literal, Mapping, Sequence
 
 from prompt_toolkit.application import Application
 from prompt_toolkit.filters import Condition
@@ -33,6 +33,7 @@ from comate_agent_sdk.facade.config.providers import (
     build_preview_payload,
     evaluate_preflight_state,
     merge_user_settings,
+    resolve_provider_presets,
 )
 
 from comate_cli.terminal_agent.figures import BULLET_OPERATOR
@@ -107,6 +108,7 @@ async def run_preflight_if_needed(
     console: Console,
     project_root: Path,
     interactive: bool,
+    provider_presets: Sequence[ProviderPreset] | None = None,
 ) -> PreflightResult:
     check = evaluate_preflight_state(project_root=project_root)
     if not check.needs_preflight:
@@ -116,7 +118,11 @@ async def run_preflight_if_needed(
         _print_preflight_block_message(console=console, check=check)
         return PreflightResult(status="blocked_non_interactive", detail="missing_llm_config")
 
-    flow = await _run_preflight_wizard(check=check, project_root=project_root)
+    flow = await _run_preflight_wizard(
+        check=check,
+        project_root=project_root,
+        provider_presets=provider_presets,
+    )
     if flow.cancel_detail is not None:
         console.print("[yellow]Setup cancelled. Session was not started.[/]")
         return PreflightResult(status="cancelled", detail=flow.cancel_detail)
@@ -216,9 +222,16 @@ class _PreflightWizardFlowResult:
 
 
 class _PreflightWizard:
-    def __init__(self, *, check: PreflightCheckResult, project_root: Path) -> None:
+    def __init__(
+        self,
+        *,
+        check: PreflightCheckResult,
+        project_root: Path,
+        provider_presets: Sequence[ProviderPreset] | None = None,
+    ) -> None:
         self._check = check
         self._project_root = project_root
+        self._provider_presets = resolve_provider_presets(provider_presets)
         self._app: Application | None = None
 
         self._mode: Literal["selection", "input"] = "selection"
@@ -449,7 +462,7 @@ class _PreflightWizard:
     def _open_provider_menu(self) -> None:
         self._back_fn = self._open_entry_menu
         ranked_presets = sorted(
-            enumerate(PROVIDER_PRESETS),
+            enumerate(self._provider_presets),
             key=lambda pair: (_PROVIDER_MENU_PRIORITY.get(pair[1].preset_id, 100), pair[0]),
         )
         options = [
@@ -472,7 +485,7 @@ class _PreflightWizard:
         )
 
     def _on_provider_selected(self, value: str) -> None:
-        selected = next((preset for preset in PROVIDER_PRESETS if preset.preset_id == value), None)
+        selected = next((preset for preset in self._provider_presets if preset.preset_id == value), None)
         if selected is None:
             self._cancel_with_detail("provider_cancelled")
             return
@@ -748,6 +761,11 @@ async def _run_preflight_wizard(
     *,
     check: PreflightCheckResult,
     project_root: Path,
+    provider_presets: Sequence[ProviderPreset] | None = None,
 ) -> _PreflightWizardFlowResult:
-    wizard = _PreflightWizard(check=check, project_root=project_root)
+    wizard = _PreflightWizard(
+        check=check,
+        project_root=project_root,
+        provider_presets=provider_presets,
+    )
     return await wizard.run()

{comate_cli-0.7.0a11 → comate_cli-0.7.1}/comate_cli/terminal_agent/slash_commands.py

@@ -137,6 +137,11 @@ SLASH_COMMAND_SPECS: tuple[SlashCommandSpec, ...] = (
         description="Configure CLI preferences (thinking, model, compaction, memory)",
         execution_kind="local",
     ),
+    SlashCommandSpec(
+        name="statusline",
+        description="Customize status bar display items",
+        execution_kind="local",
+    ),
 )
 SLASH_COMMANDS: tuple[str, ...] = tuple(f"/{cmd.name}" for cmd in SLASH_COMMAND_SPECS)
 

{comate_cli-0.7.0a11 → comate_cli-0.7.1}/comate_cli/terminal_agent/status_bar.py

@@ -1,13 +1,19 @@
 from __future__ import annotations
 
+import logging
 import subprocess
 import time
+from pathlib import Path
 from typing import NamedTuple
 
 from prompt_toolkit.application.current import get_app_or_none
 
 from comate_agent_sdk.agent import ChatSession
 
+from comate_cli.terminal_agent.statusline.model import StatuslineConfig
+
+logger = logging.getLogger(__name__)
+
 
 class GitDiffStats(NamedTuple):
     added: int
@@ -19,6 +25,14 @@ class StatusBar:
     _MIN_TERMINAL_WIDTH: int = 40
     _GIT_DIFF_CACHE_SECONDS: float = 5.0
     _GIT_CMD_TIMEOUT_SECONDS: float = 0.2
+    _SEPARATOR: str = " \u00b7 "  # " · "
+
+    # 分组颜色
+    _COLOR_MODEL: str = "#E17B7D"
+    _COLOR_CONTEXT: str = "#DF8E5F"
+    _COLOR_PROJECT: str = "#9BC69B"
+    _COLOR_GIT: str = "#6B97C1"
+    _COLOR_SEPARATOR: str = "#6B7280"
 
     def __init__(self, session: ChatSession):
         self._session = session
@@ -32,7 +46,57 @@ class StatusBar:
         self._transient_message: str | None = None
         self._transient_severity: str = "info"
         self._transient_until: float | None = None
+        self._config: StatuslineConfig = StatuslineConfig.default()
+
+        # Cached token data (updated during refresh)
+        self._cached_total_tokens: int | None = None
+        self._cached_prompt_tokens: int | None = None
+        self._cached_completion_tokens: int | None = None
+        self._cached_total_cost: float | None = None
+
+    # ---- config ---------------------------------------------------------
+    def apply_config(self, config: StatuslineConfig) -> None:
+        self._config = config
+
+    @property
+    def config(self) -> StatuslineConfig:
+        return self._config
+
+    def live_preview_data(self) -> list[tuple[str, str]]:
+        """为 /statusline UI 提供实时预览数据。"""
+        from comate_agent_sdk.agent import ChatSession as _CS
+
+        agent = getattr(self._session, "_agent", None)
+        parts: list[tuple[str, str]] = []
 
+        parts.append(("show_model_name", self._model_name))
+        parts.append(("show_git_branch", f"~{self._git_branch}"))
+        parts.append(("show_context_left", self.context_left_text()))
+        parts.append(("show_git_diff", self._git_diff_preview()))
+        parts.append(("show_llm_level", self._resolve_llm_level()))
+        parts.append(("show_turn_number", self._resolve_turn_number()))
+        parts.append(("show_project_cwd", self._resolve_project_cwd()))
+
+        if self._cached_total_tokens is not None:
+            parts.append(("show_token_usage", f"{self._format_token_count(self._cached_total_tokens)} tok"))
+        else:
+            parts.append(("show_token_usage", "-"))
+        if self._cached_prompt_tokens is not None:
+            parts.append(("show_token_input", f"{self._format_token_count(self._cached_prompt_tokens)} in"))
+        else:
+            parts.append(("show_token_input", "-"))
+        if self._cached_completion_tokens is not None:
+            parts.append(("show_token_output", f"{self._format_token_count(self._cached_completion_tokens)} out"))
+        else:
+            parts.append(("show_token_output", "-"))
+        if self._cached_total_cost is not None:
+            parts.append(("show_session_cost", f"${self._cached_total_cost:.4f}"))
+        else:
+            parts.append(("show_session_cost", "-"))
+
+        return parts
+
+    # ---- data resolvers -------------------------------------------------
     @staticmethod
     def _resolve_model_name(session: ChatSession) -> str:
         agent = getattr(session, "_agent", None)
@@ -101,17 +165,13 @@ class StatusBar:
         if not output:
             return None
 
-        # Parse output like "3 files changed, 12 insertions(+), 5 deletions(-)"
-        # or just "12 insertions(+), 5 deletions(-)"
         added, removed = 0, 0
         for part in output.split(","):
             part = part.strip()
             if "+" in part and "insertion" in part:
-                # e.g., "12 insertions(+)"
                 num_str = part.split()[0]
                 added = int(num_str)
             elif "-" in part and "deletion" in part:
-                # e.g., "5 deletions(-)"
                 num_str = part.split()[0]
                 removed = int(num_str)
 
@@ -127,6 +187,41 @@ class StatusBar:
         self._git_diff_stats = self._resolve_git_diff_stats()
         self._git_diff_cache_time = now
 
+    def _resolve_llm_level(self) -> str:
+        agent = getattr(self._session, "_agent", None)
+        level = getattr(agent, "level", None)
+        return str(level) if level else "-"
+
+    def _resolve_turn_number(self) -> str:
+        agent = getattr(self._session, "_agent", None)
+        turn = getattr(agent, "_turn_number", None)
+        return f"#{turn}" if turn is not None else "-"
+
+    def _resolve_project_cwd(self) -> str:
+        cwd = getattr(self._session, "_cwd", None)
+        if cwd is None:
+            return "-"
+        p = Path(cwd)
+        home = Path.home()
+        try:
+            rel = p.relative_to(home)
+            return "~/" if rel == Path(".") else f"~/{rel}"
+        except ValueError:
+            return str(p)
+
+    def _git_diff_preview(self) -> str:
+        if self._git_diff_stats is None:
+            return "-"
+        a, r = self._git_diff_stats
+        if a == 0 and r == 0:
+            return "-"
+        parts: list[str] = []
+        if a > 0:
+            parts.append(f"+{a}")
+        if r > 0:
+            parts.append(f"-{r}")
+        return " ".join(parts) if parts else "-"
+
     async def refresh(self) -> None:
         try:
             ctx_info = await self._session.get_context_info()
@@ -143,9 +238,21 @@ class StatusBar:
         self._context_used_pct = normalized
         self._context_left_pct = max(0.0, 100.0 - normalized)
 
-        # Refresh git diff stats off the render path; UI reads only the cache.
         self._ensure_git_diff_stats()
 
+        # Refresh token usage cache if any token-related items are enabled
+        cfg = self._config
+        if cfg.show_token_usage or cfg.show_token_input or cfg.show_token_output or cfg.show_session_cost:
+            try:
+                usage = await self._session.get_usage()
+                self._cached_total_tokens = usage.total_tokens
+                self._cached_prompt_tokens = usage.total_prompt_tokens
+                self._cached_completion_tokens = usage.total_completion_tokens
+                self._cached_total_cost = usage.total_cost
+            except Exception:
+                pass
+
+    # ---- terminal width / truncation ------------------------------------
     @classmethod
     def _resolve_terminal_width(cls) -> int:
         app = get_app_or_none()
@@ -192,18 +299,102 @@ class StatusBar:
     def get_mode(self) -> str:
         return self._mode
 
+    # ---- dynamic info_status_text ---------------------------------------
+    @staticmethod
+    def _format_token_count(n: int) -> str:
+        if n >= 1_000_000:
+            return f"{n / 1_000_000:.1f}M"
+        if n >= 1_000:
+            return f"{n / 1_000:.1f}k"
+        return str(n)
+
+    def _build_info_items(self) -> list[tuple[str, str]]:
+        """按 config 开关和固定顺序构建带颜色的展示项列表。
+
+        返回 (style, text) 列表，style 是 prompt_toolkit fragment style 字符串。
+        """
+        cfg = self._config
+        items: list[tuple[str, str]] = []
+
+        if cfg.show_model_name:
+            items.append((f"fg:{self._COLOR_MODEL}", self._model_name))
+        if cfg.show_llm_level:
+            items.append((f"fg:{self._COLOR_MODEL}", self._resolve_llm_level()))
+        if cfg.show_turn_number:
+            items.append((f"fg:{self._COLOR_CONTEXT}", self._resolve_turn_number()))
+        if cfg.show_project_cwd:
+            items.append((f"fg:{self._COLOR_PROJECT}", self._resolve_project_cwd()))
+        if cfg.show_git_branch:
+            items.append((f"fg:{self._COLOR_GIT}", f"~{self._git_branch}"))
+        if cfg.show_git_diff:
+            diff = self._git_diff_preview()
+            if diff != "-":
+                items.append((f"fg:{self._COLOR_GIT}", diff))
+        if cfg.show_context_left:
+            items.append((f"fg:{self._COLOR_CONTEXT}", self.context_left_text()))
+        if cfg.show_token_usage and self._cached_total_tokens is not None:
+            items.append((f"fg:{self._COLOR_CONTEXT}", f"{self._format_token_count(self._cached_total_tokens)} tok"))
+        if cfg.show_token_input and self._cached_prompt_tokens is not None:
+            items.append((f"fg:{self._COLOR_CONTEXT}", f"{self._format_token_count(self._cached_prompt_tokens)} in"))
+        if cfg.show_token_output and self._cached_completion_tokens is not None:
+            items.append((f"fg:{self._COLOR_CONTEXT}", f"{self._format_token_count(self._cached_completion_tokens)} out"))
+        if cfg.show_session_cost and self._cached_total_cost is not None:
+            items.append((f"fg:{self._COLOR_CONTEXT}", f"${self._cached_total_cost:.3f}"))
+
+        return items
+
+    def info_status_fragments(self) -> list[tuple[str, str]]:
+        """带分组颜色的 statusline fragments，超宽时从尾部整项移除。"""
+        items = self._build_info_items()
+        if not items:
+            return []
+
+        sep_text = self._SEPARATOR
+        sep_style = f"fg:{self._COLOR_SEPARATOR}"
+
+        # 交替插入分隔符：item0, sep, item1, sep, item2, ...
+        fragments: list[tuple[str, str]] = []
+        for i, (style, text) in enumerate(items):
+            if i > 0:
+                fragments.append((sep_style, sep_text))
+            fragments.append((style, text))
+
+        width = self._resolve_terminal_width()
+        budget = max(0, width - 2)
+        total_len = sum(len(text) for _, text in fragments)
+        if total_len <= budget:
+            return fragments
+
+        # 从尾部移除整项（含前缀分隔符）直到 fits
+        while items and total_len > budget:
+            removed_style, removed_text = items.pop()
+            total_len -= len(removed_text)
+            # 同时移除前一个分隔符
+            if items:
+                total_len -= len(sep_text)
+        if not items:
+            return []
+
+        # 重建 fragments
+        fragments = []
+        for i, (style, text) in enumerate(items):
+            if i > 0:
+                fragments.append((sep_style, sep_text))
+            fragments.append((style, text))
+        return fragments
+
     def info_status_text(self) -> str:
-        """仅返回 model | ~branch / X% context left（不含 mode 前缀）."""
-        branch_text = f"~{self._git_branch}"
-        context_text = self.context_left_text()
-        full_text = f"{self._model_name} | {branch_text} / {context_text}"
+        """按 config 动态组装纯文本展示项（用于 picker 预览等无颜色场景），用 · 分隔。"""
+        items = self._build_info_items()
+        if not items:
+            return ""
+        parts = [text for _, text in items]
+        full_text = self._SEPARATOR.join(parts)
         width = self._resolve_terminal_width()
-        budget = max(len(context_text), width - 2)
+        budget = max(0, width - 2)
         if len(full_text) <= budget:
             return full_text
-        prefix = f"{self._model_name} | {branch_text} / "
-        prefix_budget = max(0, budget - len(context_text))
-        return f"{self._truncate_text(prefix, prefix_budget)}{context_text}"
+        return self._truncate_text(full_text, budget)
 
     def right_prompt_text(self) -> str:
         return self._status_text_for_width(self._right_prompt_budget())
@@ -217,6 +408,8 @@ class StatusBar:
         return self._status_text_for_width(content_budget)
 
     def _git_diff_fragments(self) -> list[tuple[str, str]]:
+        if not self._config.show_git_diff:
+            return []
         if self._git_diff_stats is None or (
             self._git_diff_stats.added == 0 and self._git_diff_stats.removed == 0
         ):
@@ -230,10 +423,7 @@ class StatusBar:
         return parts
 
     def git_diff_fragments(self) -> list[tuple[str, str]]:
-        """Prompt-toolkit fragments for git diff stats.
-
-        Working tree only (unstaged): `git diff --shortstat`.
-        """
+        """Prompt-toolkit fragments for git diff stats."""
         return self._git_diff_fragments()
 
     def footer_toolbar(self) -> list[tuple[str, str]]:
@@ -241,8 +431,7 @@ class StatusBar:
         status_text = self.footer_status_text()
         git_fragments = self._git_diff_fragments()
 
-        # Calculate total length: status_text + git diff parts
-        git_len = sum(len(text) + 1 for _, text in git_fragments)  # +1 for space
+        git_len = sum(len(text) + 1 for _, text in git_fragments)
         left_padding = max(0, width - len(status_text) - git_len - 1)
 
         fragments: list[tuple[str, str]] = [
@@ -250,9 +439,8 @@ class StatusBar:
             ("", status_text),
         ]
 
-        # Add git diff stats with colors
         if git_fragments:
-            fragments.append(("", " "))  # Separator
+            fragments.append(("", " "))
             for class_name, text in git_fragments:
                 fragments.append((class_name, text))
 
@@ -267,11 +455,7 @@ class StatusBar:
         self._transient_until = time.monotonic() + duration_s
 
     def clear_transient_if_expired(self) -> bool:
-        """Check and clear expired transient message.
-
-        Returns True if the message was just cleared (state changed, needs repaint).
-        Returns False otherwise (no message, or message still active).
-        """
+        """Check and clear expired transient message."""
         if self._transient_until is not None and time.monotonic() >= self._transient_until:
             self._transient_message = None
             self._transient_severity = "info"

comate_cli-0.7.1/comate_cli/terminal_agent/statusline/model.py

@@ -0,0 +1,60 @@
+"""StatuslineConfig：statusline 展示项开关的不可变快照。"""
+from __future__ import annotations
+
+from dataclasses import dataclass, replace
+
+
+@dataclass(frozen=True, slots=True)
+class StatuslineConfig:
+    """11 项 statusline 展示项开关。"""
+
+    show_model_name: bool = True
+    show_git_branch: bool = True
+    show_context_left: bool = True
+    show_token_usage: bool = False
+    show_token_input: bool = False
+    show_token_output: bool = False
+    show_project_cwd: bool = False
+    show_llm_level: bool = False
+    show_turn_number: bool = False
+    show_git_diff: bool = False
+    show_session_cost: bool = False
+
+    @classmethod
+    def default(cls) -> StatuslineConfig:
+        return cls()
+
+    # ---- with_* mutators (返回新实例) ----
+
+    def with_show_model_name(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_model_name=v)
+
+    def with_show_git_branch(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_git_branch=v)
+
+    def with_show_context_left(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_context_left=v)
+
+    def with_show_token_usage(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_token_usage=v)
+
+    def with_show_token_input(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_token_input=v)
+
+    def with_show_token_output(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_token_output=v)
+
+    def with_show_project_cwd(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_project_cwd=v)
+
+    def with_show_llm_level(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_llm_level=v)
+
+    def with_show_turn_number(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_turn_number=v)
+
+    def with_show_git_diff(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_git_diff=v)
+
+    def with_show_session_cost(self, v: bool) -> StatuslineConfig:
+        return replace(self, show_session_cost=v)