peachsim 0.1.939 → 0.1.1399

package/cli/commands/cpu-profile.ts

@@ -491,6 +491,7 @@ Writes a page profile, worker profiles, and a manifest alongside the output.
     const response = await cdp.send('Runtime.evaluate', {
       expression,
       returnByValue: true,
+      awaitPromise: true,
     })
     if (response?.exceptionDetails) {
       throw new Error(
@@ -693,8 +694,33 @@ Writes a page profile, worker profiles, and a manifest alongside the output.
     captureStarted = true
     startPromises.push(startTarget(pageTarget))
     for (const target of workers.values()) startPromises.push(startTarget(target))
+    // with the native host attached, the engine's workers are realm threads in the host, reached
+    // through the page; they record over the same window as the browser targets
+    const hostRealms =
+      (await evaluatePage(`typeof window.__peachNative?.cpuProfile === 'function'`)) ===
+      true
+    const hostTargets: AttachedTarget[] = []
+    if (hostRealms) {
+      const startedAtMs = performance.now()
+      const realms = await evaluatePage(
+        `window.__peachNative.cpuProfile('start', ${sampleInterval * 1000})`,
+      )
+      for (const realm of Array.isArray(realms) ? realms : []) {
+        hostTargets.push({
+          attachedAtMs: startedAtMs,
+          detached: false,
+          error: realm.error,
+          profileStartedAtMs: realm.error ? undefined : performance.now(),
+          role: cpuProfileTargetRole(realm.url, realm.name),
+          started: !realm.error,
+          title: realm.name,
+          type: 'host-realm',
+          url: realm.url,
+        })
+      }
+    }
     await waitForStableTargetSetup()
-    const startedCount = [pageTarget, ...workers.values()].filter(
+    const startedCount = [pageTarget, ...workers.values(), ...hostTargets].filter(
       (target) => target.started,
     ).length
     if (startedCount === 0) {
@@ -737,6 +763,23 @@ Writes a page profile, worker profiles, and a manifest alongside the output.
         await cdp.send('Profiler.disable', {}, target.sessionId).catch(() => {})
       }),
     )
+    if (hostRealms) {
+      const stopped = await evaluatePage(`window.__peachNative.cpuProfile('stop', 0)`)
+      const stoppedAtMs = performance.now()
+      for (const realm of Array.isArray(stopped) ? stopped : []) {
+        const target = hostTargets.find(
+          (candidate) =>
+            candidate.title === realm.name &&
+            candidate.url === realm.url &&
+            !candidate.profile,
+        )
+        if (!target) continue
+        if (realm.profile) target.profile = realm.profile
+        else target.error = realm.error
+        target.profileStoppedAtMs = stoppedAtMs
+      }
+      results.push(...hostTargets)
+    }
     // querying the page while five high-frequency profilers are still active
     // can itself time out and lengthen the requested sampling interval. stop
     // first, then read the already-recorded workload completion evidence. a
@@ -945,6 +988,7 @@ export function cpuProfileTargetRole(url: string, title = ''): string {
     return 'compositor'
   }
   if (identity.includes('shell-worker')) return 'shell'
+  if (identity.includes('peach-host')) return 'host'
   if (identity.includes('named-worklet')) return 'worklet'
   if (identity.includes('render-worker') || identity.includes('tenant-worker')) {
     return 'tenant'

package/cli/commands/daemon.ts

@@ -19,7 +19,9 @@ import { spawnSync } from 'child_process'
 import {
   existsSync,
   mkdirSync,
+  readdirSync,
   readFileSync,
+  readlinkSync,
   realpathSync,
   rmSync,
   writeFileSync,
@@ -27,6 +29,7 @@ import {
 import { homedir } from 'os'
 import { dirname, resolve } from 'path'
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
+import { unregisterNativeDesktopLinks } from '../../src/desktop-host-delivery'
 import {
   daemonAppDir,
   isDaemonLockfileFresh,
@@ -37,7 +40,7 @@ import {
 import { rnxPublicBrand } from '../../src/public-brand'
 import { printCommandHelp } from '../help'
 import { escapeXml } from '../maestro-report'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { rnxSelfInvocation, type RnxSelfInvocation } from '../self-invocation'
 import { DAEMON_ENVIRONMENT, ensureDaemonApp } from './daemon-mac-app'
 
@@ -84,7 +87,7 @@ export async function runDaemon(args: string[], opts: DaemonOptions = {}) {
     default:
       console.error(`  unknown daemon subcommand: ${sub}`)
       printHelp()
-      rnxExit(1)
+      peachExit(1)
   }
 }
 
@@ -316,7 +319,7 @@ export async function daemonInstall({ port, force }: { port: number; force: bool
 
   console.error(`  background daemon is not supported on ${process.platform}`)
   console.error(`  run 'peach serve' in a persistent shell instead`)
-  rnxExit(1)
+  peachExit(1)
 }
 
 function macServiceTarget(): string {
@@ -364,9 +367,9 @@ function macBridgeHasListener(pid: number, port: number): boolean {
 
 export async function stopMacDaemonBridge(
   invocation: RnxSelfInvocation,
-  target = macServiceTarget(),
+  target: string | null = macServiceTarget(),
 ): Promise<void> {
-  const service = readMacDaemonState(target)
+  const service = target === null ? null : readMacDaemonState(target)
   const lock = readDaemonLockfile()
   if (isDaemonLockfileFresh(lock) && lock.pid !== service?.pid) {
     // a lockfile alone cannot authorize a signal after pid reuse.
@@ -387,7 +390,7 @@ export async function stopMacDaemonBridge(
     }
     process.kill(lock.pid, 'SIGTERM')
   }
-  if (service) runLaunchctl(['bootout', target])
+  if (service && target !== null) runLaunchctl(['bootout', target])
   if (!lock) return
   const deadline = Date.now() + 4000
   while (Date.now() < deadline) {
@@ -436,6 +439,102 @@ export async function startMacDaemon(
   )
 }
 
+// --- linux bridge ownership --------------------------------------------
+
+// the linux counterparts to the mac listener and command checks above. both
+// read /proc directly instead of shelling out to lsof, ss or ps, so minimal
+// containers and fresh users get the same ownership proof with no extra
+// binaries installed.
+
+function linuxBridgeHasListener(pid: number, port: number): boolean {
+  let fds: string[]
+  try {
+    fds = readdirSync(`/proc/${pid}/fd`)
+  } catch {
+    return false
+  }
+  const sockets = new Set<string>()
+  for (const fd of fds) {
+    try {
+      const inode = readlinkSync(`/proc/${pid}/fd/${fd}`).match(/^socket:\[(\d+)\]$/)?.[1]
+      if (inode) sockets.add(inode)
+    } catch {
+      // the fd closed between listing and read; skip it.
+    }
+  }
+  if (sockets.size === 0) return false
+  const hexPort = port.toString(16).toUpperCase().padStart(4, '0')
+  for (const table of ['/proc/net/tcp', '/proc/net/tcp6']) {
+    let body: string
+    try {
+      body = readFileSync(table, 'utf8')
+    } catch {
+      continue
+    }
+    const lines = body.split('\n')
+    for (let i = 1; i < lines.length; i++) {
+      const cols = lines[i].trim().split(/\s+/)
+      if (cols.length < 10) continue
+      if (cols[3] !== '0A') continue
+      if (!cols[1].endsWith(`:${hexPort}`)) continue
+      if (sockets.has(cols[9])) return true
+    }
+  }
+  return false
+}
+
+function readLinuxProcessCommand(pid: number): string | null {
+  // /proc cmdline is the argv vector verbatim; joining with spaces matches
+  // what `ps -o command=` prints without needing procps installed.
+  try {
+    const args = readFileSync(`/proc/${pid}/cmdline`, 'utf8')
+      .split('\0')
+      .filter((part) => part.length > 0)
+    return args.length > 0 ? args.join(' ') : null
+  } catch {
+    return null
+  }
+}
+
+export async function stopLinuxDaemonBridge(
+  invocation: RnxSelfInvocation,
+  registered: boolean,
+): Promise<void> {
+  if (registered) {
+    const res = spawnSync('systemctl', ['--user', 'stop', SERVICE_NAME_LINUX], {
+      stdio: 'pipe',
+      encoding: 'utf8',
+    })
+    if (res.status !== 0) {
+      console.error(`  stop failed: ${res.stderr?.trim()}`)
+      peachExit(1)
+    }
+    return
+  }
+  const lock = readDaemonLockfile()
+  if (!isDaemonLockfileFresh(lock)) return
+  // a lockfile alone cannot authorize a signal after pid reuse.
+  const ownsListener = linuxBridgeHasListener(lock.pid, lock.bridgePort)
+  const runningCommand = readLinuxProcessCommand(lock.pid)
+  const command = [invocation.executable, ...invocation.prefixArgs, 'serve'].join(' ')
+  if (
+    !ownsListener ||
+    runningCommand === null ||
+    (runningCommand !== command && !runningCommand.startsWith(`${command} `))
+  ) {
+    throw new Error(
+      `cannot hand off bridge on port ${lock.bridgePort}: pid ${lock.pid} is not this Peach invocation`,
+    )
+  }
+  process.kill(lock.pid, 'SIGTERM')
+  const deadline = Date.now() + 4000
+  while (Date.now() < deadline) {
+    if (!linuxBridgeHasListener(lock.pid, lock.bridgePort)) return
+    await new Promise((resolve) => setTimeout(resolve, 100))
+  }
+  throw new Error(`bridge pid ${lock.pid} did not release port ${lock.bridgePort}`)
+}
+
 // removed-path log (idempotent helpers track what they actually touched so the
 // caller can report a unified "not installed" / "removed N entries" line).
 type TeardownReport = { removed: string[]; missing: boolean }
@@ -542,6 +641,7 @@ export function teardownDaemonService(): TeardownReport {
 export function teardownRnxHome(): TeardownReport {
   const removed: string[] = []
   const home = rnxHomeDir()
+  unregisterNativeDesktopLinks()
   if (existsSync(home)) {
     rmSync(home, { recursive: true, force: true })
     removed.push(home)
@@ -558,7 +658,7 @@ async function daemonUninstall(rest: string[]) {
   if (unknown.length > 0) {
     console.error(`  unknown daemon uninstall option: ${unknown[0]}`)
     printHelp()
-    rnxExit(1)
+    peachExit(1)
     return
   }
   const purge = rest.includes('--purge')
@@ -641,7 +741,7 @@ async function daemonStatus() {
     return
   }
   console.error(`  unsupported platform: ${process.platform}`)
-  rnxExit(1)
+  peachExit(1)
 }
 
 async function daemonRestart() {
@@ -649,7 +749,7 @@ async function daemonRestart() {
     const path = macPlistPath()
     if (!existsSync(path)) {
       console.error('  daemon not registered. run `peach daemon install`')
-      rnxExit(1)
+      peachExit(1)
     }
     await stopMacDaemonBridge(resolveDaemonInvocation())
     await startMacDaemon(path)
@@ -660,7 +760,7 @@ async function daemonRestart() {
     const path = linuxUnitPath()
     if (!existsSync(path)) {
       console.error('  daemon not registered. run `peach daemon install`')
-      rnxExit(1)
+      peachExit(1)
     }
     const res = spawnSync('systemctl', ['--user', 'restart', SERVICE_NAME_LINUX], {
       stdio: 'pipe',
@@ -668,13 +768,13 @@ async function daemonRestart() {
     })
     if (res.status !== 0) {
       console.error(`  restart failed: ${res.stderr?.trim()}`)
-      rnxExit(1)
+      peachExit(1)
     }
     console.log('  restarted')
     return
   }
   console.error(`  unsupported platform: ${process.platform}`)
-  rnxExit(1)
+  peachExit(1)
 }
 
 async function daemonStart() {
@@ -682,7 +782,7 @@ async function daemonStart() {
     const path = macPlistPath()
     if (!existsSync(path)) {
       console.error('  daemon not registered. run `peach daemon install`')
-      rnxExit(1)
+      peachExit(1)
     }
     await startMacDaemon(path)
     console.log('  started')
@@ -692,7 +792,7 @@ async function daemonStart() {
     const path = linuxUnitPath()
     if (!existsSync(path)) {
       console.error('  daemon not registered. run `peach daemon install`')
-      rnxExit(1)
+      peachExit(1)
     }
     const res = spawnSync('systemctl', ['--user', 'start', SERVICE_NAME_LINUX], {
       stdio: 'pipe',
@@ -700,45 +800,43 @@ async function daemonStart() {
     })
     if (res.status !== 0) {
       console.error(`  start failed: ${res.stderr?.trim()}`)
-      rnxExit(1)
+      peachExit(1)
     }
     console.log('  started')
     return
   }
   console.error(`  unsupported platform: ${process.platform}`)
-  rnxExit(1)
+  peachExit(1)
 }
 
 async function daemonStop() {
   if (process.platform === 'darwin') {
     const path = macPlistPath()
-    if (!existsSync(path)) {
+    const registered = existsSync(path)
+    if (!registered && !isDaemonLockfileFresh(readDaemonLockfile())) {
       console.error('  daemon not registered — nothing to stop')
-      rnxExit(1)
+      peachExit(1)
     }
-    await stopMacDaemonBridge(resolveDaemonInvocation())
+    await stopMacDaemonBridge(
+      resolveDaemonInvocation(),
+      registered ? macServiceTarget() : null,
+    )
     console.log('  stopped')
     return
   }
   if (process.platform === 'linux') {
     const path = linuxUnitPath()
-    if (!existsSync(path)) {
+    const registered = existsSync(path)
+    if (!registered && !isDaemonLockfileFresh(readDaemonLockfile())) {
       console.error('  daemon not registered — nothing to stop')
-      rnxExit(1)
-    }
-    const res = spawnSync('systemctl', ['--user', 'stop', SERVICE_NAME_LINUX], {
-      stdio: 'pipe',
-      encoding: 'utf8',
-    })
-    if (res.status !== 0) {
-      console.error(`  stop failed: ${res.stderr?.trim()}`)
-      rnxExit(1)
+      peachExit(1)
     }
+    await stopLinuxDaemonBridge(resolveDaemonInvocation(), registered)
     console.log('  stopped')
     return
   }
   console.error(`  unsupported platform: ${process.platform}`)
-  rnxExit(1)
+  peachExit(1)
 }
 
 // tail the daemon's logs. macOS reads the launchd-redirected files directly
@@ -758,7 +856,7 @@ async function daemonLogs(rest: string[]) {
     const present = [out, err].filter((p) => existsSync(p))
     if (present.length === 0) {
       console.error(`  no daemon logs yet at ${LOG_DIR}. run \`peach daemon install\``)
-      rnxExit(1)
+      peachExit(1)
     }
     const args = follow
       ? ['-n', String(lines), '-F', ...present]
@@ -798,11 +896,11 @@ async function daemonLogs(rest: string[]) {
       `  could not read --user journal for ${unit} (this user isn't in the systemd-journal group yet).\n` +
         `  run:  sudo journalctl _SYSTEMD_USER_UNIT=${unit} -n ${lines} --no-pager`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
 
   console.error(`  unsupported platform: ${process.platform}`)
-  rnxExit(1)
+  peachExit(1)
 }
 
 function readPlistBinary(path: string): string | null {

package/cli/commands/debug.ts

@@ -20,7 +20,7 @@
 
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
 import { printBridgeFailureDiagnostics } from '../bridge-diagnostics'
-import { rethrowIfExit, rnxExit } from '../run-rnx'
+import { rethrowIfExit, peachExit } from '../run-rnx'
 import {
   createBridgeFromParsed,
   evalInBridge,
@@ -383,7 +383,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
 
   if (!subcommand || args.includes('--help') || args.includes('-h')) {
     printHelp()
-    rnxExit(0)
+    peachExit(0)
   }
 
   const wsPort = parsed.wsPort
@@ -398,7 +398,14 @@ export async function runDebug(args: string[], opts: DebugOptions) {
   // implementation lives in inspect.ts. forward to runInspect with the raw
   // `debug` prefix intact — runInspect strips it. done before we open a
   // debug-side bridge so we don't hold two bridges at once.
-  const INSPECT_FORWARDED = new Set(['state', 'js', 'perf', 'memory', 'sample-color'])
+  const INSPECT_FORWARDED = new Set([
+    'state',
+    'js',
+    'eval',
+    'perf',
+    'memory',
+    'sample-color',
+  ])
   if (INSPECT_FORWARDED.has(sub)) {
     const { runInspect } = await import('./inspect')
     // pass the raw arg list through so every flag (--sim, --json,
@@ -422,7 +429,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
           console.error(
             `  usage: peach debug enable <channel[,channel,...]>\n  known: ${KNOWN_CHANNELS.join(', ')}`,
           )
-          rnxExit(1)
+          peachExit(1)
         }
         const active = await setDebugChannels(
           bridge,
@@ -450,7 +457,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
         const channel = rest[0]
         if (!channel) {
           console.error('  usage: peach debug toggle <channel>')
-          rnxExit(1)
+          peachExit(1)
         }
         const result = await callDebugBridge(
           bridge,
@@ -518,7 +525,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
         const b = rest[1]
         if (!a || !b) {
           console.error('  usage: peach debug diff <labelA> <labelB>')
-          rnxExit(1)
+          peachExit(1)
         }
         // Maps don't serialize — project added/removed/changed arrays only
         const result = await callDebugBridge(
@@ -563,7 +570,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
               '  zero draws means either nothing on screen is an image, or the audit\n' +
               '  is not attached to the surface that paints.',
           )
-          rnxExit(2)
+          peachExit(2)
         }
         const under = report.rows.filter(
           (row) => row.shortfall !== null && row.shortfall < minimum,
@@ -573,7 +580,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
         } else {
           printImageAudit(report, args.includes('--all') ? report.rows : under, minimum)
         }
-        if (under.length > 0) rnxExit(1)
+        if (under.length > 0) peachExit(1)
         break
       }
 
@@ -584,7 +591,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
           console.log(fmt(result, pretty))
         } else {
           console.error('  usage: peach debug find <sheets|portals|boundaries>')
-          rnxExit(1)
+          peachExit(1)
         }
         break
       }
@@ -602,7 +609,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
             console.error(
               '  usage: peach debug trace anim <on|off|status|clear|<id>> [id|limit]',
             )
-            rnxExit(1)
+            peachExit(1)
           }
           if (sub === 'on') {
             const raw = rest[2] ?? 'all'
@@ -610,7 +617,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
             const target: number | 'all' = raw === 'all' ? 'all' : Number(raw)
             if (target !== 'all' && !Number.isFinite(target)) {
               console.error(`  invalid target: ${raw}`)
-              rnxExit(1)
+              peachExit(1)
             }
             await callTestBridge(bridge, 'enableAnimationTrace', target, limit)
             const listed = await callTestBridge(bridge, 'listAnimationTraces')
@@ -622,7 +629,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
             const target: number | 'all' = raw === 'all' ? 'all' : Number(raw)
             if (target !== 'all' && !Number.isFinite(target)) {
               console.error(`  invalid target: ${raw}`)
-              rnxExit(1)
+              peachExit(1)
             }
             await callTestBridge(bridge, 'disableAnimationTrace', target)
             console.log(fmt({ disabled: target }, pretty))
@@ -639,7 +646,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
           const id = Number(sub)
           if (!Number.isFinite(id)) {
             console.error(`  invalid id: ${sub}`)
-            rnxExit(1)
+            peachExit(1)
           }
           const limit = rest[2] ? Number(rest[2]) : undefined
           const samples = await callTestBridge(bridge, 'getAnimationTrace', id, limit)
@@ -648,7 +655,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
         }
         if (traceTarget !== 'shell') {
           console.error('  usage: peach debug trace <shell|anim> [args]')
-          rnxExit(1)
+          peachExit(1)
         }
         if (!traceCommand || /^[0-9]+$/.test(traceCommand)) {
           const recentLimit = traceCommand ? Number(traceCommand) : 50
@@ -680,7 +687,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
         console.error(
           '  usage: peach debug trace shell [on [limit]|off|status|clear|recentLimit]',
         )
-        rnxExit(1)
+        peachExit(1)
       }
 
       case 'record': {
@@ -717,7 +724,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
       default:
         console.error(`  unknown subcommand: ${sub}`)
         printHelp()
-        rnxExit(1)
+        peachExit(1)
     }
   } catch (err: any) {
     rethrowIfExit(err)
@@ -727,7 +734,7 @@ export async function runDebug(args: string[], opts: DebugOptions) {
       warningsCommand: `peach get warnings 5${simHint}`,
       requestsCommand: `peach get requests 5${simHint}`,
     })
-    rnxExit(1)
+    peachExit(1)
   } finally {
     bridge.close()
   }

package/cli/commands/desktop.ts

@@ -1,5 +1,5 @@
 import { runElectron } from './electron'
-import { runInstallDesktop } from './install-desktop'
+import { runInstallDesktop, runUninstallDesktop } from './install-desktop'
 
 interface DesktopOptions {
   port?: number
@@ -13,11 +13,13 @@ peach desktop — launch or install the desktop companion
 usage:
   peach desktop [options]
   peach desktop install [options]
+  peach desktop uninstall
 
 options:
   --port <number>     connect to a running dev server on this port
   --profile <id>      launch with an isolated persistent storage profile
   --ephemeral         launch with a temporary isolated storage profile
+  --electron          launch Electron on Windows; native app on Mac and Linux
   --native            launch (macOS arm64) or install (also Linux x64) the native host
   -y, --yes           install without prompting
 `)
@@ -30,6 +32,10 @@ export async function runDesktop(args: string[], opts: DesktopOptions): Promise<
   }
 
   const sub = args.find((arg) => !arg.startsWith('-'))
+  if (sub === 'uninstall') {
+    await runUninstallDesktop(args.filter((arg) => arg !== 'uninstall'))
+    return
+  }
   if (sub === 'install') {
     const index = args.indexOf(sub)
     await runInstallDesktop([...args.slice(0, index), ...args.slice(index + 1)])