peachsim 0.1.1625 → 0.1.1635

package/cli/commands/maestro-compare.ts

@@ -8,6 +8,7 @@ import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
 import { devices } from 'peach-engine/settings/devices'
+import { PNG } from 'pngjs'
 import { rnxHomeDir } from '../../src/home-paths'
 import { parseFlowFile } from '../flow-file'
 import {
@@ -17,7 +18,8 @@ import {
   comparePassed,
   instrumentFlowSource,
   nativeStepsFromCommandsJson,
-  nativeFlowFailureFromLog,
+  nativeFlowVerdictsFromJunit,
+  junitFlowKey,
   peachStepsFromCommandsJson,
   screensOverThreshold,
   type CompareCapture,
@@ -161,12 +163,44 @@ function statusBarPx(png: Buffer): number {
   const height = png.readUInt32BE(20)
   const spec = Object.values(devices).find(
     (d) =>
-      Math.round(d.width * d.scale) === width &&
-      Math.round(d.height * d.scale) === height,
+      // maestro can truncate fractional point bounds one pixel below simctl.
+      Math.abs(Math.round(d.width * d.scale) - width) <= 1 &&
+      Math.abs(Math.round(d.height * d.scale) - height) <= 1,
   )
   return spec ? spec.statusBarHeight * spec.scale : 0
 }
 
+// maestro's xctest shot on an ios 27 simulator drops the rightmost column of
+// an odd framebuffer (1179 becomes 1178). diffing at that short width
+// resamples peach off the pixel grid, so restore the column first.
+function alignNativeCapture(png: Buffer): Buffer {
+  const width = png.readUInt32BE(16)
+  const height = png.readUInt32BE(20)
+  const spec = Object.values(devices).find(
+    (d) =>
+      Math.abs(Math.round(d.width * d.scale) - width) <= 1 &&
+      Math.abs(Math.round(d.height * d.scale) - height) <= 1,
+  )
+  if (!spec) return png
+  const expectedW = Math.round(spec.width * spec.scale)
+  const expectedH = Math.round(spec.height * spec.scale)
+  if (expectedH !== height || expectedW !== width + 1) return png
+  const src = PNG.sync.read(png)
+  const dst = new PNG({ width: expectedW, height })
+  for (let y = 0; y < height; y++) {
+    const srow = y * src.width * 4
+    const drow = y * expectedW * 4
+    src.data.copy(dst.data, drow, srow, srow + src.width * 4)
+    const last = srow + (src.width - 1) * 4
+    const o = drow + src.width * 4
+    dst.data[o] = src.data[last] ?? 0
+    dst.data[o + 1] = src.data[last + 1] ?? 0
+    dst.data[o + 2] = src.data[last + 2] ?? 0
+    dst.data[o + 3] = 255
+  }
+  return PNG.sync.write(dst)
+}
+
 // the flow as its author would name it: relative inside the working
 // directory, home-relative or absolute outside it.
 function displayPath(cwd: string, file: string): string {
@@ -201,22 +235,6 @@ function formatFailedRequest(entry: unknown): string {
   return `request failed: ${e.method ?? 'GET'} ${e.url ?? '?'} ${e.status ?? e.error ?? ''}`.trim()
 }
 
-// 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[] {
-  const seen = new Map<string, number>()
-  return files.map((file) => {
-    const slug =
-      path
-        .basename(file)
-        .replace(/\.(ya?ml)$/i, '')
-        .replace(/[^A-Za-z0-9._-]+/g, '_') || 'flow'
-    const n = (seen.get(slug) ?? 0) + 1
-    seen.set(slug, n)
-    return path.join(root, n === 1 ? slug : `${slug}-${n}`)
-  })
-}
-
 // the flow's appId as maestro resolves it: its `${...}` templates evaluate
 // against --env values (in process.env) and the flow's own env block.
 function resolveFlowAppId(frontmatter: Record<string, unknown>): string | undefined {
@@ -424,6 +442,10 @@ export async function runMaestroCompare(
         '--test-output-dir',
         nativeOut,
         '--no-ansi',
+        '--format',
+        'junit',
+        '--output',
+        path.join(out, 'ios-report.xml'),
         ...shared,
         ...envPairs,
       ],
@@ -433,18 +455,23 @@ export async function runMaestroCompare(
     spawnSync('xcrun', ['simctl', 'status_bar', udid, 'clear'], { stdio: 'ignore' })
   }
   console.log(`\n  ios │ maestro exited ${nativeExit}\n`)
-  const nativeLog = fs.readFileSync(path.join(out, 'ios.log'), 'utf8')
+  const nativeVerdicts = nativeFlowVerdictsFromJunit(
+    fs.readFileSync(path.join(out, 'ios-report.xml'), 'utf8'),
+  )
 
   // 2. peach, same instrumented flows (its --env already applied above)
   const peachOut = path.join(out, 'peach')
-  const peachResults = new Map<string, { exit: number; playbackFailure: string }>()
+  const peachResults = new Map<
+    string,
+    { exit: number; playbackFailure: string; outputDir: string | null }
+  >()
   await runMaestro(
     ['test', runTarget, '--test-output-dir', peachOut, ...shared, ...peachArgs],
     {
       ...opts,
       captureConsole: true,
-      onFlowResult: ({ file, exit, playbackFailure }) => {
-        peachResults.set(path.resolve(file), { exit, playbackFailure })
+      onFlowResult: ({ file, exit, playbackFailure, outputDir }) => {
+        peachResults.set(path.resolve(file), { exit, playbackFailure, outputDir })
       },
     },
   )
@@ -458,26 +485,56 @@ export async function runMaestroCompare(
         .sort()
         .pop()
     : undefined
-  const peachDirs = peachFlowDirs(
-    peachOut,
-    instrumented.map((f) => f.copy),
-  )
+  const nativeOutputs = new Map<string, Array<{ dir: string; commands: unknown }>>()
+  for (const entry of nativeRun
+    ? fs.readdirSync(nativeRun, { withFileTypes: true })
+    : []) {
+    if (!entry.isDirectory()) continue
+    const dir = path.join(nativeRun!, entry.name)
+    const commands = readJson(path.join(dir, 'commands.json'))
+    if (!Array.isArray(commands)) continue
+    // display names are not paths: maestro replaces slashes and suffixes collisions.
+    // the top-level bookkeeping retains the original flow identity.
+    let name: string | undefined
+    let fileStem: string | undefined
+    for (const command of commands) {
+      if (command?.metadata?.depth !== 0) continue
+      const config = command?.command?.applyConfigurationCommand?.config
+      if (typeof config?.name === 'string') name ??= config.name
+      const env = command?.command?.defineVariablesCommand?.env
+      if (typeof env?.MAESTRO_FILENAME === 'string') fileStem ??= env.MAESTRO_FILENAME
+    }
+    if (fileStem === undefined) continue
+    const key = JSON.stringify([name ?? fileStem, fileStem])
+    const outputs = nativeOutputs.get(key) ?? []
+    outputs.push({ dir, commands })
+    nativeOutputs.set(key, outputs)
+  }
   const imagesDir = path.join(out, 'images')
   const flows: CompareFlow[] = []
   for (const [i, flow] of instrumented.entries()) {
-    const nativeDir = nativeRun ? path.join(nativeRun, flow.name) : null
-    const peachDir = peachDirs[i]!
-    const nativeRan = Boolean(nativeDir && fs.existsSync(nativeDir))
+    const fileStem = path.basename(flow.copy).replace(/\.(ya?ml)$/i, '')
+    const nativeOutput = nativeOutputs.get(JSON.stringify([flow.name, fileStem]))?.shift()
+    const nativeDir = nativeOutput?.dir
+    const nativeRan = Boolean(nativeOutput)
     const peachResult = peachResults.get(path.resolve(flow.copy))
-    const nativeFailure = nativeFlowFailureFromLog(nativeLog, flow.name)
-    const peachRan = fs.existsSync(path.join(peachDir, 'commands.json'))
+    const peachDir = peachResult?.outputDir
+    const verdicts = nativeVerdicts.get(junitFlowKey(flow.name, fileStem))
+    const nativeFailure = verdicts?.length
+      ? verdicts.shift()
+      : 'no native verdict in ios-report.xml'
+    const peachRan = Boolean(
+      peachDir && fs.existsSync(path.join(peachDir, 'commands.json')),
+    )
     const nativeSteps = nativeRan
-      ? nativeStepsFromCommandsJson(readJson(path.join(nativeDir!, 'commands.json')))
+      ? nativeStepsFromCommandsJson(nativeOutput?.commands)
       : []
     const peachSteps = peachRan
-      ? peachStepsFromCommandsJson(readJson(path.join(peachDir, 'commands.json')))
+      ? peachStepsFromCommandsJson(readJson(path.join(peachDir!, 'commands.json')))
       : []
-    const consoleJson = readJson(path.join(peachDir, 'logs', 'console.json')) as {
+    const consoleJson = (
+      peachDir ? readJson(path.join(peachDir, 'logs', 'console.json')) : null
+    ) as {
       errors?: unknown[]
       requests?: unknown[]
     } | null
@@ -492,15 +549,17 @@ export async function runMaestroCompare(
       const nativePng = nativeDir
         ? path.join(nativeDir, 'takeScreenshot', `${capture.name}.png`)
         : ''
-      const peachPng = path.join(peachDir, 'screenshots', `${capture.name}.png`)
+      const peachPng = peachDir
+        ? path.join(peachDir, 'screenshots', `${capture.name}.png`)
+        : ''
       const hasNative = Boolean(nativePng) && fs.existsSync(nativePng)
-      const hasPeach = fs.existsSync(peachPng)
+      const hasPeach = Boolean(peachPng) && fs.existsSync(peachPng)
       const imageRel = path.join(
         'images',
         `${i + 1}-${capture.name.split('/').pop()}.png`,
       )
       if (hasNative && hasPeach) {
-        const nativeBytes = fs.readFileSync(nativePng)
+        const nativeBytes = alignNativeCapture(fs.readFileSync(nativePng))
         const { diff, triptych } = compareScreens(
           nativeBytes,
           fs.readFileSync(peachPng),

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/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`)