meshcode 2.4.3__tar.gz → 2.4.5__tar.gz

{meshcode-2.4.3 → meshcode-2.4.5}/PKG-INFO

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

{meshcode-2.4.3 → meshcode-2.4.5}/meshcode/__init__.py

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

{meshcode-2.4.3 → meshcode-2.4.5}/meshcode/meshcode_mcp/server.py

@@ -37,14 +37,32 @@ _AUTO_WAKE = os.environ.get("MESHCODE_AUTO_WAKE", "1").lower() not in ("0", "fal
 
 
 def _try_auto_wake(from_agent: str, preview: str) -> None:
-    """Inject a nudge into the terminal if the agent is idle (not in wait).
+    """Inject a nudge into the terminal ONLY when agent is truly sleeping.
 
     macOS:  AppleScript → keystroke into Terminal/iTerm2
     Windows: PowerShell SendKeys to the console window
     Linux:  xdotool (best-effort)
+
+    Conditions to fire (ALL must be true):
+    - _AUTO_WAKE is enabled
+    - NOT in meshcode_wait (wait loop already handles delivery)
+    - _current_state is 'sleeping' (truly idle, not working, not just online)
+    - LLM CPU is low (not actively generating)
+    Otherwise the keystroke would interrupt the user's typing or
+    the LLM mid-thought.
     """
-    if _IN_WAIT or not _AUTO_WAKE:
+    if not _AUTO_WAKE or _IN_WAIT:
+        return
+    # Only fire when agent is actually sleeping — never when working or online
+    # (working = LLM generating; online = brief post-tool window; both would be interrupted)
+    if _current_state != 'sleeping':
         return
+    # Belt-and-suspenders: also check parent CPU is low (LLM not generating right now)
+    try:
+        if _get_parent_cpu() > 5.0:
+            return  # LLM is actively generating, don't interrupt
+    except Exception:
+        pass
     import subprocess, platform, re
     # Sanitize inputs: strip everything except alphanumeric, spaces, basic punctuation
     safe_agent = re.sub(r'[^a-zA-Z0-9_\- ]', '', from_agent)[:50]
@@ -183,6 +201,21 @@ except Exception:
     _be_path = ""
 
 
+def _capture_session() -> None:
+    """Stash the MCP session ref for silent auto-wake when agent is idle."""
+    global _STASHED_SESSION
+    if _STASHED_SESSION is not None:
+        return
+    try:
+        srv = mcp._mcp_server
+        ctx = getattr(srv, "request_context", None)
+        if ctx and getattr(ctx, "session", None):
+            _STASHED_SESSION = ctx.session
+            log.info("[meshcode] MCP session stashed for silent auto-wake")
+    except Exception:
+        pass
+
+
 def _check_hot_reload() -> None:
     """If backend.py was modified since boot/last reload, reimport it."""
     global _be_mtime, be
@@ -410,6 +443,7 @@ def with_working_status(func):
         @_functools.wraps(func)
         async def awrapper(*args, **kwargs):
             _check_hot_reload()
+            _capture_session()  # stash session on first tool call for silent auto-wake
             if not skip:
                 _set_state("working", name)
                 _record_event_bg("tool_call", {"tool": name, "args_keys": list(kwargs.keys())})
@@ -426,6 +460,7 @@ def with_working_status(func):
         @_functools.wraps(func)
         def swrapper(*args, **kwargs):
             _check_hot_reload()
+            _capture_session()  # stash session on first tool call for silent auto-wake
             if not skip:
                 _set_state("working", name)
                 _record_event_bg("tool_call", {"tool": name, "args_keys": list(kwargs.keys())})
@@ -680,22 +715,65 @@ async def _on_new_message(msg: Dict[str, Any]) -> None:
     # Auto-wake: if agent is idle (not in wait loop), nudge the terminal
     from_agent = msg.get("from") or msg.get("from_agent") or "unknown"
     payload = msg.get("payload") or {}
-    preview = payload.get("text", "") if isinstance(payload, dict) else str(payload)
+    if isinstance(payload, dict):
+        # Try common content fields in order of usefulness
+        preview = (
+            payload.get("text")
+            or payload.get("message")
+            or payload.get("action")
+            or payload.get("context")
+            or payload.get("type")
+            or (str(next(iter(payload.values()))) if payload else "")
+        )
+        preview = str(preview) if preview else "(see inbox)"
+    else:
+        preview = str(payload)
     try:
         _try_auto_wake(from_agent, preview[:60])
     except Exception:
         pass  # auto-wake is best-effort, never block message handling
 
+    # SILENT WAKE: 3-tier strategy, all without OS keystrokes
+    # 1. send_resource_updated  (lightweight cache invalidation)
+    # 2. create_message (sampling) — server PUSH that wakes the LLM (if client supports)
+    # 3. AppleScript (handled above) — fallback for clients that don't support either
     try:
-        srv = mcp._mcp_server  # FastMCP exposes the lowlevel server here
-        ctx = getattr(srv, "request_context", None)
-        if ctx and getattr(ctx, "session", None):
-            from pydantic import AnyUrl
-            await ctx.session.send_resource_updated(AnyUrl("meshcode://inbox"))
-            log.info(f"sent MCP resource_updated notification for msg from {msg.get('from')}")
+        from pydantic import AnyUrl
+        url = AnyUrl("meshcode://inbox")
+        session = _STASHED_SESSION
+        if session is None:
+            srv = mcp._mcp_server
+            ctx = getattr(srv, "request_context", None)
+            if ctx and getattr(ctx, "session", None):
+                session = ctx.session
+        if session is not None:
+            # 1. resource_updated (always cheap, may not wake)
+            try:
+                await session.send_resource_updated(url)
+                log.info(f"silent wake A: resource_updated sent for msg from {msg.get('from')}")
+            except Exception as _re:
+                log.debug(f"resource_updated failed: {_re}")
+            # 2. sampling/create_message — server PUSH that asks the LLM to think
+            #    Only attempt if client advertised sampling capability
+            try:
+                client_caps = getattr(session, "client_capabilities", None)
+                if client_caps and getattr(client_caps, "sampling", None):
+                    from mcp.types import SamplingMessage, TextContent
+                    nudge_text = f"You have a new mesh message from {from_agent}: {preview[:80]}. Call meshcode_check() to read your inbox, then process it. Stay in meshcode_wait() afterward."
+                    await session.create_message(
+                        messages=[SamplingMessage(role="user", content=TextContent(type="text", text=nudge_text))],
+                        max_tokens=4096,
+                        system_prompt="A new mesh message arrived while you were idle. Process it now.",
+                    )
+                    log.info(f"silent wake B: sampling/create_message PUSHED for msg from {msg.get('from')}")
+            except Exception as _ce:
+                log.debug(f"sampling/create_message failed: {_ce}")
     except Exception as e:
-        log.debug(f"send_resource_updated unavailable: {e}")
+        log.debug(f"silent wake unavailable: {e}")
+
 
+# Stashed MCP session for silent auto-wake (works when agent is idle, no active tool call)
+_STASHED_SESSION = None
 
 _heartbeat_stop = _threading.Event()
 
@@ -986,7 +1064,7 @@ def _detect_global_done(messages: List[Dict[str, Any]]) -> Optional[Dict[str, An
 
 @mcp.tool()
 @with_working_status
-async def meshcode_wait(timeout_seconds: int = 120, include_acks: bool = False) -> Dict[str, Any]:
+async def meshcode_wait(timeout_seconds: int = 60, include_acks: bool = False) -> Dict[str, Any]:
     """Block until a mesh message arrives or timeout. Your idle state.
 
     Args:

{meshcode-2.4.3 → meshcode-2.4.5}/meshcode.egg-info/PKG-INFO

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

{meshcode-2.4.3 → meshcode-2.4.5}/pyproject.toml

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