fix(sandbox): preserve observer idle cleanup

Author: zouyonghe

astrbot/core/computer/computer_client.py

@@ -54,9 +54,9 @@ def _save_cua_registry() -> None:
     sandbox_manager.save_registry()
 
 
-def _get_cua_idle_timeout(config: dict) -> float:
+def _get_cua_idle_timeout(context: Context, session_id: str) -> float:
     _sync_sandbox_manager_refs()
-    return sandbox_manager.get_idle_timeout(config, "cua")
+    return sandbox_manager.providers["cua"].get_idle_timeout(context, session_id)
 
 
 def _clear_cua_idle_state(sandbox_id: str) -> None:
@@ -176,39 +176,6 @@ async def _boot_managed_cua_sandbox_hook(
 _sync_sandbox_manager_refs()
 
 
-def _new_managed_cua_sandbox_id() -> str:
-    return f"cua-{uuid.uuid4().hex[:12]}"
-
-
-def _build_cua_sandbox_record_payload(
-    *,
-    sandbox_id: str,
-    sandbox_name: str,
-    session_id: str,
-    cua_kwargs: dict,
-    idle_timeout: float,
-    is_default: bool = False,
-) -> dict:
-    return {
-        "sandbox_id": sandbox_id,
-        "sandbox_name": sandbox_name,
-        "booter_type": "cua",
-        "provider": "cua",
-        "managed": True,
-        "created_by_astrbot": True,
-        "owner_user_id": session_id,
-        "owner_session_id": session_id,
-        "connect_info": {
-            "name": sandbox_name,
-            "local": cua_kwargs.get("local", True),
-            "image": cua_kwargs.get("image"),
-            "os_type": cua_kwargs.get("os_type"),
-        },
-        "is_default": is_default,
-        "idle_timeout": idle_timeout,
-    }
-
-
 async def _get_or_create_cua_booter(
     context: Context, session_id: str, sandbox_cfg: dict
 ) -> ComputerBooter:
@@ -471,7 +438,10 @@ async def get_cua_observer_booter(context: Context, session_id: str) -> Computer
         current_sandbox_id = getattr(booter, "sandbox_id", current_sandbox_id)
     cua_registry.touch_sandbox(current_sandbox_id)
     _save_cua_registry()
-    _schedule_cua_idle_cleanup(current_sandbox_id, _get_cua_idle_timeout(config))
+    _schedule_cua_idle_cleanup(
+        current_sandbox_id,
+        _get_cua_idle_timeout(context, session_id),
+    )
     return booter
 
 

tests/unit/test_cua_computer_use.py

@@ -1725,6 +1725,55 @@ async def available(self):
     assert "shipyard-session" not in computer_client.cua_idle_state
 
 
+@pytest.mark.asyncio
+async def test_cua_observer_booter_schedules_configured_idle_cleanup(
+    monkeypatch, tmp_path
+):
+    from astrbot.core.computer import computer_client
+    from astrbot.core.computer.cua_registry import CuaSandboxRegistry
+
+    class FakeBooter:
+        async def available(self):
+            return True
+
+    registry = CuaSandboxRegistry(storage_path=tmp_path / "observer-registry.json")
+    registry.upsert_sandbox(
+        sandbox_id="sb-observer-timeout",
+        sandbox_name="observer-timeout",
+        booter_type="cua",
+        provider="cua",
+        managed=True,
+        created_by_astrbot=True,
+        owner_user_id="session-a",
+        owner_session_id="session-a",
+        connect_info={"name": "observer-timeout", "local": True},
+    )
+    registry.set_current_sandbox_id("session-a", "sb-observer-timeout")
+    monkeypatch.setattr(computer_client, "cua_registry", registry)
+    computer_client.session_booter.clear()
+    computer_client.cua_idle_state.clear()
+    computer_client.session_booter["sb-observer-timeout"] = FakeBooter()
+
+    ctx = FakeContext(
+        {
+            "provider_settings": {
+                "computer_use_runtime": "sandbox",
+                "sandbox": {
+                    "booter": "cua",
+                    "cua_idle_timeout": 0.2,
+                },
+            }
+        }
+    )
+
+    await computer_client.get_cua_observer_booter(ctx, "session-a")
+
+    state = computer_client.cua_idle_state.get("sb-observer-timeout")
+    assert state is not None
+    assert state.task.done() is False
+    computer_client._clear_cua_idle_state("sb-observer-timeout")
+
+
 @pytest.mark.asyncio
 async def test_cua_components_map_sdk_results(tmp_path):
     from astrbot.core.computer.booters.cua import (