wb-browser-runtime 0.6.0 → 0.7.0

package/bin/wb-browser-runtime.js

@@ -1,18 +1,19 @@
 #!/usr/bin/env node
-// wb-browser-runtime — Browserbase + Playwright sidecar for `wb`.
+// wb-browser-runtime — CDP + Playwright sidecar for `wb`.
 //
 // Speaks wb's line-framed JSON protocol on stdio (see ../README.md). Each
 // `browser` fenced block in a workbook arrives as one `slice` message; this
 // sidecar dispatches its verbs against a Playwright `Page` connected to a
-// Browserbase session via CDP.
+// vendor-provided CDP endpoint.
+//
+// The vendor (Browserbase, browser-use, ...) is selected by WB_BROWSER_VENDOR
+// and lives behind a provider in ../lib/providers/. Verbs, recording, session
+// cache, and substitutions are all vendor-agnostic — they run against a
+// Playwright Page regardless of whose chromium is on the other end.
 //
 // Sessions are cached by `session:` name across slices for the lifetime of
 // this process, so a runbook with multiple browser blocks against the same
-// vendor reuses one Browserbase session (and one logged-in browser context).
-//
-// Env required for real runs:
-//   BROWSERBASE_API_KEY
-//   BROWSERBASE_PROJECT_ID
+// vendor reuses one session (and one logged-in browser context).
 //
 // Verb args support two substitutions, expanded recursively at dispatch time:
 //   {{ env.NAME }}        → process.env.NAME
@@ -24,742 +25,98 @@
 
 import readline from "node:readline";
 import { chromium } from "playwright-core";
-import { spawn, spawnSync } from "node:child_process";
-import { existsSync, readFileSync, promises as fsPromises } from "node:fs";
-import { randomUUID } from "node:crypto";
-import path from "node:path";
-import os from "node:os";
-import { fileURLToPath } from "node:url";
-import zlib from "node:zlib";
-import { promisify } from "node:util";
-
-const gzip = promisify(zlib.gzip);
-
-const SUPPORTS = [
-  "goto",
-  "fill",
-  "click",
-  "press",
-  "wait_for",
-  "screenshot",
-  "extract",
-  "assert",
-  "eval",
-  "save",
-];
-
-const BB_BASE = "https://api.browserbase.com";
-const VERSION = "0.6.0";
-
-// --- Recording config -------------------------------------------------------
+import { readFileSync } from "node:fs";
+import { send, log } from "../lib/io.js";
+import { resolveInside } from "../lib/util.js";
+import { SessionManager } from "../lib/session-manager.js";
+import {
+  RecordingManager,
+  loadRecordingConfig,
+} from "../lib/recording-manager.js";
+import { getProvider } from "../lib/providers/index.js";
+import { SUPPORTS, runVerb, verbName } from "../verbs/index.js";
+
+const VERSION = "0.7.0";
+const provider = getProvider();
+log(`[provider] ${provider.name}`);
+
+// --- Recording --------------------------------------------------------------
 //
-// Feature is off unless WB_RECORDING_UPLOAD_URL is set. When enabled, every
-// session gets rrweb DOM-event capture and/or a CDP screencast video; both
-// artifacts are POSTed to the upload URL at session close.
-//
-// URL template supports `{run_id}` and `{kind}` placeholders, e.g.
-//   https://host/api/runs/{run_id}/recording/{kind}
-// kind ∈ {"rrweb", "video"}. Auth: `Authorization: Bearer <SECRET>`.
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const RRWEB_VENDOR_PATH = path.join(
-  __dirname,
-  "..",
-  "vendor",
-  "rrweb-record.min.js",
-);
-
-function checkFfmpeg() {
-  try {
-    const res = spawnSync("ffmpeg", ["-version"], { stdio: "ignore" });
-    return res.status === 0;
-  } catch {
-    return false;
-  }
-}
-
-function loadRecordingConfig() {
-  const uploadUrl = (process.env.WB_RECORDING_UPLOAD_URL || "").trim();
-  if (!uploadUrl) return { enabled: false, reason: "no-upload-url" };
-  const secret = (process.env.WB_RECORDING_UPLOAD_SECRET || "").trim();
-  if (!secret) {
-    log(
-      "[recording] WB_RECORDING_UPLOAD_URL is set but WB_RECORDING_UPLOAD_SECRET is empty — refusing to upload unauthenticated. Recording disabled.",
-    );
-    return { enabled: false, reason: "no-secret" };
-  }
-
-  const runId =
-    (process.env.WB_RECORDING_RUN_ID || "").trim() ||
-    (process.env.TRIGGER_RUN_ID || "").trim() ||
-    `wb-${randomUUID()}`;
-
-  // Clamp to ranges ffmpeg/libvpx-vp9 actually handles. Requesting fps=120
-  // silently blew up memory; quality=0 produced unwatchable garbage. Clamp
-  // + log so operators see the effective value.
-  const clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
-  const rawFps =
-    Number.parseInt(process.env.WB_RECORDING_SCREENCAST_FPS || "", 10) || 5;
-  const rawQuality =
-    Number.parseInt(process.env.WB_RECORDING_SCREENCAST_QUALITY || "", 10) ||
-    60;
-  const fps = clamp(rawFps, 1, 30);
-  const quality = clamp(rawQuality, 10, 95);
-  if (fps !== rawFps) {
-    log(`[recording] fps=${rawFps} clamped to ${fps} (valid range 1..30)`);
-  }
-  if (quality !== rawQuality) {
-    log(
-      `[recording] quality=${rawQuality} clamped to ${quality} (valid range 10..95)`,
-    );
-  }
-
-  const rrwebRequested = process.env.WB_RECORDING_RRWEB !== "0";
-  const videoRequested = process.env.WB_RECORDING_VIDEO !== "0";
-
-  let rrwebSource = null;
-  if (rrwebRequested) {
-    if (!existsSync(RRWEB_VENDOR_PATH)) {
-      log(
-        `[recording] rrweb vendor file missing at ${RRWEB_VENDOR_PATH} — disabling rrweb capture`,
-      );
-    } else {
-      rrwebSource = readFileSync(RRWEB_VENDOR_PATH, "utf8");
-    }
-  }
-
-  const hasFfmpeg = videoRequested ? checkFfmpeg() : false;
-  if (videoRequested && !hasFfmpeg) {
-    log(
-      "[recording] ffmpeg not found on $PATH — disabling video capture (rrweb will continue if enabled)",
-    );
-  }
-
-  const kinds = {
-    rrweb: rrwebRequested && !!rrwebSource,
-    video: videoRequested && hasFfmpeg,
-  };
-
-  if (!kinds.rrweb && !kinds.video) {
-    log("[recording] no usable kinds — recording disabled");
-    return { enabled: false, reason: "all-kinds-disabled" };
-  }
-
-  const rrwebMaxEvents =
-    Number.parseInt(process.env.WB_RECORDING_RRWEB_MAX_EVENTS || "", 10) ||
-    50_000;
+// Feature is off unless WB_RECORDING_UPLOAD_URL is set. See
+// runtimes/browser/lib/recording-manager.js for the full lifecycle.
 
-  return {
-    enabled: true,
-    uploadUrl,
-    secret,
-    runId,
-    fps,
-    quality,
-    kinds,
-    rrwebSource,
-    rrwebMaxEvents,
-  };
-}
-
-const RECORDING = loadRecordingConfig();
-if (RECORDING.enabled) {
-  const activeKinds = Object.entries(RECORDING.kinds)
-    .filter(([, v]) => v)
-    .map(([k]) => k)
-    .join(",");
+const recording = new RecordingManager(loadRecordingConfig());
+if (recording.enabled) {
   log(
-    `[recording] enabled run_id=${RECORDING.runId} kinds=${activeKinds} fps=${RECORDING.fps} quality=${RECORDING.quality}`,
+    `[recording] enabled run_id=${recording.runId} kinds=${recording.activeKinds.join(",")} fps=${recording.fps} quality=${recording.quality}`,
   );
 }
 
-function send(obj) {
-  process.stdout.write(JSON.stringify(obj) + "\n");
-}
-
-function log(...args) {
-  process.stderr.write(args.join(" ") + "\n");
-}
-
-// --- Browserbase REST -------------------------------------------------------
-
-async function bbCreateSession() {
-  const apiKey = process.env.BROWSERBASE_API_KEY;
-  const projectId = process.env.BROWSERBASE_PROJECT_ID;
-  if (!apiKey || !projectId) {
-    throw new Error(
-      "BROWSERBASE_API_KEY and BROWSERBASE_PROJECT_ID must be set",
-    );
-  }
-
-  // Both flags opt-in per session. advancedStealth is Scale-plan-gated on
-  // Browserbase's side; proxies adds residential-IP cost. Default off so a
-  // misconfigured plan doesn't break unrelated runs (HN, Google Sheets, etc.);
-  // flip per vendor when the target sits behind Cloudflare / similar bot
-  // detection (e.g., Airbase).
-  const envBool = (v) => v === "1" || (typeof v === "string" && v.toLowerCase() === "true");
-  const advancedStealth = envBool(process.env.BROWSERBASE_ADVANCED_STEALTH);
-  const proxies = envBool(process.env.BROWSERBASE_PROXIES);
-
-  // keepAlive:false — slice lifetime is tied to wb process; on shutdown
-  // we explicitly REQUEST_RELEASE so quota isn't burned by orphans.
-  const body = { projectId, keepAlive: false };
-  if (advancedStealth) {
-    body.browserSettings = { advancedStealth: true };
-  }
-  if (proxies) {
-    body.proxies = true;
-  }
-
-  log(`[bb] session create advancedStealth=${advancedStealth} proxies=${proxies}`);
-
-  const res = await retryableFetch(
-    `${BB_BASE}/v1/sessions`,
-    {
-      method: "POST",
-      headers: {
-        "X-BB-API-Key": apiKey,
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(body),
-    },
-    "bb.create",
-  );
-  if (!res.ok) {
-    throw new Error(
-      `Browserbase create failed (${res.status}): ${await safeText(res)}`,
-    );
-  }
-  return await res.json();
-}
-
-async function bbGetLiveUrl(sessionId) {
-  const apiKey = process.env.BROWSERBASE_API_KEY;
-  const res = await retryableFetch(
-    `${BB_BASE}/v1/sessions/${sessionId}/debug`,
-    { headers: { "X-BB-API-Key": apiKey } },
-    "bb.debug",
-  );
-  if (!res.ok) {
-    throw new Error(
-      `Browserbase debug fetch failed (${res.status}): ${await safeText(res)}`,
-    );
-  }
-  const body = await res.json();
-  return body.debuggerFullscreenUrl;
-}
-
-async function bbReleaseSession(sessionId) {
-  const apiKey = process.env.BROWSERBASE_API_KEY;
-  const projectId = process.env.BROWSERBASE_PROJECT_ID;
-  try {
-    await retryableFetch(
-      `${BB_BASE}/v1/sessions/${sessionId}`,
-      {
-        method: "POST",
-        headers: { "X-BB-API-Key": apiKey, "Content-Type": "application/json" },
-        body: JSON.stringify({ projectId, status: "REQUEST_RELEASE" }),
-      },
-      "bb.release",
-    );
-  } catch (e) {
-    log(`[shutdown] release session ${sessionId} failed: ${e.message}`);
-  }
-}
-
-async function safeText(res) {
-  try {
-    return (await res.text()).slice(0, 200);
-  } catch {
-    return "<unreadable>";
-  }
-}
-
-// Retry transient network + 5xx/429 failures with short exponential backoff.
-// Each attempt gets its own AbortController + timeout; caller-passed signals
-// are not plumbed through since we don't have a cancellation story above this
-// layer. Non-retryable statuses (4xx except 429) are returned immediately for
-// the caller to handle.
-async function retryableFetch(url, opts = {}, label, { timeoutMs = 30_000 } = {}) {
-  const delays = [100, 500];
-  let lastErr = null;
-  let lastRes = null;
-  for (let attempt = 0; attempt <= delays.length; attempt++) {
-    if (attempt > 0) {
-      await new Promise((r) => setTimeout(r, delays[attempt - 1]));
-      const prev = lastRes
-        ? `status=${lastRes.status}`
-        : `err=${lastErr?.message || lastErr}`;
-      log(`[retry] ${label} attempt ${attempt + 1}/3 (${prev})`);
-    }
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    try {
-      const res = await fetch(url, { ...opts, signal: controller.signal });
-      if (res.ok) return res;
-      if (res.status === 429 || (res.status >= 500 && res.status < 600)) {
-        lastRes = res;
-        continue;
-      }
-      return res;
-    } catch (e) {
-      lastErr = e;
-      continue;
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-  if (lastRes) return lastRes;
-  throw lastErr;
-}
-
 // --- Session cache ----------------------------------------------------------
 
-const sessions = new Map(); // name -> { sid, browser, context, page, liveUrl, recording }
-
-async function ensureSession(name) {
-  if (sessions.has(name)) return sessions.get(name);
-
-  // Browserbase charges for the session the moment it's created; if anything
-  // after this point throws (debug URL, CDP connect, newContext, recording
-  // setup) we must release it explicitly or quota leaks until BB's idle
-  // timeout.
-  const created = await bbCreateSession();
-  let browser = null;
-  try {
-    const liveUrl = await bbGetLiveUrl(created.id);
-    browser = await chromium.connectOverCDP(created.connectUrl);
-    const context = browser.contexts()[0] ?? (await browser.newContext());
-    const page = context.pages()[0] ?? (await context.newPage());
-
-    const info = {
-      sid: created.id,
-      browser,
-      context,
-      page,
-      liveUrl,
-      recording: null,
-    };
-    sessions.set(name, info);
-
-    send({
-      type: "slice.session_started",
-      session: name,
-      session_id: created.id,
-      live_url: liveUrl,
-      started_at: new Date().toISOString(),
-    });
-
-    await startRecording(info, name);
-    return info;
-  } catch (e) {
-    if (browser) {
-      try {
-        await browser.close();
-      } catch {}
-    }
-    sessions.delete(name);
-    await bbReleaseSession(created.id);
-    throw e;
-  }
-}
-
-// --- Recording (rrweb + CDP screencast) ------------------------------------
-//
-// rrweb  — vendored record bundle injected via context.addInitScript. Events
-//          are emitted to window.__wbRrwebBuffer and flushed every 500ms (and
-//          on beforeunload) to a sidecar-side buffer via exposeBinding. This
-//          survives cross-origin navigations because the init script reruns on
-//          every new document.
-// video  — per-page CDPSession.startScreencast streams JPEG frames; each frame
-//          is piped into a long-lived `ffmpeg` subprocess that encodes to VP9
-//          WebM on disk. At session end we close the stdin, wait for ffmpeg to
-//          exit, and read the file.
-//
-// Both artifacts are POSTed with Bearer auth to the upload URL. Failure is
-// soft — slice.recording.failed events are emitted but the run still succeeds.
-
-async function startRecording(info, sessionName) {
-  if (!RECORDING.enabled) return;
-  info.recording = {
-    kinds: { ...RECORDING.kinds },
-    rrwebEvents: [],
-    rrwebDropped: 0,
-    rrwebOverflowLogged: false,
-    cdp: null,
-    ffmpeg: null,
-    ffmpegDone: null,
-    videoPath: null,
-  };
-  const rec = info.recording;
-
-  // Drop oldest events once the buffer exceeds the cap — keeps the tail of a
-  // long run (usually the interesting bit) rather than failing the upload or
-  // OOMing the sidecar. One warning per session so ops can spot it.
-  const pushRrweb = (e) => {
-    if (rec.rrwebEvents.length >= RECORDING.rrwebMaxEvents) {
-      rec.rrwebEvents.shift();
-      rec.rrwebDropped++;
-      if (!rec.rrwebOverflowLogged) {
-        rec.rrwebOverflowLogged = true;
-        log(
-          `[recording] rrweb buffer hit cap (${RECORDING.rrwebMaxEvents}); dropping oldest events`,
-        );
-      }
-    }
-    rec.rrwebEvents.push(e);
-  };
-
-  if (rec.kinds.rrweb) {
+const sessions = new SessionManager();
+
+async function ensureSession(name, { profile } = {}) {
+  return sessions.ensure(name, async () => {
+    // Vendors charge for the session the moment allocate() returns; if
+    // anything after this point throws (getLiveUrl, CDP connect, newContext,
+    // recording setup) we must release it explicitly or quota leaks until
+    // the vendor's idle timeout. SessionManager only caches a successful
+    // return, so on throw there's no half-populated entry to clean up here.
+    //
+    // Lifecycle timings attached to `slice.session_started` tell operators
+    // which step dominated when startup feels slow — usually connectOverCDP
+    // against a cold vendor region, but the live-URL fetch and
+    // newContext/newPage can each stall independently.
+    const t0 = Date.now();
+    const allocated = await provider.allocate({ profile, sessionName: name });
+    const tAllocated = Date.now();
+    let browser = null;
     try {
-      await info.context.exposeBinding("__wbRrwebFlush", (_src, batch) => {
-        if (Array.isArray(batch)) {
-          for (const e of batch) pushRrweb(e);
-        }
-      });
-      const bootstrap = `
-;(function(){
-  if (window.__wbRrwebActive) return;
-  window.__wbRrwebActive = true;
-  window.__wbRrwebBuffer = [];
-  try {
-    rrwebRecord({
-      emit: function(event){ window.__wbRrwebBuffer.push(event); },
-      sampling: { scroll: 150, media: 800, input: 'last' },
-      maskAllInputs: true
-    });
-  } catch (e) { /* rrweb unavailable on this page (e.g. chrome://) */ }
-  var flush = function(){
-    var buf = window.__wbRrwebBuffer;
-    if (buf && buf.length && typeof window.__wbRrwebFlush === 'function') {
-      window.__wbRrwebBuffer = [];
-      try { window.__wbRrwebFlush(buf); } catch (e) {}
-    }
-  };
-  setInterval(flush, 500);
-  window.addEventListener('beforeunload', flush);
-})();
-`;
-      await info.context.addInitScript({
-        content: RECORDING.rrwebSource + "\n" + bootstrap,
-      });
-    } catch (e) {
-      log(`[recording] rrweb setup failed: ${e.message}`);
-      rec.kinds.rrweb = false;
-    }
-  }
+      const liveUrl = await provider.getLiveUrl(allocated);
+      browser = await chromium.connectOverCDP(allocated.cdpUrl);
+      const tConnected = Date.now();
+      const context = browser.contexts()[0] ?? (await browser.newContext());
+      const page = context.pages()[0] ?? (await context.newPage());
+      const tPageReady = Date.now();
+
+      const info = {
+        sid: allocated.sid,
+        browser,
+        context,
+        page,
+        liveUrl,
+        recording: null,
+      };
 
-  if (rec.kinds.video) {
-    try {
-      const outPath = path.join(
-        os.tmpdir(),
-        `wb-video-${sanitize(sessionName)}-${Date.now()}-${process.pid}.webm`,
-      );
-      rec.videoPath = outPath;
-      const ff = spawn(
-        "ffmpeg",
-        [
-          "-hide_banner",
-          "-loglevel",
-          "warning",
-          "-y",
-          "-f",
-          "image2pipe",
-          "-vcodec",
-          "mjpeg",
-          "-framerate",
-          String(RECORDING.fps),
-          "-i",
-          "pipe:0",
-          "-c:v",
-          "libvpx-vp9",
-          "-b:v",
-          "1M",
-          "-deadline",
-          "realtime",
-          "-pix_fmt",
-          "yuv420p",
-          outPath,
-        ],
-        { stdio: ["pipe", "ignore", "pipe"] },
-      );
-      ff.stderr.on("data", (d) => {
-        const s = d.toString().trim();
-        if (s) log(`[ffmpeg] ${s.slice(0, 240)}`);
-      });
-      // Broken pipe on shutdown is normal — swallow it so it doesn't crash the
-      // node process via the default 'error' handler.
-      ff.stdin.on("error", (e) => {
-        if (e.code !== "EPIPE") log(`[ffmpeg stdin] ${e.message}`);
-      });
-      rec.ffmpeg = ff;
-      rec.ffmpegDone = new Promise((resolve) => {
-        ff.on("close", (code) => resolve(code));
-      });
-
-      const cdp = await info.context.newCDPSession(info.page);
-      rec.cdp = cdp;
-      // Dedup identical consecutive frames. CDP emits repeats when nothing
-      // changed on screen; encoding them as distinct frames bloats the WebM
-      // and mis-paces playback. Compare the base64 string directly — it's
-      // cheaper than hashing and equivalent for exact equality.
-      let lastFrameData = null;
-      let dedupCount = 0;
-      let dedupLogged = false;
-
-      cdp.on("Page.screencastFrame", async (frame) => {
-        try {
-          if (ff.stdin.writable && !ff.killed) {
-            if (frame.data === lastFrameData) {
-              dedupCount++;
-              if (!dedupLogged && dedupCount >= 100) {
-                dedupLogged = true;
-                log(
-                  `[recording] dedup active (${dedupCount} duplicate frames skipped so far)`,
-                );
-              }
-              // Still ack — Chrome needs it to keep streaming.
-              await cdp.send("Page.screencastFrameAck", {
-                sessionId: frame.sessionId,
-              });
-              return;
-            }
-            lastFrameData = frame.data;
-            const buf = Buffer.from(frame.data, "base64");
-            const ok = ff.stdin.write(buf);
-            // Backpressure: if ffmpeg's stdin buffer is full, wait for drain
-            // before acking so Chrome slows frame production instead of
-            // piling JPEG frames in Node heap. 5s fail-open so a wedged
-            // ffmpeg can't stall the protocol indefinitely.
-            if (!ok) {
-              await new Promise((resolve) => {
-                let fired = false;
-                const done = () => {
-                  if (fired) return;
-                  fired = true;
-                  ff.stdin.off("drain", done);
-                  ff.stdin.off("close", done);
-                  ff.stdin.off("error", done);
-                  clearTimeout(timer);
-                  resolve();
-                };
-                const timer = setTimeout(done, 5000);
-                ff.stdin.once("drain", done);
-                ff.stdin.once("close", done);
-                ff.stdin.once("error", done);
-              });
-            }
-          }
-          // Must ack each frame or Chrome stops streaming.
-          await cdp.send("Page.screencastFrameAck", {
-            sessionId: frame.sessionId,
-          });
-        } catch {
-          // Session tearing down — safe to ignore.
-        }
-      });
-      await cdp.send("Page.startScreencast", {
-        format: "jpeg",
-        quality: RECORDING.quality,
-        everyNthFrame: 1,
+      send({
+        type: "slice.session_started",
+        session: name,
+        session_id: allocated.sid,
+        live_url: liveUrl,
+        vendor: provider.name,
+        started_at: new Date().toISOString(),
+        timings: {
+          allocate_ms: tAllocated - t0,
+          connect_ms: tConnected - tAllocated,
+          page_ready_ms: tPageReady - tConnected,
+          total_ms: tPageReady - t0,
+        },
       });
-    } catch (e) {
-      log(`[recording] video setup failed: ${e.message}`);
-      rec.kinds.video = false;
-      if (rec.ffmpeg) {
-        try {
-          rec.ffmpeg.kill();
-        } catch {}
-      }
-    }
-  }
-
-  const active = Object.entries(rec.kinds)
-    .filter(([, v]) => v)
-    .map(([k]) => k);
-  if (active.length) {
-    send({
-      type: "slice.recording.started",
-      session: sessionName,
-      run_id: RECORDING.runId,
-      kinds: active,
-    });
-  }
-}
 
-async function flushRecording(info, sessionName) {
-  if (!info.recording) return;
-  const rec = info.recording;
-
-  let rrwebBody = null;
-  if (rec.kinds.rrweb) {
-    try {
-      const tail = await info.page.evaluate(() => {
-        if (!Array.isArray(window.__wbRrwebBuffer)) return [];
-        const out = window.__wbRrwebBuffer;
-        window.__wbRrwebBuffer = [];
-        return out;
-      });
-      if (Array.isArray(tail)) {
-        for (const e of tail) {
-          if (rec.rrwebEvents.length >= RECORDING.rrwebMaxEvents) {
-            rec.rrwebEvents.shift();
-            rec.rrwebDropped++;
-          }
-          rec.rrwebEvents.push(e);
-        }
-      }
+      await recording.start(info, name);
+      return info;
     } catch (e) {
-      log(`[recording] rrweb final drain failed: ${e.message}`);
-    }
-    if (rec.rrwebEvents.length > 0) {
-      try {
-        const json = JSON.stringify({
-          run_id: RECORDING.runId,
-          session: sessionName,
-          event_count: rec.rrwebEvents.length,
-          dropped: rec.rrwebDropped,
-          events: rec.rrwebEvents,
-        });
-        rrwebBody = await gzip(Buffer.from(json, "utf8"));
-      } catch (e) {
-        log(`[recording] rrweb gzip failed: ${e.message}`);
-      }
-    }
-  }
-
-  let videoBody = null;
-  let videoFailure = null;
-  if (rec.kinds.video && rec.cdp && rec.ffmpeg) {
-    try {
-      await rec.cdp.send("Page.stopScreencast");
-    } catch {
-      // Browser may already be tearing down.
-    }
-    const timeoutMs =
-      Number.parseInt(process.env.WB_RECORDING_FFMPEG_TIMEOUT_MS || "", 10) ||
-      30_000;
-    try {
-      rec.ffmpeg.stdin.end();
-      const settled = await Promise.race([
-        rec.ffmpegDone,
-        new Promise((r) =>
-          setTimeout(() => r({ __timeout: true }), timeoutMs),
-        ),
-      ]);
-      if (settled && typeof settled === "object" && settled.__timeout) {
-        log(`[recording] ffmpeg did not exit within ${timeoutMs}ms; killing`);
+      if (browser) {
         try {
-          rec.ffmpeg.kill("SIGKILL");
+          await browser.close();
         } catch {}
-        videoFailure = `ffmpeg_timeout_${timeoutMs}ms`;
-      } else if (typeof settled === "number" && settled !== 0) {
-        // ff.on('close') resolves with the exit code — non-zero means ffmpeg
-        // produced a corrupt/partial webm that we should not upload.
-        videoFailure = `ffmpeg_exit_code_${settled}`;
-        log(`[recording] ffmpeg exited with code ${settled}`);
-      }
-      if (!videoFailure && rec.videoPath && existsSync(rec.videoPath)) {
-        videoBody = await fsPromises.readFile(rec.videoPath);
       }
-      if (rec.videoPath && existsSync(rec.videoPath)) {
-        try {
-          await fsPromises.unlink(rec.videoPath);
-        } catch {}
-      }
-    } catch (e) {
-      videoFailure = `finalize_error: ${e.message}`;
-      log(`[recording] video finalize failed: ${e.message}`);
+      await provider.release(allocated.sid);
+      throw e;
     }
-  }
-
-  const uploads = [];
-  if (rrwebBody) {
-    uploads.push(
-      uploadArtifact(
-        "rrweb",
-        rrwebBody,
-        "application/json+gzip",
-        sessionName,
-        { event_count: rec.rrwebEvents.length },
-      ),
-    );
-  }
-  if (videoBody) {
-    uploads.push(
-      uploadArtifact("video", videoBody, "video/webm", sessionName, {
-        fps: RECORDING.fps,
-      }),
-    );
-  } else if (videoFailure) {
-    // Surface a terminal recording failure to the callback stream so the
-    // consumer knows the video was lost rather than silently missing.
-    send({
-      type: "slice.recording.failed",
-      session: sessionName,
-      run_id: RECORDING.runId,
-      kind: "video",
-      reason: videoFailure,
-    });
-  }
-  await Promise.allSettled(uploads);
-}
-
-async function uploadArtifact(kind, body, contentType, sessionName, extra) {
-  const url = RECORDING.uploadUrl
-    .replace("{run_id}", encodeURIComponent(RECORDING.runId))
-    .replace("{kind}", encodeURIComponent(kind));
-  try {
-    const res = await retryableFetch(
-      url,
-      {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${RECORDING.secret}`,
-          "Content-Type": contentType,
-          "X-WB-Run-Id": RECORDING.runId,
-          "X-WB-Recording-Kind": kind,
-          "X-WB-Session": sessionName,
-        },
-        body,
-      },
-      `upload.${kind}`,
-      { timeoutMs: 30_000 },
-    );
-    if (!res.ok) {
-      send({
-        type: "slice.recording.failed",
-        session: sessionName,
-        run_id: RECORDING.runId,
-        kind,
-        status: res.status,
-        reason: (await safeText(res)) || res.statusText || "upload rejected",
-      });
-      return;
-    }
-    send({
-      type: "slice.recording.uploaded",
-      session: sessionName,
-      run_id: RECORDING.runId,
-      kind,
-      bytes: body.length,
-      ...(extra || {}),
-    });
-  } catch (e) {
-    send({
-      type: "slice.recording.failed",
-      session: sessionName,
-      run_id: RECORDING.runId,
-      kind,
-      reason: e.name === "AbortError" ? "timeout" : e.message,
-    });
-  }
-}
-
-function sanitize(s) {
-  return String(s || "default").replace(/[^A-Za-z0-9_-]+/g, "_");
+  });
 }
-
 // --- {{ env.X }} / {{ artifacts.X }} substitution --------------------------
 
 const ENV_RE = /\{\{\s*env\.([A-Za-z_][A-Za-z0-9_]*)\s*\}\}/g;
@@ -767,14 +124,6 @@ const ENV_RE = /\{\{\s*env\.([A-Za-z_][A-Za-z0-9_]*)\s*\}\}/g;
 // exotic would invite path traversal once composed with WB_ARTIFACTS_DIR.
 const ARTIFACT_RE = /\{\{\s*artifacts\.([A-Za-z_][A-Za-z0-9_-]*)\s*\}\}/g;
 
-function resolveInside(dir, candidate) {
-  const resolvedDir = path.resolve(dir);
-  const resolved = path.resolve(resolvedDir, candidate);
-  const rel = path.relative(resolvedDir, resolved);
-  if (rel === "" || rel.startsWith("..") || path.isAbsolute(rel)) return null;
-  return resolved;
-}
-
 // Resolved once at module load. `warn` matches historical behavior
 // (log + empty string, runbook continues). `error` throws so a missing OTP
 // or env var fails the slice instead of silently sending an empty value
@@ -871,245 +220,6 @@ function scrubSecrets(msg, secrets) {
   return out;
 }
 
-// --- Verb dispatch ----------------------------------------------------------
-
-function verbName(verb) {
-  if (!verb || typeof verb !== "object") return String(verb);
-  return Object.keys(verb)[0] || "verb";
-}
-
-// Most verbs accept either a bare string ("goto: https://...") or a structured
-// object ("goto: { url: ..., wait_until: ... }"). This pulls the canonical
-// field out of either shape.
-function arg(value, primaryKey) {
-  if (typeof value === "string") return { [primaryKey]: value };
-  if (value && typeof value === "object") return value;
-  return {};
-}
-
-async function runVerb(page, verb, index, ctx) {
-  const name = verbName(verb);
-  const raw = verb[name];
-  const a = expand(
-    arg(raw, defaultKey(name)),
-    ctx?.secrets,
-    ctx?.artifactCache,
-  );
-
-  switch (name) {
-    case "goto": {
-      const url = a.url ?? "";
-      const waitUntil = a.wait_until ?? "domcontentloaded";
-      await page.goto(url, { waitUntil, timeout: a.timeout ?? 30_000 });
-      return `→ ${page.url()}`;
-    }
-    case "fill": {
-      // Don't echo the value into the summary — could be a credential.
-      await page.fill(a.selector, String(a.value ?? ""), {
-        timeout: a.timeout ?? 10_000,
-      });
-      return `${a.selector} = «${redact(a.value)}»`;
-    }
-    case "click": {
-      await page.click(a.selector, { timeout: a.timeout ?? 10_000 });
-      return `${a.selector}`;
-    }
-    case "press": {
-      const target = a.selector ?? "body";
-      await page.press(target, a.key, { timeout: a.timeout ?? 5_000 });
-      return `${target} ⌨ ${a.key}`;
-    }
-    case "wait_for": {
-      const selector = a.selector;
-      const state = a.state ?? "visible";
-      await page.waitForSelector(selector, {
-        state,
-        timeout: a.timeout ?? 15_000,
-      });
-      return `${selector} (${state})`;
-    }
-    case "screenshot": {
-      // Always resolve inside $WB_ARTIFACTS_DIR (or cwd when unset). Absolute
-      // paths and traversals are rejected — screenshots are controlled by
-      // runbook authors whose content we don't want to grant arbitrary-write.
-      const requested = a.path ?? `screenshot-${Date.now()}.png`;
-      const artifactsDir = (process.env.WB_ARTIFACTS_DIR || "").trim() || ".";
-      if (path.isAbsolute(requested)) {
-        throw new Error(
-          `screenshot: absolute paths are not allowed (got ${requested})`,
-        );
-      }
-      const full = resolveInside(artifactsDir, requested);
-      if (!full) {
-        throw new Error(
-          `screenshot: path escapes artifacts dir (got ${requested})`,
-        );
-      }
-      await fsPromises.mkdir(path.dirname(full), { recursive: true });
-      // Write to a unique .tmp first, then atomically rename, so a crash
-      // mid-capture can't leave a truncated PNG that's already been announced
-      // via slice.artifact_saved and uploaded to R2.
-      const tmp = `${full}.${process.pid}.${randomUUID().slice(0, 8)}.tmp`;
-      try {
-        await page.screenshot({ path: tmp, fullPage: !!a.full_page });
-        await fsPromises.rename(tmp, full);
-      } catch (e) {
-        try {
-          await fsPromises.unlink(tmp);
-        } catch {}
-        throw e;
-      }
-      return `→ ${requested}`;
-    }
-    case "extract": {
-      // Pull structured rows out of the page. Each `field` entry is either:
-      //   string                   — CSS selector relative to row, take textContent
-      //   { selector, attr }       — CSS selector relative to row, take attribute
-      //   { selector, text: true } — explicit textContent (default)
-      const rowSelector = a.selector;
-      const fields = a.fields ?? {};
-      const items = await page.$$eval(
-        rowSelector,
-        (rows, fieldSpec) =>
-          rows.map((row) => {
-            const out = {};
-            for (const [name, spec] of Object.entries(fieldSpec)) {
-              const sel = typeof spec === "string" ? spec : spec.selector;
-              const attr = typeof spec === "string" ? null : spec.attr ?? null;
-              const el = sel ? row.querySelector(sel) : row;
-              if (!el) {
-                out[name] = null;
-                continue;
-              }
-              out[name] = attr
-                ? el.getAttribute(attr)
-                : (el.textContent || "").trim();
-            }
-            return out;
-          }),
-        fields,
-      );
-      // Emit as JSON to stdout so wb captures it in step.complete.stdout.
-      // Pretty-printed for readability when a runbook surfaces the output.
-      console.log(JSON.stringify(items, null, 2));
-      if (ctx) ctx.lastResult = items;
-      return `${rowSelector} → ${items.length} rows`;
-    }
-    case "assert": {
-      const sel = a.selector;
-      const handle = await page.$(sel);
-      if (!handle) throw new Error(`assert: selector not found: ${sel}`);
-      if (a.text_contains) {
-        const txt = (await handle.textContent()) ?? "";
-        if (!txt.includes(a.text_contains)) {
-          throw new Error(
-            `assert: text "${a.text_contains}" not in ${sel} (got "${txt.slice(0, 80)}")`,
-          );
-        }
-      }
-      if (a.url_contains && !page.url().includes(a.url_contains)) {
-        throw new Error(
-          `assert: url does not contain "${a.url_contains}" (got ${page.url()})`,
-        );
-      }
-      return `${sel}`;
-    }
-    case "eval": {
-      // Run arbitrary JS in the page; result is JSON-serialized to stdout.
-      const result = await page.evaluate(a.script);
-      console.log(JSON.stringify(result, null, 2));
-      if (ctx) ctx.lastResult = result;
-      return `script ran`;
-    }
-    case "save": {
-      // Persist a JSON artifact into $WB_ARTIFACTS_DIR so later cells can read
-      // it and wb can upload it. Captures the previous verb's output unless
-      // the author provides an explicit `value:`.
-      const artifactsDir = (process.env.WB_ARTIFACTS_DIR || "").trim();
-      if (!artifactsDir) {
-        throw new Error(
-          "save: $WB_ARTIFACTS_DIR is not set — run this workbook via `wb run` (wb exports the dir for you)",
-        );
-      }
-      const explicitValue = a.value !== undefined;
-      const payload = explicitValue ? a.value : ctx?.lastResult;
-      if (payload === undefined) {
-        throw new Error(
-          "save: no value provided and no prior extract/eval result to capture",
-        );
-      }
-      const name =
-        typeof a.name === "string" && a.name.trim().length > 0
-          ? sanitizeArtifactName(a.name)
-          : autoArtifactName(ctx?.blockIndex ?? index);
-      const filename = name.endsWith(".json") ? name : `${name}.json`;
-      const full = path.join(artifactsDir, filename);
-      await fsPromises.mkdir(artifactsDir, { recursive: true });
-      // Atomic write: serialize to .tmp, then rename. Announce the artifact
-      // AFTER rename so a partial write can never be seen by wb's uploader.
-      const serialized = JSON.stringify(payload, null, 2);
-      const tmp = `${full}.${process.pid}.${randomUUID().slice(0, 8)}.tmp`;
-      try {
-        await fsPromises.writeFile(tmp, serialized, "utf8");
-        await fsPromises.rename(tmp, full);
-      } catch (e) {
-        try {
-          await fsPromises.unlink(tmp);
-        } catch {}
-        throw e;
-      }
-      send({
-        type: "slice.artifact_saved",
-        filename,
-        path: full,
-        bytes: Buffer.byteLength(serialized),
-      });
-      return `→ ${filename}`;
-    }
-    default:
-      throw new Error(`unsupported verb: ${name}`);
-  }
-}
-
-function sanitizeArtifactName(s) {
-  // Keep author-chosen names readable but safe as filenames. Drop anything
-  // that could escape the artifacts dir (slashes, NULs, etc.).
-  return String(s).replace(/[^A-Za-z0-9_.-]+/g, "_").slice(0, 200);
-}
-
-function autoArtifactName(blockIndex) {
-  const rand = randomUUID().replace(/-/g, "").slice(0, 8);
-  const n = Number.isFinite(blockIndex) ? blockIndex : 0;
-  return `cell-${n}-${rand}`;
-}
-
-function defaultKey(name) {
-  switch (name) {
-    case "goto":
-      return "url";
-    case "click":
-    case "wait_for":
-    case "assert":
-      return "selector";
-    case "screenshot":
-      return "path";
-    case "press":
-      return "key";
-    case "eval":
-      return "script";
-    case "save":
-      return "name";
-    default:
-      return "value";
-  }
-}
-
-function redact(value) {
-  if (typeof value !== "string") return "";
-  if (value.length <= 4) return "***";
-  return `${value.slice(0, 2)}***`;
-}
-
 // --- Slice handler ----------------------------------------------------------
 
 async function handleSlice(msg) {
@@ -1127,6 +237,15 @@ async function handleSlice(msg) {
     // slices is seen on the next slice's first read.
     artifactCache: new Map(),
   };
+  // Per-slice wall-clock cap. Rust's SLICE_EVENT_TIMEOUT is per-event (resets
+  // on every verb.complete), so a chain of 25 × 15s wait_fors that each emit
+  // a frame never trips it — the sidecar just runs for 375s while the Rust
+  // parent assumes progress. Cap aggregate slice time so we terminate cleanly
+  // instead. Default 120s; operators who legitimately need longer can bump
+  // via WB_SLICE_DEADLINE_MS.
+  const sliceDeadlineMs =
+    Number.parseInt(process.env.WB_SLICE_DEADLINE_MS || "", 10) || 120_000;
+  const sliceDeadline = Date.now() + sliceDeadlineMs;
   // Top-level guard: any unhandled error must emit slice.failed so the Rust
   // side sees a terminal frame instead of waiting out SLICE_EVENT_TIMEOUT.
   try {
@@ -1136,7 +255,7 @@ async function handleSlice(msg) {
 
     let session;
     try {
-      session = await ensureSession(sessionName);
+      session = await ensureSession(sessionName, { profile: msg.profile });
     } catch (e) {
       send({
         type: "slice.failed",
@@ -1151,23 +270,34 @@ async function handleSlice(msg) {
     const startAt = restore?.state?.verb_index ?? 0;
 
     for (let i = startAt; i < verbs.length; i++) {
+      if (Date.now() >= sliceDeadline) {
+        send({
+          type: "slice.failed",
+          error: `slice exceeded deadline (${sliceDeadlineMs}ms); aborted before verb index ${i} of ${verbs.length}`,
+        });
+        return;
+      }
       const v = verbs[i];
       const name = verbName(v);
+      const verbStart = Date.now();
       try {
-        const summary = await runVerb(session.page, v, i, sliceCtx);
+        const summary = await runVerb(session.page, v, i, sliceCtx, expand);
         send({
           type: "verb.complete",
           verb: name,
           verb_index: i,
           summary,
+          duration_ms: Date.now() - verbStart,
         });
       } catch (e) {
+        const duration_ms = Date.now() - verbStart;
         const clean = scrubSecrets(e.message, sliceCtx.secrets);
         send({
           type: "verb.failed",
           verb: name,
           verb_index: i,
           error: clean,
+          duration_ms,
         });
         send({
           type: "slice.failed",
@@ -1198,9 +328,19 @@ async function shutdown() {
   // live page.evaluate() and CDP screencast needs a live CDPSession.
   for (const [name, info] of sessions) {
     try {
-      await flushRecording(info, name);
+      await recording.flush(info, name);
     } catch (e) {
       log(`[shutdown] flush recording ${name}: ${e.message}`);
+      // Unhandled flush error → consumer would otherwise see neither an
+      // uploaded nor a failed event and have to infer loss from absence.
+      try {
+        send({
+          type: "slice.recording.failed",
+          session: name,
+          run_id: recording.runId,
+          reason: `finalize_error: ${e.message}`,
+        });
+      } catch {}
     }
   }
   for (const [name, info] of sessions) {
@@ -1210,10 +350,10 @@ async function shutdown() {
       log(`[shutdown] close ${name}: ${e.message}`);
     }
   }
-  // Ask Browserbase to release sessions explicitly so quota isn't held by
+  // Ask the vendor to release sessions explicitly so quota isn't held by
   // orphans waiting for their idle timeout.
   await Promise.all(
-    Array.from(sessions.values()).map((s) => bbReleaseSession(s.sid)),
+    Array.from(sessions.values()).map((s) => provider.release(s.sid)),
   );
   process.exit(0);
 }
@@ -1222,21 +362,35 @@ async function shutdown() {
 
 const rl = readline.createInterface({ input: process.stdin, terminal: false });
 
-// Serialize incoming messages — Playwright operations are async and we don't
-// want concurrent slice handlers stomping on the shared page.
-let chain = Promise.resolve();
-function enqueue(fn, kind) {
-  chain = chain.then(fn).catch((e) => {
-    log(`[loop] ${e.stack || e.message}`);
-    // Last-resort terminal frame so a bug in the handler can never strand
-    // the Rust parent waiting for a slice to finish.
-    if (kind === "slice") {
+// Per-session dispatch: slices against the same session name serialize
+// (shared Playwright page), slices against different names run in parallel.
+// SessionManager owns the chain map + the in-flight-create dedup that makes
+// this safe — two concurrent slices for "vendor-a" share one provider.allocate
+// instead of racing to create two vendor sessions.
+function dispatchSlice(msg) {
+  const sessionName = msg.session || "default";
+  return sessions
+    .enqueueOn(sessionName, () => handleSlice(msg))
+    .catch((e) => {
+      // handleSlice has its own top-level guard that emits slice.failed;
+      // this is the last-resort net for a bug that throws past that guard,
+      // so the Rust parent never strands waiting on SLICE_EVENT_TIMEOUT.
+      log(`[loop] ${e.stack || e.message}`);
       try {
         send({ type: "slice.failed", error: `sidecar loop error: ${e.message}` });
       } catch {}
-    }
-  });
-  return chain;
+    });
+}
+
+// Shutdown drains all pending per-session work, then tears down. Guarded
+// against repeat entries via `shuttingDown` inside shutdown() itself.
+async function drainAndShutdown() {
+  try {
+    await sessions.drainAll();
+  } catch (e) {
+    log(`[shutdown] drain failed: ${e.message}`);
+  }
+  await shutdown();
 }
 
 rl.on("line", (line) => {
@@ -1261,10 +415,10 @@ rl.on("line", (line) => {
       });
       break;
     case "slice":
-      enqueue(() => handleSlice(msg), "slice");
+      dispatchSlice(msg);
       break;
     case "shutdown":
-      enqueue(shutdown);
+      drainAndShutdown();
       break;
     default:
       log(`[warn] unknown message type: ${msg.type}`);
@@ -1273,7 +427,7 @@ rl.on("line", (line) => {
 
 rl.on("close", () => {
   // stdin closed — drain pending work then exit.
-  enqueue(shutdown);
+  drainAndShutdown();
 });
 
 // If the Rust parent SIGTERMs us (timeout, abort, crash), Node's default is
@@ -1282,7 +436,7 @@ rl.on("close", () => {
 for (const sig of ["SIGTERM", "SIGINT", "SIGHUP"]) {
   process.on(sig, () => {
     log(`[shutdown] received ${sig}`);
-    enqueue(shutdown);
+    drainAndShutdown();
   });
 }