akashcli 4.4.0__tar.gz → 4.4.1__tar.gz

{akashcli-4.4.0 → akashcli-4.4.1}/PKG-INFO

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

{akashcli-4.4.0 → akashcli-4.4.1}/akashcli/cli.py

@@ -966,27 +966,37 @@ def run(
     reauth:    bool          = typer.Option(False, "--reauth",    help="Force re-authentication"),
     save:      bool          = typer.Option(False, "--save",      help="Upload command output to cloud"),
     save_name: Optional[str] = typer.Option(None,  "--save-name", help="Filename for saved output"),
-    device:    Optional[str] = typer.Option(None,  "--device","-d",help="Target device label (default: auto)"),
+    device:    Optional[str] = typer.Option(None,  "--device", "-d",
+                                            help="Run on a device (set up with: akash serve --label NAME)"),
 ):
-    """Run a command — on the server or on a specific enrolled device.
+    """Run a command — locally, on the server, or on an enrolled device.
 
-    Token cached 24 h — instant reconnect every time.
+    No login needed:
+      akash run "df -h"                          runs locally
+      akash run "ls" --save                      runs locally, uploads output
 
-    Examples:
-      akash run "ls -la ~"                       # run on server
-      akash run "df -h" --device termux          # run on your phone
-      akash run "df -h" --device laptop          # run on your laptop
-      akash run "pip list" --save                # save output to cloud
+    With login:
+      akash run "df -h"                          runs on server
+      akash run "df -h" --device termux          runs on your phone
+      akash run "pip list" --save                runs on server, saves output
+
+    To make a device reachable:
+      1. On that device:  akash login --label termux && akash serve
+      2. From anywhere:   akash run "cmd" --device termux
     """
     from .exec import acquire_exec_token, run_command, _clear_cached_token
 
     try:
         api_key, base = _resolve_client(url)
 
-        # ── No key + device flag → relay needs auth ───────────────────────
+        # ── --device but no key ───────────────────────────────────────────
         if device is not None and not api_key:
-            print(_GUEST_WARNING)
-            _err("relay requires an API key. Run `akash login` first.")
+            _warn("relay requires an API key.")
+            _p()
+            _info(f"To run on  {_cy(device.strip() or 'a device')}  you need to log in first:")
+            _info(f"  {_cy('akash login')}         save your API key on this machine")
+            _info(f"  {_cy('akash serve')}          run on the target device to make it reachable")
+            _p()
             raise typer.Exit(1)
 
         # ── Device relay path ─────────────────────────────────────────────
@@ -1130,39 +1140,52 @@ def _build_ws_url_for_run(token: str, base_url: str) -> str:
 def shell(
     url:    Optional[str] = typer.Option(None,  "--url",    help="Override server URL"),
     reauth: bool          = typer.Option(False, "--reauth", help="Force re-authentication"),
-    device: Optional[str] = typer.Option(None,  "--device","-d", help="Target device label (default: auto)"),
+    device: Optional[str] = typer.Option(None,  "--device", "-d",
+                                         help="Device label to connect to (set up with: akash serve --label NAME)"),
 ):
-    """Open an interactive shell — on the server or on an enrolled device.
+    """Open a shell — local, server, or on any enrolled device.
 
-    Full PTY — colours, arrow keys, tab completion, Ctrl-C all work.
-    Token cached 24 h — instant reconnect.
+    No login needed:
+      akash shell                     open a local bash shell
 
-    Examples:
-      akash shell                     # server shell
-      akash shell --device termux     # shell on your phone
-      akash shell --device laptop     # shell on your laptop
-      akash shell --device            # auto (works if only 1 device enrolled)
+    With login (akash login):
+      akash shell                     full server shell (persistent, coloured)
+      akash shell --device termux     relay shell on your phone
+      akash shell --device laptop     relay shell on your laptop
+      akash shell --device            auto-pick (works if only 1 device enrolled)
+
+    To make a device reachable:
+      1. On that device:  akash login --label termux && akash serve
+      2. From anywhere:   akash shell --device termux
     """
     from .exec import acquire_exec_token, run_shell, _clear_cached_token
+    import shutil as _sh, subprocess as _sp
 
     try:
         api_key, base = _resolve_client(url)
 
-        # ── No key + device flag → relay needs auth ───────────────────────
+        # ── --device flag but no key ──────────────────────────────────────
         if device is not None and not api_key:
-            print(_GUEST_WARNING)
-            _err("relay requires an API key. Run `akash login` first.")
+            _warn("relay requires an API key.")
+            _p()
+            _info(f"To connect to  {_cy(device.strip() or 'a device')}  you need to log in first:")
+            _info(f"  {_cy('akash login')}         save your API key on this machine")
+            _info(f"  {_cy('akash serve')}          run on the target device to make it reachable")
+            _p()
             raise typer.Exit(1)
 
         # ── Device relay path ─────────────────────────────────────────────
         if device is not None:
             from .relay import connect_shell
             label = device.strip() if device.strip() else None
-            _info(f"connecting to device  {_cy(label or 'auto')}…")
+            _p()
+            _info(f"connecting to  {_cy(label or 'auto')}…")
             try:
                 exit_code = connect_shell(api_key, base, target=label)
             except RuntimeError as e:
                 _err(str(e))
+                _p()
+                _info(f"Make sure the device is running:  {_cy('akash serve')}")
                 raise typer.Exit(1)
             _p()
             _info("session closed")
@@ -1170,20 +1193,17 @@ def shell(
                 raise typer.Exit(exit_code)
             return
 
-        # ── No key → local PTY shell fallback ────────────────────────────
+        # ── No key → silent local shell ───────────────────────────────────
         if not api_key:
-            import shutil as _sh
-            print(_GUEST_WARNING)
-            _p()
             shell_bin = os.environ.get("SHELL") or _sh.which("bash") or _sh.which("sh") or "/bin/sh"
-            _info(f"opening local shell  {_dim(shell_bin)}")
+            _info(f"local shell  {_dim(shell_bin)}  {_dim('· tip: run akash login to unlock remote shells')}")
             _p()
-            import subprocess as _sp
             result = _sp.run([shell_bin])
             _p()
             _info("session closed")
             raise typer.Exit(result.returncode)
 
+        # ── Server shell ──────────────────────────────────────────────────
         if reauth:
             _clear_cached_token()
             _info("cleared cached token — re-authenticating…")
@@ -1215,23 +1235,43 @@ def devices(
     revoke: Optional[str] = typer.Option(None,  "--revoke", "-r", help="Revoke (unenroll) a device by label"),
     raw:    bool          = typer.Option(False, "--json",          help="Raw JSON output"),
 ):
-    """List enrolled devices or revoke one.
+    """List enrolled devices — or revoke one.
 
-    Each device you log in on with `akash login --label` appears here.
-    The server tracks when each device last authenticated.
+    Each device you run `akash serve` on appears here.
+    Connect from anywhere with: akash shell --device NAME
 
     Examples:
       akash devices                   list all enrolled devices
       akash devices --revoke laptop   remove a device
+
+    Setup:
+      akash login --label phone       name this device
+      akash serve                     register it as reachable
     """
     try:
-        api_key, base = _resolve_client(require_key=True)
+        api_key, base = _resolve_client(require_key=False)
     except typer.Exit:
         raise
     except Exception as e:
         _err(str(e))
         raise typer.Exit(1)
 
+    if not api_key:
+        _p()
+        _info("no devices yet — here's how to set up remote access:")
+        _p()
+        print(f"  {_DM}Step 1 — on each device you want to reach:{_RS}")
+        print(f"    {_cy('akash login --label termux')}   {_DM}(name this device){_RS}")
+        print(f"    {_cy('akash serve')}                  {_DM}(keep running — makes it reachable){_RS}")
+        _p()
+        print(f"  {_DM}Step 2 — from anywhere:{_RS}")
+        print(f"    {_cy('akash shell --device termux')}  {_DM}(open a shell on it){_RS}")
+        print(f"    {_cy('akash run --device termux \"cmd\"')} {_DM}(run a command on it){_RS}")
+        _p()
+        _info(f"Run {_cy('akash login')} first to save your API key.")
+        _p()
+        raise typer.Exit(0)
+
     _hdrs = {"x-api-key": api_key, "Origin": "https://akash.cli"}
 
     if revoke:
@@ -1298,18 +1338,17 @@ def serve(
     status:   bool          = typer.Option(False, "--status",    help="Show serve daemon status"),
     stop:     bool          = typer.Option(False, "--stop",      help="Stop background serve daemon"),
 ):
-    """Make this device reachable via `akash shell --device` and `akash run --device`.
+    """Make this device reachable for remote shell and run.
 
-    Registers this machine with the relay server and waits for incoming
-    shell/run requests. The connection is brokered through your cloud server —
-    no public IP required.
+    Run this once on a device to register it. Then from any other
+    machine: akash shell --device NAME  or  akash run --device NAME
 
     Examples:
-      akash serve                    # foreground (Ctrl-C to stop)
-      akash serve --daemon           # background daemon
-      akash serve --status           # check if daemon is running
-      akash serve --stop             # kill daemon
-      akash serve --label termux     # override device label
+      akash serve                    start in foreground (Ctrl-C to stop)
+      akash serve --daemon           run as background daemon
+      akash serve --status           check if daemon is running
+      akash serve --stop             stop the daemon
+      akash serve --label myphone    use a custom label
     """
     from .relay import serve as _serve, serve_status, serve_stop
 
@@ -1320,7 +1359,8 @@ def serve(
             _ok(f"running  {_dim('pid ' + pid_str)}")
             _info(f"logs  {st['log']}")
         else:
-            _info("not running  — start with: akash serve --daemon")
+            _info("not running")
+            _info(f"start with:  {_cy('akash serve')}  or  {_cy('akash serve --daemon')}")
         return
 
     if stop:
@@ -1331,13 +1371,23 @@ def serve(
         return
 
     try:
-        api_key, base = _resolve_client(url, require_key=True)
+        api_key, base = _resolve_client(url, require_key=False)
     except typer.Exit:
         raise
     except Exception as e:
         _err(str(e))
         raise typer.Exit(1)
 
+    if not api_key:
+        _p()
+        _warn("not logged in — can't register with relay server.")
+        _p()
+        _info("Run this first:")
+        print(f"    {_cy('akash login --label myphone')}   {_DM}# name this device{_RS}")
+        print(f"    {_cy('akash serve')}                   {_DM}# then run this{_RS}")
+        _p()
+        raise typer.Exit(1)
+
     # Resolve label: flag > config > "default"
     from .exec import _device_label as _cfg_label
     resolved_label = (label or _cfg_label() or "default").strip()

{akashcli-4.4.0 → akashcli-4.4.1}/akashcli.egg-info/PKG-INFO

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

{akashcli-4.4.0 → akashcli-4.4.1}/pyproject.toml

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