peachsim 0.1.527 → 0.1.570

package/cli/commands/platform.ts

@@ -4,6 +4,7 @@
 // (this machine, a local box, or the `rnx remote` namespace). this file resolves
 // the device and hands the rest to the normal open path.
 
+import { createHash } from 'node:crypto'
 import {
   DEFAULT_DEVICE_BY_PLATFORM,
   devices,
@@ -11,9 +12,10 @@ import {
   listSelectableDeviceModels,
   type DeviceModel,
   type RuntimePlatform,
-} from 'sootsim-engine/settings'
-import { settingsStore } from 'sootsim-engine/settings/store'
+} from 'peach-engine/settings'
+import { settingsStore } from 'peach-engine/settings/store'
 import { rnxPublicBrand } from '../../src/public-brand'
+import { UnsupportedRemoteHostError } from '../cloud-client'
 import { rethrowIfExit } from '../run-rnx'
 import type { CloudSession } from '../cloud-session'
 
@@ -27,23 +29,28 @@ function isDeviceModel(value: string): value is DeviceModel {
 }
 
 // flags this command reads for itself rather than treating as the bundle.
-const REMOTE_VALUE_FLAGS = new Set(['--device'])
+const REMOTE_VALUE_FLAGS = new Set(['--device', '--name', '--endpoint'])
 
 function remoteInputFromArgs(
   args: string[],
   platform: RuntimePlatform,
 ): {
   bundlePath: string
+  name: string | null
   reuse: boolean
   fresh: boolean
 } {
   const positional: string[] = []
+  let name: string | null = null
   for (let index = 0; index < args.length; index++) {
     const arg = args[index]
-    if (arg === '--remote' || arg === '--reuse' || arg === '--new') continue
+    if (arg === '--remote' || arg === '--nano' || arg === '--reuse' || arg === '--new') {
+      continue
+    }
     if (REMOTE_VALUE_FLAGS.has(arg)) {
       const value = args[++index] ?? null
       if (!value) throw new Error(`rnx remote ${platform} ${arg} requires a value`)
+      if (arg === '--name') name = value
       continue
     }
     const assigned = arg.match(/^(--[a-z-]+)=(.*)$/)
@@ -51,6 +58,7 @@ function remoteInputFromArgs(
       const value = assigned[2] ?? ''
       if (!value)
         throw new Error(`rnx remote ${platform} ${assigned[1]} requires a value`)
+      if (assigned[1] === '--name') name = value
       continue
     }
     if (
@@ -80,7 +88,25 @@ function remoteInputFromArgs(
   if (reuse && fresh) {
     throw new Error(`rnx remote ${platform} cannot combine --reuse and --new`)
   }
-  return { bundlePath: positional[0], reuse, fresh }
+  return { bundlePath: positional[0], name, reuse, fresh }
+}
+
+/**
+ * the box's name, taken from what was built.
+ *
+ * a bundle arrives as a file or a URL and neither carries a name, so the last
+ * path segment without its extension is the one thing both have. box names are
+ * lowercase words joined by dashes, so anything else in it becomes a dash.
+ */
+function boxNameForBundle(bundlePath: string): string {
+  const segment = bundlePath.split(/[?#]/)[0]?.split('/').filter(Boolean).at(-1) ?? ''
+  const stem = segment.replace(/\.[^.]+$/, '')
+  const name = stem
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+  if (!name) throw new Error(`rnx remote could not name a box after ${bundlePath}`)
+  return name
 }
 
 export async function runPlatformCommand(
@@ -129,7 +155,15 @@ export async function runPlatformCommand(
   }
 
   if (args.includes('--remote')) {
+    if (platform === 'android' && args.includes('--nano')) {
+      const error = new UnsupportedRemoteHostError('android', 'nano')
+      console.error(`  ${error.message}`)
+      return 1
+    }
     try {
+      if (!args.includes('--nano')) {
+        return await runRemoteBox(platform, args, selectedDevice)
+      }
       return await runRemoteCreate(platform, args, selectedDevice)
     } catch (error) {
       rethrowIfExit(error)
@@ -185,6 +219,11 @@ export function runRemotePlatformCommand(
   args: string[],
   opts: { port?: number } = {},
 ): Promise<number | undefined> {
+  if (platform === 'android' && args.includes('--nano')) {
+    const error = new UnsupportedRemoteHostError('android', 'nano')
+    console.error(`  ${error.message}`)
+    return Promise.resolve(1)
+  }
   return runPlatformCommand(platform, ['--remote', ...args], opts)
 }
 
@@ -207,6 +246,7 @@ async function runRemoteCreate(
     { authHeaderOrExit, cloudAccountIdOrExit },
     {
       claimCloudSimulator,
+      closeCloudBox,
       closeCloudSession,
       createRemoteSim,
       getRemoteSim,
@@ -232,7 +272,7 @@ async function runRemoteCreate(
 
   const existingSession = readCloudSession()
   if (
-    existingSession &&
+    existingSession?.service === 'sim' &&
     !input.fresh &&
     existingSession.platform === platform &&
     existingSession.artifact?.sha256 === artifact.sha256
@@ -265,7 +305,8 @@ async function runRemoteCreate(
 
   // the new session supersedes the old one, so the shell update channel
   // carries exactly one update: the shell accepts nothing else.
-  if (existingSession) await closeCloudSession(existingSession)
+  if (existingSession?.service === 'box') await closeCloudBox(existingSession)
+  else if (existingSession) await closeCloudSession(existingSession)
   const created = await createRemoteSim({
     bundlePath: input.bundlePath,
     device: selectedDevice,
@@ -310,6 +351,159 @@ async function runRemoteCreate(
   return openInBrowser(created.session.streamUrl)
 }
 
+/**
+ * `rnx ios --remote` and `rnx android --remote` — the app runs in a micro box.
+ *
+ * the bundle is prepared by the box plane's own producer, the one `rnx box
+ * create --bundle` uses: assets embedded, nothing minified and no module
+ * identity rewritten. the nano producer's artifact is built for the nano
+ * runner, which imports it as a module; a box page evaluates the bytes with
+ * `(0, eval)` as Script in global scope, and a minified artifact reaches it
+ * with no react instance for the reconciler to bind to. there is no size cap
+ * either way: the box holds the bundle in parts, so the single-message ceiling
+ * a nano upload answers to does not apply.
+ *
+ * a box created from the already-built app boots it in its own page, and this
+ * opens the bare shell watch url minted from the box's display grant — the same
+ * /sootsim/#remoteEngine fragment the nano service mints, pointed at the box.
+ */
+async function runRemoteBox(
+  platform: RuntimePlatform,
+  args: string[],
+  selectedDevice: string,
+): Promise<number> {
+  const command = `${platform} --remote`
+  const input = remoteInputFromArgs(args, platform)
+  const [
+    { closeCloudBox, closeCloudSession, produceCloudBoxArtifact, requestBoxWatchUrl },
+    box,
+    { cloudBoxConnectUrl, ensureCloudBoxBrowser, readCloudBoxSession },
+    { authHeaderOrExit, cloudAccountIdOrExit },
+    {
+      createCloudBoxSession,
+      publishCloudSessionToShell,
+      readCloudSession,
+      serializeCloudSession,
+      RNX_CLOUD_SESSION_ENV,
+    },
+  ] = await Promise.all([
+    import('../cloud-client'),
+    import('./box'),
+    import('peach-cloud-box/client'),
+    import('../auth'),
+    import('../cloud-session'),
+  ])
+  const { openInBrowser } = box
+  const artifact = await produceCloudBoxArtifact(input.bundlePath)
+  // the session records which bundle a box already holds, so reattaching can
+  // tell the same app from a rebuilt one. the box producer returns no digest
+  // of its own, so take it here over the bytes that actually crossed.
+  const artifactSha256 = createHash('sha256').update(artifact.bytes).digest('hex')
+  const endpoint = box.cloudBoxEndpoint(args, command)
+  if (!endpoint) return 1
+
+  const existingSession = readCloudSession()
+  if (
+    existingSession?.service === 'box' &&
+    !input.fresh &&
+    existingSession.apiOrigin === endpoint &&
+    existingSession.platform === platform &&
+    existingSession.device === selectedDevice &&
+    existingSession.artifact?.sha256 === artifactSha256
+  ) {
+    const live = await readCloudBoxSession({
+      endpoint: existingSession.apiOrigin,
+      boxId: existingSession.boxId,
+      accessToken: existingSession.boxToken,
+    })
+    if (live.sessionId) {
+      // the simulator lives in the box's Browser Run tab, which lapses on its
+      // own, so a reconnect restores it before promising commands will answer.
+      await ensureCloudBoxBrowser({
+        connectUrl: cloudBoxConnectUrl(existingSession.apiOrigin, existingSession.boxId),
+        accessToken: existingSession.boxToken,
+      })
+      // grants are short-lived, so a reconnect mints a fresh one rather than
+      // reopening whatever url the create printed.
+      const watchUrl = await requestBoxWatchUrl({
+        apiOrigin: existingSession.apiOrigin,
+        boxId: existingSession.boxId,
+        boxToken: existingSession.boxToken,
+      })
+      console.log(
+        `  reconnected to remote simulator: ${existingSession.boxId} (${platform})`,
+      )
+      console.log(`  open ${watchUrl}`)
+      console.log(REMOTE_COMMANDS_HELP)
+      return openInBrowser(watchUrl)
+    }
+  }
+
+  const { auth, header } = authHeaderOrExit(command)
+  const accountId = cloudAccountIdOrExit(auth)
+
+  if (existingSession?.service === 'box') {
+    await closeCloudBox(existingSession)
+    try {
+      publishCloudSessionToShell(null)
+    } catch {
+      // no shell update channel is required outside an interactive rnx shell
+    }
+  } else if (existingSession) {
+    await closeCloudSession(existingSession)
+  }
+  const created = await box.createPrebuiltBundleBox({
+    bundle: new Uint8Array(artifact.bytes),
+    name: input.name ?? boxNameForBundle(input.bundlePath),
+    endpoint,
+    apiOrigin: box.cloudBoxApiOrigin(args, auth),
+    apiKey: header.replace(/^Bearer /, ''),
+    accountId,
+  })
+  // creating a box starts no browser, and only its Browser Run tab hosts the
+  // simulator, so without this the viewer opens onto a box nobody is running.
+  await ensureCloudBoxBrowser({
+    connectUrl: cloudBoxConnectUrl(endpoint, created.id),
+    accessToken: created.accessToken ?? '',
+  })
+  const session = createCloudBoxSession({
+    boxId: created.id,
+    boxToken: created.accessToken ?? '',
+    apiOrigin: endpoint,
+    platform,
+    device: selectedDevice,
+    artifact: {
+      sha256: artifactSha256,
+      bytes: artifact.bytes.length,
+    },
+  })
+  try {
+    publishCloudSessionToShell(session)
+  } catch {
+    // shell update fd not configured
+  }
+  process.env[RNX_CLOUD_SESSION_ENV] = serializeCloudSession(session)
+
+  console.log(`  box: ${created.id} (${artifact.bytes.length} bytes)`)
+  console.log(`  platform: ${platform}`)
+  if (selectedDevice) console.log(`  device: ${selectedDevice}`)
+  console.log(`  artifact: sha256:${artifactSha256}`)
+  // the dest directory was chosen by resolving this bundle's descriptors
+  // against it, so say which one won rather than leaving it invisible.
+  if (artifact.assetsDirectory) console.log(`  asset dest: ${artifact.assetsDirectory}`)
+  for (const warning of artifact.warnings) console.warn(`  warning: ${warning}`)
+  console.log(REMOTE_COMMANDS_HELP)
+  // the session is published before the grant is minted, so a grant that never
+  // arrives still leaves the box addressable: re-running this command mints it.
+  const watchUrl = await requestBoxWatchUrl({
+    apiOrigin: endpoint,
+    boxId: created.id,
+    boxToken: created.accessToken ?? '',
+  })
+  console.log(`  open ${watchUrl}`)
+  return openInBrowser(watchUrl)
+}
+
 /** `rnx remote list`: the simulators this account runs that `rnx remote` made. */
 export async function runRemoteList(args: string[]): Promise<number> {
   try {
@@ -381,7 +575,10 @@ export async function runRemoteStop(args: string[]): Promise<number> {
     }
     // stopping the shell's own simulator clears the shell with it, so the
     // update channel is required before anything is deleted.
-    const descriptor = current?.simId === simId ? requireCloudSessionShellUpdate() : null
+    const descriptor =
+      current?.service === 'sim' && current.simId === simId
+        ? requireCloudSessionShellUpdate()
+        : null
     const { auth, header } = authHeaderOrExit('remote stop')
     const accountId = cloudAccountIdOrExit(auth)
     const deleted = await deleteRemoteSim({

package/cli/commands/preview.ts

@@ -1,9 +1,9 @@
 import { createHash } from 'node:crypto'
-import { brotliBundle } from 'sootsim-engine/preview/compress-node'
+import { brotliBundle } from 'peach-engine/preview/compress-node'
 import {
   runPresignedUpload,
   type InitRequestBody,
-} from 'sootsim-engine/preview/presigned-upload'
+} from 'peach-engine/preview/presigned-upload'
 import { authHeaderValue, cloudAccountIdOrExit, resolveCliAuth } from '../auth'
 import { producePreviewArtifact } from '../cloud-client'
 import { openUrl } from '../open-url'

package/cli/commands/record.ts

@@ -37,7 +37,7 @@ type OutputFormat = 'webm' | 'mp4' | 'gif' | 'png'
 // recorder bridge (current CLI default). 'live' and 'combined' route
 // through the recording store so they capture pointer events (and, for
 // combined, video) and upload to /preview/<id>. mirrors RecordingMode in
-// packages/sootsim-engine/src/recording/recordingStore.ts.
+// packages/peach-engine/src/recording/recordingStore.ts.
 type RecordMode = 'video' | 'live' | 'combined'
 
 // how long to wait for the live/combined upload to settle after stop. dev
@@ -180,7 +180,7 @@ function readRepoScope(args: string[]): RepoScope {
 
 export async function runRecord(args: string[], opts: RecordOptions) {
   // note: `--help` / `-h` never reach here — bin.ts intercepts them and
-  // renders the registry-driven help page (packages/rnx-skills meta.ts).
+  // renders the registry-driven help page (packages/peach-skills meta.ts).
 
   const sub = findRecordSubcommand(args)
   if (sub) {

package/cli/commands/report-issue.ts

@@ -6,7 +6,7 @@ import { getCliVersion } from '../../src/cli-version'
 import { readActiveRuntime } from '../../src/home-paths'
 import { authHeaderValue, resolveCliAuth } from '../auth'
 import { confirm } from '../prompt'
-import type { ScanResult } from '@sootsim/compat/web'
+import type { ScanResult } from '@peach/compat/web'
 
 const DEFAULT_REPORT_ORIGIN = 'https://contrast.dev'
 const MAX_DESCRIPTION_LENGTH = 8_000
@@ -154,7 +154,7 @@ export async function createReportIssuePayload(
 ): Promise<ReportIssuePayload> {
   const manifest = readManifest(options.appDir)
   const compatibility = manifest
-    ? (await import('@sootsim/compat/web')).scanDeps(manifest)
+    ? (await import('@peach/compat/web')).scanDeps(manifest)
     : null
   const cliVersion = getCliVersion()
   const runtimeVersion = readActiveRuntime()

package/cli/commands/screenshot-layers.ts

@@ -9,7 +9,7 @@
 
 import { mkdirSync, writeFileSync } from 'fs'
 import { resolve } from 'path'
-import { devices } from 'sootsim-engine/settings'
+import { devices } from 'peach-engine/settings'
 import { buildResolveRectEval, type SampleRect } from '../browser-evals'
 import { rnxExit } from '../run-rnx'
 import { callInBridge, createBridgeFromParsed, parseBridgeCliArgs } from '../ws-bridge'

package/cli/commands/screenshot.ts

@@ -8,7 +8,7 @@
 
 import { mkdirSync, writeFileSync } from 'fs'
 import { dirname, resolve } from 'path'
-import { devices, type DeviceModel } from 'sootsim-engine/settings'
+import { devices, type DeviceModel } from 'peach-engine/settings'
 import { launchReapedChrome } from '../../../../scripts/lib/reap-browser'
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
 import { composeFramedScreenshot } from '../../src/screenshots/frame-compose'

package/cli/commands/setup.ts

@@ -361,7 +361,7 @@ async function decideRepository(
   if (options.yes || options.ci || !process.stdin.isTTY) return false
   printPromptBlock('Share rnx with your team', [
     'rnx already works here with no project setup.',
-    'This only adds an exact rnxsim dev dependency and an rnx script for teammates.',
+    'This only adds an exact peachsim dev dependency and an rnx script for teammates.',
   ])
   return confirm(`Add rnx to ${path.basename(plan.appDir)}?`, false)
 }
@@ -392,7 +392,7 @@ rnx setup - configure optional local conveniences
 
 rnx works without project setup. This command can enable the faster background
 service, choose Browser or Desktop, configure private diagnostics, and optionally
-add an exact rnxsim dependency plus an rnx script for teammates.
+add an exact peachsim dependency plus an rnx script for teammates.
 
 usage:
   rnx setup