peachsim 0.1.629 → 0.1.631

package/README.md

@@ -15,8 +15,10 @@ The executable updates itself with `peach upgrade`. Successful interactive human
 commands refresh a cached stable CLI version in a detached process at most once
 every 20 hours. A newer version produces one short notice on stderr, once per
 version and no more than weekly. CI, agents, JSON output, pipes, and
-noninteractive commands stay silent. Set `PEACH_UPDATE_CHECK=off` to disable the
-check and notice; `peach version` checks explicitly, while `peach --version` remains
+noninteractive commands stay silent. Set `PEACH_UPDATE_CHECK=off` to disable
+automatic CLI checks, runtime updates, and their notices. Start the bridge with
+this environment, or reinstall the background service with it to persist the choice.
+`peach version` checks explicitly, while `peach --version` remains
 offline.
 
 Neither artifact contains rendering code. The canvas engine (CanvasKit
@@ -233,7 +235,7 @@ Pass a target to `peach open <port-or-url>` when a script or agent needs an expl
 selection.
 
 The first `peach open` launches an isolated Chrome for Testing sim. The CLI
-resolves Playwright from the app or CLI install, asks that exact package for
+resolves Playwright from the current directory or beside its executable, asks that exact package for
 its required browser executable, and runs that package's installer once when
 the executable is absent. It never substitutes another revision found in the
 shared Playwright cache. Later opens reuse that sim and reload it at the
@@ -557,7 +559,9 @@ frame for quick art-direction passes.
 ## Skills registry
 
 `peach skill install` installs Peach agent skills in the standard
-`<skill-name>/SKILL.md` layout used by Codex and Claude Code. The bundled
+`<skill-name>/SKILL.md` layout used by Codex and Claude Code. Building the CLI
+only writes build artifacts; run `peach skill install` explicitly to install
+or refresh agent skills. The bundled
 skills cover setup, debugging/perf/accessibility, testing, visual review, and
 the generated `contrast` command index. The published CLI registry and generated
 website docs both come from `packages/peach-skills/`:

package/cli/app-fonts.ts

@@ -139,6 +139,16 @@ export function discoverNativeLinkedAppFonts(opts: {
         collectFontFiles(root, relativeRoot.split(path.sep).join('/'))
       }
 
+      // the bundle path is the entry relative to metro's root, so a bundle at
+      // /apps/app/index.bundle served for /repo/apps/app puts that root at /repo.
+      const bundleDir = path.posix
+        .dirname(new URL(opts.bundleUrl).pathname)
+        .replace(/^\/+/, '')
+      const appRelativeDir = bundleDir.split('/').join(path.sep)
+      const metroRootCandidates = [selectedAppDir]
+      if (bundleDir && selectedAppDir.endsWith(path.sep + appRelativeDir)) {
+        metroRootCandidates.push(selectedAppDir.slice(0, -appRelativeDir.length - 1))
+      }
       const vectorIconRequire = createRequire(path.join(selectedAppDir, 'package.json'))
       for (const dependencyName of vectorIconDependencies) {
         try {
@@ -150,10 +160,19 @@ export function discoverNativeLinkedAppFonts(opts: {
           const packageRoot = entryPath.slice(0, markerIndex + marker.length - 1)
           const fontsDir =
             dependencyName === 'react-native-vector-icons' ? 'Fonts' : 'fonts'
-          collectFontFiles(
-            path.join(packageRoot, fontsDir),
-            path.posix.join('node_modules', dependencyName, fontsDir),
-          )
+          // the package can sit outside the app (a hoisted workspace
+          // node_modules or a pnpm store). metro resolves asset paths against
+          // its config.projectRoot, which is the app in expo's monorepo setup
+          // but the repo root when metro.config sets it there, so offer the
+          // path from each candidate root; the reachability check keeps the
+          // one metro actually serves.
+          const fontsRoot = path.join(packageRoot, fontsDir)
+          for (const metroRoot of metroRootCandidates) {
+            collectFontFiles(
+              fontsRoot,
+              path.relative(metroRoot, fontsRoot).split(path.sep).join('/'),
+            )
+          }
         } catch {}
       }
     }

package/cli/bridge-flow-runner.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs'
 import * as path from 'path'
-import { devices, type DeviceModel } from 'peach-engine/settings'
+import { devices, type DeviceModel } from 'peach-engine/settings/devices'
 import yaml from 'yaml'
 import { REQUIRED_IDENTICAL_FLOW_FRAMES, framesIdentical } from '../detox/proof-frame.cjs'
 import { flowTimeoutScale } from '../src/flow-timeout-scale'
@@ -1314,6 +1314,9 @@ export class SootSimBridgeFlowRunner {
 
   async tapOn(target: string | FlowPointTarget) {
     const opts = typeof target === 'string' ? { text: target } : target
+    // maestro settles before resolving a tap's final position as well as after
+    // delivering it. a preceding assertion does not settle a pending update.
+    await this.waitForAppToSettle()
     const repeat = Math.max(1, Math.trunc(opts.repeat ?? 1))
     const repeatDelay = opts.delay !== undefined && opts.delay >= 0 ? opts.delay : 100
     // maestro Maestro.hierarchyBasedTap with a TapRepeat: every tap is padded
@@ -2379,14 +2382,14 @@ export class SootSimBridgeFlowRunner {
     }
   }
 
-  // maestro waits after every input for the screen to stop changing, up to
+  // maestro waits around taps for the screen to stop changing, up to
   // its ios driver's 3 s settle budget, comparing screenshots, so an action
   // still in flight (a submit spinner, a sheet closing) finishes before the
   // next command resolves its target. an app can take a few hundred ms to
   // react to a press, so stillness must hold about half a second, and it
   // counts painted frames because a spinner repaints without moving layout.
   // a screen that never stops proceeds when the budget runs out, as there.
-  private async settleAfterInput() {
+  private async waitForAppToSettle() {
     await waitForSootsimIdle({
       bridge: this.bridge,
       simId: this.opts.simId,
@@ -2396,6 +2399,10 @@ export class SootSimBridgeFlowRunner {
       strict: true,
       paintStill: true,
     })
+  }
+
+  private async settleAfterInput() {
+    await this.waitForAppToSettle()
     this.lastInteractionAt = Date.now()
   }
 
@@ -2703,38 +2710,45 @@ export class SootSimBridgeFlowRunner {
     }
 
     try {
-      // per-step watchdog: abort if nothing forward-progresses for 10s.
-      // catches dead bundles / frozen bridges / hung ws calls. explicit
-      // wait steps (extendedWaitUntil, waitFor) opt out and keep their
-      // own timeout — the user asked for that time; don't override.
-      const hasExplicitWait = !!(
-        step.extendedWaitUntil ||
-        step.waitFor ||
-        step.scrollUntilVisible ||
-        step.launchApp ||
-        step.runFlow ||
-        // retry reruns its body on failure, so its wall time is the body's
-        // times the retry count — the 10s no-progress watchdog is the wrong
-        // budget and would report "bridge probably hung" for a slow retry.
-        step.retry ||
-        // runScript http calls are synchronous with a 5-minute upstream
-        // timeout — the 10s watchdog would kill legitimate setup scripts.
-        step.runScript ||
-        // takeScreenshot self-governs: it retries a bounded visual settle that
-        // already fails with its own reason. sharing the watchdog's 10s budget
-        // meant the watchdog always won that race, reporting "bridge probably
-        // hung" for a screen that was merely still animating.
-        step.takeScreenshot ||
-        // assertions wait out maestro's lookup window, longer than 10s, and
-        // every query they make times out on its own, so they report their
-        // own failure instead of the watchdog's guess.
-        step.assertVisible ||
-        step.assertNotVisible
+      // simple commands have a wall-clock watchdog. bounded operations keep
+      // their own lookup, settle and bridge deadlines, so the watchdog cannot
+      // report a completed step while its action continues in the background.
+      const hasBoundedWait = !!(
+        // taps combine bounded lookup, settling and delivery. a wall-clock
+        // watchdog can finish the step while that action is still running.
+        // let these operations finish before starting the next command.
+        (
+          step.tapOn ||
+          step.doubleTapOn ||
+          step.longPressOn ||
+          step.extendedWaitUntil ||
+          step.waitFor ||
+          step.scrollUntilVisible ||
+          step.launchApp ||
+          step.runFlow ||
+          // retry reruns its body on failure, so its wall time is the body's
+          // times the retry count — the 10s no-progress watchdog is the wrong
+          // budget and would report "bridge probably hung" for a slow retry.
+          step.retry ||
+          // runScript http calls are synchronous with a 5-minute upstream
+          // timeout — the 10s watchdog would kill legitimate setup scripts.
+          step.runScript ||
+          // takeScreenshot self-governs: it retries a bounded visual settle that
+          // already fails with its own reason. sharing the watchdog's 10s budget
+          // meant the watchdog always won that race, reporting "bridge probably
+          // hung" for a screen that was merely still animating.
+          step.takeScreenshot ||
+          // assertions wait out maestro's lookup window, longer than 10s, and
+          // every query they make times out on its own, so they report their
+          // own failure instead of the watchdog's guess.
+          step.assertVisible ||
+          step.assertNotVisible
+        )
       )
       const STEP_WATCHDOG_MS = 10_000
       const body = this.runStepInner(step)
       let screenshotPath: string | undefined
-      if (hasExplicitWait) {
+      if (hasBoundedWait) {
         const result = await body
         if (typeof result === 'string') screenshotPath = result
       } else {

package/cli/cli-update.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { compareSemver } from '@contrast/runtime-delivery'
+import { automaticPeachUpdatesEnabled } from '../src/automatic-update-policy'
 import { getCliVersion } from '../src/cli-version'
 import { cliUpdateFilePath } from '../src/home-paths'
 import { isAgentEnv } from './commands/inspect/env'
@@ -127,12 +128,6 @@ function envFlagIsOn(value: string | undefined): boolean {
   return Boolean(value) && !envFlagIsOff(value)
 }
 
-export function automaticCliUpdateChecksEnabled(
-  env: Readonly<Record<string, string | undefined>> = process.env,
-): boolean {
-  return !envFlagIsOff(env.PEACH_UPDATE_CHECK)
-}
-
 export function shouldUseAutomaticCliUpdateCheck(
   invocation: CliUpdateInvocation,
 ): boolean {
@@ -143,7 +138,7 @@ export function shouldUseAutomaticCliUpdateCheck(
     invocation.version ||
     !invocation.stdoutIsTTY ||
     !invocation.stderrIsTTY ||
-    !automaticCliUpdateChecksEnabled(env) ||
+    !automaticPeachUpdatesEnabled(env) ||
     envFlagIsOn(env.CI) ||
     envFlagIsOn(env.GITHUB_ACTIONS) ||
     envFlagIsOn(env.PEACH_NO_PROMPT) ||

package/cli/cloud-test-tunnel.ts

@@ -26,6 +26,7 @@ import {
 import { createServer, request as httpRequest } from 'node:http'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { pipeline } from 'node:stream'
 import { sleep } from '../src/sleep'
 
 // must match packages/contrast-runner/src/hostedPorts.ts.
@@ -160,12 +161,24 @@ export function startCloudTestTokenProxy(
       },
       (upRes) => {
         res.writeHead(upRes.statusCode || 502, upRes.headers)
-        upRes.pipe(res)
+        // a broken upstream body must break the downstream response too. pipe()
+        // leaves it open after an aborted transfer, stranding the tester.
+        pipeline(upRes, res, (error) => {
+          if (error) {
+            console.error(
+              `upstream body error ${req.method} ${req.url}: ${error.message}`,
+            )
+          }
+        })
       },
     )
     up.on('error', (err) => {
-      res.writeHead(502, { 'content-type': 'text/plain' })
-      res.end(`upstream error: ${err.message}`)
+      // a transport failure is a network error, including before headers
+      // arrive; ending a partial response would report a successful transfer.
+      res.destroy(err)
+    })
+    res.once('close', () => {
+      if (!res.writableFinished) up.destroy()
     })
     req.pipe(up)
   })

package/cli/command-registry.ts

@@ -48,6 +48,7 @@ const NODE_COMMAND_NAMES = [
   'claim',
   'close',
   'compat',
+  'project-report',
   'report-issue',
   'desktop',
   'login',

package/cli/commands/compat.ts

@@ -1,7 +1,6 @@
 // peach compat — scan dependencies with the shared compatibility engine.
 
-import { existsSync, readFileSync } from 'node:fs'
-import { dirname, join, relative, resolve } from 'node:path'
+import { relative, resolve } from 'node:path'
 import {
   COMPAT_RESULT_CAVEAT,
   formatDetailedScanLines,
@@ -9,13 +8,13 @@ import {
   scanDeps,
   type ScanResult,
 } from '@peach/compat/web'
-import { findProjectRoot, scanWorkspace } from './detect'
-
-interface PackageManifest {
-  name?: string
-  dependencies?: Record<string, string>
-  devDependencies?: Record<string, string>
-}
+import {
+  findProjectRoot,
+  scanWorkspace,
+  installedManifest,
+  readProjectManifest,
+} from './detect'
+import type { ProjectManifest } from './projectReportContract'
 
 export async function runCompat(args: string[]): Promise<void> {
   if (args.includes('--help') || args.includes('-h')) {
@@ -41,7 +40,7 @@ flags:
   const packageName = args.find(
     (arg, index) => !arg.startsWith('-') && (appIndex < 0 || index !== appIndex + 1),
   )
-  const pkg = readPackageJson(appDir)
+  const pkg = readProjectManifest(appDir)
   if (!pkg) {
     console.error(`  no package.json found in ${appDir}`)
     process.exitCode = 1
@@ -65,7 +64,7 @@ flags:
   const workspaceRoot = findProjectRoot(appDir)
   const elsewhere = scanWorkspace(workspaceRoot).apps.flatMap((app) => {
     if (resolve(app.dir) === appDir) return []
-    const manifest = readPackageJson(app.dir)
+    const manifest = readProjectManifest(app.dir)
     if (!manifest) return []
     const result = scanDeps(installedManifest(app.dir, manifest))
     return result.packages.length > 0 ? [{ dir: app.dir, result }] : []
@@ -114,57 +113,9 @@ function report(args: string[], result: ScanResult): void {
   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
-  const parsed: unknown = JSON.parse(readFileSync(packagePath, 'utf8'))
-  return parsed && typeof parsed === 'object' ? parsed : null
-}
-
 function scanOnePackage(
   appDir: string,
-  pkg: PackageManifest,
+  pkg: ProjectManifest,
   packageName: string,
 ): ScanResult {
   const installed = installedManifest(appDir, pkg)

package/cli/commands/config.ts

@@ -11,7 +11,7 @@ usage:
 environment:
   PEACH_HINTS=off          suppress CLI hints
   PEACH_HINTS=always       show every CLI hint every time
-  PEACH_UPDATE_CHECK=off   disable background CLI update checks and notices
+  PEACH_UPDATE_CHECK=off   disable automatic CLI checks, runtime updates, and notices
 `)
 }
 

package/cli/commands/control.ts

@@ -8,7 +8,7 @@ import {
   listSelectableDeviceModels,
   resolveDeviceFitBox,
   type DeviceModel,
-} from 'peach-engine/settings'
+} from 'peach-engine/settings/devices'
 import { WebSocket } from 'ws'
 import { probePort } from '../../scripts/dev-server-scanner'
 import { isAppDeepLinkTarget, openAppUrl } from '../../src/app-url'
@@ -36,6 +36,7 @@ import {
   runtimeDir,
 } from '../../src/home-paths'
 import { applyHotMode } from '../../src/native-dev-bundle-url'
+import { readNativeFirebaseConfig } from '../../src/native-firebase-config'
 import { ensureProfile } from '../../src/profiles'
 import { rnxPublicBrand } from '../../src/public-brand'
 import {
@@ -72,7 +73,9 @@ import {
 } from '../current-sim'
 import { getDriver } from '../drivers/registry'
 import { openUrl as openUrlInBrowser } from '../open-url'
+import { diagnosticsAllowedForCurrentProcess } from '../privacy'
 import { rethrowIfExit, rnxExit } from '../run-rnx'
+import { collectRuntimeDiagnostics } from '../runtime-diagnostics'
 import { rnxSelfInvocation } from '../self-invocation'
 import {
   BridgeSimLockedError,
@@ -694,11 +697,13 @@ async function filterReachableAppFonts(
       }
     }),
   )
-  const reachable: DiscoveredAppFontSpec[] = []
+  // a font offered from more than one candidate metro root keeps the first
+  // url metro served.
+  const reachable = new Map<string, DiscoveredAppFontSpec>()
   for (const spec of results) {
-    if (spec !== null) reachable.push(spec)
+    if (spec !== null && !reachable.has(spec.family)) reachable.set(spec.family, spec)
   }
-  return reachable
+  return [...reachable.values()]
 }
 
 async function resolveShellUrl(
@@ -774,6 +779,26 @@ async function stampAppSplash(
   }
 }
 
+function stampNativeFirebaseConfig(
+  urlStr: string,
+  project?: ResolvedAppProject | null,
+): string {
+  const url = new URL(urlStr)
+  if (!url.searchParams.get('bundle') || !project) return urlStr
+  try {
+    url.searchParams.set(
+      'nativeFirebase',
+      JSON.stringify(readNativeFirebaseConfig(project.appDir)),
+    )
+  } catch (error) {
+    url.searchParams.set(
+      'nativeFirebase',
+      JSON.stringify({ error: error instanceof Error ? error.message : String(error) }),
+    )
+  }
+  return url.toString()
+}
+
 // stamp the engine page url with `?appCatalog=` so an app's asset-catalog
 // colors and its declared accent reach the tenant, which applies them to the
 // bundle this url opens. the catalog lives in the native binary, never in
@@ -867,8 +892,11 @@ export async function buildShellUrl(
   // fallback typeface, which then reads as a conformance diff.
   const project =
     opts.project ?? (await resolveAppProjectForBundleUrl(bundleUrlOf(resolved)))
-  const stamped = stampAppCatalog(
-    await stampAppSplash(await stampAppFonts(resolved, project), project),
+  const stamped = stampNativeFirebaseConfig(
+    stampAppCatalog(
+      await stampAppSplash(await stampAppFonts(resolved, project), project),
+      project,
+    ),
     project,
   )
   if (
@@ -912,6 +940,7 @@ function deriveCurrentSimBaseUrl(
     // bundle.
     url.searchParams.delete('appSplash')
     url.searchParams.delete('appCatalog')
+    url.searchParams.delete('nativeFirebase')
     return url.toString()
   } catch {
     return fallback
@@ -1268,7 +1297,8 @@ function printAgentListenHint(quiet: boolean): void {
 // a splash; the caller can `peach describe` again a second later. for
 // warm loads it's the real screen. guarded by --no-describe.
 async function maybeDescribeAfterOpen(wsPort: number, simId: string, args: string[]) {
-  if (args.includes('--no-describe')) return
+  const noDescribe = args.includes('--no-describe')
+  if (noDescribe && !diagnosticsAllowedForCurrentProcess()) return
   const prevQuiet = process.env.SOOTSIM_QUIET_TARGET_NOTICE
   process.env.SOOTSIM_QUIET_TARGET_NOTICE = '1'
   try {
@@ -1277,7 +1307,7 @@ async function maybeDescribeAfterOpen(wsPort: number, simId: string, args: strin
     // seconds on a still-routing guest app, which is exactly what we want
     // to skip for the open-side describe. caller can `peach describe`
     // again later for post-routing state.
-    await waitForTreeStable(wsPort, simId, { stableMs: 150, maxMs: 400 })
+    if (!noDescribe) await waitForTreeStable(wsPort, simId, { stableMs: 150, maxMs: 400 })
     const bridge = createBridge(wsPort, {
       commandTimeoutMs: 3000,
       simId,
@@ -1285,6 +1315,7 @@ async function maybeDescribeAfterOpen(wsPort: number, simId: string, args: strin
       simIdSource: 'flag',
     })
     try {
+      if (noDescribe) return
       let readyProbe: Awaited<ReturnType<typeof inspectWaitReady>> | null = null
       try {
         readyProbe = await inspectWaitReady(bridge, 1)
@@ -1316,6 +1347,7 @@ async function maybeDescribeAfterOpen(wsPort: number, simId: string, args: strin
       console.log('')
       console.log(result.tree)
     } finally {
+      await collectRuntimeDiagnostics(bridge)
       bridge.close()
     }
   } catch {

package/cli/commands/daemon-mac-app.ts

@@ -135,8 +135,10 @@ function renderLauncherScript(
   const quoted = parts.map(shellSingleQuote).join(' ')
   const stdout = shellSingleQuote(logDir.stdout)
   const stderr = shellSingleQuote(logDir.stderr)
-  const peachHome = process.env.PEACH_HOME
-  const environment = peachHome ? `export PEACH_HOME=${shellSingleQuote(peachHome)}\n` : ''
+  const environment = ['PEACH_HOME', 'PEACH_UPDATE_CHECK']
+    .filter((key) => process.env[key])
+    .map((key) => `export ${key}=${shellSingleQuote(process.env[key] ?? '')}\n`)
+    .join('')
   return `#!/bin/sh
 # peach daemon launcher generated by 'peach daemon install'.
 # launchd spawns this; we exec the real peach invocation in place so

package/cli/commands/daemon.ts

@@ -149,10 +149,10 @@ ${programArgs}
 function renderSystemdUnit(invocation: RnxSelfInvocation, port: number): string {
   mkdirSync(LOG_DIR_LINUX, { recursive: true })
   const exec = [invocation.executable, ...invocation.prefixArgs].map(shellQuote).join(' ')
-  const peachHome = process.env.PEACH_HOME
-  const environment = peachHome
-    ? `Environment=${shellQuote(`PEACH_HOME=${peachHome}`)}\n`
-    : ''
+  const environment = ['PEACH_HOME', 'PEACH_UPDATE_CHECK']
+    .filter((key) => process.env[key])
+    .map((key) => `Environment=${shellQuote(`${key}=${process.env[key]}`)}\n`)
+    .join('')
   return `[Unit]
 Description=peach bridge daemon
 After=default.target