Skip to content

Open-source Python library for AI browser agents, plus Browser Use Cloud: stealth browsers and a hosted agent API.

store shutdown task reference to prevent browser orphaning on signal exit

ShawnPanac5885e9e067a
diff --git a/browser_use/skill_cli/daemon.py b/browser_use/skill_cli/daemon.py
index b050e0789..3f5d551c9 100644
--- a/browser_use/skill_cli/daemon.py
+++ b/browser_use/skill_cli/daemon.py
@@ -57,6 +57,7 @@ class Daemon:
self._server: asyncio.Server | None = None
self._shutdown_event = asyncio.Event()
self._session: SessionInfo | None = None
+ self._shutdown_task: asyncio.Task | None = None
self._browser_watchdog_task: asyncio.Task | None = None
async def _get_or_create_session(self) -> SessionInfo:
@@ -215,7 +216,7 @@ class Daemon:
loop = asyncio.get_running_loop()
def signal_handler():
- asyncio.create_task(self.shutdown())
+ self._shutdown_task = asyncio.create_task(self.shutdown())
for sig in (signal.SIGINT, signal.SIGTERM):
try:
@@ -260,6 +261,9 @@ class Daemon:
try:
async with self._server:
await self._shutdown_event.wait()
+ # Wait for shutdown to finish browser cleanup before exiting
+ if self._shutdown_task:
+ await self._shutdown_task
except asyncio.CancelledError:
pass
finally: