From e94cb54d03596ba5bc9cd1b6bcad948ad1d934be Mon Sep 17 00:00:00 2001 From: clover caruso Date: Fri, 23 Oct 2026 18:18:08 -0700 Subject: [PATCH] Keep VM consoles visible through reconnects and use CPU encoding Preserve the desktop and keyboard focus during transport recovery, use x264 without GPU access, and give VM previews a private screen broker. Admins can list every VM in the dashboard; MCP ownership and grants stay enforced. Verified in staging with native screen tests, authenticated browser input, forced broker recovery, and a fresh-eyes browser review. Assisted-by: gpt-6.1-sol --- dashboard/src/computer.rs | 12 +++++ dashboard/src/vms.rs | 7 +-- dashboard/web/components/VMConsole.tsx | 75 ++++++++++++++++++-------- dashboard/web/pages/VMs.css | 6 ++- flake.nix | 1 + nixos/configuration.nix | 15 ++---- nixos/vm-screen.nix | 18 +++++++ tools/dashboard-stage-test.py | 33 ++++++++++-- tools/dashboard-stage.py | 59 ++++++++++++++++---- tools/vm-screen.py | 10 ++-- 10 files changed, 179 insertions(+), 57 deletions(-) create mode 100644 nixos/vm-screen.nix diff --git a/dashboard/src/computer.rs b/dashboard/src/computer.rs index ece0d30cf7293a382311b0ca759bc47918cd06d9..13f8bbfbde229073773c5034d0c61ec9482b2a69 100644 --- a/dashboard/src/computer.rs +++ b/dashboard/src/computer.rs @@ -389,6 +389,18 @@ pub fn router(app: Arc) -> Router { #[cfg(test)] mod tests { use super::*; + + #[test] + fn dashboard_admin_access_does_not_extend_mcp_grants() { + let admin = json!({"id":"admin","groups":["infra-admin"]}); + let vm = json!({"owner":"another-user","ownerOnly":true}); + assert!(vms::visible(&admin, &vm)); + let grant = json!({"user":"admin","scopes":["computer:read","computer:control"],"resources":["test-vm"]}); + for scope in ["computer:read", "computer:control"] { + assert!(permitted(&grant, "test-vm", scope, &vm).is_err()); + } + } + #[test] fn control_requires_the_current_owner_selected_vm_and_scope() { let grant = json!({"user":"clover","scopes":["computer:read"],"resources":["m3-devbox"]}); diff --git a/dashboard/src/vms.rs b/dashboard/src/vms.rs index 9de90a335bd565ea86730a4442a0359b9af3e5e7..d23e88f474ad147ee6b1161ce50b21836dcf26f0 100644 --- a/dashboard/src/vms.rs +++ b/dashboard/src/vms.rs @@ -9,7 +9,7 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt}; pub fn visible(me: &Value, domain: &Value) -> bool { let owner = &domain["owner"]; (owner.as_str().is_some_and(|id| !id.is_empty()) && owner == &me["id"]) - || (domain["ownerOnly"] != true && array(&me["groups"]).iter().any(|group| group == "infra-admin")) + || array(&me["groups"]).iter().any(|group| group == "infra-admin") } pub async fn authorize(me: &Value, name: &str) -> Result<()> { @@ -210,8 +210,9 @@ mod tests { )); let private = json!({"owner":"account-1","ownerOnly":true}); assert!(visible(&user, &private)); - assert!(!visible(&json!({"id":"admin","groups":["infra-admin"]}), &private)); - assert!(!visible(&json!({"id":"admin","groups":["infra-admin"]}), &json!({"ownerOnly":true}))); + assert!(!visible(&json!({"id":"other","groups":["vm"]}), &private)); + assert!(visible(&json!({"id":"admin","groups":["infra-admin"]}), &private)); + assert!(visible(&json!({"id":"admin","groups":["infra-admin"]}), &json!({"ownerOnly":true}))); } #[test] diff --git a/dashboard/web/components/VMConsole.tsx b/dashboard/web/components/VMConsole.tsx index 004e921ae914ac14ddcb45565b0106670dcebfbd..eb858b7cebd00f19c7a61ccb24a51590527c250e 100644 --- a/dashboard/web/components/VMConsole.tsx +++ b/dashboard/web/components/VMConsole.tsx @@ -20,7 +20,8 @@ type WindowFrame = { windows: WindowSurface[]; rtpTimestamp: number }; export function VMConsole(props: { name: string; platform: Domain["platform"]; enabled: boolean; active: boolean; setup?: Domain["setup"]; booting: boolean; startedAt: number | null; arch: string; unavailable?: string; clipboard?: (text: string) => Promise; toolbar: JSX.Element; content: (toolbar: HTMLDivElement) => JSX.Element }) { const enabled = createMemo(() => props.enabled); const [bootScreen, setBootScreen] = createSignal(false); - const preparing = () => !bootScreen() && (!!props.setup && props.setup !== "ready" || props.booting || state() === "Connecting…"); + const [hasFrame, setHasFrame] = createSignal(false); + const preparing = () => !hasFrame() && !bootScreen() && (!!props.setup && props.setup !== "ready" || props.booting || state() === "Connecting…"); const [now, setNow] = createSignal(Date.now()); createEffect(() => { if (!preparing() || !props.active) return; @@ -89,6 +90,11 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e const [clipboard, setClipboard] = createSignal(""); const [sendingClipboard, setSendingClipboard] = createSignal(false); const [showClipboard, setShowClipboard] = createSignal(false); + let clipboardButton!: HTMLButtonElement; + const closeClipboard = () => { + setShowClipboard(false); + clipboardButton.closest("details")?.querySelector("summary")?.focus(); + }; const [windowsAvailable, setWindowsAvailable] = createSignal(false); const [separateWindows, setSeparateWindows] = createSignal(false); const [frameSync, setFrameSync] = createSignal(false); @@ -98,9 +104,10 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e const [capture, setCapture] = createSignal<{ fps: number; capture: number; scan: number; write: number }>(); const [tools, setTools] = createSignal(); const send = (message: object) => { if (input?.readyState === "open") input.send(JSON.stringify(message)); }; - const compose = () => { + const compose = (freeze = false) => { const frame = windowFrame; - canvas.hidden = !video.requestVideoFrameCallback || !video.srcObject || video.readyState < 2; + if (!video.srcObject || video.readyState < 2) return; + canvas.hidden = !video.requestVideoFrameCallback && !freeze; if (canvas.hidden || !props.active || !width || !height) return; if (canvas.width !== width || canvas.height !== height) { canvas.width = width; canvas.height = height; } const context = canvas.getContext("2d", { alpha: false }); @@ -155,6 +162,7 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e let peer: RTCPeerConnection | undefined; let frameCallback: number | undefined; let statsTimer: number | undefined; + let recoveryTimer: number | undefined; let previousStats: { time: number; bytes: number; frames: number } | undefined; const frameReady: VideoFrameRequestCallback = (_, metadata) => { if (current !== attempt || disposed) return; @@ -212,12 +220,16 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e if (current !== attempt || disposed || video.readyState < 2 || input?.readyState !== "open") return; clearTimeout(timeout); retryDelay = 1000; + setHasFrame(true); setState("Connected"); + if (document.activeElement === video) focus(); }; disconnect = () => { clearTimeout(reconnectTimer); clearTimeout(timeout); + clearTimeout(recoveryTimer); blur(); + compose(true); video.removeEventListener("keydown", releaseKeyboard, true); video.removeEventListener("focus", focus); video.removeEventListener("blur", blur); @@ -228,10 +240,9 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e if (frameCallback !== undefined) video.cancelVideoFrameCallback(frameCallback); windowFrame = undefined; pendingFrames = []; frameTimestamp = undefined; drag = undefined; movement = undefined; pointerSequence = 0; - setFrameSync(false); setWindowsAvailable(false); setWindowCapture(false); setStats(undefined); setCapture(undefined); + setFrameSync(false); setWindowsAvailable(false); setWindowCapture(false); video.onplaying = null; video.srcObject = null; - compose(); clearTimeout(cursorTimer); cursorFrames = []; cursorFrame = 0; @@ -261,13 +272,21 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e keyboard.onkeyevent = (key, _code, down) => { if (acceptsInput()) send({ type: "key", key, down }); }; input.onopen = () => { ready(); - if (document.activeElement === video) focus(); if (windowsAvailable()) send({ type: "experiment", enabled: separateWindows() }); }; peer.onicecandidate = ({ candidate }) => { if (candidate) signal({ type: "candidate", ...candidate.toJSON() }); }; peer.onconnectionstatechange = () => { - if (peer?.connectionState === "failed" || peer?.connectionState === "disconnected") { + if (peer?.connectionState === "connected") { + clearTimeout(recoveryTimer); + recoveryTimer = undefined; + setProblem(""); + ready(); + } else if (peer?.connectionState === "failed") { fail("The screen disconnected. Reconnect to try again."); + } else if (peer?.connectionState === "disconnected" && recoveryTimer === undefined) { + setState("Disconnected"); + setProblem("The screen connection was interrupted. Reconnecting…"); + recoveryTimer = window.setTimeout(() => fail("The screen disconnected. Reconnecting…"), 5000); } }; peer.ontrack = ({ track }) => { @@ -360,25 +379,28 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e setState("Disconnected"); } }; - createEffect(() => { - if (enabled()) void connect(); + createEffect(on(enabled, value => { + if (value) void connect(); else { attempt++; disconnect(); input = undefined; setState("Disconnected"); setProblem(""); + setHasFrame(false); + setStats(undefined); setCapture(undefined); + canvas.hidden = true; } - }); + })); createEffect(() => { if (acceptsInput()) return; release(); - if (document.activeElement === video) { + if (document.activeElement === video && (!props.active || !enabled() || preparing())) { video.blur(); if (props.active) tools()?.querySelector("summary")?.focus(); } }); - createEffect(on(() => props.setup, setup => { + createEffect(on(createMemo(() => props.setup), setup => { if (setup === "ready" && enabled() && state() === "Disconnected") void connect(); }, { defer: true })); let playbackFrame: number | undefined; @@ -396,7 +418,12 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e }); }; createEffect(on(() => [props.active, enabled(), preparing()], resumeVideo)); - createEffect(on(() => props.startedAt, () => setBootScreen(false))); + createEffect(on(createMemo(() => props.startedAt), () => { + setBootScreen(false); + setHasFrame(false); + setStats(undefined); setCapture(undefined); + canvas.hidden = true; + })); document.addEventListener("visibilitychange", resumeVideo); onCleanup(() => { disposed = true; @@ -439,7 +466,7 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e - +