Self-improving AI Employees for everyone
Python ai-agentsai-employeeai-employeesassistantautonomous-agentsco-employeescompanygrok-botinstinctloop-agentsmuseown-your-datapersonalself-hosted
refactor(supervisor): dedup kill_tree across process and browser services
trohitg7a5e978fdc35
diff --git a/server/services/_supervisor/util.py b/server/services/_supervisor/util.pyindex e6b9e61e..95197313 100644--- a/server/services/_supervisor/util.py+++ b/server/services/_supervisor/util.py@@ -23,9 +23,8 @@ def kill_tree(pid: int) -> None:"""Kill a process and all descendants. Cross-platform via psutil.Defensively guards every psutil call against ``NoSuchProcess`` to- survive races with fast-exiting children. Same shape as- ``process_service.py:_kill_process_tree`` and- ``browser_service.py:_kill_process_tree``.+ survive races with fast-exiting children. Used by process_service,+ browser_service, and BaseProcessSupervisor for tree termination."""try:parent = psutil.Process(pid)diff --git a/server/services/browser_service.py b/server/services/browser_service.pyindex 6c74d617..a8de9779 100644--- a/server/services/browser_service.py+++ b/server/services/browser_service.py@@ -30,43 +30,14 @@ import shutilimport subprocessfrom typing import Any, Dict, List, Optional-import psutil-from core.logging import get_logger+from services._supervisor.util import kill_treelogger = get_logger(__name__)_MAX_OUTPUT = 100_000-def _kill_process_tree(pid: int) -> None:- """Terminate a process and all its descendants (cross-platform via psutil).-- Fast-exiting processes can race between ``Process(pid)`` and- ``children()``, so every psutil call is defensively guarded.- """- try:- parent = psutil.Process(pid)- except psutil.NoSuchProcess:- return-- try:- descendants = parent.children(recursive=True)- except psutil.NoSuchProcess:- descendants = []-- for child in descendants:- try:- child.kill()- except psutil.NoSuchProcess:- pass-- try:- parent.kill()- except psutil.NoSuchProcess:- pass--class BrowserService:"""Subprocess wrapper for the agent-browser CLI.@@ -175,7 +146,7 @@ class BrowserService:# npx -> node -> agent-browser daemon -> Chromium. Killing only# proc.pid leaves the daemon orphaned. psutil.children(recursive=True)# walks the tree natively on every platform.- _kill_process_tree(proc.pid)+ kill_tree(proc.pid)proc.wait()diff --git a/server/services/process_service.py b/server/services/process_service.pyindex 97286792..81c22e2c 100644--- a/server/services/process_service.py+++ b/server/services/process_service.py@@ -4,8 +4,9 @@ Manages lifecycle (start/stop/restart), streams stdout/stderr to theTerminal tab via broadcast_terminal_log(), and persists output to templog files so AI agents can fetch output selectively.-Uses stdlib asyncio.create_subprocess_exec -- no third-party deps beyond-psutil (already a project dependency for process tree killing).+Uses stdlib asyncio.create_subprocess_exec; process-tree termination is+delegated to ``services._supervisor.util.kill_tree`` (the canonical+psutil-backed helper shared with browser_service and the supervisor base)."""import asyncio@@ -17,9 +18,8 @@ from datetime import datetimefrom pathlib import Pathfrom typing import Any, Dict, List, Optional-import psutil-from core.logging import get_logger+from services._supervisor.util import kill_treelogger = get_logger(__name__)@@ -179,7 +179,7 @@ class ProcessService:return {"success": True, "result": self._info(managed)}logger.info("[Process] Stopping: %s (pid=%d)", name, managed.pid)- _kill_process_tree(managed.pid)+ kill_tree(managed.pid)managed.status = "stopped"for task in (managed.stdout_task, managed.stderr_task):@@ -308,7 +308,7 @@ class ProcessService:continuemanaged = self._processes[key]if managed.status == "running":- _kill_process_tree(managed.pid)+ kill_tree(managed.pid)for task in (managed.stdout_task, managed.stderr_task):if task and not task.done():task.cancel()@@ -332,7 +332,7 @@ class ProcessService:for key in list(self._processes.keys()):managed = self._processes[key]if managed.status == "running":- _kill_process_tree(managed.pid)+ kill_tree(managed.pid)for task in (managed.stdout_task, managed.stderr_task):if task and not task.done():task.cancel()@@ -409,27 +409,6 @@ class ProcessService:}-def _kill_process_tree(pid: int) -> None:- """Kill a process and all descendants (cross-platform via psutil)."""- try:- parent = psutil.Process(pid)- except psutil.NoSuchProcess:- return- try:- descendants = parent.children(recursive=True)- except psutil.NoSuchProcess:- descendants = []- for child in descendants:- try:- child.kill()- except psutil.NoSuchProcess:- pass- try:- parent.kill()- except psutil.NoSuchProcess:- pass--# -- Singleton --_instance: Optional[ProcessService] = None