peachsim 0.1.940 → 0.1.1400

package/cli/cloud-test-tunnel.ts

@@ -110,7 +110,7 @@ export function startCloudTestTokenProxy(
   upstreamPort: number,
   sidecarPorts: readonly number[],
   token: string,
-): Promise<{ close: () => void } | null> {
+): Promise<{ port: number; close: () => void } | null> {
   const server = createServer((req, res) => {
     const auth = req.headers.authorization || ''
     if (auth !== `Bearer ${token}`) {
@@ -177,7 +177,11 @@ export function startCloudTestTokenProxy(
   return new Promise((resolve) => {
     server.on('error', () => resolve(null))
     server.listen(listenPort, '127.0.0.1', () => {
-      resolve({ close: () => server.close() })
+      const address = server.address()
+      if (!address || typeof address !== 'object') {
+        throw new Error('token proxy has no listening address')
+      }
+      resolve({ port: address.port, close: () => server.close() })
     })
   })
 }
@@ -187,7 +191,7 @@ function cloudflaredAvailable(): boolean {
   return probe.status === 0
 }
 
-async function ensureCloudflared(): Promise<boolean> {
+export async function ensureCloudflared(): Promise<boolean> {
   if (cloudflaredAvailable()) return true
   const archMap: Record<string, string> = { x64: 'amd64', arm64: 'arm64' }
   const arch = archMap[process.arch]
@@ -232,7 +236,7 @@ function childAlive(child: ChildProcess): boolean {
   return child.exitCode === null && child.signalCode === null
 }
 
-async function launchQuickTunnel(
+export async function launchQuickTunnel(
   originUrl: string,
   hostHeader: string,
   logFile: string,
@@ -297,23 +301,13 @@ export async function publishLiveDevStack(args: {
 }): Promise<PublishedLiveDevStack> {
   const { devPort, sidecarPorts } = args
   const jobToken = randomBytes(16).toString('hex')
-  // free loopback port for the token proxy; the advertised authority stays
+  // let the token proxy own its port; the advertised authority stays
   // the dev server's own port so Metro URLs resolve on the recorder.
-  const { Server } = await import('node:net')
-  const proxyPort = await new Promise<number>((resolve, reject) => {
-    const probe = new Server()
-    probe.once('error', reject)
-    probe.listen(0, '127.0.0.1', () => {
-      const address = probe.address()
-      const port = address && typeof address === 'object' ? address.port : 0
-      probe.close(() => resolve(port))
-    })
-  })
-  if (!proxyPort) throw new Error('could not allocate a tunnel proxy port')
-  const proxy = await startCloudTestTokenProxy(proxyPort, devPort, sidecarPorts, jobToken)
+  const proxy = await startCloudTestTokenProxy(0, devPort, sidecarPorts, jobToken)
   if (!proxy) {
-    throw new Error(`could not start the tunnel token proxy on 127.0.0.1:${proxyPort}`)
+    throw new Error('could not start the tunnel token proxy on 127.0.0.1')
   }
+  const proxyPort = proxy.port
   const closeProxy = proxy.close
   const hostHeader = `127.0.0.1:${devPort}`
   if (!(await ensureCloudflared())) {

package/cli/commands/agent.ts

@@ -37,7 +37,7 @@ import type { AgentEvent } from '../../src/agent-events'
 import type { AgentInspectMessage } from '../../src/agent-prompt'
 
 // the bridge this invocation talks to: `-p`, else the same dev-bridge or
-// daemon pick every other command makes (PORT_OFFSET and SOOTSIM_BRIDGE_PORT
+// daemon pick every other command makes (PORT_OFFSET and PEACH_BRIDGE_PORT
 // included).
 let daemonPort = 0
 

package/cli/commands/app-fonts.ts

@@ -15,7 +15,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { gzipSync } from 'node:zlib'
 import { fetchAppFontFiles } from '../app-fonts'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 
 type ManifestEntry = {
   url: string
@@ -41,7 +41,7 @@ async function stage(args: string[]): Promise<void> {
     console.error(
       '  usage: peach app-fonts stage --wire <wire> --out-dir <dir> --manifest <path>',
     )
-    rnxExit(1)
+    peachExit(1)
   }
   if (!wire.trim()) {
     console.log('no app fonts declared — nothing to stage')
@@ -95,5 +95,5 @@ export async function runAppFonts(args: string[]): Promise<void> {
   }
   console.error(`  unknown app-fonts subcommand: ${sub ?? '(none)'}`)
   console.error('  available: stage')
-  rnxExit(1)
+  peachExit(1)
 }

package/cli/commands/assert.ts

@@ -15,7 +15,7 @@
 
 import { spawn } from 'child_process'
 import { sleep } from '../../src/sleep'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { rnxSelfInvocation } from '../self-invocation'
 
 // READ_VERBS lists every command whose stdout we know is valid JSON under
@@ -405,13 +405,13 @@ function runJq(expr: string, payload: unknown): Promise<string> {
 export async function runAssert(rawArgs: string[]): Promise<void> {
   if (rawArgs[0] === '--help' || rawArgs[0] === '-h' || rawArgs.length === 0) {
     printHelp()
-    rnxExit(rawArgs.length === 0 ? 2 : 0)
+    peachExit(rawArgs.length === 0 ? 2 : 0)
   }
 
   const parsed = parseAssertArgs(rawArgs)
   if ('error' in parsed) {
     process.stderr.write(`  assert: ${parsed.error}\n`)
-    rnxExit(2)
+    peachExit(2)
   }
 
   const { verbArgs, predicates, withinMs, negate, quiet, allowTimeout } = parsed
@@ -422,7 +422,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
       `  assert: unknown or non-read verb: ${verbArgs.join(' ')}\n` +
         `  supported: ${Array.from(READ_VERBS).sort().join(', ')}\n`,
     )
-    rnxExit(2)
+    peachExit(2)
   }
 
   // default assertion when none given is --exists. matches the common
@@ -454,7 +454,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
         const label = exitCode === 1 ? 'fail' : 'skip'
         process.stderr.write(`  assert: ${label} — ${lastVerbSkipReason}\n`)
       }
-      rnxExit(exitCode)
+      peachExit(exitCode)
     }
 
     let allPass = true
@@ -470,7 +470,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
       }
     } catch (err: any) {
       if (!quiet) process.stderr.write(`  assert: skip — ${err.message}\n`)
-      rnxExit(125)
+      peachExit(125)
     }
 
     const pass = negate ? !allPass : allPass
@@ -480,7 +480,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
           `  assert: pass${attempts > 1 ? ` (attempt ${attempts})` : ''} — ${reasons.join('; ')}\n`,
         )
       }
-      rnxExit(0)
+      peachExit(0)
     }
 
     lastFailReason = reasons.join('; ')
@@ -493,7 +493,7 @@ export async function runAssert(rawArgs: string[]): Promise<void> {
         `  assert: fail${attempts > 1 ? ` after ${attempts} attempt(s)` : ''} — ${lastFailReason}\n`,
       )
     }
-    rnxExit(1)
+    peachExit(1)
   }
 }
 

package/cli/commands/auth.ts

@@ -3,7 +3,7 @@ import {
   sharedDesktopAuthAccounts,
 } from '../../src/auth/shared-session'
 import { CHOOSE_ACCOUNT_HINT, resolveCliAuth } from '../auth'
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 
 function printHelp(): void {
   console.log(`
@@ -38,7 +38,12 @@ async function printStatus(): Promise<number> {
   }
 
   const current = await refreshSharedDesktopAuthSession(auth.origin)
-  const user = current?.user
+  if (!current) {
+    console.log('  not signed in')
+    console.log('  run `peach login` to sign in again')
+    return 1
+  }
+  const user = current.user
   const accounts = sharedDesktopAuthAccounts(user)
   const accountId = current?.accountId ?? auth.accountId
   const account = accounts.find((candidate) => candidate.id === accountId)
@@ -67,5 +72,5 @@ export async function runAuth(args: string[]): Promise<void> {
 
   console.error(`  unknown auth command: ${sub}`)
   printHelp()
-  rnxExit(1)
+  peachExit(1)
 }

package/cli/commands/box/bundle-plane.ts

@@ -10,21 +10,33 @@
 
 import {
   PREBUILT_BUNDLE_DEVICE_PATH,
+  PREBUILT_BUNDLE_NATIVE_RENDERER_PATH,
   prebuiltAppFontsPartPath,
   PREBUILT_BUNDLE_PART_BYTES,
   prebuiltBundlePartPath,
 } from '@peach/box/template'
+import type { NativeRenderer } from '../../../src/config'
 import type { ProjectFileMeta, ProjectFilePlane } from '@peach/box/plane'
 
 export class BundleFilePlane implements ProjectFilePlane {
   private readonly parts = new Map<string, Uint8Array>()
   private readonly entries = new Map<string, ProjectFileMeta>()
 
-  constructor(bundle: Uint8Array, device: string | null, appFonts = '') {
+  constructor(
+    bundle: Uint8Array,
+    device: string | null,
+    appFonts = '',
+    nativeRenderer?: NativeRenderer,
+  ) {
     if (bundle.byteLength === 0) throw new Error('a Box bundle cannot be empty')
     if (appFonts)
       this.recordParts(new TextEncoder().encode(appFonts), prebuiltAppFontsPartPath)
     if (device) this.record(PREBUILT_BUNDLE_DEVICE_PATH, new TextEncoder().encode(device))
+    if (nativeRenderer !== undefined)
+      this.record(
+        PREBUILT_BUNDLE_NATIVE_RENDERER_PATH,
+        new TextEncoder().encode(nativeRenderer),
+      )
     this.recordParts(bundle, prebuiltBundlePartPath)
   }
 

package/cli/commands/box.ts

@@ -44,6 +44,7 @@ import { CheckoutFilePlane, CheckoutRequiresGitError } from './box/checkout-plan
 import { createPeachCommand } from './box/peach-command'
 import { sharePlane } from './box/plane-share'
 import { createSearchCommand } from './box/search-command'
+import { readNativeProjectRenderer } from './detect'
 import type { BoxShellSession } from '@peach/box/client'
 import type { BoxTemplateResolution } from '@peach/box/template'
 
@@ -535,6 +536,13 @@ export async function createPrebuiltBundleBox(options: {
   accountId: string | null
   secrets?: Readonly<Record<string, string>>
 }) {
+  const platform =
+    options.device && isDeviceModel(options.device)
+      ? getRuntimePlatform(options.device)
+      : 'ios'
+  const nativeRenderer = options.nativeProjectDir
+    ? readNativeProjectRenderer(options.nativeProjectDir, platform)
+    : undefined
   return cloudBoxClient(options).create({
     name: options.name,
     stack: prebuiltBundleBoxTemplate.stack,
@@ -545,12 +553,10 @@ export async function createPrebuiltBundleBox(options: {
       options.nativeProjectDir
         ? readNativeLinkedAppFontsWire({
             projectDir: options.nativeProjectDir,
-            platform:
-              options.device && isDeviceModel(options.device)
-                ? getRuntimePlatform(options.device)
-                : 'ios',
+            platform,
           })
         : '',
+      nativeRenderer,
     ),
     ...(options.secrets ? { secrets: options.secrets } : {}),
   })
@@ -592,10 +598,15 @@ async function runCloudBoxCreate(
   // built, so naming a second template would ask for two different boxes.
   const bundlePath = flag(args, 'bundle')
   const nativeProjectDir = flag(args, 'native-project')
+  const assetsDirectory = flag(args, 'assets')
   if (nativeProjectDir && !bundlePath) {
     console.error(`  ${peach} box create: --native-project requires --bundle.`)
     return 1
   }
+  if (assetsDirectory && !bundlePath) {
+    console.error(`  ${peach} box create: --assets requires --bundle.`)
+    return 1
+  }
   const namedTemplate = flag(args, 'template')
   if (bundlePath && namedTemplate) {
     console.error(
@@ -630,7 +641,7 @@ async function runCloudBoxCreate(
     // embeds them. the box service owns the size ceiling, not this producer.
     let artifact: CloudBoxArtifactProduction
     try {
-      artifact = await produceCloudBoxArtifact(resolved)
+      artifact = await produceCloudBoxArtifact(resolved, assetsDirectory)
     } catch (error) {
       console.error(
         `  ${peach} box create: could not prepare the bundle at ${resolved}: ${

package/cli/commands/compat.ts

@@ -202,7 +202,7 @@ function reportLocalNative(local: LocalNative[]): void {
     }
     console.log(`    })`)
   }
-  console.log(`\n  guide: ${rnxPublicBrand.origin}/docs/rnx/compat/custom-stubs`)
+  console.log(`\n  guide: ${rnxPublicBrand.origin}/docs/peach/compat/custom-stubs`)
 }
 
 // an app's own native code, found from the names its JavaScript asks the native

package/cli/commands/config.ts

@@ -1,4 +1,4 @@
-import { rnxExit } from '../run-rnx'
+import { peachExit } from '../run-rnx'
 import { runTelemetry } from './telemetry'
 
 function printHelp(): void {
@@ -30,5 +30,5 @@ export async function runConfig(args: string[]): Promise<void> {
 
   console.error(`  unknown config command: ${sub ?? '(missing)'}`)
   printHelp()
-  rnxExit(1)
+  peachExit(1)
 }