meshcode 2.11.170__tar.gz → 2.11.171__tar.gz

{meshcode-2.11.170 → meshcode-2.11.171}/PKG-INFO

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

{meshcode-2.11.170 → meshcode-2.11.171}/meshcode/__init__.py

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

{meshcode-2.11.170 → meshcode-2.11.171}/meshcode/meshcode_mcp/server.py

@@ -1138,6 +1138,10 @@ def with_working_status(func):
             _check_hot_reload()
             _capture_session()  # stash session on first tool call for silent auto-wake
             _touch_active_bg()  # foreground last_active_at stamp (covers wait too, before skip)
+            if not skip:                      # meshcode_wait stays ungated (read-only, must always run)
+                _blocked = await _lease_gate_async(name)
+                if _blocked is not None:
+                    return _blocked
             if not skip:
                 global _CONSECUTIVE_IDLE_SECONDS
                 _CONSECUTIVE_IDLE_SECONDS = 0  # any non-wait tool resets idle timer
@@ -1186,6 +1190,10 @@ def with_working_status(func):
             _check_hot_reload()
             _capture_session()  # stash session on first tool call for silent auto-wake
             _touch_active_bg()  # foreground last_active_at stamp (covers wait too, before skip)
+            if not skip:
+                _blocked = _lease_gate_sync(name)
+                if _blocked is not None:
+                    return _blocked
             if not skip:
                 global _CONSECUTIVE_IDLE_SECONDS
                 _CONSECUTIVE_IDLE_SECONDS = 0  # any non-wait tool resets idle timer
@@ -1329,6 +1337,40 @@ _INSTANCE_ID = f"mcp-{_uuid.uuid4().hex[:12]}"
 # false-terminate a legitimately-detached process.
 _BOOT_PPID = os.getppid()
 
+# ---- Single-instance lease GATE (fix f43cf72f, sec bba8e9d0) ---------------
+# The lease acquire is deferred off the MCP handshake path (see lifespan +
+# run_server changes below) so `initialize` answers in <1s instead of blocking
+# on contended lease RPCs (3x sb_rpc retries x 10s socket timeout). But tools
+# must NOT dispatch before the lease is held, or a second live instance /
+# a tombstoned agent could mutate shared state (split-brain / tombstone-bypass).
+# _LEASE_ACQUIRED is set() ONLY after a genuine acquire; every tool waits on it.
+_LEASE_ACQUIRED = _threading.Event()  # module-level alias (L1024); no plain `import threading` at module scope
+_LEASE_GATE_TIMEOUT = 30.0   # max seconds a tool blocks waiting for the lease
+
+def _lease_gate_sync(tool_name: str):
+    """Block a sync tool until the lease is held. Returns an error dict to
+    short-circuit if the lease never arrives (process is os._exit-ing on
+    conflict, so this tail is rare)."""
+    if _LEASE_ACQUIRED.is_set():
+        return None
+    if _LEASE_ACQUIRED.wait(timeout=_LEASE_GATE_TIMEOUT):
+        return None
+    return {"error": "single-instance lease not yet acquired — retry shortly",
+            "error_code": "lease_pending", "tool": tool_name}
+
+async def _lease_gate_async(tool_name: str):
+    """Async twin of _lease_gate_sync — never blocks the event loop."""
+    if _LEASE_ACQUIRED.is_set():
+        return None
+    _loop = asyncio.get_running_loop()
+    _deadline = _loop.time() + _LEASE_GATE_TIMEOUT
+    while not _LEASE_ACQUIRED.is_set():
+        if _loop.time() > _deadline:
+            return {"error": "single-instance lease not yet acquired — retry shortly",
+                    "error_code": "lease_pending", "tool": tool_name}
+        await asyncio.sleep(0.05)
+    return None
+
 
 def _stdin_peer_dead() -> bool:
     """Non-destructively check whether stdin's peer has closed.
@@ -1389,7 +1431,7 @@ def _acquire_lease() -> bool:
             "p_api_key": api_key,
             "p_project_id": _PROJECT_ID,
             "p_agent_name": AGENT_NAME,
-        })
+        }, _max_retries=1)
     except Exception as e:
         # Non-fatal: RPC might not exist on older servers.
         _mc_log(f"stale-lease pre-clean skipped: {e}", "warn")
@@ -1400,7 +1442,7 @@ def _acquire_lease() -> bool:
                 "p_project_id": _PROJECT_ID,
                 "p_agent_name": AGENT_NAME,
                 "p_instance_id": _INSTANCE_ID,
-            })
+            }, _max_retries=1)
             if isinstance(r, dict) and r.get("ok"):
                 global _CONSECUTIVE_IDLE_SECONDS
                 _CONSECUTIVE_IDLE_SECONDS = 0  # P6: reset idle counter on lease success
@@ -1453,7 +1495,7 @@ def _acquire_lease() -> bool:
                             "p_project_id": _PROJECT_ID,
                             "p_agent_name": AGENT_NAME,
                             "p_instance_id": _INSTANCE_ID,
-                        })
+                        }, _max_retries=1)
                         if isinstance(r2, dict) and r2.get("ok"):
                             _mc_log("Lease acquired after force-release.")
                             return True
@@ -2730,6 +2772,31 @@ async def lifespan(_app):
 
     asyncio.create_task(_bg_realtime_start())
 
+    # Single-instance lease — acquired OFF the handshake path (fix f43cf72f).
+    # Mirrors the c0e7de87 deferral of Realtime/heartbeat: run the blocking
+    # _acquire_lease() in a worker thread so the lifespan yields immediately and
+    # `initialize` is answered fast; gate all tool dispatch on _LEASE_ACQUIRED
+    # until it lands. Hard-exit (os._exit) on tombstone/kick or a genuine
+    # single-instance conflict — before any gated tool can unblock.
+    async def _bg_acquire_lease():
+        try:
+            ok = await asyncio.to_thread(_acquire_lease)
+        except SystemExit as _se:             # "kicked" tombstone path
+            os._exit(_se.code if isinstance(_se.code, int) else 0)
+            return
+        except Exception as _le:              # never fatal — degrade to no-lease, stay gated
+            log.warning(f"[meshcode] bg lease acquire error (non-fatal): {_le}")
+            return
+        if not ok:                            # another live instance holds it
+            try:
+                sys.stderr.write("[meshcode-mcp] lease held by another live instance — exiting\n")
+                sys.stderr.flush()
+            except Exception:
+                pass
+            os._exit(2)
+        _LEASE_ACQUIRED.set()                 # release the dispatch gate — ONLY on real acquire
+    asyncio.create_task(_bg_acquire_lease())
+
     def _initial_heartbeat_bg():
         """Send first heartbeat + flip status to 'idle' in a daemon thread.
 
@@ -8262,13 +8329,9 @@ def run_server():
     # only the lifespan re-runs. `SystemExit` is let through so `sys.exit`
     # from config-validation paths still works. stdin EOF returns from
     # `mcp.run()` normally, which breaks the loop.
-    # Lease acquire moved here from module-level (mig-322 fix). Running at
-    # import time caused _kill_stale_mcp_process() + _acquire_lease() to fire
-    # during pytest imports, killing live agents and hitting Supabase.
-    # _kill_stale_mcp_process() is already called in the lifespan; only the
-    # lease acquire needs an explicit call here before mcp.run().
-    if not _acquire_lease():
-        sys.exit(2)
+    # Lease acquire is DEFERRED into the lifespan (_bg_acquire_lease, fix
+    # f43cf72f) so it never blocks `initialize`. Tool dispatch is gated on
+    # _LEASE_ACQUIRED; conflict/kick hard-exits from that background task.
 
     import time as _time_mod
     _restart_count = 0

{meshcode-2.11.170 → meshcode-2.11.171}/meshcode.egg-info/PKG-INFO

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

{meshcode-2.11.170 → meshcode-2.11.171}/pyproject.toml

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