comate-cli 0.6.0__tar.gz → 0.6.1__tar.gz

{comate_cli-0.6.0 → comate_cli-0.6.1}/PKG-INFO

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

@@ -22,7 +22,6 @@ from comate_agent_sdk.tools import tool
 
 from comate_cli.terminal_agent.event_renderer import EventRenderer
 from comate_cli.terminal_agent.logo import print_logo
-from comate_cli.terminal_agent.tips import TIPS
 from comate_cli.terminal_agent.preflight import run_preflight_if_needed
 from comate_cli.terminal_agent.resume_selector import select_resume_session_id
 from comate_cli.terminal_agent.rpc_stdio import StdioRPCBridge
@@ -357,7 +356,6 @@ async def run(
         return
 
     print_logo(console, project_root=project_root)
-    console.print(f"[dim]💡 Tip: {random.choice(TIPS)}[/dim]")
 
     if resume_select and not resume_session_id:
         selected_session_id = await select_resume_session_id(console, cwd=project_root)
@@ -373,6 +371,9 @@ async def run(
     logging_session = setup_tui_logging(renderer, project_root=project_root)
 
     session, mode = _resolve_session(agent, resume_session_id, cwd=project_root)
+    # setup_tui_logging 在 _resolve_session 前安装，用于捕获 session 初始化期 warning/error。
+    # 这些日志没有交互 anchor，需在恢复历史或首次用户输入前落为 standalone log。
+    renderer.flush_pending_logs()
 
     # 版本检查：带超时，不阻塞启动
     try:

{comate_cli-0.6.0 → comate_cli-0.6.1}/comate_cli/terminal_agent/event_renderer.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import re
+import threading
 import time
 from collections import deque
 from dataclasses import dataclass, field
@@ -280,6 +281,7 @@ class EventRenderer:
         self._turn_received_text_delta: bool = False
         self._turn_received_thinking_delta: bool = False
         self._text_delta_started: bool = False
+        self._active_text_message_id: str | None = None
         # ━━━━━ spec §4.1 新管道状态字段（Phase 1.2 引入，Phase 4-6 接入） ━━━━━
         # Pipeline A: text line-commit
         self._text_pending: str = ""
@@ -289,10 +291,14 @@ class EventRenderer:
         self._thinking_batch: str = ""
         # Pipeline C: loading 行 aux
         self._loading_aux_text: str = ""
+        self._pending_logs: list[tuple[Literal["warning", "error"], str]] = []
+        self._pending_logs_lock = threading.Lock()
 
     def _append_history_entry(self, entry: HistoryEntry) -> None:
         self._history.append(entry)
         self._last_history_append_at = time.monotonic()
+        if entry.entry_type == "tool_result":
+            self.flush_pending_logs()
 
     # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
     # spec §6 流式新管道方法集（Phase 1-6 新增；Phase 7 接入 handle_event）
@@ -484,7 +490,7 @@ class EventRenderer:
         self._text_pending += delta
         while "\n" in self._text_pending:
             line, self._text_pending = self._text_pending.split("\n", 1)
-            if line == "" and not self._text_delta_started:
+            if line.strip() == "" and not self._text_delta_started:
                 continue
             self._text_delta_started = True
             self._handle_complete_line(line)
@@ -530,6 +536,7 @@ class EventRenderer:
         self._thinking_batch = ""
         self._loading_aux_text = ""
         self._text_delta_started = False
+        self._active_text_message_id = None
 
     def _should_drop_duplicate_system_message(
         self,
@@ -563,6 +570,7 @@ class EventRenderer:
         self._turn_received_text_delta = False
         self._turn_received_thinking_delta = False
         self._text_delta_started = False
+        self._active_text_message_id = None
         # spec §6.4：清空新 5 字段（每 turn 起点保证状态干净）
         self._text_pending = ""
         self._held_pipe_line = None
@@ -570,6 +578,7 @@ class EventRenderer:
         self._thinking_batch = ""
         self._loading_aux_text = ""
         self._rebuild_loading_line()
+        self.flush_pending_logs()
 
     def seed_user_message(self, content: str) -> None:
         normalized = content.strip()
@@ -578,9 +587,10 @@ class EventRenderer:
         self._flush_assistant_segment()
         self._append_history_entry(HistoryEntry(entry_type="user", text=normalized))
         self._maybe_append_file_ref_hint(normalized)
+        self.flush_pending_logs()
 
     def _maybe_append_file_ref_hint(self, text: str) -> None:
-        """Append a dim ⎿ hint for the first valid @path reference."""
+        """Append dim ⎿ hints for valid @path references."""
         if self._project_root is None:
             return
         for match in FILE_REF_PATTERN.finditer(text):
@@ -591,7 +601,7 @@ class EventRenderer:
                     self._append_history_entry(
                         HistoryEntry(entry_type="file_ref", text=f"Listed directory {raw_path}")
                     )
-                    return
+                    continue
                 if candidate.is_file():
                     hint = f"Read {raw_path}"
                     if candidate.stat().st_size <= _FILE_REF_MAX_COUNT_BYTES:
@@ -602,7 +612,7 @@ class EventRenderer:
                         except OSError:
                             pass
                     self._append_history_entry(HistoryEntry(entry_type="file_ref", text=hint))
-                    return
+                    continue
             except OSError:
                 continue
 
@@ -614,6 +624,7 @@ class EventRenderer:
         # text_pending / thinking）保证 scrollback 看到完整内容
         self._force_flush_all()
         self._flush_assistant_segment()
+        self.flush_pending_logs()
         self._pending_tool_starts.clear()
         self._rebuild_loading_line()
 
@@ -653,6 +664,7 @@ class EventRenderer:
         self._turn_received_text_delta = False
         self._turn_received_thinking_delta = False
         self._text_delta_started = False
+        self._active_text_message_id = None
         # spec §6.4：清空 5 个新字段（与 start_turn 同语义）
         self._text_pending = ""
         self._held_pipe_line = None
@@ -664,6 +676,8 @@ class EventRenderer:
         self._current_task_title = None
         self._task_started_at_monotonic = None
         self._latest_diff_lines = None
+        with self._pending_logs_lock:
+            self._pending_logs.clear()
 
     @property
     def latest_diff_lines(self) -> list[str] | None:
@@ -718,12 +732,19 @@ class EventRenderer:
         拼接到 spinner phrase。无容器时返回 ""。"""
         return self._loading_aux_text
 
-    def append_subtitle(self, text: str) -> None:
+    def append_subtitle(
+        self,
+        text: str,
+        *,
+        severity: Literal["info", "warning", "error"] = "info",
+    ) -> None:
         """Append a ⎿ subtitle entry, visually attached to the preceding entry."""
         normalized = text.strip()
         if not normalized:
             return
-        self._append_history_entry(HistoryEntry(entry_type="file_ref", text=normalized))
+        self._append_history_entry(
+            HistoryEntry(entry_type="file_ref", text=normalized, severity=severity)
+        )
 
     def append_system_message(
         self,
@@ -744,6 +765,39 @@ class EventRenderer:
             HistoryEntry(entry_type="system", text=normalized, severity=severity)
         )
 
+    def enqueue_log(
+        self,
+        *,
+        severity: Literal["warning", "error"],
+        message: str,
+    ) -> None:
+        """线程安全入口：只入队，不调度 prompt_toolkit，不立即写 scrollback。"""
+        normalized = message.strip()
+        if not normalized:
+            return
+        with self._pending_logs_lock:
+            self._pending_logs.append((severity, normalized))
+
+    def flush_pending_logs(self) -> None:
+        """Drain pending log，按当前 history anchor 决定 attached 形态。"""
+        with self._pending_logs_lock:
+            if not self._pending_logs:
+                return
+            drained = list(self._pending_logs)
+            self._pending_logs.clear()
+
+        has_anchor = bool(self._history)
+        for severity, message in drained:
+            self._append_history_entry(
+                HistoryEntry(
+                    entry_type="log",
+                    text=message,
+                    severity=severity,
+                    attached=has_anchor,
+                )
+            )
+            has_anchor = True
+
     @staticmethod
     def _team_event_key(
         *,
@@ -943,6 +997,7 @@ class EventRenderer:
             HistoryEntry(entry_type="assistant", text=self._assistant_buffer)
         )
         self._assistant_buffer = ""
+        self.flush_pending_logs()
 
     def _append_assistant_text(self, text: str) -> None:
         self._assistant_buffer += text
@@ -1460,8 +1515,12 @@ class EventRenderer:
         match event:
             case SessionInitEvent(session_id=_):
                 pass
-            case TextDeltaEvent(delta=delta, message_id=_):
+            case TextDeltaEvent(delta=delta, message_id=message_id):
                 if delta:
+                    normalized_message_id = str(message_id or "").strip()
+                    if normalized_message_id and normalized_message_id != self._active_text_message_id:
+                        self._active_text_message_id = normalized_message_id
+                        self._text_delta_started = False
                     # spec §6.1：text delta → 累到 _text_pending → 按 \n 切完整行入队
                     self._consume_text_delta(delta)
                     self._turn_received_text_delta = True

{comate_cli-0.6.0 → comate_cli-0.6.1}/comate_cli/terminal_agent/history_printer.py

@@ -19,14 +19,50 @@ from comate_cli.terminal_agent.message_style import ASSISTANT_PREFIX
 from comate_cli.terminal_agent.models import HistoryEntry
 
 
-def _render_subtitle_line(subtitle: str, *, error: bool = False) -> Text:
-    """Render a ⎿ subtitle line for tool results."""
+def _render_subtitle_line(
+    subtitle: str,
+    *,
+    error: bool = False,
+    warning: bool = False,
+) -> Text:
+    """Render a ⎿ subtitle line for tool results / attached log entries."""
+    content_lines = str(subtitle).splitlines() or [""]
+    text_style = _subtitle_text_style(error=error, warning=warning)
+
     line = Text()
     line.append(f"  {BOTTOM_LEFT_CROP} ", style="#555555")
+    line.append(f" {content_lines[0]}", style=text_style)
+    for continuation in content_lines[1:]:
+        line.append("\n")
+        line.append("      ")
+        line.append(continuation, style=text_style)
+    return line
+
+
+def _subtitle_text_style(*, error: bool = False, warning: bool = False) -> str:
     if error:
-        line.append(f" {subtitle}", style="bold red")
-    else:
-        line.append(f" {subtitle}", style="dim")
+        return "bold #FF6B6B"
+    if warning:
+        return "#E8B830"
+    return "dim"
+
+
+def _render_subtitle_continuation_line(
+    subtitle: str,
+    *,
+    error: bool = False,
+    warning: bool = False,
+) -> Text:
+    """Render a consecutive attached subtitle without repeating the ⎿ glyph."""
+    content_lines = str(subtitle).splitlines() or [""]
+    text_style = _subtitle_text_style(error=error, warning=warning)
+
+    line = Text()
+    for idx, content in enumerate(content_lines):
+        if idx > 0:
+            line.append("\n")
+        line.append("      ")
+        line.append(content, style=text_style)
     return line
 
 
@@ -100,6 +136,7 @@ def render_history_group(
     # 后续行用 2 空格缩进保持视觉对齐。`prev_was_assistant` 把 run 状态跨 drain 传过来。
     renderables: list[Any] = []
     needs_leading_gap_after_thinking = prev_was_thinking
+    subtitle_chain_active = False
     for idx, entry in enumerate(entries):
         is_assistant = entry.entry_type == "assistant"
         in_run_continuation = is_assistant and prev_was_assistant
@@ -116,6 +153,7 @@ def render_history_group(
                 and next_entry is not None
                 and _starts_with_block_marker(next_entry)
             ):
+                subtitle_chain_active = False
                 continue
 
         # Thinking entries: 灰色显示，无前缀。thinking 流式文本里的空白行
@@ -125,6 +163,7 @@ def render_history_group(
             content_lines = [line for line in content.splitlines() if line.strip()]
             if not content_lines:
                 prev_was_assistant = False
+                subtitle_chain_active = False
                 continue
             needs_leading_gap_after_thinking = False
             line_text = Text()
@@ -143,6 +182,7 @@ def render_history_group(
             if not next_is_thinking and not suppress_trailing_gap:
                 renderables.append(Text(""))
             prev_was_assistant = False
+            subtitle_chain_active = False
             continue
 
         if needs_leading_gap_after_thinking:
@@ -156,6 +196,7 @@ def render_history_group(
             renderables.append(line_text)
             renderables.append(Text(""))
             prev_was_assistant = False
+            subtitle_chain_active = False
             continue
 
         # System entries: 按 severity 区分视觉样式，缩进 2 空格与消息内容列对齐
@@ -176,15 +217,28 @@ def render_history_group(
             renderables.append(line_text)
             renderables.append(Text(""))
             prev_was_assistant = False
+            subtitle_chain_active = False
             continue
 
         # File reference hint: reuse subtitle style, attached to preceding user message
         if entry.entry_type == "file_ref":
             if renderables and isinstance(renderables[-1], Text) and not renderables[-1].plain:
                 renderables.pop()
-            renderables.append(_render_subtitle_line(str(entry.text)))
+            render_subtitle = (
+                _render_subtitle_continuation_line
+                if subtitle_chain_active
+                else _render_subtitle_line
+            )
+            renderables.append(
+                render_subtitle(
+                    str(entry.text),
+                    error=(entry.severity == "error"),
+                    warning=(entry.severity == "warning"),
+                )
+            )
             renderables.append(Text(""))
             prev_was_assistant = False
+            subtitle_chain_active = True
             continue
 
         if entry.entry_type == "tool_result":
@@ -206,6 +260,7 @@ def render_history_group(
                     renderables.append(line)
                 renderables.append(Text(""))
                 prev_was_assistant = False
+                subtitle_chain_active = bool(entry.subtitle)
                 continue
 
             content = str(entry.text)
@@ -224,6 +279,45 @@ def render_history_group(
                 renderables.append(_render_subtitle_line(entry.subtitle, error=is_error))
             renderables.append(Text(""))
             prev_was_assistant = False
+            subtitle_chain_active = bool(entry.subtitle)
+            continue
+
+        if entry.entry_type == "log":
+            if entry.attached:
+                if renderables and isinstance(renderables[-1], Text) and not renderables[-1].plain:
+                    renderables.pop()
+                render_subtitle = (
+                    _render_subtitle_continuation_line
+                    if subtitle_chain_active
+                    else _render_subtitle_line
+                )
+                renderables.append(
+                    render_subtitle(
+                        str(entry.text),
+                        error=(entry.severity == "error"),
+                        warning=(entry.severity == "warning"),
+                    )
+                )
+                subtitle_chain_active = True
+            else:
+                prefix_char = HEAVY_MULTIPLICATION if entry.severity == "error" else BLACK_CIRCLE
+                prefix_style = "bold #FF6B6B" if entry.severity == "error" else "#E8B830"
+                content = str(entry.text)
+                content_lines = content.splitlines() or [""]
+                line_text = Text()
+                line_text.append(f"{prefix_char} ", style=prefix_style)
+                line_text.append(content_lines[0], style=prefix_style)
+                for line in content_lines[1:]:
+                    line_text.append("\n")
+                    line_text.append("  ")
+                    line_text.append(line, style=prefix_style)
+                renderables.append(line_text)
+                subtitle_chain_active = False
+
+            next_is_log = next_entry is not None and next_entry.entry_type == "log"
+            if not next_is_log:
+                renderables.append(Text(""))
+            prev_was_assistant = False
             continue
 
         if hasattr(entry.text, "__rich_console__"):
@@ -264,6 +358,7 @@ def render_history_group(
         if not (is_assistant and next_is_assistant) and not suppress_trailing_gap:
             renderables.append(Text(""))
         prev_was_assistant = is_assistant
+        subtitle_chain_active = False
 
     if not renderables:
         return None

{comate_cli-0.6.0 → comate_cli-0.6.1}/comate_cli/terminal_agent/logging_adapter.py

@@ -1,4 +1,4 @@
-"""TUI logging adapter - 将日志输出到 prompt_toolkit TUI 而不破坏界面"""
+"""TUI logging adapter - 将 warning/error 日志送入 renderer pending 队列。"""
 from __future__ import annotations
 
 import logging
@@ -7,9 +7,7 @@ import sys
 import threading
 import time
 from pathlib import Path
-from typing import TYPE_CHECKING
-
-from prompt_toolkit.application import run_in_terminal
+from typing import TYPE_CHECKING, Literal
 
 if TYPE_CHECKING:
     from comate_cli.terminal_agent.event_renderer import EventRenderer
@@ -52,7 +50,7 @@ class TUILoggingHandler(logging.Handler):
     特性：
     - WARNING/ERROR 显示给用户，带颜色标识
     - 首次显示机制：相同消息只显示一次
-    - 使用 run_in_terminal() 不破坏 prompt_toolkit 界面
+    - 仅入 EventRenderer pending 队列，由明确 boundary 写入 scrollback
     """
 
     def __init__(self, renderer: EventRenderer) -> None:
@@ -81,11 +79,13 @@ class TUILoggingHandler(logging.Handler):
             self._shown_messages.add(msg_key)
 
             # 按日志级别映射 severity，渲染层负责视觉区分
-            if record.levelno >= logging.ERROR:
-                severity = "error"
-            else:
-                severity = "warning"
-            self._append_to_tui(msg, severity=severity)
+            severity: Literal["warning", "error"] = (
+                "error" if record.levelno >= logging.ERROR else "warning"
+            )
+            self._renderer.enqueue_log(
+                severity=severity,
+                message=msg,
+            )
 
         except Exception:
             self.handleError(record)
@@ -129,29 +129,6 @@ class TUILoggingHandler(logging.Handler):
         # 其他消息用完整内容作为 key
         return f"{record.name}:{msg[:50]}"
 
-    def _append_to_tui(self, msg: str, *, severity: str = "warning") -> None:
-        """将消息追加到 TUI（通过 run_in_terminal 避免破坏界面）"""
-        def _append() -> None:
-            self._renderer.append_system_message(msg, severity=severity)  # type: ignore[arg-type]
-
-        # 使用 run_in_terminal 确保不破坏 prompt_toolkit 的输入
-        # 如果没有运行中的真实 Application，直接调用（测试或初始化阶段）
-        try:
-            from prompt_toolkit.application import get_app
-            from prompt_toolkit.application.dummy import DummyApplication
-            app = get_app()
-            if isinstance(app, DummyApplication):
-                # DummyApplication，直接调用
-                _append()
-            else:
-                # run_in_terminal() 自身已经会调度 Future；这里不能再交给
-                # create_background_task() 二次包装，否则会触发重复执行竞态。
-                run_in_terminal(_append, in_executor=False)
-        except Exception:
-            # 没有 app 或导入失败，直接调用
-            _append()
-
-
 class _DropTerminalStreamFilter(logging.Filter):
     def filter(self, record: logging.LogRecord) -> bool:
         del record
@@ -348,7 +325,7 @@ def setup_tui_logging(
     setattr(tui_handler, _COMATE_LOGGING_SESSION_MARKER, True)
     root.addHandler(tui_handler)
 
-    # 3. 临时静默直写终端的 handler，避免污染 prompt_toolkit UI
+    # 3. 临时静默直写终端的 handler，避免污染主 TUI 输出
     muted_handlers: list[tuple[logging.Handler, logging.Filter]] = []
     for handler in list(root.handlers):
         if handler in {file_handler, tui_handler}:

{comate_cli-0.6.0 → comate_cli-0.6.1}/comate_cli/terminal_agent/models.py

@@ -8,7 +8,17 @@ if TYPE_CHECKING:
     from rich.text import Text
 
 ToolStatus = Literal["running", "success", "error"]
-HistoryEntryType = Literal["user", "assistant", "tool_call", "tool_result", "system", "thinking", "elapsed", "file_ref"]
+HistoryEntryType = Literal[
+    "user",
+    "assistant",
+    "tool_call",
+    "tool_result",
+    "system",
+    "thinking",
+    "elapsed",
+    "file_ref",
+    "log",
+]
 
 
 class LoadingStateType(Enum):
@@ -81,6 +91,7 @@ class HistoryEntry:
     text: str | Text  # 支持普通字符串或 Rich Text 对象
     severity: Literal["info", "warning", "error"] = "info"
     subtitle: str | None = None
+    attached: bool = False
 
 
 @dataclass(frozen=True)

comate_cli-0.6.1/comate_cli/terminal_agent/tips.py

@@ -0,0 +1,21 @@
+"""Tips displayed while a turn is running."""
+from __future__ import annotations
+
+LOADING_TIPS: tuple[str, ...] = (
+    "Use /context when a task starts to feel fuzzy.",
+    "Attach @files to make the model read the right surface first.",
+    "Use Shift+Tab to switch between act and plan mode.",
+    "Use /compact before a long follow-up in the same session.",
+    "Press Ctrl+C once to interrupt the current operation.",
+    "Use /rewind when the last turn took the wrong branch.",
+    "Ask for source-level diagnosis before changing brittle code.",
+    "Name the failing boundary before patching behavior.",
+    "Prefer one visible behavior change per small patch.",
+    "Keep queue messages invisible until they are consumed.",
+    "Check scrollback output separately from live TUI state.",
+    "For TUI bugs, separate layout state from history output.",
+    "Use @path hints when the answer depends on local files.",
+    "Review tests around the boundary you are about to touch.",
+    "Use /model when the task needs a different reasoning tier.",
+    "Small focused prompts usually beat broad fuzzy requests.",
+)

{comate_cli-0.6.0 → comate_cli-0.6.1}/comate_cli/terminal_agent/tui.py

@@ -71,6 +71,7 @@ from comate_cli.terminal_agent.slash_commands import (
     SlashCommandSpec,
 )
 from comate_cli.terminal_agent.status_bar import StatusBar
+from comate_cli.terminal_agent.tips import LOADING_TIPS
 from comate_cli.terminal_agent.tui_parts import (
     CommandsMixin,
     HistorySyncMixin,
@@ -83,6 +84,8 @@ from comate_cli.terminal_agent.tui_parts import (
 
 logger = logging.getLogger(__name__)
 
+_LOADING_TIP_DELAY_SECONDS = 2.5
+
 _TASK_POLL_INTERVAL_S = 2.0
 _INPUT_HISTORY_DIR = Path.home() / ".agent" / "history"
 _INPUT_HISTORY_MAX_ENTRIES = 200
@@ -250,6 +253,8 @@ class TerminalAgentTUI(
             else f"Flibbertigibbeting{ELLIPSIS}"
         )
         self._fallback_phrase_refresh_at = 0.0
+        self._loading_tip_text = ""
+        self._loading_tip_show_at_monotonic: float | None = None
 
         self._tool_result_flash_seconds = read_env_float(
             "AGENT_SDK_TUI_TOOL_RESULT_FLASH_SECONDS",
@@ -876,7 +881,16 @@ class TerminalAgentTUI(
         )
 
     def _set_busy(self, value: bool) -> None:
+        was_busy = self._busy
         self._busy = value
+        if value and not was_busy:
+            self._loading_tip_text = random.choice(LOADING_TIPS) if LOADING_TIPS else ""
+            self._loading_tip_show_at_monotonic = (
+                time.monotonic() + _LOADING_TIP_DELAY_SECONDS
+            )
+        elif not value:
+            self._loading_tip_text = ""
+            self._loading_tip_show_at_monotonic = None
         self._render_dirty = True
         self._invalidate()
 
@@ -1447,13 +1461,13 @@ class TerminalAgentTUI(
             if not self._compact_cancel_requested:
                 self._compact_cancel_requested = True
                 self._renderer.append_system_message(
-                    "正在取消 /compact，请等待回滚完成后退出。",
+                    "Cancelling /compact. The app will exit after rollback finishes.",
                     severity="warning",
                 )
                 self._compact_task.cancel()
             else:
                 self._renderer.append_system_message(
-                    "已请求取消 /compact，等待回滚完成。",
+                    "/compact cancellation already requested. Waiting for rollback to finish.",
                     severity="warning",
                 )
             self._refresh_layers()