peachsim 0.1.1620 → 0.1.1635

package/cli/commands/maestro.ts

@@ -51,7 +51,12 @@ export interface RunMaestroOptions {
   // (maestro compare reads it for the errors Peach saw)
   captureConsole?: boolean
   // each flow's final verdict, including a failure before any step ran
-  onFlowResult?: (result: { file: string; exit: number; playbackFailure: string }) => void
+  onFlowResult?: (result: {
+    file: string
+    exit: number
+    playbackFailure: string
+    outputDir: string | null
+  }) => void
 }
 
 const MAESTRO_DIRS = ['.maestro', 'maestro']
@@ -518,6 +523,7 @@ export async function runMaestro(
   let worstExit = 0
   const results: Array<{
     file: string
+    outputDir: string | null
     exit: number
     durationMs: number
     steps: ReturnType<typeof getLastFlowTraceSteps>
@@ -537,6 +543,7 @@ export async function runMaestro(
         console.error(`  error: ${playbackFailure}`)
         results.push({
           file,
+          outputDir: flowTestDir,
           exit: 1,
           durationMs: 0,
           steps: [],
@@ -610,6 +617,7 @@ export async function runMaestro(
     }
     const result = {
       file,
+      outputDir: flowTestDir,
       exit,
       durationMs,
       steps: traceSteps,

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/record.ts

@@ -1,5 +1,5 @@
 // peach record — drives the engine's built-in canvas recorder over
-// the WS bridge. no playwright, no ffmpeg. encoding happens in the
+// the WS bridge. scene export opens an isolated viewer; encoding happens in the
 // running peach page (webm via MediaRecorder, mp4 via WebCodecs, gif
 // via gifenc, raw png frames via a shared bitmap sampler).
 
@@ -143,6 +143,8 @@ const RECORD_VALUE_FLAGS = new Set([
   '--origin',
   '--owner',
   '--repo',
+  '--scene',
+  '--shell-url',
 ])
 const RECORD_SUBCOMMANDS = new Set([
   'start',
@@ -151,6 +153,7 @@ const RECORD_SUBCOMMANDS = new Set([
   'status',
   'prelude-start',
   'upload',
+  'render',
 ])
 
 // the record subcommand (start/stop/cancel/status) is the first non-flag
@@ -195,6 +198,23 @@ export async function runRecord(args: string[], opts: RecordOptions) {
     // drop the subcommand token; the rest (incl. any --sim/--port) flows on
     // to the subcommand handlers, which parse bridge flags themselves.
     const rest = [...args.slice(0, sub.index), ...args.slice(sub.index + 1)]
+    if (sub.name === 'render') {
+      const scene = valueOf(rest, '--scene')
+      const shellUrl = valueOf(rest, '--shell-url')
+      const output = valueOf(rest, '--output')
+      if (!scene || !shellUrl || !output)
+        throw new Error('record render requires --scene, --shell-url and --output')
+      const { renderSceneToVideo } = await import('../scene-video')
+      const result = await renderSceneToVideo({
+        scene: readFileSync(scene),
+        shellUrl,
+        output,
+      })
+      console.log(
+        `  video: ${resolve(output)} (${result.frameCount} frames at 60 fps, ${result.sizeBytes} bytes, rendered in ${(result.renderTimeMs / 1000).toFixed(1)}s)`,
+      )
+      return
+    }
     if (sub.name === 'start') {
       await recordStart(rest, opts)
       return

package/cli/commands/screenshot.ts

@@ -140,7 +140,15 @@ examples:
     // --id / --text, missing device model). surface them as a one-line
     // failure instead of an uncaught internal stack trace.
     try {
-      await captureViaBridge(parsed, outputArg, rect, withFrame, layers, allowLoading)
+      await captureViaBridge(
+        parsed,
+        outputArg,
+        rect,
+        withFrame,
+        layers,
+        allowLoading,
+        opts.verbose === true || args.includes('--verbose') || args.includes('-v'),
+      )
     } catch (err) {
       console.error(
         `  screenshot failed: ${err instanceof Error ? err.message : String(err)}`,
@@ -206,7 +214,16 @@ async function captureViaBridge(
   withFrame: boolean,
   layers: 'full' | 'tenant' | 'shell' | undefined,
   allowLoading: boolean,
+  verbose: boolean,
 ) {
+  // --verbose names the phase a slow capture spent its time in.
+  const phases: string[] = []
+  let phaseStart = Date.now()
+  const phase = (name: string) => {
+    const now = Date.now()
+    phases.push(`${name} ${now - phaseStart}ms`)
+    phaseStart = now
+  }
   // 45s, not 10s: a first-paint capture on a headless CI runner with software
   // GL (SwiftShader) is bounded but slow. forceRenderAll caps at ~6s (two
   // 3s-bounded passes) and the WebGL→2D drawImage readback + PNG encode of a
@@ -225,6 +242,7 @@ async function captureViaBridge(
     // affects screenshot fidelity directly, so call it out explicitly so the
     // user doesn't accept a stale frame as ground truth.
     const health = await checkSimHealth(bridge)
+    phase('health')
     if (health.hidden) {
       process.stderr.write(
         '  ⚠ screenshot will capture the LAST PAINTED canvas — likely stale.\n' +
@@ -267,6 +285,7 @@ async function captureViaBridge(
       }
     }
 
+    phase('ready')
     let resolvedRect: SampleRect | null = rect
     const matcher = (rect as { __matcher?: { id?: string; text?: string } })?.__matcher
     if (matcher) {
@@ -297,6 +316,7 @@ async function captureViaBridge(
     if (layers) request.layers = layers
     if (cropRect) request.crop = cropRect
     const dataUrl: string = await bridge.send(request)
+    phase('capture')
     const pngPrefix = 'data:image/png;base64,'
     // never write a 0-byte "saved" file from an empty or malformed payload —
     // the sim may be alive but not painting (check `peach get errors`)
@@ -326,6 +346,8 @@ async function captureViaBridge(
     } else {
       await writeScreenshotOutput(outputPath, rawBuffer)
     }
+    phase('write')
+    if (verbose) console.log(`  timing: ${phases.join(', ')}`)
     console.log(`  saved: ${outputPath}`)
   } finally {
     bridge.close()

package/cli/commands/serve.ts

@@ -8,7 +8,10 @@
 // run in the foreground (ctrl-c to stop). the persistent launchd/systemd
 // daemon installation is handled by `peach daemon install`.
 
-import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
+import {
+  assertPeachPortEnvironment,
+  DEFAULT_SOOTSIM_BRIDGE_PORT,
+} from '../../src/bridge-constants'
 import {
   ensureRnxHome,
   isDaemonLockfileFresh,
@@ -58,6 +61,7 @@ examples:
     peachExit(0)
   }
 
+  assertPeachPortEnvironment(process.env)
   const portArgIdx = args.indexOf('--port')
   const port =
     portArgIdx >= 0 && args[portArgIdx + 1]
@@ -147,7 +151,8 @@ examples:
     if (sims.length > 0) lastUsedAt = Date.now()
     else if (
       starterGoneAt &&
-      Date.now() - Math.max(starterGoneAt, lastUsedAt, host.lastRequestAt) >= UNUSED_EXIT_MS
+      Date.now() - Math.max(starterGoneAt, lastUsedAt, host.lastRequestAt) >=
+        UNUSED_EXIT_MS
     ) {
       void shutdown('unused')
       return

package/cli/commands/setup.ts

@@ -17,7 +17,7 @@ import {
   writePrivacyPreferences,
 } from '../../src/home-paths'
 import { rnxRuntime } from '../../src/runtime-delivery'
-import { findDesktopCompanion } from '../desktop-companion'
+import { findDesktopCompanion, nativeDesktopIsDefault } from '../desktop-companion'
 import { isCi, PRIVACY_NOTICE } from '../privacy'
 import { confirm, select } from '../prompt'
 import {
@@ -155,12 +155,7 @@ export async function runSetup(
       serviceInstalled = true
     }
 
-    if (
-      simulatorDriver !== 'playwright' &&
-      process.platform !== 'darwin' &&
-      !options.dryRun &&
-      (simulatorDriver === 'desktop' || !findDesktopCompanion({ native: false }))
-    ) {
+    if (simulatorDriver !== 'playwright' && !options.dryRun && !findDesktopCompanion()) {
       await runInstallDesktop(
         simulatorDriver === 'desktop' ? ['--yes'] : ['--yes', '--electron'],
       )
@@ -272,7 +267,7 @@ function readSimulatorDriverFlag(args: string[]): SimulatorDriverPreference | un
   if (desktop && browser) {
     throw new Error('--desktop and --browser cannot be used together')
   }
-  if (desktop) return desktopHostPlatform() === 'mac-arm64' ? 'desktop' : 'electron'
+  if (desktop) return desktopHostPlatform() ? 'desktop' : 'electron'
   if (browser) return 'playwright'
   return undefined
 }
@@ -331,46 +326,29 @@ async function decideService(
   return confirm('Enable the background service?', true)
 }
 
+// the native app is the simulator window wherever it ships, and setup installs
+// it without asking. Windows chooses between the browser and its Electron app.
 async function decideSimulatorDriver(
   options: SetupOptions,
 ): Promise<SimulatorDriverPreference> {
-  if (process.platform === 'darwin' && !findDesktopCompanion()) {
-    if (options.simulatorDriver && options.simulatorDriver !== 'playwright') {
-      throw new Error('install the Mac app with `peach desktop install --native` first')
-    }
-    return 'playwright'
-  }
   if (options.simulatorDriver) return options.simulatorDriver
   const current = readSimulatorDriverPreference()
   if (current) return current
+  if (isCi()) return 'playwright'
+  if (nativeDesktopIsDefault()) return 'desktop'
+  if (process.platform !== 'win32') return 'playwright'
   if (options.ci || options.yes || options.dryRun) return 'playwright'
   requireInteractive(options, '--desktop or --browser')
-  const desktopDescription =
-    process.platform === 'darwin'
-      ? 'Desktop opens your installed native runtime (beta).'
-      : process.platform === 'win32'
-        ? 'Desktop downloads and runs the peach installer.'
-        : 'Desktop installs the native .deb with sudo apt-get and needs a desktop session.'
-  const desktopChoice =
-    process.platform === 'darwin'
-      ? 'Native app (beta)      Faster, may have more issues'
-      : process.platform === 'win32'
-        ? 'Desktop app            Runs the peach installer'
-        : 'Native app (beta)      Faster, may have more issues'
   printPromptBlock('Simulator window', [
     'Browser opens immediately in an isolated Chrome window.',
-    desktopDescription,
-    'The Desktop app opens in a dedicated native window.',
+    'Desktop downloads and runs the peach installer.',
+    'The Desktop app opens in a dedicated window.',
   ])
   const choice = await select('Where should peach open?', [
     'Browser (default)      No additional download',
-    desktopChoice,
+    'Desktop app            Runs the peach installer',
   ])
-  return choice === 0
-    ? 'playwright'
-    : process.platform === 'darwin'
-      ? 'desktop'
-      : 'electron'
+  return choice === 0 ? 'playwright' : 'electron'
 }
 
 // diagnostics and crash reports are on unless turned off; setup says so once
@@ -433,15 +411,14 @@ function printIntro(options: SetupOptions): void {
   if (options.json) return
   printBrand('Run any React Native app in a local simulator. No project setup required.')
   if (desktopHostPlatform()) {
-    printPromptBlock('Optional native runtime (beta)', [
-      'Try the native runtime for faster simulation. It is beta, so you may run into more issues.',
-      'Install the app: peach desktop install',
-      'Open your app: peach open <port> --driver desktop',
-      'Open a browser window: peach open <port> --driver playwright --headed',
+    printPromptBlock('Native desktop app', [
+      'peach opens your app in its native desktop app, which is faster than the browser.',
+      'Setup installs it, and peach open <port> uses it.',
+      'Open a browser window instead: peach open <port> --driver playwright --headed',
       ...(process.platform === 'linux'
-        ? ['Linux desktop installation uses sudo apt-get and needs a desktop session.']
+        ? ['On Linux the app installs with sudo apt-get and needs a desktop session.']
         : []),
-      'The background service is a separate choice that keeps the bridge ready for either runtime.',
+      'The background service is a separate choice that keeps the bridge ready for either window.',
     ])
   }
 }
@@ -451,7 +428,7 @@ function printHelp(): void {
 peach setup - configure optional local conveniences
 
 peach works without project setup. This command can enable the faster background
-service, choose Browser or Desktop, configure private diagnostics, and optionally
+service, install the native desktop app, configure private diagnostics, and optionally
 add an exact peachsim dependency plus a peach script for teammates.
 
 usage:

package/cli/commands/swift.ts

@@ -73,6 +73,11 @@ export async function runSwift(
     } else if (arg === '--scheme') {
       scheme = input[++index]
       if (!scheme || scheme.startsWith('-')) throw new Error('--scheme requires a value')
+    } else if (arg === '--swift-sdks-path') {
+      const value = input[++index]
+      if (!value || value.startsWith('-'))
+        throw new Error('--swift-sdks-path requires a value')
+      process.env.PEACH_SWIFT_SDKS_PATH = path.resolve(value)
     } else if (arg === '--host-port' || valueFlags.has(arg)) {
       const value = input[++index]
       if (!value || value.startsWith('-')) throw new Error(`${arg} requires a value`)