meshcode 2.10.28__tar.gz → 2.10.30__tar.gz

{meshcode-2.10.28 → meshcode-2.10.30}/PKG-INFO

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

{meshcode-2.10.28 → meshcode-2.10.30}/meshcode/__init__.py

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

{meshcode-2.10.28 → meshcode-2.10.30}/meshcode/meshcode_mcp/server.py

@@ -2852,4 +2852,48 @@ def run_server():
             # Non-main thread or Windows doesn't expose the signal — harmless.
             pass
 
-    mcp.run()
+    # 2.10.29 field test proved: a bare FastMCP (naive.py / armored.py) loaded
+    # via `claude mcp add` survives ESC, but meshcode does not — even after
+    # moving out of the "Built-in" bucket to "Project". The remaining delta
+    # between meshcode and the naked repro is our lifespan handler: it does
+    # network I/O (release_lease, memory_set), blocking thread joins, and an
+    # await on Realtime.stop() in its `finally`. When ESC cancels the in-flight
+    # tool, CancelledError cascades into those shutdown steps, one of them
+    # raises, and the event loop unwinds — process exits.
+    #
+    # Short of rewriting the lifespan (which we will), the pragmatic safety
+    # net is to treat `mcp.run()` returning unexpectedly as an event loop
+    # casualty and spin up a fresh one. FastMCP registers tools at import
+    # time on the module-level `mcp` object, so the restart re-uses them;
+    # 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.
+    import time as _time_mod
+    _restart_count = 0
+    while True:
+        try:
+            mcp.run()
+        except SystemExit:
+            raise
+        except BaseException as _e:
+            _restart_count += 1
+            try:
+                sys.stderr.write(
+                    f"[meshcode-mcp] mcp.run() raised {type(_e).__name__}: {_e} "
+                    f"(restart #{_restart_count}); re-entering event loop in 0.3s\n"
+                )
+                sys.stderr.flush()
+            except Exception:
+                pass
+            # If we're restarting more than a few times a second, something
+            # is wrong (config error, unrecoverable import). Bail.
+            if _restart_count > 20:
+                try:
+                    sys.stderr.write("[meshcode-mcp] too many restarts; exiting\n")
+                except Exception:
+                    pass
+                break
+            _time_mod.sleep(0.3)
+            continue
+        # Clean return = stdin EOF = Claude Code closed the pipe = real shutdown
+        break

{meshcode-2.10.28 → meshcode-2.10.30}/meshcode/run_agent.py

@@ -465,13 +465,17 @@ def run(agent: str, project: Optional[str] = None, editor_override: Optional[str
     print()
 
     if editor == "claude":
-        # Claude Code: pass --mcp-config to point at the workspace's .mcp.json
-        # and --strict-mcp-config so it ignores ~/.claude.json's mcpServers.
+        # Claude Code: run from inside the workspace and let Claude Code
+        # auto-discover .mcp.json as a PROJECT-scoped MCP. We used to pass
+        # --mcp-config + --strict-mcp-config here, but that categorises the
+        # server as a "Built-in" (session-injected) MCP, and Built-in MCPs
+        # are killed by Claude Code when the user presses ESC — a bug/quirk
+        # that caused our agents to die on every cancellation. Project-
+        # scoped MCPs (loaded from ./.mcp.json at cwd) live in the "Local
+        # MCP" bucket and survive ESC. Verified with a minimal FastMCP
+        # repro side-by-side: Built-in dies, Local survives, same SDK code.
         mode = resolve_permission_mode(permission_override)
-        cmd = [
-            editor,
-            "--mcp-config", str(ws / ".mcp.json"),
-        ]
+        cmd = [editor]
         if mode == "bypass":
             cmd.append("--dangerously-skip-permissions")
             print(f"[meshcode]   Permission mode: bypass (autonomous loop, no prompts)")

{meshcode-2.10.28 → meshcode-2.10.30}/meshcode.egg-info/PKG-INFO

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

{meshcode-2.10.28 → meshcode-2.10.30}/pyproject.toml

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