peachsim 0.1.920 → 0.1.922

package/README.md

@@ -519,12 +519,17 @@ Maestro is Peach's single YAML test surface. Point it at your existing
 `.maestro/` directory, generate a test, or author one from live actions:
 
 ```sh
-peach maestro                      # discover .maestro/ and run all flows
+peach maestro                      # discover .maestro/ workspace
 peach maestro test .maestro/       # explicit
 peach maestro generate "verify login"
 peach maestro --list-compat        # see the verb support matrix
 ```
 
+Directory discovery selects root YAML flows by default, as Maestro does.
+For nested suites, pass their folder, such as `.maestro/flows`, or add
+`config.yaml` with `flows: ["flows/**"]`. Keep shared subflows outside those
+globs; `runFlow` can still load them.
+
 Tap settling compares consecutive full-screen pixels within Maestro's iOS
 three-second budget, while also draining screen transitions, native motion and
 image loads. Periodic caret paints do not require a continuous stillness window,

package/cli/commands/compat.ts

@@ -14,11 +14,13 @@ import {
   COMPAT_RESULT_CAVEAT,
   formatDetailedScanLines,
   formatScanCounts,
-  scanDeps,
+  scanDepsWithData,
+  type CompatScanData,
   type ScanResult,
 } from '@peach/compat/web'
 import { rnxPublicBrand } from '../../src/public-brand'
 import { resolveRNXAppConfig } from '../app-config'
+import { readRuntimeCompatibility } from '../runtime-compat'
 import {
   findProjectRoot,
   scanRepository,
@@ -59,14 +61,34 @@ flags:
     return
   }
 
+  const { config } = await resolveRNXAppConfig(appDir)
+  const runtime = readRuntimeCompatibility(config?.runtimeVersion)
+  if (!runtime.data) {
+    if (args.includes('--json'))
+      console.log(
+        JSON.stringify({
+          runtimeVersion: runtime.runtimeVersion,
+          overallScore: null,
+          error: runtime.reason,
+        }),
+      )
+    else console.error(`  ${runtime.reason}`)
+    process.exitCode = 1
+    return
+  }
+  const data = runtime.data
+  const scanDeps = (manifest: ProjectManifest) => scanDepsWithData(manifest, data)
+  const reportRuntime = (result: ScanResult, local: LocalNative[] | null) =>
+    report(args, result, local, runtime.runtimeVersion)
+
   if (packageName) {
-    report(args, scanOnePackage(appDir, pkg, packageName), null)
+    reportRuntime(scanOnePackage(appDir, pkg, packageName, runtime.data), null)
     return
   }
 
   const here = scanDeps(installedManifest(appDir, pkg))
   if (here.packages.length > 0 || appIndex >= 0) {
-    report(args, here, await scanLocalNative(appDir, pkg))
+    reportRuntime(here, await scanLocalNative(appDir, pkg))
     return
   }
 
@@ -84,8 +106,9 @@ flags:
 
   if (elsewhere.length === 1) {
     const only = elsewhere[0]
-    console.log(`\n  scanning ${relative(appDir, only.dir) || '.'}`)
-    report(args, only.result, await scanLocalNative(resolve(only.dir), only.manifest))
+    if (!args.includes('--json'))
+      console.log(`\n  scanning ${relative(appDir, only.dir) || '.'}`)
+    reportRuntime(only.result, await scanLocalNative(resolve(only.dir), only.manifest))
     return
   }
   if (elsewhere.length > 1) {
@@ -96,13 +119,31 @@ flags:
     console.log()
     return
   }
-  report(args, here, await scanLocalNative(appDir, pkg))
+  reportRuntime(here, await scanLocalNative(appDir, pkg))
 }
 
-function report(args: string[], result: ScanResult, local: LocalNative[] | null): void {
+function report(
+  args: string[],
+  result: ScanResult,
+  local: LocalNative[] | null,
+  runtimeVersion: string | null,
+): void {
   if (args.includes('--json')) {
+    const overallScore = result.scoreSummary.assessed === 0 ? null : result.overallScore
     console.log(
-      JSON.stringify(local ? { ...result, localNative: local } : result, null, 2),
+      JSON.stringify(
+        {
+          ...result,
+          runtimeVersion,
+          overallScore,
+          scoreSummary: { ...result.scoreSummary, compatibility: overallScore },
+          implementationEstimate:
+            result.scoreSummary.assessed === 0 ? result.overallScore : null,
+          ...(local ? { localNative: local } : {}),
+        },
+        null,
+        2,
+      ),
     )
     return
   }
@@ -343,11 +384,12 @@ function scanOnePackage(
   appDir: string,
   pkg: ProjectManifest,
   packageName: string,
+  data: CompatScanData,
 ): ScanResult {
   const installed = installedManifest(appDir, pkg)
   const version =
     installed.dependencies?.[packageName] ??
     installed.devDependencies?.[packageName] ??
     '*'
-  return scanDeps({ dependencies: { [packageName]: version } })
+  return scanDepsWithData({ dependencies: { [packageName]: version } }, data)
 }

package/cli/commands/daemon.ts

@@ -223,7 +223,9 @@ export async function daemonInstall({ port, force }: { port: number; force: bool
     const path = macPlistPath()
     if (existsSync(path) && !force) {
       console.log(`  already installed at ${path}`)
-      console.log(`  pass --force to overwrite, or use 'peach daemon restart' to reload`)
+      const pid = await startMacDaemon(path)
+      console.log(`  registered (state: running, pid ${pid})`)
+      console.log(`  pass --force to overwrite the service configuration`)
       return
     }
     await stopMacDaemonBridge(invocation)
@@ -321,8 +323,10 @@ function macServiceTarget(): string {
   return `gui/${process.getuid!()}/${SERVICE_LABEL_MAC}`
 }
 
-function readMacDaemonState(): { state: string; pid: number | null } | null {
-  const result = spawnSync('launchctl', ['print', macServiceTarget()], {
+function readMacDaemonState(
+  target = macServiceTarget(),
+): { state: string; pid: number | null } | null {
+  const result = spawnSync('launchctl', ['print', target], {
     encoding: 'utf8',
   })
   if (result.status !== 0) return null
@@ -358,8 +362,11 @@ function macBridgeHasListener(pid: number, port: number): boolean {
   return result.stdout.trim() === String(pid)
 }
 
-async function stopMacDaemonBridge(invocation: RnxSelfInvocation): Promise<void> {
-  const service = readMacDaemonState()
+export async function stopMacDaemonBridge(
+  invocation: RnxSelfInvocation,
+  target = macServiceTarget(),
+): Promise<void> {
+  const service = readMacDaemonState(target)
   const lock = readDaemonLockfile()
   if (isDaemonLockfileFresh(lock) && lock.pid !== service?.pid) {
     // a lockfile alone cannot authorize a signal after pid reuse.
@@ -380,7 +387,7 @@ async function stopMacDaemonBridge(invocation: RnxSelfInvocation): Promise<void>
     }
     process.kill(lock.pid, 'SIGTERM')
   }
-  if (service) runLaunchctl(['bootout', macServiceTarget()])
+  if (service) runLaunchctl(['bootout', target])
   if (!lock) return
   const deadline = Date.now() + 4000
   while (Date.now() < deadline) {
@@ -390,22 +397,36 @@ async function stopMacDaemonBridge(invocation: RnxSelfInvocation): Promise<void>
   throw new Error(`bridge pid ${lock.pid} did not release port ${lock.bridgePort}`)
 }
 
-async function startMacDaemon(path: string): Promise<number> {
-  if (readMacDaemonState()) {
-    runLaunchctl(['kickstart', macServiceTarget()])
-  } else {
-    runLaunchctl(['bootstrap', `gui/${process.getuid!()}`, path])
-  }
+export async function startMacDaemon(
+  path: string,
+  invocation = resolveDaemonInvocation(),
+  target = macServiceTarget(),
+): Promise<number> {
+  const service = readMacDaemonState(target)
+  const lock = readDaemonLockfile()
+  if (
+    service?.state === 'running' &&
+    service.pid !== null &&
+    isDaemonLockfileFresh(lock) &&
+    lock.pid === service.pid &&
+    macBridgeHasListener(lock.pid, lock.bridgePort)
+  )
+    return service.pid
+  // reconcile an unloaded service or a bare bridge before launchd can create
+  // another process. start is idempotent when the service already owns the bridge.
+  await stopMacDaemonBridge(invocation, target)
+  runLaunchctl(['bootstrap', target.slice(0, target.lastIndexOf('/')), path])
   // registration and an xpcproxy pid precede the actual bridge bind.
   const deadline = Date.now() + 4000
   while (Date.now() < deadline) {
-    const service = readMacDaemonState()
+    const service = readMacDaemonState(target)
     const lock = readDaemonLockfile()
     if (
       service?.state === 'running' &&
       service.pid !== null &&
       isDaemonLockfileFresh(lock) &&
-      lock.pid === service.pid
+      lock.pid === service.pid &&
+      macBridgeHasListener(lock.pid, lock.bridgePort)
     )
       return service.pid
     await new Promise((resolve) => setTimeout(resolve, 100))

package/cli/commands/flow.ts

@@ -11,6 +11,7 @@ import { applyPeachConfigToUrl, type PeachConfig } from '../../src/config'
 import { printBridgeFailureDiagnostics } from '../bridge-diagnostics'
 import {
   SootSimBridgeFlowRunner,
+  type MaestroStep,
   type SootSimFlowProfileResult,
   type SootSimFlowTraceStep,
 } from '../bridge-flow-runner'
@@ -217,7 +218,10 @@ export async function runFlowPlayback(
   // beforeSteps runs once the flow is on its target and about to run its first
   // step. opening a frontmatter `app:` navigates the sim, which wipes in-page
   // state, so a caller capturing the run itself (film) starts here.
-  hooks: { beforeSteps?: () => Promise<void> } = {},
+  hooks: {
+    beforeSteps?: () => Promise<void>
+    runSteps?: (driver: SootSimBridgeFlowRunner, steps: MaestroStep[]) => Promise<void>
+  } = {},
 ): Promise<number> {
   lastPreviewUploadResult = null
   lastPreviewUploadError = null
@@ -782,7 +786,8 @@ flow extension:
       }
     }
     await hooks.beforeSteps?.()
-    await driver.runFlow(steps, { skipPlan: dryRun })
+    if (hooks.runSteps) await hooks.runSteps(driver, steps)
+    else await driver.runFlow(steps, { skipPlan: dryRun })
     if (profile) {
       profileResult = await driver.stopProfile()
     }