peachsim 0.1.1625 → 0.1.1640

package/cli/drivers/playwright-sim-host.ts

@@ -18,15 +18,18 @@ import {
 // require, in a child process the CLI spawns as itself.
 import {
   chromeDisabledFeaturesSwitch,
+  LINUX_CHROME_SCOPE_ENV,
   softwareChromeLaunchOptions,
 } from '../../../../scripts/lib/reap-browser'
 import { createBrowserPageTargetReader } from '../../../peach-engine/src/browser-page-target'
+import { captureBrowserAccessibility } from '../../../peach-engine/src/capture/browser-accessibility-host'
 import {
   readBrowserCompositeCaptureRequest,
   resolveBrowserCompositeCdpClip,
 } from '../../../peach-engine/src/capture/browser-composite'
 import { WEBVIEW_HOST_BOOTSTRAP_SOURCE } from '../../../peach-engine/src/components/native-ui/webview-frame-bridge'
 import { createBrowserPointerDispatcher } from '../../../peach-engine/src/render-worker/browser-pointer'
+import { automateWebAuthenticationSessions } from '../../../peach-engine/src/web-authentication-automation-host'
 import {
   automateWebViewFrames,
   WEBVIEW_HOST_BINDING,
@@ -69,6 +72,9 @@ const callerUserDataDir = process.env.SOOTSIM_PW_USERDATADIR || '';
 // SOOTSIM_PW_OWNER_POLL_MS is a test-only override of the 5s poll interval;
 // production never sets it.
 const ownerPid = Number(process.env.SOOTSIM_PW_OWNER_PID || 0);
+// the open command waiting for this host to connect; it may queue for the
+// browser slot and then be killed by its own caller's budget.
+const launcherPid = Number(process.env.SOOTSIM_PW_LAUNCHER_PID || 0);
 const ownerPollMs = Number(process.env.SOOTSIM_PW_OWNER_POLL_MS || 5000);
 // optional CDP port — exposes Chrome's remote-debugging endpoint so a
 // bridge-driven sim can also be cpu-profiled (peach perf cpu --cdp-port).
@@ -103,13 +109,14 @@ const viewportSpec = /^(\\d+)x(\\d+)$/.exec(process.env.SOOTSIM_PW_VIEWPORT || '
 const viewport = viewportSpec
   ? { width: Number(viewportSpec[1]), height: Number(viewportSpec[2]) }
   : { width: 600, height: 900 };
-// device pixels per css pixel. playwright's default is 1, which makes the
-// engine allocate its canvas backing store at HALF the resolution a normal
-// retina-mac chrome would (dpr 2) — the sim looks visibly soft. default to 2
-// so a driver-launched sim matches what the user sees in their own browser.
+// host display pixels per css pixel; default to a retina Mac browser's 2.
+// medium renders at 2 and high at device native, independently of browser DPR.
+// low follows measured on-screen density, capped at device native.
+// SOOTSIM_PW_DSF changes browser DPR, not the selected render resolution.
 const deviceScaleFactor = Number(process.env.SOOTSIM_PW_DSF || 2);
 const closeTimeoutMs = Number(process.env.SOOTSIM_PW_CLOSE_TIMEOUT_MS || 2500);
 const connectAckFile = process.env.SOOTSIM_PW_CONNECTED_ACK_FILE || '';
+const admittedFile = process.env.SOOTSIM_PW_ADMITTED_FILE || '';
 const completionFile = process.env.PEACH_PW_COMPLETION_FILE || '';
 const disposableBrowserCacheDirs = new Set(${JSON.stringify(
   DISPOSABLE_BROWSER_CACHE_DIR_NAMES,
@@ -120,7 +127,9 @@ const listProcessChildren = ${listProcessChildren.toString()};
 const { tmpdir } = require('os');
 const { join } = require('path');
 const createBrowserPointerDispatcher = ${createBrowserPointerDispatcher.toString()};
+const captureBrowserAccessibility = ${captureBrowserAccessibility.toString()};
 const automateWebViewFrames = ${automateWebViewFrames.toString()};
+const automateWebAuthenticationSessions = ${automateWebAuthenticationSessions.toString()};
 const webViewAutomationHelpers = ${webViewAutomationHelpersSource()};
 const readBrowserCompositeCaptureRequest = ${readBrowserCompositeCaptureRequest.toString()};
 const resolveBrowserCompositeCdpClip = ${resolveBrowserCompositeCdpClip.toString()};
@@ -136,12 +145,9 @@ const readChromiumQueue = ${readChromiumQueue.toString()};
 // aborted/closed \`peach open\` leaked a renderer + gpu helper burning 100%+
 // CPU until manually killed (multiple incidents 2026-06).
 //
-// fix: identify our chrome tree by its UNIQUE user-data-dir. every helper a
-// chrome root spawns inherits \`--user-data-dir=<dir>\` in its cmdline, so
-// \`pgrep -f <profileDir>\` finds exactly the tree we launched and nothing else
-// — Chrome for Testing and bundled playwright chromium alike. as a side benefit we
-// no longer need the launch / launchPersistentContext fork: we ALWAYS use a
-// profile dir (mkdtemp'd if the caller didn't pass one, then removed at exit).
+// a named profile can already belong to another host. its path finds browser
+// candidates; the unique launch environment proves which ones we may reap,
+// including helpers reparented after the browser root exits.
 const reapEnabled = process.platform !== 'win32';
 let profileDir = callerUserDataDir;
 let ephemeralProfile = false;
@@ -153,33 +159,35 @@ if (!profileDir) {
 // host a bounded temporary cache so persistent named profiles retain cookies
 // and storage without multiplying a private cache for every profile.
 const diskCacheDir = mkdtempSync(join(tmpdir(), 'peach-playwright-cache-'));
-const chromePidsByProfile = () => {
+let profileLaunched = false;
+// [pid, command line] for every process on the profile. linux reads /proc,
+// since minimal and rootless images ship no ps.
+const profileProcesses = () => {
   if (!reapEnabled) return [];
   try {
     // match the whole --user-data-dir argument: a pattern search also found
     // browsers whose profile path merely starts with this one.
     const flag = ' --user-data-dir=' + profileDir + ' ';
-    return execSync('ps -axo pid=,command=', {
-      stdio: ['ignore', 'pipe', 'ignore'],
-      maxBuffer: Infinity,
-    })
-      .toString().split('\\n').map((line) => line.trim().match(/^(\\d+)\\s+(.*)$/))
-      .filter((row) => row && (' ' + row[2] + ' ').includes(flag))
-      .map((row) => Number(row[1]))
-      .filter((p) => p && p !== process.pid);
-  } catch { return []; }
-};
-const chromeCommandsByProfile = () => {
-  if (!reapEnabled) return [];
-  const pids = chromePidsByProfile();
-  if (pids.length === 0) return [];
-  try {
-    return execSync('ps -p ' + pids.join(',') + ' -o command=', {
-      stdio: ['ignore', 'pipe', 'ignore'],
-      maxBuffer: Infinity,
-    }).toString().split('\\n').filter(Boolean);
-  } catch { return []; }
+    const rows = process.platform === 'linux'
+      ? readdirSync('/proc').filter((name) => /^\\d+$/.test(name)).map((name) => {
+          let command = '';
+          // a process can exit between the listing and this read
+          try { command = readFileSync('/proc/' + name + '/cmdline', 'utf8').split('\\0').join(' ').trim(); } catch {}
+          return [Number(name), command];
+        })
+      : execSync('ps -axo pid=,command=', {
+          stdio: ['ignore', 'pipe', 'ignore'],
+          maxBuffer: Infinity,
+        })
+          .toString().split('\\n').map((line) => line.trim().match(/^(\\d+)\\s+(.*)$/))
+          .filter(Boolean).map((row) => [Number(row[1]), row[2]]);
+    return rows.filter(([pid, command]) => pid && pid !== process.pid && (' ' + command + ' ').includes(flag));
+  } catch (error) {
+    throw new Error('[playwright-driver] cannot establish browser profile ownership: ' + String(error));
+  }
 };
+const chromePidsByProfile = () => profileProcesses().map(([pid]) => pid);
+const chromeCommandsByProfile = () => profileProcesses().map(([, command]) => command);
 const assertNoUnsafeSwiftShaderFlag = () => {
   if (!hardwareGpuRequired) return;
   const unsafe = chromeCommandsByProfile().find((command) =>
@@ -200,7 +208,29 @@ const killTree = (pid) => {
   for (const k of kids) killTree(k);
   try { process.kill(pid, 'SIGKILL'); } catch {}
 };
-const reapChrome = () => { for (const pid of chromePidsByProfile()) killTree(pid); };
+const reapChrome = () => {
+  try {
+    for (const pid of chromePidsByProfile()) {
+      let owned = false;
+      if (process.platform === 'linux') {
+        try {
+          owned = readFileSync('/proc/' + pid + '/environ', 'utf8').split('\\0')
+            .includes('PEACH_PW_BROWSER_OWNER=' + diskCacheDir);
+        } catch {}
+      } else {
+        const plain = spawnSync('ps', ['-o', 'command=', '-p', String(pid)], { encoding: 'utf8' });
+        const withEnv = spawnSync('ps', ['eww', '-o', 'command=', '-p', String(pid)], { encoding: 'utf8' });
+        const argv = (plain.stdout || '').trimEnd();
+        const full = (withEnv.stdout || '').trimEnd();
+        owned = plain.status === 0 && withEnv.status === 0 && full.startsWith(argv) &&
+          (full.slice(argv.length) + ' ').includes(' PEACH_PW_BROWSER_OWNER=' + diskCacheDir + ' ');
+      }
+      if (owned) killTree(pid);
+    }
+  } catch (error) {
+    process.stderr.write('[playwright-driver] browser teardown refused: ' + String(error) + '\\n');
+  }
+};
 const removeDisposableCaches = (root) => {
   let children = [];
   try { children = readdirSync(root, { withFileTypes: true }); } catch { return; }
@@ -230,7 +260,7 @@ const cleanupProfile = () => {
     try { rmSync(profileDir, { recursive: true, force: true }); } catch {}
     return;
   }
-  removeDisposableCaches(profileDir);
+  if (profileLaunched) removeDisposableCaches(profileDir);
 };
 (async () => {
   const pw = require(modulePath);
@@ -394,14 +424,16 @@ const cleanupProfile = () => {
     await bounded('desktop host stop', stopDesktopHost, timeoutMs);
     if (context) await bounded('context.close', () => context.close(), timeoutMs);
     await terminateBrowserProcess();
-    // close() + root-SIGKILL above handle the graceful case; the helper tree
-    // (gpu/renderer/utilities) reparents and survives every one of those, so
-    // we always sweep by our unique profile dir as the load-bearing teardown.
+    // close() can leave reparented helpers; reap only this launch's browser
+    // and helpers, even if another host now uses the same named profile.
     reapChrome();
     cleanupProfile();
     if (connectAckFile) {
       try { unlinkSync(connectAckFile); } catch {}
     }
+    if (admittedFile) {
+      try { unlinkSync(admittedFile); } catch {}
+    }
     process.exit(code);
   };
   process.once('SIGTERM', () => { void shutdown(0); });
@@ -434,13 +466,25 @@ const cleanupProfile = () => {
       throw new Error('[playwright-driver] missing valid owning process; refusing unsupervised browser host');
     }
     const intervalMs = Number.isFinite(ownerPollMs) && ownerPollMs > 0 ? ownerPollMs : 5000;
-    ownerWatch = setInterval(() => {
+    const gone = (pid) => {
       try {
-        process.kill(ownerPid, 0);
+        process.kill(pid, 0);
+        return false;
       } catch (err) {
-        if (err && err.code === 'EPERM') return;
+        return !(err && err.code === 'EPERM');
+      }
+    };
+    ownerWatch = setInterval(() => {
+      if (gone(ownerPid)) {
         process.stderr.write('[owner-gone] owning process ' + ownerPid + ' exited; closing playwright host\\n');
         void shutdown(0);
+        return;
+      }
+      // until the sim connects, the open command is the only one waiting for
+      // it; once that command is gone nobody receives the sim.
+      if (!connected && !ackFileExists() && Number.isInteger(launcherPid) && launcherPid > 1 && gone(launcherPid)) {
+        process.stderr.write('[launcher-gone] open command ' + launcherPid + ' exited before the sim connected; closing playwright host\\n');
+        void shutdown(2);
       }
     }, intervalMs);
     if (typeof ownerWatch.unref === 'function') ownerWatch.unref();
@@ -472,13 +516,19 @@ const cleanupProfile = () => {
     const opts = channel
       ? { headless, channel, viewport, deviceScaleFactor }
       : { headless, viewport, deviceScaleFactor };
+    opts.env = { ...process.env, PEACH_PW_BROWSER_OWNER: diskCacheDir };
     opts.executablePath = executablePath;
     if (libraryPath) {
       opts.env = {
-        ...process.env,
+        ...opts.env,
         LD_LIBRARY_PATH: [libraryPath, process.env.LD_LIBRARY_PATH].filter(Boolean).join(':'),
       };
     }
+    // keep the browser main process with its children in the caller's cgroup.
+    // otherwise chromium moves only main into a systemd app scope over dbus.
+    if (process.platform === 'linux') {
+      opts.env = { ...process.env, ...opts.env, ...${JSON.stringify(LINUX_CHROME_SCOPE_ENV)} };
+    }
     // playwright injects --force-color-profile=srgb by default, which reads
     // visibly washed-out next to a normal chrome window on a wide-gamut mac
     // display. strip it so driver-launched sims color-match the user's own
@@ -534,11 +584,9 @@ const cleanupProfile = () => {
     // room for chrome's own toolbar, so the window isn't desktop-shaped
     // around a letterboxed page.
     if (!headless) opts.args.push('--window-size=' + viewport.width + ',' + (viewport.height + 88));
-    // ALWAYS persistent: every chrome process inherits --user-data-dir=<dir>
-    // in its cmdline, which is how reapChrome() finds the whole tree (root +
-    // helpers) on shutdown. without a unique dir there is no way to attribute
-    // an orphaned helper back to us, which is the leak we just fixed.
-    return await pw.chromium.launchPersistentContext(profileDir, opts);
+    const launched = await pw.chromium.launchPersistentContext(profileDir, opts);
+    profileLaunched = true;
+    return launched;
   };
   // the host-wide chromium slot is held for this host's life; its exit frees it
   await acquireChromiumAdmission({
@@ -549,6 +597,11 @@ const cleanupProfile = () => {
     label: 'peach sim host ' + profileDir,
     readQueue: readChromiumQueue,
   });
+  // the launcher's connect wait starts here: time queued for the slot is not
+  // time the sim had to connect.
+  if (admittedFile) {
+    try { writeFileSync(admittedFile, JSON.stringify({ admittedAt: Date.now(), pid: process.pid }) + '\\n'); } catch {}
+  }
   clearStaleSingletonLock();
   let launchErr = null;
   let launchedChannel = null;
@@ -591,6 +644,8 @@ const cleanupProfile = () => {
   await context.grantPermissions(['camera']);
   const hostMeta = {
     sootsimHostDriver: 'playwright',
+    peachRenderer: hostCommand ? 'native' : 'chromium',
+    peachHostExecutable: hostCommand ? hostCommand[0] : null,
     sootsimHostPid: process.pid,
     sootsimHostOwnerPid: ownerPid,
     sootsimHostStartedAt: Date.now(),
@@ -629,6 +684,8 @@ const cleanupProfile = () => {
     await shutdown(0);
   });
   const pointerHosts = new WeakMap();
+  await context.exposeBinding('__peachHostAccessibility', (source, instanceIds) =>
+    captureBrowserAccessibility(source.page, instanceIds));
   await context.exposeBinding('__sootsimHostPointer', async (source, value) => {
     let pending = pointerHosts.get(source.page);
     if (!pending) {
@@ -677,6 +734,7 @@ const cleanupProfile = () => {
   }, Number.isFinite(connectTimeoutMs) && connectTimeoutMs > 0 ? connectTimeoutMs : 120000);
   if (typeof connectTimer.unref === 'function') connectTimer.unref();
   const page = await context.newPage();
+  await automateWebAuthenticationSessions(context, '__peachWebAuthenticationHost', page, !headless);
   if (hardwareGpuRequired) {
     assertNoUnsafeSwiftShaderFlag();
     const gpu = await page.evaluate(() => {

package/cli/drivers/playwright.ts

@@ -151,18 +151,15 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
   // renders natively and lets the page present only on capture; the host
   // reaches the browser over cdp, so it needs a debugging port.
   let hostCommand: string[] | null = null
-  if (headless && desktopHostPlatform()) {
+  if (headless && !opts.chromium && desktopHostPlatform()) {
     try {
       hostCommand = headlessHostCommand()
       if (!hostCommand && desktopHostPlatform() === 'linux-x64') {
-        // a missing or older host upgrades to the channel's current release; one published
-        // before the compatible headless host existed leaves this run on the browser engine alone
+        // delivery honors PEACH_DESKTOP_VERSION; a pin never follows channel latest.
         await desktopHostDelivery().install()
         hostCommand = headlessHostCommand()
         if (!hostCommand)
-          console.error(
-            '  native host release has no compatible headless host yet; rendering in the browser',
-          )
+          throw new Error('selected native host has no compatible headless entrypoint')
       }
     } catch (error) {
       return {
@@ -175,6 +172,7 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
 
   const errLog = join(tmpdir(), playwrightHostLogName(Date.now(), process.pid))
   const connectAckFile = `${errLog}.connected`
+  const admittedFile = `${errLog}.admitted`
   const completionFile = `${errLog}.completed`
   const errFd = openSync(errLog, 'a')
   try {
@@ -210,9 +208,11 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
             ? { SOOTSIM_PW_VIEWPORT: `${opts.viewport.width}x${opts.viewport.height}` }
             : {}),
           SOOTSIM_PW_CONNECTED_ACK_FILE: connectAckFile,
+          SOOTSIM_PW_ADMITTED_FILE: admittedFile,
           PEACH_PW_COMPLETION_FILE: completionFile,
           SOOTSIM_PW_CONNECT_TIMEOUT_MS: String(opts.connectTimeoutMs ?? 120_000),
           SOOTSIM_PW_OWNER_PID: String(ownerPid),
+          SOOTSIM_PW_LAUNCHER_PID: String(process.pid),
           SOOTSIM_PW_LIBRARY_PATH: provisioning.libraryPath ?? '',
         },
       },
@@ -233,11 +233,12 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
     const ownerNote = ` — browser closes when pid ${ownerPid}${ownerComm ? ` (${ownerComm})` : ''} exits, or after ${idleMinutes} min with no peach command or input if another browser launch is waiting for its slot`
     return {
       launched: true,
-      message: `playwright chrome launched → ${targetUrl.href}${ownerNote}`,
+      message: `playwright ${hostCommand ? 'native host' : 'Chromium'} launched → ${targetUrl.href}${ownerNote}`,
       pid: child.pid,
       target: resolved.spec,
       attachUrl: targetUrl.href,
       connectAckFile,
+      admittedFile,
       diagnosticLogPath: errLog,
       completion,
       completionFile,
@@ -257,7 +258,7 @@ async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
 export const playwrightDriver: Driver = {
   id: 'playwright',
   name: 'playwright',
-  description: 'programmatic chromium via the playwright package — headless default',
+  description: 'isolated Chromium; headless uses the native host when available',
   kind: 'automation',
   availability: probe,
   launch,

package/cli/drivers/types.ts

@@ -30,6 +30,8 @@ export interface DriverLaunchOptions {
   url?: string
   // run in headless mode where the driver supports it. ignored by electron.
   headless?: boolean
+  // opt this open into browser rendering without acquiring or attaching a native host.
+  chromium?: boolean
   // initial device model seed forwarded to the peach shell. the electron
   // driver forwards it via argv (--device=<model>); browser drivers receive
   // it already stamped on the URL (?device=<model>) by runOpenCommand.
@@ -86,6 +88,9 @@ export interface DriverLaunchResult {
   target?: string
   attachUrl?: string
   connectAckFile?: string
+  // written once the host holds its machine-wide browser slot; its connect
+  // budget starts there, so the launcher's wait starts there too.
+  admittedFile?: string
   diagnosticLogPath?: string
   // foreground guest hosts await the detached driver's exit without polling.
   completion?: Promise<DriverCompletion>

package/cli/maestro-accessibility.ts

@@ -1,7 +1,7 @@
 import type { PeachAccessibilityNode } from '@peach/globals'
 
 // maestro reads ios frames as integer edges (AXElement.boundsString).
-export function accessibilityBounds(node: PeachAccessibilityNode): {
+export function accessibilityBounds(node: Pick<PeachAccessibilityNode, 'frame'>): {
   x: number
   y: number
   width: number

package/cli/maestro-compare.ts

@@ -121,8 +121,8 @@ function absolutizeRefs(steps: unknown, flowDir: string): unknown {
   })
 }
 
-// insert one capture after every screen-changing top-level step. subflows run
-// as one step and are captured once, after they return.
+// insert maestro's pixel-stillness wait before each checkpoint on both sides.
+// subflows run as one step and are captured once, after they return.
 export function instrumentFlowSource(
   source: string,
   flowDir: string,
@@ -159,6 +159,7 @@ export function instrumentFlowSource(
     const label = stepLabel(step)
     const name = `${COMPARE_SHOT_DIR}/${String(captures.length + 1).padStart(3, '0')}-${slugify(label)}`
     captures.push({ name, step: index + 1, label })
+    out.push('waitForAnimationToEnd')
     out.push({ takeScreenshot: name })
   }
   // maestro reads flows as yaml 1.1, where a bare yes, no, on or off is a
@@ -280,14 +281,52 @@ export function nativeStepsFromCommandsJson(json: unknown): CompareStep[] {
   return steps
 }
 
-export function nativeFlowFailureFromLog(log: string, name: string): string | undefined {
-  const verdict = `[Failed] ${name}`
-  return log.split(/[\r\n]+/).some((line) => {
-    const text = line.trim()
-    return text === verdict || text.startsWith(`${verdict} (`)
+const XML_ENTITIES: Record<string, string> = {
+  amp: '&',
+  lt: '<',
+  gt: '>',
+  quot: '"',
+  apos: "'",
+}
+
+function decodeXml(text: string): string {
+  return text.replace(/&(?:#(\d+)|#x([\da-f]+)|(\w+));/gi, (match, dec, hex, name) => {
+    if (dec || hex) return String.fromCodePoint(parseInt(dec ?? hex, dec ? 10 : 16))
+    return XML_ENTITIES[name] ?? match
   })
-    ? 'Maestro reported this flow failed; see ios.log'
-    : undefined
+}
+
+export function junitFlowKey(name: string, fileStem: string): string {
+  return JSON.stringify([name, fileStem])
+}
+
+// maestro's own per-flow report (--format junit): one testcase per flow, whose
+// status and failure text are the verdict whatever the flow did or printed.
+// values hold the failure message per testcase, undefined for a pass, in
+// report order so flows that share a name and file stem pair in run order.
+export function nativeFlowVerdictsFromJunit(
+  xml: string,
+): Map<string, Array<string | undefined>> {
+  const verdicts = new Map<string, Array<string | undefined>>()
+  for (const match of xml.matchAll(/<testcase\b([^>]*?)(\/>|>([\s\S]*?)<\/testcase>)/g)) {
+    const attrs = new Map<string, string>()
+    for (const attr of (match[1] ?? '').matchAll(/([\w:-]+)="([^"]*)"/g)) {
+      attrs.set(attr[1]!, decodeXml(attr[2]!))
+    }
+    const file = attrs.get('file')
+    const name = attrs.get('name')
+    if (file === undefined || name === undefined) continue
+    const body = match[3] ?? ''
+    const failure =
+      /<(?:failure|error)\b[^>]*?(?:\/>|>([\s\S]*?)<\/(?:failure|error)>)/.exec(body)
+    const failed = failure !== null || attrs.get('status') === 'ERROR'
+    const message = failure?.[1] ? decodeXml(failure[1]).trim() : ''
+    const key = junitFlowKey(name, path.basename(file).replace(/\.(ya?ml)$/i, ''))
+    const list = verdicts.get(key) ?? []
+    list.push(failed ? `Maestro failed this flow: ${message || 'no message'}` : undefined)
+    verdicts.set(key, list)
+  }
+  return verdicts
 }
 
 // peach's commands.json (maestro-report.ts buildFlowCommandsJson)
@@ -325,6 +364,30 @@ export interface ScreenDiff {
   maskedTopPx: number
 }
 
+// captures of one framebuffer can differ by a column or row: maestro's xctest
+// shot drops the rightmost column of an odd framebuffer. such a pair is scored
+// on the top-left area both have, with no resampling, which would shift every
+// edge. null when the sizes match or differ by more than one pixel.
+export function commonAreaSize(
+  a: { width: number; height: number },
+  b: { width: number; height: number },
+): { width: number; height: number } | null {
+  const dw = Math.abs(a.width - b.width)
+  const dh = Math.abs(a.height - b.height)
+  if ((dw === 0 && dh === 0) || dw > 1 || dh > 1) return null
+  return { width: Math.min(a.width, b.width), height: Math.min(a.height, b.height) }
+}
+
+function cropTopLeft(src: PNG, width: number, height: number): PNG {
+  if (src.width === width && src.height === height) return src
+  const out = new PNG({ width, height })
+  for (let y = 0; y < height; y++) {
+    const from = y * src.width * 4
+    src.data.copy(out.data, y * width * 4, from, from + width * 4)
+  }
+  return out
+}
+
 function resample(src: PNG, width: number, height: number): PNG {
   const out = new PNG({ width, height })
   const sx = src.width / width
@@ -402,8 +465,13 @@ export function compareScreens(
   peachPng: Buffer,
   opts: { maskTopPx?: number } = {},
 ): { diff: ScreenDiff; triptych: Buffer } {
-  const native = PNG.sync.read(nativePng)
+  let native: PNG = PNG.sync.read(nativePng)
   let peach: PNG = PNG.sync.read(peachPng)
+  const common = commonAreaSize(native, peach)
+  if (common) {
+    native = cropTopLeft(native, common.width, common.height)
+    peach = cropTopLeft(peach, common.width, common.height)
+  }
   const { width, height } = native
   const aspectMismatch = Math.abs(peach.width / peach.height - width / height) > 0.01
   const resized = peach.width !== width || peach.height !== height
@@ -602,10 +670,14 @@ function screenCard(screen: CompareScreen, threshold: number, flowIndex: number)
   ].filter(Boolean)
   let body = ''
   if (screen.image) {
+    const imageUrl = screen.image.split('/').map(encodeURIComponent).join('/')
     body = `<div class="cols"><span>iOS simulator</span><span>Peach</span><span>pixel diff</span></div>
-<a href="${esc(screen.image)}" target="_blank"><img loading="lazy" src="${esc(screen.image)}" alt="${esc(screen.label)}"></a>`
+<a href="${esc(imageUrl)}" target="_blank"><img loading="lazy" src="${esc(imageUrl)}" alt="${esc(screen.label)}"></a>`
   } else {
-    const only = screen.nativeOnly ?? screen.peachOnly
+    const only = (screen.nativeOnly ?? screen.peachOnly)
+      ?.split('/')
+      .map(encodeURIComponent)
+      .join('/')
     body = only
       ? `<div class="cols one"><span>${screen.nativeOnly ? 'iOS simulator' : 'Peach'} only</span></div><a href="${esc(only)}" target="_blank"><img class="single" loading="lazy" src="${esc(only)}" alt="${esc(screen.label)}"></a>`
       : '<p class="quiet">Neither side reached this step.</p>'

package/cli/main.ts

@@ -42,7 +42,7 @@ async function handleTopLevelError(err: unknown): Promise<never> {
   // peach's known top-level errors are all single-line, narrow strings.
   // everything else gets the full stack so unexpected crashes still surface.
   const isKnownCliFailure =
-    /^command timed out after \d+s$/.test(msg) ||
+    /^command timed out after \d+(?:\.\d+)?s$/.test(msg) ||
     /^cannot hand off bridge on port \d+: pid \d+ is not this Peach invocation$/.test(
       msg,
     ) ||
@@ -63,7 +63,8 @@ async function handleTopLevelError(err: unknown): Promise<never> {
     msg.startsWith(
       `package.json already defines scripts.${rnxPublicBrand.commandName} as `,
     ) ||
-    msg.startsWith('could not resolve a native bundle for ')
+    msg.startsWith('could not resolve a native bundle for ') ||
+    msg.startsWith('could not load ')
   if (isKnownCliFailure && !process.env.SOOTSIM_VERBOSE) {
     process.stderr.write(`  ${msg}\n`)
     await exitWithFlushedOutput(1)

package/cli/outbound-endpoints.ts

@@ -491,7 +491,7 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
   },
   'packages/peach-engine/src/engine/lottie-runtime.ts :: fetch :: descriptor.value': {
     category: 'guest_app_network',
-    count: 2,
+    count: 1,
   },
   'packages/peach-engine/src/bundle-fetch.ts :: fetch-alias :: buildBrowserAssetProxyUrl(devServerUrl)':
     { category: 'guest_app_network', count: 1 },
@@ -528,6 +528,8 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
     category: 'guest_app_network',
     count: 1,
   },
+  "packages/peach-engine/src/mcp/shared-config-transport.ts :: fetch :: '/__sootsim/shared-config'":
+    { category: 'same_origin_runtime', count: 1 },
   'packages/peach-engine/src/mcp/ws-bridge.ts :: fetch :: bridgeHealthUrl': {
     category: 'local_development',
     count: 1,
@@ -561,8 +563,6 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
     category: 'guest_app_network',
     count: 1,
   },
-  "packages/peach-engine/src/projects/projects-persistence.ts :: fetch :: '/__sootsim/shared-config'":
-    { category: 'same_origin_runtime', count: 1 },
   'packages/peach-engine/src/react-native/index.ts :: fetch :: resource': {
     category: 'guest_app_network',
     count: 1,
@@ -655,7 +655,7 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
     count: 1,
   },
   "packages/peach-engine/src/settings/persistence.ts :: fetch :: '/__sootsim/shared-config'":
-    { category: 'same_origin_runtime', count: 2 },
+    { category: 'same_origin_runtime', count: 1 },
   'packages/peachsim/cli/app-fonts.ts :: fetch :: `${origin}/`': {
     category: 'local_development',
     count: 1,
@@ -673,6 +673,14 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
       category: 'local_development',
       count: 1,
     },
+  'packages/peachsim/cli/commands/control.ts :: net.connect :: port': {
+    category: 'local_development',
+    count: 1,
+  },
+  'packages/peachsim/cli/commands/control.ts :: fetch :: origin': {
+    category: 'local_development',
+    count: 1,
+  },
   'packages/peachsim/cli/commands/control.ts :: websocket :: `ws://127.0.0.1:${port}`': {
     category: 'local_development',
     count: 1,
@@ -805,6 +813,10 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
     category: 'local_development',
     count: 1,
   },
+  'packages/peachsim/src/expo-swift-ready.ts :: fetch :: endpointUrl': {
+    category: 'local_development',
+    count: 1,
+  },
   'packages/peach-engine/src/expo-swift-compilation.ts :: fetch-alias :: address': {
     category: 'local_development',
     count: 1,
@@ -855,8 +867,10 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
     category: 'same_origin_runtime',
     count: 1,
   },
-  'packages/peach-engine/src/engine/image-loader.ts :: fetch-alias :: resolveImageFetchUri(uri)':
-    { category: 'guest_app_network', count: 1 },
+  'packages/peach-engine/src/engine/image-loader.ts :: fetch-alias :: uri': {
+    category: 'guest_app_network',
+    count: 1,
+  },
   'packages/peach-engine/src/ExternalApp.tsx :: fetch-alias :: requestUrl': {
     category: 'guest_app_network',
     count: 1,