comate-cli 0.4.2__tar.gz → 0.4.4__tar.gz

{comate_cli-0.4.2 → comate_cli-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.4.2
+Version: 0.4.4
 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,8 +14,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
+Requires-Dist: charset-normalizer==3.4.7
 Requires-Dist: comate-agent-sdk<1.0.0,>=0.0.2
+Requires-Dist: curl-cffi==0.13.0
+Requires-Dist: packaging>=21.0
+Requires-Dist: pillow==12.2.0
 Requires-Dist: prompt-toolkit>=3.0
+Requires-Dist: requests==2.32.5
 Requires-Dist: rich>=14.0
 Description-Content-Type: text/markdown
 

{comate_cli-0.4.2 → comate_cli-0.4.4}/comate_cli/terminal_agent/app.py

@@ -292,6 +292,31 @@ async def _run_print_mode(
         await _graceful_shutdown(session)
 
 
+def _install_event_loop_exception_handler() -> None:
+    """Install a custom exception handler to suppress known MCP transport race conditions.
+
+    The MCP SDK's streamable_http_client uses anyio TaskGroups internally.
+    When connections are cleaned up from a different asyncio Task than the one
+    that created them, anyio raises RuntimeError("Attempted to exit cancel scope
+    in a different task"). This handler downgrades that specific error to a
+    warning log instead of crashing the TUI.
+    """
+    loop = asyncio.get_running_loop()
+    _default = loop.get_exception_handler()
+
+    def _handler(loop: asyncio.AbstractEventLoop, context: dict) -> None:
+        exc = context.get("exception")
+        if isinstance(exc, RuntimeError) and "cancel scope" in str(exc):
+            logger.warning("MCP transport cleanup race detected (suppressed): %s", exc)
+            return
+        if _default is not None:
+            _default(loop, context)
+        else:
+            loop.default_exception_handler(context)
+
+    loop.set_exception_handler(_handler)
+
+
 async def run(
     *,
     rpc_stdio: bool = False,
@@ -299,6 +324,7 @@ async def run(
     resume_select: bool = False,
     print_message: str | None = None,
 ) -> None:
+    _install_event_loop_exception_handler()
     project_root = _resolve_cli_project_root()
     preflight_result = await run_preflight_if_needed(
         console=console,

{comate_cli-0.4.2 → comate_cli-0.4.4}/comate_cli/terminal_agent/event_renderer.py

@@ -578,6 +578,22 @@ class EventRenderer:
             return "Successfully loaded skill"
 
         if lowered == "read":
+            if isinstance(metadata, dict):
+                lines_returned = metadata.get("lines_returned")
+                start_line = metadata.get("start_line")
+                end_line = metadata.get("end_line")
+                total_lines = metadata.get("total_lines")
+                if (
+                    isinstance(lines_returned, int)
+                    and lines_returned >= 0
+                    and isinstance(start_line, int)
+                    and start_line >= 0
+                    and isinstance(end_line, int)
+                    and end_line >= 0
+                    and isinstance(total_lines, int)
+                    and total_lines >= 0
+                ):
+                    return f"Read {lines_returned} lines · Lines {start_line}-{end_line} of {total_lines}"
             lines = result.split("\n") if result else []
             if lines and lines[-1] == "":
                 lines = lines[:-1]

{comate_cli-0.4.2 → comate_cli-0.4.4}/comate_cli/terminal_agent/tui.py

@@ -54,6 +54,7 @@ from comate_cli.terminal_agent.custom_slash_commands import (
 )
 from comate_cli.terminal_agent.question_view import AskUserQuestionUI
 from comate_cli.terminal_agent.plugins.marketplace_install_view import MarketplaceInstallView
+from comate_cli.terminal_agent.tui_parts.mcp_connecting_view import McpConnectingView
 from comate_cli.terminal_agent.plugins.plugin_picker import PluginPickerUI
 from comate_cli.terminal_agent.rewind_store import RewindStore
 from comate_cli.terminal_agent.selection_menu import (
@@ -350,6 +351,7 @@ class TerminalAgentTUI(
         self._question_ui = AskUserQuestionUI()
         self._plugin_ui = PluginPickerUI()
         self._install_view = MarketplaceInstallView()
+        self._mcp_connecting_view = McpConnectingView()
         self._selection_ui = SelectionMenuUI()
         self._todo_control = FormattedTextControl(text=self._todo_text)
         self._loading_control = FormattedTextControl(text=self._loading_text)
@@ -460,6 +462,10 @@ class TerminalAgentTUI(
             content=self._install_view.container,
             filter=Condition(lambda: self._ui_mode == UIMode.MARKETPLACE_INSTALL),
         )
+        self._mcp_connecting_container = ConditionalContainer(
+            content=self._mcp_connecting_view.container,
+            filter=Condition(lambda: self._ui_mode == UIMode.MCP_CONNECTING),
+        )
 
         self._main_container = HSplit(
             [
@@ -482,6 +488,7 @@ class TerminalAgentTUI(
                 self._selection_container,
                 self._plugin_container,
                 self._install_view_container,
+                self._mcp_connecting_container,
                 Window(height=1, char="─", style="class:input.separator"),
                 self._bottom_container,
             ]

{comate_cli-0.4.2 → comate_cli-0.4.4}/comate_cli/terminal_agent/tui_parts/commands.py

@@ -384,6 +384,13 @@ class CommandsMixin:
                     "description": f"{tool_count} tools",
                 }
             )
+        options.append(
+            {
+                "value": "reconnect",
+                "label": "Reconnect",
+                "description": "Reconnect to this server",
+            }
+        )
         options.append(
             {
                 "value": "back",
@@ -409,6 +416,9 @@ class CommandsMixin:
                     )
                 )
                 return
+            if selected == "reconnect":
+                self._start_mcp_reconnect(alias, rows_by_alias)
+                return
             self._schedule_background(
                 self._open_mcp_server_list_menu_async(
                     rows=list(rows_by_alias.values()),
@@ -441,6 +451,52 @@ class CommandsMixin:
         self._sync_focus_for_mode()
         self._invalidate()
 
+    def _start_mcp_reconnect(self, alias: str, rows_by_alias: dict[str, dict[str, Any]]) -> None:
+        """启动 MCP server 重连流程。"""
+        agent_runtime = self._session._agent
+
+        def on_done(success: bool, error_message: str) -> None:
+            if success:
+                mgr = getattr(agent_runtime, "_mcp_manager", None)
+                tool_count = 0
+                if mgr:
+                    tool_count = sum(
+                        1 for info in (getattr(mgr, "tool_infos", None) or [])
+                        if getattr(info, "server_alias", "") == alias
+                    )
+                message = f"Reconnected to {alias}. ({tool_count} tools loaded)"
+            else:
+                message = f"Failed to reconnect to {alias}: {error_message}"
+
+            # 将 /mcp 命令和结果刷入 scrollback
+            self._renderer.seed_user_message("/mcp")
+            self._renderer.append_subtitle(message)
+
+            if success:
+                # 成功：回到 NORMAL 模式，不返回菜单
+                self._ui_mode = UIMode.NORMAL
+                self._sync_focus_for_mode()
+                self._refresh_layers()
+            else:
+                # 失败：回到 detail 菜单，方便用户再次重试
+                refreshed_rows = self._collect_mcp_cached_rows()
+                if refreshed_rows:
+                    refreshed_by_alias = {str(r["alias"]): r for r in refreshed_rows}
+                    rows_by_alias.update(refreshed_by_alias)
+
+                self._schedule_background(
+                    self._open_mcp_server_detail_menu_async(
+                        rows_by_alias=rows_by_alias,
+                        alias=alias,
+                    )
+                )
+
+        retry_coro = agent_runtime.retry_mcp_server(alias)
+        self._mcp_connecting_view.enter(alias, retry_coro, on_done)
+        self._ui_mode = UIMode.MCP_CONNECTING
+        self._sync_focus_for_mode()
+        self._invalidate()
+
     async def _open_mcp_server_list_menu_async(
         self,
         *,
@@ -1317,8 +1373,9 @@ class CommandsMixin:
             self._exit_selection_mode()
             return
 
-        # The callback handles the actual switch
-        self._exit_selection_mode()
+        # 回调可能已经切换了 ui_mode（如 MCP_CONNECTING），尊重回调的意图
+        if self._ui_mode == UIMode.SELECTION:
+            self._exit_selection_mode()
 
     async def _append_usage_snapshot(self) -> None:
         usage = await self._session.get_usage()

{comate_cli-0.4.2 → comate_cli-0.4.4}/comate_cli/terminal_agent/tui_parts/input_behavior.py

@@ -137,6 +137,9 @@ class InputBehaviorMixin:
         if self._ui_mode == UIMode.MARKETPLACE_INSTALL:
             self._app.layout.focus(self._install_view.focus_target())
             return
+        if self._ui_mode == UIMode.MCP_CONNECTING:
+            self._app.layout.focus(self._mcp_connecting_view.focus_target())
+            return
         self._app.layout.focus(self._input_area.window)
 
     def _handle_question_action(self, action: QuestionAction | None) -> None:

{comate_cli-0.4.2 → comate_cli-0.4.4}/comate_cli/terminal_agent/tui_parts/key_bindings.py

@@ -18,6 +18,7 @@ class KeyBindingsMixin:
         selection_mode = Condition(lambda: self._ui_mode == UIMode.SELECTION)
         plugin_mode = Condition(lambda: self._ui_mode == UIMode.PLUGIN)
         install_mode = Condition(lambda: self._ui_mode == UIMode.MARKETPLACE_INSTALL)
+        mcp_connecting_mode = Condition(lambda: self._ui_mode == UIMode.MCP_CONNECTING)
         diff_panel_open = Condition(lambda: self._diff_panel_visible)
         todo_panel_expanded = Condition(
             lambda: self._todo_panel_expanded and self._renderer.has_active_todos()
@@ -182,6 +183,15 @@ class KeyBindingsMixin:
                 self._exit_install_view()
             self._invalidate()
 
+        @bindings.add("escape", filter=mcp_connecting_mode)
+        def _mcp_connecting_escape(event) -> None:
+            del event
+            should_close = self._mcp_connecting_view.handle_escape()
+            if should_close:
+                self._ui_mode = UIMode.NORMAL
+                self._sync_focus_for_mode()
+            self._invalidate()
+
         @bindings.add("enter", filter=question_mode)
         def _question_enter(event) -> None:
             del event

comate_cli-0.4.4/comate_cli/terminal_agent/tui_parts/mcp_connecting_view.py

@@ -0,0 +1,137 @@
+"""MCP Server 重连面板 — 轻量级 TUI 组件。
+
+显示连接进度，支持 Esc 取消，20 秒超时。
+完成后通过 on_done 回调通知调用方。
+"""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+
+from prompt_toolkit.application.current import get_app_or_none
+from prompt_toolkit.layout.containers import Window
+from prompt_toolkit.layout.controls import FormattedTextControl
+
+logger = logging.getLogger(__name__)
+
+_PANEL_HEIGHT = 8
+
+_H = "\u2500"  # ─
+_TL = "\u256d"  # ╭
+_TR = "\u256e"  # ╮
+_BL = "\u2570"  # ╰
+_BR = "\u256f"  # ╯
+_V = "\u2502"  # │
+
+_CONNECT_TIMEOUT_S = 20.0
+
+
+class McpConnectingView:
+    """轻量 MCP 重连面板，嵌入主 TUI 底部交互带。"""
+
+    def __init__(self) -> None:
+        self._alias: str = ""
+        self._task: asyncio.Task[None] | None = None
+        self._on_done: callable | None = None
+        self._retry_coro = None
+
+        self._content_window = Window(
+            content=FormattedTextControl(self._render, focusable=True),
+            height=_PANEL_HEIGHT,
+            dont_extend_height=True,
+            always_hide_cursor=True,
+        )
+
+    @property
+    def container(self) -> Window:
+        return self._content_window
+
+    def focus_target(self) -> Window:
+        return self._content_window
+
+    def enter(
+        self,
+        alias: str,
+        retry_coro,
+        on_done: callable,
+    ) -> None:
+        """初始化并启动连接。"""
+        self._alias = alias
+        self._retry_coro = retry_coro
+        self._on_done = on_done
+        self._task = asyncio.create_task(self._do_connect())
+        self._task.add_done_callback(self._on_task_done)
+
+    def handle_escape(self) -> bool:
+        """Esc 取消连接。返回 True 表示面板应关闭。"""
+        if self._task and not self._task.done():
+            self._task.cancel()
+        return True
+
+    async def _do_connect(self) -> None:
+        try:
+            result = await asyncio.wait_for(
+                self._retry_coro,
+                timeout=_CONNECT_TIMEOUT_S,
+            )
+            if result:
+                self._on_done(True, "")
+            else:
+                self._on_done(False, "connection failed")
+        except asyncio.TimeoutError:
+            self._on_done(False, f"timed out after {int(_CONNECT_TIMEOUT_S)}s")
+        except asyncio.CancelledError:
+            raise
+        except Exception as exc:
+            self._on_done(False, str(exc))
+
+    def _on_task_done(self, task: asyncio.Task[None]) -> None:
+        self._task = None
+        app = get_app_or_none()
+        if app is not None:
+            app.invalidate()
+
+    def _render(self) -> list[tuple[str, str]]:
+        app = get_app_or_none()
+        width = 80
+        if app is not None:
+            try:
+                width = app.output.get_size().columns
+            except Exception:
+                pass
+        inner_w = max(20, width - 4)
+
+        lines: list[list[tuple[str, str]]] = []
+        lines.append([("bold", f"Connecting to {self._alias}\u2026")])
+        lines.append([])
+        lines.append([("class:dim", " \u273d Establishing connection to MCP server")])
+        lines.append([])
+        lines.append([("class:dim", " This may take a few moments.")])
+
+        content_lines = _PANEL_HEIGHT - 3
+        while len(lines) < content_lines:
+            lines.append([])
+
+        fragments: list[tuple[str, str]] = []
+
+        fragments.append(("class:plugin.divider", f"{_TL}{_H * (width - 2)}{_TR}"))
+        fragments.append(("", "\n"))
+
+        for line_frags in lines[:content_lines]:
+            fragments.append(("class:plugin.divider", f"{_V} "))
+            line_len = sum(len(text) for _, text in line_frags)
+            for style, text in line_frags:
+                fragments.append((style, text))
+            pad = inner_w - line_len
+            if pad > 0:
+                fragments.append(("", " " * pad))
+            fragments.append(("class:plugin.divider", f" {_V}"))
+            fragments.append(("", "\n"))
+
+        fragments.append(("class:plugin.divider", f"{_BL}{_H * (width - 2)}{_BR}"))
+        fragments.append(("", "\n"))
+
+        fragments.append(("class:dim", "   Esc to cancel"))
+
+        return fragments

{comate_cli-0.4.2 → comate_cli-0.4.4}/comate_cli/terminal_agent/tui_parts/ui_mode.py

@@ -9,3 +9,4 @@ class UIMode(Enum):
     SELECTION = "selection"
     PLUGIN = "plugin"
     MARKETPLACE_INSTALL = "marketplace_install"
+    MCP_CONNECTING = "mcp_connecting"

{comate_cli-0.4.2 → comate_cli-0.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "comate-cli"
-version = "0.4.2"
+version = "0.4.4"
 description = "Comate terminal CLI built on comate-agent-sdk"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -25,6 +25,11 @@ dependencies = [
     "comate-agent-sdk>=0.0.2,<1.0.0",
     "rich>=14.0",
     "prompt-toolkit>=3.0",
+    "packaging>=21.0",
+    "pillow==12.2.0",
+    "charset-normalizer==3.4.7",
+    "curl-cffi==0.13.0",
+    "requests==2.32.5",
 ]
 
 [project.urls]

{comate_cli-0.4.2 → comate_cli-0.4.4}/tests/test_event_renderer.py

@@ -722,6 +722,19 @@ class TestBuildToolSubtitle(unittest.TestCase):
         subtitle = self._build("Read", result)
         self.assertEqual(subtitle, "Read 3 lines")
 
+    def test_read_prefers_structured_metadata(self) -> None:
+        subtitle = self._build(
+            "Read",
+            "formatted body that should not drive subtitle",
+            metadata={
+                "lines_returned": 437,
+                "start_line": 501,
+                "end_line": 937,
+                "total_lines": 937,
+            },
+        )
+        self.assertEqual(subtitle, "Read 437 lines · Lines 501-937 of 937")
+
     def test_write_counts_lines(self) -> None:
         result = "line1\nline2\n"
         subtitle = self._build("Write", result)
@@ -819,6 +832,37 @@ class TestToolResultSubtitleInjection(unittest.TestCase):
         self.assertEqual(len(entries), 1)
         self.assertEqual(entries[0].subtitle, "Read 3 lines")
 
+    def test_read_tool_result_uses_metadata_over_visible_text_line_count(self) -> None:
+        renderer = EventRenderer()
+        renderer.handle_event(
+            ToolCallEvent(
+                tool="Read",
+                args={"file_path": "comate_agent_sdk/mcp/manager.py", "offset_line": 500, "limit_lines": 500},
+                tool_call_id="call-read-structured",
+            )
+        )
+        renderer.handle_event(
+            ToolResultEvent(
+                tool="Read",
+                result="# Read: comate_agent_sdk/mcp/manager.py\n\nLines 501-937 of 937 (TRUNCATED: line_clip)\n\n"
+                + "\n".join(f"visible-line-{idx}" for idx in range(219)),
+                tool_call_id="call-read-structured",
+                is_error=False,
+                metadata={
+                    "offset_line": 500,
+                    "limit_lines": 500,
+                    "lines_returned": 437,
+                    "total_lines": 937,
+                    "has_more": False,
+                    "start_line": 501,
+                    "end_line": 937,
+                },
+            )
+        )
+        entries = [e for e in renderer.history_entries() if e.entry_type == "tool_result"]
+        self.assertEqual(len(entries), 1)
+        self.assertEqual(entries[0].subtitle, "Read 437 lines · Lines 501-937 of 937")
+
     def test_error_result_has_subtitle_with_error_summary(self) -> None:
         renderer = EventRenderer()
         renderer._append_tool_call("Read", {"file_path": "/tmp/test.py"}, "call-2")