meshcode 2.8.3__tar.gz → 2.8.5__tar.gz

{meshcode-2.8.3 → meshcode-2.8.5}/PKG-INFO

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

{meshcode-2.8.3 → meshcode-2.8.5}/meshcode/__init__.py

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

{meshcode-2.8.3 → meshcode-2.8.5}/meshcode/comms_v4.py

@@ -1426,10 +1426,10 @@ def _stop_heartbeat_daemon(project, name):
 
 
 def connect_terminal(project, name, role=""):
-    """Bind THIS terminal to (project, agent). Calls mc_connect_agent RPC and
-    starts a 30s heartbeat loop. MeshCode is mesh infrastructure only — this
-    command does NOT spawn claude. The user must already have a claude session
-    running in this terminal."""
+    """Bind THIS terminal to (project, agent). Calls mc_acquire_agent_lease RPC
+    (ownership-validated) and starts a 30s heartbeat loop. MeshCode is mesh
+    infrastructure only — this command does NOT spawn claude. The user must
+    already have a claude session running in this terminal."""
     ensure_sessions()
     project_id = get_project_id(project)
     if not project_id:
@@ -1452,12 +1452,20 @@ def connect_terminal(project, name, role=""):
             "p_status": "needs_setup",
         })
 
-    rpc_result = sb_rpc("mc_connect_agent", {
-        "p_project_id": project_id,
-        "p_agent_name": name,
-        "p_tty": tty,
-        "p_pid": ppid,
-    })
+    # Use mc_acquire_agent_lease (ownership-validated) instead of mc_connect_agent
+    import uuid as _uuid
+    _instance_id = f"{tty or 'no-tty'}-{ppid}-{_uuid.uuid4().hex[:8]}"
+    if _api_key:
+        rpc_result = sb_rpc("mc_acquire_agent_lease", {
+            "p_api_key": _api_key,
+            "p_project_id": project_id,
+            "p_agent_name": name,
+            "p_instance_id": _instance_id,
+        })
+    else:
+        print("[ERROR] No API key found — cannot connect without authentication.")
+        print("[ERROR] Run: meshcode setup-key")
+        return
     if rpc_result and rpc_result.get("error"):
         print(f"[ERROR] {rpc_result['error']}")
         return

{meshcode-2.8.3 → meshcode-2.8.5}/meshcode/run_agent.py

@@ -32,6 +32,51 @@ WORKSPACES_ROOT = Path.home() / "meshcode"
 REGISTRY_PATH = WORKSPACES_ROOT / ".registry.json"
 
 
+def _check_agent_ownership(agent: str, project: str) -> Optional[str]:
+    """Pre-flight check: verify caller owns this agent before launching editor.
+
+    Returns an error message string if blocked, None if OK.
+    """
+    try:
+        from .setup_clients import _load_supabase_env
+        import importlib
+        secrets_mod = importlib.import_module("meshcode.secrets")
+    except Exception:
+        return None  # Can't check — let the RPC catch it later
+
+    profile = os.environ.get("MESHCODE_KEYCHAIN_PROFILE") or "default"
+    api_key = secrets_mod.get_api_key(profile=profile)
+    if not api_key:
+        return None  # No key — RPC will reject later
+
+    sb = _load_supabase_env()
+    try:
+        from urllib.request import Request, urlopen
+        body = json.dumps({
+            "p_api_key": api_key,
+            "p_project_name": project,
+            "p_agent_name": agent,
+        }).encode()
+        req = Request(
+            f"{sb['SUPABASE_URL']}/rest/v1/rpc/mc_check_agent_ownership",
+            data=body,
+            method="POST",
+            headers={
+                "apikey": sb["SUPABASE_KEY"],
+                "Authorization": f"Bearer {sb['SUPABASE_KEY']}",
+                "Content-Type": "application/json",
+            },
+        )
+        with urlopen(req, timeout=10) as resp:
+            data = json.loads(resp.read().decode())
+    except Exception:
+        return None  # Network error — let the RPC catch it later
+
+    if isinstance(data, dict) and data.get("error"):
+        return data["error"]
+    return None
+
+
 def _try_auto_setup(agent: str, project: Optional[str] = None) -> Optional[Tuple[Path, str]]:
     """If agent exists on the server but has no local workspace, auto-create it.
 
@@ -203,6 +248,14 @@ def run(agent: str, project: Optional[str] = None, editor_override: Optional[str
             print(f"[meshcode]        Run `meshcode setup <project> {agent}` first.", file=sys.stderr)
             return 2
     ws, resolved_project = found
+
+    # ── Ownership pre-check ──────────────────────────────────────────
+    # Before launching the editor, verify the caller owns this agent.
+    # This prevents hijacking another user's agent in shared meshworks.
+    ownership_err = _check_agent_ownership(agent, resolved_project)
+    if ownership_err:
+        print(f"[meshcode] ERROR: {ownership_err}", file=sys.stderr)
+        return 2
     server_id = f"meshcode-{resolved_project}-{agent}"
 
     editor = editor_override or _detect_editor()

{meshcode-2.8.3 → meshcode-2.8.5}/meshcode.egg-info/PKG-INFO

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

{meshcode-2.8.3 → meshcode-2.8.5}/pyproject.toml

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