peachsim 0.1.626 → 0.1.628

package/src/host/bridge-host.ts

@@ -9,6 +9,7 @@ import {
 } from '../../scripts/dev-server-scanner.ts'
 import { buildBrowserAssetProxyUrl } from '../backend-origin.ts'
 import {
+  AUTOMATION_SIM_IDLE_REAP_TTL_MS,
   DEFAULT_SOOTSIM_BRIDGE_PORT,
   SOOTSIM_BRIDGE_SIM_CLOSE_CODE,
   SOOTSIM_BRIDGE_SIM_CLOSE_REASON,
@@ -40,6 +41,7 @@ import {
   resolveDevCheckoutRuntimeRoot,
   resolveRuntimeRootForHostname,
   runtimeVersionFromHostname,
+  sendFileWithRanges,
 } from '../runtime-assets.ts'
 import { rnxRuntime } from '../runtime-delivery.ts'
 import { AgentHost, type AgentHostOptions } from './agent-host.ts'
@@ -260,23 +262,6 @@ export interface BridgeHostOptions {
    *  `peach serve` command resolves this with the same probe the
    *  upload itself uses (`resolveDefaultUploadOrigin`). */
   contrastOrigin?: string
-  /** override the abandoned-sim GC TTL (ms). defaults to
-   *  SIM_IDLE_REAP_TTL_MS (30 min). exists so the reaper integration test
-   *  can drive the real timer path deterministically instead of mocking
-   *  time. production callers should never set this. */
-  simIdleReapTtlMs?: number
-  /** override the idle GC TTL (ms) for automation sims (playwright-driver,
-   *  capture/factory). defaults to AUTOMATION_SIM_IDLE_REAP_TTL_MS (10 min).
-   *  test-only, like simIdleReapTtlMs. */
-  automationSimIdleReapTtlMs?: number
-  /** cap on concurrent non-primary automation sims before the reaper drops
-   *  the most-idle overflow. defaults to MAX_CONCURRENT_AUTOMATION_SIMS (6).
-   *  test-only. */
-  maxConcurrentAutomationSims?: number
-  /** grace (ms) below which an automation sim is never reaped by the cap,
-   *  even when over it. defaults to AUTOMATION_SIM_ACTIVE_GRACE_MS (60 s).
-   *  test-only. */
-  automationSimActiveGraceMs?: number
 }
 
 const DAEMON_HEARTBEAT_INTERVAL_MS = 5_000
@@ -417,25 +402,9 @@ export class SootSimBridgeHost {
   // terminal 4001 code, so the client closes the abandoned window instead
   // of reconnecting the zombie straight back in.
   private static SIM_IDLE_REAP_TTL_MS = 30 * 60_000
-  // automation sims (spawned by the playwright driver: `peach open --driver
-  // playwright`, the factory/screenshot capture path — `meta.sootsimHostDriver
-  // === 'playwright'`) are unattended one-shot browsers, never a human's tab. a
-  // capture run opens one per slide/app/retry and the 30-min human/dev TTL lets
-  // hundreds pile up inside the window — orphaned ms-playwright chromiums that
-  // drove the box to swap-thrash (load hit 157 in one incident). give them a far
-  // shorter idle TTL, and cap how many can sit concurrently: reap the most-idle
-  // overflow, but never a sim active within ACTIVE_GRACE (an agent composing
-  // between captures), nor primary / cli-attached / leased sims.
-  private static AUTOMATION_SIM_IDLE_REAP_TTL_MS = 10 * 60_000
-  private static MAX_CONCURRENT_AUTOMATION_SIMS = 6
-  private static AUTOMATION_SIM_ACTIVE_GRACE_MS = 60_000
 
   private preferredPort: number
   private portFallbackCount: number
-  private simIdleReapTtlMs: number
-  private automationSimIdleReapTtlMs: number
-  private maxConcurrentAutomationSims: number
-  private automationSimActiveGraceMs: number
   private shouldWriteLockfile: boolean
   private shouldWriteDevLockfile: boolean
   private getShellPort: (() => number | null) | null
@@ -486,14 +455,6 @@ export class SootSimBridgeHost {
       getExcludePorts: opts.agentScanExcludes,
     })
     this.contrastOrigin = opts.contrastOrigin?.replace(/\/$/, '') || null
-    this.simIdleReapTtlMs =
-      opts.simIdleReapTtlMs ?? SootSimBridgeHost.SIM_IDLE_REAP_TTL_MS
-    this.automationSimIdleReapTtlMs =
-      opts.automationSimIdleReapTtlMs ?? SootSimBridgeHost.AUTOMATION_SIM_IDLE_REAP_TTL_MS
-    this.maxConcurrentAutomationSims =
-      opts.maxConcurrentAutomationSims ?? SootSimBridgeHost.MAX_CONCURRENT_AUTOMATION_SIMS
-    this.automationSimActiveGraceMs =
-      opts.automationSimActiveGraceMs ?? SootSimBridgeHost.AUTOMATION_SIM_ACTIVE_GRACE_MS
   }
 
   /** expose the agent host so tests and embedders can inspect state or
@@ -502,14 +463,6 @@ export class SootSimBridgeHost {
     return this.agentHost
   }
 
-  /** run the abandoned-sim GC pass on demand. the reaper normally fires off
-   *  the 30s idle-sweep timer; this lets the F21-3 integration test drive
-   *  the real path without waiting for the timer. not part of the public
-   *  WS protocol. */
-  reapIdleSimsForTest(now = Date.now()): void {
-    this.reapIdleSims(now)
-  }
-
   /** synchronous wrapper around startAsync for callers that don't care
    *  about port fallback outcomes. returns immediately; actual binding
    *  happens on the event loop. callers that need to know the bound port
@@ -816,6 +769,13 @@ export class SootSimBridgeHost {
             return
           }
 
+          // a capture the page is still running after its cli exited (`peach
+          // record start`) is use the idle reaper cannot see in cli traffic.
+          if (msg.type === 'bridge:capture-active' && sim) {
+            sim.lastActiveAt = Date.now()
+            return
+          }
+
           // write a partial patch into ~/.peach/config.json. fired by the
           // engine's settingsStore when a persisted key flips in a browser
           // tab (which has no fs access of its own). after the merge, we
@@ -1345,43 +1305,10 @@ export class SootSimBridgeHost {
 
     const contentType =
       HTTP_MIME_TYPES[path.extname(filePath).toLowerCase()] || 'application/octet-stream'
-    const total = stats.size
-    const range = /^bytes=(\d*)-(\d*)$/.exec(req.headers.range || '')
-    if (range) {
-      const [, startRaw, endRaw] = range
-      const start = startRaw ? Number(startRaw) : 0
-      const end = endRaw ? Math.min(Number(endRaw), total - 1) : total - 1
-      if (!Number.isFinite(start) || start > end || start >= total) {
-        res.writeHead(416, { ...cors, 'Content-Range': `bytes */${total}` })
-        res.end()
-        return
-      }
-      res.writeHead(206, {
-        ...cors,
-        'Content-Type': contentType,
-        'Content-Range': `bytes ${start}-${end}/${total}`,
-        'Accept-Ranges': 'bytes',
-        'Content-Length': String(end - start + 1),
-      })
-      if (method === 'HEAD') {
-        res.end()
-        return
-      }
-      fs.createReadStream(filePath, { start, end }).pipe(res)
-      return
-    }
-
-    res.writeHead(200, {
+    sendFileWithRanges(req, res, filePath, stats.size, {
       ...cors,
       'Content-Type': contentType,
-      'Accept-Ranges': 'bytes',
-      'Content-Length': String(total),
     })
-    if (method === 'HEAD') {
-      res.end()
-      return
-    }
-    fs.createReadStream(filePath).pipe(res)
   }
 
   private handleServerScan(res: ServerResponse) {
@@ -2025,71 +1952,33 @@ export class SootSimBridgeHost {
   // automation sims are spawned by the playwright driver (`peach open
   // --driver playwright`, the factory/screenshot capture path), which tags them
   // with `meta.sootsimHostDriver === 'playwright'` via the host's addInitScript.
-  // they are unattended one-shot browsers, never a human's tab, so they get a
-  // shorter idle TTL and a concurrent cap.
   private isAutomationSim(sim: BridgeSimConnection): boolean {
     return sim.meta?.sootsimHostDriver === 'playwright'
   }
 
-  // an automation sim whose spawning playwright host process is still alive is
-  // an ACTIVE run, not an abandoned tab. mirrors the cli's playwrightHostPidForSim
-  // (control.ts): extract the host pid from meta, then check liveness so the
-  // host-side idle GC never kills a live capture/factory sim mid-run.
-  private automationSimOwnerAlive(sim: BridgeSimConnection): boolean {
-    const pid = Number(sim.meta?.sootsimHostPid)
-    if (!Number.isInteger(pid) || pid <= 1 || pid === process.pid) return false
-    try {
-      process.kill(pid, 0) // ESRCH → dead; EPERM → alive but unsignalable
-      return true
-    } catch (err) {
-      return (err as NodeJS.ErrnoException).code === 'EPERM'
-    }
-  }
-
   private reapIdleSims(now = Date.now()) {
     const attachedSimIds = new Set(this.cliSimBySocket.values())
-    // automation sims that pass every "someone cares" gate but are still under
-    // their TTL — candidates for the concurrent-cap pass below.
-    const automationLive: { sim: BridgeSimConnection; idleMs: number }[] = []
     for (const sim of this.sims.values()) {
-      if (sim.id === this.primarySimId) continue
       if (attachedSimIds.has(sim.id)) continue
-      if (this.getActiveLease(sim)) continue
-      // never-CLI-driven sims have lastActiveAt 0 — fall back to connectedAt
-      // so a freshly opened, not-yet-primary tab isn't reaped on the spot.
-      const lastTouched = Math.max(sim.lastActiveAt, sim.connectedAt)
-      const idleMs = now - lastTouched
       const automation = this.isAutomationSim(sim)
-      // a live-owner automation sim is an ACTIVE run (its spawning playwright host
-      // process is still alive) — never reap it. the host keeps Chrome alive
-      // intentionally and tears it down itself when ITS owner driver dies; only
-      // orphaned/host-dead autos are the leak this reaper targets. (2026-06: the
-      // 10-min automation TTL was reaping live capture + factory sims mid-run —
-      // too aggressive.) continue skips both the TTL reap and the cap pass below.
-      if (automation && this.automationSimOwnerAlive(sim)) continue
-      const ttl = automation ? this.automationSimIdleReapTtlMs : this.simIdleReapTtlMs
-      if (idleMs >= ttl) {
-        // terminal close → client closes the window, does not reconnect; the
-        // 'close' handler runs rememberDisconnectedSim → this.sims.delete.
-        this.closeSimSocketFromHost(sim.ws)
+      const lease = this.getActiveLease(sim)
+      // an automation sim is nobody's tab, so being primary or holding a cli
+      // lease (10 min from its last grant) says nothing about use: only a human
+      // interacting with a headed window keeps one past its idle window.
+      if (
+        automation ? lease?.kind === 'user-active' : sim.id === this.primarySimId || lease
+      ) {
         continue
       }
-      if (automation) automationLive.push({ sim, idleMs })
-    }
-    // concurrent cap: a burst of capture opens can pile up hundreds inside the
-    // TTL window. keep at most maxConcurrentAutomationSims of the freshest;
-    // reap the most-idle overflow, but never one active within the grace (an
-    // agent mid-capture between screenshots).
-    const cap = this.maxConcurrentAutomationSims
-    if (automationLive.length > cap) {
-      automationLive.sort((a, b) => b.idleMs - a.idleMs) // most-idle first
-      for (const { sim, idleMs } of automationLive.slice(
-        0,
-        automationLive.length - cap,
-      )) {
-        if (idleMs < this.automationSimActiveGraceMs) continue
-        this.closeSimSocketFromHost(sim.ws)
-      }
+      // never-CLI-driven sims have lastActiveAt 0 — fall back to connectedAt
+      // so a freshly opened, not-yet-primary tab isn't reaped on the spot.
+      const idleMs = now - Math.max(sim.lastActiveAt, sim.connectedAt)
+      const ttl = automation
+        ? AUTOMATION_SIM_IDLE_REAP_TTL_MS
+        : SootSimBridgeHost.SIM_IDLE_REAP_TTL_MS
+      // terminal close → client closes the window, does not reconnect; the
+      // 'close' handler runs rememberDisconnectedSim → this.sims.delete.
+      if (idleMs >= ttl) this.closeSimSocketFromHost(sim.ws)
     }
   }
 

package/src/menu.ts

@@ -80,6 +80,7 @@ export interface SootSimMenuState {
   // can reach.
   developmentMode: boolean
   showBezels: boolean
+  showTouches: boolean
   showMenuBar: boolean
   showRail: boolean
   solidWindow: boolean
@@ -493,6 +494,12 @@ function windowMenu(state: SootSimMenuState): SootSimMenuDef {
         checked: state.showBezels,
         action: 'toggle-bezels',
       },
+      {
+        label: 'Show Touches',
+        type: 'checkbox',
+        checked: state.showTouches,
+        action: 'toggle-touches',
+      },
       {
         label: 'Show Menu Bar',
         type: 'checkbox',

package/src/native-seam-manifest.ts

@@ -275,25 +275,13 @@ export const NATIVE_SEAM_MANIFEST: NativeSeamEntry[] = [
   },
   {
     pkg: 'expo-image',
-    // upstream splits the native surface across two files:
-    //   - src/ExpoImage.tsx → requireNativeViewManager('ExpoImage')
-    //   - src/ImageModule.ts → requireNativeModule('ExpoImage')
-    // the view-component seam translates expo-image's prop shape
-    // (contentFit, tintColor, source) onto sootsim's existing
-    // <sootsim-image> host. no new canvas component is needed — sootsim's
-    // image-loader + canvaskit-renderer already handle resizeMode,
-    // tintColor, and onLoad/onError lifecycle.
-    seamBasenames: ['ExpoImage'],
-    target: seamPath('expo-image'),
-    notes:
-      'expo-image native view — thin prop translator onto sootsim-image host (contentFit→resizeMode, tintColor passthrough); upstream Image.tsx + ImageBackground + useImage resolve from node_modules unchanged',
-  },
-  {
-    pkg: 'expo-image',
+    // src/ImageModule.ts → requireNativeModule('ExpoImage'). the native view
+    // is src/ExpoImage.tsx's requireNativeViewManager('ExpoImage') call inside
+    // a real JS component, so it comes from expo-image-register instead.
     seamBasenames: ['ImageModule'],
     target: seamPath('expo-image-module'),
     notes:
-      'expo-image native module — prefetch/loadAsync route through sootsim image-loader; cache controls noop (browser owns HTTP cache); blurhash encode not yet implemented',
+      'expo-image native module — prefetch/loadAsync/readFromCacheAsync route through the engine image loader, blurhash and thumbhash generation run the swift encoders, cache configuration has nothing to set in a browser',
   },
   {
     pkg: '@notifee/react-native',

package/src/runtime-assets.ts

@@ -7,6 +7,7 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import { isValidRuntimeVersion } from '@contrast/runtime-delivery'
 import { readActiveRuntime, runtimeDir } from './home-paths.ts'
+import type { ServerResponse } from 'http'
 
 export const SOOTSIM_RUNTIME_MISSING_MESSAGE =
   '[peach] no engine runtime installed. run `peach runtime install`'
@@ -97,6 +98,10 @@ const MIME_TYPES: Record<string, string> = {
   '.woff2': 'font/woff2',
   '.mp3': 'audio/mpeg',
   '.wav': 'audio/wav',
+  '.mp4': 'video/mp4',
+  '.m4v': 'video/mp4',
+  '.mov': 'video/quicktime',
+  '.webm': 'video/webm',
 }
 
 const ROOT_RUNTIME_PATHS = [
@@ -111,7 +116,7 @@ const ROOT_RUNTIME_PATHS = [
   '/spike/',
   '/test-wallpaper.jpg',
   '/preview-sw.js',
-  '/sootsim.svg',
+  '/peach.svg',
   '/bedrock-sqlite.wasm',
   '/bedrock-sqlite.js',
   '/sootsim/',
@@ -238,5 +243,57 @@ export function serveRuntimeFile(req: any, res: any, fullPath: string) {
     res.end()
     return
   }
-  fs.createReadStream(fullPath).pipe(res)
+  sendFileWithRanges(req, res, fullPath, stat.size, {})
+}
+
+// a file body that honours a single `bytes=` range. a media element can only
+// seek a resource whose server answers ranges, so any file a <video> or
+// <audio> might load goes through here.
+export function sendFileWithRanges(
+  req: { method?: string; headers?: { range?: string } } | undefined,
+  res: ServerResponse,
+  filePath: string,
+  total: number,
+  headers: Record<string, string>,
+) {
+  const head = (req?.method || 'GET').toUpperCase() === 'HEAD'
+  const range = /^bytes=(\d*)-(\d*)$/.exec(req?.headers?.range || '')
+  // a last byte before the first makes the header invalid, which a server
+  // ignores (RFC 9110 14.1.1)
+  const invalid = range && range[1] && range[2] && Number(range[2]) < Number(range[1])
+  if (range && (range[1] || range[2]) && !invalid) {
+    const [, startRaw, endRaw] = range
+    // a suffix range (bytes=-N) is the last N bytes
+    const start = startRaw ? Number(startRaw) : Math.max(0, total - Number(endRaw))
+    const end = startRaw && endRaw ? Math.min(Number(endRaw), total - 1) : total - 1
+    if (start > end || start >= total) {
+      res.writeHead(416, { ...headers, 'Content-Range': `bytes */${total}` })
+      res.end()
+      return
+    }
+    res.writeHead(206, {
+      ...headers,
+      'Content-Range': `bytes ${start}-${end}/${total}`,
+      'Accept-Ranges': 'bytes',
+      'Content-Length': String(end - start + 1),
+    })
+    if (head) res.end()
+    else streamFile(res, fs.createReadStream(filePath, { start, end }))
+    return
+  }
+  res.writeHead(200, {
+    ...headers,
+    'Accept-Ranges': 'bytes',
+    'Content-Length': String(total),
+  })
+  // the body stops at the stat'd size so a file a rebuild is still growing
+  // cannot run past its Content-Length
+  if (head || total === 0) res.end()
+  else streamFile(res, fs.createReadStream(filePath, { start: 0, end: total - 1 }))
+}
+
+// the status line is already out, so a read failure can only cut the body
+function streamFile(res: ServerResponse, stream: fs.ReadStream) {
+  stream.on('error', (error) => res.destroy(error))
+  stream.pipe(res)
 }