@delacour/warden-e2e 0.2.0 → 0.3.1

package/{chunk-7ns30pbp.mjs → chunk-8em9kgsk.mjs}

@@ -834,34 +834,34 @@ async function confirmFieldValue(request) {
   const { now, sleep } = request;
   const start = now();
   const cap = request.maxMs === undefined ? Number.POSITIVE_INFINITY : start + request.maxMs;
-  let deadline = Math.min(start + request.budgetMs, cap);
-  let held = "(gone)";
-  let streak = 0;
+  const reads = request.reads ?? CONFIRM_READS;
+  let poll = { deadline: Math.min(start + request.budgetMs, cap), held: "(gone)", streak: 0 };
   for (;; ) {
     const read = await request.read();
     if (!read.ok)
       return { status: "failed", error: read.error };
-    const { reading } = read;
-    if (reading.kind === "unreadable") {
-      streak = 0;
-      held = reading.note;
-    } else if (reading.value === request.text) {
-      streak += 1;
-      if (streak >= (request.reads ?? CONFIRM_READS))
-        return { status: "confirmed" };
-      held = reading.value;
-      deadline = Math.max(deadline, Math.min(now() + 2 * FIELD_POLL_MS, cap));
-    } else {
-      streak = 0;
-      if (reading.value !== held)
-        deadline = Math.max(deadline, Math.min(now() + FIELD_PROGRESS_MS, cap));
-      held = reading.value;
-    }
-    if (now() >= deadline)
-      return { status: "mismatch", held };
+    poll = foldReading(poll, read.reading, { text: request.text, now: now(), cap, reads });
+    if (poll.streak > 0 && poll.streak >= reads)
+      return { status: "confirmed" };
+    if (now() >= poll.deadline)
+      return { status: "mismatch", held: poll.held };
     await sleep(FIELD_POLL_MS);
   }
 }
+function foldReading(poll, reading, at) {
+  if (reading.kind === "unreadable")
+    return { ...poll, streak: 0, held: reading.note };
+  if (reading.value === at.text) {
+    const streak = poll.streak + 1;
+    if (streak >= at.reads)
+      return { ...poll, streak };
+    const deadline = Math.max(poll.deadline, Math.min(at.now + 2 * FIELD_POLL_MS, at.cap));
+    return { deadline, held: reading.value, streak };
+  }
+  const progressed = reading.value !== poll.held;
+  const deadline = progressed ? Math.max(poll.deadline, Math.min(at.now + FIELD_PROGRESS_MS, at.cap)) : poll.deadline;
+  return { deadline, held: reading.value, streak: 0 };
+}
 async function hitTestField(driver, wanted) {
   const { x, y, width, height } = wanted.element.frame;
   const hit = await driver.elementAtPoint({ x: x + width / 2, y: y + height / 2 });
@@ -2201,6 +2201,32 @@ function textOf2(data) {
     return new TextDecoder().decode(new Uint8Array(data.buffer, data.byteOffset, data.byteLength));
   return;
 }
+function taggedBindingPayload(params) {
+  const call = bindingCalledSchema.safeParse(params);
+  if (!call.success)
+    return;
+  let payload;
+  try {
+    payload = JSON.parse(call.data.payload);
+  } catch {
+    payload = undefined;
+  }
+  const tagged = bindingPayloadSchema.safeParse(payload);
+  return tagged.success ? { requestId: tagged.data.requestId, payload } : undefined;
+}
+function parseEnvelope(data) {
+  const text = textOf2(data);
+  if (text === undefined)
+    return;
+  let json;
+  try {
+    json = JSON.parse(text);
+  } catch {
+    return;
+  }
+  const message = envelopeSchema.safeParse(json);
+  return message.success ? message.data : undefined;
+}
 function inspectorOrigin(wsUrl) {
   if (!URL.canParse(wsUrl))
     return;
@@ -2261,18 +2287,9 @@ async function openCdp(wsUrl, options = {}) {
   };
   const dispatch = (method, params) => {
     if (method === "Runtime.bindingCalled") {
-      const call = bindingCalledSchema.safeParse(params);
-      if (call.success) {
-        let payload;
-        try {
-          payload = JSON.parse(call.data.payload);
-        } catch {
-          payload = undefined;
-        }
-        const tagged = bindingPayloadSchema.safeParse(payload);
-        if (tagged.success)
-          bindings.get(tagged.data.requestId)?.settle(ok(payload));
-      }
+      const tagged = taggedBindingPayload(params);
+      if (tagged)
+        bindings.get(tagged.requestId)?.settle(ok(tagged.payload));
     }
     for (const handler of [...anyHandlers])
       handler(method, params);
@@ -2280,19 +2297,10 @@ async function openCdp(wsUrl, options = {}) {
       handler(params);
   };
   ws.addEventListener("message", (event) => {
-    const text = textOf2(event.data);
-    if (text === undefined)
-      return;
-    let json;
-    try {
-      json = JSON.parse(text);
-    } catch {
+    const message = parseEnvelope(event.data);
+    if (!message)
       return;
-    }
-    const message = envelopeSchema.safeParse(json);
-    if (!message.success)
-      return;
-    const { id, error, result, method, params } = message.data;
+    const { id, error, result, method, params } = message;
     if (id !== undefined) {
       const request = pending.get(id);
       if (!request)
@@ -2455,6 +2463,20 @@ function formatPreview(object) {
   const name = object.className && object.className !== "Object" ? `${object.className} ` : "";
   return `${name}{${body}${more}}`;
 }
+function formatObject(object) {
+  if (object.subtype === "null")
+    return "null";
+  if (object.value !== undefined)
+    return JSON.stringify(object.value);
+  if (object.subtype === "error")
+    return object.description ?? "Error";
+  return formatPreview(object) ?? object.description ?? object.className ?? "Object";
+}
+function formatFunction(object) {
+  const first = (object.description ?? "function").split(`
+`)[0] ?? "function";
+  return first.length > MAX_FUNCTION_TEXT ? `${first.slice(0, MAX_FUNCTION_TEXT)}\u2026` : first;
+}
 function formatValue2(object) {
   switch (object.type) {
     case "string":
@@ -2465,24 +2487,18 @@ function formatValue2(object) {
     case "boolean":
     case "bigint":
       return object.unserializableValue ?? object.description ?? String(object.value);
-    case "function": {
-      const first = (object.description ?? "function").split(`
-`)[0] ?? "function";
-      return first.length > MAX_FUNCTION_TEXT ? `${first.slice(0, MAX_FUNCTION_TEXT)}\u2026` : first;
-    }
-    case "object": {
-      if (object.subtype === "null")
-        return "null";
-      if (object.value !== undefined)
-        return JSON.stringify(object.value);
-      if (object.subtype === "error")
-        return object.description ?? "Error";
-      return formatPreview(object) ?? object.description ?? object.className ?? "Object";
-    }
+    case "function":
+      return formatFunction(object);
+    case "object":
+      return formatObject(object);
     default:
       return object.description ?? `[${object.type}]`;
   }
 }
+function formatNumeric(spec, arg) {
+  const n = Number(arg.value ?? arg.description);
+  return Number.isNaN(n) ? "NaN" : String(spec === "f" ? n : Math.trunc(n));
+}
 function applyFormat(format, rest) {
   let used = 0;
   const text = format.replace(/%([sdifoOjc%])/g, (whole, spec) => {
@@ -2494,10 +2510,8 @@ function applyFormat(format, rest) {
     used++;
     if (spec === "c")
       return "";
-    if (spec === "d" || spec === "i" || spec === "f") {
-      const n = Number(arg.value ?? arg.description);
-      return Number.isNaN(n) ? "NaN" : String(spec === "f" ? n : Math.trunc(n));
-    }
+    if (spec === "d" || spec === "i" || spec === "f")
+      return formatNumeric(spec, arg);
     return formatValue2(arg);
   });
   return { text, used };
@@ -3078,51 +3092,61 @@ async function connectDevtools(o) {
         reconnect("JS context cleared");
     });
   }
+  const closedError = () => devtoolsErr("cdp_closed", "devtools session is closed");
+  function adopt(attached) {
+    attach(attached);
+    log(`devtools: reconnected to ${attached.target.id}`);
+    for (const handler of [...eventHandlers.reconnected])
+      handler(attached.target);
+  }
+  function adoptIfOpen(attached) {
+    if (phase() === "closed") {
+      attached.cdp.close();
+      return closedError();
+    }
+    adopt(attached);
+    return ok(attached);
+  }
+  function markLost(error) {
+    if (phase() === "closed")
+      return;
+    state = { kind: "lost", error };
+    for (const handler of [...eventHandlers.lost])
+      handler(error);
+  }
+  async function reconnectLoop(previous) {
+    previous.cdp.close();
+    let last = { code: "devtools_unavailable", message: "reconnect failed" };
+    const startedAt = now();
+    let slept = 0;
+    const leftMs = () => budgetMs - Math.max(now() - startedAt, slept);
+    for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+      if (phase() === "closed")
+        return closedError();
+      const result = await establish();
+      if (result.success)
+        return adoptIfOpen(result.data);
+      last = result.error;
+      const left = leftMs();
+      const cap = Number.isFinite(maxAttempts) ? `/${maxAttempts}` : "";
+      log(`devtools: reconnect attempt ${attempt}${cap} failed: ${last.message}`);
+      if (attempt >= maxAttempts || left <= 0)
+        break;
+      const pause = Math.min(backoffAfter(attempt), left);
+      slept += pause;
+      await sleep(pause);
+    }
+    markLost(last);
+    return { success: false, error: last };
+  }
   function reconnect(reason) {
     if (state.kind === "reconnecting")
       return state.done;
     if (state.kind !== "up")
-      return Promise.resolve(devtoolsErr("cdp_closed", "devtools session is closed"));
+      return Promise.resolve(closedError());
     const previous = state.attached;
     log(`devtools: ${reason}, reconnecting`);
-    const done = (async () => {
-      previous.cdp.close();
-      let last = { code: "devtools_unavailable", message: "reconnect failed" };
-      const startedAt = now();
-      let slept = 0;
-      const leftMs = () => budgetMs - Math.max(now() - startedAt, slept);
-      for (let attempt = 1;attempt <= maxAttempts; attempt++) {
-        if (phase() === "closed")
-          return devtoolsErr("cdp_closed", "devtools session is closed");
-        const result = await establish();
-        if (result.success) {
-          if (phase() === "closed") {
-            result.data.cdp.close();
-            return devtoolsErr("cdp_closed", "devtools session is closed");
-          }
-          attach(result.data);
-          log(`devtools: reconnected to ${result.data.target.id}`);
-          for (const handler of [...eventHandlers.reconnected])
-            handler(result.data.target);
-          return result;
-        }
-        last = result.error;
-        const left = leftMs();
-        const cap = Number.isFinite(maxAttempts) ? `/${maxAttempts}` : "";
-        log(`devtools: reconnect attempt ${attempt}${cap} failed: ${last.message}`);
-        if (attempt >= maxAttempts || left <= 0)
-          break;
-        const pause = Math.min(backoffAfter(attempt), left);
-        slept += pause;
-        await sleep(pause);
-      }
-      if (phase() !== "closed") {
-        state = { kind: "lost", error: last };
-        for (const handler of [...eventHandlers.lost])
-          handler(last);
-      }
-      return { success: false, error: last };
-    })();
+    const done = reconnectLoop(previous);
     state = { kind: "reconnecting", done };
     epoch++;
     for (const wake of [...epochWaiters])
@@ -3136,16 +3160,13 @@ async function connectDevtools(o) {
       if (phase() === "closed") {
         if (result.success)
           result.data.cdp.close();
-        return devtoolsErr("cdp_closed", "devtools session is closed");
+        return closedError();
       }
       if (!result.success) {
         state = { kind: "lost", error: result.error };
         return result;
       }
-      attach(result.data);
-      log(`devtools: reconnected to ${result.data.target.id}`);
-      for (const handler of [...eventHandlers.reconnected])
-        handler(result.data.target);
+      adopt(result.data);
       return result;
     })();
     state = { kind: "reconnecting", done };
@@ -3160,6 +3181,44 @@ async function connectDevtools(o) {
       return revive();
     return devtoolsErr("cdp_closed", "devtools session is closed");
   }
+  async function requestReload(method, baseUrl) {
+    if (method !== "http") {
+      log(`devtools: reload via ${method}`);
+      return;
+    }
+    log("devtools: reload via http");
+    try {
+      const res = await o.fetch(`${baseUrl.replace(/\/+$/, "")}/reload`, { method: "POST" });
+      if (!res.ok) {
+        return devtoolsErr("devtools_unavailable", `reload failed: POST /reload answered ${res.status}`);
+      }
+    } catch (error) {
+      return devtoolsErr("devtools_unavailable", `reload failed: POST /reload threw ${String(error)}`);
+    }
+    return;
+  }
+  async function awaitReload(method, startedAt, waitMs) {
+    if (epoch === startedAt)
+      await waitForEpochChange(waitMs);
+    if (epoch === startedAt && state.kind === "up") {
+      log(`devtools: reload via ${method} not observed after ${waitMs} ms`);
+      return devtoolsErr("reload_failed", `reload via ${method} acknowledged but the JS context did not restart within ${waitMs} ms`);
+    }
+    if (state.kind !== "reconnecting")
+      return;
+    const back = await state.done;
+    return back.success ? undefined : back;
+  }
+  function waitForEpochChange(waitMs) {
+    return new Promise((resolve) => {
+      const wake = () => {
+        epochWaiters.delete(wake);
+        resolve();
+      };
+      epochWaiters.add(wake);
+      sleep(waitMs).then(wake);
+    });
+  }
   const first = await establish();
   if (!first.success)
     return first;
@@ -3197,39 +3256,8 @@ async function connectDevtools(o) {
         return devtoolsErr(probe.error.code, `reload probe failed: ${probe.error.message}`);
       }
       const method = readReloadMethod(probe.data) ?? "http";
-      if (method === "http") {
-        log("devtools: reload via http");
-        try {
-          const res = await o.fetch(`${metroUrl.replace(/\/+$/, "")}/reload`, { method: "POST" });
-          if (!res.ok) {
-            return devtoolsErr("devtools_unavailable", `reload failed: POST /reload answered ${res.status}`);
-          }
-        } catch (error) {
-          return devtoolsErr("devtools_unavailable", `reload failed: POST /reload threw ${String(error)}`);
-        }
-      } else {
-        log(`devtools: reload via ${method}`);
-      }
-      if (epoch === startedAt) {
-        await new Promise((resolve) => {
-          const wake = () => {
-            epochWaiters.delete(wake);
-            resolve();
-          };
-          epochWaiters.add(wake);
-          sleep(waitMs).then(wake);
-        });
-      }
-      if (epoch === startedAt && state.kind === "up") {
-        log(`devtools: reload via ${method} not observed after ${waitMs} ms`);
-        return devtoolsErr("reload_failed", `reload via ${method} acknowledged but the JS context did not restart within ${waitMs} ms`);
-      }
-      if (state.kind === "reconnecting") {
-        const back = await state.done;
-        if (!back.success)
-          return back;
-      }
-      return ok({ method });
+      const failure = await requestReload(method, metroUrl) ?? await awaitReload(method, startedAt, waitMs);
+      return failure ?? ok({ method });
     },
     get target() {
       if (state.kind === "up")
@@ -5456,7 +5484,7 @@ function parseBudgets(raw) {
 
 // ../../packages/e2e/src/perf/device-perf.ts
 var PERF_DIR = "perf";
-function parseEnvelope(stdout) {
+function parseEnvelope2(stdout) {
   try {
     const json = JSON.parse(stdout.trim().split(`
 `).at(-1) ?? "");
@@ -5509,7 +5537,7 @@ function createDevicePerf(deps) {
     if (deps.unavailable !== undefined)
       throw new E2eError2("SESSION", `device.perf unavailable: ${deps.unavailable}`);
     const { code, stdout, stderr } = await deps.exec(["perf", sub, "--json", "--udid", deps.udid, ...extra]);
-    const env = parseEnvelope(stdout);
+    const env = parseEnvelope2(stdout);
     if (env === undefined || !env.ok) {
       const why = env === undefined ? stderr.trim() || `exit ${code}` : `${env.error.code}: ${env.error.message}`;
       throw new E2eError2("SESSION", `warden perf ${sub} failed: ${why}`);
@@ -5827,6 +5855,6 @@ function onlyWasSeen() {
 
 // ../../packages/e2e/src/version.ts
 var WORKSPACE_VERSION = "0.0.0-workspace";
-var WARDEN_E2E_VERSION2 = "0.2.0";
+var WARDEN_E2E_VERSION2 = "0.3.1";
 
 export { E2eError2, noteSpanDetail, addSpanDetail, canObserve, canDetectAlerts, settleDetailOf, DEFAULT_SETTLE_QUIET_MS, DEFAULT_SETTLE_TIMEOUT_MS, settleByHash, snapshotHash, ok, err, swipeVector, screenRect, fieldValue, PINCH_MS, ROTATE_MS, PATH_MS, centreOf, pinchRadius, rotateRadius, requireGesture, assertScale, assertDegrees, isInteractiveRole, resolveRole, normalizeText, matchesText, indexSnapshot, testIdQuery, textQuery, roleQuery, selectorExpression, renderSnapshot, renderHeader, resolve, locateByTestIdViaReact, isLocator, Locator, pickOne, textOf, scrollUntilVisible, bunExec, execError, driverError, driverErr, logEventSchema, fatalEventSchema, responseSchema, mapWireError, encodeRequest, bunSpawn, stdioTransport, spawnSimd, connectSimd, isHidLost, ENV_NAMES, DEFAULT_ASSERTION_TIMEOUT_MS, readEnv, runStep, setDefaultHidRecovery, setDefaultNativeLog, setDefaultDriverFactory, hasDefaultDriverFactory, setDefaultFixtureFactory, hasDefaultFixtureFactory, attemptSession, getSession, parseBudgets, createDevicePerf, perfStartFor, spawnWarden, hash6, attemptDir, screenshotPath, specIdOf, realNativeLogDeps, captureNativeLog, callerFile, BUN_TIMEOUT_MARGIN_MS2, ownHook, currentScope, createScope, runInScope, hooksFor, resolveUse, registrationDefaults, markOnly, onlyWasSeen, WORKSPACE_VERSION, WARDEN_E2E_VERSION2 };

package/index.mjs

@@ -31,7 +31,7 @@ import {
   registrationDefaults,
   markOnly,
   WARDEN_E2E_VERSION2
-} from "./chunk-7ns30pbp.mjs";
+} from "./chunk-8em9kgsk.mjs";
 // ../../packages/e2e/src/expect/expect.ts
 import { expect as bunExpect } from "bun:test";
 
@@ -742,60 +742,60 @@ async function runAttemptOnce(session, spec) {
   const bound = attemptSession(session, () => binding ?? { context: ctx, finished: false });
   print(formatConsoleLine({ type: "test-start", test: { file: spec.file, title: [...spec.title], startedAt, device } }, { clock }));
   session.enterAttempt(ctx);
+  const teardowns = [];
+  const state = {};
+  let outcome = await raceDeadline(controller, use.timeoutMs, () => setUpAndRun(bound, spec, use, controller.signal, state, teardowns));
+  outcome = failIf(outcome, ctx.softFailures.length > 0, () => softFailureError(ctx.softFailures));
+  if (outcome.failed)
+    await captureFailureArtifacts(session, ctx, budget, startedAt);
+  const cleanupErrors = await runCleanup(session, spec, ctx, state.bag, teardowns, budget, (context) => {
+    binding = { context, finished: false };
+  });
+  const finished = new E2eError2("SESSION", "attempt finished");
+  if (!controller.signal.aborted)
+    controller.abort(finished);
+  binding = { context: { ...ctx, signal: AbortSignal.abort(finished), depth: 0 }, finished: true };
+  session.leaveAttempt(ctx);
+  trace.flush();
+  outcome = failIf(outcome, cleanupErrors.length > 0, () => cleanupErrors[0]);
+  return concludeAttempt(session, spec, ctx, { startedAt, device }, outcome, print, clock);
+}
+async function raceDeadline(controller, timeoutMs, run) {
   let deadlineHit = false;
   const timer = setTimeout(() => {
     deadlineHit = true;
-    controller.abort(new E2eError2("TIMEOUT", `test timed out after ${use.timeoutMs}ms`));
-  }, use.timeoutMs);
+    controller.abort(new E2eError2("TIMEOUT", `test timed out after ${timeoutMs}ms`));
+  }, timeoutMs);
   const deadline = new Promise((_, reject) => {
     controller.signal.addEventListener("abort", () => reject(controller.signal.reason), { once: true });
   });
   deadline.catch(() => {
     return;
   });
-  const teardowns = [];
-  const state = {};
-  let failed = false;
-  let failure;
   try {
-    await Promise.race([setUpAndRun(bound, spec, use, controller.signal, state, teardowns), deadline]);
+    await Promise.race([run(), deadline]);
+    return { failed: false, failure: undefined, deadlineHit };
   } catch (error) {
-    failed = true;
-    failure = error;
+    return { failed: true, failure: error, deadlineHit };
   } finally {
     clearTimeout(timer);
   }
-  if (!failed && ctx.softFailures.length > 0) {
-    failed = true;
-    failure = softFailureError(ctx.softFailures);
-  }
-  if (failed)
-    await captureFailureArtifacts(session, ctx, budget, startedAt);
-  const cleanupErrors = await runCleanup(session, spec, ctx, state.bag, teardowns, budget, (context) => {
-    binding = { context, finished: false };
-  });
-  const finished = new E2eError2("SESSION", "attempt finished");
-  if (!controller.signal.aborted)
-    controller.abort(finished);
-  binding = { context: { ...ctx, signal: AbortSignal.abort(finished), depth: 0 }, finished: true };
-  session.leaveAttempt(ctx);
-  trace.flush();
-  if (!failed && cleanupErrors.length > 0) {
-    failed = true;
-    failure = cleanupErrors[0];
-  }
-  for (const shot of listScreenshots(dir))
-    files.add(shot);
-  const outcome = failed ? { failed: true, error: failure, timedOut: deadlineHit } : { failed: false };
-  const result = buildResult(spec, ctx, { startedAt, device }, outcome);
+}
+function failIf(outcome, present, failure) {
+  return outcome.failed || !present ? outcome : { ...outcome, failed: true, failure: failure() };
+}
+async function concludeAttempt(session, spec, ctx, run, outcome, print, clock) {
+  for (const shot of listScreenshots(ctx.dir))
+    ctx.files.add(shot);
+  const result = buildResult(spec, ctx, run, outcome.failed ? { failed: true, error: outcome.failure, timedOut: outcome.deadlineHit } : { failed: false });
   print(formatConsoleLine({ type: "test-end", result }, { clock }));
-  if (failed && session.recoverHid !== undefined && isHidLost(failure) && await session.recoverHid()) {
+  if (outcome.failed && session.recoverHid !== undefined && isHidLost(outcome.failure) && await session.recoverHid()) {
     return "again";
   }
-  if (!failed || spec.final)
+  if (!outcome.failed || spec.final)
     session.results.append(result);
-  if (failed)
-    throw failure instanceof Error ? failure : new Error(String(failure));
+  if (outcome.failed)
+    throw outcome.failure instanceof Error ? outcome.failure : new Error(String(outcome.failure));
   return;
 }
 function softFailureError(failures) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delacour/warden-e2e",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "TypeScript spec API for `warden e2e`: test, expect, screen, device, app",
   "license": "MIT",
   "repository": {
@@ -37,7 +37,7 @@
     "LICENSE"
   ],
   "peerDependencies": {
-    "@delacour/warden": "0.2.0"
+    "@delacour/warden": "0.3.1"
   },
   "dependencies": {
     "zod": "^4.4.3"

package/preload.mjs

@@ -68,7 +68,7 @@ import {
   onlyWasSeen,
   WORKSPACE_VERSION,
   WARDEN_E2E_VERSION2
-} from "./chunk-7ns30pbp.mjs";
+} from "./chunk-8em9kgsk.mjs";
 
 // ../../packages/e2e/src/preload.ts
 import { afterAll, setDefaultTimeout } from "bun:test";
@@ -3311,6 +3311,25 @@ function nativeDetail(data) {
     noteSpanDetail("frontmostPid", frontmostPid);
   return detail;
 }
+function noteRebind(data) {
+  noteSpanDetail("rebind", data.bound ? "bound" : data.reason ?? "unbound");
+  noteSpanDetail("rebindMs", data.waitedMs);
+  if (data.restarts !== undefined && data.restarts > 0)
+    noteSpanDetail("rebindRestarts", data.restarts);
+  if (data.recycled === true)
+    noteSpanDetail("rebindRecycled", true);
+}
+function healthDetail(d) {
+  return {
+    axDefault: d.ax.default,
+    ...d.ax.bridge === "degraded" ? { axBridge: "degraded" } : {},
+    ...d.ax.lastError ? { axLastError: d.ax.lastError } : {},
+    ...d.ax.error !== undefined ? { axError: d.ax.error } : {},
+    ...d.socket ? { socket: d.socket } : {},
+    ...d.xcode ? { xcode: d.xcode } : {},
+    ...d.state ? { state: d.state } : {}
+  };
+}
 
 class DriverFailure extends Error {
   error;
@@ -3477,36 +3496,37 @@ function createIosDriver(swap, simctl, opts) {
       opts.log?.(`[ios] rebind after launch failed (${reply.error.code}): ${reply.error.message}`);
       return false;
     }
-    noteSpanDetail("rebind", reply.data.bound ? "bound" : reply.data.reason ?? "unbound");
-    noteSpanDetail("rebindMs", reply.data.waitedMs);
-    if (reply.data.restarts !== undefined && reply.data.restarts > 0)
-      noteSpanDetail("rebindRestarts", reply.data.restarts);
-    if (reply.data.recycled === true)
-      noteSpanDetail("rebindRecycled", true);
+    noteRebind(reply.data);
     return reply.data.bound;
   }
+  async function settleViaHelper(quietMs, timeoutMs) {
+    const expected = launchedBundle;
+    const native = await request("settle", { quietMs, settleTimeoutMs: timeoutMs, ...expected === undefined ? {} : { bundleId: expected } }, { timeoutMs: timeoutMs + SETTLE_MARGIN_MS });
+    if (native.success) {
+      if (expected !== undefined && native.data.reason !== "frontmost_mismatch")
+        launchedBundle = undefined;
+      return { success: true, data: nativeDetail(native.data) };
+    }
+    if (native.error.code === "E_TIMEOUT") {
+      noteSpanDetail("reason", "helper_timeout");
+      return {
+        success: true,
+        data: { quiet: false, waitedMs: timeoutMs + SETTLE_MARGIN_MS, reason: "helper_timeout" }
+      };
+    }
+    if (native.error.code !== "E_UNSUPPORTED")
+      return native;
+    settleUnsupported = true;
+    opts.log?.("[ios] native settle unsupported, polling snapshot hashes");
+    return;
+  }
   async function settle(o = {}) {
     const quietMs = o.quietMs ?? DEFAULT_QUIET_MS;
     const timeoutMs = o.timeoutMs ?? DEFAULT_SETTLE_TIMEOUT_MS2;
     if (!settleUnsupported) {
-      const expected = launchedBundle;
-      const native = await request("settle", { quietMs, settleTimeoutMs: timeoutMs, ...expected === undefined ? {} : { bundleId: expected } }, { timeoutMs: timeoutMs + SETTLE_MARGIN_MS });
-      if (native.success) {
-        if (expected !== undefined && native.data.reason !== "frontmost_mismatch")
-          launchedBundle = undefined;
-        return { success: true, data: nativeDetail(native.data) };
-      }
-      if (native.error.code === "E_TIMEOUT") {
-        noteSpanDetail("reason", "helper_timeout");
-        return {
-          success: true,
-          data: { quiet: false, waitedMs: timeoutMs + SETTLE_MARGIN_MS, reason: "helper_timeout" }
-        };
-      }
-      if (native.error.code !== "E_UNSUPPORTED")
+      const native = await settleViaHelper(quietMs, timeoutMs);
+      if (native)
         return native;
-      settleUnsupported = true;
-      opts.log?.("[ios] native settle unsupported, polling snapshot hashes");
     }
     return hashSettle({ quietMs, timeoutMs });
   }
@@ -3564,15 +3584,7 @@ function createIosDriver(swap, simctl, opts) {
         transport: d.hid.transport,
         bridge: d.ax.bridge === "degraded" ? "available" : d.ax.bridge,
         screen: d.screen,
-        detail: {
-          axDefault: d.ax.default,
-          ...d.ax.bridge === "degraded" ? { axBridge: "degraded" } : {},
-          ...d.ax.lastError ? { axLastError: d.ax.lastError } : {},
-          ...d.ax.error !== undefined ? { axError: d.ax.error } : {},
-          ...d.socket ? { socket: d.socket } : {},
-          ...d.xcode ? { xcode: d.xcode } : {},
-          ...d.state ? { state: d.state } : {}
-        }
+        detail: healthDetail(d)
       }
     };
   }