From 8636b0fc64de8b832e8809ab1ddac061673ba4ca Mon Sep 17 00:00:00 2001
From: wobsoriano <sorianorobertc@gmail.com>
Date: Fri, 17 Jul 2026 00:14:21 -0700
Subject: [PATCH 1/6] test(e2e): prepare expo-native fixture for e2e

Adds open-auth-view-button and sign-out-button testIDs to App.tsx so
Maestro can drive the JS layer deterministically, and ad-hoc signs the SDK
57 iOS simulator build (CODE_SIGN_IDENTITY=-): unsigned builds have no
application-identifier, which breaks Keychain/expo-secure-store and leaves
clerk-js loading forever.
---
 integration/templates/expo-native/App.tsx             | 10 +++++++++-
 integration/templates/expo-native/package.sdk-57.json |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/integration/templates/expo-native/App.tsx b/integration/templates/expo-native/App.tsx
index 4d549077e3e..1f824007263 100644
--- a/integration/templates/expo-native/App.tsx
+++ b/integration/templates/expo-native/App.tsx
@@ -11,7 +11,7 @@ if (!publishableKey) {
 }
 
 function NativeBuildFixture() {
-  const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+  const { isLoaded, isSignedIn, signOut } = useAuth({ treatPendingAsSignedOut: false });
   const { user } = useUser();
   const [isAuthOpen, setIsAuthOpen] = useState(false);
 
@@ -25,9 +25,17 @@ function NativeBuildFixture() {
       <Text testID='auth-state'>{isLoaded ? `signed ${isSignedIn ? 'in' : 'out'}` : 'loading'}</Text>
       {user?.id && <Text testID='user-id'>{user.id}</Text>}
       <Button
+        testID='open-auth-view-button'
         title='Open native AuthView'
         onPress={() => setIsAuthOpen(true)}
       />
+      {isSignedIn && (
+        <Button
+          testID='sign-out-button'
+          title='Sign out'
+          onPress={() => void signOut()}
+        />
+      )}
 
       <Modal
         animationType='slide'
diff --git a/integration/templates/expo-native/package.sdk-57.json b/integration/templates/expo-native/package.sdk-57.json
index b56000d3fc3..8d80ee8f8ce 100644
--- a/integration/templates/expo-native/package.sdk-57.json
+++ b/integration/templates/expo-native/package.sdk-57.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build:android": "cd android && ./gradlew assembleRelease",
-    "build:ios": "xcodebuild -workspace ios/ClerkExpoNativeBuildFixture.xcworkspace -scheme ClerkExpoNativeBuildFixture -configuration Release -sdk iphonesimulator -derivedDataPath ios/build CODE_SIGNING_ALLOWED=NO CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=''",
+    "build:ios": "xcodebuild -workspace ios/ClerkExpoNativeBuildFixture.xcworkspace -scheme ClerkExpoNativeBuildFixture -configuration Release -sdk iphonesimulator -derivedDataPath ios/build CODE_SIGN_IDENTITY=-",
     "prebuild:android": "expo prebuild --clean --platform android",
     "prebuild:ios": "expo prebuild --clean --platform ios"
   },

From 952cf91ccb707eca2d0998314abb70d3252df2a6 Mon Sep 17 00:00:00 2001
From: wobsoriano <sorianorobertc@gmail.com>
Date: Fri, 17 Jul 2026 00:14:21 -0700
Subject: [PATCH 2/6] test(e2e): add Maestro workspace for expo native
 components

Scenario-per-file flows under integration/tests/expo-native covering
native AuthView sign-in with native-to-JS session sync, session persistence
across restart, AuthView detach/reattach via platform-native dismissal, and
UserButton native sign-out followed by a same-process re-sign-in. Shared
steps (clean launch, email+password entry, signed-in/out assertions,
warmup) live in subflows/. run-flows.sh runs the suite locally via
pnpm test:integration:expo-native.
---
 integration/tests/expo-native/.gitignore      |  1 +
 integration/tests/expo-native/config.yaml     | 13 +++
 .../flows/authview-detach-reattach.yaml       | 36 +++++++++
 .../session-persists-across-restart.yaml      | 22 +++++
 .../tests/expo-native/flows/sign-in.yaml      | 13 +++
 .../expo-native/flows/subflows/_warmup.yaml   | 11 +++
 .../flows/subflows/assert-signed-in.yaml      |  9 +++
 .../flows/subflows/assert-signed-out.yaml     |  6 ++
 .../expo-native/flows/subflows/open-app.yaml  | 27 +++++++
 .../subflows/sign-in-email-password.yaml      | 80 +++++++++++++++++++
 .../user-button-sign-out-re-sign-in.yaml      | 36 +++++++++
 integration/tests/expo-native/run-flows.sh    | 62 ++++++++++++++
 package.json                                  |  1 +
 13 files changed, 317 insertions(+)
 create mode 100644 integration/tests/expo-native/.gitignore
 create mode 100644 integration/tests/expo-native/config.yaml
 create mode 100644 integration/tests/expo-native/flows/authview-detach-reattach.yaml
 create mode 100644 integration/tests/expo-native/flows/session-persists-across-restart.yaml
 create mode 100644 integration/tests/expo-native/flows/sign-in.yaml
 create mode 100644 integration/tests/expo-native/flows/subflows/_warmup.yaml
 create mode 100644 integration/tests/expo-native/flows/subflows/assert-signed-in.yaml
 create mode 100644 integration/tests/expo-native/flows/subflows/assert-signed-out.yaml
 create mode 100644 integration/tests/expo-native/flows/subflows/open-app.yaml
 create mode 100644 integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml
 create mode 100644 integration/tests/expo-native/flows/user-button-sign-out-re-sign-in.yaml
 create mode 100755 integration/tests/expo-native/run-flows.sh

diff --git a/integration/tests/expo-native/.gitignore b/integration/tests/expo-native/.gitignore
new file mode 100644
index 00000000000..e33609d251c
--- /dev/null
+++ b/integration/tests/expo-native/.gitignore
@@ -0,0 +1 @@
+*.png
diff --git a/integration/tests/expo-native/config.yaml b/integration/tests/expo-native/config.yaml
new file mode 100644
index 00000000000..e307bf2630b
--- /dev/null
+++ b/integration/tests/expo-native/config.yaml
@@ -0,0 +1,13 @@
+# Maestro workspace config: https://docs.maestro.dev/reference/workspace-configuration
+# Top-level files under flows/ are cross-platform tests; flows/subflows/ holds
+# runFlow-only pieces that discovery never runs standalone. Selectors use
+# English text/labels: clerk-android ships no testTag/resource-ids, and both
+# native SDKs localize all strings, so devices must run the en locale.
+appId: com.clerk.exponativebuildfixture
+flows:
+  - 'flows/*.yaml'
+platform:
+  ios:
+    disableAnimations: true
+  android:
+    disableAnimations: true
diff --git a/integration/tests/expo-native/flows/authview-detach-reattach.yaml b/integration/tests/expo-native/flows/authview-detach-reattach.yaml
new file mode 100644
index 00000000000..5a650af8ee3
--- /dev/null
+++ b/integration/tests/expo-native/flows/authview-detach-reattach.yaml
@@ -0,0 +1,36 @@
+# Dismiss the native AuthView mid-flow and reopen it: the native view must
+# survive detach/reattach and still complete a sign-in afterwards. Dismissal
+# is the platform-native gesture: Android's system back button (doubling as
+# the back-dismisses-AuthView regression), iOS's sheet Close control
+# (clerk-ios exposes the stable clerk.dismissButton identifier).
+appId: com.clerk.exponativebuildfixture
+name: AuthView survives detach and reattach
+---
+- runFlow: subflows/open-app.yaml
+- tapOn:
+    id: 'open-auth-view-button'
+- extendedWaitUntil:
+    visible: 'Welcome! Sign in to continue\.?'
+    timeout: 25000
+- runFlow:
+    when:
+      platform: Android
+    commands:
+      - back
+- runFlow:
+    when:
+      platform: iOS
+    commands:
+      - tapOn:
+          id: 'clerk.dismissButton'
+- extendedWaitUntil:
+    visible:
+      id: 'open-auth-view-button'
+    timeout: 15000
+- tapOn:
+    id: 'open-auth-view-button'
+- runFlow: subflows/sign-in-email-password.yaml
+- runFlow: subflows/assert-signed-in.yaml
+- tapOn:
+    id: 'sign-out-button'
+- runFlow: subflows/assert-signed-out.yaml
diff --git a/integration/tests/expo-native/flows/session-persists-across-restart.yaml b/integration/tests/expo-native/flows/session-persists-across-restart.yaml
new file mode 100644
index 00000000000..95d8c900f6d
--- /dev/null
+++ b/integration/tests/expo-native/flows/session-persists-across-restart.yaml
@@ -0,0 +1,22 @@
+# Sign in via the native AuthView, restart WITHOUT clearing state, and assert
+# the session is restored from secure-store with no re-auth (bridge + token
+# cache persistence).
+appId: com.clerk.exponativebuildfixture
+name: Session persists across app restart
+---
+- runFlow: subflows/open-app.yaml
+- tapOn:
+    id: 'open-auth-view-button'
+- runFlow: subflows/sign-in-email-password.yaml
+- runFlow: subflows/assert-signed-in.yaml
+- stopApp
+- launchApp
+- extendedWaitUntil:
+    visible: 'signed in'
+    timeout: 45000
+- assertVisible:
+    id: 'user-id'
+# Leave the app signed out for whichever flow runs next.
+- tapOn:
+    id: 'sign-out-button'
+- runFlow: subflows/assert-signed-out.yaml
diff --git a/integration/tests/expo-native/flows/sign-in.yaml b/integration/tests/expo-native/flows/sign-in.yaml
new file mode 100644
index 00000000000..80645825691
--- /dev/null
+++ b/integration/tests/expo-native/flows/sign-in.yaml
@@ -0,0 +1,13 @@
+# Native AuthView email+password sign-in, asserting the native->JS session
+# sync, then JS-side sign-out asserting the reverse direction.
+appId: com.clerk.exponativebuildfixture
+name: Native AuthView sign-in syncs to JS
+---
+- runFlow: subflows/open-app.yaml
+- tapOn:
+    id: 'open-auth-view-button'
+- runFlow: subflows/sign-in-email-password.yaml
+- runFlow: subflows/assert-signed-in.yaml
+- tapOn:
+    id: 'sign-out-button'
+- runFlow: subflows/assert-signed-out.yaml
diff --git a/integration/tests/expo-native/flows/subflows/_warmup.yaml b/integration/tests/expo-native/flows/subflows/_warmup.yaml
new file mode 100644
index 00000000000..4de07d419a9
--- /dev/null
+++ b/integration/tests/expo-native/flows/subflows/_warmup.yaml
@@ -0,0 +1,11 @@
+# Cold-boot warmup, not a test. Lets the JS bundle parse and the a11y tree
+# populate once, so the first real flow doesn't eat the cold-start cost and
+# flake its in-flow waits. Excluded from the per-flow loop (lives in subflows/).
+appId: com.clerk.exponativebuildfixture
+---
+- launchApp:
+    clearState: true
+- extendedWaitUntil:
+    visible:
+      id: 'auth-state'
+    timeout: 90000
diff --git a/integration/tests/expo-native/flows/subflows/assert-signed-in.yaml b/integration/tests/expo-native/flows/subflows/assert-signed-in.yaml
new file mode 100644
index 00000000000..65bcc55159d
--- /dev/null
+++ b/integration/tests/expo-native/flows/subflows/assert-signed-in.yaml
@@ -0,0 +1,9 @@
+# Subflow: assert the JS layer observed the native sign-in (bridge sync).
+# extendedWaitUntil retries until timeout; assertVisible does not.
+appId: com.clerk.exponativebuildfixture
+---
+- extendedWaitUntil:
+    visible: 'signed in'
+    timeout: 30000
+- assertVisible:
+    id: 'user-id'
diff --git a/integration/tests/expo-native/flows/subflows/assert-signed-out.yaml b/integration/tests/expo-native/flows/subflows/assert-signed-out.yaml
new file mode 100644
index 00000000000..72986f7cae9
--- /dev/null
+++ b/integration/tests/expo-native/flows/subflows/assert-signed-out.yaml
@@ -0,0 +1,6 @@
+# Subflow: assert the JS layer is signed out.
+appId: com.clerk.exponativebuildfixture
+---
+- extendedWaitUntil:
+    visible: 'signed out'
+    timeout: 20000
diff --git a/integration/tests/expo-native/flows/subflows/open-app.yaml b/integration/tests/expo-native/flows/subflows/open-app.yaml
new file mode 100644
index 00000000000..b0aeb35ed36
--- /dev/null
+++ b/integration/tests/expo-native/flows/subflows/open-app.yaml
@@ -0,0 +1,27 @@
+# Subflow: launch from a clean state and land signed out.
+appId: com.clerk.exponativebuildfixture
+---
+- launchApp:
+    clearState: true
+- extendedWaitUntil:
+    visible:
+      id: 'auth-state'
+    timeout: 30000
+# Text-only matching from here on: iOS failed combined id+text filters on RN
+# Text elements in CI while id-only and text-only both match. Also wait out
+# clerk-js init ('loading') with a retrying wait; assertVisible never retries.
+- extendedWaitUntil:
+    visible: 'signed (in|out)'
+    timeout: 45000
+# clearState does not wipe the iOS Keychain, so a session from a previous
+# flow (or retry attempt) can survive the relaunch. Sign out via JS first.
+- runFlow:
+    when:
+      visible: 'signed in'
+    commands:
+      - tapOn:
+          id: 'sign-out-button'
+      - extendedWaitUntil:
+          visible: 'signed out'
+          timeout: 15000
+- assertVisible: 'signed out'
diff --git a/integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml b/integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml
new file mode 100644
index 00000000000..a61cc238999
--- /dev/null
+++ b/integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml
@@ -0,0 +1,80 @@
+# Subflow: enter email + password into the native AuthView and submit.
+# Requires CLERK_TEST_EMAIL and CLERK_TEST_PASSWORD env vars.
+appId: com.clerk.exponativebuildfixture
+---
+- extendedWaitUntil:
+    visible: 'Welcome! Sign in to continue\.?'
+    timeout: 25000
+# The AuthView sometimes renders its welcome text a beat before the email
+# field; don't tap until the field is actually present. The placeholder
+# varies by instance config (email-only vs email+username).
+- extendedWaitUntil:
+    visible: 'Enter your email( or username)?'
+    timeout: 25000
+# Clear any pre-populated identifier (Clerk persists the last-used one in
+# secure-store, surviving clearState) via Select-all when the edit menu
+# shows, falling back to eraseText when it doesn't (the menu is unreliable
+# on a remounted AuthView on iOS). The retry gates on reaching the password
+# step, so a mangled identifier gets a clean second attempt.
+- retry:
+    maxRetries: 2
+    commands:
+      - tapOn:
+          text: 'Enter your email( or username)?'
+      - waitForAnimationToEnd:
+          timeout: 2000
+      - longPressOn:
+          text: 'Enter your email( or username)?'
+      # iOS shows "Select All", Android shows "Select all".
+      - runFlow:
+          when:
+            visible: 'Select [Aa]ll'
+          commands:
+            - tapOn:
+                text: 'Select [Aa]ll'
+      - eraseText: 100
+      - inputText: ${CLERK_TEST_EMAIL}
+      - tapOn:
+          text: 'Continue'
+          index: 0
+      - extendedWaitUntil:
+          visible: 'Enter your password'
+          timeout: 15000
+- tapOn:
+    text: 'Enter your password'
+- eraseText: 50
+- inputText: ${CLERK_TEST_PASSWORD}
+- tapOn:
+    text: 'Continue'
+    index: 0
+- waitForAnimationToEnd:
+    timeout: 5000
+# Some instances require email-code verification after a successful password
+# submit. For +clerk_test@ emails the documented test code is 424242:
+# https://clerk.com/docs/testing/test-emails-and-phones
+- runFlow:
+    when:
+      visible: 'Check your email'
+    commands:
+      - inputText: '424242'
+      - waitForAnimationToEnd:
+          timeout: 5000
+# Android Google Password Manager may prompt to save the password.
+- runFlow:
+    when:
+      visible: '.*Google Password Manager.*'
+    commands:
+      - tapOn:
+          text: 'Not now|Never'
+      - waitForAnimationToEnd:
+          timeout: 2000
+# iOS system Save Password / iCloud Keychain prompt overlays the app.
+- runFlow:
+    when:
+      visible: 'Save Password|Strong Password|Use Strong Password|AutoFill Passwords'
+    commands:
+      - tapOn:
+          text: 'Not Now|Never for This Website|Don.t Save'
+          optional: true
+      - waitForAnimationToEnd:
+          timeout: 2000
diff --git a/integration/tests/expo-native/flows/user-button-sign-out-re-sign-in.yaml b/integration/tests/expo-native/flows/user-button-sign-out-re-sign-in.yaml
new file mode 100644
index 00000000000..eb1a2a12cb7
--- /dev/null
+++ b/integration/tests/expo-native/flows/user-button-sign-out-re-sign-in.yaml
@@ -0,0 +1,36 @@
+# Native UserButton -> account sheet -> native sign-out, asserting the JS
+# layer observes it (the reverse bridge direction from sign-in.yaml).
+# clerk-android exposes no test identifiers (no testTag / resource-ids), so
+# shared selectors are English text / accessibility labels.
+#
+# Ends with a second sign-in in the SAME app process (no restart, no
+# clearState): a past regression had the second native sign-in complete
+# natively while the JS SDK never observed it. Every other flow cold-launches
+# with clearState, so this is the only place that path is exercised.
+appId: com.clerk.exponativebuildfixture
+name: UserButton native sign-out, then same-process re-sign-in
+---
+- runFlow: subflows/open-app.yaml
+- tapOn:
+    id: 'open-auth-view-button'
+- runFlow: subflows/sign-in-email-password.yaml
+- runFlow: subflows/assert-signed-in.yaml
+# iOS labels the trigger "Open account"; Android "Open user profile".
+- tapOn:
+    text: 'Open (account|user profile)'
+- extendedWaitUntil:
+    visible: 'Manage account'
+    timeout: 15000
+- assertVisible: 'Sign out'
+- tapOn:
+    text: 'Sign out'
+- runFlow: subflows/assert-signed-out.yaml
+# Second sign-in without restarting the app: the remounted AuthView must
+# work and the JS layer must observe the new session.
+- tapOn:
+    id: 'open-auth-view-button'
+- runFlow: subflows/sign-in-email-password.yaml
+- runFlow: subflows/assert-signed-in.yaml
+- tapOn:
+    id: 'sign-out-button'
+- runFlow: subflows/assert-signed-out.yaml
diff --git a/integration/tests/expo-native/run-flows.sh b/integration/tests/expo-native/run-flows.sh
new file mode 100755
index 00000000000..e08d864d7a5
--- /dev/null
+++ b/integration/tests/expo-native/run-flows.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+# Runs every top-level Maestro flow (flows/*.yaml; flows/subflows/ are
+# runFlow-only pieces) as one CLI invocation per flow, so a hang or crash in
+# one flow can't poison the rest, with one clean-state retry per flow.
+# Whole-flow retry can mask app instability (the Maestro docs discourage it),
+# so it is capped at a single retry purely to absorb emulator/simulator flake.
+#
+# Usage: ./run-flows.sh [force-stop command...]
+#   CI iOS:     ./run-flows.sh xcrun simctl terminate "$SIM_UDID" com.clerk.exponativebuildfixture
+#   CI Android: ./run-flows.sh adb shell am force-stop com.clerk.exponativebuildfixture
+#   Local:      ./run-flows.sh
+#
+# Required env: CLERK_TEST_EMAIL, CLERK_TEST_PASSWORD
+# Optional env: MAESTRO_DEBUG_OUTPUT (directory for CI debug artifacts)
+set -euo pipefail
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+command -v maestro >/dev/null 2>&1 || {
+  echo "maestro CLI is required: https://docs.maestro.dev/getting-started/installing-maestro"
+  exit 1
+}
+
+: "${CLERK_TEST_EMAIL:?CLERK_TEST_EMAIL is required}"
+: "${CLERK_TEST_PASSWORD:?CLERK_TEST_PASSWORD is required}"
+
+force_stop() { if [ "$#" -gt 0 ]; then "$@" >/dev/null 2>&1 || true; fi; }
+
+debug_args=()
+if [ -n "${MAESTRO_DEBUG_OUTPUT:-}" ]; then
+  debug_args=(--debug-output "$MAESTRO_DEBUG_OUTPUT" --flatten-debug-output)
+fi
+
+# Warmup: parse the JS bundle + populate the a11y tree once so the first real
+# flow doesn't flake on cold-start; force-stop afterwards so the first
+# launchApp clearState doesn't race a still-foregrounded app process.
+maestro test ${debug_args+"${debug_args[@]}"} flows/subflows/_warmup.yaml || true
+force_stop "$@"
+
+# Every flows/*.yaml is a cross-platform test (platform differences live in
+# per-step `when: platform:` conditionals); flows/subflows/ are runFlow-only.
+status=0
+for flow in flows/*.yaml; do
+  [ -e "$flow" ] || continue
+  for attempt in 1 2; do
+    if maestro test \
+      --env CLERK_TEST_EMAIL="$CLERK_TEST_EMAIL" \
+      --env CLERK_TEST_PASSWORD="$CLERK_TEST_PASSWORD" \
+      ${debug_args+"${debug_args[@]}"} \
+      "$flow"; then
+      break
+    fi
+    if [ "$attempt" -eq 2 ]; then
+      echo "::error::Flow $flow failed after 2 attempts"
+      status=1
+      break
+    fi
+    echo "::warning::Flow $flow failed attempt $attempt, retrying after 10s..."
+    force_stop "$@"
+    sleep 10
+  done
+done
+exit $status
diff --git a/package.json b/package.json
index 78e375eebad..6e85e476fe3 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "test:integration:custom": "pnpm test:integration:base --grep @custom",
     "test:integration:deployment:nextjs": "pnpm playwright test --config integration/playwright.deployments.config.ts",
     "test:integration:electron": "pnpm test:integration:base --grep @electron",
+    "test:integration:expo-native": "integration/tests/expo-native/run-flows.sh",
     "test:integration:expo-web:disabled": "E2E_APP_ID=expo.expo-web pnpm test:integration:base --grep @expo-web",
     "test:integration:express": "E2E_APP_ID=express.* pnpm test:integration:base --grep @express",
     "test:integration:fastify": "E2E_APP_ID=fastify.* pnpm test:integration:base --grep @fastify",

From 788806f61cca7acab504e22160a4c4835de8d371 Mon Sep 17 00:00:00 2001
From: wobsoriano <sorianorobertc@gmail.com>
Date: Fri, 17 Jul 2026 00:14:22 -0700
Subject: [PATCH 3/6] ci(e2e): run Maestro e2e in expo-native-build and drop
 mobile-e2e workflow

Extends the existing expo-native-build matrix with run-e2e on the SDK 57
entries (other SDKs can opt in the same way), provisioning a throwaway BAPI
test user after the native build, running the Maestro suite in burn-in
mode (continue-on-error), cleaning the user up before uploading scrubbed
debug artifacts, and deleting the dead mobile-e2e workflow.
---
 .github/workflows/expo-native-build.yml | 234 +++++++++++++++++++++-
 .github/workflows/mobile-e2e.yml        | 247 ------------------------
 2 files changed, 226 insertions(+), 255 deletions(-)
 delete mode 100644 .github/workflows/mobile-e2e.yml

diff --git a/.github/workflows/expo-native-build.yml b/.github/workflows/expo-native-build.yml
index 03e8520dbb0..d5948f6cefd 100644
--- a/.github/workflows/expo-native-build.yml
+++ b/.github/workflows/expo-native-build.yml
@@ -8,6 +8,7 @@ on:
     paths:
       - '.github/workflows/expo-native-build.yml'
       - 'integration/templates/expo-native/**'
+      - 'integration/tests/expo-native/**'
       - 'packages/expo/**'
   workflow_dispatch:
 
@@ -20,15 +21,19 @@ concurrency:
 
 env:
   FIXTURE_DIR: integration/templates/expo-native
+  E2E_DIR: integration/tests/expo-native
   FIXTURE_PUBLISHABLE_KEY: pk_test_ZHVtbXkuY2xlcmsuYWNjb3VudHMuZGV2JA
   SDK_PACK_DIR: /tmp/clerk-expo-pack
+  E2E_INSTANCE_NAME: clerkstage-with-native-components
+  BAPI_URL: https://api.clerkstage.dev
+  MAESTRO_VERSION: '2.6.1'
 
 jobs:
   native-build:
     if: ${{ github.head_ref != 'changeset-release/main' }}
     name: Expo ${{ matrix.expo-sdk }} / ${{ matrix.platform }}
     runs-on: ${{ matrix.runner }}
-    timeout-minutes: 45
+    timeout-minutes: ${{ matrix.run-e2e == true && 60 || 45 }}
     strategy:
       fail-fast: false
       matrix:
@@ -48,9 +53,11 @@ jobs:
           - expo-sdk: 57
             platform: android
             runner: blacksmith-8vcpu-ubuntu-2204
+            run-e2e: true
           - expo-sdk: 57
             platform: ios
             runner: blacksmith-6vcpu-macos-26
+            run-e2e: true
 
     steps:
       - name: Checkout repo
@@ -72,27 +79,51 @@ jobs:
           pnpm --filter @clerk/expo... build
           mkdir -p "$SDK_PACK_DIR"
           pnpm --filter @clerk/expo pack --pack-destination "$SDK_PACK_DIR"
-          SDK_TARBALL="$(ls "$SDK_PACK_DIR"/clerk-expo-*.tgz)"
-          if tar -tf "$SDK_TARBALL" | grep -q '^package/e2e/'; then
-            echo "Fixture files must not be packed into @clerk/expo"
-            exit 1
-          fi
 
       - name: Install fixture dependencies
         working-directory: ${{ env.FIXTURE_DIR }}
         env:
           EXPO_SDK: ${{ matrix.expo-sdk }}
+          RUN_E2E: ${{ matrix.run-e2e == true && 'true' || 'false' }}
         run: |
           cp "package.sdk-$EXPO_SDK.json" package.json
           pnpm install --no-frozen-lockfile
           SDK_TARBALL="$(ls "$SDK_PACK_DIR"/clerk-expo-*.tgz)"
           pnpm add "$SDK_TARBALL" -w
-          pnpm expo install expo-auth-session expo-constants expo-crypto expo-dev-client expo-secure-store expo-web-browser
+          # expo-dev-client makes even release builds boot into the dev
+          # launcher (unreachable Metro in CI), which stalls every Maestro
+          # flow on a blank screen. Skip it on e2e jobs only.
+          DEV_CLIENT="expo-dev-client"
+          if [ "$RUN_E2E" = "true" ]; then DEV_CLIENT=""; fi
+          pnpm expo install expo-auth-session expo-constants expo-crypto $DEV_CLIENT expo-secure-store expo-web-browser
+
+      - name: Check e2e secret availability
+        id: gate
+        if: matrix.run-e2e == true
+        env:
+          KEYS: ${{ secrets.INTEGRATION_STAGING_INSTANCE_KEYS }}
+        run: |
+          if [ -n "$KEYS" ]; then
+            echo "ok=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "ok=false" >> "$GITHUB_OUTPUT"
+            echo "::notice::INTEGRATION_STAGING_INSTANCE_KEYS unavailable (fork PR?); running build-only."
+          fi
+
+      - name: Resolve Clerk instance keys
+        id: keys
+        if: steps.gate.outputs.ok == 'true'
+        continue-on-error: true
+        env:
+          INTEGRATION_STAGING_INSTANCE_KEYS: ${{ secrets.INTEGRATION_STAGING_INSTANCE_KEYS }}
+        run: node scripts/resolve-instance-keys.mjs INTEGRATION_STAGING_INSTANCE_KEYS "$E2E_INSTANCE_NAME"
 
       - name: Write fixture .env
         working-directory: ${{ env.FIXTURE_DIR }}
+        env:
+          E2E_PK: ${{ steps.keys.outputs.pk }}
         run: |
-          echo "EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY=$FIXTURE_PUBLISHABLE_KEY" > .env
+          echo "EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY=${E2E_PK:-$FIXTURE_PUBLISHABLE_KEY}" > .env
 
       - name: Set up JDK 17
         if: ${{ matrix.platform == 'android' }}
@@ -120,3 +151,190 @@ jobs:
         if: ${{ matrix.platform == 'ios' }}
         working-directory: ${{ env.FIXTURE_DIR }}
         run: pnpm build:ios
+
+      - name: Install Maestro
+        if: steps.keys.outputs.pk != ''
+        # pipefail + binary check so a curl flake doesn't leave a missing
+        # binary that only surfaces later as exit-code-127.
+        run: |
+          set -o pipefail
+          installed=0
+          for i in 1 2 3; do
+            if curl -fLs --retry 3 --retry-delay 5 "https://get.maestro.mobile.dev" | MAESTRO_VERSION="$MAESTRO_VERSION" bash; then
+              if [ -x "$HOME/.maestro/bin/maestro" ]; then installed=1; break; fi
+            fi
+            echo "Maestro install attempt $i failed (or binary missing); retrying"
+            sleep 5
+          done
+          [ "$installed" = 1 ] || { echo "::error::Maestro install failed after 3 attempts"; exit 1; }
+          echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
+          "$HOME/.maestro/bin/maestro" --version
+
+      - name: Boot iOS simulator
+        id: sim
+        if: matrix.platform == 'ios' && steps.keys.outputs.pk != ''
+        uses: futureware-tech/simulator-action@e89aa8f93d3aec35083ff49d2854d07f7186f7f5 # v5
+        with:
+          model: 'iPhone 17 Pro'
+
+      # Provisioned as late as possible (after the expensive native build and
+      # simulator boot) so live credentials exist for the shortest window.
+      - name: Provision test user via BAPI
+        id: user
+        if: steps.keys.outputs.pk != ''
+        continue-on-error: true
+        env:
+          CLERK_SECRET_KEY: ${{ steps.keys.outputs.sk }}
+        run: |
+          email="ci-${GITHUB_RUN_ID}-${RANDOM}+clerk_test@clerkcookie.com"
+          username="ci_${GITHUB_RUN_ID}_${RANDOM}"
+          password="ClerkCI!$(openssl rand -hex 8)Aa1"
+          http_code=$(curl -sS -o /tmp/bapi_response.json -w "%{http_code}" -X POST "$BAPI_URL/v1/users" \
+            -H "Authorization: Bearer $CLERK_SECRET_KEY" \
+            -H "Content-Type: application/json" \
+            -d "{\"email_address\":[\"$email\"],\"username\":\"$username\",\"password\":\"$password\"}")
+          if [ "$http_code" -lt 200 ] || [ "$http_code" -ge 300 ]; then
+            echo "::error::BAPI user creation failed (HTTP $http_code)"
+            cat /tmp/bapi_response.json
+            exit 1
+          fi
+          user_id=$(jq -er '.id' /tmp/bapi_response.json)
+          echo "::add-mask::$password"
+          {
+            echo "email=$email"
+            echo "password=$password"
+            echo "user_id=$user_id"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Run iOS e2e (Maestro)
+        id: run_e2e_ios
+        if: matrix.platform == 'ios' && steps.user.outputs.user_id != ''
+        # Burn-in: e2e cannot fail the check yet. Flip to hard-fail in a
+        # follow-up once the suite has proven quiet.
+        continue-on-error: true
+        working-directory: ${{ env.FIXTURE_DIR }}
+        env:
+          CLERK_TEST_EMAIL: ${{ steps.user.outputs.email }}
+          CLERK_TEST_PASSWORD: ${{ steps.user.outputs.password }}
+          SIM_UDID: ${{ steps.sim.outputs.udid }}
+        run: |
+          echo "Using simulator $SIM_UDID"
+          # Kill animations + predictive keyboard: animations add latency to
+          # every tap; predictive text hijacks inputText targets.
+          xcrun simctl spawn "$SIM_UDID" defaults write com.apple.UIKit UIAnimationDragCoefficient -float 0.01 || true
+          xcrun simctl spawn "$SIM_UDID" defaults write -g ApplePersistenceIgnoreState -bool YES || true
+          xcrun simctl spawn "$SIM_UDID" defaults write com.apple.keyboard.ContinuousPath -bool NO || true
+          xcrun simctl spawn "$SIM_UDID" defaults write com.apple.keyboard.AutoCapitalization -bool NO || true
+          xcrun simctl spawn "$SIM_UDID" defaults write com.apple.keyboard.AutoCorrection -bool NO || true
+          xcrun simctl spawn "$SIM_UDID" defaults write com.apple.keyboard.Prediction -bool NO || true
+          xcrun simctl install "$SIM_UDID" ios/build/Build/Products/Release-iphonesimulator/ClerkExpoNativeBuildFixture.app
+          # Stream the app's console output into the debug artifact so a hang has
+          # actionable evidence (keychain/network errors) instead of just screenshots.
+          mkdir -p "$RUNNER_TEMP/maestro-debug"
+          xcrun simctl spawn "$SIM_UDID" log stream --style compact \
+            --predicate 'processImagePath CONTAINS "ClerkExpoNativeBuildFixture"' \
+            > "$RUNNER_TEMP/maestro-debug/sim-console.log" 2>&1 &
+          LOG_PID=$!
+          cd "$GITHUB_WORKSPACE/$E2E_DIR"
+          rc=0
+          MAESTRO_DEBUG_OUTPUT="$RUNNER_TEMP/maestro-debug" ./run-flows.sh \
+            xcrun simctl terminate "$SIM_UDID" com.clerk.exponativebuildfixture || rc=$?
+          kill "$LOG_PID" 2>/dev/null || true
+          exit "$rc"
+
+      - name: Enable KVM
+        if: matrix.platform == 'android' && steps.user.outputs.user_id != ''
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: AVD cache
+        id: avd-cache
+        if: matrix.platform == 'android' && steps.user.outputs.user_id != ''
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-34-google_apis-x86_64-v1
+
+      - name: Create AVD snapshot
+        if: matrix.platform == 'android' && steps.user.outputs.user_id != '' && steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2
+        with:
+          api-level: 34
+          target: google_apis
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Run Android e2e (Maestro)
+        id: run_e2e_android
+        if: matrix.platform == 'android' && steps.user.outputs.user_id != ''
+        continue-on-error: true
+        uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2
+        env:
+          CLERK_TEST_EMAIL: ${{ steps.user.outputs.email }}
+          CLERK_TEST_PASSWORD: ${{ steps.user.outputs.password }}
+        with:
+          api-level: 34
+          target: google_apis
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim
+          disable-animations: true
+          # The action runs each script line in a separate sh -c; the folded
+          # scalar (>-) plus && keeps everything in one shell invocation.
+          script: >-
+            adb install -r integration/templates/expo-native/android/app/build/outputs/apk/release/app-release.apk &&
+            cd integration/tests/expo-native &&
+            MAESTRO_DEBUG_OUTPUT="$RUNNER_TEMP/maestro-debug" ./run-flows.sh adb shell am force-stop com.clerk.exponativebuildfixture
+
+      # Runs before the artifact upload so the credentials are already dead
+      # by the time the debug files become downloadable.
+      - name: Cleanup test user
+        if: always() && steps.user.outputs.user_id != ''
+        env:
+          CLERK_SECRET_KEY: ${{ steps.keys.outputs.sk }}
+          USER_ID: ${{ steps.user.outputs.user_id }}
+        run: |
+          curl -fsS -X DELETE "$BAPI_URL/v1/users/$USER_ID" \
+            -H "Authorization: Bearer $CLERK_SECRET_KEY" || true
+
+      # Maestro debug files record flow env (and typed input) in plaintext;
+      # add-mask only covers step logs, not artifact contents.
+      - name: Scrub test credentials from Maestro debug output
+        if: always() && (steps.run_e2e_ios.outcome == 'failure' || steps.run_e2e_android.outcome == 'failure')
+        env:
+          CLERK_TEST_PASSWORD: ${{ steps.user.outputs.password }}
+        run: |
+          [ -d "$RUNNER_TEMP/maestro-debug" ] || exit 0
+          [ -n "$CLERK_TEST_PASSWORD" ] || exit 0
+          # shellcheck disable=SC2016
+          find "$RUNNER_TEMP/maestro-debug" -type f \
+            \( -name '*.json' -o -name '*.log' -o -name '*.txt' -o -name '*.yaml' \) \
+            -exec perl -pi -e 's/\Q$ENV{CLERK_TEST_PASSWORD}\E/[REDACTED]/g' {} +
+
+      - name: Upload Maestro artifacts on e2e failure
+        if: always() && (steps.run_e2e_ios.outcome == 'failure' || steps.run_e2e_android.outcome == 'failure')
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: maestro-${{ matrix.platform }}-sdk${{ matrix.expo-sdk }}
+          path: ${{ runner.temp }}/maestro-debug
+          retention-days: 7
+
+      - name: Report e2e outcome
+        if: always() && steps.user.outputs.user_id != ''
+        env:
+          IOS_OUTCOME: ${{ steps.run_e2e_ios.outcome }}
+          ANDROID_OUTCOME: ${{ steps.run_e2e_android.outcome }}
+        run: |
+          outcome="$IOS_OUTCOME"
+          [ "$outcome" = "skipped" ] && outcome="$ANDROID_OUTCOME"
+          echo "## Maestro e2e (${{ matrix.platform }}, SDK ${{ matrix.expo-sdk }}): $outcome" >> "$GITHUB_STEP_SUMMARY"
+          if [ "$outcome" = "failure" ]; then
+            echo "::warning::Maestro e2e failed (burn-in mode: not failing the job). See the maestro-${{ matrix.platform }}-sdk${{ matrix.expo-sdk }} artifact."
+          fi
diff --git a/.github/workflows/mobile-e2e.yml b/.github/workflows/mobile-e2e.yml
deleted file mode 100644
index 5c75f37af06..00000000000
--- a/.github/workflows/mobile-e2e.yml
+++ /dev/null
@@ -1,247 +0,0 @@
-# Manual mobile e2e for @clerk/expo native components.
-# Clones clerk-expo-quickstart, builds the NativeComponentQuickstart app,
-# and runs Maestro flows on iOS simulator and Android emulator.
-#
-# Secrets:
-#   INTEGRATION_STAGING_INSTANCE_KEYS — JSON map of named staging test instances
-#     ({ "<name>": { "pk": "pk_test_...", "sk": "sk_test_..." } }).
-#     Same secret used by /integration (Playwright) staging jobs. We read the
-#     entry named EXPO_INSTANCE_NAME (set in env: below).
-#
-# Test users are provisioned per-run via Clerk Backend API and deleted at
-# teardown — same pattern as /integration's createBapiUser.
-name: "Mobile e2e (@clerk/expo)"
-
-on:
-  workflow_dispatch:
-    inputs:
-      quickstart_ref:
-        description: "clerk-expo-quickstart git ref (branch, tag, or SHA)"
-        required: false
-        default: "main"
-      exclude_tags:
-        description: "Maestro tags to exclude (comma-separated)"
-        required: false
-        default: "manual,skip"
-
-env:
-  EXPO_INSTANCE_NAME: clerkstage-with-native-components
-
-concurrency:
-  group: mobile-e2e-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  android:
-    name: Android
-    runs-on: 'blacksmith-8vcpu-ubuntu-2204'
-    timeout-minutes: 45
-    defaults:
-      run:
-        working-directory: .
-    steps:
-      - name: Checkout @clerk/javascript
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-        with:
-          persist-credentials: false
-
-      - name: Checkout clerk-expo-quickstart
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-        with:
-          persist-credentials: false
-          repository: clerk/clerk-expo-quickstart
-          ref: ${{ inputs.quickstart_ref }}
-          path: clerk-expo-quickstart
-
-      - uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: 20
-          cache: pnpm
-
-      - name: Install monorepo deps
-        run: pnpm install --frozen-lockfile
-
-      - name: Build @clerk/expo
-        run: pnpm turbo build --filter=@clerk/expo...
-
-      - name: Install quickstart deps
-        working-directory: clerk-expo-quickstart/NativeComponentQuickstart
-        run: pnpm install
-
-      - name: Resolve Clerk instance keys
-        id: keys
-        env:
-          INTEGRATION_STAGING_INSTANCE_KEYS: ${{ secrets.INTEGRATION_STAGING_INSTANCE_KEYS }}
-        run: node scripts/resolve-instance-keys.mjs INTEGRATION_STAGING_INSTANCE_KEYS "$EXPO_INSTANCE_NAME"
-
-      - name: Write quickstart .env
-        working-directory: clerk-expo-quickstart/NativeComponentQuickstart
-        run: |
-          echo "EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY=${{ steps.keys.outputs.pk }}" > .env
-
-      - name: Provision test user via BAPI
-        id: user
-        env:
-          CLERK_SECRET_KEY: ${{ steps.keys.outputs.sk }}
-        run: |
-          email="ci-${GITHUB_RUN_ID}-${RANDOM}+clerk_test@clerkcookie.com"
-          password="ClerkCI!$(openssl rand -hex 8)Aa1"
-          response=$(curl -fsS -X POST https://api.clerk.com/v1/users \
-            -H "Authorization: Bearer $CLERK_SECRET_KEY" \
-            -H "Content-Type: application/json" \
-            -d "{\"email_address\":[\"$email\"],\"password\":\"$password\"}")
-          user_id=$(echo "$response" | jq -er '.id')
-          echo "::add-mask::$password"
-          echo "email=$email" >> "$GITHUB_OUTPUT"
-          echo "password=$password" >> "$GITHUB_OUTPUT"
-          echo "user_id=$user_id" >> "$GITHUB_OUTPUT"
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Install Maestro
-        run: |
-          curl -Ls "https://get.maestro.mobile.dev" | bash
-          echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
-
-      - name: Run Android e2e
-        uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2
-        env:
-          CLERK_TEST_EMAIL: ${{ steps.user.outputs.email }}
-          CLERK_TEST_PASSWORD: ${{ steps.user.outputs.password }}
-          EXCLUDE_TAGS: ${{ inputs.exclude_tags }}
-        with:
-          api-level: 34
-          target: google_apis
-          arch: x86_64
-          script: |
-            cd clerk-expo-quickstart/NativeComponentQuickstart
-            npx expo prebuild --clean
-            npx expo run:android --variant release --no-bundler
-            cd ../../integration-mobile
-            # Maestro doesn't auto-recurse into subdirectories; pass each flow explicitly.
-            find flows -type f -name "*.yaml" ! -path "*/common/*" -print0 | \
-              xargs -0 maestro test --exclude-tags "$EXCLUDE_TAGS"
-
-      - name: Upload Maestro artifacts on failure
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        with:
-          name: maestro-android
-          path: ~/.maestro/tests
-
-      - name: Cleanup test user
-        if: always() && steps.user.outputs.user_id != ''
-        env:
-          CLERK_SECRET_KEY: ${{ steps.keys.outputs.sk }}
-          USER_ID: ${{ steps.user.outputs.user_id }}
-        run: |
-          curl -fsS -X DELETE "https://api.clerk.com/v1/users/$USER_ID" \
-            -H "Authorization: Bearer $CLERK_SECRET_KEY" || true
-
-  ios:
-    name: iOS
-    runs-on: macos-15
-    timeout-minutes: 60
-    steps:
-      - name: Checkout @clerk/javascript
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-        with:
-          persist-credentials: false
-
-      - name: Checkout clerk-expo-quickstart
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-        with:
-          persist-credentials: false
-          repository: clerk/clerk-expo-quickstart
-          ref: ${{ inputs.quickstart_ref }}
-          path: clerk-expo-quickstart
-
-      - uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: 20
-          cache: pnpm
-
-      - name: Install monorepo deps
-        run: pnpm install --frozen-lockfile
-
-      - name: Build @clerk/expo
-        run: pnpm turbo build --filter=@clerk/expo...
-
-      - name: Install quickstart deps
-        working-directory: clerk-expo-quickstart/NativeComponentQuickstart
-        run: pnpm install
-
-      - name: Resolve Clerk instance keys
-        id: keys
-        env:
-          INTEGRATION_STAGING_INSTANCE_KEYS: ${{ secrets.INTEGRATION_STAGING_INSTANCE_KEYS }}
-        run: node scripts/resolve-instance-keys.mjs INTEGRATION_STAGING_INSTANCE_KEYS "$EXPO_INSTANCE_NAME"
-
-      - name: Write quickstart .env
-        working-directory: clerk-expo-quickstart/NativeComponentQuickstart
-        run: |
-          echo "EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY=${{ steps.keys.outputs.pk }}" > .env
-
-      - name: Provision test user via BAPI
-        id: user
-        env:
-          CLERK_SECRET_KEY: ${{ steps.keys.outputs.sk }}
-        run: |
-          email="ci-${GITHUB_RUN_ID}-${RANDOM}+clerk_test@clerkcookie.com"
-          password="ClerkCI!$(openssl rand -hex 8)Aa1"
-          response=$(curl -fsS -X POST https://api.clerk.com/v1/users \
-            -H "Authorization: Bearer $CLERK_SECRET_KEY" \
-            -H "Content-Type: application/json" \
-            -d "{\"email_address\":[\"$email\"],\"password\":\"$password\"}")
-          user_id=$(echo "$response" | jq -er '.id')
-          echo "::add-mask::$password"
-          echo "email=$email" >> "$GITHUB_OUTPUT"
-          echo "password=$password" >> "$GITHUB_OUTPUT"
-          echo "user_id=$user_id" >> "$GITHUB_OUTPUT"
-
-      - name: Cache SPM
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: ~/Library/Developer/Xcode/DerivedData
-          key: spm-${{ hashFiles('packages/expo/package.json') }}
-
-      - name: Install Maestro
-        run: |
-          curl -Ls "https://get.maestro.mobile.dev" | bash
-          echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
-
-      - name: Build and run iOS e2e
-        env:
-          CLERK_TEST_EMAIL: ${{ steps.user.outputs.email }}
-          CLERK_TEST_PASSWORD: ${{ steps.user.outputs.password }}
-          EXCLUDE_TAGS: ${{ inputs.exclude_tags }}
-        run: |
-          cd clerk-expo-quickstart/NativeComponentQuickstart
-          npx expo prebuild --clean
-          npx expo run:ios --configuration Release --no-bundler
-          cd ../../integration-mobile
-          # Maestro doesn't auto-recurse into subdirectories; pass each flow explicitly.
-          find flows -type f -name "*.yaml" ! -path "*/common/*" -print0 | \
-            xargs -0 maestro test --exclude-tags "$EXCLUDE_TAGS,androidOnly"
-
-      - name: Upload Maestro artifacts on failure
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        with:
-          name: maestro-ios
-          path: ~/.maestro/tests
-
-      - name: Cleanup test user
-        if: always() && steps.user.outputs.user_id != ''
-        env:
-          CLERK_SECRET_KEY: ${{ steps.keys.outputs.sk }}
-          USER_ID: ${{ steps.user.outputs.user_id }}
-        run: |
-          curl -fsS -X DELETE "https://api.clerk.com/v1/users/$USER_ID" \
-            -H "Authorization: Bearer $CLERK_SECRET_KEY" || true

From 7b342853e7c64df8dc54e0a611173d21144b8715 Mon Sep 17 00:00:00 2001
From: wobsoriano <sorianorobertc@gmail.com>
Date: Fri, 17 Jul 2026 00:14:23 -0700
Subject: [PATCH 4/6] ci(repo): add empty changeset

---
 .changeset/new-queens-brake.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .changeset/new-queens-brake.md

diff --git a/.changeset/new-queens-brake.md b/.changeset/new-queens-brake.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/new-queens-brake.md
@@ -0,0 +1,2 @@
+---
+---

From f676cebd4edea7975fb82e4e1dc06086047d4d6b Mon Sep 17 00:00:00 2001
From: wobsoriano <sorianorobertc@gmail.com>
Date: Fri, 17 Jul 2026 00:45:11 -0700
Subject: [PATCH 5/6] test(e2e): handle email-code-first sign-in factor
 ordering

Which first factor follows the email step depends on instance config and
SDK: clerk-ios can present the email-code screen first where clerk-android
presents password first. The subflow now accepts either screen instead of
hard-gating on the password field, keeping password-then-code instances
working unchanged.
---
 .../subflows/sign-in-email-password.yaml      | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml b/integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml
index a61cc238999..469d946b65f 100644
--- a/integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml
+++ b/integration/tests/expo-native/flows/subflows/sign-in-email-password.yaml
@@ -37,21 +37,35 @@ appId: com.clerk.exponativebuildfixture
       - tapOn:
           text: 'Continue'
           index: 0
+      # Which first factor comes next depends on instance config AND SDK:
+      # clerk-ios can go email-code-first where clerk-android goes
+      # password-first. Accept either screen.
       - extendedWaitUntil:
-          visible: 'Enter your password'
+          visible: 'Enter your password|Check your email'
           timeout: 15000
-- tapOn:
-    text: 'Enter your password'
-- eraseText: 50
-- inputText: ${CLERK_TEST_PASSWORD}
-- tapOn:
-    text: 'Continue'
-    index: 0
-- waitForAnimationToEnd:
-    timeout: 5000
-# Some instances require email-code verification after a successful password
-# submit. For +clerk_test@ emails the documented test code is 424242:
-# https://clerk.com/docs/testing/test-emails-and-phones
+# Email-code-first: for +clerk_test@ emails the documented test code is
+# 424242: https://clerk.com/docs/testing/test-emails-and-phones
+- runFlow:
+    when:
+      visible: 'Check your email'
+    commands:
+      - inputText: '424242'
+      - waitForAnimationToEnd:
+          timeout: 5000
+- runFlow:
+    when:
+      visible: 'Enter your password'
+    commands:
+      - tapOn:
+          text: 'Enter your password'
+      - eraseText: 50
+      - inputText: ${CLERK_TEST_PASSWORD}
+      - tapOn:
+          text: 'Continue'
+          index: 0
+      - waitForAnimationToEnd:
+          timeout: 5000
+# Some instances ask for the email code after the password instead.
 - runFlow:
     when:
       visible: 'Check your email'

From 571480e91208fc9a6ecd2217711aaa1af0741581 Mon Sep 17 00:00:00 2001
From: wobsoriano <sorianorobertc@gmail.com>
Date: Fri, 17 Jul 2026 06:36:41 -0700
Subject: [PATCH 6/6] ci(e2e): Cache Maestro CLI between runs

---
 .github/workflows/expo-native-build.yml | 29 +++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/expo-native-build.yml b/.github/workflows/expo-native-build.yml
index d5948f6cefd..fe42691e2cb 100644
--- a/.github/workflows/expo-native-build.yml
+++ b/.github/workflows/expo-native-build.yml
@@ -152,21 +152,32 @@ jobs:
         working-directory: ${{ env.FIXTURE_DIR }}
         run: pnpm build:ios
 
+      - name: Cache Maestro
+        if: steps.keys.outputs.pk != ''
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        with:
+          path: ~/.maestro
+          key: maestro-${{ runner.os }}-${{ env.MAESTRO_VERSION }}
+
       - name: Install Maestro
         if: steps.keys.outputs.pk != ''
         # pipefail + binary check so a curl flake doesn't leave a missing
         # binary that only surfaces later as exit-code-127.
         run: |
           set -o pipefail
-          installed=0
-          for i in 1 2 3; do
-            if curl -fLs --retry 3 --retry-delay 5 "https://get.maestro.mobile.dev" | MAESTRO_VERSION="$MAESTRO_VERSION" bash; then
-              if [ -x "$HOME/.maestro/bin/maestro" ]; then installed=1; break; fi
-            fi
-            echo "Maestro install attempt $i failed (or binary missing); retrying"
-            sleep 5
-          done
-          [ "$installed" = 1 ] || { echo "::error::Maestro install failed after 3 attempts"; exit 1; }
+          if [ -x "$HOME/.maestro/bin/maestro" ]; then
+            echo "Using cached Maestro"
+          else
+            installed=0
+            for i in 1 2 3; do
+              if curl -fLs --retry 3 --retry-delay 5 "https://get.maestro.mobile.dev" | MAESTRO_VERSION="$MAESTRO_VERSION" bash; then
+                if [ -x "$HOME/.maestro/bin/maestro" ]; then installed=1; break; fi
+              fi
+              echo "Maestro install attempt $i failed (or binary missing); retrying"
+              sleep 5
+            done
+            [ "$installed" = 1 ] || { echo "::error::Maestro install failed after 3 attempts"; exit 1; }
+          fi
           echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
           "$HOME/.maestro/bin/maestro" --version