comate-cli 0.10.16__tar.gz → 0.10.18__tar.gz

comate_cli-0.10.18/.agent/artifacts/grep_content/7f6ae5a9bc2404aef026b13c8a360c1c687ea1c1509b65429239928d9f8560bb.txt

@@ -0,0 +1,91 @@
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/options.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/options.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/options.py"},"lines":{"text":"from dataclasses import dataclass\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":17,"end":23}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/options.py"},"lines":{"text":"from pathlib import Path\n"},"line_number":4,"absolute_offset":70,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":13,"end":19}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/options.py"},"lines":{"text":"from typing import Any\n"},"line_number":5,"absolute_offset":95,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/options.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":33822,"human":"0.000034s"},"searches":1,"searches_with_match":1,"bytes_searched":2324,"bytes_printed":1446,"matched_lines":4,"matches":8}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/approval.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/approval.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/approval.py"},"lines":{"text":"import asyncio\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/approval.py"},"lines":{"text":"import logging\n"},"line_number":4,"absolute_offset":51,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/approval.py"},"lines":{"text":"from typing import Any, Protocol\n"},"line_number":5,"absolute_offset":66,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/approval.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.protocol import to_jsonable\n"},"line_number":7,"absolute_offset":100,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":44,"end":50}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/approval.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":30816,"human":"0.000031s"},"searches":1,"searches_with_match":1,"bytes_searched":4371,"bytes_printed":1704,"matched_lines":5,"matches":8}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"},"lines":{"text":"from dataclasses import fields, is_dataclass\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":17,"end":23}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"},"lines":{"text":"from typing import Any, Literal\n"},"line_number":4,"absolute_offset":81,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"},"lines":{"text":"from pydantic import BaseModel\n"},"line_number":6,"absolute_offset":114,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":14,"end":20}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"},"lines":{"text":"from comate_agent_sdk.agent.events import (\n"},"line_number":8,"absolute_offset":146,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":35,"end":41}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.protocol import to_jsonable\n"},"line_number":15,"absolute_offset":320,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":44,"end":50}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/serde.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":16970,"human":"0.000017s"},"searches":1,"searches_with_match":1,"bytes_searched":2079,"bytes_printed":2167,"matched_lines":6,"matches":12}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/__init__.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/__init__.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/__init__.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":15648,"human":"0.000016s"},"searches":1,"searches_with_match":1,"bytes_searched":35,"bytes_printed":469,"matched_lines":1,"matches":2}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"import json\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"from dataclasses import fields, is_dataclass\n"},"line_number":4,"absolute_offset":48,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":17,"end":23}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"from enum import Enum\n"},"line_number":5,"absolute_offset":93,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":10,"end":16}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"from pathlib import Path\n"},"line_number":6,"absolute_offset":115,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":13,"end":19}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"from typing import Any, Literal, TypeGuard\n"},"line_number":7,"absolute_offset":140,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"from pydantic import BaseModel\n"},"line_number":9,"absolute_offset":184,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":14,"end":20}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"lines":{"text":"        ) from exc\n"},"line_number":57,"absolute_offset":1403,"submatches":[{"match":{"text":"from"},"start":10,"end":14}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/protocol.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":23058,"human":"0.000023s"},"searches":1,"searches_with_match":1,"bytes_searched":4379,"bytes_printed":2680,"matched_lines":8,"matches":14}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"},"lines":{"text":"import asyncio\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"},"lines":{"text":"import logging\n"},"line_number":4,"absolute_offset":51,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"},"lines":{"text":"import sys\n"},"line_number":5,"absolute_offset":66,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"},"lines":{"text":"import threading\n"},"line_number":6,"absolute_offset":77,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"},"lines":{"text":"from typing import Any\n"},"line_number":7,"absolute_offset":94,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdin_reader.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":13167,"human":"0.000013s"},"searches":1,"searches_with_match":1,"bytes_searched":2478,"bytes_printed":1894,"matched_lines":6,"matches":8}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"import logging\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from collections.abc import Awaitable, Callable\n"},"line_number":4,"absolute_offset":51,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":21,"end":27}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from enum import Enum\n"},"line_number":5,"absolute_offset":99,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":10,"end":16}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from pathlib import Path\n"},"line_number":6,"absolute_offset":121,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":13,"end":19}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from typing import Any\n"},"line_number":7,"absolute_offset":146,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from comate_agent_sdk.agent.chat_session import ChatSessionError\n"},"line_number":9,"absolute_offset":170,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":41,"end":47}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from comate_agent_sdk.agent.session_query import (\n"},"line_number":10,"absolute_offset":235,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":42,"end":48}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.options import (\n"},"line_number":16,"absolute_offset":377,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":43,"end":49}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.protocol import (\n"},"line_number":21,"absolute_offset":505,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":44,"end":50}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.serde import (\n"},"line_number":31,"absolute_offset":761,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":41,"end":47}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.session_host import (\n"},"line_number":35,"absolute_offset":862,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":48,"end":54}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/server.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":31301,"human":"0.000031s"},"searches":1,"searches_with_match":1,"bytes_searched":16422,"bytes_printed":4171,"matched_lines":12,"matches":23}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"import asyncio\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"import contextlib\n"},"line_number":4,"absolute_offset":51,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"import logging\n"},"line_number":5,"absolute_offset":69,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from collections.abc import Awaitable, Callable\n"},"line_number":6,"absolute_offset":84,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":21,"end":27}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from dataclasses import dataclass\n"},"line_number":7,"absolute_offset":132,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":17,"end":23}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from pathlib import Path\n"},"line_number":8,"absolute_offset":166,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":13,"end":19}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from typing import Any\n"},"line_number":9,"absolute_offset":191,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from comate_agent_sdk.agent.events import StopEvent, TurnStartedEvent\n"},"line_number":11,"absolute_offset":215,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":35,"end":41}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from comate_cli.terminal_agent.custom_slash_commands import (\n"},"line_number":13,"absolute_offset":286,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":53,"end":59}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.approval import (\n"},"line_number":20,"absolute_offset":507,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":44,"end":50}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.options import RpcSessionOpenParams\n"},"line_number":25,"absolute_offset":646,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":43,"end":49}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.serde import (\n"},"line_number":26,"absolute_offset":717,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":41,"end":47}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"from comate_cli.terminal_agent.slash_commands import (\n"},"line_number":32,"absolute_offset":887,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":46,"end":52}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"        raise SlashCommandError(f\"failed to expand /{call.name}: {exc}\") from exc\n"},"line_number":100,"absolute_offset":2910,"submatches":[{"match":{"text":"from"},"start":73,"end":77}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"    from comate_agent_sdk.agent import ChatSession\n"},"line_number":114,"absolute_offset":3273,"submatches":[{"match":{"text":"from"},"start":4,"end":8},{"match":{"text":"import"},"start":32,"end":38}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"lines":{"text":"    from comate_agent_sdk.agent import ChatSession\n"},"line_number":120,"absolute_offset":3442,"submatches":[{"match":{"text":"from"},"start":4,"end":8},{"match":{"text":"import"},"start":32,"end":38}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/session_host.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":47324,"human":"0.000047s"},"searches":1,"searches_with_match":1,"bytes_searched":12196,"bytes_printed":5909,"matched_lines":17,"matches":30}}}
+{"type":"begin","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"}}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"from __future__ import annotations\n"},"line_number":1,"absolute_offset":0,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":16,"end":22}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"import asyncio\n"},"line_number":3,"absolute_offset":36,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"import contextlib\n"},"line_number":4,"absolute_offset":51,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"import json\n"},"line_number":5,"absolute_offset":69,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"import logging\n"},"line_number":6,"absolute_offset":81,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"import sys\n"},"line_number":7,"absolute_offset":96,"submatches":[{"match":{"text":"import"},"start":0,"end":6}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"from pathlib import Path\n"},"line_number":8,"absolute_offset":107,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":13,"end":19}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"from typing import Any\n"},"line_number":9,"absolute_offset":132,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":12,"end":18}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.protocol import (\n"},"line_number":11,"absolute_offset":156,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":44,"end":50}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.server import StdioRPCServer\n"},"line_number":18,"absolute_offset":338,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":42,"end":48}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"from comate_cli.terminal_agent.rpc.stdin_reader import ThreadedStdinReader\n"},"line_number":19,"absolute_offset":402,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":48,"end":54}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"from comate_agent_sdk.utils.daemon_thread import (\n"},"line_number":20,"absolute_offset":477,"submatches":[{"match":{"text":"from"},"start":0,"end":4},{"match":{"text":"import"},"start":42,"end":48}]}}
+{"type":"match","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"lines":{"text":"                raise RpcTransportClosedError(\"stdout unavailable\") from None\n"},"line_number":208,"absolute_offset":7715,"submatches":[{"match":{"text":"from"},"start":68,"end":72}]}}
+{"type":"end","data":{"path":{"text":"/home/hyc/projects/agent-sdk/packages/comate_cli/comate_cli/terminal_agent/rpc/stdio.py"},"binary_offset":null,"stats":{"elapsed":{"secs":0,"nanos":28854,"human":"0.000029s"},"searches":1,"searches_with_match":1,"bytes_searched":7793,"bytes_printed":4207,"matched_lines":13,"matches":20}}}
+{"data":{"elapsed_total":{"human":"0.004763s","nanos":4763293,"secs":0},"stats":{"bytes_printed":24647,"bytes_searched":52077,"elapsed":{"human":"0.000241s","nanos":240960,"secs":0},"matched_lines":72,"matches":125,"searches":9,"searches_with_match":9}},"type":"summary"}

{comate_cli-0.10.16 → comate_cli-0.10.18}/.agent/artifacts/index.json

@@ -1,6 +1,6 @@
 {
   "schema_version": 1,
-  "updated_at": 1784596310,
+  "updated_at": 1785719652,
   "items": {
     "sha256:da3d0964cd50a338b3dedc5212ee6d4d045c04629f62a0e948c905c3ec27ab4c": {
       "id": "sha256:da3d0964cd50a338b3dedc5212ee6d4d045c04629f62a0e948c905c3ec27ab4c",
@@ -1630,6 +1630,16 @@
       "mime": "text/plain",
       "created_at": 1784596310,
       "ttl_seconds": 3600
+    },
+    "sha256:7f6ae5a9bc2404aef026b13c8a360c1c687ea1c1509b65429239928d9f8560bb": {
+      "id": "sha256:7f6ae5a9bc2404aef026b13c8a360c1c687ea1c1509b65429239928d9f8560bb",
+      "relpath": ".agent/artifacts/grep_content/7f6ae5a9bc2404aef026b13c8a360c1c687ea1c1509b65429239928d9f8560bb.txt",
+      "abspath": "/home/hyc/projects/agent-sdk/packages/comate_cli/.agent/artifacts/grep_content/7f6ae5a9bc2404aef026b13c8a360c1c687ea1c1509b65429239928d9f8560bb.txt",
+      "bytes": 27886,
+      "sha256": "7f6ae5a9bc2404aef026b13c8a360c1c687ea1c1509b65429239928d9f8560bb",
+      "mime": "text/plain",
+      "created_at": 1785719652,
+      "ttl_seconds": 3600
     }
   }
 }

{comate_cli-0.10.16 → comate_cli-0.10.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.10.16
+Version: 0.10.18
 Summary: Comate terminal CLI built on comate-agent-sdk
 Project-URL: Homepage, https://github.com/AndyLee1024/agent-sdk
 Project-URL: Repository, https://github.com/AndyLee1024/agent-sdk
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <3.14,>=3.11
 Requires-Dist: charset-normalizer==3.4.7
-Requires-Dist: comate-agent-sdk<0.11.30,>=0.11.5
+Requires-Dist: comate-agent-sdk<0.12,>=0.11.14
 Requires-Dist: concurrent-log-handler>=0.9.25
 Requires-Dist: curl-cffi==0.13.0
 Requires-Dist: httpx<0.29.0,>=0.28.1
@@ -83,3 +83,5 @@ COMATE_DEBUG_NOISE=1 comate
 ## Author
 
 andy
+
+by andy

{comate_cli-0.10.16 → comate_cli-0.10.18}/README.md

@@ -55,3 +55,5 @@ COMATE_DEBUG_NOISE=1 comate
 ## Author
 
 andy
+
+by andy

{comate_cli-0.10.16 → comate_cli-0.10.18}/comate_cli/terminal_agent/app.py

@@ -682,6 +682,7 @@ def _build_agent(
         strict_hook_settings=False,
         memory_background_enabled=snapshot.memory_background_enabled,
         memory_dreaming_enabled=snapshot.memory_dreaming_enabled,
+        disabled_skills=tuple(getattr(snapshot, "disabled_skills", ()) or ()),
         disallowed_tools=disallowed_tools,
         add_dirs=add_dirs or None,
         # Explicit projection is required: the SDK library default is

{comate_cli-0.10.16 → comate_cli-0.10.18}/comate_cli/terminal_agent/config/model.py

@@ -1,6 +1,7 @@
 """ConfigSnapshot：/config UI、store、startup 三处共享的偏好快照。
 
 Revision 5: 6 项偏好（display_thinking, model_level, memory_background, memory_dreaming, token_cost, recap）。
+Revision 6: 追加 disabled_skills——由 /skills 菜单管理，不进 /config picker 字段序。
 """
 from __future__ import annotations
 
@@ -20,6 +21,8 @@ class ConfigSnapshot:
     memory_dreaming_enabled: bool = True
     token_cost_enabled: bool = False
     recap_enabled: bool = True
+    disabled_skills: tuple[str, ...] = ()
+    """按名禁用的 skill 名单，投影为 AgentConfig.disabled_skills；管理入口是 /skills 菜单。"""
 
     @classmethod
     def default(cls) -> "ConfigSnapshot":
@@ -42,3 +45,6 @@ class ConfigSnapshot:
 
     def with_recap(self, enabled: bool) -> "ConfigSnapshot":
         return replace(self, recap_enabled=enabled)
+
+    def with_disabled_skills(self, names: tuple[str, ...]) -> "ConfigSnapshot":
+        return replace(self, disabled_skills=tuple(names))

{comate_cli-0.10.16 → comate_cli-0.10.18}/comate_cli/terminal_agent/config/store.py

@@ -37,6 +37,7 @@ _CLI_CONFIG_MODEL_SECTION = "model"
 _CLI_CONFIG_MEMORY_SECTION = "memory"
 _CLI_CONFIG_TOKEN_COST_SECTION = "token_cost"
 _CLI_CONFIG_RECAP_SECTION = "recap"
+_CLI_CONFIG_SKILLS_SECTION = "skills"
 
 
 def _settings_path() -> Path:
@@ -91,6 +92,17 @@ def _named_string(section: dict[str, Any], key: str, path: str) -> str | None:
     return None
 
 
+def _named_string_list(section: dict[str, Any], key: str, path: str) -> tuple[str, ...] | None:
+    """读字符串数组；非数组或含非字符串元素时整体拒绝，只 warn 不 raise。"""
+    if key not in section:
+        return None
+    raw = section[key]
+    if not isinstance(raw, list) or not all(isinstance(item, str) for item in raw):
+        logger.warning("settings.json %s 非法 (%r)，保留已有值", path, raw)
+        return None
+    return tuple(raw)
+
+
 def snapshot_from_settings_dict(data: Mapping[str, Any]) -> ConfigSnapshot:
     """Build ConfigSnapshot from settings data without mutating or writing it."""
     snapshot = ConfigSnapshot.default()
@@ -247,6 +259,19 @@ def _apply_cli_config(snapshot: ConfigSnapshot, section: dict[str, Any]) -> Conf
     if parsed_bool is not None:
         snapshot = snapshot.with_recap(parsed_bool)
 
+    skills = _named_object(
+        section,
+        _CLI_CONFIG_SKILLS_SECTION,
+        "comate_cli.config.skills",
+    )
+    disabled_skills = _named_string_list(
+        skills,
+        "disabled",
+        "comate_cli.config.skills.disabled",
+    )
+    if disabled_skills is not None:
+        snapshot = snapshot.with_disabled_skills(disabled_skills)
+
     return snapshot
 
 
@@ -262,7 +287,7 @@ class SaveResult:
 
 
 def save(snapshot: ConfigSnapshot) -> SaveResult:
-    """读现有 settings.json → 写入 6 项 canonical CLI config 与 SDK mirrors → 原子写回。
+    """读现有 settings.json → 写入 canonical CLI config 与 SDK mirrors → 原子写回。
 
     失败返回 ok=False，error_messages 透传，不 raise。"""
     try:
@@ -286,6 +311,8 @@ def build_cli_config_settings(snapshot: ConfigSnapshot) -> dict[str, Any]:
         "model": {"level": snapshot.model_level.lower()},
         "token_cost": {"enabled": snapshot.token_cost_enabled},
         "recap": {"enabled": snapshot.recap_enabled},
+        # 无 SDK settings mirror：runtime 投影由 _build_agent() 显式完成。
+        "skills": {"disabled": list(snapshot.disabled_skills)},
     }
 
 

{comate_cli-0.10.16 → comate_cli-0.10.18}/comate_cli/terminal_agent/event_renderer.py

@@ -75,7 +75,7 @@ from comate_cli.terminal_agent.tool_result_store import (
     ToolResultRecord,
     ToolResultRegistry,
 )
-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.tool_view import summarize_tool_args, resolve_display_tool_name, should_show_tool_in_scrollback, _truncate_to_width
 from comate_cli.terminal_agent.tool_fold import (
     ActiveToolFold,
     ToolFoldSnapshot,
@@ -103,12 +103,6 @@ TOOL_ARGS_PROGRESS_VISIBLE_AFTER_SECONDS = 1.5
 TOOL_ARGS_PROGRESS_VISIBLE_MIN_TOKENS_AFTER_DELAY = 256
 
 
-def _truncate(content: str, max_len: int = 120) -> str:
-    if len(content) <= max_len:
-        return content
-    return f"{content[:max_len]}..."
-
-
 def _scheduled_scope(durable: bool) -> str:
     return "durable" if durable else "session-only"
 
@@ -125,7 +119,7 @@ def _scheduled_failure_reason(reason: str) -> str:
         else:
             prompt_at = lowered.find("prompt")
             text = text[:prompt_at].rstrip(": -") or "hidden"
-    return _truncate(text, 160)
+    return _truncate_to_width(text, 160)
 
 
 def _format_duration(seconds: float) -> str:
@@ -360,6 +354,9 @@ class EventRenderer:
         self._running_tools: dict[str, _RunningTool] = {}
         self._tool_call_args: dict[str, dict[str, Any]] = {}
         self._active_tool_fold = ActiveToolFold()
+        # 本 session 的 scratchpad 目录，由 TUI 宿主从 ChatSession 接线（见
+        # set_scratchpad_dir）。None 表示尚未接线，草稿写入按普通写入展示。
+        self._scratchpad_dir: Path | None = None
         self._tool_results = tool_results
         self._fallback_tool_result_sequence = 0
         self._assistant_buffer = ""
@@ -418,6 +415,14 @@ class EventRenderer:
     def set_tool_result_registry(self, tool_results: ToolResultRegistry) -> None:
         self._tool_results = tool_results
 
+    def set_scratchpad_dir(self, scratchpad_dir: Path | None) -> None:
+        """接线本 session 的 scratchpad 目录（session 切换后需重新接线）。"""
+        self._scratchpad_dir = Path(scratchpad_dir) if scratchpad_dir is not None else None
+
+    @property
+    def scratchpad_dir(self) -> Path | None:
+        return self._scratchpad_dir
+
     def is_auto_compacting(self) -> bool:
         return self._is_auto_compacting
 
@@ -1655,6 +1660,8 @@ class EventRenderer:
         title = tool_name
         is_task = tool_name.lower() == "agent"
         summary = summarize_tool_args(tool_name, args, self._project_root).strip()
+        # transient 面板是单行消费通道，压平 Bash 摘要中的换行防御
+        summary = summary.replace("\n", " ")
         display_name = resolve_display_tool_name(tool_name, args)
         subagent_name = ""
         subagent_description = ""
@@ -1705,7 +1712,16 @@ class EventRenderer:
             )
             text, subtitle = scrollback_preview(rec)
             self._append_history_entry(
-                HistoryEntry(entry_type="tool_result", text=text, severity=sev, subtitle=subtitle, subtitle_style=sub_sty)
+                HistoryEntry(
+                    entry_type="tool_result",
+                    text=text,
+                    severity=sev,
+                    subtitle=subtitle,
+                    subtitle_style=sub_sty,
+                    multiline_signature=tool_name.lower() == "bash"
+                    and isinstance(text, Text)
+                    and "\n" in text.plain,
+                )
             )
             return
 
@@ -1757,7 +1773,16 @@ class EventRenderer:
         )
         text, subtitle = scrollback_preview(rec)
         self._append_history_entry(
-            HistoryEntry(entry_type="tool_result", text=text, severity=sev, subtitle=subtitle, subtitle_style=sub_sty)
+            HistoryEntry(
+                entry_type="tool_result",
+                text=text,
+                severity=sev,
+                subtitle=subtitle,
+                subtitle_style=sub_sty,
+                multiline_signature=tool_name.lower() == "bash"
+                and isinstance(text, Text)
+                and "\n" in text.plain,
+            )
         )
 
     def _rebuild_loading_line(self) -> None:
@@ -2005,12 +2030,13 @@ class EventRenderer:
                 args_dict = arguments if isinstance(arguments, dict) else {"_raw": str(arguments)}
                 # Store args for ToolResult phase lookup.
                 self._tool_call_args[tool_call_id] = args_dict
-                if is_foldable_tool(tool_name):
+                if is_foldable_tool(tool_name, args_dict, scratchpad_dir=self._scratchpad_dir):
                     self._active_tool_fold.add_call(
                         tool_call_id=tool_call_id,
                         tool_name=tool_name,
                         args=args_dict,
                         started_at_monotonic=time.monotonic(),
+                        scratchpad_dir=self._scratchpad_dir,
                     )
                     self._rebuild_loading_line()
                     return (False, None)
@@ -2163,6 +2189,8 @@ class EventRenderer:
                 parent_state = self._running_tools.get(parent_tool_call_id)
                 if parent_state is not None:
                     args_summary = summarize_tool_args(tool, args, self._project_root).strip()
+                    # transient 面板嵌套工具行是单行，压平换行
+                    args_summary = args_summary.replace("\n", " ")
                     nested_tool = _SubagentTool(
                         tool_name=tool,
                         args_summary=args_summary,

{comate_cli-0.10.16 → comate_cli-0.10.18}/comate_cli/terminal_agent/figures.py

@@ -59,6 +59,9 @@ REFERENCE_MARK = "※"         # ※
 # Issue flag
 FLAG_ICON = "⚑"              # ⚑
 
+# 锁定标记（builtin/plugin skill 不可禁用）
+LOCK_ICON = "🔒"             # 🔒
+
 # Blockquote / 装饰横线
 BLOCKQUOTE_BAR = "▎"         # ▎
 HEAVY_HORIZONTAL = "━"       # ━

{comate_cli-0.10.16 → comate_cli-0.10.18}/comate_cli/terminal_agent/history_printer.py

@@ -4,6 +4,8 @@ import re
 from collections.abc import Callable
 from typing import Any
 
+from prompt_toolkit.utils import get_cwidth
+
 from rich.console import Console, Group
 from rich.padding import Padding
 from rich.style import Style
@@ -538,31 +540,61 @@ def render_history_group(
                 renderables.append(first_line)
 
                 has_body = len(text_lines) > 1
-                # For multi-line Rich Text bodies (Edit/Write inline diff),
-                # subtitle ("Added X, removed Y") goes between signature and
-                # body so the reader sees the summary before the diff. For
-                # single-line text (bash/grep/read previews), subtitle stays
-                # after the signature line as before.
-                if has_body and entry.subtitle:
-                    glyph_column = _line_number_gutter_glyph_column(text_lines[1:])
-                    renderables.append(
-                        _render_subtitle_line(
-                            entry.subtitle,
-                            error=(entry.subtitle_style == "error"),
-                            warning=(entry.subtitle_style == "warning"),
-                            glyph_column=glyph_column if glyph_column is not None else 2,
-                        )
+                if entry.multiline_signature and has_body:
+                    # Bash 多行签名：续行缩进对齐到括号内容起始列，
+                    # subtitle 排在全部签名行之后。
+                    first_plain = (
+                        text_lines[0].plain
+                        if text_lines and isinstance(text_lines[0], Text)
+                        else str(text_lines[0] if text_lines else "")
                     )
-                for line in text_lines[1:]:
-                    renderables.append(
-                        _pad_diff_body_line_background(
-                            line,
-                            terminal_width=terminal_width,
-                            console_tab_size=console.tab_size,
-                        )
+                    paren_idx = first_plain.find("(")
+                    sig_prefix = (
+                        first_plain[: paren_idx + 1] if paren_idx >= 0 else first_plain
+                    )
+                    indent_width = get_cwidth(prefix_char) + 1 + sum(
+                        get_cwidth(ch) for ch in sig_prefix
                     )
-                if not has_body and entry.subtitle:
-                    renderables.append(_render_subtitle_line(entry.subtitle, error=(entry.subtitle_style == "error"), warning=(entry.subtitle_style == "warning")))
+                    indent_str = " " * indent_width
+                    for line in text_lines[1:]:
+                        cont_line = Text()
+                        cont_line.append(indent_str)
+                        cont_line.append_text(line)
+                        renderables.append(cont_line)
+                    if entry.subtitle:
+                        renderables.append(
+                            _render_subtitle_line(
+                                entry.subtitle,
+                                error=(entry.subtitle_style == "error"),
+                                warning=(entry.subtitle_style == "warning"),
+                            )
+                        )
+                else:
+                    # For multi-line Rich Text bodies (Edit/Write inline diff),
+                    # subtitle ("Added X, removed Y") goes between signature and
+                    # body so the reader sees the summary before the diff. For
+                    # single-line text (bash/grep/read previews), subtitle stays
+                    # after the signature line as before.
+                    if has_body and entry.subtitle:
+                        glyph_column = _line_number_gutter_glyph_column(text_lines[1:])
+                        renderables.append(
+                            _render_subtitle_line(
+                                entry.subtitle,
+                                error=(entry.subtitle_style == "error"),
+                                warning=(entry.subtitle_style == "warning"),
+                                glyph_column=glyph_column if glyph_column is not None else 2,
+                            )
+                        )
+                    for line in text_lines[1:]:
+                        renderables.append(
+                            _pad_diff_body_line_background(
+                                line,
+                                terminal_width=terminal_width,
+                                console_tab_size=console.tab_size,
+                            )
+                        )
+                    if not has_body and entry.subtitle:
+                        renderables.append(_render_subtitle_line(entry.subtitle, error=(entry.subtitle_style == "error"), warning=(entry.subtitle_style == "warning")))
 
                 renderables.append(Text(""))
                 prev_was_assistant = False

{comate_cli-0.10.16 → comate_cli-0.10.18}/comate_cli/terminal_agent/models.py

@@ -126,6 +126,7 @@ class HistoryEntry:
     log_subtype: LogSubtype | None = None
     tool_call_ids: tuple[str, ...] = ()
     job_event: JobEventDisplay | None = None
+    multiline_signature: bool = False
 
 
 @dataclass(frozen=True)