peachsim 0.1.939 → 0.1.1399

package/cli/commands/upload.ts

@@ -30,7 +30,7 @@ import { authHeaderValue, githubUploadIdentity, resolveCliAuth } from '../auth'
 import { openUrl } from '../open-url'
 import { extractStringFlag } from '../parse-args'
 import { resolveRunProvenance } from '../run-registry'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import {
   callInBridge,
   createBridgeFromParsed,
@@ -227,7 +227,7 @@ function parsePositiveMs(raw: string | undefined, name: string): number | undefi
   const value = Number(raw)
   if (!Number.isFinite(value) || value <= 0) {
     console.error(`  invalid ${name}: ${raw}`)
-    rnxExit(1)
+    peachExit(1)
   }
   return Math.round(value)
 }
@@ -433,7 +433,7 @@ export async function runUpload(
 ): Promise<UploadResult> {
   if (args.includes('--help') || args.includes('-h')) {
     printHelp()
-    rnxExit(0)
+    peachExit(0)
   }
 
   const mutableArgs = [...args]
@@ -472,17 +472,17 @@ export async function runUpload(
   const openResult = extractBoolFlag(mutableArgs, '--open')
   if ((owner && !repo) || (!owner && repo)) {
     console.error('  --owner and --repo must be provided together')
-    rnxExit(1)
+    peachExit(1)
   }
   if (billingKind && billingKind !== 'test_run') {
     console.error(`  invalid --billing-kind: ${billingKind}`)
-    rnxExit(1)
+    peachExit(1)
   }
   // the hosted recorder names the job whose minutes cover this recording
   const runnerJobId = process.env.CONTRAST_RUNNER_JOB_ID
   if (billingKind === 'test_run' && !runnerJobId) {
     console.error('  --billing-kind test_run is only for hosted test jobs')
-    rnxExit(1)
+    peachExit(1)
   }
   if (!eventsPath && !videoPath) {
     console.error(
@@ -490,7 +490,7 @@ export async function runUpload(
         '  for a normal local preview, use `peach record --mode combined --open`\n' +
         '  or `peach maestro test --preview` instead of uploading a bundle-only snapshot.',
     )
-    rnxExit(1)
+    peachExit(1)
   }
   // assets-only filters captured cross-origin responses to just image/font/
   // css/js/binary records before upload — API responses (JSON, HTML) hit the
@@ -715,14 +715,14 @@ export async function runUpload(
     console.error(
       '  could not read bundle snapshot — is peach running and is the bundle loaded?',
     )
-    rnxExit(2)
+    peachExit(2)
   }
   if (!snapshot.bundleUrl) {
     console.error(
       '  no ?bundle= URL on the current peach tab.\n' +
         '  open the app you want to share first (e.g. peach open 8082), then run upload.',
     )
-    rnxExit(2)
+    peachExit(2)
   }
 
   // prefer the post-transform bundle captured from the running tab. this
@@ -867,13 +867,13 @@ export async function runUpload(
         : undefined
     if (!videoContentType) {
       console.error('  preview flow videos must be mp4 or gif')
-      rnxExit(1)
+      peachExit(1)
     }
     if (videoDurationMsRaw) {
       const parsed = Number(videoDurationMsRaw)
       if (!Number.isFinite(parsed) || parsed <= 0) {
         console.error(`  invalid --video-duration-ms: ${videoDurationMsRaw}`)
-        rnxExit(1)
+        peachExit(1)
       }
       videoDurationMs = Math.round(parsed)
     }
@@ -893,7 +893,7 @@ export async function runUpload(
     console.error(
       '  set PEACH_API_KEY=sk_rnx_..., run `peach login`, or use the Contrast github runner.',
     )
-    rnxExit(1)
+    peachExit(1)
   }
   const resolvedAuthHeader = authHeaderValue(cliAuth)
 
@@ -1193,7 +1193,7 @@ export async function runUpload(
     if (e.phase === 'init' && e.status === 401) {
       console.error('  preview upload requires a valid login.')
       console.error('  run `peach login` and retry.')
-      rnxExit(1, 'preview upload requires a valid login')
+      peachExit(1, 'preview upload requires a valid login')
     }
     if (e.status === 402) {
       // billing gate — surface the server's own `message`, not raw JSON.
@@ -1201,13 +1201,13 @@ export async function runUpload(
         parseServerMessage(e.responseText) ??
         'preview uploads require Personal, Team, or an active trial — upgrade from the billing dialog.'
       console.error(`  ${message}`)
-      rnxExit(1, message)
+      peachExit(1, message)
     }
     // PresignedUploadError.message already carries the "<phase> failed:"
     // prefix — don't re-prefix it (that produced "init failed: init failed:").
     const message = e.message ?? `${e.phase ?? 'upload'} failed: ${String(err)}`
     console.error(`  ${message}`)
-    rnxExit(1, message)
+    peachExit(1, message)
   }
 
   const previewUrl = `${canonicalPublicPreviewOrigin(publicOrigin)}${finalize.url}`

package/cli/commands/what-happened.ts

@@ -15,7 +15,7 @@
 //   peach what-happened --limit 50           # cap (default 200)
 
 import { getCliIdentityKey } from '../current-sim'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { createBridgeFromParsed, parseBridgeCliArgs } from '../ws-bridge'
 import {
   formatTimelineEvent,
@@ -184,7 +184,7 @@ note: react-commit, layout, and scroll are opt-in/noisy events. enable them
 with "peach timeline start <kind>", then pass --noisy or include them in
 --kinds to see them.
 `)
-    rnxExit(0)
+    peachExit(0)
   }
 
   const summaryMode = args.includes('--summary')

package/cli/current-sim.ts

@@ -5,7 +5,8 @@ import { getParentPid, getProcessComm, getProcessPgid } from './parent-pid'
 import { writeSecureJsonAtomic } from './secure-file'
 
 const CURRENT_SIM_VERSION = 2 as const
-const CURRENT_SIM_PATH_ENV = 'SOOTSIM_CLI_CURRENT_SIM_PATH'
+const CURRENT_SIM_PATH_ENV = 'PEACH_CLI_CURRENT_SIM_PATH'
+const LEGACY_CURRENT_SIM_PATH_ENV = 'SOOTSIM_CLI_CURRENT_SIM_PATH'
 
 export interface LocalCurrentTarget {
   version: 2
@@ -167,8 +168,10 @@ export function getOwnerProcessGroupId(): number | null {
 }
 
 export function getCurrentSimPath() {
-  if (process.env[CURRENT_SIM_PATH_ENV]) {
-    return resolve(process.env[CURRENT_SIM_PATH_ENV])
+  const envPath =
+    process.env[CURRENT_SIM_PATH_ENV] || process.env[LEGACY_CURRENT_SIM_PATH_ENV]
+  if (envPath) {
+    return resolve(envPath)
   }
   const key = getCliIdentityKey()
   return join(tmpdir(), `peach-current-sim-${key}.json`)

package/cli/desktop-companion.ts

@@ -1,10 +1,11 @@
 import { execFileSync, spawn } from 'child_process'
-import { existsSync, readdirSync } from 'fs'
+import { existsSync, mkdirSync, writeFileSync } from 'fs'
 import { dirname, join, resolve } from 'path'
 import { fileURLToPath } from 'url'
 import { activeDesktopHostApp, isNativeHostBundle } from '../src/desktop-host-delivery'
+import { rnxHomeDir } from '../src/home-paths'
 
-// resolved lazily — sootsim-engine is a workspace package in dev, but absent
+// resolved lazily: peach-engine is a workspace package in dev, but absent
 // from the published npm tarball. don't crash module load just because the
 // engine package isn't installed; commands that don't need the dev-electron
 // path (most of them) shouldn't care.
@@ -20,19 +21,11 @@ function getSootsimRoot(): string | null {
   }
   return _sootsimRoot
 }
-const PEACH_BUNDLE_ID = 'dev.peachsim.simulator'
 
 export interface DesktopCompanionInstall {
   path: string
   platform: NodeJS.Platform
-  kind:
-    | 'native-mac-app'
-    | 'native-linux-app'
-    | 'mac-app'
-    | 'linux-appimage'
-    | 'linux-binary'
-    | 'win-exe'
-    | 'dev-electron'
+  kind: 'native-mac-app' | 'native-linux-app' | 'win-exe' | 'dev-electron'
   // present for dev-electron: the sootsim-engine dir that electron treats
   // as the app root (its package.json "main" points at dist-electron/main.cjs).
   engineDir?: string
@@ -40,14 +33,7 @@ export interface DesktopCompanionInstall {
 
 export interface DesktopCompanionLaunchResult {
   launched: boolean
-  via?:
-    | 'native-mac-app'
-    | 'native-linux-app'
-    | 'mac-app'
-    | 'linux-appimage'
-    | 'linux-binary'
-    | 'win-exe'
-    | 'dev-electron'
+  via?: 'native-mac-app' | 'native-linux-app' | 'win-exe' | 'dev-electron'
   target?: string
 }
 
@@ -84,8 +70,7 @@ function findDevElectron(): DesktopCompanionInstall | null {
 
 // detect whether the sootsim-engine we resolved is the in-repo workspace
 // checkout (has src-electron/main.ts) vs something pulled in as a dep.
-// this matters because repo development has one supported path: dev electron
-// against the live :5173 renderer.
+// Windows development uses Electron against the live renderer.
 function isInRepoCheckout(): boolean {
   const root = getSootsimRoot()
   if (!root) return false
@@ -95,7 +80,7 @@ function isInRepoCheckout(): boolean {
 function findElectronBin(startDir: string): string | null {
   let dir = startDir
   for (let i = 0; i < 6; i++) {
-    const candidate = join(dir, 'node_modules/.bin/electron')
+    const candidate = join(dir, 'node_modules/electron/dist/electron.exe')
     if (existsSync(candidate)) return candidate
     const parent = dirname(dir)
     if (parent === dir) break
@@ -104,120 +89,38 @@ function findElectronBin(startDir: string): string | null {
   return null
 }
 
-function findInstalledMacApp(): DesktopCompanionInstall | null {
-  const candidates = [
-    '/Applications/peach.app',
-    resolve(process.env.HOME || '', 'Applications/peach.app'),
-  ]
-
-  // the native host's /Applications/Peach.app is the same path on a
-  // case-insensitive disk
-  const found = candidates.find(
-    (candidate) => existsSync(candidate) && !isNativeHostBundle(candidate),
-  )
-  if (found) {
-    return {
-      path: found,
-      platform: 'darwin',
-      kind: 'mac-app',
-    }
-  }
-
-  return null
-}
-
-function findMacApp(): DesktopCompanionInstall | null {
-  const installed = findInstalledMacApp()
-  if (installed) return installed
-  const root = getSootsimRoot()
-  const builtApp = root ? resolve(root, 'app/peach.app') : null
-  if (builtApp && existsSync(builtApp)) {
-    return { path: builtApp, platform: 'darwin', kind: 'mac-app' }
-  }
-
-  try {
-    // runner-toolchain-platform: darwin
-    const result = execFileSync(
-      'mdfind',
-      [`kMDItemCFBundleIdentifier == "${PEACH_BUNDLE_ID}"`],
-      { encoding: 'utf8', timeout: 3000 },
-    ).trim()
-    if (result) {
-      return {
-        path: result.split('\n')[0],
-        platform: 'darwin',
-        kind: 'mac-app',
-      }
-    }
-  } catch {}
-
-  return null
-}
-
 export function findInstalledDesktopCompanion(): DesktopCompanionInstall | null {
-  if (process.platform === 'darwin') return findInstalledMacApp()
-  if (process.platform === 'linux') return findInstalledLinuxApp()
-  if (process.platform === 'win32') return findWindowsInstall()
-  return null
+  return process.platform === 'win32'
+    ? findWindowsInstall()
+    : findNativeDesktopCompanion()
 }
 
-function findFirstAppImage(dir: string): string | null {
-  if (!existsSync(dir)) return null
-  const match = readdirSync(dir)
-    .filter((entry) => entry.startsWith('peach') && entry.endsWith('.AppImage'))
-    .sort()
-    .reverse()[0]
-  return match ? join(dir, match) : null
-}
-
-function findInstalledLinuxApp(): DesktopCompanionInstall | null {
-  const directCandidates = [
-    resolve(process.env.HOME || '', 'Applications/peach.AppImage'),
-    resolve(process.env.HOME || '', '.local/bin/peach.AppImage'),
-    '/opt/peach/peach.AppImage',
-    '/opt/peach/peach',
-  ]
-
-  const directMatch = directCandidates.find((candidate) => existsSync(candidate))
-  if (directMatch) {
-    return {
-      path: directMatch,
-      platform: 'linux',
-      kind: directMatch.endsWith('.AppImage') ? 'linux-appimage' : 'linux-binary',
-    }
-  }
-
-  return null
-}
-
-function findLinuxInstall(): DesktopCompanionInstall | null {
-  const installed = findInstalledLinuxApp()
-  if (installed) return installed
-  const root = getSootsimRoot()
-  const directCandidates = root
-    ? [resolve(root, 'app/peach.AppImage'), resolve(root, 'release/linux-unpacked/peach')]
-    : []
-  const directMatch = directCandidates.find((candidate) => existsSync(candidate))
-  if (directMatch) {
-    return {
-      path: directMatch,
-      platform: 'linux',
-      kind: directMatch.endsWith('.AppImage') ? 'linux-appimage' : 'linux-binary',
-    }
-  }
-
-  const scannedMatch = root
-    ? findFirstAppImage(resolve(root, 'app')) ||
-      findFirstAppImage(resolve(root, 'release'))
-    : null
-
-  if (!scannedMatch) return null
-
-  return {
-    path: scannedMatch,
-    platform: 'linux',
-    kind: 'linux-appimage',
+// existing Electron apps stay on disk; CLI users receive the migration once.
+export function notifyDesktopMigration(): void {
+  if (process.platform !== 'darwin' && process.platform !== 'linux') return
+  const legacy =
+    process.platform === 'darwin'
+      ? [
+          '/Applications/peach.app',
+          resolve(process.env.HOME || '', 'Applications/peach.app'),
+        ].some((candidate) => existsSync(candidate) && !isNativeHostBundle(candidate))
+      : ['Applications/peach.AppImage', '.local/bin/peach.AppImage'].some((candidate) =>
+          existsSync(resolve(process.env.HOME || '', candidate)),
+        ) ||
+        existsSync('/opt/peach/peach.AppImage') ||
+        existsSync('/opt/peach/peach')
+  const marker = join(rnxHomeDir(), 'electron-native-migration')
+  if (!legacy || existsSync(marker)) return
+  mkdirSync(rnxHomeDir(), { recursive: true })
+  try {
+    writeFileSync(marker, '', { flag: 'wx' })
+  } catch (error) {
+    if (error instanceof Error && 'code' in error && error.code === 'EEXIST') return
+    throw error
   }
+  console.error(
+    '  Electron has retired on Mac and Linux. Install the native app: peach install-desktop',
+  )
 }
 
 function findWindowsInstall(): DesktopCompanionInstall | null {
@@ -244,14 +147,21 @@ export interface DesktopCompanionOptions {
   native?: boolean
 }
 
-// an explicit PEACH_DESKTOP_APP selects the native host for every launch.
+// Electron is supported only on Windows; Mac and Linux always use native.
 export function wantsNativeDesktop(opts: DesktopCompanionOptions = {}): boolean {
-  return opts.native === true || !!process.env.PEACH_DESKTOP_APP
+  return (
+    process.platform === 'darwin' || process.platform === 'linux' || opts.native === true
+  )
 }
 
 export function getNativeDesktopAppPath(): string | null {
   const explicitApp = process.env.PEACH_DESKTOP_APP
-  if (!explicitApp) return activeDesktopHostApp()
+  if (!explicitApp)
+    return process.platform === 'linux'
+      ? existsSync('/usr/bin/peach-desktop')
+        ? '/usr/bin/peach-desktop'
+        : null
+      : activeDesktopHostApp()
   if (process.platform === 'darwin' && !explicitApp.endsWith('.app'))
     throw new Error('PEACH_DESKTOP_APP must name a Mac .app bundle')
   if (process.platform !== 'darwin' && process.platform !== 'linux')
@@ -279,6 +189,7 @@ export function findDesktopCompanion(
   opts: DesktopCompanionOptions = {},
 ): DesktopCompanionInstall | null {
   if (wantsNativeDesktop(opts)) return findNativeDesktopCompanion()
+  if (process.platform !== 'win32') return null
   const dev = findDevElectron()
   if (dev) return dev
   if (isInRepoCheckout()) {
@@ -288,7 +199,7 @@ export function findDesktopCompanion(
       console.error(
         `  dist-electron/main.cjs missing in ${engineDir}.\n` +
           `  run: bun run --cwd packages/peach-engine build:electron-main\n` +
-          `  (or keep it fresh with: bun run watch:sootsim:electron-main)`,
+          `  (or keep it fresh with: bun run watch:peach:electron-main)`,
       )
     } else {
       console.error(
@@ -297,8 +208,6 @@ export function findDesktopCompanion(
     }
     return null
   }
-  if (process.platform === 'darwin') return findMacApp()
-  if (process.platform === 'linux') return findLinuxInstall()
   if (process.platform === 'win32') return findWindowsInstall()
   return null
 }
@@ -343,6 +252,7 @@ export async function launchDesktopCompanion(
   install = findDesktopCompanion(),
   opts: LaunchCompanionOptions = {},
 ): Promise<DesktopCompanionLaunchResult> {
+  notifyDesktopMigration()
   if (!install) return { launched: false }
 
   // electron argv extra: main.ts reads --device <model> from process.argv
@@ -361,22 +271,18 @@ export async function launchDesktopCompanion(
   if (opts.ephemeralProfile) extraArgs.push('--ephemeral-profile')
   if (opts.ownerPid && opts.ownerPid > 1) extraArgs.push(`--owner-pid=${opts.ownerPid}`)
 
-  if (install.kind === 'mac-app' || install.kind === 'native-mac-app') {
+  if (install.kind === 'native-mac-app') {
     // `open -a` splits app args before and after `--args`. anything after
     // --args is forwarded to electron's process.argv.
-    const nativeApp = install.kind === 'native-mac-app'
     // the personal home screen belongs to launches from Spotlight or the Dock;
     // every CLI launch gets the plain one
-    if (nativeApp) extraArgs.push('--no-personal-home')
+    extraArgs.push('--no-personal-home')
     // a CLI launch builds its windows from its own args: skip appkit's restore of a prior
     // crashed session, whose reopen alert blocks boot, without clearing the saved state
-    if (nativeApp) extraArgs.push('-ApplePersistenceIgnoreState', 'YES')
+    extraArgs.push('-ApplePersistenceIgnoreState', 'YES')
     const openArgs: string[] = ['-g', '-a', install.path]
-    if (url) openArgs.push(buildMacLaunchUrl(url, opts, nativeApp))
-    else if (
-      nativeApp &&
-      (opts.profileId || opts.ephemeralProfile || opts.ownerPid || opts.device)
-    )
+    if (url) openArgs.push(buildMacLaunchUrl(url, opts, true))
+    else if (opts.profileId || opts.ephemeralProfile || opts.ownerPid || opts.device)
       openArgs.push(buildMacLaunchUrl(undefined, opts, true))
     if (extraArgs.length > 0) openArgs.push('--args', ...extraArgs)
     await spawnDetached('open', openArgs)
@@ -419,8 +325,8 @@ function buildMacLaunchUrl(
     (!nativeApp || !opts.device)
   )
     return url || ''
-  const deepLink = new URL('peach://dev')
-  if (url) deepLink.searchParams.set('url', url)
+  const deepLink = new URL(url?.startsWith('peach://') ? url : 'peach://dev')
+  if (url && !url.startsWith('peach://')) deepLink.searchParams.set('url', url)
   if (nativeApp && opts.device) deepLink.searchParams.set('device', opts.device)
   if (opts.profileId) deepLink.searchParams.set('profile', opts.profileId)
   if (opts.ephemeralProfile) deepLink.searchParams.set('ephemeral', '1')

package/cli/dev-build-freshness.ts

@@ -2,7 +2,7 @@
 //
 // inside the Contrast monorepo checkout serve() serves public/sootsim — the
 // dev-stack engine build — directly (see resolveDevCheckoutRuntimeRoot).
-// without the dev watch running (bun dev's watch:sootsim) that build goes
+// without the dev watch running (bun dev's watch:peach) that build goes
 // stale the moment an engine/shell source is edited, and serve() would hand
 // sims the old bundle with no complaint. this module compares source and
 // artifact mtimes per build route and reports which routes are stale, so
@@ -20,7 +20,7 @@
 import { readdirSync, statSync, type Dirent } from 'node:fs'
 import { join, relative, sep } from 'node:path'
 
-export const DEV_BUILD_REBUILD_COMMAND = 'bun run build:sootsim'
+export const DEV_BUILD_REBUILD_COMMAND = 'bun run build:peach'
 
 export type DevBuildRouteId = 'shell' | 'engine' | 'tenant'
 

package/cli/drivers/desktop.ts

@@ -1,8 +1,11 @@
-// desktop drivers: `desktop` launches the native host, `electron` the
-// Electron companion. both wrap the desktop-companion helpers, which already
-// handle mac `open -a`, linux AppImage and the --device seed.
+// desktop driver selection is shared with companion discovery.
 
-import { findDesktopCompanion, launchDesktopCompanion } from '../desktop-companion'
+import {
+  findDesktopCompanion,
+  launchDesktopCompanion,
+  wantsNativeDesktop,
+  notifyDesktopMigration,
+} from '../desktop-companion'
 import type {
   Driver,
   DriverAvailability,
@@ -11,8 +14,8 @@ import type {
 } from './types'
 
 export function createDesktopDriver(id: 'desktop' | 'electron'): Driver {
-  const native = id === 'desktop'
-  const missing = `peach ${id} app not installed (run \`peach desktop install${native ? ' --native' : ''}\`)`
+  const native = wantsNativeDesktop({ native: id === 'desktop' })
+  const missing = `peach ${id} app not installed (run \`peach desktop install${native ? '' : ' --electron'}\`)`
   function probe(): DriverAvailability {
     const install = findDesktopCompanion({ native })
     if (!install) return { available: false, reason: missing }
@@ -25,6 +28,11 @@ export function createDesktopDriver(id: 'desktop' | 'electron'): Driver {
 
   async function launch(opts: DriverLaunchOptions): Promise<DriverLaunchResult> {
     try {
+      notifyDesktopMigration()
+      if (id === 'electron' && native)
+        console.error(
+          '  Electron is Windows-only; using the native desktop app (peach install-desktop).',
+        )
       const install = findDesktopCompanion({ native })
       if (!install) return { launched: false, message: missing }
       const result = await launchDesktopCompanion(opts.url, install, {
@@ -38,7 +46,7 @@ export function createDesktopDriver(id: 'desktop' | 'electron'): Driver {
       }
       return {
         launched: true,
-        message: `${install.kind === 'native-mac-app' ? 'native desktop' : 'electron'} launched via ${result.via}${opts.url ? ` → ${opts.url}` : ''}`,
+        message: `${native ? 'native desktop' : 'electron'} launched via ${result.via}${opts.url ? ` → ${opts.url}` : ''}`,
         target: result.target,
         attachUrl: opts.url,
       }
@@ -54,8 +62,8 @@ export function createDesktopDriver(id: 'desktop' | 'electron'): Driver {
     id,
     name: id,
     description: native
-      ? 'native desktop host (macOS arm64; native window, menu bar)'
-      : 'peach desktop companion app (Electron; native window, menu bar)',
+      ? 'native desktop host (macOS arm64 and Linux x64)'
+      : 'peach desktop companion app (Electron; Windows only)',
     kind: 'native',
     availability: probe,
     launch,

package/cli/drivers/electron.ts

@@ -1,5 +1,4 @@
-// electron driver: the Electron desktop companion, until the native host
-// (the `desktop` driver) replaces it.
+// Electron is Windows-only; other desktop platforms launch the native host.
 
 import { createDesktopDriver } from './desktop'
 

package/cli/drivers/playwright-sim-host.ts

@@ -104,10 +104,11 @@ const viewport = viewportSpec
 const deviceScaleFactor = Number(process.env.SOOTSIM_PW_DSF || 2);
 const closeTimeoutMs = Number(process.env.SOOTSIM_PW_CLOSE_TIMEOUT_MS || 2500);
 const connectAckFile = process.env.SOOTSIM_PW_CONNECTED_ACK_FILE || '';
+const completionFile = process.env.PEACH_PW_COMPLETION_FILE || '';
 const disposableBrowserCacheDirs = new Set(${JSON.stringify(
   DISPOSABLE_BROWSER_CACHE_DIR_NAMES,
 )});
-const { existsSync, mkdtempSync, readdirSync, rmSync, unlinkSync } = require('fs');
+const { existsSync, mkdtempSync, readdirSync, rmSync, unlinkSync, writeFileSync } = require('fs');
 const { execSync, spawn } = require('child_process');
 const { tmpdir } = require('os');
 const { join } = require('path');
@@ -363,10 +364,17 @@ const cleanupProfile = () => {
   process.once('SIGINT', () => { void shutdown(0); });
   // the launch-failure path at the bottom of this script exits without going
   // through shutdown(); the exit hook (sync sweep) still reaps the tree.
-  process.on('exit', () => {
+  process.on('exit', (code) => {
     if (desktopHost && desktopHost.exitCode === null) desktopHost.kill('SIGKILL');
     reapChrome();
     cleanupProfile();
+    if (completionFile) {
+      try {
+        writeFileSync(completionFile, JSON.stringify({ code, pid: process.pid, completedAt: Date.now() }) + '\\n');
+      } catch (error) {
+        process.stderr.write('[completion-error] ' + String(error) + '\\n');
+      }
+    }
   });
   // owner-liveness watchdog — the load-bearing fix for leaked Chrome hosts.
   // we are spawned detached + unref'd so \`peach open\` returns immediately,
@@ -651,6 +659,7 @@ const cleanupProfile = () => {
   page.on('console', (m) => {
     if (m.type() === 'error') {
       process.stderr.write('[console.error] ' + m.text() + '\\n');
+      if (hostCommand && m.text().includes('[compositor] worker lost:')) void shutdown(1);
     }
   });
   // a crashed renderer never runs the page's bridge close path, so nothing