agent-manager-cli 0.1.8__tar.gz → 0.1.9__tar.gz

{agent_manager_cli-0.1.8 → agent_manager_cli-0.1.9}/PKG-INFO

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

{agent_manager_cli-0.1.8 → agent_manager_cli-0.1.9}/am/cli.py

@@ -656,8 +656,39 @@ async def run_daemon_bidirectional(ws_url: str, ws_token: str, command: list[str
 
         stdout_task = asyncio.create_task(_read_stdout())
         ws_task = asyncio.create_task(_read_ws())
-        await stdout_task
-        ws_task.cancel()
+
+        # Run both in parallel. Normally stdout_task finishes first
+        # (Claude exits naturally at end of task). If ws_task finishes
+        # first it means the backend connection died — in that case we
+        # have no way to recover the session, so we terminate Claude
+        # so the daemon subprocess exits cleanly. The node agent will
+        # detect the dead subprocess and spawn a fresh one on the next
+        # attach command (with --continue --resume so history is kept).
+        done, _pending = await asyncio.wait(
+            [stdout_task, ws_task],
+            return_when=asyncio.FIRST_COMPLETED,
+        )
+
+        if ws_task in done and proc.returncode is None:
+            _log(
+                "daemon",
+                "WS closed while Claude is still running — terminating CLI "
+                "(node agent will respawn on next attach)",
+            )
+            try:
+                proc.terminate()
+            except ProcessLookupError:
+                pass
+
+        # Let remaining tasks clean up (stdout_task should exit once
+        # claude's stdout closes after terminate).
+        for task in (stdout_task, ws_task):
+            if not task.done():
+                task.cancel()
+                try:
+                    await task
+                except (asyncio.CancelledError, Exception):
+                    pass
 
     proc.wait()
     _log("daemon", f"Process exited with code {proc.returncode}")
@@ -888,8 +919,34 @@ async def _run_node_agent(
         async def _heartbeat():
             while True:
                 await asyncio.sleep(25)
+                # Reap any daemon subprocesses that have exited so we
+                # don't report them as alive.
+                dead = [
+                    aid for aid, p in daemon_procs.items()
+                    if p.returncode is not None
+                ]
+                for aid in dead:
+                    daemon_procs.pop(aid, None)
+
+                # Report live daemons to the backend so it can refresh
+                # `daemon:live:{id}` heartbeats. This is the source of
+                # truth for the UI's `is_daemon_alive` check — without
+                # it the backend has no way to know when a daemon
+                # subprocess is alive but its own ws to the backend is
+                # dead (orphaned after backend restart, etc.).
+                alive_ids = [
+                    aid for aid, p in daemon_procs.items()
+                    if p.returncode is None
+                ]
                 try:
-                    await ws.send(json.dumps({"type": "heartbeat"}))
+                    await ws.send(
+                        json.dumps(
+                            {
+                                "type": "heartbeat",
+                                "daemons": alive_ids,
+                            }
+                        )
+                    )
                 except websockets.exceptions.ConnectionClosed as e:
                     _log("node", f"heartbeat: connection closed ({e.code} {e.reason or '-'})")
                     break

{agent_manager_cli-0.1.8 → agent_manager_cli-0.1.9}/pyproject.toml

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