meshagent-cli 0.44.13__tar.gz → 0.45.1__tar.gz

{meshagent_cli-0.44.13 → meshagent_cli-0.45.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.44.13
+Version: 0.45.1
 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.44.13
-Requires-Dist: meshagent-codex==0.44.13
+Requires-Dist: meshagent-llm-proxy==0.45.1
+Requires-Dist: meshagent-codex==0.45.1
 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.44.13; extra == "all"
-Requires-Dist: meshagent-api[all]==0.44.13; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.44.13; extra == "all"
-Requires-Dist: meshagent-scrapy==0.44.13; extra == "all"
-Requires-Dist: meshagent-computers==0.44.13; extra == "all"
-Requires-Dist: meshagent-openai==0.44.13; extra == "all"
-Requires-Dist: meshagent-anthropic==0.44.13; extra == "all"
-Requires-Dist: meshagent-otel==0.44.13; extra == "all"
-Requires-Dist: meshagent-mcp==0.44.13; extra == "all"
-Requires-Dist: meshagent-tools==0.44.13; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.45.1; extra == "all"
+Requires-Dist: meshagent-api[all]==0.45.1; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.45.1; extra == "all"
+Requires-Dist: meshagent-scrapy==0.45.1; extra == "all"
+Requires-Dist: meshagent-computers==0.45.1; extra == "all"
+Requires-Dist: meshagent-openai==0.45.1; extra == "all"
+Requires-Dist: meshagent-anthropic==0.45.1; extra == "all"
+Requires-Dist: meshagent-otel==0.45.1; extra == "all"
+Requires-Dist: meshagent-mcp==0.45.1; extra == "all"
+Requires-Dist: meshagent-tools==0.45.1; 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.44.13; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.44.13; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.44.13; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.44.13; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.45.1; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.45.1; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.45.1; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.45.1; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 
@@ -56,7 +56,7 @@ Dynamic: license-file
 
 ## MeshAgent CLI
 
-The ``meshagent.cli`` package installs everything you need to streamline room and agent management from your terminal. The CLI assembles submodules for authentication, projects, API keys, participant tokens, messaging, storage, agents, webhooks, and more. 
+The ``meshagent.cli`` package installs everything you need to streamline room and agent management from your terminal. The CLI assembles submodules for authentication, projects, API keys, participant tokens, messaging, storage, agents, and more.
 Check out the [CLI Quickstart](https://docs.meshagent.com/cli/getting_started) for more details.
 
 ---

{meshagent_cli-0.44.13 → meshagent_cli-0.45.1}/README.md

@@ -2,7 +2,7 @@
 
 ## MeshAgent CLI
 
-The ``meshagent.cli`` package installs everything you need to streamline room and agent management from your terminal. The CLI assembles submodules for authentication, projects, API keys, participant tokens, messaging, storage, agents, webhooks, and more. 
+The ``meshagent.cli`` package installs everything you need to streamline room and agent management from your terminal. The CLI assembles submodules for authentication, projects, API keys, participant tokens, messaging, storage, agents, and more.
 Check out the [CLI Quickstart](https://docs.meshagent.com/cli/getting_started) for more details.
 
 ---
@@ -12,4 +12,4 @@ Check out the [CLI Quickstart](https://docs.meshagent.com/cli/getting_started) f
 
 **Documentation**: [docs.meshagent.com](https://docs.meshagent.com/)
 
----
+---

{meshagent_cli-0.44.13 → meshagent_cli-0.45.1}/meshagent/cli/__init__.py

@@ -1,3 +1,3 @@
 from .version import __version__
 
-__all__ = [__version__]
+__all__ = ["__version__"]

{meshagent_cli-0.44.13 → meshagent_cli-0.45.1}/meshagent/cli/agents.py

@@ -6,7 +6,6 @@ import typer
 from rich import print
 
 from meshagent.api import RoomException
-from meshagent.api.client import NotFoundError
 from meshagent.api.managed_agents import ManagedAgentSpec
 from meshagent.agents.chat_client import ChatThreadSession, WebSocketChatClient
 from meshagent.agents.messages import (
@@ -23,8 +22,6 @@ from meshagent.cli.helper import get_client, print_json_table, resolve_project_i
 app = async_typer.AsyncTyper(
     help="Create, list, and manage managed agents in a project"
 )
-secret_app = async_typer.AsyncTyper(help="Manage secrets for a managed agent")
-app.add_typer(secret_app, name="secret", help="Manage secrets for a managed agent")
 
 
 def _maybe_parse_json_object(label: str, value: Optional[str]) -> Optional[dict]:
@@ -56,11 +53,6 @@ def _maybe_parse_string_dict_json(
     return output
 
 
-def _parse_secret_data(data: str) -> bytes:
-    parsed = _maybe_parse_json_object("data", data)
-    return json.dumps(parsed, separators=(",", ":")).encode("utf-8")
-
-
 async def _resolve_agent_id_or_fail(
     account_client,
     *,
@@ -716,142 +708,3 @@ async def agent_use_command(
         raise typer.Exit(1)
     finally:
         await account_client.close()
-
-
-@secret_app.async_command("list")
-async def agent_secret_list_command(
-    *,
-    project_id: ProjectIdOption,
-    id: Annotated[Optional[str], typer.Option(help="Agent ID (preferred)")] = None,
-    name: Annotated[Optional[str], typer.Option(help="Agent name")] = None,
-    o: OutputFormatOption = "table",
-):
-    account_client = await get_client()
-    try:
-        project_id = await resolve_project_id(project_id=project_id)
-        agent_id = await _resolve_agent_id_or_fail(
-            account_client, project_id=project_id, agent_id=id, agent_name=name
-        )
-        secrets = await account_client.list_agent_secrets(
-            project_id=project_id, agent_id=agent_id
-        )
-        output = [secret.model_dump(mode="json") for secret in secrets]
-        if o == "json":
-            print(json.dumps(output, indent=2))
-        elif output:
-            print_json_table(output, "id", "name", "type")
-        else:
-            print("No agent secrets found.")
-    except RoomException as ex:
-        print(f"[red]{ex}[/red]")
-        raise typer.Exit(1)
-    finally:
-        await account_client.close()
-
-
-@secret_app.async_command("get")
-async def agent_secret_get_command(
-    secret_id: Annotated[str, typer.Argument(help="Secret ID")],
-    *,
-    project_id: ProjectIdOption,
-    id: Annotated[Optional[str], typer.Option(help="Agent ID (preferred)")] = None,
-    name: Annotated[Optional[str], typer.Option(help="Agent name")] = None,
-    o: OutputFormatOption = "json",
-):
-    account_client = await get_client()
-    try:
-        project_id = await resolve_project_id(project_id=project_id)
-        agent_id = await _resolve_agent_id_or_fail(
-            account_client, project_id=project_id, agent_id=id, agent_name=name
-        )
-        secret = await account_client.get_agent_secret(
-            project_id=project_id, agent_id=agent_id, secret_id=secret_id
-        )
-        payload = secret.model_dump(mode="json")
-        if o == "json":
-            print(json.dumps(payload, indent=2))
-        else:
-            print_json_table([payload], "id", "name", "type")
-    except RoomException as ex:
-        print(f"[red]{ex}[/red]")
-        raise typer.Exit(1)
-    finally:
-        await account_client.close()
-
-
-@secret_app.async_command("set")
-async def agent_secret_set_command(
-    secret_id: Annotated[str, typer.Argument(help="Secret ID")],
-    *,
-    project_id: ProjectIdOption,
-    id: Annotated[Optional[str], typer.Option(help="Agent ID (preferred)")] = None,
-    name: Annotated[Optional[str], typer.Option(help="Agent name")] = None,
-    secret_name: Annotated[
-        Optional[str], typer.Option("--secret-name", help="Display name")
-    ] = None,
-    type: Annotated[str, typer.Option("--type", help="Secret content type")] = "keys",
-    data: Annotated[
-        str,
-        typer.Option(
-            "--data",
-            help='Secret data as a JSON object, for example \'{"OPENAI_API_KEY":"..."}\'',
-        ),
-    ],
-):
-    account_client = await get_client()
-    try:
-        project_id = await resolve_project_id(project_id=project_id)
-        agent_id = await _resolve_agent_id_or_fail(
-            account_client, project_id=project_id, agent_id=id, agent_name=name
-        )
-        secret_data = _parse_secret_data(data)
-        try:
-            await account_client.update_agent_secret(
-                project_id=project_id,
-                agent_id=agent_id,
-                secret_id=secret_id,
-                name=secret_name or secret_id,
-                type=type,
-                data=secret_data,
-            )
-            print(f"[green]Updated agent secret:[/] {secret_id}")
-        except NotFoundError:
-            created_id = await account_client.create_agent_secret(
-                project_id=project_id,
-                agent_id=agent_id,
-                secret_id=secret_id,
-                name=secret_name or secret_id,
-                type=type,
-                data=secret_data,
-            )
-            print(f"[green]Created agent secret:[/] {created_id}")
-    except RoomException as ex:
-        print(f"[red]{ex}[/red]")
-        raise typer.Exit(1)
-    finally:
-        await account_client.close()
-
-
-@secret_app.async_command("delete")
-async def agent_secret_delete_command(
-    secret_id: Annotated[str, typer.Argument(help="Secret ID")],
-    *,
-    project_id: ProjectIdOption,
-    id: Annotated[Optional[str], typer.Option(help="Agent ID (preferred)")] = None,
-    name: Annotated[Optional[str], typer.Option(help="Agent name")] = None,
-):
-    account_client = await get_client()
-    try:
-        project_id = await resolve_project_id(project_id=project_id)
-        agent_id = await _resolve_agent_id_or_fail(
-            account_client, project_id=project_id, agent_id=id, agent_name=name
-        )
-        await account_client.delete_agent_secret(
-            project_id=project_id, agent_id=agent_id, secret_id=secret_id
-        )
-        print("[bold cyan]Agent secret deleted.[/bold cyan]")
-    except RoomException as ex:
-        print(f"[red]{ex}[/red]")
-        raise typer.Exit(1)
-    finally:
-        await account_client.close()

{meshagent_cli-0.44.13 → meshagent_cli-0.45.1}/meshagent/cli/async_typer_test.py

@@ -59,7 +59,7 @@ def test_lazy_help_does_not_import_subcommands(monkeypatch) -> None:
 
     monkeypatch.setattr(importlib, "import_module", _fake_import_module)
 
-    result = CliRunner().invoke(async_typer.get_command(app), ["--help"])
+    result = CliRunner().invoke(app, ["--help"])
 
     assert result.exit_code == 0
     assert "child" in result.output
@@ -91,7 +91,7 @@ def test_lazy_subcommand_help_imports_only_selected_branch(monkeypatch) -> None:
 
     monkeypatch.setattr(importlib, "import_module", _fake_import_module)
 
-    result = CliRunner().invoke(async_typer.get_command(app), ["child", "--help"])
+    result = CliRunner().invoke(app, ["child", "--help"])
 
     assert result.exit_code == 0
     assert "hello" in result.output
@@ -124,7 +124,7 @@ def test_lazy_command_path_loads_leaf_command(monkeypatch) -> None:
 
     monkeypatch.setattr(importlib, "import_module", _fake_import_module)
 
-    result = CliRunner().invoke(async_typer.get_command(app), ["hello"])
+    result = CliRunner().invoke(app, ["hello"])
 
     assert result.exit_code == 0
     assert result.output == "hello\n"
@@ -157,7 +157,7 @@ def test_lazy_command_path_preserves_deprecated_option_aliases(monkeypatch) -> N
     monkeypatch.setattr(importlib, "import_module", _fake_import_module)
 
     result = CliRunner().invoke(
-        async_typer.get_command(app),
+        app,
         ["hello", "--require-web-search"],
     )
 
@@ -201,7 +201,7 @@ def test_deprecated_option_aliases_are_rewritten_before_parsing() -> None:
         )
 
     result = CliRunner().invoke(
-        async_typer.get_command(app),
+        app,
         ["--toolkit", "weather", "--require-web-search", "--no-require-time"],
     )
 

{meshagent_cli-0.44.13 → meshagent_cli-0.45.1}/meshagent/cli/call.py

@@ -6,16 +6,15 @@ from meshagent.cli.common_options import ProjectIdOption, RoomOption
 import json
 from meshagent.api import (
     RoomClient,
-    ParticipantToken,
     WebSocketClientProtocol,
-    ParticipantGrant,
     ApiScope,
 )
 from meshagent.api.http import new_client_session
 from meshagent.api.helpers import websocket_room_url
 from meshagent.api.services import send_webhook
 from meshagent.cli import async_typer
-from meshagent.cli.helper import get_client, resolve_project_id, resolve_key
+from meshagent.cli.helper import get_client, mint_participant_token_for_cli
+from meshagent.cli.helper import resolve_project_id
 from meshagent.cli.helper import resolve_room
 from urllib.parse import urlparse
 from pathlib import PurePath
@@ -102,21 +101,19 @@ async def make_call(
 ):
     """Send a `room.call` request to a URL or in-room agent."""
 
-    key = await resolve_key(project_id=project_id, key=key)
-
     if permissions is not None:
         with open(str(pathlib.Path(permissions).expanduser().resolve()), "rb") as f:
             spec = parse_yaml_raw_as(ParticipantTokenSpec, f.read())
-
-            token = ParticipantToken(
-                name=spec.identity,
-            )
-            token.add_role_grant(role=role)
-            token.add_room_grant(room)
-            token.add_api_grant(spec.api)
+            token_name = spec.identity
+            token_grants = [
+                {"name": "role", "scope": role},
+                {"name": "room", "scope": room},
+                {"name": "api", "scope": spec.api.model_dump(mode="json")},
+            ]
 
     else:
-        token = None
+        token_name = None
+        token_grants = None
 
     await _make_call(
         project_id=project_id,
@@ -126,7 +123,8 @@ async def make_call(
         participant_name=participant_name,
         url=url,
         arguments=arguments,
-        token=token,
+        token_name=token_name,
+        token_grants=token_grants,
         key=key,
     )
 
@@ -145,9 +143,10 @@ async def _make_call(
     arguments: Annotated[
         str, typer.Option(..., help="JSON string with arguments for the call")
     ] = {},
-    token: Optional[ParticipantToken] = None,
+    token_name: Optional[str] = None,
+    token_grants: Optional[list[dict]] = None,
     permissions: Optional[ApiScope] = None,
-    key: str,
+    key: str | None,
 ):
     """
     Instruct an agent to 'call' a given URL with specific arguments.
@@ -163,19 +162,26 @@ async def _make_call(
 
         room = resolve_room(room)
 
-        if token is None:
-            jwt = os.getenv("MESHAGENT_TOKEN")
-            if jwt is None:
-                token = ParticipantToken(
-                    name=participant_name,
-                )
-                token.add_api_grant(permissions or ApiScope.agent_default())
-                token.add_role_grant(role=role)
-                token.add_room_grant(room)
-                token.grants.append(ParticipantGrant(name="tunnel_ports", scope="9000"))
-                jwt = token.to_jwt(api_key=key)
-        else:
-            jwt = token.to_jwt(api_key=key)
+        jwt = os.getenv("MESHAGENT_TOKEN")
+        if jwt is None:
+            if token_grants is None:
+                token_grants = [
+                    {
+                        "name": "api",
+                        "scope": (permissions or ApiScope.agent_default()).model_dump(
+                            mode="json"
+                        ),
+                    },
+                    {"name": "role", "scope": role},
+                    {"name": "room", "scope": room},
+                    {"name": "tunnel_ports", "scope": "9000"},
+                ]
+            jwt = await mint_participant_token_for_cli(
+                project_id=project_id,
+                name=token_name or participant_name,
+                grants=token_grants,
+                key=key,
+            )
 
         if local is None:
             local = is_local_url(url)