meshcode 2.4.1__tar.gz → 2.4.2__tar.gz

{meshcode-2.4.1 → meshcode-2.4.2}/PKG-INFO

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

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode/__init__.py

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

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode/comms_v4.py

@@ -57,7 +57,7 @@ def _load_env_file():
         return {}
     out = {}
     try:
-        for line in env_path.read_text().splitlines():
+        for line in env_path.read_text(encoding="utf-8").splitlines():
             line = line.strip()
             if line.startswith("export "):
                 line = line[7:]
@@ -296,7 +296,7 @@ def can_nudge(project, name):
     nf = get_nudge_file(project, name)
     if nf and nf.exists():
         try:
-            last = float(nf.read_text().strip())
+            last = float(nf.read_text(encoding="utf-8").strip())
             if (time.time() - last) < NUDGE_COOLDOWN:
                 return False
         except (ValueError, IOError, OSError):
@@ -307,7 +307,7 @@ def can_nudge(project, name):
 def mark_nudged(project, name):
     nf = get_nudge_file(project, name)
     if nf:
-        nf.write_text(str(time.time()))
+        nf.write_text(str(time.time()), encoding="utf-8")
 
 
 def send_notification(project, name, from_agent, pending=1):
@@ -455,7 +455,7 @@ def _throttle_spawn_ok(project, name, max_per_5min=5):
     history = []
     if throttle_file.exists():
         try:
-            history = [float(x) for x in throttle_file.read_text().split() if x]
+            history = [float(x) for x in throttle_file.read_text(encoding="utf-8").split() if x]
         except Exception:
             history = []
     history = [t for t in history if now_ts - t < 300]  # last 5 min
@@ -463,7 +463,7 @@ def _throttle_spawn_ok(project, name, max_per_5min=5):
         return False
     history.append(now_ts)
     try:
-        throttle_file.write_text(" ".join(f"{t:.0f}" for t in history))
+        throttle_file.write_text(" ".join(f"{t:.0f}" for t in history), encoding="utf-8")
     except Exception:
         pass
     return True
@@ -615,7 +615,7 @@ def spawn_headless_agent(project, name, project_id, message_body, from_agent):
         ts_safe = started_iso.replace(":", "-").replace("+", "_")
         (debug_dir / f"{name}_{ts_safe}.log").write_text(
             f"=== SYSTEM PROMPT ===\n{system_prompt}\n\n=== USER MESSAGE ===\n{message_body}\n\n=== STDOUT ===\n{stdout_text}\n\n=== STDERR ===\n{stderr_text}\n"
-        )
+        , encoding="utf-8")
     except Exception:
         pass
     if exit_code != 0:
@@ -669,7 +669,7 @@ def nudge_agent(project, name, from_agent=""):
         return False
 
     try:
-        data = json.loads(session_file.read_text())
+        data = json.loads(session_file.read_text(encoding="utf-8"))
     except (json.JSONDecodeError, IOError, OSError):
         if _headless_spawn_allowed():
             log_msg(f"[{project}] NUDGE: {name} session file unreadable, spawning headless (opt-in)")
@@ -818,7 +818,7 @@ def get_session_info():
     for f in SESSIONS_DIR.iterdir():
         if f.is_file() and '_' in f.name and not f.name.startswith('.'):
             try:
-                data = json.loads(f.read_text())
+                data = json.loads(f.read_text(encoding="utf-8"))
                 session_tty = data.get("tty", "")
                 if session_tty and (session_tty in my_tty or my_tty in session_tty):
                     return data.get("project"), data.get("agent")
@@ -861,8 +861,15 @@ def register(project, name, role=""):
     except (subprocess.SubprocessError, OSError, ValueError):
         pass
 
-    # Register agent via tier-aware RPC (enforces plan limits)
-    rpc_result = sb_rpc("mc_register_agent", {
+    # Register agent via tier-aware RPC (enforces plan limits).
+    # Use with_api_key variant so scoped guest keys also work and so
+    # the RPC validates owner/member access (no anon bypass).
+    _api_key = _load_api_key_for_cli()
+    if not _api_key:
+        print("[ERROR] Not authenticated. Run `meshcode login <api_key>` first.")
+        return
+    rpc_result = sb_rpc("mc_register_agent_with_api_key", {
+        "p_api_key": _api_key,
         "p_project_id": project_id,
         "p_name": name,
         "p_role": role,
@@ -884,7 +891,7 @@ def register(project, name, role=""):
 
     # Save local session file (for nudge TTY detection)
     session_data = {"project": project, "agent": name, "pid": ppid, "tty": tty, "registered_at": now()}
-    (SESSIONS_DIR / f"{project}_{name}").write_text(json.dumps(session_data))
+    (SESSIONS_DIR / f"{project}_{name}").write_text(json.dumps(session_data), encoding="utf-8")
 
     # Get all agents in project
     agents = sb_select("mc_agents", f"project_id=eq.{project_id}", order="registered_at.asc")
@@ -1360,7 +1367,7 @@ def _start_heartbeat_daemon(project, name):
     # Stop any existing heartbeat
     try:
         if pid_file.exists():
-            old = int(pid_file.read_text().strip())
+            old = int(pid_file.read_text(encoding="utf-8").strip())
             try:
                 os.kill(old, 15)
             except Exception:
@@ -1389,12 +1396,17 @@ def _start_heartbeat_daemon(project, name):
         "    if pid: post('/rest/v1/rpc/mc_heartbeat', {'p_project_id':pid,'p_agent_name':name})\n"
         "    time.sleep(30)\n"
     )
-    proc = subprocess.Popen(
-        [sys.executable, "-c", code],
-        stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
-        start_new_session=True,
-    )
-    pid_file.write_text(str(proc.pid))
+    # Windows: start_new_session kwarg doesn't exist. Use creationflags.
+    _popen_kwargs = {
+        "stdout": subprocess.DEVNULL,
+        "stderr": subprocess.DEVNULL,
+    }
+    if sys.platform == "win32":
+        _popen_kwargs["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
+    else:
+        _popen_kwargs["start_new_session"] = True
+    proc = subprocess.Popen([sys.executable, "-c", code], **_popen_kwargs)
+    pid_file.write_text(str(proc.pid), encoding="utf-8")
     return proc.pid
 
 
@@ -1402,7 +1414,7 @@ def _stop_heartbeat_daemon(project, name):
     pid_file = _heartbeat_loop_pidfile(project, name)
     if pid_file.exists():
         try:
-            pid = int(pid_file.read_text().strip())
+            pid = int(pid_file.read_text(encoding="utf-8").strip())
             os.kill(pid, 15)
         except Exception:
             pass
@@ -1426,13 +1438,18 @@ def connect_terminal(project, name, role=""):
     tty, owning = _capture_tty_for_pid(os.getppid())
     ppid = owning or os.getppid()
 
-    # Make sure agent identity exists (idempotent)
-    sb_rpc("mc_register_agent", {
-        "p_project_id": project_id,
-        "p_name": name,
-        "p_role": role,
-        "p_status": "needs_setup",
-    })
+    # Make sure agent identity exists (idempotent).
+    # Use with_api_key variant so scoped guest keys work and the RPC
+    # validates owner/member access (no anon bypass).
+    _api_key = _load_api_key_for_cli()
+    if _api_key:
+        sb_rpc("mc_register_agent_with_api_key", {
+            "p_api_key": _api_key,
+            "p_project_id": project_id,
+            "p_name": name,
+            "p_role": role,
+            "p_status": "needs_setup",
+        })
 
     rpc_result = sb_rpc("mc_connect_agent", {
         "p_project_id": project_id,
@@ -1445,7 +1462,7 @@ def connect_terminal(project, name, role=""):
         return
 
     session_data = {"project": project, "agent": name, "pid": ppid, "tty": tty, "registered_at": now()}
-    (SESSIONS_DIR / f"{project}_{name}").write_text(json.dumps(session_data))
+    (SESSIONS_DIR / f"{project}_{name}").write_text(json.dumps(session_data), encoding="utf-8")
 
     hb_pid = _start_heartbeat_daemon(project, name)
 
@@ -1503,7 +1520,7 @@ def connect(project, name, hook_target="claude", role=""):
     meta_path = Path.home() / ".meshcode" / "profile_meta.json"
     if meta_path.exists():
         try:
-            meta = json.loads(meta_path.read_text())
+            meta = json.loads(meta_path.read_text(encoding="utf-8"))
             print(f"[meshcode] Authenticated as {meta.get('display_name', meta.get('email', '?'))}")
         except Exception:
             pass
@@ -1534,7 +1551,7 @@ def connect(project, name, hook_target="claude", role=""):
             "send_command": f"python3 {comms_path} send {project} {name}:{{to}} '{{message}}'",
             "platform": os_name
         }
-        config_path.write_text(json.dumps(config, indent=2))
+        config_path.write_text(json.dumps(config, indent=2), encoding="utf-8")
         print(f"[meshcode] Config saved to {config_path}")
         print(f"[meshcode] Codex: use read_command and send_command from the config")
 
@@ -1591,7 +1608,7 @@ def login(api_key):
     config_dir = Path.home() / ".meshcode"
     config_dir.mkdir(exist_ok=True)
     meta_path = config_dir / "profile_meta.json"
-    meta_path.write_text(json.dumps(meta, indent=2))
+    meta_path.write_text(json.dumps(meta, indent=2), encoding="utf-8")
     try:
         os.chmod(meta_path, 0o600)
     except Exception:
@@ -1601,7 +1618,7 @@ def login(api_key):
     flag = config_dir / ".migrated_to_keychain"
     if not flag.exists():
         try:
-            flag.write_text("login")
+            flag.write_text("login", encoding="utf-8")
         except Exception:
             pass
 
@@ -1656,6 +1673,12 @@ ADMIN:
   unregister <proj> <name>                   Leave project
   prefs                                      View/set preferences
 
+PROFILES (multi-account):
+  profiles                                   List stored keychain profiles
+  --profile <name>                           Use a specific profile (global flag)
+  MESHCODE_PROFILE=<name>                    Env var equivalent
+  (Inside a workspace dir, profile is auto-detected from .mcp.json)
+
 FEATURES: Auto-status (5 states), Agent Replay, Live Spectator,
           Mesh Graph, Session Recording, Hot-reload
 
@@ -1843,6 +1866,31 @@ if __name__ == "__main__":
     for bf in _bare_present:
         flags[bf] = True
 
+    # Global --profile flag: selects which keychain profile api_key comes from.
+    # Priority: --profile <name> > MESHCODE_PROFILE env > "default".
+    # Sets MESHCODE_KEYCHAIN_PROFILE env so every downstream helper picks it up.
+    _profile_flag = flags.pop("profile", None)
+    if _profile_flag:
+        os.environ["MESHCODE_KEYCHAIN_PROFILE"] = _profile_flag
+    elif os.environ.get("MESHCODE_PROFILE") and not os.environ.get("MESHCODE_KEYCHAIN_PROFILE"):
+        os.environ["MESHCODE_KEYCHAIN_PROFILE"] = os.environ["MESHCODE_PROFILE"]
+    else:
+        # Auto-detect: if cwd is a meshcode workspace (~/meshcode/<proj>-<agent>),
+        # read its .mcp.json to find the profile baked in by setup.
+        try:
+            _cwd = Path.cwd()
+            _mcp_json = _cwd / ".mcp.json"
+            if _mcp_json.exists() and str(_cwd).startswith(str(Path.home() / "meshcode")):
+                _doc = json.loads(_mcp_json.read_text(encoding="utf-8"))
+                _servers = _doc.get("mcpServers", {}) or {}
+                for _sid, _sblk in _servers.items():
+                    _p = (_sblk.get("env") or {}).get("MESHCODE_KEYCHAIN_PROFILE")
+                    if _p and not os.environ.get("MESHCODE_KEYCHAIN_PROFILE"):
+                        os.environ["MESHCODE_KEYCHAIN_PROFILE"] = _p
+                        break
+        except Exception:
+            pass
+
     if cmd == "register":
         # Backwards-compat alias for `connect`. Mesh-only model: bind THIS
         # terminal to (project, agent) — never spawns claude.
@@ -1951,7 +1999,7 @@ if __name__ == "__main__":
             any_found = True
             agent = f.name[len(prefix):]
             try:
-                d = json.loads(f.read_text())
+                d = json.loads(f.read_text(encoding="utf-8"))
             except Exception as e:
                 print(f"  [{agent}] CORRUPT ({e})")
                 continue
@@ -2165,6 +2213,47 @@ if __name__ == "__main__":
             sys.exit(1)
         login(key)
 
+    elif cmd in ("profiles", "whoami"):
+        # List all stored keychain profiles with metadata
+        try:
+            import importlib as _il
+            _sec = _il.import_module("meshcode.secrets")
+        except Exception as _e:
+            print(f"[meshcode] ERROR: cannot load secrets module: {_e}", file=sys.stderr)
+            sys.exit(1)
+
+        profiles = _sec.list_profiles()
+        active = os.environ.get("MESHCODE_KEYCHAIN_PROFILE") or "default"
+
+        if not profiles:
+            print("[meshcode] No profiles stored yet.")
+            print("[meshcode] Run `meshcode login <api_key>` to create the default profile,")
+            print("[meshcode] or `meshcode join <invite-token>` to create a scoped profile.")
+            sys.exit(0)
+
+        print()
+        print(f"[meshcode] Stored profiles ({len(profiles)}):")
+        print()
+        for name, meta in sorted(profiles.items()):
+            marker = " *ACTIVE*" if name == active else ""
+            kind = meta.get("type", "default" if name == "default" else "scoped")
+            print(f"  {name}{marker}")
+            print(f"      type: {kind}")
+            if meta.get("meshwork"):
+                print(f"      meshwork: {meta['meshwork']}")
+            if meta.get("agent"):
+                print(f"      agent: {meta['agent']}")
+            if meta.get("email"):
+                print(f"      email: {meta['email']}")
+            if meta.get("expires_at"):
+                print(f"      expires: {meta['expires_at']}")
+            if meta.get("backend"):
+                print(f"      backend: {meta['backend']}")
+        print()
+        print("[meshcode] Use `--profile <name>` or `MESHCODE_PROFILE=<name>` to switch.")
+        print("[meshcode] In a meshcode workspace dir, the profile is auto-detected from .mcp.json.")
+        sys.exit(0)
+
     elif cmd == "prefs":
         # meshcode prefs permission-mode [bypass|safe|ask]   (no arg = show)
         # meshcode prefs auto-update [on|off|reset]          (no arg = show)

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode/invites.py

@@ -79,10 +79,17 @@ def _rpc(name: str, body: Dict[str, Any]) -> Optional[Dict[str, Any]]:
 
 
 def _get_default_api_key() -> Optional[str]:
+    """Read the api key for the active profile.
+
+    Profile resolution: MESHCODE_KEYCHAIN_PROFILE env > "default".
+    The CLI dispatcher sets MESHCODE_KEYCHAIN_PROFILE from --profile flag,
+    MESHCODE_PROFILE env, or workspace auto-detection.
+    """
     try:
         import importlib
         secrets_mod = importlib.import_module("meshcode.secrets")
-        return secrets_mod.get_api_key(profile="default")
+        profile = os.environ.get("MESHCODE_KEYCHAIN_PROFILE") or "default"
+        return secrets_mod.get_api_key(profile=profile)
     except Exception:
         return None
 

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode/launcher.py

@@ -67,7 +67,7 @@ def load_env() -> tuple[str, str]:
     key = os.environ.get("SUPABASE_KEY", "").strip()
     if not (url and key) and ENV_FILE.exists():
         try:
-            for raw in ENV_FILE.read_text().splitlines():
+            for raw in ENV_FILE.read_text(encoding="utf-8").splitlines():
                 line = raw.strip()
                 if not line or line.startswith("#"):
                     continue
@@ -103,7 +103,7 @@ def write_pidfile() -> None:
         "uptime_seconds": int(time.time() - _start_time),
     }
     try:
-        PID_FILE.write_text(json.dumps(payload, indent=2))
+        PID_FILE.write_text(json.dumps(payload, indent=2), encoding="utf-8")
     except Exception as e:
         log(f"pid-file write failed: {e}", err=True)
 

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode/meshcode_mcp/server.py

@@ -885,8 +885,18 @@ def meshcode_send(to: str, message: Any, in_reply_to: Optional[str] = None,
 
 @mcp.tool()
 @with_working_status
-def meshcode_broadcast(payload: Dict[str, Any]) -> Dict[str, Any]:
-    """Broadcast to ALL agents in this meshwork (except yourself)."""
+def meshcode_broadcast(payload: Any) -> Dict[str, Any]:
+    """Broadcast to ALL agents in this meshwork (except yourself).
+
+    Accepts payload as either:
+      - dict (structured): {"type": "...", "detail": "..."}
+      - str (shorthand): wrapped internally as {"text": "..."}
+    """
+    if isinstance(payload, str):
+        payload = {"text": payload}
+    elif not isinstance(payload, dict):
+        return {"error": "payload must be a string or object", "got_type": type(payload).__name__}
+
     agents = be.get_board(_PROJECT_ID)
     sent = 0
     for a in agents:

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode/run_agent.py

@@ -44,7 +44,9 @@ def _try_auto_setup(agent: str, project: Optional[str] = None) -> Optional[Tuple
     except Exception:
         return None
 
-    api_key = secrets_mod.get_api_key(profile="default")
+    import os as _os
+    profile = _os.environ.get("MESHCODE_KEYCHAIN_PROFILE") or "default"
+    api_key = secrets_mod.get_api_key(profile=profile)
     if not api_key:
         return None
 

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode/self_update.py

@@ -144,7 +144,7 @@ def consume_pending_result() -> None:
     if not RESULT_PATH.exists():
         return
     try:
-        data = json.loads(RESULT_PATH.read_text())
+        data = json.loads(RESULT_PATH.read_text(encoding="utf-8"))
         RESULT_PATH.unlink(missing_ok=True)
     except Exception:
         return
@@ -188,7 +188,7 @@ def _acquire_lock() -> bool:
                 return False
             LOCK_PATH.unlink(missing_ok=True)
         LOCK_PATH.parent.mkdir(parents=True, exist_ok=True)
-        LOCK_PATH.write_text(str(os.getpid()))
+        LOCK_PATH.write_text(str(os.getpid()), encoding="utf-8")
         return True
     except Exception:
         return False
@@ -233,7 +233,7 @@ except Exception as e:
 finally:
     result["finished_at"] = int(time.time())
     try:
-        result_path.write_text(json.dumps(result))
+        result_path.write_text(json.dumps(result), encoding="utf-8")
     except Exception:
         pass
     try:

{meshcode-2.4.1 → meshcode-2.4.2}/meshcode.egg-info/PKG-INFO

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

{meshcode-2.4.1 → meshcode-2.4.2}/pyproject.toml

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