rnxsim 0.1.500 → 0.1.502

package/README.md

@@ -445,7 +445,7 @@ no code changes — just add one line to your jest config:
 
 ```js
 // jest config
-{ preset: 'rnxsim/detox/jest-preset' }
+{ preset: 'rnxsim/detox' }
 ```
 
 Or use the CLI directly:

package/cli/cloud-client.ts

@@ -36,7 +36,7 @@ import {
   type RNXMetroModuleIdentityMetadata,
 } from '../src/metro-production-bundle.ts'
 import { rnxPublicBrand } from '../src/public-brand.ts'
-import { CHOOSE_ACCOUNT_HINT } from './auth.ts'
+import { CHOOSE_ACCOUNT_HINT, resolveCliAuth } from './auth.ts'
 import {
   createCloudSession,
   normalizeCloudOrigin,
@@ -44,8 +44,25 @@ import {
   type CloudBoxSession,
   type CloudSession,
   type CloudSimSession,
+  type RemotePlatform,
 } from './cloud-session.ts'
-import { detectProject, findProjectRoot } from './commands/detect.ts'
+
+export class UnsupportedRemoteHostError extends Error {
+  readonly code = 'unsupported_host' as const
+  readonly platform: string
+  readonly host: string
+
+  constructor(platform: string, host: string, message?: string) {
+    super(
+      message ??
+        `rnx remote ${platform} does not support --${host}: rnxsim/cloud only creates iOS simulators`,
+    )
+    this.name = 'UnsupportedRemoteHostError'
+    this.platform = platform
+    this.host = host
+  }
+}
+import { detectProject } from './commands/detect.ts'
 import type { StorageSnapshot } from '../../sootsim-engine/src/preview/storage-snapshot-contract.ts'
 import type {
   BridgeClaimResult,
@@ -58,7 +75,7 @@ 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 = 'rnx ios --remote'
+const REMOTE_COMMAND = 'rnx remote'
 const PREVIEW_COMMAND = 'rnx preview'
 
 // a Metro asset dest is a shallow tree of images. a walk that runs past this
@@ -72,6 +89,7 @@ interface CreateCloudBoxOptions {
   authorization: string
   /** the account to bill when the authorization is a session token; an api key names its own */
   accountId: string | null
+  platform?: RemotePlatform
   apiOrigin?: string
   /** the name this box carries in the account's box list. */
   boxName?: string | null
@@ -502,9 +520,28 @@ function searchMetroAssetDest(
     resolve(bundleDirectory, '..', 'assets'),
   ]
   const cwd = process.cwd()
-  if (detectProject(cwd)?.hasMetroConfig) {
-    const root = findProjectRoot(cwd)
-    candidates.push(join(root, 'dist'), join(root, 'build'))
+  let projectDirectory: string | null = null
+  for (const start of [bundleDirectory, cwd]) {
+    let directory = resolve(start)
+    while (true) {
+      if (detectProject(directory)?.hasMetroConfig) {
+        projectDirectory = directory
+        break
+      }
+      const parent = dirname(directory)
+      if (parent === directory) break
+      directory = parent
+    }
+    if (projectDirectory) break
+  }
+  if (projectDirectory) {
+    candidates.push(
+      join(projectDirectory, 'assets'),
+      join(projectDirectory, 'dist'),
+      join(projectDirectory, 'dist', 'assets'),
+      join(projectDirectory, 'build'),
+      join(projectDirectory, 'build', 'assets'),
+    )
   }
   const searched: string[] = []
   const holders: { dest: MetroAssetDest; verified: number }[] = []
@@ -833,6 +870,10 @@ export async function createCloudBox(options: CreateCloudBoxOptions): Promise<{
   assetsDirectory: string | null
   warnings: string[]
 }> {
+  const platform = options.platform ?? 'ios'
+  if (platform === 'android') {
+    throw new UnsupportedRemoteHostError('android', 'nano')
+  }
   const apiOrigin = resolveCloudOrigin(options.apiOrigin)
   const artifact = await produceCloudArtifact(options.bundlePath)
   const boxName = options.boxName?.trim()
@@ -840,7 +881,7 @@ export async function createCloudBox(options: CreateCloudBoxOptions): Promise<{
     authorization: options.authorization,
     'x-rnx-box-size': 'nano',
     'x-rnx-artifact-sha256': artifact.sha256,
-    'x-rnx-platform': 'ios',
+    'x-rnx-platform': platform,
     'x-rnx-device': options.device,
     ...(options.accountId ? { 'x-rnx-account-id': options.accountId } : null),
     ...(boxName ? { 'x-rnx-box-name': boxName } : null),
@@ -889,6 +930,12 @@ export async function createCloudBox(options: CreateCloudBoxOptions): Promise<{
     apiOrigin,
     claimId: created.receipt.simulator.claim.id,
     token: created.simulatorToken,
+    platform,
+    device: options.device,
+    artifact: {
+      sha256: artifact.sha256,
+      bytes: artifact.bytes.length,
+    },
   })
   return {
     receipt: created.receipt,
@@ -1185,6 +1232,36 @@ export async function confirmCloudSimulator(session: CloudSimSession): Promise<v
 
 // deletes the box, which closes every simulator it holds
 export async function closeCloudBox(session: CloudSession): Promise<void> {
+  if (session.service === 'box') {
+    const auth = resolveCliAuth()
+    let authHeader = `Bearer ${session.boxToken}`
+    if (auth?.kind === 'api-key') {
+      authHeader = `Bearer ${auth.secret}`
+    } else if (auth?.kind === 'session') {
+      authHeader = `Bearer ${auth.token}`
+    }
+    let response: Response
+    try {
+      response = await fetch(
+        `${session.apiOrigin}/v1/boxes/${encodeURIComponent(session.boxId)}/stop`,
+        {
+          method: 'POST',
+          headers: { authorization: authHeader },
+        },
+      )
+    } catch (error) {
+      throw new Error(
+        `could not reach box ${session.boxId} at ${session.apiOrigin}: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      )
+    }
+    const text = await response.text()
+    if (!response.ok && response.status !== 404) {
+      throw responseError(response.status, text)
+    }
+    return
+  }
   const response = await fetch(
     `${session.apiOrigin}/v1/boxes/${encodeURIComponent(session.boxId)}`,
     {
@@ -1300,6 +1377,12 @@ export async function addCloudSimulator(
     simId,
     claimId: claim.id,
     token,
+    platform: 'ios',
+    device: options.device,
+    artifact: {
+      sha256: artifact.id.replace(/^sha256:/, ''),
+      bytes: artifact.bytes,
+    },
   })
   return { receipt, session: updatedSession }
 }

package/cli/cloud-dispatch.ts

@@ -126,12 +126,8 @@ export async function dispatchCloudBoundary({
   command,
   args,
 }: CloudBoundaryInvocation): Promise<CloudBoundaryResult> {
-  if (command === 'ios' && args.includes('--remote')) return { handled: false }
-  if (command === 'android' && args.includes('--remote')) {
-    console.error(
-      '  rnx android --remote is not available; remote simulators are iOS only',
-    )
-    return { handled: true, code: 1 }
+  if ((command === 'ios' || command === 'android') && args.includes('--remote')) {
+    return { handled: false }
   }
   if (!CLOUD_TARGET_COMMANDS.has(command)) return { handled: false }
 
@@ -155,13 +151,35 @@ export async function dispatchCloudBoundary({
   }
   if (!session) return { handled: false }
 
+  if (command === 'close') {
+    if (args.includes('--all') || args.includes('--others')) {
+      return refuseCloudInvocation(command, parsed.positional)
+    }
+    try {
+      const descriptor = cloudSession.requireCloudSessionShellUpdate()
+      await cloudClient.closeCloudBox(session)
+      cloudSession.publishCloudSessionToShell(null, descriptor)
+      console.log(
+        session.service === 'box'
+          ? `  closed: remote box ${session.boxId}`
+          : `  closed: remote simulator ${session.simId}`,
+      )
+      return { handled: true, code: 0 }
+    } catch (error) {
+      console.error(
+        `  close failed: ${error instanceof Error ? error.message : String(error)}`,
+      )
+      return { handled: true, code: 1 }
+    }
+  }
+
   // a box relays the whole bridge vocabulary to the page hosting its
   // simulator, which runs the same shell the local CLI drives. so there is no
   // subset to police: every command below reaches it through the ordinary
-  // bridge, which createBridgeFromParsed points at the box. the two exceptions
-  // are the two commands that are about a nano claim, which a box has none of.
+  // bridge, which createBridgeFromParsed points at the box. claim is specific
+  // to nano.
   if (session.service === 'box') {
-    if (command === 'claim' || command === 'close') {
+    if (command === 'claim') {
       console.error(
         `  rnx ${command} is not available for a box; its simulator is held by the Box page. use rnx box stop to end the box.`,
       )
@@ -188,24 +206,6 @@ export async function dispatchCloudBoundary({
     }
   }
 
-  if (command === 'close') {
-    if (args.includes('--all') || args.includes('--others')) {
-      return refuseCloudInvocation(command, parsed.positional)
-    }
-    try {
-      const descriptor = cloudSession.requireCloudSessionShellUpdate()
-      await cloudClient.closeCloudBox(session)
-      cloudSession.publishCloudSessionToShell(null, descriptor)
-      console.log(`  closed: remote simulator ${session.simId}`)
-      return { handled: true, code: 0 }
-    } catch (error) {
-      console.error(
-        `  close failed: ${error instanceof Error ? error.message : String(error)}`,
-      )
-      return { handled: true, code: 1 }
-    }
-  }
-
   // these inputs use the same perform executor as an inline chain. a CPU
   // simulator has focused text inputs but no browser keyboard to inspect.
   if (

package/cli/cloud-session.ts

@@ -15,6 +15,13 @@ export const RNX_SHELL_UPDATE_UNSET = `${RNX_SHELL_UPDATE_PREFIX}unset`
 // leaving a reader to infer it from which fields happen to be filled in.
 export type CloudSession = CloudSimSession | CloudBoxSession
 
+export type RemotePlatform = 'ios' | 'android'
+
+export interface CloudSessionArtifactIdentity {
+  sha256: string
+  bytes?: number
+}
+
 /**
  * one remote host, addressed by the box token, and the simulator inside it
  * that ordinary commands reach with the simulator token. this is what
@@ -29,6 +36,9 @@ export interface CloudSimSession {
   apiOrigin: string
   claimId: string
   token: string
+  platform?: RemotePlatform
+  device?: string
+  artifact?: CloudSessionArtifactIdentity
 }
 
 /**
@@ -43,6 +53,9 @@ export interface CloudBoxSession {
   boxId: string
   boxToken: string
   apiOrigin: string
+  platform?: RemotePlatform
+  device?: string
+  artifact?: CloudSessionArtifactIdentity
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -79,8 +92,11 @@ export function createCloudSession(input: {
   apiOrigin: string
   claimId: string
   token: string
+  platform?: RemotePlatform
+  device?: string
+  artifact?: CloudSessionArtifactIdentity
 }): CloudSimSession {
-  const session = {
+  const session: CloudSimSession = {
     version: CLOUD_SESSION_VERSION,
     service: 'sim',
     boxId: input.boxId.trim(),
@@ -89,7 +105,10 @@ export function createCloudSession(input: {
     apiOrigin: normalizeCloudOrigin(input.apiOrigin.trim()),
     claimId: input.claimId.trim(),
     token: input.token,
-  } satisfies CloudSimSession
+    ...(input.platform ? { platform: input.platform } : {}),
+    ...(input.device?.trim() ? { device: input.device.trim() } : {}),
+    ...(input.artifact ? { artifact: input.artifact } : {}),
+  }
   if (
     !session.boxId ||
     !session.boxToken ||
@@ -106,14 +125,20 @@ export function createCloudBoxSession(input: {
   boxId: string
   boxToken: string
   apiOrigin: string
+  platform?: RemotePlatform
+  device?: string
+  artifact?: CloudSessionArtifactIdentity
 }): CloudBoxSession {
-  const session = {
+  const session: CloudBoxSession = {
     version: CLOUD_SESSION_VERSION,
     service: 'box',
     boxId: input.boxId.trim(),
     boxToken: input.boxToken,
     apiOrigin: normalizeCloudOrigin(input.apiOrigin.trim()),
-  } satisfies CloudBoxSession
+    ...(input.platform ? { platform: input.platform } : {}),
+    ...(input.device?.trim() ? { device: input.device.trim() } : {}),
+    ...(input.artifact ? { artifact: input.artifact } : {}),
+  }
   if (!session.boxId || !session.boxToken) {
     throw new Error('cloud box session requires a box, an origin, and a box token')
   }
@@ -160,9 +185,29 @@ export function parseCloudSession(encoded: string): CloudSession {
   ) {
     throw new Error(`${RNX_CLOUD_SESSION_ENV} is invalid`)
   }
+  const platform =
+    parsed.platform === 'ios' || parsed.platform === 'android'
+      ? parsed.platform
+      : undefined
+  const device = typeof parsed.device === 'string' ? parsed.device : undefined
+  const artifact =
+    isRecord(parsed.artifact) && typeof parsed.artifact.sha256 === 'string'
+      ? {
+          sha256: parsed.artifact.sha256,
+          bytes:
+            typeof parsed.artifact.bytes === 'number' ? parsed.artifact.bytes : undefined,
+        }
+      : undefined
   try {
     if (parsed.service === 'box') {
-      return createCloudBoxSession({ boxId, boxToken, apiOrigin })
+      return createCloudBoxSession({
+        boxId,
+        boxToken,
+        apiOrigin,
+        platform,
+        device,
+        artifact,
+      })
     }
     const simId = parsed.simId
     const claimId = parsed.claimId
@@ -175,7 +220,17 @@ export function parseCloudSession(encoded: string): CloudSession {
     ) {
       throw new Error('unreadable cloud session')
     }
-    return createCloudSession({ boxId, boxToken, simId, apiOrigin, claimId, token })
+    return createCloudSession({
+      boxId,
+      boxToken,
+      simId,
+      apiOrigin,
+      claimId,
+      token,
+      platform,
+      device,
+      artifact,
+    })
   } catch {
     throw new Error(`${RNX_CLOUD_SESSION_ENV} is invalid`)
   }

package/cli/commands/agent-wrapper.ts

@@ -33,6 +33,7 @@ import {
   openSync,
 } from 'node:fs'
 import fs from 'node:fs/promises'
+import os from 'node:os'
 import path from 'node:path'
 import readline from 'node:readline'
 import { promisify } from 'node:util'
@@ -848,6 +849,20 @@ function buildClaudeTurnRunner(deps: ClaudeTurnDeps): TurnRunner {
     } = deps
     const startedAt = Date.now()
     emit({ type: 'turn-started' } as AgentEvent)
+    // the agent runs as the user, on the user's claude login. the host app's
+    // own api key must not become the agent's credential.
+    const { ANTHROPIC_API_KEY: _hostApiKey, ...claudeEnv } = process.env
+    // `--session-id` creates the transcript and refuses a uuid that already
+    // has one, so every turn after the first (including the first turn of a
+    // restarted wrapper) resumes it instead.
+    const transcriptPath = path.join(
+      os.homedir(),
+      '.claude',
+      'projects',
+      cwd.replace(/[/.]/g, '-'),
+      `${claudeSessionUuid}.jsonl`,
+    )
+    const sessionFlag = existsSync(transcriptPath) ? '--resume' : '--session-id'
 
     const child = spawn(
       resolvedBin,
@@ -858,7 +873,7 @@ function buildClaudeTurnRunner(deps: ClaudeTurnDeps): TurnRunner {
         '--verbose',
         '--permission-mode',
         'bypassPermissions',
-        '--session-id',
+        sessionFlag,
         claudeSessionUuid,
         text,
       ],
@@ -866,7 +881,7 @@ function buildClaudeTurnRunner(deps: ClaudeTurnDeps): TurnRunner {
         cwd,
         stdio: ['ignore', 'pipe', 'pipe'],
         env: {
-          ...process.env,
+          ...claudeEnv,
           RNX_CLI_IDENTITY: sessionId,
           SOOTSIM_PROJECT_ID: projectId,
         },

package/cli/commands/control.ts

@@ -1520,12 +1520,18 @@ export async function runOpenCommand(
   printBridgeWorldNotice(parsed.wsPort, baseUrl)
   const savedSimId = readCurrentSimId()
   const shouldReuseCurrentSim = !openInNewSim
+  // every open stamps its page URL with a one-off token and matches the sim by
+  // it. a sim id alone cannot tell the page this open loaded from the page it
+  // replaced, which stays registered until the browser commits the navigation.
+  const token = `cli-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
+  const simMatchesToken = (sim: BridgeSimInfo) =>
+    sim.url?.includes(`inspectOpen=${token}`) ?? false
 
   if (shouldReuseCurrentSim) {
     const bridge = createBridgeFromParsed(parsed)
     const simHint = parsed.simId ? ` --sim ${parsed.simId}` : ''
     let fallBackToNewSim = false
-    let preNavSimIds = new Set<string>()
+    let navigatedShellUrl: string | null = null
 
     try {
       let targetSim: BridgeSimInfo | null = null
@@ -1585,27 +1591,24 @@ export async function runOpenCommand(
           }
         }
         if (!fallBackToNewSim && targetSim) {
-          // a navigation that crosses origins tears down the page context, so
-          // the guest reconnects as a NEW sim and the id we are holding stops
-          // existing. record what was connected first, so the wait below can
-          // follow the reload instead of polling an id the browser retired.
-          preNavSimIds = new Set(sims.map((sim) => sim.id))
           const resolvedBaseUrl =
             hasExplicitBaseUrl || looksLikeSootsimUrl(target)
               ? baseUrl
               : deriveCurrentSimBaseUrl(targetSim, baseUrl)
-          const shellUrl =
+          navigatedShellUrl =
             targetShellUrl ??
             (await buildShellUrl(
               target,
               applyRNXConfigToUrl(resolvedBaseUrl, runtimeConfig),
               buildShellUrlOpts,
             ))
+          const navigationUrl = new URL(navigatedShellUrl)
+          navigationUrl.searchParams.set('inspectOpen', token)
           bridge
             .send({
               type: 'evaluate',
               simId: targetSim.id,
-              code: `window.location.href = ${JSON.stringify(shellUrl)}`,
+              code: `window.location.href = ${JSON.stringify(navigationUrl.toString())}`,
             })
             .catch(() => {})
         }
@@ -1621,21 +1624,30 @@ export async function runOpenCommand(
         rnxExit(1)
       }
 
-      if (!fallBackToNewSim && targetSim) {
-        await sleep(1500)
-        const navSim = targetSim
-        const reloadedSim = await waitForSimMatch(
+      if (!fallBackToNewSim && targetSim && navigatedShellUrl) {
+        // the navigated page may keep the sim id (restored from session
+        // storage) or register a new one, so match by token, never by id.
+        const navigatedSim = await waitForSimMatch(
           parsed.wsPort,
           parsed.commandTimeoutMs,
           (sim) =>
             sim.readyState === 'open' &&
             simUsesDriver(sim, driverId) &&
-            (sim.id === navSim.id || (!preNavSimIds.has(sim.id) && sim.isPrimary)),
+            simMatchesToken(sim),
           { attempts: Math.round(30 * flowTimeoutScale()) },
         )
-        if (reloadedSim && reloadedSim.id !== navSim.id) {
-          targetSim = reloadedSim
+        if (!navigatedSim) {
+          console.error(
+            `  timed out waiting for sim ${targetSim.id} to load ${navigatedShellUrl}`,
+          )
+          await printBridgeFailureDiagnostics(bridge, {
+            errorsCommand: `rnx get errors 5${simHint}`,
+            warningsCommand: `rnx get warnings 5${simHint}`,
+            requestsCommand: `rnx get requests 5${simHint}`,
+          })
+          rnxExit(1)
         }
+        targetSim = navigatedSim
         const ready = await waitForSimReady(
           parsed.wsPort,
           parsed.commandTimeoutMs,
@@ -1659,18 +1671,12 @@ export async function runOpenCommand(
         }
         ready.bridge.close()
         saveCurrentSimId(targetSim.id)
-        const resolvedBaseUrl =
-          hasExplicitBaseUrl || looksLikeSootsimUrl(target)
-            ? baseUrl
-            : deriveCurrentSimBaseUrl(targetSim, baseUrl)
-        const shellUrl =
-          targetShellUrl ??
-          (await buildShellUrl(
-            target,
-            applyRNXConfigToUrl(resolvedBaseUrl, runtimeConfig),
-            buildShellUrlOpts,
-          ))
-        printOpenedSim(shellUrl, { ...targetSim, url: shellUrl }, 'current sim', quiet)
+        printOpenedSim(
+          navigatedShellUrl,
+          { ...targetSim, url: navigatedShellUrl },
+          'current sim',
+          quiet,
+        )
         await maybeDescribeAfterOpen(parsed.wsPort, targetSim.id, args)
         return parsed.wsPort
       }
@@ -1680,7 +1686,6 @@ export async function runOpenCommand(
   }
 
   const configuredBaseUrl = applyRNXConfigToUrl(baseUrl, runtimeConfig)
-  const token = `cli-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
   const openUrl = await buildOpenUrl(target, configuredBaseUrl, token, buildShellUrlOpts)
   const ownerPid = getStableOwnerPid()
   if (!ownerPid) {
@@ -1689,9 +1694,6 @@ export async function runOpenCommand(
     )
     rnxExit(1)
   }
-  const simMatchesToken = (sim: BridgeSimInfo) =>
-    sim.url?.includes(`inspectOpen=${token}`) ?? false
-
   const driver = getDriver(driverId)
   if (!driver) {
     console.error(`  unknown driver "${driverId}" — run \`rnx list --drivers\``)