akashcli 4.7.4__tar.gz → 4.7.6__tar.gz

{akashcli-4.7.4 → akashcli-4.7.6}/PKG-INFO

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

{akashcli-4.7.4 → akashcli-4.7.6}/akashcli/cli.py

@@ -47,11 +47,12 @@ def _gr(s: str) -> str:          return f"{_GR}{s}{_RS}"
 
 # ── Spinner (single-line, no flicker) ────────────────────────────────────────
 class _Spin:
-    """Minimal inline spinner with instant frame-0 rendering, smooth 350ms visibility, and clean cleanup."""
+    """Minimal inline spinner with instant frame-0 rendering, smooth visibility, and clean cleanup."""
     _FRAMES = ("⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏")
 
-    def __init__(self, label: str, min_seconds: float = 0.35, disabled: bool = False):
+    def __init__(self, label: str, min_seconds: float = 0.35, disabled: bool = False, prefix: str = ""):
         self._label = label
+        self._prefix = prefix
         self._disabled = disabled or (not sys.stdout.isatty())
         self._min_seconds = min_seconds
         self._i = 0
@@ -65,18 +66,21 @@ class _Spin:
         import threading, time
         self._active = True
         self._t0 = time.monotonic()
-        cr = chr(13)
-        sys.stdout.write(cr + "  " + _C + self._FRAMES[0] + _RS + "  " + _DM + self._label + _RS + "  ")
+        pfx = self._prefix + "  " if self._prefix else "  "
+        sys.stdout.write(f"\r{pfx}{_C}{self._FRAMES[0]}{_RS}  {_DM}{self._label}{_RS}  ")
         sys.stdout.flush()
 
         def _spin():
             time.sleep(0.04)
             while self._active:
                 f = self._FRAMES[self._i % len(self._FRAMES)]
-                sys.stdout.write(chr(13) + "  " + _C + f + _RS + "  " + _DM + self._label + _RS + "  ")
+                now = time.monotonic()
+                dur = now - self._t0
+                dur_str = f" {_dim(f'({dur:.1f}s)')}" if dur >= 1.0 else ""
+                sys.stdout.write(f"\r\033[2K{pfx}{_C}{f}{_RS}  {_DM}{self._label}{_RS}{dur_str}  ")
                 sys.stdout.flush()
                 self._i += 1
-                time.sleep(0.07)
+                time.sleep(0.06)
 
         self._thread = threading.Thread(target=_spin, daemon=True)
         self._thread.start()
@@ -95,7 +99,7 @@ class _Spin:
         self._active = False
         if self._thread:
             self._thread.join(timeout=0.2)
-        sys.stdout.write(chr(13) + chr(27) + "[2K"); sys.stdout.flush()
+        sys.stdout.write("\r\033[2K")
         sys.stdout.flush()
 
 def _resolve_client(url_override: str = None, require_key: bool = False, silent: bool = False):
@@ -2792,7 +2796,7 @@ def agent_list(raw: bool = typer.Option(False, "--json", help="Raw JSON output")
 
 
 def _resolve_agent_id(target_id: str) -> tuple[str, str, str]:
-    """Resolves short Profile ID (e.g. fbf6) or Client ID into (profile_id, client_id, agent_name)."""
+    """Resolves short Profile ID (e.g. aa23), Client ID, suffix, or name into (profile_id, client_id, agent_name)."""
     import json
     from pathlib import Path
     agents_file = Path.home() / ".akash" / "agents.json"
@@ -2801,15 +2805,32 @@ def _resolve_agent_id(target_id: str) -> tuple[str, str, str]:
         try: agents = json.loads(agents_file.read_text())
         except Exception: pass
 
-    # 1. Match by Profile ID (fbf6)
+    if not target_id:
+        if agents:
+            first_pid = next(reversed(list(agents.keys())))
+            return first_pid, agents[first_pid]["client_id"], agents[first_pid].get("name", "Agent")
+        return "", "", "Agent"
+
+    # 1. Match by Profile ID (e.g. aa23)
     if target_id in agents:
         return target_id, agents[target_id]["client_id"], agents[target_id].get("name", "Agent")
 
-    # 2. Match by Client ID (akash_client_...)
+    # 2. Match by exact Client ID
     for pid, d in agents.items():
         if d.get("client_id") == target_id:
             return pid, target_id, d.get("name", "Agent")
 
+    # 3. Match by Client ID suffix (e.g. d06f) or prefix
+    for pid, d in agents.items():
+        cid = d.get("client_id", "")
+        if cid.endswith(target_id) or cid.startswith(target_id) or (len(target_id) >= 4 and target_id in cid):
+            return pid, cid, d.get("name", "Agent")
+
+    # 4. Match by Name (case-insensitive)
+    for pid, d in agents.items():
+        if d.get("name", "").lower() == target_id.lower():
+            return pid, d.get("client_id", ""), d.get("name", "Agent")
+
     return target_id, target_id, "Agent"
 
 
@@ -3310,15 +3331,19 @@ def mcp_serve(
         except Exception: agents = {}
 
     if not profile_id and not client_id and agents:
-        profile_id = "af4f" if "af4f" in agents else next(iter(agents.keys()))
+        profile_id = next(reversed(list(agents.keys())))
 
-    cached = agents.get(profile_id or "", {})
-    cid = client_id or cached.get("client_id") or os.getenv("AKASH_CLIENT_ID")
+    resolved_pid, resolved_cid, pname = _resolve_agent_id(profile_id or client_id or "")
+    cached = agents.get(resolved_pid, {})
+    cid = client_id or resolved_cid or cached.get("client_id") or os.getenv("AKASH_CLIENT_ID")
     csec = client_secret or cached.get("client_secret") or os.getenv("AKASH_CLIENT_SECRET")
-    pname = cached.get("name", "AI Agent")
+    pname = cached.get("name", pname)
+    profile_id = resolved_pid or profile_id
 
     if not cid or not csec:
-        _err("Missing credentials. Provide --id <ID> or create one: akash agent create")
+        avail = ", ".join([f"{k} ({v.get('name', 'Agent')})" for k, v in agents.items()]) if agents else "none"
+        _err(f"Missing credentials for '{profile_id or client_id or 'default'}'. Available profiles: {avail}")
+        _err("Provide a valid --id <ID> or create one: akash mcp create -n Dev -r @coder")
         raise typer.Exit(1)
 
     _, base = _resolve_client(url or cached.get("url"), require_key=False, silent=True)
@@ -3399,6 +3424,7 @@ def mcp_serve(
                         args = frame.get("arguments", {})
                         t0 = time.monotonic()
                         now_str = datetime.datetime.now().strftime("%H:%M:%S")
+                        ts_pfx = f"  {_GR}{now_str}{_RS}"
 
                         if t_name == "akash_exec_command":
                             cmd = args.get("command", "")
@@ -3406,7 +3432,7 @@ def mcp_serve(
 
                             is_safe, sec_reason = _sanitize_agent_command(cmd, scopes=cached.get("scopes", "*"))
                             if not is_safe:
-                                print(f"  {_GR}{now_str}{_RS}  {_R}🚨 Blocked{_RS} -> {disp_cmd} {_dim('(' + sec_reason + ')')}")
+                                print(f"{ts_pfx}  {_R}🚨 Blocked{_RS} -> {disp_cmd} {_dim('(' + sec_reason + ')')}")
                                 ws.send(json.dumps({
                                     "type": "tool_response",
                                     "id": call_id,
@@ -3416,9 +3442,9 @@ def mcp_serve(
                                 if any(k in cmd for k in ["touch", "mkdir", "mv", "cp", "sed", ">", ">>", "python", "npm", "pip"]):
                                     _save_undo_checkpoint()
 
-                                # Instant frame-0 animated spinner with timeout protection
+                                # Instant frame-0 animated spinner with live visibility
                                 try:
-                                    with _Spin(f"executing: {disp_cmd}", min_seconds=0.1):
+                                    with _Spin(f"exec: {disp_cmd}", min_seconds=0.25, prefix=ts_pfx):
                                         r = subprocess.run(cmd, shell=True, capture_output=True, text=True, timeout=60)
                                         elapsed_ms = (time.monotonic() - t0) * 1000
                                         raw_out = r.stdout + r.stderr
@@ -3432,7 +3458,7 @@ def mcp_serve(
 
                                 ec_color = _G if returncode == 0 else _R
                                 ec_icon = f"{_G}✓{_RS}" if returncode == 0 else f"{_R}✗{_RS}"
-                                print(f"  {_GR}{now_str}{_RS}  {ec_icon} {ec_color}exec:{_RS} {disp_cmd} {ec_color}[{returncode}]{_RS} {_dim(f'{elapsed_ms:.1f}ms')}")
+                                print(f"{ts_pfx}  {ec_icon} {ec_color}exec:{_RS} {disp_cmd} {ec_color}[{returncode}]{_RS} {_dim(f'{elapsed_ms:.1f}ms')}")
 
                                 ws.send(json.dumps({
                                     "type": "tool_response",
@@ -3440,10 +3466,10 @@ def mcp_serve(
                                     "result": {"content": [{"type": "text", "text": bounded_out or "(no output)"}], "isError": returncode != 0}
                                 }))
                         elif t_name == "akash_undo":
-                            with _Spin("undo: reverting workspace to checkpoint", min_seconds=0.15):
+                            with _Spin("undo: reverting workspace to checkpoint", min_seconds=0.25, prefix=ts_pfx):
                                 ok, msg_txt = _restore_undo_checkpoint()
                             icon = f"{_G}✓{_RS}" if ok else f"{_R}✗{_RS}"
-                            print(f"  {_GR}{now_str}{_RS}  {icon} {(_G if ok else _R)}undo:{_RS} {_dim(msg_txt)}")
+                            print(f"{ts_pfx}  {icon} {(_G if ok else _R)}undo:{_RS} {_dim(msg_txt)}")
                             ws.send(json.dumps({
                                 "type": "tool_response",
                                 "id": call_id,
@@ -3453,10 +3479,10 @@ def mcp_serve(
                         elif t_name == "akash_checkpoint_create":
                             label = args.get("label", "agent_checkpoint")
                             from .terminal import build_snapshot
-                            with _Spin(f"checkpoint: {label} (packing workspace)", min_seconds=0.15):
+                            with _Spin(f"checkpoint: {label} (packing workspace)", min_seconds=0.25, prefix=ts_pfx):
                                 _, manifest, _ = build_snapshot(label=label)
                                 elapsed_ms = (time.monotonic() - t0) * 1000
-                            print(f"  {_GR}{now_str}{_RS}  {_C}📸 checkpoint:{_RS} {_dim(label)} ({len(manifest.get('files', []))} files) {_dim(f'{elapsed_ms:.1f}ms')}")
+                            print(f"{ts_pfx}  {_C}📸 checkpoint:{_RS} {_dim(label)} ({len(manifest.get('files', []))} files) {_dim(f'{elapsed_ms:.1f}ms')}")
                             ws.send(json.dumps({
                                 "type": "tool_response",
                                 "id": call_id,

{akashcli-4.7.4 → akashcli-4.7.6}/akashcli.egg-info/PKG-INFO

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

{akashcli-4.7.4 → akashcli-4.7.6}/pyproject.toml

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