From ab168befae25d9dc01dbb2b8b90fefa99e3d2295 Mon Sep 17 00:00:00 2001
From: yetuge <182123929+yetuge@users.noreply.github.com>
Date: Sat, 7 Nov 2026 15:49:55 +0800
Subject: [PATCH] fix(sandbox): build the readiness client off the event loop
 (#7934)

* fix(sandbox): build the readiness client off the event loop

`wait_for_sandbox_ready_async` exists so sandbox startup waits do not block the
runtime event loop, yet it constructed `httpx.AsyncClient` inline: the
constructor resolves the system trust store synchronously, so the loop stalled
for the whole construction before the first poll was sent (~320 ms in a local
probe on this host).

Move the construction into a worker thread and own it as a task, the way
backend/AGENTS.md now requires for HTTPX clients: a cancellation that lands
while the worker is still inside the constructor waits for it and closes the
client it builds, so the pool is not abandoned. Requests, polling cadence,
timeouts and cleanup stay on the event loop.

The blocking-I/O regression pins both halves. Against the previous code the
trust-store assertion fires on the loop thread; with a plain `asyncio.to_thread`
instead of the owned task, the cancellation test reports the leaked client.

* fix(sandbox): preserve readiness cancellation during cleanup

---------

Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
---
 .../deerflow/community/aio_sandbox/AGENTS.md  |   7 +
 .../deerflow/community/aio_sandbox/backend.py |  47 +++++-
 .../test_aio_sandbox_readiness_ssl.py         | 142 ++++++++++++++++++
 3 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 backend/tests/blocking_io/test_aio_sandbox_readiness_ssl.py

diff --git a/backend/packages/harness/deerflow/community/aio_sandbox/AGENTS.md b/backend/packages/harness/deerflow/community/aio_sandbox/AGENTS.md
index 097778e21a..a04b53e71e 100644
--- a/backend/packages/harness/deerflow/community/aio_sandbox/AGENTS.md
+++ b/backend/packages/harness/deerflow/community/aio_sandbox/AGENTS.md
@@ -30,6 +30,13 @@ receipts fence reuse through existing quarantine. New output from a running
 command needs its next offset; empty polls retain the previous offsets.
 Markers support cooperative cleanup, not hostile-code isolation.
 
+## Readiness polling
+
+Build the async readiness client off the event loop. Drain construction and
+close a late client on caller cancellation. If construction or close is
+itself cancelled, log it and preserve the caller's original cancellation.
+Regression: `tests/blocking_io/test_aio_sandbox_readiness_ssl.py`.
+
 ## Reuse admission
 
 Open-mode creation returns its port reservation when the Docker or Apple
diff --git a/backend/packages/harness/deerflow/community/aio_sandbox/backend.py b/backend/packages/harness/deerflow/community/aio_sandbox/backend.py
index 346177bce1..db56b332b1 100644
--- a/backend/packages/harness/deerflow/community/aio_sandbox/backend.py
+++ b/backend/packages/harness/deerflow/community/aio_sandbox/backend.py
@@ -8,6 +8,7 @@ import logging
 import time
 from abc import ABC, abstractmethod
 from collections.abc import Mapping
+from typing import Any
 from urllib.parse import urlparse
 
 import httpx
@@ -103,6 +104,48 @@ def wait_for_sandbox_ready(
     return False
 
 
+async def _settle(future: asyncio.Future[Any]) -> Any:
+    """Await a future that owns a resource, even if this task is cancelled again.
+
+    Cleanup must not be the thing that gets abandoned: the caller remembers its
+    own cancellation and re-raises it once the resource is released.
+    """
+    while True:
+        try:
+            return await asyncio.shield(future)
+        except asyncio.CancelledError:
+            if future.cancelled():
+                raise
+
+
+async def _open_client(**kwargs: Any) -> httpx.AsyncClient:
+    """Build an ``httpx.AsyncClient`` without loading TLS trust on the event loop.
+
+    The constructor resolves the system trust store synchronously, so it has to
+    run in a thread. That alone is not enough: a cancellation can arrive while
+    the worker is still inside the constructor, and then the await is abandoned
+    while the thread goes on to hand back a live client that nobody closes. So
+    own the construction as a task and, once cancelled, wait for it and close
+    whatever it produced before the cancellation propagates. If either owned
+    task fails or is itself cancelled, log it and re-raise the caller's original
+    cancellation.
+    """
+    construction: asyncio.Task[httpx.AsyncClient] = asyncio.create_task(asyncio.to_thread(httpx.AsyncClient, **kwargs))
+    try:
+        return await asyncio.shield(construction)
+    except asyncio.CancelledError:
+        try:
+            late_client = await _settle(construction)
+        except (Exception, asyncio.CancelledError) as error:
+            logger.error("Sandbox readiness HTTPX client construction failed after cancellation: %r", error)
+        else:
+            try:
+                await _settle(asyncio.create_task(late_client.aclose()))
+            except (Exception, asyncio.CancelledError) as error:
+                logger.error("Closing a sandbox readiness HTTPX client built after cancellation failed: %r", error)
+        raise
+
+
 async def wait_for_sandbox_ready_async(
     sandbox_url: str,
     timeout: int = 30,
@@ -125,7 +168,9 @@ async def wait_for_sandbox_ready_async(
     }
     if headers:
         client_kwargs["headers"] = dict(headers)
-    async with httpx.AsyncClient(**client_kwargs) as client:
+    # Construction loads TLS trust synchronously, off the loop, and owns the
+    # client even when this coroutine is cancelled mid-construction.
+    async with await _open_client(**client_kwargs) as client:
         while True:
             remaining = deadline - loop.time()
             if remaining <= 0:
diff --git a/backend/tests/blocking_io/test_aio_sandbox_readiness_ssl.py b/backend/tests/blocking_io/test_aio_sandbox_readiness_ssl.py
new file mode 100644
index 0000000000..f78fee105b
--- /dev/null
+++ b/backend/tests/blocking_io/test_aio_sandbox_readiness_ssl.py
@@ -0,0 +1,142 @@
+"""Sandbox readiness polling must load HTTPX TLS trust off the event loop.
+
+``wait_for_sandbox_ready_async`` exists precisely so sandbox startup waits do
+not block the runtime's event loop, yet it built its client inline: the
+``httpx.AsyncClient`` constructor resolves the system trust store synchronously,
+so the loop stalled for its whole duration before the first poll was even sent.
+"""
+
+import asyncio
+import ssl
+import threading
+
+import httpx
+import pytest
+
+from deerflow.community.aio_sandbox.backend import wait_for_sandbox_ready_async
+
+
+@pytest.mark.asyncio
+async def test_sandbox_readiness_tls_setup_runs_off_loop(monkeypatch):
+    loop_thread = threading.get_ident()
+    original_context = ssl.create_default_context
+    contexts = []
+    clients = []
+    requests = []
+
+    def create_context(*args, **kwargs):
+        assert threading.get_ident() != loop_thread, "TLS trust loading blocks the event loop"
+        context = original_context(*args, **kwargs)
+        contexts.append(context)
+        return context
+
+    async def send(self, request, **kwargs):
+        assert threading.get_ident() == loop_thread
+        clients.append(self)
+        requests.append(str(request.url))
+        return httpx.Response(200, request=request, json={"status": "ready"})
+
+    monkeypatch.setattr(ssl, "create_default_context", create_context)
+    monkeypatch.setattr(httpx.AsyncClient, "send", send)
+
+    ready = await wait_for_sandbox_ready_async(
+        "http://sandbox.example:8080",
+        timeout=5,
+        headers={"Authorization": "Bearer synthetic"},
+    )
+
+    assert ready is True
+    assert contexts
+    assert requests == ["http://sandbox.example:8080/v1/sandbox"]
+    assert len(clients) == 1
+    assert clients[0].is_closed
+
+
+@pytest.mark.asyncio
+async def test_sandbox_readiness_closes_client_built_after_cancellation(monkeypatch):
+    """Cancelling during construction must not leak the client it eventually builds.
+
+    The constructor cannot be interrupted once it is inside the worker thread, so
+    the await is abandoned while the thread goes on and hands back a live client.
+    Nothing can enter the ``async with`` for that client, so the construction's
+    owner has to close it and the wait still has to end cancelled.
+    """
+    real_client = httpx.AsyncClient
+    started = threading.Event()
+    release = threading.Event()
+    finished = threading.Event()
+    built = []
+    sent = []
+
+    def gated_client(*args, **kwargs):
+        started.set()
+        assert release.wait(10), "the constructor was never released"
+        client = real_client(*args, **kwargs)
+        built.append(client)
+        finished.set()
+        return client
+
+    async def send(self, request, **kwargs):
+        sent.append(request.url)
+        return httpx.Response(200, request=request, json={"status": "ready"})
+
+    monkeypatch.setattr(httpx, "AsyncClient", gated_client)
+    monkeypatch.setattr(real_client, "send", send)
+
+    pending = asyncio.ensure_future(wait_for_sandbox_ready_async("http://sandbox.example:8080", timeout=5))
+
+    assert await asyncio.to_thread(started.wait, 10), "the constructor never started"
+    # The wait is suspended on the constructor now, so the cancellation lands
+    # there and never reaches the request: release the worker only afterwards.
+    pending.cancel()
+    await asyncio.sleep(0)
+    await asyncio.sleep(0)
+    release.set()
+
+    with pytest.raises(asyncio.CancelledError):
+        await pending
+
+    # The worker thread cannot be stopped, so wait for it before judging what it
+    # built; a leaked client is only visible once the constructor has returned.
+    assert await asyncio.to_thread(finished.wait, 10), "the constructor never finished"
+
+    assert sent == [], "a cancelled construction must not send a poll"
+    assert len(built) == 1
+    assert built[0].is_closed, "the client built after the cancellation was leaked"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("stage", "log_fragment"),
+    [
+        ("construction", "construction failed after cancellation"),
+        ("close", "built after cancellation failed"),
+    ],
+)
+async def test_sandbox_readiness_preserves_caller_cancellation_when_owned_task_is_cancelled(monkeypatch, caplog, stage, log_fragment):
+    loop = asyncio.get_running_loop()
+    started = asyncio.Event()
+    release = threading.Event()
+
+    class Client:
+        async def aclose(self):
+            raise asyncio.CancelledError("close task cancelled")
+
+    def build_client(**kwargs):
+        loop.call_soon_threadsafe(started.set)
+        assert release.wait(5), "the constructor was never released"
+        if stage == "construction":
+            raise asyncio.CancelledError("construction task cancelled")
+        return Client()
+
+    monkeypatch.setattr(httpx, "AsyncClient", build_client)
+    pending = asyncio.create_task(wait_for_sandbox_ready_async("http://sandbox.example:8080", timeout=5))
+    try:
+        await asyncio.wait_for(started.wait(), timeout=5)
+    finally:
+        pending.cancel("readiness caller cancelled")
+        release.set()
+
+    with pytest.raises(asyncio.CancelledError, match="readiness caller cancelled"):
+        await pending
+    assert log_fragment in caplog.text