peachsim 0.1.1594 → 0.1.1620

package/cli/cloud-client.ts

@@ -70,7 +70,6 @@ import type {
 export const DEFAULT_RNX_CLOUD_ORIGIN = rnxPublicBrand.origin
 export const MAX_RNX_CLOUD_BUNDLE_BYTES = RNX_CLOUD_MAX_ARTIFACT_BYTES
 
-// every message this module writes names the command through this constant.
 const REMOTE_COMMAND = 'peach remote'
 const PREVIEW_COMMAND = 'peach preview'
 
@@ -170,19 +169,19 @@ function resolveCloudOrigin(value?: string): string {
   return normalizeCloudOrigin(source)
 }
 
-function readImmutableBundleSource(bundlePath: string): string {
+function readImmutableBundleSource(bundlePath: string, command: string): string {
   const filepath = resolve(bundlePath)
   if (extname(filepath) !== '.js') {
-    throw new Error(`${REMOTE_COMMAND} requires one local Metro .js bundle`)
+    throw new Error(`${command} requires one local Metro .js bundle`)
   }
   const descriptor = openSync(filepath, 'r')
   try {
     const before = fstatSync(descriptor, { bigint: true })
     if (!before.isFile()) {
-      throw new Error(`${REMOTE_COMMAND} bundle must be a regular local file`)
+      throw new Error(`${command} bundle must be a regular local file`)
     }
     if (before.size <= 0n) {
-      throw new Error(`${REMOTE_COMMAND} bundle is empty`)
+      throw new Error(`${command} bundle is empty`)
     }
     const bytes = readFileSync(descriptor)
     const after = fstatSync(descriptor, { bigint: true })
@@ -193,16 +192,16 @@ function readImmutableBundleSource(bundlePath: string): string {
       before.mtimeNs !== after.mtimeNs ||
       bytes.length !== Number(before.size)
     ) {
-      throw new Error(`${REMOTE_COMMAND} bundle changed while it was being read`)
+      throw new Error(`${command} bundle changed while it was being read`)
     }
     let source: string
     try {
       source = new TextDecoder('utf-8', { fatal: true }).decode(bytes)
     } catch {
-      throw new Error(`${REMOTE_COMMAND} bundle must be valid UTF-8 JavaScript`)
+      throw new Error(`${command} bundle must be valid UTF-8 JavaScript`)
     }
     if (source.includes('\0') || !source.includes('__d(') || !source.includes('__r(')) {
-      throw new Error(`${REMOTE_COMMAND} requires a Metro JavaScript bundle`)
+      throw new Error(`${command} requires a Metro JavaScript bundle`)
     }
     return source
   } finally {
@@ -210,30 +209,30 @@ function readImmutableBundleSource(bundlePath: string): string {
   }
 }
 
-async function fetchBundleSource(bundleUrl: string): Promise<string> {
+async function fetchBundleSource(bundleUrl: string, command: string): Promise<string> {
   let response: Response
   try {
     response = await fetch(bundleUrl)
   } catch (error) {
     throw new Error(
-      `${REMOTE_COMMAND} could not fetch bundle from ${bundleUrl}: ${
+      `${command} could not fetch bundle from ${bundleUrl}: ${
         error instanceof Error ? error.message : String(error)
       }`,
     )
   }
   if (!response.ok) {
     throw new Error(
-      `${REMOTE_COMMAND} could not fetch bundle from ${bundleUrl}: HTTP ${response.status}${
+      `${command} could not fetch bundle from ${bundleUrl}: HTTP ${response.status}${
         response.statusText ? ` ${response.statusText}` : ''
       }`,
     )
   }
   const text = await response.text()
   if (text.length === 0) {
-    throw new Error(`${REMOTE_COMMAND} bundle is empty`)
+    throw new Error(`${command} bundle is empty`)
   }
   if (text.includes('\0') || !text.includes('__d(') || !text.includes('__r(')) {
-    throw new Error(`${REMOTE_COMMAND} requires a Metro JavaScript bundle`)
+    throw new Error(`${command} requires a Metro JavaScript bundle`)
   }
   return text
 }
@@ -254,20 +253,20 @@ function isRemoteBundleInput(bundleInput: string): boolean {
   return bundleInput.startsWith('https://') || bundleInput.startsWith('http://')
 }
 
-async function loadBundleSource(bundleInput: string): Promise<string> {
+async function loadBundleSource(bundleInput: string, command: string): Promise<string> {
   if (bundleInput.startsWith('http://') && !isLoopbackBundleUrl(bundleInput)) {
-    throw new Error(`${REMOTE_COMMAND} bundle URL must use HTTPS`)
+    throw new Error(`${command} bundle URL must use HTTPS`)
   }
   const source = isRemoteBundleInput(bundleInput)
-    ? await fetchBundleSource(bundleInput)
-    : readImmutableBundleSource(bundleInput)
+    ? await fetchBundleSource(bundleInput, command)
+    : readImmutableBundleSource(bundleInput, command)
   // validate the actual runtime script form without executing guest code or
   // allocating a host.
   try {
     new Script(rewriteGuestImportMeta(source), { filename: bundleInput })
   } catch (error) {
     throw new Error(
-      `${REMOTE_COMMAND} bundle contains invalid JavaScript: ${
+      `${command} bundle contains invalid JavaScript: ${
         error instanceof Error ? error.message : String(error)
       }`,
     )
@@ -549,6 +548,7 @@ function unverifiedContentKey(
 function searchMetroAssetDest(
   bundlePath: string,
   descriptors: readonly MetroAssetDescriptor[],
+  command: string,
   assetsDirectory?: string,
 ): MetroAssetSearch {
   const bundleDirectory = dirname(resolve(bundlePath))
@@ -616,7 +616,7 @@ function searchMetroAssetDest(
     // the wrong repair for a dest that only needs rebuilding.
     if (stale.length > 0) {
       throw new Error(
-        `${REMOTE_COMMAND} found this bundle's assets in ${stale.join(', ')}, but their bytes are not the ones it was built against. Rebuild with \`react-native bundle --assets-dest ${stale[0]}\` so the bundle and the images match.`,
+        `${command} found this bundle's assets in ${stale.join(', ')}, but their bytes are not the ones it was built against. Rebuild with \`react-native bundle --assets-dest ${stale[0]}\` so the bundle and the images match.`,
       )
     }
     return { dest: null, searched, truncated, unconfirmed: false }
@@ -633,7 +633,7 @@ function searchMetroAssetDest(
   if (!winner) return { dest: null, searched, truncated, unconfirmed: false }
   if (distinct.size > 1) {
     throw new Error(
-      `${REMOTE_COMMAND} found this bundle's assets in more than one directory and cannot tell which build wrote them: ${rivals
+      `${command} found this bundle's assets in more than one directory and cannot tell which build wrote them: ${rivals
         .map((rival) => rival.dest.directory)
         .join(
           ', ',
@@ -649,13 +649,14 @@ function searchMetroAssetDest(
 
 async function inferCloudModuleIdentity(
   source: string,
+  command: string,
 ): Promise<RNXMetroModuleIdentityMetadata> {
   let receipt
   try {
     receipt = await loadMetroFingerprintRegistry()
   } catch (error) {
     throw new Error(
-      `${REMOTE_COMMAND} could not load the Metro fingerprint registry needed to identify this bundle: ${
+      `${command} could not load the Metro fingerprint registry needed to identify this bundle: ${
         error instanceof Error ? error.message : String(error)
       }. Build it through the published Metro plugin: withPeach(config).`,
     )
@@ -674,7 +675,7 @@ async function inferCloudModuleIdentity(
     }
   } catch (error) {
     throw new Error(
-      `${REMOTE_COMMAND} could not infer module identity for this Metro bundle: ${
+      `${command} could not infer module identity for this Metro bundle: ${
         error instanceof Error ? error.message : String(error)
       }. Build it through the published Metro plugin: withPeach(config).`,
     )
@@ -775,7 +776,7 @@ async function embedBundleAssets(
   dest: MetroAssetDest | null
   substituted: string[]
 }> {
-  const source = await loadBundleSource(bundlePath)
+  const source = await loadBundleSource(bundlePath, command)
   const descriptors = extractAssetDescriptors(source).filter(
     (descriptor) => !isEmbeddedAssetDescriptor(descriptor),
   )
@@ -791,7 +792,7 @@ async function embedBundleAssets(
   // an https bundle uses only an explicit local asset destination.
   const search: MetroAssetSearch =
     assetsDirectory || !isRemoteBundleInput(bundlePath)
-      ? searchMetroAssetDest(bundlePath, descriptors, assetsDirectory)
+      ? searchMetroAssetDest(bundlePath, descriptors, command, assetsDirectory)
       : { dest: null, searched: [], truncated: false, unconfirmed: false }
   const dest = search.dest
   // `embedMetroAssetFiles` re-parses the bundle, so its descriptors are equal
@@ -877,7 +878,7 @@ async function produceArtifact(
     assetsDirectory,
   )
   const artifact = await buildRnxCloudArtifact(prepared.code, {
-    inferModuleIdentity: inferCloudModuleIdentity,
+    inferModuleIdentity: (source) => inferCloudModuleIdentity(source, command),
   })
   const bytes = Buffer.from(artifact.code, 'utf8')
   const assets = artifact.receipt.assets
@@ -1602,9 +1603,11 @@ export function createCloudBridgeForParsed(
     : new CloudBridge(session)
 }
 
-// stops the box, which ends the simulator it holds. an account api key stops
-// with its own authority; a session login stops with the login, falling back
-// to the box token the session already holds.
+// deletes the box, which ends the simulator it holds. a cloud session box is
+// the prebuilt bundle `peach ios --remote` created, so it holds nothing but that
+// bundle: stopping it would only keep its name taken and its storage held. an
+// account api key deletes with its own authority; a session login deletes with
+// the login, falling back to the box token the session already holds.
 export async function closeCloudBox(session: CloudSession): Promise<void> {
   if (session.service !== 'box') {
     if (!session.boxId || !session.boxToken) return
@@ -1631,7 +1634,7 @@ export async function closeCloudBox(session: CloudSession): Promise<void> {
   let response: Response
   try {
     response = await fetch(
-      `${session.apiOrigin}/v1/boxes/${encodeURIComponent(session.boxId)}/stop`,
+      `${session.apiOrigin}/v1/boxes/${encodeURIComponent(session.boxId)}/delete`,
       {
         method: 'POST',
         headers: { authorization: authHeader },
@@ -1650,6 +1653,15 @@ export async function closeCloudBox(session: CloudSession): Promise<void> {
   }
 }
 
+// the box's page reported that the app threw while booting, so no simulator is
+// coming and the box should end rather than bill.
+export class BoxBootFailedError extends Error {
+  constructor(boxId: string, detail: string) {
+    super(`box ${boxId} could not boot the app: ${detail}`)
+    this.name = 'BoxBootFailedError'
+  }
+}
+
 export interface BoxDisplayGrant {
   url: string
   authToken: string
@@ -1710,6 +1722,17 @@ export async function requestBoxWatchUrl(options: {
         }`,
       )
     }
+    if (response.status === 422) {
+      const text = await response.text()
+      let failure: unknown = null
+      try {
+        failure = JSON.parse(text)
+      } catch {}
+      if (isRecord(failure) && failure.code === 'boot-failed') {
+        throw new BoxBootFailedError(options.boxId, String(failure.error))
+      }
+      throw responseError(response.status, text)
+    }
     if (response.status === 409) {
       // the page has not attached its simulator yet. this is the normal state
       // right after a create, so wait rather than refusing.

package/cli/commands/agent-indicator-mode.ts

@@ -0,0 +1,39 @@
+// peach mode agent-indicator — show or hide the connected agent indicator and
+// its resting agent cursor over the device in the running peach sim, so
+// scripted recordings can film clean devices while the CLI drives them.
+
+import { peachExit } from '../run-rnx'
+import { runShellBooleanMode, type ShellBooleanModeOptions } from './shell-boolean-mode'
+
+export async function runAgentIndicatorMode(
+  args: string[],
+  opts: ShellBooleanModeOptions,
+) {
+  if (args.includes('--help') || args.includes('-h')) {
+    console.log(`
+peach mode agent-indicator — toggle the connected agent indicator
+
+usage:
+  peach mode agent-indicator [on|off|toggle]
+
+arguments:
+  on        show the indicator while a CLI or agent drives the sim (default)
+  off       hide it and the agent cursor that rests under it, for clean recordings
+            of scripted sims
+  toggle    flip the current state (default action)
+
+the setting persists. a shell url can also seed it with agentIndicator=0.
+
+examples:
+  peach mode agent-indicator off
+  peach --sim a1 mode agent-indicator on
+`)
+    peachExit(0)
+  }
+
+  await runShellBooleanMode(args, opts, {
+    modeKey: 'agentIndicator',
+    displayName: 'agent-indicator',
+    actionId: 'toggle-agent-indicator',
+  })
+}

package/cli/commands/box.ts

@@ -124,7 +124,7 @@ function apiOrigin(args: string[], auth: CliAuth): string {
   return (
     flag(args, 'api-origin') ??
     process.env[API_ORIGIN_ENV]?.trim() ??
-    (auth.kind === 'session' ? auth.origin : 'https://contrast.dev')
+    (auth.kind === 'session' ? auth.origin : rnxPublicBrand.origin)
   ).replace(/\/+$/, '')
 }
 
@@ -186,6 +186,7 @@ async function runCloudBoxUse(args: string[]): Promise<number> {
       apiOrigin: apiOrigin(args, auth),
       apiKey,
       boxId: named,
+      accountId: cloudAccountIdOrExit(auth),
     })
     // attach for the Box's own name: the caller may have typed either an id or
     // a name, and the default has to be able to print the one a person reads.
@@ -361,7 +362,12 @@ async function runCloudBoxConnect(args: string[]): Promise<number> {
 
   let session: BoxShellSession | null = null
   try {
-    const reference = await resolveCloudBoxReference({ apiOrigin: origin, apiKey, boxId })
+    const reference = await resolveCloudBoxReference({
+      apiOrigin: origin,
+      apiKey,
+      boxId,
+      accountId: cloudAccountIdOrExit(auth),
+    })
     const box = await createBoxClient(
       createCloudBoxProvider({
         endpoint: reference.endpoint,
@@ -406,7 +412,7 @@ async function runCloudBoxConnect(args: string[]): Promise<number> {
  * person sees is what the agent is working on, and two people opening the same
  * box see the same screen.
  *
- * the url carries no credential: it is the box's page on the Contrast origin,
+ * the url carries no credential: it is the box's page on its account origin,
  * and opening it signed in resolves the box through the account service. that
  * makes it a link somebody can keep, paste, or reload.
  */
@@ -428,6 +434,7 @@ async function runCloudBoxOpen(args: string[]): Promise<number> {
       apiOrigin: apiOrigin(args, auth),
       apiKey,
       boxId,
+      accountId: cloudAccountIdOrExit(auth),
     })
     const connectUrl = cloudBoxConnectUrl(reference.endpoint, reference.boxId)
     // ensure first: it is what navigates the generation's tab to the Box page,
@@ -491,6 +498,7 @@ export async function openInBrowser(url: string): Promise<number> {
 
 function cloudBoxClient(options: {
   endpoint: string
+  fresh?: boolean
   apiOrigin: string
   apiKey: string
   accountId: string | null
@@ -498,6 +506,7 @@ function cloudBoxClient(options: {
   return createBoxClient(
     createCloudBoxProvider({
       endpoint: options.endpoint,
+      fresh: options.fresh,
       authority: {
         kind: 'account',
         apiOrigin: options.apiOrigin,
@@ -517,6 +526,7 @@ function cloudBoxClient(options: {
  * that bundle instead of building anything.
  */
 export async function createPrebuiltBundleBox(options: {
+  fresh?: boolean
   bundle: Uint8Array
   nativeProjectDir?: string
   // the simulator's device model, or null for the Box page's default