peachsim 0.1.939 → 0.1.1399

package/cli/commands/install-cli.ts

@@ -6,8 +6,10 @@
 
 import { spawnSync } from 'node:child_process'
 import {
+  accessSync,
   appendFileSync,
   chmodSync,
+  constants,
   copyFileSync,
   existsSync,
   mkdirSync,
@@ -161,25 +163,44 @@ function installCommandPath(target: string): string | null {
   const home = process.env.HOME || homedir()
   const shell = process.env.SHELL || ''
   const shellName = shell.endsWith('/zsh') ? 'zsh' : shell.endsWith('/bash') ? 'bash' : ''
-  const profile = join(
-    home,
-    shellName === 'zsh' ? '.zshrc' : shellName === 'bash' ? '.bashrc' : '.profile',
-  )
+  const profiles = [
+    join(
+      home,
+      shellName === 'zsh' ? '.zshrc' : shellName === 'bash' ? '.bashrc' : '.profile',
+    ),
+  ]
+  if (shellName === 'bash') {
+    let loginProfile = join(home, '.profile')
+    // bash login shells read only the first readable profile in this order.
+    for (const name of ['.bash_profile', '.bash_login']) {
+      const candidate = join(home, name)
+      try {
+        accessSync(candidate, constants.R_OK)
+        loginProfile = candidate
+        break
+      } catch {}
+    }
+    profiles.push(loginProfile)
+  }
   const bin = dirname(target)
   const pathLine = `export PATH="${bin}:$PATH"`
   const integration = shellName ? `eval "$(command peach __shell-init ${shellName})"` : ''
-  const current = existsSync(profile) ? readFileSync(profile, 'utf8') : ''
-  if (current.includes(pathLine) && (!integration || current.includes(integration)))
-    return null
+  const updatedProfiles: string[] = []
+  for (const profile of profiles) {
+    const current = existsSync(profile) ? readFileSync(profile, 'utf8') : ''
+    if (current.includes(pathLine) && (!integration || current.includes(integration)))
+      continue
 
-  const additions = [
-    '',
-    '# added by the peach installer; delete this block to remove peach from your shell',
-    ...(current.includes(pathLine) ? [] : [pathLine]),
-    ...(integration && !current.includes(integration) ? [integration] : []),
-  ]
-  appendFileSync(profile, `${additions.join('\n')}\n`)
-  return profile
+    const additions = [
+      '',
+      '# added by the peach installer; delete this block to remove peach from your shell',
+      ...(current.includes(pathLine) ? [] : [pathLine]),
+      ...(integration && !current.includes(integration) ? [integration] : []),
+    ]
+    appendFileSync(profile, `${additions.join('\n')}\n`)
+    updatedProfiles.push(profile)
+  }
+  return updatedProfiles.length ? updatedProfiles.join(', ') : null
 }
 
 async function handOffDaemon({

package/cli/commands/install-desktop.ts

@@ -1,53 +1,30 @@
-// peach desktop install — download and install the optional desktop GUI
-//
-// the CLI + daemon are the canonical peach surface; this command is only
-// for users who want a GUI companion on top of that.
-//
-// --native installs the native desktop host at /Applications/Peach.app on
-// macOS, or the standalone headless host that `peach open --headless` attaches
-// on Linux x64, verified and cached by version under ~/.peach/desktop/versions/<version>/
-// through the same delivery `peach runtime install` uses (src/desktop-host-delivery.ts).
-//
-// otherwise it installs the Electron companion: it
-// fetches the right platform artifact from https://contrast.dev/api/electron-release/
-// and installs it into the OS-native location that findInstalledDesktopCompanion() looks for:
-//   macos: /Applications/peach.app when writable and free of the native host,
-//          else ~/Applications/peach.app
-//   linux: ~/Applications/peach.AppImage
-//   win:   spawns the NSIS installer
-//
-// post-install the electron-updater feed (same URL) handles upgrades inside the
-// running app, so this command is a first-install bootstrap, not an update path.
+// install the native Mac app or Linux GTK package; --native on Linux acquires
+// the standalone headless host for CI. Electron installs only on Windows.
 
-import { spawn, spawnSync } from 'child_process'
-import {
-  chmodSync,
-  copyFileSync,
-  createWriteStream,
-  existsSync,
-  mkdirSync,
-  rmSync,
-  statSync,
-  unlinkSync,
-} from 'fs'
+import { spawn } from 'child_process'
+import { createWriteStream, existsSync, mkdirSync, rmSync, statSync } from 'fs'
 import { tmpdir } from 'os'
-import { basename, dirname, join, resolve } from 'path'
+import { dirname, join } from 'path'
 import {
   DESKTOP_HOST_CHANNELS,
   desktopHostDelivery,
   desktopHostPlatform,
-  isNativeHostBundle,
   MAC_HOST_APP,
+  registerNativeDesktopLinks,
+  uninstallNativeDesktopHost,
 } from '../../src/desktop-host-delivery'
 import { desktopHostDir } from '../../src/home-paths'
-import { findInstalledDesktopCompanion } from '../desktop-companion'
+import {
+  findInstalledDesktopCompanion,
+  notifyDesktopMigration,
+} from '../desktop-companion'
 import { confirm } from '../prompt'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { accent, bold, failure, muted, success, withSpinner } from '../ui'
 
 const DOWNLOAD_BASE = 'https://contrast.dev/api/electron-release'
 
-type TargetPlatform = 'mac-arm64' | 'mac-x64' | 'win-x64' | 'linux-x64' | 'linux-arm64'
+type TargetPlatform = 'win-x64' | 'linux-x64'
 
 interface Target {
   platform: TargetPlatform
@@ -57,30 +34,12 @@ interface Target {
 }
 
 function detectTarget(): Target | null {
-  const arch = process.arch
-  if (process.platform === 'darwin') {
-    const platform: TargetPlatform = arch === 'arm64' ? 'mac-arm64' : 'mac-x64'
-    const filename = `peach-latest-${platform}.dmg`
+  if (process.platform === 'linux' && process.arch === 'x64') {
     return {
-      platform,
-      filename,
-      url: `${DOWNLOAD_BASE}/${filename}`,
-      install: installMacDmg,
-    }
-  }
-  if (process.platform === 'linux') {
-    // ship arch-appropriate AppImages. on Apple Silicon Macs (the default
-    // host for orb/multipass VMs) the linux VM is arm64, so the x64
-    // AppImage fails at runtime with "Dynamic loader not found:
-    // /lib64/ld-linux-x86-64.so.2". detect the running arch and pick the
-    // matching artifact.
-    const platform: TargetPlatform = arch === 'arm64' ? 'linux-arm64' : 'linux-x64'
-    const filename = `peach-latest-${platform}.AppImage`
-    return {
-      platform,
-      filename,
-      url: `${DOWNLOAD_BASE}/${filename}`,
-      install: installLinuxAppImage,
+      platform: 'linux-x64',
+      filename: 'PeachDesktop-linux-x64.deb',
+      url: 'https://contrast.dev/api/native-release/linux-x64',
+      install: installLinuxDeb,
     }
   }
   if (process.platform === 'win32') {
@@ -143,122 +102,24 @@ function renderProgress(received: number, total: number | null): string {
   return `  ${bar} ${pct}%  ${mb} / ${totalMb} MB`
 }
 
-async function installMacDmg(dmgPath: string): Promise<string> {
-  const mountOutput = spawnSync(
-    'hdiutil',
-    ['attach', '-nobrowse', '-readonly', dmgPath],
-    {
-      encoding: 'utf8',
-    },
-  )
-  if (mountOutput.status !== 0) {
-    throw new Error(
-      `hdiutil attach failed: ${mountOutput.stderr || mountOutput.stdout}`.trim(),
-    )
-  }
-  const mountLines = mountOutput.stdout.trim().split('\n')
-  const mountLine = mountLines[mountLines.length - 1]
-  const mountPoint = mountLine.split('\t').pop()?.trim()
-  if (!mountPoint || !existsSync(mountPoint)) {
-    throw new Error(`could not determine dmg mount point (output: ${mountOutput.stdout})`)
-  }
-
-  const appSource = join(mountPoint, 'peach.app')
-  if (!existsSync(appSource)) {
-    spawnSync('hdiutil', ['detach', '-force', mountPoint])
-    throw new Error(`peach.app not found inside ${mountPoint}`)
-  }
-
-  // prefer /Applications if writable, otherwise ~/Applications (same paths
-  // findInstalledDesktopCompanion checks, so no extra config needed post-install).
-  const systemApps = '/Applications'
-  const userApps = resolve(process.env.HOME || '', 'Applications')
-  let destRoot = systemApps
-  try {
-    const probe = join(systemApps, `.peach-write-probe-${process.pid}`)
-    spawnSync('touch', [probe])
-    if (existsSync(probe)) rmSync(probe, { force: true })
-    else destRoot = userApps
-  } catch {
-    destRoot = userApps
-  }
-  // the native host owns /Applications/Peach.app, the same path on a
-  // case-insensitive disk, so Electron goes beside the user's apps then
-  if (isNativeHostBundle(join(systemApps, 'peach.app'))) destRoot = userApps
-  if (destRoot === userApps) {
-    mkdirSync(destRoot, { recursive: true })
-  }
-
-  const appDest = join(destRoot, 'peach.app')
-
-  // copy alongside the destination and swap, rather than deleting the installed
-  // app first. removing it up front means a failed copy leaves the user with no
-  // app at all, having destroyed a working install to do it. the staging path is
-  // in the same directory so the swap is a rename on one volume.
-  const staging = join(
-    destRoot,
-    `.${basename(appDest, '.app')}-incoming-${process.pid}.app`,
-  )
-  rmSync(staging, { recursive: true, force: true })
-
-  const copy = spawnSync('cp', ['-R', appSource, staging])
-  if (copy.status !== 0) {
-    spawnSync('hdiutil', ['detach', '-force', mountPoint])
-    rmSync(staging, { recursive: true, force: true })
-    throw new Error(`copy to ${destRoot} failed: ${copy.stderr?.toString() || ''}`.trim())
-  }
-  const detach = spawnSync('hdiutil', ['detach', '-force', mountPoint])
-
-  const previous = join(
-    destRoot,
-    `.${basename(appDest, '.app')}-previous-${process.pid}.app`,
-  )
-  if (existsSync(appDest)) {
-    const park = spawnSync('mv', [appDest, previous])
-    if (park.status !== 0) {
-      rmSync(staging, { recursive: true, force: true })
-      throw new Error(
-        `could not replace ${appDest}: ${park.stderr?.toString() || ''}`.trim(),
-      )
-    }
-  }
-  const swap = spawnSync('mv', [staging, appDest])
-  if (swap.status !== 0) {
-    // put the working install back before reporting failure
-    if (existsSync(previous)) spawnSync('mv', [previous, appDest])
-    rmSync(staging, { recursive: true, force: true })
-    throw new Error(
-      `could not move into ${appDest}: ${swap.stderr?.toString() || ''}`.trim(),
-    )
-  }
-  rmSync(previous, { recursive: true, force: true })
-
-  if (detach.status !== 0) {
-    console.warn(
-      `  warning: failed to unmount ${mountPoint} (${detach.stderr?.toString().trim() || 'unknown error'})`,
+async function installLinuxDeb(packagePath: string): Promise<string> {
+  await new Promise<void>((resolvePromise, rejectPromise) => {
+    const command = process.getuid?.() === 0 ? 'apt-get' : 'sudo'
+    const args =
+      command === 'sudo'
+        ? ['apt-get', 'install', '-y', packagePath]
+        : ['install', '-y', packagePath]
+    const child = spawn(command, args, { stdio: 'inherit' })
+    child.once('error', rejectPromise)
+    child.once('exit', (code) =>
+      code === 0
+        ? resolvePromise()
+        : rejectPromise(new Error(`package install exited with code ${code}`)),
     )
-  }
-
-  // clear the quarantine attribute so gatekeeper doesn't nag on first launch;
-  // the app is already notarized so this is safe.
-  spawnSync('xattr', ['-dr', 'com.apple.quarantine', appDest])
-
-  return appDest
-}
-
-async function installLinuxAppImage(appImagePath: string): Promise<string> {
-  const destDir = resolve(process.env.HOME || '', 'Applications')
-  mkdirSync(destDir, { recursive: true })
-  const dest = join(destDir, 'peach.AppImage')
-  if (existsSync(dest)) rmSync(dest, { force: true })
-  // copyFile + unlink instead of rename: /tmp and ~/Applications are
-  // routinely on separate mounts in containers / VMs, where renameSync
-  // fails EXDEV. copy is portable across mounts and the unlink at the
-  // end keeps the staging dir clean.
-  copyFileSync(appImagePath, dest)
-  unlinkSync(appImagePath)
-  chmodSync(dest, 0o755)
-  return dest
+  })
+  if (!existsSync('/usr/bin/peach-desktop'))
+    throw new Error('native desktop launcher missing after package install')
+  return '/usr/bin/peach-desktop'
 }
 
 async function installWindowsExe(exePath: string): Promise<string> {
@@ -286,7 +147,7 @@ export async function runInstallDesktop(args: string[]) {
 peach desktop install
 
 Download and install the optional peach Desktop app.
-The CLI works without it. Choose Desktop when you want a dedicated native window.
+The CLI works without it. Mac and Linux install the native app; Windows installs Electron.
 
 usage:
   peach desktop install [options]
@@ -295,6 +156,7 @@ usage:
 options:
   -y, --yes            skip confirmation and install immediately
   --force              reinstall even if the companion is already present
+  --electron           install Electron on Windows; native app on Mac and Linux
   --native             install the native desktop host: /Applications/Peach.app
                        on macOS arm64, the headless host on Linux x64
   --channel <name>     with --native: production (default) or staging
@@ -309,7 +171,7 @@ examples:
   peach desktop install --native
   peach desktop install --native --channel staging
 `)
-    rnxExit(0)
+    peachExit(0)
   }
 
   const skipConfirm =
@@ -319,7 +181,14 @@ examples:
     process.env.CI === '1' ||
     !process.stdin.isTTY
   const force = args.includes('--force')
-  if (args.includes('--native')) {
+  if (args.includes('--native') && args.includes('--electron')) {
+    console.error('  --native cannot be combined with --electron')
+    peachExit(1)
+  }
+  notifyDesktopMigration()
+  if (args.includes('--electron') && process.platform !== 'win32')
+    console.error('  Electron is Windows-only; installing the native desktop app.')
+  if (args.includes('--native') || process.platform === 'darwin') {
     await installNativeHost(args, force)
     return
   }
@@ -336,10 +205,8 @@ examples:
     console.error(
       `  ${failure('×')} No desktop build is available for ${process.platform}/${process.arch}.`,
     )
-    console.error(
-      '  Supported: darwin-arm64, darwin-x64, linux-x64, linux-arm64, win32-x64',
-    )
-    rnxExit(1)
+    console.error('  Supported: darwin-arm64, linux-x64, win32-x64')
+    peachExit(1)
   }
 
   console.log(`  ${bold('Desktop app')}`)
@@ -388,7 +255,7 @@ examples:
     console.error(
       '  The CLI and daemon work without the desktop app. Run `peach --help`.',
     )
-    rnxExit(1)
+    peachExit(1)
   }
 
   if (process.stdout.isTTY) process.stdout.write('\n')
@@ -406,16 +273,8 @@ examples:
     console.error(
       `  ${failure('×')} Install failed: ${err instanceof Error ? err.message : String(err)}`,
     )
-    // the download is good, only placing the app failed. on macOS the disk
-    // image installs itself perfectly well by hand, so open it and let the user
-    // drag rather than leaving them at a dead end. keep workDir for that.
-    if (process.platform === 'darwin') {
-      spawnSync('open', [downloadPath])
-      console.error(`  Opened ${target.filename} — drag peach to Applications to finish.`)
-    } else {
-      console.error(`  Keeping the download at ${downloadPath} for manual installation.`)
-    }
-    rnxExit(1)
+    console.error(`  Keeping the download at ${downloadPath} for manual installation.`)
+    peachExit(1)
   }
 
   console.log()
@@ -429,7 +288,7 @@ async function installNativeHost(args: string[], force: boolean): Promise<void>
   const channel = channelIndex >= 0 ? args[channelIndex + 1] : undefined
   if (channelIndex >= 0 && !channel) {
     console.error(`  --channel needs ${DESKTOP_HOST_CHANNELS.join(' or ')}`)
-    rnxExit(1)
+    peachExit(1)
   }
   const version = args.find(
     (arg, i) => !arg.startsWith('-') && args[i - 1] !== '--channel' && arg !== 'install',
@@ -447,6 +306,8 @@ async function installNativeHost(args: string[], force: boolean): Promise<void>
           quiet: true,
         }),
     )
+    if (resolvedChannel === 'production' && !args.includes('--native'))
+      registerNativeDesktopLinks()
     const location =
       desktopHostPlatform() === 'linux-x64'
         ? desktopHostDir(result.version)
@@ -458,7 +319,7 @@ async function installNativeHost(args: string[], force: boolean): Promise<void>
     console.error(
       `  ${failure('×')} Native desktop install failed: ${err instanceof Error ? err.message : String(err)}`,
     )
-    rnxExit(1)
+    peachExit(1)
   }
   console.log()
   console.log(`  ${bold('Ready')}`)
@@ -466,6 +327,18 @@ async function installNativeHost(args: string[], force: boolean): Promise<void>
     console.log('  peach open <target> --headless        Render it through the host')
     return
   }
-  console.log('  peach desktop --native                Launch the native desktop host')
+  console.log('  peach desktop                         Launch the native desktop host')
   console.log('  peach open <target> --driver desktop  Open a demo or bundle in it')
 }
+
+export async function runUninstallDesktop(args: string[]): Promise<void> {
+  if (args.some((arg) => arg !== '--native')) {
+    throw new Error(
+      'desktop uninstall removes the native host; Electron remains installed',
+    )
+  }
+  if (!desktopHostPlatform())
+    throw new Error('no native desktop host ships on this platform')
+  uninstallNativeDesktopHost()
+  console.log('  Native desktop host uninstalled.')
+}

package/cli/commands/kotlin.ts

@@ -11,7 +11,11 @@ import {
 } from '../../src/kotlin-app'
 import { PeachExit } from '../run-rnx'
 import { runOpenCommand, type OpenCommandResources } from './control'
-import { closeGuestResources, isLoopbackGuestRequest } from './guest-host'
+import {
+  closeGuestResources,
+  isLoopbackGuestRequest,
+  waitForGuestCompletion,
+} from './guest-host'
 
 const GUEST_PATH = '/__peach/kotlin-guest.js'
 const HMR_PATH = '/__peach/kotlin-hmr'
@@ -182,10 +186,7 @@ export async function runKotlin(
       signal: controller.signal,
       ownerPid: process.pid,
     })
-    await new Promise<void>((resolve) => {
-      if (controller.signal.aborted) resolve()
-      else controller.signal.addEventListener('abort', () => resolve(), { once: true })
-    })
+    code = await waitForGuestCompletion(resources, controller.signal, 'Kotlin app')
   } catch (error) {
     if (!controller.signal.aborted) {
       console.error(

package/cli/commands/login.ts

@@ -11,7 +11,7 @@ import { isLoopbackHost } from '../../src/backend-origin'
 import { rnxPublicBrand } from '../../src/public-brand'
 import { openUrl } from '../open-url'
 import { extractStringFlag } from '../parse-args'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 
 const REMOTE_DEFAULT_ORIGIN = process.env.PEACH_AUTH_ORIGIN || 'https://contrast.dev'
 
@@ -61,7 +61,7 @@ async function chooseAccount(
         `  no account named ${JSON.stringify(requested)}. your accounts:\n` +
           accounts.map((account) => `    ${account.name} (${account.id})`).join('\n'),
       )
-      rnxExit(1)
+      peachExit(1)
     }
     return match
   }
@@ -71,7 +71,7 @@ async function chooseAccount(
       '  this sign-in belongs to several accounts; rerun with --account <name> to choose the one to bill:\n' +
         accounts.map((account) => `    ${account.name} (${account.id})`).join('\n'),
     )
-    rnxExit(1)
+    peachExit(1)
   }
   console.log('  which account should remote simulators and boxes bill to?')
   accounts.forEach((account, index) => console.log(`    ${index + 1}. ${account.name}`))
@@ -186,7 +186,7 @@ function isLocalOrigin(origin: string): boolean {
 export async function runLogin(args: string[]) {
   if (args.includes('--help') || args.includes('-h')) {
     printHelp()
-    rnxExit(0)
+    peachExit(0)
   }
 
   const mutableArgs = [...args]
@@ -317,7 +317,7 @@ export async function runLogin(args: string[]) {
 
   if (!result.ok) {
     console.error(`  login failed: ${result.error}`)
-    rnxExit(1)
+    peachExit(1)
   }
 
   writeSharedDesktopAuthSession({