akashcli 4.5.5__tar.gz → 4.5.7__tar.gz

{akashcli-4.5.5 → akashcli-4.5.7}/PKG-INFO

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

{akashcli-4.5.5 → akashcli-4.5.7}/akashcli/relay.py

@@ -193,27 +193,59 @@ def _handle_run(ws, frame: dict) -> None:
 
 
 def _handle_pty(ws, frame: dict) -> None:
-    """Run a command in a PTY and relay I/O until the process exits."""
-    import pty, select, struct, fcntl, termios, threading as _th
+    """Run a shell in a properly configured PTY and relay I/O."""
+    import pty, select, struct, fcntl, termios
 
     command = frame.get("command", "")
     rows    = int(frame.get("rows", 24))
     cols    = int(frame.get("cols", 80))
 
     master_fd, slave_fd = pty.openpty()
-    try:
-        fcntl.ioctl(master_fd, termios.TIOCSWINSZ,
-                    struct.pack("HHHH", rows, cols, 0, 0))
-    except Exception:
-        pass
+    # Set terminal window size on both fds
+    winsz = struct.pack("HHHH", rows, cols, 0, 0)
+    for fd in (master_fd, slave_fd):
+        try:
+            fcntl.ioctl(fd, termios.TIOCSWINSZ, winsz)
+        except Exception:
+            pass
+
+    def _child_setup():
+        """Run inside the child process before exec — creates a new session
+        and attaches the slave PTY as the controlling terminal so bash gets
+        full job control (no 'cannot set terminal process group' errors)."""
+        os.setsid()
+        try:
+            fcntl.ioctl(0, termios.TIOCSCTTY, 0)
+        except Exception:
+            pass
 
     import subprocess as _sp
+    shell = command or os.environ.get("SHELL", "/bin/bash")
+
+    # DevOS-style PS1 injected into every relay shell session.
+    # Uses only bash builtins + git (optional). No external deps.
+    _AKASH_PS1 = (
+        r'__akash_ps1() { '
+        r'  local b; b=$(git branch --show-current 2>/dev/null); '
+        r'  [ -n "$b" ] && echo -e " \033[90m(\033[1;35m$b\033[90m)\033[0m"; '
+        r'}; '
+        r'PS1="\n\033[1;36m╭─\033[0m \033[1;32m\u\033[90m@\033[1;32m\h\033[0m'
+        r'  \033[1;34m\w\033[0m\$(__akash_ps1)\n'
+        r'\033[1;36m╰─❯\033[0m "; '
+        r'export PS1'
+    )
+
+    # Run the shell directly (not wrapped in bash -c) so it IS the login shell
+    # and gets a proper controlling terminal from slave_fd.
     try:
         proc = _sp.Popen(
-            ["/bin/bash", "-c", command],
+            [shell],
             stdin=slave_fd, stdout=slave_fd, stderr=slave_fd,
-            close_fds=True, cwd=os.path.expanduser("~"),
-            env={**os.environ, "TERM": "xterm-256color",
+            close_fds=True,
+            preexec_fn=_child_setup,
+            cwd=os.path.expanduser("~"),
+            env={**os.environ,
+                 "TERM": "xterm-256color",
                  "COLUMNS": str(cols), "LINES": str(rows)},
         )
     except Exception as e:
@@ -225,15 +257,25 @@ def _handle_pty(ws, frame: dict) -> None:
         return
 
     os.close(slave_fd)
+
+    # Give bash ~120 ms to finish sourcing .bashrc, then inject our PS1.
+    import time as _time
+    _time.sleep(0.12)
+    try:
+        os.write(master_fd, (_AKASH_PS1 + "\n").encode())
+    except Exception:
+        pass
+
     stop = threading.Event()
 
-    # Thread: master fd → WebSocket
+    # Thread: master fd → WebSocket  (drain as fast as possible)
     def _out():
         while not stop.is_set():
             try:
-                r, _, _ = select.select([master_fd], [], [], 0.05)
+                r, _, _ = select.select([master_fd], [], [], 0.02)
                 if r:
-                    data = os.read(master_fd, 4096)
+                    # Read up to 16 KiB at a time for snappy bulk output
+                    data = os.read(master_fd, 16384)
                     if not data:
                         break
                     ws.send(json.dumps({
@@ -241,6 +283,18 @@ def _handle_pty(ws, frame: dict) -> None:
                         "data": base64.b64encode(data).decode(),
                     }))
                 elif proc.poll() is not None:
+                    # Drain any remaining output
+                    try:
+                        r2, _, _ = select.select([master_fd], [], [], 0.1)
+                        if r2:
+                            data = os.read(master_fd, 16384)
+                            if data:
+                                ws.send(json.dumps({
+                                    "type": "pty_out",
+                                    "data": base64.b64encode(data).decode(),
+                                }))
+                    except Exception:
+                        pass
                     break
             except Exception:
                 break
@@ -269,9 +323,9 @@ def _handle_pty(ws, frame: dict) -> None:
         elif it == "resize":
             r = int(inf.get("rows", rows))
             c = int(inf.get("cols", cols))
+            winsz = struct.pack("HHHH", r, c, 0, 0)
             try:
-                fcntl.ioctl(master_fd, termios.TIOCSWINSZ,
-                            struct.pack("HHHH", r, c, 0, 0))
+                fcntl.ioctl(master_fd, termios.TIOCSWINSZ, winsz)
             except Exception:
                 pass
         elif it == "close":
@@ -279,10 +333,14 @@ def _handle_pty(ws, frame: dict) -> None:
 
     stop.set()
     try:
-        proc.kill()
+        proc.terminate()
     except Exception:
         pass
-    proc.wait()
+    try:
+        proc.wait(timeout=2)
+    except Exception:
+        try: proc.kill()
+        except Exception: pass
     t_out.join(timeout=1)
     try:
         os.close(master_fd)
@@ -404,10 +462,10 @@ def connect_shell(api_key: str, base_url: str,
                 try:
                     while not stop.is_set():
                         if _stdin_fd >= 0:
-                            r = _sel.select([_stdin_fd], [], [], 0.05)[0]
+                            r = _sel.select([_stdin_fd], [], [], 0.02)[0]
                             if not r:
                                 continue
-                            chunk = os.read(_stdin_fd, 256)
+                            chunk = os.read(_stdin_fd, 4096)
                         else:
                             chunk = sys.stdin.buffer.read(1)
                         if not chunk:
@@ -702,11 +760,10 @@ def guest_connect_shell(base_url: str, code: str) -> int:
             if ftype == "waiting_approval":
                 fp = first.get("fingerprint", "")
                 _restore()   # restore terminal so we can print cleanly
-                print(f"  {_Y}…{_RS}  waiting for host to approve this connection…")
+                print(f"\n  {_C}◈{_RS}  {_DM}waiting for host to approve…{_RS}")
                 if fp:
-                    print(f"  {_DM}Your fingerprint:  {_C}{fp}{_RS}")
-                print(f"  {_DM}(host has 30 seconds to respond){_RS}")
-                print()
+                    print(f"  {_DM}fingerprint  {_C}{fp}{_RS}")
+                print(f"  {_DM}host has 30 s to respond{_RS}\n")
                 # Wait for next frame: connected or denied
                 try:
                     second = json.loads(ws.recv(timeout=35))
@@ -728,6 +785,18 @@ def guest_connect_shell(base_url: str, code: str) -> int:
                 _restore()
                 raise RuntimeError(first.get("message", "unexpected server response"))
 
+            # Print a clean DevOS-style session header before entering raw mode
+            _restore()
+            print(f"\n  {_G}◉{_RS}  {_C}akash shell{_RS}  {_DM}·  code {code}  ·  Ctrl-C to disconnect{_RS}\n")
+            # Re-enter raw mode
+            try:
+                import tty as _tty3, termios as _term3
+                _old_settings = _term3.tcgetattr(_stdin_fd)
+                _tty3.setraw(_stdin_fd)
+                _raw_ok = True
+            except Exception:
+                pass
+
             ws.send(json.dumps({
                 "type": "pty_run",
                 "command": os.environ.get("SHELL", "/bin/bash"),
@@ -740,10 +809,11 @@ def guest_connect_shell(base_url: str, code: str) -> int:
                 try:
                     while not stop.is_set():
                         if _stdin_fd >= 0:
-                            r = _sel.select([_stdin_fd], [], [], 0.05)[0]
+                            r = _sel.select([_stdin_fd], [], [], 0.02)[0]
                             if not r:
                                 continue
-                            chunk = os.read(_stdin_fd, 256)
+                            # Read up to 4 KiB — handles paste bursts snappily
+                            chunk = os.read(_stdin_fd, 4096)
                         else:
                             chunk = sys.stdin.buffer.read(1)
                         if not chunk:

{akashcli-4.5.5 → akashcli-4.5.7}/akashcli.egg-info/PKG-INFO

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

{akashcli-4.5.5 → akashcli-4.5.7}/pyproject.toml

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