peachsim 0.1.629 → 0.1.631

package/cli/drivers/playwright-provisioning.ts

@@ -2,9 +2,9 @@ import { spawnSync } from 'node:child_process'
 import { existsSync, readFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import { dirname, join } from 'node:path'
+import { isRecord } from '../../src/is-record'
 import { RNX_INTERNAL_CHILDREN, RNX_INTERNAL_COMMAND } from '../internal-child'
 import { rnxSelfInvocation } from '../self-invocation'
-import { isRecord } from '../../src/is-record'
 
 export interface ResolvedPlaywright {
   // package name that resolved (for human-facing messaging)
@@ -32,7 +32,8 @@ export function resolvePlaywright(): ResolvedPlaywright | null {
   // resolve from several roots, not just cwd. a user can invoke a global CLI
   // from an arbitrary directory while Playwright is installed beside the CLI.
   const roots = [`${process.cwd()}/`]
-  if (process.argv[1]) roots.push(process.argv[1])
+  const self = rnxSelfInvocation()
+  roots.push(self.prefixArgs[0] ?? self.executable)
   for (const root of roots) {
     try {
       const requireFromRoot = createRequire(root)

package/cli/drivers/playwright-sim-host.ts

@@ -2,6 +2,11 @@ import {
   readBrowserCompositeCaptureRequest,
   resolveBrowserCompositeCdpClip,
 } from '../../../peach-engine/src/capture/browser-composite'
+import {
+  AUTH_BROWSER_EXTERNAL_NAVIGATION_EVENT,
+  AUTH_BROWSER_SESSION_FRAGMENT_KEY,
+  forwardPopupSchemeNavigations,
+} from '../../../peach-engine/src/open-external'
 import { createBrowserPointerDispatcher } from '../../../peach-engine/src/render-worker/browser-pointer'
 // the detached browser host, as CJS source.
 //
@@ -46,11 +51,13 @@ const cdpPort = process.env.SOOTSIM_PW_CDP_PORT || '';
 const extraChromeArgs = (process.env.SOOTSIM_PW_CHROME_ARGS || '')
   .split(' ')
   .filter(Boolean);
-// Local CanvasKit work must never fall back to Playwright's software
-// renderer. CI may use the bundled browser for non-interactive coverage, but
-// local test drives fail closed unless the hardware-backed test browser is
-// proven after launch.
-const hardwareGpuRequired = process.env.CI !== '1' && process.env.CI !== 'true';
+// A Mac always has a GPU, so a local macOS drive that lands on Playwright's
+// software renderer is a misconfiguration that pegs every core: it fails
+// closed unless the hardware-backed test browser is proven after launch. CI
+// and Linux or Windows hosts, which are often GPU-less servers, use the
+// bundled browser and render in software when no GPU is present.
+const hardwareGpuRequired =
+  process.platform === 'darwin' && process.env.CI !== '1' && process.env.CI !== 'true';
 const softwareRendererPattern = /swiftshader|software(?: rasterizer)?|llvmpipe|lavapipe|softpipe/i;
 // page viewport as '<w>x<h>'. the caller sizes it from the device profile;
 // the fallback is phone-shaped because the page hosts a phone sim — the
@@ -74,6 +81,7 @@ const { execSync } = require('child_process');
 const { tmpdir } = require('os');
 const { join } = require('path');
 const createBrowserPointerDispatcher = ${createBrowserPointerDispatcher.toString()};
+const forwardPopupSchemeNavigations = ${forwardPopupSchemeNavigations.toString()};
 const readBrowserCompositeCaptureRequest = ${readBrowserCompositeCaptureRequest.toString()};
 const resolveBrowserCompositeCdpClip = ${resolveBrowserCompositeCdpClip.toString()};
 // chrome tree reaper — playwright's browser.close() and even SIGKILLing the
@@ -300,9 +308,9 @@ const cleanupProfile = () => {
   startOwnerWatch();
   // Local rendering uses Playwright's full Chrome for Testing app. On macOS its
   // com.google.chrome.for.testing identity cannot intercept open/quit events for
-  // the user's com.google.Chrome browser. CI may use chromium_headless_shell;
-  // local rendering fails closed because that shell has no GPU and silently
-  // chooses SwiftShader. NOTE: this is NOT enough to make \`peach perf cpu\`
+  // the user's com.google.Chrome browser. CI and non-Mac hosts use
+  // chromium_headless_shell; local Mac rendering fails closed because that
+  // shell has no GPU and silently chooses SwiftShader. NOTE: this is NOT enough to make \`peach perf cpu\`
   // work — that profiles the tenant *worker*, and the JS Self-Profiler API
   // cannot be constructed in a dedicated worker (see
   // worker-handlers/cpu-profile.ts). cpu-profile needs a CDP-based profiler
@@ -317,7 +325,8 @@ const cleanupProfile = () => {
     throw new Error('[playwright-driver] refused SwiftShader launch arguments');
   }
   // one browser path per environment: the full, separately identified test app
-  // locally; chromium_headless_shell on CI. never launch a branded user browser.
+  // on a local Mac; the bundled chromium everywhere else. never launch a
+  // branded user browser.
   const channelsToTry = hardwareGpuRequired ? ['chromium'] : [null];
   const launchWith = async (channel) => {
     const opts = channel
@@ -429,6 +438,13 @@ const cleanupProfile = () => {
   await context.addInitScript({
     content: 'Object.defineProperty(window, "__sootsimHostMeta", { value: ' + JSON.stringify(hostMeta) + ', configurable: true });' + bridgePortInject,
   });
+  // ASWebAuthenticationSession completes on a navigation to its callback
+  // scheme, which a browser popup cannot follow.
+  await forwardPopupSchemeNavigations(
+    context,
+    ${JSON.stringify(AUTH_BROWSER_EXTERNAL_NAVIGATION_EVENT)},
+    ${JSON.stringify(AUTH_BROWSER_SESSION_FRAGMENT_KEY)},
+  );
   await context.exposeBinding('__sootsimHostClose', async () => {
     await shutdown(0);
   });

package/cli/main.ts

@@ -2,6 +2,7 @@
 // single lazy-imported command a run dispatches to. `./bin` imports this only
 // when none of its hidden entry points claimed the process.
 
+import { automaticPeachUpdatesEnabled } from '../src/automatic-update-policy'
 import { rnxPublicBrand } from '../src/public-brand'
 import { levenshtein } from './levenshtein'
 import { COMMANDS, parseArgs, TOP_LEVEL_RUNTIME_COMMANDS } from './parse-args'
@@ -21,7 +22,10 @@ import { IS_STANDALONE } from './standalone'
 // "command timed out after 10s" message and is uncopyable for a bug report.
 // rejections that don't match this shape still get the verbose stack so we
 // don't paper over real bugs.
-function handleTopLevelError(err: unknown): never {
+async function handleTopLevelError(err: unknown): Promise<never> {
+  const { trackCliError, flushCliTelemetry } = await import('./telemetry')
+  trackCliError(err)
+  await flushCliTelemetry()
   const msg = err instanceof Error ? err.message : String(err)
   // peach's known top-level errors are all single-line, narrow strings.
   // everything else gets the full stack so unexpected crashes still surface.
@@ -92,7 +96,7 @@ const isReadOnlyInvocation =
   parsed.commandArgs.includes('--dry-run')
 
 if (isCliUpdateWorker) {
-  if (IS_STANDALONE) {
+  if (IS_STANDALONE && automaticPeachUpdatesEnabled()) {
     try {
       const { refreshCliUpdateCache } = await import('./cli-update')
       await refreshCliUpdateCache()
@@ -119,7 +123,12 @@ if (
 // interactive command runs next prints it once (stderr, so --json stdout
 // stays parseable) and deletes it. the daemon/serve processes skip it so a
 // background process can't eat the notice before a human sees it.
-if (!isReadOnlyInvocation && parsed.command !== 'serve' && parsed.command !== 'daemon') {
+if (
+  automaticPeachUpdatesEnabled() &&
+  !isReadOnlyInvocation &&
+  parsed.command !== 'serve' &&
+  parsed.command !== 'daemon'
+) {
   const { consumeRuntimeUpgradeNotice } = await import('../src/home-paths')
   const notice = consumeRuntimeUpgradeNotice()
   if (notice) {
@@ -589,6 +598,11 @@ try {
         break
       }
 
+      case 'project-report': {
+        const { runProjectReport } = await import('./commands/project-report')
+        await exitWithFlush(runProjectReport(parsed.commandArgs))
+      }
+
       case 'report-issue': {
         const { runReportIssue } = await import('./commands/report-issue')
         const code = await runReportIssue(parsed.commandArgs)
@@ -708,5 +722,7 @@ try {
   throw error
 }
 
+const { flushCliTelemetry } = await import('./telemetry')
+await flushCliTelemetry()
 await scheduleAutomaticCliUpdate(0)
 await scheduleAutomaticCleanup()

package/cli/outbound-endpoints.ts

@@ -38,7 +38,8 @@ export const OUTBOUND_ENDPOINTS: Record<string, OutboundEndpointDeclaration> = {
     category: 'bounded-diagnostics',
     destination: 'configured PostHog ingestion host',
     preConsent: false,
-    payload: 'package name/version/unsupported API or error class only',
+    payload:
+      'anonymous install id, CLI/runtime versions, OS/arch, command name, package compatibility fields, error class and bounded path-redacted first-line error/warning messages',
   },
   contrast_user_action: {
     category: 'explicit-user-action',
@@ -349,12 +350,8 @@ export const DECLARED_OUTBOUND_CALLS: Record<string, OutboundCallDeclaration> =
     category: 'guest_app_network',
     count: 1,
   },
-  'packages/peach-engine/src/engine/config-plugin-splash-loader.ts :: fetch :: manifestFetchUrl(origin)':
-    { category: 'local_development', count: 1 },
   'packages/peach-engine/src/engine/emoji-metrics-font-loader.ts :: fetch :: attemptedBundledUrl':
     { category: 'same_origin_runtime', count: 1 },
-  'packages/peach-engine/src/engine/expo-app-config.ts :: fetch :: manifestFetchUrl(origin)':
-    { category: 'local_development', count: 1 },
   'packages/peach-engine/src/engine/image-loader.ts :: fetch :: resolveImageFetchUri(uri)':
     { category: 'guest_app_network', count: 1 },
   'packages/peach-engine/src/engine/language-font-loader.ts :: fetch :: url': {

package/cli/privacy.ts

@@ -23,7 +23,6 @@ export function diagnosticsAllowedForCurrentProcess(
 ): boolean {
   const doNotTrack = process.env.DO_NOT_TRACK
   if (doNotTrack === '1' || doNotTrack === 'true') return false
-  if (!canPromptForPrivacyChoice()) return false
   return preferences.configured && preferences.productAnalytics
 }
 
@@ -42,7 +41,7 @@ export async function ensurePrivacyChoice(options: {
   }
 
   const allowed = await confirm(
-    'Share anonymous package incompatibilities and error classes to improve peach?',
+    'Share anonymous diagnostics, including CI and agent runs: CLI/runtime versions, OS/arch, command name, random install ID, package incompatibilities, error class, and first-line error/warning messages (300 characters, paths redacted; no arguments, stacks, source or structured app data)?',
     false,
   )
   // the engine's historical analytics and crash transports carry broader

package/cli/runtime-diagnostics.ts

@@ -0,0 +1,51 @@
+import { consoleEntriesEval, type InspectBridge } from './commands/inspect/core'
+import { diagnosticsAllowedForCurrentProcess } from './privacy'
+import { setDiagnosticRuntimeVersion, trackCliDiagnostic } from './telemetry'
+
+// reuse the same local console/error stores the CLI already inspects. only
+// message strings cross into the diagnostic queue, never stacks or objects.
+export async function collectRuntimeDiagnostics(bridge: InspectBridge): Promise<void> {
+  if (!diagnosticsAllowedForCurrentProcess()) return
+  try {
+    const result: unknown = await bridge.send(
+      {
+        type: 'evaluate',
+        code: `(() => {
+        const messages = []
+        const add = (kind, message) => {
+          if (typeof message === 'string' && message) messages.push({ kind, message: message.slice(0, 2048) })
+        }
+        const obs = window.__sootsimObservability
+        for (const e of (obs?.reportedErrors?.getSnapshot?.() || []).slice(-20)) add('runtime_error', e.message)
+        for (const [kind, entries] of [
+          ['runtime_error', ${consoleEntriesEval('error', 20)}],
+          ['runtime_warning', ${consoleEntriesEval('warn', 20)}],
+        ]) {
+          for (const e of entries) {
+            const parts = e.args.map(a => typeof a === 'string' ? a : typeof a?.message === 'string' ? a.message : '').filter(Boolean)
+            add(kind, parts.join(' '))
+          }
+        }
+        return { runtimeVersion: window.__sootsimRuntimeVersion, messages: messages.slice(0, 50) }
+      })()`,
+      },
+      { timeoutMs: 1000 },
+    )
+    if (!result || typeof result !== 'object') return
+    if ('runtimeVersion' in result && typeof result.runtimeVersion === 'string') {
+      setDiagnosticRuntimeVersion(result.runtimeVersion)
+    }
+    if (!('messages' in result) || !Array.isArray(result.messages)) return
+    for (const entry of result.messages.slice(0, 50)) {
+      if (!entry || typeof entry !== 'object') continue
+      if (
+        (entry.kind === 'runtime_error' || entry.kind === 'runtime_warning') &&
+        typeof entry.message === 'string'
+      ) {
+        trackCliDiagnostic({ kind: entry.kind, message: entry.message })
+      }
+    }
+  } catch {
+    // diagnostics never delay a failed bridge beyond this bounded probe.
+  }
+}

package/cli/telemetry.ts

@@ -1,3 +1,7 @@
+import { homedir } from 'node:os'
+import { getCliVersion } from '../src/cli-version'
+import { readActiveRuntime, readOrCreateAnonymousId } from '../src/home-paths'
+import { parseArgs } from './parse-args'
 import { diagnosticsAllowedForCurrentProcess } from './privacy'
 
 type PackageIncompatibility = {
@@ -10,9 +14,15 @@ type PackageIncompatibility = {
 type ErrorShape = {
   kind: 'error_shape'
   errorClass: string
+  message: string
 }
 
-export type CliDiagnostic = PackageIncompatibility | ErrorShape
+type RuntimeMessage = {
+  kind: 'runtime_error' | 'runtime_warning'
+  message: string
+}
+
+export type CliDiagnostic = PackageIncompatibility | ErrorShape | RuntimeMessage
 
 type Config = { apiKey: string; host: string }
 
@@ -32,6 +42,46 @@ function bounded(value: string, max: number): string {
   return value.trim().slice(0, max)
 }
 
+export function sanitizeDiagnosticMessage(value: string): string {
+  const firstLine = value.slice(0, 2048).split(/[\r\n\u2028\u2029]/, 1)[0] ?? ''
+  // retain package names from dependency paths, never source filenames,
+  // URL paths/queries, local paths, stack frames, or serialized app objects.
+  return firstLine
+    .split(homedir())
+    .join('<home>')
+    .replace(
+      /<package:(?:@[\w.-]+\/)?[\w.-]+>|(?:https?:\/\/|file:\/\/|[A-Za-z]:[\\/]|<home>[\\/]|\/|\.{1,2}[\\/]|\b[\w.-]+[\\/])[^\s"'<>]+/g,
+      (location) => {
+        if (location.startsWith('<package:')) return location
+        const dependency = /(?:^|[\\/])node_modules[\\/]((?:@[^\\/]+[\\/])?[^\\/]+)/.exec(
+          location,
+        )
+        return dependency ? `<package:${dependency[1]?.replace(/\\/g, '/')}>` : '<path>'
+      },
+    )
+    .replace(/\b[\w.-]+\.(?:tsx?|jsx?|swift|m|mm|kt|java)(?::\d+(?::\d+)?)?/g, '<source>')
+    .replace(/\{.*$|\[(?:\s*["'{\d]|$).*$/g, '<data>')
+    .replace(
+      /\b(?:const|let|var)\s+\w+\s*=.*$|\b(?:function|class)\s+\w+.*$|\b(?:import|export)\s+.*$|\breturn\s*[({<].*$/g,
+      '<source>',
+    )
+    .replace(/^\s*at\s+.*$|\bat\s+[\w.$<>]+\s*\([^)]*\)/g, '<stack>')
+    .trim()
+    .slice(0, 300)
+}
+
+let observedRuntimeVersion: string | null = null
+
+function diagnosticVersion(version: string | null): string | null {
+  return version && version.length <= 80 && /^\d+\.\d+\.\d+(?:-[\w.-]+)?$/.test(version)
+    ? version
+    : null
+}
+
+export function setDiagnosticRuntimeVersion(version: string): void {
+  observedRuntimeVersion = diagnosticVersion(version)
+}
+
 export function buildCliDiagnosticEvent(diagnostic: CliDiagnostic) {
   const properties =
     diagnostic.kind === 'package_incompatibility'
@@ -42,12 +92,24 @@ export function buildCliDiagnosticEvent(diagnostic: CliDiagnostic) {
             ? { unsupported_api: bounded(diagnostic.unsupportedApi, 160) }
             : {}),
         }
-      : { error_class: bounded(diagnostic.errorClass, 160) }
+      : diagnostic.kind === 'error_shape'
+        ? {
+            error_class: bounded(diagnostic.errorClass, 160),
+            message: sanitizeDiagnosticMessage(diagnostic.message),
+          }
+        : { message: sanitizeDiagnosticMessage(diagnostic.message) }
 
   return {
     event: diagnostic.kind,
-    distinct_id: 'peach-cli-diagnostic',
-    properties,
+    distinct_id: readOrCreateAnonymousId(),
+    properties: {
+      cli_version: diagnosticVersion(getCliVersion()),
+      runtime_version: observedRuntimeVersion ?? diagnosticVersion(readActiveRuntime()),
+      os: process.platform,
+      arch: process.arch,
+      command: parseArgs(process.argv).command ?? 'open',
+      ...properties,
+    },
   }
 }
 
@@ -55,12 +117,20 @@ const queue: CliDiagnostic[] = []
 
 export function trackCliDiagnostic(diagnostic: CliDiagnostic): void {
   if (!diagnosticsAllowedForCurrentProcess()) return
-  queue.push(diagnostic)
+  if (queue.length >= 50) return
+  const entry =
+    diagnostic.kind === 'package_incompatibility'
+      ? diagnostic
+      : { ...diagnostic, message: sanitizeDiagnosticMessage(diagnostic.message) }
+  if (queue.some((queued) => JSON.stringify(queued) === JSON.stringify(entry))) return
+  queue.push(entry)
 }
 
 export function trackCliError(error: unknown): void {
   const errorClass = error instanceof Error ? error.constructor.name : typeof error
-  trackCliDiagnostic({ kind: 'error_shape', errorClass })
+  const message =
+    error instanceof Error ? error.message : typeof error === 'string' ? error : ''
+  trackCliDiagnostic({ kind: 'error_shape', errorClass, message })
 }
 
 export async function flushCliTelemetry(): Promise<void> {
@@ -70,8 +140,9 @@ export async function flushCliTelemetry(): Promise<void> {
     queue.length = 0
     return
   }
-  const batch = queue.splice(0, queue.length).map(buildCliDiagnosticEvent)
+  const diagnostics = queue.splice(0, queue.length)
   try {
+    const batch = diagnostics.map((diagnostic) => buildCliDiagnosticEvent(diagnostic))
     await fetch(`${config.host}/batch/`, {
       method: 'POST',
       headers: { 'content-type': 'application/json' },

package/detox/index.ts

@@ -10,6 +10,11 @@ import {
   readBrowserCompositeCaptureRequest,
   resolveBrowserCompositeCdpClip,
 } from '../../peach-engine/src/capture/browser-composite'
+import {
+  AUTH_BROWSER_EXTERNAL_NAVIGATION_EVENT,
+  AUTH_BROWSER_SESSION_FRAGMENT_KEY,
+  forwardPopupSchemeNavigations,
+} from '../../peach-engine/src/open-external'
 import { isAppBootTargetUrl } from '../../peach-engine/src/render-worker/app-load'
 import { SOOTSIM_SHELL_COMMAND_NAME } from '../src/menu'
 import { pollUntil } from '../src/poll-until'
@@ -55,7 +60,6 @@ let _reapBrowserNow: (() => void) | null = null
 let _context: BrowserContext | null = null
 let _page: Page | null = null
 let _synchronizationEnabled = false
-let _suspendedAppId: string | null = null
 let _browserCompromised: string | null = null
 let browserIdentity = 0
 let contextIdentity = 0
@@ -601,7 +605,7 @@ export async function waitForSootsimIdle(
 // find a node in the sootsim tree matching a matcher descriptor
 async function findNodeByMatcher(matcher: Matcher): Promise<any> {
   const page = getPage()
-  if (matcher.index !== undefined) {
+  if (matcher.index !== undefined || matcher.type === 'text') {
     return page.evaluate(async (indexedMatcher: Matcher) => {
       const filter =
         indexedMatcher.type === 'id'
@@ -614,8 +618,8 @@ async function findNodeByMatcher(matcher: Matcher): Promise<any> {
                 ? { hasRole: indexedMatcher.value }
                 : { type: indexedMatcher.value }
       const results = await window.__sootsimTest!.queryAll(filter)
-      // detox indexes by.text over the text elements that read exactly that
-      // text. hasText also matches every ancestor, so index 0 would be the root.
+      // detox by.text matches exact text elements, with or without an index.
+      // hasText also matches ancestors and substrings, which are not targets.
       const indexed =
         indexedMatcher.type === 'text'
           ? results.filter(
@@ -630,11 +634,6 @@ async function findNodeByMatcher(matcher: Matcher): Promise<any> {
       (id: string) => window.__sootsimTest!.findByTestId(id),
       matcher.value,
     )
-  } else if (matcher.type === 'text') {
-    return page.evaluate(
-      (text: string) => window.__sootsimTest!.findByText(text),
-      matcher.value,
-    )
   } else if (matcher.type === 'label') {
     return page.evaluate(
       (label: string) => window.__sootsimTest!.findByLabel(label),
@@ -933,7 +932,22 @@ async function dispatchDeviceOrientation(orientation: 'portrait' | 'landscape')
       landscapeSide: DETOX_PLATFORM === 'ios' ? 'right' : 'left',
     },
   )
-  await page.waitForTimeout(50)
+  // destination dimensions publish before the interface finishes turning.
+  await page.waitForFunction(
+    (next) => {
+      const settings = window.SootSim?.bridges?.settings?.get?.()
+      const rotation = Reflect.get(window, '__sootsimDeviceRotation')
+      return (
+        typeof settings === 'object' &&
+        settings !== null &&
+        'orientation' in settings &&
+        settings.orientation === next &&
+        rotation?.active !== true
+      )
+    },
+    orientation,
+    { timeout: 15000 },
+  )
 }
 
 const MAX_SETTLED_SPEED_PT_PER_SEC = 2.0
@@ -1584,14 +1598,18 @@ function createSootSimElement(matcher: Matcher): SootSimElement {
         visible: node.layout.width > 0 && node.layout.height > 0,
         enabled: !node.accessibilityState?.disabled,
         ...node,
-        frame: node.absolutePosition
-          ? {
-              x: node.absolutePosition.x,
-              y: node.absolutePosition.y,
-              width: node.absolutePosition.width ?? node.frame?.width ?? 0,
-              height: node.absolutePosition.height ?? node.frame?.height ?? 0,
-            }
-          : node.frame,
+        // the transformed rect when the node reports one; a node resolved
+        // without a size (x and y only) keeps its own frame
+        frame:
+          node.absolutePosition?.width !== undefined &&
+          node.absolutePosition.height !== undefined
+            ? {
+                x: node.absolutePosition.x,
+                y: node.absolutePosition.y,
+                width: node.absolutePosition.width,
+                height: node.absolutePosition.height,
+              }
+            : node.frame,
       }
     },
 
@@ -1755,36 +1773,41 @@ export const device = {
     if (_browserCompromised) {
       throw new Error(`sootsim browser is compromised: ${_browserCompromised}`)
     }
-    if (
-      _page &&
-      opts?.newInstance === false &&
-      !opts.delete &&
-      !opts.recordVideoDir &&
-      _suspendedAppId
-    ) {
+    if (_page && opts?.newInstance === false && !opts.delete && !opts.recordVideoDir) {
+      // detox activates the running app without relaunching it; a url would
+      // need a delivery path into the running guest that the adapter lacks.
+      if (opts.url) {
+        throw new Error(`SootSim cannot deliver a url to a running app: ${opts.url}`)
+      }
       const page = _page
-      const appId = _suspendedAppId
-      await page.evaluate(
-        (id) => window.SootSim?.bridges?.mainShell?.launchApp?.(id),
-        appId,
-      )
-      await pollUntil(
-        () =>
-          page.evaluate(async (id) => {
-            const state = await window.SootSim?.bridges?.mainShell?.getState?.()
-            return (
-              state?.state === 'app' &&
-              state.activeApp === id &&
-              state.switcherPhase === 'idle'
-            )
-          }, appId),
-        Boolean,
-        {
-          timeoutMs: 10000,
-          label: `SootSim app ${appId} to resume`,
-        },
-      )
-      _suspendedAppId = null
+      const appId = await page.evaluate(async () => {
+        const state = await window.SootSim?.bridges?.mainShell?.getState?.()
+        const guestApp = state?.guestApp
+        if (typeof guestApp !== 'string') {
+          throw new Error('SootSim main shell reports no guest app')
+        }
+        if (state?.state === 'app' && state.activeApp === guestApp) return null
+        window.SootSim?.bridges?.mainShell?.launchApp?.(guestApp)
+        return guestApp
+      })
+      if (appId !== null) {
+        await pollUntil(
+          () =>
+            page.evaluate(async (id) => {
+              const state = await window.SootSim?.bridges?.mainShell?.getState?.()
+              return (
+                state?.state === 'app' &&
+                state.activeApp === id &&
+                state.switcherPhase === 'idle'
+              )
+            }, appId),
+          Boolean,
+          {
+            timeoutMs: 10000,
+            label: `SootSim app ${appId} to resume`,
+          },
+        )
+      }
       await waitForSootsimTree(page, 10000)
       if (opts?.userNotification) {
         await postRemotePushToSimulator(opts.userNotification, true)
@@ -1833,6 +1856,11 @@ export const device = {
         reapOwnedBrowser()
         throw error
       }
+      await forwardPopupSchemeNavigations(
+        _context,
+        AUTH_BROWSER_EXTERNAL_NAVIGATION_EVENT,
+        AUTH_BROWSER_SESSION_FRAGMENT_KEY,
+      )
       await _context.exposeBinding('__sootsimHostCapture', async (source, value) => {
         const request = readBrowserCompositeCaptureRequest(value)
         const session = await source.page.context().newCDPSession(source.page)
@@ -3178,14 +3206,12 @@ export const device = {
 
   async sendToHome() {
     const page = getPage()
-    _suspendedAppId = await page.evaluate(async () => {
+    await page.evaluate(async () => {
       const state = await window.SootSim?.bridges?.mainShell?.getState?.()
-      const appId = state?.activeApp
-      if (typeof appId !== 'string') {
+      if (typeof state?.activeApp !== 'string') {
         throw new Error(`cannot send an inactive SootSim app home`)
       }
       window.SootSim?.bridges?.mainShell?.goHome?.()
-      return appId
     })
     await pollUntil(
       () =>

package/dist-lib/agent-daemon-client.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/agent-events.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/agent-identity.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/agent-sessions.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/attached-projects.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/auth/shared-session.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/backend-origin.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/beta.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/beta.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/beta.ts
 var IS_BETA = true;