meshagent-cli 0.0.39__tar.gz → 0.2.0__tar.gz

{meshagent_cli-0.0.39 → meshagent_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.0.39
+Version: 0.2.0
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,15 +10,18 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: typer~=0.15
 Requires-Dist: pydantic-yaml~=1.4
-Requires-Dist: meshagent-api~=0.0.39
-Requires-Dist: meshagent-agents~=0.0.39
-Requires-Dist: meshagent-tools~=0.0.39
-Requires-Dist: meshagent-mcp~=0.0.39
+Requires-Dist: meshagent-api~=0.2.0
+Requires-Dist: meshagent-agents~=0.2.0
+Requires-Dist: meshagent-computers~=0.2.0
+Requires-Dist: meshagent-openai~=0.2.0
+Requires-Dist: meshagent-tools~=0.2.0
+Requires-Dist: meshagent-mcp~=0.2.0
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
 Requires-Dist: opentelemetry-distro~=0.54b1
 Requires-Dist: opentelemetry-exporter-otlp-proto-http~=1.33
 Requires-Dist: art~=6.5
+Requires-Dist: pydantic-yaml~=1.5
 
 ## MeshAgent CLI
 

{meshagent_cli-0.0.39 → meshagent_cli-0.2.0}/meshagent/cli/call.py

@@ -72,10 +72,16 @@ async def make_call(
     project_id: str = None,
     room: Annotated[str, typer.Option()],
     api_key_id: Annotated[Optional[str], typer.Option()] = None,
-    name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "agent",
     local: Optional[bool] = None,
-    agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
+    agent_name: Annotated[
+        Optional[str], typer.Option(..., help="deprecated and unused", hidden=True)
+    ] = None,
+    name: Annotated[str, typer.Option(..., help="deprecated", hidden=True)] = None,
+    participant_name: Annotated[
+        Optional[str],
+        typer.Option(..., help="the participant name to be used by the callee"),
+    ] = None,
     url: Annotated[str, typer.Option(..., help="URL the agent should call")],
     arguments: Annotated[
         str, typer.Option(..., help="JSON string with arguments for the call")
@@ -83,7 +89,22 @@ async def make_call(
 ):
     """
     Instruct an agent to 'call' a given URL with specific arguments.
+
     """
+
+    if name is not None:
+        print("[yellow]name is deprecated and should no longer be passed[/yellow]")
+
+    if agent_name is not None:
+        print(
+            "[yellow]agent-name is deprecated and should no longer be passed, use participant-name instead[/yellow]"
+        )
+        participant_name = agent_name
+
+    if participant_name is None:
+        print("[red]--participant-name is required[/red]")
+        raise typer.Exit(1)
+
     account_client = await get_client()
     try:
         project_id = await resolve_project_id(project_id=project_id)
@@ -96,7 +117,7 @@ async def make_call(
         )["token"]
 
         token = ParticipantToken(
-            name=name, project_id=project_id, api_key_id=api_key_id
+            name=participant_name, project_id=project_id, api_key_id=api_key_id
         )
         token.add_role_grant(role=role)
         token.add_room_grant(room)
@@ -130,7 +151,7 @@ async def make_call(
             ) as client:
                 print("[bold green]Making agent call...[/bold green]")
                 await client.agents.make_call(
-                    name=agent_name, url=url, arguments=json.loads(arguments)
+                    name=participant_name, url=url, arguments=json.loads(arguments)
                 )
                 print("[bold cyan]Call request sent successfully.[/bold cyan]")
 

{meshagent_cli-0.0.39 → meshagent_cli-0.2.0}/meshagent/cli/cli.py

@@ -2,6 +2,8 @@ import typer
 import asyncio
 from typing import Optional
 
+from meshagent.cli import async_typer
+
 from meshagent.cli import auth
 from meshagent.cli import api_keys
 from meshagent.cli import projects
@@ -18,7 +20,7 @@ from meshagent.cli import call
 from meshagent.cli import cli_mcp
 from meshagent.cli import chatbot
 from meshagent.cli import voicebot
-from meshagent.cli import tty
+from meshagent.cli.exec import register as register_exec
 
 from meshagent.cli import otel
 
@@ -38,7 +40,7 @@ otel.init(level=logging.INFO)
 logging.getLogger("openai").setLevel(logging.ERROR)
 logging.getLogger("httpx").setLevel(logging.ERROR)
 
-app = typer.Typer()
+app = async_typer.AsyncTyper()
 app.add_typer(call.app, name="call")
 app.add_typer(auth.app, name="auth")
 app.add_typer(projects.app, name="project")
@@ -55,7 +57,8 @@ app.add_typer(cli_secrets.app, name="secret")
 app.add_typer(cli_mcp.app, name="mcp")
 app.add_typer(chatbot.app, name="chatbot")
 app.add_typer(voicebot.app, name="voicebot")
-app.add_typer(tty.app, name="tty")
+
+register_exec(app)
 
 
 def _run_async(coro):

meshagent_cli-0.2.0/meshagent/cli/exec.py

@@ -0,0 +1,286 @@
+import sys
+import tty as _tty
+import termios
+from meshagent.api.websocket_protocol import WebSocketClientProtocol
+from meshagent.api import RoomClient
+from meshagent.api.helpers import websocket_room_url
+from typing import Annotated, Optional
+import asyncio
+import typer
+from rich import print
+import aiohttp
+import struct
+import signal
+import shutil
+import json
+from urllib.parse import quote
+
+from meshagent.api import ParticipantToken
+
+import logging
+
+from meshagent.cli.helper import (
+    get_client,
+    resolve_project_id,
+    resolve_api_key,
+)
+
+
+def register(app: typer.Typer):
+    @app.async_command("exec")
+    async def exec_command(
+        *,
+        project_id: str = None,
+        room: Annotated[str, typer.Option()],
+        name: Annotated[Optional[str], typer.Option()] = None,
+        image: Annotated[Optional[str], typer.Option()] = None,
+        api_key_id: Annotated[Optional[str], typer.Option()] = None,
+        command: Annotated[list[str], typer.Argument(...)] = None,
+        tty: bool = False,
+    ):
+        """Open an interactive websocket‑based TTY."""
+        client = await get_client()
+        try:
+            project_id = await resolve_project_id(project_id=project_id)
+            api_key_id = await resolve_api_key(
+                project_id=project_id, api_key_id=api_key_id
+            )
+
+            token = ParticipantToken(
+                name="tty", project_id=project_id, api_key_id=api_key_id
+            )
+
+            key = (
+                await client.decrypt_project_api_key(
+                    project_id=project_id, id=api_key_id
+                )
+            )["token"]
+
+            token.add_role_grant(role="user")
+            token.add_room_grant(room)
+
+            ws_url = (
+                websocket_room_url(room_name=room)
+                + f"/exec?token={token.to_jwt(token=key)}"
+            )
+
+            if image:
+                ws_url += f"&image={quote(' '.join(image))}"
+
+            if name:
+                ws_url += f"&name={quote(' '.join(name))}"
+
+            if command and len(command) != 0:
+                ws_url += f"&command={quote(' '.join(command))}"
+
+            if tty:
+                if not sys.stdin.isatty():
+                    print("[red]TTY requested but process is not a TTY[/red]")
+                    raise typer.Exit(1)
+
+                ws_url += "&tty=true"
+
+            else:
+                if command is None:
+                    print("[red]TTY required when not executing a command[/red]")
+                    raise typer.Exit(1)
+
+                ws_url += "&tty=false"
+
+            if tty:
+                # Save current terminal settings so we can restore them later.
+                old_tty_settings = termios.tcgetattr(sys.stdin)
+                _tty.setraw(sys.stdin)
+
+            async with RoomClient(
+                protocol=WebSocketClientProtocol(
+                    url=websocket_room_url(room_name=room),
+                    token=token.to_jwt(token=key),
+                )
+            ):
+                try:
+                    async with aiohttp.ClientSession() as session:
+                        async with session.ws_connect(ws_url) as websocket:
+                            send_queue = asyncio.Queue[bytes]()
+
+                            loop = asyncio.get_running_loop()
+                            (
+                                stdout_transport,
+                                stdout_protocol,
+                            ) = await loop.connect_write_pipe(
+                                asyncio.streams.FlowControlMixin, sys.stdout
+                            )
+                            stdout_writer = asyncio.StreamWriter(
+                                stdout_transport, stdout_protocol, None, loop
+                            )
+
+                            (
+                                stderr_transport,
+                                stderr_protocol,
+                            ) = await loop.connect_write_pipe(
+                                asyncio.streams.FlowControlMixin, sys.stderr
+                            )
+                            stderr_writer = asyncio.StreamWriter(
+                                stderr_transport, stderr_protocol, None, loop
+                            )
+
+                            async def recv_from_websocket():
+                                while True:
+                                    done, pending = await asyncio.wait(
+                                        [asyncio.create_task(websocket.receive())],
+                                        return_when=asyncio.FIRST_COMPLETED,
+                                    )
+
+                                    first = done.pop()
+
+                                    if first == read_stdin_task:
+                                        break
+
+                                    message = first.result()
+
+                                    if websocket.closed:
+                                        break
+
+                                    if message.type == aiohttp.WSMsgType.CLOSE:
+                                        break
+
+                                    elif message.type == aiohttp.WSMsgType.CLOSING:
+                                        pass
+
+                                    elif message.type == aiohttp.WSMsgType.ERROR:
+                                        break
+
+                                    if not message.data:
+                                        break
+
+                                    data: bytes = message.data
+                                    if len(data) > 0:
+                                        if data[0] == 1:
+                                            stderr_writer.write(data)
+                                            await stderr_writer.drain()
+                                        elif data[0] == 0:
+                                            stdout_writer.write(data)
+                                            await stdout_writer.drain()
+                                        else:
+                                            raise ValueError(
+                                                f"Invalid channel received {data[0]}"
+                                            )
+
+                            last_size = None
+
+                            async def send_resize(rows, cols):
+                                nonlocal last_size
+
+                                size = (cols, rows)
+                                if size == last_size:
+                                    return
+
+                                last_size = size
+
+                                resize_json = json.dumps(
+                                    {"Width": cols, "Height": rows}
+                                ).encode("utf-8")
+                                payload = struct.pack("B", 4) + resize_json
+                                send_queue.put_nowait(payload)
+                                await asyncio.sleep(5)
+
+                            cols, rows = shutil.get_terminal_size(fallback=(24, 80))
+                            if tty:
+                                await send_resize(rows, cols)
+
+                            def on_sigwinch():
+                                cols, rows = shutil.get_terminal_size(fallback=(24, 80))
+                                task = asyncio.create_task(send_resize(rows, cols))
+
+                                def on_done(t: asyncio.Task):
+                                    t.result()
+
+                                task.add_done_callback(on_done)
+
+                            loop.add_signal_handler(signal.SIGWINCH, on_sigwinch)
+
+                            async def read_stdin():
+                                loop = asyncio.get_running_loop()
+
+                                reader = asyncio.StreamReader()
+                                protocol = asyncio.StreamReaderProtocol(reader)
+                                await loop.connect_read_pipe(
+                                    lambda: protocol, sys.stdin
+                                )
+
+                                while True:
+                                    # Read one character at a time from stdin without blocking the event loop.
+                                    done, pending = await asyncio.wait(
+                                        [
+                                            asyncio.create_task(reader.read(1)),
+                                            websocket_recv_task,
+                                        ],
+                                        return_when=asyncio.FIRST_COMPLETED,
+                                    )
+
+                                    first = done.pop()
+                                    if first == websocket_recv_task:
+                                        break
+
+                                    data = first.result()
+                                    if not data:
+                                        break
+
+                                    if websocket.closed:
+                                        break
+
+                                    if tty:
+                                        if data == b"\x04":
+                                            break
+
+                                    if data:
+                                        send_queue.put_nowait(b"\0" + data)
+                                    else:
+                                        break
+
+                                send_queue.put_nowait(b"\0")
+
+                            websocket_recv_task = asyncio.create_task(
+                                recv_from_websocket()
+                            )
+                            read_stdin_task = asyncio.create_task(read_stdin())
+
+                            async def send_to_websocket():
+                                while True:
+                                    try:
+                                        data = await send_queue.get()
+                                        if websocket.closed:
+                                            break
+
+                                        if data is not None:
+                                            await websocket.send_bytes(data)
+
+                                        else:
+                                            break
+                                    except asyncio.QueueShutDown:
+                                        break
+
+                            send_to_websocket_task = asyncio.create_task(
+                                send_to_websocket()
+                            )
+                            await asyncio.gather(
+                                websocket_recv_task,
+                                read_stdin_task,
+                            )
+
+                            send_queue.shutdown()
+                            await send_to_websocket_task
+
+                finally:
+                    if not sys.stdin.closed and tty:
+                        # Restore original terminal settings even if the coroutine is cancelled.
+                        termios.tcsetattr(
+                            sys.stdin, termios.TCSADRAIN, old_tty_settings
+                        )
+
+        except Exception as e:
+            print(f"[red]{e}[/red]")
+            logging.error("failed", exc_info=e)
+            raise typer.Exit(1)
+        finally:
+            await client.close()