peachsim 0.1.1644 → 0.1.1653

package/README.md

@@ -484,6 +484,18 @@ connected. With multiple driveable sims, the bridge lists their ids and refuses
 to choose. Run `peach use <id>` to pin later commands, or pass `--sim <id>` to
 target one command.
 
+Writes, `peach do reload`, `storage-clear` and `close` honor a live lease held
+by another CLI identity and refuse before the sim is touched. A `peach open`
+that will not reuse a pinned sim (no pin, or `--new`, `--profile`,
+`--ephemeral`) records that intent as soon as its arguments validate. If it
+then fails, including while resolving the app bundle, later commands from the
+same CLI identity that name no sim refuse instead of landing on another
+connected tab: writes, `reload`, `storage-clear`, `close`, `close --all` and
+`close --others`. A successful `peach open`, `peach use <id>` or `--sim <id>`
+restores intent, and reads keep the fallback. Naming a sim (`peach close <id>`)
+is explicit and is not blocked; closing an unleased sim that someone else owns
+by naming it stays the caller's call.
+
 Use an inline `peach do` chain for a short action sequence that should execute as
 one engine batch. Repeat `--then` before each additional action. Each phrase
 uses the same positional grammar as its standalone `do` command. Touch timing

package/cli/app-catalog.ts

@@ -5,7 +5,7 @@ import {
   enumerateBundleImages,
   enumerateBundleSymbols,
 } from '../../sootsim-swift/src/bundleAssets'
-import type { AppCatalog } from 'peach-engine/engine/app-catalog-wire'
+import type { AppCatalog } from '#peach-cli-contract/engine/app-catalog-wire'
 
 // the xcode build setting actool turns into the built Info.plist's
 // NSAccentColorName when the source plist does not name one itself

package/cli/app-fonts.ts

@@ -2,19 +2,7 @@ import { createHash } from 'node:crypto'
 import fs from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
-import {
-  encodeAppFontsWire,
-  resolveAppFontsWire,
-  expoFontPathsFromPlugins,
-  nativeLinkedFontSpecsFromPaths,
-  appFontAssetUrlsFromWire,
-  type ConfigPluginFontSpec,
-  type FontPlatform,
-} from 'peach-engine/engine/config-plugin-fonts'
-import { resolveListeningPid, resolveProcessCwd } from '../scripts/dev-server-scanner'
-import { loopbackOriginOf } from '../src/backend-origin'
-import { MANIFEST_PROBE_TIMEOUT_MS } from '../src/dev-bundle-resolution'
-import { parseExpoManifestBody } from '../src/expo-manifest-body'
+import { getCliRuntime } from '../src/cli-runtime.ts'
 import { stageHostFile } from '../src/host/staged-host-files'
 import { parsePlistSource } from '../src/plist.ts'
 import { listXcodeAppTargets, readXcodeAppTarget } from '../src/xcode-project'
@@ -23,6 +11,8 @@ import {
   materialSymbolFontPaths,
   materialSymbolFontAssets,
 } from './material-symbol-fonts'
+import type { FontPlatform } from '#peach-cli-contract/engine/config-plugin-fonts'
+import type { ConfigPluginFontSpec } from '#peach-cli-contract/engine/config-plugin-fonts'
 
 const require = createRequire(import.meta.url)
 
@@ -43,7 +33,7 @@ export function discoverNativeLinkedAppFonts(opts: {
 }): DiscoveredAppFontSpec[] {
   const { paths, materialSymbols } = discoverNativeLinkedAppFontAssets(opts)
   const realProjectRoot = fs.realpathSync(opts.projectDir)
-  const specs = nativeLinkedFontSpecsFromPaths(
+  const specs = getCliRuntime().engine_config_plugin_fonts.nativeLinkedFontSpecsFromPaths(
     projectRelativeFontPaths(opts.projectDir, paths),
     nativeFontPlatform(opts.platform),
     (fontPath) =>
@@ -143,7 +133,8 @@ function discoverNativeLinkedAppFontAssets(opts: {
   }
 
   // a declared path with no file behind it links nothing natively.
-  const fontPaths = expoFontPathsFromPlugins(plugins, platform)
+  const fontPaths = getCliRuntime()
+    .engine_config_plugin_fonts.expoFontPathsFromPlugins(plugins, platform)
     .slice(0, 256)
     .map((fontPath) => path.resolve(selectedAppDir, fontPath))
     .filter(isFile)
@@ -354,7 +345,7 @@ export function readNativeLinkedAppFontsWire(opts: {
   }
   const projectDir = fs.realpathSync(opts.projectDir)
   const { paths, materialSymbols } = discoverNativeLinkedAppFontAssets(opts)
-  const specs = nativeLinkedFontSpecsFromPaths(
+  const specs = getCliRuntime().engine_config_plugin_fonts.nativeLinkedFontSpecsFromPaths(
     projectRelativeFontPaths(projectDir, paths),
     nativeFontPlatform(opts.platform),
     (fontPath) => {
@@ -368,69 +359,7 @@ export function readNativeLinkedAppFontsWire(opts: {
     (filePath) =>
       `data:application/octet-stream;base64,${fs.readFileSync(filePath).toString('base64')}`,
   )
-  return encodeAppFontsWire(specs)
-}
-
-// resolve a metro dev server's project root. Expo's middleware advertises it
-// in X-React-Native-Project-Root, encoded with encodeURI. Older servers name it
-// in extra.expoClient._internal.projectRoot. The local peach open path runs from the
-// CLI's cwd, which almost never owns the bundle being opened (e.g.
-// `peach open 8081` run from ~/contrast against a 3pc metro), so scanning cwd for
-// font declarations finds nothing.
-//
-// a bare react-native packager serves no such manifest, so the same resolver
-// asks the OS for the listening process's cwd. that is still the development
-// server's project identity; the invoking CLI's cwd is never consulted.
-//
-// it waits on the same budget as the manifest resolution that found this dev
-// server. a cold Expo Metro answers /status in 2-4s while it builds a bundle,
-// and dropping the project there opens the app without its fonts, splash or
-// Firebase config. a server that stays silent past the budget fails the open.
-export async function resolveMetroProjectRoot(bundleUrl: string): Promise<string | null> {
-  const origin = loopbackOriginOf(bundleUrl)
-  if (!origin) return null
-  const controller = new AbortController()
-  const timer = setTimeout(() => controller.abort(), MANIFEST_PROBE_TIMEOUT_MS)
-  let servedManifest = false
-  let metroRunning = false
-  try {
-    const status = await fetch(`${origin}/status`, { signal: controller.signal })
-    const advertisedRoot = status.headers.get('X-React-Native-Project-Root')
-    if (status.ok && advertisedRoot) return decodeURI(advertisedRoot)
-    metroRunning = status.ok && (await status.text()).trim() === 'packager-status:running'
-    const res = await fetch(`${origin}/`, {
-      headers: { 'expo-platform': 'ios', Accept: 'application/json' },
-      signal: controller.signal,
-    })
-    if (res.ok) {
-      const manifest = parseExpoManifestBody(await res.text()) as {
-        extra?: { expoClient?: { _internal?: { projectRoot?: unknown } } }
-      }
-      servedManifest = true
-      const root = manifest?.extra?.expoClient?._internal?.projectRoot
-      if (typeof root === 'string' && root.length > 0) return root
-    }
-  } catch {
-    if (controller.signal.aborted)
-      throw new Error(
-        `Metro project root request timed out after ${MANIFEST_PROBE_TIMEOUT_MS / 1000}s: ${origin}. Wait for the dev server to finish starting or pass --project-root.`,
-      )
-  } finally {
-    clearTimeout(timer)
-  }
-
-  // a server that answered with a manifest has already told us everything it
-  // knows. if it did not name a project root there is none to learn, and asking
-  // the OS about the listening process would answer with whatever directory
-  // that process happens to sit in — which is the CLI's own cwd trap this
-  // function exists to avoid. only a server whose status identifies Metro
-  // and which served no manifest gets the process lookup.
-  if (servedManifest || !metroRunning) return null
-
-  const port = Number(new URL(origin).port)
-  if (!Number.isFinite(port) || port <= 0) return null
-  const pid = await resolveListeningPid(port)
-  return pid === null ? null : resolveProcessCwd(pid)
+  return getCliRuntime().engine_config_plugin_fonts.encodeAppFontsWire(specs)
 }
 
 // content type for a config-plugin font url, by extension. config fonts only
@@ -469,7 +398,9 @@ export async function fetchAppFontFiles(
 ): Promise<FetchedAppFont[]> {
   const out: FetchedAppFont[] = []
   const seen = new Set<string>()
-  for (const url of appFontAssetUrlsFromWire(await resolveAppFontsWire(wire, fetch))) {
+  for (const url of getCliRuntime().engine_config_plugin_fonts.appFontAssetUrlsFromWire(
+    await getCliRuntime().engine_config_plugin_fonts.resolveAppFontsWire(wire, fetch),
+  )) {
     const urlhash = createHash('sha256').update(url).digest('hex')
     if (seen.has(urlhash)) continue
     seen.add(urlhash)

package/cli/app-splash.ts

@@ -2,21 +2,22 @@ import { createHash } from 'node:crypto'
 import fs from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
-import {
-  configPluginSplashFromExpoConfig,
-  encodeAppSplashWire,
-  parseAppSplashWire,
-  type ConfigPluginSplashSpec,
-} from 'peach-engine/engine/config-plugin-splash'
 import { loopbackOriginOf } from '../src/backend-origin'
+import { getCliRuntime } from '../src/cli-runtime.ts'
 import { resolveAppProject } from './app-project'
+import type { ConfigPluginSplashSpec } from '#peach-cli-contract/engine/config-plugin-splash'
 
 const require = createRequire(import.meta.url)
 
 // the filesystem scan and the engine's metro-manifest scan share the same
 // parser (config-plugin-splash.ts) and produce the same resolved spec.
 export type DiscoveredAppSplashSpec = ConfigPluginSplashSpec
-export { encodeAppSplashWire, parseAppSplashWire }
+export function encodeAppSplashWire(spec: ConfigPluginSplashSpec): string {
+  return getCliRuntime().engine_config_plugin_splash.encodeAppSplashWire(spec)
+}
+export function parseAppSplashWire(wire: string): ConfigPluginSplashSpec | null {
+  return getCliRuntime().engine_config_plugin_splash.parseAppSplashWire(wire)
+}
 
 export async function discoverOneNativeAppSplash(
   bundleUrl: string,
@@ -42,9 +43,14 @@ export async function discoverOneNativeAppSplash(
       return null
     const extra = 'extra' in manifest ? manifest.extra : undefined
     if (!extra || typeof extra !== 'object' || !('expoClient' in extra)) return null
-    return configPluginSplashFromExpoConfig(extra.expoClient, 'ios', origin, {
-      oneNativeApp: true,
-    })
+    return getCliRuntime().engine_config_plugin_splash.configPluginSplashFromExpoConfig(
+      extra.expoClient,
+      'ios',
+      origin,
+      {
+        oneNativeApp: true,
+      },
+    )
   } catch {
     return null
   }
@@ -88,7 +94,7 @@ export function discoverConfigPluginAppSplash(opts: {
   } catch {}
   if (!exp || typeof exp !== 'object') return null
 
-  return configPluginSplashFromExpoConfig(
+  return getCliRuntime().engine_config_plugin_splash.configPluginSplashFromExpoConfig(
     exp,
     platform === 'android' ? 'android' : 'ios',
     metroOrigin,
@@ -140,7 +146,7 @@ export async function fetchAppSplashImages(
     onError?: (url: string, err: unknown) => void
   },
 ): Promise<FetchedAppSplashImage[]> {
-  const spec = parseAppSplashWire(wire)
+  const spec = getCliRuntime().engine_config_plugin_splash.parseAppSplashWire(wire)
   if (!spec) return []
   const out: FetchedAppSplashImage[] = []
   const seen = new Set<string>()

package/cli/bridge-flow-runner.ts

@@ -1,16 +1,16 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import { isTextInputEditCommand, type TextInputEditCommand } from '@peach/globals'
-import {
-  isStorageSnapshot,
-  prepareStorageSnapshotForShare,
-  type ShareableStorageSnapshot,
-} from 'peach-engine/preview/storage-snapshot-contract'
-import { devices, type DeviceModel } from 'peach-engine/settings/devices'
 import { REQUIRED_IDENTICAL_FLOW_FRAMES, framesIdentical } from '../detox/proof-frame.cjs'
+import { devices, type DeviceModel } from '../src/device-catalog.ts'
 import { flowTimeoutScale } from '../src/flow-timeout-scale'
 import { composeFramedScreenshot } from '../src/screenshots/frame-compose'
 import { sleep } from '../src/sleep'
+import {
+  isStorageSnapshot,
+  prepareStorageSnapshotForShare,
+  ShareableStorageSnapshot,
+} from '../src/storageSnapshotContract.ts'
 import {
   inspectWaitReady,
   isPeachAccessibilityTree,
@@ -27,6 +27,7 @@ import {
   sameNativeAccessibilityShape,
 } from './maestro-accessibility'
 import { MaestroJsContext, scriptConditionIsTruthy } from './maestro-js'
+import { redactForSharing } from './output-redaction'
 import { ensureCliRecordingEntitlement } from './recording-access'
 import type { PerformResult, PerformStep, ResetResult } from '../src/bridge-contract'
 import type { WsBridge } from './ws-bridge'
@@ -2387,7 +2388,10 @@ export class SootSimBridgeFlowRunner {
     fs.mkdirSync(outputDir, { recursive: true })
     const write = (name: string, content: string | Buffer) => {
       try {
-        fs.writeFileSync(path.join(outputDir, name), content)
+        fs.writeFileSync(
+          path.join(outputDir, name),
+          typeof content === 'string' ? redactForSharing(content) : content,
+        )
       } catch {
         // best-effort; don't let one failed write block the others
       }

package/cli/cloud-client.ts

@@ -24,14 +24,8 @@ import {
   buildRnxCloudArtifact,
   type RnxCloudArtifactReceipt,
 } from '../../contrast-bundler/src/metroCloudArtifact.ts'
-import { rewriteGuestImportMeta } from '../../peach-engine/src/guest-import-meta.ts'
-import { loadMetroFingerprintRegistry } from '../../peach-engine/src/metro-fingerprint-registry-client.ts'
-import { inferMetroModuleIdentity } from '../../peach-engine/src/metro-fingerprint.ts'
-import {
-  isNativeJavaScriptBundle,
-  isRolldownBundle,
-} from '../../peach-engine/src/preview/bundle-layout'
 import { isLoopbackHost } from '../src/backend-origin.ts'
+import { getCliRuntime } from '../src/cli-runtime.ts'
 import {
   isRnxCloudCommandType,
   isRnxCloudSimStatus,
@@ -52,6 +46,7 @@ import {
 } from '../src/metro-production-bundle.ts'
 import { readPackageVersionsFooter } from '../src/packageVersionsContract'
 import { rnxPublicBrand } from '../src/public-brand.ts'
+import { StorageSnapshot } from '../src/storageSnapshotContract.ts'
 import { CHOOSE_ACCOUNT_HINT, resolveCliAuth } from './auth.ts'
 import {
   createCloudSession,
@@ -63,7 +58,6 @@ import {
   type RemotePlatform,
 } from './cloud-session.ts'
 import { detectProject } from './commands/detect.ts'
-import type { StorageSnapshot } from '../../peach-engine/src/preview/storage-snapshot-contract.ts'
 import type {
   BridgeClaimResult,
   BridgeSimInfo,
@@ -258,13 +252,15 @@ async function loadBundleSource(bundleInput: string, command: string): Promise<s
   const source = isRemoteBundleInput(bundleInput)
     ? await fetchBundleSource(bundleInput, command)
     : readImmutableBundleSource(bundleInput, command)
-  if (!isNativeJavaScriptBundle(source)) {
+  if (!getCliRuntime().preview_bundle_layout.isNativeJavaScriptBundle(source)) {
     throw new Error(`${command} requires a supported React Native JavaScript bundle`)
   }
   // validate the actual runtime script form without executing guest code or
   // allocating a host.
   try {
-    new Script(rewriteGuestImportMeta(source), { filename: bundleInput })
+    new Script(getCliRuntime().guest_import_meta.rewriteGuestImportMeta(source), {
+      filename: bundleInput,
+    })
   } catch (error) {
     throw new Error(
       `${command} bundle contains invalid JavaScript: ${
@@ -674,7 +670,8 @@ async function inferCloudModuleIdentity(
 ): Promise<RNXMetroModuleIdentityMetadata> {
   let receipt
   try {
-    receipt = await loadMetroFingerprintRegistry()
+    receipt =
+      await getCliRuntime().metro_fingerprint_registry_client.loadMetroFingerprintRegistry()
   } catch (error) {
     throw new Error(
       `${command} could not load the Metro fingerprint registry needed to identify this bundle: ${
@@ -683,7 +680,7 @@ async function inferCloudModuleIdentity(
     )
   }
   try {
-    const inferred = await inferMetroModuleIdentity({
+    const inferred = await getCliRuntime().metro_fingerprint.inferMetroModuleIdentity({
       source,
       registry: receipt.registry,
       registryIntegrity: receipt.integrity,
@@ -741,7 +738,7 @@ export async function produceCloudArtifact(
 /** prepares a standalone preview whose bytes must represent every Metro asset. */
 export async function producePreviewArtifact(bundlePath: string) {
   const prepared = await embedBundleAssets(bundlePath, PREVIEW_COMMAND, 'require-assets')
-  if (!isRolldownBundle(prepared.source)) {
+  if (!getCliRuntime().preview_bundle_layout.isRolldownBundle(prepared.source)) {
     return {
       ...(await produceArtifact(prepared, Number.POSITIVE_INFINITY, PREVIEW_COMMAND)),
       minified: true,

package/cli/command-registry.ts

@@ -51,6 +51,7 @@ const NODE_COMMAND_NAMES = [
   'claim',
   'close',
   'doctor',
+  'coverage',
   'project-report',
   'support',
   'desktop',
@@ -145,16 +146,24 @@ const VALUE_FLAGS = new Set([
 
 const BROWSER_SCREENSHOT_SUBCOMMANDS = new Set(['capture', 'ask', 'appearance', 'motion'])
 
-export function getRnxFirstPositional(args: readonly string[]): string | null {
+export function getRnxPositionals(
+  args: readonly string[],
+  extraValueFlags: ReadonlySet<string> = new Set(),
+): string[] {
+  const positionals: string[] = []
   for (let index = 0; index < args.length; index++) {
     const arg = args[index]
     if (arg.startsWith('-')) {
-      if (VALUE_FLAGS.has(arg)) index++
+      if (VALUE_FLAGS.has(arg) || extraValueFlags.has(arg)) index++
       continue
     }
-    return arg
+    positionals.push(arg)
   }
-  return null
+  return positionals
+}
+
+export function getRnxFirstPositional(args: readonly string[]): string | null {
+  return getRnxPositionals(args)[0] ?? null
 }
 
 export function getRnxCommandRegistration(name: string): RnxCommandRegistration | null {

package/cli/commands/box.ts

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 // `peach box` — the box environment.
 //
 // bare `peach box` is LOCAL and mounts the current checkout at /project. cloud
@@ -9,8 +10,6 @@
 // every verb that acts on an existing Box takes it the same way: the id or
 // name on the command line, else the one `peach box use` remembered. see
 // boxTarget below.
-
-import { createHash } from 'node:crypto'
 import fs from 'node:fs'
 import path from 'node:path'
 import { createInterface } from 'node:readline'
@@ -30,7 +29,8 @@ import {
   ensureCloudBoxBrowser,
   resolveCloudBoxReference,
 } from 'peach-cloud-box/client'
-import { getRuntimePlatform, isDeviceModel } from 'peach-engine/settings/devices'
+import { getCliRuntime } from '../../src/cli-runtime.ts'
+import { isDeviceModel } from '../../src/device-catalog.ts'
 import { readDefaultBox, writeDefaultBox } from '../../src/home-paths'
 import { rnxPublicBrand } from '../../src/public-brand'
 import { readNativeLinkedAppFontsWire } from '../app-fonts'
@@ -532,7 +532,7 @@ export async function createPrebuiltBundleBox(options: {
 }) {
   const platform =
     options.device && isDeviceModel(options.device)
-      ? getRuntimePlatform(options.device)
+      ? getCliRuntime().settings_devices.getRuntimePlatform(options.device)
       : 'ios'
   const nativeRenderer = options.nativeProjectDir
     ? readNativeProjectRenderer(options.nativeProjectDir, platform)