rnxsim 0.1.368 → 0.1.370

package/cli/commands/assert.ts

@@ -14,6 +14,7 @@
 //   2   misuse — bad flags, unknown verb    (treated as bad by bisect)
 
 import { spawn } from 'child_process'
+import { rnxExit } from '../run-rnx'
 
 // READ_VERBS lists every command whose stdout we know is valid JSON under
 // --json. keeping this explicit means `sootsim assert tap 100 200` fails
@@ -403,13 +404,13 @@ function runJq(expr: string, payload: unknown): Promise<string> {
 export async function runAssert(rawArgs: string[]): Promise<void> {
   if (rawArgs[0] === '--help' || rawArgs[0] === '-h' || rawArgs.length === 0) {
     printHelp()
-    process.exit(rawArgs.length === 0 ? 2 : 0)
+    rnxExit(rawArgs.length === 0 ? 2 : 0)
   }
 
   const parsed = parseAssertArgs(rawArgs)
   if ('error' in parsed) {
     process.stderr.write(`  assert: ${parsed.error}\n`)
-    process.exit(2)
+    rnxExit(2)
   }
 
   const { verbArgs, predicates, withinMs, negate, quiet, allowTimeout } = parsed
@@ -420,7 +421,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
       `  assert: unknown or non-read verb: ${verbArgs.join(' ')}\n` +
         `  supported: ${Array.from(READ_VERBS).sort().join(', ')}\n`,
     )
-    process.exit(2)
+    rnxExit(2)
   }
 
   // default assertion when none given is --exists. matches the common
@@ -452,7 +453,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
         const label = exitCode === 1 ? 'fail' : 'skip'
         process.stderr.write(`  assert: ${label} — ${lastVerbSkipReason}\n`)
       }
-      process.exit(exitCode)
+      rnxExit(exitCode)
     }
 
     let allPass = true
@@ -468,7 +469,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
       }
     } catch (err: any) {
       if (!quiet) process.stderr.write(`  assert: skip — ${err.message}\n`)
-      process.exit(125)
+      rnxExit(125)
     }
 
     const pass = negate ? !allPass : allPass
@@ -478,7 +479,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
           `  assert: pass${attempts > 1 ? ` (attempt ${attempts})` : ''} — ${reasons.join('; ')}\n`,
         )
       }
-      process.exit(0)
+      rnxExit(0)
     }
 
     lastFailReason = reasons.join('; ')
@@ -491,7 +492,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
         `  assert: fail${attempts > 1 ? ` after ${attempts} attempt(s)` : ''} — ${lastFailReason}\n`,
       )
     }
-    process.exit(1)
+    rnxExit(1)
   }
 }
 

package/cli/commands/auth.ts

@@ -1,5 +1,6 @@
 import { refreshSharedDesktopAuthSession } from '../../src/auth/shared-session'
 import { resolveCliAuth } from '../auth'
+import { rnxExit } from '../run-rnx'
 
 function printHelp(): void {
   console.log(`
@@ -55,5 +56,5 @@ export async function runAuth(args: string[]): Promise<void> {
 
   console.error(`  unknown auth command: ${sub}`)
   printHelp()
-  process.exit(1)
+  rnxExit(1)
 }

package/cli/commands/box/checkout-plane.ts

@@ -1,7 +1,6 @@
-// ProjectFilePlane over a real local checkout — the third provider behind the
-// seam Contrast's browser host and its server host already implement. writes
-// land on the user's actual disk, so this plane refuses anything it cannot
-// represent faithfully rather than round-tripping it through a string.
+// ProjectFilePlane over a real local checkout — the second host behind the
+// seam Contrast's browser already implements. writes land on the user's actual
+// disk, so nothing here converts content: the plane reads and writes bytes.
 //
 // the file set comes from `git ls-files -co --exclude-standard`, which is the
 // project's own definition of what belongs to it. a hardcoded skip list was
@@ -20,14 +19,14 @@ const execFileAsync = promisify(execFile)
 
 export class CheckoutRequiresGitError extends Error {}
 
-// a NUL byte is the usual "this is not text" test. the plane serves strings,
-// so a binary file cannot survive a read/write round trip. reading one gives
-// the same garbage real `cat` gives, which is fine; WRITING one back would
-// corrupt a file on the user's actual disk, so binary files are published as
-// read-only and the write path refuses them by name. detecting this at read
-// time is not an option: just-bash's `cat` discards every readFile error and
-// reports "No such file or directory" whatever the error says, so the refusal
-// has to live in the index where the filesystem layer can act on it.
+// a NUL byte is the usual "this is not text" test. it is published as metadata
+// rather than acted on here: moving a binary file is byte-exact and perfectly
+// fine, and so is deleting one, but a shell command that produced TEXT cannot
+// be allowed to overwrite it, because that text is a lossy decode of the
+// file's own bytes. HarnessProjectFs owns that refusal. detecting it at write
+// time instead is not an option: just-bash's `cat` discards every readFile
+// error and reports "No such file or directory" whatever the error says, so
+// the fact has to be in the index where the filesystem layer can read it.
 const BINARY_SNIFF_BYTES = 8192
 
 function looksBinary(filePath: string, size: number): boolean {
@@ -45,9 +44,24 @@ function looksBinary(filePath: string, size: number): boolean {
   }
 }
 
+// the box re-indexes before every command, so the sniff above runs against the
+// whole project every time a user presses return. on a 14,889-file checkout
+// that is 277-644 ms of a 430-840 ms refresh, and nearly all of it re-reads
+// files that did not change. a file whose size and mtime both match the last
+// look has the same first 8 KB, so remember the answer against those two.
+// `statSync` already returns mtimeMs, and it carries sub-millisecond
+// resolution here, so the window in which a same-size rewrite could hide is
+// narrower than a millisecond rather than git's one-second racy-clean case.
+interface SniffedFile {
+  size: number
+  mtimeMs: number
+  binary: boolean
+}
+
 export class CheckoutFilePlane implements ProjectFilePlane {
   readonly root: string
   private entries = new Map<string, ProjectFileMeta>()
+  private sniffed = new Map<string, SniffedFile>()
 
   constructor(root: string) {
     this.root = path.resolve(root)
@@ -77,6 +91,9 @@ export class CheckoutFilePlane implements ProjectFilePlane {
     }
 
     const next = new Map<string, ProjectFileMeta>()
+    // rebuilt alongside the index rather than pruned, so a deleted file's
+    // record cannot outlive it in a box that stays open all day
+    const nextSniffed = new Map<string, SniffedFile>()
     for (const relative of stdout.split('\0')) {
       if (!relative) continue
       let stat: fs.Stats
@@ -87,12 +104,22 @@ export class CheckoutFilePlane implements ProjectFilePlane {
         continue
       }
       if (!stat.isFile()) continue
+      const seen = this.sniffed.get(relative)
+      const binary =
+        seen && seen.size === stat.size && seen.mtimeMs === stat.mtimeMs
+          ? seen.binary
+          : looksBinary(path.join(this.root, relative), stat.size)
+      nextSniffed.set(relative, { size: stat.size, mtimeMs: stat.mtimeMs, binary })
       next.set(relative, {
         size: stat.size,
-        readOnly: looksBinary(path.join(this.root, relative), stat.size),
+        // a checkout carries no write policy of its own; if the user can write
+        // the file, so can the shell
+        readOnly: false,
+        binary,
       })
     }
     this.entries = next
+    this.sniffed = nextSniffed
   }
 
   private absolute(planePath: string): string {
@@ -109,13 +136,19 @@ export class CheckoutFilePlane implements ProjectFilePlane {
     return fs.promises.readFile(this.absolute(planePath), 'utf8')
   }
 
-  async write(planePath: string, content: string): Promise<void> {
+  async readBytes(planePath: string): Promise<Uint8Array> {
+    return fs.promises.readFile(this.absolute(planePath))
+  }
+
+  async write(planePath: string, content: Uint8Array): Promise<void> {
     const absolute = this.absolute(planePath)
     await fs.promises.mkdir(path.dirname(absolute), { recursive: true })
-    await fs.promises.writeFile(absolute, content, 'utf8')
+    await fs.promises.writeFile(absolute, content)
     this.entries.set(planePath, {
-      size: Buffer.byteLength(content, 'utf8'),
+      size: content.byteLength,
       readOnly: false,
+      // the bytes are in hand, so the same NUL test costs nothing here
+      binary: content.subarray(0, BINARY_SNIFF_BYTES).includes(0),
     })
   }
 

package/cli/commands/compat.ts

@@ -1,7 +1,7 @@
 // sootsim compat — scan dependencies with the shared compatibility engine.
 
 import { existsSync, readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
+import { dirname, join, relative, resolve } from 'node:path'
 import {
   COMPAT_RESULT_CAVEAT,
   formatDetailedScanLines,
@@ -9,6 +9,7 @@ import {
   scanDeps,
   type ScanResult,
 } from '@sootsim/compat/web'
+import { findProjectRoot, scanWorkspace } from './detect'
 
 interface PackageManifest {
   name?: string
@@ -47,7 +48,47 @@ flags:
     return
   }
 
-  const result = packageName ? scanOnePackage(pkg, packageName) : scanDeps(pkg)
+  if (packageName) {
+    report(args, scanOnePackage(appDir, pkg, packageName))
+    return
+  }
+
+  const here = scanDeps(installedManifest(appDir, pkg))
+  if (here.packages.length > 0 || appIndex >= 0) {
+    report(args, here)
+    return
+  }
+
+  // a monorepo root manifest is not the app. it carries react-native and expo
+  // so the workspace resolves and little else, so scanning it reports a
+  // project with nothing to check while the real app sits in a subdirectory.
+  const workspaceRoot = findProjectRoot(appDir)
+  const elsewhere = scanWorkspace(workspaceRoot).apps.flatMap((app) => {
+    if (resolve(app.dir) === appDir) return []
+    const manifest = readPackageJson(app.dir)
+    if (!manifest) return []
+    const result = scanDeps(installedManifest(app.dir, manifest))
+    return result.packages.length > 0 ? [{ dir: app.dir, result }] : []
+  })
+
+  if (elsewhere.length === 1) {
+    const only = elsewhere[0]
+    console.log(`\n  scanning ${relative(appDir, only.dir) || '.'}`)
+    report(args, only.result)
+    return
+  }
+  if (elsewhere.length > 1) {
+    console.log(`\n  this workspace has more than one app. scan one with --app:`)
+    for (const entry of elsewhere) {
+      console.log(`    rnx compat --app ${relative(appDir, entry.dir)}`)
+    }
+    console.log()
+    return
+  }
+  report(args, here)
+}
+
+function report(args: string[], result: ScanResult): void {
   if (args.includes('--json')) {
     console.log(JSON.stringify(result, null, 2))
     return
@@ -73,6 +114,47 @@ flags:
   console.log(`\n  ${COMPAT_RESULT_CAVEAT}\n`)
 }
 
+// the declared range is often not a version: pnpm and bun catalogs write
+// `catalog:`, a workspace dependency writes `workspace:*`, and a pinned tarball
+// writes a URL. none of those match a verified version range, so a whole app
+// reports as unverified. the installed tree holds the version that will
+// actually run, so ask it, and keep the declared range for anything the project
+// has not installed.
+function installedManifest(appDir: string, pkg: PackageManifest): PackageManifest {
+  const resolveVersion = (name: string, declared: string): string => {
+    let dir = appDir
+    while (true) {
+      const manifest = join(dir, 'node_modules', name, 'package.json')
+      if (existsSync(manifest)) {
+        try {
+          const parsed: unknown = JSON.parse(readFileSync(manifest, 'utf8'))
+          if (parsed && typeof parsed === 'object' && 'version' in parsed) {
+            const version = parsed.version
+            if (typeof version === 'string') return version
+          }
+        } catch {}
+        return declared
+      }
+      const parent = dirname(dir)
+      if (parent === dir) return declared
+      dir = parent
+    }
+  }
+  const mapped = (deps: Record<string, string> | undefined) =>
+    deps &&
+    Object.fromEntries(
+      Object.entries(deps).map(([name, declared]) => [
+        name,
+        resolveVersion(name, declared),
+      ]),
+    )
+  return {
+    name: pkg.name,
+    dependencies: mapped(pkg.dependencies),
+    devDependencies: mapped(pkg.devDependencies),
+  }
+}
+
 function readPackageJson(appDir: string): PackageManifest | null {
   const packagePath = resolve(appDir, 'package.json')
   if (!existsSync(packagePath)) return null
@@ -80,8 +162,15 @@ function readPackageJson(appDir: string): PackageManifest | null {
   return parsed && typeof parsed === 'object' ? parsed : null
 }
 
-function scanOnePackage(pkg: PackageManifest, packageName: string): ScanResult {
+function scanOnePackage(
+  appDir: string,
+  pkg: PackageManifest,
+  packageName: string,
+): ScanResult {
+  const installed = installedManifest(appDir, pkg)
   const version =
-    pkg.dependencies?.[packageName] ?? pkg.devDependencies?.[packageName] ?? '*'
+    installed.dependencies?.[packageName] ??
+    installed.devDependencies?.[packageName] ??
+    '*'
   return scanDeps({ dependencies: { [packageName]: version } })
 }

package/cli/commands/config.ts

@@ -1,3 +1,4 @@
+import { rnxExit } from '../run-rnx'
 import { runTelemetry } from './telemetry'
 
 function printHelp(): void {
@@ -28,5 +29,5 @@ export async function runConfig(args: string[]): Promise<void> {
 
   console.error(`  unknown config command: ${sub ?? '(missing)'}`)
   printHelp()
-  process.exit(1)
+  rnxExit(1)
 }

package/cli/commands/control.ts

@@ -55,6 +55,7 @@ import {
 } from '../current-sim'
 import { getDriver } from '../drivers/registry'
 import { openUrl as openUrlInBrowser } from '../open-url'
+import { rethrowIfExit, rnxExit } from '../run-rnx'
 import {
   BridgeSimLockedError,
   bridgePortForShellBaseUrl,
@@ -477,18 +478,18 @@ function parseOpenRuntimeConfig(args: string[]): SootSimConfig | undefined {
       const raw = args[i + 1]
       if (!raw) {
         console.error('  rnx open: --replace expects <module>=<file>')
-        process.exit(1)
+        rnxExit(1)
       }
       const eqIndex = raw.indexOf('=')
       if (eqIndex <= 0 || eqIndex === raw.length - 1) {
         console.error('  rnx open: --replace expects <module>=<file>')
-        process.exit(1)
+        rnxExit(1)
       }
       const moduleName = raw.slice(0, eqIndex).trim()
       const filePath = normalizeReplacementPath(raw.slice(eqIndex + 1).trim())
       if (!fs.existsSync(filePath)) {
         console.error(`  rnx open: replacement file not found: ${filePath}`)
-        process.exit(1)
+        rnxExit(1)
       }
       modules[moduleName] = { file: filePath }
       i++
@@ -502,7 +503,7 @@ function parseOpenRuntimeConfig(args: string[]): SootSimConfig | undefined {
       const eqIndex = raw ? raw.indexOf('=') : -1
       if (!raw || eqIndex <= 0 || eqIndex === raw.length - 1) {
         console.error('  rnx open: --remap expects <host:port>=<host:port>')
-        process.exit(1)
+        rnxExit(1)
       }
       remap[raw.slice(0, eqIndex).trim()] = raw.slice(eqIndex + 1).trim()
       i++
@@ -1338,7 +1339,7 @@ export async function runLinkCommand(args: string[], opts: ControlCommandOptions
   if (parsed.positional.length !== 1) {
     console.error('  rnx open: expected exactly one <url-or-route>')
     console.error('  examples: rnx open /settings  |  rnx open myapp://settings')
-    process.exit(1)
+    rnxExit(1)
   }
 
   const bridge = createBridgeFromParsed(parsed)
@@ -1353,7 +1354,7 @@ export async function runLinkCommand(args: string[], opts: ControlCommandOptions
       warningsCommand: `rnx get warnings 5${simHint}`,
       requestsCommand: `rnx get requests 5${simHint}`,
     })
-    process.exit(1)
+    rnxExit(1)
   } finally {
     bridge.close()
   }
@@ -1397,11 +1398,11 @@ export async function runOpenCommand(
     console.error(
       `  rnx open: --cdp-port must be a positive port number, got "${cdpPortArg}"`,
     )
-    process.exit(1)
+    rnxExit(1)
   }
   if (requestedProfileId && ephemeralProfile) {
     console.error('  rnx open: --profile cannot be combined with --ephemeral')
-    process.exit(1)
+    rnxExit(1)
   }
   const profileId = requestedProfileId ? ensureProfile(requestedProfileId).id : undefined
   const openInNewSim = args.includes('--new') || !!profileId || ephemeralProfile
@@ -1410,7 +1411,7 @@ export async function runOpenCommand(
     console.error(
       '  rnx open: --new, --profile, and --ephemeral cannot be combined with --sim',
     )
-    process.exit(1)
+    rnxExit(1)
   }
   const target = parsed.positional[0] || ''
 
@@ -1419,7 +1420,7 @@ export async function runOpenCommand(
       console.error(
         '  rnx open: deep links target the current app; remove --new, --profile, or --ephemeral',
       )
-      process.exit(1)
+      rnxExit(1)
     }
     await runLinkCommand(args, opts)
     return
@@ -1447,7 +1448,7 @@ export async function runOpenCommand(
         `  could not launch a browser: ${err instanceof Error ? err.message : String(err)}`,
       )
       console.error(`  open it yourself: ${target}`)
-      process.exit(1)
+      rnxExit(1)
     }
     console.log(
       isLocal
@@ -1492,7 +1493,7 @@ export async function runOpenCommand(
   const requestedDriverId = args.find((_, i) => args[i - 1] === '--driver') || ''
   if (requestedDriverId && !isDriverId(requestedDriverId)) {
     console.error(`  unknown driver "${requestedDriverId}" — run \`rnx list --drivers\``)
-    process.exit(1)
+    rnxExit(1)
   }
   const driverId: DriverId = isDriverId(requestedDriverId)
     ? requestedDriverId
@@ -1506,7 +1507,7 @@ export async function runOpenCommand(
   const driverHeadless = resolveDriverHeadless(args, driverId)
   if (cdpPort && driverId !== 'playwright') {
     console.error('  rnx open: --cdp-port is only honored by the playwright driver')
-    process.exit(1)
+    rnxExit(1)
   }
 
   // metro HMR mode. interactive opens default to hot=true so edits hot-apply
@@ -1520,7 +1521,7 @@ export async function runOpenCommand(
   const noHmrFlag = args.includes('--no-hmr')
   if (hotFlag && noHmrFlag) {
     console.error('  rnx open: --hot and --no-hmr cannot be combined')
-    process.exit(1)
+    rnxExit(1)
   }
   const hotMode = hotFlag ? true : noHmrFlag ? false : driverId !== 'playwright'
 
@@ -1532,7 +1533,7 @@ export async function runOpenCommand(
   if (deviceArg && !(deviceArg in devices)) {
     console.error(`  rnx open: unknown device "${deviceArg}"`)
     console.error(`  known devices: ${listSelectableDeviceModels().join(', ')}`)
-    process.exit(1)
+    rnxExit(1)
   }
   const deviceSpec = deviceArg ? devices[deviceArg as DeviceModel] : undefined
 
@@ -1544,7 +1545,7 @@ export async function runOpenCommand(
   const viewportMatch = viewportArg ? /^(\d+)x(\d+)$/.exec(viewportArg) : null
   if (viewportArg && !viewportMatch) {
     console.error(`  rnx open: --viewport must be <width>x<height>, got "${viewportArg}"`)
-    process.exit(1)
+    rnxExit(1)
   }
   const explicitViewport = viewportMatch
     ? { width: Number(viewportMatch[1]), height: Number(viewportMatch[2]) }
@@ -1662,7 +1663,7 @@ export async function runOpenCommand(
           warningsCommand: `rnx get warnings 5${simHint}`,
           requestsCommand: `rnx get requests 5${simHint}`,
         })
-        process.exit(1)
+        rnxExit(1)
       }
 
       if (!fallBackToNewSim && targetSim) {
@@ -1674,7 +1675,7 @@ export async function runOpenCommand(
         )
         if (!ready) {
           console.error('  timed out waiting for current sim to load target')
-          process.exit(1)
+          rnxExit(1)
         }
         ready.bridge.close()
         saveCurrentSimId(targetSim.id)
@@ -1706,7 +1707,7 @@ export async function runOpenCommand(
     console.error(
       '  could not resolve a stable owning process; refusing unsupervised sim host',
     )
-    process.exit(1)
+    rnxExit(1)
   }
   const simMatchesToken = (sim: BridgeSimInfo) =>
     sim.url?.includes(`inspectOpen=${token}`) ?? false
@@ -1714,7 +1715,7 @@ export async function runOpenCommand(
   const driver = getDriver(driverId)
   if (!driver) {
     console.error(`  unknown driver "${driverId}" — run \`rnx list --drivers\``)
-    process.exit(1)
+    rnxExit(1)
   }
   const connectWait = resolveDriverConnectWaitOptions()
   const result = await driver.launch({
@@ -1738,7 +1739,7 @@ export async function runOpenCommand(
   })
   if (!result.launched) {
     console.error(`  ${driver.name} driver: ${result.message}`)
-    process.exit(1)
+    rnxExit(1)
   }
   const outcome = await waitForSimMatchOrHostExit(
     parsed.wsPort,
@@ -1750,7 +1751,7 @@ export async function runOpenCommand(
   if (outcome.kind === 'host-exit') {
     printDriverDiagnosticLogTail(result)
     console.error(`  ${driver.name} host crashed — sim is no longer attached`)
-    process.exit(1)
+    rnxExit(1)
   }
   if (outcome.kind === 'timeout') {
     if (result.pid) {
@@ -1763,7 +1764,7 @@ export async function runOpenCommand(
     console.error(
       `  timed out after ${connectWait.timeoutMs}ms waiting for opened sim to connect`,
     )
-    process.exit(1)
+    rnxExit(1)
   }
   const match = outcome.sim
   saveCurrentSimId(match.id)
@@ -1801,7 +1802,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 \`rnx open --new\` for a fresh investigation sim`)
-          process.exit(1)
+          rnxExit(1)
         }
         if (!force) {
           // another CLI agent leases it. don't hijack its target silently;
@@ -1813,20 +1814,21 @@ async function runUseLikeCommand(args: string[], opts: ControlCommandOptions = {
           console.error(
             `  \`sootsim use ${target.id} --force\` to take it, or \`rnx open --new\` for a fresh sim`,
           )
-          process.exit(1)
+          rnxExit(1)
         }
       }
       await bridge.focusSim(target.id)
       saveCurrentSimId(target.id)
       console.log(`  using: ${target.id}`)
     } catch (err) {
+      rethrowIfExit(err)
       console.error(`  use failed: ${err instanceof Error ? err.message : String(err)}`)
       await printBridgeFailureDiagnostics(bridge, {
         errorsCommand: `rnx get errors 5${simHint}`,
         warningsCommand: `rnx get warnings 5${simHint}`,
         requestsCommand: `rnx get requests 5${simHint}`,
       })
-      process.exit(1)
+      rnxExit(1)
     }
   } finally {
     bridge.close()
@@ -1871,10 +1873,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 \`rnx open --new\` for a fresh sim`)
-        process.exit(1)
+        rnxExit(1)
       }
       console.error(`  claim failed: ${err instanceof Error ? err.message : String(err)}`)
-      process.exit(1)
+      rnxExit(1)
     }
   } finally {
     bridge.close()
@@ -2016,7 +2018,7 @@ export async function runCloseCommand(args: string[], opts: ControlCommandOption
         console.error(
           `  close failed: keep sim ${plan.missingExplicitKeepId} is not connected; not closing other sims`,
         )
-        process.exit(1)
+        rnxExit(1)
       }
       if (plan.targets.length === 0) {
         console.log(
@@ -2047,11 +2049,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(', ')}`)
-        process.exit(1)
+        rnxExit(1)
       }
     } catch (err) {
+      rethrowIfExit(err)
       console.error(`  close failed: ${err instanceof Error ? err.message : String(err)}`)
-      process.exit(1)
+      rnxExit(1)
     } finally {
       bridge.close()
     }
@@ -2074,7 +2077,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`)
-        process.exit(1)
+        rnxExit(1)
       }
       await terminatePlaywrightHostsForSims(sims, [target.id])
       if (readCurrentSimId() === target.id) {
@@ -2083,13 +2086,14 @@ export async function runCloseCommand(args: string[], opts: ControlCommandOption
       }
       console.log(`  closed: ${target.id}`)
     } catch (err) {
+      rethrowIfExit(err)
       console.error(`  close failed: ${err instanceof Error ? err.message : String(err)}`)
       await printBridgeFailureDiagnostics(bridge, {
         errorsCommand: `rnx get errors 5${simHint}`,
         warningsCommand: `rnx get warnings 5${simHint}`,
         requestsCommand: `rnx get requests 5${simHint}`,
       })
-      process.exit(1)
+      rnxExit(1)
     }
   } finally {
     bridge.close()