fix(sandbox): preserve default marker on upsert

Author: zouyonghe

astrbot/core/computer/sandbox_registry.py

@@ -68,7 +68,7 @@ def upsert_sandbox(
         owner_user_id: str | None,
         owner_session_id: str | None,
         connect_info: dict[str, Any],
-        is_default: bool = False,
+        is_default: bool | object = _UNSET,
         status: str | object = _UNSET,
         idle_timeout: int | float | None | object = _UNSET,
         expires_at: float | None | object = _UNSET,
@@ -89,7 +89,6 @@ def upsert_sandbox(
                 "provider": provider,
                 "managed": managed,
                 "created_by_astrbot": created_by_astrbot,
-                "is_default": is_default,
                 "owner_user_id": owner_user_id,
                 "owner_session_id": owner_session_id,
                 "connect_info": deepcopy(connect_info),
@@ -104,6 +103,7 @@ def upsert_sandbox(
             "expires_at": None,
             "retention_policy": "temporary",
             "status": "running",
+            "is_default": False,
             "labels": {},
             "notes": None,
         }
@@ -116,6 +116,7 @@ def upsert_sandbox(
             "expires_at": expires_at,
             "retention_policy": retention_policy,
             "status": status,
+            "is_default": is_default,
             "labels": deepcopy(labels) if labels is not _UNSET else _UNSET,
             "notes": notes,
         }
@@ -127,7 +128,9 @@ def upsert_sandbox(
                 record[field_name] = value
         record = SandboxRecord.from_dict(record).to_dict()
         self._payload["sandboxes"][sandbox_id] = record
-        if is_default or (managed and self._payload["default_sandbox_id"] is None):
+        if is_default is True or (
+            managed and self._payload["default_sandbox_id"] is None
+        ):
             self.set_default_sandbox_id(sandbox_id)
         return deepcopy(record)
 

tests/unit/test_sandbox_registry.py

@@ -172,3 +172,14 @@ def test_sandbox_registry_upsert_preserves_runtime_fields_when_omitted(tmp_path)
     assert record["last_used_at"] == 100
     assert record["idle_timeout"] == 30
     assert record["status"] == "unknown"
+
+
+def test_sandbox_registry_upsert_preserves_default_marker_when_omitted(tmp_path):
+    registry = SandboxRegistry(storage_path=tmp_path / "sandbox_registry.json")
+    _upsert(registry, "sb-1", is_default=True)
+
+    _upsert(registry, "sb-1", sandbox_name="renamed")
+
+    record = registry.get_sandbox("sb-1")
+    assert registry.default_sandbox_id == "sb-1"
+    assert record["is_default"] is True