meshcode 2.10.45__tar.gz → 2.10.46__tar.gz

{meshcode-2.10.45 → meshcode-2.10.46}/PKG-INFO

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

{meshcode-2.10.45 → meshcode-2.10.46}/meshcode/__init__.py

@@ -1,2 +1,2 @@
 """MeshCode — Real-time communication between AI agents."""
-__version__ = "2.10.45"
+__version__ = "2.10.46"

{meshcode-2.10.45 → meshcode-2.10.46}/meshcode/meshcode_mcp/server.py

@@ -635,6 +635,12 @@ def with_working_status(func):
                 _record_event_bg("tool_call", {"tool": name, "args_keys": list(kwargs.keys()), "estimated_tokens": _est_tokens})
             try:
                 return await func(*args, **kwargs)
+            except asyncio.CancelledError:
+                # ESC in Claude Code cancels the in-flight task. Catch here
+                # to prevent cascade through FastMCP into the event loop.
+                # Return an error dict instead of propagating BaseException.
+                log.debug(f"[meshcode] tool {name} cancelled by client (ESC)")
+                return {"error": "cancelled_by_client", "tool": name}
             except Exception as e:
                 if not skip:
                     _auto_learn_error(name, e, list(kwargs.keys()))
@@ -1665,7 +1671,11 @@ async def meshcode_call(to: str, function: str, args: Any = None, timeout_second
     poll_interval = 1.0
     elapsed = 0.0
     while elapsed < timeout_seconds:
-        await _asyncio.sleep(poll_interval)
+        try:
+            await _asyncio.sleep(poll_interval)
+        except _asyncio.CancelledError:
+            log.debug("[meshcode] meshcode_call poll cancelled by ESC")
+            return {"error": "cancelled_by_client", "call_id": call_id, "ok": False}
         elapsed += poll_interval
 
         # Check Realtime buffer first
@@ -1898,7 +1908,13 @@ async def meshcode_wait(timeout_seconds: int = 20, include_acks: bool = False) -
         # Keep polling until something actionable arrives.
         # The agent (LLM) is NOT called between iterations — zero token cost.
         while True:
-            result = await _meshcode_wait_inner(actual_timeout=capped_timeout, include_acks=include_acks)
+            try:
+                result = await _meshcode_wait_inner(actual_timeout=capped_timeout, include_acks=include_acks)
+            except asyncio.CancelledError:
+                # Safety net: if CancelledError escapes _meshcode_wait_inner
+                # despite the inner shield, catch it here to prevent cascade.
+                log.debug("[meshcode] meshcode_wait outer loop caught CancelledError")
+                result = {"timed_out": True, "reason": "cancelled_by_client"}
 
             if result.get("got_message"):
                 # Real message arrived — return to agent for processing
@@ -2041,7 +2057,20 @@ async def _meshcode_wait_inner(actual_timeout: int, include_acks: bool) -> Dict[
 
     if _rt_live:
         # 2a) Real async wait — zero CPU, zero Supabase calls.
-        woke = await _REALTIME.wait_for_message(timeout=float(actual_timeout))
+        # Shield from CancelledError: when Claude Code presses ESC, it cancels
+        # the in-flight asyncio task. CancelledError is a BaseException that
+        # bypasses most try/except, cascades through FastMCP's tool handler,
+        # and unwinds the event loop — killing the MCP server. By shielding
+        # the await and catching CancelledError, we return a clean timeout
+        # result instead. The mcp.run() retry loop restarts the event loop
+        # without the lifespan cascade.
+        try:
+            woke = await asyncio.shield(
+                _REALTIME.wait_for_message(timeout=float(actual_timeout))
+            )
+        except (asyncio.CancelledError, Exception) as _cancel_exc:
+            log.debug(f"[meshcode] wait_for_message cancelled/failed: {type(_cancel_exc).__name__}")
+            return {"timed_out": True, "reason": "cancelled_by_client"}
         if woke:
             buffered = _REALTIME.drain()
             if buffered:
@@ -2054,7 +2083,11 @@ async def _meshcode_wait_inner(actual_timeout: int, include_acks: bool) -> Dict[
         _poll_interval = 5
         _elapsed = 0
         while _elapsed < actual_timeout:
-            await asyncio.sleep(min(_poll_interval, actual_timeout - _elapsed))
+            try:
+                await asyncio.sleep(min(_poll_interval, actual_timeout - _elapsed))
+            except asyncio.CancelledError:
+                log.debug("[meshcode] DB poll sleep cancelled by ESC")
+                return {"timed_out": True, "reason": "cancelled_by_client"}
             _elapsed += _poll_interval
             try:
                 api_key = _get_api_key()

{meshcode-2.10.45 → meshcode-2.10.46}/meshcode/run_agent.py

@@ -434,8 +434,20 @@ def _resolve_pinned_claude(editor_cmd: str) -> str:
             print(f"[meshcode] Global admin pin: Claude Code v{pinned}", file=sys.stderr)
     if not pinned:
         pinned = load_prefs().get("claude_version", "")
+
+    # "latest" or "none" means skip pinning — use whatever is installed
+    if pinned and pinned.lower() in ("latest", "none", "skip"):
+        print(f"[meshcode] Version pin disabled ({pinned}) — using installed version", file=sys.stderr)
+        return editor_cmd
+
     if not pinned:
-        return editor_cmd  # No pin — use installed version
+        # Default pin: v2.1.104 is the last Claude Code version where ESC
+        # doesn't kill the MCP server. Newer versions send CancelledError
+        # that cascades through the event loop. This default is overridden
+        # by any of the 3 pin sources above (set to "latest" to disable).
+        # Remove this default once Anthropic fixes the ESC bug upstream.
+        pinned = "2.1.104"
+        print(f"[meshcode] Default ESC-safe pin: Claude Code v{pinned}", file=sys.stderr)
 
     current = _get_claude_version(editor_cmd)
     if current == pinned:

{meshcode-2.10.45 → meshcode-2.10.46}/meshcode.egg-info/PKG-INFO

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

{meshcode-2.10.45 → meshcode-2.10.46}/pyproject.toml

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