meshagent-cli 0.52.1__tar.gz → 0.52.4__tar.gz

{meshagent_cli-0.52.1 → meshagent_cli-0.52.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.52.1
+Version: 0.52.4
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -17,13 +17,13 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-http~=1.33
 Requires-Dist: art~=6.5
 Requires-Dist: pyyaml~=6.0.2
 Requires-Dist: pydantic-yaml~=1.5
-Requires-Dist: pyarrow~=21.0.0
+Requires-Dist: pyarrow~=22.0.0
 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.52.1
-Requires-Dist: meshagent-codex==0.52.1
+Requires-Dist: meshagent-llm-proxy==0.52.4
+Requires-Dist: meshagent-codex==0.52.4
 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.52.1; extra == "all"
-Requires-Dist: meshagent-api[all]==0.52.1; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.52.1; extra == "all"
-Requires-Dist: meshagent-scrapy==0.52.1; extra == "all"
-Requires-Dist: meshagent-computers==0.52.1; extra == "all"
-Requires-Dist: meshagent-openai==0.52.1; extra == "all"
-Requires-Dist: meshagent-anthropic==0.52.1; extra == "all"
-Requires-Dist: meshagent-otel==0.52.1; extra == "all"
-Requires-Dist: meshagent-mcp==0.52.1; extra == "all"
-Requires-Dist: meshagent-tools==0.52.1; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.52.4; extra == "all"
+Requires-Dist: meshagent-api[all]==0.52.4; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.52.4; extra == "all"
+Requires-Dist: meshagent-scrapy==0.52.4; extra == "all"
+Requires-Dist: meshagent-computers==0.52.4; extra == "all"
+Requires-Dist: meshagent-openai==0.52.4; extra == "all"
+Requires-Dist: meshagent-anthropic==0.52.4; extra == "all"
+Requires-Dist: meshagent-otel==0.52.4; extra == "all"
+Requires-Dist: meshagent-mcp==0.52.4; extra == "all"
+Requires-Dist: meshagent-tools==0.52.4; 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.52.1; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.52.1; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.52.1; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.52.1; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.52.4; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.52.4; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.52.4; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.52.4; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.52.1 → meshagent_cli-0.52.4}/meshagent/cli/cli.py

@@ -386,6 +386,13 @@ SHELL_RENDERERS = {
 }
 
 
+app.add_lazy_command(
+    name="oauth-client",
+    module="meshagent.cli.oauth_clients",
+    help="Manage OAuth clients and login branding",
+)
+
+
 def main() -> None:
     from meshagent.agents.channel_process import dispatch_main
 

{meshagent_cli-0.52.1 → meshagent_cli-0.52.4}/meshagent/cli/config.py

@@ -8,19 +8,49 @@ from meshagent.api import RoomException
 from meshagent.api.client import MeshagentDeploymentConfig
 from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client
+from meshagent.cli.local_settings import resolve_api_url
 
 app = async_typer.AsyncTyper(help="Read MeshAgent deployment configuration")
 
+SUPPORTED_CONFIG_PATHS = (
+    "version",
+    "openai.url",
+    "anthropic.url",
+    "grok.url",
+    "domains.studio",
+    "domains.accounts",
+    "domains.powerboards",
+    "domains.api",
+    "domains.mail",
+    "domains.pages",
+    "domains.registry",
+)
+
 
 @app.callback()
 def _config_callback() -> None:
     pass
 
 
-def _config_value(config: MeshagentDeploymentConfig, path: str) -> str | None:
+def _llm_proxy_url(*, api_url: str, provider_path: str) -> str:
+    return f"{api_url.rstrip('/')}/{provider_path}"
+
+
+def _config_value(
+    config: MeshagentDeploymentConfig,
+    path: str,
+    *,
+    api_url: str,
+) -> str | None:
     match path:
         case "version":
             return config.version
+        case "openai.url":
+            return _llm_proxy_url(api_url=api_url, provider_path="openai/v1")
+        case "anthropic.url":
+            return _llm_proxy_url(api_url=api_url, provider_path="anthropic")
+        case "grok.url":
+            return _llm_proxy_url(api_url=api_url, provider_path="grok/v1")
         case "domains.studio":
             return config.domains.studio
         case "domains.accounts":
@@ -36,20 +66,9 @@ def _config_value(config: MeshagentDeploymentConfig, path: str) -> str | None:
         case "domains.registry":
             return config.domains.registry
         case _:
-            supported_paths = ", ".join(
-                [
-                    "version",
-                    "domains.studio",
-                    "domains.accounts",
-                    "domains.powerboards",
-                    "domains.api",
-                    "domains.mail",
-                    "domains.pages",
-                    "domains.registry",
-                ]
-            )
             raise typer.BadParameter(
-                f"unsupported config path; choose one of: {supported_paths}"
+                "unsupported config path; choose one of: "
+                f"{', '.join(SUPPORTED_CONFIG_PATHS)}"
             )
 
 
@@ -57,7 +76,12 @@ def _config_value(config: MeshagentDeploymentConfig, path: str) -> str | None:
 async def config_get(
     path: Annotated[
         str,
-        typer.Argument(help="Config path to read, for example domains.pages"),
+        typer.Argument(
+            help=(
+                "Config path to read. Supported paths: "
+                f"{', '.join(SUPPORTED_CONFIG_PATHS)}"
+            )
+        ),
     ],
 ) -> None:
     """Print one deployment config value."""
@@ -70,7 +94,11 @@ async def config_get(
     finally:
         await client.close()
 
-    value = _config_value(config, path.strip())
+    value = _config_value(
+        config,
+        path.strip(),
+        api_url=resolve_api_url(),
+    )
     if value is None:
         typer.echo(f"Config value is not set: {path.strip()}", err=True)
         raise typer.Exit(1)

{meshagent_cli-0.52.1 → meshagent_cli-0.52.4}/meshagent/cli/config_test.py

@@ -63,6 +63,53 @@ def test_config_get_version_prints_server_version(
     assert fake_client.closed is True
 
 
+@pytest.mark.parametrize(
+    ("path", "expected"),
+    [
+        ("openai.url", "https://api.meshagent.example/openai/v1"),
+        ("anthropic.url", "https://api.meshagent.example/anthropic"),
+        ("grok.url", "https://api.meshagent.example/grok/v1"),
+    ],
+)
+def test_config_get_prints_llm_proxy_url_for_active_deployment(
+    path: str,
+    expected: str,
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    fake_client = _FakeConfigClient(
+        MeshagentDeploymentConfig(domains=MeshagentDomains())
+    )
+
+    async def _fake_get_client() -> _FakeConfigClient:
+        return fake_client
+
+    monkeypatch.setattr(config, "get_client", _fake_get_client)
+    monkeypatch.setattr(
+        config,
+        "resolve_api_url",
+        lambda: "https://api.meshagent.example/",
+    )
+
+    cli.app(["config", "get", path])
+
+    captured = capsys.readouterr()
+    assert captured.out == f"{expected}\n"
+    assert captured.err == ""
+    assert fake_client.closed is True
+
+
+def test_config_get_help_lists_supported_paths(
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    cli.app(["config", "get", "--help"])
+
+    captured = capsys.readouterr()
+    for path in config.SUPPORTED_CONFIG_PATHS:
+        assert path in captured.out
+    assert captured.err == ""
+
+
 def test_config_get_rejects_unknown_path(
     monkeypatch: pytest.MonkeyPatch,
     capsys: pytest.CaptureFixture[str],

meshagent_cli-0.52.4/meshagent/cli/oauth_clients.py

@@ -0,0 +1,120 @@
+from enum import Enum
+from typing import Annotated
+
+import typer
+from meshagent.api.oauth_branding import OAuthClientBranding
+from meshagent.cli import async_typer
+from meshagent.cli.common_options import ProjectIdOption
+from meshagent.cli.helper import get_client, resolve_project_id
+from pydantic import ValidationError
+from rich import print_json
+
+app = async_typer.AsyncTyper(help="Manage OAuth clients and login branding")
+
+
+class Theme(str, Enum):
+    light = "light"
+    dark = "dark"
+    auto = "auto"
+
+
+def branding_metadata(
+    existing: dict[str, str],
+    *,
+    name: str | None,
+    logo_url: str | None,
+    theme: Theme | None,
+    clear_logo: bool = False,
+) -> dict[str, str]:
+    if clear_logo and logo_url is not None:
+        raise typer.BadParameter("Use either --logo-url or --clear-logo")
+    metadata = dict(existing)
+    if name is not None:
+        metadata["name"] = name
+    if clear_logo:
+        metadata.pop("logo_url", None)
+    elif logo_url is not None:
+        metadata["logo_url"] = logo_url
+    if theme is not None:
+        metadata["theme"] = theme.value
+    try:
+        OAuthClientBranding.model_validate(metadata)
+    except ValidationError as exc:
+        raise typer.BadParameter("Logo URL must be an absolute HTTP(S) URL") from exc
+    return metadata
+
+
+@app.command("create")
+async def create_client(
+    name: Annotated[str, typer.Option(help="Application name shown at login")],
+    redirect_uri: Annotated[
+        list[str], typer.Option(help="Allowed callback URL; repeat for multiple URLs")
+    ],
+    scope: Annotated[str, typer.Option(help="OAuth scopes")],
+    project_id: ProjectIdOption,
+    logo_url: Annotated[
+        str | None, typer.Option(help="Optional HTTP(S) login logo URL")
+    ] = None,
+    theme: Annotated[Theme, typer.Option(help="Login appearance")] = Theme.auto,
+):
+    """Create an authorization-code client. The output includes its new secret."""
+    metadata = branding_metadata({}, name=name, logo_url=logo_url, theme=theme)
+    project_id = await resolve_project_id(project_id)
+    async with await get_client() as client:
+        result = await client.create_oauth_client(
+            project_id=project_id,
+            grant_types=["authorization_code", "refresh_token"],
+            response_types=["code"],
+            redirect_uris=redirect_uri,
+            scope=scope,
+            metadata=metadata,
+        )
+        print_json(result.model_dump_json())
+
+
+@app.command("update")
+async def update_client(
+    client_id: Annotated[str, typer.Argument(help="OAuth client ID")],
+    project_id: ProjectIdOption,
+    name: Annotated[
+        str | None, typer.Option(help="Application name shown at login")
+    ] = None,
+    logo_url: Annotated[str | None, typer.Option(help="HTTP(S) login logo URL")] = None,
+    theme: Annotated[
+        Theme | None, typer.Option(help="Login appearance: light, dark, or auto")
+    ] = None,
+    clear_logo: Annotated[
+        bool, typer.Option(help="Restore the default MeshAgent logo")
+    ] = False,
+):
+    """Update login branding, preserving other client settings and metadata."""
+    project_id = await resolve_project_id(project_id)
+    async with await get_client() as client:
+        existing = await client.get_oauth_client(
+            project_id=project_id, client_id=client_id
+        )
+        metadata = branding_metadata(
+            existing.metadata,
+            name=name,
+            logo_url=logo_url,
+            theme=theme,
+            clear_logo=clear_logo,
+        )
+        result = await client.update_oauth_client(
+            project_id=project_id, client_id=client_id, metadata=metadata
+        )
+        print_json(data=result)
+
+
+@app.command("get")
+async def get_client_config(
+    client_id: Annotated[str, typer.Argument(help="OAuth client ID")],
+    project_id: ProjectIdOption,
+):
+    """Show an OAuth client's configuration and branding."""
+    project_id = await resolve_project_id(project_id)
+    async with await get_client() as client:
+        result = await client.get_oauth_client(
+            project_id=project_id, client_id=client_id
+        )
+        print_json(result.model_dump_json())

meshagent_cli-0.52.4/meshagent/cli/oauth_clients_test.py

@@ -0,0 +1,89 @@
+import pytest
+import typer
+from meshagent.cli.oauth_clients import Theme, app, branding_metadata
+from meshagent.cli.testing import CliRunner
+
+
+def test_branding_update_preserves_other_metadata():
+    assert branding_metadata(
+        {"name": "App", "custom": "keep", "logo_url": "https://old.example/logo"},
+        name=None,
+        logo_url=None,
+        theme=Theme.dark,
+    ) == {
+        "name": "App",
+        "custom": "keep",
+        "logo_url": "https://old.example/logo",
+        "theme": "dark",
+    }
+
+
+def test_clear_logo_restores_default_without_removing_name():
+    assert branding_metadata(
+        {"name": "App", "logo_url": "https://example.com/logo"},
+        name=None,
+        logo_url=None,
+        theme=None,
+        clear_logo=True,
+    ) == {"name": "App"}
+
+
+@pytest.mark.parametrize("url", ["javascript:alert(1)", "/logo.svg", "not-a-url"])
+def test_invalid_logo_rejected(url):
+    with pytest.raises(typer.BadParameter):
+        branding_metadata({}, name="App", logo_url=url, theme=Theme.auto)
+
+
+def test_oauth_branding_options_are_available():
+    result = CliRunner().invoke(app, ["update", "--help"])
+    assert result.exit_code == 0, result.output
+    from rich.text import Text
+
+    output = Text.from_ansi(result.output).plain
+    assert "--logo-url" in output
+    assert "--clear-logo" in output
+    assert "--theme" in output
+
+
+@pytest.mark.asyncio
+async def test_update_command_sends_branding_and_preserves_existing_metadata(
+    monkeypatch,
+):
+    from unittest.mock import AsyncMock
+
+    from meshagent.api.client import OAuthClient
+    from meshagent.cli import oauth_clients
+
+    api = AsyncMock()
+    api.__aenter__.return_value = api
+    api.get_oauth_client.return_value = OAuthClient(
+        client_id="client-1",
+        project_id="project-1",
+        grant_types=["authorization_code"],
+        response_types=["code"],
+        redirect_uris=["https://example.com/callback"],
+        scope="openid",
+        metadata={"name": "Existing", "custom": "preserved"},
+    )
+    api.update_oauth_client.return_value = {"ok": True}
+    monkeypatch.setattr(oauth_clients, "get_client", AsyncMock(return_value=api))
+    monkeypatch.setattr(
+        oauth_clients, "resolve_project_id", AsyncMock(return_value="project-1")
+    )
+    monkeypatch.setattr(oauth_clients, "print_json", lambda **kwargs: None)
+    await oauth_clients.update_client(
+        client_id="client-1",
+        project_id="project-1",
+        logo_url="https://example.com/logo.svg",
+        theme=Theme.dark,
+    )
+    api.update_oauth_client.assert_awaited_once_with(
+        project_id="project-1",
+        client_id="client-1",
+        metadata={
+            "name": "Existing",
+            "custom": "preserved",
+            "logo_url": "https://example.com/logo.svg",
+            "theme": "dark",
+        },
+    )

{meshagent_cli-0.52.1 → meshagent_cli-0.52.4}/meshagent/cli/process.py

@@ -1667,7 +1667,7 @@ def _websocket_iap_cookie_headers(
         raise typer.BadParameter(
             "a room participant token is required for --websocket-auth=iap"
         )
-    return {"Cookie": f"__Host-meshagent_iap={token.strip()}"}
+    return {"Cookie": f"__meshagent_iap={token.strip()}"}
 
 
 def _process_use_websocket_headers(

{meshagent_cli-0.52.1 → meshagent_cli-0.52.4}/meshagent/cli/process_test.py

@@ -598,7 +598,7 @@ def test_process_use_websocket_headers_set_iap_cookie() -> None:
         iap_token="room-jwt",
     )
 
-    assert headers == {"Cookie": "__Host-meshagent_iap=room-jwt"}
+    assert headers == {"Cookie": "__meshagent_iap=room-jwt"}
 
 
 def test_process_use_websocket_headers_sign_agent_participant_token(

{meshagent_cli-0.52.1 → meshagent_cli-0.52.4}/meshagent/cli/projects.py

@@ -4,12 +4,14 @@ from pathlib import Path
 from typing import Annotated, Literal
 
 import typer
+import yaml
 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.api.llm_router_config import LlmRouterConfig
 from meshagent.cli import async_typer
 from meshagent.cli.common_options import OutputFormatOption, ProjectIdOption
 from meshagent.cli.helper import (
@@ -282,6 +284,84 @@ async def reset_room_roles(project_id: ProjectIdOption):
         await client.close()
 
 
+@app.async_command(
+    "get-llm-router-config",
+    help=(
+        "Get the complete LLM router configuration as YAML. The document "
+        "contains allowedModels, apps, and rules."
+    ),
+)
+async def get_llm_router_config(
+    project_id: ProjectIdOption,
+    output: Annotated[
+        Path | None,
+        typer.Option(
+            "--output", "-o", help="Write YAML to this file instead of stdout."
+        ),
+    ] = None,
+):
+    client = await get_client()
+    try:
+        resolved_project_id = await resolve_project_id(project_id)
+        document = await client.get_project_settings_document(
+            resolved_project_id, "router"
+        )
+        try:
+            config = LlmRouterConfig.model_validate(document or {})
+        except ValueError as error:
+            print(f"[red]The stored LLM router configuration is invalid: {error}[/red]")
+            raise typer.Exit(code=1) from error
+        serialized = yaml.safe_dump(
+            config.to_document(),
+            sort_keys=False,
+            allow_unicode=True,
+        )
+        if output is None:
+            typer.echo(serialized, nl=False)
+        else:
+            try:
+                output.write_text(serialized)
+            except OSError as error:
+                print(f"[red]Unable to write LLM router configuration: {error}[/red]")
+                raise typer.Exit(code=1) from error
+    finally:
+        await client.close()
+
+
+@app.async_command(
+    "set-llm-router-config",
+    help=(
+        "Validate and replace allowedModels, apps, and rules from YAML. "
+        "Providers: openai, anthropic, grok. APIs: completions, "
+        "chat_completions, responses, messages, realtime. Transports: http, "
+        "websocket. App modes: allowed, blocked. Ensure tools: web_search, "
+        "static, advice; other tool types are filter-only. Search context: "
+        "low, medium, high. Advice strategy: parallel."
+    ),
+)
+async def set_llm_router_config(
+    file: Annotated[Path, typer.Argument(help="LLM router configuration YAML")],
+    project_id: ProjectIdOption,
+):
+    try:
+        config = parse_yaml_raw_as(LlmRouterConfig, file.read_text())
+    except (OSError, ValueError) as error:
+        print(f"[red]Invalid LLM router configuration: {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,
+            "router",
+            config.to_document(),
+        )
+        print(f"[green]LLM router configuration updated:[/] {resolved_project_id}")
+    finally:
+        await client.close()
+
+
 @app.async_command(
     "activate", help="Set the active project for subsequent CLI commands."
 )