meshcode 2.11.67__tar.gz → 2.11.69__tar.gz

{meshcode-2.11.67 → meshcode-2.11.69}/PKG-INFO

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

{meshcode-2.11.67 → meshcode-2.11.69}/meshcode/__init__.py

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

{meshcode-2.11.67 → meshcode-2.11.69}/meshcode/comms_v4.py

@@ -266,6 +266,29 @@ def _load_api_key_for_cli() -> str:
     return ""
 
 
+def _ensure_protocol_registered():
+    """Best-effort, run-once registration of the meshcode:// URL scheme.
+
+    The dashboard 'Launch' button opens a meshcode:// deep-link; without a
+    registered OS handler the click silently no-ops (the bug Samuel hit).
+    cmd_install_protocol() is idempotent + platform-dispatched, but nothing
+    used to call it. Invoke once on first-run paths (init / go / setup / up),
+    guarded by a marker so we never re-run lsregister on every invocation.
+    Never raises — registration failure must not block the actual command.
+    """
+    try:
+        marker = COMMS_DIR / ".protocol_installed"
+        if marker.exists():
+            return
+        import importlib
+        _ph = importlib.import_module("meshcode.protocol_handler")
+        _ph.cmd_install_protocol()
+        COMMS_DIR.mkdir(parents=True, exist_ok=True)
+        marker.write_text("1", encoding="utf-8")
+    except Exception:
+        pass
+
+
 def get_project_id(project_name):
     """Resolve a project's UUID for the authenticated CLI user.
 
@@ -2833,6 +2856,9 @@ if __name__ == "__main__":
         # Guided onboarding: try zero-config pairing first, then manual fallback
         import webbrowser
         import time as _t
+        # Register meshcode:// early in onboarding (run-once) so the dashboard
+        # Launch deep-link works for this user.
+        _ensure_protocol_registered()
         print()
         print("  Welcome to MeshCode!")
         print("  " + "=" * 40)
@@ -3003,6 +3029,12 @@ if __name__ == "__main__":
             print("[meshcode] Get your API key at: https://meshcode.io/settings")
             sys.exit(1)
 
+    # First-run paths where the user is about to launch/manage agents: ensure
+    # the meshcode:// scheme is registered (run-once) so the dashboard Launch
+    # deep-link dispatches to this machine.
+    if cmd in ("go", "run", "setup", "add-agent", "add_agent", "up", "quickstart"):
+        _ensure_protocol_registered()
+
     if cmd == "register":
         # Backwards-compat alias for `connect`. Mesh-only model: bind THIS
         # terminal to (project, agent) — never spawns claude.
@@ -3852,6 +3884,27 @@ if __name__ == "__main__":
         _up = importlib.import_module("meshcode.up")
         sys.exit(_up.cmd_up(pos))
 
+    elif cmd == "install-protocol":
+        # Register the meshcode:// URL scheme so the dashboard 'Launch' deep-link
+        # spawns agents. LAUNCH-1 RC: protocol_handler defined this but it was
+        # never wired to the dispatcher -> `meshcode install-protocol` = Unknown command.
+        import importlib
+        _ph = importlib.import_module("meshcode.protocol_handler")
+        sys.exit(_ph.cmd_install_protocol())
+
+    elif cmd == "launch-url":
+        # meshcode launch-url "meshcode://launch?agents=..&token=..&user=.." —
+        # invoked by the OS scheme handler (.app/.desktop) the line above registers.
+        import importlib
+        _ph = importlib.import_module("meshcode.protocol_handler")
+        sys.exit(_ph.cmd_launch_url(pos[0] if pos else ""))
+
+    elif cmd == "launch-batch":
+        # meshcode launch-batch <agent> [<agent>...] — open a visible terminal per agent.
+        import importlib
+        _ph = importlib.import_module("meshcode.protocol_handler")
+        sys.exit(_ph.cmd_launch_batch(pos))
+
     else:
         known_cmds = [
             "register", "send", "broadcast", "read", "check", "watch", "inbox", "next",
@@ -3861,6 +3914,7 @@ if __name__ == "__main__":
             "revoke-invite", "revoke-member", "login", "prefs", "launcher",
             "help", "init", "doctor", "compat", "upgrade", "profile", "validate-sessions", "wake-headless",
             "supervisor", "hostd", "up", "upload", "quickstart", "patch-hooks", "wake-all",
+            "install-protocol", "launch-url", "launch-batch",
         ]
         # Simple fuzzy: prefix match + Levenshtein-like best match
         suggestions = [c for c in known_cmds if c.startswith(cmd)]

{meshcode-2.11.67 → meshcode-2.11.69}/meshcode/hostd.py

@@ -87,25 +87,61 @@ def get_host_id() -> str:
 # ------------------------------------------------------------------
 
 def _supabase_cfg() -> tuple:
+    # env first (explicit override), then fall back to the SAME resolution the
+    # rest of the CLI uses (comms_v4: env -> ~/.meshcode/env -> baked publishable
+    # default). hostd runs under launchd with NO env, so the old env-only lookup
+    # left it unable to reach the cloud at all ("SUPABASE_URL/KEY not set").
     url = os.environ.get("SUPABASE_URL", "").rstrip("/")
     key = os.environ.get("SUPABASE_KEY") or os.environ.get("MESHCODE_SUPABASE_ANON_KEY") or ""
-    return url, key
+    if url and key:
+        return url, key
+    try:
+        from meshcode import comms_v4 as _c  # type: ignore
+        return (url or _c.SUPABASE_URL).rstrip("/"), (key or _c.SUPABASE_KEY)
+    except Exception:
+        return url, key
 
 
 def _api_key() -> Optional[str]:
-    """The meshcode agent/user api key, used as p_api_key in mc_ RPCs."""
+    """The meshcode agent/user api key, used as p_api_key in mc_ RPCs.
+
+    Resolution mirrors comms_v4._load_api_key_for_cli so hostd authenticates
+    the same way `meshcode run` does. CRITICAL: launchd starts hostd with NO
+    environment, so the key MUST be resolvable from the keychain (where
+    `meshcode login` stores it). The old code only checked env + a
+    wrong-shaped profiles.json, so launchd-started hostd always FATAL'd
+    ("no api key") and never registered -> dashboard launch had no host.
+    """
+    # 1) explicit env override
     k = os.environ.get("MESHCODE_API_KEY")
     if k:
         return k
+    # 2) keychain — the actual store `meshcode login` writes to. Same source
+    #    comms_v4._load_api_key_for_cli() uses. This is the launchd fix.
+    try:
+        from meshcode import secrets as _secrets  # type: ignore
+        profile = os.environ.get("MESHCODE_KEYCHAIN_PROFILE") or _secrets.DEFAULT_PROFILE
+        key = _secrets.get_api_key(profile=profile) or ""
+        if key:
+            return key
+    except Exception:
+        pass
+    # 3) legacy per-profile state file fallback. Handles BOTH the flat
+    #    {name: {api_key}} and nested {"profiles": {name: {api_key}}} shapes
+    #    (the flat-only scan silently missed the nested writer).
     try:
-        # same source meshcode run uses (per-profile state)
         prof = STATE_DIR / "profiles.json"
         if prof.exists():
             data = json.loads(prof.read_text(encoding="utf-8"))
-            # best-effort: first profile with an api_key
-            for v in (data.values() if isinstance(data, dict) else []):
-                if isinstance(v, dict) and v.get("api_key"):
-                    return v["api_key"]
+            roots = []
+            if isinstance(data, dict):
+                roots.append(data)
+                if isinstance(data.get("profiles"), dict):
+                    roots.append(data["profiles"])
+            for root in roots:
+                for v in root.values():
+                    if isinstance(v, dict) and v.get("api_key"):
+                        return v["api_key"]
     except Exception:
         pass
     return None
@@ -377,8 +413,17 @@ def cmd_hostd(args: list) -> int:
 
     if sub == "run":
         if not api_key:
-            _log("FATAL: no api key — set MESHCODE_API_KEY")
+            _log("FATAL: no api key — run `meshcode login` (key is read from the keychain)")
             return 1
+        # Register this host in mc_host_config so the dashboard can list it as a
+        # launch target (Path2 canonical: dashboard -> mc_host_set_agents ->
+        # mc_agents.desired_state='running' -> this daemon polls + spawns).
+        # mc_host_config_set upserts (host_id, owner_user_id) idempotently.
+        _reg = _rpc("mc_host_config_set", {"p_api_key": api_key, "p_host_id": host_id})
+        if _reg and _reg.get("ok"):
+            _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")
         while True:
             try:

{meshcode-2.11.67 → meshcode-2.11.69}/meshcode.egg-info/PKG-INFO

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

{meshcode-2.11.67 → meshcode-2.11.69}/pyproject.toml

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