comate-cli 0.1.11__tar.gz → 0.2.1__tar.gz

{comate_cli-0.1.11 → comate_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.1.11
+Version: 0.2.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.1.11 → comate_cli-0.2.1}/comate_cli/mcp_cli.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import argparse
 import asyncio
 import sys
-from pathlib import Path
 from typing import Any
 
 from comate_agent_sdk.mcp import (
@@ -15,6 +14,7 @@ from comate_agent_sdk.mcp import (
     write_mcp_servers_to_path,
 )
 from comate_agent_sdk.mcp.types import McpServerConfig
+from comate_agent_sdk.utils.paths import PathInput
 
 
 class McpCliError(ValueError):
@@ -23,8 +23,13 @@ class McpCliError(ValueError):
         self.exit_code = int(exit_code)
 
 
+class _McpArgumentParser(argparse.ArgumentParser):
+    def error(self, message: str) -> None:
+        raise McpCliError(message)
+
+
 def _build_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser(
+    parser = _McpArgumentParser(
         prog="comate mcp",
         description="Configure and manage MCP servers",
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -143,11 +148,11 @@ def _parse_env_entries(entries: list[str]) -> dict[str, str]:
     return env
 
 
-def _clean_remainder_args(raw_args: list[str]) -> list[str]:
-    args = list(raw_args)
-    if args and args[0] == "--":
-        return args[1:]
-    return args
+def _split_trailing_command_args(argv: list[str]) -> tuple[list[str], list[str]]:
+    if "--" not in argv:
+        return list(argv), []
+    separator_index = argv.index("--")
+    return list(argv[:separator_index]), list(argv[separator_index + 1 :])
 
 
 def _build_add_server_config(args: argparse.Namespace) -> McpServerConfig:
@@ -155,9 +160,7 @@ def _build_add_server_config(args: argparse.Namespace) -> McpServerConfig:
     header_entries = [str(item) for item in list(args.header or [])]
     env_entries = [str(item) for item in list(args.env or [])]
     command_or_url = str(args.command_or_url or "").strip()
-    remainder = _clean_remainder_args(
-        [str(item) for item in list(getattr(args, "extra_args", []) or [])]
-    )
+    remainder = [str(item) for item in list(getattr(args, "extra_args", []) or [])]
 
     if transport == "http":
         if env_entries:
@@ -177,6 +180,9 @@ def _build_add_server_config(args: argparse.Namespace) -> McpServerConfig:
 
     if header_entries:
         raise McpCliError("--header is only supported for http transport")
+    stdio_args = list(remainder)
+    if not command_or_url and stdio_args:
+        command_or_url = stdio_args.pop(0)
     if not command_or_url:
         raise McpCliError("stdio transport requires command after <name>")
 
@@ -184,14 +190,14 @@ def _build_add_server_config(args: argparse.Namespace) -> McpServerConfig:
     cfg = {
         "command": command_or_url,
     }
-    if remainder:
-        cfg["args"] = remainder
+    if stdio_args:
+        cfg["args"] = stdio_args
     if env:
         cfg["env"] = env
     return cfg  # type: ignore[return-value]
 
 
-def _load_servers_by_scope(*, scope: str, project_root: Path | None) -> dict[str, McpServerConfig]:
+def _load_servers_by_scope(*, scope: str, project_root: PathInput | None) -> dict[str, McpServerConfig]:
     if scope == "effective":
         return load_effective_servers(project_root=project_root)
     return load_scope_servers(scope=scope, project_root=project_root)  # type: ignore[arg-type]
@@ -200,7 +206,7 @@ def _load_servers_by_scope(*, scope: str, project_root: Path | None) -> dict[str
 def _read_effective_server_with_source(
     *,
     name: str,
-    project_root: Path | None,
+    project_root: PathInput | None,
 ) -> tuple[McpServerConfig, str] | None:
     user_servers = load_scope_servers(scope="user", project_root=project_root)
     project_servers = load_scope_servers(scope="project", project_root=project_root)
@@ -230,7 +236,7 @@ def _format_server_endpoint(cfg: McpServerConfig) -> str:
     return " ".join([command, *str_args]).strip()
 
 
-def _cmd_add(args: argparse.Namespace, *, project_root: Path | None) -> None:
+def _cmd_add(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
     scope = str(args.scope)
     name = str(args.name).strip()
     if not name:
@@ -250,7 +256,7 @@ def _cmd_add(args: argparse.Namespace, *, project_root: Path | None) -> None:
     )
 
 
-def _cmd_remove(args: argparse.Namespace, *, project_root: Path | None) -> None:
+def _cmd_remove(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
     scope = str(args.scope)
     name = str(args.name).strip()
     if not name:
@@ -271,7 +277,7 @@ def _cmd_remove(args: argparse.Namespace, *, project_root: Path | None) -> None:
     )
 
 
-def _cmd_list(args: argparse.Namespace, *, project_root: Path | None) -> None:
+def _cmd_list(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
     scope = str(args.scope)
     servers = _load_servers_by_scope(scope=scope, project_root=project_root)
     if not servers:
@@ -295,7 +301,7 @@ def _cmd_list(args: argparse.Namespace, *, project_root: Path | None) -> None:
         sys.stdout.write(f"{alias}: {endpoint} ({server_type}) - {status}\n")
 
 
-def _cmd_get(args: argparse.Namespace, *, project_root: Path | None) -> None:
+def _cmd_get(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
     name = str(args.name).strip()
     scope = str(args.scope)
     if not name:
@@ -363,18 +369,19 @@ def _cmd_get(args: argparse.Namespace, *, project_root: Path | None) -> None:
     sys.stdout.write("\n".join(lines) + "\n")
 
 
-def run_mcp_command(argv: list[str], *, project_root: Path | None = None) -> None:
+def run_mcp_command(argv: list[str], *, project_root: PathInput | None = None) -> None:
     parser = _build_parser()
-    parsed, extra_args = parser.parse_known_args(argv)
+    parser_argv, trailing_args = _split_trailing_command_args(argv)
+    parsed = parser.parse_args(parser_argv)
     command = str(getattr(parsed, "command", "") or "").strip()
     if not command:
         parser.print_help(sys.stdout)
         return
-    if command != "add" and extra_args:
-        joined = " ".join(extra_args)
+    if command != "add" and trailing_args:
+        joined = " ".join(["--", *trailing_args])
         raise McpCliError(f"Unrecognized arguments: {joined}")
     if command == "add":
-        setattr(parsed, "extra_args", list(extra_args))
+        setattr(parsed, "extra_args", list(trailing_args))
 
     handlers = {
         "add": _cmd_add,

{comate_cli-0.1.11 → comate_cli-0.2.1}/comate_cli/terminal_agent/animations.py

@@ -11,26 +11,27 @@ from rich.text import Text
 from comate_agent_sdk.agent.events import StopEvent, TextEvent, ToolCallEvent, ToolResultEvent, UserQuestionEvent
 
 DEFAULT_STATUS_PHRASES: tuple[str, ...] = (
-    "Vibing...",
-    "Thinking...",
-    "Reasoning...",
-    "Planning next move...",
-    "Reading context...",
-    "Connecting dots...",
-    "Synthesizing signal...",
-    "Spotting edge cases...",
-    "Checking assumptions...",
-    "Tracing dependencies...",
-    "Drafting response...",
-    "Polishing details...",
-    "Validating flow...",
-    "Cross-checking facts...",
-    "Refining intent...",
-    "Mapping tools...",
-    "Building confidence...",
-    "Stitching answer...",
-    "Finalizing output...",
-    "Almost there...",
+    "Embellishing…",
+    "Vibing…",
+    "Thinking…",
+    "Reasoning…",
+    "Planning next move…",
+    "Reading context…",
+    "Connecting dots…",
+    "Synthesizing signal…",
+    "Spotting edge cases…",
+    "Checking assumptions…",
+    "Tracing dependencies…",
+    "Drafting response…",
+    "Polishing details…",
+    "Validating flow…",
+    "Cross-checking facts…",
+    "Refining intent…",
+    "Mapping tools…",
+    "Building confidence…",
+    "Stitching answer…",
+    "Finalizing output…",
+    "Almost there…",
 )
 
 BREATH_DOT_COLORS: tuple[str, ...] = (

{comate_cli-0.1.11 → comate_cli-0.2.1}/comate_cli/terminal_agent/app.py

@@ -69,8 +69,8 @@ async def _check_update() -> str | None:
         return None
 
     if _is_chinese_locale():
-        url = f"https://mirrors.cloud.tencent.com/pypi/pypi/{package}/json"
-        source_label = "tencent"
+        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"
@@ -90,9 +90,9 @@ async def _check_update() -> str | None:
         from packaging.version import Version
         if Version(latest) > Version(current):
             return (
-                f"[dim]💡 New version available: [bold cyan]{latest}[/] "
+                f"[dim] New version available: [bold cyan]{latest}[/] "
                 f"(current: {current})  "
-                f"Run [bold]uv tool upgrade {package}[/] to upgrade.[/]"
+                f"Run [bold green]uv tool upgrade {package}[/] to upgrade.[/]"
             )
     except Exception:
         pass
@@ -230,16 +230,20 @@ def _format_resume_hint(session_id: str | None) -> str | None:
 
 async def _preload_mcp_in_tui(session: ChatSession) -> None:
     """在 TUI 内异步加载 MCP，初始化阶段不输出 scrollback 文案。"""
-    if not bool(session._agent.options.mcp_enabled):
+    runtime = session.runtime
+    if not bool(runtime.options.mcp_enabled):
         return
 
     try:
-        await session._agent.ensure_mcp_tools_loaded()
+        preload_task = runtime.start_mcp_preload()
+        if preload_task is None:
+            return
+        await preload_task
     except Exception as e:
         logger.warning(f"MCP init failed: {e}", exc_info=True)
         return
 
-    mgr = session._agent._mcp_manager
+    mgr = runtime._mcp_manager
     if mgr is None:
         return
 
@@ -311,7 +315,7 @@ async def run(
 
     # 配置 TUI logging handler（将 SDK 日志输出到 TUI）
     from comate_cli.terminal_agent.logging_adapter import setup_tui_logging
-    setup_tui_logging(renderer)
+    logging_session = setup_tui_logging(renderer)
 
     tui = TerminalAgentTUI(session, status_bar, renderer)
     tui.add_resume_history(mode)
@@ -333,6 +337,7 @@ async def run(
                 exc_info=True,
             )
     finally:
+        logging_session.close()
         if active_session is session:
             await _graceful_shutdown(active_session)
         else:

{comate_cli-0.1.11 → comate_cli-0.2.1}/comate_cli/terminal_agent/custom_slash_commands.py

@@ -10,6 +10,8 @@ from typing import Literal
 
 import yaml
 
+from comate_agent_sdk.utils.paths import PathInput, normalize_path_input
+
 logger = logging.getLogger(__name__)
 
 DEFAULT_ITEM_MAX_BYTES = 32 * 1024
@@ -55,12 +57,15 @@ class CustomSlashLoadResult:
 
 def discover_custom_slash_commands(
     *,
-    project_root: Path,
+    project_root: PathInput,
     builtin_names: set[str],
-    user_root: Path | None = None,
+    user_root: PathInput | None = None,
 ) -> CustomSlashLoadResult:
-    resolved_project_root = project_root.expanduser().resolve()
-    resolved_user_root = (user_root or Path.home()).expanduser().resolve()
+    resolved_project_root = normalize_path_input(project_root, field_name="project_root")
+    resolved_user_root = normalize_path_input(
+        user_root if user_root is not None else Path.home(),
+        field_name="user_root",
+    )
 
     project_dir = resolved_project_root / ".agent" / "commands"
     user_dir = resolved_user_root / ".agent" / "commands"
@@ -188,11 +193,12 @@ async def render_custom_slash_prompt(
     *,
     command: CustomSlashCommand,
     raw_args: str,
-    project_root: Path,
+    project_root: PathInput,
     item_max_bytes: int = DEFAULT_ITEM_MAX_BYTES,
     total_max_bytes: int = DEFAULT_TOTAL_MAX_BYTES,
     bash_timeout_seconds: float = DEFAULT_BASH_TIMEOUT_SECONDS,
 ) -> str:
+    resolved_project_root = normalize_path_input(project_root, field_name="project_root")
     normalized_args = raw_args.strip()
     try:
         arg_tokens = shlex.split(normalized_args) if normalized_args else []
@@ -213,7 +219,7 @@ async def render_custom_slash_prompt(
     after_bash = await _replace_bash_markers(
         text=replaced_text,
         marker_map=marker_map,
-        project_root=project_root,
+        project_root=resolved_project_root,
         item_max_bytes=item_max_bytes,
         total_max_bytes=total_max_bytes,
         total_inserted_bytes=total_inserted_bytes,
@@ -224,7 +230,7 @@ async def render_custom_slash_prompt(
     after_file_ref = _replace_file_reference_markers(
         text=after_bash,
         marker_map=marker_map,
-        project_root=project_root,
+        project_root=resolved_project_root,
         item_max_bytes=item_max_bytes,
         total_max_bytes=total_max_bytes,
         total_inserted_bytes=total_inserted_bytes,