meshagent-cli 0.33.2__tar.gz → 0.34.0__tar.gz

{meshagent_cli-0.33.2 → meshagent_cli-0.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.33.2
+Version: 0.34.0
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -19,21 +19,21 @@ Requires-Dist: rich~=14.3.0
 Requires-Dist: textual<2.0,>=0.50
 Requires-Dist: prompt-toolkit~=3.0.52
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]~=0.33.2; extra == "all"
-Requires-Dist: meshagent-api[all]~=0.33.2; extra == "all"
-Requires-Dist: meshagent-computers~=0.33.2; extra == "all"
-Requires-Dist: meshagent-openai~=0.33.2; extra == "all"
-Requires-Dist: meshagent-anthropic~=0.33.2; extra == "all"
-Requires-Dist: meshagent-codex~=0.33.2; extra == "all"
-Requires-Dist: meshagent-mcp~=0.33.2; extra == "all"
-Requires-Dist: meshagent-tools~=0.33.2; extra == "all"
+Requires-Dist: meshagent-agents[all]~=0.34.0; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.34.0; extra == "all"
+Requires-Dist: meshagent-computers~=0.34.0; extra == "all"
+Requires-Dist: meshagent-openai~=0.34.0; extra == "all"
+Requires-Dist: meshagent-anthropic~=0.34.0; extra == "all"
+Requires-Dist: meshagent-codex~=0.34.0; extra == "all"
+Requires-Dist: meshagent-mcp~=0.34.0; extra == "all"
+Requires-Dist: meshagent-tools~=0.34.0; extra == "all"
 Requires-Dist: supabase-auth~=2.28.0; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0.52; extra == "all"
 Provides-Extra: mcp-service
-Requires-Dist: meshagent-agents[all]~=0.33.2; extra == "mcp-service"
-Requires-Dist: meshagent-api~=0.33.2; extra == "mcp-service"
-Requires-Dist: meshagent-mcp~=0.33.2; extra == "mcp-service"
-Requires-Dist: meshagent-tools~=0.33.2; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]~=0.34.0; extra == "mcp-service"
+Requires-Dist: meshagent-api~=0.34.0; extra == "mcp-service"
+Requires-Dist: meshagent-mcp~=0.34.0; extra == "mcp-service"
+Requires-Dist: meshagent-tools~=0.34.0; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 
 # [Meshagent](https://www.meshagent.com)

{meshagent_cli-0.33.2 → meshagent_cli-0.34.0}/meshagent/cli/queue.py

@@ -1,26 +1,75 @@
-import typer
-from rich import print
-from typing import Annotated, Optional
-from meshagent.cli.common_options import ProjectIdOption, RoomOption
-import json as _json
 import base64
+import json as _json
 import mimetypes
 from pathlib import Path
+from typing import Annotated, Optional
+
+import typer
+from rich import print
 
-from meshagent.api.helpers import websocket_room_url
 from meshagent.api import (
     RoomClient,
-    WebSocketClientProtocol,
     RoomException,
+    WebSocketClientProtocol,
 )
+from meshagent.api.helpers import websocket_room_url
+from meshagent.api.room_server_client import Queue as RoomQueue
 from meshagent.agents.mail_common import create_email_message
-from meshagent.cli.helper import resolve_project_id, resolve_room
 from meshagent.cli import async_typer
-from meshagent.cli.helper import get_client
+from meshagent.cli.common_options import OutputFormatOption, ProjectIdOption, RoomOption
+from meshagent.cli.helper import (
+    get_client,
+    print_json_table,
+    resolve_project_id,
+    resolve_room,
+)
 
 app = async_typer.AsyncTyper(help="Use queues in a room")
 
 
+def _queue_rows(queues: list[RoomQueue]) -> list[dict[str, str | int]]:
+    return [{"name": item.name, "size": item.size} for item in queues]
+
+
+@app.async_command("list", help="List queues in a room.")
+async def queue_list(
+    *,
+    project_id: ProjectIdOption,
+    room: RoomOption,
+    output: OutputFormatOption = "table",
+):
+    account_client = await get_client()
+    try:
+        project_id = await resolve_project_id(project_id=project_id)
+        room = resolve_room(room)
+
+        connection = await account_client.connect_room(project_id=project_id, room=room)
+
+        async with RoomClient(
+            protocol=WebSocketClientProtocol(
+                url=websocket_room_url(room_name=room),
+                token=connection.jwt,
+            )
+        ) as client:
+            rows = _queue_rows(await client.queues.list())
+
+            if output == "json":
+                print(_json.dumps({"queues": rows}, indent=2))
+                return
+
+            if len(rows) == 0:
+                print("There are no queues currently in the room")
+                return
+
+            print_json_table(rows, "name", "size")
+
+    except RoomException as e:
+        print(e)
+        raise typer.Exit(1)
+    finally:
+        await account_client.close()
+
+
 @app.async_command("send", help="Send a JSON message to a room queue.")
 async def send(
     *,

{meshagent_cli-0.33.2 → meshagent_cli-0.34.0}/meshagent/cli/queue_test.py

@@ -150,6 +150,50 @@ async def _run_size(
     return account_client, printed
 
 
+async def _run_queue_list(
+    *,
+    monkeypatch: pytest.MonkeyPatch,
+    room_name: str,
+    queues: list[_FakeQueue],
+    output: str = "table",
+) -> tuple[_FakeAccountClient, list[str], list[dict[str, object]]]:
+    account_client = _FakeAccountClient()
+    printed: list[str] = []
+    table_calls: list[dict[str, object]] = []
+
+    async def _fake_get_client() -> _FakeAccountClient:
+        return account_client
+
+    async def _fake_resolve_project_id(*, project_id):
+        del project_id
+        return "project-1"
+
+    def _fake_resolve_room(room: str) -> str:
+        return room
+
+    def _fake_print(*args, **kwargs) -> None:
+        del kwargs
+        printed.append(" ".join(str(arg) for arg in args))
+
+    def _fake_print_json_table(records: list[dict[str, object]], *cols: str) -> None:
+        table_calls.append({"records": records, "cols": cols})
+
+    monkeypatch.setattr(queue, "get_client", _fake_get_client)
+    monkeypatch.setattr(queue, "resolve_project_id", _fake_resolve_project_id)
+    monkeypatch.setattr(queue, "resolve_room", _fake_resolve_room)
+    monkeypatch.setattr(queue, "print_json_table", _fake_print_json_table)
+    _FakeRoomClient.default_queues = queues
+    monkeypatch.setattr(queue, "RoomClient", _FakeRoomClient)
+    monkeypatch.setattr(queue, "print", _fake_print)
+
+    await queue.queue_list(
+        project_id=None,
+        room=room_name,
+        output=output,
+    )
+    return account_client, printed, table_calls
+
+
 @pytest.mark.asyncio
 async def test_send_mail_queues_base64_email_payload(
     monkeypatch: pytest.MonkeyPatch,
@@ -242,6 +286,74 @@ async def test_send_mail_allows_empty_body(
     assert list(email_message.iter_attachments()) == []
 
 
+@pytest.mark.asyncio
+async def test_queue_list_prints_queue_rows(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    account_client, printed, table_calls = await _run_queue_list(
+        monkeypatch=monkeypatch,
+        room_name="demo-room",
+        queues=[
+            _FakeQueue(name="jobs", size=3),
+            _FakeQueue(name="other", size=1),
+        ],
+    )
+
+    assert account_client.connect_calls == [
+        {"project_id": "project-1", "room": "demo-room"}
+    ]
+    assert account_client.closed is True
+    assert printed == []
+    assert table_calls == [
+        {
+            "records": [
+                {"name": "jobs", "size": 3},
+                {"name": "other", "size": 1},
+            ],
+            "cols": ("name", "size"),
+        }
+    ]
+
+
+@pytest.mark.asyncio
+async def test_queue_list_prints_empty_room_message(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    account_client, printed, table_calls = await _run_queue_list(
+        monkeypatch=monkeypatch,
+        room_name="demo-room",
+        queues=[],
+    )
+
+    assert account_client.connect_calls == [
+        {"project_id": "project-1", "room": "demo-room"}
+    ]
+    assert account_client.closed is True
+    assert printed == ["There are no queues currently in the room"]
+    assert table_calls == []
+
+
+@pytest.mark.asyncio
+async def test_queue_list_json_output(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    account_client, printed, table_calls = await _run_queue_list(
+        monkeypatch=monkeypatch,
+        room_name="demo-room",
+        queues=[_FakeQueue(name="jobs", size=3)],
+        output="json",
+    )
+
+    assert account_client.connect_calls == [
+        {"project_id": "project-1", "room": "demo-room"}
+    ]
+    assert account_client.closed is True
+    assert printed == [
+        '{\n  "queues": [\n    {\n      "name": "jobs",\n      "size": 3\n    }\n  ]\n}'
+    ]
+    assert table_calls == []
+
+
 @pytest.mark.asyncio
 async def test_size_prints_matching_queue_size(
     monkeypatch: pytest.MonkeyPatch,

meshagent_cli-0.34.0/meshagent/cli/version.py

@@ -0,0 +1 @@
+__version__ = "0.34.0"

{meshagent_cli-0.33.2 → meshagent_cli-0.34.0}/meshagent/cli/webserver.py

@@ -34,6 +34,7 @@ from meshagent.api.helpers import meshagent_base_url, websocket_room_url
 from meshagent.api.specs.service import (
     AgentSpec,
     ANNOTATION_AGENT_TYPE,
+    ANNOTATION_SERVICE_ID,
     ContainerMountSpec,
     EnvironmentVariable,
     PortSpec,
@@ -275,15 +276,17 @@ async def _upsert_domain_route(
     domain: str,
     room_name: str,
     port: str,
+    service_id: str,
 ) -> None:
     _warn_if_non_meshagent_app_domain(domain)
+    route_annotations = {ANNOTATION_SERVICE_ID: service_id}
     try:
         await client.create_route(
             project_id=project_id,
             domain=domain,
             room_name=room_name,
             port=port,
-            annotations={},
+            annotations=route_annotations,
         )
     except ConflictError:
         existing = await client.get_route(project_id=project_id, domain=domain)
@@ -293,7 +296,9 @@ async def _upsert_domain_route(
                 f"Refusing to change it to room {room_name}. "
                 "Use `meshagent route update` if you want to repoint it."
             )
-        if existing.port == port:
+        updated_annotations = dict(existing.annotations)
+        updated_annotations[ANNOTATION_SERVICE_ID] = service_id
+        if existing.port == port and existing.annotations == updated_annotations:
             print(f"[green]Route already configured:[/] {domain} -> {room_name}:{port}")
             return
         await client.update_route(
@@ -301,7 +306,7 @@ async def _upsert_domain_route(
             domain=domain,
             room_name=room_name,
             port=port,
-            annotations=existing.annotations,
+            annotations=updated_annotations,
         )
         print(f"[green]Updated route:[/] {domain} -> {room_name}:{port}")
     else:
@@ -2057,6 +2062,7 @@ async def deploy(
                     domain=domain,
                     room_name=cast(str, room_name),
                     port=str(resolved_web_port),
+                    service_id=resolved_service_name,
                 )
 
     finally:

{meshagent_cli-0.33.2 → meshagent_cli-0.34.0}/meshagent/cli/webserver_test.py

@@ -4,10 +4,133 @@ from pathlib import Path
 import pytest
 import typer
 from aiohttp.test_utils import TestClient, TestServer
+from meshagent.api.client import ConflictError, Route
+from meshagent.api.specs.service import ANNOTATION_SERVICE_ID
 
 from meshagent.cli import webserver
 
 
+class _FakeRouteClient:
+    def __init__(
+        self,
+        *,
+        existing_route: Route | None = None,
+        create_conflict: bool = False,
+    ) -> None:
+        self._existing_route = existing_route
+        self._create_conflict = create_conflict
+        self.created_routes: list[dict[str, object]] = []
+        self.updated_routes: list[dict[str, object]] = []
+
+    async def create_route(
+        self,
+        *,
+        project_id: str,
+        domain: str,
+        room_name: str,
+        port: str,
+        annotations: dict[str, str],
+    ) -> None:
+        self.created_routes.append(
+            {
+                "project_id": project_id,
+                "domain": domain,
+                "room_name": room_name,
+                "port": port,
+                "annotations": annotations,
+            }
+        )
+        if self._create_conflict:
+            raise ConflictError("route already exists")
+
+    async def get_route(self, *, project_id: str, domain: str) -> Route:
+        assert self._existing_route is not None
+        assert project_id
+        assert domain
+        return self._existing_route
+
+    async def update_route(
+        self,
+        *,
+        project_id: str,
+        domain: str,
+        room_name: str,
+        port: str,
+        annotations: dict[str, str],
+    ) -> None:
+        self.updated_routes.append(
+            {
+                "project_id": project_id,
+                "domain": domain,
+                "room_name": room_name,
+                "port": port,
+                "annotations": annotations,
+            }
+        )
+
+
+@pytest.mark.asyncio
+async def test_upsert_domain_route_creates_route_with_service_id_annotation() -> None:
+    client = _FakeRouteClient()
+
+    await webserver._upsert_domain_route(
+        client=client,
+        project_id="project-123",
+        domain="site.meshagent.app",
+        room_name="demo-room",
+        port="8000",
+        service_id="demo-webserver",
+    )
+
+    assert client.created_routes == [
+        {
+            "project_id": "project-123",
+            "domain": "site.meshagent.app",
+            "room_name": "demo-room",
+            "port": "8000",
+            "annotations": {ANNOTATION_SERVICE_ID: "demo-webserver"},
+        }
+    ]
+    assert client.updated_routes == []
+
+
+@pytest.mark.asyncio
+async def test_upsert_domain_route_backfills_service_id_annotation_when_port_matches() -> (
+    None
+):
+    client = _FakeRouteClient(
+        create_conflict=True,
+        existing_route=Route(
+            domain="site.meshagent.app",
+            room_name="demo-room",
+            port="8000",
+            annotations={"meshagent.custom": "keep-me"},
+        ),
+    )
+
+    await webserver._upsert_domain_route(
+        client=client,
+        project_id="project-123",
+        domain="site.meshagent.app",
+        room_name="demo-room",
+        port="8000",
+        service_id="demo-webserver",
+    )
+
+    assert client.updated_routes == [
+        {
+            "project_id": "project-123",
+            "domain": "site.meshagent.app",
+            "room_name": "demo-room",
+            "port": "8000",
+            "annotations": {
+                "meshagent.custom": "keep-me",
+                ANNOTATION_SERVICE_ID: "demo-webserver",
+            },
+        }
+    ]
+
+
 async def _start_static_test_client(
     *,
     route_path: str,

{meshagent_cli-0.33.2 → meshagent_cli-0.34.0}/meshagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.33.2
+Version: 0.34.0
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -19,21 +19,21 @@ Requires-Dist: rich~=14.3.0
 Requires-Dist: textual<2.0,>=0.50
 Requires-Dist: prompt-toolkit~=3.0.52
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]~=0.33.2; extra == "all"
-Requires-Dist: meshagent-api[all]~=0.33.2; extra == "all"
-Requires-Dist: meshagent-computers~=0.33.2; extra == "all"
-Requires-Dist: meshagent-openai~=0.33.2; extra == "all"
-Requires-Dist: meshagent-anthropic~=0.33.2; extra == "all"
-Requires-Dist: meshagent-codex~=0.33.2; extra == "all"
-Requires-Dist: meshagent-mcp~=0.33.2; extra == "all"
-Requires-Dist: meshagent-tools~=0.33.2; extra == "all"
+Requires-Dist: meshagent-agents[all]~=0.34.0; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.34.0; extra == "all"
+Requires-Dist: meshagent-computers~=0.34.0; extra == "all"
+Requires-Dist: meshagent-openai~=0.34.0; extra == "all"
+Requires-Dist: meshagent-anthropic~=0.34.0; extra == "all"
+Requires-Dist: meshagent-codex~=0.34.0; extra == "all"
+Requires-Dist: meshagent-mcp~=0.34.0; extra == "all"
+Requires-Dist: meshagent-tools~=0.34.0; extra == "all"
 Requires-Dist: supabase-auth~=2.28.0; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0.52; extra == "all"
 Provides-Extra: mcp-service
-Requires-Dist: meshagent-agents[all]~=0.33.2; extra == "mcp-service"
-Requires-Dist: meshagent-api~=0.33.2; extra == "mcp-service"
-Requires-Dist: meshagent-mcp~=0.33.2; extra == "mcp-service"
-Requires-Dist: meshagent-tools~=0.33.2; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]~=0.34.0; extra == "mcp-service"
+Requires-Dist: meshagent-api~=0.34.0; extra == "mcp-service"
+Requires-Dist: meshagent-mcp~=0.34.0; extra == "mcp-service"
+Requires-Dist: meshagent-tools~=0.34.0; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 
 # [Meshagent](https://www.meshagent.com)

meshagent_cli-0.34.0/meshagent_cli.egg-info/requires.txt

@@ -0,0 +1,29 @@
+typer~=0.21
+fastmcp~=2.8
+opentelemetry-distro~=0.59b0
+opentelemetry-exporter-otlp-proto-http~=1.33
+art~=6.5
+pydantic-yaml~=1.5
+pathspec~=0.12.1
+rich~=14.3.0
+textual<2.0,>=0.50
+prompt-toolkit~=3.0.52
+
+[all]
+meshagent-agents[all]~=0.34.0
+meshagent-api[all]~=0.34.0
+meshagent-computers~=0.34.0
+meshagent-openai~=0.34.0
+meshagent-anthropic~=0.34.0
+meshagent-codex~=0.34.0
+meshagent-mcp~=0.34.0
+meshagent-tools~=0.34.0
+supabase-auth~=2.28.0
+prompt-toolkit~=3.0.52
+
+[mcp-service]
+meshagent-agents[all]~=0.34.0
+meshagent-api~=0.34.0
+meshagent-mcp~=0.34.0
+meshagent-tools~=0.34.0
+supabase-auth~=2.28.0

{meshagent_cli-0.33.2 → meshagent_cli-0.34.0}/pyproject.toml

@@ -26,23 +26,23 @@ dynamic = ["version", "readme"]
 [project.optional-dependencies]
 
 all = [
-  "meshagent-agents[all]~=0.33.2",
-  "meshagent-api[all]~=0.33.2",
-  "meshagent-computers~=0.33.2",
-  "meshagent-openai~=0.33.2",
-  "meshagent-anthropic~=0.33.2",
-  "meshagent-codex~=0.33.2",
-  "meshagent-mcp~=0.33.2",
-  "meshagent-tools~=0.33.2",
+  "meshagent-agents[all]~=0.34.0",
+  "meshagent-api[all]~=0.34.0",
+  "meshagent-computers~=0.34.0",
+  "meshagent-openai~=0.34.0",
+  "meshagent-anthropic~=0.34.0",
+  "meshagent-codex~=0.34.0",
+  "meshagent-mcp~=0.34.0",
+  "meshagent-tools~=0.34.0",
   "supabase-auth~=2.28.0",
   "prompt-toolkit~=3.0.52"
 ]
 
 mcp-service = [
-    "meshagent-agents[all]~=0.33.2",
-    "meshagent-api~=0.33.2",
-    "meshagent-mcp~=0.33.2",
-    "meshagent-tools~=0.33.2",
+    "meshagent-agents[all]~=0.34.0",
+    "meshagent-api~=0.34.0",
+    "meshagent-mcp~=0.34.0",
+    "meshagent-tools~=0.34.0",
     "supabase-auth~=2.28.0"
 ]
 

meshagent_cli-0.33.2/meshagent/cli/version.py

@@ -1 +0,0 @@
-__version__ = "0.33.2"

meshagent_cli-0.33.2/meshagent_cli.egg-info/requires.txt

@@ -1,29 +0,0 @@
-typer~=0.21
-fastmcp~=2.8
-opentelemetry-distro~=0.59b0
-opentelemetry-exporter-otlp-proto-http~=1.33
-art~=6.5
-pydantic-yaml~=1.5
-pathspec~=0.12.1
-rich~=14.3.0
-textual<2.0,>=0.50
-prompt-toolkit~=3.0.52
-
-[all]
-meshagent-agents[all]~=0.33.2
-meshagent-api[all]~=0.33.2
-meshagent-computers~=0.33.2
-meshagent-openai~=0.33.2
-meshagent-anthropic~=0.33.2
-meshagent-codex~=0.33.2
-meshagent-mcp~=0.33.2
-meshagent-tools~=0.33.2
-supabase-auth~=2.28.0
-prompt-toolkit~=3.0.52
-
-[mcp-service]
-meshagent-agents[all]~=0.33.2
-meshagent-api~=0.33.2
-meshagent-mcp~=0.33.2
-meshagent-tools~=0.33.2
-supabase-auth~=2.28.0