comate-cli 0.3.7__tar.gz → 0.3.9__tar.gz

{comate_cli-0.3.7 → comate_cli-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.3.7
+Version: 0.3.9
 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
@@ -15,7 +15,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
 Requires-Dist: comate-agent-sdk<1.0.0,>=0.0.2
-Requires-Dist: packaging>=25.0
 Requires-Dist: prompt-toolkit>=3.0
 Requires-Dist: rich>=14.0
 Description-Content-Type: text/markdown

{comate_cli-0.3.7 → comate_cli-0.3.9}/comate_cli/terminal_agent/app.py

@@ -370,7 +370,7 @@ async def run(
         if mgr and mgr.failed_servers:
             aliases = [alias for alias, _ in mgr.failed_servers]
             status_bar.show_transient(
-                f"⚠ MCP: {', '.join(aliases)} unavailable",
+                f"MCP: {', '.join(aliases)} unavailable",
                 duration_s=5.0,
             )
 

{comate_cli-0.3.7 → comate_cli-0.3.9}/comate_cli/terminal_agent/event_renderer.py

@@ -112,6 +112,18 @@ def _task_sort_key(task: dict[str, Any]) -> tuple[int, int]:
     return rank, numeric_id
 
 
+def _task_stats_header(tasks: list[dict[str, Any]]) -> str:
+    """生成 task 统计标题，如 '3 tasks (1 done, 2 open)'。"""
+    total = len(tasks)
+    done = sum(
+        1 for t in tasks
+        if str(t.get("status", "")).strip().lower() == "completed"
+    )
+    open_count = total - done
+    noun = "task" if total == 1 else "tasks"
+    return f"{total} {noun} ({done} done, {open_count} open)"
+
+
 def _format_task_row(task: dict[str, Any]) -> str:
     """格式化单条 task 行。
 
@@ -295,6 +307,12 @@ class EventRenderer:
     def has_active_todos(self) -> bool:
         return self.has_active_tasks()
 
+    def has_in_progress_tasks(self) -> bool:
+        return any(
+            str(t.get("status", "")).strip().lower() == "in_progress"
+            for t in self._current_tasks
+        )
+
     def compute_required_tool_panel_lines(self) -> int:
         """计算显示所有 running tools 所需的最小行数。"""
         if not self._running_tools:
@@ -518,7 +536,9 @@ class EventRenderer:
         if not tasks:
             return []
 
-        header = str(self._current_task_title or "").strip() or "Tasks"
+        header = str(self._current_task_title or "").strip()
+        if not header:
+            header = _task_stats_header(tasks)
         lines: list[str] = [header]
         for task in sorted(tasks, key=_task_sort_key):
             lines.append(_format_task_row(task))
@@ -849,7 +869,7 @@ class EventRenderer:
             return
 
         all_completed = all(str(item.get("status", "")).strip().lower() == "completed" for item in normalized)
-        # 标题：显示 ID 最小的 in_progress task 的 subject，否则 "Tasks"
+        # 标题：显示 ID 最小的 in_progress task 的 subject，否则统计摘要
         in_progress_tasks = [
             t for t in normalized
             if str(t.get("status", "")).strip().lower() == "in_progress"
@@ -858,7 +878,7 @@ class EventRenderer:
             in_progress_tasks.sort(key=lambda t: int(t.get("id", 0)))
             header = str(in_progress_tasks[0].get("subject", "")).strip() or "Tasks"
         else:
-            header = "Tasks"
+            header = _task_stats_header(normalized)
         if not all_completed:
             if not self._current_tasks:
                 self._task_started_at_monotonic = time.monotonic()

{comate_cli-0.3.7 → comate_cli-0.3.9}/comate_cli/terminal_agent/preflight.py

@@ -188,7 +188,7 @@ PROVIDER_PRESETS: tuple[ProviderPreset, ...] = (
         models={
             "LOW": "glm-4.7",
             "MID": "glm-4.7",
-            "HIGH": "glm-5",
+            "HIGH": "glm-5.1",
         },
     ),
     ProviderPreset(
@@ -200,7 +200,7 @@ PROVIDER_PRESETS: tuple[ProviderPreset, ...] = (
         models={
             "LOW": "glm-4.7",
             "MID": "glm-4.7",
-            "HIGH": "glm-5",
+            "HIGH": "glm-5.1",
         },
     ),
     ProviderPreset(

{comate_cli-0.3.7 → comate_cli-0.3.9}/comate_cli/terminal_agent/tui.py

@@ -1305,16 +1305,16 @@ class TerminalAgentTUI(
                 except asyncio.TimeoutError:
                     logger.debug(
                         "MCP init timed out after "
-                        f"{self._mcp_init_gate_timeout_s:.1f}s; degrade and continue",
+                        f"{self._mcp_init_gate_timeout_s:.1f}s; continuing in background",
                     )
                     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,
-                        task_name="terminal-mcp-init-worker",
+                        "MCP: init timed out, continuing in background…",
+                        duration_s=5.0,
                     )
+                    # Don't cancel init_task — let it complete in background.
+                    # asyncio.shield above already protects it from wait_for's
+                    # auto-cancellation. When it finishes, runtime._mcp_manager
+                    # will be set and tools become available for the next turn.
                 except asyncio.CancelledError:
                     await self._cancel_task_with_timeout(
                         init_task,

{comate_cli-0.3.7 → comate_cli-0.3.9}/comate_cli/terminal_agent/tui_parts/render_panels.py

@@ -243,9 +243,8 @@ class RenderPanelsMixin:
         return max_lines
 
     def _should_hide_loading_panel(self) -> bool:
-        """统一 loading 显隐逻辑：仅当 Todo 面板出现且无工具运行时隐藏 loading 区域。"""
-        if self._renderer.has_running_tools():
-            return False
+        """统一 loading 显隐逻辑：当 Task 面板存在时始终隐藏 loading 区域，
+        loading 语义由 task title 的呼吸圆点承载。"""
         return self._renderer.has_active_todos()
 
     def _sync_todo_panel_state(self) -> None:
@@ -593,7 +592,15 @@ class RenderPanelsMixin:
                     title_elapsed_suffix = (
                         f"  ({self._format_run_elapsed(elapsed)} • ctrl+c to interrupt)"
                     )
-                title_budget = width - 1 - get_cwidth(title_elapsed_suffix)
+                # busy 时在 title 前加呼吸圆点，承载 loading 语义
+                dot_prefix_width = 0
+                if self._busy:
+                    dot_color = breathing_dot_color(self._loading_frame)
+                    dot_glyph = breathing_dot_glyph(time.monotonic())
+                    dot_style = f"fg:{dot_color} bold"
+                    fragments.append((dot_style, f"{dot_glyph} "))
+                    dot_prefix_width = 2  # glyph(1) + space(1)
+                title_budget = width - 1 - dot_prefix_width - get_cwidth(title_elapsed_suffix)
                 clipped_title = fit_single_line(line, max(title_budget, 8))
                 fragments.extend(self._todo_title_shimmer_fragments(clipped_title))
                 if title_elapsed_suffix:

{comate_cli-0.3.7 → comate_cli-0.3.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "comate-cli"
-version = "0.3.7"
+version = "0.3.9"
 description = "Comate terminal CLI built on comate-agent-sdk"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -25,7 +25,6 @@ dependencies = [
     "comate-agent-sdk>=0.0.2,<1.0.0",
     "rich>=14.0",
     "prompt-toolkit>=3.0",
-    "packaging>=25.0",
 ]
 
 [project.urls]

{comate_cli-0.3.7 → comate_cli-0.3.9}/tests/test_completion_status_panel.py

@@ -248,10 +248,10 @@ class TestCompletionStatusPanel(unittest.TestCase):
         self.assertTrue(tui._should_hide_loading_panel())
         self.assertEqual(tui._loading_text(), [("", " ")])
 
-        # 有 todo 且有工具运行（subagent 执行中）→ 不隐藏，loading 面板优先
+        # 有 todo 且有工具运行（subagent 执行中）→ 也隐藏，loading 语义由 task title 承载
         tui._renderer.active_todos = True
         tui._renderer.running_tools = True
-        self.assertFalse(tui._should_hide_loading_panel())
+        self.assertTrue(tui._should_hide_loading_panel())
 
         # 无 todo，有工具运行 → 不隐藏
         tui._renderer.active_todos = False

{comate_cli-0.3.7 → comate_cli-0.3.9}/tests/test_event_renderer.py

@@ -396,6 +396,18 @@ class TestEventRenderer(unittest.TestCase):
     def test_task_completed_appends_summary_and_hides_panel(self) -> None:
         renderer = EventRenderer()
         renderer.start_turn()
+        # 先创建 pending tasks，使 _current_tasks 非空
+        renderer.handle_event(
+            TaskUpdatedEvent(
+                list_id="default",
+                tasks=[
+                    {"id": "1", "subject": "a", "status": "pending", "open_blocked_by": []},
+                    {"id": "2", "subject": "b", "status": "pending", "open_blocked_by": []},
+                ],
+            )
+        )
+        self.assertTrue(renderer.has_active_todos())
+        # 全部完成后应写入 summary 并隐藏面板
         renderer.handle_event(
             TaskUpdatedEvent(
                 list_id="default",

{comate_cli-0.3.7 → comate_cli-0.3.9}/tests/test_task_panel_format.py

@@ -76,14 +76,14 @@ def test_title_shows_smallest_id_in_progress():
     assert renderer._current_task_title == "Task A"
 
 
-def test_title_falls_back_to_tasks_when_no_in_progress():
+def test_title_falls_back_to_stats_when_no_in_progress():
     renderer = _make_renderer_for_title_test()
     tasks = [
         {"id": "1", "subject": "Set up project", "status": "pending", "open_blocked_by": []},
         {"id": "2", "subject": "Write tests", "status": "pending", "open_blocked_by": []},
     ]
     renderer._update_tasks(tasks, list_id="default")
-    assert renderer._current_task_title == "Tasks"
+    assert renderer._current_task_title == "2 tasks (0 done, 2 open)"
 
 
 def test_title_ignores_list_id():
@@ -92,5 +92,5 @@ def test_title_ignores_list_id():
         {"id": "1", "subject": "Task A", "status": "pending", "open_blocked_by": []},
     ]
     renderer._update_tasks(tasks, list_id="team-alpha")
-    assert renderer._current_task_title == "Tasks"
+    assert renderer._current_task_title == "1 task (0 done, 1 open)"
     assert "team-alpha" not in (renderer._current_task_title or "")

{comate_cli-0.3.7 → comate_cli-0.3.9}/tests/test_task_panel_rendering.py

@@ -38,6 +38,7 @@ class _StubMixin(RenderPanelsMixin):
         self._todo_panel_expanded_max_lines = 12
         self._run_start_time = None
         self._tool_result_flash_active = False
+        self._busy = False
 
     def _terminal_width(self) -> int:
         return 80

{comate_cli-0.3.7 → comate_cli-0.3.9}/uv.lock

@@ -364,7 +364,7 @@ wheels = [
 
 [[package]]
 name = "comate-agent-sdk"
-version = "0.3.4"
+version = "0.3.8"
 source = { editable = "../../" }
 dependencies = [
     { name = "aiohttp" },
@@ -429,11 +429,10 @@ dev = [
 
 [[package]]
 name = "comate-cli"
-version = "0.3.4"
+version = "0.3.8"
 source = { editable = "." }
 dependencies = [
     { name = "comate-agent-sdk" },
-    { name = "packaging" },
     { name = "prompt-toolkit" },
     { name = "rich" },
 ]
@@ -446,7 +445,6 @@ dev = [
 [package.metadata]
 requires-dist = [
     { name = "comate-agent-sdk", editable = "../../" },
-    { name = "packaging", specifier = ">=25.0" },
     { name = "prompt-toolkit", specifier = ">=3.0" },
     { name = "rich", specifier = ">=14.0" },
 ]