comate-cli 0.7.1__tar.gz → 0.7.2__tar.gz

{comate_cli-0.7.1 → comate_cli-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.7.1
+Version: 0.7.2
 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.1 → comate_cli-0.7.2}/comate_cli/terminal_agent/app.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import importlib.metadata
-import locale
 import logging
 import os
 import random
@@ -27,6 +25,18 @@ from comate_cli.terminal_agent.resume_selector import select_resume_session_id
 from comate_cli.terminal_agent.rpc_stdio import StdioRPCBridge
 from comate_cli.terminal_agent.status_bar import StatusBar
 from comate_cli.terminal_agent.tui import TerminalAgentTUI
+from comate_cli.terminal_agent.update_check import (
+    UpdateInfo,
+    UpdatePromptChoice,
+    UpdatePromptDecision,
+    check_update,
+    decide_update_prompt,
+    format_update_hint,
+    mark_update_seen,
+    record_skip_until_next_version,
+    run_update_command,
+    show_update_prompt,
+)
 
 console = Console()
 logger = logging.getLogger(__name__)
@@ -37,70 +47,32 @@ def _resolve_cli_project_root() -> Path:
     return Path.cwd().expanduser().resolve()
 
 
-def _is_chinese_locale() -> bool:
-    """判断当前系统 locale 是否为中文环境。"""
-    # zh_tw（台湾）和 zh_hk（香港）不走清华镜像源
-    _CN_PREFIXES = ("zh_cn", "zh_sg", "zh_mo", "zh_hans")
-    for env_var in ("LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE"):
-        val = os.environ.get(env_var, "").lower()
-        if any(val.startswith(p) for p in _CN_PREFIXES):
-            return True
-    try:
-        lang, _ = locale.getlocale()
-        if lang:
-            lang_lower = lang.lower()
-            if any(lang_lower.startswith(p) for p in _CN_PREFIXES):
-                return True
-    except Exception:
-        pass
-    return False
+async def _check_update() -> UpdateInfo | None:
+    return await check_update(log=logger)
 
 
-async def _check_update() -> str | None:
-    """异步检查 comate-cli 是否有新版本，返回提示字符串或 None。
+async def _handle_update_on_launch(info: UpdateInfo) -> bool:
+    """Handle interactive startup update UX.
 
-    中文 locale 自动使用清华 TUNA 镜像源，其余使用官方 PyPI。
+    Returns True when launch should stop after a successful update.
     """
-    package = "comate-cli"
     try:
-        current = importlib.metadata.version(package)
-    except importlib.metadata.PackageNotFoundError:
-        return None
-
-    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"
-
-    try:
-        import httpx
-        async with httpx.AsyncClient(timeout=3.0) as client:
-            resp = await client.get(url)
-            resp.raise_for_status()
-            latest = resp.json()["info"]["version"]
+        decision = decide_update_prompt(info)
+        if decision == UpdatePromptDecision.SKIP:
+            return False
+        if decision == UpdatePromptDecision.SHOW_HINT:
+            console.print(format_update_hint(info))
+            mark_update_seen(info)
+            return False
+
+        choice = await show_update_prompt(info)
+        if choice == UpdatePromptChoice.UPDATE_NOW:
+            return await run_update_command(console, info)
+        if choice == UpdatePromptChoice.SKIP_UNTIL_NEXT_VERSION:
+            record_skip_until_next_version(info)
     except Exception:
-        logger.debug(f"update check failed (source={source_label})", exc_info=True)
-        return None
-
-    try:
-        from packaging.version import Version
-
-        if Version(latest) > Version(current):
-            return (
-                f"[dim] New version available: [bold cyan]{latest}[/] "
-                f"(current: {current})  "
-                f"Run [bold green]uv tool upgrade {package}[/] to upgrade.[/]"
-            )
-    except Exception:
-        logger.debug(
-            "update comparison failed (current=%s, latest=%s)",
-            current,
-            latest,
-            exc_info=True,
-        )
-    return None
+        logger.debug("startup update prompt failed", exc_info=True)
+    return False
 
 
 def _flush_langfuse_if_configured() -> None:
@@ -366,6 +338,14 @@ async def run(
 
     print_logo(console, project_root=project_root)
 
+    # 版本检查：带超时，不阻塞启动；仅交互启动路径触发升级 UX。
+    try:
+        update_info = await asyncio.wait_for(_check_update(), timeout=2.0)
+        if update_info is not None and await _handle_update_on_launch(update_info):
+            return
+    except (asyncio.TimeoutError, Exception):
+        pass
+
     if resume_select and not resume_session_id:
         selected_session_id = await select_resume_session_id(console, cwd=project_root)
         if not selected_session_id:
@@ -384,14 +364,6 @@ async def run(
     # 这些日志没有交互 anchor，需在恢复历史或首次用户输入前落为 standalone log。
     renderer.flush_pending_logs()
 
-    # 版本检查：带超时，不阻塞启动
-    try:
-        update_hint = await asyncio.wait_for(_check_update(), timeout=2.0)
-        if update_hint:
-            console.print(update_hint)
-    except (asyncio.TimeoutError, Exception):
-        pass
-
     status_bar = StatusBar(session)
     status_bar.set_mode(session.get_mode())
     try:

comate_cli-0.7.2/comate_cli/terminal_agent/update_check.py

@@ -0,0 +1,334 @@
+from __future__ import annotations
+
+import asyncio
+import importlib.metadata
+import locale
+import logging
+import os
+from dataclasses import dataclass
+from enum import Enum
+from pathlib import Path
+from typing import Any
+
+from rich.console import Console
+
+from comate_agent_sdk.agent.settings import (
+    USER_SETTINGS_PATH,
+    read_settings_json_object,
+    write_settings_json_atomic,
+)
+
+logger = logging.getLogger(__name__)
+
+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"
+
+
+class UpdatePromptDecision(Enum):
+    SKIP = "skip"
+    SHOW_HINT = "show_hint"
+    SHOW_PROMPT = "show_prompt"
+
+
+class UpdatePromptChoice(Enum):
+    UPDATE_NOW = "update_now"
+    SKIP = "skip"
+    SKIP_UNTIL_NEXT_VERSION = "skip_until_next_version"
+
+
+@dataclass(frozen=True, slots=True)
+class UpdateInfo:
+    package: str
+    current_version: str
+    latest_version: str
+    release_notes_url: str
+
+
+def _is_chinese_locale() -> bool:
+    """判断当前系统 locale 是否为中文环境。"""
+    # zh_tw（台湾）和 zh_hk（香港）不走清华镜像源
+    cn_prefixes = ("zh_cn", "zh_sg", "zh_mo", "zh_hans")
+    for env_var in ("LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE"):
+        val = os.environ.get(env_var, "").lower()
+        if any(val.startswith(prefix) for prefix in cn_prefixes):
+            return True
+    try:
+        lang, _ = locale.getlocale()
+        if lang:
+            lang_lower = lang.lower()
+            if any(lang_lower.startswith(prefix) for prefix in cn_prefixes):
+                return True
+    except Exception:
+        pass
+    return False
+
+
+async def check_update(
+    *,
+    package: str = PACKAGE_NAME,
+    release_notes_url: str = RELEASE_NOTES_URL,
+    log: logging.Logger | None = None,
+) -> UpdateInfo | None:
+    """异步检查 comate-cli 是否有新版本，返回结构化版本信息或 None。"""
+    active_logger = log or logger
+    try:
+        current = importlib.metadata.version(package)
+    except importlib.metadata.PackageNotFoundError:
+        return None
+
+    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"
+
+    try:
+        import httpx
+
+        async with httpx.AsyncClient(timeout=3.0) as client:
+            resp = await client.get(url)
+            resp.raise_for_status()
+            latest = resp.json()["info"]["version"]
+    except Exception:
+        active_logger.debug(f"update check failed (source={source_label})", exc_info=True)
+        return None
+
+    try:
+        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,
+        )
+    return None
+
+
+def format_update_hint(info: UpdateInfo) -> str:
+    return (
+        f"[dim] New version available: [bold cyan]{info.latest_version}[/] "
+        f"(current: {info.current_version})  "
+        f"Run [bold green]uv tool update {info.package}[/] to update.[/]"
+    )
+
+
+def decide_update_prompt(
+    info: UpdateInfo,
+    *,
+    settings_path: Path | None = None,
+) -> UpdatePromptDecision:
+    state = _load_package_update_state(info.package, settings_path=settings_path)
+    if state.get("skip_until_version") == info.latest_version:
+        return UpdatePromptDecision.SKIP
+    if state.get("last_seen_version") == info.latest_version:
+        return UpdatePromptDecision.SHOW_PROMPT
+    return UpdatePromptDecision.SHOW_HINT
+
+
+def mark_update_seen(info: UpdateInfo, *, settings_path: Path | None = None) -> None:
+    _write_package_update_state(
+        info.package,
+        {"last_seen_version": info.latest_version},
+        settings_path=settings_path,
+    )
+
+
+def record_skip_until_next_version(
+    info: UpdateInfo,
+    *,
+    settings_path: Path | None = None,
+) -> None:
+    _write_package_update_state(
+        info.package,
+        {
+            "last_seen_version": info.latest_version,
+            "skip_until_version": info.latest_version,
+        },
+        settings_path=settings_path,
+    )
+
+
+async def show_update_prompt(info: UpdateInfo) -> UpdatePromptChoice:
+    from prompt_toolkit.application import Application
+    from prompt_toolkit.key_binding import KeyBindings
+    from prompt_toolkit.layout import HSplit, Layout, Window
+    from prompt_toolkit.layout.controls import FormattedTextControl
+    from prompt_toolkit.patch_stdout import patch_stdout
+    from prompt_toolkit.styles import Style as PTStyle
+
+    choices = (
+        UpdatePromptChoice.UPDATE_NOW,
+        UpdatePromptChoice.SKIP,
+        UpdatePromptChoice.SKIP_UNTIL_NEXT_VERSION,
+    )
+    selected_index = 0
+
+    def render() -> list[tuple[str, str]]:
+        rows = [
+            ("class:title", f"✨ Update available! {info.current_version} -> {info.latest_version}\n"),
+            ("", "\n"),
+            # ("class:dim", f"  Release notes: {info.release_notes_url}\n"),
+            # ("", "\n"),
+        ]
+        labels = (
+            f"Update now (runs `{_format_update_command()}`)",
+            "Skip",
+            "Skip until next version",
+        )
+        for index, label in enumerate(labels):
+            marker = "›" if index == selected_index else " "
+            style = "class:selected" if index == selected_index else ""
+            rows.append((style, f"{marker} {index + 1}. {label}\n"))
+        rows.extend(
+            [
+                ("", "\n"),
+                ("class:dim", "  Press enter to continue"),
+            ]
+        )
+        return rows
+
+    kb = KeyBindings()
+
+    def exit_with(index: int, event: Any) -> None:
+        event.app.exit(result=choices[index])
+
+    @kb.add("up")
+    def _on_up(event: Any) -> None:
+        nonlocal selected_index
+        del event
+        selected_index = max(0, selected_index - 1)
+
+    @kb.add("down")
+    def _on_down(event: Any) -> None:
+        nonlocal selected_index
+        del event
+        selected_index = min(len(choices) - 1, selected_index + 1)
+
+    @kb.add("1")
+    def _on_one(event: Any) -> None:
+        exit_with(0, event)
+
+    @kb.add("2")
+    def _on_two(event: Any) -> None:
+        exit_with(1, event)
+
+    @kb.add("3")
+    def _on_three(event: Any) -> None:
+        exit_with(2, event)
+
+    @kb.add("enter")
+    def _on_enter(event: Any) -> None:
+        exit_with(selected_index, event)
+
+    @kb.add("escape")
+    @kb.add("c-c")
+    def _on_cancel(event: Any) -> None:
+        event.app.exit(result=UpdatePromptChoice.SKIP)
+
+    app: Application[UpdatePromptChoice] = Application(
+        layout=Layout(
+            HSplit(
+                [
+                    Window(
+                        content=FormattedTextControl(text=render, focusable=True),
+                        wrap_lines=False,
+                    )
+                ]
+            )
+        ),
+        key_bindings=kb,
+        style=PTStyle.from_dict(
+            {
+                "title": "bold",
+                "dim": "ansibrightblack",
+                "selected": "bold",
+            }
+        ),
+        full_screen=True,
+        erase_when_done=True,
+        mouse_support=False,
+    )
+    with patch_stdout(raw=True):
+        return await app.run_async()
+
+
+async def run_update_command(console: Console, info: UpdateInfo) -> bool:
+    command = ("uv", "tool", "update", info.package)
+    command_text = " ".join(command)
+    console.print(f"Updating Comate via `{command_text}`...")
+    try:
+        process = await asyncio.create_subprocess_exec(
+            *command,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.STDOUT,
+        )
+    except OSError as exc:
+        logger.warning("failed to start update command: %s", exc, exc_info=True)
+        console.print(f"[red]Failed to start `{command_text}`: {exc}[/]")
+        return False
+
+    output, _ = await process.communicate()
+    if output:
+        console.out(output.decode(errors="replace"), end="")
+
+    if process.returncode == 0:
+        console.print("🎉 Update ran successfully! Please restart Comate.")
+        return True
+
+    console.print(f"[red]Update failed with exit code {process.returncode}. Continuing with current Comate.[/]")
+    return False
+
+
+def _load_package_update_state(
+    package: str,
+    *,
+    settings_path: Path | None,
+) -> dict[str, Any]:
+    data = read_settings_json_object(settings_path or USER_SETTINGS_PATH)
+    updates = data.get(_SETTINGS_SECTION)
+    if not isinstance(updates, dict):
+        return {}
+    state = updates.get(_package_state_key(package))
+    if not isinstance(state, dict):
+        return {}
+    return dict(state)
+
+
+def _write_package_update_state(
+    package: str,
+    values: dict[str, str],
+    *,
+    settings_path: Path | None,
+) -> None:
+    path = settings_path or USER_SETTINGS_PATH
+    data = read_settings_json_object(path)
+    updates = data.get(_SETTINGS_SECTION)
+    if not isinstance(updates, dict):
+        updates = {}
+    state = updates.get(_package_state_key(package))
+    if not isinstance(state, dict):
+        state = {}
+    state.update(values)
+    updates[_package_state_key(package)] = state
+    data[_SETTINGS_SECTION] = updates
+    write_settings_json_atomic(path=path, data=data)
+
+
+def _package_state_key(package: str) -> str:
+    return package.replace("-", "_")
+
+
+def _format_update_command() -> str:
+    return " ".join(UPDATE_COMMAND)

{comate_cli-0.7.1 → comate_cli-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "comate-cli"
-version = "0.7.1"
+version = "0.7.2"
 description = "Comate terminal CLI built on comate-agent-sdk"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -42,6 +42,12 @@ comate = "comate_cli.main:main"
 
 [tool.hatch.build.targets.wheel]
 packages = ["comate_cli"]
+# hatchling>=1.30 默认输出 core metadata 2.5 (PEP 794)，但 PyPI warehouse
+# 暂未接受 metadata 2.5，上传会被拒。先固定到 2.4，等 warehouse 支持后再切回。
+core-metadata-version = "2.4"
+
+[tool.hatch.build.targets.sdist]
+core-metadata-version = "2.4"
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"