peachsim 0.1.939 → 0.1.1399

package/cli/commands/inspect.ts

@@ -19,7 +19,7 @@ import { maybeHint } from '../hints'
 import { shouldPrintInspectNotice } from '../inspect-notice-state'
 import { levenshtein } from '../levenshtein'
 import { TOP_LEVEL_RUNTIME_COMMANDS } from '../parse-args'
-import { rethrowIfExit, rnxExit } from '../run-rnx'
+import { rethrowIfExit, peachExit } from '../run-rnx'
 import { collectRuntimeDiagnostics } from '../runtime-diagnostics'
 import { trackCliError } from '../telemetry'
 import {
@@ -869,7 +869,7 @@ async function performCloudKeys(
   console.error(
     `  ${actionLabel} failed: ${failed?.error ?? result.error ?? 'no text input had focus'}. focus an input first with peach do tap-id or peach do type-into.`,
   )
-  rnxExit(1)
+  peachExit(1)
 }
 
 async function requireVisualKeyboard(bridge: WsBridge, actionLabel: string) {
@@ -879,12 +879,12 @@ async function requireVisualKeyboard(bridge: WsBridge, actionLabel: string) {
     console.error(
       `  ${actionLabel} requires a focused editable control. the iOS keyboard is visible, but no input owns focus.`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   console.error(
     `  ${actionLabel} requires the iOS keyboard to be visible. focus an input first with peach do tap-id/tap-text or peach do type-into.`,
   )
-  rnxExit(1)
+  peachExit(1)
 }
 
 async function runShellVisualCommand(
@@ -1132,7 +1132,8 @@ export async function runInspect(args: string[], opts: InspectOptions) {
     ],
   })
   const positional = parsed.positional
-  const subcommand = positional[0]
+  const subcommand =
+    verbPrefix === 'debug' && positional[0] === 'eval' ? 'js' : positional[0]
   // used by inspectCommand() below to format usage/error strings with the
   // same prefix the user actually typed. null when they typed a top-level
   // command, and inspectCommand asks the registry for the group instead.
@@ -1155,6 +1156,17 @@ export async function runInspect(args: string[], opts: InspectOptions) {
   const inspectUsage = (name: string, tail: string) =>
     `  usage: ${inspectCommand(name)}${tail ? ` ${tail}` : ''}`
 
+  if (
+    invocationPrefix === 'wait' &&
+    !subcommand &&
+    effectiveArgs.length > 0 &&
+    !args.includes('--help') &&
+    !args.includes('-h')
+  ) {
+    console.error(inspectUsage('selector', '<testid> [--max-ms <ms>]'))
+    peachExit(1)
+  }
+
   if (!subcommand || args.includes('--help') || args.includes('-h')) {
     // all help output comes from the registry in packages/peach-skills
     // so `peach do --help`, `peach get --help`, the website docs, and
@@ -1175,7 +1187,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
       const groupHelp = renderCliGroupHelp(invocationPrefix, docContext)
       if (groupHelp) {
         console.log(`${groupHelp}\n`)
-        rnxExit(0)
+        peachExit(0)
       }
     }
 
@@ -1183,7 +1195,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
       const shellHelp = renderCliCommandHelp('shell', docContext)
       if (shellHelp) {
         console.log(`${shellHelp}\n`)
-        rnxExit(0)
+        peachExit(0)
       }
     }
 
@@ -1193,7 +1205,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
       .filter((s): s is string => s != null)
       .join('\n\n')
     console.log(`${groupSections}\n`)
-    rnxExit(0)
+    peachExit(0)
   }
 
   const wsPort = parsed.wsPort
@@ -1212,7 +1224,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         : effectiveArgs
     const { runDiagnose } = await import('./diagnose')
     const code = await runDiagnose(['recent', ...diagnosisArgs], opts)
-    if (code !== 0) rnxExit(code)
+    if (code !== 0) peachExit(code)
     return
   }
 
@@ -1221,7 +1233,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
     // runCamera returns a code instead of exiting, so `do scan` has to carry
     // it out. dropping it made a failed scan exit 0.
     const code = await runCamera(effectiveArgs, { port: opts.port })
-    if (code !== 0) rnxExit(code)
+    if (code !== 0) peachExit(code)
     return
   }
 
@@ -1669,7 +1681,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
     (args.includes('--verbose') || args.includes('-v')) && !args.includes('--json')
   if (invocationPrefix === 'do' && subcommand === 'shell') {
     console.error('  `peach do shell` was removed. use `peach shell ...` instead.')
-    rnxExit(1)
+    peachExit(1)
   }
   if (writeCommands.has(subcommand)) {
     await checkSimHealth(bridge)
@@ -1880,7 +1892,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           console.error(
             '  samples an averaged color from the canvas. coords are logical peach units.',
           )
-          rnxExit(1)
+          peachExit(1)
         }
         const result = await bridge.send({
           type: 'evaluate',
@@ -1913,7 +1925,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         if (!matcher) {
           console.error(inspectUsage('node', '<matcher>'))
           console.error('  resolves testID, id, then text — dumps full node info as JSON')
-          rnxExit(1)
+          peachExit(1)
         }
         if (bridge.plane === 'cloud') {
           const byTestId = await inspectFind(bridge, { testId: matcher })
@@ -1987,11 +1999,11 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const payload = outcome.payload
           if (!payload || typeof payload.cx !== 'number') {
             await reportMissingTarget(bridge, 'tap', target)
-            rnxExit(1)
+            peachExit(1)
           }
           if (!isTapSuccess(outcome.result)) {
             printTapFailure(`${target.mode} "${target.value}"`, outcome)
-            rnxExit(1)
+            peachExit(1)
           }
           const candidate = buildTapCandidateFromResult(
             payload.cx,
@@ -2017,7 +2029,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           console.error(
             inspectUsage('tap', '<testid> | <x> <y> | --testid <id> | --text <t>'),
           )
-          rnxExit(1)
+          peachExit(1)
         }
         const result = await tapCoordinates(bridge, x, y)
         const candidate = buildTapCandidateFromResult(x, y, result)
@@ -2047,7 +2059,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           !Number.isFinite(stepMs)
         ) {
           console.error(inspectUsage(subcommand, '<x1> <y1> <x2> <y2> [steps] [stepMs]'))
-          rnxExit(1)
+          peachExit(1)
         }
         const result = await performSingleStep(bridge, {
           type: 'drag',
@@ -2108,7 +2120,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
               "<x1> <y1> <x2> <y2> <x1'> <y1'> <x2'> <y2'> [steps] [stepMs]",
             ),
           )
-          rnxExit(1)
+          peachExit(1)
         }
         const result = await performSingleStep(bridge, {
           type: 'pinch',
@@ -2145,7 +2157,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const query = positional[1]
         if (!query) {
           console.error(inspectUsage('tap-text', '<text>'))
-          rnxExit(1)
+          peachExit(1)
         }
 
         const findFlagValue = (name: string): string | null => {
@@ -2158,7 +2170,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const nthIndex = nthArg !== null ? Number(nthArg) : null
         if (nthIndex !== null && !Number.isFinite(nthIndex)) {
           console.error(`  --nth/--index requires an integer, got: ${nthArg}`)
-          rnxExit(1)
+          peachExit(1)
         }
         const within = findFlagValue('--within')
         const roleFlag = findFlagValue('--role')
@@ -2176,7 +2188,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         ] as const) {
           if (val !== null && !Number.isFinite(Number(val))) {
             console.error(`  ${flag} requires a number, got: ${val}`)
-            rnxExit(1)
+            peachExit(1)
           }
         }
         const nearIdx = args.indexOf('--near')
@@ -2186,7 +2198,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const ny = Number(args[nearIdx + 2])
           if (!Number.isFinite(nx) || !Number.isFinite(ny)) {
             console.error('  --near requires two numbers: --near <x> <y>')
-            rnxExit(1)
+            peachExit(1)
           }
           near = { x: nx, y: ny }
         }
@@ -2211,7 +2223,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
 
         if (payload?.error === 'bridge-not-ready') {
           console.error('  peach test bridge not ready')
-          rnxExit(1)
+          peachExit(1)
         }
 
         if (payload?.ambiguous) {
@@ -2260,23 +2272,23 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           console.error(
             '    --first                 keep the old pick-first-silently behavior',
           )
-          rnxExit(2)
+          peachExit(2)
         }
 
         if (payload?.nthOutOfRange) {
           console.error(
             `  not found: nth ${payload.nth} of ${payload.total} match${payload.total === 1 ? '' : 'es'} for "${query}"`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
 
         if (!payload || typeof payload.cx !== 'number') {
           console.error(`  not found: ${query}`)
-          rnxExit(1)
+          peachExit(1)
         }
         if (!isTapSuccess(outcome.result)) {
           printTapFailure(`text "${query}"`, outcome)
-          rnxExit(1)
+          peachExit(1)
         }
         const candidate = buildTapCandidateFromNode(
           query,
@@ -2336,7 +2348,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const query = positional[1]
         if (!query) {
           console.error(inspectUsage('tap-best', '<query>'))
-          rnxExit(1)
+          peachExit(1)
         }
         const outcome = await tapBest(bridge, query, { agent: isAgentEnv() })
         const payload = outcome.payload as
@@ -2359,22 +2371,22 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           console.error(
             `  tap-best: no testID or visible text matched "${query}". try \`peach find --interactive-targets\` to list candidates.`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
         if ('error' in payload) {
           console.error(`  ${payload.error}`)
-          rnxExit(1)
+          peachExit(1)
         }
         if (payload.strategy === 'none') {
           console.error(
             `  tap-best: no testID or visible text matched "${query}". try \`peach find --interactive-targets\` to list candidates.`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
         const node = payload.node
         if (!isTapSuccess(outcome.result)) {
           printTapFailure(`best "${query}"`, outcome)
-          rnxExit(1)
+          peachExit(1)
         }
         const candidate = buildTapCandidateFromNode(
           query,
@@ -2415,18 +2427,18 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const text = positional.slice(2).join(' ')
         if (!targetId || !text) {
           console.error(inspectUsage('type-into', '<id> <text>'))
-          rnxExit(1)
+          peachExit(1)
         }
         if (bridge.plane === 'cloud') {
           const outcome = await tapById(bridge, targetId, { agent: isAgentEnv() })
           if (!outcome.payload || typeof outcome.payload.cx !== 'number') {
             console.error(`  not found: ${targetId}`)
             await printSimilarTestIds(bridge, targetId)
-            rnxExit(1)
+            peachExit(1)
           }
           if (!isTapSuccess(outcome.result)) {
             printTapFailure(`id "${targetId}"`, outcome)
-            rnxExit(1)
+            peachExit(1)
           }
           const nodeId: unknown = outcome.payload.target?.nodeId
           if (
@@ -2435,7 +2447,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             nodeId === 0
           ) {
             console.error('  type-into requires a resolved text input node identity')
-            rnxExit(1)
+            peachExit(1)
           }
           const typed = await performCloudKeys(
             bridge,
@@ -2449,7 +2461,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             typeof Reflect.get(receipt, 'secureTextEntry') !== 'boolean'
           ) {
             console.error('  type-into did not return its matched input secure state')
-            rnxExit(1)
+            peachExit(1)
           }
           const recordedText =
             Reflect.get(receipt, 'secureTextEntry') === true
@@ -2486,7 +2498,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         })
         if (!tiPayload || typeof tiPayload.cx !== 'number') {
           console.error(`  not found: ${targetId}`)
-          rnxExit(1)
+          peachExit(1)
         }
         if (!tiPayload.isTextInput) {
           console.error(`  warning: ${targetId} is not a text input (isTextInput: false)`)
@@ -2510,7 +2522,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         })
         if (!keyboardState.visible) {
           console.error(`  keyboard did not open after tapping ${targetId}`)
-          rnxExit(1)
+          peachExit(1)
         }
         // step 2.5: confirm the tap actually focused the requested input.
         // the keyboard being visible is necessary but not sufficient — a
@@ -2530,7 +2542,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
                 focusCheck.testID ?? focusCheck.id ?? null,
               )}. did the tap land on an outer Pressable wrapper?`,
             )
-            rnxExit(1)
+            peachExit(1)
           }
         }
         // step 3: clear existing text then type through the visible keyboard
@@ -2586,7 +2598,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const text = positional.slice(1).join(' ')
         if (!text) {
           console.error(inspectUsage('type', '<text>'))
-          rnxExit(1)
+          peachExit(1)
         }
         if (bridge.plane === 'cloud') {
           await performCloudKeys(bridge, [{ type: 'type', text }], 'type')
@@ -2620,7 +2632,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const name = positional[1]
         if (!name) {
           console.error(inspectUsage('key', '<name>'))
-          rnxExit(1)
+          peachExit(1)
         }
         if (bridge.plane === 'cloud') {
           await performCloudKeys(bridge, [{ type: 'key', key: name }], 'key')
@@ -2637,7 +2649,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const keys = positional.slice(1)
         if (keys.length === 0) {
           console.error(inspectUsage('key-sequence', '<key> [<key> ...]'))
-          rnxExit(1)
+          peachExit(1)
         }
         if (bridge.plane === 'cloud') {
           await performCloudKeys(
@@ -2664,7 +2676,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const codes = positional.slice(1)
         if (codes.length === 0) {
           console.error(inspectUsage('keycode', '<code> [<code> ...]'))
-          rnxExit(1)
+          peachExit(1)
         }
         const mapped = codes.map((code) => ({ code, key: keyCodeToVisualKey(code) }))
         const unsupported = mapped.filter((entry) => !entry.key)
@@ -2676,7 +2688,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           console.error(
             `  unsupported keycode(s): ${unsupported.map((entry) => entry.code).join(', ')}`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
         await requireVisualKeyboard(bridge, 'keycode')
         for (const entry of keys) {
@@ -2695,7 +2707,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const ch = positional[1]
         if (!ch) {
           console.error(inspectUsage('dispatch', '<char>'))
-          rnxExit(1)
+          peachExit(1)
         }
         await bridge.send({ type: 'keyboard', action: 'dispatchKey', text: ch })
         await recordInspectAction(
@@ -2726,12 +2738,12 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const resolved = await resolveTargetCoords(bridge, target)
           if (!resolved) {
             await reportMissingTarget(bridge, 'double-tap', target)
-            rnxExit(1)
+            peachExit(1)
           }
           const refusal = offscreenTargetRefusal(bridge.plane, resolved)
           if (refusal) {
             console.error(`  double-tap: ${refusal}`)
-            rnxExit(1)
+            peachExit(1)
           }
           x = resolved.x
           y = resolved.y
@@ -2741,7 +2753,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           console.error(
             inspectUsage('double-tap', '<testid> | <x> <y> [gapMs] | --testid <id>'),
           )
-          rnxExit(1)
+          peachExit(1)
         }
         const waitMs = Math.max(0, Math.round(gapMs))
         const single = await performSingleStep(bridge, {
@@ -2771,12 +2783,12 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const resolved = await resolveTargetCoords(bridge, target)
           if (!resolved) {
             await reportMissingTarget(bridge, 'long-press', target)
-            rnxExit(1)
+            peachExit(1)
           }
           const refusal = offscreenTargetRefusal(bridge.plane, resolved)
           if (refusal) {
             console.error(`  long-press: ${refusal}`)
-            rnxExit(1)
+            peachExit(1)
           }
           x = resolved.x
           y = resolved.y
@@ -2799,7 +2811,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
               '<testid> [durationMs] | <x> <y> [durationMs] | --testid <id>',
             ),
           )
-          rnxExit(1)
+          peachExit(1)
         }
         const roundedDurationMs = Math.max(0, Math.round(durationMs))
         const result = await bridge.send({
@@ -2826,7 +2838,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         console.error(
           '  error: a touch lives within one batch; chain its phases, e.g. peach do touch down 200 720 --then touch move 200 400 --then touch up 200 400',
         )
-        rnxExit(1)
+        peachExit(1)
       }
 
       case 'gesture': {
@@ -2845,12 +2857,12 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         if (!preset || !Number.isFinite(durationMs)) {
           console.error(inspectUsage('gesture', '<preset> [durationMs]'))
           console.error(`  presets: ${GESTURE_PRESETS.join(', ')}`)
-          rnxExit(1)
+          peachExit(1)
         }
         if (!(GESTURE_PRESETS as readonly string[]).includes(preset)) {
           console.error(`  unknown gesture preset: ${preset}`)
           console.error(`  presets: ${GESTURE_PRESETS.join(', ')}`)
-          rnxExit(1)
+          peachExit(1)
         }
         const frame = await bridge.send({
           type: 'evaluate',
@@ -2957,7 +2969,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         if (args.some((arg) => arg === '--node-id' || arg.startsWith('--node-id='))) {
           console.error('  scroll takes a testID; --node-id is not supported')
           console.error(inspectUsage('scroll', '<id> <x> <y> | --testid <id> <x> <y>'))
-          rnxExit(1)
+          peachExit(1)
         }
         const target = readTargetFlag(args)
         const id = target?.mode === 'testid' ? target.value : positional[1]
@@ -2966,7 +2978,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const y = Number(positional[offset + 1])
         if (!id || !Number.isFinite(x) || !Number.isFinite(y)) {
           console.error(inspectUsage('scroll', '<id> <x> <y> | --testid <id> <x> <y>'))
-          rnxExit(1)
+          peachExit(1)
         }
         const resolved = await resolveTargetCoords(bridge, { mode: 'testid', value: id })
         const result = await performSingleStep(bridge, {
@@ -3125,7 +3137,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             const id = positional[2]
             if (!id) {
               console.error(`  usage: ${inspectCommand('state')} node <id>`)
-              rnxExit(1)
+              peachExit(1)
             }
             result =
               (await callTestBridge(bridge, 'findByTestId', id)) ||
@@ -3136,7 +3148,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             const id = positional[2]
             if (!id) {
               console.error(`  usage: ${inspectCommand('state')} scroll <id>`)
-              rnxExit(1)
+              peachExit(1)
             }
             result = await callTestBridge(bridge, 'getScrollState', id)
             break
@@ -3146,7 +3158,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             const y = Number(positional[3])
             if (!Number.isFinite(x) || !Number.isFinite(y)) {
               console.error(`  usage: ${inspectCommand('state')} scroll-hit <x> <y>`)
-              rnxExit(1)
+              peachExit(1)
             }
             result = await callTestBridge(bridge, 'getScrollStateAt', x, y)
             break
@@ -3156,7 +3168,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             const y = Number(positional[3])
             if (!Number.isFinite(x) || !Number.isFinite(y)) {
               console.error(`  usage: ${inspectCommand('state')} hit <x> <y>`)
-              rnxExit(1)
+              peachExit(1)
             }
             result = await callTestBridge(bridge, 'debugHitAt', x, y)
             break
@@ -3166,7 +3178,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             const y = Number(positional[3])
             if (!Number.isFinite(x) || !Number.isFinite(y)) {
               console.error(`  usage: ${inspectCommand('state')} gesture <x> <y>`)
-              rnxExit(1)
+              peachExit(1)
             }
             result = await callTestBridge(bridge, 'debugGestureAt', x, y)
             break
@@ -3211,7 +3223,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             break
           default:
             console.error(`  unknown state subcommand: ${stateCmd}`)
-            rnxExit(1)
+            peachExit(1)
         }
         console.log(JSON.stringify(result, null, 2))
         break
@@ -3267,7 +3279,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
                 : '<home|switcher> [settleMs]',
             ),
           )
-          rnxExit(1)
+          peachExit(1)
         }
 
         let ok = false
@@ -3280,7 +3292,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             console.error(
               inspectUsage('shell', 'launch <appId> [settleMs] [--clear-state]'),
             )
-            rnxExit(1)
+            peachExit(1)
           }
           if (clearState) {
             await bridge.send({
@@ -3345,7 +3357,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const appId = positional[2]
           if (!appId) {
             console.error(inspectUsage('shell', 'open-card <appId> [settleMs]'))
-            rnxExit(1)
+            peachExit(1)
           }
           ok = !!(await callShellCommandWhenReady(
             bridge,
@@ -3378,7 +3390,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const mode = positional[2]
           if (!mode || !['light', 'dark', 'auto', 'toggle'].includes(mode)) {
             console.error(inspectUsage('shell', 'appearance <light|dark|auto|toggle>'))
-            rnxExit(1)
+            peachExit(1)
           }
           const result = await runShellVisualCommand(bridge, 'appearance', mode)
           ok = !!result?.ok
@@ -3396,7 +3408,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           state = { [shellCmd]: result }
         } else {
           console.error(`  unknown shell subcommand: ${shellCmd}`)
-          rnxExit(1)
+          peachExit(1)
         }
         console.log(JSON.stringify({ ok, settled, state }, null, 2))
         break
@@ -3422,7 +3434,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           } else {
             console.error(`  ${message}`)
           }
-          rnxExit(1)
+          peachExit(1)
         }
         // reload waits for the guest app's `sootsim:externalAppReady` signal
         // (not just a live ws connection) within RELOAD_READY_TIMEOUT_MS. fatal
@@ -3559,7 +3571,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           }
         }
         if (!readyResult?.ready) {
-          rnxExit(1)
+          peachExit(1)
         }
         break
       }
@@ -3582,7 +3594,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
               '  storage clear failed: external app reload bridge is unavailable',
             )
           }
-          rnxExit(1)
+          peachExit(1)
         }
 
         const readyResult = await pollForReloadReady(bridge, {
@@ -3591,7 +3603,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
 
         if (wantsJson(effectiveArgs)) {
           printJson({ cleared: true, ready: readyResult.ready, reload: readyResult })
-          if (!readyResult.ready) rnxExit(1)
+          if (!readyResult.ready) peachExit(1)
           break
         }
 
@@ -3635,7 +3647,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           // ignore errors checking for errors
         }
         if (!readyResult.ready) {
-          rnxExit(1)
+          peachExit(1)
         }
         break
       }
@@ -3659,7 +3671,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `    ${inspectCommand('js')} SootSim.bridges.keyboard.type("hello")`,
           )
           console.error(`    ${inspectCommand('js')} SootSim.state.root.children.length`)
-          rnxExit(1)
+          peachExit(1)
         }
         // --tenant: evaluate inside the TENANT worker's global scope (guest
         // bundle, metro module table, compat stubs) via the test bridge's
@@ -3784,7 +3796,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
       case 'perf': {
         if (invocationPrefix === 'debug' && !opts.internalPerfCommand) {
           console.error('  `peach debug perf` was removed. use `peach perf shell ...`.')
-          rnxExit(1)
+          peachExit(1)
         }
         const perfCmd = positional[1]
         if (opts.internalPerfCommand === 'scroll') {
@@ -3816,7 +3828,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             const parsedLimit = limitValue === undefined ? 6000 : Number(limitValue)
             if (!Number.isFinite(parsedLimit) || parsedLimit < 120) {
               console.error('  error: --limit must be a number of at least 120')
-              rnxExit(1)
+              peachExit(1)
             }
             const pressTestID = effectiveArgs.find(
               (_, index) => effectiveArgs[index - 1] === '--press-testid',
@@ -3832,7 +3844,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             })
             if (result?.error) {
               console.error(`  error: ${result.error}`)
-              rnxExit(1)
+              peachExit(1)
             }
             console.log(
               `  scroll profiling started: perform consecutive swipes, then run '${inspectCommand('perf')} stop'`,
@@ -3850,7 +3862,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             })
             if (result?.error) {
               console.error(`  error: ${result.error}`)
-              rnxExit(1)
+              peachExit(1)
             }
             const trace: SootSimScrollPerformanceTrace = result
             if (wantsJson(effectiveArgs)) {
@@ -3891,7 +3903,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             break
           }
           console.error(`  unknown scroll perf command: ${perfCmd}`)
-          rnxExit(1)
+          peachExit(1)
         }
         if (!perfCmd || perfCmd === '--help' || perfCmd === '-h') {
           console.log(`
@@ -3932,7 +3944,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             })
             if (result?.error) {
               console.error(`  error: ${result.error}`)
-              rnxExit(1)
+              peachExit(1)
             }
             console.log(
               `  shell profiling started — interact with the app, then run '${inspectCommand('perf')} stop'`,
@@ -3957,7 +3969,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
                   '  (shell worker did not answer within 5s — is a sim loaded?)',
                 )
               }
-              rnxExit(1)
+              peachExit(1)
             }
             if (wantsJson(effectiveArgs)) {
               printJson(result)
@@ -4013,7 +4025,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             })
             if (result?.error) {
               console.error(`  error: ${result.error}`)
-              rnxExit(1)
+              peachExit(1)
             }
             if (wantsJson(effectiveArgs)) {
               printJson(result)
@@ -4046,7 +4058,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
                 `  use 'perf start' / 'perf stop' (worst frames are in the stop report).`,
               )
             }
-            rnxExit(1)
+            peachExit(1)
         }
         break
       }
@@ -4151,12 +4163,12 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const raw = positional[1]
         if (!raw || raw === '--help' || raw === '-h') {
           console.error(`  usage: ${inspectCommand('animation')} <id>`)
-          rnxExit(1)
+          peachExit(1)
         }
         const id = Number(raw)
         if (!Number.isFinite(id)) {
           console.error(`  invalid id: ${raw}`)
-          rnxExit(1)
+          peachExit(1)
         }
         const result = await callTestBridge(bridge, 'getAnimation', id)
         console.log(JSON.stringify(result, null, 2))
@@ -4167,12 +4179,12 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         const raw = positional[1]
         if (!raw || raw === '--help' || raw === '-h') {
           console.error(`  usage: ${inspectCommand('stop-animation')} <id|all>`)
-          rnxExit(1)
+          peachExit(1)
         }
         const target: number | 'all' = raw === 'all' ? 'all' : Number(raw)
         if (target !== 'all' && !Number.isFinite(target)) {
           console.error(`  invalid id: ${raw}`)
-          rnxExit(1)
+          peachExit(1)
         }
         const count = await callTestBridge<number>(bridge, 'stopAnimation', target)
         console.log(`  stopped ${count ?? 0} animation(s)`)
@@ -4275,7 +4287,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const id = positional[2]
           if (!id) {
             console.error('  usage: peach network get <id>')
-            rnxExit(1)
+            peachExit(1)
           }
           const entry = (await bridge.send({
             type: 'evaluate',
@@ -4287,7 +4299,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           })) as NetworkEntryPayload | null
           if (!entry) {
             console.error(`  no entry with id ${id}`)
-            rnxExit(1)
+            peachExit(1)
           }
           if (jsonOut) {
             console.log(JSON.stringify(entry, null, 2))
@@ -4306,7 +4318,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `  invalid limit: ${sub} — \`network\` takes a numeric count (e.g. ${inspectCommand('network')} 100).\n` +
               `  to target a specific sim, use \`--sim ${sub}\` instead.`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
 
         const fetchEntries = async () => {
@@ -4475,7 +4487,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `  invalid limit: ${sub} — \`logs\` takes a numeric count (e.g. ${inspectCommand('logs')} 100).\n` +
               `  to target a specific sim, use \`--sim ${sub}\` instead.`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
 
         const fetchEntries = () => inspectLogs(bridge)
@@ -4533,7 +4545,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
 
       default:
         console.error(`  unknown subcommand: ${subcommand}`)
-        rnxExit(1)
+        peachExit(1)
     }
 
     // auto-settle after any write command so the next CLI call doesn't see
@@ -4641,7 +4653,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         // ignore secondary request summary errors while already failing the command
       }
     }
-    rnxExit(1)
+    peachExit(1)
   } finally {
     if (subcommand !== 'list') await collectRuntimeDiagnostics(bridge)
     bridge.close()