peachsim 0.1.939 → 0.1.1399

package/scripts/dev-server-scanner.ts

@@ -448,55 +448,27 @@ export async function discoverListeningPorts(
   return processes.map((p) => p.port)
 }
 
-/** parse `netstat -anv -p tcp` output for the pid listening on one port.
- *
- *  macOS lays a LISTEN row out as
- *    tcp4 0 0 127.0.0.1.8090 *.* LISTEN 0 0 131072 131072 node:97330 ...
- *  so the local address is the 4th column with a DOT before the port (which is
- *  what keeps port 8137 from matching a row for 18137), and the owner is the
- *  only token shaped "<name>:<pid>".
- *
- *  exported because this column layout is the fragile part and a child process
- *  cannot exercise it under bun's test runner, which hands back empty stdout. */
-export function pidFromNetstat(stdout: string, port: number): number | null {
-  for (const line of stdout.split('\n')) {
-    if (!line.includes('LISTEN')) continue
-    const parts = line.trim().split(/\s+/)
-    if (!parts[3]?.endsWith(`.${port}`)) continue
-    for (const token of parts) {
-      const owner = token.match(/^\S+:(\d+)$/)
-      if (owner) {
-        const pid = Number(owner[1])
-        if (pid > 0) return pid
-      }
-    }
-  }
-  return null
-}
-
-/** resolve the pid of the process listening on one local port.
- *
- *  `lsof` walks every descriptor of every process, which measures 2-4s on a
- *  loaded machine — longer than any timeout worth giving it, so
- *  `discoverListeningProcesses` above degrades to its pid-less port list
- *  exactly when the machine is busy. netstat (macOS/BSD) and ss (linux) read
- *  the kernel socket table instead and answer in well under a second, and both
- *  carry the owning pid. use this whenever the question is "who owns this one
- *  port"; `discoverListeningProcesses` answers the different question of what
- *  is listening at all. */
+/** resolve the pid listening on one local port without scanning unrelated fds.
+ * macOS netstat can return empty stdout to child processes, so resolve its
+ * listener through the targeted lsof query. Linux exposes ownership through ss.
+ */
 export async function resolveListeningPid(port: number): Promise<number | null> {
   if (!Number.isInteger(port) || port <= 0) return null
 
-  // macOS netstat: "tcp4 0 0 127.0.0.1.8090 *.* LISTEN ... node:97330 ..."
-  // the local address uses a dot before the port, and the owner column is the
-  // only token shaped "<name>:<pid>".
-  try {
-    const { stdout } = await execGuarded('netstat -anv -p tcp 2>/dev/null', 8000, {
-      maxBuffer: 16 * 1024 * 1024,
-    })
-    const pid = pidFromNetstat(stdout, port)
-    if (pid !== null) return pid
-  } catch {}
+  if (process.platform === 'darwin') {
+    try {
+      const { stdout } = await execGuarded(
+        `lsof -nP -a -iTCP:${port} -sTCP:LISTEN -t 2>/dev/null`,
+        8000,
+      )
+      const pids = [...new Set(stdout.trim().split(/\s+/).map(Number))]
+      return pids.length === 1 && Number.isInteger(pids[0]) && pids[0]! > 0
+        ? pids[0]!
+        : null
+    } catch {
+      return null
+    }
+  }
 
   // linux ss: 'LISTEN 0 511 0.0.0.0:8081 0.0.0.0:* users:(("node",pid=1234,fd=5))'
   try {
@@ -846,7 +818,7 @@ async function fetchManifestEnrichment(
 }
 
 // ports confirmed to be running a non-sootsim dev server — safe to skip the
-// /__soot/ probe on subsequent scans. cleared when the port disappears from the
+// /__peachsim/ probe on subsequent scans. cleared when the port disappears from the
 // listening set (process restarted, could now be a different server).
 const knownNonPatched = new Set<number>()
 
@@ -868,7 +840,7 @@ const knownOne = new Set<number>()
 // fire signature probes in waves and pick the best match by precedence:
 //   1. expo manifest   (JSON manifest at /)
 //   2. metro/expo      (packager-status:running on /status)
-//   3. sootsim-patched (/__soot/)
+//   3. sootsim-patched (/__peachsim/)
 //   4. one/vxrn        (HEAD on /node_modules/one/metro-entry.bundle) — only
 //                       fires as a true last resort; on expo apps this probe
 //                       crashes metro by triggering HmrServer.registerEntryPoint
@@ -905,21 +877,75 @@ export async function probePort(
   const onePath = `/node_modules/one/metro-entry.bundle?platform=ios&dev=true`
 
   // wave 1 — safe parallel probes. none of these mutate metro state.
-  const [sootsimRes, statusRes, manifestRes, expoRes, swiftRes] = await Promise.all([
-    knownNonPatched.has(port)
-      ? Promise.resolve(null)
-      : httpGet(probeHostname, port, '/__soot/'),
-    httpGet(probeHostname, port, '/status'),
-    knownOne.has(port)
-      ? Promise.resolve(null)
-      : httpGet(probeHostname, port, '/', 'GET', MANIFEST_TIMEOUT_MS, {
-          'expo-platform': 'ios',
-        }),
-    knownNonExpo.has(port)
-      ? Promise.resolve(null)
-      : httpGet(probeHostname, port, '/_expo/status'),
-    httpGet(probeHostname, port, SWIFT_DISCOVERY_PATH),
-  ])
+  const [sootsimRes, statusRes, manifestRes, expoRes, swiftRes, oneScanRes] =
+    await Promise.all([
+      knownNonPatched.has(port)
+        ? Promise.resolve(null)
+        : httpGet(probeHostname, port, '/__peachsim/'),
+      httpGet(probeHostname, port, '/status'),
+      knownOne.has(port)
+        ? Promise.resolve(null)
+        : httpGet(probeHostname, port, '/', 'GET', MANIFEST_TIMEOUT_MS, {
+            'expo-platform': 'ios',
+          }),
+      knownNonExpo.has(port)
+        ? Promise.resolve(null)
+        : httpGet(probeHostname, port, '/_expo/status'),
+      httpGet(probeHostname, port, SWIFT_DISCOVERY_PATH),
+      httpGet(probeHostname, port, '/__server-scan', 'GET', MANIFEST_TIMEOUT_MS),
+    ])
+
+  // the One plugin advertises its exact native entry, including replacement
+  // identity. native.app's Expo Go manifest can instead advertise index.bundle.
+  const oneScan =
+    oneScanRes?.statusCode === 200 ? safeParseManifest(oneScanRes.body) : null
+  if (Array.isArray(oneScan)) {
+    for (const entry of oneScan) {
+      if (
+        !entry ||
+        typeof entry !== 'object' ||
+        entry.framework !== 'one' ||
+        entry.port !== port ||
+        typeof entry.bundleUrl !== 'string'
+      )
+        continue
+      let bundle: URL
+      try {
+        bundle = new URL(entry.bundleUrl)
+      } catch {
+        continue
+      }
+      if (
+        bundle.protocol !== 'http:' ||
+        !isLoopbackHost(bundle.hostname) ||
+        bundle.port !== String(port) ||
+        !bundle.pathname.endsWith('/one/metro-entry.bundle')
+      )
+        continue
+      knownOne.add(port)
+      return enrichWithManifest(
+        applyManifest(
+          {
+            port,
+            framework: 'one',
+            bundleUrl: withRuntimeConfig(
+              port,
+              alignLoopbackBundleUrlWithProbe(
+                bundle.href,
+                buildLoopbackProbeBaseUrl('http:', probeHostname, port),
+              ),
+              owner.cwd,
+            ),
+            lastSeen: Date.now(),
+            ...owner,
+          },
+          manifestRes,
+          buildIconProxyUrl,
+        ),
+        buildIconProxyUrl,
+      )
+    }
+  }
 
   const swift =
     swiftRes?.statusCode === 200
@@ -1043,7 +1069,7 @@ export async function probePort(
     )
   }
 
-  // patched sootsim — fallback for legacy /__soot/ patched servers. also
+  // patched sootsim — fallback for legacy /__peachsim/ patched servers. also
   // checked before the one HEAD for the same reason.
   if (
     sootsimRes &&
@@ -1058,7 +1084,7 @@ export async function probePort(
           framework: 'one',
           bundleUrl: withRuntimeConfig(
             port,
-            `${buildLoopbackProbeBaseUrl('http:', probeHostname, port)}/__soot/bundle.js`,
+            `${buildLoopbackProbeBaseUrl('http:', probeHostname, port)}/__peachsim/bundle.js`,
             owner.cwd,
           ),
           hmrUrl: `${buildLoopbackProbeBaseUrl('ws:', probeHostname, port)}/hot`,
@@ -1296,7 +1322,7 @@ export async function scanDevServers(
     }
     // pid changed or cache expired — drop any endpoint-specific verdicts so
     // the re-probe starts from scratch. otherwise a restarted process that
-    // swapped frameworks keeps the old skip-/__soot/ or skip-/_expo/status
+    // swapped frameworks keeps the old skip-/__peachsim/ or skip-/_expo/status
     // decisions, and the scanner never discovers the new server.
     if (cached && cached.pid !== pid) {
       knownNonPatched.delete(port)

package/skills/contrast/SKILL.md

@@ -101,8 +101,8 @@ skills for working with the Peach native preview engine:
 
 | skill | description |
 | --- | --- |
-| `/peach-debug` | Debug rendering, animation, gesture, performance, and accessibility issues in a React Native app running under Peach. Reach for this whenever an animation looks wrong (janky, stutters, snaps, only updates once, or doesn't move at all), a swipe/transition/gesture misbehaves or feels broken, scrolling drops frames or feels slow, the UI renders the wrong tree/props, or a screen reader can't reach something — and drive the peach CLI debug tooling first, not screenshots or ad-hoc logging. |
-| `/peach-perf` | Optimize Peach engine and app performance — scroll jank, dropped frames, slow animation, idle CPU, memory growth, and "smooth normally but laggy under load" (video calls, busy machines). Covers measuring on the right thread with the right browser, proving each perf tier actually engages via its counters, a CPU-contention test harness, and the map of existing perf machinery so you improve it instead of reinventing it. For general app debugging load /peach-debug first. |
+| `/peach-debug` | Debug rendering, animation, gesture, performance, and accessibility issues in a React Native app under Peach. Use when an animation janks, snaps, or stalls, a gesture misbehaves, scrolling drops frames, the tree or props look wrong, or a screen reader cannot reach something. Use the peach CLI first. |
+| `/peach-perf` | Optimize Peach engine and app performance: scroll jank, dropped frames, slow animation, idle CPU, memory growth, and lag under load. Covers measuring on the right thread, proving perf tiers engage via counters, a CPU-contention harness, and perf machinery. For debugging load peach-debug first. |
 | `/peach-setup` | Get Peach connected to your React Native app with no project setup |
 | `/peach-test` | Run automated tests against your React Native app under Peach with Maestro YAML or Detox/Jest |
 | `/peach-visual` | Pixel-level rendering comparison between Peach and native iOS — fonts, gradients, shadows, image fidelity |

package/skills/peach-debug/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: peach-debug
 model: sm
-description: Debug rendering, animation, gesture, performance, and accessibility issues in a React Native app running under Peach. Reach for this whenever an animation looks wrong (janky, stutters, snaps, only updates once, or doesn't move at all), a swipe/transition/gesture misbehaves or feels broken, scrolling drops frames or feels slow, the UI renders the wrong tree/props, or a screen reader can't reach something — and drive the peach CLI debug tooling first, not screenshots or ad-hoc logging.
+description: Debug rendering, animation, gesture, performance, and accessibility issues in a React Native app under Peach. Use when an animation janks, snaps, or stalls, a gesture misbehaves, scrolling drops frames, the tree or props look wrong, or a screen reader cannot reach something. Use the peach CLI first.
 ---
 
 # Peach debug

package/skills/peach-perf/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: peach-perf
 model: sm
-description: Optimize Peach engine and app performance — scroll jank, dropped frames, slow animation, idle CPU, memory growth, and "smooth normally but laggy under load" (video calls, busy machines). Covers measuring on the right thread with the right browser, proving each perf tier actually engages via its counters, a CPU-contention test harness, and the map of existing perf machinery so you improve it instead of reinventing it. For general app debugging load /peach-debug first.
+description: Optimize Peach engine and app performance: scroll jank, dropped frames, slow animation, idle CPU, memory growth, and lag under load. Covers measuring on the right thread, proving perf tiers engage via counters, a CPU-contention harness, and perf machinery. For debugging load peach-debug first.
 ---
 
 # Peach performance

package/skills/peach-setup/SKILL.md

@@ -56,7 +56,8 @@ debugging or `/peach-test` for writing tests.
   `--new`, `--profile`, and `--ephemeral` create another isolated browser
   tree. use them only when separate storage or a genuinely concurrent sim is
   required. repeated new trees consume enough memory and CPU to starve other
-  work on a shared machine.
+  work on a shared machine. `--ephemeral` also boots on default settings and
+  keeps its setting changes to itself, so use it for proof captures.
 - **pin the sim before driving it.** `peach open` records the new sim for the
   current CLI identity. read its id and pin it explicitly before a longer flow:
 

package/skills/peach-test/SKILL.md

@@ -39,6 +39,14 @@ Do not invent a third runner for how a Maestro flow was authored.
 - **pin a sim before running a suite.** parallel CI jobs colliding
   on the default bridge port is the #1 flake source. pass `--port` in
   CI and `peach use <id>` locally.
+- **admit a bounded stack and flow together.** if your environment requires
+  resource admission, keep stack startup, readiness, sim opening and pinning,
+  the flow, and cleanup of your owned stack in one admitted process group.
+  A stack started in an admitted background command can hold the slot that a
+  later tool call needs for the flow. Nested commands must inherit the real
+  admission; never set admission flags by hand. Before the flow, confirm
+  `peach describe --sim <id>` returns a tree: a saved sim id does not prove
+  the connection survived the wait.
 - **every flow ends with an assert, not a screenshot.** a screenshot
   passes as long as the flow didn't throw. `assertVisible` (or
   `expect(...).toBeVisible()`) actually verifies the happy path.

package/src/assetCatalogContract.ts

@@ -4,6 +4,46 @@ export interface SwiftImageSource {
   scale: number
 }
 
+// the scale variants stay available until the runtime knows its device.
+export type SwiftImageVariants = SwiftImageSource[]
+
+export function isSwiftImageVariants(value: unknown): value is SwiftImageVariants {
+  return (
+    Array.isArray(value) &&
+    value.length > 0 &&
+    value.every(
+      (image) =>
+        typeof image === 'object' &&
+        image !== null &&
+        typeof image.uri === 'string' &&
+        typeof image.scale === 'number' &&
+        Number.isFinite(image.scale) &&
+        image.scale > 0,
+    )
+  )
+}
+
+// react native's asset scale rule, shared by metro and native catalog images.
+export function assetScaleForDevice(scales: readonly number[], target: number): number {
+  for (const scale of scales) if (scale >= target) return scale
+  return scales[scales.length - 1] ?? 1
+}
+
+export function scaledImageSource(
+  variants: SwiftImageVariants | undefined,
+  deviceScale: number,
+): SwiftImageSource | undefined {
+  if (!variants) return undefined
+  const scale = assetScaleForDevice(
+    variants.map((image) => image.scale),
+    deviceScale,
+  )
+  return variants.find((image) => image.scale === scale)
+}
+
+// relative bundle path to the asset names owned by that bundle; '.' is main.
+export type SwiftImageResources = Record<string, Record<string, SwiftImageVariants>>
+
 // an app catalog color resolves by appearance or names a system color.
 export type AppCatalogColor = { light: string; dark: string } | { system: string }
 
@@ -11,6 +51,7 @@ export type AppCatalogColor = { light: string; dark: string } | { system: string
 export interface SfSymbolImageDrawing {
   referencePointSize: number
   basePointSize: number
+  baselineOffsetUnrounded: number
   referenceCanvasSize: readonly [number, number]
   insets: readonly [number, number, number, number]
   layers: readonly { d: string; opacity: number; eraser: boolean }[]
@@ -26,8 +67,9 @@ export function sfSymbolImageDimensions(
   scale: number,
 ) {
   const glyphScale = (pointSize * scale) / drawing.referencePointSize
+  // negative alignment bearings do not become negative UIImage content padding.
   const insets = drawing.insets.map((inset) =>
-    Math.round((inset * pointSize * scale) / drawing.basePointSize),
+    Math.max(0, Math.round((inset * pointSize * scale) / drawing.basePointSize)),
   )
   return {
     glyphScale,

package/src/bridge-contract-input.ts

@@ -64,6 +64,17 @@ function optionalNumber(
     : numberValue(record[key], `${path}.${key}`)
 }
 
+function optionalPointerId(
+  record: Record<string, unknown>,
+  path: string,
+): number | undefined {
+  const pointerId = optionalNumber(record, 'pointerId', path)
+  if (pointerId !== undefined && !Number.isSafeInteger(pointerId)) {
+    validationFailure(`${path}.pointerId`, 'must be a safe integer')
+  }
+  return pointerId
+}
+
 function optionalBoolean(
   record: Record<string, unknown>,
   key: string,
@@ -96,7 +107,7 @@ export function parsePerformStep(value: unknown, index: number): SimPerformStep
     case 'touchDown':
     case 'touchMove':
     case 'touchUp': {
-      const pointerId = optionalNumber(step, 'pointerId', path)
+      const pointerId = optionalPointerId(step, path)
       return {
         type,
         x: numberValue(step.x, `${path}.x`),
@@ -105,7 +116,7 @@ export function parsePerformStep(value: unknown, index: number): SimPerformStep
       }
     }
     case 'touchCancel': {
-      const pointerId = optionalNumber(step, 'pointerId', path)
+      const pointerId = optionalPointerId(step, path)
       return { type, ...(pointerId === undefined ? {} : { pointerId }) }
     }
     case 'tap':
@@ -282,38 +293,54 @@ export function parsePerformStep(value: unknown, index: number): SimPerformStep
   }
 }
 
-// an unclosed touchDown leaves a pointer stuck down, and the batch abort path
-// would cancel it after the caller was told the batch failed. every batch is
-// self-contained (pointers never survive it), so a touchDown without its
-// touchUp or touchCancel in the same batch is rejected before anything runs.
-export function findUnbalancedTouchDown(
+// every batch is self-contained, so a pointer must be opened before it moves
+// or closes and every opened pointer must close before the batch ends.
+export function findInvalidPointerSequence(
   steps: readonly SimPerformStep[],
-): { index: number; pointerId: number } | null {
+): { index: number; error: string } | null {
   const open = new Map<number, number>()
-  const pointerIdOf = (step: SimPerformStep): number | null => {
+  for (const [index, step] of steps.entries()) {
     if (
       step.type !== 'touchDown' &&
       step.type !== 'touchMove' &&
       step.type !== 'touchUp' &&
       step.type !== 'touchCancel'
     ) {
-      return null
+      continue
     }
     const pointerId = step.pointerId ?? 999
-    return Number.isSafeInteger(pointerId) ? pointerId : null
-  }
-  for (const [index, step] of steps.entries()) {
+    if (!Number.isSafeInteger(pointerId)) {
+      return {
+        index,
+        error: `perform.steps[${index}] (${step.type}) has an invalid pointer id`,
+      }
+    }
     if (step.type === 'touchDown') {
-      const pointerId = pointerIdOf(step) ?? 999
-      if (!open.has(pointerId)) open.set(pointerId, index)
-    } else if (step.type === 'touchUp' || step.type === 'touchCancel') {
-      const pointerId = pointerIdOf(step)
-      if (pointerId !== null) open.delete(pointerId)
+      if (open.has(pointerId)) {
+        return {
+          index,
+          error: `perform.steps[${index}] (touchDown) starts pointer ${pointerId} before its previous touchUp or touchCancel`,
+        }
+      }
+      open.set(pointerId, index)
+      continue
+    }
+    if (!open.has(pointerId)) {
+      return {
+        index,
+        error: `perform.steps[${index}] (${step.type}) has no matching touchDown for pointer ${pointerId}`,
+      }
+    }
+    if (step.type === 'touchUp' || step.type === 'touchCancel') {
+      open.delete(pointerId)
     }
   }
   const next = open.entries().next()
   if (next.done) return null
-  return { index: next.value[1], pointerId: next.value[0] }
+  return {
+    index: next.value[1],
+    error: `perform.steps[${next.value[1]}] (touchDown) has no matching touchUp or touchCancel for pointer ${next.value[0]}`,
+  }
 }
 
 export function parseStateOptions(value: unknown): SimStateOptions {

package/src/bridge-contract.ts

@@ -374,7 +374,6 @@ export const SEMANTIC_READY_CONTENT_NODE_FLOOR = 100
 export const SEMANTIC_READY_NODE_STABLE_MS = 750
 export const SEMANTIC_READY_POLL_MS = 150
 
-export const PUBLIC_NO_NETWORK_MARKER = 'public Peach Cloud simulators have no network'
 export const HEADLESS_TENANT_FETCH_HUNG_MARKER = 'headless tenant fetch hung'
 
 export function readyProbeHasContent(