peachsim 0.1.1640 → 0.1.1644

package/README.md

@@ -656,6 +656,11 @@ peach screenshot --with-frame --output /tmp/peach-framed.png
 peach record --duration 5 --output /tmp/peach-anim.mp4
 ```
 
+`peach record status` queries the recorder on the tracked simulator. A video
+whose stop reply timed out remains available: status reports processing or
+ready to save, and another `peach record stop --output <path>` joins the same
+finalization and saves its bytes. `peach record cancel` discards them.
+
 `peach screenshot --with-frame` composes the real Peach shell device chrome
 around the raw screen bitmap (reusing the shell bezel/button geometry, excluding
 the Electron top bar, rail gutter, and other window chrome). Flows can request

package/cli/app-bundle-resources.ts

@@ -0,0 +1,57 @@
+import { createHash } from 'node:crypto'
+import fs from 'node:fs'
+import path from 'node:path'
+import { preferredMimeType } from '../../peach-compat/src/stubs/uttype-mime'
+import { enumerateBundleResources } from '../../sootsim-swift/src/bundleAssets'
+import {
+  isAppBundleResourcePath,
+  type AppBundleResources,
+} from '../src/appBundleResourcesContract'
+import { stageHostByteFiles } from '../src/host/staged-host-files'
+import { readIosAppTarget } from '../src/native-app-identity-project'
+import { readPackageFile } from '../src/swift-source-file'
+
+export function stageAppBundleResources(
+  appDir: string,
+  origin: string,
+  iosTarget?: string,
+): AppBundleResources {
+  const app = readIosAppTarget(appDir, iosTarget)
+  if (!app) return {}
+  const root = fs.realpathSync(appDir)
+  const members = new Map<string, string>()
+  for (const file of app.resources) {
+    const real = fs.realpathSync(file)
+    const relative = path.relative(root, real)
+    if (relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative))
+      throw new Error('native app resource escapes the Xcode input root')
+    const lexical = path.relative(root, file)
+    if (
+      lexical === '..' ||
+      lexical.startsWith(`..${path.sep}`) ||
+      path.isAbsolute(lexical)
+    )
+      throw new Error('native app resource escapes the selected project')
+    const name = `Resources/${lexical.split(path.sep).join('/')}`
+    members.set(name, file)
+  }
+  const resources = enumerateBundleResources([...members.keys()])
+  const bytes = resources.map(({ base, file }) => {
+    if (!isAppBundleResourcePath(base)) throw new Error('invalid native resource path')
+    const source = members.get(file)
+    if (!source) throw new Error('native resource is not an Xcode target member')
+    return readPackageFile(root, source, Infinity)
+  })
+  const urls = stageHostByteFiles(bytes, origin)
+  const result: AppBundleResources = Object.create(null)
+  resources.forEach(({ base }, index) => {
+    const content = bytes[index]!
+    result[base] = {
+      uri: urls[index]!,
+      sha256: createHash('sha256').update(content).digest('hex'),
+      contentType: preferredMimeType(base) ?? 'application/octet-stream',
+      byteLength: content.byteLength,
+    }
+  })
+  return result
+}

package/cli/app-stubs.ts

@@ -381,23 +381,39 @@ export function packageNativeRequests(dir: string): NativeRequest[] {
   )
 }
 
-// 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.
+// resolve the installed runtime dependency graph, including transitive native
+// packages. workspace source is scanned as app code instead. a transitive
+// package is scanned only when it ships native code: the graph runs to
+// thousands of packages, and the rest name nothing a direct dependency does not.
 function dependencyNativeOwners(
   appDir: string,
   manifest: ProjectManifest | null,
 ): Map<string, string> {
   const owners = new Map<string, string>()
-  for (const name of Object.keys({
+  const pending = Object.keys({
     ...manifest?.devDependencies,
     ...manifest?.dependencies,
-  })) {
-    const dir = installedPackageDir(appDir, name)
-    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)
+  }).map((name) => ({ from: appDir, name }))
+  const visited = new Set<string>()
+  for (let index = 0; index < pending.length; index++) {
+    const { from, name } = pending[index]
+    const dir = installedPackageDir(from, name)
+    if (!dir || visited.has(dir)) continue
+    visited.add(dir)
+    const dependency = readProjectManifest(dir)
+    const optional = readPackageJson(dir)?.optionalDependencies
+    if (
+      dir.split('/').includes('node_modules') &&
+      (from === appDir || hasNativeCode(dir, 'ios'))
+    )
+      for (const request of packageNativeRequests(dir))
+        if (!owners.has(`${request.kind}:${request.name}`))
+          owners.set(`${request.kind}:${request.name}`, dependency?.name ?? name)
+    for (const child of Object.keys({
+      ...dependency?.dependencies,
+      ...(isRecord(optional) ? optional : {}),
+    }))
+      pending.push({ from: dir, name: child })
   }
   return owners
 }
@@ -595,7 +611,12 @@ export function scanLocalNative(
       dir,
       scanRepository(dir).directories.flatMap((sub) =>
         listDir(sub)
-          .filter((name) => NATIVE_SOURCE_FILE.test(name))
+          .filter(
+            (name) =>
+              NATIVE_SOURCE_FILE.test(name) &&
+              (!platform ||
+                (platform === 'ios' ? name.endsWith('.swift') : name.endsWith('.kt'))),
+          )
           .map((name) => join(sub, name)),
       ),
     ]),
@@ -633,8 +654,12 @@ export function scanLocalNative(
       path: `${relative(appDir, file)}:${line}`,
       expoModule: moduleDir ? relative(appDir, moduleDir) || '.' : null,
       swift: moduleDir
-        ? (nativeFilesByModule.get(moduleDir) ?? []).some((path) =>
-            path.endsWith('.swift'),
+        ? (nativeFilesByModule.get(moduleDir) ?? []).some(
+            (path) =>
+              path.endsWith('.swift') &&
+              [...(readSmallFile(path) ?? '').matchAll(/\bName\(\s*"(\w+)"\s*\)/g)].some(
+                (match) => match[1] === name,
+              ),
           )
         : false,
       answered: answered[kind].has(name),

package/cli/cloud-session.ts

@@ -60,6 +60,7 @@ export interface CloudBoxSession {
   platform?: RemotePlatform
   device?: string
   artifact?: CloudSessionArtifactIdentity
+  appFontsWireSha256?: string
 }
 
 export function normalizeCloudOrigin(source: string): string {
@@ -128,7 +129,13 @@ export function createCloudBoxSession(input: {
   platform?: RemotePlatform
   device?: string
   artifact?: CloudSessionArtifactIdentity
+  appFontsWireSha256?: string
 }): CloudBoxSession {
+  if (
+    input.appFontsWireSha256 !== undefined &&
+    !/^[a-f0-9]{64}$/.test(input.appFontsWireSha256)
+  )
+    throw new Error('cloud box session has an invalid app-font wire digest')
   const session: CloudBoxSession = {
     version: CLOUD_SESSION_VERSION,
     service: 'box',
@@ -138,6 +145,9 @@ export function createCloudBoxSession(input: {
     ...(input.platform ? { platform: input.platform } : {}),
     ...(input.device?.trim() ? { device: input.device.trim() } : {}),
     ...(input.artifact ? { artifact: input.artifact } : {}),
+    ...(input.appFontsWireSha256 !== undefined
+      ? { appFontsWireSha256: input.appFontsWireSha256 }
+      : {}),
   }
   if (!session.boxId || !session.boxToken) {
     throw new Error('cloud box session requires a box, an origin, and a box token')
@@ -198,6 +208,11 @@ export function parseCloudSession(encoded: string): CloudSession {
   try {
     if (parsed.service === 'box') {
       if (!boxId || !boxToken) throw new Error('unreadable cloud box session')
+      if (
+        parsed.appFontsWireSha256 !== undefined &&
+        typeof parsed.appFontsWireSha256 !== 'string'
+      )
+        throw new Error('unreadable app-font wire digest')
       return createCloudBoxSession({
         boxId,
         boxToken,
@@ -205,6 +220,7 @@ export function parseCloudSession(encoded: string): CloudSession {
         platform,
         device,
         artifact,
+        appFontsWireSha256: parsed.appFontsWireSha256,
       })
     }
     const simId = parsed.simId

package/cli/commands/assert.ts

@@ -162,11 +162,14 @@ interface VerbResult {
   reason?: string
 }
 
-async function runVerbOnce(verbArgs: string[]): Promise<VerbResult> {
+async function runVerbOnce(
+  verbArgs: string[],
+  globalArgs: string[],
+): Promise<VerbResult> {
   // re-invoke self through the real CLI entry, so every code path the user's
   // verb would take, assert takes too.
   const { executable, prefixArgs } = rnxSelfInvocation()
-  const args = [...prefixArgs, ...verbArgs, '--json']
+  const args = [...prefixArgs, ...globalArgs, ...verbArgs, '--json']
 
   return new Promise<VerbResult>((resolve) => {
     const proc = spawn(executable, args, {
@@ -402,7 +405,10 @@ function runJq(expr: string, payload: unknown): Promise<string> {
   })
 }
 
-export async function runAssert(rawArgs: string[]): Promise<void> {
+export async function runAssert(
+  rawArgs: string[],
+  target: { port?: number; sim?: string } = {},
+): Promise<void> {
   if (rawArgs[0] === '--help' || rawArgs[0] === '-h' || rawArgs.length === 0) {
     printHelp()
     peachExit(rawArgs.length === 0 ? 2 : 0)
@@ -430,6 +436,13 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
   const effectivePredicates =
     predicates.length > 0 ? predicates : [{ kind: '--exists', args: [] }]
 
+  // the child is a fresh CLI process: without the caller's explicit port and
+  // sim it falls back to the saved target.
+  const globalArgs = [
+    ...(target.port != null ? ['--port', String(target.port)] : []),
+    ...(target.sim ? ['--sim', target.sim] : []),
+  ]
+
   const deadline = withinMs > 0 ? Date.now() + withinMs : 0
   let attempts = 0
   let lastFailReason = ''
@@ -437,7 +450,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
 
   while (true) {
     attempts++
-    const verbResult = await runVerbOnce(verbArgs)
+    const verbResult = await runVerbOnce(verbArgs, globalArgs)
     if (!verbResult.ok) {
       lastVerbSkipReason = verbResult.reason || 'verb failed'
       if (Date.now() < deadline) {

package/cli/commands/box.ts

@@ -10,6 +10,7 @@
 // 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'
@@ -536,7 +537,13 @@ export async function createPrebuiltBundleBox(options: {
   const nativeRenderer = options.nativeProjectDir
     ? readNativeProjectRenderer(options.nativeProjectDir, platform)
     : undefined
-  return cloudBoxClient(options).create({
+  const appFonts = options.nativeProjectDir
+    ? readNativeLinkedAppFontsWire({
+        projectDir: options.nativeProjectDir,
+        platform,
+      })
+    : ''
+  const box = await cloudBoxClient(options).create({
     name: options.name,
     stack: prebuiltBundleBoxTemplate.stack,
     template: BOX_TEMPLATES.resolve({ name: prebuiltBundleBoxTemplate.name }).provenance,
@@ -544,16 +551,17 @@ export async function createPrebuiltBundleBox(options: {
       options.bundle,
       options.device,
       options.initialUrl ?? null,
-      options.nativeProjectDir
-        ? readNativeLinkedAppFontsWire({
-            projectDir: options.nativeProjectDir,
-            platform,
-          })
-        : '',
+      appFonts,
       nativeRenderer,
     ),
     ...(options.secrets ? { secrets: options.secrets } : {}),
   })
+  return {
+    box,
+    appFontsWireSha256: box.existing
+      ? undefined
+      : createHash('sha256').update(appFonts).digest('hex'),
+  }
 }
 
 // a plain .env file: `NAME=value` lines, an optional `export `, optional
@@ -698,7 +706,7 @@ async function runCloudBoxCreate(
   }
   let session: BoxShellSession | null = null
   try {
-    const box =
+    const created =
       'bundle' in source
         ? await createPrebuiltBundleBox({
             ...connection,
@@ -708,21 +716,27 @@ async function runCloudBoxCreate(
             name,
             ...(secrets ? { secrets } : {}),
           })
-        : await cloudBoxClient(connection).create({
-            name,
-            stack: template.stack,
-            template: template.provenance,
-            source: source.checkout,
-            ...(secrets ? { secrets } : {}),
-            onProgress:
-              opts.verbose && !json
-                ? (seeded, total) => console.log(`  ...seeded ${seeded}/${total} files`)
-                : undefined,
-          })
+        : {
+            box: await cloudBoxClient(connection).create({
+              name,
+              stack: template.stack,
+              template: template.provenance,
+              source: source.checkout,
+              ...(secrets ? { secrets } : {}),
+              onProgress:
+                opts.verbose && !json
+                  ? (seeded, total) => console.log(`  ...seeded ${seeded}/${total} files`)
+                  : undefined,
+            }),
+          }
+    const { box } = created
     if (json) {
       console.log(
         JSON.stringify({
           ...box.description,
+          ...('appFontsWireSha256' in created
+            ? { appFontsWireSha256: created.appFontsWireSha256 }
+            : {}),
           ...(box.accessToken ? { accessToken: box.accessToken } : {}),
         }),
       )

package/cli/commands/control.ts

@@ -89,6 +89,7 @@ import {
   isPeachSimulatorDocumentPath,
 } from '../../src/simulator-route'
 import { sleep } from '../../src/sleep'
+import { stageAppBundleResources } from '../app-bundle-resources'
 import { discoverAppCatalog } from '../app-catalog'
 import { loadRNXAppConfig } from '../app-config'
 import { discoverNativeLinkedAppFonts, resolveMetroProjectRoot } from '../app-fonts'
@@ -1378,6 +1379,7 @@ export async function buildShellUrl(
   )
   const expoStamped = new URL(stamped)
   expoStamped.searchParams.delete('nativeAppIdentity')
+  expoStamped.searchParams.delete('appBundleResources')
   if (project) {
     const nativeRenderer = readNativeProjectRenderer(project.appDir, platform)
     if (nativeRenderer !== undefined) {
@@ -1397,6 +1399,15 @@ export async function buildShellUrl(
       : null
     if (nativeAppIdentity)
       expoStamped.searchParams.set('nativeAppIdentity', nativeAppIdentity)
+    if (platform === 'ios' && nativeAppIdentity) {
+      const resources = stageAppBundleResources(
+        project.appDir,
+        `http://localhost:${port.port}`,
+        opts.iosTarget,
+      )
+      if (Object.keys(resources).length > 0)
+        expoStamped.searchParams.set('appBundleResources', JSON.stringify(resources))
+    }
   }
   // a plain Metro has no native Firebase config endpoint, so the CLI reads it
   // from the project whose Expo config it can evaluate. a project without its
@@ -1498,6 +1509,7 @@ function deriveCurrentSimBaseUrl(
     // bundle.
     url.searchParams.delete('appSplash')
     url.searchParams.delete('appCatalog')
+    url.searchParams.delete('appBundleResources')
     url.searchParams.delete('nativeFirebase')
     url.searchParams.delete('packageVersions')
     url.searchParams.delete('nativeAppIdentity')

package/cli/commands/doctor.ts

@@ -373,9 +373,8 @@ function printVersions(findings: DoctorFindings): void {
   }
 }
 
-// one line per package, worst first, with the published implementation
-// percent. packages that run from the bundle with no native code sit last on
-// one line: there is nothing to check in them.
+// packages appear worst first with the published implementation percent and
+// complete capability details. javascript-only packages sit last on one line.
 function printPackages(
   packages: readonly PackageResult[],
   verbose: boolean,
@@ -411,10 +410,26 @@ function printPackages(
   const columns = process.stdout.columns || 120
   for (const row of rows) {
     const percent = percentLabel(row.item)
-    const detail = fit(row.detail, Math.max(40, columns - nameWidth - versionWidth - 13))
+    const detail = row.detail
     console.log(
       `    ${row.glyph} ${row.item.name.padEnd(nameWidth)}${muted(row.item.version.padEnd(versionWidth))}${percent.padStart(5)}${detail ? `  ${row.tone(detail)}` : ''}`,
     )
+    if (!answering.has(row.item.name)) {
+      for (const [label, text] of [
+        ['working', row.item.rnx.working],
+        ['missing', row.item.rnx.missing],
+      ]) {
+        if (!text) continue
+        let line = `${label}:`
+        for (const word of text.split(/\s+/)) {
+          if (line.length + word.length + 1 > columns - 6) {
+            console.log(`      ${muted(line)}`)
+            line = word
+          } else line += ` ${word}`
+        }
+        console.log(`      ${muted(line)}`)
+      }
+    }
     if (verbose && row.item.note) console.log(`      ${muted(row.item.note)}`)
   }
   if (javascriptOnly.length > 0) {
@@ -517,22 +532,12 @@ function packageRow(
     return {
       rank: RANK.partial,
       glyph: warning('◐'),
-      detail: pkg.rnx.missing ? `missing: ${firstClause(pkg.rnx.missing)}` : '',
+      detail: '',
       tone: muted,
     }
   return { rank: RANK.supported, glyph: success('✓'), detail: '', tone: muted }
 }
 
-function firstClause(text: string): string {
-  const end = text.search(/[.;,](\s|$)/)
-  return end > 0 ? text.slice(0, end) : text
-}
-
-// a detail ends at the terminal edge rather than wrapping under the columns
-function fit(text: string, width: number): string {
-  return text.length > width ? `${text.slice(0, Math.max(0, width - 1))}…` : text
-}
-
 function printNativeGuidance(
   unknownNative: readonly UnknownNativePackage[],
   local: readonly LocalNative[],
@@ -577,6 +582,10 @@ function printNativeGuidance(
   }
   if (open.size) {
     console.log(`\n  stub them in peach.config.ts, by package:\n`)
+    console.log(
+      muted(`    import { defineConfig } from '${rnxPublicBrand.packageName}/config'`),
+    )
+    console.log()
     console.log(muted(`    export default defineConfig({`))
     console.log(muted(`      packages: {`))
     for (const [owner, requestsByName] of open) {

package/cli/commands/inspect/actions.ts

@@ -380,9 +380,10 @@ async function resolveTextTapTarget(
   query: string,
   options: TapTextOptions = {},
 ) {
+  const needle = options.exact ? query : query.trim().toLowerCase()
+  if (!needle) return { matched: 0, total: 0 }
   const { tree } = await inspectTree(bridge, 50)
   if (!Array.isArray(tree)) return { matched: 0, total: 0 }
-  const needle = options.exact ? query : query.toLowerCase()
   let candidates = collectTextCandidates(tree).filter(
     ({ node, ancestorTestIDs, role }) => {
       const text = nodeText(node)
@@ -411,7 +412,7 @@ async function resolveTextTapTarget(
     if (actionable.length > 0) candidates = actionable
     if (!options.exact) {
       const whole = candidates.filter(
-        ({ node }) => nodeText(node).trim().toLowerCase() === needle.trim(),
+        ({ node }) => nodeText(node).trim().toLowerCase() === needle,
       )
       if (whole.length > 0) candidates = whole
     }

package/cli/commands/inspect/core.ts

@@ -556,12 +556,6 @@ export interface LayoutElement {
   ellipsisActive?: boolean
 }
 
-export interface LayoutResult {
-  preview: 'web' | 'native'
-  count: number
-  elements: LayoutElement[]
-}
-
 // in-page extractor for the native preview. mirrors the visibility + device
 // sizing the a11y / wait-ready kernels use so "what's on screen" agrees across
 // the inspect surface. returns LayoutElement[] (or [] when the bridge is cold).
@@ -2013,8 +2007,6 @@ export const DEBUG_CHANNELS = [
   'yoga',
 ] as const
 
-export type DebugChannel = (typeof DEBUG_CHANNELS)[number]
-
 // `debug status` — which debug channels are currently enabled + their counts.
 export async function inspectDebugStatus(bridge: InspectBridge): Promise<unknown> {
   return bridge.send({ type: 'evaluate', code: 'window.__sootsimDebug.status()' })

package/cli/commands/inspect.ts

@@ -971,20 +971,6 @@ function keyCodeToVisualKey(code: string) {
   return null
 }
 
-function getInspectCommandName(subcommand: string, directSubcommand: string | null) {
-  if (directSubcommand === subcommand) return `peach ${subcommand}`
-  const group = getCliInspectVerbMeta(subcommand)?.group
-  return group ? `peach ${group} ${subcommand}` : `peach ${subcommand}`
-}
-
-function getInspectUsage(
-  subcommand: string,
-  tail: string,
-  directSubcommand: string | null,
-) {
-  return `  usage: ${getInspectCommandName(subcommand, directSubcommand)}${tail ? ` ${tail}` : ''}`
-}
-
 function normalizeRecordedText(value: unknown) {
   if (typeof value !== 'string') return null
   const text = value.replace(/\s+/g, ' ').trim()

package/cli/commands/platform.ts

@@ -528,7 +528,7 @@ async function runRemoteBox(
   } else if (existingSession) {
     await closeCloudSession(existingSession)
   }
-  const created = await box.createPrebuiltBundleBox({
+  const { box: created, appFontsWireSha256 } = await box.createPrebuiltBundleBox({
     bundle: new Uint8Array(artifact.bytes),
     nativeProjectDir: input.nativeProjectDir,
     device: selectedDevice,
@@ -546,6 +546,7 @@ async function runRemoteBox(
     apiOrigin: endpoint,
     platform,
     device: selectedDevice,
+    appFontsWireSha256,
     artifact: {
       sha256: artifactSha256,
       bytes: artifact.bytes.length,