cloudagent-daemon 0.2.4__tar.gz → 0.2.5__tar.gz

{cloudagent_daemon-0.2.4 → cloudagent_daemon-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudagent-daemon
-Version: 0.2.4
+Version: 0.2.5
 Summary: Local daemon for cloudagent — bridges Claude Code subprocesses to the cloudagent backend over WebSocket.
 Project-URL: Homepage, https://cloudagent.chat
 Project-URL: Repository, https://codeup.aliyun.com/69bd0a4d29ad98af4065ce71/cloudagent

{cloudagent_daemon-0.2.4 → cloudagent_daemon-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cloudagent-daemon"
-version = "0.2.4"
+version = "0.2.5"
 description = "Local daemon for cloudagent — bridges Claude Code subprocesses to the cloudagent backend over WebSocket."
 authors = [{name = "chaoyin", email = "tudoucyx@gmail.com"}]
 readme = "README.md"

cloudagent_daemon-0.2.5/src/cloudagent_daemon/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.5"

{cloudagent_daemon-0.2.4 → cloudagent_daemon-0.2.5}/src/cloudagent_daemon/service.py

@@ -17,6 +17,7 @@ import os
 import platform
 import shutil
 import subprocess
+import time
 from pathlib import Path
 
 from .paths import (
@@ -200,29 +201,69 @@ def install_macos(
     plist_path.chmod(0o600)
 
     uid = os.getuid()
-    # Reinstall-safe (2026-05-19). A plain ``bootstrap`` is a no-op when
-    # the service is already loaded — launchctl keeps the OLD in-memory
-    # plist and never re-reads the file we just wrote. Without a prior
-    # ``bootout`` a re-run of ``install-service`` silently keeps the
-    # stale definition (e.g. a changed CLOUDAGENT_DAEMON_PERMISSION_MODE
-    # never takes effect). So: bootout first (unload any loaded
-    # instance), then bootstrap genuinely loads the fresh plist.
-    # ``bootout`` exits non-zero when nothing is loaded (first install)
-    # — ``check=False`` swallows that, making install == reinstall.
-    subprocess.run(
-        ["launchctl", "bootout", f"gui/{uid}/{label}"],
-        check=False,
-    )
-    subprocess.run(
-        ["launchctl", "bootstrap", f"gui/{uid}", str(plist_path)],
-        check=False,
-    )
+    domain = f"gui/{uid}"
+    service_target = f"{domain}/{label}"
+    _launchd_reinstall(domain, service_target, plist_path)
+    return plist_path
+
+
+def _launchd_reinstall(
+    domain: str, service_target: str, plist_path: Path
+) -> None:
+    """Reinstall a launchd job: bootout → wait → bootstrap → kickstart.
+
+    Reinstall-safe + race-safe. Two problems this handles:
+
+    1. A plain ``bootstrap`` is a no-op when the service is already
+       loaded — launchd keeps the OLD in-memory plist and never re-reads
+       the file. So we ``bootout`` first to unload any loaded instance.
+
+    2. ``bootout`` is *asynchronous*: launchctl returns before launchd
+       has finished tearing the job down. A ``bootstrap`` fired
+       immediately races the still-unloading job and fails with
+       ``Input/output error`` (5). So after bootout we POLL
+       ``launchctl print`` until the job is genuinely gone, then
+       bootstrap — with a few retries for slow teardown.
+
+    Raises RuntimeError if bootstrap never succeeds (cli surfaces it as
+    a clean error instead of the old silent "✓ Installed" lie).
+    """
+    subprocess.run(["launchctl", "bootout", service_target], check=False)
+
+    # Poll until the job is no longer registered (``print`` exits
+    # non-zero). ~5s budget — teardown is normally well under 1s.
+    for _ in range(50):
+        probe = subprocess.run(
+            ["launchctl", "print", service_target],
+            capture_output=True,
+            check=False,
+        )
+        if probe.returncode != 0:
+            break
+        time.sleep(0.1)
+
+    last_err = ""
+    for _ in range(5):
+        result = subprocess.run(
+            ["launchctl", "bootstrap", domain, str(plist_path)],
+            capture_output=True,
+            text=True,
+            check=False,
+        )
+        if result.returncode == 0:
+            break
+        last_err = (result.stderr or result.stdout or "").strip()
+        time.sleep(0.3)
+    else:
+        raise RuntimeError(
+            f"launchctl bootstrap failed after retries: {last_err or 'unknown'}"
+        )
+
     # Kickstart -k forces an immediate (re)start.
     subprocess.run(
-        ["launchctl", "kickstart", "-k", f"gui/{uid}/{label}"],
+        ["launchctl", "kickstart", "-k", service_target],
         check=False,
     )
-    return plist_path
 
 
 def uninstall_macos(profile: str | None = None) -> bool:

cloudagent_daemon-0.2.4/src/cloudagent_daemon/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.4"