comate-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{comate_cli-0.3.0 → comate_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.3.0
+Version: 0.3.2
 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.3.0 → comate_cli-0.3.2}/comate_cli/terminal_agent/app.py

@@ -242,7 +242,7 @@ async def _preload_mcp_in_tui(session: ChatSession) -> None:
             return
         await preload_task
     except Exception as e:
-        logger.warning(f"MCP init failed: {e}", exc_info=True)
+        logger.debug(f"MCP init failed: {e}", exc_info=True)
         return
 
     mgr = runtime._mcp_manager
@@ -250,7 +250,7 @@ async def _preload_mcp_in_tui(session: ChatSession) -> None:
         return
 
     for alias, reason in mgr.failed_servers:
-        logger.warning(f"MCP server '{alias}' skipped: {reason}")
+        logger.debug(f"MCP server '{alias}' skipped: {reason}")
 
     loaded = mgr.tool_infos
     if loaded:
@@ -360,6 +360,13 @@ async def run(
 
     async def _mcp_loader() -> None:
         await _preload_mcp_in_tui(session)
+        mgr = session.runtime._mcp_manager
+        if mgr and mgr.failed_servers:
+            aliases = [alias for alias, _ in mgr.failed_servers]
+            status_bar.show_transient(
+                f"⚠ MCP: {', '.join(aliases)} unavailable",
+                duration_s=5.0,
+            )
 
     usage_line: str | None = None
     active_session = session

{comate_cli-0.3.0 → comate_cli-0.3.2}/comate_cli/terminal_agent/status_bar.py

@@ -29,6 +29,8 @@ class StatusBar:
         self._context_left_pct: float = 100.0
         self._git_diff_stats: GitDiffStats | None = None
         self._git_diff_cache_time: float = 0.0
+        self._transient_message: str | None = None
+        self._transient_until: float | None = None
 
     @staticmethod
     def _resolve_model_name(session: ChatSession) -> str:
@@ -62,6 +64,7 @@ class StatusBar:
                 check=False,
                 capture_output=True,
                 text=True,
+                encoding="utf-8",
                 timeout=StatusBar._GIT_CMD_TIMEOUT_SECONDS,
             )
         except subprocess.TimeoutExpired:
@@ -82,6 +85,7 @@ class StatusBar:
                 check=False,
                 capture_output=True,
                 text=True,
+                encoding="utf-8",
                 timeout=StatusBar._GIT_CMD_TIMEOUT_SECONDS,
             )
         except subprocess.TimeoutExpired:
@@ -254,5 +258,30 @@ class StatusBar:
         fragments.append(("", " "))
         return fragments
 
+    def show_transient(self, message: str, duration_s: float = 5.0) -> None:
+        """Set a transient message that auto-clears after *duration_s* seconds."""
+        self._transient_message = message
+        self._transient_until = time.monotonic() + duration_s
+
+    def clear_transient_if_expired(self) -> bool:
+        """Check and clear expired transient message.
+
+        Returns True if the message was just cleared (state changed, needs repaint).
+        Returns False otherwise (no message, or message still active).
+        """
+        if self._transient_until is not None and time.monotonic() >= self._transient_until:
+            self._transient_message = None
+            self._transient_until = None
+            return True
+        return False
+
+    @property
+    def transient_message(self) -> str | None:
+        return self._transient_message
+
+    @property
+    def has_transient(self) -> bool:
+        return self._transient_message is not None
+
     def helper_toolbar(self) -> list[tuple[str, str]]:
         return []

{comate_cli-0.3.0 → comate_cli-0.3.2}/comate_cli/terminal_agent/tui.py

@@ -83,8 +83,9 @@ _INPUT_HISTORY_MAX_ENTRIES = 200
 def _get_input_history_path(cwd: str) -> Path:
     """Compute FileHistory path for a given cwd, ensuring parent dir exists."""
     import hashlib
+    import re
 
-    slug = cwd.replace("/", "_").lstrip("_")
+    slug = re.sub(r'[^a-zA-Z0-9_.\-]', '_', cwd).lstrip("_")
     if len(slug) > 200:
         hash_suffix = hashlib.sha1(cwd.encode()).hexdigest()[:8]
         slug = f"{slug[:100]}_{hash_suffix}"
@@ -483,6 +484,7 @@ class TerminalAgentTUI(
                 "status.mode.act": "bg:default #60a5fa bold",
                 "status.mode.plan": "bg:default #7AC9CA bold",
                 "status.hint": "bg:default #6B7280",
+                "status.transient": "bg:default italic fg:ansiyellow",
                 "input.placeholder": "bg:default #9CA3AF",
                 "auto-suggestion": "bg:default #94a3b8",
                 "queue": "bg:#1d222a #d8dee9",
@@ -1141,6 +1143,12 @@ class TerminalAgentTUI(
                     else:
                         self._render_dirty = True
 
+                # 瞬态消息过期检查
+                if self._status_bar.clear_transient_if_expired():
+                    self._render_dirty = True
+                elif self._status_bar.has_transient:
+                    self._render_dirty = True
+
                 loading_line = self._renderer.loading_line().strip()
                 loading_changed = loading_line != self._last_loading_line
                 if loading_changed:
@@ -1276,10 +1284,13 @@ class TerminalAgentTUI(
                         timeout=self._mcp_init_gate_timeout_s,
                     )
                 except asyncio.TimeoutError:
-                    logger.warning(
+                    logger.debug(
                         "MCP init timed out after "
                         f"{self._mcp_init_gate_timeout_s:.1f}s; degrade and continue",
                     )
+                    self._status_bar.show_transient(
+                        "⚠ MCP: init timed out", duration_s=5.0,
+                    )
                     await self._cancel_task_with_timeout(
                         init_task,
                         timeout_s=self._mcp_init_cancel_timeout_s,
@@ -1293,7 +1304,7 @@ class TerminalAgentTUI(
                     )
                     return
                 except Exception as exc:
-                    logger.warning(f"MCP init failed in TUI bootstrap: {exc}", exc_info=True)
+                    logger.debug(f"MCP init failed in TUI bootstrap: {exc}", exc_info=True)
                 finally:
                     self._initializing = False
                     if self._queued_messages and not self._busy:

{comate_cli-0.3.0 → comate_cli-0.3.2}/comate_cli/terminal_agent/tui_parts/render_panels.py

@@ -49,6 +49,33 @@ class RenderPanelsMixin:
     def _status_text(self) -> list[tuple[str, str]]:
         width = self._terminal_width()
 
+        # 瞬态消息优先于 mode 显示
+        transient = self._status_bar.transient_message
+        if transient:
+            # 右栏：model | ~branch / X% left (不变)
+            right_text = self._status_bar.info_status_text()
+            if self._busy or self._initializing:
+                git_frags = []
+            else:
+                git_frags = self._status_bar.git_diff_fragments()
+
+            right_w = sum(get_cwidth(c) for c in right_text)
+            if git_frags:
+                right_w += 2 + sum(get_cwidth(c) for _, t in git_frags for c in t)
+
+            left_w = sum(get_cwidth(c) for c in transient)
+            padding = max(1, width - left_w - right_w - 2)
+
+            frags: list[tuple[str, str]] = [
+                ("class:status.transient", transient),
+                ("class:status", " " * padding),
+                ("class:status", right_text),
+            ]
+            if git_frags:
+                frags.append(("class:status", "  "))
+                frags.extend(git_frags)
+            return frags
+
         # 左栏：mode 图标 + 提示文字
         mode = self._status_bar.get_mode()
         hint_text = "(shift+tab to cycle)"

{comate_cli-0.3.0 → comate_cli-0.3.2}/pyproject.toml

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

{comate_cli-0.3.0 → comate_cli-0.3.2}/tests/test_app_mcp_preload.py

@@ -9,7 +9,7 @@ from comate_cli.terminal_agent.app import _preload_mcp_in_tui
 
 class _FakeRuntime:
     def __init__(self) -> None:
-        self.options = types.SimpleNamespace(mcp_enabled=True)
+        self.config = types.SimpleNamespace(mcp_enabled=True)
         self._mcp_manager = types.SimpleNamespace(
             failed_servers=[],
             tool_infos=[types.SimpleNamespace(server_alias="ctx7")],

{comate_cli-0.3.0 → comate_cli-0.3.2}/tests/test_completion_status_panel.py

@@ -39,6 +39,10 @@ class _FakeStatusBar:
         self.git_diff_calls += 1
         return []
 
+    @property
+    def transient_message(self) -> str | None:
+        return None
+
 
 class _FakeLoadingState:
     def __init__(self, text: str = "") -> None:

{comate_cli-0.3.0 → comate_cli-0.3.2}/tests/test_input_history.py

@@ -25,6 +25,15 @@ class TestGetInputHistoryPath(unittest.TestCase):
             self.assertTrue(len(path.stem) <= 109)  # 100 chars + _ + 8 hex
             self.assertTrue(path.name.endswith(".txt"))
 
+    def test_slug_windows_path(self) -> None:
+        """Windows paths with backslashes and drive letter produce a safe slug."""
+        from comate_cli.terminal_agent.tui import _get_input_history_path
+        with patch("comate_cli.terminal_agent.tui._INPUT_HISTORY_DIR", Path(tempfile.mkdtemp())):
+            path = _get_input_history_path(r"C:\Users\ligj\projects\agent-sdk")
+            # Colon, backslashes all replaced; no absolute-path hijacking
+            self.assertEqual(path.name, "C__Users_ligj_projects_agent-sdk.txt")
+            self.assertTrue(str(path).startswith(str(path.parent)))
+
     def test_creates_parent_directory(self) -> None:
         from comate_cli.terminal_agent.tui import _get_input_history_path
         with tempfile.TemporaryDirectory() as tmp:

comate_cli-0.3.2/tests/test_status_bar_transient.py

@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+import time
+import unittest
+from unittest.mock import patch
+
+from comate_cli.terminal_agent.status_bar import StatusBar
+
+
+class _FakeSession:
+    """Minimal stub so StatusBar.__init__ does not need a real ChatSession."""
+    class _agent:
+        class llm:
+            model = "test-model"
+
+
+def _make_status_bar() -> StatusBar:
+    with patch.object(StatusBar, "_resolve_git_branch", return_value="main"):
+        return StatusBar(_FakeSession())  # type: ignore[arg-type]
+
+
+class TestStatusBarTransient(unittest.TestCase):
+    def test_show_transient_sets_message(self) -> None:
+        sb = _make_status_bar()
+        assert sb.transient_message is None
+        assert sb.has_transient is False
+
+        sb.show_transient("hello", duration_s=5.0)
+
+        assert sb.transient_message == "hello"
+        assert sb.has_transient is True
+
+    def test_clear_transient_if_expired_returns_false_when_no_message(self) -> None:
+        sb = _make_status_bar()
+        assert sb.clear_transient_if_expired() is False
+
+    def test_clear_transient_if_expired_returns_false_while_active(self) -> None:
+        sb = _make_status_bar()
+        sb.show_transient("active", duration_s=10.0)
+        assert sb.clear_transient_if_expired() is False
+        assert sb.has_transient is True
+
+    def test_clear_transient_if_expired_returns_true_and_clears_when_expired(self) -> None:
+        sb = _make_status_bar()
+        sb.show_transient("expired", duration_s=0.0)
+        # duration_s=0.0 means it expires immediately at monotonic() + 0.0
+        # Give a tiny margin
+        time.sleep(0.01)
+        assert sb.clear_transient_if_expired() is True
+        assert sb.transient_message is None
+        assert sb.has_transient is False
+
+    def test_show_transient_overwrites_previous(self) -> None:
+        sb = _make_status_bar()
+        sb.show_transient("first", duration_s=10.0)
+        sb.show_transient("second", duration_s=10.0)
+        assert sb.transient_message == "second"
+
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)

{comate_cli-0.3.0 → comate_cli-0.3.2}/tests/test_tui_mcp_init_gate.py

@@ -51,6 +51,21 @@ class TestTUIMcpInitGate(unittest.IsolatedAsyncioTestCase):
         tui._mcp_init_task = None
         tui._ui_tick_task = None
 
+        # Provide a minimal status bar stub for show_transient()
+        class _FakeStatusBar:
+            def __init__(self) -> None:
+                self.transient_calls: list[tuple[str, float]] = []
+            def show_transient(self, msg: str, duration_s: float = 5.0) -> None:
+                self.transient_calls.append((msg, duration_s))
+            def clear_transient_if_expired(self) -> bool:
+                return False
+            @property
+            def has_transient(self) -> bool:
+                return False
+
+        fake_status_bar = _FakeStatusBar()
+        tui._status_bar = fake_status_bar
+
         submitted: list[str] = []
 
         async def _fake_submit_user_message(
@@ -80,6 +95,8 @@ class TestTUIMcpInitGate(unittest.IsolatedAsyncioTestCase):
         self.assertEqual(list(tui._queued_messages), [])
         self.assertTrue(tui._renderer.closed)
         self.assertEqual(tui._renderer.messages, [])
+        self.assertEqual(len(fake_status_bar.transient_calls), 1)
+        self.assertIn("timed out", fake_status_bar.transient_calls[0][0])
 
 
 if __name__ == "__main__":

{comate_cli-0.3.0 → comate_cli-0.3.2}/uv.lock

@@ -364,7 +364,7 @@ wheels = [
 
 [[package]]
 name = "comate-agent-sdk"
-version = "0.2.9"
+version = "0.3.1"
 source = { editable = "../../" }
 dependencies = [
     { name = "aiohttp" },
@@ -429,7 +429,7 @@ dev = [
 
 [[package]]
 name = "comate-cli"
-version = "0.2.9"
+version = "0.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "comate-agent-sdk" },