peachsim 0.1.630 → 0.1.632

package/README.md

@@ -254,7 +254,15 @@ through an unreachable IPv4 address. `peach open` starts a local bridge when no
 daemon is reachable. The background service is strongly recommended for local
 agent work because inspect, interaction, and test commands reuse one ready bridge
 and runtime. Enable it at any time with `peach daemon install`; it is never required
-in CI. The packaged Desktop app is optional and available through first-run
+in CI.
+
+Sandboxed or agent runners may stop child processes when a command ends,
+including a bridge started by `peach open`. Keep `peach serve` running in a
+persistent terminal or background task outside that command's lifetime, then
+run `peach open` and later commands against it. When using a custom bridge port,
+pass the same `--port <n>` to `peach serve` and the CLI commands.
+
+The packaged Desktop app is optional and available through first-run
 onboarding or `peach desktop install`. A downloaded app starts its own bundled
 daemon on first launch. An installed runtime can open while the daemon checks
 for updates; a first install waits for the runtime download to finish. The app

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

@@ -2710,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/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/control.ts

@@ -73,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,
@@ -695,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(
@@ -1293,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 {
@@ -1302,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,
@@ -1310,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)
@@ -1341,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 {