comate-cli 0.2.3__tar.gz → 0.2.5__tar.gz

{comate_cli-0.2.3 → comate_cli-0.2.5}/.gitignore

@@ -5,6 +5,7 @@ __pycache__/
 .agent
 .agents
 set_env.sh
+.worktrees/
 # C extensions
 *.so
 
@@ -222,4 +223,4 @@ __marimo__/
 ./tmp/
 
 # OS generated files
-.DS_Store
+.DS_Store.worktrees/

{comate_cli-0.2.3 → comate_cli-0.2.5}/PKG-INFO

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

@@ -230,7 +230,7 @@ def _format_resume_hint(session_id: str | None) -> str | None:
 async def _preload_mcp_in_tui(session: ChatSession) -> None:
     """在 TUI 内异步加载 MCP，初始化阶段不输出 scrollback 文案。"""
     runtime = session.runtime
-    if not bool(runtime.options.mcp_enabled):
+    if not bool(runtime.config.mcp_enabled):
         return
 
     try:

{comate_cli-0.2.3 → comate_cli-0.2.5}/comate_cli/terminal_agent/event_renderer.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import time
+from collections import deque
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Literal
@@ -17,6 +18,7 @@ from comate_agent_sdk.agent.events import (
     SubagentStopEvent,
     SubagentToolCallEvent,
     SubagentToolResultEvent,
+    TeamMessageEvent,
     TextEvent,
     ThinkingEvent,
     TaskUpdatedEvent,
@@ -30,7 +32,7 @@ from rich.console import RenderableType
 from rich.text import Text
 
 from comate_cli.terminal_agent.models import HistoryEntry, LoadingState
-from comate_cli.terminal_agent.tool_view import summarize_tool_args, resolve_display_tool_name
+from comate_cli.terminal_agent.tool_view import summarize_tool_args, resolve_display_tool_name, should_show_tool_in_scrollback
 from comate_cli.terminal_agent.env_utils import read_env_int
 
 logger = logging.getLogger(__name__)
@@ -38,6 +40,7 @@ logger = logging.getLogger(__name__)
 _DEFAULT_TOOL_ERROR_SUMMARY_MAX_LEN = 160
 _DEFAULT_TOOL_PANEL_MAX_LINES = 4
 _DEFAULT_TASK_PANEL_MAX_LINES = 6
+_RECENT_TEAM_EVENT_CACHE_SIZE = 128
 
 
 def _truncate(content: str, max_len: int = 120) -> str:
@@ -108,23 +111,25 @@ def _task_sort_key(task: dict[str, Any]) -> tuple[int, int]:
 
 
 def _format_task_row(task: dict[str, Any]) -> str:
-    task_id = str(task.get("id", "?")).strip() or "?"
+    """格式化单条 task 行。
+
+    符号约定：
+    - ✓ completed
+    - ◼ in_progress
+    - ▢ pending (unblocked)
+    - ▫ pending (blocked) — 视觉相似的中间符号，渲染层统一显示为 ▢ 但应用不同颜色
+    """
     subject = str(task.get("subject", "")).strip() or "(untitled)"
-    owner = str(task.get("owner", "")).strip()
     status = str(task.get("status", "pending")).strip().lower()
     open_blocked_by = task.get("open_blocked_by", [])
-    owner_suffix = f" owner={owner}" if owner else ""
-    blocked_suffix = ""
-    if isinstance(open_blocked_by, list) and open_blocked_by:
-        blocked_suffix = f" blocked by #{','.join(str(item) for item in open_blocked_by)}"
 
     if status == "completed":
-        return f"  ✓ [#{task_id}] {subject}{owner_suffix}"
+        return f"✓ {subject}"
     if status == "in_progress":
-        return f"  ◉ [#{task_id}] {subject}{owner_suffix}"
-    if blocked_suffix:
-        return f"  ◌ [#{task_id}] {subject}{owner_suffix}{blocked_suffix}"
-    return f"  ○ [#{task_id}] {subject}{owner_suffix}"
+        return f"◼ {subject}"
+    if isinstance(open_blocked_by, list) and open_blocked_by:
+        return f"▫ {subject}"
+    return f"▢ {subject}"
 
 
 @dataclass
@@ -159,6 +164,7 @@ class EventRenderer:
     def __init__(self, project_root: Path | None = None) -> None:
         self._history: list[HistoryEntry] = []
         self._running_tools: dict[str, _RunningTool] = {}
+        self._tool_call_args: dict[str, dict[str, Any]] = {}
         self._thinking_content: str = ""
         self._assistant_buffer = ""
         self._loading_state: LoadingState = LoadingState.idle()
@@ -183,6 +189,9 @@ class EventRenderer:
             50,
         )
         self._latest_diff_lines: list[str] | None = None
+        self._recent_team_event_keys: deque[tuple[str, str, str, str, str, str]] = deque(
+            maxlen=_RECENT_TEAM_EVENT_CACHE_SIZE
+        )
 
     def start_turn(self) -> None:
         self._flush_assistant_segment()
@@ -229,7 +238,9 @@ class EventRenderer:
     def reset_history_view(self) -> None:
         """重置 history 视图状态（用于会话切换后的重新加载）。"""
         self._history = []
+        self._recent_team_event_keys.clear()
         self._running_tools.clear()
+        self._tool_call_args.clear()
         self._thinking_content = ""
         self._assistant_buffer = ""
         self._loading_state = LoadingState.idle()
@@ -294,6 +305,74 @@ class EventRenderer:
             HistoryEntry(entry_type="system", text=normalized, severity=severity)
         )
 
+    @staticmethod
+    def _team_event_key(
+        *,
+        agent_name: str,
+        from_agent: str,
+        to_agent: str | None,
+        message_type: str,
+        timestamp: str,
+        content_preview: str,
+    ) -> tuple[str, str, str, str, str, str]:
+        return (
+            str(agent_name or "").strip(),
+            str(from_agent or "").strip(),
+            str(to_agent or "").strip(),
+            str(message_type or "").strip(),
+            str(timestamp or "").strip(),
+            str(content_preview or "").strip(),
+        )
+
+    def append_team_message_event(
+        self,
+        *,
+        agent_name: str,
+        from_agent: str,
+        to_agent: str | None,
+        message_type: str,
+        content_preview: str,
+        timestamp: str,
+    ) -> bool:
+        event_key = self._team_event_key(
+            agent_name=agent_name,
+            from_agent=from_agent,
+            to_agent=to_agent,
+            message_type=message_type,
+            timestamp=timestamp,
+            content_preview=content_preview,
+        )
+        if event_key in self._recent_team_event_keys:
+            logger.debug(
+                "[team-diag] renderer_dedupe "
+                "agent=%r from=%r to=%r type=%r timestamp=%r preview=%r",
+                agent_name,
+                from_agent,
+                to_agent,
+                message_type,
+                timestamp,
+                content_preview,
+            )
+            return False
+
+        self._recent_team_event_keys.append(event_key)
+        target = to_agent or "[broadcast]"
+        preview_str = f' "{content_preview}"' if content_preview else ""
+        text = f"[team] {from_agent} → {target}: ({message_type}){preview_str}"
+        logger.debug(
+            "[team-diag] renderer_append "
+            "agent=%r from=%r to=%r type=%r timestamp=%r preview=%r history_len_before=%d",
+            agent_name,
+            from_agent,
+            to_agent,
+            message_type,
+            timestamp,
+            content_preview,
+            len(self._history),
+        )
+        self.append_system_message(text)
+        return True
+
     def append_elapsed_message(self, content: str) -> None:
         """追加一条灰色无前缀的计时统计行到 history scrollback."""
         normalized = content.strip()
@@ -389,7 +468,7 @@ class EventRenderer:
             return lines
 
         clipped = lines[: normalized_limit - 1]
-        clipped.append(f"  … (+{len(lines) - (normalized_limit - 1)})")
+        clipped.append(f"… (+{len(lines) - (normalized_limit - 1)})")
         return clipped
 
     def full_task_panel_lines(self) -> list[str]:
@@ -655,7 +734,16 @@ class EventRenderer:
             return
 
         all_completed = all(str(item.get("status", "")).strip().lower() == "completed" for item in normalized)
-        header = "Tasks" if list_id == "default" else f"Tasks · {list_id}"
+        # 标题：显示 ID 最小的 in_progress task 的 subject，否则 "Tasks"
+        in_progress_tasks = [
+            t for t in normalized
+            if str(t.get("status", "")).strip().lower() == "in_progress"
+        ]
+        if in_progress_tasks:
+            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"
         if not all_completed:
             if not self._current_tasks:
                 self._task_started_at_monotonic = time.monotonic()
@@ -701,17 +789,21 @@ class EventRenderer:
 
         for task in tasks:
             line = _format_task_row(task)
-            if line.startswith("  ✓ "):
+            if line.startswith("✓ "):
                 result.append("  ✓ ")
-                result.append(line[4:], style="green strike")
-            elif line.startswith("  ◉ "):
-                result.append("  ◉ ")
-                result.append(line[4:], style="yellow")
-            elif line.startswith("  ◌ "):
-                result.append("  ◌ ")
-                result.append(line[4:], style="dim")
+                result.append(line[2:], style="green strike")
+            elif line.startswith("◼ "):
+                result.append("  ◼ ")
+                result.append(line[2:], style="#F97316")
+            elif line.startswith("▫ "):
+                # blocked pending: display as ▢ + dim
+                result.append("  ▢ ")
+                result.append(line[2:], style="dim")
+            elif line.startswith("▢ "):
+                result.append("  ▢ ")
+                result.append(line[2:])
             else:
-                result.append(line)
+                result.append(f"  {line}")
             result.append("\n")
 
         # 移除末尾的换行
@@ -786,18 +878,15 @@ class EventRenderer:
             case ToolCallEvent(tool=tool_name, args=arguments, tool_call_id=tool_call_id):
                 args_dict = arguments if isinstance(arguments, dict) else {"_raw": str(arguments)}
                 self._thinking_content = ""
-                # Task* / AskUserQuestion / ExitPlanMode: skip normal tool tracking.
-                if tool_name.lower() in ("taskcreate", "tasklist", "taskget", "taskupdate", "askuserquestion", "exitplanmode"):
+                # Store args for ToolResult phase lookup.
+                self._tool_call_args[tool_call_id] = args_dict
+                if not should_show_tool_in_scrollback(tool_name, args_dict):
                     self._rebuild_loading_line()
                     return (False, None)
                 self._append_tool_call(tool_name, args_dict, tool_call_id)
             case ToolResultEvent(tool=tool_name, result=result, tool_call_id=tool_call_id, is_error=is_error, metadata=metadata):
-                if tool_name.lower() in ("taskcreate", "tasklist", "taskupdate") and not is_error:
-                    # Successful task coordination updates should not spam scrollback.
-                    self._rebuild_loading_line()
-                    return (False, None)
-                if tool_name.lower() in ("askuserquestion", "exitplanmode") and not is_error:
-                    # Success is already visible via UserQuestionEvent / PlanApprovalRequiredEvent.
+                stored_args = self._tool_call_args.pop(tool_call_id, {})
+                if not should_show_tool_in_scrollback(tool_name, stored_args, is_result=True, is_error=is_error):
                     self._running_tools.pop(tool_call_id, None)
                     self._rebuild_loading_line()
                     return (False, None)
@@ -941,6 +1030,22 @@ class EventRenderer:
                 self._history.append(
                     HistoryEntry(entry_type="system", text=text)
                 )
+            case TeamMessageEvent(
+                agent_name=agent_name,
+                from_agent=from_agent,
+                to_agent=to_agent,
+                message_type=message_type,
+                content_preview=content_preview,
+                timestamp=timestamp,
+            ):
+                self.append_team_message_event(
+                    agent_name=agent_name,
+                    from_agent=from_agent,
+                    to_agent=to_agent,
+                    message_type=message_type,
+                    content_preview=content_preview,
+                    timestamp=timestamp,
+                )
             case _:
                 logger.debug("Unhandled event type: %s", type(event).__name__)
 

{comate_cli-0.2.3 → comate_cli-0.2.5}/comate_cli/terminal_agent/tool_view.py

@@ -60,6 +60,48 @@ _MAX_FANCY_LINE_LEN = 100
 _ALLOWED_STATUS = {"pending", "in_progress", "completed"}
 _ALLOWED_PRIORITY = {"high", "medium", "low"}
 
+# Tools that are always hidden from scrollback (have dedicated event channels).
+_ALWAYS_HIDDEN_TOOLS: frozenset[str] = frozenset({"askuserquestion", "exitplanmode"})
+
+# Task coordination tools hidden from scrollback unless erroring.
+_SILENT_TASK_TOOLS: frozenset[str] = frozenset({"tasklist", "taskget"})
+
+
+def should_show_tool_in_scrollback(
+    tool_name: str,
+    args: dict[str, Any],
+    is_result: bool = False,
+    is_error: bool = False,
+) -> bool:
+    """Determine whether a tool call/result should appear in scrollback.
+
+    Centralises the visibility rules so that both the live event pipeline
+    (event_renderer) and the resume replay pipeline (history_sync) share
+    one source of truth.
+    """
+    lowered = tool_name.lower()
+
+    # AskUserQuestion / ExitPlanMode: only show errors.
+    if lowered in _ALWAYS_HIDDEN_TOOLS:
+        return is_result and is_error
+
+    # TaskCreate: always visible.
+    if lowered == "taskcreate":
+        return True
+
+    # TaskUpdate: visible only when status=completed, or on error.
+    if lowered == "taskupdate":
+        if str(args.get("status", "")).lower() == "completed":
+            return True
+        return is_result and is_error
+
+    # TaskList / TaskGet: only show errors.
+    if lowered in _SILENT_TASK_TOOLS:
+        return is_result and is_error
+
+    # All other tools: always visible.
+    return True
+
 
 def _parse_todos_value(value: Any) -> list[dict[str, Any]] | None:
     if isinstance(value, list):

{comate_cli-0.2.3 → comate_cli-0.2.5}/comate_cli/terminal_agent/tui.py

@@ -15,7 +15,7 @@ from contextlib import suppress
 from pathlib import Path
 from typing import Any
 
-from prompt_toolkit.application import Application
+from prompt_toolkit.application import Application, run_in_terminal
 from prompt_toolkit.completion import (
     ThreadedCompleter,
     merge_completers,
@@ -36,6 +36,7 @@ from comate_agent_sdk.agent.events import (
     PlanApprovalRequiredEvent,
     SessionInitEvent,
     StopEvent,
+    TeamMessageEvent,
 )
 
 from comate_cli.terminal_agent.animations import (
@@ -74,6 +75,8 @@ from comate_cli.terminal_agent.tui_parts import (
 
 logger = logging.getLogger(__name__)
 
+_TASK_POLL_INTERVAL_S = 2.0
+
 
 class TerminalAgentTUI(
     KeyBindingsMixin,
@@ -95,8 +98,46 @@ class TerminalAgentTUI(
         except Exception:
             pass
         self._renderer = renderer
+        self._task_poll_next_at = time.monotonic() + _TASK_POLL_INTERVAL_S
         self._rewind_store = RewindStore(session=self._session, project_root=Path.cwd())
 
+        # Team inbox 消息直连 scrollback（绕开 session_event_queue，实现实时显示）
+        _renderer = self._renderer
+        def _on_team_message(event: TeamMessageEvent) -> None:
+            logger.debug(
+                "[team-diag] tui_append "
+                "session_id=%r recv_agent=%r from=%r to=%r type=%r timestamp=%r "
+                "preview=%r history_len_before=%d",
+                self._session.session_id,
+                event.agent_name,
+                event.from_agent,
+                event.to_agent,
+                event.message_type,
+                event.timestamp,
+                event.content_preview,
+                len(self._renderer.history_entries()),
+            )
+            def _write() -> None:
+                _renderer.append_team_message_event(
+                    agent_name=str(event.agent_name or ""),
+                    from_agent=str(event.from_agent or ""),
+                    to_agent=event.to_agent,
+                    message_type=str(event.message_type or ""),
+                    content_preview=str(event.content_preview or ""),
+                    timestamp=str(event.timestamp or ""),
+                )
+            try:
+                from prompt_toolkit.application import get_app
+                from prompt_toolkit.application.dummy import DummyApplication
+                app = get_app()
+                if not isinstance(app, DummyApplication):
+                    app.create_background_task(run_in_terminal(_write, in_executor=False))
+                    return
+            except Exception:
+                pass
+            _write()
+        self._session._agent._team.team_message_event_callback = _on_team_message
+
         self._tool_panel_max_lines = read_env_int(
             "AGENT_SDK_TUI_TOOL_PANEL_MAX_LINES",
             4,
@@ -999,6 +1040,34 @@ class TerminalAgentTUI(
         self._sync_focus_for_mode()
         self._render_dirty = True
 
+    def _fetch_tasks_from_store(self) -> tuple[list[dict], str] | None:
+        """从 TaskStore 读取最新 task 列表（纯 I/O，线程安全）。
+
+        返回 (task_dicts, list_id) 或 None。
+        不修改任何共享状态——状态更新由调用方在主线程完成。
+        """
+        try:
+            agent = getattr(self._session, "_agent", None)
+            if agent is None:
+                return None
+            store = getattr(agent, "_task_store", None)
+            if store is None:
+                return None
+            tasks = store.list_tasks()
+            if not tasks:
+                return None
+            # 转换 TaskItem 为 dict（与 chat_session.py 格式一致）
+            task_dicts: list[dict] = []
+            for task in tasks:
+                payload = task.model_dump(mode="json")
+                payload["open_blocked_by"] = store.get_open_blocked_by(task.id)
+                task_dicts.append(payload)
+            list_id = store.list_id_value()
+            return task_dicts, list_id
+        except Exception:
+            logger.debug("task store fetch failed", exc_info=True)
+            return None
+
     async def _ui_tick(self) -> None:
         try:
             while not self._closing:
@@ -1053,6 +1122,17 @@ class TerminalAgentTUI(
                     or self._renderer.has_running_tools()
                 )
                 sleep_s = 1 / 6 if fast else 1 / 4
+
+                # 定时轮询 TaskStore 刷新 task 面板
+                now_poll = time.monotonic()
+                if now_poll >= self._task_poll_next_at:
+                    self._task_poll_next_at = now_poll + _TASK_POLL_INTERVAL_S
+                    poll_result = await asyncio.to_thread(self._fetch_tasks_from_store)
+                    if poll_result is not None:
+                        task_dicts, list_id = poll_result
+                        self._renderer._update_tasks(task_dicts, list_id=list_id)
+                        self._render_dirty = True
+
                 await asyncio.sleep(sleep_s)
         except asyncio.CancelledError:
             return

{comate_cli-0.2.3 → comate_cli-0.2.5}/comate_cli/terminal_agent/tui_parts/commands.py

@@ -875,7 +875,7 @@ class CommandsMixin:
             agent_level = self._session._agent.level
             if agent_level:
                 current_level = agent_level
-            llm_levels = self._session._agent.options.llm_levels
+            llm_levels = self._session._agent._runtime_state.llm_levels
         except Exception:
             pass
 

{comate_cli-0.2.3 → comate_cli-0.2.5}/comate_cli/terminal_agent/tui_parts/history_sync.py

@@ -18,6 +18,7 @@ from comate_cli.terminal_agent.history_printer import (
 from comate_cli.terminal_agent.logo import print_logo
 from comate_cli.terminal_agent.markdown_render import render_markdown_to_plain
 from comate_cli.terminal_agent.models import HistoryEntry
+from comate_cli.terminal_agent.tool_view import should_show_tool_in_scrollback
 
 console = Console()
 logger = logging.getLogger(__name__)
@@ -76,6 +77,7 @@ class HistorySyncMixin:
 
         # 维护 tool_call_id 映射，用于匹配工具调用和结果
         tool_call_info: dict[str, tuple[str, str]] = {}  # tool_call_id → (tool_name, signature)
+        tool_call_args: dict[str, dict[str, Any]] = {}
 
         for item in history:
             if item.item_type == ItemType.USER_MESSAGE:
@@ -103,6 +105,7 @@ class HistorySyncMixin:
                         signature = self._build_resume_tool_signature(tool_name, args_dict)
                         # 存储映射，不调用 restore_tool_call（避免加入 _running_tools）
                         tool_call_info[tc.id] = (tool_name, signature)
+                        tool_call_args[tc.id] = args_dict
 
                 # 显示 assistant text
                 assistant_text = self._extract_assistant_text(item).strip()
@@ -127,6 +130,11 @@ class HistorySyncMixin:
                     tool_name = getattr(message, "tool_name", item.tool_name or "UnknownTool")
                     signature = f"{tool_name}()"
 
+                # Apply shared visibility filter.
+                resume_args = tool_call_args.get(tool_call_id, {}) if tool_call_id else {}
+                if not should_show_tool_in_scrollback(tool_name, resume_args, is_result=True, is_error=is_error):
+                    continue
+
                 # Extract diff from raw_envelope for Edit/MultiEdit
                 diff_lines: list[str] | None = None
                 if tool_name in ("Edit", "MultiEdit") and not is_error:
@@ -220,6 +228,25 @@ class HistorySyncMixin:
         pending = self._pending_history_entries()
         if not pending:
             return
+        team_pending = [
+            entry
+            for entry in pending
+            if entry.entry_type == "system" and isinstance(entry.text, str) and entry.text.startswith("[team] ")
+        ]
+        if team_pending:
+            logger.debug(
+                "[team-diag] history_async_drain "
+                "session_id=%r pending_count=%d team_pending_count=%d printed_index=%d",
+                getattr(self._session, "session_id", ""),
+                len(pending),
+                len(team_pending),
+                self._printed_history_index,
+            )
+            for entry in team_pending:
+                logger.debug(
+                    "[team-diag] history_async_entry text=%r",
+                    entry.text,
+                )
         group = render_history_group(
             console,
             pending,
@@ -245,6 +272,25 @@ class HistorySyncMixin:
         pending = self._pending_history_entries()
         if not pending:
             return
+        team_pending = [
+            entry
+            for entry in pending
+            if entry.entry_type == "system" and isinstance(entry.text, str) and entry.text.startswith("[team] ")
+        ]
+        if team_pending:
+            logger.debug(
+                "[team-diag] history_sync_drain "
+                "session_id=%r pending_count=%d team_pending_count=%d printed_index=%d",
+                getattr(self._session, "session_id", ""),
+                len(pending),
+                len(team_pending),
+                self._printed_history_index,
+            )
+            for entry in team_pending:
+                logger.debug(
+                    "[team-diag] history_sync_entry text=%r",
+                    entry.text,
+                )
         group = render_history_group(
             console,
             pending,
@@ -259,9 +305,30 @@ class HistorySyncMixin:
         entries = self._renderer.history_entries()
         if self._printed_history_index >= len(entries):
             return []
+        previous_index = self._printed_history_index
         pending = entries[self._printed_history_index :]
         self._printed_history_index = len(entries)
         # 根据 _show_thinking 开关过滤 thinking 条目
         if not getattr(self, "_show_thinking", False):
             pending = [e for e in pending if e.entry_type != "thinking"]
+        team_pending = [
+            entry
+            for entry in pending
+            if entry.entry_type == "system" and isinstance(entry.text, str) and entry.text.startswith("[team] ")
+        ]
+        if team_pending:
+            logger.debug(
+                "[team-diag] history_pending "
+                "session_id=%r previous_index=%d new_index=%d total_entries=%d team_pending_count=%d",
+                getattr(self._session, "session_id", ""),
+                previous_index,
+                self._printed_history_index,
+                len(entries),
+                len(team_pending),
+            )
+            for entry in team_pending:
+                logger.debug(
+                    "[team-diag] history_pending_entry text=%r",
+                    entry.text,
+                )
         return pending

{comate_cli-0.2.3 → comate_cli-0.2.5}/comate_cli/terminal_agent/tui_parts/render_panels.py

@@ -239,7 +239,7 @@ class RenderPanelsMixin:
             )
             if len(all_lines) > len(collapsed_lines) and collapsed_lines:
                 last_line = collapsed_lines[-1]
-                if last_line.startswith("  … (+"):
+                if last_line.startswith("… (+"):
                     collapsed_lines[-1] = f"{last_line}, Ctrl+Y to expand"
             return collapsed_lines
 
@@ -558,13 +558,42 @@ class RenderPanelsMixin:
                 if title_elapsed_suffix:
                     fragments.append(("fg:#6B7280", title_elapsed_suffix))
             else:
-                clipped = fit_single_line(line, width - 1)
-                style = "fg:#CBD5E1"
-                if "✓" in line:
-                    style = "fg:#86EFAC"
-                elif "◉" in line:
-                    style = "fg:#FDE68A"
-                fragments.append((style, clipped))
+                clipped = fit_single_line(line, width - 3)  # 留空间给 prefix + space
+                # prefix 列：第一条任务行用 ⎿，后续用空格
+                is_first_task_row = idx == 1
+                prefix_char = "⎿" if is_first_task_row else " "
+                prefix_style = "fg:#555555"
+
+                # 解析符号和文本，应用分色
+                if clipped.startswith("✓ "):
+                    symbol, text = "✓", clipped[2:]
+                    symbol_style = "fg:#86EFAC"
+                    text_style = "fg:#6B7280 strike"
+                elif clipped.startswith("◼ "):
+                    symbol, text = "◼", clipped[2:]
+                    symbol_style = "fg:#F97316"
+                    text_style = "fg:#E2E8F0"
+                elif clipped.startswith("▫ "):
+                    # blocked pending: ▫ 是中间符号，渲染时显示为 ▢
+                    symbol, text = "▢", clipped[2:]
+                    symbol_style = "fg:#4B5563"
+                    text_style = "fg:#4B5563"
+                elif clipped.startswith("▢ "):
+                    symbol, text = "▢", clipped[2:]
+                    symbol_style = "fg:#6B7280"
+                    text_style = "fg:#6B7280"
+                else:
+                    # 溢出行 "… (+N)" 等
+                    symbol, text = "", clipped
+                    symbol_style = ""
+                    text_style = "fg:#6B7280"
+
+                fragments.append((prefix_style, prefix_char))
+                fragments.append(("", " "))
+                if symbol:
+                    fragments.append((symbol_style, symbol))
+                    fragments.append(("", " "))
+                fragments.append((text_style, text))
             if idx != last_index:
                 fragments.append(("", "\n"))
         return fragments

{comate_cli-0.2.3 → comate_cli-0.2.5}/pyproject.toml

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