comate-cli 0.7.5__tar.gz → 0.7.7__tar.gz

{comate_cli-0.7.5 → comate_cli-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.7.5
+Version: 0.7.7
 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.5 → comate_cli-0.7.7}/comate_cli/main.py

@@ -7,7 +7,12 @@ import os
 import signal
 import subprocess
 import sys
+import time
 import warnings
+
+# 进程启动锚点：在任何重三方库 import（anthropic/prompt_toolkit/rich）之前捕获，
+# 交给 StartupProfiler 测量「run() 之前的 import」这段以往不可见的启动成本。
+_PROCESS_START_PERF = time.perf_counter()
 try:
     import termios
 except ImportError:
@@ -268,7 +273,9 @@ def main(argv: list[str] | None = None) -> None:
     atexit.register(term_guard.restore, reason="atexit")
     atexit.register(noise_guard.begin_shutdown)
 
+    _app_import_start_perf = time.perf_counter()
     from comate_cli.terminal_agent.app import run
+    _app_import_done_perf = time.perf_counter()
 
     try:
         rpc_stdio, resume_session_id, resume_select, print_prompt = _parse_args(run_argv)
@@ -295,6 +302,9 @@ def main(argv: list[str] | None = None) -> None:
                 resume_session_id=resume_session_id,
                 resume_select=resume_select,
                 print_message=print_message,
+                process_start_perf=_PROCESS_START_PERF,
+                app_import_start_perf=_app_import_start_perf,
+                app_import_done_perf=_app_import_done_perf,
             )
         )
     except KeyboardInterrupt:

{comate_cli-0.7.5 → comate_cli-0.7.7}/comate_cli/terminal_agent/app.py

@@ -36,12 +36,15 @@ from comate_cli.terminal_agent.update_check import (
     get_pending_update_prompt_info,
     mark_update_seen,
     record_skip_until_next_version,
+    record_update_check_attempt,
     run_update_command,
+    should_check_for_update,
     show_update_prompt,
 )
 
 console = Console()
 logger = logging.getLogger(__name__)
+_UPDATE_CHECK_DELAY_S = 1.0
 
 
 def _resolve_cli_project_root() -> Path:
@@ -69,7 +72,7 @@ async def _handle_update_on_launch(info: UpdateInfo) -> bool:
         if decision == UpdatePromptDecision.SKIP:
             return False
         if decision == UpdatePromptDecision.SHOW_HINT:
-            console.print(format_update_hint(info))
+            console.print(f"[dim]{format_update_hint(info)}[/]")
             mark_update_seen(info)
             return False
 
@@ -86,7 +89,7 @@ async def _handle_update_on_launch(info: UpdateInfo) -> bool:
 async def _handle_background_update_on_launch(
     info: UpdateInfo,
     *,
-    status_bar: StatusBar,
+    renderer: EventRenderer,
     profiler: StartupProfiler,
 ) -> None:
     try:
@@ -95,12 +98,12 @@ async def _handle_background_update_on_launch(
             profiler.mark("update_check.skip")
             return
         if decision == UpdatePromptDecision.SHOW_HINT:
-            status_bar.show_transient(format_update_hint(info), duration_s=8.0)
+            renderer.append_system_message(format_update_hint(info))
             mark_update_seen(info)
             profiler.mark("update_check.hint")
             return
 
-        status_bar.show_transient(format_update_hint(info), duration_s=8.0)
+        renderer.append_system_message(format_update_hint(info))
         profiler.mark("update_check.prompt_deferred")
     except Exception:
         logger.debug("startup background update handling failed", exc_info=True)
@@ -109,18 +112,21 @@ async def _handle_background_update_on_launch(
 
 def _schedule_update_check_on_launch(
     *,
-    status_bar: StatusBar,
+    renderer: EventRenderer,
     profiler: StartupProfiler,
 ) -> asyncio.Task[None]:
     async def _run() -> None:
         try:
             profiler.mark("update_check.start")
+            profiler.mark("update_check.delay.start")
+            await asyncio.sleep(_UPDATE_CHECK_DELAY_S)
+            profiler.mark("update_check.delay.done")
             update_info = await _check_update(profiler=profiler.child("update_check"))
             profiler.mark("update_check.done")
             if update_info is not None:
                 await _handle_background_update_on_launch(
                     update_info,
-                    status_bar=status_bar,
+                    renderer=renderer,
                     profiler=profiler,
                 )
         except asyncio.CancelledError:
@@ -436,9 +442,18 @@ async def run(
     resume_session_id: str | None = None,
     resume_select: bool = False,
     print_message: str | None = None,
+    process_start_perf: float | None = None,
+    app_import_start_perf: float | None = None,
+    app_import_done_perf: float | None = None,
 ) -> None:
     _install_event_loop_exception_handler()
-    profiler = StartupProfiler.from_env(logger=logger)
+    # process_start_perf 由入口 main() 在模块 import 之前捕获，使 profiler 能测到
+    # 「run() 之前的重三方库 import」这段以往不可见的启动成本（柱子 A）。
+    profiler = StartupProfiler.from_env(logger=logger, started_at=process_start_perf)
+    if app_import_start_perf is not None:
+        profiler.mark_at("main.app_import.start", app_import_start_perf)
+    if app_import_done_perf is not None:
+        profiler.mark_at("main.app_import.done", app_import_done_perf)
     profiler.mark("cli_project_root.start")
     project_root = _resolve_cli_project_root()
     profiler.mark("cli_project_root.done")
@@ -534,10 +549,16 @@ async def run(
     tui = TerminalAgentTUI(session, status_bar, renderer)
     profiler.mark("tui.init.done")
     tui.add_resume_history(mode)
-    update_check_task = _schedule_update_check_on_launch(
-        status_bar=status_bar,
-        profiler=profiler,
-    )
+    update_check_task: asyncio.Task[None] | None = None
+    if should_check_for_update():
+        # attempt 语义：先记录尝试时间，确保 interval 内最多发起一次网络检查
+        record_update_check_attempt()
+        update_check_task = _schedule_update_check_on_launch(
+            renderer=renderer,
+            profiler=profiler,
+        )
+    else:
+        profiler.mark("update_check.throttled")
 
     async def _mcp_loader() -> None:
         await _preload_mcp_in_tui(session, profiler=profiler.child("mcp"))
@@ -565,11 +586,12 @@ async def run(
             )
     finally:
         try:
-            await _cancel_background_task(
-                update_check_task,
-                timeout_s=0.1,
-                task_name="terminal-update-check",
-            )
+            if update_check_task is not None:
+                await _cancel_background_task(
+                    update_check_task,
+                    timeout_s=0.1,
+                    task_name="terminal-update-check",
+                )
             if active_session is session:
                 await _graceful_shutdown(active_session)
             else:

{comate_cli-0.7.5 → comate_cli-0.7.7}/comate_cli/terminal_agent/startup_profile.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import os
+import threading
 import time
 
 
@@ -17,40 +18,65 @@ class StartupProfiler:
         started_at: float | None = None,
         prefix: str = "",
         pending_messages: list[str] | None = None,
+        lock: threading.Lock | None = None,
     ) -> None:
         self._logger = logger
         self._enabled = enabled
         self._started_at = started_at if started_at is not None else time.perf_counter()
         self._prefix = prefix.strip(".")
         self._pending_messages = pending_messages if pending_messages is not None else []
+        self._lock = lock if lock is not None else threading.Lock()
 
     @classmethod
-    def from_env(cls, *, logger: logging.Logger) -> "StartupProfiler":
+    def from_env(
+        cls,
+        *,
+        logger: logging.Logger,
+        started_at: float | None = None,
+    ) -> "StartupProfiler":
         raw_value = os.environ.get("COMATE_STARTUP_PROFILE", "")
         enabled = raw_value.strip().lower() in _TRUTHY_VALUES
-        return cls(logger=logger, enabled=enabled)
+        return cls(logger=logger, enabled=enabled, started_at=started_at)
 
     def mark(self, phase: str) -> None:
+        self.mark_at(phase, time.perf_counter())
+
+    def mark_at(self, phase: str, perf_value: float) -> None:
+        """记录一个发生在指定 perf_counter() 时刻的阶段。
+
+        用于补记 profiler 创建之前（如 main 入口的模块 import）已经测好的时间点，
+        elapsed_ms 仍以 started_at 为锚点，保持与 mark() 同一坐标系。
+        """
         if not self._enabled:
             return
         normalized_phase = phase.strip(".")
         if self._prefix:
             normalized_phase = f"{self._prefix}.{normalized_phase}"
-        elapsed_ms = (time.perf_counter() - self._started_at) * 1000
-        self._pending_messages.append(
-            f"startup_profile phase={normalized_phase} elapsed_ms={elapsed_ms:.3f}"
-        )
-        self.flush()
+        elapsed_ms = (perf_value - self._started_at) * 1000
+        with self._lock:
+            self._pending_messages.append(
+                f"startup_profile phase={normalized_phase} elapsed_ms={elapsed_ms:.3f}"
+            )
+            pending = self._drain_pending_locked()
+        for message in pending:
+            self._logger.info(message)
 
     def flush(self) -> None:
-        if not self._enabled or not self._pending_messages:
+        if not self._enabled:
             return
+        with self._lock:
+            pending = self._drain_pending_locked()
+        for message in pending:
+            self._logger.info(message)
+
+    def _drain_pending_locked(self) -> list[str]:
+        if not self._pending_messages:
+            return []
         if not self._logger.isEnabledFor(logging.INFO):
-            return
+            return []
         pending = list(self._pending_messages)
         self._pending_messages.clear()
-        for message in pending:
-            self._logger.info(message)
+        return pending
 
     def child(self, prefix: str) -> "StartupProfiler":
         normalized_prefix = prefix.strip(".")
@@ -64,4 +90,5 @@ class StartupProfiler:
             started_at=self._started_at,
             prefix=normalized_prefix,
             pending_messages=self._pending_messages,
+            lock=self._lock,
         )

{comate_cli-0.7.5 → comate_cli-0.7.7}/comate_cli/terminal_agent/update_check.py

@@ -5,6 +5,9 @@ import importlib.metadata
 import locale
 import logging
 import os
+import ssl
+import threading
+import time
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
@@ -24,6 +27,93 @@ PACKAGE_NAME = "comate-cli"
 RELEASE_NOTES_URL = "https://github.com/AndyLee1024/agent-sdk/releases/latest"
 UPDATE_COMMAND = ("uv", "tool", "update", PACKAGE_NAME)
 _SETTINGS_SECTION = "updates"
+_UPDATE_CHECK_TRUST_ENV = "COMATE_CLI_UPDATE_CHECK_TRUST_ENV"
+_TRUTHY_ENV_VALUES = {"1", "true", "yes", "on"}
+
+# 启动后台更新检查限频：默认 24h 内只查一次，避免每次启动都付网络 + httpx 构造成本。
+# 设为 0（或负数）表示禁用限频，每次启动都检查。
+_LAST_CHECK_AT_KEY = "last_check_at"
+_UPDATE_CHECK_INTERVAL_ENV = "COMATE_CLI_UPDATE_CHECK_INTERVAL_S"
+_DEFAULT_UPDATE_CHECK_INTERVAL_S = 24 * 60 * 60
+
+# certifi 预建的 SSL context（进程级复用）。默认 verify=True 会让 httpx 走
+# ssl.create_default_context() → 在 Windows 上枚举系统证书库，实测可达数秒；
+# 显式传 cafile 则不触发 load_default_certs()，构造降到几十毫秒。
+_update_check_ssl_context: ssl.SSLContext | None = None
+_ssl_context_lock = threading.Lock()
+
+
+def _get_update_check_ssl_context() -> ssl.SSLContext | None:
+    """惰性构建并复用 certifi SSL context；失败返回 None（回退 httpx 默认行为）。"""
+    global _update_check_ssl_context
+    if _update_check_ssl_context is not None:
+        return _update_check_ssl_context
+    with _ssl_context_lock:
+        if _update_check_ssl_context is None:
+            try:
+                import certifi
+
+                _update_check_ssl_context = ssl.create_default_context(
+                    cafile=certifi.where()
+                )
+            except Exception:
+                logger.debug(
+                    "failed to build certifi SSL context for update check",
+                    exc_info=True,
+                )
+                return None
+    return _update_check_ssl_context
+
+
+def _resolve_update_check_interval_s() -> float:
+    raw = os.environ.get(_UPDATE_CHECK_INTERVAL_ENV, "").strip()
+    if not raw:
+        return float(_DEFAULT_UPDATE_CHECK_INTERVAL_S)
+    try:
+        value = float(raw)
+    except ValueError:
+        return float(_DEFAULT_UPDATE_CHECK_INTERVAL_S)
+    return value if value >= 0 else float(_DEFAULT_UPDATE_CHECK_INTERVAL_S)
+
+
+def should_check_for_update(
+    *,
+    package: str = PACKAGE_NAME,
+    settings_path: Path | None = None,
+    now: float | None = None,
+) -> bool:
+    """启动时是否应执行网络版本检查（限频判断，纯本地 IO）。"""
+    interval_s = _resolve_update_check_interval_s()
+    if interval_s <= 0:
+        return True
+    state = _load_package_update_state(package, settings_path=settings_path)
+    try:
+        last_check_at = float(state.get(_LAST_CHECK_AT_KEY))  # type: ignore[arg-type]
+    except (TypeError, ValueError):
+        return True
+    current = now if now is not None else time.time()
+    if current < last_check_at:
+        # 时钟回拨：视为需要重新检查
+        return True
+    return (current - last_check_at) >= interval_s
+
+
+def record_update_check_attempt(
+    *,
+    package: str = PACKAGE_NAME,
+    settings_path: Path | None = None,
+    now: float | None = None,
+) -> None:
+    """记录一次更新检查尝试时间（attempt 语义：每个 interval 内最多一次网络请求）。"""
+    current = now if now is not None else time.time()
+    try:
+        _write_package_update_state(
+            package,
+            {_LAST_CHECK_AT_KEY: current},
+            settings_path=settings_path,
+        )
+    except Exception:
+        logger.debug("failed to record update check attempt", exc_info=True)
 
 
 class UpdatePromptDecision(Enum):
@@ -65,6 +155,11 @@ def _is_chinese_locale() -> bool:
     return False
 
 
+def _update_check_trust_env() -> bool:
+    raw = os.environ.get(_UPDATE_CHECK_TRUST_ENV, "")
+    return raw.strip().lower() in _TRUTHY_ENV_VALUES
+
+
 async def check_update(
     *,
     package: str = PACKAGE_NAME,
@@ -73,77 +168,143 @@ async def check_update(
     profiler: Any | None = None,
 ) -> UpdateInfo | None:
     """异步检查 comate-cli 是否有新版本，返回结构化版本信息或 None。"""
-    active_logger = log or logger
+    if profiler is not None:
+        profiler.mark("thread.await.start")
     try:
+        return await asyncio.to_thread(
+            check_update_blocking,
+            package=package,
+            release_notes_url=release_notes_url,
+            log=log,
+            profiler=profiler,
+        )
+    except asyncio.CancelledError:
         if profiler is not None:
-            profiler.mark("current_version.start")
-        current = importlib.metadata.version(package)
-    except importlib.metadata.PackageNotFoundError:
+            profiler.mark("thread.await.cancelled")
+        raise
+    except Exception:
+        if profiler is not None:
+            profiler.mark("thread.await.failed")
+        active_logger = log or logger
+        active_logger.debug("update check worker failed", exc_info=True)
         return None
     finally:
         if profiler is not None:
-            profiler.mark("current_version.done")
+            profiler.mark("thread.await.done")
 
-    if profiler is not None:
-        profiler.mark("locale.start")
-    if _is_chinese_locale():
-        url = f"https://mirrors.tuna.tsinghua.edu.cn/pypi/{package}/json"
-        source_label = "tuna"
-    else:
-        url = f"https://pypi.org/pypi/{package}/json"
-        source_label = "pypi"
-    if profiler is not None:
-        profiler.mark("locale.done")
 
+def check_update_blocking(
+    *,
+    package: str = PACKAGE_NAME,
+    release_notes_url: str = RELEASE_NOTES_URL,
+    log: logging.Logger | None = None,
+    profiler: Any | None = None,
+) -> UpdateInfo | None:
+    """同步执行版本检查；由 async wrapper 放入 worker thread，避免阻塞 TUI event loop。"""
+    active_logger = log or logger
     try:
         if profiler is not None:
-            profiler.mark("httpx_import.start")
-        import httpx
-        if profiler is not None:
-            profiler.mark("httpx_import.done")
+            profiler.mark("thread.run.start")
 
-        async with httpx.AsyncClient(timeout=3.0) as client:
+        try:
             if profiler is not None:
-                profiler.mark("http_get.start")
-            resp = await client.get(url)
-            resp.raise_for_status()
-            latest = resp.json()["info"]["version"]
+                profiler.mark("current_version.start")
+            current = importlib.metadata.version(package)
+        except importlib.metadata.PackageNotFoundError:
+            return None
+        finally:
             if profiler is not None:
-                profiler.mark("http_get.done")
-    except Exception:
-        active_logger.debug(f"update check failed (source={source_label})", exc_info=True)
-        return None
+                profiler.mark("current_version.done")
 
-    try:
         if profiler is not None:
-            profiler.mark("version_compare.start")
-        from packaging.version import Version
+            profiler.mark("locale.start")
+        if _is_chinese_locale():
+            url = f"https://mirrors.tuna.tsinghua.edu.cn/pypi/{package}/json"
+            source_label = "tuna"
+        else:
+            url = f"https://pypi.org/pypi/{package}/json"
+            source_label = "pypi"
+        if profiler is not None:
+            profiler.mark("locale.done")
 
-        if Version(latest) > Version(current):
-            return UpdateInfo(
-                package=package,
-                current_version=current,
-                latest_version=latest,
-                release_notes_url=release_notes_url,
+        try:
+            if profiler is not None:
+                profiler.mark("httpx_import.start")
+            import httpx
+            if profiler is not None:
+                profiler.mark("httpx_import.done")
+
+            trust_env = _update_check_trust_env()
+            if profiler is not None:
+                profiler.mark(
+                    "http_client.trust_env.enabled"
+                    if trust_env
+                    else "http_client.trust_env.disabled"
+                )
+                profiler.mark("http_client.construct.start")
+            client_kwargs: dict[str, Any] = {"timeout": 3.0, "trust_env": trust_env}
+            if not trust_env:
+                # 默认路径用 certifi context 绕开 Windows 证书库枚举（见 _get_update_check_ssl_context）。
+                # trust_env 逃生通道（企业代理/自签根证书）保持 httpx 默认 verify=True 行为不变。
+                ssl_context = _get_update_check_ssl_context()
+                if ssl_context is not None:
+                    client_kwargs["verify"] = ssl_context
+            client = httpx.Client(**client_kwargs)
+            if profiler is not None:
+                profiler.mark("http_client.construct.done")
+
+            if profiler is not None:
+                profiler.mark("http_client.enter.start")
+            with client:
+                if profiler is not None:
+                    profiler.mark("http_client.enter.done")
+                    profiler.mark("http_get.start")
+                resp = client.get(url)
+                resp.raise_for_status()
+                latest = resp.json()["info"]["version"]
+                if profiler is not None:
+                    profiler.mark("http_get.done")
+        except Exception:
+            if profiler is not None:
+                profiler.mark("http_client.failed")
+            active_logger.debug(f"update check failed (source={source_label})", exc_info=True)
+            return None
+
+        try:
+            if profiler is not None:
+                profiler.mark("version_compare.start")
+            from packaging.version import Version
+
+            if Version(latest) > Version(current):
+                return UpdateInfo(
+                    package=package,
+                    current_version=current,
+                    latest_version=latest,
+                    release_notes_url=release_notes_url,
+                )
+        except Exception:
+            active_logger.debug(
+                "update comparison failed (current=%s, latest=%s)",
+                current,
+                latest,
+                exc_info=True,
             )
-    except Exception:
-        active_logger.debug(
-            "update comparison failed (current=%s, latest=%s)",
-            current,
-            latest,
-            exc_info=True,
-        )
+        finally:
+            if profiler is not None:
+                profiler.mark("version_compare.done")
+        return None
     finally:
         if profiler is not None:
-            profiler.mark("version_compare.done")
-    return None
+            profiler.mark("thread.run.done")
 
 
 def format_update_hint(info: UpdateInfo) -> str:
+    # Returns plain text only. Callers are responsible for adding markup
+    # appropriate to their render target (Rich Console vs prompt_toolkit).
     return (
-        f"[dim] New version available: [bold cyan]{info.latest_version}[/] "
+        f"✨ New version available: {info.latest_version} "
         f"(current: {info.current_version})  "
-        f"Run [bold green]uv tool update {info.package}[/] to update.[/]"
+        f"Run `uv tool update {info.package}` to update."
     )
 
 
@@ -367,7 +528,7 @@ def _load_package_update_state(
 
 def _write_package_update_state(
     package: str,
-    values: dict[str, str],
+    values: dict[str, Any],
     *,
     settings_path: Path | None,
 ) -> None:

{comate_cli-0.7.5 → comate_cli-0.7.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "comate-cli"
-version = "0.7.5"
+version = "0.7.7"
 description = "Comate terminal CLI built on comate-agent-sdk"
 readme = "README.md"
 requires-python = ">=3.11,<3.14"

comate_cli-0.7.7/tests/conftest.py

@@ -0,0 +1,33 @@
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+import pytest
+
+
+def _ensure_cli_package_on_path() -> None:
+    cli_project_root = Path(__file__).resolve().parents[1]
+    cli_project_root_str = str(cli_project_root)
+    if cli_project_root_str not in sys.path:
+        sys.path.insert(0, cli_project_root_str)
+
+
+_ensure_cli_package_on_path()
+
+
+@pytest.fixture(autouse=True)
+def _isolate_update_check_settings(tmp_path, monkeypatch):
+    """每个测试用独立临时 settings.json，隔离启动更新检查的限频状态。
+
+    update_check 的限频（last_check_at）与 last_seen_version 都落在 USER_SETTINGS_PATH。
+    驱动 run()/scheduler 的集成测试若写到真实用户配置，会造成跨用例顺序相关的脏状态。
+    在这里把模块级 USER_SETTINGS_PATH 指向临时目录，统一隔离。
+    显式传 settings_path 的单测不受影响。
+    """
+    from comate_cli.terminal_agent import update_check
+
+    monkeypatch.setattr(
+        update_check, "USER_SETTINGS_PATH", tmp_path / "settings.json"
+    )
+    yield