mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
fix(computer_use): stop the cua-driver child on exit
CuaDriverBackend caches a long-lived cua-driver subprocess for the life of the Hermes process, and stop() was never called from anywhere — the driver outlived the session that spawned it. #69903 stopped the orphan from pegging a core by disabling the cursor overlay, but left the process behind; this is item 3 of #28152 ("Hermes does not keep the driver alive after tool completion"). Register an atexit hook, mirroring browser_tool's atexit.register(_emergency_cleanup_all_sessions). atexit only, no signal handlers, for the prompt_toolkit reason documented there. reset_backend_for_tests now reuses the same teardown instead of repeating it.
This commit is contained in:
parent
d9f1043c33
commit
4e49af94be
2 changed files with 107 additions and 8 deletions
|
|
@ -38,6 +38,7 @@ For captures / actions with `capture_after=True`:
|
|||
|
||||
from __future__ import annotations
|
||||
|
||||
import atexit
|
||||
import base64
|
||||
import json
|
||||
import logging
|
||||
|
|
@ -177,16 +178,39 @@ def _get_backend() -> ComputerUseBackend:
|
|||
return _backend
|
||||
|
||||
|
||||
def _shutdown_backend_atexit() -> None:
|
||||
"""Stop the cached backend so the cua-driver child doesn't outlive us.
|
||||
|
||||
The backend is cached per-process and holds a long-lived ``cua-driver``
|
||||
subprocess, so without this the driver survives the Hermes process that
|
||||
spawned it (#28152 item 3). #69903 kept the orphan from burning a core by
|
||||
disabling the cursor overlay; the process itself still lingered.
|
||||
|
||||
Mirrors ``browser_tool``'s ``atexit.register(_emergency_cleanup_all_sessions)``
|
||||
— same spawn-and-drive-a-subprocess shape. atexit only, no signal handlers:
|
||||
a ``SystemExit`` raised from a prompt_toolkit key binding corrupts its
|
||||
coroutine state and makes the process unkillable. Never raises, since an
|
||||
exception escaping atexit prints a traceback on every exit.
|
||||
"""
|
||||
global _backend
|
||||
# Drop the lock before stop() — teardown budgets 5s and shouldn't block
|
||||
# an unrelated caller waiting to spawn.
|
||||
with _backend_lock:
|
||||
backend, _backend = _backend, None
|
||||
if backend is None:
|
||||
return
|
||||
try:
|
||||
backend.stop()
|
||||
except Exception as e:
|
||||
logger.debug("cua-driver atexit teardown failed: %s", e)
|
||||
|
||||
|
||||
atexit.register(_shutdown_backend_atexit)
|
||||
|
||||
|
||||
def reset_backend_for_tests() -> None: # pragma: no cover
|
||||
"""Test helper — tear down the cached backend and per-session state."""
|
||||
global _backend
|
||||
with _backend_lock:
|
||||
if _backend is not None:
|
||||
try:
|
||||
_backend.stop()
|
||||
except Exception:
|
||||
pass
|
||||
_backend = None
|
||||
_shutdown_backend_atexit()
|
||||
_AUX_VISION_ROUTE_CACHE.clear()
|
||||
with _approval_lock:
|
||||
_session_auto_approve.clear()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue