peachsim 0.1.939 → 0.1.1399

package/cli/commands/control.ts

@@ -6,6 +6,8 @@ import path from 'node:path'
 import { encodeAppCatalogWire } from 'peach-engine/engine/app-catalog-wire'
 import {
   devices,
+  getRuntimePlatform,
+  isDeviceModel,
   listSelectableDeviceModels,
   resolveDeviceFitBox,
   type DeviceModel,
@@ -13,12 +15,13 @@ import {
 import { WebSocket } from 'ws'
 import { probePort } from '../../scripts/dev-server-scanner'
 import { isAppDeepLinkTarget, openAppUrl } from '../../src/app-url'
-import { isLoopbackHost } from '../../src/backend-origin'
+import { isLoopbackHost, loopbackOriginOf } from '../../src/backend-origin'
 import { resolveSootsimShellBaseUrlForBridgePort } from '../../src/bridge-constants'
 import {
   applyPeachConfigToUrl,
   mergePeachConfig,
   PEACH_CONFIG_QUERY_PARAM,
+  readPeachConfigFromSearchParams,
   type PeachConfig,
 } from '../../src/config'
 import {
@@ -80,7 +83,7 @@ import {
 import { getDriver } from '../drivers/registry'
 import { isTeamMachineSession, openUrl as openUrlInBrowser } from '../open-url'
 import { diagnosticsAllowedForCurrentProcess } from '../privacy'
-import { rethrowIfExit, rnxExit } from '../run-rnx'
+import { rethrowIfExit, peachExit } from '../run-rnx'
 import { collectRuntimeDiagnostics } from '../runtime-diagnostics'
 import { rnxSelfInvocation } from '../self-invocation'
 import {
@@ -95,6 +98,7 @@ import {
   worldForBridgePort,
   type BridgeSimInfo,
 } from '../ws-bridge'
+import { readNativeProjectRenderer } from './detect'
 import { inspectDescribe, inspectReadySnapshot, waitReadyReason } from './inspect/core'
 import { isAgentEnv } from './inspect/env'
 import { hasInstalledPeachSkills } from './skills'
@@ -425,14 +429,14 @@ function looksLikeSootsimUrl(target: string): boolean {
       url.pathname.includes(PEACH_SIMULATOR_SHELL_FILE) ||
       isPeachSimulatorDocumentPath(pathname) ||
       pathname === '/sootsim' ||
-      url.pathname === '/__soot' ||
-      url.pathname === '/__soot/' ||
+      url.pathname === '/__peachsim' ||
+      url.pathname === '/__peachsim/' ||
       pathname === '/rn' ||
       /^\/rn\/[^/]+$/i.test(pathname) ||
       /^\/app\/[^/]+$/i.test(pathname) ||
-      pathname === '/__soot/rn' ||
-      /^\/__soot\/rn\/[^/]+$/i.test(pathname) ||
-      /^\/__soot\/app\/[^/]+$/i.test(pathname)
+      pathname === '/__peachsim/rn' ||
+      /^\/__peachsim\/rn\/[^/]+$/i.test(pathname) ||
+      /^\/__peachsim\/app\/[^/]+$/i.test(pathname)
     )
   } catch {
     return false
@@ -448,9 +452,9 @@ function looksLikeShellPathTarget(target: string): boolean {
       pathname === '/rn' ||
       /^\/rn\/[^/]+$/i.test(pathname) ||
       /^\/app\/[^/]+$/i.test(pathname) ||
-      pathname === '/__soot/rn' ||
-      /^\/__soot\/rn\/[^/]+$/i.test(pathname) ||
-      /^\/__soot\/app\/[^/]+$/i.test(pathname)
+      pathname === '/__peachsim/rn' ||
+      /^\/__peachsim\/rn\/[^/]+$/i.test(pathname) ||
+      /^\/__peachsim\/app\/[^/]+$/i.test(pathname)
     )
   } catch {
     return false
@@ -461,8 +465,8 @@ function buildShellPathOpenUrl(target: string, baseUrl: string): string {
   const targetUrl = new URL(target, 'http://sootsim.local')
   const url = new URL(baseUrl)
   const prefix = getShellRoutePrefix(url.pathname)
-  const routePath = targetUrl.pathname.startsWith('/__soot/')
-    ? targetUrl.pathname.slice('/__soot'.length)
+  const routePath = targetUrl.pathname.startsWith('/__peachsim/')
+    ? targetUrl.pathname.slice('/__peachsim'.length)
     : targetUrl.pathname
 
   url.pathname = `${prefix}${routePath}`
@@ -558,8 +562,8 @@ async function resolveConnectionInputForCli(target: string): Promise<ResolvedDev
 
 function getShellRoutePrefix(pathname: string): string {
   const normalized = pathname.replace(/\/+$/, '') || '/'
-  if (normalized === '/__soot' || normalized.startsWith('/__soot/')) {
-    return '/__soot'
+  if (normalized === '/__peachsim' || normalized.startsWith('/__peachsim/')) {
+    return '/__peachsim'
   }
   return ''
 }
@@ -636,18 +640,18 @@ function parseOpenRuntimeConfig(args: string[]): PeachConfig | undefined {
       const raw = args[i + 1]
       if (!raw) {
         console.error('  peach open: --replace expects <module>=<file>')
-        rnxExit(1)
+        peachExit(1)
       }
       const eqIndex = raw.indexOf('=')
       if (eqIndex <= 0 || eqIndex === raw.length - 1) {
         console.error('  peach open: --replace expects <module>=<file>')
-        rnxExit(1)
+        peachExit(1)
       }
       const moduleName = raw.slice(0, eqIndex).trim()
       const filePath = normalizeReplacementPath(raw.slice(eqIndex + 1).trim())
       if (!fs.existsSync(filePath)) {
         console.error(`  peach open: replacement file not found: ${filePath}`)
-        rnxExit(1)
+        peachExit(1)
       }
       modules[moduleName] = { file: filePath }
       i++
@@ -661,7 +665,7 @@ function parseOpenRuntimeConfig(args: string[]): PeachConfig | undefined {
       const eqIndex = raw ? raw.indexOf('=') : -1
       if (!raw || eqIndex <= 0 || eqIndex === raw.length - 1) {
         console.error('  peach open: --remap expects <host:port>=<host:port>')
-        rnxExit(1)
+        peachExit(1)
       }
       remap[raw.slice(0, eqIndex).trim()] = raw.slice(eqIndex + 1).trim()
       i++
@@ -876,14 +880,15 @@ async function stampAppSplash(
 }
 
 // stamp the engine page url with `?appCatalog=` so an app's asset-catalog
-// colors and its declared accent reach the tenant, which applies them to the
-// bundle this url opens. the catalog lives in the native binary, never in
-// the js bundle, so only the app's ios project on disk has it.
+// colors and images and its declared accent reach the tenant, which applies
+// them to the bundle this url opens. the catalog lives in the native binary,
+// never in the js bundle, so only the app's ios project on disk has it.
 function stampAppCatalog(urlStr: string, project?: ResolvedAppProject | null): string {
   try {
     const url = new URL(urlStr)
-    if (!url.searchParams.get('bundle') || !project) return urlStr
-    const catalog = discoverAppCatalog(project.appDir)
+    const metroOrigin = loopbackOriginOf(url.searchParams.get('bundle') ?? '')
+    if (!metroOrigin || !project) return urlStr
+    const catalog = discoverAppCatalog(project.appDir, metroOrigin)
     if (!catalog) return urlStr
     url.searchParams.set('appCatalog', encodeAppCatalogWire(catalog))
     return url.toString()
@@ -953,12 +958,20 @@ export interface BuildShellUrlOptions {
   // screen holding a focused text field never reaches three identical idle
   // frames, so the screenshot guard burns all 12 attempts and then fails.
   proof?: boolean
+  // a temporary storage profile, stamped as ?ephemeral=1. the shell then
+  // neither reads nor writes the machine-wide settings in
+  // ~/.peach/config.json, so a preference another sim saved (bold text,
+  // reduce motion, appearance) cannot steer this boot.
+  ephemeral?: boolean
   // launch-time environment variables, stamped as repeated ?env=KEY%3DVALUE.
   // see the --env flag above.
   env?: string[]
   // the project's env file as react-native-config's iOS build compiles it,
   // stamped as ?dotEnv=<json>. set by `peach open --load-env` only.
   dotEnv?: Record<string, string>
+  // the bridge an explicit --port names; the expo swift compile endpoint
+  // stamped onto the URL uses it instead of the discovered world's bridge.
+  bridgePort?: number
 }
 
 function readProjectNativeFirebaseConfig(
@@ -1005,6 +1018,29 @@ export async function buildShellUrl(
     project,
   )
   const expoStamped = new URL(stamped)
+  if (project) {
+    const device = opts.device ?? expoStamped.searchParams.get('device')
+    const bundle = bundleUrlOf(resolved)
+    const platform =
+      device && isDeviceModel(device)
+        ? getRuntimePlatform(device)
+        : bundle && new URL(bundle).searchParams.get('platform') === 'android'
+          ? 'android'
+          : 'ios'
+    const nativeRenderer = readNativeProjectRenderer(project.appDir, platform)
+    if (nativeRenderer !== undefined) {
+      const config = readPeachConfigFromSearchParams(expoStamped.searchParams)
+      if (
+        config?.nativeRenderer !== undefined &&
+        config.nativeRenderer !== nativeRenderer
+      )
+        throw new Error('peach config contradicts native project renderer')
+      expoStamped.searchParams.set(
+        PEACH_CONFIG_QUERY_PARAM,
+        JSON.stringify(mergePeachConfig(config, { nativeRenderer })),
+      )
+    }
+  }
   // a plain Metro has no native Firebase config endpoint, so the CLI reads it
   // from the project whose Expo config it can evaluate. a project without its
   // own `@expo/config` (a dependency-free recorder) leaves it to the Peach
@@ -1020,18 +1056,24 @@ export async function buildShellUrl(
     const world = resolveBridgeWorld()
     const port = resolveBridgePortForPin({
       baseUrl,
-      wsPort: world.bridgePort,
-      explicitPort: false,
+      wsPort: opts.bridgePort ?? world.bridgePort,
+      explicitPort: opts.bridgePort !== undefined,
     })
     if (port.error) throw new Error(port.error)
     expoStamped.searchParams.set(
       'expoSwift',
       `http://localhost:${port.port}/__peach/expo-swift?root=${encodeURIComponent(expoRoot)}`,
     )
+    // the engine fetches only its device platform's build
+    expoStamped.searchParams.set(
+      'expoKotlin',
+      `http://localhost:${port.port}/__peach/expo-kotlin?root=${encodeURIComponent(expoRoot)}`,
+    )
   }
   if (
     !opts.device &&
     !opts.proof &&
+    !opts.ephemeral &&
     !opts.posture &&
     !opts.orientation &&
     !opts.osVersion &&
@@ -1048,6 +1090,7 @@ export async function buildShellUrl(
   if (opts.osVersion) url.searchParams.set('osVersion', opts.osVersion)
   if (opts.theme) url.searchParams.set('theme', opts.theme)
   if (opts.proof) url.searchParams.set('proof', '1')
+  if (opts.ephemeral) url.searchParams.set('ephemeral', '1')
   for (const entry of opts.env ?? []) url.searchParams.append('env', entry)
   return url.toString()
 }
@@ -1079,6 +1122,7 @@ function deriveCurrentSimBaseUrl(
     url.searchParams.delete('appCatalog')
     url.searchParams.delete('nativeFirebase')
     url.searchParams.delete('expoSwift')
+    url.searchParams.delete('expoKotlin')
     return url.toString()
   } catch {
     return fallback
@@ -1289,7 +1333,7 @@ function readUnservedUrl(result: DriverLaunchResult): string | null {
   }
 }
 
-function printDriverDiagnosticLogTail(result: DriverLaunchResult) {
+export function printDriverDiagnosticLogTail(result: DriverLaunchResult) {
   if (!result.diagnosticLogPath) return
   try {
     const detail = fs.readFileSync(result.diagnosticLogPath, 'utf8').trim()
@@ -1563,7 +1607,7 @@ export async function runLinkCommand(args: string[], opts: ControlCommandOptions
   if (parsed.positional.length !== 1) {
     console.error('  peach open: expected exactly one <url-or-route>')
     console.error('  examples: peach open /settings  |  peach open myapp://settings')
-    rnxExit(1)
+    peachExit(1)
   }
 
   const bridge = createBridgeFromParsed(parsed)
@@ -1578,7 +1622,7 @@ export async function runLinkCommand(args: string[], opts: ControlCommandOptions
       warningsCommand: `peach get warnings 5${simHint}`,
       requestsCommand: `peach get requests 5${simHint}`,
     })
-    rnxExit(1)
+    peachExit(1)
   } finally {
     bridge.close()
   }
@@ -1636,11 +1680,11 @@ export async function runOpenCommand(
     console.error(
       `  peach open: --cdp-port must be a positive port number, got "${cdpPortArg}"`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   if (requestedProfileId && ephemeralProfile) {
     console.error('  peach open: --profile cannot be combined with --ephemeral')
-    rnxExit(1)
+    peachExit(1)
   }
   const profileId = requestedProfileId ? ensureProfile(requestedProfileId).id : undefined
   const openInNewSim = args.includes('--new') || !!profileId || ephemeralProfile
@@ -1649,7 +1693,7 @@ export async function runOpenCommand(
     console.error(
       '  peach open: --new, --profile, and --ephemeral cannot be combined with --sim',
     )
-    rnxExit(1)
+    peachExit(1)
   }
   const target = parsed.positional[0] || ''
 
@@ -1663,7 +1707,7 @@ export async function runOpenCommand(
     console.error(
       `  peach open: --port is the WS bridge port, not the app port. to open the app on ${portValue}, pass it positionally: \`peach open ${portValue}\``,
     )
-    rnxExit(1)
+    peachExit(1)
   }
 
   // -t / --theme <light|dark|auto> seeds the appearance for the opened sim,
@@ -1676,7 +1720,7 @@ export async function runOpenCommand(
   const themeArg = themeFlagIndex === -1 ? undefined : args[themeFlagIndex + 1]
   if (themeFlagIndex !== -1 && themeArg === undefined) {
     console.error('  peach open: --theme expects light, dark, or auto')
-    rnxExit(1)
+    peachExit(1)
   }
   if (
     themeArg !== undefined &&
@@ -1685,7 +1729,7 @@ export async function runOpenCommand(
     themeArg !== 'auto'
   ) {
     console.error(`  peach open: --theme must be light, dark, or auto, got "${themeArg}"`)
-    rnxExit(1)
+    peachExit(1)
   }
 
   if (isAppDeepLinkTarget(target)) {
@@ -1693,7 +1737,7 @@ export async function runOpenCommand(
       console.error(
         '  peach open: deep links target the current app; remove --new, --profile, or --ephemeral',
       )
-      rnxExit(1)
+      peachExit(1)
     }
     await runLinkCommand(args, opts)
     return
@@ -1721,7 +1765,7 @@ export async function runOpenCommand(
         `  could not launch a browser: ${err instanceof Error ? err.message : String(err)}`,
       )
       console.error(`  open it yourself: ${target}`)
-      rnxExit(1)
+      peachExit(1)
     }
     console.log(
       isLocal
@@ -1738,7 +1782,7 @@ export async function runOpenCommand(
   const projectRoot = projectRootIndex < 0 ? undefined : args[projectRootIndex + 1]
   if (projectRootIndex >= 0 && (!projectRoot || projectRoot.startsWith('--'))) {
     console.error('  peach open: --project-root expects a local app directory')
-    rnxExit(1)
+    peachExit(1)
   }
   const project = await resolveAppProjectForBundleUrl(
     resolvedBundle?.bundleUrl,
@@ -1772,7 +1816,7 @@ export async function runOpenCommand(
     })
     if (pinned.error !== undefined) {
       console.error(`  error: ${pinned.error}`)
-      rnxExit(1)
+      peachExit(1)
     } else {
       parsed.wsPort = pinned.port
     }
@@ -1796,10 +1840,12 @@ export async function runOpenCommand(
     console.error(
       `  unknown driver "${requestedDriverId}" — run \`peach list --drivers\``,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   const driverId: DriverId = isDriverId(requestedDriverId)
-    ? requestedDriverId
+    ? requestedDriverId === 'electron' && process.platform !== 'win32'
+      ? 'desktop'
+      : requestedDriverId
     : process.env.CI === '1' ||
         process.env.CI === 'true' ||
         process.env.GITHUB_ACTIONS === 'true' ||
@@ -1807,11 +1853,17 @@ export async function runOpenCommand(
         isAgentEnv() ||
         !process.stdin.isTTY
       ? 'playwright'
-      : readSimulatorDriverPreference() || 'playwright'
+      : readSimulatorDriverPreference() === 'electron' && process.platform !== 'win32'
+        ? 'desktop'
+        : readSimulatorDriverPreference() || 'playwright'
+  if (requestedDriverId === 'electron' && driverId === 'desktop')
+    console.error(
+      '  Electron is Windows-only; using the native desktop app (peach install-desktop).',
+    )
   const driverHeadless = resolveDriverHeadless(args, driverId)
   if (cdpPort && driverId !== 'playwright') {
     console.error('  peach open: --cdp-port is only honored by the playwright driver')
-    rnxExit(1)
+    peachExit(1)
   }
 
   // metro HMR mode. interactive opens default to hot=true so edits hot-apply
@@ -1825,7 +1877,7 @@ export async function runOpenCommand(
   const noHmrFlag = args.includes('--no-hmr')
   if (hotFlag && noHmrFlag) {
     console.error('  peach open: --hot and --no-hmr cannot be combined')
-    rnxExit(1)
+    peachExit(1)
   }
   const hotMode = hotFlag ? true : noHmrFlag ? false : driverId !== 'playwright'
 
@@ -1837,7 +1889,7 @@ export async function runOpenCommand(
   if (deviceArg && !(deviceArg in devices)) {
     console.error(`  peach open: unknown device "${deviceArg}"`)
     console.error(`  known devices: ${listSelectableDeviceModels().join(', ')}`)
-    rnxExit(1)
+    peachExit(1)
   }
 
   // --posture <open|closed> seeds the fold posture for the opened sim,
@@ -1847,7 +1899,7 @@ export async function runOpenCommand(
   const postureArg = args.find((_, i) => args[i - 1] === '--posture')
   if (postureArg && postureArg !== 'open' && postureArg !== 'closed') {
     console.error(`  peach open: --posture must be open or closed, got "${postureArg}"`)
-    rnxExit(1)
+    peachExit(1)
   }
   const orientationFlag = args.find((_, i) => args[i - 1] === '--orientation')
   const orientationArg =
@@ -1858,7 +1910,7 @@ export async function runOpenCommand(
     console.error(
       `  peach open: --orientation must be portrait or landscape, got "${orientationFlag}"`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   // the window fits the box the browser stage fits the device into, which for
   // a foldable spans both postures, so the device draws at its natural size in
@@ -1878,7 +1930,7 @@ export async function runOpenCommand(
     console.error(
       `  peach open: --os-version must be <major>.<minor>, got "${osVersionArg}"`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
 
   // --env <KEY=VALUE> (repeatable) sets a launch-time environment variable,
@@ -1894,7 +1946,7 @@ export async function runOpenCommand(
     const eqIndex = raw ? raw.indexOf('=') : -1
     if (!raw || eqIndex <= 0) {
       console.error(`  peach open: --env expects KEY=VALUE, got "${raw ?? ''}"`)
-      rnxExit(1)
+      peachExit(1)
     }
     envArgs.push(raw)
   }
@@ -1909,7 +1961,7 @@ export async function runOpenCommand(
     console.error(
       `  peach open: --viewport must be <width>x<height>, got "${viewportArg}"`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   const explicitViewport = viewportMatch
     ? { width: Number(viewportMatch[1]), height: Number(viewportMatch[2]) }
@@ -1925,7 +1977,7 @@ export async function runOpenCommand(
       console.error(
         '  peach open: --load-env needs a local app project to read the env file from',
       )
-      rnxExit(1)
+      peachExit(1)
     }
     try {
       const result = readProjectDotEnv(project.appDir)
@@ -1935,7 +1987,7 @@ export async function runOpenCommand(
       console.error(
         `  peach open: ${error instanceof Error ? error.message : String(error)}`,
       )
-      rnxExit(1)
+      peachExit(1)
     }
   }
 
@@ -1951,8 +2003,10 @@ export async function runOpenCommand(
     resolvedBundle,
     project,
     proof: args.includes('--proof'),
+    ephemeral: ephemeralProfile,
     env: envArgs.length ? envArgs : undefined,
     dotEnv,
+    bridgePort: parsed.explicitPort ? parsed.wsPort : undefined,
   }
 
   // resolve the shell base URL from the bridge port we settled on, so the page
@@ -2069,7 +2123,7 @@ export async function runOpenCommand(
           warningsCommand: `peach get warnings 5${simHint}`,
           requestsCommand: `peach get requests 5${simHint}`,
         })
-        rnxExit(1)
+        peachExit(1)
       }
 
       if (!fallBackToNewSim && targetSim && navigatedShellUrl) {
@@ -2093,7 +2147,7 @@ export async function runOpenCommand(
             warningsCommand: `peach get warnings 5${simHint}`,
             requestsCommand: `peach get requests 5${simHint}`,
           })
-          rnxExit(1)
+          peachExit(1)
         }
         targetSim = navigatedSim
         const ready = await waitForSimReady(
@@ -2110,7 +2164,7 @@ export async function runOpenCommand(
             warningsCommand: `peach get warnings 5${simHint}`,
             requestsCommand: `peach get requests 5${simHint}`,
           })
-          rnxExit(1)
+          peachExit(1)
         }
         ready.bridge.close()
         saveCurrentSimId(targetSim.id)
@@ -2136,12 +2190,12 @@ export async function runOpenCommand(
     console.error(
       '  could not resolve a stable owning process; refusing unsupervised sim host',
     )
-    rnxExit(1)
+    peachExit(1)
   }
   const driver = getDriver(driverId)
   if (!driver) {
     console.error(`  unknown driver "${driverId}" — run \`peach list --drivers\``)
-    rnxExit(1)
+    peachExit(1)
   }
   const connectWait = resolveDriverConnectWaitOptions()
   opts.signal?.throwIfAborted()
@@ -2171,7 +2225,7 @@ export async function runOpenCommand(
   opts.signal?.throwIfAborted()
   if (!result.launched) {
     console.error(`  ${driver.name} driver: ${result.message}`)
-    rnxExit(1)
+    peachExit(1)
   }
   const outcome = await waitForSimMatchOrHostExit(
     parsed.wsPort,
@@ -2194,7 +2248,7 @@ export async function runOpenCommand(
     } else {
       console.error(`  ${driver.name} host crashed — sim is no longer attached`)
     }
-    rnxExit(1)
+    peachExit(1)
   }
   if (outcome.kind === 'timeout') {
     if (result.pid) {
@@ -2207,7 +2261,7 @@ export async function runOpenCommand(
     console.error(
       `  timed out after ${connectWait.timeoutMs}ms waiting for opened sim to connect`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   const match = outcome.sim
   if (opts.resources) opts.resources.simId = match.id
@@ -2237,7 +2291,7 @@ export async function runOpenCommand(
       requestsCommand: `peach get requests 5${hint}`,
     })
     bridge.close()
-    rnxExit(1)
+    peachExit(1)
   }
   ready.bridge.close()
   printOpenedSim(openUrl, match, `${driver.name} driver`, quiet)
@@ -2280,7 +2334,7 @@ async function runUseLikeCommand(args: string[], opts: ControlCommandOptions = {
             `  refused: ${target.id} is locked by the active user (${secs}s) — that's a live human tab`,
           )
           console.error(`  run \`peach open --new\` for a fresh investigation sim`)
-          rnxExit(1)
+          peachExit(1)
         }
         if (!force) {
           // another CLI agent leases it. don't hijack its target silently;
@@ -2292,7 +2346,7 @@ async function runUseLikeCommand(args: string[], opts: ControlCommandOptions = {
           console.error(
             `  \`peach use ${target.id} --force\` to take it, or \`peach open --new\` for a fresh sim`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
       }
       await bridge.focusSim(target.id)
@@ -2306,7 +2360,7 @@ async function runUseLikeCommand(args: string[], opts: ControlCommandOptions = {
         warningsCommand: `peach get warnings 5${simHint}`,
         requestsCommand: `peach get requests 5${simHint}`,
       })
-      rnxExit(1)
+      peachExit(1)
     }
   } finally {
     bridge.close()
@@ -2350,10 +2404,10 @@ export async function runClaimCommand(args: string[], opts: ControlCommandOption
         const secs = Math.max(0, Math.round(err.lock.expiresInMs / 1000))
         console.error(`  claim failed: locked by ${err.lock.by} for ${secs}s more`)
         console.error(`  use --force to take it, or \`peach open --new\` for a fresh sim`)
-        rnxExit(1)
+        peachExit(1)
       }
       console.error(`  claim failed: ${err instanceof Error ? err.message : String(err)}`)
-      rnxExit(1)
+      peachExit(1)
     }
   } finally {
     bridge.close()
@@ -2545,7 +2599,7 @@ export async function runCloseCommand(args: string[], opts: ControlCommandOption
         console.error(
           `  close failed: keep sim ${plan.missingExplicitKeepId} is not connected; not closing other sims`,
         )
-        rnxExit(1)
+        peachExit(1)
       }
       if (plan.targets.length === 0) {
         console.log(
@@ -2578,12 +2632,12 @@ export async function runCloseCommand(args: string[], opts: ControlCommandOption
       console.log(summary)
       if (result.remaining.length > 0) {
         console.error(`  close failed: still connected: ${result.remaining.join(', ')}`)
-        rnxExit(1)
+        peachExit(1)
       }
     } catch (err) {
       rethrowIfExit(err)
       console.error(`  close failed: ${err instanceof Error ? err.message : String(err)}`)
-      rnxExit(1)
+      peachExit(1)
     } finally {
       bridge.close()
     }
@@ -2606,7 +2660,7 @@ export async function runCloseCommand(args: string[], opts: ControlCommandOption
       if (!closed) {
         await terminatePlaywrightHostsForSims(sims, [target.id])
         console.error(`  close failed: ${target.id} is still connected`)
-        rnxExit(1)
+        peachExit(1)
       }
       await terminatePlaywrightHostsForSims(sims, [target.id])
       if (readCurrentSimId() === target.id) {
@@ -2623,14 +2677,14 @@ export async function runCloseCommand(args: string[], opts: ControlCommandOption
         console.error(
           `  to close ${word === 'all' ? 'every' : 'every other'} sim: peach close --${word}`,
         )
-        rnxExit(1)
+        peachExit(1)
       }
       await printBridgeFailureDiagnostics(bridge, {
         errorsCommand: `peach get errors 5${simHint}`,
         warningsCommand: `peach get warnings 5${simHint}`,
         requestsCommand: `peach get requests 5${simHint}`,
       })
-      rnxExit(1)
+      peachExit(1)
     }
   } finally {
     bridge.close()