comate-cli 0.7.0a5__tar.gz → 0.7.0a6__tar.gz

comate_cli-0.7.0a6/CHANGELOG.md

@@ -0,0 +1,46 @@
+# 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
+
+- `_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.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.7.0a5 → comate_cli-0.7.0a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.7.0a5
+Version: 0.7.0a6
 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
@@ -41,3 +41,28 @@ Or install globally:
 uv tool install comate-cli
 comate
 ```
+
+## 排错 / Troubleshooting
+
+### 看不到错误信息但行为异常
+
+comate 在生产模式下会把若干无害但吵闹的 shutdown 噪音写入
+`~/.comate/logs/agent.log`，而不是显示在终端里。这包括 Windows asyncio
+shutdown 的 `ResourceWarning`、MCP 服务器违规向 stdout 写日志导致的 JSONRPC
+解析失败，以及解释器退出阶段的 unraisable 异常。
+
+如果你怀疑隐藏了真实错误，可以按下面顺序排查：
+
+```bash
+# 1. 看 noise 通道的最近 50 条
+grep -E "\[unraisable\]|\[excepthook\]|\[warning\]" ~/.comate/logs/agent.log | tail -50
+
+# 2. 看完整 agent.log 末尾
+tail -200 ~/.comate/logs/agent.log
+
+# 3. 临时关掉噪音接管器,看原始输出(开发场景)
+COMATE_DEBUG_NOISE=1 comate
+```
+
+`COMATE_DEBUG_NOISE=1` 设置后，`_ShutdownNoiseGuard` 会跳过 install，
+错误会像旧版本一样直接打印到 stderr。

comate_cli-0.7.0a6/README.md

@@ -0,0 +1,41 @@
+# comate-cli
+
+Comate terminal CLI package.
+
+## Usage
+
+```bash
+uvx comate-cli
+```
+
+Or install globally:
+
+```bash
+uv tool install comate-cli
+comate
+```
+
+## 排错 / Troubleshooting
+
+### 看不到错误信息但行为异常
+
+comate 在生产模式下会把若干无害但吵闹的 shutdown 噪音写入
+`~/.comate/logs/agent.log`，而不是显示在终端里。这包括 Windows asyncio
+shutdown 的 `ResourceWarning`、MCP 服务器违规向 stdout 写日志导致的 JSONRPC
+解析失败，以及解释器退出阶段的 unraisable 异常。
+
+如果你怀疑隐藏了真实错误，可以按下面顺序排查：
+
+```bash
+# 1. 看 noise 通道的最近 50 条
+grep -E "\[unraisable\]|\[excepthook\]|\[warning\]" ~/.comate/logs/agent.log | tail -50
+
+# 2. 看完整 agent.log 末尾
+tail -200 ~/.comate/logs/agent.log
+
+# 3. 临时关掉噪音接管器,看原始输出(开发场景)
+COMATE_DEBUG_NOISE=1 comate
+```
+
+`COMATE_DEBUG_NOISE=1` 设置后，`_ShutdownNoiseGuard` 会跳过 install，
+错误会像旧版本一样直接打印到 stderr。

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/comate_cli/main.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 import atexit
 import asyncio
 import logging
+import os
 import signal
 import subprocess
 import sys
+import warnings
 try:
     import termios
 except ImportError:
@@ -68,10 +70,21 @@ class _ShutdownNoiseGuard:
 
     def __init__(self) -> None:
         self._shutdown_armed = False
+        self._installed = False
         self._orig_unraisablehook = sys.unraisablehook
+        self._orig_excepthook = sys.excepthook
+        self._orig_showwarning = warnings.showwarning
+        self._noise_logger = self._build_noise_logger()
 
     def install(self) -> None:
+        if self._installed:
+            return
+        if os.environ.get("COMATE_DEBUG_NOISE", "").strip().lower() in ("1", "true", "yes"):
+            return
         sys.unraisablehook = self._unraisablehook
+        sys.excepthook = self._excepthook
+        warnings.showwarning = self._showwarning
+        self._installed = True
 
     def begin_shutdown(self) -> None:
         if self._shutdown_armed:
@@ -88,13 +101,94 @@ class _ShutdownNoiseGuard:
         except Exception as exc:
             logger.debug(f"Failed to switch SIGINT to SIG_IGN during shutdown: {exc}")
 
+    def _route(
+        self,
+        channel: str,
+        *,
+        exc: BaseException | None = None,
+        msg: str = "",
+        **extra: object,
+    ) -> None:
+        try:
+            if exc is not None:
+                self._noise_logger.warning(
+                    "[%s] %s: %s",
+                    channel,
+                    type(exc).__name__,
+                    exc,
+                    exc_info=(type(exc), exc, exc.__traceback__),
+                    extra={"noise_channel": channel, **extra},
+                )
+            else:
+                self._noise_logger.warning(
+                    "[%s] %s",
+                    channel,
+                    msg,
+                    extra={"noise_channel": channel, **extra},
+                )
+        except Exception:
+            pass
+
     def _unraisablehook(self, unraisable: object) -> None:
         exc_value = getattr(unraisable, "exc_value", None)
         if self._shutdown_armed and isinstance(exc_value, KeyboardInterrupt):
-            logger.debug("Suppressed unraisable KeyboardInterrupt during shutdown")
             return
+        obj = getattr(unraisable, "object", None)
+        self._route("unraisable", exc=exc_value, object_repr=repr(obj))
+
+    def _excepthook(
+        self,
+        exc_type: type[BaseException],
+        exc_value: BaseException,
+        exc_tb: object,
+    ) -> None:
+        self._route("excepthook", exc=exc_value)
+
+    def _showwarning(
+        self,
+        message: Warning | str,
+        category: type[Warning],
+        filename: str,
+        lineno: int,
+        file: object | None = None,
+        line: str | None = None,
+    ) -> None:
+        self._route(
+            "warning",
+            msg=str(message),
+            category=category.__name__,
+            warning_filename=str(filename),
+            warning_lineno=lineno,
+        )
+
+    def _build_noise_logger(self) -> logging.Logger:
+        log = logging.getLogger("comate.noise")
+        log.setLevel(logging.WARNING)
+        log.propagate = False
+        if log.handlers:
+            return log
+
+        try:
+            from concurrent_log_handler import ConcurrentRotatingFileHandler
+
+            log_dir = os.path.join(os.path.expanduser("~"), ".comate", "logs")
+            os.makedirs(log_dir, exist_ok=True)
+            handler = ConcurrentRotatingFileHandler(
+                os.path.join(log_dir, "agent.log"),
+                maxBytes=10 * 1024 * 1024,
+                backupCount=3,
+                encoding="utf-8",
+            )
+            handler.setFormatter(
+                logging.Formatter(
+                    "%(asctime)s %(levelname)s %(name)s [%(noise_channel)s]: %(message)s"
+                )
+            )
+            log.addHandler(handler)
+        except Exception:
+            log.addHandler(logging.NullHandler())
 
-        self._orig_unraisablehook(unraisable)
+        return log
 
 
 def _usage_text() -> str:

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/comate_cli/terminal_agent/app.py

@@ -415,11 +415,13 @@ async def run(
                 exc_info=True,
             )
     finally:
-        logging_session.close()
-        if active_session is session:
-            await _graceful_shutdown(active_session)
-        else:
-            await _graceful_shutdown(session, active_session)
+        try:
+            if active_session is session:
+                await _graceful_shutdown(active_session)
+            else:
+                await _graceful_shutdown(session, active_session)
+        finally:
+            logging_session.close()
 
     if usage_line:
         console.print(f"[dim]{usage_line}[/]")

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/comate_cli/terminal_agent/tui.py

@@ -274,6 +274,12 @@ class TerminalAgentTUI(
             "AGENT_SDK_TUI_PASTE_PLACEHOLDER_THRESHOLD_CHARS",
             500,
         )
+        paste_guard_window_ms = read_env_int(
+            "AGENT_SDK_TUI_PASTE_GUARD_WINDOW_MS",
+            120,
+        )
+        self._paste_guard_window_seconds = paste_guard_window_ms / 1000.0
+        self._paste_guard_active_until = 0.0
         self._paste_placeholder_text: str | None = None
         self._active_paste_token: str | None = None
         self._paste_payload_by_token: dict[str, str] = {}

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/comate_cli/terminal_agent/tui_parts/input_behavior.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import time
 from bisect import bisect_right
 from typing import Any
 
@@ -212,6 +213,35 @@ class InputBehaviorMixin:
         self._active_paste_token = None
         self._paste_placeholder_text = None
         self._paste_payload_by_token.clear()
+        self._paste_guard_active_until = 0.0
+
+    def _paste_guard_window(self) -> float:
+        return max(0.05, float(getattr(self, "_paste_guard_window_seconds", 0.12)))
+
+    def _mark_paste_like_input(self, _text: str = "") -> None:
+        self._paste_guard_active_until = time.monotonic() + self._paste_guard_window()
+
+    def _extend_paste_guard(self) -> None:
+        self._mark_paste_like_input("")
+
+    def _is_paste_guard_active(self) -> bool:
+        return time.monotonic() < float(
+            getattr(self, "_paste_guard_active_until", 0.0)
+        )
+
+    def _should_treat_enter_as_pasted_newline(self, buffer: Any) -> bool:
+        if not self._is_paste_guard_active():
+            return False
+        if getattr(buffer, "complete_state", None) is not None:
+            return False
+        return True
+
+    def _handle_normal_enter_key(self, buffer: Any) -> bool:
+        if not self._should_treat_enter_as_pasted_newline(buffer):
+            return False
+        buffer.insert_text("\n")
+        self._extend_paste_guard()
+        return True
 
     @staticmethod
     def _find_inserted_segment(
@@ -258,14 +288,23 @@ class InputBehaviorMixin:
     def _handle_large_paste(self, buffer: Any) -> bool:
         if self._suppress_input_change_hook:
             return False
-        if self._busy:
-            return False
 
         text = str(buffer.text)
         previous_text = self._last_input_text
         self._last_input_len = len(text)
         self._last_input_text = text
 
+        threshold = max(1, int(self._paste_threshold_chars))
+        segment = self._find_inserted_segment(previous_text, text)
+        inserted_text = segment[2] if segment is not None else ""
+        if inserted_text and ("\n" in inserted_text or "\r" in inserted_text):
+            self._mark_paste_like_input(inserted_text)
+        if len(inserted_text) >= threshold:
+            self._mark_paste_like_input(inserted_text)
+
+        if self._busy:
+            return False
+
         placeholder = self._paste_placeholder_text
         if self._active_paste_token is not None and placeholder and placeholder in text:
             return False
@@ -276,8 +315,6 @@ class InputBehaviorMixin:
         ):
             self._clear_paste_state()
 
-        threshold = max(1, int(self._paste_threshold_chars))
-        segment = self._find_inserted_segment(previous_text, text)
         if segment is None:
             return False
         start, end, inserted_text = segment

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/comate_cli/terminal_agent/tui_parts/key_bindings.py

@@ -411,6 +411,9 @@ class KeyBindingsMixin:
         @bindings.add("enter", filter=normal_mode, eager=True)
         def _enter(event) -> None:
             buffer = event.current_buffer
+            if self._handle_normal_enter_key(buffer):
+                return
+
             cs = buffer.complete_state
 
             # 菜单打开时：先接受补全

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/pyproject.toml

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

comate_cli-0.7.0a6/tests/fixtures/fake_mcp_misbehaving_stdout.py

@@ -0,0 +1,75 @@
+"""故意违反 MCP stdio 规范的假服务器。"""
+from __future__ import annotations
+
+import json
+import signal
+import sys
+import threading
+import time
+
+
+_running = True
+
+
+def _read_loop() -> None:
+    """从 stdin 读 JSONRPC 请求,对 initialize 回一个最小响应。"""
+    for line in sys.stdin:
+        line = line.strip()
+        if not line:
+            continue
+        try:
+            req = json.loads(line)
+        except Exception:
+            continue
+        if req.get("method") == "initialize":
+            resp = {
+                "jsonrpc": "2.0",
+                "id": req.get("id"),
+                "result": {
+                    "protocolVersion": "2024-11-05",
+                    "capabilities": {},
+                    "serverInfo": {
+                        "name": "fake-misbehaving",
+                        "version": "0.0.1",
+                    },
+                },
+            }
+            sys.stdout.write(json.dumps(resp) + "\n")
+            sys.stdout.flush()
+
+
+def _noise_loop() -> None:
+    """每 50ms 向 stdout 写一行彩色日志。"""
+    counter = 0
+    while _running:
+        sys.stdout.write(
+            f"\x1b[90m2026-05-19T02:29:{counter:02d}Z "
+            "[INFO] internal status tick\x1b[0m\n"
+        )
+        sys.stdout.flush()
+        counter = (counter + 1) % 60
+        time.sleep(0.05)
+
+
+def _on_signal(signum, frame) -> None:
+    global _running
+    _running = False
+    try:
+        sys.stdout.write(
+            "\x1b[90m2026-05-19T02:29:99Z "
+            "[INFO] shutting down gracefully\x1b[0m\n"
+        )
+        sys.stdout.flush()
+    except Exception:
+        pass
+    raise SystemExit(0)
+
+
+if __name__ == "__main__":
+    signal.signal(signal.SIGINT, _on_signal)
+    if sys.platform == "win32":
+        signal.signal(signal.SIGTERM, _on_signal)
+    threading.Thread(target=_read_loop, daemon=True).start()
+    threading.Thread(target=_noise_loop, daemon=True).start()
+    while True:
+        time.sleep(0.5)

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/tests/test_app_shutdown.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import unittest
 from contextlib import contextmanager
-from unittest.mock import MagicMock, call, patch
+from types import SimpleNamespace
+from unittest.mock import AsyncMock, MagicMock, call, patch
 
 from comate_cli.terminal_agent import app as app_module
 
@@ -20,6 +21,70 @@ class _FakeSession:
 
 
 class TestAppShutdown(unittest.IsolatedAsyncioTestCase):
+    async def test_run_closes_logging_after_graceful_shutdown(self) -> None:
+        call_log: list[str] = []
+
+        fake_logging_session = MagicMock()
+        fake_logging_session.close.side_effect = lambda: call_log.append("logging_close")
+
+        fake_session = MagicMock()
+        fake_session.session_id = "session-1"
+        fake_session.runtime = SimpleNamespace(_mcp_manager=None)
+        fake_session.get_mode.return_value = "default"
+        fake_session.get_usage = AsyncMock(return_value=object())
+
+        class _FakeStatusBar:
+            def __init__(self, session) -> None:
+                self.session = session
+
+            def set_mode(self, mode) -> None:
+                pass
+
+            async def refresh(self) -> None:
+                pass
+
+            def show_transient(self, message: str, *, duration_s: float) -> None:
+                pass
+
+        class _FakeTUI:
+            initialized_session_id = None
+
+            def __init__(self, session, status_bar, renderer) -> None:
+                self.session = session
+
+            def add_resume_history(self, mode: str) -> None:
+                pass
+
+            async def run(self, *, mcp_init) -> None:
+                call_log.append("tui_run")
+
+        async def fake_preflight(*args, **kwargs):
+            return SimpleNamespace(should_abort_launch=False)
+
+        async def fake_graceful(*sessions) -> None:
+            call_log.append("graceful_shutdown")
+
+        with (
+            patch.object(app_module, "_resolve_cli_project_root", return_value=SimpleNamespace()),
+            patch.object(app_module, "run_preflight_if_needed", side_effect=fake_preflight),
+            patch.object(app_module, "_build_agent", return_value=object()),
+            patch.object(app_module, "print_logo"),
+            patch.object(app_module, "EventRenderer", return_value=MagicMock()),
+            patch(
+                "comate_cli.terminal_agent.logging_adapter.setup_tui_logging",
+                return_value=fake_logging_session,
+            ),
+            patch.object(app_module, "_resolve_session", return_value=(fake_session, "new")),
+            patch.object(app_module, "_check_update", return_value=None),
+            patch.object(app_module, "StatusBar", _FakeStatusBar),
+            patch.object(app_module, "TerminalAgentTUI", _FakeTUI),
+            patch.object(app_module, "_format_exit_usage_line", return_value=None),
+            patch.object(app_module, "_graceful_shutdown", side_effect=fake_graceful),
+        ):
+            await app_module.run()
+
+        self.assertEqual(call_log, ["tui_run", "graceful_shutdown", "logging_close"])
+
     async def test_graceful_shutdown_deduplicates_sessions_and_flushes(self) -> None:
         events: list[str] = []
 

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/tests/test_compact_command_semantics.py

@@ -149,7 +149,7 @@ class TestCompactCommandSemantics(unittest.TestCase):
         self.assertEqual(commands._status_bar.refresh_calls, 1)
         self.assertTrue(
             any(
-                kind == "subtitle" and "/compact completed:" in msg
+                kind == "subtitle" and "compact completed:" in msg
                 for kind, msg, _ in commands._renderer.events
             )
         )
@@ -167,7 +167,7 @@ class TestCompactCommandSemantics(unittest.TestCase):
         asyncio.run(commands._execute_command("/compact"))
 
         self.assertEqual(commands._renderer.events[-1][0], "subtitle")
-        self.assertEqual(commands._renderer.events[-1][1], "/compact skipped: disabled")
+        self.assertEqual(commands._renderer.events[-1][1], "compact skipped: disabled")
         self.assertEqual(commands._renderer.events[-1][2], "warning")
 
     def test_compact_reports_no_changes_in_english(self) -> None:
@@ -184,7 +184,7 @@ class TestCompactCommandSemantics(unittest.TestCase):
         self.assertEqual(commands._renderer.events[-1][0], "subtitle")
         self.assertEqual(
             commands._renderer.events[-1][1],
-            "/compact made no changes: The context was left unchanged.",
+            "compact made no changes: The context was left unchanged.",
         )
         self.assertEqual(commands._renderer.events[-1][2], "warning")
 
@@ -205,7 +205,7 @@ class TestCompactCommandSemantics(unittest.TestCase):
                 ("user", "/compact", "info"),
                 (
                     "subtitle",
-                    "/compact made no changes: The context was left unchanged.",
+                    "compact made no changes: The context was left unchanged.",
                     "warning",
                 ),
             ],

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/tests/test_preflight.py

@@ -196,11 +196,11 @@ class TestPreflightMerge(unittest.TestCase):
         self.assertIn("zai_global", preset_map)
         self.assertEqual(
             preset_map["zai_cn"].base_url,
-            "https://open.bigmodel.cn/api/anthropic",
+            "https://open.bigmodel.cn/api/coding/paas/v4",
         )
         self.assertEqual(
             preset_map["zai_global"].base_url,
-            "https://api.z.ai/api/anthropic",
+            "https://api.z.ai/api/coding/paas/v4",
         )
 
     def test_provider_presets_are_brand_only(self) -> None:
@@ -216,6 +216,7 @@ class TestPreflightMerge(unittest.TestCase):
                 "OpenAI and compatible",
                 "Anthropic and compatible",
                 "GitHub Copilot Plan",
+                "Xiaomi MiMo Token Plan",
             ],
         )
 

{comate_cli-0.7.0a5 → comate_cli-0.7.0a6}/tests/test_rewind_command_semantics.py

@@ -144,7 +144,10 @@ class TestRewindCommandSemantics(unittest.TestCase):
 
         asyncio.run(commands._slash_rewind(""))
 
-        self.assertIn("暂时没有可以回到的文字消息", commands._renderer.messages[-1][0])
+        self.assertIn(
+            "No rewind-able text messages are available",
+            commands._renderer.messages[-1][0],
+        )
         self.assertNotIn("active replay", commands._renderer.messages[-1][0])
         self.assertNotIn("meta", commands._renderer.messages[-1][0])