meshagent-cli 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

meshagent/cli/call.py

@@ -117,7 +117,7 @@ async def make_call(
         )["token"]
 
         token = ParticipantToken(
-            name="cli", 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)

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/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()

meshagent/cli/storage.py

@@ -112,7 +112,7 @@ async def storage_cp_command(
     ] = None,
     name: Annotated[
         str, typer.Option(..., help="Participant name (if copying to/from remote)")
-    ],
+    ] = "cli",
     role: str = "user",
     source_path: str,
     dest_path: str,

meshagent/cli/version.py

@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.2.1"

{meshagent_cli-0.1.0.dist-info → meshagent_cli-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.1.0
+Version: 0.2.1
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,12 +10,12 @@ 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.1
-Requires-Dist: meshagent-agents~=0.1
-Requires-Dist: meshagent-computers~=0.1
-Requires-Dist: meshagent-openai~=0.1
-Requires-Dist: meshagent-tools~=0.1
-Requires-Dist: meshagent-mcp~=0.1
+Requires-Dist: meshagent-api~=0.2.1
+Requires-Dist: meshagent-agents~=0.2.1
+Requires-Dist: meshagent-computers~=0.2.1
+Requires-Dist: meshagent-openai~=0.2.1
+Requires-Dist: meshagent-tools~=0.2.1
+Requires-Dist: meshagent-mcp~=0.2.1
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
 Requires-Dist: opentelemetry-distro~=0.54b1

{meshagent_cli-0.1.0.dist-info → meshagent_cli-0.2.1.dist-info}/RECORD

@@ -4,12 +4,13 @@ meshagent/cli/api_keys.py,sha256=4mBqyh_WAogaMIYhRBQOCjfsSSp1RY9BqiI_6DaGLmk,496
 meshagent/cli/async_typer.py,sha256=GCeSefBDbpd-V4V8LrvHGUTBMth3HspVMfFa-HUZ0cg,898
 meshagent/cli/auth.py,sha256=tPipbOtHnsrvJ-OUOE-lyfvvIhkTIGYlkgS81hLdyB8,783
 meshagent/cli/auth_async.py,sha256=mi2-u949M412PAMN-PCdHEiF9hGf0W3m1RAseZX07-w,4058
-meshagent/cli/call.py,sha256=IQePqq7PkAqnTVjqBah15VptgChWxV-G5ARKf0tzEBc,5295
+meshagent/cli/call.py,sha256=aVRs-7QDZWxK8jYc71oACNIkHuoDe1KUyfl8EtUbj-0,5306
 meshagent/cli/chatbot.py,sha256=pK-_G3CiMbV-NC0iXzbjztu4f-ZAeXNzcmOB-HxJWQo,7928
-meshagent/cli/cli.py,sha256=D2cIVAgYZ095XqWBrvd7Qq60yGL7pfLTIK4Y52xrKSM,6314
+meshagent/cli/cli.py,sha256=Xltp1pICOdWEoCexeZz1taHPcRhRv7dM2e7tktyrd2k,6376
 meshagent/cli/cli_mcp.py,sha256=BTTAMn3u4i1uTDItFxmxMTsSAvFaWtdI3YdZngHz11g,10641
 meshagent/cli/cli_secrets.py,sha256=lkfR8tVjOA5KdynAhKCg5Z2EJkgrHFTX43pdB60YiU4,13767
 meshagent/cli/developer.py,sha256=JWz-qcduCbFopQ1DNGbwrknzFt59KBLIXx8DyD6PxZM,3081
+meshagent/cli/exec.py,sha256=46OyTVr3ejfDuNjBKkV9vkk62O808isD7bEC6jUgQHc,11338
 meshagent/cli/helper.py,sha256=gbd6Tvlp7CObPp3srWm-mbAe7tBD0iacg6PitGWJdtw,4874
 meshagent/cli/messaging.py,sha256=cr-oVAu_s8uEPUm3GELSq8yaVDnEWlt02D5V4KbA6wc,6437
 meshagent/cli/otel.py,sha256=1yoMGivskLV9f7M_LqCLKbttTTAPmFY5yhWXqFzvRN8,4066
@@ -17,13 +18,12 @@ meshagent/cli/participant_token.py,sha256=N07hblRjj0zDKxl5CQXJjIMmft5s9mWgKZKz-V
 meshagent/cli/projects.py,sha256=WaO7M-D4ghy0nVpvwZ08ZEcybZ_e_cFe6rEoNxyAWkc,3306
 meshagent/cli/services.py,sha256=1afeMH41Kj0-1uAKB72buWnPFcgaqT4xFVO4FEpTPC0,19308
 meshagent/cli/sessions.py,sha256=MP7XhrtkUrealdpl8IKrTR3u9sjF15sG175-Y_m7nps,800
-meshagent/cli/storage.py,sha256=Q3ajuC6j4GLlU4jZoUW_Zsl1dOr04vzLibw2DPedJJ4,35564
-meshagent/cli/tty.py,sha256=-XQE2W8_nW74vRG8jnqPofnfPB5bAvBX7_1-wMcBR1w,4207
-meshagent/cli/version.py,sha256=kUR5RAFc7HCeiqdlX36dZOHkUI5wI6V_43RpEcD8b-0,22
+meshagent/cli/storage.py,sha256=wtLKYFyfsErCePxCG962Xb--moCN-zj9uVCtRPhIpfA,35572
+meshagent/cli/version.py,sha256=HfjVOrpTnmZ-xVFCYSVmX50EXaBQeJteUHG-PD6iQs8,22
 meshagent/cli/voicebot.py,sha256=Ykn9mUhcwl03ZCPDRua6moeNyrvToGPowQfjhPM0zqA,5032
 meshagent/cli/webhook.py,sha256=r5zct-UBQYSq3BWmnZRrHVOEHVlkY0j8uDxGVn3Pbxo,2902
-meshagent_cli-0.1.0.dist-info/METADATA,sha256=c75FMbewaNMuydlR3quvd91ja9mL_mCp1sCFJ1-xnbI,1436
-meshagent_cli-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_cli-0.1.0.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
-meshagent_cli-0.1.0.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_cli-0.1.0.dist-info/RECORD,,
+meshagent_cli-0.2.1.dist-info/METADATA,sha256=_YNXB_L6Rp1ll2t2ybHSwOXfp79RzDw2dT5UJ1NAgVE,1448
+meshagent_cli-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_cli-0.2.1.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
+meshagent_cli-0.2.1.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_cli-0.2.1.dist-info/RECORD,,

meshagent/cli/tty.py

@@ -1,124 +0,0 @@
-import sys
-import tty
-import termios
-from meshagent.api.helpers import websocket_room_url
-from typing import Annotated, Optional
-import os
-
-import asyncio
-import typer
-from rich import print
-import aiohttp
-
-from meshagent.api import ParticipantToken
-from meshagent.cli import async_typer
-from meshagent.cli.helper import (
-    get_client,
-    resolve_project_id,
-    resolve_api_key,
-)
-
-
-app = async_typer.AsyncTyper()
-
-
-@app.async_command("connect")
-async def tty_command(
-    *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
-):
-    """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"/tty?token={token.to_jwt(token=key)}"
-        )
-
-        print(f"[bold green]Connecting to[/bold green] {room}")
-
-        # Save current terminal settings so we can restore them later.
-        old_tty_settings = termios.tcgetattr(sys.stdin)
-
-        try:
-            async with aiohttp.ClientSession() as session:
-                async with session.ws_connect(ws_url) as websocket:
-                    tty.setraw(sys.stdin)
-
-                    loop = asyncio.get_running_loop()
-                    transport, protocol = await loop.connect_write_pipe(
-                        asyncio.streams.FlowControlMixin, sys.stdout
-                    )
-                    writer = asyncio.StreamWriter(transport, protocol, None, loop)
-
-                    async def recv_from_websocket():
-                        async for message in websocket:
-                            if message.type == aiohttp.WSMsgType.CLOSE:
-                                await websocket.close()
-
-                            elif message.type == aiohttp.WSMsgType.ERROR:
-                                await websocket.close()
-
-                            data: bytes = message.data
-                            writer.write(data)
-                            await writer.drain()
-
-                    async def send_to_websocket():
-                        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.
-
-                            data = await reader.read(1)
-                            if not data:
-                                break
-
-                            if websocket.closed:
-                                break
-
-                            if data == b"\x03":
-                                print("<CTRL-C>\n")
-                                break
-
-                            if data:
-                                await websocket.send_bytes(data)
-                            else:
-                                await websocket.close(code=1000)
-                                break
-
-                    done, pending = await asyncio.wait(
-                        [
-                            asyncio.create_task(recv_from_websocket()),
-                            asyncio.create_task(send_to_websocket()),
-                        ],
-                        return_when=asyncio.FIRST_COMPLETED,
-                    )
-
-                    for task in pending:
-                        task.cancel()
-
-        finally:
-            # Restore original terminal settings even if the coroutine is cancelled.
-            termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_tty_settings)
-
-    finally:
-        await client.close()