rnxsim 0.1.344 → 0.1.345

package/cli/commands/setup.ts

@@ -5,7 +5,6 @@ import os from 'node:os'
 import path from 'node:path'
 import {
   COMPAT_RESULT_CAVEAT,
-  countScanResults,
   formatDetailedScanLines,
   formatScanCounts,
   scanDeps,
@@ -14,9 +13,7 @@ import {
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
 import { getCliVersion } from '../../src/cli-version'
 import {
-  isDaemonLockfileFresh,
   readActiveRuntime,
-  readDaemonLockfile,
   readPrivacyPreferences,
   runtimeDir,
   writePrivacyPreferences,
@@ -31,46 +28,27 @@ import {
   planRepositorySetup,
   type RepositorySetupPlan,
 } from '../setup-repository'
-import { trackCliEvent } from '../telemetry'
+import { trackCliError } from '../telemetry'
 import { daemonInstall, getDaemonServiceStatus } from './daemon'
+import { isAgentEnv } from './inspect/env'
 
 interface SetupOptions {
   appDir: string
   ci: boolean
   dryRun: boolean
-  fromWelcome: boolean
   json: boolean
   yes: boolean
   service: boolean | undefined
   repository: boolean | undefined
   productAnalytics: boolean | undefined
-  crashReports: boolean | undefined
-  shareCompatibility: boolean
-}
-
-export interface MachineSetupStatus {
-  daemonSupported: boolean
-  daemonInstalled: boolean
-  daemonRunning: boolean
-  runtimeInstalled: boolean
-  privacyConfigured: boolean
 }
 
 export interface SetupResult {
   runtimeVersion: string
   serviceInstalled: boolean
   repositoryPrepared: boolean
-  compatibilityShared: boolean
 }
 
-type SetupStage =
-  | 'decisions'
-  | 'runtime'
-  | 'repository'
-  | 'service'
-  | 'privacy'
-  | 'compatibility'
-
 export async function runSetup(args: string[]): Promise<SetupResult | undefined> {
   if (args.includes('--help') || args.includes('-h')) {
     printHelp()
@@ -78,25 +56,14 @@ export async function runSetup(args: string[]): Promise<SetupResult | undefined>
   }
 
   const options = parseSetupOptions(args)
-  let stage: SetupStage = 'decisions'
   try {
     const packageRoot = findPackageRoot(options.appDir)
     const serviceStatus = getDaemonServiceStatus()
     const privacy = readPrivacyPreferences()
     const service = await decideService(options, serviceStatus)
     const repository = await decideRepository(options, packageRoot)
-    const productAnalytics = await decidePrivacy(
-      options,
-      'productAnalytics',
-      privacy.productAnalytics,
-      privacy.configured,
-    )
-    const crashReports = await decidePrivacy(
-      options,
-      'crashReports',
-      privacy.crashReports,
-      privacy.configured,
-    )
+    const productAnalytics = await decidePrivacy(options, privacy)
+    const crashReports = false
 
     const manifest = await sootsimRuntime.fetchManifest()
     const resolvedRuntime = sootsimRuntime.resolveVersion(manifest, { channel: 'stable' })
@@ -117,9 +84,8 @@ export async function runSetup(args: string[]): Promise<SetupResult | undefined>
     printIntro(options)
     printMachineSection(options, serviceStatus, service, runtimeVersion)
     printRepositorySection(options, packageRoot, repositoryPlan)
-    printPrivacySection(options, productAnalytics, crashReports)
+    printPrivacySection(options, productAnalytics)
 
-    stage = 'runtime'
     let installed = false
     if (!options.dryRun) {
       const activeRuntime = readActiveRuntime()
@@ -132,7 +98,6 @@ export async function runSetup(args: string[]): Promise<SetupResult | undefined>
       installed = result.installed
     }
 
-    stage = 'repository'
     if (repositoryPlan) {
       await applyRepositorySetup(repositoryPlan, {
         dryRun: options.dryRun,
@@ -140,31 +105,23 @@ export async function runSetup(args: string[]): Promise<SetupResult | undefined>
       })
     }
 
-    stage = 'service'
     let serviceInstalled = serviceStatus.installed
     if (service && !serviceStatus.installed && !options.dryRun) {
       await daemonInstall({ port: DEFAULT_SOOTSIM_BRIDGE_PORT, force: false })
       serviceInstalled = true
     }
 
-    stage = 'privacy'
     if (!options.dryRun) {
       writePrivacyPreferences({ productAnalytics, crashReports })
     }
 
-    stage = 'compatibility'
     const scan = packageRoot ? scanPackage(packageRoot) : null
-    const shareCompatibility = await decideCompatibilitySharing(options, scan)
-    if (shareCompatibility && scan && packageRoot && !options.dryRun) {
-      await shareCompatibilityScan(packageRoot, scan)
-    }
-    printCompatibilitySection(options, scan, shareCompatibility)
+    printCompatibilitySection(options, scan)
 
     const result: SetupResult = {
       runtimeVersion,
       serviceInstalled,
       repositoryPrepared: repositoryPlan !== null,
-      compatibilityShared: shareCompatibility && !options.dryRun,
     }
     const cache = runtimeCacheMetadata(runtimeVersion)
     if (options.json) {
@@ -187,53 +144,13 @@ export async function runSetup(args: string[]): Promise<SetupResult | undefined>
       printReadySection(repositoryPlan)
     }
 
-    const counts = scan ? countScanResults(scan) : null
-    trackCliEvent({
-      event: 'cli_setup_completed',
-      properties: {
-        service_installed: serviceInstalled,
-        repository_prepared: repositoryPlan !== null,
-        product_analytics: productAnalytics,
-        crash_reports: crashReports,
-        compat_supported: counts?.supported ?? 0,
-        compat_partial: counts?.partial ?? 0,
-        compat_unsupported: counts?.unsupported ?? 0,
-        compat_not_yet_verified: counts?.notYetVerified ?? 0,
-        from_welcome: options.fromWelcome,
-        ci: options.ci,
-        dry_run: options.dryRun,
-      },
-    })
     return result
   } catch (error) {
-    const message = boundedMessage(error)
-    trackCliEvent({
-      event: 'cli_setup_failed',
-      properties: { stage, message },
-    })
+    trackCliError(error)
     throw error
   }
 }
 
-export function readMachineSetupStatus(): MachineSetupStatus {
-  const service = getDaemonServiceStatus()
-  const lock = readDaemonLockfile()
-  const activeRuntime = readActiveRuntime()
-  return {
-    daemonSupported: service.supported,
-    daemonInstalled: service.installed,
-    daemonRunning: Boolean(lock && isDaemonLockfileFresh(lock)),
-    runtimeInstalled: Boolean(activeRuntime && fs.existsSync(runtimeDir(activeRuntime))),
-    privacyConfigured: readPrivacyPreferences().configured,
-  }
-}
-
-export function shouldRunSetupForBareCommand(
-  status: MachineSetupStatus = readMachineSetupStatus(),
-): boolean {
-  return !status.runtimeInstalled || !status.privacyConfigured
-}
-
 function parseSetupOptions(args: string[]): SetupOptions {
   const appIndex = args.indexOf('--app')
   const appArg = appIndex >= 0 ? args[appIndex + 1] : undefined
@@ -244,16 +161,13 @@ function parseSetupOptions(args: string[]): SetupOptions {
   const repository = readBooleanFlag(args, '--repo', '--no-repo')
   return {
     appDir: path.resolve(appArg ?? process.cwd()),
-    ci: args.includes('--ci'),
+    ci: args.includes('--ci') || isAgentEnv(),
     dryRun: args.includes('--dry-run'),
-    fromWelcome: args.includes('--from-welcome'),
     json: args.includes('--json'),
     yes: args.includes('--yes') || args.includes('-y'),
     service,
     repository,
     productAnalytics: readOnOffFlag(args, '--analytics'),
-    crashReports: readOnOffFlag(args, '--crash-reports'),
-    shareCompatibility: args.includes('--share-compat'),
   }
 }
 
@@ -312,34 +226,13 @@ async function decideRepository(
 
 async function decidePrivacy(
   options: SetupOptions,
-  key: 'productAnalytics' | 'crashReports',
-  current: boolean,
-  configured: boolean,
+  current: ReturnType<typeof readPrivacyPreferences>,
 ): Promise<boolean> {
-  const explicit =
-    key === 'productAnalytics' ? options.productAnalytics : options.crashReports
-  if (explicit !== undefined) return explicit
-  if (configured) return current
-  if (options.yes) return true
-  const flag =
-    key === 'productAnalytics' ? '--analytics on|off' : '--crash-reports on|off'
-  requireInteractive(options, flag)
-  const question =
-    key === 'productAnalytics'
-      ? 'Share bounded product analytics?'
-      : 'Send bounded crash reports?'
-  return confirm(question, true)
-}
-
-async function decideCompatibilitySharing(
-  options: SetupOptions,
-  scan: ScanResult | null,
-): Promise<boolean> {
-  if (!scan) return false
-  if (options.shareCompatibility) return true
-  if (options.yes || !process.stdin.isTTY) return false
+  if (options.productAnalytics !== undefined) return options.productAnalytics
+  if (current.configured) return current.productAnalytics
+  if (options.yes || options.ci || !process.stdin.isTTY) return false
   return confirm(
-    'Share dependency names, requested versions, framework, and this compatibility result?',
+    'Share anonymous package incompatibilities and error classes to improve rnx?',
     false,
   )
 }
@@ -359,51 +252,6 @@ function scanPackage(packageRoot: string): ScanResult {
   return scanDeps(parsed)
 }
 
-async function shareCompatibilityScan(
-  packageRoot: string,
-  scan: ScanResult,
-): Promise<void> {
-  const parsed: unknown = JSON.parse(
-    fs.readFileSync(path.join(packageRoot, 'package.json'), 'utf8'),
-  )
-  if (!parsed || typeof parsed !== 'object')
-    throw new Error('package.json must be an object')
-  const response = await fetch('https://contrast.dev/api/scan', {
-    method: 'POST',
-    headers: { 'content-type': 'application/json' },
-    body: JSON.stringify(buildCompatibilitySharePayload(parsed, scan)),
-    signal: AbortSignal.timeout(10_000),
-  })
-  if (!response.ok) {
-    throw new Error(`compatibility sharing failed with HTTP ${response.status}`)
-  }
-}
-
-export function buildCompatibilitySharePayload(manifest: object, scan: ScanResult) {
-  return {
-    dependencies: boundedDependencies(Reflect.get(manifest, 'dependencies')),
-    devDependencies: boundedDependencies(Reflect.get(manifest, 'devDependencies')),
-    framework: scan.framework,
-    result: {
-      framework: scan.framework,
-      rnVersion: scan.rnVersion,
-      packages: scan.packages.slice(0, 200),
-    },
-    source: 'desktop',
-    shared: true,
-  }
-}
-
-function boundedDependencies(value: unknown): Record<string, string> {
-  if (!value || typeof value !== 'object') return {}
-  const output: Record<string, string> = {}
-  for (const [name, version] of Object.entries(value).slice(0, 200)) {
-    if (typeof version !== 'string') continue
-    output[name.slice(0, 160)] = version.slice(0, 80)
-  }
-  return output
-}
-
 function runtimeCacheMetadata(runtimeVersion: string) {
   const platform = os.platform()
   const arch = os.arch()
@@ -416,7 +264,7 @@ function runtimeCacheMetadata(runtimeVersion: string) {
 
 function printIntro(options: SetupOptions): void {
   if (options.json) return
-  console.log(`\n  ${options.fromWelcome ? 'welcome to rnx' : 'rnx setup'}`)
+  console.log(`\n  rnx setup`)
 }
 
 function printMachineSection(
@@ -454,31 +302,17 @@ function printRepositorySection(
   }
 }
 
-function printPrivacySection(
-  options: SetupOptions,
-  productAnalytics: boolean,
-  crashReports: boolean,
-): void {
+function printPrivacySection(options: SetupOptions, productAnalytics: boolean): void {
   if (options.json) return
   console.log(`\n  3. privacy`)
-  console.log(`     product analytics: ${productAnalytics ? 'on' : 'off'}`)
-  console.log(
-    `       command, feature, version, platform, and bounded performance events`,
-  )
-  console.log(`     crash reports: ${crashReports ? 'on' : 'off'}`)
-  console.log(
-    `       error type, message, stack, runtime version, platform, and bounded dependency summary`,
-  )
+  console.log(`     bounded diagnostics: ${productAnalytics ? 'on' : 'off'}`)
+  console.log(`       package name/version/unsupported API or error class only`)
   console.log(
-    `     source files, environment values, terminal output, app data, screenshots, and recordings are not included`,
+    `     source, paths, project names, app content, identity, and command usage are never included`,
   )
 }
 
-function printCompatibilitySection(
-  options: SetupOptions,
-  scan: ScanResult | null,
-  shared: boolean,
-): void {
+function printCompatibilitySection(options: SetupOptions, scan: ScanResult | null): void {
   if (options.json) return
   console.log(`\n  4. compatibility`)
   if (!scan) {
@@ -488,7 +322,6 @@ function printCompatibilitySection(
   console.log(`     ${formatScanCounts(scan)}`)
   for (const line of formatDetailedScanLines(scan)) console.log(`     ${line}`)
   console.log(`     ${COMPAT_RESULT_CAVEAT}`)
-  console.log(`     dependency sharing: ${shared ? 'yes' : 'no'}`)
 }
 
 function printReadySection(repository: RepositorySetupPlan | null): void {
@@ -511,11 +344,6 @@ function printReadySection(repository: RepositorySetupPlan | null): void {
   )
 }
 
-function boundedMessage(error: unknown): string {
-  const message = error instanceof Error ? error.message : String(error)
-  return message.replace(/(?:\/?[\w.-]+)+/g, '<path>').slice(0, 240)
-}
-
 function printHelp(): void {
   console.log(`
 rnx setup — configure a machine and optionally prepare the current repository
@@ -530,11 +358,9 @@ decisions:
   --service | --no-service
   --repo | --no-repo
   --analytics on|off
-  --crash-reports on|off
-  --share-compat
 
 automation:
-  --yes       accept defaults; compatibility sharing still defaults off
+  --yes       accept setup defaults; diagnostics remain off unless explicitly enabled
   --ci        never prompt or install a background service
   --json      emit runtime/cache metadata as JSON
   --dry-run   print exact repository operations without changing the machine

package/cli/commands/telemetry.ts

@@ -13,7 +13,9 @@ import {
 
 function printStatus(): void {
   const preferences = readPrivacyPreferences()
-  console.log(`  product analytics are ${preferences.productAnalytics ? 'ON' : 'OFF'}`)
+  const enabled = preferences.configured && preferences.productAnalytics
+  console.log(`  bounded diagnostics are ${enabled ? 'ON' : 'OFF'}`)
+  console.log('  permitted fields: package name/version/unsupported API or error class')
   console.log(`  config: ${configFilePath()}`)
   const doNotTrack = process.env.DO_NOT_TRACK
   if (doNotTrack === '1' || doNotTrack === 'true') {
@@ -33,14 +35,14 @@ export async function runTelemetry(args: string[]): Promise<void> {
       return
 
     case 'on':
-      writePrivacyPreferences({ ...readPrivacyPreferences(), productAnalytics: true })
-      console.log('  product analytics ON')
+      writePrivacyPreferences({ productAnalytics: true, crashReports: false })
+      console.log('  bounded diagnostics ON')
       console.log(`  config: ${configFilePath()}`)
       return
 
     case 'off':
-      writePrivacyPreferences({ ...readPrivacyPreferences(), productAnalytics: false })
-      console.log('  product analytics OFF')
+      writePrivacyPreferences({ productAnalytics: false, crashReports: false })
+      console.log('  bounded diagnostics OFF')
       console.log(`  config: ${configFilePath()}`)
       return
 

package/cli/commands/upload.ts

@@ -21,14 +21,12 @@ import {
   isTraceTimelineEvent,
   parseTraceTimelineJsonl,
 } from 'sootsim-engine/preview/trace'
-import { readSharedDesktopAuthSession } from '../../src/auth/shared-session'
 import { rnxPublicBrand } from '../../src/public-brand'
 import { fetchAppFontFiles } from '../app-fonts'
 import { fetchAppSplashImages } from '../app-splash'
 import { authHeaderValue, githubUploadIdentity, resolveCliAuth } from '../auth'
 import { openUrl } from '../open-url'
 import { resolveRunProvenance } from '../run-registry'
-import { flushCliTelemetry, trackCliEvent } from '../telemetry'
 import { createBridgeFromParsed, evalInBridge, parseBridgeCliArgs } from '../ws-bridge'
 import type { SootSimTimelineEvent } from '@sootsim/globals'
 
@@ -114,25 +112,11 @@ const REMOTE_DEFAULT_ORIGIN = process.env.SOOTSIM_UPLOAD_ORIGIN || 'https://cont
 // reviewers/users open SootSim preview pages on sootsim.com.
 const REMOTE_DEFAULT_PUBLIC_PREVIEW_ORIGIN =
   process.env.SOOTSIM_PREVIEW_ORIGIN || rnxPublicBrand.origin
-const LOCAL_DEFAULT_ORIGIN = 'https://contrast.localhost:3000'
-const LOCAL_UPLOAD_PROBE_TIMEOUT_MS = 2_000
-
 export async function resolveDefaultUploadOrigin(
   explicitOrigin?: string,
 ): Promise<string> {
   if (explicitOrigin) return explicitOrigin
   if (process.env.SOOTSIM_UPLOAD_ORIGIN) return process.env.SOOTSIM_UPLOAD_ORIGIN
-
-  try {
-    const res = await fetch(`${LOCAL_DEFAULT_ORIGIN}/api/preview/upload/init`, {
-      method: 'OPTIONS',
-      signal: AbortSignal.timeout(LOCAL_UPLOAD_PROBE_TIMEOUT_MS),
-    })
-    if (res.ok || res.status === 204 || res.status === 405) {
-      return LOCAL_DEFAULT_ORIGIN
-    }
-  } catch {}
-
   return REMOTE_DEFAULT_ORIGIN
 }
 
@@ -188,9 +172,7 @@ usage:
   rnx record upload [--origin <url>] [--public-origin <url>] (--events <path> | --video <path>) [--screenshot <path>] [--owner <org> --repo <repo>] [--sim <sim>] [--open] [--assets-only]
 
 options:
-  --origin <url>     upload target (default: auto)
-                     prefers ${LOCAL_DEFAULT_ORIGIN} when available, otherwise
-                     falls back to ${REMOTE_DEFAULT_ORIGIN}
+  --origin <url>     upload target (default: ${REMOTE_DEFAULT_ORIGIN})
                      override with SOOTSIM_UPLOAD_ORIGIN env var
   --public-origin <url>
                      public /preview link origin (default: ${REMOTE_DEFAULT_PUBLIC_PREVIEW_ORIGIN}
@@ -848,14 +830,12 @@ export async function runUpload(
         : undefined
     if (!videoContentType) {
       console.error('  preview flow videos must be mp4 or gif')
-      await flushCliTelemetry()
       process.exit(1)
     }
     if (videoDurationMsRaw) {
       const parsed = Number(videoDurationMsRaw)
       if (!Number.isFinite(parsed) || parsed <= 0) {
         console.error(`  invalid --video-duration-ms: ${videoDurationMsRaw}`)
-        await flushCliTelemetry()
         process.exit(1)
       }
       videoDurationMs = Math.round(parsed)
@@ -871,34 +851,11 @@ export async function runUpload(
   const cliAuth = resolveCliAuth()
   const gitHubIdentity = githubUploadIdentity(cliAuth)
   const provenance = resolveRunProvenance()
-  const sharedSession = readSharedDesktopAuthSession()
-  trackCliEvent({
-    event: 'preview_upload_started',
-    identity: {
-      userId: cliAuth?.kind === 'session' ? (sharedSession?.user?.id ?? null) : null,
-      repoId: gitHubIdentity?.repoId ?? null,
-      installationId: gitHubIdentity?.installationId ?? null,
-    },
-    properties: {
-      origin,
-      hasAuth: Boolean(cliAuth),
-      authMode: cliAuth?.kind ?? 'none',
-      bundleBytes: bundleBytes.byteLength,
-      isTransformed,
-      extraFiles: extrasOk.length,
-      recordedFetches: recordedFetches.length,
-      hasEvents: Boolean(eventsGz),
-      traceTimelineEvents: traceTimelineEvents.length,
-      hasScreenshot: Boolean(screenshotBytes),
-      hasVideo: Boolean(videoBytes),
-    },
-  })
   if (!cliAuth) {
     console.error('  preview uploads need auth.')
     console.error(
       '  set RNX_API_KEY=sk_rnx_..., run `rnx login`, or use the Contrast github runner.',
     )
-    await flushCliTelemetry()
     process.exit(1)
   }
   const resolvedAuthHeader = authHeaderValue(cliAuth)
@@ -1194,7 +1151,6 @@ export async function runUpload(
     if (e.phase === 'init' && e.status === 401) {
       console.error('  preview upload requires a valid login.')
       console.error('  run `rnx login` and retry.')
-      await flushCliTelemetry()
       process.exit(1)
     }
     if (e.status === 402) {
@@ -1202,13 +1158,11 @@ export async function runUpload(
       console.error(
         `  ${parseServerMessage(e.responseText) ?? 'preview uploads require Personal, Team, or an active trial — upgrade from the billing dialog.'}`,
       )
-      await flushCliTelemetry()
       process.exit(1)
     }
     // PresignedUploadError.message already carries the "<phase> failed:"
     // prefix — don't re-prefix it (that produced "init failed: init failed:").
     console.error(`  ${e.message ?? `${e.phase ?? 'upload'} failed: ${String(err)}`}`)
-    await flushCliTelemetry()
     process.exit(1)
   }
 
@@ -1220,6 +1174,5 @@ export async function runUpload(
     await openUrl(previewUrl)
   }
 
-  await flushCliTelemetry()
   return { previewUrl, shareId: finalize.id }
 }

package/cli/commands/welcome.ts

@@ -0,0 +1,64 @@
+import { scanDevServers, type DiscoveredServer } from '../../scripts/dev-server-scanner'
+import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
+import { readPrivacyPreferences } from '../../src/home-paths'
+import { canPromptForPrivacyChoice } from '../privacy'
+import { select } from '../prompt'
+import { createBridge } from '../ws-bridge'
+import { runOpenCommand } from './control'
+
+function serverLabel(server: DiscoveredServer): string {
+  return `${server.projectName?.trim() || server.framework} on :${server.port}`
+}
+
+async function chooseServer(
+  discovered: DiscoveredServer[],
+): Promise<DiscoveredServer | null> {
+  if (discovered.length === 0) return null
+  const ordered = [...discovered].sort((a, b) => a.port - b.port)
+  if (ordered.length === 1 || !canPromptForPrivacyChoice()) return ordered[0] ?? null
+  const selected = await select(
+    'which running app should rnx open?',
+    ordered.map(serverLabel),
+  )
+  return ordered[selected] ?? ordered[0] ?? null
+}
+
+export async function runWelcome(): Promise<number> {
+  const privacy = readPrivacyPreferences()
+  console.log('\n  welcome to rnx')
+  console.log(
+    `  diagnostics: ${privacy.configured && privacy.productAnalytics ? 'bounded opt-in on' : 'off until you opt in'}`,
+  )
+  console.log('  looking for a running React Native app…')
+
+  const selected = await chooseServer(
+    await scanDevServers({ excludePorts: [DEFAULT_SOOTSIM_BRIDGE_PORT] }),
+  )
+  if (!selected) {
+    console.error('  no running React Native development server found.')
+    console.error('  start your app normally, then run `npx rnxsim` again.')
+    return 1
+  }
+
+  console.log(`  found ${serverLabel(selected)} · opening simulator…`)
+  const bridgePort = await runOpenCommand([selected.bundleUrl])
+  if (bridgePort !== undefined) {
+    const { runInspect } = await import('./inspect')
+    await runInspect(['wait', 'ready', '--max-ms', '120000'], { port: bridgePort })
+    const bridge = createBridge(bridgePort, { commandTimeoutMs: 45_000 })
+    try {
+      const frame: unknown = await bridge.send({ type: 'screenshot' })
+      const pngPrefix = 'data:image/png;base64,'
+      if (
+        typeof frame !== 'string' ||
+        !frame.startsWith(pngPrefix) ||
+        frame.length <= pngPrefix.length
+      ) {
+        throw new Error('the simulator connected but did not produce a visible app frame')
+      }
+    } finally {
+      bridge.close()
+    }
+  }
+  return 0
+}