peachsim 0.1.1635 → 0.1.1640

package/README.md

@@ -599,7 +599,11 @@ foreground or background state. Both retain its browser session and app state.
 `sourceApp` does not add fields to React Native's `{ url }` event. A
 stopped guest rejects URL delivery. Explicit `newInstance: true`, deletion,
 and video recording create a new browser context; cold launches still use the
-supplied shell URL. When synchronization is enabled, URL delivery waits for
+supplied shell URL. Process termination and `newInstance: true` preserve
+cookies, local storage and IndexedDB for the next launch. `delete: true` and
+driver cleanup clear that retained storage. Relaunch creates a fresh runtime,
+so input focus and other in-memory component state do not survive termination.
+When synchronization is enabled, URL delivery waits for
 existing work before dispatch and for navigation and painting afterward.
 
 Element taps finish viewport measurement before resolving the selected node's

package/cli/app-config.ts

@@ -89,12 +89,21 @@ async function loadConfigFile(
     }
     const wire = WIRE_SLOTS.filter((slot) => loaded[slot] !== undefined)
     if (wire.length > 0) {
-      const migration = wireSlotMigration(project.appDir, {
-        modules: { ...loaded.turboModules, ...loaded.nativeModules },
-        views: { ...loaded.nativeViews },
-      })
+      const slots: readonly string[] = WIRE_SLOTS
+      const kept = Object.entries(loaded)
+        .filter(([key, value]) => !slots.includes(key) && value !== undefined)
+        .map(([key]) => key)
+      const migration = wireSlotMigration(
+        project.appDir,
+        project.configPath,
+        {
+          modules: { ...loaded.turboModules, ...loaded.nativeModules },
+          views: { ...loaded.nativeViews },
+        },
+        kept,
+      )
       throw new Error(
-        `${wire.join(', ')} moved under packages, keyed by the package whose native side they answer. replace them with:\n${migration}`,
+        `${wire.join(', ')} moved under packages, keyed by the package whose native side they answer. ${kept.length ? 'remove them and add' : 'replace the config with'}:\n${migration}`,
       )
     }
     return resolveConfigReplacementFiles(loaded, project.configPath)

package/cli/app-stubs.ts

@@ -25,6 +25,7 @@ import {
   type PeachConfig,
 } from '../src/config'
 import { isRecord } from '../src/is-record'
+import { rnxPublicBrand } from '../src/public-brand'
 import { visitParsedProgram } from '../src/visit-parsed-program'
 import {
   readProjectManifest,
@@ -380,26 +381,61 @@ export function packageNativeRequests(dir: string): NativeRequest[] {
   )
 }
 
-// the `packages` block that replaces a config's old top-level wire slots: each
-// name keyed by the direct dependency whose JavaScript asks for it. `packages`
-// takes only 'noop' or a file path, so any other old value is named for a hand
-// move instead of guessed.
-export function wireSlotMigration(
+// the native names each installed dependency's own JavaScript asks for, keyed
+// `kind:name`. links to source outside node_modules are the app's own packages
+// and are scanned as app code instead.
+function dependencyNativeOwners(
   appDir: string,
-  wire: { modules: Record<string, unknown>; views: Record<string, unknown> },
-): string {
+  manifest: ProjectManifest | null,
+): Map<string, string> {
   const owners = new Map<string, string>()
-  const manifest = readProjectManifest(appDir)
   for (const name of Object.keys({
     ...manifest?.devDependencies,
     ...manifest?.dependencies,
   })) {
     const dir = installedPackageDir(appDir, name)
-    if (!dir) continue
+    if (!dir || !dir.split('/').includes('node_modules')) continue
     for (const request of packageNativeRequests(dir))
       if (!owners.has(`${request.kind}:${request.name}`))
         owners.set(`${request.kind}:${request.name}`, name)
   }
+  return owners
+}
+
+// a complete config module in the form the app's config file already uses, so
+// the printed text pastes over it
+function configModule(configPath: string | null, packages: string[]): string {
+  const body = ['  packages: {', ...packages, '  },']
+  if (
+    configPath &&
+    (configPath.endsWith('.cjs') ||
+      (configPath.endsWith('.js') &&
+        /\bmodule\.exports\b/.test(readSmallFile(configPath) ?? '')))
+  )
+    return ['module.exports = {', ...body, '}'].join('\n')
+  return [
+    `import { defineConfig } from '${rnxPublicBrand.packageName}/config'`,
+    '',
+    'export default defineConfig({',
+    ...body,
+    '})',
+  ].join('\n')
+}
+
+// what replaces a config's old top-level wire slots: each name keyed by the
+// package whose JavaScript asks for it. a config holding only those slots gets
+// a complete module; one with other settings (`kept`) gets just the packages
+// entries, since a whole module would drop them. `packages` takes only 'noop'
+// or a file path, so any other old value is named for a hand move instead of
+// guessed.
+export function wireSlotMigration(
+  appDir: string,
+  configPath: string | null,
+  wire: { modules: Record<string, unknown>; views: Record<string, unknown> },
+  kept: readonly string[] = [],
+): string {
+  const manifest = readProjectManifest(appDir)
+  const owners = dependencyNativeOwners(appDir, manifest)
   if (manifest)
     for (const request of scanLocalNative(
       appDir,
@@ -408,6 +444,7 @@ export function wireSlotMigration(
       undefined,
       new Set(),
       true,
+      owners,
     ))
       if (!owners.has(`${request.kind}:${request.name}`))
         owners.set(`${request.kind}:${request.name}`, request.package)
@@ -453,9 +490,17 @@ export function wireSlotMigration(
     ].filter(Boolean)
     return `    [${JSON.stringify(owner)}]: { ${parts.join(', ')} },`
   })
+  if (lines.length && kept.length)
+    return [
+      ...manual.map((line) => `// ${line}`),
+      `// keep ${kept.join(', ')}; merge these into packages`,
+      '  packages: {',
+      ...lines,
+      '  },',
+    ].join('\n')
   return [
-    ...(lines.length ? ['  packages: {', ...lines, '  },'] : []),
-    ...manual.map((line) => `  // ${line}`),
+    ...manual.map((line) => `// ${line}`),
+    ...(lines.length ? [configModule(configPath, lines)] : []),
   ].join('\n')
 }
 
@@ -519,6 +564,7 @@ export function scanLocalNative(
   platform: ScanResult['scoreSummary']['platform'] | undefined,
   knownPackages: ReadonlySet<string> = new Set(),
   includeLegacy = false,
+  providers?: ReadonlyMap<string, string>,
 ): LocalNative[] {
   const expoModuleDirs: string[] = []
   const excludedModuleDirs: string[] = []
@@ -571,11 +617,14 @@ export function scanLocalNative(
     return result
   }
   const found = new Map<string, LocalNative>()
+  // a name an installed dependency asks for belongs to that dependency, whoever
+  // in the app spells it out
   const add = (kind: LocalNative['kind'], name: string, file: string, line: number) => {
-    const packageName = owner(dirname(file))
-    if (knownPackages.has(packageName)) return
     const key = `${kind}:${name}`
     if (found.has(key)) return
+    providers ??= dependencyNativeOwners(appDir, pkg)
+    const packageName = providers.get(key) ?? owner(dirname(file))
+    if (knownPackages.has(packageName)) return
     const moduleDir = expoModuleDirs.find((dir) => file.startsWith(`${dir}/`)) ?? null
     found.set(key, {
       kind,

package/cli/bridge-flow-runner.ts

@@ -3103,11 +3103,11 @@ export class SootSimBridgeFlowRunner {
   }
 
   async startProfile() {
-    const result = await this.evaluate<any>(`(() => {
+    const result = await this.evaluate<any>(`(async () => {
       if (!window.__sootsimShellPerf) {
         return { error: "shell frame profile unavailable (__sootsimShellPerf missing on the page)" }
       }
-      window.__sootsimShellPerf.start()
+      await window.__sootsimShellPerf.start()
       return { started: true }
     })()`)
     if (result?.error) {

package/cli/cloud-client.ts

@@ -27,6 +27,10 @@ import {
 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 {
   isRnxCloudCommandType,
@@ -172,7 +176,7 @@ function resolveCloudOrigin(value?: string): string {
 function readImmutableBundleSource(bundlePath: string, command: string): string {
   const filepath = resolve(bundlePath)
   if (extname(filepath) !== '.js') {
-    throw new Error(`${command} requires one local Metro .js bundle`)
+    throw new Error(`${command} requires one local .js bundle`)
   }
   const descriptor = openSync(filepath, 'r')
   try {
@@ -200,9 +204,6 @@ function readImmutableBundleSource(bundlePath: string, command: string): string
     } catch {
       throw new Error(`${command} bundle must be valid UTF-8 JavaScript`)
     }
-    if (source.includes('\0') || !source.includes('__d(') || !source.includes('__r(')) {
-      throw new Error(`${command} requires a Metro JavaScript bundle`)
-    }
     return source
   } finally {
     closeSync(descriptor)
@@ -231,9 +232,6 @@ async function fetchBundleSource(bundleUrl: string, command: string): Promise<st
   if (text.length === 0) {
     throw new Error(`${command} bundle is empty`)
   }
-  if (text.includes('\0') || !text.includes('__d(') || !text.includes('__r(')) {
-    throw new Error(`${command} requires a Metro JavaScript bundle`)
-  }
   return text
 }
 
@@ -260,6 +258,9 @@ async function loadBundleSource(bundleInput: string, command: string): Promise<s
   const source = isRemoteBundleInput(bundleInput)
     ? await fetchBundleSource(bundleInput, command)
     : readImmutableBundleSource(bundleInput, command)
+  if (!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 {
@@ -728,25 +729,44 @@ export async function produceCloudArtifact(
   maxBytes: number = MAX_RNX_CLOUD_BUNDLE_BYTES,
   assetsDirectory?: string,
 ): Promise<CloudArtifactProduction> {
-  return produceArtifact(
+  const prepared = await embedBundleAssets(
     bundlePath,
-    maxBytes,
     REMOTE_COMMAND,
     assetsDirectory ? 'require-assets' : 'allow-placeholders',
     assetsDirectory,
   )
+  return produceArtifact(prepared, maxBytes, REMOTE_COMMAND)
 }
 
 /** prepares a standalone preview whose bytes must represent every Metro asset. */
-export async function producePreviewArtifact(
-  bundlePath: string,
-): Promise<CloudArtifactProduction> {
-  return produceArtifact(
-    bundlePath,
-    Number.POSITIVE_INFINITY,
-    PREVIEW_COMMAND,
-    'require-assets',
-  )
+export async function producePreviewArtifact(bundlePath: string) {
+  const prepared = await embedBundleAssets(bundlePath, PREVIEW_COMMAND, 'require-assets')
+  if (!isRolldownBundle(prepared.source)) {
+    return {
+      ...(await produceArtifact(prepared, Number.POSITIVE_INFINITY, PREVIEW_COMMAND)),
+      minified: true,
+    }
+  }
+  const bytes = Buffer.from(prepared.code, 'utf8')
+  const sha256 = createHash('sha256').update(bytes).digest('hex')
+  return {
+    bytes,
+    sha256,
+    minified: false,
+    receipt: {
+      source: {
+        sha256: createHash('sha256').update(prepared.source).digest('hex'),
+        bytes: Buffer.byteLength(prepared.source, 'utf8'),
+      },
+      artifact: { sha256, bytes: bytes.byteLength },
+    },
+    warnings:
+      prepared.search.unconfirmed && prepared.dest
+        ? [
+            `peach preview could not authenticate asset hashes in ${prepared.dest.directory}; confirm these are the assets this bundle was built against.`,
+          ]
+        : [],
+  }
 }
 
 export interface CloudBoxArtifactProduction {
@@ -890,18 +910,10 @@ async function embedBundleAssets(
 }
 
 async function produceArtifact(
-  bundlePath: string,
+  prepared: Awaited<ReturnType<typeof embedBundleAssets>>,
   maxBytes: number,
   command: string,
-  assetPolicy: 'allow-placeholders' | 'require-assets',
-  assetsDirectory?: string,
 ): Promise<CloudArtifactProduction> {
-  const prepared = await embedBundleAssets(
-    bundlePath,
-    command,
-    assetPolicy,
-    assetsDirectory,
-  )
   const artifact = await buildRnxCloudArtifact(prepared.code, {
     inferModuleIdentity: (source) => inferCloudModuleIdentity(source, command),
   })
@@ -1453,12 +1465,17 @@ function cloudCommand(command: {
 class CloudBridge implements WsBridge {
   readonly plane = 'cloud' as const
 
-  constructor(private readonly session: CloudSimSession) {}
+  constructor(
+    private readonly session: CloudSimSession,
+    private readonly explicitTimeoutMs?: number,
+  ) {}
 
   async send(
     command: { type: string; [key: string]: unknown },
-    options?: { timeoutMs?: number },
+    options?: { timeoutMs?: number; defaultTimeoutMs?: number },
   ): Promise<unknown> {
+    const timeoutMs =
+      options?.timeoutMs ?? this.explicitTimeoutMs ?? options?.defaultTimeoutMs
     const body: CloudCommandEnvelope = {
       id: randomUUID(),
       claimId: this.session.claimId,
@@ -1475,9 +1492,7 @@ class CloudBridge implements WsBridge {
             'content-type': 'application/json',
           },
           body: JSON.stringify(body),
-          ...(options?.timeoutMs
-            ? { signal: AbortSignal.timeout(options.timeoutMs) }
-            : {}),
+          ...(timeoutMs ? { signal: AbortSignal.timeout(timeoutMs) } : {}),
         },
       )
     } catch (error) {
@@ -1538,12 +1553,17 @@ class CloudBridge implements WsBridge {
 class CloudBoxBridge implements WsBridge {
   readonly plane = 'cloud' as const
 
-  constructor(private readonly session: CloudBoxSession) {}
+  constructor(
+    private readonly session: CloudBoxSession,
+    private readonly explicitTimeoutMs?: number,
+  ) {}
 
   async send(
     command: { type: string; [key: string]: unknown },
-    options?: { timeoutMs?: number },
+    options?: { timeoutMs?: number; defaultTimeoutMs?: number },
   ): Promise<unknown> {
+    const timeoutMs =
+      options?.timeoutMs ?? this.explicitTimeoutMs ?? options?.defaultTimeoutMs
     const id = randomUUID()
     // the wire id is this request's, so the command carries none. `simId` names
     // a local sim among several and a box has exactly one.
@@ -1562,9 +1582,7 @@ class CloudBoxBridge implements WsBridge {
             'content-type': 'application/json',
           },
           body: JSON.stringify({ id, command: payload }),
-          ...(options?.timeoutMs
-            ? { signal: AbortSignal.timeout(options.timeoutMs) }
-            : {}),
+          ...(timeoutMs ? { signal: AbortSignal.timeout(timeoutMs) } : {}),
         },
       )
     } catch (error) {
@@ -1619,13 +1637,15 @@ class CloudBoxBridge implements WsBridge {
 }
 
 export function createCloudBridgeForParsed(
-  parsed: Pick<ParsedBridgeCliArgs, 'simId' | 'simIdSource'>,
+  parsed: Pick<ParsedBridgeCliArgs, 'simId' | 'simIdSource'> &
+    Partial<Pick<ParsedBridgeCliArgs, 'explicitTimeout' | 'commandTimeoutMs'>>,
 ): WsBridge | null {
   const session = resolveCloudSessionForParsed(parsed)
   if (!session) return null
+  const timeoutMs = parsed.explicitTimeout ? parsed.commandTimeoutMs : undefined
   return session.service === 'box'
-    ? new CloudBoxBridge(session)
-    : new CloudBridge(session)
+    ? new CloudBoxBridge(session, timeoutMs)
+    : new CloudBridge(session, timeoutMs)
 }
 
 // deletes the box, which ends the simulator it holds. a cloud session box is

package/cli/commands/doctor.ts

@@ -476,7 +476,10 @@ function packageRow(
     return {
       rank: RANK.unknown,
       glyph: accent('?'),
-      detail: 'native code Peach does not know; stub it below',
+      // fonts and assets, or names built at runtime, leave nothing to stub by name
+      detail: unknownNative.requests.length
+        ? 'native code Peach does not know; stub it below'
+        : 'native code; names no native module',
       tone: muted,
     }
   // a stub answers ahead of Peach's own support for the package
@@ -560,19 +563,24 @@ function printNativeGuidance(
     )
   }
   // the open names grouped by the package they belong to, the key `packages` takes
-  const open = new Map<string, NativeRequest[]>()
+  const open = new Map<string, Map<string, NativeRequest>>()
   for (const [owner, requests] of [
     ...unknownNative.map((item) => [item.name, item.requests] as const),
     ...local.map((item) => [item.package, [item]] as const),
   ]) {
-    const unanswered = requests.filter((request) => !request.answered)
-    if (unanswered.length) open.set(owner, [...(open.get(owner) ?? []), ...unanswered])
+    for (const request of requests) {
+      if (request.answered) continue
+      const names = open.get(owner) ?? new Map<string, NativeRequest>()
+      names.set(`${request.kind}:${request.name}`, request)
+      open.set(owner, names)
+    }
   }
   if (open.size) {
     console.log(`\n  stub them in peach.config.ts, by package:\n`)
     console.log(muted(`    export default defineConfig({`))
     console.log(muted(`      packages: {`))
-    for (const [owner, requests] of open) {
+    for (const [owner, requestsByName] of open) {
+      const requests = [...requestsByName.values()]
       console.log(muted(`        '${owner}': {`))
       for (const kind of ['module', 'view'] as const) {
         const names = requests.filter((request) => request.kind === kind)

package/cli/commands/flow.ts

@@ -973,7 +973,7 @@ flow extension:
         // canvas during scrub for smooth motion while the real app
         // catches up.
         if (videoPath) uploadArgs.push('--video', videoPath)
-        if (scenePath) uploadArgs.push('--scene', scenePath)
+        if (scenePath) uploadArgs.push('--scene', scenePath, '--live-bundle')
         if (previewScreenshotPath) {
           uploadArgs.push('--screenshot', previewScreenshotPath)
         }

package/cli/commands/inspect/shared.ts

@@ -92,10 +92,15 @@ export async function maybeWaitForStartedScreenTransitions(
 ) {
   if (bridge.plane === 'cloud') return
   try {
-    const result = await callTestBridge<SootSimScreenTransitionWaitResult>(
-      bridge,
-      'waitForScreenTransitions',
-      SCREEN_TRANSITION_PREFLIGHT,
+    // the sim bounds this wait itself, so the round trip gets a short budget of
+    // its own; under the command budget a wedged sim cost every read twice
+    const result: SootSimScreenTransitionWaitResult | undefined = await bridge.send(
+      {
+        type: 'call',
+        path: '__sootsimTest.waitForScreenTransitions',
+        args: [SCREEN_TRANSITION_PREFLIGHT],
+      },
+      { timeoutMs: SCREEN_TRANSITION_PREFLIGHT.timeoutMs + 1200 },
     )
     if (!opts.verbose || !result?.started) return
     if (result.timedOut) {