meshcode 2.11.88__tar.gz → 2.11.91__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcode
-Version: 2.11.88
+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.88 → meshcode-2.11.91}/meshcode/__init__.py

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

{meshcode-2.11.88 → 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"
@@ -881,28 +931,58 @@ def _hostd_bootstrap_if_needed(ttl_sec: int = 3600, verbose: bool = False) -> bo
     return ok
 
 
+def _running_daemon_is_stale() -> bool:
+    """ca947d7f: True ONLY if hostd_state.json records a running_version that is STRICTLY older
+    than the on-disk installed version. Absent / unknown / equal / newer -> False (FAIL-SAFE:
+    never bounce a healthy or ambiguous daemon on the login-critical path — commander's safety
+    condition). NOTE: a daemon predating the running_version stamp (<2.11.90) wrote no marker, so
+    this returns False for it — that one-time transition still needs a manual restart; this guards
+    FUTURE transitions as defense-in-depth (the daemon's own self-reexec is the primary path)."""
+    try:
+        rv = (_load_state() or {}).get("running_version")
+        if not rv:
+            return False
+        import importlib.metadata as _ilmd
+        ondisk = _ilmd.version("meshcode")
+        from meshcode import self_update as _su
+        return bool(_su._is_newer(ondisk, rv))
+    except Exception:
+        return False
+
+
 def _hostd_bootstrap(verbose: bool = False) -> bool:
     """Idempotent auto-install + start of hostd (task f12b9d36) — called from `meshcode login`
     so onboarding is just `pip install meshcode` + `meshcode login` (no manual `hostd install`).
-    If the OS job already exists, just ensure it's running (don't bounce a live daemon); else
-    install + start. Best-effort: NEVER raises — login must not fail on a bootstrap hiccup."""
+    If the OS job already exists, just ensure it's running (don't bounce a live daemon) UNLESS the
+    running daemon is provably STALE (ca947d7f), in which case force-restart it so Stop's kill
+    sweep + launch fixes land. Best-effort: NEVER raises — login must not fail on a hiccup."""
     import platform
     try:
+        force = _running_daemon_is_stale()  # bounce ONLY a provably-stale daemon
+        if force:
+            _log(f"hostd bootstrap: running daemon is STALE vs on-disk -> force-restart")
         sysname = platform.system()
         if sysname == "Darwin":
             if not _hostd_plist_path().exists():
                 _hostd_install()  # writes plist + launchctl load
             try:
                 uid = str(os.getuid())
-                subprocess.run(["launchctl", "kickstart", f"gui/{uid}/{_HOSTD_PLIST_LABEL}"],
-                               capture_output=True, text=True)  # start if not already running
+                # `kickstart -k` restarts a running job; plain `kickstart` only starts if down.
+                args = ["launchctl", "kickstart", f"gui/{uid}/{_HOSTD_PLIST_LABEL}"]
+                if force:
+                    args.insert(2, "-k")
+                subprocess.run(args, capture_output=True, text=True)
             except Exception:
                 pass
         elif sysname == "Windows":
             q = subprocess.run(["schtasks", "/Query", "/TN", _HOSTD_TASK_NAME],
                                capture_output=True, text=True)
             if q.returncode == 0:
-                # task exists -> just ensure running (IgnoreNew => harmless if already up; no double-spawn)
+                if force:
+                    # stale -> stop the running instance, then start fresh on the new wheel.
+                    subprocess.run(["schtasks", "/End", "/TN", _HOSTD_TASK_NAME],
+                                   capture_output=True, text=True)
+                # task exists -> ensure running (IgnoreNew => harmless if already up; no double-spawn)
                 subprocess.run(["schtasks", "/Run", "/TN", _HOSTD_TASK_NAME],
                                capture_output=True, text=True)
             else:
@@ -910,6 +990,10 @@ def _hostd_bootstrap(verbose: bool = False) -> bool:
                 _hostd_install_windows()
         else:  # Linux + others
             if shutil.which("systemctl"):
+                if force:
+                    subprocess.run(["systemctl", "--user", "restart", _HOSTD_SYSTEMD_UNIT],
+                                   capture_output=True, text=True)
+                    return True
                 act = subprocess.run(["systemctl", "--user", "is-active", _HOSTD_SYSTEMD_UNIT],
                                      capture_output=True, text=True)
                 if act.stdout.strip() == "active":
@@ -1024,7 +1108,14 @@ def cmd_hostd(args: list) -> int:
             _log(f"registered host {host_id} in mc_host_config")
         else:
             _log(f"WARN: host registration failed (dashboard may not list this host): {_reg}")
-        _log(f"hostd starting — host_id={host_id} interval={POLL_INTERVAL_SEC}s stale={STALE_SECONDS}s")
+        _log(f"hostd starting — host_id={host_id} interval={POLL_INTERVAL_SEC}s stale={STALE_SECONDS}s v{_RUNNING_VERSION}")
+        # ca947d7f: stamp the version THIS daemon is running into hostd_state.json so
+        # `meshcode login` (_hostd_bootstrap) can detect a STALE running daemon and force-
+        # restart it (the one-time transition onto a self-reexec-capable build). Best-effort.
+        try:
+            _st = _load_state(); _st["running_version"] = _RUNNING_VERSION; _save_state(_st)
+        except Exception:
+            pass
         # uptime-since-spawn (core's suggestion): if the daemon dies <2min, the last alive log +
         # the uptime stamped on the FATAL line reveal the <2min pattern for RC.
         _spawn_mono = time.monotonic()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcode
-Version: 2.11.88
+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.88 → meshcode-2.11.91}/pyproject.toml

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