akashcli 4.8.2__tar.gz → 4.8.4__tar.gz

{akashcli-4.8.2 → akashcli-4.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.8.2
+Version: 4.8.4
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License-Expression: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.8.2 → akashcli-4.8.4}/akashcli/cli.py

@@ -2774,43 +2774,131 @@ def _render_inspection_card(r: dict) -> None:
 
 
 @agent_app.command("list")
+@agent_app.command("ls", hidden=True)
+@agent_app.command("ids", hidden=True)
+@agent_app.command("profiles", hidden=True)
 def agent_list(raw: bool = typer.Option(False, "--json", help="Raw JSON output")):
-    """List all locally saved Agent Profile IDs and their credentials."""
+    """List all locally saved Agent & MCP Profile IDs, credentials, and launch commands."""
     import json
     from pathlib import Path
+
+    is_raw = bool(raw is True)
     agents_file = Path.home() / ".akash" / "agents.json"
     if not agents_file.exists():
-        _info("no saved agent profiles found - create one with: akash agent create")
+        _p()
+        _info("No saved agent profiles found. Create one with: " + _cy("akash mcp create -n Dev -r @coder"))
+        _p()
         return
 
     try:
-        agents = json.loads(agents_file.read_text())
+        agents = json.loads(agents_file.read_text(encoding="utf-8"))
     except Exception:
         agents = {}
 
     if not agents:
-        _info("no saved agent profiles found - create one with: akash agent create")
+        _p()
+        _info("No saved agent profiles found. Create one with: " + _cy("akash mcp create -n Dev -r @coder"))
+        _p()
         return
 
-    if raw:
+    if is_raw:
         print(json.dumps(agents, indent=2))
         return
 
+    default_pid = next(reversed(list(agents.keys())))
+
     _p()
-    print(f"  {_C}◈{_RS}  {_W}Available Agent Profile IDs{_RS} {_dim(f'({len(agents)})')}")
-    _p()
-    print(f"  {_DM}{'ID':<6}  {'NAME':<20}  {'CLIENT ID':<26}  MCP LAUNCH COMMAND{_RS}")
-    print(f"  {_GR}{'─'*75}{_RS}")
+    print(f"  {_C}◈{_RS}  {_W}Akash MCP Profiles & Agent IDs{_RS} {_dim(f'({len(agents)} configured)')}")
+    print(f"  {_GR}{'─'*76}{_RS}")
+
+    hdr_status = f"{'STATUS':<11}"
+    hdr_id = f"{'ID':<8}"
+    hdr_name = f"{'NAME':<16}"
+    hdr_cid = f"{'CLIENT ID SUFFIX':<18}"
+    hdr_scopes = "ROLE / SCOPES"
+    print(f"  {_DM}{hdr_status}{hdr_id}{hdr_name}{hdr_cid}{hdr_scopes}{_RS}")
+    print(f"  {_GR}{'─'*76}{_RS}")
+
+    import datetime
+    now_utc = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
+
+    last_suffix = ""
+    expired_count = 0
     for pid, data in agents.items():
-        name = data.get("name", "Agent")[:19]
-        cid = data.get("client_id", "?")
-        cid_short = cid[:22] + "…" if len(cid) > 22 else cid
-        cmd_hint = f"akash mcp serve --id {pid}"
-        print(f"  {_ye(pid):<15} {_W}{name:<20}{_RS} {_dim(cid_short):<35} {_C}{cmd_hint}{_RS}")
-    _p()
-    _info("To launch: akash mcp serve --id <ID>")
+        is_default = (pid == default_pid)
+
+        # Check expiration status
+        is_expired = False
+        exp_val = data.get("expires_at")
+        if exp_val:
+            try:
+                exp_dt = datetime.datetime.fromisoformat(exp_val.replace("Z", "+00:00")).replace(tzinfo=None)
+                if exp_dt < now_utc:
+                    is_expired = True
+            except Exception:
+                pass
+
+        if is_expired:
+            expired_count += 1
+            status_txt = "✗ expired"
+            status_color = _R
+        elif is_default:
+            status_txt = "● active"
+            status_color = _G
+        else:
+            status_txt = "○ idle"
+            status_color = _DM
+
+        name = data.get("name", "Agent")
+        if len(name) > 14:
+            name = name[:13] + "…"
+
+        cid = data.get("client_id", "")
+        suffix = f"...{cid[-4:]}" if len(cid) >= 4 else cid
+        if is_default:
+            last_suffix = cid[-4:] if len(cid) >= 4 else cid
+
+        raw_scopes = data.get("scopes", "*")
+        if raw_scopes == "*":
+            scope_desc = "@full (All access)"
+        elif "fs:no_delete" in raw_scopes and "workspace:write" in raw_scopes:
+            scope_desc = "@coder (Safe Dev)"
+        elif "workspace:write" in raw_scopes:
+            scope_desc = "@editor (Code Edit)"
+        elif "exec:read_only" in raw_scopes:
+            scope_desc = "@viewer (Read-Only)"
+        else:
+            scope_desc = raw_scopes.split(",")[0] if raw_scopes else "custom"
+
+        # Safe alignment with ANSI colors
+        c_status = f"{status_color}{status_txt}{_RS}" + " " * max(0, 11 - len(status_txt))
+        c_id = f"{_ye(pid)}{_RS}" + " " * max(0, 8 - len(pid))
+        c_name = f"{_W}{name}{_RS}" + " " * max(0, 16 - len(name))
+        c_cid = f"{_cy(suffix)}{_RS}" + " " * max(0, 18 - len(suffix))
+        c_scopes = f"{_dim(scope_desc)}"
+
+        print(f"  {c_status}{c_id}{c_name}{c_cid}{c_scopes}")
+
+    print(f"  {_GR}{'─'*76}{_RS}")
+    if expired_count > 0:
+        print(f"  {_Y}⚡{_RS} {_W}{expired_count} profile(s) expired.{_RS} {_DM}Run {_cy('akash mcp renew <id>')} to extend or {_cy('akash mcp rm --expired')} to clean up.{_RS}\n")
+    else:
+        _p()
+    print(f"  {_W}Quick Launch:{_RS}")
+    print(f"    • Use default profile :  {_C}akash mcp serve{_RS}")
+    suffix_hint = f"  {_dim('(or: --id ' + last_suffix + ')')}" if last_suffix else ""
+    print(f"    • Use specific ID     :  {_C}akash mcp serve --id {default_pid}{_RS}{suffix_hint}")
+    print(f"    • Clean idle profiles :  {_C}akash mcp rm --all{_RS}")
+    print(f"    • Renew expiration    :  {_C}akash mcp renew {default_pid} --days 30{_RS}")
+    print(f"    • Create new profile  :  {_C}akash mcp create -n Dev -r @coder{_RS}")
     _p()
 
+@mcp_app.callback(invoke_without_command=True)
+def mcp_callback(ctx: typer.Context):
+    """Model Context Protocol (MCP) server & AI agent tool bridge."""
+    if ctx.invoked_subcommand is None:
+        agent_list()
+
 
 
 def _resolve_agent_id(target_id: str) -> tuple[str, str, str]:
@@ -2941,6 +3029,12 @@ def agent_info(
                 status = d.get("status", "active") + " (live server)"
                 exp = d.get("expires_at", "unknown")[:19].replace("T", " ")
                 is_live = True
+                if pid in all_a and d.get("expires_at"):
+                    all_a[pid]["expires_at"] = d.get("expires_at")
+                    try:
+                        agents_file.write_text(json.dumps(all_a, indent=2))
+                    except Exception:
+                        pass
             elif r.status_code == 404:
                 status = "not found on server"
         except Exception:
@@ -3015,42 +3109,175 @@ def agent_update(
     else:
         _err(f"Failed to update scopes: {res.text}")
 
-@agent_app.command("revoke")
-def agent_revoke(
-    target: Optional[str] = typer.Argument(None, help="Profile ID (e.g. fbf6) or Client ID"),
-    id:     Optional[str] = typer.Option(None, "--id", help="Profile ID (e.g. fbf6)"),
-    url:    Optional[str] = typer.Option(None, "--url", help="Override server URL"),
+@agent_app.command("rm")
+@agent_app.command("remove", hidden=True)
+@agent_app.command("delete", hidden=True)
+@agent_app.command("revoke", hidden=True)
+def agent_remove(
+    target: Optional[str] = typer.Argument(None, help="Profile ID (e.g. 88d7), Client ID suffix (e.g. ddff), or name"),
+    all_idle: bool = typer.Option(False, "--all", "-a", help="Remove all idle profiles, keeping active default"),
+    expired_only: bool = typer.Option(False, "--expired", "-e", help="Remove all expired profiles"),
+    yes: bool = typer.Option(False, "--yes", "-y", "--force", "-f", help="Skip confirmation prompt"),
+    url: Optional[str] = typer.Option(None, "--url", help="Override server URL"),
 ):
-    """Revoke an agent's access in one command using its short Profile ID."""
-    target_id = id or target
-    if not target_id:
-        _err("Provide a Profile ID (e.g. 'akash agent revoke fbf6')")
+    """Remove / clean up one or more MCP profile IDs locally and on gateway."""
+    import json, datetime
+    from pathlib import Path
+    agents_file = Path.home() / ".akash" / "agents.json"
+    if not agents_file.exists():
+        _info("No saved profiles to remove.")
+        return
+
+    try:
+        agents = json.loads(agents_file.read_text(encoding="utf-8"))
+    except Exception:
+        agents = {}
+
+    if not agents:
+        _info("No saved profiles to remove.")
+        return
+
+    default_pid = next(reversed(list(agents.keys())))
+    now_utc = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
+
+    targets_to_delete = []
+
+    if all_idle:
+        for pid in list(agents.keys()):
+            if pid != default_pid:
+                targets_to_delete.append(pid)
+        if not targets_to_delete:
+            _info("No idle profiles to remove (only active profile exists).")
+            return
+        if not yes:
+            try:
+                sys.stdout.write(f"  Remove {len(targets_to_delete)} idle profile(s)? [y/N]: ")
+                sys.stdout.flush()
+                ans = sys.stdin.readline().strip().lower()
+                if ans not in ("y", "yes"):
+                    _info("Aborted.")
+                    return
+            except (KeyboardInterrupt, EOFError):
+                return
+
+    elif expired_only:
+        for pid, d in list(agents.items()):
+            exp_str = d.get("expires_at")
+            if exp_str:
+                try:
+                    exp_dt = datetime.datetime.fromisoformat(exp_str.replace("Z", "+00:00")).replace(tzinfo=None)
+                    if exp_dt < now_utc:
+                        targets_to_delete.append(pid)
+                except Exception:
+                    pass
+        if not targets_to_delete:
+            _info("No expired profiles found to remove.")
+            return
+
+    elif target:
+        pid, cid, name = _resolve_agent_id(target)
+        if pid not in agents:
+            _err(f"Profile '{target}' not found in saved profiles.")
+            raise typer.Exit(1)
+        targets_to_delete.append(pid)
+
+    else:
+        _err("Specify a Profile ID to remove (e.g. 'akash mcp rm 88d7'), or use '--all' / '--expired'.")
+        _info(f"Run {_cy('akash mcp')} to view all IDs.")
         raise typer.Exit(1)
 
-    pid, cid, name = _resolve_agent_id(target_id)
-    api_key, base = _resolve_client(url, require_key=False, silent=True)
-    hdrs = {"Origin": "https://akash.cli", "x-device-id": _device_fingerprint()}
-    if api_key: hdrs["x-api-key"] = api_key
+    _p()
+    removed_count = 0
+    for pid in targets_to_delete:
+        d = agents.get(pid, {})
+        name = d.get("name", "Agent")
+        cid = d.get("client_id", "")
+        suffix = cid[-4:] if len(cid) >= 4 else ""
+
+        # Best-effort remote revocation on gateway
+        target_url = url or d.get("url")
+        _, base = _resolve_client(target_url, require_key=False, silent=True)
+        if cid and base:
+            try:
+                httpx.delete(f"{base}/api/agent/app/{cid}", timeout=3.0)
+            except Exception:
+                pass
+
+        if pid in agents:
+            del agents[pid]
+            removed_count += 1
+            print(f"  {_G}✓{_RS}  Removed profile {_W}{name}{_RS} ({_ye(pid)}{_dim(' · ...' + suffix if suffix else '')})")
+
+    try:
+        agents_file.write_text(json.dumps(agents, indent=2))
+    except Exception:
+        pass
 
-    with _Spin(f"revoking credentials for {pid} ({name})…"):
-        res = httpx.delete(f"{base}/api/agent/app/{cid}", headers=hdrs, timeout=10.0)
+    _p()
+    _ok(f"Cleaned up {removed_count} MCP profile(s). {len(agents)} profile(s) remaining.")
+    _p()
 
-    # Clean local profile if present
+@agent_app.command("renew")
+def agent_renew(
+    target: Optional[str] = typer.Argument(None, help="Profile ID, Client ID suffix, or name (defaults to active profile)"),
+    days: int = typer.Option(7, "--days", "-d", help="Number of days to extend validity (default: 7)"),
+    url: Optional[str] = typer.Option(None, "--url", help="Override server URL"),
+):
+    """Renew/extend the validity of an MCP profile / agent ID."""
     import json
     from pathlib import Path
     agents_file = Path.home() / ".akash" / "agents.json"
-    if agents_file.exists():
+    if not agents_file.exists():
+        _err("No saved profiles found.")
+        raise typer.Exit(1)
+
+    try:
+        agents = json.loads(agents_file.read_text(encoding="utf-8"))
+    except Exception:
+        agents = {}
+
+    if not agents:
+        _err("No saved profiles found.")
+        raise typer.Exit(1)
+
+    target_id = target
+    if not target_id:
+        target_id = next(reversed(list(agents.keys())))
+
+    pid, cid, name = _resolve_agent_id(target_id)
+    cached = agents.get(pid, {})
+    target_url = url or cached.get("url")
+    _, base = _resolve_client(target_url, require_key=False, silent=True)
+
+    with _Spin(f"renewing MCP profile {pid} ({name}) for {days} days…"):
         try:
-            agents = json.loads(agents_file.read_text())
-            if pid in agents:
-                del agents[pid]
-                agents_file.write_text(json.dumps(agents, indent=2))
-        except Exception: pass
+            res = httpx.patch(
+                f"{base}/api/agent/app/{cid}",
+                json={"renew": True, "ttl_days": days},
+                timeout=8.0
+            )
+        except Exception as e:
+            _err(f"Network error contacting gateway ({base}): {e}")
+            raise typer.Exit(1)
 
     if res.status_code == 200:
-        _ok(f"Agent {_ye(pid)} ({name}) revoked successfully!")
+        d = res.json()
+        new_exp = d.get("expires_at", "")
+        if pid in agents:
+            agents[pid]["expires_at"] = new_exp
+            try:
+                agents_file.write_text(json.dumps(agents, indent=2))
+            except Exception:
+                pass
+        _p()
+        _ok(f"Successfully renewed profile {_ye(name)} ({_C}{pid}{_RS} · {_dim('...' + cid[-4:])}) for {_G}{days} days{_RS}!")
+        if new_exp:
+            exp_clean = new_exp[:19].replace("T", " ")
+            print(f"     {_DM}New Expiration : {_RS}{_cy(exp_clean)} UTC")
+        _p()
     else:
-        _ok(f"Agent {_ye(pid)} removed locally.")
+        _err(f"Failed to renew profile on gateway: HTTP {res.status_code} - {res.text}")
+        raise typer.Exit(1)
 
 
 @agent_app.command("create")
@@ -3101,6 +3328,7 @@ def agent_create(
         "client_secret": d["client_secret"],
         "name": name,
         "scopes": d.get("scopes", effective_scopes),
+        "expires_at": d.get("expires_at"),
         "url": base
     }
     agents_file.write_text(json.dumps(agents, indent=2))
@@ -3603,7 +3831,9 @@ def mcp_serve(
     print("  " + _GR + "──────────────────────────────────────────────────" + _RS)
     print("  " + _DM + "Workspace : " + _RS + _cy(str(Path.cwd())))
     print("  " + _DM + "Gateway   : " + _RS + _dim(base))
-    print("  " + _DM + "Profile   : " + _RS + _ye(pname) + " " + _dim("(" + (profile_id or "custom") + ")"))
+    cid_suffix = f"...{cid[-4:]}" if cid and len(cid) >= 4 else ""
+    suffix_tag = f" · client: {cid_suffix}" if cid_suffix else ""
+    print("  " + _DM + "Profile   : " + _RS + _ye(pname) + " " + _dim("(" + (profile_id or "custom") + suffix_tag + ")"))
     print("  " + _GR + "──────────────────────────────────────────────────" + _RS)
     print("  " + _DM + "Active Tools:" + _RS)
     print("    • akash_exec_command      " + _dim("(Safe terminal runner)"))

{akashcli-4.8.2 → akashcli-4.8.4}/akashcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.8.2
+Version: 4.8.4
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License-Expression: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.8.2 → akashcli-4.8.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "akashcli"
-version = "4.8.2"
+version = "4.8.4"
 description = "Akash CLI — secure remote shell relay, file vault, and device management"
 readme = "README.md"
 requires-python = ">=3.9"