agent-manager-cli 0.1.3__tar.gz → 0.1.4__tar.gz

{agent_manager_cli-0.1.3 → agent_manager_cli-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-manager-cli
-Version: 0.1.3
+Version: 0.1.4
 Summary: CLI для удалённого управления AI-агентами — Node Agent, daemon, сканер сессий
 License-Expression: MIT
 Requires-Python: >=3.11

{agent_manager_cli-0.1.3 → agent_manager_cli-0.1.4}/am/cli.py

@@ -79,7 +79,8 @@ def map_stream_event(line: str) -> list[dict]:
         return []
 
     if msg_type == "assistant":
-        content_blocks = msg.get("message", {}).get("content", [])
+        message = msg.get("message", {})
+        content_blocks = message.get("content", [])
         events = []
         for block in content_blocks:
             block_type = block.get("type")
@@ -108,6 +109,20 @@ def map_stream_event(line: str) -> list[dict]:
                         },
                     }
                 )
+        # Emit token usage delta if present in this assistant message.
+        usage = message.get("usage") or {}
+        if usage:
+            events.append(
+                {
+                    "event_type": "usage",
+                    "data": {
+                        "input_tokens": usage.get("input_tokens", 0),
+                        "output_tokens": usage.get("output_tokens", 0),
+                        "cache_creation_input_tokens": usage.get("cache_creation_input_tokens", 0),
+                        "cache_read_input_tokens": usage.get("cache_read_input_tokens", 0),
+                    },
+                }
+            )
         return events
 
     if msg_type == "user":
@@ -372,14 +387,16 @@ async def run_daemon_bidirectional(ws_url: str, ws_token: str, command: list[str
 
                 try:
                     raw = json.loads(line)
-                    if raw.get("type") == "system" and raw.get("subtype") == "init":
+                    raw_type = raw.get("type", "?")
+                    _log("raw", f"#{line_num} type={raw_type}")
+                    if raw_type == "system" and raw.get("subtype") == "init":
                         session_id = raw.get("session_id")
-                    elif raw.get("type") == "result":
+                    elif raw_type == "result":
                         sid = raw.get("session_id")
                         if sid:
                             session_id = sid
                 except (json.JSONDecodeError, KeyError):
-                    pass
+                    _log("raw", f"#{line_num} (not json) {line[:80]}")
 
                 events = map_stream_event(line)
                 if not events:
@@ -630,7 +647,8 @@ async def _run_node_agent(host: str, secure: bool, access_token: str) -> None:
                         )
                     )
                     _log("node", f"Sent {len(sessions)} sessions")
-                except websockets.exceptions.ConnectionClosed:
+                except websockets.exceptions.ConnectionClosed as e:
+                    _log("node", f"scan: connection closed ({e.code} {e.reason or '-'})")
                     break
                 except Exception as e:
                     _log("node", f"Scan error: {e}")
@@ -641,7 +659,8 @@ async def _run_node_agent(host: str, secure: bool, access_token: str) -> None:
                 await asyncio.sleep(25)
                 try:
                     await ws.send(json.dumps({"type": "heartbeat"}))
-                except websockets.exceptions.ConnectionClosed:
+                except websockets.exceptions.ConnectionClosed as e:
+                    _log("node", f"heartbeat: connection closed ({e.code} {e.reason or '-'})")
                     break
 
         async def _listen_commands():
@@ -654,8 +673,8 @@ async def _run_node_agent(host: str, secure: bool, access_token: str) -> None:
 
                     if cmd.get("type") == "attach":
                         await _handle_attach(cmd, host, secure, daemon_procs)
-            except websockets.exceptions.ConnectionClosed:
-                pass
+            except websockets.exceptions.ConnectionClosed as e:
+                _log("node", f"listen: connection closed ({e.code} {e.reason or '-'})")
 
         scan_task = asyncio.create_task(_scan_and_send())
         hb_task = asyncio.create_task(_heartbeat())
@@ -763,18 +782,45 @@ def cmd_connect(args: argparse.Namespace) -> None:
             save_config(config)
             _log("connect", "Token refreshed.")
 
-    try:
-        asyncio.run(_run_node_agent(host, secure, access_token))
-    except KeyboardInterrupt:
-        print("\n[connect] Stopped.", file=sys.stderr)
-    except websockets.exceptions.InvalidStatusCode as e:
-        _log("connect", f"WebSocket error: {e}")
-        if e.status_code in (401, 403):
-            _log("connect", "Token may be expired. Run `am login` again.")
-        sys.exit(1)
-    except Exception as e:
-        _log("connect", f"Error: {e}")
-        sys.exit(1)
+    # Reconnect loop with exponential backoff. On clean disconnect (network
+    # blip, backend restart, proxy timeout) we retry automatically. Auth
+    # errors (401/403) bail out immediately — the user must re-login.
+    import time as _time
+
+    backoff = 1
+    while True:
+        try:
+            asyncio.run(_run_node_agent(host, secure, access_token))
+            # _run_node_agent returned normally → ws was closed by server or
+            # one of the tasks finished. Reconnect after a short delay.
+            _log("connect", f"Disconnected. Reconnecting in {backoff}s...")
+        except KeyboardInterrupt:
+            print("\n[connect] Stopped.", file=sys.stderr)
+            return
+        except websockets.exceptions.InvalidStatusCode as e:
+            if e.status_code in (401, 403):
+                _log("connect", f"Auth failed ({e.status_code}). Run `am login` again.")
+                sys.exit(1)
+            _log("connect", f"WebSocket error: {e}, retrying in {backoff}s...")
+        except OSError as e:
+            # DNS / connect refused / network unreachable — keep trying.
+            _log("connect", f"Network error: {e}, retrying in {backoff}s...")
+        except Exception as e:
+            _log("connect", f"Error: {e} ({type(e).__name__}), retrying in {backoff}s...")
+
+        _time.sleep(backoff)
+        backoff = min(backoff * 2, 30)  # cap at 30 seconds
+
+        # After a reconnect attempt, try to refresh the token again in case
+        # it expired while we were disconnected for a long period.
+        if refresh_token:
+            tokens = _refresh_token(host, secure, refresh_token)
+            if tokens:
+                access_token = tokens["access_token"]
+                refresh_token = tokens["refresh_token"]
+                config["access_token"] = access_token
+                config["refresh_token"] = refresh_token
+                save_config(config)
 
 
 # ---------------------------------------------------------------------------

{agent_manager_cli-0.1.3 → agent_manager_cli-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-manager-cli"
-version = "0.1.3"
+version = "0.1.4"
 description = "CLI для удалённого управления AI-агентами — Node Agent, daemon, сканер сессий"
 readme = "README.md"
 requires-python = ">=3.11"