meshagent-cli 0.0.27__py3-none-any.whl → 0.0.29__py3-none-any.whl

meshagent/cli/cli_mcp.py

@@ -5,7 +5,7 @@ from mcp.client.stdio import stdio_client, StdioServerParameters
 
 import typer
 from rich import print
-from typing import Annotated, Optional
+from typing import Annotated, Optional, List
 
 from meshagent.api.helpers import meshagent_base_url, websocket_room_url
 from meshagent.api import RoomClient, ParticipantToken, WebSocketClientProtocol, RoomException
@@ -21,13 +21,17 @@ from pathlib import Path
 from meshagent.api.services import ServiceHost
 import os
 
+from meshagent.cli.services import _kv_to_dict
 
 import shlex
 
 app = async_typer.AsyncTyper()
 
 @app.async_command("sse")
-async def sse(*, project_id: str = None, room: Annotated[str, typer.Option()], token_path: Annotated[Optional[str], typer.Option()] = None, api_key_id: Annotated[Optional[str], typer.Option()] = None, name: Annotated[str, typer.Option(..., help="Participant name")] = "cli", role: str = "tool", url: Annotated[str, typer.Option()]):
+async def sse(*, project_id: str = None, room: Annotated[str, typer.Option()], token_path: Annotated[Optional[str], typer.Option()] = None, api_key_id: Annotated[Optional[str], typer.Option()] = None, name: Annotated[str, typer.Option(..., help="Participant name")] = "cli", role: str = "tool", url: Annotated[str, typer.Option()], toolkit_name: Annotated[Optional[str], typer.Option()] = None):
+    if toolkit_name == None:
+        toolkit_name = "mcp"
+
     account_client = await get_client()
     try:
         project_id = await resolve_project_id(project_id=project_id)
@@ -44,7 +48,7 @@ async def sse(*, project_id: str = None, room: Annotated[str, typer.Option()], t
                     
                     mcp_tools_response = await session.list_tools()
                     
-                    toolkit = MCPToolkit(name=name, session=session, tools=mcp_tools_response.tools)
+                    toolkit = MCPToolkit(name=toolkit_name, session=session, tools=mcp_tools_response.tools)
                     
                     remote_toolkit = RemoteToolkit(name=toolkit.name, tools=toolkit.tools, title=toolkit.title, description=toolkit.description)
 
@@ -61,7 +65,10 @@ async def sse(*, project_id: str = None, room: Annotated[str, typer.Option()], t
         await account_client.close()
 
 @app.async_command("stdio")
-async def stdio(*, project_id: str = None, room: Annotated[str, typer.Option()], token_path: Annotated[Optional[str], typer.Option()] = None, api_key_id: Annotated[Optional[str], typer.Option()] = None, name: Annotated[str, typer.Option(..., help="Participant name")] = "cli", role: str = "tool", command: Annotated[str, typer.Option()]):
+async def stdio(*, project_id: str = None, room: Annotated[str, typer.Option()], token_path: Annotated[Optional[str], typer.Option()] = None, api_key_id: Annotated[Optional[str], typer.Option()] = None, name: Annotated[str, typer.Option(..., help="Participant name")] = "cli", role: str = "tool", command: Annotated[str, typer.Option()], toolkit_name: Annotated[Optional[str], typer.Option()] = None, env: Annotated[List[str], typer.Option("--env", "-e", help="KEY=VALUE")] = []):
+    if toolkit_name == None:
+        toolkit_name = "mcp"
+
     account_client = await get_client()
     try:
         project_id = await resolve_project_id(project_id=project_id)
@@ -77,14 +84,14 @@ async def stdio(*, project_id: str = None, room: Annotated[str, typer.Option()],
             async with stdio_client(StdioServerParameters(
                     command=parsed_command[0],  # Executable
                     args=parsed_command[1:],  # Optional command line arguments
-                    env=None,  # Optional environment variables
+                    env=_kv_to_dict(env),  # Optional environment variables
                 )) as (read_stream, write_stream):
 
                 async with ClientSession(read_stream=read_stream, write_stream=write_stream) as session:
                     
                     mcp_tools_response = await session.list_tools()
                     
-                    toolkit = MCPToolkit(name=name, session=session, tools=mcp_tools_response.tools)
+                    toolkit = MCPToolkit(name=toolkit_name, session=session, tools=mcp_tools_response.tools)
                     
                     remote_toolkit = RemoteToolkit(name=toolkit.name, tools=toolkit.tools, title=toolkit.title, description=toolkit.description)
 
@@ -102,7 +109,7 @@ async def stdio(*, project_id: str = None, room: Annotated[str, typer.Option()],
 
 
 @app.async_command("stdio-service")
-async def stdio_host(*,  command: Annotated[str, typer.Option()],  host: Annotated[Optional[str], typer.Option()] = None, port: Annotated[Optional[int], typer.Option()] = None, webhook_secret: Annotated[Optional[str], typer.Option()] = None, path: Annotated[Optional[str], typer.Option()] = None):
+async def stdio_host(*,  command: Annotated[str, typer.Option()],  host: Annotated[Optional[str], typer.Option()] = None, port: Annotated[Optional[int], typer.Option()] = None, webhook_secret: Annotated[Optional[str], typer.Option()] = None, path: Annotated[Optional[str], typer.Option()] = None, toolkit_name: Annotated[Optional[str], typer.Option()] = None, env: Annotated[List[str], typer.Option("--env", "-e", help="KEY=VALUE")] = []):
     
     try:
         
@@ -111,14 +118,17 @@ async def stdio_host(*,  command: Annotated[str, typer.Option()],  host: Annotat
         async with stdio_client(StdioServerParameters(
                 command=parsed_command[0],  # Executable
                 args=parsed_command[1:],  # Optional command line arguments
-                env=None,  # Optional environment variables
+                env=_kv_to_dict(env),  # Optional environment variables
             )) as (read_stream, write_stream):
 
             async with ClientSession(read_stream=read_stream, write_stream=write_stream) as session:
-                
+
                 mcp_tools_response = await session.list_tools()
                 
-                toolkit = MCPToolkit(name="mcp", session=session, tools=mcp_tools_response.tools)
+                if toolkit_name == None:
+                    toolkit_name = "mcp"
+
+                toolkit = MCPToolkit(name=toolkit_name, session=session, tools=mcp_tools_response.tools)
                 
                 if port == None:
 

meshagent/cli/version.py

@@ -1 +1 @@
-__version__ = "0.0.27"
+__version__ = "0.0.29"

{meshagent_cli-0.0.27.dist-info → meshagent_cli-0.0.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.0.27
+Version: 0.0.29
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -10,10 +10,10 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: typer~=0.15.3
 Requires-Dist: pydantic-yaml~=1.4.0
-Requires-Dist: meshagent-api~=0.0.27
-Requires-Dist: meshagent-agents~=0.0.27
-Requires-Dist: meshagent-tools~=0.0.27
-Requires-Dist: meshagent-mcp~=0.0.27
+Requires-Dist: meshagent-api~=0.0.29
+Requires-Dist: meshagent-agents~=0.0.29
+Requires-Dist: meshagent-tools~=0.0.29
+Requires-Dist: meshagent-mcp~=0.0.29
 Requires-Dist: supabase~=2.15.1
 
 ### Meshagent CLI

{meshagent_cli-0.0.27.dist-info → meshagent_cli-0.0.29.dist-info}/RECORD

@@ -7,7 +7,7 @@ meshagent/cli/auth_async.py,sha256=LArKxTxQAPmItv0JaGkW3Ybutl6MVmb6_EeSjI18IbI,4
 meshagent/cli/call.py,sha256=M8oMo-hsYIzQzMF0OMNdJuoYCjDwtYUtdV1hCwZs0co,4610
 meshagent/cli/chatbot.py,sha256=ylW_jSvY1OWDs7LPsyEIz8-x_BaInnIgmpcQZqwOdmg,3016
 meshagent/cli/cli.py,sha256=G7RAwd3LzS4LHpvyCD51XS0vjwR2Ml7feUfBP2VdwUs,1338
-meshagent/cli/cli_mcp.py,sha256=rHU5rZFJMPiYRWMHvrQub15gIqAuLDS979Q-fMJJ2BU,6830
+meshagent/cli/cli_mcp.py,sha256=-H4DtUGXZeWT2P7P9_5hOLRDq_l9xr1NoRLW_vDToRo,7462
 meshagent/cli/cli_secrets.py,sha256=U0kdzN3zt7JIqzdRLynAjxdvAsI0enesBd_m7TeXjnQ,13629
 meshagent/cli/developer.py,sha256=5eoDr3kfi-IufA5d6OESqNr739Bdut_IFBtT3nq0xZU,3002
 meshagent/cli/helper.py,sha256=hcY6C5BqGnYmwFVIG7nS9NPIZXbdpOoEna-t0mYmHGY,4632
@@ -17,11 +17,11 @@ meshagent/cli/projects.py,sha256=Tut8kRCVvgdWzlAR1Zqf0QxAi4sNfQEIHY9zxfS1nuI,110
 meshagent/cli/services.py,sha256=5uVfW8LX8IJ_Y03bkaC7wYvuLJltlAhhqNonavgqHqs,11042
 meshagent/cli/sessions.py,sha256=WWvuztYqRfthSq6ztwL_eQ_sz9JRc33jcN6p7YyM_Fs,782
 meshagent/cli/storage.py,sha256=BsagaJfThrUWqXFyAk9IvQtUuDAMckE2mffZ_peozMo,33555
-meshagent/cli/version.py,sha256=XJ5NZRv5ahaSlYm7_PUNTixULma76xIxwxi2Yy6Eb8w,23
+meshagent/cli/version.py,sha256=x-mEbDNfu7r2SKAGR0A7P0FwPyhhSxJRlutHkucLsHk,23
 meshagent/cli/voicebot.py,sha256=svsCqz4kP-Xm9uw68SDsmeiezFZpuiakmSdR5nHLTAM,3264
 meshagent/cli/webhook.py,sha256=KBl8U1TcOX3z2uoyH4YMuUuw0vSVX7xpRxYvzxI5c-Y,2811
-meshagent_cli-0.0.27.dist-info/METADATA,sha256=PKyGr5KRC-zC36UeZgEpElCYb5UXVWe10VyVlZ-4flM,605
-meshagent_cli-0.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_cli-0.0.27.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
-meshagent_cli-0.0.27.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_cli-0.0.27.dist-info/RECORD,,
+meshagent_cli-0.0.29.dist-info/METADATA,sha256=FTwd-E8lAc2jbITtu5uiHRMjEbufxZGHSjHOM0w1pws,605
+meshagent_cli-0.0.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_cli-0.0.29.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
+meshagent_cli-0.0.29.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_cli-0.0.29.dist-info/RECORD,,