akashcli 4.8.3__tar.gz → 4.8.5__tar.gz

{akashcli-4.8.3 → akashcli-4.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.8.3
+Version: 4.8.5
 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.3 → akashcli-4.8.5}/akashcli/__init__.py

@@ -2,7 +2,7 @@ try:
     from importlib.metadata import version
     __version__ = version("akashcli")
 except Exception:
-    __version__ = "4.7.4"
+    __version__ = "4.8.5"
 
 AKASH_VERSION = __version__
 

{akashcli-4.8.3 → akashcli-4.8.5}/akashcli/cli.py

@@ -471,8 +471,14 @@ def cloud_upload(
     password: Optional[str]  = typer.Option(None,  "--pass", "-p", help="Password-protect"),
 ):
     """Upload a file or text snippet."""
+    api_key, base = _resolve_client(require_key=False, silent=True)
+    if not api_key:
+        _err("Not logged in. You must be logged in to upload files.")
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to log in, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
+
     try:
-        client = AkashClient()
+        client = AkashClient(api_key=api_key, api_url=base)
 
         def _cb(done, total):
             bar = _progress_bar(done, total)
@@ -500,6 +506,19 @@ def cloud_upload(
         raise typer.Exit(1)
 
 
+@app.command("upload")
+def app_upload(
+    path:     Optional[Path] = typer.Argument(None,  help="File to upload"),
+    text:     Optional[str]  = typer.Option(None,  "--text", "-t", help="Upload raw text"),
+    name:     Optional[str]  = typer.Option(None,  "--name", "-n", help="Custom filename"),
+    burn:     bool           = typer.Option(False, "--burn",       help="Delete after first download"),
+    expiry:   int            = typer.Option(0,     "--expiry","-e",help="Expire in N days (0 = never)"),
+    password: Optional[str]  = typer.Option(None,  "--pass", "-p", help="Password-protect"),
+):
+    """Upload a file or text snippet (requires login)."""
+    return cloud_upload(path=path, text=text, name=name, burn=burn, expiry=expiry, password=password)
+
+
 # ── akash cloud files ─────────────────────────────────────────────────────────
 
 @cloud_app.command("files")
@@ -604,8 +623,14 @@ def cloud_manage(
 @cloud_app.command("bulk")
 def cloud_bulk(path: Path):
     """Recursively upload every file in a folder."""
+    api_key, base = _resolve_client(require_key=False, silent=True)
+    if not api_key:
+        _err("Not logged in. You must be logged in to upload files.")
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to log in, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
+
     try:
-        client = AkashClient()
+        client = AkashClient(api_key=api_key, api_url=base)
         uploader = VaultUploader(client)
         all_files = [p for p in path.glob("**/*") if p.is_file() and not p.name.startswith(".")]
         for i, file in enumerate(all_files, 1):
@@ -2008,8 +2033,14 @@ def send(
     _ok(f"encrypted  {_dim(f'{size_kb:.1f} KB → {enc_kb:.1f} KB')}")
 
     # ── 4. Upload envelope ────────────────────────────────────────────────────
+    api_key, base = _resolve_client(require_key=False, silent=True)
+    if not api_key:
+        _err("Not logged in. You must be logged in to send files.")
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to log in, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
+
     try:
-        client = AkashClient()
+        client = AkashClient(api_key=api_key, api_url=base)
     except Exception as e:
         _err(f"not logged in: {e}")
         raise typer.Exit(1)
@@ -2086,8 +2117,14 @@ def inbox(
         _err(f"failed to load identity: {e}")
         raise typer.Exit(1)
 
+    api_key, base = _resolve_client(require_key=False, silent=True)
+    if not api_key:
+        _err("Not logged in. You must be logged in to view your inbox.")
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to log in, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
+
     try:
-        client = AkashClient()
+        client = AkashClient(api_key=api_key, api_url=base)
     except Exception as e:
         _err(f"not logged in: {e}")
         raise typer.Exit(1)
@@ -2264,8 +2301,14 @@ def pipe(
     from .logger import log_op
     import io
 
+    api_key, base = _resolve_client(require_key=False, silent=True)
+    if not api_key:
+        _err("Not logged in. You must be logged in to pipe data to the cloud.")
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to log in, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
+
     try:
-        client = AkashClient()
+        client = AkashClient(api_key=api_key, api_url=base)
     except Exception as e:
         _err(f"not logged in: {e}")
         raise typer.Exit(1)
@@ -2644,8 +2687,14 @@ def env_push(
     from .logger import log_op
     import tempfile as _tf
 
+    api_key, base = _resolve_client(require_key=False, silent=True)
+    if not api_key:
+        _err("Not logged in. You must be logged in to push environment variables.")
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to log in, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
+
     try:
-        client = AkashClient()
+        client = AkashClient(api_key=api_key, api_url=base)
     except Exception as e:
         _err(f"not logged in: {e}")
         raise typer.Exit(1)
@@ -2708,8 +2757,14 @@ def env_pull(
     from .env_manager import env_save_blob
     from .logger import log_op
 
+    api_key, base = _resolve_client(require_key=False, silent=True)
+    if not api_key:
+        _err("Not logged in. You must be logged in to pull environment variables.")
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to log in, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
+
     try:
-        client = AkashClient()
+        client = AkashClient(api_key=api_key, api_url=base)
     except Exception as e:
         _err(f"not logged in: {e}")
         raise typer.Exit(1)
@@ -2819,11 +2874,35 @@ def agent_list(raw: bool = typer.Option(False, "--json", help="Raw JSON output")
     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():
         is_default = (pid == default_pid)
-        status_txt = "● active" if is_default else "○ idle"
-        status_color = _G if is_default else _DM
+
+        # 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:
@@ -2856,12 +2935,16 @@ def agent_list(raw: bool = typer.Option(False, "--json", help="Raw JSON output")
         print(f"  {c_status}{c_id}{c_name}{c_cid}{c_scopes}")
 
     print(f"  {_GR}{'─'*76}{_RS}")
-    _p()
+    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"    • Inspect permissions :  {_C}akash mcp info {default_pid}{_RS}")
+    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()
 
@@ -3001,6 +3084,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:
@@ -3075,42 +3164,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 ""
 
-    with _Spin(f"revoking credentials for {pid} ({name})…"):
-        res = httpx.delete(f"{base}/api/agent/app/{cid}", headers=hdrs, timeout=10.0)
+        # 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 '')})")
 
-    # Clean local profile if present
+    try:
+        agents_file.write_text(json.dumps(agents, indent=2))
+    except Exception:
+        pass
+
+    _p()
+    _ok(f"Cleaned up {removed_count} MCP profile(s). {len(agents)} profile(s) remaining.")
+    _p()
+
+@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")
@@ -3161,6 +3383,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))

{akashcli-4.8.3 → akashcli-4.8.5}/akashcli/client.py

@@ -20,7 +20,7 @@ class AkashClient:
         _patch_dns(_up(self.base_url).hostname or "")
 
         if not self.api_key:
-            raise AuthenticationError("No API Key found. Run 'akash login' or set AKASH_API_KEY env var.")
+            raise AuthenticationError("User is not logged in. An API key is required. Run 'akash login' or set AKASH_API_KEY env var.")
 
     def _get_headers(self, custom: dict = None):
         h = {"x-api-key": self.api_key, "Origin": "https://akash.cli"}

{akashcli-4.8.3 → akashcli-4.8.5}/akashcli/storage.py

@@ -379,6 +379,10 @@ def upload_large_file(
     progress_cb: Optional[Callable[[int, int], None]] = None,
 ) -> dict:
     from .uploader import VaultUploader
+    from .exceptions import AuthenticationError
+
+    if not getattr(client, "api_key", None):
+        raise AuthenticationError("User is not logged in. An API key is required to upload files. Run 'akash login'.")
 
     size   = path.stat().st_size
     digest = sha256_file(path)

{akashcli-4.8.3 → akashcli-4.8.5}/akashcli/uploader.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Optional, Callable, List
 from concurrent.futures import ThreadPoolExecutor
 from .models import UploadResult
-from .exceptions import UploadFailed, QuotaExceeded
+from .exceptions import UploadFailed, QuotaExceeded, AuthenticationError
 
 class VaultUploader:
     def __init__(self, client):
@@ -26,6 +26,8 @@ class VaultUploader:
         Standardizes both File and Text uploads into a single stream.
         progress_callback signature: (bytes_read, total_bytes)
         """
+        if not getattr(self.client, "api_key", None):
+            raise AuthenticationError("User is not logged in. An API key is required to upload files. Run 'akash login'.")
         
         # 1. Prepare Headers based on V3 Power-Control Specs
         headers = {
@@ -220,6 +222,8 @@ class VaultUploader:
 
     def upload_directory(self, folder_path: str, max_workers: int = 3) -> List[UploadResult]:
         """Recursively uploads all files in a folder using a thread pool."""
+        if not getattr(self.client, "api_key", None):
+            raise AuthenticationError("User is not logged in. An API key is required to upload files. Run 'akash login'.")
         # Convert string path to Path object
         root = Path(folder_path)
         if not root.is_dir():

{akashcli-4.8.3 → akashcli-4.8.5}/akashcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.8.3
+Version: 4.8.5
 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.3 → akashcli-4.8.5}/pyproject.toml

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