comate-cli 0.10.4__tar.gz → 0.10.6__tar.gz

{comate_cli-0.10.4 → comate_cli-0.10.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.10.4
+Version: 0.10.6
 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.4 → comate_cli-0.10.6}/comate_cli/terminal_agent/update_messages.py

@@ -32,7 +32,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_hint=(
             "✨ New version available: {latest} (current: {current})  "
-            "Close {product}, then run `{command}` in a new PowerShell to update."
+            "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)",
@@ -42,7 +42,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         continue_label="Press enter to continue",
         windows_manual_update=(
             "Windows cannot safely update {product} from inside the running process.\n\n"
-            "Close all {product} windows, then run this in a new PowerShell:\n\n"
+            "Close all {product} windows, then run this in a new CMD or PowerShell:\n\n"
             "{command}\n\n"
             "If the current installation is already broken, run:\n\n"
             "uv tool uninstall {package}\n\n"
@@ -50,7 +50,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_update_scheduled=(
             "🚀 Background update scheduled: {product} will update to {latest} "
-            "automatically once all {product} windows are closed. "
+            "automatically once this {product} process exits. "
             "The result will be shown on next launch."
         ),
         windows_update_result_success=(
@@ -58,7 +58,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_update_result_failed=(
             "Background update to {latest} failed (exit code {code}). Close all {product} "
-            "windows and run `{command}` in a new PowerShell to update manually."
+            "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 "
@@ -78,7 +78,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_hint=(
             "✨ 发现新版本：{latest}（当前：{current}）  "
-            "请关闭 {product}，然后在新的 PowerShell 中运行 `{command}` 更新。"
+            "请关闭 {product}，然后在新的 CMD 或 PowerShell 中运行 `{command}` 更新。"
         ),
         title="✨ 发现新版本！{current} -> {latest}",
         show_update_command_label="立即更新（退出后自动完成）",
@@ -88,14 +88,14 @@ _MESSAGES: dict[str, UpdateMessages] = {
         continue_label="按 Enter 继续",
         windows_manual_update=(
             "Windows 无法在当前运行中的 {product} 进程内安全更新。\n\n"
-            "请关闭所有 {product} 窗口，然后在新的 PowerShell 中运行：\n\n"
+            "请关闭所有 {product} 窗口，然后在新的 CMD 或 PowerShell 中运行：\n\n"
             "{command}\n\n"
             "如果当前安装已经损坏，请先运行：\n\n"
             "uv tool uninstall {package}\n\n"
             "然后再次运行安装命令。"
         ),
         windows_update_scheduled=(
-            "🚀 已安排后台更新：关闭所有 {product} 窗口后将自动升级到 {latest}，"
+            "🚀 已安排后台更新：当前 {product} 进程退出后将自动升级到 {latest}，"
             "结果将在下次启动时显示。"
         ),
         windows_update_result_success=(
@@ -103,7 +103,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_update_result_failed=(
             "后台更新到 {latest} 失败（退出码 {code}）。请关闭所有 {product} 窗口后，"
-            "在新的 PowerShell 中运行 `{command}` 手动更新。"
+            "在新的 CMD 或 PowerShell 中运行 `{command}` 手动更新。"
         ),
         windows_update_result_timeout=(
             "后台更新到 {latest} 未执行：{product} 退出未完成，等待超时。"
@@ -122,7 +122,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_hint=(
             "✨ 發現新版本：{latest}（目前：{current}）  "
-            "請關閉 {product}，然後在新的 PowerShell 中執行 `{command}` 更新。"
+            "請關閉 {product}，然後在新的 CMD 或 PowerShell 中執行 `{command}` 更新。"
         ),
         title="✨ 發現新版本！{current} -> {latest}",
         show_update_command_label="立即更新（結束後自動完成）",
@@ -132,14 +132,14 @@ _MESSAGES: dict[str, UpdateMessages] = {
         continue_label="按 Enter 繼續",
         windows_manual_update=(
             "Windows 無法在目前執行中的 {product} 程序內安全更新。\n\n"
-            "請關閉所有 {product} 視窗，然後在新的 PowerShell 中執行：\n\n"
+            "請關閉所有 {product} 視窗，然後在新的 CMD 或 PowerShell 中執行：\n\n"
             "{command}\n\n"
             "如果目前安裝已損壞，請先執行：\n\n"
             "uv tool uninstall {package}\n\n"
             "然後再次執行安裝命令。"
         ),
         windows_update_scheduled=(
-            "🚀 已排定背景更新：關閉所有 {product} 視窗後將自動升級到 {latest}，"
+            "🚀 已排定背景更新：目前 {product} 程序結束後將自動升級到 {latest}，"
             "結果將於下次啟動時顯示。"
         ),
         windows_update_result_success=(
@@ -147,7 +147,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_update_result_failed=(
             "背景更新到 {latest} 失敗（結束碼 {code}）。請關閉所有 {product} 視窗後，"
-            "在新的 PowerShell 中執行 `{command}` 手動更新。"
+            "在新的 CMD 或 PowerShell 中執行 `{command}` 手動更新。"
         ),
         windows_update_result_timeout=(
             "背景更新到 {latest} 未執行：{product} 結束未完成，等待逾時。"
@@ -166,7 +166,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_hint=(
             "✨ 新しいバージョンがあります：{latest}（現在：{current}）  "
-            "{product} を閉じてから、新しい PowerShell で `{command}` を実行してください。"
+            "{product} を閉じてから、新しい CMD または PowerShell で `{command}` を実行してください。"
         ),
         title="✨ 新しいバージョンがあります！{current} -> {latest}",
         show_update_command_label="今すぐ更新（終了後に自動実行）",
@@ -176,14 +176,14 @@ _MESSAGES: dict[str, UpdateMessages] = {
         continue_label="Enter で続行",
         windows_manual_update=(
             "Windows では、実行中の {product} プロセス内で安全に更新できません。\n\n"
-            "すべての {product} ウィンドウを閉じてから、新しい PowerShell で次を実行してください：\n\n"
+            "すべての {product} ウィンドウを閉じてから、新しい CMD または PowerShell で次を実行してください：\n\n"
             "{command}\n\n"
             "現在のインストールが壊れている場合は、先に次を実行してください：\n\n"
             "uv tool uninstall {package}\n\n"
             "その後、インストールコマンドをもう一度実行してください。"
         ),
         windows_update_scheduled=(
-            "🚀 バックグラウンド更新を予約しました：すべての {product} ウィンドウを閉じると"
+            "🚀 バックグラウンド更新を予約しました：現在の {product} プロセスが終了すると"
             "自動的に {latest} へ更新されます。結果は次回起動時に表示されます。"
         ),
         windows_update_result_success=(
@@ -191,7 +191,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
         ),
         windows_update_result_failed=(
             "{latest} へのバックグラウンド更新に失敗しました（終了コード {code}）。"
-            "すべての {product} ウィンドウを閉じてから、新しい PowerShell で `{command}` "
+            "すべての {product} ウィンドウを閉じてから、新しい CMD または PowerShell で `{command}` "
             "を実行して手動で更新してください。"
         ),
         windows_update_result_timeout=(

{comate_cli-0.10.4 → comate_cli-0.10.6}/comate_cli/terminal_agent/windows_updater.py

@@ -3,7 +3,8 @@
 Windows cannot rebuild a running uv tool environment safely: the trampoline
 executable and the venv python.exe can be locked by the running process. The
 Windows update path therefore starts a detached PowerShell process, waits for
-all CLI windows to exit, runs uv, and leaves a result file for the next launch.
+the launching CLI process to exit, runs uv, and leaves a result file for the
+next launch.
 """
 
 from __future__ import annotations
@@ -13,6 +14,7 @@ import logging
 import os
 import shutil
 import subprocess
+import time
 from contextlib import suppress
 from dataclasses import dataclass
 from pathlib import Path
@@ -34,6 +36,8 @@ UPDATER_CREATIONFLAGS = (
 
 _PARENT_WAIT_TIMEOUT_SECONDS = 60
 _POST_PARENT_EXIT_GRACE_MS = 800
+_UPDATER_STARTUP_WAIT_SECONDS = 3.0
+_UPDATER_STARTUP_POLL_SECONDS = 0.05
 _VALID_STATUSES = frozenset({"success", "failed", "timeout"})
 
 _SCRIPT_TEMPLATE = """\
@@ -173,6 +177,23 @@ def _log_path(package: str, updates_dir: Path) -> Path:
     return updates_dir / f"{_package_key(package)}.log"
 
 
+def _wait_for_updater_start(log_file: Path) -> bool:
+    """Return True once the detached helper has started running its script."""
+    if log_file.exists():
+        return True
+    timeout = max(0.0, _UPDATER_STARTUP_WAIT_SECONDS)
+    if timeout <= 0.0:
+        return False
+    deadline = time.monotonic() + timeout
+    while True:
+        if log_file.exists():
+            return True
+        remaining = deadline - time.monotonic()
+        if remaining <= 0:
+            return False
+        time.sleep(min(_UPDATER_STARTUP_POLL_SECONDS, remaining))
+
+
 def _ps_quote(value: str) -> str:
     return "'" + value.replace("'", "''") + "'"
 
@@ -259,8 +280,11 @@ def spawn_detached_updater(
         logger.debug("uv executable not found; falling back to manual update copy")
         return False
     script_file = _script_path(target.package, resolved_dir)
+    log_file = _log_path(target.package, resolved_dir)
     try:
         resolved_dir.mkdir(parents=True, exist_ok=True)
+        with suppress(OSError):
+            log_file.unlink(missing_ok=True)
         script_file.write_text(
             build_updater_script(
                 info=info,
@@ -275,6 +299,7 @@ def spawn_detached_updater(
             [
                 "powershell.exe",
                 "-NoProfile",
+                "-NonInteractive",
                 "-ExecutionPolicy",
                 "Bypass",
                 "-File",
@@ -286,6 +311,13 @@ def spawn_detached_updater(
             stderr=subprocess.DEVNULL,
             close_fds=True,
         )
+        if not _wait_for_updater_start(log_file):
+            logger.warning(
+                "detached updater did not create startup log within %.1fs: %s",
+                _UPDATER_STARTUP_WAIT_SECONDS,
+                log_file,
+            )
+            return False
     except OSError:
         logger.warning("failed to spawn detached updater", exc_info=True)
         with suppress(OSError):

{comate_cli-0.10.4 → comate_cli-0.10.6}/pyproject.toml

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

{comate_cli-0.10.4 → comate_cli-0.10.6}/tests/test_update_check.py

@@ -339,7 +339,6 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
         original_run_in_executor = loop.run_in_executor
 
         def _run_in_executor(executor, func, *args):  # noqa: ANN001
-            del func, args
             if executor is None:
                 default_executor_calls.append(executor)
                 raise AssertionError("update check must not use the default executor")
@@ -727,7 +726,7 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
             hint,
         )
 
-    def test_format_update_hint_keeps_powershell_copy_on_windows_zh_cn(self) -> None:
+    def test_format_update_hint_supports_cmd_and_powershell_on_windows_zh_cn(self) -> None:
         info = UpdateInfo(
             package="comate-cli",
             current_version="0.3.3",
@@ -750,6 +749,7 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
         ):
             hint = format_update_hint(info)
 
+        self.assertIn("CMD", hint)
         self.assertIn("PowerShell", hint)
         self.assertIn("关闭", hint)
         self.assertNotIn("终端", hint)
@@ -912,6 +912,8 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
             "uv tool install comate-cli@latest --force --reinstall --refresh-package comate-cli",
             output,
         )
+        self.assertIn("CMD", output)
+        self.assertIn("PowerShell", output)
 
     async def test_windows_update_path_spawns_detached_updater_and_stops_launch(
         self,

{comate_cli-0.10.4 → comate_cli-0.10.6}/tests/test_windows_updater.py

@@ -4,7 +4,7 @@ import json
 import tempfile
 import unittest
 from pathlib import Path
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 from comate_cli.terminal_agent.update_check import UpdateInfo, UpdateTarget
 
@@ -269,6 +269,16 @@ class TestSpawnDetachedUpdater(unittest.TestCase):
             patch.object(windows_updater.subprocess, "Popen") as mock_popen,
         ):
             tmp = Path(tmp_str)
+
+            def _fake_popen(*args, **kwargs):
+                del args, kwargs
+                (tmp / "acme_cli.log").write_text(
+                    "updater started parent_pid=4242",
+                    encoding="utf-8",
+                )
+                return MagicMock()
+
+            mock_popen.side_effect = _fake_popen
             ok = windows_updater.spawn_detached_updater(
                 _acme_info(), target=_acme_target(), updates_dir=tmp
             )
@@ -287,6 +297,7 @@ class TestSpawnDetachedUpdater(unittest.TestCase):
                 [
                     "powershell.exe",
                     "-NoProfile",
+                    "-NonInteractive",
                     "-ExecutionPolicy",
                     "Bypass",
                     "-File",
@@ -301,6 +312,31 @@ class TestSpawnDetachedUpdater(unittest.TestCase):
             self.assertEqual(kwargs["stdout"], sp.DEVNULL)
             self.assertEqual(kwargs["stderr"], sp.DEVNULL)
 
+    def test_spawn_returns_false_when_helper_does_not_create_startup_log(self) -> None:
+        from comate_cli.terminal_agent import windows_updater
+
+        with (
+            tempfile.TemporaryDirectory() as tmp_str,
+            patch.object(windows_updater.os, "getpid", return_value=4242),
+            patch.object(windows_updater.shutil, "which", return_value="C:\\uv\\uv.exe"),
+            patch.object(windows_updater.subprocess, "Popen") as mock_popen,
+            patch.object(
+                windows_updater,
+                "_UPDATER_STARTUP_WAIT_SECONDS",
+                0.0,
+                create=True,
+            ),
+        ):
+            tmp = Path(tmp_str)
+            ok = windows_updater.spawn_detached_updater(
+                _acme_info(), target=_acme_target(), updates_dir=tmp
+            )
+
+            self.assertFalse(ok)
+            mock_popen.assert_called_once()
+            self.assertTrue((tmp / "acme_cli-updater.ps1").exists())
+            self.assertFalse((tmp / "acme_cli.log").exists())
+
     def test_missing_uv_returns_false_without_script(self) -> None:
         from comate_cli.terminal_agent import windows_updater