sync from abhijitramesh/webgpu-bench@3d3db948b0

data/combined.json

@@ -7,7 +7,7 @@
         "platform": "darwin",
         "arch": "arm",
         "totalMemoryGB": 4,
-        "submittedAt": "2026-04-25T18:48:06.721Z",
+        "submittedAt": "2026-04-25T19:42:00.460Z",
         "resultCount": 4,
         "passCount": 4,
         "llamaCppCommit": null,
@@ -27,7 +27,7 @@
         "platform": "darwin",
         "arch": "arm",
         "totalMemoryGB": 8,
-        "submittedAt": "2026-04-25T18:48:06.720Z",
+        "submittedAt": "2026-04-25T19:42:00.459Z",
         "resultCount": 2,
         "passCount": 2,
         "llamaCppCommit": null,
@@ -50,7 +50,7 @@
     "browsers": [
       "chromium-147"
     ],
-    "generatedAt": "2026-04-25T18:48:06.775Z"
+    "generatedAt": "2026-04-25T19:42:00.502Z"
   },
   "results": [
     {

js/run/controller.js

@@ -7,7 +7,6 @@ import { localSource, hostedSource, inventoryOpfs, purgeOpfs } from './source.js
 import { getDeviceBudgetMB, variantFits, describeDevice } from './device.js';
 import {
   resumeHFSession, beginHFSignIn, signOutHF, submitResultsToDataset,
-  HF_TOKEN_STORAGE_KEY, HF_POPUP_DONE_MESSAGE, isHFPopupCallback,
 } from './hub.js';
 import { isHubConfigured, HF_DATASET_REPO } from './config.js';
 
@@ -241,13 +240,17 @@ function renderHfSection() {
 
   if (state.hfSession) {
     signinBtn.textContent = 'Sign out';
-    signinBtn.disabled = false;
+    // Sign-out itself is fine mid-run, but stay consistent with the disabled
+    // sign-in state so the row doesn't toggle look mid-run.
+    signinBtn.disabled = state.running;
     submitBtn.hidden = false;
     const eligible = submittableResults();
-    submitBtn.disabled = eligible.length === 0;
-    submitBtn.title = eligible.length === 0 && state.results.length > 0
-      ? `Need at least ${MIN_ITERATIONS_FOR_SUBMIT} successful iterations per variant to submit`
-      : '';
+    submitBtn.disabled = state.running || eligible.length === 0;
+    submitBtn.title = state.running
+      ? 'Wait for the benchmark to finish before submitting'
+      : (eligible.length === 0 && state.results.length > 0
+        ? `Need at least ${MIN_ITERATIONS_FOR_SUBMIT} successful iterations per variant to submit`
+        : '');
     const who = state.hfSession.userName ? `@${state.hfSession.userName}` : 'signed in';
     const hint = eligible.length > 0
       ? ` · ${eligible.length}/${state.results.length} variants eligible`
@@ -255,7 +258,15 @@ function renderHfSection() {
     userEl.textContent = `${who} · → ${HF_DATASET_REPO}${hint}`;
   } else {
     signinBtn.textContent = 'Sign in with Hugging Face';
-    signinBtn.disabled = false;
+    // Sign-in triggers a full-page redirect, which would kill an in-flight
+    // worker. Disable the button while the benchmark is running so the user
+    // can't accidentally lose their run; results are saved progressively to
+    // localStorage and restored on the next mount, so finishing the run and
+    // signing in afterwards still lets them submit.
+    signinBtn.disabled = state.running;
+    signinBtn.title = state.running
+      ? 'Wait for the benchmark to finish before signing in'
+      : '';
     submitBtn.hidden = true;
     userEl.textContent = '';
   }
@@ -598,6 +609,9 @@ function updateButtons() {
   const rn = $('btn-run'); if (rn) rn.disabled = state.running || checked.length === 0;
   const ab = $('btn-abort'); if (ab) { ab.disabled = !state.running; ab.hidden = !state.running; }
   renderBudgetMeter(checked, cachedChecked);
+  // Keep the Sign in / Submit buttons in sync with the running flag — they
+  // depend on it so the user can't kick off a redirect mid-run.
+  renderHfSection();
 }
 
 /* Show selected size as a fill bar against the device's max model size.
@@ -1485,35 +1499,14 @@ function wirePurgeHandler() {
   });
 }
 
-async function refreshHfSessionFromStorage() {
-  try {
-    state.hfSession = await resumeHFSession();
-  } catch {
-    state.hfSession = null;
-  }
-  renderHfSection();
-}
-
-function wireCrossTabHubSync() {
-  // Popup writes the token to localStorage and posts a message to opener.
-  // We listen to both: postMessage is the fast path; the storage event also
-  // fires for any other open tab on the same origin so they all stay in sync.
-  window.addEventListener('storage', (e) => {
-    if (e.key !== HF_TOKEN_STORAGE_KEY) return;
-    refreshHfSessionFromStorage();
-  });
-  window.addEventListener('message', (e) => {
-    if (e.origin !== location.origin) return;
-    if (e.data?.type !== HF_POPUP_DONE_MESSAGE) return;
-    refreshHfSessionFromStorage();
-  });
-}
-
 function wireHubHandlers() {
   const signinBtn = $('btn-signin');
   const submitBtn = $('btn-submit');
   if (signinBtn) {
     signinBtn.addEventListener('click', async () => {
+      // Sign in / Sign out is disabled while a run is in flight; this guard
+      // catches a stale-event-during-state-change race and keeps results safe.
+      if (state.running) return;
       try {
         if (state.hfSession) {
           signOutHF();
@@ -1521,20 +1514,8 @@ function wireHubHandlers() {
           renderHfSection();
           return;
         }
-        // Popup keeps any in-flight benchmark + accumulated results alive on
-        // this tab. Fall back to a full-page redirect only if the popup is
-        // blocked by the browser.
-        try {
-          await beginHFSignIn({ popup: true });
-          logLine('Opened HF sign-in in a new tab — finish there and come back.');
-        } catch (err) {
-          if (err.code === 'popup-blocked') {
-            logLine('Popup blocked — falling back to full-page sign-in. Your in-progress run will be lost.');
-            await beginHFSignIn({ popup: false });
-          } else {
-            throw err;
-          }
-        }
+        await beginHFSignIn();
+        // beginHFSignIn redirects — unreachable after.
       } catch (err) {
         logLine(`Sign-in failed: ${err.message}`);
       }
@@ -1584,43 +1565,6 @@ function wireRunHandlers() {
 
 export async function mountRunSection() {
   if (state.mounted) return;
-
-  // OAuth popup fast-path: when this page is loaded inside the sign-in
-  // popup, the URL carries `code`+`state` from HF. We can't rely on
-  // `window.opener` alone because HF's OAuth response sets COOP, which
-  // severs the opener reference in Chrome/Safari. `isHFPopupCallback()`
-  // also checks the localStorage marker the opener writes pre-popup.
-  if (typeof window !== 'undefined') {
-    const params = new URLSearchParams(location.search);
-    if (params.get('code') && params.get('state') && isHFPopupCallback()) {
-      document.body.innerHTML = `
-        <div style="padding:48px 32px;font-family:system-ui,sans-serif;color:#222;max-width:480px;margin:0 auto;text-align:center">
-          <div id="hf-popup-status" style="font-size:15px;line-height:1.5">Completing sign-in…</div>
-          <button id="hf-popup-close" type="button" hidden
-            style="margin-top:24px;padding:8px 16px;font:inherit;border:1px solid #ccc;border-radius:6px;background:#f6f6f6;cursor:pointer">
-            Close this tab
-          </button>
-        </div>
-      `;
-      // Restore visibility — the inline guard in run.html hid <html> to avoid
-      // a bench-skeleton flash; we own the body now and want our message visible.
-      document.documentElement.style.visibility = '';
-      try { await resumeHFSession(); } catch { /* logged inside */ }
-      // resumeHFSession already calls window.close(); if the browser denies
-      // it (Firefox is strict; some COOP cases too), surface a clear message
-      // and a manual close button. The parent tab already updated via the
-      // storage event triggered by the token write.
-      const status = document.getElementById('hf-popup-status');
-      const closeBtn = document.getElementById('hf-popup-close');
-      if (status) status.textContent = 'Signed in. You can close this tab.';
-      if (closeBtn) {
-        closeBtn.hidden = false;
-        closeBtn.addEventListener('click', () => { try { window.close(); } catch {} });
-      }
-      return;
-    }
-  }
-
   state.mounted = true;
 
   state.surface = await detectSurface();
@@ -1663,14 +1607,37 @@ export async function mountRunSection() {
   wireAbortHandler();
   wirePurgeHandler();
   wireHubHandlers();
-  wireCrossTabHubSync();
   wireOutputHandlers();
+  // Restore the last completed run from localStorage so it survives a page
+  // reload — including the OAuth redirect taking the user to HF and back.
+  // Must run before updateButtons/renderOutput/hideProgress so they pick up
+  // the rehydrated state.results.
+  restoreSavedResults();
   updateButtons();
   renderOutput();
-  hideProgressUntilFirstRow();
+  if (state.results.length === 0) hideProgressUntilFirstRow();
   maybeShowCrashBanner();
 }
 
+const RESULTS_STORAGE_KEY = 'webgpu-bench:lastRun';
+
+function restoreSavedResults() {
+  let saved;
+  try {
+    const raw = localStorage.getItem(RESULTS_STORAGE_KEY);
+    if (!raw) return;
+    saved = JSON.parse(raw);
+  } catch { return; }
+  if (!Array.isArray(saved) || saved.length === 0) return;
+
+  state.results = saved;
+  for (const record of saved) {
+    const v = state.variants.find(x => x.repo === record.repo && x.filename === record.filename);
+    if (!v) continue;
+    progressRowFor(v).fillFromRecord(record);
+  }
+}
+
 export function teardownRunSection() {
   // Placeholder — no explicit teardown today. Future: abort in-flight runs,
   // detach listeners. For now the Run tab just sits idle.

js/run/hub.js

@@ -4,11 +4,13 @@
 //   1. On page load, the run controller calls `resumeHFSession()` to handle
 //      the OAuth redirect (if the URL has the expected query params) and to
 //      reuse any previously-stored access token.
-//   2. Clicking [Sign in] calls `beginHFSignIn({ popup: true })` which opens
-//      HF in a new window. After consent, HF redirects the popup back here;
-//      the popup completes the exchange, persists the token to localStorage,
-//      pings the opener via postMessage, and closes itself. The original
-//      tab keeps any in-flight benchmark + accumulated results intact.
+//   2. Clicking [Sign in] calls `beginHFSignIn()` which redirects the
+//      browser to HF; after consent, HF redirects back to the page with
+//      the OAuth response encoded in the URL. The next page load calls
+//      `resumeHFSession()` again, completes the exchange, and stores the
+//      token in localStorage. The Run controller restores any previously
+//      saved benchmark results from localStorage so they survive the
+//      OAuth round-trip.
 //   3. Clicking [Submit] calls `submitResultsToDataset()` which commits a
 //      JSON file (one per machine-slug / browser / session) as a PR to the
 //      leaderboard dataset.
@@ -26,34 +28,9 @@ import {
   isHubConfigured,
 } from './config.js';
 
-// localStorage (not sessionStorage) so the popup and the original tab share
-// the same token namespace, and a `storage` event fires in the opener when
-// the popup completes sign-in.
-export const HF_TOKEN_STORAGE_KEY = 'webgpu-bench:hfOauth';
-export const HF_POPUP_DONE_MESSAGE = 'webgpu-bench:hf-signed-in';
-// Marker written by the opener tab right before window.open(). The popup
-// reads it on callback to know it's running inside a popup — `window.opener`
-// is unreliable because HF's OAuth page sets a COOP header that severs the
-// opener relationship in Chrome/Safari. Marker is cleared after callback.
-const HF_POPUP_PENDING_KEY = 'webgpu-bench:hfPopupPending';
-const HF_POPUP_PENDING_TTL_MS = 10 * 60 * 1000;
-
-export function isHFPopupCallback() {
-  if (typeof window === 'undefined') return false;
-  if (window.opener && window.opener !== window) return true;
-  try {
-    const raw = localStorage.getItem(HF_POPUP_PENDING_KEY);
-    if (!raw) return false;
-    const data = JSON.parse(raw);
-    if (!data?.ts || (Date.now() - data.ts) > HF_POPUP_PENDING_TTL_MS) {
-      localStorage.removeItem(HF_POPUP_PENDING_KEY);
-      return false;
-    }
-    return true;
-  } catch {
-    return false;
-  }
-}
+// localStorage (not sessionStorage) so the token survives the OAuth redirect
+// (different document load) and is shared across tabs on the same origin.
+const TOKEN_STORAGE_KEY = 'webgpu-bench:hfOauth';
 
 // ──────────────── session ────────────────
 
@@ -64,30 +41,18 @@ export async function resumeHFSession() {
   try {
     const res = await oauthHandleRedirectIfPresent();
     if (res) {
-      const session = {
+      localStorage.setItem(TOKEN_STORAGE_KEY, JSON.stringify({
         accessToken: res.accessToken,
         expiresAt: res.accessTokenExpiresAt,
         userName: res.userInfo?.preferred_username || res.userInfo?.name || null,
         avatarUrl: res.userInfo?.picture || null,
         hubId: res.userInfo?.sub || null,
-      };
-      localStorage.setItem(HF_TOKEN_STORAGE_KEY, JSON.stringify(session));
+      }));
       // Clean up the OAuth query params so a reload doesn't retry.
       const url = new URL(location.href);
       for (const k of ['code', 'state']) url.searchParams.delete(k);
       history.replaceState({}, '', url.toString());
-      // Popup hand-off: tell the opener tab (if accessible) and close. The
-      // opener also gets a `storage` event from the localStorage write —
-      // postMessage is the fast path; storage event is the safety net for
-      // when COOP severs window.opener.
-      if (isHFPopupCallback()) {
-        localStorage.removeItem(HF_POPUP_PENDING_KEY);
-        if (window.opener && window.opener !== window && !window.opener.closed) {
-          try { window.opener.postMessage({ type: HF_POPUP_DONE_MESSAGE }, location.origin); } catch { /* opener gone */ }
-        }
-        try { window.close(); } catch { /* not script-opened */ }
-      }
-      return session;
+      return readStoredSession();
     }
   } catch (err) {
     console.warn('OAuth redirect handling failed:', err.message);
@@ -98,12 +63,12 @@ export async function resumeHFSession() {
 
 function readStoredSession() {
   try {
-    const raw = localStorage.getItem(HF_TOKEN_STORAGE_KEY);
+    const raw = localStorage.getItem(TOKEN_STORAGE_KEY);
     if (!raw) return null;
     const data = JSON.parse(raw);
     if (!data.accessToken) return null;
     if (data.expiresAt && new Date(data.expiresAt).getTime() < Date.now()) {
-      localStorage.removeItem(HF_TOKEN_STORAGE_KEY);
+      localStorage.removeItem(TOKEN_STORAGE_KEY);
       return null;
     }
     return data;
@@ -112,7 +77,7 @@ function readStoredSession() {
   }
 }
 
-export async function beginHFSignIn({ popup = false } = {}) {
+export async function beginHFSignIn() {
   if (!isHubConfigured()) {
     throw new Error('HF hub is not configured. Set HF_DATASET_REPO in run/config.js.');
   }
@@ -135,27 +100,11 @@ export async function beginHFSignIn({ popup = false } = {}) {
     scopes,
     redirectUrl: location.origin + location.pathname,
   });
-  if (popup) {
-    // Set marker BEFORE window.open so the popup callback can detect popup
-    // mode even when COOP nullifies window.opener.
-    try {
-      localStorage.setItem(HF_POPUP_PENDING_KEY, JSON.stringify({ ts: Date.now() }));
-    } catch { /* quota / disabled — best effort */ }
-    const win = window.open(url, 'hf-oauth', 'popup=yes,width=520,height=720');
-    if (!win) {
-      try { localStorage.removeItem(HF_POPUP_PENDING_KEY); } catch { /* noop */ }
-      const err = new Error('Popup blocked — allow popups for this site, or use full-page sign-in.');
-      err.code = 'popup-blocked';
-      throw err;
-    }
-    return { popup: win };
-  }
   location.assign(url);
-  return null;
 }
 
 export function signOutHF() {
-  localStorage.removeItem(HF_TOKEN_STORAGE_KEY);
+  localStorage.removeItem(TOKEN_STORAGE_KEY);
 }
 
 export async function fetchWhoAmI(token) {

run.html

@@ -5,29 +5,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="color-scheme" content="light dark">
   <script>(function(){var s=localStorage.getItem('theme');if(!s){s=(window.matchMedia&&matchMedia('(prefers-color-scheme: dark)').matches)?'dark':'light';}document.documentElement.setAttribute('data-theme',s);})();</script>
-  <script>
-    // OAuth-popup flash guard: if this load is the HF sign-in popup callback,
-    // hide the page immediately so the user doesn't see the bench skeleton
-    // flash before mountRunSection() runs the close path.
-    (function () {
-      try {
-        var p = new URLSearchParams(location.search);
-        if (!p.get('code') || !p.get('state')) return;
-        var hasOpener = !!(window.opener && window.opener !== window);
-        var marker = false;
-        try {
-          var raw = localStorage.getItem('webgpu-bench:hfPopupPending');
-          if (raw) {
-            var data = JSON.parse(raw);
-            marker = !!(data && data.ts && (Date.now() - data.ts) < 10 * 60 * 1000);
-          }
-        } catch (e) { /* localStorage disabled */ }
-        if (hasOpener || marker) {
-          document.documentElement.style.visibility = 'hidden';
-        }
-      } catch (e) { /* noop */ }
-    })();
-  </script>
   <title>Run — WebGPU Bench</title>
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>