peachsim 0.1.939 → 0.1.1399

package/cli/commands/screenshot.ts

@@ -14,7 +14,7 @@ import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
 import { composeFramedScreenshot } from '../../src/screenshots/frame-compose'
 import { buildResolveRectEval, type SampleRect } from '../browser-evals'
 import { createCloudBridgeForParsed } from '../cloud-client'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import {
   callInBridge,
   checkSimHealth,
@@ -64,7 +64,7 @@ examples:
   peach screenshot --area 0,200,393,400 --output hero.png
   peach screenshot --id loginButton --output button.png
 `)
-    rnxExit(0)
+    peachExit(0)
   }
 
   const unknown = findUnknownFlags(args)
@@ -77,7 +77,7 @@ examples:
       )
     }
     console.error('  run `peach screenshot --help` for the list of supported flags')
-    rnxExit(1)
+    peachExit(1)
   }
 
   const allowLoading = args.includes('--allow-loading')
@@ -90,7 +90,7 @@ examples:
   ) {
     console.error('  --with-frame only supports full-screen capture for now')
     console.error('  remove --area / --id / --text, or capture raw and compose later')
-    rnxExit(1)
+    peachExit(1)
   }
 
   // share the standard bridge arg parser so --sim / --port / saved sims
@@ -126,7 +126,7 @@ examples:
       console.error(
         `  screenshot failed: ${error instanceof Error ? error.message : String(error)}`,
       )
-      rnxExit(1)
+      peachExit(1)
     } finally {
       cloudBridge.close()
     }
@@ -145,7 +145,7 @@ examples:
       console.error(
         `  screenshot failed: ${err instanceof Error ? err.message : String(err)}`,
       )
-      rnxExit(1)
+      peachExit(1)
     }
     return
   }
@@ -153,7 +153,7 @@ examples:
   if (withFrame) {
     console.error('  --with-frame requires a running peach bridge')
     console.error('  open the app in a live sim first, then rerun the command')
-    rnxExit(1)
+    peachExit(1)
   }
 
   if (rect) {
@@ -161,7 +161,7 @@ examples:
     console.error(
       '  start one with `peach serve`, `peach desktop`, or your project dev server',
     )
-    rnxExit(1)
+    peachExit(1)
   }
 
   await runPlaywrightScreenshot(args, opts)

package/cli/commands/screenshots-capture.ts

@@ -25,7 +25,7 @@ import { chromium, type Frame, type Page } from 'playwright-core'
 import { launchReapedChromeScoped } from '../../../../scripts/lib/reap-browser'
 import { rnxPublicBrand } from '../../src/public-brand'
 import { resolveCliAuth, type CliAuth } from '../auth'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 
 const HELP = `
 peach screenshot appstore capture — headlessly capture + upload App Store slides
@@ -129,7 +129,7 @@ function resolveSessionAuth(): { token: string; origin: string } {
     '\n  peach screenshot appstore capture needs a logged-in session.\n' +
       '  run `peach login` first (the captured slides upload to that account).\n\n',
   )
-  rnxExit(1)
+  peachExit(1)
 }
 
 function isLoopback(hostname: string): boolean {

package/cli/commands/serve.ts

@@ -15,15 +15,12 @@ import {
   readDaemonLockfile,
 } from '../../src/home-paths'
 import { SootSimBridgeHost } from '../../src/host/bridge-host'
-import {
-  findMonorepoRoot,
-  resolveDevCheckoutRuntimeRoot,
-} from '../../src/runtime-assets'
-import { rnxExit } from '../run-rnx'
+import { findMonorepoRoot, resolveDevCheckoutRuntimeRoot } from '../../src/runtime-assets'
 import {
   DEV_BUILD_REBUILD_COMMAND,
   findStaleDevBuildRoutes,
 } from '../dev-build-freshness'
+import { peachExit } from '../run-rnx'
 import { resolveDefaultUploadOrigin } from './upload'
 
 interface ServeOptions {
@@ -52,7 +49,7 @@ examples:
   peach serve --port 7668 --quiet
   peach serve --host 0.0.0.0
 `)
-    rnxExit(0)
+    peachExit(0)
   }
 
   const portArgIdx = args.indexOf('--port')
@@ -62,13 +59,13 @@ examples:
       : (opts.port ?? DEFAULT_SOOTSIM_BRIDGE_PORT)
   if (Number.isNaN(port)) {
     console.error(`  invalid --port value: ${args[portArgIdx + 1]}`)
-    rnxExit(1)
+    peachExit(1)
   }
   const hostArgIdx = args.indexOf('--host')
   const bindHost = hostArgIdx >= 0 ? args[hostArgIdx + 1] : '127.0.0.1'
   if (!bindHost || bindHost.startsWith('-')) {
     console.error('  --host requires a listener address')
-    rnxExit(1)
+    peachExit(1)
   }
   const quiet = args.includes('--quiet') || args.includes('-q')
 
@@ -81,7 +78,7 @@ examples:
       `  a peach bridge is already running (pid ${existingLock.pid}, port ${existingLock.bridgePort})`,
     )
     console.error(`  stop it with 'peach daemon stop' first`)
-    rnxExit(1)
+    peachExit(1)
   }
 
   // in a dev checkout serve() serves the dev-stack build directly, so a
@@ -100,9 +97,9 @@ examples:
         )
       }
       console.error(
-        `  rebuild with \`${DEV_BUILD_REBUILD_COMMAND}\` (or run bun dev so watch:sootsim keeps it current), then try again.`,
+        `  rebuild with \`${DEV_BUILD_REBUILD_COMMAND}\` (or run bun dev so watch:peach keeps it current), then try again.`,
       )
-      rnxExit(1)
+      peachExit(1)
     }
   }
 
@@ -159,7 +156,7 @@ examples:
     try {
       await host.close()
     } catch {}
-    rnxExit(0)
+    peachExit(0)
   }
   process.on('SIGINT', () => shutdown('SIGINT'))
   process.on('SIGTERM', () => shutdown('SIGTERM'))

package/cli/commands/setup.ts

@@ -6,6 +6,7 @@ import os from 'node:os'
 import path from 'node:path'
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
 import { getCliVersion } from '../../src/cli-version'
+import { desktopHostPlatform } from '../../src/desktop-host-delivery'
 import {
   readActiveRuntime,
   readPrivacyPreferences,
@@ -147,8 +148,14 @@ export async function runSetup(
       serviceInstalled = true
     }
 
-    if (simulatorDriver === 'electron' && !options.dryRun && !findDesktopCompanion()) {
-      await runInstallDesktop(['--yes'])
+    if (
+      simulatorDriver !== 'playwright' &&
+      !options.dryRun &&
+      (simulatorDriver === 'desktop' || !findDesktopCompanion({ native: false }))
+    ) {
+      await runInstallDesktop(
+        simulatorDriver === 'desktop' ? ['--yes'] : ['--yes', '--electron'],
+      )
     }
 
     if (launchConnectRN) {
@@ -246,7 +253,7 @@ function readSimulatorDriverFlag(args: string[]): SimulatorDriverPreference | un
   if (desktop && browser) {
     throw new Error('--desktop and --browser cannot be used together')
   }
-  if (desktop) return 'electron'
+  if (desktop) return desktopHostPlatform() === 'mac-arm64' ? 'desktop' : 'electron'
   if (browser) return 'playwright'
   return undefined
 }
@@ -314,17 +321,21 @@ async function decideSimulatorDriver(
   if (options.ci || options.yes || options.dryRun) return 'playwright'
   requireInteractive(options, '--desktop or --browser')
   const desktopDescription =
-    process.platform === 'darwin'
-      ? 'Desktop downloads a DMG and installs peach.app.'
-      : process.platform === 'win32'
-        ? 'Desktop downloads and runs the peach installer.'
-        : 'Desktop downloads the matching peach AppImage.'
+    desktopHostPlatform() === 'mac-arm64'
+      ? 'Desktop installs the signed native Peach.app.'
+      : process.platform === 'darwin'
+        ? 'Desktop downloads a DMG and installs peach.app.'
+        : process.platform === 'win32'
+          ? 'Desktop downloads and runs the peach installer.'
+          : 'Desktop downloads the matching peach AppImage.'
   const desktopChoice =
-    process.platform === 'darwin'
-      ? 'Desktop app            Installs peach.app from a DMG'
-      : process.platform === 'win32'
-        ? 'Desktop app            Runs the peach installer'
-        : 'Desktop app            Installs the matching AppImage'
+    desktopHostPlatform() === 'mac-arm64'
+      ? 'Desktop app            Installs the signed native host'
+      : process.platform === 'darwin'
+        ? 'Desktop app            Installs peach.app from a DMG'
+        : process.platform === 'win32'
+          ? 'Desktop app            Runs the peach installer'
+          : 'Desktop app            Installs the matching AppImage'
   printPromptBlock('Simulator window', [
     'Browser opens immediately in an isolated Chrome window.',
     desktopDescription,
@@ -334,7 +345,11 @@ async function decideSimulatorDriver(
     'Browser (recommended)  No additional download',
     desktopChoice,
   ])
-  return choice === 0 ? 'playwright' : 'electron'
+  return choice === 0
+    ? 'playwright'
+    : desktopHostPlatform() === 'mac-arm64'
+      ? 'desktop'
+      : 'electron'
 }
 
 // diagnostics and crash reports are on unless turned off; setup says so once

package/cli/commands/shell-boolean-mode.ts

@@ -1,4 +1,4 @@
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { callInBridge, createBridgeFromParsed, parseBridgeCliArgs } from '../ws-bridge'
 
 export type ShellBooleanModeAction = 'on' | 'off' | 'toggle'
@@ -24,7 +24,7 @@ export function parseShellBooleanModeAction(args: string[]): ShellBooleanModeAct
   const action = args[0]?.toLowerCase() ?? 'toggle'
   if (action !== 'on' && action !== 'off' && action !== 'toggle') {
     console.error(`  unknown argument: "${action}" (expected on | off | toggle)`)
-    rnxExit(1)
+    peachExit(1)
   }
   return action
 }

package/cli/commands/show-touches-mode.ts

@@ -1,7 +1,7 @@
 // peach mode show-touches — toggle OS touch indicators (Show Single Touches / Show taps)
 // in the running peach sim.
 
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { runShellBooleanMode, type ShellBooleanModeOptions } from './shell-boolean-mode'
 
 export async function runShowTouchesMode(args: string[], opts: ShellBooleanModeOptions) {
@@ -22,7 +22,7 @@ examples:
   peach mode show-touches on
   peach mode show-touches off
 `)
-    rnxExit(0)
+    peachExit(0)
   }
 
   await runShellBooleanMode(args, opts, {

package/cli/commands/skills.ts

@@ -13,7 +13,7 @@ import { fileURLToPath } from 'url'
 import { getCliVersion } from '../../src/cli-version'
 import { rnxHomeDir } from '../../src/home-paths'
 import { rnxPublicBrand } from '../../src/public-brand'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 
 declare const __PEACH_BUNDLED_SKILLS__: Record<string, string>
 
@@ -277,7 +277,7 @@ function agentTarget(target: string): InstallTarget[] {
   }
   console.error(`  unknown skill install target: ${target}`)
   console.error('  expected all, codex, or claude')
-  rnxExit(1)
+  peachExit(1)
 }
 
 function parseSkillFrontmatter(
@@ -359,7 +359,7 @@ function matchSkills(skills: SkillInfo[], filters: string[]): SkillInfo[] {
   if (matched.length === 0) {
     console.error(`  no skills matched: ${filters.join(', ')}`)
     console.error('  available: ' + skills.map((skill) => skill.name).join(', '))
-    rnxExit(1)
+    peachExit(1)
   }
   return matched
 }
@@ -514,7 +514,7 @@ function parseInstallArgs(args: string[]): {
     const arg = args[index]
     if (arg === '--help' || arg === '-h') {
       printInstallHelp()
-      rnxExit(0)
+      peachExit(0)
     }
     if (arg === '--force' || arg === '-f') {
       force = true
@@ -524,11 +524,11 @@ function parseInstallArgs(args: string[]): {
       const dir = args[index + 1]
       if (!dir || dir.startsWith('-')) {
         console.error('  --target requires a directory')
-        rnxExit(1)
+        peachExit(1)
       }
       if (targets) {
         console.error('  pass only one install target')
-        rnxExit(1)
+        peachExit(1)
       }
       targets = [{ label: 'target', dir }]
       index++
@@ -537,7 +537,7 @@ function parseInstallArgs(args: string[]): {
     if (arg.startsWith('-')) {
       console.error(`  unknown option: ${arg}`)
       printInstallHelp()
-      rnxExit(1)
+      peachExit(1)
     }
     if (!targets && AGENT_TARGET_IDS.has(arg)) {
       targets = agentTarget(arg)
@@ -553,7 +553,7 @@ async function runInstall(args: string[]) {
   const skills = listSkills()
   if (skills.length === 0) {
     console.error('  no skills found in peach package')
-    rnxExit(1)
+    peachExit(1)
   }
 
   const parsed = parseInstallArgs(args)
@@ -566,7 +566,7 @@ async function runInstall(args: string[]) {
     fs.mkdirSync(target.dir, { recursive: true })
     if (!fs.statSync(target.dir).isDirectory()) {
       console.error(`  target is not a directory: ${target.dir}`)
-      rnxExit(1)
+      peachExit(1)
     }
     removeLegacyBundledSkills(target.dir)
   }
@@ -596,7 +596,7 @@ async function runInstall(args: string[]) {
     console.error(
       `  ${conflicts} conflict(s); rerun with --force only if replacing them is intended.\n`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   console.log('  done. skills are installed and available to your agent.\n')
 }
@@ -630,5 +630,5 @@ export async function runSkill(args: string[]) {
 
   console.error(`  unknown skill command: ${command}`)
   printSkillHelp()
-  rnxExit(1)
+  peachExit(1)
 }

package/cli/commands/swift.ts

@@ -16,11 +16,15 @@ import {
   SWIFT_ICON_PATH,
   type SwiftHostDiscovery,
 } from '../../src/swiftDiscoveryContract'
-import { findXcodeProject } from '../../src/xcode-project'
+import { findXcodeProject, readXcodeScheme } from '../../src/xcode-project'
 import { authHeaderValue, resolveCliAuth } from '../auth'
 import { PeachExit } from '../run-rnx'
 import { runOpenCommand, type OpenCommandResources } from './control'
-import { closeGuestResources, isLoopbackGuestRequest } from './guest-host'
+import {
+  closeGuestResources,
+  isLoopbackGuestRequest,
+  waitForGuestCompletion,
+} from './guest-host'
 import type { SwiftEntryModuleArgs } from '../../../sootsim-swift/src/entryModule'
 
 export async function runSwift(
@@ -38,6 +42,7 @@ export async function runSwift(
   let uploadSource = false
   let openPreview = true
   let target: string | undefined
+  let scheme: string | undefined
   const valueFlags = new Set([
     '--device',
     '--driver',
@@ -61,6 +66,9 @@ export async function runSwift(
     else if (arg === '--target') {
       target = input[++index]
       if (!target || target.startsWith('-')) throw new Error('--target requires a value')
+    } else if (arg === '--scheme') {
+      scheme = input[++index]
+      if (!scheme || scheme.startsWith('-')) throw new Error('--scheme requires a value')
     } else if (arg === '--host-port' || valueFlags.has(arg)) {
       const value = input[++index]
       if (!value || value.startsWith('-')) throw new Error(`${arg} requires a value`)
@@ -77,7 +85,7 @@ export async function runSwift(
   }
   if (!packagePath) {
     throw new Error(
-      'usage: peach swift <SwiftPM directory | Xcode project or workspace> [--target <app target>]',
+      'usage: peach swift <SwiftPM directory | Xcode project or workspace> [--scheme <scheme> | --target <app target>]',
     )
   }
   // local by default: this machine's swift.org toolchain compiles against the
@@ -101,7 +109,7 @@ export async function runSwift(
   let module: SwiftModule | null = null
   if (!hosted) {
     try {
-      module = await resolveSwiftModule()
+      module = await resolveSwiftModule({ required: true })
     } catch (error) {
       console.error(`  ${error instanceof Error ? error.message : String(error)}`)
       return 1
@@ -126,9 +134,21 @@ export async function runSwift(
       'peach swift needs a directory containing Package.swift, or an Xcode project or workspace',
     )
   }
-  if (target && !xcodeproj)
-    throw new Error('--target selects an Xcode application target')
-  if (xcodeproj) packagePath = host.openXcodeProject(xcodeproj, target, module?.root)
+  if ((target || scheme) && !xcodeproj)
+    throw new Error(
+      `${scheme ? '--scheme' : '--target'} selects an Xcode application target`,
+    )
+  if (target && scheme) throw new Error('--scheme names its own target; pass one of them')
+  // a scheme runs its launch action's target in that action's configuration
+  const run = scheme && xcodeproj ? readXcodeScheme(xcodeproj, scheme) : null
+  if (xcodeproj) {
+    packagePath = host.openXcodeProject(
+      xcodeproj,
+      run?.target ?? target,
+      module?.root,
+      run?.configuration,
+    )
+  }
   // collection preflights every input path before any source bytes are read.
   host.swiftPackageWatchFiles(packagePath, undefined)
   const packageName = path.basename(packagePath)
@@ -304,6 +324,7 @@ export async function runSwift(
     console.log(`  Swift preview host: ${origin}`)
     await refresh()
     controller.signal.throwIfAborted()
+    if (!metadata || compileError) throw new Error(compileError)
     if (opts.device) openArgs.push('--device', opts.device)
     if (opts.driver) openArgs.push('--driver', opts.driver)
     if (opts.headless) openArgs.push('--headless')
@@ -317,10 +338,7 @@ export async function runSwift(
           ownerPid: process.pid,
         },
       )
-    await new Promise<void>((resolve) => {
-      if (controller.signal.aborted) resolve()
-      else controller.signal.addEventListener('abort', () => resolve(), { once: true })
-    })
+    code = await waitForGuestCompletion(resources, controller.signal, 'Swift preview')
   } catch (error) {
     if (!controller.signal.aborted) {
       console.error(

package/cli/commands/telemetry.ts

@@ -11,7 +11,7 @@ import {
   writePrivacyPreferences,
 } from '../../src/home-paths'
 import { PRIVACY_CONTENTS } from '../privacy'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 
 function printStatus(): void {
   const preferences = readPrivacyPreferences()
@@ -55,6 +55,6 @@ export async function runTelemetry(args: string[]): Promise<void> {
     default:
       console.error(`  unknown telemetry action: ${sub}`)
       console.error('  usage: peach config telemetry [on|off|status]')
-      rnxExit(1)
+      peachExit(1)
   }
 }

package/cli/commands/test.ts

@@ -1183,6 +1183,11 @@ export async function runCloudTest(
         console.error(
           `  error: cloud test timed out after ${timeoutMs < 1000 ? `${timeoutMs}ms` : `${timeoutMs / 1000}s`}`,
         )
+        if (!tunnelDependent) {
+          console.error(
+            `  the hosted job keeps running and billing; stop it with: peach test --cancel ${id}`,
+          )
+        }
         return 1
       }
 

package/cli/commands/three-mode.ts

@@ -10,7 +10,8 @@ import {
   isThreeModeSetting,
   THREE_MODE_SETTING_IDS,
 } from 'peach-engine/screenshots/tokens'
-import { rnxExit } from '../run-rnx'
+import { isRecord } from '../../src/is-record'
+import { peachExit } from '../run-rnx'
 import {
   callInBridgeWrite,
   createBridgeFromParsed,
@@ -18,7 +19,6 @@ import {
   type WsBridge,
 } from '../ws-bridge'
 import { runShellBooleanMode, type ShellBooleanModeOptions } from './shell-boolean-mode'
-import { isRecord } from '../../src/is-record'
 
 type ThreeModeConfig = Record<string, unknown>
 type ThreeModeState = Record<string, unknown> & {
@@ -113,7 +113,7 @@ examples:
   peach mode three measure ./cinematic.json --width 450 --height 900 --at 0,1200
   peach mode three off
 `)
-    rnxExit(0)
+    peachExit(0)
   }
 
   const timelineAction = findTimelineAction(args)

package/cli/commands/timeline.ts

@@ -16,7 +16,7 @@
 // see `peach what-happened` for the read side.
 
 import { writeFileSync } from 'fs'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { callInBridge, createBridgeFromParsed, parseBridgeCliArgs } from '../ws-bridge'
 
 interface TimelineOptions {
@@ -55,7 +55,7 @@ export async function runTimeline(args: string[], opts: TimelineOptions) {
   const sub = parsed.positional[0]
   if (!sub || args.includes('--help') || args.includes('-h')) {
     printHelp()
-    rnxExit(0)
+    peachExit(0)
   }
   const json = args.includes('--json')
   const bridge = createBridgeFromParsed(parsed)
@@ -98,7 +98,7 @@ export async function runTimeline(args: string[], opts: TimelineOptions) {
         const outPath = rest[0]
         if (!outPath) {
           console.error('  usage: peach timeline dump <file>')
-          rnxExit(1)
+          peachExit(1)
         }
         const result = await callInBridge<{ events: unknown[] }>(
           bridge,
@@ -112,7 +112,7 @@ export async function runTimeline(args: string[], opts: TimelineOptions) {
       default: {
         console.error(`  unknown subcommand: ${sub}`)
         printHelp()
-        rnxExit(1)
+        peachExit(1)
       }
     }
   } finally {

package/cli/commands/upgrade.ts

@@ -15,7 +15,7 @@ import {
   fetchCliReleaseFile,
   refreshCliUpdateCache,
 } from '../cli-update'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { fetchRuntimeReleaseNotes, formatRuntimeReleaseNotes } from '../runtime-notes'
 import { IS_STANDALONE } from '../standalone'
 import { runRuntime } from './runtime'
@@ -43,7 +43,7 @@ export async function runUpgrade(
   const cliVersion = toIdx >= 0 ? args[toIdx + 1]?.replace(/^v/, '') : undefined
   if (toIdx >= 0 && !(cliVersion && VERSION_PATTERN.test(cliVersion))) {
     console.error('  peach upgrade: --to takes a CLI version such as 0.1.669')
-    rnxExit(1)
+    peachExit(1)
   }
 
   console.log('peach upgrade\n')