meshagent-cli 0.36.1__tar.gz → 0.36.2__tar.gz

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.36.1
+Version: 0.36.2
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -20,21 +20,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.36.1; extra == "all"
-Requires-Dist: meshagent-api[all]~=0.36.1; extra == "all"
-Requires-Dist: meshagent-computers~=0.36.1; extra == "all"
-Requires-Dist: meshagent-openai~=0.36.1; extra == "all"
-Requires-Dist: meshagent-anthropic~=0.36.1; extra == "all"
-Requires-Dist: meshagent-codex~=0.36.1; extra == "all"
-Requires-Dist: meshagent-mcp~=0.36.1; extra == "all"
-Requires-Dist: meshagent-tools~=0.36.1; extra == "all"
+Requires-Dist: meshagent-agents[all]~=0.36.2; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.36.2; extra == "all"
+Requires-Dist: meshagent-computers~=0.36.2; extra == "all"
+Requires-Dist: meshagent-openai~=0.36.2; extra == "all"
+Requires-Dist: meshagent-anthropic~=0.36.2; extra == "all"
+Requires-Dist: meshagent-codex~=0.36.2; extra == "all"
+Requires-Dist: meshagent-mcp~=0.36.2; extra == "all"
+Requires-Dist: meshagent-tools~=0.36.2; 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.36.1; extra == "mcp-service"
-Requires-Dist: meshagent-api~=0.36.1; extra == "mcp-service"
-Requires-Dist: meshagent-mcp~=0.36.1; extra == "mcp-service"
-Requires-Dist: meshagent-tools~=0.36.1; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]~=0.36.2; extra == "mcp-service"
+Requires-Dist: meshagent-api~=0.36.2; extra == "mcp-service"
+Requires-Dist: meshagent-mcp~=0.36.2; extra == "mcp-service"
+Requires-Dist: meshagent-tools~=0.36.2; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 
 # [Meshagent](https://www.meshagent.com)

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/meshagent/cli/auth_async.py

@@ -11,6 +11,7 @@ from pathlib import Path
 from typing import Awaitable, Callable, Optional
 from urllib.parse import urlencode
 from aiohttp import web, ClientSession
+from meshagent.api.oauth_scopes import FULL_OAUTH_SCOPE
 
 # -----------------------------------------------------------------------------
 # Config
@@ -24,7 +25,7 @@ REDIRECT_URL = f"http://localhost:{REDIRECT_PORT}/callback"
 # - MESHAGENT_API_URL (required): e.g., https://api.meshagent.com
 # - MESHAGENT_OAUTH_CLIENT_ID (required)
 # - MESHAGENT_OAUTH_CLIENT_SECRET (optional; only if your server requires it)
-# - MESHAGENT_OAUTH_SCOPES (optional; defaults to "openid email profile")
+# - MESHAGENT_OAUTH_SCOPES (optional; defaults to the full official scope set)
 
 # -----------------------------------------------------------------------------
 # Helpers
@@ -80,7 +81,7 @@ def _client_secret() -> str | None:
 
 
 def _scopes() -> str:
-    return os.getenv("MESHAGENT_OAUTH_SCOPES", "admin")
+    return os.getenv("MESHAGENT_OAUTH_SCOPES", FULL_OAUTH_SCOPE)
 
 
 def _save(tokens: dict):

meshagent_cli-0.36.2/meshagent/cli/auth_async_test.py

@@ -0,0 +1,16 @@
+from meshagent.api.oauth_scopes import FULL_OAUTH_SCOPE
+from meshagent.cli import auth_async
+
+
+def test_scopes_defaults_to_full_official_scope_set(
+    monkeypatch,
+) -> None:
+    monkeypatch.delenv("MESHAGENT_OAUTH_SCOPES", raising=False)
+
+    assert auth_async._scopes() == FULL_OAUTH_SCOPE
+
+
+def test_scopes_prefers_environment_override(monkeypatch) -> None:
+    monkeypatch.setenv("MESHAGENT_OAUTH_SCOPES", "admin")
+
+    assert auth_async._scopes() == "admin"

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/meshagent/cli/cli.py

@@ -116,6 +116,7 @@ app.add_lazy_command(
     name="helper",
     module="meshagent.cli.helpers",
     help="Developer helper services",
+    hidden=True,
 )
 app.add_lazy_command(
     name="helpers",

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/meshagent/cli/room.py

@@ -76,3 +76,9 @@ app.add_lazy_command(
     module="meshagent.cli.sync",
     help="Inspect and update mesh documents in a room",
 )
+app.add_lazy_command(
+    name="connect",
+    module="meshagent.cli.room_connect",
+    attribute="connect_command",
+    help="Connect to a room and run a local command with room auth env",
+)

meshagent_cli-0.36.2/meshagent/cli/room_connect.py

@@ -0,0 +1,119 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+import os
+import subprocess
+from typing import Sequence
+
+import click
+from rich import print
+
+from meshagent.api.helpers import meshagent_base_url
+from meshagent.cli import async_typer
+from meshagent.cli.helper import get_client, resolve_project_id, resolve_room
+
+
+@dataclass(frozen=True)
+class _ConnectedRoomEnv:
+    api_url: str
+    room_name: str
+    room_url: str
+    token: str
+
+
+def _normalize_room_url(*, room_url: str) -> str:
+    normalized = room_url.strip().rstrip("/")
+    if normalized.startswith("wss:"):
+        return "https:" + normalized.removeprefix("wss:")
+    if normalized.startswith("ws:"):
+        return "http:" + normalized.removeprefix("ws:")
+    return normalized
+
+
+async def _connect_room_env(
+    *,
+    project_id: str | None,
+    room: str | None,
+) -> _ConnectedRoomEnv:
+    account_client = await get_client()
+    try:
+        resolved_project_id = await resolve_project_id(project_id=project_id)
+        resolved_room = resolve_room(room)
+        if resolved_room is None:
+            print("[red]--room is required (or set MESHAGENT_ROOM).[/red]")
+            raise click.exceptions.Exit(1)
+
+        connection = await account_client.connect_room(
+            project_id=resolved_project_id,
+            room=resolved_room,
+        )
+        return _ConnectedRoomEnv(
+            api_url=os.getenv("MESHAGENT_API_URL") or meshagent_base_url(),
+            room_name=connection.room_name,
+            room_url=_normalize_room_url(room_url=connection.room_url),
+            token=connection.jwt,
+        )
+    finally:
+        await account_client.close()
+
+
+def _run_connected_command(
+    *,
+    command: Sequence[str],
+    room_env: _ConnectedRoomEnv,
+) -> int:
+    child_env = os.environ.copy()
+    child_env["MESHAGENT_API_URL"] = room_env.api_url
+    child_env["MESHAGENT_TOKEN"] = room_env.token
+    child_env["MESHAGENT_ROOM"] = room_env.room_name
+    child_env["OPENAI_BASE_URL"] = f"{room_env.room_url}/openai/v1"
+    child_env["ANTHROPIC_BASE_URL"] = f"{room_env.room_url}/anthropic"
+    child_env["OPENAI_API_KEY"] = room_env.token
+    child_env["ANTHROPIC_API_KEY"] = room_env.token
+
+    try:
+        result = subprocess.run(
+            list(command),
+            check=False,
+            env=child_env,
+        )
+    except OSError as exc:
+        error_message = exc.strerror or str(exc)
+        raise click.ClickException(
+            f"Failed to start {command[0]}: {error_message}"
+        ) from exc
+
+    return result.returncode
+
+
+@click.command(
+    "connect",
+    help=(
+        "Connect to a room and run a local command with "
+        "MESHAGENT_API_URL, MESHAGENT_TOKEN, and MESHAGENT_ROOM set. "
+        "Use -- before the local command."
+    ),
+)
+@click.option(
+    "--project-id",
+    help="A MeshAgent project id. If empty, the activated project will be used.",
+)
+@click.option("--room", help="Room name")
+@click.argument("command", nargs=-1, type=click.UNPROCESSED)
+def connect_command(
+    project_id: str | None,
+    room: str | None,
+    command: tuple[str, ...],
+) -> None:
+    if len(command) == 0:
+        raise click.UsageError(
+            "Pass the local command after --, for example: "
+            "meshagent room connect -- python script.py"
+        )
+
+    room_env = async_typer._run_coroutine_sync(
+        _connect_room_env(project_id=project_id, room=room)
+    )
+    raise click.exceptions.Exit(
+        _run_connected_command(command=command, room_env=room_env)
+    )

meshagent_cli-0.36.2/meshagent/cli/room_connect_test.py

@@ -0,0 +1,151 @@
+from types import SimpleNamespace
+
+import pytest
+from click.testing import CliRunner
+
+from meshagent.cli import room_connect
+from meshagent.cli import cli as root_cli
+from meshagent.cli.async_typer import get_command
+
+
+class _FakeAccountClient:
+    def __init__(self) -> None:
+        self.base_url = "https://api.example.meshagent.test"
+        self.closed = False
+        self.connect_calls: list[dict[str, str]] = []
+
+    async def connect_room(self, *, project_id: str, room: str) -> SimpleNamespace:
+        self.connect_calls.append({"project_id": project_id, "room": room})
+        return SimpleNamespace(
+            jwt="room-jwt",
+            room_name="connected-room",
+            room_url="wss://room-proxy.meshagent.test/rooms/connected-room",
+        )
+
+    async def close(self) -> None:
+        self.closed = True
+
+
+def test_room_connect_runs_command_with_connected_room_env(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    account_client = _FakeAccountClient()
+    captured_run: dict[str, object] = {}
+
+    async def _fake_get_client() -> _FakeAccountClient:
+        return account_client
+
+    async def _fake_resolve_project_id(*, project_id: str | None) -> str:
+        assert project_id == "project-input"
+        return "project-1"
+
+    def _fake_resolve_room(room: str | None) -> str | None:
+        assert room == "room-input"
+        return room
+
+    def _fake_run(command, *, check: bool, env: dict[str, str]):
+        captured_run["command"] = command
+        captured_run["check"] = check
+        captured_run["env"] = env
+        return SimpleNamespace(returncode=23)
+
+    monkeypatch.setattr(room_connect, "get_client", _fake_get_client)
+    monkeypatch.setattr(room_connect, "resolve_project_id", _fake_resolve_project_id)
+    monkeypatch.setattr(room_connect, "resolve_room", _fake_resolve_room)
+    monkeypatch.setattr(room_connect.subprocess, "run", _fake_run)
+    monkeypatch.setattr(
+        room_connect,
+        "meshagent_base_url",
+        lambda: "https://default.meshagent.test",
+    )
+    monkeypatch.setenv("UNCHANGED_ENV", "keep-me")
+    monkeypatch.setenv("MESHAGENT_API_URL", "https://env.meshagent.test")
+
+    result = CliRunner().invoke(
+        get_command(root_cli.app),
+        [
+            "room",
+            "connect",
+            "--project-id",
+            "project-input",
+            "--room",
+            "room-input",
+            "--",
+            "python",
+            "-c",
+            "print('hello')",
+        ],
+    )
+
+    assert result.exit_code == 23
+    assert account_client.connect_calls == [
+        {"project_id": "project-1", "room": "room-input"}
+    ]
+    assert account_client.closed is True
+    assert captured_run["command"] == ["python", "-c", "print('hello')"]
+    assert captured_run["check"] is False
+    captured_env = captured_run["env"]
+    assert isinstance(captured_env, dict)
+    assert captured_env["UNCHANGED_ENV"] == "keep-me"
+    assert captured_env["MESHAGENT_API_URL"] == "https://env.meshagent.test"
+    assert captured_env["MESHAGENT_TOKEN"] == "room-jwt"
+    assert captured_env["MESHAGENT_ROOM"] == "connected-room"
+    assert (
+        captured_env["OPENAI_BASE_URL"]
+        == "https://room-proxy.meshagent.test/rooms/connected-room/openai/v1"
+    )
+    assert (
+        captured_env["ANTHROPIC_BASE_URL"]
+        == "https://room-proxy.meshagent.test/rooms/connected-room/anthropic"
+    )
+    assert captured_env["OPENAI_API_KEY"] == "room-jwt"
+    assert captured_env["ANTHROPIC_API_KEY"] == "room-jwt"
+
+
+@pytest.mark.asyncio
+async def test_room_connect_uses_default_api_url_when_env_is_unset(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    account_client = _FakeAccountClient()
+
+    async def _fake_get_client() -> _FakeAccountClient:
+        return account_client
+
+    async def _fake_resolve_project_id(*, project_id: str | None) -> str:
+        assert project_id == "project-input"
+        return "project-1"
+
+    def _fake_resolve_room(room: str | None) -> str | None:
+        assert room == "room-input"
+        return room
+
+    monkeypatch.setattr(room_connect, "get_client", _fake_get_client)
+    monkeypatch.setattr(room_connect, "resolve_project_id", _fake_resolve_project_id)
+    monkeypatch.setattr(room_connect, "resolve_room", _fake_resolve_room)
+    monkeypatch.setattr(
+        room_connect,
+        "meshagent_base_url",
+        lambda: "https://default.meshagent.test",
+    )
+    monkeypatch.delenv("MESHAGENT_API_URL", raising=False)
+
+    room_env = await room_connect._connect_room_env(
+        project_id="project-input",
+        room="room-input",
+    )
+
+    assert room_env.api_url == "https://default.meshagent.test"
+    assert room_env.room_name == "connected-room"
+    assert room_env.room_url == "https://room-proxy.meshagent.test/rooms/connected-room"
+    assert room_env.token == "room-jwt"
+    assert account_client.closed is True
+
+
+def test_room_connect_requires_command_after_separator() -> None:
+    result = CliRunner().invoke(
+        get_command(root_cli.app),
+        ["room", "connect", "--"],
+    )
+
+    assert result.exit_code == 2
+    assert "Pass the local command after --" in result.output

meshagent_cli-0.36.2/meshagent/cli/version.py

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

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/meshagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.36.1
+Version: 0.36.2
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -20,21 +20,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.36.1; extra == "all"
-Requires-Dist: meshagent-api[all]~=0.36.1; extra == "all"
-Requires-Dist: meshagent-computers~=0.36.1; extra == "all"
-Requires-Dist: meshagent-openai~=0.36.1; extra == "all"
-Requires-Dist: meshagent-anthropic~=0.36.1; extra == "all"
-Requires-Dist: meshagent-codex~=0.36.1; extra == "all"
-Requires-Dist: meshagent-mcp~=0.36.1; extra == "all"
-Requires-Dist: meshagent-tools~=0.36.1; extra == "all"
+Requires-Dist: meshagent-agents[all]~=0.36.2; extra == "all"
+Requires-Dist: meshagent-api[all]~=0.36.2; extra == "all"
+Requires-Dist: meshagent-computers~=0.36.2; extra == "all"
+Requires-Dist: meshagent-openai~=0.36.2; extra == "all"
+Requires-Dist: meshagent-anthropic~=0.36.2; extra == "all"
+Requires-Dist: meshagent-codex~=0.36.2; extra == "all"
+Requires-Dist: meshagent-mcp~=0.36.2; extra == "all"
+Requires-Dist: meshagent-tools~=0.36.2; 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.36.1; extra == "mcp-service"
-Requires-Dist: meshagent-api~=0.36.1; extra == "mcp-service"
-Requires-Dist: meshagent-mcp~=0.36.1; extra == "mcp-service"
-Requires-Dist: meshagent-tools~=0.36.1; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]~=0.36.2; extra == "mcp-service"
+Requires-Dist: meshagent-api~=0.36.2; extra == "mcp-service"
+Requires-Dist: meshagent-mcp~=0.36.2; extra == "mcp-service"
+Requires-Dist: meshagent-tools~=0.36.2; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 
 # [Meshagent](https://www.meshagent.com)

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/meshagent_cli.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ meshagent/cli/async_typer.py
 meshagent/cli/async_typer_test.py
 meshagent/cli/auth.py
 meshagent/cli/auth_async.py
+meshagent/cli/auth_async_test.py
 meshagent/cli/call.py
 meshagent/cli/chatbot.py
 meshagent/cli/cli.py
@@ -46,6 +47,8 @@ meshagent/cli/projects.py
 meshagent/cli/queue.py
 meshagent/cli/queue_test.py
 meshagent/cli/room.py
+meshagent/cli/room_connect.py
+meshagent/cli/room_connect_test.py
 meshagent/cli/room_services.py
 meshagent/cli/rooms.py
 meshagent/cli/root_commands.py

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/meshagent_cli.egg-info/requires.txt

@@ -11,20 +11,20 @@ textual<2.0,>=0.50
 prompt-toolkit~=3.0.52
 
 [all]
-meshagent-agents[all]~=0.36.1
-meshagent-api[all]~=0.36.1
-meshagent-computers~=0.36.1
-meshagent-openai~=0.36.1
-meshagent-anthropic~=0.36.1
-meshagent-codex~=0.36.1
-meshagent-mcp~=0.36.1
-meshagent-tools~=0.36.1
+meshagent-agents[all]~=0.36.2
+meshagent-api[all]~=0.36.2
+meshagent-computers~=0.36.2
+meshagent-openai~=0.36.2
+meshagent-anthropic~=0.36.2
+meshagent-codex~=0.36.2
+meshagent-mcp~=0.36.2
+meshagent-tools~=0.36.2
 supabase-auth~=2.28.0
 prompt-toolkit~=3.0.52
 
 [mcp-service]
-meshagent-agents[all]~=0.36.1
-meshagent-api~=0.36.1
-meshagent-mcp~=0.36.1
-meshagent-tools~=0.36.1
+meshagent-agents[all]~=0.36.2
+meshagent-api~=0.36.2
+meshagent-mcp~=0.36.2
+meshagent-tools~=0.36.2
 supabase-auth~=2.28.0

{meshagent_cli-0.36.1 → meshagent_cli-0.36.2}/pyproject.toml

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

meshagent_cli-0.36.1/meshagent/cli/version.py

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