comate-cli 0.1.0__tar.gz → 0.1.3__tar.gz

{comate_cli-0.1.0 → comate_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.1.0
+Version: 0.1.3
 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
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
-Requires-Dist: comate-agent-sdk<1.0.0,>=0.0.1
+Requires-Dist: comate-agent-sdk<1.0.0,>=0.0.2
 Requires-Dist: prompt-toolkit>=3.0
 Requires-Dist: rich>=14.0
 Description-Content-Type: text/markdown

{comate_cli-0.1.0 → comate_cli-0.1.3}/comate_cli/main.py

@@ -12,6 +12,10 @@ import threading
 logger = logging.getLogger(__name__)
 
 
+class _ArgumentError(ValueError):
+    """Raised when CLI arguments are invalid."""
+
+
 class _TerminalStateGuard:
     """Best-effort tty restore guard for abnormal shutdown paths."""
 
@@ -88,18 +92,43 @@ class _ShutdownNoiseGuard:
         self._orig_unraisablehook(unraisable)
 
 
-def _parse_args(argv: list[str]) -> tuple[bool, str | None]:
+def _usage_text() -> str:
+    return (
+        "Usage:\n"
+        "  comate [--rpc-stdio]\n"
+        "  comate resume [<session_id>] [--rpc-stdio]"
+    )
+
+
+def _parse_args(argv: list[str]) -> tuple[bool, str | None, bool]:
     rpc_stdio = False
-    session_id: str | None = None
+    positionals: list[str] = []
     for arg in argv:
         if arg == "--rpc-stdio":
             rpc_stdio = True
             continue
         if arg.startswith("-"):
-            continue
-        if session_id is None:
-            session_id = arg
-    return rpc_stdio, session_id
+            raise _ArgumentError(f"Unknown option: {arg}")
+        positionals.append(arg)
+
+    if not positionals:
+        return rpc_stdio, None, False
+
+    command = positionals[0]
+    if command != "resume":
+        raise _ArgumentError(f"Unknown command: {command}")
+
+    if len(positionals) == 1:
+        if rpc_stdio:
+            raise _ArgumentError(
+                "resume without <session_id> does not support --rpc-stdio"
+            )
+        return rpc_stdio, None, True
+
+    if len(positionals) == 2:
+        return rpc_stdio, positionals[1], False
+
+    raise _ArgumentError("resume accepts at most one <session_id>")
 
 
 def main(argv: list[str] | None = None) -> None:
@@ -114,9 +143,20 @@ def main(argv: list[str] | None = None) -> None:
 
     from comate_cli.terminal_agent.app import run
 
-    rpc_stdio, session_id = _parse_args(run_argv)
     try:
-        asyncio.run(run(rpc_stdio=rpc_stdio, session_id=session_id))
+        rpc_stdio, resume_session_id, resume_select = _parse_args(run_argv)
+    except _ArgumentError as exc:
+        sys.stderr.write(f"{exc}\n{_usage_text()}\n")
+        raise SystemExit(2) from exc
+
+    try:
+        asyncio.run(
+            run(
+                rpc_stdio=rpc_stdio,
+                resume_session_id=resume_session_id,
+                resume_select=resume_select,
+            )
+        )
     except KeyboardInterrupt:
         noise_guard.begin_shutdown()
     finally:

{comate_cli-0.1.0 → comate_cli-0.1.3}/comate_cli/terminal_agent/app.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 import asyncio
+import importlib.metadata
+import locale
 import logging
 import os
 import signal
-import sys
 import threading
 import time
 from collections.abc import Iterator
@@ -20,6 +21,8 @@ from comate_agent_sdk.tools import tool
 
 from comate_cli.terminal_agent.event_renderer import EventRenderer
 from comate_cli.terminal_agent.logo import print_logo
+from comate_cli.terminal_agent.preflight import run_preflight_if_needed
+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
@@ -28,6 +31,72 @@ console = Console()
 logger = logging.getLogger(__name__)
 
 
+def _resolve_cli_project_root() -> Path:
+    """Resolve project root: always the current working directory."""
+    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() -> str | None:
+    """异步检查 comate-cli 是否有新版本，返回提示字符串或 None。
+
+    中文 locale 自动使用清华镜像源，其余使用官方 PyPI。
+    """
+    package = "comate-cli"
+    try:
+        current = importlib.metadata.version(package)
+    except importlib.metadata.PackageNotFoundError:
+        return None
+
+    if _is_chinese_locale():
+        url = f"https://pypi.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:
+        logger.debug(f"update check failed (source={source_label})", exc_info=True)
+        return None
+
+    try:
+        from importlib.metadata import version as _v
+        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]uv tool upgrade {package}[/] to upgrade.[/]"
+            )
+    except Exception:
+        pass
+    return None
+
+
 def _flush_langfuse_if_configured() -> None:
     """Flush Langfuse pending events synchronously to prevent atexit thread-join errors on Ctrl+C."""
     try:
@@ -108,9 +177,10 @@ async def add(a: int, b: int) -> int:
     return a + b
 
 
-def _build_agent() -> Agent:
+def _build_agent(*, project_root: Path | None = None) -> Agent:
     context7_api_key = os.getenv("CONTEXT7_API_KEY")
     exa_api_key = os.getenv("EXA_API_KEY")
+    resolved_project_root = project_root or _resolve_cli_project_root()
 
     exa_tools = (
         "web_search_exa,"
@@ -127,6 +197,7 @@ def _build_agent() -> Agent:
     return Agent(
         config=AgentConfig(
             role="software_engineering",
+            project_root=resolved_project_root,
             env_options=EnvOptions(system_env=True, git_env=True),
             use_streaming_task=True,  # 启用流式 Task（实时显示嵌套工具调用）
             mcp_servers={
@@ -150,10 +221,12 @@ def _build_agent() -> Agent:
     )
 
 
-def _resolve_session(agent: Agent, session_id: str | None) -> tuple[ChatSession, str]:
-    if session_id:
-        return ChatSession.resume(agent, session_id=session_id), "resume"
-    return ChatSession(agent), "new"
+def _resolve_session(
+    agent: Agent, resume_session_id: str | None, *, cwd: Path | None = None
+) -> tuple[ChatSession, str]:
+    if resume_session_id:
+        return ChatSession.resume(agent, session_id=resume_session_id, cwd=cwd), "resume"
+    return ChatSession(agent, cwd=cwd), "new"
 
 
 def _format_exit_usage_line(usage: object) -> str:
@@ -175,6 +248,15 @@ def _format_exit_usage_line(usage: object) -> str:
     )
 
 
+def _format_resume_hint(session_id: str | None) -> str | None:
+    if not session_id:
+        return None
+    return (
+        f"[dim]To continue this session, run [bold cyan]comate resume "
+        f"{session_id}[/][/]"
+    )
+
+
 async def _preload_mcp_in_tui(session: ChatSession, renderer: EventRenderer) -> None:
     """在 TUI 内部异步加载 MCP，通过 renderer 输出状态消息."""
     if not session._agent.options.mcp_servers:
@@ -196,11 +278,29 @@ async def _preload_mcp_in_tui(session: ChatSession, renderer: EventRenderer) ->
         renderer.append_system_message(f"MCP loaded: {', '.join(aliases)} ({count} tools)")
 
 
-async def run(*, rpc_stdio: bool = False, session_id: str | None = None) -> None:
-    agent = _build_agent()
-    session, mode = _resolve_session(agent, session_id)
+async def run(
+    *,
+    rpc_stdio: bool = False,
+    resume_session_id: str | None = None,
+    resume_select: bool = False,
+) -> None:
+    project_root = _resolve_cli_project_root()
+    preflight_result = await run_preflight_if_needed(
+        console=console,
+        project_root=project_root,
+        interactive=not rpc_stdio,
+    )
+    if preflight_result.should_abort_launch:
+        return
+
+    agent = _build_agent(project_root=project_root)
+
+    if rpc_stdio and resume_select and not resume_session_id:
+        console.print("[red]`comate resume` does not support `--rpc-stdio` without <session_id>[/]")
+        return
 
     if rpc_stdio:
+        session, _mode = _resolve_session(agent, resume_session_id, cwd=project_root)
         bridge = StdioRPCBridge(session)
         try:
             await bridge.run()
@@ -209,6 +309,23 @@ async def run(*, rpc_stdio: bool = False, session_id: str | None = None) -> None
         return
 
     print_logo(console)
+
+    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:
+            return
+        resume_session_id = selected_session_id
+
+    session, mode = _resolve_session(agent, resume_session_id, cwd=project_root)
+
+    # 版本检查：带超时，不阻塞启动
+    try:
+        update_hint = await asyncio.wait_for(_check_update(), timeout=2.0)
+        if update_hint:
+            console.print(update_hint)
+    except (asyncio.TimeoutError, Exception):
+        pass
+
     # 不再阻塞等待 MCP，改为 TUI 内部异步加载
     status_bar = StatusBar(session)
     status_bar.set_mode(session.get_mode())
@@ -250,12 +367,11 @@ async def run(*, rpc_stdio: bool = False, session_id: str | None = None) -> None
     if usage_line:
         console.print(f"[dim]{usage_line}[/]")
 
-    console.print(
-        f"[dim]To continue this session, run [bold cyan]comate resume "
-        f"{active_session.session_id}[/][/]"
-    )
+    initialized_session_id = tui.initialized_session_id
+    resume_hint = _format_resume_hint(initialized_session_id)
+    if resume_hint is not None:
+        console.print(resume_hint)
 
 
 if __name__ == "__main__":
-    argv_session_id = sys.argv[1] if len(sys.argv) > 1 else None
-    asyncio.run(run(session_id=argv_session_id))
+    asyncio.run(run())