comate-cli 0.11.2__tar.gz → 0.12.0b2__tar.gz

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/CHANGELOG.md

@@ -18,6 +18,14 @@
 
 ### Added
 
+- 新增 `comate update` 子命令与 `comate --version` / `-V`：用户可自主升级，不再手敲
+  `uv tool install ...`。macOS/Linux 为既有进程内升级的命令行包装；Windows 改为
+  「旁装 + 入口切换 + 重启生效」（ADR-0018）：新版本装到 `~/.agent/versions/<包名>/<版本>/`，
+  只替换 PATH 上的 `comate.exe` 跳板，无需关闭任何窗口。启动全屏提示的 Windows 首选项
+  相应改为「立即更新」，首次一行提示只给 `comate update`；旧入口 / 半成品 / 超保留数
+  （2 个）的旧版本由下次启动后台试删回收。源码开发态（editable）拒绝自更新，PATH 无 uv
+  时给出手动命令。版本检查新增预发布规则：装着 beta 的用户会被推荐下一个 beta，正式版
+  用户永远看不到 beta；`comate update --pre` 可显式选择预发布版。
 - 新增 `/workflows` 独立全屏面板：跑次列表 → 跑次详情（阶段标题 + agent 行）→ agent 详情
   （prompt / 结果 / 错误 pager）三层导航，每秒轮询 run JSON live 刷新；`x` 对本会话发起的
   跑次两段式停止，非本会话 / 崩溃遗留的 running 行标记为「非本会话」且不可停；忙时可打开。

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/CONTEXT.md

@@ -102,6 +102,32 @@ _Avoid_: auto update enablement (inverted semantics), plugin pin (no version pin
 The invariant that an update changes only on-disk plugin state. The running session keeps its already-loaded resources until the next startup or an explicit user reload. A background update therefore never shifts agent behavior mid-session.
 _Avoid_: hot reload, live update
 
+## CLI Self-Update Language
+
+**Self-Update**:
+The act of upgrading the CLI's own installed package to a newer release, whether triggered by the `update` subcommand or from the launch prompt. It concerns the CLI distribution itself, never plugins.
+_Avoid_: auto update (reserved for plugins), upgrade command, uv update
+
+**Version Check**:
+Comparing the installed CLI version against the newest version offered by the release source, by PEP 440 ordering. A newer remote version is what makes a Self-Update available. This is the only place in the CLI where versions are ordered; it is unrelated to plugin **Update Detection**.
+_Avoid_: update check, update detection (plugin term), has-update probe
+
+**Release Source**:
+Where a Version Check reads the newest version from: the public package index for the default distribution, or the whitelabel distribution's own index. It is derived from the distribution profile, never hard-coded.
+_Avoid_: registry, mirror (a mirror is one way to reach the same source)
+
+**Side-Install**:
+Installing a new CLI version into its own version-isolated location without touching the currently running installation. Used where the running installation cannot be rebuilt in place.
+_Avoid_: in-place upgrade, reinstall, versioned install
+
+**Entrypoint Flip**:
+Replacing the single command-launcher file on the user's PATH so that it points at a Side-Installed version, by renaming the current launcher aside and putting the new one in its place. It is the only file of the running installation a Self-Update may modify.
+_Avoid_: symlink swap, shim update, rename dance
+
+**Restart-to-Apply**:
+The rule that a completed Self-Update takes effect only for processes started afterwards. Running sessions keep their version until they exit.
+_Avoid_: hot upgrade, live upgrade
+
 ## Tool Result Display Language
 
 **Tool Result Preview**:
@@ -179,6 +205,10 @@ _Avoid_: spinner state, running flag, blocked
 - The **Update Effectiveness Boundary** holds for both Plugin Auto Update and manual plugin updates: neither may mutate the running session's loaded resources.
 - An **Auto Update Opt-out** affects only Plugin Auto Update; it does not disable manual per-plugin updates.
 
+- **Self-Update** and **Plugin Auto Update** are separate concepts with separate vocabularies: a **Version Check** orders versions, plugin **Update Detection** only compares for equality. Neither triggers the other.
+- A **Side-Install** followed by an **Entrypoint Flip** is one Self-Update strategy; an in-process reinstall of the current installation is another. Which one applies is a property of the platform, not of the user's choice.
+- **Restart-to-Apply** holds for every Self-Update strategy and mirrors the plugin **Update Effectiveness Boundary**: on-disk state changes, the running process does not.
+
 - A **Session Title** is a fact of the session, not of the **Session Report**: it exists whether or not a report backend is configured, and the report only mirrors it. **Durable Title Completion** is therefore judged from the session's own metadata.
 - A **Session Title** is generated from the session's earliest **Committed Title Input**, never from the latest one. A resumed session without a title is titled from its original first input, so the title does not change to whatever was typed after resume.
 - The **Tab Title** shows the **Session Title** the moment it becomes durable, falls back to the product name after `/clear` starts a new session, and shows the existing title immediately on resume.

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.11.2
+Version: 0.12.0b2
 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.13,>=0.12.5
+Requires-Dist: comate-agent-sdk<0.13,>=0.12.6
 Requires-Dist: concurrent-log-handler>=0.9.25
 Requires-Dist: curl-cffi==0.13.0
 Requires-Dist: httpx<0.29.0,>=0.28.1

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/comate_cli/main.py

@@ -247,6 +247,7 @@ def _usage_text(command_name: str = "comate") -> str:
         f"  {command_name} -p [--output-format text|json] <prompt>\n"
         f"  {command_name} resume [<session_id>]\n"
         f"  {command_name} mcp <subcommand> [options]\n"
+        f"  {command_name} update [--pre]\n"
         "\n"
         f'MCP subcommands (run "{command_name} mcp <subcommand> --help" for details):\n'
         f"  add        Add an MCP server to {command_name}\n"
@@ -261,7 +262,9 @@ def _usage_text(command_name: str = "comate") -> str:
         "  --add-dir <path>   Grant tool read/write access to an extra directory\n"
         "                     (repeatable). Applies to subagents too."
         "\n"
-        "  --yolo             Start in bypassPermissions (YOLO) mode"
+        "  --yolo             Start in bypassPermissions (YOLO) mode\n"
+        "  --version, -V      Print version and exit\n"
+        "  --pre              (update) Also consider pre-release versions"
     )
 
 
@@ -569,6 +572,34 @@ def main(argv: list[str] | None = None, *, profile=None) -> None:
         sys.stdout.write(f"{_usage_text(command_name=command_name)}\n")
         return
 
+    if run_argv in (["--version"], ["-V"]):
+        # 输出格式 "<package> <version>" 是 Side-Install 冒烟验证的契约
+        # （新 shim 跑 --version，取最后一段比对版本号），改动需同步 side_install。
+        import importlib.metadata
+
+        try:
+            version = importlib.metadata.version(profile.package_name)
+        except importlib.metadata.PackageNotFoundError:
+            version = "unknown"
+        sys.stdout.write(f"{profile.package_name} {version}\n")
+        return
+
+    if run_argv and run_argv[0] == "update":
+        update_args = run_argv[1:]
+        include_prereleases = "--pre" in update_args
+        unknown = [arg for arg in update_args if arg != "--pre"]
+        if unknown:
+            sys.stderr.write(
+                f"update: unknown arguments: {' '.join(unknown)}\n"
+                f"{_usage_text(command_name=command_name)}\n"
+            )
+            raise SystemExit(2)
+        from comate_cli.update_cli import run_update_cli
+
+        raise SystemExit(
+            run_update_cli(profile=profile, include_prereleases=include_prereleases)
+        )
+
     if run_argv and run_argv[0] == "mcp":
         from comate_cli.mcp_cli import McpCliError, run_mcp_command
 

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/comate_cli/terminal_agent/app.py

@@ -138,6 +138,31 @@ async def _handle_background_update_on_launch(
         profiler.mark("update_check.handle_failed")
 
 
+async def _run_windows_self_update_cleanup(*, target: "UpdateTarget | None") -> None:
+    """win32 启动后台清理：.old 入口 / 半成品 / 超保留数版本 / legacy venv。
+
+    只在版本化布局已建立（有过一次 Side-Install）时干活：零成本早退，不 spawn
+    `uv tool dir`。清理本身是本地有限文件 IO，经 to_thread 移出 event loop。
+    """
+    from comate_cli.terminal_agent import side_install
+
+    if target is None:
+        return
+    try:
+        layout = side_install.build_layout(target)
+        if not side_install.has_completed_versions(layout):
+            return
+        legacy = await side_install.resolve_legacy_env_dir(layout, target)
+        await asyncio.to_thread(  # to_thread: bounded-local — 本地有限文件 IO/rmtree，必然返回
+            side_install.cleanup_stale_artifacts,
+            layout,
+            legacy_env_dir=legacy,
+            running_prefix=Path(sys.prefix),
+        )
+    except Exception:
+        logger.debug("windows self-update cleanup failed", exc_info=True)
+
+
 def _schedule_update_check_on_launch(
     *,
     renderer: EventRenderer,
@@ -165,6 +190,10 @@ def _schedule_update_check_on_launch(
                     profiler=profiler,
                     target=target,
                 )
+            if sys.platform == "win32":
+                profiler.mark("update_check.win32_cleanup.start")
+                await _run_windows_self_update_cleanup(target=target)
+                profiler.mark("update_check.win32_cleanup.done")
         except asyncio.CancelledError:
             profiler.mark("update_check.cancelled")
             raise

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/comate_cli/terminal_agent/event_renderer.py

@@ -72,6 +72,7 @@ from comate_cli.terminal_agent.models import (
     LogSubtype,
 )
 from comate_cli.terminal_agent.tool_result_formatters import (
+    record_diff_line_counts,
     render_diff_text,
     scrollback_preview,
 )
@@ -400,6 +401,9 @@ class EventRenderer:
         # 本 session 的 scratchpad 目录，由 TUI 宿主从 ChatSession 接线（见
         # set_scratchpad_dir）。None 表示尚未接线，草稿写入按普通写入展示。
         self._scratchpad_dir: Path | None = None
+        # 本 session 的 auto memory 目录，接线方式同 scratchpad；None 表示尚未接线，
+        # 记忆写入按普通写入展示。
+        self._memory_dir: Path | None = None
         self._tool_results = tool_results
         self._fallback_tool_result_sequence = 0
         self._assistant_buffer = ""
@@ -471,6 +475,14 @@ class EventRenderer:
     def scratchpad_dir(self) -> Path | None:
         return self._scratchpad_dir
 
+    def set_memory_dir(self, memory_dir: Path | None) -> None:
+        """接线本 session 的 auto memory 目录（session 切换后需重新接线）。"""
+        self._memory_dir = Path(memory_dir) if memory_dir is not None else None
+
+    @property
+    def memory_dir(self) -> Path | None:
+        return self._memory_dir
+
     def is_auto_compacting(self) -> bool:
         return self._is_auto_compacting
 
@@ -2133,13 +2145,19 @@ 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, args_dict, scratchpad_dir=self._scratchpad_dir):
+                if is_foldable_tool(
+                    tool_name,
+                    args_dict,
+                    scratchpad_dir=self._scratchpad_dir,
+                    memory_dir=self._memory_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,
+                        memory_dir=self._memory_dir,
                     )
                     self._rebuild_loading_line()
                     return (False, None)
@@ -2170,10 +2188,13 @@ class EventRenderer:
                         metadata=metadata,
                         output=output,
                     )
+                    lines_added, lines_removed = record_diff_line_counts(rec)
                     self._active_tool_fold.mark_result(
                         tool_call_id,
                         is_error=is_error,
                         result_record_sequence=rec.sequence,
+                        lines_added=lines_added,
+                        lines_removed=lines_removed,
                     )
                     self._rebuild_loading_line()
                     return (False, None)
@@ -2353,9 +2374,15 @@ class EventRenderer:
                 self._rebuild_loading_line()
                 if event.metadata.get("output_truncated") == "max_output_tokens":
                     # 32k 重试也撞穿 / 显式 cap 直接截断：SDK 照常 completed 收尾，
-                    # 截断事实只有这条 warning 可见。
+                    # 截断事实只有这条 warning 可见。正文一字未出（额度被思考耗尽）
+                    # 是语义不同的整句，独立 key。
+                    truncated_key = (
+                        i18n_message.stream_output_truncated_no_content
+                        if event.metadata.get("output_truncated_no_content")
+                        else i18n_message.stream_output_truncated
+                    )
                     self.append_system_message(
-                        i18n(i18n_message.stream_output_truncated),
+                        i18n(truncated_key),
                         severity="warning",
                     )
                 # 用户拒答提问是他自己刚做的动作，scrollback 不必回声。

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/comate_cli/terminal_agent/i18n/_en.py

@@ -213,6 +213,10 @@ EN: dict[str, str] = {
     "stream_output_truncated": (
         "Output hit the token cap, this response was truncated"
     ),
+    "stream_output_truncated_no_content": (
+        "Thinking used up the output token cap, this response produced no text; "
+        "try /effort to lower the thinking level"
+    ),
     "thinking_display_disabled": "Thinking display disabled.",
     "thinking_display_enabled": "Thinking display enabled.",
     "tool_result_cancelled": "Interrupted",

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/comate_cli/terminal_agent/i18n/_ja.py

@@ -217,6 +217,10 @@ JA: dict[str, str] = {
     "stream_output_truncated": (
         "出力がトークン上限に達したため、この応答は途中で打ち切られました"
     ),
+    "stream_output_truncated_no_content": (
+        "思考で出力トークン上限を使い切ったため、この応答は本文を生成できませんでした。"
+        "/effort で思考レベルを下げてみてください"
+    ),
     "thinking_display_disabled": "思考プロセスの表示をオフにしました。",
     "thinking_display_enabled": "思考プロセスの表示をオンにしました。",
     "tool_result_cancelled": "中断されました",

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/comate_cli/terminal_agent/i18n/_zh.py

@@ -156,6 +156,9 @@ ZH: dict[str, str] = {
     "stream_fallback_discarded": "流式传输中断，上方部分输出已作废",
     "stream_fallback_retry_aux": "流式中断，转非流式重试中…",
     "stream_output_truncated": "输出已达 token 上限，本轮回答被截断",
+    "stream_output_truncated_no_content": (
+        "输出 token 上限已被思考过程耗尽，本轮没有产出正文；可用 /effort 降低思考档位"
+    ),
     "thinking_display_disabled": "已关闭思考过程显示。",
     "thinking_display_enabled": "已开启思考过程显示。",
     "tool_result_cancelled": "已中断",

{comate_cli-0.11.2 → comate_cli-0.12.0b2}/comate_cli/terminal_agent/i18n/message.py

@@ -141,6 +141,7 @@ class message(StrEnum):  # noqa: N801 - 调用形态是 i18n(message.key)，小
     stream_fallback_discarded = "stream_fallback_discarded"
     stream_fallback_retry_aux = "stream_fallback_retry_aux"
     stream_output_truncated = "stream_output_truncated"
+    stream_output_truncated_no_content = "stream_output_truncated_no_content"
     thinking_display_disabled = "thinking_display_disabled"
     thinking_display_enabled = "thinking_display_enabled"
     # tool result 三态副行（ADR-0010）：拒绝/中断是语义不同的整句，各自成 key，