meshagent-cli 0.5.1__tar.gz → 0.5.2__tar.gz

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.5.1
+Version: 0.5.2
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,12 +10,12 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: typer~=0.15
 Requires-Dist: pydantic-yaml~=1.4
-Requires-Dist: meshagent-api~=0.5.1
-Requires-Dist: meshagent-agents~=0.5.1
-Requires-Dist: meshagent-computers~=0.5.1
-Requires-Dist: meshagent-openai~=0.5.1
-Requires-Dist: meshagent-tools~=0.5.1
-Requires-Dist: meshagent-mcp~=0.5.1
+Requires-Dist: meshagent-api~=0.5.2
+Requires-Dist: meshagent-agents~=0.5.2
+Requires-Dist: meshagent-computers~=0.5.2
+Requires-Dist: meshagent-openai~=0.5.2
+Requires-Dist: meshagent-tools~=0.5.2
+Requires-Dist: meshagent-mcp~=0.5.2
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
 Requires-Dist: opentelemetry-distro~=0.54b1

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/agent.py

@@ -1,6 +1,7 @@
 import typer
 from rich import print
 from typing import Annotated, Optional
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 import json
 import asyncio
 
@@ -13,7 +14,7 @@ from meshagent.api import (
 )
 from meshagent.cli.helper import resolve_project_id, resolve_api_key
 from meshagent.cli import async_typer
-from meshagent.cli.helper import get_client, resolve_token_jwt
+from meshagent.cli.helper import get_client, resolve_token_jwt, resolve_room
 
 app = async_typer.AsyncTyper()
 
@@ -21,9 +22,9 @@ app = async_typer.AsyncTyper()
 @app.async_command("ask")
 async def ask(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "user",
     agent: Annotated[str, typer.Option()],
@@ -39,6 +40,7 @@ async def ask(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
 
         key = (
             await account_client.decrypt_project_api_key(
@@ -93,10 +95,10 @@ async def ask(
 @app.async_command("invoke-tool")
 async def invoke_tool(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "user",
     toolkit: Annotated[str, typer.Option(..., help="Toolkit name")],
@@ -129,6 +131,7 @@ async def invoke_tool(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
 
         jwt = await resolve_token_jwt(
             project_id=project_id,
@@ -189,10 +192,10 @@ async def invoke_tool(
 @app.async_command("list-agents")
 async def list_agents_command(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "user",
 ):
@@ -203,6 +206,8 @@ async def list_agents_command(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
+
         jwt = await resolve_token_jwt(
             project_id=project_id,
             api_key_id=api_key_id,
@@ -243,10 +248,10 @@ async def list_agents_command(
 @app.async_command("list-toolkits")
 async def list_toolkits_command(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "user",
     participant_id: Annotated[
@@ -260,6 +265,7 @@ async def list_toolkits_command(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
         jwt = await resolve_token_jwt(
             project_id=project_id,
             api_key_id=api_key_id,

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/api_keys.py

@@ -1,10 +1,17 @@
 import typer
 import json
 from rich import print
-from typing import Annotated
+
+from meshagent.cli.common_options import ProjectIdOption
 from meshagent.cli import async_typer
-from meshagent.cli.helper import get_client, print_json_table
-from meshagent.cli.helper import resolve_project_id, set_active_api_key
+from meshagent.cli.helper import (
+    get_client,
+    print_json_table,
+    resolve_project_id,
+    set_active_api_key,
+)
+from meshagent.cli.common_options import OutputFormatOption
+
 
 app = async_typer.AsyncTyper(help="Manage or activate api-keys for your project")
 
@@ -12,15 +19,8 @@ app = async_typer.AsyncTyper(help="Manage or activate api-keys for your project"
 @app.async_command("list")
 async def list(
     *,
-    project_id: str = None,
-    o: Annotated[
-        str,
-        typer.Option(
-            "--output",
-            "-o",
-            help="output format [json|table]",
-        ),
-    ] = "table",
+    project_id: ProjectIdOption = None,
+    o: OutputFormatOption = "table",
 ):
     project_id = await resolve_project_id(project_id=project_id)
     client = await get_client()
@@ -39,7 +39,9 @@ async def list(
 
 
 @app.async_command("create")
-async def create(*, project_id: str = None, name: str, description: str = ""):
+async def create(
+    *, project_id: ProjectIdOption = None, name: str, description: str = ""
+):
     project_id = await resolve_project_id(project_id=project_id)
 
     client = await get_client()
@@ -51,7 +53,7 @@ async def create(*, project_id: str = None, name: str, description: str = ""):
 
 
 @app.async_command("delete")
-async def delete(*, project_id: str = None, id: str):
+async def delete(*, project_id: ProjectIdOption = None, id: str):
     project_id = await resolve_project_id(project_id=project_id)
 
     client = await get_client()
@@ -60,7 +62,7 @@ async def delete(*, project_id: str = None, id: str):
 
 
 @app.async_command("show")
-async def show(*, project_id: str = None, api_key_id: str):
+async def show(*, project_id: ProjectIdOption = None, api_key_id: str):
     client = await get_client()
     try:
         project_id = await resolve_project_id(project_id=project_id)
@@ -76,7 +78,7 @@ async def show(*, project_id: str = None, api_key_id: str):
 @app.async_command("activate")
 async def activate(
     api_key_id: str | None = typer.Argument(None),
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     interactive: bool = typer.Option(
         False,
         "-i",

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/call.py

@@ -1,6 +1,7 @@
 import typer
 from rich import print
 from typing import Annotated, Optional
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 import json
 import aiohttp
 from meshagent.api import (
@@ -13,7 +14,7 @@ from meshagent.api.helpers import meshagent_base_url, 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
-from meshagent.cli.helper import resolve_api_key
+from meshagent.cli.helper import resolve_api_key, resolve_room
 from urllib.parse import urlparse
 from pathlib import PurePath
 import socket
@@ -69,9 +70,9 @@ def is_local_url(url: str) -> bool:
 @app.async_command("tool")
 async def make_call(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
+    api_key_id: ApiKeyIdOption = None,
     role: str = "agent",
     local: Optional[bool] = None,
     agent_name: Annotated[
@@ -109,6 +110,7 @@ async def make_call(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
 
         key = (
             await account_client.decrypt_project_api_key(

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/chatbot.py

@@ -1,6 +1,11 @@
 import typer
 from rich import print
 from typing import Annotated, Optional
+from meshagent.cli.common_options import (
+    ProjectIdOption,
+    ApiKeyIdOption,
+    RoomOption,
+)
 from meshagent.tools import Toolkit
 from meshagent.api import RoomClient, WebSocketClientProtocol
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
@@ -118,9 +123,9 @@ def build_chatbot(
 @app.async_command("join")
 async def make_call(
     *,
-    project_id: str = None,
-    room: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
+    api_key_id: ApiKeyIdOption = None,
     role: str = "agent",
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     token_path: Annotated[Optional[str], typer.Option()] = None,
@@ -157,7 +162,6 @@ async def make_call(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
-
         room = resolve_room(room)
         jwt = await resolve_token_jwt(
             project_id=project_id,
@@ -215,7 +219,7 @@ async def make_call(
 @app.async_command("service")
 async def service(
     *,
-    room: Annotated[Optional[str], typer.Option()] = None,
+    room: RoomOption = None,
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     rules_file: Optional[str] = None,

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/cli_mcp.py

@@ -5,6 +5,7 @@ from mcp.client.stdio import stdio_client, StdioServerParameters
 import typer
 from rich import print
 from typing import Annotated, Optional, List
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
 from meshagent.api import RoomClient, WebSocketClientProtocol, RoomException
@@ -33,10 +34,10 @@ app = async_typer.AsyncTyper()
 @app.async_command("sse")
 async def sse(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "tool",
     url: Annotated[str, typer.Option()],
@@ -49,7 +50,6 @@ async def sse(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
-
         room = resolve_room(room)
         jwt = await resolve_token_jwt(
             project_id=project_id,
@@ -101,10 +101,10 @@ async def sse(
 @app.async_command("stdio")
 async def stdio(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "tool",
     command: Annotated[str, typer.Option()],
@@ -118,7 +118,6 @@ async def stdio(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
-
         room = resolve_room(room)
         jwt = await resolve_token_jwt(
             project_id=project_id,

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/cli_secrets.py

@@ -3,7 +3,8 @@
 # --------------------------------------------------------------------------
 import typer
 from rich import print
-from typing import Annotated, Dict, Optional
+from typing import Annotated, Dict
+from meshagent.cli.common_options import ProjectIdOption
 
 from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client, print_json_table, resolve_project_id
@@ -52,7 +53,7 @@ keys_app = async_typer.AsyncTyper(
 @keys_app.async_command("create")
 async def create_keys_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     name: Annotated[str, typer.Option(help="Secret name")],
     data: Annotated[
         str,
@@ -85,7 +86,7 @@ async def create_keys_secret(
 @keys_app.async_command("update")
 async def update_keys_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     secret_id: Annotated[str, typer.Option(help="Existing secret ID")],
     name: Annotated[str, typer.Option(help="Secret name")],
     data: Annotated[
@@ -127,7 +128,7 @@ docker_app = async_typer.AsyncTyper(
 @docker_app.async_command("create")
 async def create_docker_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     name: Annotated[str, typer.Option(help="Secret name")],
     server: Annotated[
         str, typer.Option(help="Docker registry server, e.g. index.docker.io")
@@ -165,7 +166,7 @@ async def create_docker_secret(
 @docker_app.async_command("update")
 async def update_docker_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     secret_id: Annotated[str, typer.Option(help="Existing secret ID")],
     name: Annotated[str, typer.Option(help="Secret name")],
     server: Annotated[str, typer.Option(help="Docker registry server")],
@@ -210,7 +211,7 @@ acr_app = async_typer.AsyncTyper(
 @acr_app.async_command("create")
 async def create_acr_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     name: Annotated[str, typer.Option(help="Secret name")],
     server: Annotated[str, typer.Option(help="ACR server, e.g. myregistry.azurecr.io")],
     username: Annotated[str, typer.Option(help="Service principal ID")],
@@ -240,7 +241,7 @@ async def create_acr_secret(
 @acr_app.async_command("update")
 async def update_acr_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     secret_id: Annotated[str, typer.Option(help="Existing secret ID")],
     name: Annotated[str, typer.Option(help="Secret name")],
     server: Annotated[str, typer.Option(help="ACR server, e.g. myregistry.azurecr.io")],
@@ -280,7 +281,7 @@ gar_app = async_typer.AsyncTyper(
 @gar_app.async_command("create")
 async def create_gar_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     name: Annotated[str, typer.Option(help="Secret name")],
     server: Annotated[str, typer.Option(help="GAR host, e.g. us-west1-docker.pkg.dev")],
     json_key: Annotated[
@@ -313,7 +314,7 @@ async def create_gar_secret(
 @gar_app.async_command("update")
 async def update_gar_secret(
     *,
-    project_id: Optional[str] = typer.Option(None),
+    project_id: ProjectIdOption = None,
     secret_id: Annotated[str, typer.Option(help="Existing secret ID")],
     name: Annotated[str, typer.Option(help="Secret name")],
     server: Annotated[str, typer.Option(help="GAR host, e.g. us-west1-docker.pkg.dev")],
@@ -347,7 +348,7 @@ async def update_gar_secret(
 
 
 @secrets_app.async_command("list")
-async def secret_list(*, project_id: Optional[str] = None):
+async def secret_list(*, project_id: ProjectIdOption = None):
     """List all secrets in the project (typed as Docker/ACR/GAR or Keys secrets)."""
     client = await get_client()
     try:
@@ -382,7 +383,7 @@ async def secret_list(*, project_id: Optional[str] = None):
 @secrets_app.async_command("delete")
 async def secret_delete(
     *,
-    project_id: Optional[str] = None,
+    project_id: ProjectIdOption = None,
     secret_id: Annotated[str, typer.Argument(help="ID of the secret to delete")],
 ):
     """Delete a secret."""

meshagent_cli-0.5.2/meshagent/cli/common_options.py

@@ -0,0 +1,31 @@
+import typer
+from typing import Annotated, Optional
+
+OutputFormatOption = Annotated[
+    str,
+    typer.Option("--output", "-o", help="output format [json|table]"),
+]
+
+ProjectIdOption = Annotated[
+    Optional[str],
+    typer.Option(
+        "--project-id",
+        help="A MeshAgent project id. If empty, the activated project will be used.",
+    ),
+]
+
+ApiKeyIdOption = Annotated[
+    Optional[str],
+    typer.Option(
+        "--api-key-id",
+        help="A MeshAgent project API key id. If empty, the activated api key will be used.",
+    ),
+]
+
+RoomOption = Annotated[
+    Optional[str],
+    typer.Option(
+        "--room",
+        help="Room name. If empty, the MESHAGENT_ROOM environment variable will be used.",
+    ),
+]

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/developer.py

@@ -2,9 +2,15 @@ import asyncio
 import json
 import typer
 from rich import print
-from typing import Annotated, Optional
+from typing import Annotated
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 from meshagent.cli import async_typer
-from meshagent.cli.helper import get_client, resolve_project_id, resolve_api_key
+from meshagent.cli.helper import (
+    get_client,
+    resolve_project_id,
+    resolve_api_key,
+    resolve_room,
+)
 from meshagent.api import RoomClient, ParticipantToken, WebSocketClientProtocol
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
 
@@ -14,14 +20,9 @@ app = async_typer.AsyncTyper()
 @app.async_command("watch")
 async def watch_logs(
     *,
-    project_id: Annotated[
-        Optional[str],
-        typer.Option(
-            ..., help="Project ID (if not set, will try to use the active project)"
-        ),
-    ] = None,
-    room: Annotated[str, typer.Option(..., help="Name of the room to connect to")],
-    api_key_id: Annotated[Optional[str], typer.Option(..., help="API Key ID")] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: Annotated[
         str, typer.Option(..., help="Role to assign to this participant")
@@ -36,6 +37,7 @@ async def watch_logs(
         # Resolve project ID (or fetch from the active project if not provided)
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
 
         # Decrypt the project's API key
         key = (

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/exec.py

@@ -5,6 +5,7 @@ from meshagent.api.websocket_protocol import WebSocketClientProtocol
 from meshagent.api import RoomClient
 from meshagent.api.helpers import websocket_room_url
 from typing import Annotated, Optional
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 import asyncio
 import typer
 from rich import print
@@ -23,6 +24,7 @@ from meshagent.cli.helper import (
     get_client,
     resolve_project_id,
     resolve_api_key,
+    resolve_room,
 )
 
 
@@ -30,11 +32,11 @@ def register(app: typer.Typer):
     @app.async_command("exec")
     async def exec_command(
         *,
-        project_id: str = None,
-        room: Annotated[str, typer.Option()],
+        project_id: ProjectIdOption = None,
+        room: RoomOption,
         name: Annotated[Optional[str], typer.Option()] = None,
         image: Annotated[Optional[str], typer.Option()] = None,
-        api_key_id: Annotated[Optional[str], typer.Option()] = None,
+        api_key_id: ApiKeyIdOption = None,
         command: Annotated[list[str], typer.Argument(...)] = None,
         tty: bool = False,
         room_storage_path: str = "/data",
@@ -46,6 +48,7 @@ def register(app: typer.Typer):
             api_key_id = await resolve_api_key(
                 project_id=project_id, api_key_id=api_key_id
             )
+            room = resolve_room(room)
 
             token = ParticipantToken(
                 name="tty", project_id=project_id, api_key_id=api_key_id

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/helper.py

@@ -4,7 +4,6 @@ from rich.table import Table
 from pydantic import BaseModel
 from pathlib import Path
 from typing import Optional
-
 from meshagent.cli import auth_async
 from meshagent.cli import async_typer
 from meshagent.api.helpers import meshagent_base_url

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/mailbot.py

@@ -4,6 +4,11 @@ import typer
 from meshagent.api import ParticipantToken
 from rich import print
 from typing import Annotated, Optional
+from meshagent.cli.common_options import (
+    ProjectIdOption,
+    ApiKeyIdOption,
+    RoomOption,
+)
 from meshagent.tools import Toolkit
 from meshagent.api import RoomClient, WebSocketClientProtocol
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
@@ -118,9 +123,9 @@ def build_mailbot(
 @app.async_command("join")
 async def make_call(
     *,
-    project_id: str = None,
-    room: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
+    api_key_id: ApiKeyIdOption = None,
     role: str = "agent",
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     token_path: Annotated[Optional[str], typer.Option()] = None,
@@ -205,7 +210,7 @@ async def make_call(
 @app.async_command("service")
 async def service(
     *,
-    room: Annotated[Optional[str], typer.Option()] = None,
+    room: RoomOption = None,
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     rules_file: Optional[str] = None,

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/messaging.py

@@ -1,6 +1,11 @@
 import typer
 from rich import print
 from typing import Annotated, Optional
+from meshagent.cli.common_options import (
+    ProjectIdOption,
+    ApiKeyIdOption,
+    RoomOption,
+)
 import json
 
 from meshagent.api import RoomClient, WebSocketClientProtocol
@@ -20,10 +25,10 @@ app = async_typer.AsyncTyper()
 @app.async_command("list-participants")
 async def messaging_list_participants_command(
     *,
-    project_id: str = None,
-    room: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option()] = "cli",
     role: str = "user",
 ):
@@ -74,10 +79,10 @@ async def messaging_list_participants_command(
 @app.async_command("send")
 async def messaging_send_command(
     *,
-    project_id: str = None,
-    room: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option()] = "cli",
     role: str = "user",
     to_participant_id: Annotated[
@@ -145,10 +150,10 @@ async def messaging_send_command(
 @app.async_command("broadcast")
 async def messaging_broadcast_command(
     *,
-    project_id: str = None,
-    room: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option()] = "cli",
     role: str = "user",
     data: Annotated[str, typer.Option(..., help="JSON message to broadcast")],

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/participant_token.py

@@ -1,8 +1,9 @@
 import typer
 from rich import print
-from typing import Annotated, Optional
+from typing import Annotated
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 from meshagent.api import ParticipantToken
-from meshagent.cli.helper import resolve_project_id, resolve_api_key
+from meshagent.cli.helper import resolve_project_id, resolve_api_key, resolve_room
 from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client
 import pathlib
@@ -13,10 +14,10 @@ app = async_typer.AsyncTyper()
 @app.async_command("generate")
 async def generate(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     token_path: Annotated[str, typer.Option()],
-    room: Annotated[str, typer.Option()],
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    room: RoomOption,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option()],
     role: str = "agent",
 ):
@@ -24,7 +25,7 @@ async def generate(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id=project_id, api_key_id=api_key_id)
-
+        room = resolve_room(room)
         key = (
             await client.decrypt_project_api_key(project_id=project_id, id=api_key_id)
         )["token"]

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/projects.py

@@ -1,6 +1,5 @@
 import typer
 from rich import print
-from typing import Annotated
 from meshagent.cli import async_typer
 from meshagent.cli.helper import (
     get_client,
@@ -8,6 +7,7 @@ from meshagent.cli.helper import (
     set_active_project,
     get_active_project,
 )
+from meshagent.cli.common_options import OutputFormatOption
 
 app = async_typer.AsyncTyper(help="Manage or activate your meshagent projects")
 
@@ -24,14 +24,7 @@ async def create(name: str):
 
 @app.async_command("list")
 async def list(
-    o: Annotated[
-        str,
-        typer.Option(
-            "--output",
-            "-o",
-            help="output format [json|table]",
-        ),
-    ] = "table",
+    o: OutputFormatOption = "table",
 ):
     client = await get_client()
     projects = await client.list_projects()

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/queue.py

@@ -1,6 +1,7 @@
 import typer
 from rich import print
 from typing import Annotated, Optional
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 import json as _json
 
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
@@ -10,7 +11,7 @@ from meshagent.api import (
     WebSocketClientProtocol,
     RoomException,
 )
-from meshagent.cli.helper import resolve_project_id, resolve_api_key
+from meshagent.cli.helper import resolve_project_id, resolve_api_key, resolve_room
 from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client
 
@@ -20,9 +21,9 @@ app = async_typer.AsyncTyper(help="Use queues in a room")
 @app.async_command("send")
 async def send(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "user",
     queue: Annotated[str, typer.Option(..., help="Queue name")],
@@ -36,6 +37,7 @@ async def send(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
 
         key = (
             await account_client.decrypt_project_api_key(
@@ -74,9 +76,9 @@ async def send(
 @app.async_command("receive")
 async def receive(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option()],
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "user",
     queue: Annotated[str, typer.Option(..., help="Queue name")],
@@ -85,6 +87,7 @@ async def receive(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
 
         key = (
             await account_client.decrypt_project_api_key(

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/services.py

@@ -4,6 +4,7 @@
 import typer
 from rich import print
 from typing import Annotated, List, Optional, Dict
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption
 from aiohttp import ClientResponseError
 from datetime import datetime, timezone
 from pydantic import PositiveInt
@@ -18,6 +19,7 @@ from meshagent.cli.helper import (
     print_json_table,
     resolve_project_id,
     resolve_api_key,
+    resolve_room,
 )
 from meshagent.api import (
     ParticipantToken,
@@ -26,6 +28,7 @@ from meshagent.api import (
     websocket_room_url,
     meshagent_base_url,
 )
+from meshagent.cli.common_options import OutputFormatOption
 
 from pydantic_yaml import parse_yaml_raw_as
 
@@ -92,7 +95,7 @@ def _parse_port_spec(spec: str) -> PortSpec:
 @app.async_command("create")
 async def service_create(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     file: Annotated[
         Optional[str],
         typer.Option("--file", "-f", help="File path to a service definition"),
@@ -200,7 +203,7 @@ async def service_create(
 @app.async_command("update")
 async def service_update(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     id: Optional[str] = None,
     file: Annotated[
         Optional[str],
@@ -332,8 +335,8 @@ async def service_update(
 @app.async_command("test")
 async def service_test(
     *,
-    project_id: str = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    api_key_id: ApiKeyIdOption = None,
     file: Annotated[
         Optional[str],
         typer.Option("--file", "-f", help="File path to a service definition"),
@@ -388,8 +391,8 @@ async def service_test(
     my_client = await get_client()
     try:
         project_id = await resolve_project_id(project_id)
-
         api_key_id = await resolve_api_key(project_id, api_key_id)
+        room = resolve_room(room)
 
         if file is not None:
             with open(file, "rb") as f:
@@ -467,7 +470,7 @@ async def service_test(
 @app.async_command("show")
 async def service_show(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     service_id: Annotated[str, typer.Argument(help="ID of the service to delete")],
 ):
     """Show a services for the project."""
@@ -485,10 +488,8 @@ async def service_show(
 @app.async_command("list")
 async def service_list(
     *,
-    project_id: str = None,
-    o: Annotated[
-        str, typer.Option("--output", "-o", help="output format [json|table]")
-    ] = "table",
+    project_id: ProjectIdOption = None,
+    o: OutputFormatOption = "table",
 ):
     """List all services for the project."""
     client = await get_client()
@@ -511,7 +512,7 @@ async def service_list(
 @app.async_command("delete")
 async def service_delete(
     *,
-    project_id: Optional[str] = None,
+    project_id: ProjectIdOption = None,
     service_id: Annotated[str, typer.Argument(help="ID of the service to delete")],
 ):
     """Delete a service."""

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/sessions.py

@@ -1,11 +1,12 @@
 from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client, print_json_table, resolve_project_id
+from meshagent.cli.common_options import ProjectIdOption
 
 app = async_typer.AsyncTyper()
 
 
 @app.async_command("list")
-async def list(*, project_id: str = None):
+async def list(*, project_id: ProjectIdOption = None):
     client = await get_client()
     sessions = await client.list_recent_sessions(
         project_id=await resolve_project_id(project_id=project_id)
@@ -15,7 +16,7 @@ async def list(*, project_id: str = None):
 
 
 @app.async_command("show")
-async def show(*, project_id: str = None, session_id: str):
+async def show(*, project_id: ProjectIdOption = None, session_id: str):
     client = await get_client()
     events = await client.list_session_events(
         project_id=await resolve_project_id(project_id=project_id),

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/storage.py

@@ -1,5 +1,6 @@
 import typer
 from typing import Annotated, Optional
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 from rich import print
 import os
 import fnmatch
@@ -56,10 +57,10 @@ def split_glob_subpath(subpath: str):
 @app.async_command("exists")
 async def storage_exists_command(
     *,
-    project_id: str = None,
-    room: Annotated[str, typer.Option(..., help="Room name")],
+    project_id: ProjectIdOption = None,
+    room: RoomOption,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option(..., help="API Key ID")] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "user",
     path: str,
@@ -102,14 +103,10 @@ async def storage_exists_command(
 @app.async_command("cp")
 async def storage_cp_command(
     *,
-    project_id: str = None,
-    room: Annotated[
-        str, typer.Option(..., help="Room name (if copying to/from remote)")
-    ],
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[
-        str, typer.Option(..., help="API Key ID (if copying to/from remote)")
-    ] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[
         str, typer.Option(..., help="Participant name (if copying to/from remote)")
     ] = "cli",
@@ -351,16 +348,10 @@ async def storage_cp_command(
 @app.async_command("show")
 async def storage_show_command(
     *,
-    project_id: Annotated[
-        Optional[str], typer.Option(..., help="Project ID (if remote)")
-    ] = None,
-    room: Annotated[
-        Optional[str], typer.Option(..., help="Room name (if remote)")
-    ] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[
-        Optional[str], typer.Option(..., help="API Key ID (if remote)")
-    ] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[
         Optional[str], typer.Option(..., help="Participant name (if remote)")
     ] = None,
@@ -444,16 +435,10 @@ async def storage_show_command(
 @app.async_command("rm")
 async def storage_rm_command(
     *,
-    project_id: Annotated[
-        Optional[str], typer.Option(..., help="Project ID (if remote)")
-    ] = None,
-    room: Annotated[
-        Optional[str], typer.Option(..., help="Room name (if remote)")
-    ] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[
-        Optional[str], typer.Option(..., help="API Key ID (if remote)")
-    ] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[
         Optional[str], typer.Option(..., help="Participant name (if remote)")
     ] = None,
@@ -665,16 +650,10 @@ async def storage_rm_command(
 @app.async_command("ls")
 async def storage_ls_command(
     *,
-    project_id: Annotated[
-        Optional[str], typer.Option(..., help="Project ID (if remote)")
-    ] = None,
-    room: Annotated[
-        Optional[str], typer.Option(..., help="Room name (if remote)")
-    ] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
     token_path: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[
-        Optional[str], typer.Option(..., help="API Key ID (if remote)")
-    ] = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[
         Optional[str], typer.Option(..., help="Participant name (if remote)")
     ] = None,
@@ -698,6 +677,8 @@ async def storage_ls_command(
     client = None
     storage_client: Optional[StorageClient] = None
 
+    room = resolve_room(room)
+
     # --- Set up remote connection if needed ---
     async def ensure_storage_client():
         nonlocal account_client, client, storage_client, project_id, api_key_id

meshagent_cli-0.5.2/meshagent/cli/version.py

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

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/voicebot.py

@@ -1,6 +1,7 @@
 import typer
 from rich import print
 from typing import Annotated, Optional
+from meshagent.cli.common_options import ProjectIdOption, ApiKeyIdOption, RoomOption
 from meshagent.api import RoomClient, WebSocketClientProtocol, RoomException
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
 from meshagent.cli import async_typer
@@ -35,9 +36,9 @@ app = async_typer.AsyncTyper(help="Join a voicebot to a room")
 @app.async_command("join")
 async def make_call(
     *,
-    project_id: str = None,
-    room: Annotated[Optional[str], typer.Option()] = None,
-    api_key_id: Annotated[Optional[str], typer.Option()] = None,
+    project_id: ProjectIdOption = None,
+    room: RoomOption = None,
+    api_key_id: ApiKeyIdOption = None,
     name: Annotated[str, typer.Option(..., help="Participant name")] = "cli",
     role: str = "agent",
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
@@ -59,7 +60,6 @@ async def make_call(
     try:
         project_id = await resolve_project_id(project_id=project_id)
         api_key_id = await resolve_api_key(project_id, api_key_id)
-
         room = resolve_room(room)
         jwt = await resolve_token_jwt(
             project_id=project_id,
@@ -118,7 +118,7 @@ async def make_call(
 @app.async_command("service")
 async def service(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     rules_file: Optional[str] = None,

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent/cli/webhook.py

@@ -2,6 +2,7 @@ import typer
 from rich import print
 import json
 from typing import Annotated, List, Optional
+from meshagent.cli.common_options import ProjectIdOption
 
 from meshagent.cli import async_typer
 from meshagent.cli.helper import get_client, print_json_table, resolve_project_id
@@ -16,7 +17,7 @@ app = async_typer.AsyncTyper()
 @app.async_command("create")
 async def webhook_create(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     name: Annotated[str, typer.Option(help="Friendly name for the webhook")],
     url: Annotated[str, typer.Option(help="Target URL that will receive POSTs")],
     event: Annotated[
@@ -63,7 +64,7 @@ async def webhook_create(
 @app.async_command("list")
 async def webhook_list(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
 ):
     """List all webhooks for the project."""
     client = await get_client()
@@ -86,7 +87,7 @@ async def webhook_list(
 @app.async_command("delete")
 async def webhook_delete(
     *,
-    project_id: str = None,
+    project_id: ProjectIdOption = None,
     webhook_id: Annotated[str, typer.Argument(help="ID of the webhook to delete")],
 ):
     """Delete a project webhook."""

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.5.1
+Version: 0.5.2
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,12 +10,12 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: typer~=0.15
 Requires-Dist: pydantic-yaml~=1.4
-Requires-Dist: meshagent-api~=0.5.1
-Requires-Dist: meshagent-agents~=0.5.1
-Requires-Dist: meshagent-computers~=0.5.1
-Requires-Dist: meshagent-openai~=0.5.1
-Requires-Dist: meshagent-tools~=0.5.1
-Requires-Dist: meshagent-mcp~=0.5.1
+Requires-Dist: meshagent-api~=0.5.2
+Requires-Dist: meshagent-agents~=0.5.2
+Requires-Dist: meshagent-computers~=0.5.2
+Requires-Dist: meshagent-openai~=0.5.2
+Requires-Dist: meshagent-tools~=0.5.2
+Requires-Dist: meshagent-mcp~=0.5.2
 Requires-Dist: supabase~=2.15
 Requires-Dist: fastmcp~=2.8
 Requires-Dist: opentelemetry-distro~=0.54b1

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent_cli.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ meshagent/cli/chatbot.py
 meshagent/cli/cli.py
 meshagent/cli/cli_mcp.py
 meshagent/cli/cli_secrets.py
+meshagent/cli/common_options.py
 meshagent/cli/developer.py
 meshagent/cli/exec.py
 meshagent/cli/helper.py

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/meshagent_cli.egg-info/requires.txt

@@ -1,11 +1,11 @@
 typer~=0.15
 pydantic-yaml~=1.4
-meshagent-api~=0.5.1
-meshagent-agents~=0.5.1
-meshagent-computers~=0.5.1
-meshagent-openai~=0.5.1
-meshagent-tools~=0.5.1
-meshagent-mcp~=0.5.1
+meshagent-api~=0.5.2
+meshagent-agents~=0.5.2
+meshagent-computers~=0.5.2
+meshagent-openai~=0.5.2
+meshagent-tools~=0.5.2
+meshagent-mcp~=0.5.2
 supabase~=2.15
 fastmcp~=2.8
 opentelemetry-distro~=0.54b1

{meshagent_cli-0.5.1 → meshagent_cli-0.5.2}/pyproject.toml

@@ -11,12 +11,12 @@ keywords = []
 dependencies = [
   "typer~=0.15",
   "pydantic-yaml~=1.4",
-  "meshagent-api~=0.5.1",
-  "meshagent-agents~=0.5.1",
-  "meshagent-computers~=0.5.1",
-  "meshagent-openai~=0.5.1",
-  "meshagent-tools~=0.5.1",
-  "meshagent-mcp~=0.5.1",
+  "meshagent-api~=0.5.2",
+  "meshagent-agents~=0.5.2",
+  "meshagent-computers~=0.5.2",
+  "meshagent-openai~=0.5.2",
+  "meshagent-tools~=0.5.2",
+  "meshagent-mcp~=0.5.2",
   "supabase~=2.15",
   "fastmcp~=2.8",
   "opentelemetry-distro~=0.54b1",

meshagent_cli-0.5.1/meshagent/cli/version.py

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