comate-cli 0.10.9__tar.gz → 0.10.10__tar.gz

{comate_cli-0.10.9 → comate_cli-0.10.10}/PKG-INFO

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

@@ -105,23 +105,6 @@ async def _handle_update_on_launch(
     return False
 
 
-def _show_startup_update_result(target: UpdateTarget) -> None:
-    """Display a detached updater result file if one exists."""
-    try:
-        from comate_cli.terminal_agent.windows_updater import (
-            consume_update_result,
-            format_update_result_message,
-        )
-
-        result = consume_update_result(target.package)
-        if result is None:
-            return
-        style = "green" if result.status == "success" else "yellow"
-        console.print(f"[{style}]{format_update_result_message(result, target=target)}[/]")
-    except Exception:
-        logger.debug("startup update result display failed", exc_info=True)
-
-
 async def _handle_background_update_on_launch(
     info: UpdateInfo,
     *,
@@ -788,8 +771,6 @@ async def run(
         return
 
     if interactive:
-        _show_startup_update_result(update_target)
-
         _check_update_func, get_pending_update_prompt_info = _import_update_check_core()
         pending_info = get_pending_update_prompt_info(target=update_target)
         if pending_info is not None:

{comate_cli-0.10.9 → comate_cli-0.10.10}/comate_cli/terminal_agent/tui.py

@@ -277,6 +277,7 @@ class TerminalAgentTUI(
         self._compact_cancel_requested = False
         self._pending_exit_after_compact_cancel = False
         self._queued_display_by_message_id: dict[str, str] = {}
+        self._submitted_queue_preview_suppressed_ids: set[str] = set()
         self._waiting_for_input = False
         self._pending_questions: list[dict[str, Any]] | None = None
         self._ui_mode = UIMode.NORMAL
@@ -1685,7 +1686,16 @@ class TerminalAgentTUI(
 
         try:
             with self._first_turn_span("submit_user_message.session_send"):
-                await self._session.send(text)
+                message_id = await self._session.send(text)
+            suppressed_ids = getattr(
+                self,
+                "_submitted_queue_preview_suppressed_ids",
+                None,
+            )
+            if not isinstance(suppressed_ids, set):
+                suppressed_ids = set()
+                self._submitted_queue_preview_suppressed_ids = suppressed_ids
+            suppressed_ids.add(str(message_id))
         except Exception as exc:
             logger.exception("send failed")
             await self._handle_error(exc)
@@ -1709,6 +1719,17 @@ class TerminalAgentTUI(
                         QueueDirtyReason.CANCELLED,
                         QueueDirtyReason.CLEARED,
                     }:
+                        suppressed_ids = getattr(
+                            self,
+                            "_submitted_queue_preview_suppressed_ids",
+                            None,
+                        )
+                        if isinstance(suppressed_ids, set):
+                            if event.reason is QueueDirtyReason.CLEARED:
+                                suppressed_ids.clear()
+                            else:
+                                for message_id in event.message_ids:
+                                    suppressed_ids.discard(str(message_id))
                         for message_id in event.message_ids:
                             self._queued_display_by_message_id.pop(
                                 str(message_id),
@@ -1716,8 +1737,15 @@ class TerminalAgentTUI(
                             )
                         self._clear_queued_admission_busy_if_stale()
                     if event.reason is QueueDirtyReason.CONSUMED:
+                        suppressed_ids = getattr(
+                            self,
+                            "_submitted_queue_preview_suppressed_ids",
+                            None,
+                        )
                         consumed_human_displays: list[str] = []
                         for message_id, origin in zip(event.message_ids, event.origins):
+                            if isinstance(suppressed_ids, set):
+                                suppressed_ids.discard(str(message_id))
                             if origin is not MessageOrigin.HUMAN:
                                 continue
                             display_text = self._queued_display_by_message_id.pop(

{comate_cli-0.10.9 → comate_cli-0.10.10}/comate_cli/terminal_agent/tui_parts/render_panels.py

@@ -28,7 +28,6 @@ from comate_cli.terminal_agent.figures import (
     DOWN_ARROW,
     ELLIPSIS,
     FAST_PLAY_ICON,
-    PAUSE_ICON,
     TASK_IN_PROGRESS,
     TASK_PENDING,
     TASK_BLOCKED,
@@ -169,10 +168,14 @@ class RenderPanelsMixin:
         except Exception:
             logger.debug("failed to read queue preview snapshot", exc_info=True)
             return []
+        suppressed_ids = getattr(self, "_submitted_queue_preview_suppressed_ids", set())
+        if not isinstance(suppressed_ids, set):
+            suppressed_ids = set()
         return [
             message
             for message in snapshot
             if getattr(message, "origin", None) == MessageOrigin.HUMAN
+            and str(getattr(message, "message_id", "")) not in suppressed_ids
         ]
 
     def _visible_queued_message_ids(self) -> set[str] | None:

{comate_cli-0.10.9 → comate_cli-0.10.10}/comate_cli/terminal_agent/update_check.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import importlib.metadata
-import locale
 import logging
 import os
 import ssl
@@ -105,6 +104,25 @@ class UpdateTarget:
         )
 
 
+def windows_update_command(target: UpdateTarget) -> tuple[str, ...]:
+    """Windows manual update command with venv repair via --reinstall."""
+    return (
+        "uv",
+        "tool",
+        "install",
+        f"{target.package}@latest",
+        "--force",
+        "--reinstall",
+        "--refresh-package",
+        target.package,
+        *target.install_args,
+    )
+
+
+def windows_update_command_text(target: UpdateTarget) -> str:
+    return " ".join(windows_update_command(target))
+
+
 @dataclass(frozen=True, slots=True)
 class UpdateInfo:
     package: str
@@ -154,21 +172,15 @@ def _coerce_update_target(
 
 
 def _is_chinese_locale() -> bool:
-    """判断当前系统 locale 是否为中文环境。"""
-    # zh_tw（台湾）和 zh_hk（香港）不走清华镜像源
+    """判断当前系统 locale 是否为中国大陆简体环境（决定是否走清华镜像源）。"""
+    from comate_cli.terminal_agent.update_messages import system_locale_candidates
+
+    # zh_tw（台湾）和 zh_hk（香港）不走清华镜像源；OR 语义：任一来源为中文即用镜像。
     cn_prefixes = ("zh_cn", "zh_sg", "zh_mo", "zh_hans")
-    for env_var in ("LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE"):
-        val = os.environ.get(env_var, "").lower()
-        if any(val.startswith(prefix) for prefix in cn_prefixes):
+    for candidate in system_locale_candidates():
+        value = candidate.lower()
+        if any(value.startswith(prefix) for prefix in cn_prefixes):
             return True
-    try:
-        lang, _ = locale.getlocale()
-        if lang:
-            lang_lower = lang.lower()
-            if any(lang_lower.startswith(prefix) for prefix in cn_prefixes):
-                return True
-    except Exception:
-        pass
     return False
 
 
@@ -411,8 +423,6 @@ def format_update_hint(info: UpdateInfo, target: UpdateTarget | None = None) ->
     is_windows = sys.platform == "win32"
     command = _format_update_command(update_target)
     if is_windows:
-        from comate_cli.terminal_agent.windows_updater import windows_update_command_text
-
         command = windows_update_command_text(update_target)
     hint_template = messages.windows_hint if is_windows else messages.hint
     return hint_template.format(
@@ -595,34 +605,17 @@ async def run_update_command(
     command_text = " ".join(command)
     messages = get_update_messages()
     if sys.platform == "win32":
-        from comate_cli.terminal_agent.windows_updater import (
-            spawn_detached_updater,
-            windows_update_command_text,
-        )
-
-        windows_command_text = windows_update_command_text(update_target)
-
-        if spawn_detached_updater(info, target=update_target):
-            console.out(
-                messages.windows_update_scheduled.format(
-                    product=update_target.product_label,
-                    latest=info.latest_version,
-                    current=info.current_version,
-                ),
-                end="\n",
-            )
-            return True
         console.out(
             messages.windows_manual_update.format(
                 product=update_target.product_label,
                 package=update_target.package,
-                command=windows_command_text,
+                command=windows_update_command_text(update_target),
                 current=info.current_version,
                 latest=info.latest_version,
             ),
             end="\n",
         )
-        return False
+        return True
 
     console.print(f"Updating {update_target.product_label} via `{command_text}`...")
 

{comate_cli-0.10.9 → comate_cli-0.10.10}/comate_cli/terminal_agent/update_messages.py

@@ -1,9 +1,13 @@
 from __future__ import annotations
 
 import locale
+import logging
 import os
+import sys
 from dataclasses import dataclass
 
+logger = logging.getLogger(__name__)
+
 
 @dataclass(frozen=True, slots=True)
 class UpdateMessages:
@@ -16,10 +20,6 @@ class UpdateMessages:
     skip_until_next_version_label: str
     continue_label: str
     windows_manual_update: str
-    windows_update_scheduled: str
-    windows_update_result_success: str
-    windows_update_result_failed: str
-    windows_update_result_timeout: str
     success: str
     failure: str
 
@@ -35,7 +35,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "Close {product}, then run `{command}` in a new CMD or PowerShell to update."
         ),
         title="✨ Update available! {current} -> {latest}",
-        show_update_command_label="Update now (completes after exit)",
+        show_update_command_label="Show update command and exit",
         update_now_label="Update now (runs `{command}`)",
         skip_label="Skip",
         skip_until_next_version_label="Skip until next version",
@@ -48,23 +48,6 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "uv tool uninstall {package}\n\n"
             "Then run the install command again."
         ),
-        windows_update_scheduled=(
-            "🚀 Background update scheduled: {product} will update to {latest} "
-            "automatically once this {product} process exits. "
-            "The result will be shown on next launch."
-        ),
-        windows_update_result_success=(
-            "🎉 {product} was updated to {latest} in the background (previous: {current})."
-        ),
-        windows_update_result_failed=(
-            "Background update to {latest} failed (exit code {code}). Close all {product} "
-            "windows and run `{command}` in a new CMD or PowerShell to update manually."
-        ),
-        windows_update_result_timeout=(
-            "Background update to {latest} did not run: {product} did not finish "
-            'shutting down before the wait limit. Choose "Update now" again, or run '
-            "`{command}` manually."
-        ),
         success="🎉 Update ran successfully! Please restart {product}.",
         failure=(
             "Update failed with exit code {code}. The current installation may still "
@@ -81,7 +64,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "请关闭 {product}，然后在新的 CMD 或 PowerShell 中运行 `{command}` 更新。"
         ),
         title="✨ 发现新版本！{current} -> {latest}",
-        show_update_command_label="立即更新（退出后自动完成）",
+        show_update_command_label="显示更新命令并退出",
         update_now_label="立即更新（运行 `{command}`）",
         skip_label="跳过",
         skip_until_next_version_label="跳过此版本",
@@ -94,21 +77,6 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "uv tool uninstall {package}\n\n"
             "然后再次运行安装命令。"
         ),
-        windows_update_scheduled=(
-            "🚀 已安排后台更新：当前 {product} 进程退出后将自动升级到 {latest}，"
-            "结果将在下次启动时显示。"
-        ),
-        windows_update_result_success=(
-            "🎉 {product} 已在后台自动更新到 {latest}（原 {current}）。"
-        ),
-        windows_update_result_failed=(
-            "后台更新到 {latest} 失败（退出码 {code}）。请关闭所有 {product} 窗口后，"
-            "在新的 CMD 或 PowerShell 中运行 `{command}` 手动更新。"
-        ),
-        windows_update_result_timeout=(
-            "后台更新到 {latest} 未执行：{product} 退出未完成，等待超时。"
-            "可再次选择“立即更新”，或手动运行 `{command}`。"
-        ),
         success="🎉 更新命令已成功执行！请重启 {product}。",
         failure=(
             "更新失败，退出码：{code}。当前安装可能仍可使用；如果 {product} "
@@ -125,7 +93,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "請關閉 {product}，然後在新的 CMD 或 PowerShell 中執行 `{command}` 更新。"
         ),
         title="✨ 發現新版本！{current} -> {latest}",
-        show_update_command_label="立即更新（結束後自動完成）",
+        show_update_command_label="顯示更新命令並退出",
         update_now_label="立即更新（執行 `{command}`）",
         skip_label="略過",
         skip_until_next_version_label="略過此版本",
@@ -138,21 +106,6 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "uv tool uninstall {package}\n\n"
             "然後再次執行安裝命令。"
         ),
-        windows_update_scheduled=(
-            "🚀 已排定背景更新：目前 {product} 程序結束後將自動升級到 {latest}，"
-            "結果將於下次啟動時顯示。"
-        ),
-        windows_update_result_success=(
-            "🎉 {product} 已在背景自動更新到 {latest}（原 {current}）。"
-        ),
-        windows_update_result_failed=(
-            "背景更新到 {latest} 失敗（結束碼 {code}）。請關閉所有 {product} 視窗後，"
-            "在新的 CMD 或 PowerShell 中執行 `{command}` 手動更新。"
-        ),
-        windows_update_result_timeout=(
-            "背景更新到 {latest} 未執行：{product} 結束未完成，等待逾時。"
-            "可再次選擇「立即更新」，或手動執行 `{command}`。"
-        ),
         success="🎉 更新命令已成功執行！請重新啟動 {product}。",
         failure=(
             "更新失敗，結束碼：{code}。目前安裝可能仍可使用；如果 {product} "
@@ -169,7 +122,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "{product} を閉じてから、新しい CMD または PowerShell で `{command}` を実行してください。"
         ),
         title="✨ 新しいバージョンがあります！{current} -> {latest}",
-        show_update_command_label="今すぐ更新（終了後に自動実行）",
+        show_update_command_label="更新コマンドを表示して終了",
         update_now_label="今すぐ更新（`{command}` を実行）",
         skip_label="スキップ",
         skip_until_next_version_label="このバージョンをスキップ",
@@ -182,23 +135,6 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "uv tool uninstall {package}\n\n"
             "その後、インストールコマンドをもう一度実行してください。"
         ),
-        windows_update_scheduled=(
-            "🚀 バックグラウンド更新を予約しました：現在の {product} プロセスが終了すると"
-            "自動的に {latest} へ更新されます。結果は次回起動時に表示されます。"
-        ),
-        windows_update_result_success=(
-            "🎉 {product} はバックグラウンドで {latest} に更新されました（以前：{current}）。"
-        ),
-        windows_update_result_failed=(
-            "{latest} へのバックグラウンド更新に失敗しました（終了コード {code}）。"
-            "すべての {product} ウィンドウを閉じてから、新しい CMD または PowerShell で `{command}` "
-            "を実行して手動で更新してください。"
-        ),
-        windows_update_result_timeout=(
-            "{latest} へのバックグラウンド更新は実行されませんでした：{product} が"
-            "待機時間内に終了しませんでした。もう一度「今すぐ更新」を選ぶか、"
-            "`{command}` を手動で実行してください。"
-        ),
         success="🎉 更新コマンドが正常に完了しました。{product} を再起動してください。",
         failure=(
             "更新に失敗しました。終了コード：{code}。現在のインストールはまだ使える"
@@ -209,16 +145,45 @@ _MESSAGES: dict[str, UpdateMessages] = {
 }
 
 
-def detect_update_locale() -> str:
+def _windows_ui_locale() -> str | None:
+    """Return the Windows user UI locale string, or None when unavailable."""
+    if sys.platform != "win32":
+        return None
+    try:
+        import ctypes
+
+        lang_id = ctypes.windll.kernel32.GetUserDefaultUILanguage()
+        return locale.windows_locale.get(lang_id)
+    except Exception:
+        logger.debug("windows UI locale detection failed", exc_info=True)
+        return None
+
+
+def system_locale_candidates() -> list[str]:
+    """Return non-empty locale candidates in user-intent priority order."""
+    candidates: list[str] = []
     for env_var in ("LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE"):
-        normalized = _normalize_locale(os.environ.get(env_var))
-        if normalized:
-            return normalized
+        value = os.environ.get(env_var)
+        if value:
+            candidates.append(value)
+    windows_locale = _windows_ui_locale()
+    if windows_locale:
+        candidates.append(windows_locale)
     try:
         lang, _encoding = locale.getlocale()
     except Exception:
-        return "en"
-    return _normalize_locale(lang) or "en"
+        lang = None
+    if lang:
+        candidates.append(lang)
+    return candidates
+
+
+def detect_update_locale() -> str:
+    for candidate in system_locale_candidates():
+        normalized = _normalize_locale(candidate)
+        if normalized:
+            return normalized
+    return "en"
 
 
 def get_update_messages(locale_key: str | None = None) -> UpdateMessages: