meshagent-cli 0.21.0__py3-none-any.whl → 0.23.0__py3-none-any.whl

meshagent/cli/cli.py

@@ -21,7 +21,7 @@ from meshagent.cli import voicebot
 from meshagent.cli import mailbot
 from meshagent.cli import worker
 from meshagent.cli import task_runner
-from meshagent.cli import oauth2
+from meshagent.cli import cli_secrets
 from meshagent.cli import helpers
 from meshagent.cli import meeting_transcriber
 from meshagent.cli import rooms
@@ -53,11 +53,11 @@ app.add_typer(auth.app, name="auth")
 app.add_typer(projects.app, name="project")
 app.add_typer(api_keys.app, name="api-key")
 app.add_typer(sessions.app, name="session")
-app.add_typer(participant_token.app, name="participant-token")
+app.add_typer(participant_token.app, name="token")
 app.add_typer(webhook.app, name="webhook")
 app.add_typer(services.app, name="service")
 app.add_typer(cli_mcp.app, name="mcp")
-app.add_typer(oauth2.app, name="oauth2")
+app.add_typer(cli_secrets.app, name="secrets")
 app.add_typer(helpers.app, name="helpers")
 app.add_typer(rooms.app, name="rooms")
 app.add_typer(mailboxes.app, name="mailbox")

meshagent/cli/helper.py

@@ -7,8 +7,14 @@ from typing import Optional
 from meshagent.cli import auth_async
 from meshagent.cli import async_typer
 from meshagent.api.helpers import meshagent_base_url
+from meshagent.api.specs.service import ServiceSpec
+from meshagent.agents.context import AgentChatContext
 from meshagent.api.client import Meshagent, RoomConnectionInfo
 import os
+import aiofiles
+from pydantic_yaml import parse_yaml_raw_as
+import json
+
 from rich import print
 
 SETTINGS_FILE = Path.home() / ".meshagent" / "project.json"
@@ -61,6 +67,8 @@ async def set_active_api_key(project_id: str, key: str):
 
 async def get_active_api_key(project_id: str):
     settings = _load_settings()
+    if settings is None:
+        return None
     key: str = settings.active_api_keys.get(project_id)
     # Ignore old keys, API key format changed
     if key is not None and key.startswith("ma-"):
@@ -76,7 +84,7 @@ class CustomMeshagentClient(Meshagent):
     async def connect_room(self, *, project_id: str, room: str) -> RoomConnectionInfo:
         from urllib.parse import quote
 
-        jwt = os.getenv("MESHAGENT_SESSION_TOKEN")
+        jwt = os.getenv("MESHAGENT_TOKEN")
 
         if jwt is not None and room == os.getenv("MESHAGENT_ROOM"):
             return RoomConnectionInfo(
@@ -151,6 +159,32 @@ async def resolve_project_id(project_id: Optional[str] = None):
     return project_id
 
 
+async def init_context_from_spec(context: AgentChatContext) -> None:
+    path = os.getenv("MESHAGENT_SPEC_PATH")
+
+    if path is None:
+        return None
+
+    async with aiofiles.open(path, "r") as file:
+        spec_str = await file.read()
+        try:
+            json.loads(spec_str)
+            spec = ServiceSpec.model_validate_json(spec_str)
+        except ValueError:
+            # fallback on yaml parser if spec can't
+            spec = parse_yaml_raw_as(ServiceSpec, spec_str)
+
+        readme = spec.metadata.annotations.get("meshagent.service.readme")
+
+        if spec.metadata.description:
+            context.append_assistant_message(
+                f"This agent's description:\n{spec.metadata.description}"
+            )
+
+        if readme is not None:
+            context.append_assistant_message(f"This agent's README:\n{readme}")
+
+
 async def resolve_key(project_id: str | None, key: str | None):
     project_id = await resolve_project_id(project_id=project_id)
     if key is None:
@@ -159,7 +193,7 @@ async def resolve_key(project_id: str | None, key: str | None):
     if key is None:
         key = os.getenv("MESHAGENT_API_KEY")
 
-    if key is None:
+    if key is None and os.getenv("MESHAGENT_TOKEN") is None:
         print(
             "[red]--key is required if MESHAGENT_API_KEY is not set. You can use meshagent api-key create to create a new api key."
         )
@@ -192,6 +226,10 @@ def cleanup_args(args: list[str]):
             pass
         elif args[i].startswith("--room="):
             pass
+        elif args[i] == "deploy":
+            pass
+        elif args[i] == "spec":
+            pass
         else:
             out.append(args[i])
         i += 1

meshagent/cli/helpers.py

@@ -36,7 +36,6 @@ async def helpers_service():
     class Runner(LLMTaskRunner):
         def __init__(self, **kwargs):
             super().__init__(
-                name="meshagent.runner",
                 title="Generic Task Runner",
                 description="an agent that will perform a task with the selected tools",
                 llm_adapter=OpenAIResponsesAdapter(model="gpt-5.2"),
@@ -68,7 +67,6 @@ async def helpers_service():
     class Planner(LLMTaskRunner):
         def __init__(self, **kwargs):
             super().__init__(
-                name="meshagent.planner",
                 title="Generic Task Runner (Legacy)",
                 description="an agent that will perform a task with the selected tools",
                 llm_adapter=OpenAIResponsesAdapter(model="gpt-5.2"),
@@ -86,7 +84,6 @@ async def helpers_service():
     class DynamicPlanner(DynamicLLMTaskRunner):
         def __init__(self, **kwargs):
             super().__init__(
-                name="meshagent.schema_planner",
                 title="Schema Task Runner",
                 description="an agent that can produces output that matches a schema",
                 llm_adapter=OpenAIResponsesAdapter(model="gpt-5.2"),

meshagent/cli/host.py

@@ -1,12 +1,16 @@
 from meshagent.api.services import ServiceHost
 from meshagent.api.specs.service import ServiceSpec
 import asyncio
+from meshagent.agents import Agent
 
 
 options = {"deferred": False}
 services = {}
 
 
+agents: list[tuple[Agent, str]] = []
+
+
 def set_deferred(deferred: bool):
     options["deferred"] = deferred
 

meshagent/cli/mailbot.py

@@ -1,6 +1,7 @@
 import typer
 from meshagent.cli import async_typer
 from rich import print
+import os
 
 from meshagent.api import ParticipantToken
 from typing import Annotated, Optional
@@ -19,6 +20,7 @@ from meshagent.cli.helper import (
     cleanup_args,
 )
 from meshagent.openai import OpenAIResponsesAdapter
+from meshagent.anthropic import AnthropicOpenAIResponsesStreamAdapter
 
 from meshagent.agents.config import RulesConfig
 
@@ -64,7 +66,6 @@ app = async_typer.AsyncTyper(help="Join a mailbot to a room")
 def build_mailbot(
     *,
     model: str,
-    agent_name: str,
     rule: List[str],
     toolkit: List[str],
     schema: List[str],
@@ -76,7 +77,7 @@ def build_mailbot(
         Optional[bool], typer.Option(..., help="Enable web search tool calling")
     ] = False,
     toolkit_name: Optional[str] = None,
-    queue: str,
+    queue: Optional[str] = None,
     email_address: str,
     room_rules_paths: list[str],
     whitelist=list[str],
@@ -96,9 +97,10 @@ def build_mailbot(
     skill_dirs: Optional[list[str]] = None,
     shell_image: Optional[str] = None,
     llm_participant: Optional[str] = None,
+    delegate_shell_token: Optional[bool] = None,
     log_llm_requests: Optional[bool] = None,
 ):
-    from meshagent.agents.mail import MailWorker
+    from meshagent.agents.mail import MailBot
 
     if (require_storage or require_read_only_storage) and len(whitelist) == 0:
         logger.warning(
@@ -122,7 +124,7 @@ def build_mailbot(
         except FileNotFoundError:
             print(f"[yellow]rules file not found at {rules_file}[/yellow]")
 
-    BaseClass = MailWorker
+    BaseClass = MailBot
     if llm_participant:
         llm_adapter = MessageStreamLLMAdapter(
             participant_name=llm_participant,
@@ -139,10 +141,16 @@ def build_mailbot(
             )
 
         else:
-            llm_adapter = OpenAIResponsesAdapter(
-                model=model,
-                log_requests=log_llm_requests,
-            )
+            if model.startswith("claude-"):
+                llm_adapter = AnthropicOpenAIResponsesStreamAdapter(
+                    model=model,
+                    log_requests=log_llm_requests,
+                )
+            else:
+                llm_adapter = OpenAIResponsesAdapter(
+                    model=model,
+                    log_requests=log_llm_requests,
+                )
 
     parsed_whitelist = []
     if len(whitelist) > 0:
@@ -156,7 +164,6 @@ def build_mailbot(
         def __init__(self):
             super().__init__(
                 llm_adapter=llm_adapter,
-                name=agent_name,
                 requires=requirements,
                 toolkits=toolkits,
                 queue=queue,
@@ -169,6 +176,14 @@ def build_mailbot(
                 skill_dirs=skill_dirs,
             )
 
+        async def init_chat_context(self):
+            from meshagent.cli.helper import init_context_from_spec
+
+            context = await super().init_chat_context()
+            await init_context_from_spec(context)
+
+            return context
+
         async def start(self, *, room: RoomClient):
             print(
                 "[bold green]Configure and send an email interact with your mailbot[/bold green]"
@@ -231,12 +246,17 @@ def build_mailbot(
                     LocalShellTool(thread_context=thread_context)
                 )
 
+            env = {}
+            if delegate_shell_token:
+                env["MESHAGENT_TOKEN"] = self.room.protocol.token
+
             if require_shell:
                 thread_toolkit.tools.append(
                     ShellTool(
                         working_directory=working_directory,
                         config=ShellConfig(name="shell"),
                         image=shell_image or "python:3.13",
+                        env=env,
                     )
                 )
 
@@ -316,12 +336,14 @@ def build_mailbot(
 
 
 @app.async_command("join")
-async def make_call(
+async def join(
     *,
     project_id: ProjectIdOption,
     room: RoomOption,
     role: str = "agent",
-    agent_name: Annotated[str, typer.Option(..., help="Name of the agent to call")],
+    agent_name: Annotated[
+        Optional[str], typer.Option(..., help="Name of the agent to call")
+    ] = None,
     rule: Annotated[List[str], typer.Option("--rule", "-r", help="a system rule")] = [],
     rules_file: Optional[str] = None,
     require_toolkit: Annotated[
@@ -365,7 +387,9 @@ async def make_call(
         str,
         typer.Option("--key", help="an api key to sign the token with"),
     ] = None,
-    queue: Annotated[str, typer.Option(..., help="the name of the mail queue")],
+    queue: Annotated[
+        Optional[str], typer.Option(..., help="the name of the mail queue")
+    ] = None,
     email_address: Annotated[
         str, typer.Option(..., help="the email address of the agent")
     ],
@@ -451,6 +475,10 @@ async def make_call(
         Optional[str],
         typer.Option(..., help="an image tag to use to run shell commands in"),
     ] = None,
+    delegate_shell_token: Annotated[
+        Optional[bool],
+        typer.Option(..., help="Delegate the room token to shell tools"),
+    ] = False,
     log_llm_requests: Annotated[
         Optional[bool],
         typer.Option(..., help="log all requests to the llm"),
@@ -464,69 +492,84 @@ async def make_call(
 
         room = resolve_room(room)
 
-        token = ParticipantToken(
-            name=agent_name,
-        )
+        jwt = os.getenv("MESHAGENT_TOKEN")
+        if jwt is None:
+            if agent_name is None:
+                print(
+                    "[bold red]--agent-name must be specified when the MESHAGENT_TOKEN environment variable is not set[/bold red]"
+                )
+                raise typer.Exit(1)
 
-        token.add_api_grant(ApiScope.agent_default(tunnels=require_computer_use))
+            token = ParticipantToken(
+                name=agent_name,
+            )
+
+            token.add_api_grant(ApiScope.agent_default(tunnels=require_computer_use))
 
-        token.add_role_grant(role=role)
-        token.add_room_grant(room)
+            token.add_role_grant(role=role)
+            token.add_room_grant(room)
 
-        jwt = token.to_jwt(api_key=key)
+            jwt = token.to_jwt(api_key=key)
 
         print("[bold green]Connecting to room...[/bold green]", flush=True)
-        async with RoomClient(
-            protocol=WebSocketClientProtocol(
-                url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
-                token=jwt,
-            )
-        ) as client:
-            CustomMailbot = build_mailbot(
-                computer_use=None,
-                model=model,
-                local_shell=require_local_shell,
-                agent_name=agent_name,
-                rule=rule,
-                schema=require_schema + schema,
-                toolkit=require_toolkit + toolkit,
-                image_generation=None,
-                web_search=require_web_search,
-                rules_file=rules_file,
-                queue=queue,
-                email_address=email_address,
-                toolkit_name=toolkit_name,
-                room_rules_paths=room_rules,
-                whitelist=whitelist,
-                require_shell=require_shell,
-                require_apply_patch=require_apply_patch,
-                require_storage=require_storage,
-                require_read_only_storage=require_read_only_storage,
-                require_time=require_time,
-                require_uuid=require_uuid,
-                require_table_read=require_table_read,
-                require_table_write=require_table_write,
-                require_computer_use=require_computer_use,
-                reply_all=reply_all,
-                database_namespace=database_namespace,
-                enable_attachments=enable_attachments,
-                working_directory=working_directory,
-                skill_dirs=skill_dir,
-                shell_image=shell_image,
-                llm_participant=llm_participant,
-                log_llm_requests=log_llm_requests,
-            )
+        CustomMailbot = build_mailbot(
+            computer_use=None,
+            model=model,
+            local_shell=require_local_shell,
+            rule=rule,
+            schema=require_schema + schema,
+            toolkit=require_toolkit + toolkit,
+            image_generation=None,
+            web_search=require_web_search,
+            rules_file=rules_file,
+            queue=queue,
+            email_address=email_address,
+            toolkit_name=toolkit_name,
+            room_rules_paths=room_rules,
+            whitelist=whitelist,
+            require_shell=require_shell,
+            require_apply_patch=require_apply_patch,
+            require_storage=require_storage,
+            require_read_only_storage=require_read_only_storage,
+            require_time=require_time,
+            require_uuid=require_uuid,
+            require_table_read=require_table_read,
+            require_table_write=require_table_write,
+            require_computer_use=require_computer_use,
+            reply_all=reply_all,
+            database_namespace=database_namespace,
+            enable_attachments=enable_attachments,
+            working_directory=working_directory,
+            skill_dirs=skill_dir,
+            shell_image=shell_image,
+            llm_participant=llm_participant,
+            delegate_shell_token=delegate_shell_token,
+            log_llm_requests=log_llm_requests,
+        )
 
-            bot = CustomMailbot()
+        bot = CustomMailbot()
 
-            await bot.start(room=client)
-            try:
-                print(
-                    flush=True,
+        if get_deferred():
+            from meshagent.cli.host import agents
+
+            agents.append((bot, jwt))
+        else:
+            async with RoomClient(
+                protocol=WebSocketClientProtocol(
+                    url=websocket_room_url(
+                        room_name=room, base_url=meshagent_base_url()
+                    ),
+                    token=jwt,
                 )
-                await client.protocol.wait_for_close()
-            except KeyboardInterrupt:
-                await bot.stop()
+            ) as client:
+                await bot.start(room=client)
+                try:
+                    print(
+                        flush=True,
+                    )
+                    await client.protocol.wait_for_close()
+                except KeyboardInterrupt:
+                    await bot.stop()
 
     finally:
         await account_client.close()
@@ -588,7 +631,9 @@ async def service(
     path: Annotated[
         Optional[str], typer.Option(help="HTTP path to mount the service at")
     ] = None,
-    queue: Annotated[str, typer.Option(..., help="the name of the mail queue")],
+    queue: Annotated[
+        Optional[str], typer.Option(..., help="the name of the mail queue")
+    ] = None,
     email_address: Annotated[
         str, typer.Option(..., help="the email address of the agent")
     ],
@@ -674,6 +719,10 @@ async def service(
         Optional[str],
         typer.Option(..., help="an image tag to use to run shell commands in"),
     ] = None,
+    delegate_shell_token: Annotated[
+        Optional[bool],
+        typer.Option(..., help="Delegate the room token to shell tools"),
+    ] = False,
     log_llm_requests: Annotated[
         Optional[bool],
         typer.Option(..., help="log all requests to the llm"),
@@ -688,7 +737,7 @@ async def service(
             path = f"/agent{i}"
 
     service.agents.append(
-        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "ChatBot"})
+        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "MailBot"})
     )
 
     service.add_path(
@@ -700,7 +749,6 @@ async def service(
             model=model,
             local_shell=require_local_shell,
             web_search=require_web_search,
-            agent_name=agent_name,
             rule=rule,
             schema=require_schema + schema,
             toolkit=require_toolkit + toolkit,
@@ -726,6 +774,7 @@ async def service(
             skill_dirs=skill_dir,
             shell_image=shell_image,
             llm_participant=llm_participant,
+            delegate_shell_token=delegate_shell_token,
             log_llm_requests=log_llm_requests,
         ),
     )
@@ -798,7 +847,9 @@ async def spec(
     path: Annotated[
         Optional[str], typer.Option(help="HTTP path to mount the service at")
     ] = None,
-    queue: Annotated[str, typer.Option(..., help="the name of the mail queue")],
+    queue: Annotated[
+        Optional[str], typer.Option(..., help="the name of the mail queue")
+    ] = None,
     email_address: Annotated[
         str, typer.Option(..., help="the email address of the agent")
     ],
@@ -884,6 +935,10 @@ async def spec(
         Optional[str],
         typer.Option(..., help="an image tag to use to run shell commands in"),
     ] = None,
+    delegate_shell_token: Annotated[
+        Optional[bool],
+        typer.Option(..., help="Delegate the room token to shell tools"),
+    ] = False,
     log_llm_requests: Annotated[
         Optional[bool],
         typer.Option(..., help="log all requests to the llm"),
@@ -898,7 +953,7 @@ async def spec(
             path = f"/agent{i}"
 
     service.agents.append(
-        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "ChatBot"})
+        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "MailBot"})
     )
 
     service.add_path(
@@ -910,7 +965,6 @@ async def spec(
             model=model,
             local_shell=require_local_shell,
             web_search=require_web_search,
-            agent_name=agent_name,
             rule=rule,
             schema=require_schema + schema,
             toolkit=require_toolkit + toolkit,
@@ -936,6 +990,7 @@ async def spec(
             skill_dirs=skill_dir,
             shell_image=shell_image,
             llm_participant=llm_participant,
+            delegate_shell_token=delegate_shell_token,
             log_llm_requests=log_llm_requests,
         ),
     )
@@ -1021,7 +1076,9 @@ async def deploy(
     path: Annotated[
         Optional[str], typer.Option(help="HTTP path to mount the service at")
     ] = None,
-    queue: Annotated[str, typer.Option(..., help="the name of the mail queue")],
+    queue: Annotated[
+        Optional[str], typer.Option(..., help="the name of the mail queue")
+    ] = None,
     email_address: Annotated[
         str, typer.Option(..., help="the email address of the agent")
     ],
@@ -1107,6 +1164,10 @@ async def deploy(
         Optional[str],
         typer.Option(..., help="an image tag to use to run shell commands in"),
     ] = None,
+    delegate_shell_token: Annotated[
+        Optional[bool],
+        typer.Option(..., help="Delegate the room token to shell tools"),
+    ] = False,
     log_llm_requests: Annotated[
         Optional[bool],
         typer.Option(..., help="log all requests to the llm"),
@@ -1128,7 +1189,7 @@ async def deploy(
             path = f"/agent{i}"
 
     service.agents.append(
-        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "ChatBot"})
+        AgentSpec(name=agent_name, annotations={ANNOTATION_AGENT_TYPE: "MailBot"})
     )
 
     service.add_path(
@@ -1140,7 +1201,6 @@ async def deploy(
             model=model,
             local_shell=require_local_shell,
             web_search=require_web_search,
-            agent_name=agent_name,
             rule=rule,
             schema=require_schema + schema,
             toolkit=require_toolkit + toolkit,
@@ -1166,6 +1226,7 @@ async def deploy(
             skill_dirs=skill_dir,
             shell_image=shell_image,
             llm_participant=llm_participant,
+            delegate_shell_token=delegate_shell_token,
             log_llm_requests=log_llm_requests,
         ),
     )

meshagent/cli/meeting_transcriber.py

@@ -12,7 +12,7 @@ from meshagent.cli.helper import (
     resolve_room,
     resolve_key,
 )
-
+import os
 from meshagent.api import RequiredSchema
 from meshagent.api.services import ServiceHost
 
@@ -24,7 +24,9 @@ async def join(
     *,
     project_id: ProjectIdOption,
     room: RoomOption,
-    agent_name: Annotated[str, typer.Option(..., help="Name of the agent")],
+    agent_name: Annotated[
+        Optional[str], typer.Option(..., help="Name of the agent")
+    ] = None,
     key: Annotated[
         str,
         typer.Option("--key", help="an api key to sign the token with"),
@@ -47,16 +49,24 @@ async def join(
         project_id = await resolve_project_id(project_id=project_id)
         room = resolve_room(room)
 
-        token = ParticipantToken(
-            name=agent_name,
-        )
+        jwt = os.getenv("MESHAGENT_TOKEN")
+        if jwt is None:
+            if agent_name is None:
+                print(
+                    "[bold red]--agent-name must be specified when the MESHAGENT_TOKEN environment variable is not set[/bold red]"
+                )
+                raise typer.Exit(1)
+
+            token = ParticipantToken(
+                name=agent_name,
+            )
 
-        token.add_api_grant(ApiScope.agent_default())
+            token.add_api_grant(ApiScope.agent_default())
 
-        token.add_role_grant(role="agent")
-        token.add_room_grant(room)
+            token.add_role_grant(role="agent")
+            token.add_room_grant(room)
 
-        jwt = token.to_jwt(api_key=key)
+            jwt = token.to_jwt(api_key=key)
 
         print("[bold green]Connecting to room...[/bold green]", flush=True)
         async with RoomClient(
@@ -70,7 +80,6 @@ async def join(
             requirements.append(RequiredSchema(name="transcript"))
 
             bot = MeetingTranscriber(
-                name=agent_name,
                 requires=requirements,
             )
 
@@ -123,7 +132,6 @@ async def service(
     class CustomMeetingTranscriber(MeetingTranscriber):
         def __init__(self):
             super().__init__(
-                name=agent_name,
                 requires=requirements,
             )
 

meshagent/cli/messaging.py

@@ -19,7 +19,7 @@ from meshagent.cli.helper import (
 app = async_typer.AsyncTyper(help="Send and receive messages in a room")
 
 
-@app.async_command("list-participants", help="List messaging-enabled participants")
+@app.async_command("list", help="List messaging-enabled participants")
 async def messaging_list_participants_command(
     *,
     project_id: ProjectIdOption,
@@ -46,7 +46,6 @@ async def messaging_list_participants_command(
         ) as client:
             # Must enable before we can see who else is enabled
             await client.messaging.enable()
-            await client.messaging.start()
 
             participants = client.messaging.get_participants()
             output = []
@@ -92,7 +91,6 @@ async def messaging_send_command(
         ) as client:
             # Create and enable messaging
             await client.messaging.enable()
-            await client.messaging.start()
 
             # Find the participant we want to message
             participant = None
@@ -147,7 +145,6 @@ async def messaging_broadcast_command(
         ) as client:
             # Create and enable messaging
             await client.messaging.enable()
-            await client.messaging.start()
 
             # Broadcast the message
             await client.messaging.broadcast_message(