comate-cli 0.5.0__tar.gz → 0.5.2__tar.gz

{comate_cli-0.5.0 → comate_cli-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.5.0
+Version: 0.5.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
@@ -16,6 +16,7 @@ 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: concurrent-log-handler>=0.9.25
 Requires-Dist: curl-cffi==0.13.0
 Requires-Dist: packaging>=21.0
 Requires-Dist: pillow==12.2.0

{comate_cli-0.5.0 → comate_cli-0.5.2}/comate_cli/mcp_cli.py

@@ -217,9 +217,17 @@ def _read_effective_server_with_source(
     return None
 
 
-def _render_health_status(connected: bool, reason: str | None) -> str:
-    if connected:
+def _render_health_status(
+    *,
+    status: str | None,
+    connected: bool,
+    reason: str | None,
+) -> str:
+    normalized = str(status or "").strip().lower()
+    if normalized == "connected" or (normalized in {"", "idle"} and connected):
         return "✓ Connected"
+    if normalized == "connecting":
+        return "… Connecting"
     if reason:
         return f"✗ {reason}"
     return "✗ Not connected"
@@ -294,7 +302,11 @@ def _cmd_list(args: argparse.Namespace, *, project_root: PathInput | None) -> No
         endpoint = _format_server_endpoint(cfg)
         health = health_by_alias.get(alias)
         status = (
-            _render_health_status(health.connected, health.reason)
+            _render_health_status(
+                status=getattr(health, "status", None),
+                connected=health.connected,
+                reason=health.reason,
+            )
             if health is not None
             else "✗ Unknown"
         )
@@ -330,7 +342,11 @@ def _cmd_get(args: argparse.Namespace, *, project_root: PathInput | None) -> Non
     status = "✗ Not connected"
     if health_rows:
         row = health_rows[0]
-        status = _render_health_status(row.connected, row.reason)
+        status = _render_health_status(
+            status=getattr(row, "status", None),
+            connected=row.connected,
+            reason=row.reason,
+        )
 
     server_type = str(cfg.get("type", "stdio")).strip().lower()  # type: ignore[attr-defined]
     lines = [

{comate_cli-0.5.0 → comate_cli-0.5.2}/comate_cli/terminal_agent/app.py

@@ -370,7 +370,7 @@ async def run(
     # 而非 fallthrough 到 Python lastResort StreamHandler 以原始文本输出到 stderr。
     renderer = EventRenderer(project_root=project_root)
     from comate_cli.terminal_agent.logging_adapter import setup_tui_logging
-    logging_session = setup_tui_logging(renderer)
+    logging_session = setup_tui_logging(renderer, project_root=project_root)
 
     session, mode = _resolve_session(agent, resume_session_id, cwd=project_root)
 

{comate_cli-0.5.0 → comate_cli-0.5.2}/comate_cli/terminal_agent/event_renderer.py

@@ -43,6 +43,7 @@ _DEFAULT_TOOL_PANEL_MAX_LINES = 4
 _DEFAULT_TASK_PANEL_MAX_LINES = 6
 _RECENT_TEAM_EVENT_CACHE_SIZE = 128
 _FILE_REF_MAX_COUNT_BYTES = 10 * 1024 * 1024  # 10 MB
+_SYSTEM_MESSAGE_DEDUPE_WINDOW_SECONDS = 0.5
 
 
 def _truncate(content: str, max_len: int = 120) -> str:
@@ -207,6 +208,37 @@ class EventRenderer:
         self._recent_team_event_keys: deque[tuple[str, str, str, str, str, str]] = deque(
             maxlen=_RECENT_TEAM_EVENT_CACHE_SIZE
         )
+        self._last_history_append_at: float = 0.0
+
+    def _append_history_entry(self, entry: HistoryEntry) -> None:
+        self._history.append(entry)
+        self._last_history_append_at = time.monotonic()
+
+    def _should_drop_duplicate_system_message(
+        self,
+        *,
+        content: str,
+        severity: Literal["info", "warning", "error"],
+    ) -> bool:
+        if severity not in {"warning", "error"}:
+            return False
+        if not self._history:
+            return False
+        last_entry = self._history[-1]
+        if last_entry.entry_type != "system":
+            return False
+        if last_entry.severity != severity:
+            return False
+        if str(last_entry.text).strip() != content:
+            return False
+        if time.monotonic() - self._last_history_append_at > _SYSTEM_MESSAGE_DEDUPE_WINDOW_SECONDS:
+            return False
+        logger.debug(
+            "Skip duplicate system message in scrollback: severity=%s content=%r",
+            severity,
+            content,
+        )
+        return True
 
     def start_turn(self) -> None:
         self._flush_assistant_segment()
@@ -218,7 +250,7 @@ class EventRenderer:
         if not normalized:
             return
         self._flush_assistant_segment()
-        self._history.append(HistoryEntry(entry_type="user", text=normalized))
+        self._append_history_entry(HistoryEntry(entry_type="user", text=normalized))
         self._maybe_append_file_ref_hint(normalized)
 
     def _maybe_append_file_ref_hint(self, text: str) -> None:
@@ -230,7 +262,9 @@ class EventRenderer:
             candidate = self._project_root / raw_path
             try:
                 if candidate.is_dir():
-                    self._history.append(HistoryEntry(entry_type="file_ref", text=f"Listed directory {raw_path}"))
+                    self._append_history_entry(
+                        HistoryEntry(entry_type="file_ref", text=f"Listed directory {raw_path}")
+                    )
                     return
                 if candidate.is_file():
                     hint = f"Read {raw_path}"
@@ -241,7 +275,7 @@ class EventRenderer:
                             hint += f"  ({line_count} lines)"
                         except OSError:
                             pass
-                    self._history.append(HistoryEntry(entry_type="file_ref", text=hint))
+                    self._append_history_entry(HistoryEntry(entry_type="file_ref", text=hint))
                     return
             except OSError:
                 continue
@@ -261,7 +295,7 @@ class EventRenderer:
 
     def interrupt_turn(self) -> None:
         if self._running_tools:
-            self._history.append(
+            self._append_history_entry(
                 HistoryEntry(
                     entry_type="system",
                     text=f"Current task interrupted ({len(self._running_tools)} running tools)",
@@ -343,7 +377,7 @@ class EventRenderer:
         normalized = text.strip()
         if not normalized:
             return
-        self._history.append(HistoryEntry(entry_type="file_ref", text=normalized))
+        self._append_history_entry(HistoryEntry(entry_type="file_ref", text=normalized))
 
     def append_system_message(
         self,
@@ -354,8 +388,13 @@ class EventRenderer:
         normalized = content.strip()
         if not normalized:
             return
+        if self._should_drop_duplicate_system_message(
+            content=normalized,
+            severity=severity,
+        ):
+            return
         self._flush_assistant_segment()
-        self._history.append(
+        self._append_history_entry(
             HistoryEntry(entry_type="system", text=normalized, severity=severity)
         )
 
@@ -433,14 +472,14 @@ class EventRenderer:
         if not normalized:
             return
         self._flush_assistant_segment()
-        self._history.append(HistoryEntry(entry_type="elapsed", text=normalized))
+        self._append_history_entry(HistoryEntry(entry_type="elapsed", text=normalized))
 
     def append_assistant_message(self, content: str) -> None:
         normalized = content.strip()
         if not normalized:
             return
         self._flush_assistant_segment()
-        self._history.append(HistoryEntry(entry_type="assistant", text=normalized))
+        self._append_history_entry(HistoryEntry(entry_type="assistant", text=normalized))
 
     def tool_panel_entries(
         self, *, max_lines: int | None = None
@@ -554,7 +593,9 @@ class EventRenderer:
     def _flush_assistant_segment(self) -> None:
         if not self._assistant_buffer:
             return
-        self._history.append(HistoryEntry(entry_type="assistant", text=self._assistant_buffer))
+        self._append_history_entry(
+            HistoryEntry(entry_type="assistant", text=self._assistant_buffer)
+        )
         self._assistant_buffer = ""
 
     def _append_assistant_text(self, text: str) -> None:
@@ -671,7 +712,39 @@ class EventRenderer:
 
         if lowered == "grep":
             lines = [line for line in (result or "").splitlines() if line.strip()]
-            return f"Found matches in {len(lines)} files"
+            if not lines:
+                return "Found matches"
+
+            count_summary = re.search(
+                r"^Found\s+(at least\s+)?(\d+)\s+total occurrences across\s+(\d+)\s+(file|files)\.",
+                result or "",
+                re.MULTILINE,
+            )
+            if count_summary:
+                qualifier = count_summary.group(1) or ""
+                occurrences = count_summary.group(2)
+                file_count = count_summary.group(3)
+                file_word = count_summary.group(4)
+                return f"Found {qualifier}{occurrences} matches across {file_count} {file_word}"
+
+            if lines[0] == "No matches found":
+                return "Found 0 matches"
+
+            if lines[0] == "No files found":
+                return "Found matches in 0 files"
+
+            file_summary = re.match(r"^Found\s+(at least\s+)?(\d+)\s+files?\b", lines[0])
+            if file_summary:
+                qualifier = file_summary.group(1) or ""
+                return f"Found matches in {qualifier}{file_summary.group(2)} files"
+
+            if all(
+                not re.search(r":\d+(?::|$)", line)
+                for line in lines
+            ):
+                return f"Found matches in {len(lines)} files"
+
+            return "Found matches"
 
         return None
 
@@ -688,7 +761,7 @@ class EventRenderer:
         Args:
             signature: 工具签名，例如 "Read(path=xxx)"
             is_error: 是否为错误结果
-            diff_lines: optional diff lines for Edit/MultiEdit
+            diff_lines: optional diff lines for Edit
             model_name: model name for Agent tools (rendered dim)
             subtitle: optional subtitle rendered as `⎿ ...`
         """
@@ -700,18 +773,18 @@ class EventRenderer:
                 text_obj.append(f" · {model_name}", style="dim")
             text_obj.append("\n")
             text_obj.append(self._render_diff_text(diff_lines, max_lines=self._diff_max_lines))
-            self._history.append(
+            self._append_history_entry(
                 HistoryEntry(entry_type="tool_result", text=text_obj, severity="info", subtitle=subtitle)
             )
             return
         if model_name:
             text_obj = Text(signature)
             text_obj.append(f" · {model_name}", style="dim")
-            self._history.append(
+            self._append_history_entry(
                 HistoryEntry(entry_type="tool_result", text=text_obj, severity=sev, subtitle=subtitle)
             )
             return
-        self._history.append(
+        self._append_history_entry(
             HistoryEntry(
                 entry_type="tool_result",
                 text=signature,
@@ -764,7 +837,9 @@ class EventRenderer:
         if state is None:
             display_name = resolve_display_tool_name(tool_name, {})
             signature = _tool_signature(display_name, "")
-            self._history.append(HistoryEntry(entry_type="tool_result", text=signature, severity=sev, subtitle=subtitle))
+            self._append_history_entry(
+                HistoryEntry(entry_type="tool_result", text=signature, severity=sev, subtitle=subtitle)
+            )
             return
 
         if state.is_task:
@@ -790,7 +865,7 @@ class EventRenderer:
         else:
             display_name = state.display_tool_name or state.tool_name
             summary = state.args_summary
-            # Append line range for Edit/MultiEdit
+            # Append line range for Edit
             if display_name == "Update" and metadata:
                 sl = metadata.get("start_line")
                 el = metadata.get("end_line")
@@ -800,7 +875,7 @@ class EventRenderer:
             signature = _tool_signature(display_name, summary)
             base = f"{signature}"
 
-        # Render diff for Edit/MultiEdit if metadata contains diff lines
+        # Render diff for Edit if metadata contains diff lines
         if not is_error and metadata:
             diff_lines = metadata.get("diff")
             if isinstance(diff_lines, list) and len(diff_lines) > 0:
@@ -811,15 +886,19 @@ class EventRenderer:
                     text_obj = Text(base)
                 text_obj.append("\n")
                 text_obj.append(self._render_diff_text(diff_lines, max_lines=self._diff_max_lines))
-                self._history.append(
+                self._append_history_entry(
                     HistoryEntry(entry_type="tool_result", text=text_obj, severity="info", subtitle=subtitle)
                 )
                 return
 
         if isinstance(base, Text):
-            self._history.append(HistoryEntry(entry_type="tool_result", text=base, severity=sev, subtitle=subtitle))
+            self._append_history_entry(
+                HistoryEntry(entry_type="tool_result", text=base, severity=sev, subtitle=subtitle)
+            )
         else:
-            self._history.append(HistoryEntry(entry_type="tool_result", text=base, severity=sev, subtitle=subtitle))
+            self._append_history_entry(
+                HistoryEntry(entry_type="tool_result", text=base, severity=sev, subtitle=subtitle)
+            )
 
     @staticmethod
     def _render_diff_text(diff_lines: list[str], max_lines: int = 50) -> Text:
@@ -900,7 +979,7 @@ class EventRenderer:
     def _append_questions(self, questions: list[dict[str, Any]]) -> None:
         if not questions:
             return
-        self._history.append(
+        self._append_history_entry(
             HistoryEntry(
                 entry_type="tool_result",
                 text=f"Input required: {len(questions)} question(s) pending.",
@@ -919,7 +998,7 @@ class EventRenderer:
                     if label:
                         labels.append(label)
             choice_preview = f" (Options: {' / '.join(labels)})" if labels else ""
-            self._history.append(
+            self._append_history_entry(
                 HistoryEntry(
                     entry_type="tool_result",
                     text=f"  {idx}. {header}: {question_text} {choice_preview}".strip(),
@@ -962,7 +1041,7 @@ class EventRenderer:
         if started is not None:
             elapsed_suffix = f" · {_format_duration(time.monotonic() - started)}"
         total = len(normalized)
-        self._history.append(
+        self._append_history_entry(
             HistoryEntry(
                 entry_type="tool_result",
                 text=f"tasks {total}/{total} completed{elapsed_suffix}",
@@ -1042,7 +1121,7 @@ class EventRenderer:
                 pass
             case ThinkingEvent(content=thinking):
                 self._thinking_content = thinking
-                self._history.append(HistoryEntry(entry_type="thinking", text=thinking))
+                self._append_history_entry(HistoryEntry(entry_type="thinking", text=thinking))
             case CompactionResultEvent(
                 current_tokens=tokens,
                 threshold=threshold,
@@ -1207,7 +1286,7 @@ class EventRenderer:
                 if reason == "waiting_for_plan_approval":
                     return (False, None)
                 if reason == "interrupted":
-                    self._history.append(
+                    self._append_history_entry(
                         HistoryEntry(entry_type="system", text="Current task interrupted.", severity="warning")
                     )
             case PlanApprovalRequiredEvent(
@@ -1225,18 +1304,18 @@ class EventRenderer:
                     except Exception:
                         logger.warning("ExitPlanMode: Failed to read plan file %s", plan_path)
                 if plan_content:
-                    self._history.append(
+                    self._append_history_entry(
                         HistoryEntry(
                             entry_type="system",
                             text="─── Here is the plan, please review and approve or reject ───",
                         )
                     )
-                    self._history.append(HistoryEntry(entry_type="assistant", text=plan_content))
+                    self._append_history_entry(HistoryEntry(entry_type="assistant", text=plan_content))
 
                 text = f"Plan ready for review: {plan_path}"
                 if summary:
                     text = f"{text} | {summary}"
-                self._history.append(
+                self._append_history_entry(
                     HistoryEntry(entry_type="system", text=text)
                 )
             case TeamMessageEvent(

{comate_cli-0.5.0 → comate_cli-0.5.2}/comate_cli/terminal_agent/logging_adapter.py

@@ -4,6 +4,9 @@ from __future__ import annotations
 import logging
 import os
 import sys
+import threading
+import time
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 from prompt_toolkit.application import run_in_terminal
@@ -12,6 +15,37 @@ if TYPE_CHECKING:
     from comate_cli.terminal_agent.event_renderer import EventRenderer
 
 
+logger = logging.getLogger(__name__)
+
+_COMATE_LOGGING_SESSION_MARKER = "_comate_tui_logging_session"
+_RECENT_DUPLICATE_LOG_WINDOW_SECONDS = 0.5
+_recent_log_message_times: dict[str, float] = {}
+_recent_log_message_lock = threading.Lock()
+_active_tui_logging_session: "TUILoggingSession | None" = None
+_active_tui_logging_session_lock = threading.Lock()
+
+_LOG_LEVEL_ENV_VAR = "COMATE_LOG_LEVEL"
+_VALID_LOG_LEVELS: tuple[str, ...] = ("DEBUG", "INFO", "WARNING", "ERROR")
+_DEFAULT_LOG_LEVEL = logging.INFO
+_invalid_log_level_warned = False
+
+
+def _should_drop_recent_duplicate_log(msg_key: str) -> bool:
+    now = time.monotonic()
+    with _recent_log_message_lock:
+        expired_keys = [
+            key
+            for key, ts in _recent_log_message_times.items()
+            if now - ts > _RECENT_DUPLICATE_LOG_WINDOW_SECONDS
+        ]
+        for key in expired_keys:
+            _recent_log_message_times.pop(key, None)
+
+        previous = _recent_log_message_times.get(msg_key)
+        _recent_log_message_times[msg_key] = now
+        return previous is not None
+
+
 class TUILoggingHandler(logging.Handler):
     """自定义 logging handler，将日志友好地显示在 TUI 中
 
@@ -40,6 +74,8 @@ class TUILoggingHandler(logging.Handler):
 
             # 首次显示检查
             msg_key = self._get_message_key(record)
+            if _should_drop_recent_duplicate_log(msg_key):
+                return
             if msg_key in self._shown_messages:
                 return
             self._shown_messages.add(msg_key)
@@ -108,9 +144,9 @@ class TUILoggingHandler(logging.Handler):
                 # DummyApplication，直接调用
                 _append()
             else:
-                app.create_background_task(
-                    run_in_terminal(_append, in_executor=False)
-                )
+                # run_in_terminal() 自身已经会调度 Future；这里不能再交给
+                # create_background_task() 二次包装，否则会触发重复执行竞态。
+                run_in_terminal(_append, in_executor=False)
         except Exception:
             # 没有 app 或导入失败，直接调用
             _append()
@@ -159,21 +195,86 @@ class TUILoggingSession:
                 continue
 
         self._root_logger.setLevel(self._previous_level)
+        with _active_tui_logging_session_lock:
+            global _active_tui_logging_session
+            if _active_tui_logging_session is self:
+                _active_tui_logging_session = None
+
+
+def _read_level_from_settings_env(project_root: Path | None) -> str:
+    """从 settings.json 的 env 段读取 COMATE_LOG_LEVEL。
+
+    查找顺序：project settings(.agent/settings.json) → user settings(~/.agent/settings.json)。
+    复用 SDK 侧的 load_settings_file，不引入独立解析路径。
+    返回空串表示未配置或读取失败，由调用方决定如何降级。
+    """
+    try:
+        from comate_agent_sdk.agent.settings import USER_SETTINGS_PATH, load_settings_file
+    except Exception:
+        return ""
+
+    def _lookup(path: Path) -> str:
+        try:
+            cfg = load_settings_file(path)
+        except Exception:
+            return ""
+        if cfg is None or cfg.env is None:
+            return ""
+        raw = cfg.env.get(_LOG_LEVEL_ENV_VAR, "")
+        return raw.strip() if isinstance(raw, str) else ""
+
+    if project_root is not None:
+        value = _lookup(Path(project_root) / ".agent" / "settings.json")
+        if value:
+            return value
+
+    return _lookup(USER_SETTINGS_PATH)
+
 
+def _resolve_log_level(project_root: Path | None = None) -> int:
+    """解析生效日志级别。
 
-def _build_file_handler() -> logging.Handler:
-    from logging.handlers import RotatingFileHandler
+    优先级：os.environ[COMATE_LOG_LEVEL]
+          > project .agent/settings.json env.COMATE_LOG_LEVEL
+          > user ~/.agent/settings.json env.COMATE_LOG_LEVEL
+          > INFO。
+    非法值降级 INFO，并在整个进程生命周期内最多 warn 一次。
+    """
+    global _invalid_log_level_warned
+
+    raw = os.environ.get(_LOG_LEVEL_ENV_VAR, "").strip()
+    if not raw:
+        raw = _read_level_from_settings_env(project_root)
+
+    if not raw:
+        return _DEFAULT_LOG_LEVEL
+
+    normalized = raw.upper()
+    if normalized not in _VALID_LOG_LEVELS:
+        if not _invalid_log_level_warned:
+            _invalid_log_level_warned = True
+            logger.warning(
+                f"Invalid {_LOG_LEVEL_ENV_VAR}={raw!r}; falling back to INFO. "
+                f"Valid values: {list(_VALID_LOG_LEVELS)}"
+            )
+        return _DEFAULT_LOG_LEVEL
+
+    return getattr(logging, normalized)
+
+
+def _build_file_handler(level: int) -> logging.Handler:
+    from concurrent_log_handler import ConcurrentRotatingFileHandler
 
     log_dir = os.path.join(os.path.expanduser("~"), ".comate", "logs")
     os.makedirs(log_dir, exist_ok=True)
     log_path = os.path.join(log_dir, "agent.log")
-    file_handler = RotatingFileHandler(
+    file_handler = ConcurrentRotatingFileHandler(
         log_path,
         maxBytes=10 * 1024 * 1024,
         backupCount=3,
         encoding="utf-8",
     )
-    file_handler.setLevel(logging.DEBUG)
+    file_handler.setLevel(level)
     file_handler.setFormatter(
         logging.Formatter("%(asctime)s %(levelname)s %(name)s: %(message)s")
     )
@@ -187,24 +288,64 @@ def _should_mute_terminal_stream(handler: logging.Handler) -> bool:
     return stream in {sys.stdout, sys.stderr, sys.__stdout__, sys.__stderr__}
 
 
-def setup_tui_logging(renderer: EventRenderer) -> TUILoggingSession:
+def setup_tui_logging(
+    renderer: EventRenderer,
+    *,
+    project_root: Path | None = None,
+) -> TUILoggingSession:
     """统一日志初始化：文件 + TUI 双通道。
 
-    - 所有日志（含 traceback）写入 ~/.comate/logs/agent.log（RotatingFileHandler）
+    - 所有日志（含 traceback）写入 ~/.comate/logs/agent.log
+      （ConcurrentRotatingFileHandler：跨进程文件锁 + Windows rename 重试）
     - WARNING/ERROR 以用户友好格式显示在 TUI scrollback
     - 临时静默 root logger 上写往 stdout/stderr 的 stream handler，避免污染 TUI
+
+    日志级别通过 COMATE_LOG_LEVEL 控制（默认 INFO，可设为 DEBUG/INFO/WARNING/ERROR）。
+    查找顺序：os.environ > project .agent/settings.json env > user ~/.agent/settings.json env。
+    root 与 file handler 同步应用该级别——第三方库（anthropic/httpx/...）的 DEBUG 噪音随之收敛。
+    TUI handler 始终固定 WARNING，不受此开关影响，避免 DEBUG 刷屏。
     """
     root = logging.getLogger()
     previous_level = root.level
+    level = _resolve_log_level(project_root)
+
+    with _active_tui_logging_session_lock:
+        global _active_tui_logging_session
+        active_session = _active_tui_logging_session
+    if active_session is not None:
+        active_session.close()
+    with _recent_log_message_lock:
+        _recent_log_message_times.clear()
+
+    stale_handlers: list[logging.Handler] = []
+    for handler in list(root.handlers):
+        if not getattr(handler, _COMATE_LOGGING_SESSION_MARKER, False):
+            continue
+        try:
+            root.removeHandler(handler)
+        except Exception:
+            pass
+        stale_handlers.append(handler)
+
+    for handler in stale_handlers:
+        try:
+            handler.close()
+        except Exception:
+            continue
 
     # 1. 日志文件 handler（完整调试信息，含 traceback）
-    file_handler = _build_file_handler()
+    file_handler = _build_file_handler(level)
+    setattr(file_handler, _COMATE_LOGGING_SESSION_MARKER, True)
     root.addHandler(file_handler)
-    root.setLevel(logging.DEBUG)
+    # root 级别与 file handler 保持一致——这是单 knob 控第三方 DEBUG 噪音的关键：
+    # 第三方 logger level=NOTSET 会继承 root 的 effective level，DEBUG 记录
+    # 在 isEnabledFor 阶段就被丢弃，不会走到任何 handler。
+    root.setLevel(level)
 
     # 2. TUI handler 挂到 root（覆盖所有命名空间的 WARNING/ERROR）
     tui_handler = TUILoggingHandler(renderer)
     tui_handler.setLevel(logging.WARNING)
+    setattr(tui_handler, _COMATE_LOGGING_SESSION_MARKER, True)
     root.addHandler(tui_handler)
 
     # 3. 临时静默直写终端的 handler，避免污染 prompt_toolkit UI
@@ -218,9 +359,12 @@ def setup_tui_logging(renderer: EventRenderer) -> TUILoggingSession:
         handler.addFilter(log_filter)
         muted_handlers.append((handler, log_filter))
 
-    return TUILoggingSession(
+    session = TUILoggingSession(
         root_logger=root,
         added_handlers=[file_handler, tui_handler],
         muted_handlers=muted_handlers,
         previous_level=previous_level,
     )
+    with _active_tui_logging_session_lock:
+        _active_tui_logging_session = session
+    return session

{comate_cli-0.5.0 → comate_cli-0.5.2}/comate_cli/terminal_agent/rewind_store.py

@@ -16,7 +16,7 @@ from comate_agent_sdk.context.items import ItemType
 
 logger = logging.getLogger(__name__)
 
-_TRACKED_TOOLS = {"Write", "Edit", "MultiEdit"}
+_TRACKED_TOOLS = {"Write", "Edit"}
 _SCHEMA_VERSION = 1
 
 
@@ -561,6 +561,8 @@ class RewindStore:
             touched.add(relpath)
 
             created_val = data.get("created")
+            if not isinstance(created_val, bool):
+                created_val = meta.get("created")
             created: bool | None
             if isinstance(created_val, bool):
                 created = created_val