meshcode 2.11.90__tar.gz → 2.11.91__tar.gz

{meshcode-2.11.90 → meshcode-2.11.91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcode
-Version: 2.11.90
+Version: 2.11.91
 Summary: Real-time communication between AI agents — Supabase-backed CLI
 Author-email: MeshCode <hello@meshcode.io>
 License: MIT

{meshcode-2.11.90 → meshcode-2.11.91}/meshcode/__init__.py

@@ -1,5 +1,5 @@
 """MeshCode — Real-time communication between AI agents."""
-__version__ = "2.11.90"
+__version__ = "2.11.91"
 
 # Exception hierarchy — eagerly imported (lightweight, no deps)
 from meshcode.exceptions import (  # noqa: F401

{meshcode-2.11.90 → meshcode-2.11.91}/meshcode/hostd.py

@@ -55,6 +55,27 @@ try:
 except Exception:
     _RUNNING_VERSION = "0.0.0"
 _LAST_UPDATE_KICK_MONO = 0.0
+_REEXEC_GUARD_LOGGED = False
+
+
+def _has_supervisor() -> bool:
+    """True if an OS supervisor (launchd/systemd/Task Scheduler) manages this hostd and will
+    relaunch it on clean exit. Field data (Samuel Mac): os.execv is BLOCKED in the sandboxed
+    runtime, so where a supervisor exists we PREFER exit-and-relaunch over execv."""
+    import platform
+    try:
+        s = platform.system()
+        if s == "Darwin":
+            return _hostd_plist_path().exists()
+        if s == "Windows":
+            return subprocess.run(["schtasks", "/Query", "/TN", _HOSTD_TASK_NAME],
+                                  capture_output=True, text=True).returncode == 0
+        if shutil.which("systemctl"):
+            return subprocess.run(["systemctl", "--user", "is-enabled", _HOSTD_SYSTEMD_UNIT],
+                                  capture_output=True, text=True).returncode == 0
+    except Exception:
+        pass
+    return False
 
 
 def _maybe_self_restart_on_version_drift() -> None:
@@ -96,13 +117,42 @@ def _maybe_self_restart_on_version_drift() -> None:
             newer = False
     if not newer:
         return
-    _log(f"VERSION DRIFT: running {_RUNNING_VERSION}, on-disk {ondisk} -> self-reexec to load "
-         f"new code (Stop kill sweep + daemon fixes). headless_pids persisted; KeepAlive re-attaches.")
+    # Loop-guard (backend2 finding): in a source/dev run, importlib.metadata can report a
+    # pip-installed wheel NEWER than the __init__.py actually executing, so the drift would
+    # PERSIST across restart -> storm. Persist the attempt; if we already tried to reach this
+    # exact on-disk target recently and didn't advance, skip until the guard window passes.
+    global _REEXEC_GUARD_LOGGED
+    try:
+        _st = _load_state()
+    except Exception:
+        _st = {}
+    _att = _st.get("reexec_attempt") or {}
+    if _att.get("target") == ondisk and (time.time() - float(_att.get("at", 0) or 0)) < 600:
+        if not _REEXEC_GUARD_LOGGED:
+            _REEXEC_GUARD_LOGGED = True
+            _log(f"version drift {_RUNNING_VERSION}->{ondisk} but a recent restart didn't advance the "
+                 f"running version (source/dev run?). Skipping to avoid a restart storm; retry after 600s.")
+        return
+    _st["reexec_attempt"] = {"target": ondisk, "at": time.time()}
+    try:
+        _save_state(_st)
+    except Exception:
+        pass
+    _log(f"VERSION DRIFT: running {_RUNNING_VERSION}, on-disk {ondisk} -> restart to load new code "
+         f"(Stop kill sweep + daemon fixes). headless_pids persisted.")
+    # Prefer supervisor-restart where one manages hostd: field data (Samuel Mac) showed os.execv
+    # is BLOCKED in the sandboxed runtime and the os._exit->KeepAlive fallback is what actually
+    # restarts. So when a supervisor exists, exit cleanly and let it relaunch on the new wheel.
+    if _has_supervisor():
+        _log("supervisor present -> clean exit; launchd/systemd/schtasks relaunches on new code")
+        os._exit(0)
+    # No supervisor (e.g. dev foreground run): execv is the only in-place restart. If it's blocked,
+    # do NOT self-destruct (nothing would relaunch us) — stay on old code, retry after the guard window.
     try:
         os.execv(sys.executable, [sys.executable, "-m", "meshcode"] + sys.argv[1:])
     except Exception as e:
-        _log(f"WARN: self-reexec failed ({e}); exiting so the supervisor restarts us")
-        os._exit(0)
+        _log(f"WARN: no supervisor + execv failed ({e}); staying on {_RUNNING_VERSION}, retry after guard window")
+        return
 
 STATE_DIR = Path.home() / ".meshcode"
 HOST_ID_PATH = STATE_DIR / "host_id"

{meshcode-2.11.90 → meshcode-2.11.91}/meshcode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcode
-Version: 2.11.90
+Version: 2.11.91
 Summary: Real-time communication between AI agents — Supabase-backed CLI
 Author-email: MeshCode <hello@meshcode.io>
 License: MIT

{meshcode-2.11.90 → meshcode-2.11.91}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "meshcode"
-version = "2.11.90"
+version = "2.11.91"
 description = "Real-time communication between AI agents — Supabase-backed CLI"
 readme = "README.md"
 license = {text = "MIT"}