comate-cli 0.8.6__tar.gz → 0.9.0__tar.gz

{comate_cli-0.8.6 → comate_cli-0.9.0}/.gitignore

@@ -18,6 +18,7 @@ claude_code_codebase/
 build/
 develop-eggs/
 dist/
+packages/comate_cli/dist-*/
 downloads/
 eggs/
 .eggs/

comate_cli-0.9.0/CHANGELOG.md

@@ -0,0 +1,137 @@
+# Changelog
+
+## Unreleased
+
+### Fixed
+
+- Windows 上 Ctrl+C 退出时 `ERROR:mcp.client.stdio:Failed to parse JSONRPC message from server`
+  和 traceback 漏到终端的问题。修复包含两部分：`app.py` finally 顺序调整，
+  以及 SDK stdio MCP 关闭路径切换到主动信号升级链。
+- Windows 上 Ctrl+C 退出时 `Exception ignored in: <BaseSubprocessTransport.__del__>`
+  和 `ValueError: I/O operation on closed pipe` 漏到终端的问题。现在由
+  `_ShutdownNoiseGuard` catch-all 接管 `sys.unraisablehook` 并写入 agent log。
+
+### Added
+
+- 新增 `/clear` slash command：清空当前 leader session 的 conversation，
+  保留 session_id、team membership、inbox 与 TaskStore。成功后会清屏、
+  重打 logo、重置 TUI transcript view，并刷新 status bar；busy 或
+  compacting 状态会拒绝执行。
+- `_ShutdownNoiseGuard` 扩展为四合一接管器：SIGINT、`sys.unraisablehook`、
+  `sys.excepthook`、`warnings.showwarning`。捕获到的噪音统一路由到独立的
+  `comate.noise` logger（`propagate=False`），写入 `~/.comate/logs/agent.log`。
+- 新增 `COMATE_DEBUG_NOISE=1` 环境变量逃生口，开发排障时可关闭噪音接管器，
+  查看旧版本的原始 stderr 输出。
+
+### Changed
+
+- TUI 分支退出时先执行 `_graceful_shutdown(...)`，再关闭 `logging_session`，
+  让现有 logging 屏蔽机制覆盖 MCP teardown 全程。
+
+## 0.9.0 - 2026-07-02
+
+### Added
+
+- 新增 `DistributionProfile` 白标扩展面，调用方可注入产品名、命令名、包名、
+  system role、provider presets、logo renderer、更新源与安装参数。
+- CLI 入口、preflight、logo、更新检查、resume hint、MCP 子命令帮助文案等运行时路径
+  支持通过发行版 profile 接管用户可见身份。
+
+### Changed
+
+- `UpdateTarget` 改为由 `fetch_latest` 回调和 `install_args` 描述更新源。
+  直接构造 `UpdateTarget` 的下游需要从旧字段迁移到新契约；这是对该内部扩展面的
+  破坏性变更。
+- 更新命令现在会透传 profile 提供的安装参数，支持发行版自定义安装源。
+
+### Removed
+
+- 公开仓库中的发行版专用示例、测试夹具和历史文档已中性化或移出仓库；构建产物目录
+  `packages/comate_cli/dist-*/` 已加入忽略规则。
+
+## 0.8.6 - 2026-06-24
+
+### `/loop` 定时循环能力升级
+
+本周期对 `/loop` 做了一次提示词驱动的重构，修复了一个影响中文用户的核心 bug，
+并收紧了调度规则。
+
+#### Fixed
+
+- **中文「每隔N分钟」不再静默回退为 10 分钟**：之前 `/loop 每隔1分钟 检查构建状态`
+  这类中文自然语言措辞，会因为未命中代码里的英文正则而静默回退为默认 10 分钟，
+  调度完全不符合预期。现在间隔解析从"代码硬正则"改为提示词驱动，把规则和原始输入
+  交给模型按用户意图（任意语言）自行解析。中文「每隔1分钟」「每两小时」、英文
+  "every couple of hours" 都能被正确识别。
+- **`/loop` 运行数次后神秘停止**：根因是 TUI 状态栏刷新抛异常时会"杀死" event pump，
+  进而关闭 scheduled prompt scheduler。现在状态栏刷新失败被隔离为局部防护（带日志），
+  不再波及 event pump 与 `/loop` 调度消费。
+
+#### Changed
+
+- **间隔→cron 转换规则收紧**：为避免 cron 在边界重置导致节奏不均匀，规则现在只允许
+  能整除单位的间隔，其他值会自动向上取整并明确告知取整结果：
+  - 分钟（能整除 60）：1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30（如 `7m → 10m`）
+  - 小时（能整除 24）：1, 2, 3, 4, 6, 8, 12（如 `5h → 6h`；13~24h → `1d`）
+  - 天：仅 `1d`（禁止多天，`Nd, N>1` 会在月末重置，无法表达"每 N 天"）
+  - 显式禁止 `7m`、`5h`、`2d` 等会让节奏"漂移"的写法。
+- **CronCreate 使用规则精简**：删除四条容易让模型误判触发窗口/续跑语义的规则段落，
+  追加 recurring 与 one-shot 的可复用 cron 示例模板，减少模型凭空构造错误 cron。
+
+### Added
+
+- **空闲 Recap（会话摘要回顾）**：回到终端时自动生成"离开期间发生了什么"摘要并渲染到
+  scrollback，带 label 标签与禁用提示，方便恢复上下文。
+- **`/learn` slash 命令**：引导把刚解决的问题沉淀为可复用知识。
+- **`/implement-plan` slash 命令**：一键进入计划执行模式。
+- **内置 default custom commands 加载链**：开箱即用一组默认 custom slash 命令。
+- **工具调用流式进度**：Loading 行实时展示工具参数解析进度（token 估算），告别"干等"。
+- **LLM 重试动态面板**：主 agent LLM 重试状态可视化，底部面板动态展示重试进度，SDK
+  原始重试噪声收敛到统一面板。
+- **`Ctrl+J` 手动换行**：多行输入时显式插入换行。
+- **`@path` 提示行统一**：抽出为单一事实源并在 staging 界面同步显示。
+- **Logo 支持 2x 放大**；统一圆点 marker 为呼吸点动画；tool signature 路径自动相对化。
+
+### Changed（体验优化）
+
+- 退出汇总输出精简、token 字段标签重命名。
+- 时长显示数字与单位间加空格（如 `12 s`）。
+- scrollback diff 展示优化。
+- 错误 tool result 截断/展开提示保持 dim 样式。
+
+### Fixed（稳定性）
+
+- **Windows 状态栏 git 命令卡住 TUI 事件泵**。
+- **provider 异常击穿 prompt_toolkit 防护**：LLM provider 抛出未处理异常时不再击穿到 TUI 层。
+- **LLM stream 清理的无界等待**。
+- **启动更新检查改为真正异步 HTTP**：不再占用默认线程池导致退出卡死；移除 24h 限频机制。
+- **memory prefetch 退出噪声**兜底屏蔽。
+
+### Fixed（渲染与配置）
+
+- scrollback diff 背景未铺满内容行、diff 背景在 tab 行上的宽度计算错误。
+- 代码块末行背景填充保留，避免渲染断裂。
+- Bash scrollback 命令摘要单行化，避免多行折叠错乱。
+- marketplace 详情页更新反馈不正确。
+- 移除 CLI 的上下文压缩阈值配置（改由 SDK 安全窗口自动管理）。
+
+## 0.7.0a1 - 2026-05-19 (alpha)
+
+> 这是一个 **alpha 预发布版本**，用于内部 / 早期测试。
+> `pip install comate-cli` 默认不会安装到本版本，需要显式 `pip install comate-cli==0.7.0a1` 或 `pip install --pre comate-cli`。
+
+### Breaking Changes
+
+- 依赖 `comate-agent-sdk>=0.8.0a1`，与旧 SDK 不兼容。
+- 旧版本生成的 resume jsonl / context 快照不保证可以正常回放，**建议从空 session 重新开始**。
+
+### 累积变更
+
+自 0.6.x 起累积大量 TUI 与会话能力改进，涵盖：
+
+- Resume picker 重做：搜索、跨 cwd 切换、预览模式、视觉抛光
+- Auto compact 期间显式提示 `Compacting context`
+- Team / subagent 事件透出与渲染统一
+- 与 SDK 0.8.0a2 配套的 tool envelope / token 账本展示
+
+详细变更请参考 git log。

{comate_cli-0.8.6 → comate_cli-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.8.6
+Version: 0.9.0
 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.9.0/comate_cli/distribution.py

@@ -0,0 +1,83 @@
+"""Distribution profile contract for whitelabel CLI packages.
+
+Private overlay packages can construct a DistributionProfile and pass it to
+comate_cli.main.main(profile=...) to customize branding, presets, update
+sources, logo rendering, and the system role. This module is the only public
+contract for that extension surface.
+
+Design:
+docs/superpowers/specs/2026-07-02-cli-distribution-whitelabel-design.md
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+from typing import TYPE_CHECKING, Awaitable, Callable, Protocol
+
+if TYPE_CHECKING:
+    from comate_agent_sdk.facade.config.provider_presets import ProviderPreset
+    from rich.console import Console
+
+REQUIRED_PROVIDER_LEVELS: tuple[str, ...] = ("LOW", "MID", "HIGH")
+
+
+@dataclass(frozen=True, slots=True)
+class LatestRelease:
+    """Result returned by an update source."""
+
+    version: str
+    release_notes_url: str | None = None
+
+
+LatestVersionFetcher = Callable[[], Awaitable["LatestRelease | None"]]
+
+
+@dataclass(frozen=True, slots=True)
+class UpdateSource:
+    fetch_latest: LatestVersionFetcher
+    install_args: tuple[str, ...] = ()
+    release_notes_url: str | None = None
+
+    def __post_init__(self) -> None:
+        if not callable(self.fetch_latest):
+            raise ValueError("UpdateSource.fetch_latest must be callable")
+        object.__setattr__(self, "install_args", tuple(self.install_args))
+
+
+class LogoRenderer(Protocol):
+    def __call__(self, console: "Console", *, project_root: Path | None = None) -> None: ...
+
+
+@dataclass(frozen=True, slots=True)
+class DistributionProfile:
+    product_name: str = "Comate"
+    command_name: str = "comate"
+    package_name: str = "comate-cli"
+    provider_presets: tuple["ProviderPreset", ...] | None = None
+    update: UpdateSource | None = None
+    render_logo: LogoRenderer | None = None
+    system_role: str | None = None
+
+    def __post_init__(self) -> None:
+        for field_name in ("product_name", "command_name", "package_name"):
+            if not str(getattr(self, field_name)).strip():
+                raise ValueError(f"DistributionProfile.{field_name} must be non-empty")
+
+        if self.provider_presets is None:
+            return
+
+        object.__setattr__(self, "provider_presets", tuple(self.provider_presets))
+
+        if not self.provider_presets:
+            raise ValueError("DistributionProfile.provider_presets must be non-empty when provided")
+
+        for preset in self.provider_presets:
+            missing = [level for level in REQUIRED_PROVIDER_LEVELS if level not in preset.models]
+            if missing:
+                raise ValueError(
+                    f"provider preset {preset.preset_id!r} missing levels: {', '.join(missing)}"
+                )
+
+
+DEFAULT_PROFILE = DistributionProfile()

{comate_cli-0.8.6 → comate_cli-0.9.0}/comate_cli/main.py

@@ -5,6 +5,7 @@ import asyncio
 import logging
 import os
 import signal
+from pathlib import Path
 import subprocess
 import sys
 import time
@@ -32,7 +33,7 @@ PRINT_OUTPUT_FORMAT_JSON = "json"
 PRINT_OUTPUT_FORMATS = frozenset({PRINT_OUTPUT_FORMAT_TEXT, PRINT_OUTPUT_FORMAT_JSON})
 PRINT_OUTPUT_FORMAT_UNSUPPORTED = frozenset({"stream-json"})
 
-ParsedArgs = tuple[bool, str | None, bool, str | None, str]
+ParsedArgs = tuple[bool, str | None, bool, str | None, str, tuple[str, ...]]
 
 
 class _TerminalStateGuard:
@@ -205,13 +206,17 @@ class _ShutdownNoiseGuard:
         return log
 
 
-def _usage_text() -> str:
+def _usage_text(command_name: str = "comate") -> str:
     return (
         "Usage:\n"
-        "  comate [--rpc-stdio]\n"
-        "  comate -p [--output-format text|json] <prompt>\n"
-        "  comate resume [<session_id>] [--rpc-stdio]\n"
-        "  comate mcp <subcommand> [options]"
+        f"  {command_name} [--rpc-stdio] [--add-dir <path>]...\n"
+        f"  {command_name} -p [--output-format text|json] <prompt>\n"
+        f"  {command_name} resume [<session_id>] [--rpc-stdio]\n"
+        f"  {command_name} mcp <subcommand> [options]\n"
+        "\n"
+        "Options:\n"
+        "  --add-dir <path>   Grant tool read/write access to an extra directory\n"
+        "                     (repeatable). Applies to subagents too."
     )
 
 
@@ -221,6 +226,7 @@ def _parse_args(argv: list[str]) -> ParsedArgs:
     output_format = PRINT_OUTPUT_FORMAT_TEXT
     output_format_explicit = False
     positionals: list[str] = []
+    add_dirs: list[str] = []
 
     index = 0
     while index < len(argv):
@@ -253,6 +259,19 @@ def _parse_args(argv: list[str]) -> ParsedArgs:
             output_format = value
             index += 1
             continue
+        if arg == "--add-dir" or arg.startswith("--add-dir="):
+            if arg == "--add-dir":
+                index += 1
+                if index >= len(argv):
+                    raise _ArgumentError("--add-dir requires a path")
+                value = argv[index]
+            else:
+                value = arg.partition("=")[2]
+            if not value:
+                raise _ArgumentError("--add-dir requires a path")
+            add_dirs.append(value)
+            index += 1
+            continue
         if arg.startswith("-"):
             raise _ArgumentError(f"Unknown option: {arg}")
         positionals.append(arg)
@@ -266,11 +285,11 @@ def _parse_args(argv: list[str]) -> ParsedArgs:
         if rpc_stdio:
             raise _ArgumentError("-p/--print and --rpc-stdio are mutually exclusive")
         print_prompt = " ".join(positionals) if positionals else ""
-        return rpc_stdio, None, False, print_prompt, output_format
+        return rpc_stdio, None, False, print_prompt, output_format, tuple(add_dirs)
 
     # Non -p mode: original logic
     if not positionals:
-        return rpc_stdio, None, False, None, output_format
+        return rpc_stdio, None, False, None, output_format, tuple(add_dirs)
 
     command = positionals[0]
     if command != "resume":
@@ -281,14 +300,33 @@ def _parse_args(argv: list[str]) -> ParsedArgs:
             raise _ArgumentError(
                 "resume without <session_id> does not support --rpc-stdio"
             )
-        return rpc_stdio, None, True, None, output_format
+        return rpc_stdio, None, True, None, output_format, tuple(add_dirs)
 
     if len(positionals) == 2:
-        return rpc_stdio, positionals[1], False, None, output_format
+        return rpc_stdio, positionals[1], False, None, output_format, tuple(add_dirs)
 
     raise _ArgumentError("resume accepts at most one <session_id>")
 
 
+def _validate_add_dirs(raw_dirs: tuple[str, ...]) -> tuple[Path, ...]:
+    """Resolve and validate --add-dir paths (must exist and be directories).
+
+    Raises _ArgumentError (fail-fast) so a typo'd directory never silently
+    grants nothing: a granted dir is a permission boundary, so we reject
+    rather than skip. Sensitive/over-broad roots are left to the SDK path
+    guard at runtime.
+    """
+    resolved: list[Path] = []
+    for raw in raw_dirs:
+        path = Path(raw).expanduser().resolve()
+        if not path.exists():
+            raise _ArgumentError(f"--add-dir path does not exist: {raw}")
+        if not path.is_dir():
+            raise _ArgumentError(f"--add-dir path is not a directory: {raw}")
+        resolved.append(path)
+    return tuple(resolved)
+
+
 def _read_stdin_posix_idle_drain(
     stdin: object,
     *,
@@ -350,18 +388,22 @@ def _read_stdin_if_ready(
         return str(read()) if callable(read) else ""
 
 
-def main(argv: list[str] | None = None) -> None:
+def main(argv: list[str] | None = None, *, profile=None) -> None:
+    from comate_cli.distribution import DEFAULT_PROFILE
+
+    profile = profile or DEFAULT_PROFILE
+    command_name = profile.command_name
     run_argv = list(argv) if argv is not None else sys.argv[1:]
 
     if run_argv in (["--help"], ["-h"]):
-        sys.stdout.write(f"{_usage_text()}\n")
+        sys.stdout.write(f"{_usage_text(command_name=command_name)}\n")
         return
 
     if run_argv and run_argv[0] == "mcp":
         from comate_cli.mcp_cli import McpCliError, run_mcp_command
 
         try:
-            run_mcp_command(run_argv[1:])
+            run_mcp_command(run_argv[1:], command_name=command_name)
             return
         except McpCliError as exc:
             sys.stderr.write(f"{exc}\n")
@@ -379,11 +421,17 @@ def main(argv: list[str] | None = None) -> None:
     _app_import_done_perf = time.perf_counter()
 
     try:
-        rpc_stdio, resume_session_id, resume_select, print_prompt, print_output_format = (
-            _parse_args(run_argv)
-        )
+        (
+            rpc_stdio,
+            resume_session_id,
+            resume_select,
+            print_prompt,
+            print_output_format,
+            add_dirs_raw,
+        ) = _parse_args(run_argv)
+        add_dirs = _validate_add_dirs(add_dirs_raw)
     except _ArgumentError as exc:
-        sys.stderr.write(f"{exc}\n{_usage_text()}\n")
+        sys.stderr.write(f"{exc}\n{_usage_text(command_name=command_name)}\n")
         raise SystemExit(2) from exc
 
     # Assemble print mode message
@@ -404,9 +452,11 @@ def main(argv: list[str] | None = None) -> None:
                 resume_select=resume_select,
                 print_message=print_message,
                 print_output_format=print_output_format,
+                add_dirs=add_dirs,
                 process_start_perf=_PROCESS_START_PERF,
                 app_import_start_perf=_app_import_start_perf,
                 app_import_done_perf=_app_import_done_perf,
+                profile=profile,
             )
         )
     except KeyboardInterrupt:

{comate_cli-0.8.6 → comate_cli-0.9.0}/comate_cli/mcp_cli.py

@@ -17,6 +17,7 @@ from comate_agent_sdk.mcp import (
     validate_server_config,
     write_mcp_servers_to_path,
 )
+from comate_agent_sdk.mcp.cwd import format_stdio_cwd_resolution, resolve_stdio_cwd
 from comate_agent_sdk.mcp.types import McpServerConfig
 from comate_agent_sdk.utils.paths import PathInput
 
@@ -40,27 +41,27 @@ class _McpArgumentParser(argparse.ArgumentParser):
         raise McpCliError(message)
 
 
-def _build_parser() -> argparse.ArgumentParser:
+def _build_parser(command_name: str = "comate") -> argparse.ArgumentParser:
     parser = _McpArgumentParser(
-        prog="comate mcp",
+        prog=f"{command_name} mcp",
         description="Configure and manage MCP servers",
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog=(
             "Examples:\n"
             "  # Add HTTP server:\n"
-            "  comate mcp add --transport http sentry https://mcp.sentry.dev/mcp\n\n"
+            f"  {command_name} mcp add --transport http sentry https://mcp.sentry.dev/mcp\n\n"
             "  # Add HTTP server with headers:\n"
-            "  comate mcp add --transport http corridor https://app.corridor.dev/api/mcp "
+            f"  {command_name} mcp add --transport http corridor https://app.corridor.dev/api/mcp "
             '--header "Authorization: Bearer ..."\n\n'
             "  # Add stdio server with environment variables:\n"
-            "  comate mcp add -e API_KEY=xxx my-server -- npx my-mcp-server\n\n"
+            f"  {command_name} mcp add -e API_KEY=xxx my-server -- npx my-mcp-server\n\n"
             "  # Add stdio server with subprocess flags:\n"
-            "  comate mcp add my-server -- my-command --some-flag arg1"
+            f"  {command_name} mcp add my-server -- my-command --some-flag arg1"
         ),
     )
     subparsers = parser.add_subparsers(dest="command")
 
-    add_parser = subparsers.add_parser("add", help="Add an MCP server to comate")
+    add_parser = subparsers.add_parser("add", help=f"Add an MCP server to {command_name}")
     add_parser.add_argument(
         "-s",
         "--scope",
@@ -295,7 +296,11 @@ def _split_add_args(argv: list[str]) -> tuple[list[str], list[str]]:
     return ["add", *option_args, *positional_args], extra_args
 
 
-def _build_add_server_config(args: argparse.Namespace) -> McpServerConfig:
+def _build_add_server_config(
+    args: argparse.Namespace,
+    *,
+    command_name: str = "comate",
+) -> McpServerConfig:
     transport = str(args.transport or "stdio").strip().lower()
     header_entries = [str(item) for item in list(args.header or [])]
     env_entries = [str(item) for item in list(args.env or [])]
@@ -308,8 +313,8 @@ def _build_add_server_config(args: argparse.Namespace) -> McpServerConfig:
         or getattr(args, "callback_port", None)
     ):
         raise McpCliError(
-            "OAuth flags are not supported by comate mcp add yet. "
-            "Use headers for token-based HTTP/SSE MCP servers, or add a Comate-native oauth object via .mcp.json."
+            f"OAuth flags are not supported by {command_name} mcp add yet. "
+            "Use headers for token-based HTTP/SSE MCP servers, or add a native oauth object via .mcp.json."
         )
 
     if transport in {"http", "sse"}:
@@ -397,6 +402,21 @@ def _format_server_endpoint(cfg: McpServerConfig) -> str:
     return " ".join([command, *str_args]).strip()
 
 
+def _format_stdio_cwd_line(
+    cfg: McpServerConfig,
+    *,
+    project_root: PathInput | None,
+) -> str | None:
+    server_type = str(cfg.get("type", "stdio")).strip().lower()  # type: ignore[attr-defined]
+    if server_type != "stdio":
+        return None
+    try:
+        resolution = resolve_stdio_cwd(cfg, project_root=project_root, create=False)
+    except ValueError as exc:
+        return f"<invalid cwd: {exc}>"
+    return format_stdio_cwd_resolution(resolution)
+
+
 def _write_server_to_scope(
     *,
     name: str,
@@ -440,13 +460,18 @@ def _find_scopes_containing_server(
     return found
 
 
-def _cmd_add(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
+def _cmd_add(
+    args: argparse.Namespace,
+    *,
+    project_root: PathInput | None,
+    command_name: str = "comate",
+) -> None:
     scope = str(args.scope)
     name = str(args.name).strip()
     if not name:
         raise McpCliError("Server name cannot be empty")
 
-    config = _build_add_server_config(args)
+    config = _build_add_server_config(args, command_name=command_name)
     path, existed = _write_server_to_scope(
         name=name,
         config=config,
@@ -461,11 +486,16 @@ def _cmd_add(args: argparse.Namespace, *, project_root: PathInput | None) -> Non
     )
 
 
-def _cmd_add_json(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
+def _cmd_add_json(
+    args: argparse.Namespace,
+    *,
+    project_root: PathInput | None,
+    command_name: str = "comate",
+) -> None:
     if _has_oauth_flags(args):
         raise McpCliError(
-            "OAuth flags are not supported by comate mcp add-json yet. "
-            "Use headers for token-based HTTP/SSE MCP servers, or add a Comate-native oauth object via .mcp.json."
+            f"OAuth flags are not supported by {command_name} mcp add-json yet. "
+            "Use headers for token-based HTTP/SSE MCP servers, or add a native oauth object via .mcp.json."
         )
 
     scope = str(args.scope)
@@ -496,7 +526,12 @@ def _cmd_add_json(args: argparse.Namespace, *, project_root: PathInput | None) -
     )
 
 
-def _cmd_remove(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
+def _cmd_remove(
+    args: argparse.Namespace,
+    *,
+    project_root: PathInput | None,
+    command_name: str = "comate",
+) -> None:
     name = str(args.name).strip()
     if not name:
         raise McpCliError("Server name cannot be empty")
@@ -509,7 +544,7 @@ def _cmd_remove(args: argparse.Namespace, *, project_root: PathInput | None) ->
         if len(found) > 1:
             scope_list = ", ".join(found)
             suggestions = "; ".join(
-                f"comate mcp remove {name!r} --scope {scope}" for scope in found
+                f"{command_name} mcp remove {name!r} --scope {scope}" for scope in found
             )
             raise McpCliError(
                 f"MCP server '{name}' exists in multiple scopes: {scope_list}. "
@@ -547,7 +582,9 @@ def _cmd_list(args: argparse.Namespace, *, project_root: PathInput | None) -> No
         return
 
     sys.stdout.write("Checking MCP server health...\n\n")
-    health_rows = asyncio.run(collect_mcp_server_health(servers=servers))
+    health_rows = asyncio.run(
+        collect_mcp_server_health(servers=servers, project_root=project_root)
+    )
     health_by_alias = {row.alias: row for row in health_rows}
 
     for alias in sorted(servers.keys()):
@@ -565,9 +602,17 @@ def _cmd_list(args: argparse.Namespace, *, project_root: PathInput | None) -> No
             else f"{CROSS_MARK} Unknown"
         )
         sys.stdout.write(f"{alias}: {endpoint} ({server_type}) - {status}\n")
+        cwd_line = _format_stdio_cwd_line(cfg, project_root=project_root)
+        if cwd_line:
+            sys.stdout.write(f"  cwd: {cwd_line}\n")
 
 
-def _cmd_get(args: argparse.Namespace, *, project_root: PathInput | None) -> None:
+def _cmd_get(
+    args: argparse.Namespace,
+    *,
+    project_root: PathInput | None,
+    command_name: str = "comate",
+) -> None:
     name = str(args.name).strip()
     scope = str(args.scope)
     if not name:
@@ -594,7 +639,9 @@ def _cmd_get(args: argparse.Namespace, *, project_root: PathInput | None) -> Non
         scope_line = _scope_label(scope)
         remove_scope = scope
 
-    health_rows = asyncio.run(collect_mcp_server_health(servers={name: cfg}))
+    health_rows = asyncio.run(
+        collect_mcp_server_health(servers={name: cfg}, project_root=project_root)
+    )
     status = f"{CROSS_MARK} Not connected"
     if health_rows:
         row = health_rows[0]
@@ -624,6 +671,9 @@ def _cmd_get(args: argparse.Namespace, *, project_root: PathInput | None) -> Non
         raw_args = cfg.get("args") or []  # type: ignore[attr-defined]
         if isinstance(raw_args, list) and raw_args:
             lines.append(f"  Args: {' '.join(str(item) for item in raw_args)}")
+        cwd_line = _format_stdio_cwd_line(cfg, project_root=project_root)
+        if cwd_line:
+            lines.append(f"  Cwd: {cwd_line}")
         env = cfg.get("env") or {}  # type: ignore[attr-defined]
         if isinstance(env, dict) and env:
             lines.append("  Env:")
@@ -632,13 +682,18 @@ def _cmd_get(args: argparse.Namespace, *, project_root: PathInput | None) -> Non
 
     lines.append("")
     lines.append(
-        f'To remove this server, run: comate mcp remove "{name}" --scope {remove_scope}'
+        f'To remove this server, run: {command_name} mcp remove "{name}" --scope {remove_scope}'
     )
     sys.stdout.write("\n".join(lines) + "\n")
 
 
-def run_mcp_command(argv: list[str], *, project_root: PathInput | None = None) -> None:
-    parser = _build_parser()
+def run_mcp_command(
+    argv: list[str],
+    *,
+    project_root: PathInput | None = None,
+    command_name: str = "comate",
+) -> None:
+    parser = _build_parser(command_name=command_name)
     if argv and argv[0] == "add":
         parser_argv, extra_args = _split_add_args(argv)
         parsed = parser.parse_args(parser_argv)
@@ -667,6 +722,9 @@ def run_mcp_command(argv: list[str], *, project_root: PathInput | None = None) -
         raise McpCliError(f"Unknown mcp command: {command}")
 
     try:
-        handler(parsed, project_root=project_root)
+        if command in {"add", "add-json", "get", "remove"}:
+            handler(parsed, project_root=project_root, command_name=command_name)
+        else:
+            handler(parsed, project_root=project_root)
     except McpConfigError as exc:
         raise McpCliError(str(exc), exit_code=1) from exc