@delacour/warden-e2e 0.11.0 → 0.12.0

package/preload.mjs

@@ -39,6 +39,7 @@ import {
   isLocator,
   Locator,
   scrollUntilVisible,
+  realNativeLogDeps,
   bunExec,
   execError,
   driverError,
@@ -104,12 +105,11 @@ import {
   createDevicePerf,
   spawnWarden,
   screenshotPath,
-  realNativeLogDeps,
   BUN_TIMEOUT_MARGIN_MS2,
   onlyWasSeen,
   WORKSPACE_VERSION,
   WARDEN_E2E_VERSION2
-} from "./chunk-ggcjzrvh.mjs";
+} from "./chunk-qz94hsb6.mjs";
 
 // ../../packages/e2e/src/preload.ts
 import { afterAll, setDefaultTimeout } from "bun:test";
@@ -306,35 +306,46 @@ function parseAdbDeviceList(stdout) {
   const entries = [];
   for (const raw of stdout.split(`
 `)) {
-    const line = raw.trim();
-    const row = /^(\S+)\s+(.+)$/.exec(line);
-    if (!row?.[1] || !row[2] || line.startsWith("List of devices") || line.startsWith("*"))
-      continue;
-    const serial = row[1];
-    const rest = row[2];
-    const noPermissions = rest.startsWith("no permissions");
-    const state = noPermissions ? "no permissions" : rest.split(/\s+/)[0] ?? "";
-    const emulator = /^emulator-(\d+)$/.exec(serial);
-    if (emulator?.[1]) {
-      entries.push({ kind: "emulator", serial, port: Number(emulator[1]), state });
-      continue;
-    }
-    const attributes = noPermissions ? rest.slice(rest.lastIndexOf("]") + 1) : rest.slice(state.length);
-    const attr = (key) => new RegExp(`(?:^|\\s)${key}:(\\S+)`).exec(attributes)?.[1];
-    const networked = /^[^:\s]+:\d+$|_adb-tls-/.test(serial);
-    const model = attr("model");
-    const product = attr("product");
-    entries.push({
-      kind: "other",
-      serial,
-      state,
-      transport: networked ? "wifi" : "usb",
-      ...model !== undefined ? { model } : {},
-      ...product !== undefined ? { product } : {}
-    });
+    const entry = parseAdbRow(raw.trim());
+    if (entry)
+      entries.push(entry);
   }
   return entries;
 }
+function parseAdbRow(line) {
+  const row = /^(\S+)\s+(.+)$/.exec(line);
+  if (!row?.[1] || !row[2] || line.startsWith("List of devices") || line.startsWith("*"))
+    return;
+  const serial = row[1];
+  const rest = row[2];
+  const noPermissions = rest.startsWith("no permissions");
+  const state = noPermissions ? "no permissions" : rest.split(/\s+/)[0] ?? "";
+  const emulator = /^emulator-(\d+)$/.exec(serial);
+  if (emulator?.[1])
+    return { kind: "emulator", serial, port: Number(emulator[1]), state };
+  const attributes = noPermissions ? rest.slice(rest.lastIndexOf("]") + 1) : rest.slice(state.length);
+  const attr = (key) => new RegExp(`(?:^|\\s)${key}:(\\S+)`).exec(attributes)?.[1];
+  const networked = /^[^:\s]+:\d+$|_adb-tls-/.test(serial);
+  const model = attr("model");
+  const product = attr("product");
+  return {
+    kind: "other",
+    serial,
+    state,
+    transport: networked ? "wifi" : "usb",
+    ...model !== undefined ? { model } : {},
+    ...product !== undefined ? { product } : {}
+  };
+}
+function physicalOf(entry, model, hwSerial) {
+  return {
+    platform: "android",
+    transport: entry.transport,
+    adbState: entry.state,
+    ...hwSerial !== undefined ? { hwSerial } : {},
+    ...model !== undefined ? { model } : {}
+  };
+}
 function parseAdbDevices(stdout) {
   const emulators = [];
   for (const entry of parseAdbDeviceList(stdout)) {
@@ -663,14 +674,7 @@ function createAndroidProvider(deps, options = {}) {
       return device;
     if (model !== undefined)
       device.profile = profileSlug(model);
-    const hwSerial = info?.hwSerial;
-    device.physical = {
-      platform: "android",
-      transport: entry.transport,
-      adbState: entry.state,
-      ...hwSerial !== undefined ? { hwSerial } : {},
-      ...model !== undefined ? { model } : {}
-    };
+    device.physical = physicalOf(entry, model, info?.hwSerial);
     return device;
   }
   async function avdNameOf(serial) {
@@ -824,6 +828,37 @@ function createAndroidProvider(deps, options = {}) {
     deps.log?.(`${serial}: launch from snapshot ${snapshot} failed (${launched.error}) \u2014 retrying with a cold boot`);
     return attempt(undefined);
   }
+  async function refuseBootingPhone(id) {
+    const listed = await listAdbDevices(deps);
+    const state = listed.success ? listed.data.find((e) => e.serial === id)?.state : undefined;
+    if (state === "unauthorized")
+      return err(`${id} is unauthorized: accept the USB debugging prompt on the phone, then retry`);
+    return err(`${id} is a physical device: warden never boots one (state: ${state ?? "not connected"})`);
+  }
+  async function pollRegistered(id, polls) {
+    for (let i = 0;; i++) {
+      const emulators = await listEmulators(deps);
+      if (!emulators.success)
+        return emulators;
+      if (emulators.data.some((e) => e.serial === id))
+        return ok(true);
+      if (i >= polls)
+        return ok(false);
+      await sleep(REGISTER_POLL_MS);
+    }
+  }
+  async function pollGone(id, killError) {
+    const deadline = deps.now() + RELAUNCH_GONE_TIMEOUT_MS;
+    for (;; ) {
+      const listed = await listEmulators(deps);
+      if (listed.success && !listed.data.some((e) => e.serial === id))
+        return ok(undefined);
+      if (deps.now() >= deadline) {
+        return err(`${id} did not shut down within ${RELAUNCH_GONE_TIMEOUT_MS / 1000}s${killError === undefined ? "" : `: ${killError}`}`);
+      }
+      await sleep(REGISTER_POLL_MS);
+    }
+  }
   return {
     platform: "android",
     async inventory() {
@@ -878,25 +913,15 @@ function createAndroidProvider(deps, options = {}) {
       return ok(device);
     },
     async boot(id) {
-      if (!isEmulatorSerial(id)) {
-        const listed = await listAdbDevices(deps);
-        const state = listed.success ? listed.data.find((e) => e.serial === id)?.state : undefined;
-        if (state === "unauthorized")
-          return err(`${id} is unauthorized: accept the USB debugging prompt on the phone, then retry`);
-        return err(`${id} is a physical device: warden never boots one (state: ${state ?? "not connected"})`);
-      }
+      if (!isEmulatorSerial(id))
+        return refuseBootingPhone(id);
       const launched = deps.store.listDevices("android").some((d) => d.id === id);
       const polls = launched ? Math.ceil(REGISTER_TIMEOUT_MS / REGISTER_POLL_MS) : 0;
-      for (let i = 0;; i++) {
-        const emulators = await listEmulators(deps);
-        if (!emulators.success)
-          return emulators;
-        if (emulators.data.some((e) => e.serial === id))
-          return ok(undefined);
-        if (i >= polls)
-          break;
-        await sleep(REGISTER_POLL_MS);
-      }
+      const registered = await pollRegistered(id, polls);
+      if (!registered.success)
+        return registered;
+      if (registered.data)
+        return ok(undefined);
       return launched ? err(`${id} did not register with adb within ${REGISTER_TIMEOUT_MS / 1000}s of its launch`) : err(`${id} is not running \u2014 android devices are created, not booted`);
     },
     async waitReady(id, timeoutMs) {
@@ -936,16 +961,9 @@ function createAndroidProvider(deps, options = {}) {
       if (!resolved.success)
         return resolved;
       const killed = await run(deps, adb(id, "emu", "kill"), { timeoutMs: EMU_CONSOLE_TIMEOUT_MS });
-      const deadline = deps.now() + RELAUNCH_GONE_TIMEOUT_MS;
-      for (;; ) {
-        const listed = await listEmulators(deps);
-        if (listed.success && !listed.data.some((e) => e.serial === id))
-          break;
-        if (deps.now() >= deadline) {
-          return err(`${id} did not shut down within ${RELAUNCH_GONE_TIMEOUT_MS / 1000}s${killed.success ? "" : `: ${killed.error}`}`);
-        }
-        await sleep(REGISTER_POLL_MS);
-      }
+      const gone = await pollGone(id, killed.success ? undefined : killed.error);
+      if (!gone.success)
+        return gone;
       await sleep(RELAUNCH_PORT_SETTLE_MS);
       const launched = await launchOrColdBoot(resolved.data.avdName, port, id, undefined, true);
       if (!launched.success)
@@ -2107,6 +2125,26 @@ async function preparePhone(session, clock, facts, log) {
   return { success: true, data: undefined };
 }
 var SETTING_VALUE = /^(null|\d)$/;
+function restoreCommands(rotation, uimode) {
+  const commands = [];
+  if (rotation) {
+    for (const key of ["accelerometer_rotation", "user_rotation"]) {
+      commands.push(rotation[key] === "null" ? ["settings", "delete", "system", key] : ["settings", "put", "system", key, rotation[key]]);
+    }
+  }
+  if (uimode)
+    commands.push(["cmd", "uimode", "night", uimode]);
+  return commands;
+}
+async function runAll(session, commands) {
+  let failed = false;
+  for (const argv of commands) {
+    const res = await session.run(shellCommand(argv));
+    if (!res.success || res.data.exitCode !== 0)
+      failed = true;
+  }
+  return failed;
+}
 async function createSettingsGuard(deps) {
   const { session, serial, sdk, state, log } = deps;
   let rotation = deps.pending.rotation;
@@ -2142,22 +2180,10 @@ async function createSettingsGuard(deps) {
       return { success: true, data: undefined };
     },
     async restore() {
-      const commands = [];
-      if (rotation) {
-        for (const key of ["accelerometer_rotation", "user_rotation"]) {
-          commands.push(rotation[key] === "null" ? ["settings", "delete", "system", key] : ["settings", "put", "system", key, rotation[key]]);
-        }
-      }
-      if (uimode)
-        commands.push(["cmd", "uimode", "night", uimode]);
+      const commands = restoreCommands(rotation, uimode);
       if (commands.length === 0)
         return;
-      let failed = false;
-      for (const argv of commands) {
-        const res = await session.run(shellCommand(argv));
-        if (!res.success || res.data.exitCode !== 0)
-          failed = true;
-      }
+      const failed = await runAll(session, commands);
       if (failed) {
         log?.("could not restore the rotation / night mode; the next driver on this device will");
         return;
@@ -2487,63 +2513,50 @@ function createAndroidCamera(deps) {
     const staged = [];
     const mode = {};
     for (const facing of CAMERA_FACINGS) {
-      const feed = feeds[facing];
-      const png = join5(dir, `${facing}.png`);
-      const tmpPng = join5(dir, `.${facing}.png.tmp-${process.pid}`);
-      if (feed === undefined || feed.kind === "video") {
-        staged.push({ tmp: tmpPng, final: png });
-        writeFileSync3(tmpPng, PLACEHOLDER_PNG);
-      }
-      if (feed === undefined)
-        continue;
-      const sniffed = sniffCameraMedia(feed.path);
-      if (!sniffed.success)
-        return driverErr("E_BAD_REQUEST", sniffed.error.message);
-      if (sniffed.data.kind !== feed.kind) {
-        return driverErr("E_BAD_REQUEST", `${feed.path} is ${sniffed.data.kind} media, not a ${feed.kind} feed`);
-      }
-      if (feed.kind === "video") {
-        const name = `${facing}${extname(feed.path).toLowerCase() || ".mp4"}`;
-        const tmp = join5(dir, `.${name}.tmp-${process.pid}`);
-        copyFileSync(feed.path, tmp);
-        staged.push({ tmp, final: join5(dir, name) });
-        mode[facing] = name;
-        continue;
-      }
-      staged.push({ tmp: tmpPng, final: png });
-      if (sniffed.data.ext === "png") {
-        copyFileSync(feed.path, tmpPng);
-        continue;
-      }
-      const converted = await reencode(feed.path, tmpPng);
-      if (!converted.success)
-        return converted;
+      const failed = await prepareFacing(facing, feeds[facing], staged, mode);
+      if (failed)
+        return failed;
     }
     return { success: true, data: { staged, mode } };
   }
+  async function prepareFacing(facing, feed, staged, mode) {
+    const png = join5(dir, `${facing}.png`);
+    const tmpPng = join5(dir, `.${facing}.png.tmp-${process.pid}`);
+    if (feed === undefined || feed.kind === "video") {
+      staged.push({ tmp: tmpPng, final: png });
+      writeFileSync3(tmpPng, PLACEHOLDER_PNG);
+    }
+    if (feed === undefined)
+      return;
+    const sniffed = sniffCameraMedia(feed.path);
+    if (!sniffed.success)
+      return driverErr("E_BAD_REQUEST", sniffed.error.message);
+    if (sniffed.data.kind !== feed.kind) {
+      return driverErr("E_BAD_REQUEST", `${feed.path} is ${sniffed.data.kind} media, not a ${feed.kind} feed`);
+    }
+    if (feed.kind === "video")
+      return stageVideo(facing, feed.path, staged, mode);
+    staged.push({ tmp: tmpPng, final: png });
+    if (sniffed.data.ext === "png") {
+      copyFileSync(feed.path, tmpPng);
+      return;
+    }
+    const converted = await reencode(feed.path, tmpPng);
+    return converted.success ? undefined : converted;
+  }
+  function stageVideo(facing, path, staged, mode) {
+    const name = `${facing}${extname(path).toLowerCase() || ".mp4"}`;
+    const tmp = join5(dir, `.${name}.tmp-${process.pid}`);
+    copyFileSync(path, tmp);
+    staged.push({ tmp, final: join5(dir, name) });
+    mode[facing] = name;
+    return;
+  }
   function discard(staged) {
     for (const { tmp } of staged)
       rmSync3(tmp, { force: true });
   }
-  return async (op) => {
-    const profile = deps.profile();
-    if (profile === undefined || !splitCameraProfile(profile).camera) {
-      return driverErr("E_CAMERA_DEVICE", `${deps.serial} is not a camera emulator: its camera source is fixed when it launches, so claim it with --camera (profile \`camera: true\`)`);
-    }
-    const feeds = op ?? {};
-    const before = readCameraMode(dir);
-    let prepared;
-    try {
-      mkdirSync4(dir, { recursive: true });
-      prepared = await prepare(feeds);
-    } catch (error) {
-      return driverErr("E_IO", `camera feed: ${message(error)}`);
-    }
-    if (!prepared.success) {
-      rmTemps(dir);
-      return prepared;
-    }
-    const { staged, mode } = prepared.data;
+  function commit(before, staged, mode) {
     try {
       for (const { tmp, final } of staged)
         renameSync3(tmp, final);
@@ -2553,19 +2566,48 @@ function createAndroidCamera(deps) {
           rmSync3(join5(dir, old), { force: true });
       }
       writeCameraMode(dir, mode);
+      return;
     } catch (error) {
       discard(staged);
       return driverErr("E_IO", `camera feed: ${message(error)}`);
     }
+  }
+  async function prepareGuarded(feeds) {
+    try {
+      mkdirSync4(dir, { recursive: true });
+      return await prepare(feeds);
+    } catch (error) {
+      return driverErr("E_IO", `camera feed: ${message(error)}`);
+    }
+  }
+  async function relaunchForMode(before, mode) {
+    const restarted = await deps.relaunch();
+    if (restarted.success)
+      return;
+    return driverErr("E_NOT_BOOTED", `restarting ${deps.serial} to switch its camera between ${usesVideo(before) ? "video" : "image"} and ${usesVideo(mode) ? "video" : "image"} failed: ${restarted.error}`);
+  }
+  return async (op) => {
+    const profile = deps.profile();
+    if (profile === undefined || !splitCameraProfile(profile).camera) {
+      return driverErr("E_CAMERA_DEVICE", `${deps.serial} is not a camera emulator: its camera source is fixed when it launches, so claim it with --camera (profile \`camera: true\`)`);
+    }
+    const feeds = op ?? {};
+    const before = readCameraMode(dir);
+    const prepared = await prepareGuarded(feeds);
+    if (!prepared.success) {
+      rmTemps(dir);
+      return prepared;
+    }
+    const { staged, mode } = prepared.data;
+    const committed = commit(before, staged, mode);
+    if (committed)
+      return committed;
     deps.record?.(feeds);
     const state = { feeds };
     if (sameCameraMode(before, mode))
       return { success: true, data: { ...state, appliesOnCameraOpen: true, rebooted: false } };
-    const restarted = await deps.relaunch();
-    if (!restarted.success) {
-      return driverErr("E_NOT_BOOTED", `restarting ${deps.serial} to switch its camera between ${usesVideo(before) ? "video" : "image"} and ${usesVideo(mode) ? "video" : "image"} failed: ${restarted.error}`);
-    }
-    return { success: true, data: { ...state, rebooted: true } };
+    const restarted = await relaunchForMode(before, mode);
+    return restarted ?? { success: true, data: { ...state, rebooted: true } };
   };
 }
 function rmTemps(dir) {
@@ -3911,67 +3953,84 @@ var SWITCHES = [
   ["highContrastText", "secure", "high_text_contrast_enabled"],
   ["colorInversion", "secure", "accessibility_display_inversion_enabled"]
 ];
+var stepFontScale = async (c, op, run) => {
+  if (op !== null && op.textSize === undefined)
+    return;
+  const font = fontScaleOf(op?.textSize);
+  if ("success" in font)
+    return font;
+  run.notes = font.notes;
+  const done = await c.putSetting("system", "font_scale", String(font.scale));
+  if (!done.success)
+    return done;
+  run.applied.push("textSize");
+  return;
+};
+var stepBoldText = async (c, op, run) => {
+  if (op !== null && op.boldText === undefined)
+    return;
+  const done = await c.putSetting("secure", "font_weight_adjustment", String(op?.boldText === true ? BOLD_TEXT_ADJUSTMENT : 0));
+  if (!done.success)
+    return done;
+  run.applied.push("boldText");
+  return;
+};
+var stepSwitches = async (c, op, run) => {
+  for (const [field, table, key] of SWITCHES) {
+    if (op !== null && op[field] === undefined)
+      continue;
+    const done = await c.putSetting(table, key, op?.[field] === true ? "1" : "0");
+    if (!done.success)
+      return done;
+    if (op !== null)
+      run.applied.push(field);
+  }
+  return;
+};
+var stepReduceMotion = async (c, op, run) => {
+  if (op !== null && op.reduceMotion === undefined)
+    return;
+  const done = await c.putSetting("global", "transition_animation_scale", op?.reduceMotion === true ? "0" : transitionOff(c));
+  if (!done.success)
+    return done;
+  if (op !== null)
+    run.applied.push("reduceMotion");
+  return;
+};
+var stepScreenReader = async (c, op, run) => {
+  if (op !== null && op.screenReader === undefined)
+    return;
+  const done = await (op?.screenReader === true ? c.talkback.enable() : c.talkback.disable());
+  if (!done.success)
+    return done;
+  if (op !== null) {
+    run.screenReader = done.data;
+    run.applied.push("screenReader");
+    run.screenReaderPrevious = c.talkback.previous();
+  }
+  return;
+};
+var A11Y_STEPS = [stepFontScale, stepBoldText, stepSwitches, stepReduceMotion, stepScreenReader];
 function a11yOp(c) {
   return async (op) => {
-    const applied = [];
-    const skipped = [];
-    let notes = [];
-    if (op === null || op.textSize !== undefined) {
-      const font = fontScaleOf(op?.textSize);
-      if ("success" in font)
-        return font;
-      notes = font.notes;
-      const done = await c.putSetting("system", "font_scale", String(font.scale));
-      if (!done.success)
-        return done;
-      applied.push("textSize");
-    }
-    if (op === null || op.boldText !== undefined) {
-      const done = await c.putSetting("secure", "font_weight_adjustment", String(op?.boldText === true ? BOLD_TEXT_ADJUSTMENT : 0));
-      if (!done.success)
-        return done;
-      applied.push("boldText");
-    }
-    for (const [field, table, key] of SWITCHES) {
-      if (op === null || op[field] !== undefined) {
-        const done = await c.putSetting(table, key, op?.[field] === true ? "1" : "0");
-        if (!done.success)
-          return done;
-        if (op !== null)
-          applied.push(field);
-      }
-    }
-    if (op === null || op.reduceMotion !== undefined) {
-      const done = await c.putSetting("global", "transition_animation_scale", op?.reduceMotion === true ? "0" : transitionOff(c));
-      if (!done.success)
-        return done;
-      if (op !== null)
-        applied.push("reduceMotion");
-    }
-    let screenReader;
-    let screenReaderPrevious;
-    if (op === null || op.screenReader !== undefined) {
-      const done = await (op?.screenReader === true ? c.talkback.enable() : c.talkback.disable());
-      if (!done.success)
-        return done;
-      if (op !== null) {
-        screenReader = done.data;
-        applied.push("screenReader");
-        screenReaderPrevious = c.talkback.previous();
-      }
+    const run = { applied: [], notes: [] };
+    for (const step of A11Y_STEPS) {
+      const failed = await step(c, op, run);
+      if (failed)
+        return failed;
     }
-    skipped.push(...a11ySkips(op));
-    if (applied.length === 0 && skipped.length > 0) {
+    const skipped = a11ySkips(op);
+    if (run.applied.length === 0 && skipped.length > 0) {
       return unsupported(skipped.map((s) => ({ name: s.setting, reason: s.reason })));
     }
     return {
       success: true,
       data: {
-        applied,
+        applied: run.applied,
         skipped,
-        notes,
-        ...screenReader === undefined ? {} : { screenReader },
-        ...screenReaderPrevious === undefined ? {} : { screenReaderPrevious }
+        notes: run.notes,
+        ...run.screenReader === undefined ? {} : { screenReader: run.screenReader },
+        ...run.screenReaderPrevious === undefined ? {} : { screenReaderPrevious: run.screenReaderPrevious }
       }
     };
   };
@@ -3982,6 +4041,14 @@ function batteryRequestProblem(op) {
     return bad;
   return batteryArgvs(op).length === 0 ? driverErr("E_BAD_REQUEST", "battery needs a level, charging, or both") : undefined;
 }
+async function applyBattery(c, op) {
+  for (const cmd of batteryArgvs(op)) {
+    const done = await c.must(cmd);
+    if (!done.success)
+      return done;
+  }
+  return;
+}
 function batteryOp(c) {
   return async (op) => {
     if (!c.serial.startsWith("emulator-")) {
@@ -3994,11 +4061,9 @@ function batteryOp(c) {
     const bad = batteryRequestProblem(op);
     if (bad)
       return bad;
-    for (const cmd of batteryArgvs(op)) {
-      const done = await c.must(cmd);
-      if (!done.success)
-        return done;
-    }
+    const failed = await applyBattery(c, op);
+    if (failed)
+      return failed;
     return {
       success: true,
       data: {
@@ -5156,21 +5221,25 @@ function createUiadOps(deps) {
     await backend.failed(error);
     return neverSent(error) && canRetry ? "retry" : "surface";
   }
+  async function attemptCall(op, use, idempotent, surfaceRefusals, canRetry) {
+    const server = await backend.server();
+    if (server === undefined)
+      return { retry: false, outcome: undefined };
+    const res = await use(server);
+    if (res.success)
+      return { retry: false, outcome: res };
+    if (surfaceRefusals && REFUSALS.has(res.error.code))
+      return { retry: false, outcome: res };
+    const verdict = await judge(op, res.error, canRetry);
+    if (verdict === "retry")
+      return { retry: true };
+    return { retry: false, outcome: verdict === "surface" && !idempotent ? res : undefined };
+  }
   async function call(op, use, idempotent, surfaceRefusals = false) {
     for (let attempt = 0;attempt < 2; attempt++) {
-      const server = await backend.server();
-      if (server === undefined)
-        return;
-      const res = await use(server);
-      if (res.success)
-        return res;
-      if (surfaceRefusals && REFUSALS.has(res.error.code))
-        return res;
-      const verdict = await judge(op, res.error, attempt === 0);
-      if (verdict === "surface" && !idempotent)
-        return res;
-      if (verdict !== "retry")
-        return;
+      const tried = await attemptCall(op, use, idempotent, surfaceRefusals, attempt === 0);
+      if (!tried.retry)
+        return tried.outcome;
     }
     return;
   }
@@ -5336,6 +5405,27 @@ function elementAt(flat, point) {
   const deepest = (list) => list.reduce((best, e) => best === undefined || e.depth >= best.depth ? e : best, undefined);
   return deepest(inside.filter((e) => e.hittable)) ?? deepest(inside) ?? null;
 }
+async function bootAndProbe(options, session, clock) {
+  const { serial, log } = options;
+  const booted = await waitForBoot(session, serial, clock, {
+    ...options.bootTimeoutMs !== undefined ? { timeoutMs: options.bootTimeoutMs } : {},
+    ...log ? { log } : {}
+  });
+  if (!booted.success)
+    return booted;
+  const sdk = booted.data.sdk;
+  const phone = booted.data.physical;
+  if (phone) {
+    const awake = await preparePhone(session, clock, phone, log);
+    if (!awake.success)
+      return awake;
+  }
+  const probed = options.screen ?? booted.data.screen;
+  const screen = probed ? { success: true, data: probed } : await readScreen(session, serial);
+  if (!screen.success)
+    return screen;
+  return { success: true, data: { sdk, phone, screen: screen.data } };
+}
 async function openAndroidDriver(options) {
   const { serial, adb, log } = options;
   const clock = options.clock ?? realClock;
@@ -5351,23 +5441,10 @@ async function openAndroidDriver(options) {
     return { success: false, error };
   };
   const savedState = options.state?.read(serial);
-  const booted = await waitForBoot(session, serial, clock, {
-    ...options.bootTimeoutMs !== undefined ? { timeoutMs: options.bootTimeoutMs } : {},
-    ...log ? { log } : {}
-  });
-  if (!booted.success)
-    return failed(booted.error);
-  const sdk = booted.data.sdk;
-  const phone = booted.data.physical;
-  if (phone) {
-    const awake = await preparePhone(session, clock, phone, log);
-    if (!awake.success)
-      return failed(awake.error);
-  }
-  const probed = options.screen ?? booted.data.screen;
-  const screen = probed ? { success: true, data: probed } : await readScreen(session, serial);
-  if (!screen.success)
-    return failed(screen.error);
+  const probed = await bootAndProbe(options, session, clock);
+  if (!probed.success)
+    return failed(probed.error);
+  const { sdk, phone, screen } = probed.data;
   const saved = forSdk(await savedState ?? {}, sdk);
   const animations = await disableAnimations({
     session,
@@ -5387,7 +5464,7 @@ async function openAndroidDriver(options) {
   }) : undefined;
   return {
     success: true,
-    data: buildDriver(options, session, screen.data, clock, execBinary, {
+    data: buildDriver(options, session, screen, clock, execBinary, {
       sdk,
       savedRoute: saved.dumpRoute,
       savedUiadUnsupported: saved.uiadUnsupported,
@@ -5425,12 +5502,72 @@ function openUiad(input) {
     atf: () => ensureAtfJar({ session, adb, serial, ...log ? { log } : {} })
   });
 }
-function buildDriver(options, session, baseScreen, clock, execBinary, facts) {
+async function dumpWithRetry(dumper, clock, log) {
+  let dumped = await dumper.dump();
+  for (let attempt = 1;attempt < SNAPSHOT_ATTEMPTS2 && !dumped.success && dumped.error.code === "E_AX_UNAVAILABLE"; attempt++) {
+    log?.(`uiautomator unavailable, retrying (${attempt}/${SNAPSHOT_ATTEMPTS2 - 1})`);
+    await clock.sleep(SNAPSHOT_RETRY_MS2);
+    dumped = await dumper.dump();
+  }
+  return dumped;
+}
+function parseDump(xml, baseScreen, clock) {
+  const rotation = hierarchyRotation(xml);
+  const screen = rotatedScreen(baseScreen, rotation);
+  let parsed;
+  try {
+    parsed = parseUiautomatorXml(xml, screen);
+  } catch (error) {
+    if (error instanceof UiautomatorParseError)
+      return driverErr("E_AX_UNAVAILABLE", error.message);
+    throw error;
+  }
+  return {
+    success: true,
+    data: {
+      platform: "android",
+      backend: "uiautomator",
+      takenAt: clock.now(),
+      screen,
+      ...parsed,
+      truncated: false
+    }
+  };
+}
+async function touchSensor(exec, adb, serial, fingerId) {
+  const touched = await exec(emuFingerTouchArgv(adb, serial, fingerId), { timeoutMs: 1e4 });
+  if (touched.exitCode === 0 && !/^KO\b/m.test(touched.stdout))
+    return { success: true, data: undefined };
+  return driverErr("E_IO", `adb emu finger touch failed: ${`${touched.stdout}${touched.stderr}`.trim().slice(0, 200)}`);
+}
+function biometricsOp(session, exec, adb, serial) {
+  return async (op) => {
+    if (!isEmulatorSerial2(serial)) {
+      return driverErr("E_UNSUPPORTED", `biometrics need an emulator, not the physical device ${serial}`);
+    }
+    if (op === "enroll" || op === "unenroll") {
+      return driverErr("E_UNSUPPORTED", `Android fingerprint enrollment comes from the golden snapshot (profile \`biometrics: true\`); \`${op}\` is not available at run time`);
+    }
+    if (op !== "status") {
+      const touched = await touchSensor(exec, adb, serial, op === "match" ? 1 : UNENROLLED_FINGER_ID);
+      if (!touched.success)
+        return touched;
+    }
+    const dump = await runChecked(session, shellCommand(dumpsysFingerprintArgv()), "E_UNSUPPORTED");
+    if (!dump.success)
+      return dump;
+    const state = { enrolled: parseFingerprintEnrolled(dump.data), modality: "fingerprint" };
+    return { success: true, data: state };
+  };
+}
+function capabilitiesOf(serverOn, shellPointers) {
+  return serverOn ? { ...CAPABILITIES, pinch: true, maxPointers: 2, unicodeText: true, nativeSettle: true } : { ...CAPABILITIES, maxPointers: shellPointers };
+}
+function openDumper(options, session, facts, saving) {
   const { serial, adb, exec, log } = options;
   const { sdk } = facts;
   const initialRoute = options.dumpRoute ?? facts.savedRoute;
-  const saving = [];
-  const dumper = createDumper({
+  return createDumper({
     session,
     exec,
     adb,
@@ -5444,40 +5581,19 @@ function buildDriver(options, session, baseScreen, clock, execBinary, facts) {
         saving.push(options.state.update(serial, patchFor(sdk, { dumpRoute: route })));
     }
   });
+}
+function buildDriver(options, session, baseScreen, clock, execBinary, facts) {
+  const { serial, adb, exec, log } = options;
+  const { sdk } = facts;
+  const saving = [];
+  const dumper = openDumper(options, session, facts, saving);
   const uiad = openUiad({ options, session, baseScreen, clock, facts, saving });
-  async function dumpWithRetry() {
-    let dumped = await dumper.dump();
-    for (let attempt = 1;attempt < SNAPSHOT_ATTEMPTS2 && !dumped.success && dumped.error.code === "E_AX_UNAVAILABLE"; attempt++) {
-      log?.(`uiautomator unavailable, retrying (${attempt}/${SNAPSHOT_ATTEMPTS2 - 1})`);
-      await clock.sleep(SNAPSHOT_RETRY_MS2);
-      dumped = await dumper.dump();
-    }
-    return dumped;
-  }
   async function dumpSnapshot() {
     noteSpanDetail("backend", "dump");
-    const dumped = await dumpWithRetry();
+    const dumped = await dumpWithRetry(dumper, clock, log);
     if (!dumped.success)
       return dumped;
-    let parsed;
-    const rotation = hierarchyRotation(dumped.data.xml);
-    const screen = rotatedScreen(baseScreen, rotation);
-    try {
-      parsed = parseUiautomatorXml(dumped.data.xml, screen);
-    } catch (error) {
-      if (error instanceof UiautomatorParseError)
-        return driverErr("E_AX_UNAVAILABLE", error.message);
-      throw error;
-    }
-    const taken = {
-      platform: "android",
-      backend: "uiautomator",
-      takenAt: clock.now(),
-      screen,
-      ...parsed,
-      truncated: false
-    };
-    return { success: true, data: taken };
+    return parseDump(dumped.data.xml, baseScreen, clock);
   }
   async function takeSnapshot() {
     return await uiad?.snapshot() ?? dumpSnapshot();
@@ -5613,18 +5729,20 @@ function buildDriver(options, session, baseScreen, clock, execBinary, facts) {
     }
     return { success: true, data: { path: opts.path } };
   };
-  const orientation = async (set) => {
-    if (set) {
-      const saved = await facts.settings?.beforeRotate();
-      if (saved && !saved.success)
-        return saved;
-      for (const argv of rotationArgvs(orientationToRotation(set))) {
-        const res = await input(shellCommand(argv));
-        if (!res.success)
-          return res;
-      }
-      return { success: true, data: set };
+  const setOrientation = async (set) => {
+    const saved = await facts.settings?.beforeRotate();
+    if (saved && !saved.success)
+      return saved;
+    for (const argv of rotationArgvs(orientationToRotation(set))) {
+      const res = await input(shellCommand(argv));
+      if (!res.success)
+        return res;
     }
+    return { success: true, data: set };
+  };
+  const orientation = async (set) => {
+    if (set)
+      return setOrientation(set);
     const res = await session.run(shellCommand(userRotationArgv()));
     if (!res.success)
       return res;
@@ -5774,30 +5892,7 @@ function buildDriver(options, session, baseScreen, clock, execBinary, facts) {
     });
     return unit;
   };
-  const touchSensor = async (fingerId) => {
-    const touched = await options.exec(emuFingerTouchArgv(adb, serial, fingerId), { timeoutMs: 1e4 });
-    if (touched.exitCode === 0 && !/^KO\b/m.test(touched.stdout))
-      return { success: true, data: undefined };
-    return driverErr("E_IO", `adb emu finger touch failed: ${`${touched.stdout}${touched.stderr}`.trim().slice(0, 200)}`);
-  };
-  const biometrics = async (op) => {
-    if (!isEmulatorSerial2(serial)) {
-      return driverErr("E_UNSUPPORTED", `biometrics need an emulator, not the physical device ${serial}`);
-    }
-    if (op === "enroll" || op === "unenroll") {
-      return driverErr("E_UNSUPPORTED", `Android fingerprint enrollment comes from the golden snapshot (profile \`biometrics: true\`); \`${op}\` is not available at run time`);
-    }
-    if (op !== "status") {
-      const touched = await touchSensor(op === "match" ? 1 : UNENROLLED_FINGER_ID);
-      if (!touched.success)
-        return touched;
-    }
-    const dump = await runChecked(session, shellCommand(dumpsysFingerprintArgv()), "E_UNSUPPORTED");
-    if (!dump.success)
-      return dump;
-    const state = { enrolled: parseFingerprintEnrolled(dump.data), modality: "fingerprint" };
-    return { success: true, data: state };
-  };
+  const biometrics = biometricsOp(session, options.exec, adb, serial);
   const clipboard = async () => driverErr("E_UNSUPPORTED", "Android has no public shell clipboard access; type ASCII with typeText");
   const health = async () => {
     const [release, sdk, model] = await Promise.all(["ro.build.version.release", "ro.build.version.sdk", "ro.product.model"].map((k) => session.run(shellCommand(getpropArgv(k)))));
@@ -5816,7 +5911,7 @@ function buildDriver(options, session, baseScreen, clock, execBinary, facts) {
     platform: "android",
     id: serial,
     get capabilities() {
-      return uiad?.enabled() ? { ...CAPABILITIES, pinch: true, maxPointers: 2, unicodeText: true, nativeSettle: true } : { ...CAPABILITIES, maxPointers: maxPointers() };
+      return capabilitiesOf(uiad?.enabled() === true, maxPointers());
     },
     health,
     snapshot,
@@ -5832,8 +5927,10 @@ function buildDriver(options, session, baseScreen, clock, execBinary, facts) {
     key,
     pressKeyRepeat,
     ...uiad !== undefined || sdk !== undefined && sdk >= SELECT_ALL_MIN_SDK ? { selectAll } : {},
-    ...uiad !== undefined ? { setText, a11yEvents, ...screenReader } : {},
     ...uiad !== undefined ? {
+      setText,
+      a11yEvents,
+      ...screenReader,
       auditNatively: (opts) => atfAudit({ run: (o) => uiad.audit(o) }, opts?.contrast === undefined ? {} : { contrast: opts.contrast })
     } : {},
     pressButton,
@@ -6382,18 +6479,27 @@ function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var optionalString = (value) => typeof value === "string" && value !== "" ? value : undefined;
+function readFrame(frame) {
+  if (!Array.isArray(frame) || frame.length !== 4 || !frame.every((n) => typeof n === "number"))
+    return;
+  return frame;
+}
+function actionsValid(actions) {
+  return actions === undefined || Array.isArray(actions) && actions.every((a) => typeof a === "string");
+}
+function traitsValid(traits) {
+  return typeof traits === "string" && /^0x[0-9a-f]+$/i.test(traits);
+}
 function readNode2(value) {
   if (!isRecord4(value) || typeof value.ae !== "boolean" || typeof value.cls !== "string")
     return;
-  const { frame, traits, actions } = value;
-  if (!Array.isArray(frame) || frame.length !== 4 || !frame.every((n) => typeof n === "number"))
-    return;
-  if (typeof traits !== "string" || !/^0x[0-9a-f]+$/i.test(traits))
+  const { traits, actions } = value;
+  const box = readFrame(value.frame);
+  if (!box)
     return;
-  if (actions !== undefined && (!Array.isArray(actions) || !actions.every((a) => typeof a === "string"))) {
+  if (!traitsValid(traits) || !actionsValid(actions))
     return;
-  }
-  const [x, y, width, height] = frame;
+  const [x, y, width, height] = box;
   const label = optionalString(value.label);
   const hint = optionalString(value.hint);
   const text = optionalString(value.value);
@@ -7389,6 +7495,79 @@ function withStagedSettings(requested, settings) {
     args: [...requested?.args ?? [], ...args]
   };
 }
+var NOTHING_APPLIED = { ok: true, applied: [] };
+async function a11yTextSizeStep(run, udid, op) {
+  const size = op === null ? undefined : op.textSize;
+  if (op !== null && size === undefined)
+    return NOTHING_APPLIED;
+  const resolved = op === null ? undefined : resolveTextSize(size);
+  if (resolved && !resolved.success)
+    return { ok: false, failure: driverErr("E_BAD_REQUEST", resolved.error) };
+  const done = await run(contentSizeArgv(udid, resolved ? resolved.data.category : DEFAULT_CONTENT_SIZE));
+  return done.success ? { ok: true, applied: ["textSize"] } : { ok: false, failure: done };
+}
+async function a11yContrastStep(run, udid, op) {
+  if (op !== null && op.contrast === undefined)
+    return NOTHING_APPLIED;
+  const done = await run(contrastArgv(udid, op?.contrast === "increased"));
+  return done.success ? { ok: true, applied: ["contrast"] } : { ok: false, failure: done };
+}
+async function a11yDefaultsStep(run, udid, op) {
+  if (op === null) {
+    for (const argv of iosDefaultsDeleteArgvs(udid, IOS_DEFAULTS_FIELDS)) {
+      const done = await run(argv, false, iosDefaultsMissing);
+      if (!done.success)
+        return { ok: false, failure: done };
+    }
+    return NOTHING_APPLIED;
+  }
+  const entries = IOS_DEFAULTS_FIELDS.flatMap((field) => {
+    const on = op[field];
+    return on === undefined ? [] : [[field, on]];
+  });
+  for (const argv of iosDefaultsWriteArgvs(udid, entries)) {
+    const done = await run(argv);
+    if (!done.success)
+      return { ok: false, failure: done };
+  }
+  return { ok: true, applied: entries.map(([field]) => field) };
+}
+function a11ySkipped(op) {
+  const skipped = [];
+  for (const setting of ["highContrastText", "colorInversion"]) {
+    if (op?.[setting] !== undefined)
+      skipped.push({ setting, reason: "Android only" });
+  }
+  return skipped;
+}
+function a11yScreenReader(op) {
+  if (op?.screenReader === undefined)
+    return;
+  return op.screenReader ? { mode: "simulated", engine: "voiceover" } : { mode: "off" };
+}
+async function batteryClear(run, udid) {
+  const done = await run(statusBarClearArgv(udid));
+  return done.success ? { success: true, data: { cosmetic: true } } : done;
+}
+async function batteryOverride(run, udid, op) {
+  const bad = badRequest(batteryProblem(op.level));
+  if (bad)
+    return bad;
+  if (op.level === undefined && op.charging === undefined) {
+    return driverErr("E_BAD_REQUEST", "battery needs a level, charging, or both");
+  }
+  const done = await run(statusBarBatteryArgv(udid, op));
+  if (!done.success)
+    return done;
+  return {
+    success: true,
+    data: {
+      ...op.level === undefined ? {} : { level: op.level },
+      ...op.charging === undefined ? {} : { charging: op.charging },
+      cosmetic: true
+    }
+  };
+}
 function createIosSettings(deps) {
   const { udid, exec } = deps;
   let memoryStaged = {};
@@ -7467,76 +7646,25 @@ function createIosSettings(deps) {
     },
     async a11y(op) {
       const applied = [];
-      const skipped = [];
-      const size = op === null ? undefined : op.textSize;
-      if (op === null || size !== undefined) {
-        const resolved = op === null ? undefined : resolveTextSize(size);
-        if (resolved && !resolved.success)
-          return driverErr("E_BAD_REQUEST", resolved.error);
-        const done = await simctl(contentSizeArgv(udid, resolved ? resolved.data.category : DEFAULT_CONTENT_SIZE));
-        if (!done.success)
-          return done;
-        applied.push("textSize");
-      }
-      if (op === null || op.contrast !== undefined) {
-        const done = await simctl(contrastArgv(udid, op?.contrast === "increased"));
-        if (!done.success)
-          return done;
-        applied.push("contrast");
-      }
-      if (op === null) {
-        for (const argv of iosDefaultsDeleteArgvs(udid, IOS_DEFAULTS_FIELDS)) {
-          const done = await simctl(argv, false, iosDefaultsMissing);
-          if (!done.success)
-            return done;
-        }
-      } else {
-        const entries = IOS_DEFAULTS_FIELDS.flatMap((field) => {
-          const on = op[field];
-          return on === undefined ? [] : [[field, on]];
-        });
-        for (const argv of iosDefaultsWriteArgvs(udid, entries)) {
-          const done = await simctl(argv);
-          if (!done.success)
-            return done;
-        }
-        applied.push(...entries.map(([field]) => field));
-      }
-      for (const setting of ["highContrastText", "colorInversion"]) {
-        if (op?.[setting] !== undefined)
-          skipped.push({ setting, reason: "Android only" });
+      const steps = [a11yTextSizeStep, a11yContrastStep, a11yDefaultsStep];
+      for (const step of steps) {
+        const outcome = await step(simctl, udid, op);
+        if (!outcome.ok)
+          return outcome.failure;
+        applied.push(...outcome.applied);
       }
+      const skipped = a11ySkipped(op);
       if (applied.length === 0 && skipped.length > 0) {
         return driverErr("E_UNSUPPORTED", skipped.map((s) => `${s.setting}: ${s.reason}`).join("; "));
       }
-      const screenReader = op?.screenReader === undefined ? undefined : op.screenReader ? { mode: "simulated", engine: "voiceover" } : { mode: "off" };
+      const screenReader = a11yScreenReader(op);
       return {
         success: true,
         data: { applied, skipped, notes: [], ...screenReader ? { screenReader } : {} }
       };
     },
     async battery(op) {
-      if (op === null) {
-        const done = await simctl(statusBarClearArgv(udid));
-        return done.success ? { success: true, data: { cosmetic: true } } : done;
-      }
-      const bad = badRequest(batteryProblem(op.level));
-      if (bad)
-        return bad;
-      if (op.level === undefined && op.charging === undefined) {
-        return driverErr("E_BAD_REQUEST", "battery needs a level, charging, or both");
-      }
-      const done = await simctl(statusBarBatteryArgv(udid, op));
-      if (!done.success)
-        return done;
-      return {
-        success: true,
-        data: {
-          ...op.level === undefined ? {} : { level: op.level },
-          ...op.charging === undefined ? {} : { charging: op.charging },
-          cosmetic: true
-        }
-      };
+      return op === null ? batteryClear(simctl, udid) : batteryOverride(simctl, udid, op);
     },
     async memoryWarning() {
       return driverErr("E_UNSUPPORTED", "no way to deliver a memory warning to an iOS app was found: `notifyutil -p com.apple.system.lowmemory` is accepted but a UIKit app never receives UIApplicationDidReceiveMemoryWarning (verified); use Simulator > Debug > Simulate Memory Warning by hand");
@@ -8609,6 +8737,19 @@ function createIosDriver(swap, simctl, opts) {
       throw error;
     }
   }
+  async function settleAfterLaunch(bundleId) {
+    lastLaunched = bundleId;
+    launchedBundle = bundleId;
+    if (await rebind(bundleId))
+      launchedBundle = undefined;
+    const loaded = await net?.confirmLoaded();
+    if (loaded && !loaded.success)
+      return loaded.error;
+    const a11yLoaded = await a11y?.confirmLoaded();
+    if (a11yLoaded && !a11yLoaded.success)
+      return a11yLoaded.error;
+    return;
+  }
   async function rebind(bundleId) {
     if (rebindUnsupported || settleUnsupported)
       return false;
@@ -8814,19 +8955,10 @@ function createIosDriver(swap, simctl, opts) {
         const o = withEnv.data;
         const viaHelper = await appOp("launch", params({ bundleId, args: o?.args && [...o.args], env: o?.env, terminateRunning: o?.relaunch !== false }), LAUNCH_TIMEOUT_MS);
         const launched = await appOutcome(viaHelper, () => simctl.launch(bundleId, o), (data) => noteSpanDetail("pid", data.pid));
-        if (launched.success) {
-          lastLaunched = bundleId;
-          launchedBundle = bundleId;
-          if (await rebind(bundleId))
-            launchedBundle = undefined;
-          const loaded = await net?.confirmLoaded();
-          if (loaded && !loaded.success)
-            return loaded;
-          const a11yLoaded = await a11y?.confirmLoaded();
-          if (a11yLoaded && !a11yLoaded.success)
-            return a11yLoaded;
-        }
-        return launched;
+        if (!launched.success)
+          return launched;
+        const unconfirmed = await settleAfterLaunch(bundleId);
+        return unconfirmed ? { success: false, error: unconfirmed } : launched;
       },
       terminate: async (bundleId) => {
         const viaHelper = await appOp("terminate", { bundleId }, APP_OP_TIMEOUT_MS);
@@ -8892,6 +9024,33 @@ async function connect(o, log) {
     ...timeoutOption(o)
   });
 }
+function nativeAuditFor(o, exec, log, ctx) {
+  return createIosNativeAudit({
+    udid: o.udid,
+    exec,
+    bundleId: () => o.bundleId ?? ctx.lastBundle(),
+    ...o.wardenHome ? { wardenHome: o.wardenHome } : {},
+    ...o.version ? { version: o.version } : {},
+    ...o.runnerSources ? { runnerSources: o.runnerSources } : {},
+    ...o.nativeAudit ?? {},
+    ...o.debug ? { log } : {}
+  });
+}
+function settingsFor(o, exec, ctx) {
+  return createIosSettings({
+    udid: o.udid,
+    exec,
+    lastBundle: ctx.lastBundle,
+    ...o.bundleId ? { defaultBundle: o.bundleId } : {},
+    staged: o.stagedSettings ?? stagedSettingsFor(o.wardenHome ?? wardenHome(), o.udid)
+  });
+}
+function helperPreflight(o) {
+  if (o.client || (o.socketPath ?? o.env?.simdSocket))
+    return;
+  const helper = resolveHelper(o);
+  return helper.success ? undefined : helper;
+}
 async function openIosDriver(o) {
   const log = o.log ?? (() => {
     return;
@@ -8899,11 +9058,9 @@ async function openIosDriver(o) {
   const now = o.now ?? Date.now;
   const exec = o.debug ? timedExec(o.exec, log, now) : o.exec;
   const simctl = createSimctl({ udid: o.udid, exec, ...o.devicesRoot ? { devicesRoot: o.devicesRoot } : {} });
-  if (!o.client && !(o.socketPath ?? o.env?.simdSocket)) {
-    const helper = resolveHelper(o);
-    if (!helper.success)
-      return helper;
-  }
+  const preflight = helperPreflight(o);
+  if (preflight)
+    return preflight;
   const connecting = o.client ? Promise.resolve({ success: true, data: o.client }) : connect(o, log);
   const [client, automation] = await Promise.all([connecting, simctl.enableAutomation()]);
   if (!automation.success)
@@ -8927,23 +9084,8 @@ async function openIosDriver(o) {
       log,
       ...network ? { network } : {},
       a11y: () => iosA11yFor(o, now, sleep),
-      nativeAudit: (ctx) => createIosNativeAudit({
-        udid: o.udid,
-        exec,
-        bundleId: () => o.bundleId ?? ctx.lastBundle(),
-        ...o.wardenHome ? { wardenHome: o.wardenHome } : {},
-        ...o.version ? { version: o.version } : {},
-        ...o.runnerSources ? { runnerSources: o.runnerSources } : {},
-        ...o.nativeAudit ?? {},
-        ...o.debug ? { log } : {}
-      }),
-      settings: (ctx) => createIosSettings({
-        udid: o.udid,
-        exec,
-        lastBundle: ctx.lastBundle,
-        ...o.bundleId ? { defaultBundle: o.bundleId } : {},
-        staged: o.stagedSettings ?? stagedSettingsFor(o.wardenHome ?? wardenHome(), o.udid)
-      }),
+      nativeAudit: (ctx) => nativeAuditFor(o, exec, log, ctx),
+      settings: (ctx) => settingsFor(o, exec, ctx),
       ...o.clockRecorder ? { clockRecorder: o.clockRecorder } : {}
     })
   };
@@ -9530,15 +9672,20 @@ var stderrLog = (line) => {
   process.stderr.write(`${line}
 `);
 };
+function leaseSeams(env, deps, given) {
+  const networkProxy = given.networkProxy ?? leaseProxyFor(env, deps);
+  const clockRecorder = given.clockRecorder ?? leaseClockRecorderFor(env, deps);
+  return {
+    ...networkProxy === undefined ? {} : { networkProxy },
+    ...clockRecorder === undefined ? {} : { clockRecorder }
+  };
+}
 function androidOptions(env, deps, debug) {
   const android = deps.android ?? {};
   const log = deps.log ?? (debug ? stderrLog : undefined);
-  const networkProxy = android.networkProxy ?? leaseProxyFor(env, deps);
-  const clockRecorder = android.clockRecorder ?? leaseClockRecorderFor(env, deps);
   return {
     ...android,
-    ...networkProxy === undefined ? {} : { networkProxy },
-    ...clockRecorder === undefined ? {} : { clockRecorder },
+    ...leaseSeams(env, deps, android),
     serial: env.udid,
     adb: android.adb ?? androidTools(process.env).adb,
     exec: deps.exec ?? bunExec,
@@ -9570,12 +9717,9 @@ async function openDriver(env, deps = {}) {
     case "ios": {
       if (isPhysicalIosId(env.udid))
         return openIosDeviceDriver(deviceOptions(env, deps, debug));
-      const networkProxy = deps.networkProxy ?? leaseProxyFor(env, deps);
-      const clockRecorder = deps.clockRecorder ?? leaseClockRecorderFor(env, deps);
       return openIosDriver({
         ...deps,
-        ...networkProxy === undefined ? {} : { networkProxy },
-        ...clockRecorder === undefined ? {} : { clockRecorder },
+        ...leaseSeams(env, deps, deps),
         udid: env.udid,
         bundleId: env.bundleId,
         env,
@@ -10124,6 +10268,12 @@ function createDevice({
     signal,
     step: (label, fn) => session.step === undefined ? fn() : session.step("locator", label, fn)
   });
+  async function closeAutofillSaveSheet(action) {
+    if (typeof action !== "string") {
+      throw new E2eError2("ACTION_FAILED", `the autofill "Save password?" sheet is closed with Back only, never "${action.button}": use accept or dismiss`);
+    }
+    await unwrap(() => driver.pressButton("back"), "dismiss autofill save sheet", signal());
+  }
   const device = {
     a11yAudit: a11y.a11yAudit,
     screenReader: a11y.screenReader,
@@ -10151,10 +10301,7 @@ function createDevice({
       if (isOpenInSheet(info) && typeof action === "string" && linkInFlight(session))
         return false;
       if (driver.platform === "android" && isAutofillSaveSheet(info.buttons)) {
-        if (typeof action !== "string") {
-          throw new E2eError2("ACTION_FAILED", `the autofill "Save password?" sheet is closed with Back only, never "${action.button}": use accept or dismiss`);
-        }
-        await unwrap(() => driver.pressButton("back"), "dismiss autofill save sheet", signal());
+        await closeAutofillSaveSheet(action);
         return true;
       }
       const target = alertTarget(info, action, driver.platform);
@@ -10482,6 +10629,23 @@ function abortError(signal) {
 function isFinitePoint(point) {
   return Number.isFinite(point.x) && Number.isFinite(point.y);
 }
+async function swipeDirection(rt, options) {
+  const observed = await rt.observe();
+  if (canActOnElements(observed.driver)) {
+    if (rt.drive("swipe", await observed.driver.scrollElement(options.direction)))
+      return;
+  }
+  const vector = swipeVector(options.direction, screenRect(observed.snapshot.screen), options.momentum);
+  rt.drive("swipe", await observed.driver.swipe(vector.from, vector.to, vector.options));
+}
+async function swipeBetween(rt, host, options) {
+  if (!isFinitePoint(options.from) || !isFinitePoint(options.to)) {
+    throw new E2eError2("INVALID_ARGUMENT", "swipe needs finite coordinates for from and to");
+  }
+  const driver = await host.driver();
+  const opts = options.durationMs === undefined ? undefined : { durationMs: options.durationMs };
+  rt.drive("swipe", await driver.swipe(options.from, options.to, opts));
+}
 function createScreen(host) {
   const rt = new Runtime(host);
   const lazy = (query) => new Locator({ kind: "query", query }, rt);
@@ -10493,22 +10657,9 @@ function createScreen(host) {
       throw new E2eError2("INVALID_ARGUMENT", "swipe takes either { direction, momentum? } or { from, to, durationMs? }, not a mix");
     }
     return rt.step("swipe", async () => {
-      if ("direction" in options) {
-        const observed = await rt.observe();
-        if (canActOnElements(observed.driver)) {
-          if (rt.drive("swipe", await observed.driver.scrollElement(options.direction)))
-            return;
-        }
-        const vector = swipeVector(options.direction, screenRect(observed.snapshot.screen), options.momentum);
-        rt.drive("swipe", await observed.driver.swipe(vector.from, vector.to, vector.options));
-        return;
-      }
-      if (!isFinitePoint(options.from) || !isFinitePoint(options.to)) {
-        throw new E2eError2("INVALID_ARGUMENT", "swipe needs finite coordinates for from and to");
-      }
-      const driver = await host.driver();
-      const opts = options.durationMs === undefined ? undefined : { durationMs: options.durationMs };
-      rt.drive("swipe", await driver.swipe(options.from, options.to, opts));
+      if ("direction" in options)
+        return swipeDirection(rt, options);
+      return swipeBetween(rt, host, options);
     });
   };
   return {