meshagent-cli 0.0.34__py3-none-any.whl → 0.0.35__py3-none-any.whl

meshagent/cli/auth_async.py

@@ -58,7 +58,7 @@ async def _wait_for_code() -> str:
         return web.Response(status=400)
 
     app.add_routes([web.get("/callback", callback)])
-    runner = web.AppRunner(app)
+    runner = web.AppRunner(app, access_log=None)
     await runner.setup()
     site = web.TCPSite(runner, "localhost", REDIRECT_PORT)
     await site.start()

meshagent/cli/chatbot.py

@@ -45,8 +45,10 @@ async def make_call(
         
         print("[bold green]Connecting to room...[/bold green]")
         async with RoomClient(
-            protocol=WebSocketClientProtocol(url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
-                                            token=jwt)
+            protocol=WebSocketClientProtocol(
+                url=websocket_room_url(room_name=room, base_url=meshagent_base_url()),
+                token=jwt
+            )
         ) as client:
             
             requirements = []

meshagent/cli/cli.py

@@ -1,5 +1,6 @@
 import typer
 import asyncio
+from typing import Optional
 
 from meshagent.cli import auth
 from meshagent.cli import api_keys
@@ -41,6 +42,131 @@ app.add_typer(tty.app, name="tty")
 def _run_async(coro):
     asyncio.run(coro)
 
+
+import os, sys
+from pathlib import Path
+import typer
+from meshagent.cli.helper import get_client, set_active_project, get_active_project, resolve_project_id, resolve_api_key
+
+
+def detect_shell() -> str:
+    """
+    Best-effort detection of the *current* interactive shell.
+
+    Order of preference
+    1. Explicit --shell argument (handled by Typer)
+    2. Per-shell env vars set by the running shell
+       • BASH_VERSION / ZSH_VERSION / FISH_VERSION
+    3. $SHELL on POSIX (user’s login shell – still correct >90 % of the time)
+    4. Parent process on Windows (COMSPEC → cmd / powershell)
+    5. Safe default: 'bash'
+    """
+    # Per-shell version variables (works even if login shell ≠ current shell)
+    for var, name in (
+        ("ZSH_VERSION", "zsh"),
+        ("BASH_VERSION", "bash"),
+        ("FISH_VERSION", "fish"),
+    ):
+        if var in os.environ:
+            return name
+
+    # POSIX fallback: login shell path
+    sh = os.environ.get("SHELL")
+    if sh:
+        return Path(sh).name.lower()
+
+    # Windows heuristics
+    if sys.platform == "win32":
+        comspec = Path(os.environ.get("COMSPEC", "")).name.lower()
+        if "powershell" in comspec:
+            return "powershell"
+        if "cmd" in comspec:
+            return "cmd"
+        return "powershell"  # sensible default on modern Windows
+
+    # Last-ditch default
+    return "bash"
+
+
+def _bash_like(name: str, value: str, unset: bool) -> str:
+    return f'unset {name}' if unset else f'export {name}="{value}"'
+
+
+def _fish(name: str, value: str, unset: bool) -> str:
+    return f'set -e {name}' if unset else f'set -gx {name} "{value}"'
+
+
+def _powershell(name: str, value: str, unset: bool) -> str:
+    return f'Remove-Item Env:{name}' if unset else f'$Env:{name}="{value}"'
+
+
+def _cmd(name: str, value: str, unset: bool) -> str:
+    return f'set {name}=' if unset else f'set {name}={value}'
+
+
+SHELL_RENDERERS = {
+    "bash": _bash_like,
+    "zsh": _bash_like,
+    "fish": _fish,
+    "powershell": _powershell,
+    "cmd": _cmd,
+}
+
+
+@app.command(
+    "env",
+    help="Generate commands to set meshagent environment variables.",
+)
+def env(
+    shell: Optional[str] = typer.Option(None,
+        "--shell",
+        case_sensitive=False,
+        help="bash | zsh | fish | powershell | cmd",
+    ),
+    unset: bool = typer.Option(
+        False, "--unset", help="Output commands to unset the variables."
+    ),
+):
+    """Print shell-specific exports/unsets for Docker environment variables."""
+    
+    async def command():
+        nonlocal shell, unset
+        shell = (shell or detect_shell()).lower()
+        if shell not in SHELL_RENDERERS:
+            typer.echo(f"Unsupported shell '{shell}'.", err=True)
+            raise typer.Exit(code=1)
+
+        client = await get_client()
+        try:
+            project_id = await resolve_project_id(project_id=None)
+            api_key_id = await resolve_api_key(project_id=project_id, api_key_id=None)
+
+            token = (await client.decrypt_project_api_key(project_id=project_id, id=api_key_id))["token"]
+        finally:
+            await client.close()
+
+        vars = {
+            "MESHAGENT_PROJECT_ID" : project_id,
+            "MESHAGENT_API_KEY" : api_key_id,
+            "MESHAGENT_SECRET" : token
+        }
+        if shell not in SHELL_RENDERERS:
+            typer.echo(f"Unsupported shell '{shell}'.", err=True)
+            raise typer.Exit(code=1)
+
+        render = SHELL_RENDERERS[shell]
+
+        for name, value in vars.items():
+            typer.echo(render(name, value, unset))
+
+        if not unset and shell in ("bash", "zsh"):
+            typer.echo(
+                '\n# Run this command to configure your current shell:\n'
+                f'# eval "$(meshagent env)"'
+            )
+    
+    _run_async(command())
+
 @app.command("setup")
 def setup_command():
     """Perform initial login and project/api key activation."""

meshagent/cli/tty.py

@@ -2,6 +2,7 @@ import pathlib
 import sys
 import tty
 import termios
+from meshagent.api.helpers import websocket_room_url
 from typing import Annotated, Optional
 
 import asyncio
@@ -46,10 +47,9 @@ async def tty_command(
         )
 
         token.add_role_grant(role="user")
-
         token.add_room_grant(room)
 
-        ws_url = f"{os.getenv("MESHAGENT_API_URL").replace("http","ws",1)}/rooms/{room}/tty?token={token.to_jwt(token=key)}"
+        ws_url = websocket_room_url(room_name=room)+"/tty?token={token.to_jwt(token=key)}"
 
         print(f"[bold green]Connecting to[/bold green] {room}")
 

meshagent/cli/version.py

@@ -1 +1 @@
-__version__ = "0.0.34"
+__version__ = "0.0.35"

{meshagent_cli-0.0.34.dist-info → meshagent_cli-0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.0.34
+Version: 0.0.35
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -8,14 +8,14 @@ Project-URL: Website, https://www.meshagent.com
 Project-URL: Source, https://www.meshagent.com
 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.34
-Requires-Dist: meshagent-agents~=0.0.34
-Requires-Dist: meshagent-tools~=0.0.34
-Requires-Dist: meshagent-mcp~=0.0.34
-Requires-Dist: supabase~=2.15.1
-Requires-Dist: fastmcp~=2.8.1
+Requires-Dist: typer~=0.15
+Requires-Dist: pydantic-yaml~=1.4
+Requires-Dist: meshagent-api~=0.0.35
+Requires-Dist: meshagent-agents~=0.0.35
+Requires-Dist: meshagent-tools~=0.0.35
+Requires-Dist: meshagent-mcp~=0.0.35
+Requires-Dist: supabase~=2.15
+Requires-Dist: fastmcp~=2.8
 
 ### Meshagent CLI
 

{meshagent_cli-0.0.34.dist-info → meshagent_cli-0.0.35.dist-info}/RECORD

@@ -3,10 +3,10 @@ meshagent/cli/agent.py,sha256=0VjwJkwZ-G637Mps3OtxxWIfjWbrirJ4TTq2Idvjtug,10023
 meshagent/cli/api_keys.py,sha256=VZynVFCBwxcwJ6dtxcoqKB91B0_QsUfJTim4vUXGvKc,4550
 meshagent/cli/async_typer.py,sha256=GCeSefBDbpd-V4V8LrvHGUTBMth3HspVMfFa-HUZ0cg,898
 meshagent/cli/auth.py,sha256=pZQwYTNWQOWTqpyDrkQLNKuidH-wn9GNE5yEJoxn3-g,767
-meshagent/cli/auth_async.py,sha256=LArKxTxQAPmItv0JaGkW3Ybutl6MVmb6_EeSjI18IbI,4001
+meshagent/cli/auth_async.py,sha256=run_J11mRPJQ6BI_aAtV_3O3h52eAl1EOnHuotwhoqQ,4018
 meshagent/cli/call.py,sha256=-6Bf5PCVcsuLMgDpG1g3GiY3S5rgs_-CWgWX4C6AXwg,4739
-meshagent/cli/chatbot.py,sha256=qFPSYbJGIjInOemlYS03vnZ87-VbrUBGcvXufKuT2WY,6435
-meshagent/cli/cli.py,sha256=jogOzdPS1u6TXURLq85x9vZDuiwcJ8Brn7joC8GymlE,2128
+meshagent/cli/chatbot.py,sha256=_ZuEpWwj1tYpu4CxuoQ4OXAk4LEkD1Qfmt-bOsjkkBU,6437
+meshagent/cli/cli.py,sha256=L3DaoAy03buBemBiltTSgcV9aq9I044pkg6zoZPKzYc,5937
 meshagent/cli/cli_mcp.py,sha256=SG0r-cL3P7eu-fbwB-1WgjQPCmxKqQBh-X3kTKDli-E,9536
 meshagent/cli/cli_secrets.py,sha256=U0kdzN3zt7JIqzdRLynAjxdvAsI0enesBd_m7TeXjnQ,13629
 meshagent/cli/developer.py,sha256=5eoDr3kfi-IufA5d6OESqNr739Bdut_IFBtT3nq0xZU,3002
@@ -17,12 +17,12 @@ meshagent/cli/projects.py,sha256=EQfbO9_GQKkjlFcaSHQfIxqIxsmFR3FbH5Fd17I5IPk,330
 meshagent/cli/services.py,sha256=pMAyLg0eEO33fhRiin5q0KbNVoTzQyT5wSDgvDqeRYM,11241
 meshagent/cli/sessions.py,sha256=WWvuztYqRfthSq6ztwL_eQ_sz9JRc33jcN6p7YyM_Fs,782
 meshagent/cli/storage.py,sha256=Se_4xhxiihIovSR1ajlEWo_YZ12G7eUY_-lvifJ8pjo,33806
-meshagent/cli/tty.py,sha256=F1-ZKEl-kfKSFPvwsX8S99E9xbq7WyApbZGLs5_I-Bw,4081
-meshagent/cli/version.py,sha256=IeOAFvenopBWYv9ajaYlgGYiPXMiGT008qnpbTQ0HPU,23
+meshagent/cli/tty.py,sha256=DkgeYQckjil191HNoEGHmheniCi41XNUSMpYY1ilAic,4099
+meshagent/cli/version.py,sha256=QmUV3Ydc9xA0pOuihDI_wM1kvEzVZrdkq2eiedTW2UA,23
 meshagent/cli/voicebot.py,sha256=5vB0yzcKVvQ-nq2in51Xlf-rWbJB8Mjc8V44me6mUD4,4701
 meshagent/cli/webhook.py,sha256=KBl8U1TcOX3z2uoyH4YMuUuw0vSVX7xpRxYvzxI5c-Y,2811
-meshagent_cli-0.0.34.dist-info/METADATA,sha256=E77RQqtneIqGLXHZmNcXAqlwHNWqaaGTPfkVqZVg0rI,635
-meshagent_cli-0.0.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_cli-0.0.34.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
-meshagent_cli-0.0.34.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_cli-0.0.34.dist-info/RECORD,,
+meshagent_cli-0.0.35.dist-info/METADATA,sha256=5tcx5aulHPt6KgjOIdaih5sXkMGB1Dp7SiLPIg5H7o4,627
+meshagent_cli-0.0.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_cli-0.0.35.dist-info/entry_points.txt,sha256=WRcGGN4vMtvC5Pgl3uRFqsJiQXNoHuLLa-TCSY3gAhQ,52
+meshagent_cli-0.0.35.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_cli-0.0.35.dist-info/RECORD,,