meshagent-cli 0.48.0__tar.gz → 0.49.0__tar.gz

{meshagent_cli-0.48.0 → meshagent_cli-0.49.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.48.0
+Version: 0.49.0
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -22,8 +22,8 @@ Requires-Dist: openpyxl~=3.1
 Requires-Dist: xlsxwriter~=3.2
 Requires-Dist: pathspec<2,>=1.0.3
 Requires-Dist: zstandard~=0.25.0
-Requires-Dist: meshagent-llm-proxy==0.48.0
-Requires-Dist: meshagent-codex==0.48.0
+Requires-Dist: meshagent-llm-proxy==0.49.0
+Requires-Dist: meshagent-codex==0.49.0
 Requires-Dist: rich~=14.3.0
 Requires-Dist: sounddevice~=0.5
 Requires-Dist: textual<9.0,>=8.2.3
@@ -32,23 +32,23 @@ Requires-Dist: prompt-toolkit~=3.0.52
 Requires-Dist: ascii-magic~=2.3
 Requires-Dist: pillow~=11.3.0
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]==0.48.0; extra == "all"
-Requires-Dist: meshagent-api[all]==0.48.0; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.48.0; extra == "all"
-Requires-Dist: meshagent-scrapy==0.48.0; extra == "all"
-Requires-Dist: meshagent-computers==0.48.0; extra == "all"
-Requires-Dist: meshagent-openai==0.48.0; extra == "all"
-Requires-Dist: meshagent-anthropic==0.48.0; extra == "all"
-Requires-Dist: meshagent-otel==0.48.0; extra == "all"
-Requires-Dist: meshagent-mcp==0.48.0; extra == "all"
-Requires-Dist: meshagent-tools==0.48.0; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.49.0; extra == "all"
+Requires-Dist: meshagent-api[all]==0.49.0; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.49.0; extra == "all"
+Requires-Dist: meshagent-scrapy==0.49.0; extra == "all"
+Requires-Dist: meshagent-computers==0.49.0; extra == "all"
+Requires-Dist: meshagent-openai==0.49.0; extra == "all"
+Requires-Dist: meshagent-anthropic==0.49.0; extra == "all"
+Requires-Dist: meshagent-otel==0.49.0; extra == "all"
+Requires-Dist: meshagent-mcp==0.49.0; extra == "all"
+Requires-Dist: meshagent-tools==0.49.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.48.0; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.48.0; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.48.0; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.48.0; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.49.0; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.49.0; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.49.0; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.49.0; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.48.0 → meshagent_cli-0.49.0}/meshagent/cli/projects.py

@@ -1,19 +1,24 @@
 import sys
 from dataclasses import dataclass
-from typing import Annotated
+from pathlib import Path
+from typing import Annotated, Literal
 
 import typer
+from pydantic import BaseModel, ConfigDict
+from pydantic_yaml import parse_yaml_raw_as
 from rich import print
 
+from meshagent.api import ApiScope
 from meshagent.api.client import Meshagent, NotFoundError, ProjectInfo, ProjectsPage
 from meshagent.cli import async_typer
+from meshagent.cli.common_options import OutputFormatOption, ProjectIdOption
 from meshagent.cli.helper import (
     get_client,
     get_active_project,
     print_json_table,
+    resolve_project_id,
     set_active_project,
 )
-from meshagent.cli.common_options import OutputFormatOption
 
 app = async_typer.AsyncTyper(help="Manage or activate your meshagent projects")
 
@@ -25,6 +30,30 @@ class ListedProject:
     is_active: bool
 
 
+RoomAccessRole = Literal["guest", "viewer", "operator", "developer", "admin"]
+
+
+class ParticipantTokenRoleDefinition(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    api: ApiScope
+
+
+class RoomRoleDefinition(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    participant: ParticipantTokenRoleDefinition | None = None
+    site_user: bool = False
+
+
+class RoomRolesSpec(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    version: Literal["v1"]
+    kind: Literal["RoomRoles"]
+    roles: dict[RoomAccessRole, RoomRoleDefinition]
+
+
 def _parse_listed_projects(
     response: ProjectsPage,
     *,
@@ -209,6 +238,50 @@ async def get(
         await client.close()
 
 
+@app.async_command(
+    "set-room-roles",
+    help="Set authoritative project room-role mappings from a YAML spec.",
+)
+async def set_room_roles(
+    file: Annotated[Path, typer.Argument(help="RoomRoles YAML spec")],
+    project_id: ProjectIdOption,
+):
+    try:
+        spec = parse_yaml_raw_as(RoomRolesSpec, file.read_text())
+    except (OSError, ValueError) as error:
+        print(f"[red]Invalid room role spec: {error}[/red]")
+        raise typer.Exit(code=1) from error
+
+    client = await get_client()
+    try:
+        resolved_project_id = await resolve_project_id(project_id)
+        await client.set_project_settings_document(
+            resolved_project_id,
+            "room_roles",
+            {"roles": spec.model_dump(mode="json", exclude_none=True)["roles"]},
+        )
+        print(f"[green]Room role override updated:[/] {resolved_project_id}")
+    finally:
+        await client.close()
+
+
+@app.async_command(
+    "reset-room-roles",
+    help="Remove the project room-role override and restore built-in defaults.",
+)
+async def reset_room_roles(project_id: ProjectIdOption):
+    client = await get_client()
+    try:
+        resolved_project_id = await resolve_project_id(project_id)
+        await client.delete_project_settings_document(
+            resolved_project_id,
+            "room_roles",
+        )
+        print(f"[green]Room role defaults restored:[/] {resolved_project_id}")
+    finally:
+        await client.close()
+
+
 @app.async_command(
     "activate", help="Set the active project for subsequent CLI commands."
 )

{meshagent_cli-0.48.0 → meshagent_cli-0.49.0}/meshagent/cli/projects_test.py

@@ -17,6 +17,8 @@ class _FakeClient:
         self._project_rows = list(project_rows)
         self._created_project_id = created_project_id
         self.created_project_names: list[str] = []
+        self.settings_documents: dict[str, dict] = {}
+        self.deleted_settings_documents: list[str] = []
         self.closed = False
 
     async def list_projects(self) -> ProjectsPage:
@@ -48,6 +50,16 @@ class _FakeClient:
         self._project_rows.append(created_row)
         return ProjectInfo.model_validate(created_row)
 
+    async def set_project_settings_document(
+        self, project_id: str, name: str, document: dict
+    ):
+        self.settings_documents[name] = document
+        return {}
+
+    async def delete_project_settings_document(self, project_id: str, name: str):
+        self.deleted_settings_documents.append(name)
+        return {}
+
     async def close(self) -> None:
         self.closed = True
 
@@ -375,3 +387,87 @@ async def test_activate_prints_cancel_message_when_tui_is_canceled(monkeypatch)
     assert active_project_calls == []
     assert output == ["Project activation canceled."]
     assert client.closed is True
+
+
+@pytest.mark.asyncio
+async def test_set_room_roles_writes_dedicated_document(monkeypatch, tmp_path) -> None:
+    client = _FakeClient(
+        [
+            {
+                "id": "project-1",
+                "name": "Alpha",
+            }
+        ]
+    )
+    spec = tmp_path / "room-roles.yaml"
+    spec.write_text(
+        """version: v1
+kind: RoomRoles
+roles:
+  guest:
+    participant:
+      api:
+        messaging:
+          broadcast: false
+          list: true
+          send: false
+    site_user: false
+"""
+    )
+
+    async def _fake_get_client():
+        return client
+
+    async def _fake_resolve_project_id(project_id=None):
+        return project_id or "project-1"
+
+    monkeypatch.setattr(projects, "get_client", _fake_get_client)
+    monkeypatch.setattr(projects, "resolve_project_id", _fake_resolve_project_id)
+
+    await projects.set_room_roles(file=spec, project_id="project-1")
+
+    assert client.settings_documents == {
+        "room_roles": {
+            "roles": {
+                "guest": {
+                    "participant": {
+                        "api": {
+                            "messaging": {
+                                "broadcast": False,
+                                "list": True,
+                                "send": False,
+                            }
+                        }
+                    },
+                    "site_user": False,
+                }
+            }
+        },
+    }
+    assert client.closed is True
+
+
+@pytest.mark.asyncio
+async def test_reset_room_roles_deletes_dedicated_document(monkeypatch) -> None:
+    client = _FakeClient(
+        [
+            {
+                "id": "project-1",
+                "name": "Alpha",
+            }
+        ]
+    )
+
+    async def _fake_get_client():
+        return client
+
+    async def _fake_resolve_project_id(project_id=None):
+        return project_id or "project-1"
+
+    monkeypatch.setattr(projects, "get_client", _fake_get_client)
+    monkeypatch.setattr(projects, "resolve_project_id", _fake_resolve_project_id)
+
+    await projects.reset_room_roles(project_id="project-1")
+
+    assert client.deleted_settings_documents == ["room_roles"]
+    assert client.closed is True

{meshagent_cli-0.48.0 → meshagent_cli-0.49.0}/meshagent/cli/routes.py

@@ -14,7 +14,7 @@ from pydantic import ValidationError
 from rich import print
 
 from meshagent.api.client import ValidationErrorResponse
-from meshagent.api.specs.service import RouteSpec
+from meshagent.api.specs.service import RouteContentSpec, RouteCorsRule, RouteSpec
 from meshagent.cli import async_typer
 from meshagent.cli.common_options import ProjectIdOption, OutputFormatOption
 from meshagent.cli.helper import (
@@ -52,6 +52,74 @@ def _parse_annotations(annotations: Optional[str]) -> Optional[dict[str, str]]:
         raise typer.BadParameter("Invalid JSON for --annotations") from exc
 
 
+def _parse_cors(cors: Optional[str]) -> Optional[list[RouteCorsRule]]:
+    if cors is None:
+        return None
+    if cors.strip() == "":
+        return []
+    try:
+        value = json.loads(cors)
+        if not isinstance(value, list):
+            raise ValueError("expected a JSON array")
+        return [RouteCorsRule.model_validate(rule) for rule in value]
+    except (json.JSONDecodeError, TypeError, ValueError, ValidationError) as exc:
+        raise typer.BadParameter("Invalid JSON for --cors") from exc
+
+
+def _parse_compression(compression: Optional[str]) -> Optional[str]:
+    if compression is None:
+        return None
+    normalized = compression.strip().lower()
+    if normalized not in {"brotli", "gzip", "none"}:
+        raise typer.BadParameter(
+            "Invalid value for --compression: expected brotli, gzip, or none"
+        )
+    return normalized
+
+
+def _parse_route_path(path: str) -> str:
+    if not path.startswith("/"):
+        raise typer.BadParameter("RouteSpec paths must start with /")
+    return path
+
+
+def _content_options_supplied(
+    *,
+    content_path: Optional[str],
+    cors: Optional[str],
+    index: Optional[bool],
+    iap: Optional[bool],
+    compression: Optional[str],
+) -> bool:
+    return any(
+        value is not None for value in (content_path, cors, index, iap, compression)
+    )
+
+
+def _route_table_row(route) -> dict[str, object]:
+    paths = route.spec.paths
+    content = [path.targetContent for path in paths if path.targetContent is not None]
+    return {
+        "domain": route.domain,
+        "backend": route.spec.room_name or route.spec.agent_name or "",
+        "path": ", ".join(path.path for path in paths),
+        "port": ", ".join(
+            str(path.targetPort) for path in paths if path.targetPort is not None
+        ),
+        "content_path": ", ".join(item.subpath or "/" for item in content),
+        "index": ", ".join(str(item.index).lower() for item in content),
+        "iap": ", ".join(str(item.iap).lower() for item in content),
+        "compression": ", ".join(item.compression for item in content),
+        "cors": " | ".join(
+            json.dumps(
+                [rule.model_dump(mode="json") for rule in item.cors],
+                separators=(",", ":"),
+            )
+            for item in content
+        ),
+    }
+
+
 def _load_route_spec(path: str) -> RouteSpec:
     try:
         text = Path(path).expanduser().read_text(encoding="utf-8")
@@ -128,6 +196,34 @@ async def route_create(
             help="Published port to route to",
         ),
     ] = None,
+    path: Annotated[
+        str,
+        typer.Option("--path", help="Public URL path to expose"),
+    ] = "/",
+    content_path: Annotated[
+        Optional[str],
+        typer.Option(
+            "--content-path",
+            "--room-path",
+            help="Room storage subpath to serve directly",
+        ),
+    ] = None,
+    cors: Annotated[
+        Optional[str],
+        typer.Option("--cors", help="CORS rules as a JSON array"),
+    ] = None,
+    index: Annotated[
+        Optional[bool],
+        typer.Option("--index/--no-index", help="Serve index.html for directories"),
+    ] = None,
+    iap: Annotated[
+        Optional[bool],
+        typer.Option("--iap/--no-iap", help="Require identity-aware proxy access"),
+    ] = None,
+    compression: Annotated[
+        Optional[str],
+        typer.Option("--compression", help="brotli, gzip, or none"),
+    ] = None,
     annotations: Annotated[
         Optional[str],
         typer.Option(
@@ -150,8 +246,25 @@ async def route_create(
     try:
         project_id = await resolve_project_id(project_id)
         if file is None:
-            if domain is None or port is None:
-                raise typer.BadParameter("Provide --file or both --domain and --port")
+            content_options = _content_options_supplied(
+                content_path=content_path,
+                cors=cors,
+                index=index,
+                iap=iap,
+                compression=compression,
+            )
+            if domain is None or (port is None and not content_options):
+                raise typer.BadParameter(
+                    "Provide --file or --domain and one of --port or --content-path"
+                )
+            if port is not None and content_options:
+                raise typer.BadParameter(
+                    "--port cannot be combined with room content options"
+                )
+            if content_options and content_path is None:
+                raise typer.BadParameter(
+                    "Provide --content-path when using room content options"
+                )
             room = resolve_room(room)
             if room is None:
                 print(
@@ -159,12 +272,31 @@ async def route_create(
                 )
                 raise typer.Exit(code=1)
             parsed_annotations = _parse_annotations(annotations) or {}
+            target: dict[str, object]
+            if content_path is not None:
+                target = {
+                    "targetContent": RouteContentSpec(
+                        subpath=content_path,
+                        cors=_parse_cors(cors) or [],
+                        index=index or False,
+                        iap=iap or False,
+                        compression=_parse_compression(compression) or "brotli",
+                    )
+                }
+            else:
+                target = {"targetPort": port}
             spec = RouteSpec.model_validate(
                 {
                     "metadata": {"name": domain, "annotations": parsed_annotations},
                     "domain": domain,
                     "backend": {"room": {"name": room}},
-                    "paths": [{"path": "/", "pathType": "prefix", "targetPort": port}],
+                    "paths": [
+                        {
+                            "path": _parse_route_path(path),
+                            "pathType": "prefix",
+                            **target,
+                        }
+                    ],
                 }
             )
         else:
@@ -219,6 +351,34 @@ async def route_update(
             help="Published port to route to",
         ),
     ] = None,
+    path: Annotated[
+        Optional[str],
+        typer.Option("--path", help="Public URL path to expose"),
+    ] = None,
+    content_path: Annotated[
+        Optional[str],
+        typer.Option(
+            "--content-path",
+            "--room-path",
+            help="Room storage subpath to serve directly",
+        ),
+    ] = None,
+    cors: Annotated[
+        Optional[str],
+        typer.Option("--cors", help="CORS rules as a JSON array"),
+    ] = None,
+    index: Annotated[
+        Optional[bool],
+        typer.Option("--index/--no-index", help="Serve index.html for directories"),
+    ] = None,
+    iap: Annotated[
+        Optional[bool],
+        typer.Option("--iap/--no-iap", help="Require identity-aware proxy access"),
+    ] = None,
+    compression: Annotated[
+        Optional[str],
+        typer.Option("--compression", help="brotli, gzip, or none"),
+    ] = None,
     annotations: Annotated[
         Optional[str],
         typer.Option(
@@ -238,6 +398,19 @@ async def route_update(
         else:
             room = resolve_room(room)
             parsed_annotations = _parse_annotations(annotations)
+            parsed_cors = _parse_cors(cors)
+            parsed_compression = _parse_compression(compression)
+            content_options = _content_options_supplied(
+                content_path=content_path,
+                cors=cors,
+                index=index,
+                iap=iap,
+                compression=compression,
+            )
+            if port is not None and content_options:
+                raise typer.BadParameter(
+                    "--port cannot be combined with room content options"
+                )
             try:
                 route = await client.get_route(project_id=project_id, domain=domain)
             except (ClientResponseError, ValidationErrorResponse) as exc:
@@ -250,18 +423,105 @@ async def route_update(
                     raise typer.Exit(code=1)
                 raise
             room = room or route.room_name
-            port = port or route.port
+            if room == "":
+                raise typer.BadParameter("Provide --room for a room route")
             parsed_annotations = (
                 parsed_annotations
                 if parsed_annotations is not None
                 else route.annotations
             )
+            current_path = route.spec.paths[0] if route.spec.paths else None
+            route_path = (
+                _parse_route_path(path)
+                if path is not None
+                else current_path.path
+                if current_path is not None
+                else "/"
+            )
+            if port is not None:
+                target: dict[str, object] = {"targetPort": port}
+                strip_prefix = (
+                    current_path.stripPrefix if current_path is not None else False
+                )
+            elif content_options:
+                current_content = (
+                    current_path.targetContent if current_path is not None else None
+                )
+                if content_path is None and current_content is None:
+                    raise typer.BadParameter(
+                        "Provide --content-path when using room content options"
+                    )
+                target = {
+                    "targetContent": RouteContentSpec(
+                        subpath=(
+                            content_path
+                            if content_path is not None
+                            else current_content.subpath
+                            if current_content is not None
+                            else ""
+                        ),
+                        cors=(
+                            parsed_cors
+                            if parsed_cors is not None
+                            else current_content.cors
+                            if current_content is not None
+                            else []
+                        ),
+                        index=(
+                            index
+                            if index is not None
+                            else current_content.index
+                            if current_content is not None
+                            else False
+                        ),
+                        iap=(
+                            iap
+                            if iap is not None
+                            else current_content.iap
+                            if current_content is not None
+                            else False
+                        ),
+                        compression=(
+                            parsed_compression
+                            if parsed_compression is not None
+                            else current_content.compression
+                            if current_content is not None
+                            else "brotli"
+                        ),
+                    )
+                }
+                strip_prefix = False
+            else:
+                if current_path is None:
+                    raise typer.BadParameter(
+                        "Provide --port or --content-path for a room route"
+                    )
+                if current_path.targetPort is not None:
+                    target = {"targetPort": current_path.targetPort}
+                elif current_path.targetContent is not None:
+                    target = {"targetContent": current_path.targetContent}
+                else:
+                    raise typer.BadParameter(
+                        "Provide --port or --content-path for a room route"
+                    )
+                strip_prefix = current_path.stripPrefix
+            paths = [
+                {
+                    "path": route_path,
+                    "pathType": (
+                        current_path.pathType if current_path is not None else "prefix"
+                    ),
+                    "stripPrefix": strip_prefix,
+                    **target,
+                },
+                *[item.model_dump(mode="python") for item in route.spec.paths[1:]],
+            ]
             spec = RouteSpec.model_validate(
                 {
                     "metadata": {"name": domain, "annotations": parsed_annotations},
                     "domain": domain,
                     "backend": {"room": {"name": room}},
-                    "paths": [{"path": "/", "pathType": "prefix", "targetPort": port}],
+                    "paths": paths,
                 }
             )
 
@@ -353,17 +613,16 @@ async def route_list(
             print({"routes": [route.model_dump(mode="json") for route in routes]})
         else:
             print_json_table(
-                [
-                    {
-                        "domain": route.domain,
-                        "backend": route.spec.room_name or route.spec.agent_name or "",
-                        "port": route.port,
-                    }
-                    for route in routes
-                ],
+                [_route_table_row(route) for route in routes],
                 "domain",
                 "backend",
+                "path",
                 "port",
+                "content_path",
+                "index",
+                "iap",
+                "compression",
+                "cors",
             )
     finally:
         await client.close()