peachsim 0.1.1620 → 0.1.1625

package/cli/commands/inspect/settling.ts

@@ -1,3 +1,7 @@
+import {
+  accessibilityBounds,
+  sameNativeAccessibilityShape,
+} from '../../maestro-accessibility'
 import {
   inspectReadySnapshot,
   inspectWaitReady,
@@ -16,9 +20,11 @@ export type WaitForSootsimIdleOptions = {
   // in fewer polls instead of paying the count at its slower rate.
   stablePolls?: number
   strict?: boolean
-  // compare consecutive full-screen pixels, as maestro's ios driver does.
+  // compare consecutive full-screen pixels; explicit animation waits use this.
   // frame publications and caret blinks do not require a continuous window.
   paintStill?: boolean
+  // native maestro ios: pixel stability first, then native hierarchy equality.
+  maestro?: boolean
   // settle on motion alone, for the waits around a gesture: image loads and
   // network traffic move nothing on screen, and the hierarchy walk costs
   // seconds per poll on a large tree under load.
@@ -75,6 +81,7 @@ export async function waitForSootsimIdle({
   stablePolls = 3,
   strict = false,
   paintStill = false,
+  maestro = false,
   motionOnly = false,
   transitionStartWindowMs = 80,
   transitionTimeoutMs = 4000,
@@ -108,12 +115,15 @@ export async function waitForSootsimIdle({
       const pollMs = ${Math.max(1, Math.round(pollMs))}
       const strict = ${strict ? 'true' : 'false'}
       const paintStill = ${paintStill ? 'true' : 'false'}
+      const maestro = ${maestro ? 'true' : 'false'}
+      const accessibilityBounds = ${accessibilityBounds.toString()}
+      const sameNativeAccessibilityShape = ${sameNativeAccessibilityShape.toString()}
       const motionOnly = ${motionOnly ? 'true' : 'false'}
       // full mounted-geometry observation needs at least two hierarchy reads
       // plus the stillness window, which a sub-second budget cannot afford:
       // tight budgets (auto-wait) settle on worker stillness plus root
       // membership, generous ones confirm the geometry too.
-      const fullGeometry = ${!motionOnly && maxMs >= 1000 ? 'true' : 'false'}
+      const fullGeometry = ${!maestro && !motionOnly && maxMs >= 1000 ? 'true' : 'false'}
       const requiredStillMs = paintStill ? 0 : ${Math.max(1, Math.round(stablePolls)) * Math.max(1, Math.round(pollMs))}
       const minimumStablePolls = paintStill ? 1 : ${Math.min(2, Math.max(1, Math.round(stablePolls)))}
       const composite = paintStill ? window.SootSim?.bridges?.liveComposite : null
@@ -235,6 +245,9 @@ export async function waitForSootsimIdle({
           // strict also waits out shell motion: a system alert, sheet or menu
           // animates in the shell worker while the app's own stats read still,
           // so its presentation is complete only once the shell's list empties.
+          const accessibilityRead = maestro
+            ? answer(() => window.__sootsimTest.captureAccessibilityTree()).catch(() => null)
+            : null
           const motionRead = strict
             ? answer(() => window.__sootsimTest?.listAnimations?.()).catch(() => null)
             : null
@@ -244,9 +257,12 @@ export async function waitForSootsimIdle({
           // the compositor rejects a stats request it is too busy to answer.
           const compositorRead = answer(() => window.__sootsimCompositor.getStats()).catch(() => BUSY)
           const countsRead = motionOnly ? null : answer(() => window.__sootsimTest?.getRequestCounts?.()).catch(() => null)
-          // mounted-root membership: the live node count moves while the tree
-          // mounts, unmounts or recycles, in either render mode.
-          const nodeCountRead = answer(() => window.__sootsimTest?.getNodeCount?.()).catch(() => null)
+          // mounted-root membership: the count of nodes that can reach the
+          // window moves while the screen mounts, unmounts or recycles, in
+          // either render mode. a screen a pushed one covers or an inactive
+          // tab stays mounted out of the window, so what it mounts is not
+          // screen motion.
+          const nodeCountRead = answer(() => window.__sootsimTest?.getWindowNodeCount?.()).catch(() => null)
           // the mounted hierarchy in render-worker mode comes from the test
           // bridge: window.__sootsimRoot is an empty placeholder there, so a
           // walk over it hashes every screen to the same empty string while
@@ -276,7 +292,7 @@ export async function waitForSootsimIdle({
             const motion = await motionRead
             if (motion === BUSY) workerBusy = true
             else if (Array.isArray(motion)) {
-              const blocking = motion.filter((anim) => anim.realm === 'shell' && anim.priority !== 'low')
+              const blocking = motion.filter((anim) => anim.realm === 'shell' && anim.priority !== 'low' && anim.visible !== false)
               shellAnimating = blocking.length > 0
               // name what holds the settle so a timeout points at its owner.
               shellBlockers = blocking
@@ -308,6 +324,8 @@ export async function waitForSootsimIdle({
               stats.hasActiveAnims === true ||
               stats.hasActiveBlockingNativeAnimations === true ||
               (!paintStill && stats.hasPendingBlockingAnimationFrames === true)
+            // the runtime reports only layout work that can reach the window:
+            // a covered screen or inactive tab committing does not hold it.
             layoutDirty =
               stats.layoutDirty === true && stats.renderRequested === true
             // a freshly-pushed screen showing a skeleton is layout-stable
@@ -340,6 +358,11 @@ export async function waitForSootsimIdle({
           const total = await nodeCountRead
           if (total === BUSY) workerBusy = true
           nodeCount = typeof total === 'number' ? total : null
+          const accessibility = accessibilityRead ? await accessibilityRead : null
+          const nativeHierarchy = Array.isArray(accessibility) && accessibility.length > 0
+            ? accessibility
+            : null
+          if (accessibility === BUSY) workerBusy = true
           let hierarchy = hierarchyRead ? await hierarchyRead : null
           if (hierarchy === BUSY) {
             workerBusy = true
@@ -420,7 +443,7 @@ export async function waitForSootsimIdle({
               pixelFrameToken = token
             }
           }
-          return { layout: nodes.join(';'), screenPixels, animating, shellAnimating, shellBlockers, layoutDirty, pendingFetches, workerBusy, webViewStarting, webViewBlocker, renderStatsAvailable, requestTotal, requestInFlight, appCommits, nodeCount }
+          return { layout: nodes.join(';'), nativeHierarchy, screenPixels, animating, shellAnimating, shellBlockers, layoutDirty, pendingFetches, workerBusy, webViewStarting, webViewBlocker, renderStatsAvailable, requestTotal, requestInFlight, appCommits, nodeCount }
         }
 
         // how long generic background network is allowed to keep us waiting AFTER
@@ -434,6 +457,7 @@ export async function waitForSootsimIdle({
         // so the generic request counters are a courtesy, not a gate: honor them
         // only within this grace once the screen is visually still.
         const networkQuietGraceMs = 1200
+        let lastNativeHierarchy = null
         let lastLayout = ''
         let lastScreenPixels = null
         let screenChangedPolls = 0
@@ -461,6 +485,9 @@ export async function waitForSootsimIdle({
           }
           return true
         }
+        const hierarchyUnchanged = (current, previous) =>
+          current !== null && previous !== null && current.length === previous.length &&
+          current.every((node, index) => sameNativeAccessibilityShape(node, previous[index], accessibilityBounds))
         const IDLE_HELD = { idleHeld: true }
         while (true) {
           if (clockNow() >= deadline) {
@@ -506,7 +533,7 @@ export async function waitForSootsimIdle({
           // the loop head drains a transition still in flight before it ends.
           if (snapshot.workerBusy && clockNow() >= deadline && report) continue
           polls++
-          report = { snapshot, layout: lastLayout, screenPixels: lastScreenPixels, requestTotal: lastRequestTotal, appCommits: lastAppCommits, nodeCount: lastNodeCount }
+          report = { snapshot, nativeHierarchy: lastNativeHierarchy, layout: lastLayout, screenPixels: lastScreenPixels, requestTotal: lastRequestTotal, appCommits: lastAppCommits, nodeCount: lastNodeCount }
           if (snapshot.layoutDirty) dirtyPolls++
           if (snapshot.animating || snapshot.shellAnimating) animatingPolls++
           if (snapshot.webViewStarting) webViewStartingPolls++
@@ -527,7 +554,15 @@ export async function waitForSootsimIdle({
           // strictOk and adds shell motion plus the blocking-stats floor. a
           // null count or commit reading means the runtime does not report
           // it, which reads as stable the way a missing stats block does.
-          const visuallyStill =
+          // native screen checks observe output, not animation ownership. after
+          // its 3 s pixel phase, iOS accepts two equal native TreeNodes even
+          // while paint-only playback continues. overlap hierarchy reads so
+          // neither the gesture nor screenshot deadline grows.
+          const maestroStill = snapshot.screenPixels !== null && !snapshot.workerBusy && !snapshot.webViewStarting && (
+            !screenChanged || (clockNow() - start >= 3000 &&
+              hierarchyUnchanged(snapshot.nativeHierarchy, lastNativeHierarchy))
+          )
+          const visuallyStill = maestro ? maestroStill :
             strictOk &&
             !snapshot.animating &&
             !snapshot.layoutDirty &&
@@ -555,7 +590,7 @@ export async function waitForSootsimIdle({
             // grace (continuous background traffic must not block forever).
             if (
               stillProven() &&
-              (motionOnly || networkQuiet || clockNow() - visuallyStillSince >= networkQuietGraceMs)
+              (maestro || motionOnly || networkQuiet || clockNow() - visuallyStillSince >= networkQuietGraceMs)
             ) {
               if (transitionWait) {
                 await transitionWait
@@ -567,6 +602,7 @@ export async function waitForSootsimIdle({
             stillPolls = []
             visuallyStillSince = 0
           }
+          lastNativeHierarchy = snapshot.nativeHierarchy
           lastLayout = snapshot.layout
           lastScreenPixels = snapshot.screenPixels
           lastRequestTotal = snapshot.requestTotal
@@ -589,20 +625,21 @@ export async function waitForSootsimIdle({
         }
         const last = report.snapshot
         const blockers = []
-        if (strict && !last.renderStatsAvailable) blockers.push('render stats unavailable')
-        if (last.animating) blockers.push('animations still running')
-        if (last.shellAnimating) blockers.push('shell animations still running (' + last.shellBlockers + ')')
-        if (last.layoutDirty) blockers.push('layout still dirty')
-        if (last.appCommits !== null && report.appCommits !== null && last.appCommits !== report.appCommits) blockers.push('layout commits still landing')
-        if (last.nodeCount !== null && report.nodeCount !== null && last.nodeCount !== report.nodeCount) blockers.push('node count still changing')
-        if (!motionOnly && last.pendingFetches > 0) blockers.push(last.pendingFetches + ' image fetches pending')
+        if (!maestro && strict && !last.renderStatsAvailable) blockers.push('render stats unavailable')
+        if (!maestro && last.animating) blockers.push('animations still running')
+        if (!maestro && last.shellAnimating) blockers.push('shell animations still running (' + last.shellBlockers + ')')
+        if (!maestro && last.layoutDirty) blockers.push('layout still dirty')
+        if (!maestro && last.appCommits !== null && report.appCommits !== null && last.appCommits !== report.appCommits) blockers.push('layout commits still landing')
+        if (!maestro && last.nodeCount !== null && report.nodeCount !== null && last.nodeCount !== report.nodeCount) blockers.push('node count still changing')
+        if (!maestro && !motionOnly && last.pendingFetches > 0) blockers.push(last.pendingFetches + ' image fetches pending')
         if (last.workerBusy) blockers.push('a render worker too busy to report')
         if (last.webViewStarting) blockers.push(last.webViewBlocker || 'webView still starting')
-        if (last.layout !== report.layout) blockers.push('layout still changing')
+        if (!maestro && last.layout !== report.layout) blockers.push('layout still changing')
+        if (maestro && !hierarchyUnchanged(last.nativeHierarchy, report.nativeHierarchy)) blockers.push(last.nativeHierarchy === null ? 'native accessibility hierarchy unavailable' : 'native accessibility hierarchy still changing')
         if (paintStill && !last.screenPixels) blockers.push('screen pixels unavailable')
         else if (paintStill && !screenUnchanged(last.screenPixels, report.screenPixels)) blockers.push('screen pixels still changing')
-        if (!motionOnly && last.requestInFlight > 0) blockers.push(last.requestInFlight + ' requests in flight')
-        else if (!motionOnly && last.requestTotal !== report.requestTotal) blockers.push('new requests issued')
+        if (!maestro && !motionOnly && last.requestInFlight > 0) blockers.push(last.requestInFlight + ' requests in flight')
+        else if (!maestro && !motionOnly && last.requestTotal !== report.requestTotal) blockers.push('new requests issued')
         if (polls < 2) blockers.push('sim too busy to poll twice')
         // the last read is still: motion ended too near the deadline for the
         // stillness window to hold before it.

package/cli/commands/maestro-compare.ts

@@ -12,6 +12,7 @@ import { rnxHomeDir } from '../../src/home-paths'
 import { parseFlowFile } from '../flow-file'
 import {
   buildCompareHtml,
+  buildCompareSide,
   compareScreens,
   comparePassed,
   instrumentFlowSource,
@@ -22,7 +23,6 @@ import {
   type CompareCapture,
   type CompareFlow,
   type CompareReport,
-  type CompareSide,
 } from '../maestro-compare'
 import { MaestroJsContext } from '../maestro-js'
 import { collectFlowFiles, loadMaestroWorkspaceConfig } from '../maestro-workspace'
@@ -201,29 +201,6 @@ function formatFailedRequest(entry: unknown): string {
   return `request failed: ${e.method ?? 'GET'} ${e.url ?? '?'} ${e.status ?? e.error ?? ''}`.trim()
 }
 
-function sideFromSteps(
-  steps: CompareSide['steps'],
-  ran: boolean,
-  extraErrors: string[],
-  // a run that failed outside its steps (the sim or app never came up)
-  runFailure?: string,
-): CompareSide {
-  const failed = steps.find((s) => s.status === 'failed')
-  return {
-    status: !ran ? 'not run' : failed || runFailure ? 'failed' : 'passed',
-    durationMs: steps.reduce((sum, s) => sum + s.durationMs, 0),
-    steps,
-    errors: [
-      ...(failed
-        ? [`step "${failed.label}" failed: ${failed.error ?? 'no message'}`]
-        : runFailure
-          ? [runFailure]
-          : []),
-      ...extraErrors,
-    ],
-  }
-}
-
 // peach names each flow's output dir after the file stem, suffixing repeats
 // in run order (commands/maestro.ts uniqueFlowDir).
 function peachFlowDirs(root: string, files: string[]): string[] {
@@ -460,14 +437,14 @@ export async function runMaestroCompare(
 
   // 2. peach, same instrumented flows (its --env already applied above)
   const peachOut = path.join(out, 'peach')
-  const peachFailures = new Map<string, string>()
+  const peachResults = new Map<string, { exit: number; playbackFailure: string }>()
   await runMaestro(
     ['test', runTarget, '--test-output-dir', peachOut, ...shared, ...peachArgs],
     {
       ...opts,
       captureConsole: true,
       onFlowResult: ({ file, exit, playbackFailure }) => {
-        if (exit !== 0) peachFailures.set(path.resolve(file), playbackFailure)
+        peachResults.set(path.resolve(file), { exit, playbackFailure })
       },
     },
   )
@@ -491,6 +468,8 @@ export async function runMaestroCompare(
     const nativeDir = nativeRun ? path.join(nativeRun, flow.name) : null
     const peachDir = peachDirs[i]!
     const nativeRan = Boolean(nativeDir && fs.existsSync(nativeDir))
+    const peachResult = peachResults.get(path.resolve(flow.copy))
+    const nativeFailure = nativeFlowFailureFromLog(nativeLog, flow.name)
     const peachRan = fs.existsSync(path.join(peachDir, 'commands.json'))
     const nativeSteps = nativeRan
       ? nativeStepsFromCommandsJson(readJson(path.join(nativeDir!, 'commands.json')))
@@ -545,21 +524,21 @@ export async function runMaestroCompare(
     flows.push({
       name: flow.name,
       file: displayPath(cwd, flow.file),
-      native: sideFromSteps(
+      native: buildCompareSide(
         nativeSteps,
-        nativeRan,
+        nativeFailure ? 'failed' : nativeRan ? 'passed' : 'not run',
         nativeRan
           ? []
           : [
               `maestro produced no output for this flow (exit ${nativeExit}); see ios.log`,
             ],
-        nativeFlowFailureFromLog(nativeLog, flow.name),
+        nativeFailure,
       ),
-      peach: sideFromSteps(
+      peach: buildCompareSide(
         peachSteps,
-        peachRan,
+        peachResult ? (peachResult.exit === 0 ? 'passed' : 'failed') : 'not run',
         peachConsole,
-        peachFailures.get(path.resolve(flow.copy)),
+        peachResult?.exit ? peachResult.playbackFailure : undefined,
       ),
       screens,
     })

package/cli/commands/platform.ts

@@ -17,7 +17,7 @@ import { settingsStore } from 'peach-engine/settings/store'
 import { rnxPublicBrand } from '../../src/public-brand'
 import { UnsupportedRemoteHostError } from '../cloud-client'
 import { rethrowIfExit } from '../run-rnx'
-import type { CloudSession } from '../cloud-session'
+import type { CloudBoxSession, CloudSession } from '../cloud-session'
 
 const PLATFORM_LABEL: Record<RuntimePlatform, string> = {
   ios: 'iOS',
@@ -275,6 +275,7 @@ async function runRemoteCreate(
   const [
     { authHeaderOrExit, cloudAccountIdOrExit },
     {
+      assertBundleBuiltFor,
       claimCloudSimulator,
       closeCloudBox,
       closeCloudSession,
@@ -300,6 +301,7 @@ async function runRemoteCreate(
     undefined,
     input.assetsDirectory,
   )
+  assertBundleBuiltFor(artifact.bytes, platform, `peach ${platform} --remote`)
   const descriptor = requireCloudSessionShellUpdate()
   const { auth, header } = authHeaderOrExit(
     `${platform} ${args.includes('--nano') ? '--nano' : '--remote'}`,
@@ -401,8 +403,8 @@ async function runRemoteCreate(
  * a nano upload answers to does not apply.
  *
  * a box created from the already-built app boots it in its own page, and this
- * opens the bare shell watch url minted from the box's display grant — the same
- * /simulator#remoteEngine fragment the nano service mints, pointed at the box.
+ * opens the watch url the box service mints with its display grant, on the
+ * deploy that serves that page, as the nano service mints one on its own.
  */
 async function runRemoteBox(
   platform: RuntimePlatform,
@@ -413,10 +415,12 @@ async function runRemoteBox(
   const input = remoteInputFromArgs(args, platform)
   const [
     {
+      assertBundleBuiltFor,
       BoxBootFailedError,
       closeCloudBox,
       closeCloudSession,
       produceCloudBoxArtifact,
+      awaitBoxBoot,
       requestBoxWatchUrl,
     },
     box,
@@ -437,13 +441,35 @@ async function runRemoteBox(
     import('../cloud-session'),
   ])
   const { openInBrowser } = box
+  // an app that cannot boot never gets a simulator, so the box ends with the
+  // error instead of billing until someone finds it.
+  const awaitBootOrCloseBox = async (session: CloudBoxSession) => {
+    try {
+      await awaitBoxBoot({
+        apiOrigin: session.apiOrigin,
+        boxId: session.boxId,
+        boxToken: session.boxToken,
+      })
+    } catch (error) {
+      if (error instanceof BoxBootFailedError) {
+        await closeCloudBox(session)
+        try {
+          publishCloudSessionToShell(null)
+        } catch {
+          // no shell update channel is required outside an interactive peach shell
+        }
+        delete process.env[PEACH_CLOUD_SESSION_ENV]
+      }
+      throw error
+    }
+  }
   const artifact = await produceCloudBoxArtifact(input.bundlePath, input.assetsDirectory)
+  assertBundleBuiltFor(artifact.bytes, platform, `peach ${command}`)
   // the session records which bundle a box already holds, so reattaching can
   // tell the same app from a rebuilt one. the box producer returns no digest
   // of its own, so take it here over the bytes that actually crossed.
   const artifactSha256 = createHash('sha256').update(artifact.bytes).digest('hex')
-  const endpoint = box.cloudBoxEndpoint(args, command)
-  if (!endpoint) return 1
+  const endpoint = box.cloudBoxEndpoint(args)
 
   const existingSession = readCloudSession()
   // a launch link only means something to an app that is launching, so a box
@@ -470,6 +496,9 @@ async function runRemoteBox(
         connectUrl: cloudBoxConnectUrl(existingSession.apiOrigin, existingSession.boxId),
         accessToken: existingSession.boxToken,
       })
+      // a lapsed tab reboots the app, so a reconnect reads that boot's outcome
+      // before waiting on a simulator a throwing app never attaches.
+      await awaitBootOrCloseBox(existingSession)
       // grants are short-lived, so a reconnect mints a fresh one rather than
       // reopening whatever url the create printed.
       const watchUrl = await requestBoxWatchUrl({
@@ -562,27 +591,12 @@ async function runRemoteBox(
   }
   // the session is published before the grant is minted, so a grant that never
   // arrives still leaves the box addressable: re-running this command mints it.
-  let watchUrl: string
-  try {
-    watchUrl = await requestBoxWatchUrl({
-      apiOrigin: endpoint,
-      boxId: created.id,
-      boxToken: created.accessToken ?? '',
-    })
-  } catch (error) {
-    // an app that cannot boot never gets a simulator, so the box ends with the
-    // error instead of billing until someone finds it.
-    if (error instanceof BoxBootFailedError) {
-      await closeCloudBox(session)
-      try {
-        publishCloudSessionToShell(null)
-      } catch {
-        // no shell update channel is required outside an interactive peach shell
-      }
-      delete process.env[PEACH_CLOUD_SESSION_ENV]
-    }
-    throw error
-  }
+  const watchUrl = await requestBoxWatchUrl({
+    apiOrigin: endpoint,
+    boxId: created.id,
+    boxToken: created.accessToken ?? '',
+  })
+  await awaitBootOrCloseBox(session)
   console.log(`  open ${watchUrl}`)
   return openInBrowser(watchUrl)
 }
@@ -598,11 +612,22 @@ export async function runRemoteList(args: string[]): Promise<number> {
       }
       throw new Error(`usage: peach remote list [--json]`)
     }
-    const [{ authHeaderOrExit, cloudAccountIdOrExit }, { listRemoteSims }] =
-      await Promise.all([import('../auth'), import('../cloud-client')])
+    const [
+      { authHeaderOrExit, cloudAccountIdOrExit },
+      { listAccountRemoteSimulators },
+      { cloudBoxApiOrigin },
+    ] = await Promise.all([
+      import('../auth'),
+      import('../remote-simulators'),
+      import('./box'),
+    ])
     const { auth, header } = authHeaderOrExit('remote list')
     const accountId = cloudAccountIdOrExit(auth)
-    const sims = await listRemoteSims({ authorization: header, accountId })
+    const sims = await listAccountRemoteSimulators({
+      apiOrigin: cloudBoxApiOrigin(args, auth),
+      authorization: header,
+      accountId,
+    })
     if (json) {
       console.log(JSON.stringify({ sims }))
       return 0
@@ -612,6 +637,10 @@ export async function runRemoteList(args: string[]): Promise<number> {
       return 0
     }
     for (const sim of sims) {
+      if (sim.service === 'box') {
+        console.log(`  ${sim.simId}  ${sim.status}  ${sim.name ?? ''}`)
+        continue
+      }
       const platformLabel = sim.labels['peach.platform'] ?? 'unknown'
       console.log(
         `  ${sim.simId}  ${sim.status}  ${platformLabel}  sha256:${sim.artifact.sha256.slice(0, 12)}`,
@@ -643,11 +672,13 @@ export async function runRemoteStop(args: string[]): Promise<number> {
     const simId = positional[0]
     const [
       { authHeaderOrExit, cloudAccountIdOrExit },
-      { deleteRemoteSim },
+      { stopAccountRemoteSimulator },
+      { cloudBoxApiOrigin },
       { publishCloudSessionToShell, readCloudSession, requireCloudSessionShellUpdate },
     ] = await Promise.all([
       import('../auth'),
-      import('../cloud-client'),
+      import('../remote-simulators'),
+      import('./box'),
       import('../cloud-session'),
     ])
     let current: CloudSession | null = null
@@ -659,16 +690,20 @@ export async function runRemoteStop(args: string[]): Promise<number> {
     // stopping the shell's own simulator clears the shell with it, so the
     // update channel is required before anything is deleted.
     const descriptor =
-      current?.service === 'sim' && current.simId === simId
+      (current?.service === 'sim' && current.simId === simId) ||
+      (current?.service === 'box' && current.boxId === simId)
         ? requireCloudSessionShellUpdate()
         : null
     const { auth, header } = authHeaderOrExit('remote stop')
     const accountId = cloudAccountIdOrExit(auth)
-    const deleted = await deleteRemoteSim({
+    const deleted = await stopAccountRemoteSimulator(
+      {
+        apiOrigin: cloudBoxApiOrigin(args, auth),
+        authorization: header,
+        accountId,
+      },
       simId,
-      authorization: header,
-      accountId,
-    })
+    )
     if (!deleted) {
       console.error(
         `  ${rnxPublicBrand.commandName} remote stop: ${simId} does not exist`,

package/cli/commands/upload.ts

@@ -14,6 +14,7 @@ import path from 'path'
 import { gzipSync, gunzipSync } from 'zlib'
 import { readProfileTrace } from '@peach/globals/profile-trace'
 import { toProfileFile, type ProfileFile } from '@peach/globals/profiler'
+import { resolveAppFontsWire } from 'peach-engine/engine/config-plugin-fonts'
 import { shouldCompress } from 'peach-engine/preview/compress'
 import { brotliBundle } from 'peach-engine/preview/compress-node'
 import {
@@ -939,7 +940,10 @@ export async function runUpload(
   // fetcher (same code path as the build's `peach app-fonts stage`) so both
   // pipelines store identical bytes keyed by sha256(url).
   const appFontFiles: PreparedFile[] = []
-  const appFontsWire = appFontsWireFromPageHref(snapshot.pageHref) || ''
+  const appFontsWire = await resolveAppFontsWire(
+    appFontsWireFromPageHref(snapshot.pageHref),
+    fetch,
+  )
   if (appFontsWire) {
     const fonts = await fetchAppFontFiles(appFontsWire, {
       onStaged: ({ url, byteLength }) =>

package/cli/dev-build-freshness.ts

@@ -14,8 +14,8 @@
 // watcher would bundle chokidar and private engine/bundler modules into the cli.
 // deps-web belongs to a different served tree.
 
-import { readdirSync, statSync, type Dirent } from 'node:fs'
-import { join, relative, sep } from 'node:path'
+import { readdirSync, statSync, utimesSync, type Dirent } from 'node:fs'
+import { join, relative, resolve, sep } from 'node:path'
 
 export const DEV_BUILD_REBUILD_COMMAND = 'bun run build:peach'
 
@@ -159,6 +159,41 @@ function newestForEntry(monorepoRoot: string, repoPath: string): NewestFile | nu
   return null
 }
 
+/** stamps the sentinels under `installedRoot` as built at `sourceCapturedAt`,
+ *  when the build captured its source. an install that finds identical bytes
+ *  (remote cache hit, byte-identical promotion) leaves their old mtimes, which
+ *  the gate would read as a stale build; stamping the install time instead
+ *  would hide a source edit made while the build ran. */
+export function markDevBuildCurrent(
+  monorepoRoot: string,
+  installedRoot: string,
+  sourceCapturedAt: Date,
+): void {
+  const installed = resolve(installedRoot)
+  for (const route of ROUTES) {
+    for (const artifact of route.artifacts) {
+      const absolute = join(monorepoRoot, artifact)
+      if (absolute !== installed && !absolute.startsWith(installed + sep)) continue
+      const stack = [absolute]
+      while (stack.length > 0) {
+        const path = stack.pop()
+        if (path === undefined) continue
+        let stat: ReturnType<typeof statSync>
+        try {
+          stat = statSync(path)
+        } catch {
+          continue
+        }
+        if (stat.isDirectory()) {
+          for (const name of readdirSync(path)) stack.push(join(path, name))
+        } else {
+          utimesSync(path, sourceCapturedAt, sourceCapturedAt)
+        }
+      }
+    }
+  }
+}
+
 function toRepoPath(monorepoRoot: string, absolutePath: string): string {
   return relative(monorepoRoot, absolutePath).split(sep).join('/')
 }

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

@@ -37,6 +37,7 @@ import {
   webViewAutomationHelpersSource,
 } from '../../../peach-engine/src/webview-automation-host'
 import { DISPOSABLE_BROWSER_CACHE_DIR_NAMES } from '../../src/browser-cache'
+import { listProcessChildren } from '../../src/process-group'
 
 // a person's tap on the device canvas is a trusted input, which gives the page
 // the user activation browsers require before media plays with sound, and an
@@ -113,8 +114,9 @@ const completionFile = process.env.PEACH_PW_COMPLETION_FILE || '';
 const disposableBrowserCacheDirs = new Set(${JSON.stringify(
   DISPOSABLE_BROWSER_CACHE_DIR_NAMES,
 )});
-const { existsSync, mkdtempSync, readdirSync, rmSync, unlinkSync, writeFileSync } = require('fs');
-const { execSync, spawn } = require('child_process');
+const { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync, unlinkSync, writeFileSync } = require('fs');
+const { execSync, spawn, spawnSync } = require('child_process');
+const listProcessChildren = ${listProcessChildren.toString()};
 const { tmpdir } = require('os');
 const { join } = require('path');
 const createBrowserPointerDispatcher = ${createBrowserPointerDispatcher.toString()};
@@ -193,10 +195,9 @@ const assertNoUnsafeSwiftShaderFlag = () => {
 const killTree = (pid) => {
   let kids = [];
   try {
-    kids = execSync('pgrep -P ' + pid + ' || true', { stdio: ['ignore', 'pipe', 'ignore'] })
-      .toString().split('\\n').filter(Boolean);
+    kids = listProcessChildren([pid]);
   } catch {}
-  for (const k of kids) killTree(Number(k));
+  for (const k of kids) killTree(k);
   try { process.kill(pid, 'SIGKILL'); } catch {}
 };
 const reapChrome = () => { for (const pid of chromePidsByProfile()) killTree(pid); };

package/cli/maestro-accessibility.ts

@@ -0,0 +1,53 @@
+import type { PeachAccessibilityNode } from '@peach/globals'
+
+// maestro reads ios frames as integer edges (AXElement.boundsString).
+export function accessibilityBounds(node: PeachAccessibilityNode): {
+  x: number
+  y: number
+  width: number
+  height: number
+} {
+  const left = Math.trunc(node.frame.x)
+  const top = Math.trunc(node.frame.y)
+  return {
+    x: left,
+    y: top,
+    width: Math.trunc(node.frame.x + node.frame.width) - left,
+    height: Math.trunc(node.frame.y + node.frame.height) - top,
+  }
+}
+
+// upstream Filters.containsChild compares the resolved child TreeNode against
+// a candidate's immediate children by structural equality: the native
+// attribute map, the boolean flags, and the children, recursively. the native
+// hintText attribute is the placeholder (accessibilityHint is not a TreeNode
+// attribute), and engine identity (elementId/nodeId) plus the projection's own
+// metadata (type, role, isAccessibilityElement, state) are not part of that
+// native shape.
+// bounds is explicit so serialized page evaluation survives cli minification.
+export function sameNativeAccessibilityShape(
+  a: PeachAccessibilityNode,
+  b: PeachAccessibilityNode,
+  bounds: typeof accessibilityBounds,
+): boolean {
+  if (
+    (a.testID ?? '') !== (b.testID ?? '') ||
+    (a.label ?? '') !== (b.label ?? '') ||
+    (a.placeholder ?? '') !== (b.placeholder ?? '') ||
+    (a.value ?? '') !== (b.value ?? '') ||
+    a.enabled !== b.enabled ||
+    a.selected !== b.selected ||
+    a.checked !== b.checked ||
+    a.clickable !== b.clickable ||
+    (a.hasFocus ?? false) !== (b.hasFocus ?? false) ||
+    JSON.stringify(bounds(a)) !== JSON.stringify(bounds(b)) ||
+    a.children.length !== b.children.length
+  ) {
+    return false
+  }
+  for (const [index, child] of a.children.entries()) {
+    const other = b.children[index]
+    if (!other || !sameNativeAccessibilityShape(child, other, bounds)) return false
+  }
+  return true
+}