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

{comate_cli-0.4.7 → comate_cli-0.5.0}/.gitignore

@@ -8,6 +8,7 @@ set_env.sh
 .worktrees/
 # C extensions
 *.so
+codebase_claude/
 claude_code_codebase/
 .claude/
 # Distribution / packaging

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.4.7
+Version: 0.5.0
 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.4.7 → comate_cli-0.5.0}/comate_cli/terminal_agent/history_printer.py

@@ -173,8 +173,8 @@ def render_history_group(
 
 
 async def print_history_group_async(console: Console, group: Group) -> None:
-    console.print(group)
+    console.print(group, soft_wrap=True)
 
 
 def print_history_group_sync(console: Console, group: Group) -> None:
-    console.print(group)
+    console.print(group, soft_wrap=True)

{comate_cli-0.4.7 → comate_cli-0.5.0}/comate_cli/terminal_agent/tool_view.py

@@ -152,7 +152,34 @@ def extract_todos(args: dict[str, Any]) -> list[TodoItemState] | None:
 def _truncate(content: str, max_len: int = 280) -> str:
     if len(content) <= max_len:
         return content
-    return f"{content[:max_len]}..."
+    return f"{content[:max_len - 3]}..."
+
+
+TOOL_SUMMARY_MAX_LENGTH = 50
+
+
+def _truncate_path_middle(path: str | None, max_len: int) -> str:
+    """Middle-truncate a path, preserving the filename.
+
+    Example: 'a/b/c/d/very/deep/file.ts' → '…/deep/file.ts'
+    """
+    if not path:
+        return ""
+    if len(path) <= max_len:
+        return path
+    parts = path.replace("\\", "/").split("/")
+    filename = parts[-1]
+    if len(filename) + 2 >= max_len:  # +2 for …/
+        return _truncate(filename, max_len)
+    result = filename
+    for part in reversed(parts[:-1]):
+        candidate = f"{part}/{result}"
+        if len(candidate) + 2 > max_len:  # +2 for …/
+            break
+        result = candidate
+    if result == path:
+        return path
+    return f"…/{result}"
 
 
 def _normalize_inline(content: str) -> str:
@@ -335,27 +362,36 @@ def summarize_tool_args(
     lowered = tool_name.lower()
     if lowered == "write":
         path = _lookup_arg(args, "file_path", "path")
-        path_display = _normalize_path_for_display(path, project_root)
-        return f"path={path_display}" if path_display else _compact_json(args)
+        path_display = _truncate_path_middle(
+            _normalize_path_for_display(path, project_root) or "", 45
+        )
+        return _truncate(f"path={path_display}" if path_display else _compact_json(args), TOOL_SUMMARY_MAX_LENGTH)
     if lowered == "edit":
         path = _lookup_arg(args, "file_path", "path")
-        path_display = _normalize_path_for_display(path, project_root)
-        return path_display or _compact_json(args)
+        path_display = _truncate_path_middle(
+            _normalize_path_for_display(path, project_root) or "", 45
+        )
+        return _truncate(path_display or _compact_json(args), TOOL_SUMMARY_MAX_LENGTH)
     if lowered == "multiedit":
         path = _lookup_arg(args, "file_path", "path")
-        path_display = _normalize_path_for_display(path, project_root)
-        return path_display or _compact_json(args)
+        path_display = _truncate_path_middle(
+            _normalize_path_for_display(path, project_root) or "", 45
+        )
+        return _truncate(path_display or _compact_json(args), TOOL_SUMMARY_MAX_LENGTH)
     if lowered == "read":
         path = _lookup_arg(args, "file_path", "path")
-        path_display = _normalize_path_for_display(path, project_root)
+        path_display = _truncate_path_middle(
+            _normalize_path_for_display(path, project_root) or "", 40
+        )
         offset = _lookup_arg(args, "offset_line")
         limit = _lookup_arg(args, "limit_lines")
-        return f"path={path_display} offset={offset} limit={limit}" if path_display else _compact_json(args)
+        raw = f"path={path_display} offset={offset} limit={limit}" if path_display else _compact_json(args)
+        return _truncate(raw, 65)
     if lowered == "agent":
         subagent_name, description = _extract_task_identity(args)
         if description and description != subagent_name:
-            return f"{subagent_name}({description})"
-        return subagent_name
+            return _truncate(f"{subagent_name}({description})", TOOL_SUMMARY_MAX_LENGTH)
+        return _truncate(subagent_name, TOOL_SUMMARY_MAX_LENGTH)
     if lowered == "taskcreate":
         subject = str(_lookup_arg(args, "subject") or "").strip()
         blocked_by = _lookup_arg(args, "blocked_by")
@@ -384,31 +420,39 @@ def summarize_tool_args(
     if lowered in {"grep", "glob", "ls"}:
         pattern = _lookup_arg(args, "pattern")
         path = _lookup_arg(args, "path")
-        path_display = _normalize_path_for_display(path, project_root)
-        return f"path={path_display} pattern={pattern}" if (path_display or pattern) else _compact_json(args)
+        path_display = _truncate_path_middle(
+            _normalize_path_for_display(path, project_root) or "", 25
+        )
+        pattern_display = _truncate(str(pattern), 20) if pattern else ""
+        parts = []
+        if path_display:
+            parts.append(f"path={path_display}")
+        if pattern_display:
+            parts.append(f"pattern={pattern_display}")
+        return _truncate(" ".join(parts) if parts else _compact_json(args), TOOL_SUMMARY_MAX_LENGTH)
     if lowered == "bash":
         command_args = _lookup_arg(args, "args")
         if isinstance(command_args, list):
             cmd = " ".join(str(part) for part in command_args)
-            cmd_display = _truncate(cmd, 180)
+            cmd_display = _truncate(cmd, 120)
             cwd = _lookup_arg(args, "cwd")
             cwd_display = _normalize_cwd_for_display(cwd, project_root)
             if cwd_display:
-                return f"cwd={cwd_display} {cmd_display}"
+                return _truncate(f"cwd={cwd_display} {cmd_display}", 120)
             return cmd_display
         # 回退：兼容非标准格式（如 command 字段）
         command = _lookup_arg(args, "command")
         cwd = _lookup_arg(args, "cwd")
         cwd_display = _normalize_cwd_for_display(cwd, project_root)
         if cwd_display:
-            return f"cwd={cwd_display} command={_truncate(str(command), 180)}" if command else _compact_json(args)
-        return f"command={_truncate(str(command), 180)}" if command else _compact_json(args)
+            return _truncate(f"cwd={cwd_display} command={_truncate(str(command), 120)}", 120) if command else _compact_json(args)
+        return _truncate(f"command={_truncate(str(command), 120)}", 120) if command else _compact_json(args)
     if lowered == "skill":
         skill_name = _lookup_arg(args, "skill_name", "skill")
-        return str(skill_name).strip() if skill_name else ""
+        return _truncate(str(skill_name).strip(), TOOL_SUMMARY_MAX_LENGTH) if skill_name else ""
     if lowered == "webfetch":
         url = _lookup_arg(args, "url")
-        return f"url={url}" if url else _compact_json(args)
+        return _truncate(f"url={url}" if url else _compact_json(args), TOOL_SUMMARY_MAX_LENGTH)
     if lowered == "todowrite":
         todos = extract_todos(args)
         if todos is None:
@@ -420,7 +464,7 @@ def summarize_tool_args(
             f"todos={len(todos)} pending={pending} "
             f"in_progress={in_progress} completed={completed}"
         )
-    return _friendly_kv(args)
+    return _truncate(_friendly_kv(args), TOOL_SUMMARY_MAX_LENGTH)
 
 
 class ToolEventView:

{comate_cli-0.4.7 → comate_cli-0.5.0}/comate_cli/terminal_agent/tui.py

@@ -135,6 +135,7 @@ class TerminalAgentTUI(
             pass
         self._renderer = renderer
         self._task_poll_next_at = time.monotonic() + _TASK_POLL_INTERVAL_S
+        self._task_poll_last_list_id: str | None = None
         self._rewind_store = RewindStore(session=self._session, project_root=Path.cwd())
 
         # Team inbox 消息直连 scrollback（绕开 session_event_queue，实现实时显示）
@@ -467,6 +468,23 @@ class TerminalAgentTUI(
             filter=Condition(lambda: self._ui_mode == UIMode.MCP_CONNECTING),
         )
 
+        # idle 时 todo/diff/queue 全部隐藏，它们之间的分隔空行也应该一并消失，
+        # 否则多余的固定高度会导致 prompt_toolkit 非全屏渲染时高度波动 → scrollback 污染。
+        _has_todo_or_diff = Condition(
+            lambda: self._renderer.has_active_todos()
+            or (
+                self._diff_panel_visible
+                and self._renderer.latest_diff_lines is not None
+            )
+        )
+        _has_diff_or_queue = Condition(
+            lambda: (
+                self._diff_panel_visible
+                and self._renderer.latest_diff_lines is not None
+            )
+            or self._should_show_queue_panel()
+        )
+
         self._main_container = HSplit(
             [
                 self._loading_container,
@@ -478,10 +496,17 @@ class TerminalAgentTUI(
                     ),
                 ),
                 self._todo_container,
-                Window(height=1, style="class:loading"),
+                ConditionalContainer(
+                    content=Window(height=1, style="class:loading"),
+                    filter=_has_todo_or_diff,
+                ),
                 self._diff_panel_container,
-                Window(height=1, style="class:input.separator"),
+                ConditionalContainer(
+                    content=Window(height=1, style="class:input.separator"),
+                    filter=_has_diff_or_queue,
+                ),
                 self._queue_container,
+                Window(height=1, style="class:loading"),
                 Window(height=1, char="─", style="class:input.separator"),
                 self._input_container,
                 self._question_container,
@@ -1255,8 +1280,10 @@ class TerminalAgentTUI(
                     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
+                        if list_id != self._task_poll_last_list_id:
+                            self._task_poll_last_list_id = list_id
+                            self._renderer._update_tasks(task_dicts, list_id=list_id)
+                            self._render_dirty = True
 
                 await asyncio.sleep(sleep_s)
         except asyncio.CancelledError:

{comate_cli-0.4.7 → comate_cli-0.5.0}/pyproject.toml

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

{comate_cli-0.4.7 → comate_cli-0.5.0}/tests/test_history_printer.py

@@ -5,7 +5,7 @@ import unittest
 from rich.console import Console
 from rich.text import Text
 
-from comate_cli.terminal_agent.history_printer import render_history_group
+from comate_cli.terminal_agent.history_printer import render_history_group, print_history_group_sync
 from comate_cli.terminal_agent.models import HistoryEntry
 
 
@@ -78,3 +78,26 @@ class TestSubtitleRendering(unittest.TestCase):
         self.assertIn("⎿", output)
         self.assertIn("Listed directory src/components/", output)
         self.assertNotIn("•", output)
+
+
+class TestSoftWrapPrefixProtection(unittest.TestCase):
+    """Verify ● prefix never gets separated from tool content via print_history_group_sync."""
+
+    def test_long_tool_result_prefix_on_same_line(self) -> None:
+        """print_history_group_sync must keep ● on the same line as tool name."""
+        entry = HistoryEntry(
+            entry_type="tool_result",
+            text="Read(path=very/long/path/that/exceeds/terminal/width/file.ts offset=595 limit=35)",
+        )
+        console = Console(file=None, force_terminal=True, width=40)
+        group = render_history_group(
+            console, [entry], terminal_width=40, render_markdown_to_plain=_identity_md,
+        )
+        self.assertIsNotNone(group)
+        with console.capture() as capture:
+            print_history_group_sync(console, group)
+        output = capture.get()
+        lines = output.strip().split("\n")
+        first_content_line = lines[0]
+        self.assertIn("●", first_content_line)
+        self.assertIn("Read", first_content_line)

{comate_cli-0.4.7 → comate_cli-0.5.0}/tests/test_tool_view.py

@@ -2,7 +2,13 @@ from __future__ import annotations
 
 import unittest
 
-from comate_cli.terminal_agent.tool_view import ToolEventView, should_show_tool_in_scrollback
+from comate_cli.terminal_agent.tool_view import (
+    ToolEventView,
+    should_show_tool_in_scrollback,
+    _truncate,
+    _truncate_path_middle,
+    TOOL_SUMMARY_MAX_LENGTH,
+)
 
 
 class TestToolEventView(unittest.TestCase):
@@ -143,5 +149,140 @@ class TestShouldShowToolInScrollback(unittest.TestCase):
         self.assertFalse(should_show_tool_in_scrollback("TASKCREATE", {"subject": "x"}))
 
 
+class TestTruncateSemantics(unittest.TestCase):
+    """Verify _truncate output is strictly <= max_len."""
+
+    def test_truncate_output_within_max_len(self) -> None:
+        result = _truncate("x" * 100, 50)
+        self.assertLessEqual(len(result), 50)
+        self.assertTrue(result.endswith("..."))
+
+    def test_truncate_short_input_unchanged(self) -> None:
+        self.assertEqual(_truncate("hello", 50), "hello")
+
+
+class TestTruncatePathMiddle(unittest.TestCase):
+    def test_short_path_unchanged(self) -> None:
+        self.assertEqual(_truncate_path_middle("src/main.py", 50), "src/main.py")
+
+    def test_long_path_preserves_filename(self) -> None:
+        path = "a/b/c/d/very/deep/nested/file.ts"
+        result = _truncate_path_middle(path, 20)
+        self.assertTrue(result.endswith("file.ts"))
+        self.assertTrue(result.startswith("…/"))
+        self.assertLessEqual(len(result), 20)
+
+    def test_filename_only_no_separator(self) -> None:
+        result = _truncate_path_middle("file.ts", 50)
+        self.assertEqual(result, "file.ts")
+
+    def test_filename_exceeds_max_len_end_truncates(self) -> None:
+        result = _truncate_path_middle("very_long_filename_that_is_way_too_long.ts", 15)
+        self.assertLessEqual(len(result), 15)
+        self.assertTrue(result.endswith("..."))
+
+    def test_empty_path(self) -> None:
+        self.assertEqual(_truncate_path_middle("", 50), "")
+
+    def test_none_path_returns_empty(self) -> None:
+        self.assertEqual(_truncate_path_middle(None, 50), "")
+
+    def test_preserves_multiple_trailing_segments(self) -> None:
+        path = "a/b/c/deep/file.ts"
+        result = _truncate_path_middle(path, 16)
+        self.assertIn("deep/file.ts", result)
+        self.assertTrue(result.startswith("…/"))
+        self.assertLessEqual(len(result), 16)
+
+    def test_backslash_path_normalized(self) -> None:
+        path = "a\\b\\c\\deep\\file.ts"
+        result = _truncate_path_middle(path, 16)
+        self.assertIn("file.ts", result)
+        self.assertNotIn("\\", result)
+
+    def test_constant_value(self) -> None:
+        self.assertEqual(TOOL_SUMMARY_MAX_LENGTH, 50)
+
+
+class TestSummarizeToolArgsTruncation(unittest.TestCase):
+    """Verify all tool branches respect truncation limits."""
+
+    _long_path = "claude-code-source-code-3da94d5e5f2b99c9d82b0d8f09448b04775cd41f/src/utils/swarm/inProcessRunner.ts"
+
+    def test_read_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"file_path": self._long_path, "offset_line": 595, "limit_lines": 35}
+        result = summarize_tool_args("Read", args, None)
+        self.assertLessEqual(len(result), 65)
+        self.assertIn("inProcessRunner.ts", result)
+
+    def test_write_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"file_path": self._long_path}
+        result = summarize_tool_args("Write", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+        self.assertIn("inProcessRunner.ts", result)
+
+    def test_edit_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"file_path": self._long_path}
+        result = summarize_tool_args("Edit", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+
+    def test_grep_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"path": self._long_path, "pattern": "function findAvailableTask"}
+        result = summarize_tool_args("Grep", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+
+    def test_bash_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"args": ["echo"] + ["x" * 200]}
+        result = summarize_tool_args("Bash", args, None)
+        self.assertLessEqual(len(result), 120)
+
+    def test_bash_command_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"command": "x" * 200}
+        result = summarize_tool_args("Bash", args, None)
+        self.assertLessEqual(len(result), 120)
+
+    def test_fallback_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"key": "x" * 300}
+        result = summarize_tool_args("UnknownTool", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+
+    def test_short_args_unchanged(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"file_path": "src/main.py"}
+        result = summarize_tool_args("Read", args, None)
+        self.assertIn("src/main.py", result)
+
+    def test_webfetch_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"url": "https://example.com/" + "x" * 200}
+        result = summarize_tool_args("WebFetch", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+
+    def test_agent_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"subagent_type": "Explore", "description": "x" * 200}
+        result = summarize_tool_args("Agent", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+
+    def test_skill_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"skill": "x" * 200}
+        result = summarize_tool_args("Skill", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+
+    def test_grep_pattern_only_within_budget(self) -> None:
+        from comate_cli.terminal_agent.tool_view import summarize_tool_args
+        args = {"pattern": "x" * 200}
+        result = summarize_tool_args("Grep", args, None)
+        self.assertLessEqual(len(result), TOOL_SUMMARY_MAX_LENGTH)
+
+
 if __name__ == "__main__":
     unittest.main(verbosity=2)