fix: improve web runtime resolution and restore x11vnc ncache

universal-runtime/entrypoint.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 IDLE_TIMEOUT="${IDLE_TIMEOUT:-1800}"
-X11VNC_FLAGS="${X11VNC_FLAGS:--wait 5 -defer 5 -ncache 10 -ncache_cr -threads}"
+X11VNC_FLAGS="${X11VNC_FLAGS:--wait 5 -defer 5 -ncache 10 -threads}"
 SCREEN_GEOMETRY="${SCREEN_GEOMETRY:-1920x1080x24}"
 CHROME_WINDOW_SIZE="${CHROME_WINDOW_SIZE:-1920,1080}"
 ENABLE_HEARTBEAT="${ENABLE_HEARTBEAT:-1}"
@@ -264,6 +264,22 @@ export CHROME_WINDOW_SIZE
 Xvfb "$DISPLAY_NUM" -screen 0 "$SCREEN_GEOMETRY" >/tmp/xvfb.log 2>&1 &
 fluxbox >/tmp/fluxbox.log 2>&1 &
 python3 /manager.py >/tmp/manager.log 2>&1 &
-x11vnc -display "$DISPLAY_NUM" -rfbport 5900 -forever -shared -nopw -noxdamage $X11VNC_FLAGS >/tmp/x11vnc.log 2>&1 &
+start_x11vnc_with_retry() {
+  local display_arg="$1"
+  local attempt=0
+  while [ "$attempt" -lt 12 ]; do
+    x11vnc -display "$display_arg" -rfbport 5900 -forever -shared -nopw -noxdamage $X11VNC_FLAGS >/tmp/x11vnc.log 2>&1 &
+    local pid=$!
+    sleep 1
+    if kill -0 "$pid" 2>/dev/null; then
+      return 0
+    fi
+    attempt=$((attempt + 1))
+    sleep 0.5
+  done
+  return 1
+}
+
+start_x11vnc_with_retry "$DISPLAY_NUM" || true
 
 exec websockify --verbose --idle-timeout="$IDLE_TIMEOUT" --web=/opt/portal 6080 localhost:5900

universal-runtime/manager.py

@@ -71,15 +71,35 @@ def _sanitize_resolution(width: int | None, height: int | None) -> tuple[int, in
 def apply_resolution(width: int | None, height: int | None) -> tuple[int, int]:
     safe_w, safe_h = _sanitize_resolution(width, height)
     # Best effort: Xvfb usually exposes RandR and accepts xrandr -s.
+    applied = False
     try:
-        subprocess.run(  # noqa: S603
+        result = subprocess.run(  # noqa: S603
             ["xrandr", "-display", DISPLAY, "-s", f"{safe_w}x{safe_h}"],
             check=False,
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
         )
+        applied = result.returncode == 0
     except Exception:
-        pass
+        applied = False
+
+    if not applied:
+        # Fallback to default geometry if requested mode is unsupported.
+        try:
+            fallback_w, fallback_h = [int(x) for x in CHROME_WINDOW_SIZE.split(",", 1)]
+        except Exception:
+            fallback_w, fallback_h = 1920, 1080
+        safe_w, safe_h = _sanitize_resolution(fallback_w, fallback_h)
+        try:
+            subprocess.run(  # noqa: S603
+                ["xrandr", "-display", DISPLAY, "-s", f"{safe_w}x{safe_h}"],
+                check=False,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+        except Exception:
+            pass
+
     _state["resolution"] = f"{safe_w},{safe_h}"
     return safe_w, safe_h