From f6b78ec35143d4a1125a3199d77b2b72d1006c4e Mon Sep 17 00:00:00 2001
From: Jakub Tkacz <32908614+Ubax@users.noreply.github.com>
Date: Thu, 11 Jun 2026 18:08:32 +0200
Subject: [PATCH 01/17] [expo-app-metrics] add session shared object (#46652)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Why

Until now `getMainSession`/`getForegroundSession` returned eager,
serialized snapshots of a session (the `MainSession`/`GenericSession`
union), so the data was frozen at the moment of the call and the full
metrics/logs collections were marshalled across the bridge every time.
We want a single live `Session` representation that reflects the
session's current state and only fetches the heavy collections when
asked.

# How

1. Introduce a native `Session` shared object (`SessionSharedObject` on
Android, `Session` on iOS) exposed to JS via `src/Session.ts`.
- Scalar fields (`id`, `type`, `startDate`) are snapshots captured when
the object is created.
- Mutable state (`isActive`, `getEndDate`) and the heavy collections
(`getMetrics`, `getLogs`) are fetched lazily so each call reflects live
state.
- Adds `addMetric(metric)` on the object — the session id is implied by
the receiver, so the new `MetricInput` type is `Omit<Metric,
'sessionId'>`.
2. Change the module surface:
- `getMainSession()` is now synchronous and returns the shared object
built from in-memory state, so it never returns `null`. Repeated calls
return the same static reference (`getMainSession() ===
getMainSession()`).
- `getForegroundSession()` resolves to the foreground `Session` shared
object or `null`.
- Export the native `Session` class on the module type so the web module
can substitute its own implementation.
3. Split the historic-session shape out into a new eager `DebugSession`
type (used by `getInactiveSessions()`), keeping serialized history
separate from the live shared object.
4. Android: fold the `SessionCoordinator` (added in
[#46702](https://github.com/expo/expo/pull/46702)) into
`SessionSharedObject`. The session id and start date are generated
synchronously so they are available to readers immediately, while
`startSessionWithIdAt` runs in a `by lazy` job;
`awaitSessionPersisted()` (`job.join()`) gates
`addMetrics`/`addLogs`/`stop` so no insert can race ahead of session
creation.
5. iOS: rework `Session`/`StoredSession` and add `JsMetric` to back the
shared object and the `addMetric` input.
6. Update `observe-tester` screens and the web module (`module.web.ts`)
to the new API.

# Test Plan

1. CI
2. Observe tester — verified sessions, metrics, and logs render on both
platforms.


# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [x] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
---
 .../src/screens/AppMetricsScreen.tsx          |  14 +-
 .../app/(tabs)/(sessions)/sessions/[id].tsx   |   4 +-
 .../(tabs)/(sessions)/sessions/foreground.tsx |   4 +-
 .../app/(tabs)/(sessions)/sessions/index.tsx  |  16 +-
 .../app/(tabs)/(sessions)/sessions/main.tsx   |   9 +-
 .../observe-tester/app/(tabs)/debug/index.tsx |  29 +-
 .../components/SessionDetail.tsx              |  23 +-
 .../components/SessionHeader.tsx              |   7 +-
 packages/expo-app-metrics/CHANGELOG.md        |   1 +
 .../modules/appmetrics/AppMetricsModule.kt    | 108 +++++--
 .../appmetrics/storage/MetricsDatabase.kt     |   6 +
 .../appmetrics/storage/SessionCoordinator.kt  |  65 ----
 .../appmetrics/storage/SessionManager.kt      |   8 +
 .../appmetrics/storage/SessionMappers.kt      |  52 ++-
 .../appmetrics/storage/SessionSharedObject.kt |  57 ++++
 .../appmetrics/updates/UpdatesMonitoring.kt   |   5 +-
 .../appmetrics/storage/SessionManagerTest.kt  | 103 ++++++
 .../appmetrics/storage/SessionMappersTest.kt  |  70 +++-
 .../storage/SessionSharedObjectTest.kt        | 301 ++++++++++++++++++
 packages/expo-app-metrics/build/Session.d.ts  |  54 ++++
 .../expo-app-metrics/build/Session.d.ts.map   |   1 +
 packages/expo-app-metrics/build/index.d.ts    |   1 +
 .../expo-app-metrics/build/index.d.ts.map     |   2 +-
 .../expo-app-metrics/build/module.web.d.ts    |   5 +-
 .../build/module.web.d.ts.map                 |   2 +-
 packages/expo-app-metrics/build/types.d.ts    |  77 +++--
 .../expo-app-metrics/build/types.d.ts.map     |   2 +-
 .../ios/AppMetricsModule.swift                |  52 ++-
 .../ios/Sessions/ForegroundSession.swift      |   2 +-
 .../ios/Sessions/JsMetric.swift               |  25 ++
 .../ios/Sessions/Session.swift                |  42 ++-
 .../ios/Storage/StoredSession.swift           |  64 ++--
 .../ios/Tests/SessionMetricInputTests.swift   |  52 +++
 packages/expo-app-metrics/src/Session.ts      |  56 ++++
 packages/expo-app-metrics/src/index.ts        |   1 +
 packages/expo-app-metrics/src/module.web.ts   |  36 ++-
 packages/expo-app-metrics/src/types.ts        |  82 +++--
 .../src/__tests__/optionalImport.test.ts      |   2 +-
 .../expo-router/__tests__/init.test.native.ts |   4 +-
 .../src/integrations/expo-router/init.ts      |   6 +-
 .../expo-router/useObserveForRouter.ts        |   2 +-
 ...ObserveNavigationContainer.test.native.tsx |   2 +-
 .../ObserveNavigationProvider.test.native.tsx |   2 +-
 .../handleStateChange.test.native.ts          |   2 +-
 .../__tests__/integration.test.native.tsx     |   2 +-
 .../useObserveForReactNavigation.ts           |   2 +-
 46 files changed, 1198 insertions(+), 264 deletions(-)
 delete mode 100644 packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionCoordinator.kt
 create mode 100644 packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionSharedObject.kt
 create mode 100644 packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionSharedObjectTest.kt
 create mode 100644 packages/expo-app-metrics/build/Session.d.ts
 create mode 100644 packages/expo-app-metrics/build/Session.d.ts.map
 create mode 100644 packages/expo-app-metrics/ios/Tests/SessionMetricInputTests.swift
 create mode 100644 packages/expo-app-metrics/src/Session.ts

diff --git a/apps/native-component-list/src/screens/AppMetricsScreen.tsx b/apps/native-component-list/src/screens/AppMetricsScreen.tsx
index b39061ad171998..811878e3e4ab02 100644
--- a/apps/native-component-list/src/screens/AppMetricsScreen.tsx
+++ b/apps/native-component-list/src/screens/AppMetricsScreen.tsx
@@ -11,12 +11,14 @@ export default function AppMetricsScreen() {
 
   useFocusEffect(
     React.useCallback(() => {
-      let cancelled = false;
-      AppMetrics.getMainSession().then((s) => {
-        if (!cancelled) setMetrics(s?.metrics ?? []);
-      });
+      let canceled = false;
+      AppMetrics.getMainSession()
+        .getMetrics()
+        .then((m) => {
+          if (!canceled) setMetrics(m);
+        });
       return () => {
-        cancelled = true;
+        canceled = true;
       };
     }, [])
   );
@@ -24,7 +26,7 @@ export default function AppMetricsScreen() {
   const onRefresh = React.useCallback(async () => {
     setRefreshing(true);
     try {
-      setMetrics((await AppMetrics.getMainSession())?.metrics ?? []);
+      setMetrics(await AppMetrics.getMainSession().getMetrics());
     } finally {
       setRefreshing(false);
     }
diff --git a/apps/observe-tester/app/(tabs)/(sessions)/sessions/[id].tsx b/apps/observe-tester/app/(tabs)/(sessions)/sessions/[id].tsx
index 1c2d658121b5e7..7d9ac9472152b9 100644
--- a/apps/observe-tester/app/(tabs)/(sessions)/sessions/[id].tsx
+++ b/apps/observe-tester/app/(tabs)/(sessions)/sessions/[id].tsx
@@ -1,4 +1,4 @@
-import AppMetrics, { type Session } from 'expo-app-metrics';
+import AppMetrics, { type DebugSession } from 'expo-app-metrics';
 import { useFocusEffect, useLocalSearchParams } from 'expo-router';
 import { useCallback, useState } from 'react';
 
@@ -6,7 +6,7 @@ import { SessionDetail } from '@/components/SessionDetail';
 
 export default function InactiveSessionScreen() {
   const { id } = useLocalSearchParams<{ id: string }>();
-  const [session, setSession] = useState<Session | null>(null);
+  const [session, setSession] = useState<DebugSession | null>(null);
   const [loaded, setLoaded] = useState(false);
 
   useFocusEffect(
diff --git a/apps/observe-tester/app/(tabs)/(sessions)/sessions/foreground.tsx b/apps/observe-tester/app/(tabs)/(sessions)/sessions/foreground.tsx
index c759e20d390810..11d2a5261e85de 100644
--- a/apps/observe-tester/app/(tabs)/(sessions)/sessions/foreground.tsx
+++ b/apps/observe-tester/app/(tabs)/(sessions)/sessions/foreground.tsx
@@ -1,11 +1,11 @@
-import AppMetrics, { type Session } from 'expo-app-metrics';
+import AppMetrics, { type DebugSession } from 'expo-app-metrics';
 import { useFocusEffect } from 'expo-router';
 import { useCallback, useState } from 'react';
 
 import { SessionDetail, liveSessionToRecord } from '@/components/SessionDetail';
 
 export default function ForegroundSessionScreen() {
-  const [session, setSession] = useState<Session | null>(null);
+  const [session, setSession] = useState<DebugSession | null>(null);
   const [loaded, setLoaded] = useState(false);
 
   useFocusEffect(
diff --git a/apps/observe-tester/app/(tabs)/(sessions)/sessions/index.tsx b/apps/observe-tester/app/(tabs)/(sessions)/sessions/index.tsx
index 33b5c0805ffc8f..5abc481f785348 100644
--- a/apps/observe-tester/app/(tabs)/(sessions)/sessions/index.tsx
+++ b/apps/observe-tester/app/(tabs)/(sessions)/sessions/index.tsx
@@ -1,4 +1,4 @@
-import AppMetrics, { type Session, type SessionType } from 'expo-app-metrics';
+import AppMetrics, { type DebugSession, type Session, type SessionType } from 'expo-app-metrics';
 import { useObserve } from 'expo-observe';
 import { type Href, router, Stack, useFocusEffect } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
@@ -50,9 +50,9 @@ export default function SessionsList() {
       AppMetrics.getMainSession(),
       AppMetrics.getForegroundSession(),
     ]);
-    const active = live
-      .filter((session): session is Session => session != null)
-      .map(liveSessionToRow);
+    const active = await Promise.all(
+      live.filter((session): session is Session => session != null).map(liveSessionToRow)
+    );
 
     const records = await AppMetrics.getInactiveSessions();
     const inactive: SessionRowData[] = records
@@ -143,20 +143,20 @@ export default function SessionsList() {
   );
 }
 
-function liveSessionToRow(session: Session): SessionRowData {
+async function liveSessionToRow(session: Session): Promise<SessionRowData> {
   return {
     id: session.id,
     type: session.type,
     startDate: session.startDate,
     endDate: null,
     isActive: true,
-    metricCount: session.metrics.length,
+    metricCount: (await session.getMetrics()).length,
     crashed: false,
     href: `/sessions/${session.type}`,
   };
 }
 
-function inactiveSessionToRow(session: Session): SessionRowData {
+function inactiveSessionToRow(session: DebugSession): SessionRowData {
   return {
     id: session.id,
     type: session.type,
@@ -164,7 +164,7 @@ function inactiveSessionToRow(session: Session): SessionRowData {
     endDate: session.endDate ?? null,
     isActive: false,
     metricCount: session.metrics.length,
-    crashed: 'crashReport' in session ? !!session.crashReport : false,
+    crashed: !!session.crashReport,
     href: `/sessions/${session.id}`,
   };
 }
diff --git a/apps/observe-tester/app/(tabs)/(sessions)/sessions/main.tsx b/apps/observe-tester/app/(tabs)/(sessions)/sessions/main.tsx
index 7b05be5c63c696..1b6e2b23f3ed8c 100644
--- a/apps/observe-tester/app/(tabs)/(sessions)/sessions/main.tsx
+++ b/apps/observe-tester/app/(tabs)/(sessions)/sessions/main.tsx
@@ -1,19 +1,20 @@
-import AppMetrics, { type Session } from 'expo-app-metrics';
+import AppMetrics, { type DebugSession } from 'expo-app-metrics';
 import { useFocusEffect } from 'expo-router';
 import { useCallback, useState } from 'react';
 
 import { SessionDetail, liveSessionToRecord } from '@/components/SessionDetail';
 
 export default function MainSessionScreen() {
-  const [session, setSession] = useState<Session | null>(null);
+  const [session, setSession] = useState<DebugSession | null>(null);
   const [loaded, setLoaded] = useState(false);
 
   useFocusEffect(
     useCallback(() => {
       let cancelled = false;
-      AppMetrics.getMainSession().then((mainSession) => {
+      const mainSession = AppMetrics.getMainSession();
+      liveSessionToRecord(mainSession).then((record) => {
         if (cancelled) return;
-        setSession(mainSession ? liveSessionToRecord(mainSession) : null);
+        setSession(record);
         setLoaded(true);
       });
       return () => {
diff --git a/apps/observe-tester/app/(tabs)/debug/index.tsx b/apps/observe-tester/app/(tabs)/debug/index.tsx
index 7225821f7fd1da..e4722d65d787c1 100644
--- a/apps/observe-tester/app/(tabs)/debug/index.tsx
+++ b/apps/observe-tester/app/(tabs)/debug/index.tsx
@@ -45,13 +45,28 @@ export default function Debug() {
       <Button
         title="Log main session to console"
         onPress={async () => {
-          const session = await AppMetrics.getMainSession();
-
-          if (session) {
-            console.log(JSON.stringify(session, null, 2));
-          } else {
-            console.error('Main session is null');
-          }
+          const session = AppMetrics.getMainSession();
+          const [metrics, logs, isActive, endDate] = await Promise.all([
+            session.getMetrics(),
+            session.getLogs(),
+            session.isActive(),
+            session.getEndDate(),
+          ]);
+          console.log(
+            JSON.stringify(
+              {
+                id: session.id,
+                type: session.type,
+                startDate: session.startDate,
+                endDate,
+                isActive,
+              },
+              null,
+              2
+            )
+          );
+          console.log(JSON.stringify(metrics, null, 2));
+          console.log(JSON.stringify(logs, null, 2));
         }}
         theme="secondary"
       />
diff --git a/apps/observe-tester/components/SessionDetail.tsx b/apps/observe-tester/components/SessionDetail.tsx
index 538b32eec8ed63..d12940491cd954 100644
--- a/apps/observe-tester/components/SessionDetail.tsx
+++ b/apps/observe-tester/components/SessionDetail.tsx
@@ -1,4 +1,4 @@
-import type { Session } from 'expo-app-metrics';
+import type { DebugSession, Session } from 'expo-app-metrics';
 import { useObserve } from 'expo-observe';
 import { Stack } from 'expo-router';
 import { useEffect, useState } from 'react';
@@ -26,7 +26,7 @@ export function SessionDetail({
   loaded,
   title,
 }: {
-  session: Session | null;
+  session: DebugSession | null;
   loaded: boolean;
   title: string;
 }) {
@@ -60,7 +60,7 @@ export function SessionDetail({
         <>
           <SessionHeader session={session} />
           <Divider style={styles.divider} />
-          {session.type === 'main' && session.crashReport ? (
+          {session.crashReport ? (
             <>
               <Text style={[styles.sectionTitle, { color: theme.text.default }]}>Crash report</Text>
               <CrashReportPanel report={session.crashReport} />
@@ -113,14 +113,19 @@ export function SessionDetail({
  * since a live (active) session can't have crashed yet. Lets the `main` route
  * render through the same presentational component as the inactive records.
  */
-export function liveSessionToRecord(session: Session): Session {
+export async function liveSessionToRecord(session: Session): Promise<DebugSession> {
+  const [metrics, logs, endDate] = await Promise.all([
+    session.getMetrics(),
+    session.getLogs(),
+    session.getEndDate(),
+  ]);
   return {
     id: session.id,
     type: session.type,
     startDate: session.startDate,
-    endDate: session.endDate,
-    metrics: session.metrics,
-    logs: session.logs,
+    endDate,
+    metrics,
+    logs,
     // A live session is always active, so it never has a crash report.
     crashReport: null,
   };
@@ -129,8 +134,8 @@ export function liveSessionToRecord(session: Session): Session {
 // The call stack tree balloons the raw JSON to the point where it can fail to render. It's
 // already shown visually in the "Call stacks" section above, so we omit it from the raw JSON
 // and replace it with a marker noting that.
-function stripCallStackTree(session: Session): Session {
-  if (!('crashReport' in session) || !session.crashReport?.callStackTree) {
+function stripCallStackTree(session: DebugSession): DebugSession {
+  if (!session.crashReport?.callStackTree) {
     return session;
   }
   return {
diff --git a/apps/observe-tester/components/SessionHeader.tsx b/apps/observe-tester/components/SessionHeader.tsx
index 0e0dc7d9d0f90a..a17882316a208a 100644
--- a/apps/observe-tester/components/SessionHeader.tsx
+++ b/apps/observe-tester/components/SessionHeader.tsx
@@ -1,17 +1,16 @@
-import type { Session } from 'expo-app-metrics';
+import type { DebugSession } from 'expo-app-metrics';
 import * as Clipboard from 'expo-clipboard';
 import { Pressable, StyleSheet, Text, View } from 'react-native';
 
 import { useTheme } from '@/utils/theme';
 
-export function SessionHeader({ session }: { session: Session }) {
+export function SessionHeader({ session }: { session: DebugSession }) {
   const theme = useTheme();
   const startDate = new Date(session.startDate);
   const endDate = session.endDate ? new Date(session.endDate) : null;
   const duration = endDate
     ? formatDuration(endDate.getTime() - startDate.getTime())
     : 'still running';
-  const crashed = session.type === 'main' && !!session.crashReport;
   const routeName = session.metrics.find((m) => m.name === 'timeToInteractive')?.routeName;
 
   return (
@@ -22,7 +21,7 @@ export function SessionHeader({ session }: { session: Session }) {
           background={theme.background.info}
           color={theme.text.info}
         />
-        {crashed ? (
+        {session.crashReport ? (
           <Badge label="Crashed" background={theme.background.danger} color={theme.text.danger} />
         ) : !session.endDate ? (
           <Badge label="Active" background={theme.background.success} color={theme.text.success} />
diff --git a/packages/expo-app-metrics/CHANGELOG.md b/packages/expo-app-metrics/CHANGELOG.md
index 1969e801d8ac2d..8a243cf71ca7d8 100644
--- a/packages/expo-app-metrics/CHANGELOG.md
+++ b/packages/expo-app-metrics/CHANGELOG.md
@@ -16,3 +16,4 @@
 ### 💡 Others
 
 - Add private `getForegroundSession` ([#46657](https://github.com/expo/expo/pull/46657) by [@Ubax](https://github.com/Ubax))
+- Add session shared object API ([#46652](https://github.com/expo/expo/pull/46652) by [@Ubax](https://github.com/Ubax))
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt
index aad558af1b8de4..3a87f239102d72 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt
@@ -9,17 +9,20 @@ import expo.modules.appmetrics.logevents.sanitizeLogEventAttributes
 import expo.modules.appmetrics.logevents.validateEventBody
 import expo.modules.appmetrics.logevents.validateEventName
 import expo.modules.appmetrics.memory.MemoryMetricsManager
+import expo.modules.appmetrics.storage.JsDebugSession
+import expo.modules.appmetrics.storage.JsLogRecord
 import expo.modules.appmetrics.storage.JsMetric
-import expo.modules.appmetrics.storage.JsSession
 import expo.modules.appmetrics.storage.LogRecord
 import expo.modules.appmetrics.storage.Metric
-import expo.modules.appmetrics.storage.SessionCoordinator
 import expo.modules.appmetrics.storage.SessionManager
+import expo.modules.appmetrics.storage.SessionMetricInput
+import expo.modules.appmetrics.storage.SessionSharedObject
 import expo.modules.appmetrics.updates.UpdatesMonitoring
 import expo.modules.appmetrics.updates.UpdatesStateEvent
 import expo.modules.appmetrics.utils.JsonAny
 import expo.modules.appmetrics.utils.TimeUtils
 import expo.modules.interfaces.constants.ConstantsInterface
+import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.functions.Coroutine
 import expo.modules.kotlin.modules.Module
@@ -47,13 +50,9 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
   lateinit var updatesMonitoring: UpdatesMonitoring
   private var subscription: UpdatesStateChangeSubscription? = null
 
-  private val moduleCreationTimestamp = TimeUtils.getCurrentTimestampInISOFormat()
-
   lateinit var sessionManager: SessionManager
 
-  // Owns the main session lifecycle and gates every write on the session row
-  // being persisted first.
-  lateinit var sessionCoordinator: SessionCoordinator
+  lateinit var mainSession: SessionSharedObject
 
   // Lazy-initialized metadata - created once when first needed
   private val metadata: AppMetadata? by lazy {
@@ -76,6 +75,8 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
         }
       }
 
+      // TODO(@ubax): move `logEvent` onto the Session shared object so logs are recorded via a
+      // session handle (like `addMetric`), instead of writing to `mainSession` directly here.
       Function("logEvent") { name: String, options: LogEventOptions? ->
         val validatedName = validateEventName(name) ?: return@Function
         val validatedBody = validateEventBody(options?.body)
@@ -89,12 +90,12 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
           // ordering startup-metric writes ahead of caller-driven log events.
           saveStartupMetricsIfNotSaved()
           // Globals merge happens inside `sessionManager.addLogs` so every
-          // persistence path picks them up. The coordinator waits for the
-          // session row before inserting.
-          sessionCoordinator.addLogs(
+          // persistence path picks them up. The session waits for its row
+          // before inserting.
+          mainSession.addLogs(
             listOf(
               LogRecord(
-                sessionId = sessionCoordinator.sessionId,
+                sessionId = mainSession.sessionId,
                 timestamp = TimeUtils.getCurrentTimestampInISOFormat(),
                 name = validatedName,
                 body = validatedBody,
@@ -114,24 +115,37 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
       OnCreate {
         sessionManager = SessionManager(context)
 
-        sessionCoordinator = SessionCoordinator(
+        // The main session starts at the first startup metric's timestamp (the
+        // earliest moment we have a record of), falling back to now when none
+        // have been collected yet.
+        val appSessionStartTimestamp =
+          AppStartupManager.metrics.firstOrNull()?.timestamp ?: TimeUtils.getCurrentTimestampInISOFormat()
+
+        mainSession = SessionSharedObject(
           sessionManager = sessionManager,
           scope = scope,
-          deactivateBefore = moduleCreationTimestamp,
-          startTimestamp = TimeUtils.getProcessStartTimestamp(),
-          metadata = metadata
+          type = "main",
+          customStartTimestamp = appSessionStartTimestamp,
+          metadata = metadata,
+          runtime = appContext.runtime
         )
 
         // Persist the session row eagerly so it's visible to readers
         // (`getMainSession`, …) as soon as possible. Idempotent:
         // a racing write triggers (and joins) the same single start job.
-        scope.launch { sessionCoordinator.awaitSessionReady() }
+        scope.launch { mainSession.awaitSessionPersisted() }
+
+        // Sweep sessions orphaned by a previous process. The cutoff equals this
+        // session's start and the comparison is strict (`<`), so this session
+        // survives while older ones are swept — order vs the INSERT doesn't
+        // matter. Relies on `<`, not `<=` (see SessionManagerTest).
+        scope.launch { sessionManager.deactivateAllSessionsBefore(appSessionStartTimestamp) }
 
         memoryMetricsManager = MemoryMetricsManager(
           context = context,
           sessionManager = sessionManager
         )
-        updatesMonitoring = UpdatesMonitoring(sessionId = sessionCoordinator.sessionId)
+        updatesMonitoring = UpdatesMonitoring(session = mainSession)
         updatesMonitoring.patchAppInfoIfNeeded(metadata)
         UpdatesControllerRegistry.controller?.get()?.let { controller ->
           subscription = controller.subscribeToUpdatesStateChanges(this@AppMetricsModule)
@@ -151,18 +165,18 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
       OnDestroy {
         // `modulesQueue` is cancelled immediately after this hook returns, so
         // run the UPDATE on the calling thread to make sure the end timestamp
-        // is persisted before teardown. `stopSession` awaits the session-start
-        // job first, so the INSERT lands before the UPDATE and the stamp doesn't
+        // is persisted before teardown. `stop` awaits the session-start job
+        // first, so the INSERT lands before the UPDATE and the stamp doesn't
         // silently no-op on a missing row.
         runBlocking {
-          sessionCoordinator.stopSession()
+          mainSession.stop()
         }
       }
 
       // Debug-only: surfaces the inactive (ended) sessions for on-device
       // inspection (e.g. the ObserveTester app)
       AsyncFunction("getInactiveSessions") Coroutine { ->
-        sessionManager.getInactiveSessions().map { JsSession.fromSessionWithMetrics(it) }
+        sessionManager.getInactiveSessions().map { JsDebugSession.fromSessionWithMetrics(it) }
       }
 
       AsyncFunction("takeMemoryUsageSnapshotAsync") Coroutine { sessionId: String? ->
@@ -175,8 +189,14 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
         sessionManager.addMetrics(listOf(metric.toMetric()), sessionId = metric.sessionId)
       }
 
-      AsyncFunction("getMainSession") Coroutine { ->
-        sessionManager.getSessionById(sessionCoordinator.sessionId)?.let { JsSession.fromSessionWithMetrics(it) }
+      Function("getMainSession") {
+        mainSession
+      }
+
+      // Android has no foreground-session tracking yet, so there's never a session to return.
+      // Async to match the `Promise<Session | null>` JS contract.
+      AsyncFunction("getForegroundSession") {
+        null as SessionSharedObject?
       }
 
       Class(NetworkRequestObserver::class) {
@@ -185,9 +205,33 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
         }
       }
       
-      // Android has no foreground-session tracking yet
-      AsyncFunction("getForegroundSession") Coroutine { ->
-        null as JsSession?
+      Class("Session", SessionSharedObject::class) {
+        // TODO(@ubax): Allow for user session creation from JS
+        Constructor { ->
+          throw CodedException(
+            "Session objects can't be created from JavaScript because sessions are opened and managed natively. " +
+              "Get one from AppMetrics.getMainSession() or AppMetrics.getForegroundSession() instead."
+          )
+        }
+
+        Property("id", SessionSharedObject::sessionId)
+        Property("type", SessionSharedObject::type)
+        Property("startDate", SessionSharedObject::startDate)
+
+        AsyncFunction("isActive") Coroutine SessionSharedObject::isActive
+        AsyncFunction("getEndDate") Coroutine SessionSharedObject::getEndDate
+
+        AsyncFunction("getMetrics") Coroutine { ref: SessionSharedObject ->
+          ref.getMetrics().map { JsMetric.fromMetric(it) }
+        }
+
+        AsyncFunction("getLogs") Coroutine { ref: SessionSharedObject ->
+          ref.getLogs().map { JsLogRecord.fromLogRecord(it) }
+        }
+
+        AsyncFunction("addMetric") Coroutine { ref: SessionSharedObject, metric: SessionMetricInput ->
+          ref.addMetrics(listOf(metric.toMetric(ref.sessionId)))
+        }
       }
     }
 
@@ -203,25 +247,25 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
       updatesMonitoring.downloadTimeMetric(subscription)?.let { metric ->
         scope.launch {
           // Attach any pending startup metrics first so the download-time
-          // metric lands alongside them. The coordinator waits for the session
-          // row before inserting.
+          // metric lands alongside them. The session waits for its row before
+          // inserting.
           saveStartupMetricsIfNotSaved()
-          sessionCoordinator.addMetrics(listOf(metric))
+          mainSession.addMetrics(listOf(metric))
         }
       }
     }
   }
 
   // Persists the collected startup metrics once, then suspends until that write
-  // completes. The coordinator waits for the session row before inserting.
+  // completes. The session waits for its row before inserting.
   internal suspend fun saveStartupMetricsIfNotSaved() = saveStartupMetricsJob.join()
-  
+
   // Startup metrics are persisted on first access and exactly once: `by lazy`
   // runs the initializer a single time even across threads, so concurrent callers
   // don't each insert them.
   private val saveStartupMetricsJob: Job by lazy {
     scope.launch {
-      sessionCoordinator.addMetrics(AppStartupManager.metrics)
+      mainSession.addMetrics(AppStartupManager.metrics)
     }
   }
 }
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/MetricsDatabase.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/MetricsDatabase.kt
index 4ce81dc26d4b12..02fbc646135c28 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/MetricsDatabase.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/MetricsDatabase.kt
@@ -176,6 +176,9 @@ interface MetricDao {
 
   @Delete
   suspend fun delete(metrics: List<Metric>)
+
+  @Query("SELECT * FROM metrics WHERE sessionId = :sessionId ORDER BY timestamp ASC")
+  suspend fun getMetricsForSession(sessionId: String): List<Metric>
 }
 
 @Dao
@@ -188,6 +191,9 @@ interface LogDao {
 
   @Query("DELETE FROM logs WHERE timestamp < :cutoffTimestamp")
   suspend fun deleteLogsOlderThan(cutoffTimestamp: String)
+
+  @Query("SELECT * FROM logs WHERE sessionId = :sessionId ORDER BY timestamp ASC")
+  suspend fun getLogsForSession(sessionId: String): List<LogRecord>
 }
 
 @Dao
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionCoordinator.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionCoordinator.kt
deleted file mode 100644
index d4b1ec4189abc3..00000000000000
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionCoordinator.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package expo.modules.appmetrics.storage
-
-import expo.modules.appmetrics.AppMetadata
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-
-/**
- * Owns the main's session lifecycle and gates every write on the session row
- * being persisted first.
- *
- * `metrics.sessionId` / `logs.sessionId` have a foreign key to `sessions.id`, so
- * a metric or log written before its session row exists fails with
- * `SQLiteConstraintException: FOREIGN KEY constraint failed` (ENG-21739).
- *
- * To guarantee ordering, the session row is created lazily by [sessionStartJob]
- * (exactly once), and every write joins that job via [awaitSessionReady] before
- * touching the database.
- */
-class SessionCoordinator(
-  private val sessionManager: SessionManager,
-  private val scope: CoroutineScope,
-  // Sessions left active by a previous process (force-quit, OOM, crash) are
-  // deactivated up to this timestamp before the new session is created.
-  private val deactivateBefore: String,
-  private val startTimestamp: String,
-  private val metadata: AppMetadata?
-) {
-  // Generated synchronously so it's available immediately to readers and to
-  // collaborators (e.g. `UpdatesMonitoring`) that capture it before the session
-  // row has been persisted.
-  val sessionId: String = sessionManager.createSessionId()
-
-  // The session row is persisted on first access and exactly once: `by lazy`
-  // runs the initializer a single time even across threads, so no
-  // explicit lock or volatile flag is needed.
-  private val sessionStartJob: Job by lazy {
-    scope.launch {
-      // Deactivate must run before the INSERT: the new session's
-      // `startTimestamp` is the process-start time, which is older than
-      // `deactivateBefore`, so inserting first would let the sweep mark the
-      // brand-new active session inactive.
-      sessionManager.deactivateAllSessionsBefore(deactivateBefore)
-      sessionManager.startSessionWithIdAt(sessionId, startTimestamp, metadata)
-    }
-  }
-
-  /** Suspends until the session row has been persisted (kicked off lazily on first call). */
-  suspend fun awaitSessionReady() = sessionStartJob.join()
-
-  suspend fun addMetrics(metrics: List<Metric>) {
-    awaitSessionReady()
-    sessionManager.addMetrics(metrics, sessionId)
-  }
-
-  suspend fun addLogs(logs: List<LogRecord>) {
-    awaitSessionReady()
-    sessionManager.addLogs(logs, sessionId)
-  }
-
-  suspend fun stopSession() {
-    awaitSessionReady()
-    sessionManager.stopSession(sessionId)
-  }
-}
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionManager.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionManager.kt
index c02b0c40cd2b83..9e67e62899d3b3 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionManager.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionManager.kt
@@ -117,6 +117,14 @@ class SessionManager(
 
   suspend fun getSessionById(id: String): SessionWithMetrics? = database.sessionDao().getSessionWithMetricsBySessionId(id)
 
+  suspend fun getSessionRow(id: String): Session? = database.sessionDao().getById(id)
+
+  suspend fun getMetricsForSession(sessionId: String): List<Metric> =
+    database.metricDao().getMetricsForSession(sessionId)
+
+  suspend fun getLogsForSession(sessionId: String): List<LogRecord> =
+    database.logDao().getLogsForSession(sessionId)
+
   suspend fun clearAllData() {
     database.sessionDao().deleteAll()
   }
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionMappers.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionMappers.kt
index 0b4b66990f8736..7802b937d7187a 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionMappers.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionMappers.kt
@@ -11,17 +11,21 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 
 /**
- * JS-facing shape of a session. Field names mirror the TypeScript `Session`
- * type (`startDate` / `endDate`), distinct from the Room column names
- * (`startTimestamp` / `endTimestamp`).
+ * JS-facing shape of a historic session — the plain eager `DebugSession` record
+ * returned by `getInactiveSessions`. Field names mirror the TypeScript
+ * `DebugSession` type (`startDate` / `endDate`), distinct from the Room column
+ * names (`startTimestamp` / `endTimestamp`).
  *
  * `type` is hard-coded to `"main"` since the per-launch session opened in
- * `AppMetricsModule.OnCreate` is the only one we track. A future change
- * should add a real `type` column and lifecycle hooks for
- * foreground/screen/custom sessions.
+ * `AppMetricsModule.OnCreate` is the only one we track.
+ *
+ * TODO(@ubax): surface all session types — add a real `type` column and lifecycle
+ *   hooks for foreground/screen/custom sessions.
+ * TODO(@ubax): add crash report support on Android — `crashReport` is an iOS-only
+ *   MetricKit feature today, so the record omits it (optional in the TS type).
  */
 @OptimizedRecord
-data class JsSession(
+data class JsDebugSession(
   @Field val id: String,
   @Field val type: String,
   @Field val startDate: String,
@@ -30,8 +34,8 @@ data class JsSession(
   @Field val logs: List<JsLogRecord>
 ) : Record {
   companion object {
-    fun fromSessionWithMetrics(value: SessionWithMetrics): JsSession =
-      JsSession(
+    fun fromSessionWithMetrics(value: SessionWithMetrics): JsDebugSession =
+      JsDebugSession(
         id = value.session.id,
         type = "main",
         startDate = value.session.startTimestamp,
@@ -83,6 +87,36 @@ data class JsMetric(
   }
 }
 
+/**
+ * Payload for `Session.addMetric` — mirrors the TypeScript `MetricInput` type
+ * (`Metric` minus `sessionId`). The owning session is implied by the shared
+ * object the metric is added to, so the id is injected via `toMetric(sessionId)`
+ * rather than carried across the bridge; `updateId` is a native-side concern not
+ * exposed to JS.
+ */
+@OptimizedRecord
+data class SessionMetricInput(
+  @Field val category: String,
+  @Field val name: String,
+  @Field val value: Double,
+  @Field val timestamp: String = TimeUtils.getCurrentTimestampInISOFormat(),
+  @Field val routeName: String? = null,
+  @Field val params: Map<String, Any?>? = null
+) : Record {
+  fun toMetric(sessionId: String): Metric =
+    Metric(
+      metricId = UUID.randomUUID().toString(),
+      sessionId = sessionId,
+      timestamp = timestamp,
+      category = category,
+      name = name,
+      value = value,
+      routeName = routeName,
+      updateId = null,
+      params = params?.let { JsonAny.encodeMapToJsonString(it) }
+    )
+}
+
 /**
  * JS-facing shape of a log event. Mirrors the TypeScript `LogRecord` type and
  * decodes the storage-only JSON `attributes` column into a typed map.
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionSharedObject.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionSharedObject.kt
new file mode 100644
index 00000000000000..8d1fec94ed68bf
--- /dev/null
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/storage/SessionSharedObject.kt
@@ -0,0 +1,57 @@
+package expo.modules.appmetrics.storage
+
+import expo.modules.appmetrics.AppMetadata
+import expo.modules.appmetrics.utils.TimeUtils
+import expo.modules.kotlin.runtime.Runtime
+import expo.modules.kotlin.sharedobjects.SharedObject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+class SessionSharedObject(
+  private val sessionManager: SessionManager,
+  private val scope: CoroutineScope,
+  val type: String,
+  customStartTimestamp: String? = null,
+  private val metadata: AppMetadata? = null,
+  runtime: Runtime? = null
+) : SharedObject(runtime) {
+  // Generated synchronously so it's available immediately to readers and to
+  // collaborators that capture it before the session row has been persisted.
+  val sessionId: String = sessionManager.createSessionId()
+
+  // The session's start timestamp, exposed to JS as `startDate`.
+  val startDate: String = customStartTimestamp ?: TimeUtils.getCurrentTimestampInISOFormat()
+
+  private val sessionStartJob: Job by lazy {
+    scope.launch {
+      sessionManager.startSessionWithIdAt(sessionId, startDate, metadata)
+    }
+  }
+
+  /** Suspends until the session row has been persisted. */
+  suspend fun awaitSessionPersisted() = sessionStartJob.join()
+
+  suspend fun addMetrics(metrics: List<Metric>) {
+    awaitSessionPersisted()
+    sessionManager.addMetrics(metrics, sessionId)
+  }
+
+  suspend fun addLogs(logs: List<LogRecord>) {
+    awaitSessionPersisted()
+    sessionManager.addLogs(logs, sessionId)
+  }
+
+  suspend fun stop() {
+    awaitSessionPersisted()
+    sessionManager.stopSession(sessionId)
+  }
+
+  suspend fun isActive(): Boolean = sessionManager.getSessionRow(sessionId)?.isActive ?: true
+
+  suspend fun getEndDate(): String? = sessionManager.getSessionRow(sessionId)?.endTimestamp
+
+  suspend fun getMetrics(): List<Metric> = sessionManager.getMetricsForSession(sessionId)
+
+  suspend fun getLogs(): List<LogRecord> = sessionManager.getLogsForSession(sessionId)
+}
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/updates/UpdatesMonitoring.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/updates/UpdatesMonitoring.kt
index bf53c238e23d15..13c7c32cc6ec5c 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/updates/UpdatesMonitoring.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/updates/UpdatesMonitoring.kt
@@ -5,6 +5,7 @@ import expo.modules.appmetrics.AppUpdatesInfo
 import expo.modules.appmetrics.MetricCategory
 import expo.modules.appmetrics.TAG
 import expo.modules.appmetrics.storage.Metric
+import expo.modules.appmetrics.storage.SessionSharedObject
 import expo.modules.appmetrics.utils.TimeUtils
 import expo.modules.updatesinterface.UpdatesControllerRegistry
 import expo.modules.updatesinterface.UpdatesNativeInterfaceStateContext
@@ -15,7 +16,7 @@ import expo.modules.updatesinterface.UpdatesStateChangeSubscription
  * The subscription lifecycle and state change listening are managed by AppMetricsModule.
  */
 class UpdatesMonitoring(
-  private val sessionId: String
+  private val session: SessionSharedObject
 ) {
 
   /**
@@ -62,7 +63,7 @@ class UpdatesMonitoring(
     val downloadTimeSeconds = (finishTime.time - startTime.time).toDouble() / 1000.0
 
     return Metric(
-      sessionId = sessionId,
+      sessionId = session.sessionId,
       timestamp = TimeUtils.getCurrentTimestampInISOFormat(),
       category = MetricCategory.Updates.categoryName,
       name = "updateDownloadTime",
diff --git a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionManagerTest.kt b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionManagerTest.kt
index e77689ab55ea42..fb79f027a82211 100644
--- a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionManagerTest.kt
+++ b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionManagerTest.kt
@@ -166,6 +166,28 @@ class SessionManagerTest {
       assertTrue(database.sessionDao().getSessionWithMetricsBySessionId(newSession)!!.session.isActive)
     }
 
+  @Test
+  fun `deactivateAllSessionsBefore excludes a session whose startTimestamp equals the cutoff`() =
+    runTest {
+      // The active-session safety in AppMetricsModule depends on this being a
+      // strict `<` comparison, NOT `<=`: a freshly-created session shares its
+      // start timestamp with the sweep cutoff, so it must survive the sweep even
+      // though it can run after the session's own INSERT.
+      val cutoff = "2025-01-10T00:00:00.000Z"
+      val atCutoff = "at-cutoff-session"
+      val justBefore = "just-before-session"
+      sessionManager.startSessionWithIdAt(atCutoff, cutoff)
+      sessionManager.startSessionWithIdAt(justBefore, "2025-01-09T23:59:59.999Z")
+
+      // Act
+      sessionManager.deactivateAllSessionsBefore(cutoff)
+
+      // Assert — equal to the cutoff is preserved (proves `<`), strictly older
+      // is deactivated.
+      assertTrue(database.sessionDao().getSessionWithMetricsBySessionId(atCutoff)!!.session.isActive)
+      assertFalse(database.sessionDao().getSessionWithMetricsBySessionId(justBefore)!!.session.isActive)
+    }
+
   @Test
   fun `deactivateAllSessionsBefore stamps endTimestamp on orphan sessions`() =
     runTest {
@@ -650,6 +672,87 @@ class SessionManagerTest {
 
   // endregion
 
+  // region Live Session Reader Tests
+
+  @Test
+  fun `getSessionRow reflects live isActive and endTimestamp`() =
+    runTest {
+      // Arrange
+      val sessionId = "test-session"
+      sessionManager.startSessionWithIdAt(sessionId, "2025-01-01T00:00:00.000Z")
+
+      // Assert: live row reports the session as active with no end timestamp
+      val active = sessionManager.getSessionRow(sessionId)
+      assertNotNull(active)
+      assertTrue(active!!.isActive)
+      assertNull(active.endTimestamp)
+
+      // Act: end the session
+      sessionManager.stopSession(sessionId)
+
+      // Assert: the same query now reflects the ended state
+      val ended = sessionManager.getSessionRow(sessionId)
+      assertNotNull(ended)
+      assertFalse(ended!!.isActive)
+      assertNotNull(ended.endTimestamp)
+    }
+
+  @Test
+  fun `getSessionRow returns null for an unknown session`() =
+    runTest {
+      assertNull(sessionManager.getSessionRow("does-not-exist"))
+    }
+
+  @Test
+  fun `getMetricsForSession returns only that session's metrics`() =
+    runTest {
+      // Arrange
+      val sessionId = "session-1"
+      val otherId = "session-2"
+      sessionManager.startSessionWithIdAt(sessionId, "2025-01-01T00:00:00.000Z")
+      sessionManager.startSessionWithIdAt(otherId, "2025-01-01T01:00:00.000Z")
+      database.metricDao().insertAll(
+        listOf(
+          createMetric("metric-1", sessionId),
+          createMetric("metric-2", sessionId),
+          createMetric("metric-3", otherId)
+        )
+      )
+
+      // Act
+      val metrics = sessionManager.getMetricsForSession(sessionId)
+
+      // Assert
+      assertEquals(setOf("metric-1", "metric-2"), metrics.map { it.metricId }.toSet())
+      assertTrue(metrics.all { it.sessionId == sessionId })
+    }
+
+  @Test
+  fun `getLogsForSession returns only that session's logs`() =
+    runTest {
+      // Arrange
+      val sessionId = "session-1"
+      val otherId = "session-2"
+      sessionManager.startSessionWithIdAt(sessionId, "2025-01-01T00:00:00.000Z")
+      sessionManager.startSessionWithIdAt(otherId, "2025-01-01T01:00:00.000Z")
+      database.logDao().insertAll(
+        listOf(
+          createLog("log-1", sessionId),
+          createLog("log-2", sessionId),
+          createLog("log-3", otherId)
+        )
+      )
+
+      // Act
+      val logs = sessionManager.getLogsForSession(sessionId)
+
+      // Assert
+      assertEquals(setOf("log-1", "log-2"), logs.map { it.logId }.toSet())
+      assertTrue(logs.all { it.sessionId == sessionId })
+    }
+
+  // endregion
+
   // region Helper Methods
 
   private fun createMetric(
diff --git a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionMappersTest.kt b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionMappersTest.kt
index 5b537798f0180c..10bbd9b71bbe48 100644
--- a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionMappersTest.kt
+++ b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionMappersTest.kt
@@ -2,6 +2,7 @@ package expo.modules.appmetrics.storage
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -57,7 +58,7 @@ class SessionMappersTest {
       metrics = emptyList()
     )
 
-    val js = JsSession.fromSessionWithMetrics(swm)
+    val js = JsDebugSession.fromSessionWithMetrics(swm)
 
     assertEquals("abc", js.id)
     assertEquals("main", js.type)
@@ -73,7 +74,7 @@ class SessionMappersTest {
       metrics = emptyList()
     )
 
-    val js = JsSession.fromSessionWithMetrics(swm)
+    val js = JsDebugSession.fromSessionWithMetrics(swm)
 
     assertEquals("2025-01-02T00:00:00.000Z", js.endDate)
   }
@@ -127,7 +128,7 @@ class SessionMappersTest {
       )
     )
 
-    val js = JsSession.fromSessionWithMetrics(swm)
+    val js = JsDebugSession.fromSessionWithMetrics(swm)
 
     assertEquals(2, js.logs.size)
     assertEquals("first.event", js.logs[0].name)
@@ -196,4 +197,67 @@ class SessionMappersTest {
     assertEquals(listOf("a", "b"), metricResult?.get("tags"))
     assertEquals(metricResult?.get("tags"), logResult?.get("tags"))
   }
+
+  @Test
+  fun `SessionMetricInput_toMetric injects the sessionId`() {
+    val input = SessionMetricInput(
+      category = "custom",
+      name = "purchase",
+      value = 9.99
+    )
+
+    val metric = input.toMetric("session-42")
+
+    assertEquals("session-42", metric.sessionId)
+  }
+
+  @Test
+  fun `SessionMetricInput_toMetric maps scalar fields verbatim and generates its own metricId`() {
+    val input = SessionMetricInput(
+      category = "custom",
+      name = "purchase",
+      value = 9.99,
+      timestamp = "2025-03-01T12:00:00.000Z",
+      routeName = "Checkout"
+    )
+
+    val metric = input.toMetric("session-42")
+
+    assertEquals("custom", metric.category)
+    assertEquals("purchase", metric.name)
+    assertEquals(9.99, metric.value, 0.0)
+    assertEquals("2025-03-01T12:00:00.000Z", metric.timestamp)
+    assertEquals("Checkout", metric.routeName)
+    // `metricId` is generated natively and `updateId` isn't part of the
+    // JS-facing `MetricInput` contract — neither is caller-settable.
+    assertTrue(metric.metricId.isNotEmpty())
+    assertNull(metric.updateId)
+  }
+
+  @Test
+  fun `SessionMetricInput_toMetric JSON-encodes params`() {
+    val input = SessionMetricInput(
+      category = "custom",
+      name = "purchase",
+      value = 1.0,
+      params = mapOf("screen" to "Home", "attempt" to 3, "flag" to true)
+    )
+
+    val metric = input.toMetric("session-42")
+
+    // Round-trip through the JsMetric decoder to assert the encoding is valid.
+    val decoded = JsMetric.fromMetric(metric).params
+    assertEquals("Home", decoded?.get("screen"))
+    assertEquals(3L, decoded?.get("attempt"))
+    assertEquals(true, decoded?.get("flag"))
+  }
+
+  @Test
+  fun `SessionMetricInput_toMetric yields null params when none provided`() {
+    val input = SessionMetricInput(category = "custom", name = "purchase", value = 1.0)
+
+    val metric = input.toMetric("session-42")
+
+    assertNull(metric.params)
+  }
 }
diff --git a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionSharedObjectTest.kt b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionSharedObjectTest.kt
new file mode 100644
index 00000000000000..4e79a8de3589cb
--- /dev/null
+++ b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/storage/SessionSharedObjectTest.kt
@@ -0,0 +1,301 @@
+package expo.modules.appmetrics.storage
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import io.mockk.coVerify
+import io.mockk.spyk
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/**
+ * Exercises the lifecycle logic folded out of the old `SessionCoordinator` and
+ * into [SessionSharedObject]: the ENG-21739 ordering guarantee (the session row
+ * is INSERTed before any metric/log write touches it), and `stop()`.
+ *
+ * Uses the same Robolectric + in-memory Room harness as [SessionManagerTest],
+ * constructing the object with no runtime (the default) so it stays unlinked
+ * from any JS runtime.
+ */
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE, sdk = [28])
+class SessionSharedObjectTest {
+  private lateinit var database: MetricsDatabase
+  private lateinit var sessionManager: SessionManager
+
+  @Before
+  fun setUp() {
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    database = Room
+      .inMemoryDatabaseBuilder(context, MetricsDatabase::class.java)
+      .allowMainThreadQueries()
+      .build()
+    sessionManager = SessionManager(context, database)
+  }
+
+  @After
+  fun tearDown() {
+    database.close()
+  }
+
+  @Test
+  fun `addMetrics persists the session row before writing the metric`() =
+    runTest {
+      // Arrange — a fresh session that has NOT been awaited yet.
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+      assertNull(sessionManager.getSessionRow(session.sessionId))
+
+      // Act — the very first touch is a write. If the INSERT didn't run first,
+      // the FK on metrics.sessionId would throw FOREIGN KEY constraint failed.
+      session.addMetrics(listOf(createMetric("metric-1", session.sessionId)))
+
+      // Assert — both the row and the metric exist.
+      assertNotNull(sessionManager.getSessionRow(session.sessionId))
+      assertEquals(
+        setOf("metric-1"),
+        sessionManager.getMetricsForSession(session.sessionId).map { it.metricId }.toSet()
+      )
+    }
+
+  @Test
+  fun `addLogs persists the session row before writing the log`() =
+    runTest {
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+      assertNull(sessionManager.getSessionRow(session.sessionId))
+
+      session.addLogs(listOf(createLog("log-1", session.sessionId)))
+
+      assertNotNull(sessionManager.getSessionRow(session.sessionId))
+      assertEquals(
+        setOf("log-1"),
+        sessionManager.getLogsForSession(session.sessionId).map { it.logId }.toSet()
+      )
+    }
+
+  @Test
+  fun `startTimestamp defaults to construction time when omitted`() =
+    runTest {
+      // No startTimestamp passed — the object stamps it from the constructor.
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "custom"
+      )
+
+      // startDate is populated synchronously at construction...
+      assertTrue(session.startDate.isNotBlank())
+
+      // ...and is the timestamp persisted for the row.
+      session.awaitSessionPersisted()
+      assertEquals(
+        session.startDate,
+        sessionManager.getSessionRow(session.sessionId)!!.startTimestamp
+      )
+    }
+
+  @Test
+  fun `awaitSessionPersisted runs the start job exactly once`() =
+    runTest {
+      // Spy so we can count the real INSERT. We can't assert this via the DB:
+      // session inserts use OnConflictStrategy.IGNORE, so a duplicate run would
+      // be silently swallowed and leave exactly one row regardless.
+      val spy = spyk(sessionManager)
+      val session = SessionSharedObject(
+        sessionManager = spy,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+
+      // Two concurrent waiters plus a third sequential call — all join the same
+      // lazily-started job, which must execute its body only once.
+      val a = launch { session.awaitSessionPersisted() }
+      val b = launch { session.awaitSessionPersisted() }
+      a.join()
+      b.join()
+      session.awaitSessionPersisted()
+
+      coVerify(exactly = 1) { spy.startSessionWithIdAt(any(), any(), any(), any()) }
+      assertNotNull(sessionManager.getSessionRow(session.sessionId))
+    }
+
+  @Test
+  fun `stop awaits the start job then stamps the end timestamp`() =
+    runTest {
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+
+      session.stop()
+
+      val row = sessionManager.getSessionRow(session.sessionId)
+      assertNotNull(row)
+      assertFalse(row!!.isActive)
+      assertNotNull(row.endTimestamp)
+    }
+
+  @Test
+  fun `isActive and getEndDate reflect the persisted row across stop`() =
+    runTest {
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+      session.awaitSessionPersisted()
+
+      assertTrue(session.isActive())
+      assertNull(session.getEndDate())
+
+      session.stop()
+
+      assertFalse(session.isActive())
+      assertNotNull(session.getEndDate())
+    }
+
+  @Test
+  fun `isActive defaults to true before the row is persisted`() =
+    runTest {
+      // Never awaited, so the start job hasn't inserted the row yet — the read
+      // is optimistic rather than blocking.
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+
+      assertTrue(session.isActive())
+      assertNull(session.getEndDate())
+      assertNull(sessionManager.getSessionRow(session.sessionId))
+    }
+
+  @Test
+  fun `getMetrics and getLogs are empty before the row is persisted`() =
+    runTest {
+      // Never awaited — no row, no entries. The optimistic read returns empty
+      // collections rather than blocking on the start job.
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+
+      assertEquals(emptyList<Metric>(), session.getMetrics())
+      assertEquals(emptyList<LogRecord>(), session.getLogs())
+    }
+
+  @Test
+  fun `a freshly persisted session reads as active with no metrics or logs`() =
+    runTest {
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+      session.awaitSessionPersisted()
+
+      // Row exists now, but nothing has been written to it yet.
+      assertTrue(session.isActive())
+      assertNull(session.getEndDate())
+      assertEquals(emptyList<Metric>(), session.getMetrics())
+      assertEquals(emptyList<LogRecord>(), session.getLogs())
+    }
+
+  @Test
+  fun `getMetrics and getLogs return this session's persisted entries`() =
+    runTest {
+      val session = SessionSharedObject(
+        sessionManager = sessionManager,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+
+      session.addMetrics(listOf(createMetric("metric-1", session.sessionId)))
+      session.addLogs(listOf(createLog("log-1", session.sessionId)))
+
+      assertEquals(setOf("metric-1"), session.getMetrics().map { it.metricId }.toSet())
+      assertEquals(setOf("log-1"), session.getLogs().map { it.logId }.toSet())
+    }
+
+  @Test
+  fun `getters never trigger the session-start persist`() =
+    runTest {
+      // Reads are intentionally NOT gated on awaitSessionPersisted(): they read
+      // through optimistically and must never kick off the lazy start job.
+      val spy = spyk(sessionManager)
+      val session = SessionSharedObject(
+        sessionManager = spy,
+        scope = this,
+        type = "main",
+        customStartTimestamp = "2025-01-01T00:00:00.000Z"
+      )
+
+      session.isActive()
+      session.getEndDate()
+      session.getMetrics()
+      session.getLogs()
+
+      // No INSERT was issued and the row still doesn't exist.
+      coVerify(exactly = 0) { spy.startSessionWithIdAt(any(), any(), any(), any()) }
+      assertNull(sessionManager.getSessionRow(session.sessionId))
+    }
+
+  // region Helpers
+
+  private fun createMetric(
+    metricId: String,
+    sessionId: String
+  ): Metric =
+    Metric(
+      metricId = metricId,
+      sessionId = sessionId,
+      timestamp = "2025-01-01T00:00:00.000Z",
+      category = "test",
+      name = "test-metric",
+      value = 123.45,
+      routeName = null,
+      params = null
+    )
+
+  private fun createLog(
+    logId: String,
+    sessionId: String
+  ): LogRecord =
+    LogRecord(
+      logId = logId,
+      sessionId = sessionId,
+      timestamp = "2025-01-01T00:00:00.000Z",
+      name = "test.event",
+      body = null,
+      severity = "info",
+      attributes = null,
+      droppedAttributesCount = 0
+    )
+
+  // endregion
+}
diff --git a/packages/expo-app-metrics/build/Session.d.ts b/packages/expo-app-metrics/build/Session.d.ts
new file mode 100644
index 00000000000000..b830fc87e61f7d
--- /dev/null
+++ b/packages/expo-app-metrics/build/Session.d.ts
@@ -0,0 +1,54 @@
+import type { SharedObject } from 'expo';
+import type { LogRecord, Metric, MetricInput, SessionType } from './types';
+/**
+ * A live session recorded by App Metrics, backed by a native shared object.
+ *
+ * The scalar properties (`id`, `type`, `startDate`) are snapshots taken when the
+ * object is created — they do not update as the session evolves. Properties that
+ * can change over the session's lifetime (`isActive`, `getEndDate`) and the
+ * heavier collections (`getMetrics`, `getLogs`) are fetched lazily so they
+ * reflect live state on each call.
+ *
+ * @private This API is unstable and may change without notice.
+ */
+export declare class Session extends SharedObject {
+    /**
+     * Unique identifier (UUID) of the session.
+     */
+    readonly id: string;
+    /**
+     * Kind of session. The per-launch session is `'main'`; a session tracking
+     * foreground time is `'foreground'`.
+     */
+    readonly type: SessionType;
+    /**
+     * ISO 8601 timestamp of when the session started.
+     */
+    readonly startDate: string;
+    /**
+     * Fetches whether the session is still active. Read lazily so it reflects the
+     * session's live state rather than a snapshot from when the object was
+     * created.
+     */
+    isActive(): Promise<boolean>;
+    /**
+     * Fetches the ISO 8601 timestamp of when the session ended, or `null` while
+     * it is still active. Read lazily so it reflects live state.
+     */
+    getEndDate(): Promise<string | null>;
+    /**
+     * Fetches the metrics recorded during this session from the on-device store.
+     */
+    getMetrics(): Promise<Metric[]>;
+    /**
+     * Fetches the log events recorded during this session from the on-device
+     * store.
+     */
+    getLogs(): Promise<LogRecord[]>;
+    /**
+     * Records a custom metric against this session. The session id is implied by
+     * the receiver, so the metric input carries no `sessionId`.
+     */
+    addMetric(metric: MetricInput): Promise<void>;
+}
+//# sourceMappingURL=Session.d.ts.map
\ No newline at end of file
diff --git a/packages/expo-app-metrics/build/Session.d.ts.map b/packages/expo-app-metrics/build/Session.d.ts.map
new file mode 100644
index 00000000000000..97c9445e5738f1
--- /dev/null
+++ b/packages/expo-app-metrics/build/Session.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3E;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,YAAY;IAC/C;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;IACH,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAC5B;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IACpC;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAC/B;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAC/B;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9C"}
\ No newline at end of file
diff --git a/packages/expo-app-metrics/build/index.d.ts b/packages/expo-app-metrics/build/index.d.ts
index 890521e72c2670..ca2ec9864e8180 100644
--- a/packages/expo-app-metrics/build/index.d.ts
+++ b/packages/expo-app-metrics/build/index.d.ts
@@ -1,5 +1,6 @@
 export { default } from './module';
 export { AppMetricsRoot } from './AppMetricsRoot';
+export type { Session } from './Session';
 export * from './types';
 export * from './useNetworkRequestObserver';
 //# sourceMappingURL=index.d.ts.map
\ No newline at end of file
diff --git a/packages/expo-app-metrics/build/index.d.ts.map b/packages/expo-app-metrics/build/index.d.ts.map
index e2e0de39c21446..7db2c2b29655de 100644
--- a/packages/expo-app-metrics/build/index.d.ts.map
+++ b/packages/expo-app-metrics/build/index.d.ts.map
@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,cAAc,SAAS,CAAC;AACxB,cAAc,6BAA6B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,cAAc,SAAS,CAAC;AACxB,cAAc,6BAA6B,CAAC"}
\ No newline at end of file
diff --git a/packages/expo-app-metrics/build/module.web.d.ts b/packages/expo-app-metrics/build/module.web.d.ts
index e43fe585ad05f0..696ddf1cd0ea26 100644
--- a/packages/expo-app-metrics/build/module.web.d.ts
+++ b/packages/expo-app-metrics/build/module.web.d.ts
@@ -1,8 +1,11 @@
 import { NativeModule } from 'expo';
+import type { Session } from './Session';
 import type { ExpoAppMetricsModuleType, LogAttributeValue, LogEventOptions, Metric, MetricAttributes } from './types';
 export * from './types';
 declare class ExpoAppMetricsModule extends NativeModule implements ExpoAppMetricsModuleType {
     NetworkRequestObserver: ExpoAppMetricsModuleType["NetworkRequestObserver"];
+    Session: typeof Session;
+    private mainSession;
     addCustomMetricToSession(metric: Metric): Promise<void>;
     markFirstRender(): Promise<void>;
     markInteractive(attributes?: MetricAttributes): Promise<void>;
@@ -12,7 +15,7 @@ declare class ExpoAppMetricsModule extends NativeModule implements ExpoAppMetric
     getInactiveSessions(): Promise<never[]>;
     simulateCrashReport(): void;
     triggerCrash(): void;
-    getMainSession(): Promise<null>;
+    getMainSession(): Session;
     getForegroundSession(): Promise<null>;
 }
 declare const _default: typeof ExpoAppMetricsModule;
diff --git a/packages/expo-app-metrics/build/module.web.d.ts.map b/packages/expo-app-metrics/build/module.web.d.ts.map
index ca607cb80f57ad..3b02551896af4f 100644
--- a/packages/expo-app-metrics/build/module.web.d.ts.map
+++ b/packages/expo-app-metrics/build/module.web.d.ts.map
@@ -1 +1 @@
-{"version":3,"file":"module.web.d.ts","sourceRoot":"","sources":["../src/module.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAmC,MAAM,MAAM,CAAC;AAErE,OAAO,KAAK,EACV,wBAAwB,EACxB,iBAAiB,EACjB,eAAe,EACf,MAAM,EACN,gBAAgB,EAEjB,MAAM,SAAS,CAAC;AAEjB,cAAc,SAAS,CAAC;AAOxB,cAAM,oBAAqB,SAAQ,YAAa,YAAW,wBAAwB;IACjF,sBAAsB,EACoB,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;IAE7F,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAGjD,eAAe;IACf,eAAe,CAAC,UAAU,CAAC,EAAE,gBAAgB;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe;IAChD,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI;IACnE,kBAAkB;IAClB,mBAAmB;IAGzB,mBAAmB;IACnB,YAAY;IACN,cAAc;IAGd,oBAAoB;CAG3B;;AAED,wBAAyE"}
\ No newline at end of file
+{"version":3,"file":"module.web.d.ts","sourceRoot":"","sources":["../src/module.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAmC,MAAM,MAAM,CAAC;AAErE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EACV,wBAAwB,EACxB,iBAAiB,EACjB,eAAe,EAEf,MAAM,EACN,gBAAgB,EAIjB,MAAM,SAAS,CAAC;AAEjB,cAAc,SAAS,CAAC;AA8BxB,cAAM,oBAAqB,SAAQ,YAAa,YAAW,wBAAwB;IACjF,sBAAsB,EACoB,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;IAC7F,OAAO,EAA4B,OAAO,OAAO,CAAC;IAElD,OAAO,CAAC,WAAW,CAA2B;IAE9C,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjD,eAAe;IACf,eAAe,CAAC,UAAU,CAAC,EAAE,gBAAgB;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe;IAChD,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI;IACnE,kBAAkB;IAClB,mBAAmB;IAGzB,mBAAmB;IACnB,YAAY;IACZ,cAAc,IAAI,OAAO;IAInB,oBAAoB;CAG3B;;AAED,wBAAyE"}
\ No newline at end of file
diff --git a/packages/expo-app-metrics/build/types.d.ts b/packages/expo-app-metrics/build/types.d.ts
index 58c415093f1aa0..df68dc5ff58a8c 100644
--- a/packages/expo-app-metrics/build/types.d.ts
+++ b/packages/expo-app-metrics/build/types.d.ts
@@ -1,4 +1,5 @@
 import type { SharedObject } from 'expo';
+import type { Session } from './Session';
 export type AppStartupTimes = {
     /**
      * Time from when the user taps the app to the moment the app starts executing the main code.
@@ -181,21 +182,11 @@ export type LogEventOptions = {
 };
 export type SessionType = 'main' | 'foreground' | 'screen' | 'custom' | 'unknown';
 export type CrashKind = 'badAccess' | 'fatalError' | 'divideByZero' | 'forceUnwrapNil' | 'arrayOutOfBounds' | 'objcException' | 'stackOverflow';
-type SessionBase = {
-    id: string;
-    startDate: string;
-    endDate?: string | null;
-    metrics: Metric[];
-    logs: LogRecord[];
-};
-export type MainSession = SessionBase & {
-    type: 'main';
-    crashReport?: CrashReport | null;
-};
-export type GenericSession = SessionBase & {
-    type: Exclude<SessionType, 'main'>;
-};
-export type Session = MainSession | GenericSession;
+/**
+ * Payload accepted by `Session.addMetric`. The owning session is implied by the
+ * receiver, so the input carries every `Metric` field except `sessionId`.
+ */
+export type MetricInput = Omit<Metric, 'sessionId'>;
 export type CallStackFrame = {
     binaryName?: string | null;
     binaryUUID?: string | null;
@@ -338,6 +329,29 @@ export type NetworkRequestObserverEvents = {
 export declare class NetworkRequestObserver extends SharedObject<NetworkRequestObserverEvents> {
     constructor();
 }
+/**
+ * A historic session and its recorded data, returned by `getInactiveSessions()`
+ * as a plain eager record (not a shared object). Debug-only: intended for
+ * inspecting on-device history, not production use.
+ *
+ * @private This API is unstable, debug-only, and may change without notice.
+ */
+export type DebugSession = {
+    /** Unique identifier (UUID) of the session. */
+    id: string;
+    /** Kind of session. */
+    type: SessionType;
+    /** ISO 8601 timestamp of when the session started. */
+    startDate: string;
+    /** ISO 8601 timestamp of when the session ended, or `null`/absent while active. */
+    endDate?: string | null;
+    /** Metrics recorded during the session. */
+    metrics: Metric[];
+    /** Log events recorded during the session. */
+    logs: LogRecord[];
+    /** Crash report attached to the session, if any. Never present on Android (MetricKit is iOS-only). */
+    crashReport?: CrashReport | null;
+};
 export interface ExpoAppMetricsModuleType {
     markFirstRender(): void;
     markInteractive(attributes?: MetricAttributes): void;
@@ -377,7 +391,7 @@ export interface ExpoAppMetricsModuleType {
      *
      * @private This API is unstable and may change without notice.
      */
-    getInactiveSessions(): Promise<Session[]>;
+    getInactiveSessions(): Promise<DebugSession[]>;
     /**
      * Simulates a crash report, attributing it to the current main session.
      * Intended for development and debugging only.
@@ -399,17 +413,17 @@ export interface ExpoAppMetricsModuleType {
      */
     addCustomMetricToSession(metric: Metric): Promise<void>;
     /**
-     * Returns the current main session, including its metrics.
+     * Returns the main session — the per-launch session that tracks the entire
+     * app process — as a shared object built from in-memory state, so the call
+     * is synchronous and never returns `null`. Metrics and logs are fetched
+     * lazily via the returned object.
+     *
+     * The returned object is a static reference: repeated calls return the same
+     * object while it stays referenced, so `getMainSession() === getMainSession()`.
      *
      * @private This API is unstable and may change without notice.
      */
-    getMainSession(): Promise<MainSession | null>;
-    /**
-     * Class for subscribing to HTTP requests observed by the native networking interceptor.
-     * Construct an instance to begin receiving `requestStarted`/`requestCompleted` events;
-     * release the instance (drop all references) to stop.
-     */
-    NetworkRequestObserver: typeof NetworkRequestObserver;
+    getMainSession(): Session;
     /**
      * Resolves to the current foreground session — created when the app becomes
      * active and ended when it is backgrounded — as a shared object, or `null`
@@ -420,6 +434,19 @@ export interface ExpoAppMetricsModuleType {
      * @platform ios
      */
     getForegroundSession(): Promise<Session | null>;
+    /**
+     * Class for subscribing to HTTP requests observed by the native networking interceptor.
+     * Construct an instance to begin receiving `requestStarted`/`requestCompleted` events;
+     * release the instance (drop all references) to stop.
+     */
+    NetworkRequestObserver: typeof NetworkRequestObserver;
+    /**
+     * Native `Session` shared-object class (live main/foreground sessions).
+     * Exposed so the web module can substitute its own implementation; not
+     * intended to be constructed from user code.
+     *
+     * @private This API is unstable and may change without notice.
+     */
+    Session: typeof Session;
 }
-export {};
 //# sourceMappingURL=types.d.ts.map
\ No newline at end of file
diff --git a/packages/expo-app-metrics/build/types.d.ts.map b/packages/expo-app-metrics/build/types.d.ts.map
index ebba5da20d0623..24d8764c34878a 100644
--- a/packages/expo-app-metrics/build/types.d.ts.map
+++ b/packages/expo-app-metrics/build/types.d.ts.map
@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/packages/expo-app-metrics/ios/AppMetricsModule.swift b/packages/expo-app-metrics/ios/AppMetricsModule.swift
index 51c03ac1488c76..d595c7810c6e8e 100644
--- a/packages/expo-app-metrics/ios/AppMetricsModule.swift
+++ b/packages/expo-app-metrics/ios/AppMetricsModule.swift
@@ -1,3 +1,4 @@
+import Foundation
 import ExpoModulesCore
 import EXUpdatesInterface
 
@@ -33,6 +34,8 @@ public final class AppMetricsModule: Module, UpdatesStateChangeListener {
       )
     }
 
+    // TODO(@ubax): move `logEvent` onto the Session shared object so logs are recorded via a
+    // session handle (like `addMetric`), instead of writing to `mainSession` directly here.
     Function("logEvent") { (name: String, options: LogEventOptions?) in
       guard let validatedName = validateEventName(name) else {
         return
@@ -91,23 +94,44 @@ public final class AppMetricsModule: Module, UpdatesStateChangeListener {
       }.value
     }
 
-    AsyncFunction("getMainSession") { () -> StoredSession? in
-      return try await AppMetricsActor.isolated {
-        try storedSession(id: AppMetrics.mainSession.id)
-      }.value
+    // Synchronous and never nil: the main session is the process-lifetime singleton, always
+    // available. It's a `SharedObject`, so returning the same instance hands JS the identical shared
+    // object on every call (`getMainSession() === getMainSession()`).
+    Function("getMainSession") { () -> Session in
+      return AppMetrics.mainSession
     }
 
     // Returns the current foreground session, or `nil` when the app is not in the foreground.
-    // Reads the actor-isolated `foregroundSession`, so it's async. The handle is cached and reused
-    // while the same foreground session is current, and rebuilt when the session rotates, so the
-    // reference is static per foreground session.
-    AsyncFunction("getForegroundSession") { () -> StoredSession? in
-      return try await AppMetricsActor.isolated { () -> StoredSession? in
-        guard let foregroundSessionId = AppMetrics.foregroundSession?.id else {
-          return nil
-        }
-        return try storedSession(id: foregroundSessionId)
-      }.value
+    // Reads the actor-isolated `foregroundSession`, so it's async. The instance is the shared object
+    // itself, so JS gets the same object while the session is current and a new one after it rotates.
+    AsyncFunction("getForegroundSession") { () -> Session? in
+      return try await AppMetricsActor.isolated { AppMetrics.foregroundSession }.value
+    }
+
+    Class("Session", Session.self) {
+      Property("id") { $0.id }
+      Property("type") { $0.type.rawValue }
+      Property("startDate") { $0.startDate.ISO8601Format() }
+
+      AsyncFunction("isActive") { (session: Session) -> Bool in
+        return try await AppMetricsActor.isolated { session.isActive }.value
+      }
+
+      AsyncFunction("getEndDate") { (session: Session) -> String? in
+        return try await AppMetricsActor.isolated { session.endDate?.ISO8601Format() }.value
+      }
+
+      AsyncFunction("getMetrics") { (session: Session) -> [Metric] in
+        return try await AppMetricsActor.isolated { try session.getMetrics() }.value
+      }
+
+      AsyncFunction("getLogs") { (session: Session) -> [LogRecord] in
+        return try await AppMetricsActor.isolated { try session.getLogs() }.value
+      }
+
+      AsyncFunction("addMetric") { (session: Session, input: SessionMetricInput) in
+        try await AppMetricsActor.isolated { try session.addMetric(input) }.value
+      }
     }
 
     Function("simulateCrashReport") {
diff --git a/packages/expo-app-metrics/ios/Sessions/ForegroundSession.swift b/packages/expo-app-metrics/ios/Sessions/ForegroundSession.swift
index 2807b80316e769..4e99f9e9011010 100644
--- a/packages/expo-app-metrics/ios/Sessions/ForegroundSession.swift
+++ b/packages/expo-app-metrics/ios/Sessions/ForegroundSession.swift
@@ -4,7 +4,7 @@
  A new foreground session starts when the AppDelegate's `applicationDidBecomeActive` is called and
  ends when `applicationDidEnterBackground` is called. Each app foregrounding creates a new session.
  */
-internal final class ForegroundSession: Session {
+internal final class ForegroundSession: Session, @unchecked Sendable {
   init() {
     super.init(type: .foreground)
   }
diff --git a/packages/expo-app-metrics/ios/Sessions/JsMetric.swift b/packages/expo-app-metrics/ios/Sessions/JsMetric.swift
index f09f021edb30a7..c3a12b9511a3b6 100644
--- a/packages/expo-app-metrics/ios/Sessions/JsMetric.swift
+++ b/packages/expo-app-metrics/ios/Sessions/JsMetric.swift
@@ -28,3 +28,28 @@ struct JsMetric: Record {
     )
   }
 }
+
+/**
+ Mirrors the TypeScript `MetricInput` type (`Metric` minus `sessionId`)
+ */
+struct SessionMetricInput: Record {
+  @Field var category: String = ""
+  @Field var name: String = ""
+  @Field var value: Double = 0
+  @Field var timestamp: String = Date.now.ISO8601Format()
+  @Field var routeName: String?
+  @Field var params: [String: Any]?
+
+  func toMetric(sessionId: String) -> Metric {
+    return Metric(
+      category: Metric.Category(rawValue: category),
+      name: name,
+      value: value,
+      timestamp: timestamp,
+      routeName: routeName,
+      updateId: nil,
+      params: params,
+      sessionId: sessionId
+    )
+  }
+}
diff --git a/packages/expo-app-metrics/ios/Sessions/Session.swift b/packages/expo-app-metrics/ios/Sessions/Session.swift
index c019822ae0142f..2df8db8abb3753 100644
--- a/packages/expo-app-metrics/ios/Sessions/Session.swift
+++ b/packages/expo-app-metrics/ios/Sessions/Session.swift
@@ -1,9 +1,10 @@
 import Foundation
+import ExpoModulesCore
 
 /**
  Session is a time frame during the app's lifetime that tracks various metrics from its start till its end.
  */
-public class Session: MetricsReceiver, @unchecked Sendable {
+public class Session: SharedObject, MetricsReceiver, @unchecked Sendable {
   /**
    Unique ID of the session in UUID v4 format.
    */
@@ -28,6 +29,7 @@ public class Session: MetricsReceiver, @unchecked Sendable {
     self.id = UUID().uuidString
     self.startDate = Date.now
     self.type = type
+    super.init()
 
     // The session-row INSERT is fire-and-forget on `AppMetricsActor`. Subsequent writes for this
     // session (metrics, logs, `stop()`, crash reports) all go through the same actor, and tasks on
@@ -56,6 +58,7 @@ public class Session: MetricsReceiver, @unchecked Sendable {
     self.type = type
     self.startDate = startDate
     self.endDate = endDate
+    super.init()
   }
 
   /**
@@ -122,12 +125,47 @@ public class Session: MetricsReceiver, @unchecked Sendable {
 
   let memoryMeter = MemoryMonitoring()
 
+  // MARK: - Reading and recording session data
+
+  /**
+   Metrics recorded against this session, decoded from storage.
+   */
+  @AppMetricsActor
+  func getMetrics() throws -> [Metric] {
+    let rows = try AppMetrics.database?.getMetrics(sessionId: id) ?? []
+    return decodeMetrics(from: rows)
+  }
+
+  /**
+   Log records recorded against this session, decoded from storage.
+   */
+  @AppMetricsActor
+  func getLogs() throws -> [LogRecord] {
+    let rows = try AppMetrics.database?.getLogs(sessionId: id) ?? []
+    return decodeLogs(from: rows)
+  }
+
+  /**
+   Records a metric against this session. JS-facing: errors propagate so the caller's promise rejects.
+   */
+  @AppMetricsActor
+  func addMetric(_ input: SessionMetricInput) throws {
+    try insert(input.toMetric(sessionId: id))
+  }
+
+  // Persists a metric row for this session. Shared by the throwing JS path (`addMetric`) and the
+  // fire-and-forget native push path (`receiveMetric`), which differ only in error handling.
+  @AppMetricsActor
+  private func insert(_ metric: Metric) throws {
+    try AppMetrics.database?.insert(metric: MetricRow.from(metric: metric, sessionId: id))
+  }
+
   // MARK: - MetricsReceiver
 
   @AppMetricsActor
   public func receiveMetric(_ metric: Metric) {
     do {
-      try AppMetrics.database?.insert(metric: MetricRow.from(metric: metric, sessionId: self.id))
+      try insert(metric)
     } catch {
       logger.warn("[AppMetrics] Failed to insert metric \"\(metric.getMetricKey())\" for session \(self.id): \(error.localizedDescription)")
     }
diff --git a/packages/expo-app-metrics/ios/Storage/StoredSession.swift b/packages/expo-app-metrics/ios/Storage/StoredSession.swift
index 1886d797f151c0..bd96c5d4941718 100644
--- a/packages/expo-app-metrics/ios/Storage/StoredSession.swift
+++ b/packages/expo-app-metrics/ios/Storage/StoredSession.swift
@@ -13,7 +13,6 @@ public struct StoredSession: Codable, Sendable {
   public let type: Session.SessionType
   public let startDate: String
   public let endDate: String?
-  public let isActive: Bool
   public let environment: String?
   public let app: AppInfo
   public let device: DeviceInfo
@@ -34,7 +33,6 @@ public struct StoredSession: Codable, Sendable {
     self.type = Session.SessionType(rawValue: session.type) ?? .unknown
     self.startDate = session.startTimestamp
     self.endDate = session.endTimestamp
-    self.isActive = session.isActive
     self.environment = session.environment
     self.languageTag = session.languageTag
     self.app = AppInfo(
@@ -58,28 +56,46 @@ public struct StoredSession: Codable, Sendable {
       systemName: session.deviceOs ?? "",
       systemVersion: session.deviceOsVersion ?? ""
     )
-    self.metrics = row.metrics.map { metric in
-      return Metric(
-        category: metric.category.flatMap { Metric.Category(rawValue: $0) },
-        name: metric.name,
-        value: metric.value,
-        timestamp: metric.timestamp,
-        routeName: metric.routeName,
-        updateId: metric.updateId,
-        params: decodeJSONDictionary(metric.params),
-        sessionId: metric.sessionId
-      )
-    }
-    self.logs = row.logs.map { log in
-      return LogRecord(
-        name: log.name,
-        body: log.body,
-        attributes: decodeJSONDictionary(log.attributes),
-        droppedAttributesCount: log.droppedAttributesCount,
-        severity: Severity(rawValue: log.severity) ?? .info,
-        timestamp: log.timestamp
-      )
-    }
+    self.metrics = decodeMetrics(from: row.metrics)
+    self.logs = decodeLogs(from: row.logs)
     self.crashReport = decodeFromJSONString(CrashReport.self, from: row.crashReportJSON)
   }
 }
+
+/**
+ Projects metric rows into the public `Metric` domain shape, decoding the JSON-encoded `params`
+ blob back into a dictionary. Shared by `StoredSession` and the `Session`/`DebugSession` shared
+ objects' lazy `getMetrics()` readers.
+ */
+func decodeMetrics(from rows: [MetricRow]) -> [Metric] {
+  return rows.map { metric in
+    return Metric(
+      category: metric.category.flatMap { Metric.Category(rawValue: $0) },
+      name: metric.name,
+      value: metric.value,
+      timestamp: metric.timestamp,
+      routeName: metric.routeName,
+      updateId: metric.updateId,
+      params: decodeJSONDictionary(metric.params),
+      sessionId: metric.sessionId
+    )
+  }
+}
+
+/**
+ Projects log rows into the public `LogRecord` domain shape, decoding the JSON-encoded `attributes`
+ blob back into a dictionary. Shared by `StoredSession` and the `Session`/`DebugSession` shared
+ objects' lazy `getLogs()` readers.
+ */
+func decodeLogs(from rows: [LogRow]) -> [LogRecord] {
+  return rows.map { log in
+    return LogRecord(
+      name: log.name,
+      body: log.body,
+      attributes: decodeJSONDictionary(log.attributes),
+      droppedAttributesCount: log.droppedAttributesCount,
+      severity: Severity(rawValue: log.severity) ?? .info,
+      timestamp: log.timestamp
+    )
+  }
+}
diff --git a/packages/expo-app-metrics/ios/Tests/SessionMetricInputTests.swift b/packages/expo-app-metrics/ios/Tests/SessionMetricInputTests.swift
new file mode 100644
index 00000000000000..a74cd088e8c3fd
--- /dev/null
+++ b/packages/expo-app-metrics/ios/Tests/SessionMetricInputTests.swift
@@ -0,0 +1,52 @@
+import Testing
+
+@testable import ExpoAppMetrics
+
+@Suite("SessionMetricInput")
+struct SessionMetricInputTests {
+  @Test
+  func `injects the passed sessionId rather than carrying one itself`() {
+    var input = SessionMetricInput()
+    input.category = "navigation"
+    input.name = "ttr"
+    input.value = 1.5
+    input.timestamp = "2026-01-01T00:00:00Z"
+
+    let metric = input.toMetric(sessionId: "session-from-shared-object")
+    #expect(metric.sessionId == "session-from-shared-object")
+    #expect(metric.category == .navigation)
+    #expect(metric.name == "ttr")
+    #expect(metric.value == 1.5)
+    #expect(metric.timestamp == "2026-01-01T00:00:00Z")
+  }
+
+  @Test
+  func `drops the category when the raw string is unknown`() {
+    // Mirrors `JsMetric` behavior: until `Metric.Category` accepts free-form strings, an unknown
+    // category is dropped to keep the Codable contract intact.
+    var input = SessionMetricInput()
+    input.category = "not-a-real-category"
+    input.name = "custom"
+    input.value = 0
+
+    let metric = input.toMetric(sessionId: "s1")
+    #expect(metric.category == nil)
+    #expect(metric.name == "custom")
+  }
+
+  @Test
+  func `carries routeName and params through to the Metric`() {
+    var input = SessionMetricInput()
+    input.category = "navigation"
+    input.name = "ttr"
+    input.value = 0.4
+    input.routeName = "/home"
+    input.params = ["isInitial": true]
+
+    let metric = input.toMetric(sessionId: "s1")
+    #expect(metric.routeName == "/home")
+    // `updateId` is not part of the JS-facing `MetricInput` contract.
+    #expect(metric.updateId == nil)
+    #expect(metric.params != nil)
+  }
+}
diff --git a/packages/expo-app-metrics/src/Session.ts b/packages/expo-app-metrics/src/Session.ts
new file mode 100644
index 00000000000000..cc3f7a1655e6ba
--- /dev/null
+++ b/packages/expo-app-metrics/src/Session.ts
@@ -0,0 +1,56 @@
+import type { SharedObject } from 'expo';
+
+import type { LogRecord, Metric, MetricInput, SessionType } from './types';
+
+/**
+ * A live session recorded by App Metrics, backed by a native shared object.
+ *
+ * The scalar properties (`id`, `type`, `startDate`) are snapshots taken when the
+ * object is created — they do not update as the session evolves. Properties that
+ * can change over the session's lifetime (`isActive`, `getEndDate`) and the
+ * heavier collections (`getMetrics`, `getLogs`) are fetched lazily so they
+ * reflect live state on each call.
+ *
+ * @private This API is unstable and may change without notice.
+ */
+export declare class Session extends SharedObject {
+  /**
+   * Unique identifier (UUID) of the session.
+   */
+  readonly id: string;
+  /**
+   * Kind of session. The per-launch session is `'main'`; a session tracking
+   * foreground time is `'foreground'`.
+   */
+  readonly type: SessionType;
+  /**
+   * ISO 8601 timestamp of when the session started.
+   */
+  readonly startDate: string;
+
+  /**
+   * Fetches whether the session is still active. Read lazily so it reflects the
+   * session's live state rather than a snapshot from when the object was
+   * created.
+   */
+  isActive(): Promise<boolean>;
+  /**
+   * Fetches the ISO 8601 timestamp of when the session ended, or `null` while
+   * it is still active. Read lazily so it reflects live state.
+   */
+  getEndDate(): Promise<string | null>;
+  /**
+   * Fetches the metrics recorded during this session from the on-device store.
+   */
+  getMetrics(): Promise<Metric[]>;
+  /**
+   * Fetches the log events recorded during this session from the on-device
+   * store.
+   */
+  getLogs(): Promise<LogRecord[]>;
+  /**
+   * Records a custom metric against this session. The session id is implied by
+   * the receiver, so the metric input carries no `sessionId`.
+   */
+  addMetric(metric: MetricInput): Promise<void>;
+}
diff --git a/packages/expo-app-metrics/src/index.ts b/packages/expo-app-metrics/src/index.ts
index 98257c5b036eba..f399c928137d9d 100644
--- a/packages/expo-app-metrics/src/index.ts
+++ b/packages/expo-app-metrics/src/index.ts
@@ -1,4 +1,5 @@
 export { default } from './module';
 export { AppMetricsRoot } from './AppMetricsRoot';
+export type { Session } from './Session';
 export * from './types';
 export * from './useNetworkRequestObserver';
diff --git a/packages/expo-app-metrics/src/module.web.ts b/packages/expo-app-metrics/src/module.web.ts
index f6b9b26ac5abc4..3ccedbc59ddd79 100644
--- a/packages/expo-app-metrics/src/module.web.ts
+++ b/packages/expo-app-metrics/src/module.web.ts
@@ -1,12 +1,16 @@
 import { NativeModule, registerWebModule, SharedObject } from 'expo';
 
+import type { Session } from './Session';
 import type {
   ExpoAppMetricsModuleType,
   LogAttributeValue,
   LogEventOptions,
+  LogRecord,
   Metric,
   MetricAttributes,
   NetworkRequestObserverEvents,
+  MetricInput,
+  SessionType,
 } from './types';
 
 export * from './types';
@@ -16,13 +20,40 @@ class NetworkRequestObserverWeb extends SharedObject<NetworkRequestObserverEvent
   // can construct it without guarding on Platform.OS.
 }
 
+class WebSession extends globalThis.expo.SharedObject {
+  readonly id = 'web-session';
+  readonly startDate = new Date().toISOString();
+
+  constructor(readonly type: SessionType = 'main') {
+    super();
+  }
+
+  async isActive(): Promise<boolean> {
+    return true;
+  }
+  async getEndDate(): Promise<string | null> {
+    return null;
+  }
+  async getMetrics(): Promise<Metric[]> {
+    return [];
+  }
+  async getLogs(): Promise<LogRecord[]> {
+    return [];
+  }
+  async addMetric(_metric: MetricInput): Promise<void> {}
+}
+
 class ExpoAppMetricsModule extends NativeModule implements ExpoAppMetricsModuleType {
   NetworkRequestObserver =
     NetworkRequestObserverWeb as unknown as ExpoAppMetricsModuleType['NetworkRequestObserver'];
+  Session = WebSession as unknown as typeof Session;
+
+  private mainSession: WebSession | null = null;
 
   addCustomMetricToSession(metric: Metric): Promise<void> {
     throw new Error('Method not implemented.');
   }
+
   async markFirstRender() {}
   async markInteractive(attributes?: MetricAttributes) {}
   logEvent(name: string, options?: LogEventOptions) {}
@@ -33,8 +64,9 @@ class ExpoAppMetricsModule extends NativeModule implements ExpoAppMetricsModuleT
   }
   simulateCrashReport() {}
   triggerCrash() {}
-  async getMainSession() {
-    return null;
+  getMainSession(): Session {
+    this.mainSession ??= new WebSession('main');
+    return this.mainSession as unknown as Session;
   }
   async getForegroundSession() {
     return null;
diff --git a/packages/expo-app-metrics/src/types.ts b/packages/expo-app-metrics/src/types.ts
index 8456a45d25279f..f1d59c875568ff 100644
--- a/packages/expo-app-metrics/src/types.ts
+++ b/packages/expo-app-metrics/src/types.ts
@@ -1,5 +1,7 @@
 import type { SharedObject } from 'expo';
 
+import type { Session } from './Session';
+
 export type AppStartupTimes = {
   /**
    * Time from when the user taps the app to the moment the app starts executing the main code.
@@ -203,24 +205,11 @@ export type CrashKind =
   | 'objcException'
   | 'stackOverflow';
 
-type SessionBase = {
-  id: string;
-  startDate: string;
-  endDate?: string | null;
-  metrics: Metric[];
-  logs: LogRecord[];
-};
-
-export type MainSession = SessionBase & {
-  type: 'main';
-  crashReport?: CrashReport | null;
-};
-
-export type GenericSession = SessionBase & {
-  type: Exclude<SessionType, 'main'>;
-};
-
-export type Session = MainSession | GenericSession;
+/**
+ * Payload accepted by `Session.addMetric`. The owning session is implied by the
+ * receiver, so the input carries every `Metric` field except `sessionId`.
+ */
+export type MetricInput = Omit<Metric, 'sessionId'>;
 
 export type CallStackFrame = {
   binaryName?: string | null;
@@ -373,6 +362,30 @@ export declare class NetworkRequestObserver extends SharedObject<NetworkRequestO
   constructor();
 }
 
+/**
+ * A historic session and its recorded data, returned by `getInactiveSessions()`
+ * as a plain eager record (not a shared object). Debug-only: intended for
+ * inspecting on-device history, not production use.
+ *
+ * @private This API is unstable, debug-only, and may change without notice.
+ */
+export type DebugSession = {
+  /** Unique identifier (UUID) of the session. */
+  id: string;
+  /** Kind of session. */
+  type: SessionType;
+  /** ISO 8601 timestamp of when the session started. */
+  startDate: string;
+  /** ISO 8601 timestamp of when the session ended, or `null`/absent while active. */
+  endDate?: string | null;
+  /** Metrics recorded during the session. */
+  metrics: Metric[];
+  /** Log events recorded during the session. */
+  logs: LogRecord[];
+  /** Crash report attached to the session, if any. Never present on Android (MetricKit is iOS-only). */
+  crashReport?: CrashReport | null;
+};
+
 export interface ExpoAppMetricsModuleType {
   markFirstRender(): void;
   markInteractive(attributes?: MetricAttributes): void;
@@ -412,7 +425,7 @@ export interface ExpoAppMetricsModuleType {
    *
    * @private This API is unstable and may change without notice.
    */
-  getInactiveSessions(): Promise<Session[]>;
+  getInactiveSessions(): Promise<DebugSession[]>;
 
   /**
    * Simulates a crash report, attributing it to the current main session.
@@ -438,11 +451,28 @@ export interface ExpoAppMetricsModuleType {
   addCustomMetricToSession(metric: Metric): Promise<void>;
 
   /**
-   * Returns the current main session, including its metrics.
+   * Returns the main session — the per-launch session that tracks the entire
+   * app process — as a shared object built from in-memory state, so the call
+   * is synchronous and never returns `null`. Metrics and logs are fetched
+   * lazily via the returned object.
+   *
+   * The returned object is a static reference: repeated calls return the same
+   * object while it stays referenced, so `getMainSession() === getMainSession()`.
+   *
+   * @private This API is unstable and may change without notice.
+   */
+  getMainSession(): Session;
+
+  /**
+   * Resolves to the current foreground session — created when the app becomes
+   * active and ended when it is backgrounded — as a shared object, or `null`
+   * when no foreground session is active. Metrics and logs are fetched lazily
+   * via the returned object.
    *
    * @private This API is unstable and may change without notice.
+   * @platform ios
    */
-  getMainSession(): Promise<MainSession | null>;
+  getForegroundSession(): Promise<Session | null>;
 
   /**
    * Class for subscribing to HTTP requests observed by the native networking interceptor.
@@ -452,13 +482,11 @@ export interface ExpoAppMetricsModuleType {
   NetworkRequestObserver: typeof NetworkRequestObserver;
 
   /**
-   * Resolves to the current foreground session — created when the app becomes
-   * active and ended when it is backgrounded — as a shared object, or `null`
-   * when no foreground session is active. Metrics and logs are fetched lazily
-   * via the returned object.
+   * Native `Session` shared-object class (live main/foreground sessions).
+   * Exposed so the web module can substitute its own implementation; not
+   * intended to be constructed from user code.
    *
    * @private This API is unstable and may change without notice.
-   * @platform ios
    */
-  getForegroundSession(): Promise<Session | null>;
+  Session: typeof Session;
 }
diff --git a/packages/expo-observe/src/__tests__/optionalImport.test.ts b/packages/expo-observe/src/__tests__/optionalImport.test.ts
index a2e178fd4b39b6..2bbf081ba8c873 100644
--- a/packages/expo-observe/src/__tests__/optionalImport.test.ts
+++ b/packages/expo-observe/src/__tests__/optionalImport.test.ts
@@ -46,7 +46,7 @@ jest.mock('expo-app-metrics', () => ({
   __esModule: true,
   default: {
     markInteractive: jest.fn(),
-    getMainSession: jest.fn(async () => ({ id: 'session-1' })),
+    getMainSession: jest.fn(() => ({ id: 'session-1' })),
     addCustomMetricToSession: jest.fn(),
   },
 }));
diff --git a/packages/expo-observe/src/integrations/expo-router/__tests__/init.test.native.ts b/packages/expo-observe/src/integrations/expo-router/__tests__/init.test.native.ts
index 5e97c1cdfda744..5c4d2af2b43adf 100644
--- a/packages/expo-observe/src/integrations/expo-router/__tests__/init.test.native.ts
+++ b/packages/expo-observe/src/integrations/expo-router/__tests__/init.test.native.ts
@@ -7,7 +7,7 @@ import { createRouterIntegrationStorage, type RouterIntegrationStorage } from '.
 
 jest.mock('expo-app-metrics', () => {
   const addCustomMetricToSession = jest.fn();
-  const getMainSession = jest.fn(async () => ({ id: 'session-1' }));
+  const getMainSession = jest.fn(() => ({ id: 'session-1' }));
   return {
     __esModule: true,
     default: {
@@ -385,7 +385,7 @@ describe('initListeners', () => {
   });
 
   it('uses getMainSession from AppMetrics for the metric session id', async () => {
-    mockGetMainSession.mockResolvedValueOnce({ id: 'custom-session' });
+    mockGetMainSession.mockReturnValueOnce({ id: 'custom-session' });
     dispatch(events, 'NAVIGATE');
     focus(events, 'a');
     await new Promise((resolve) => setImmediate(resolve));
diff --git a/packages/expo-observe/src/integrations/expo-router/init.ts b/packages/expo-observe/src/integrations/expo-router/init.ts
index 54ad51e4c691e5..59a2f4f333dbab 100644
--- a/packages/expo-observe/src/integrations/expo-router/init.ts
+++ b/packages/expo-observe/src/integrations/expo-router/init.ts
@@ -48,8 +48,8 @@ export function initListeners(
 
   const unsubscribeFocus = navigationEvents.addListener('pageFocused', async (e) => {
     // Snapshot both clocks once so every metric written below is stamped with
-    // the moment the focus event fired, not the moment `addCustomMetricToSession`
-    // happens to run after the awaited `getMainSession()` round-trip.
+    // the moment the focus event fired, not the moment `addMetric` happens to run
+    // after the surrounding async work.
     const now = performance.now();
     const timestamp = new Date().toISOString();
 
@@ -101,7 +101,7 @@ export function initListeners(
     }
 
     // All async work happens after storage is updated.
-    const mainSessionId = (await AppMetrics.getMainSession())?.id;
+    const mainSessionId = AppMetrics.getMainSession()?.id;
     if (!mainSessionId) return;
 
     AppMetrics.addCustomMetricToSession({
diff --git a/packages/expo-observe/src/integrations/expo-router/useObserveForRouter.ts b/packages/expo-observe/src/integrations/expo-router/useObserveForRouter.ts
index 1034e5333d14f3..55d3209c7ec83d 100644
--- a/packages/expo-observe/src/integrations/expo-router/useObserveForRouter.ts
+++ b/packages/expo-observe/src/integrations/expo-router/useObserveForRouter.ts
@@ -104,7 +104,7 @@ export function useObserveForRouter(): MarkInteractive | null {
 
       // Stored in seconds to match the OTel `unit = "s"` convention
       const interactiveTimeSeconds = (now - currentScreenData.dispatchTime) / 1000;
-      const mainSessionId = (await AppMetrics.getMainSession())?.id;
+      const mainSessionId = AppMetrics.getMainSession()?.id;
       // TODO(@ubax): we should count the time against the action which caused the first navigation
       // and add a param stating if during that time there was any navigation
       if (mainSessionId) {
diff --git a/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationContainer.test.native.tsx b/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationContainer.test.native.tsx
index 62f5730fe4c336..c724c125fec7ce 100644
--- a/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationContainer.test.native.tsx
+++ b/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationContainer.test.native.tsx
@@ -13,7 +13,7 @@ jest.mock('expo-app-metrics', () => ({
   __esModule: true,
   default: {
     markInteractive: jest.fn(),
-    getMainSession: jest.fn(async () => ({ id: 'session-1' })),
+    getMainSession: jest.fn(() => ({ id: 'session-1' })),
     addCustomMetricToSession: jest.fn(),
   },
 }));
diff --git a/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationProvider.test.native.tsx b/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationProvider.test.native.tsx
index 0ee3a2f317933e..4a04d41b6e5440 100644
--- a/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationProvider.test.native.tsx
+++ b/packages/expo-observe/src/integrations/react-navigation/__tests__/ObserveNavigationProvider.test.native.tsx
@@ -13,7 +13,7 @@ jest.mock('expo-app-metrics', () => ({
   __esModule: true,
   default: {
     markInteractive: jest.fn(),
-    getMainSession: jest.fn(async () => ({ id: 'session-1' })),
+    getMainSession: jest.fn(() => ({ id: 'session-1' })),
     addCustomMetricToSession: jest.fn(),
   },
 }));
diff --git a/packages/expo-observe/src/integrations/react-navigation/__tests__/handleStateChange.test.native.ts b/packages/expo-observe/src/integrations/react-navigation/__tests__/handleStateChange.test.native.ts
index 6e58f3d4689da8..d521e32599bc4a 100644
--- a/packages/expo-observe/src/integrations/react-navigation/__tests__/handleStateChange.test.native.ts
+++ b/packages/expo-observe/src/integrations/react-navigation/__tests__/handleStateChange.test.native.ts
@@ -9,7 +9,7 @@ import type { NavigationStateLike } from '../types';
 
 jest.mock('expo-app-metrics', () => {
   const addCustomMetricToSession = jest.fn();
-  const getMainSession = jest.fn(async () => ({ id: 'session-1' }));
+  const getMainSession = jest.fn(() => ({ id: 'session-1' }));
   return {
     __esModule: true,
     default: {
diff --git a/packages/expo-observe/src/integrations/react-navigation/__tests__/integration.test.native.tsx b/packages/expo-observe/src/integrations/react-navigation/__tests__/integration.test.native.tsx
index 4463e6abb7541d..f48475daac7bc6 100644
--- a/packages/expo-observe/src/integrations/react-navigation/__tests__/integration.test.native.tsx
+++ b/packages/expo-observe/src/integrations/react-navigation/__tests__/integration.test.native.tsx
@@ -21,7 +21,7 @@ jest.mock('expo-app-metrics', () => ({
   __esModule: true,
   default: {
     markInteractive: jest.fn(),
-    getMainSession: jest.fn(async () => ({ id: 'session-1' })),
+    getMainSession: jest.fn(() => ({ id: 'session-1' })),
     addCustomMetricToSession: jest.fn(async () => {}),
   },
 }));
diff --git a/packages/expo-observe/src/integrations/react-navigation/useObserveForReactNavigation.ts b/packages/expo-observe/src/integrations/react-navigation/useObserveForReactNavigation.ts
index fa88d47722f9f4..0f3ba826760a60 100644
--- a/packages/expo-observe/src/integrations/react-navigation/useObserveForReactNavigation.ts
+++ b/packages/expo-observe/src/integrations/react-navigation/useObserveForReactNavigation.ts
@@ -112,7 +112,7 @@ export function useObserveForReactNavigation(): MarkInteractive | null {
       }
 
       const interactiveTimeSeconds = (now - currentScreenData.dispatchTime) / 1000;
-      const mainSessionId = (await AppMetrics.getMainSession())?.id;
+      const mainSessionId = AppMetrics.getMainSession()?.id;
       if (mainSessionId) {
         await emitTTI({
           sessionId: mainSessionId,

From f98fca26dfb931f6eeefaa3963c3f89a1d75077c Mon Sep 17 00:00:00 2001
From: Tomasz Sapeta <tsapeta@expo.dev>
Date: Thu, 11 Jun 2026 18:40:00 +0200
Subject: [PATCH 02/17] [test-suite] Register AppMetrics in the bare-expo e2e
 test list (#46802)

---
 apps/bare-expo/e2e/TestSuite-test.native.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/bare-expo/e2e/TestSuite-test.native.js b/apps/bare-expo/e2e/TestSuite-test.native.js
index f39060e4c7025a..13d8526b5688d2 100644
--- a/apps/bare-expo/e2e/TestSuite-test.native.js
+++ b/apps/bare-expo/e2e/TestSuite-test.native.js
@@ -1,8 +1,10 @@
 /**
- * The test cases for bare-expo E2E testing.
- * When adding or removing tests, also update the paths in .github/workflows/test-suite.yml
+ * The test cases for bare-expo E2E testing. The Maestro flow is generated from this list
+ * (see `createMaestroFlowAsync`), so adding or removing an entry is all that's needed; each
+ * test must also be registered in `apps/test-suite/TestModules.ts` so the app can run it.
  */
 const TESTS = [
+  'AppMetrics',
   'Basic',
   // 'Asset',
   // 'FileSystem',

From 15e39882a2499c95f743b45e4bea6976cfa06ffa Mon Sep 17 00:00:00 2001
From: Kadi Kraman <kadi@expo.io>
Date: Thu, 11 Jun 2026 18:48:58 +0100
Subject: [PATCH 03/17] [docs] Clarify observe endpoints (#46689)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Why

Realised we have 2 endpoints but only 1 custom endpoint so we should
clarify how it will be used.

<!--
Please describe the motivation for this PR, and link to relevant GitHub
issues, forums posts, or feature requests.
-->

# How

Add clarification on what endpoints will actually be called.

<!--
How did you build this feature or fix this bug and why?
-->

# Test Plan

👀

<!--
Please describe how you tested this change and how a reviewer could
reproduce your test, especially if this PR does not include automated
tests! If possible, please also provide terminal output and/or
screenshots demonstrating your test/reproduction.
-->

# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
---
 docs/pages/eas/observe/configuration.mdx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/pages/eas/observe/configuration.mdx b/docs/pages/eas/observe/configuration.mdx
index 3e11502d0a5a24..e0dc50bfb7fdb5 100644
--- a/docs/pages/eas/observe/configuration.mdx
+++ b/docs/pages/eas/observe/configuration.mdx
@@ -79,7 +79,9 @@ A build is treated as a debug build if either the native app is a debug build or
 
 ## Custom endpoint
 
-If you need to change the endpoint for the observability API, set the `endpointUrl` value in your **app config**:
+EAS Observe sends data using the OpenTelemetry Protocol (OTLP) over HTTP with a JSON payload. It posts metrics to `<endpointUrl>/<project-id>/v1/metrics` and logs to `<endpointUrl>/<project-id>/v1/logs`, where `<project-id>` is your EAS project ID. This means you can set `endpointUrl` to an OpenTelemetry-compatible backend or an OpenTelemetry Collector to route your observability data there.
+
+To change the endpoint, set the `endpointUrl` value in your **app config**:
 
 ```json app.json
 {
@@ -97,6 +99,8 @@ If you need to change the endpoint for the observability API, set the `endpointU
 
 The endpoint URL is baked into the native layer of the app at build time, so changing it requires regenerating native code. After updating your app config, run `npx expo prebuild` and create a new build to apply the change.
 
+The path includes your project ID before the standard `/v1/metrics` and `/v1/logs` OTLP paths. If your backend expects the standard OTLP path without that prefix, send the data to an OpenTelemetry Collector that receives it and re-exports it to your backend.
+
 ## Environments
 
 All metrics are grouped by environment. The environment value is derived from `process.env.NODE_ENV` by default (falling back to `'production'` if unset). To override it, use [`configure({ environment })`](#configure).

From 54725f91b6150f0aabe992508dd4a836d15d6f5c Mon Sep 17 00:00:00 2001
From: Max Lapides <max@maxlapides.com>
Date: Thu, 11 Jun 2026 11:01:24 -0700
Subject: [PATCH 04/17] [font] Resolve package-style font paths (#46784)

---
 packages/expo-font/plugin/build/utils.js      | 21 ++++-
 .../plugin/src/__tests__/utils-test.ts        | 80 ++++++++++++++++++-
 packages/expo-font/plugin/src/utils.ts        | 24 +++++-
 3 files changed, 120 insertions(+), 5 deletions(-)

diff --git a/packages/expo-font/plugin/build/utils.js b/packages/expo-font/plugin/build/utils.js
index 3a6a2ddabd6933..93104f9652ab75 100644
--- a/packages/expo-font/plugin/build/utils.js
+++ b/packages/expo-font/plugin/build/utils.js
@@ -6,7 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toValidAndroidResourceName = toValidAndroidResourceName;
 exports.resolveFontPaths = resolveFontPaths;
 const promises_1 = __importDefault(require("fs/promises"));
+const node_module_1 = __importDefault(require("node:module"));
 const path_1 = __importDefault(require("path"));
+function isErrorWithCode(error, code) {
+    return typeof error === 'object' && error !== null && 'code' in error && error.code === code;
+}
+function resolveFontPath(p, projectRoot) {
+    return node_module_1.default.createRequire(path_1.default.join(projectRoot, 'package.json')).resolve(p);
+}
 // rule: File-based resource names must contain only lowercase a-z, 0-9, or underscore
 function toValidAndroidResourceName(value) {
     const valueWithoutFileExtension = path_1.default.parse(value).name;
@@ -20,8 +27,18 @@ function toValidAndroidResourceName(value) {
 }
 async function resolveFontPaths(fonts, projectRoot) {
     const promises = fonts.map(async (p) => {
-        const resolvedPath = path_1.default.resolve(projectRoot, p);
-        const stat = await promises_1.default.stat(resolvedPath);
+        let resolvedPath = path_1.default.resolve(projectRoot, p);
+        let stat;
+        try {
+            stat = await promises_1.default.stat(resolvedPath);
+        }
+        catch (error) {
+            if (!isErrorWithCode(error, 'ENOENT')) {
+                throw error;
+            }
+            resolvedPath = resolveFontPath(p, projectRoot);
+            stat = await promises_1.default.stat(resolvedPath);
+        }
         if (stat.isDirectory()) {
             const dir = await promises_1.default.readdir(resolvedPath);
             return dir.map((file) => path_1.default.join(resolvedPath, file));
diff --git a/packages/expo-font/plugin/src/__tests__/utils-test.ts b/packages/expo-font/plugin/src/__tests__/utils-test.ts
index 642dbc480ca715..d60c5251cb5e28 100644
--- a/packages/expo-font/plugin/src/__tests__/utils-test.ts
+++ b/packages/expo-font/plugin/src/__tests__/utils-test.ts
@@ -1,4 +1,8 @@
-import { toValidAndroidResourceName } from '../utils';
+import fs from 'fs/promises';
+import os from 'os';
+import path from 'path';
+
+import { resolveFontPaths, toValidAndroidResourceName } from '../utils';
 
 describe(toValidAndroidResourceName, () => {
   it('converts strings to valid Android resource names', () => {
@@ -25,3 +29,77 @@ describe(toValidAndroidResourceName, () => {
     expect(toValidAndroidResourceName('Noto Sans JP')).toBe('noto_sans_jp');
   });
 });
+
+describe(resolveFontPaths, () => {
+  let projectRoot: string;
+
+  beforeEach(async () => {
+    projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'expo-font-plugin-'));
+  });
+
+  afterEach(async () => {
+    await fs.rm(projectRoot, { force: true, recursive: true });
+  });
+
+  it('resolves relative file paths from the project root', async () => {
+    const fontPath = path.join(projectRoot, 'assets', 'fonts', 'Inter.ttf');
+    await fs.mkdir(path.dirname(fontPath), { recursive: true });
+    await fs.writeFile(fontPath, '');
+
+    await expect(resolveFontPaths(['./assets/fonts/Inter.ttf'], projectRoot)).resolves.toEqual([
+      fontPath,
+    ]);
+  });
+
+  it('expands directory contents and filters to supported font files', async () => {
+    const fontsDir = path.join(projectRoot, 'assets', 'fonts');
+    await fs.mkdir(fontsDir, { recursive: true });
+    await fs.writeFile(path.join(fontsDir, 'Inter.ttf'), '');
+    await fs.writeFile(path.join(fontsDir, 'Inter.otf'), '');
+    await fs.writeFile(path.join(fontsDir, 'README.md'), '');
+
+    const result = await resolveFontPaths(['./assets/fonts'], projectRoot);
+
+    expect(result.sort()).toEqual([
+      path.join(fontsDir, 'Inter.otf'),
+      path.join(fontsDir, 'Inter.ttf'),
+    ]);
+  });
+
+  it('resolves scoped package-style font paths relative to the project root', async () => {
+    const fontPath = path.join(
+      projectRoot,
+      'node_modules',
+      '@expo-google-fonts',
+      'inter',
+      '400Regular',
+      'Inter_400Regular.ttf'
+    );
+    await fs.mkdir(path.dirname(fontPath), { recursive: true });
+    await fs.writeFile(fontPath, '');
+
+    await expect(
+      resolveFontPaths(['@expo-google-fonts/inter/400Regular/Inter_400Regular.ttf'], projectRoot)
+    ).resolves.toEqual([await fs.realpath(fontPath)]);
+  });
+
+  it('resolves unscoped package-style font paths relative to the project root', async () => {
+    const fontPath = path.join(
+      projectRoot,
+      'node_modules',
+      'some-font-package',
+      'fonts',
+      'Foo.ttf'
+    );
+    await fs.mkdir(path.dirname(fontPath), { recursive: true });
+    await fs.writeFile(fontPath, '');
+
+    await expect(
+      resolveFontPaths(['some-font-package/fonts/Foo.ttf'], projectRoot)
+    ).resolves.toEqual([await fs.realpath(fontPath)]);
+  });
+
+  it('rejects missing font paths', async () => {
+    await expect(resolveFontPaths(['./assets/fonts/Missing.ttf'], projectRoot)).rejects.toThrow();
+  });
+});
diff --git a/packages/expo-font/plugin/src/utils.ts b/packages/expo-font/plugin/src/utils.ts
index 8027fd7e88844e..a90dc0bafd3afb 100644
--- a/packages/expo-font/plugin/src/utils.ts
+++ b/packages/expo-font/plugin/src/utils.ts
@@ -1,6 +1,15 @@
 import fs from 'fs/promises';
+import Module from 'node:module';
 import path from 'path';
 
+function isErrorWithCode(error: unknown, code: string) {
+  return typeof error === 'object' && error !== null && 'code' in error && error.code === code;
+}
+
+function resolveFontPath(p: string, projectRoot: string) {
+  return Module.createRequire(path.join(projectRoot, 'package.json')).resolve(p);
+}
+
 // rule: File-based resource names must contain only lowercase a-z, 0-9, or underscore
 export function toValidAndroidResourceName(value: string) {
   const valueWithoutFileExtension = path.parse(value).name;
@@ -17,8 +26,19 @@ export function toValidAndroidResourceName(value: string) {
 
 export async function resolveFontPaths(fonts: string[], projectRoot: string) {
   const promises = fonts.map(async (p) => {
-    const resolvedPath = path.resolve(projectRoot, p);
-    const stat = await fs.stat(resolvedPath);
+    let resolvedPath = path.resolve(projectRoot, p);
+    let stat: Awaited<ReturnType<typeof fs.stat>>;
+
+    try {
+      stat = await fs.stat(resolvedPath);
+    } catch (error) {
+      if (!isErrorWithCode(error, 'ENOENT')) {
+        throw error;
+      }
+
+      resolvedPath = resolveFontPath(p, projectRoot);
+      stat = await fs.stat(resolvedPath);
+    }
 
     if (stat.isDirectory()) {
       const dir = await fs.readdir(resolvedPath);

From 9d18e0968abdbb83139ec368a6f89fe258a7ecd0 Mon Sep 17 00:00:00 2001
From: Kudo Chien <kudo@expo.dev>
Date: Fri, 12 Jun 2026 02:23:04 +0800
Subject: [PATCH 05/17] [font] add missing changelog [skip ci] (#46827)

---
 packages/expo-font/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/expo-font/CHANGELOG.md b/packages/expo-font/CHANGELOG.md
index 5ad53d8eda3caf..74b9309a0fb8b6 100644
--- a/packages/expo-font/CHANGELOG.md
+++ b/packages/expo-font/CHANGELOG.md
@@ -10,6 +10,8 @@
 
 ### 💡 Others
 
+- Resolve package-style font paths. ([#46784](https://github.com/expo/expo/pull/46784) by [@maxlapides](https://github.com/maxlapides))
+
 ## 56.0.5 — 2026-05-19
 
 ### 🐛 Bug fixes

From 979a335c55538c8ca25abd4621f34216c7f57036 Mon Sep 17 00:00:00 2001
From: Kudo Chien <kudo@expo.dev>
Date: Fri, 12 Jun 2026 02:29:11 +0800
Subject: [PATCH 06/17] [core] fix recompose when switch screens (#46650)

---
 packages/expo-modules-core/CHANGELOG.md       |  1 +
 .../modules/kotlin/views/ExpoComposeView.kt   | 56 ++++++++++++++++---
 .../views/ViewManagerWrapperDelegate.kt       |  9 +++
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/packages/expo-modules-core/CHANGELOG.md b/packages/expo-modules-core/CHANGELOG.md
index f155219d7c0b71..27e70e50ef25b0 100644
--- a/packages/expo-modules-core/CHANGELOG.md
+++ b/packages/expo-modules-core/CHANGELOG.md
@@ -22,6 +22,7 @@
 - [iOS] Throw an actionable error when a worklet is used but `react-native-worklets`'s native adapter isn't linked, instead of a misleading "not an instance of Worklet" failure. ([#46571](https://github.com/expo/expo/pull/46571) by [@chrfalch](https://github.com/chrfalch))
 - [Android] Fix `canAskAgain` returning `false` for re-requestable permissions in the "Ask every time" state. ([#46683](https://github.com/expo/expo/pull/46683) by [@alanjhughes](https://github.com/alanjhughes))
 - [Internal] Remove `EventEmitter` re-export global type indirection ([#46719](https://github.com/expo/expo/pull/46719) by [@kitten](https://github.com/kitten))
+- [Android] Fixed Expo UI re-compose when switching screens in react-native-screens. ([#46650](https://github.com/expo/expo/pull/46650) by [@kudo](https://github.com/kudo))
 
 ### 💡 Others
 
diff --git a/packages/expo-modules-core/android/src/compose/expo/modules/kotlin/views/ExpoComposeView.kt b/packages/expo-modules-core/android/src/compose/expo/modules/kotlin/views/ExpoComposeView.kt
index 9a4795c3910227..54c00879b11ac9 100644
--- a/packages/expo-modules-core/android/src/compose/expo/modules/kotlin/views/ExpoComposeView.kt
+++ b/packages/expo-modules-core/android/src/compose/expo/modules/kotlin/views/ExpoComposeView.kt
@@ -17,6 +17,10 @@ import androidx.annotation.UiThread
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.view.size
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.types.enforceType
@@ -52,10 +56,14 @@ abstract class ExpoComposeView<T : ComposeProps>(
   context: Context,
   appContext: AppContext,
   private val withHostingView: Boolean = false
-) : ExpoView(context, appContext) {
+) : ExpoView(context, appContext), ComposeHostingView {
   open val props: T? = null
   protected var recomposeScope: RecomposeScope? = null
 
+  // Retained so the composition can be disposed on unmount: its strategy is
+  // pinned to the Activity lifecycle, so nothing disposes it on window detach.
+  private var hostingComposeView: ComposeView? = null
+
   private val globalEvent = ViewEvent<Pair<String, Map<String, Any?>>>(GLOBAL_EVENT_NAME, this, null)
 
   /**
@@ -191,22 +199,56 @@ abstract class ExpoComposeView<T : ComposeProps>(
 
   private fun addComposeView() {
     val composeView = ComposeView(context).also {
+      // Give each Host a unique id so its rememberSaveable state gets its own key.
+      // All Hosts share the Activity's SavedStateRegistry (set below), so without an id
+      // they'd collide on one key and only the first could save/restore state.
+      it.id = generateViewId()
       it.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
-      it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+      // Pin the composition to the Activity lifecycle so it survives
+      // react-native-screens detaching inactive screens on every switch.
+      // The strategy alone isn't enough: Compose's WrappedComposition also
+      // observes the view-tree lifecycle owner found at first attach — the
+      // screen fragment's, which RN-screens destroys per switch — and
+      // self-disposes on its ON_DESTROY, leaving a dead composition that
+      // never recreates. Overriding the owners on the ComposeView (nearest
+      // tag wins) points both at the Activity. Unmount disposes explicitly
+      // via disposeHostedComposition().
+      val activity = appContext.currentActivity
+      if (activity is LifecycleOwner && activity is SavedStateRegistryOwner) {
+        it.setViewTreeLifecycleOwner(activity)
+        it.setViewTreeSavedStateRegistryOwner(activity)
+        it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnLifecycleDestroyed(activity.lifecycle))
+      } else {
+        // No Activity to pin to: keep the prior behavior, including the
+        // dispose-on-reattach workaround for blank compositions after
+        // navigation (https://github.com/expo/expo/pull/34689).
+        it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+        it.addOnAttachStateChangeListener(
+          OnAttachAfterDetachmentListener(onAttachAfterDetachment = {
+            it.disposeComposition()
+          })
+        )
+      }
       it.setContent {
         with(ComposableScope()) {
           Content()
         }
       }
-      it.addOnAttachStateChangeListener(
-        OnAttachAfterDetachmentListener(onAttachAfterDetachment = {
-          it.disposeComposition()
-        })
-      )
     }
+    hostingComposeView = composeView
     addView(composeView)
   }
 
+  override fun disposeHostedComposition() {
+    hostingComposeView?.let {
+      // disposeComposition() alone leaves the composition strategy's lifecycle observer
+      // registered on the Activity, which leaks this view.
+      // Swapping the strategy first detaches that observer, then we dispose.
+      it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
+      it.disposeComposition()
+    }
+  }
+
   override fun addView(child: View, index: Int, params: ViewGroup.LayoutParams) {
     val view = if (child !is ExpoComposeView<*> && child !is ComposeView && this !is RNHostViewInterface) {
       ExpoComposeAndroidView(child, appContext)
diff --git a/packages/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/ViewManagerWrapperDelegate.kt b/packages/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/ViewManagerWrapperDelegate.kt
index 6feb45dcb9db58..a79d2542d17db7 100644
--- a/packages/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/ViewManagerWrapperDelegate.kt
+++ b/packages/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/ViewManagerWrapperDelegate.kt
@@ -148,6 +148,7 @@ class ViewManagerWrapperDelegate(
 
   fun onDestroy(view: View) {
     try {
+      (view as? ComposeHostingView)?.disposeHostedComposition()
       definition.onViewDestroys?.invoke(view)
     } catch (exception: Throwable) {
       // The view wasn't constructed correctly, so errors are expected.
@@ -177,3 +178,11 @@ class ViewManagerWrapperDelegate(
       }
   }
 }
+
+/**
+ * Implemented by Compose-based views to dispose their composition when the
+ * view is destroyed.
+ */
+interface ComposeHostingView {
+  fun disposeHostedComposition()
+}

From 05425b41c32df2f709069306db034783fbf503ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 21:26:37 +0200
Subject: [PATCH 07/17] [image][Android] Remove unused `kapt` plugin (#46820)

---
 packages/expo-image/android/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/expo-image/android/build.gradle b/packages/expo-image/android/build.gradle
index 56aa0228c50068..ded02013078a4f 100644
--- a/packages/expo-image/android/build.gradle
+++ b/packages/expo-image/android/build.gradle
@@ -6,7 +6,6 @@ buildscript {
 
 plugins {
   id 'com.android.library'
-  id 'kotlin-kapt'
   id 'expo-module-gradle-plugin'
 }
 

From cb8c7a40288fbb602270686e6729a01867f6281a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 21:26:53 +0200
Subject: [PATCH 08/17] [observe][Android] Remove `kotlin-android` plugin
 (#46821)

---
 packages/expo-observe/android/build.gradle | 101 ++++++++++-----------
 1 file changed, 50 insertions(+), 51 deletions(-)

diff --git a/packages/expo-observe/android/build.gradle b/packages/expo-observe/android/build.gradle
index 9a607e2b4ebf7c..bb714fb45c17dc 100644
--- a/packages/expo-observe/android/build.gradle
+++ b/packages/expo-observe/android/build.gradle
@@ -1,37 +1,36 @@
 buildscript {
-    ext {
-        getKspVersion = {
-            if (rootProject.hasProperty("kspVersion")) {
-                return rootProject["kspVersion"]
-            }
+  ext {
+    getKspVersion = {
+      if (rootProject.hasProperty("kspVersion")) {
+        return rootProject["kspVersion"]
+      }
 
-            def kotlinVersion = rootProject.hasProperty("kotlinVersion") ? rootProject["kotlinVersion"] : "2.0.21"
-            if (kotlinVersion == "2.1.20") {
-                return "2.1.20-2.0.1"
-            } else if (kotlinVersion == "2.0.21") {
-                return "2.0.21-1.0.28"
-            } else if (kotlinVersion == "1.9.25") {
-                return "1.9.25-1.0.20"
-            }
-            return "1.9.24-1.0.20"
-        }
+      def kotlinVersion = rootProject.hasProperty("kotlinVersion") ? rootProject["kotlinVersion"] : "2.0.21"
+      if (kotlinVersion == "2.1.20") {
+        return "2.1.20-2.0.1"
+      } else if (kotlinVersion == "2.0.21") {
+        return "2.0.21-1.0.28"
+      } else if (kotlinVersion == "1.9.25") {
+        return "1.9.25-1.0.20"
+      }
+      return "1.9.24-1.0.20"
     }
+  }
 
-    repositories
+  repositories
     {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
+      google()
+      mavenCentral()
+      gradlePluginPortal()
     }
 
-    dependencies {
-        classpath("org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:${kotlinVersion}")
-        classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:${getKspVersion()}"
-    }
+  dependencies {
+    classpath("org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:${kotlinVersion}")
+    classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:${getKspVersion()}"
+  }
 }
 apply plugin: 'com.android.library'
 apply plugin: 'expo-module-gradle-plugin'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
 apply plugin: 'com.google.devtools.ksp'
 
@@ -41,42 +40,42 @@ def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json'
 version = packageJson.version
 
 android {
-    namespace "expo.modules.observe"
+  namespace "expo.modules.observe"
 
-    defaultConfig {
-        versionCode 1
-        versionName packageJson.version
+  defaultConfig {
+    versionCode 1
+    versionName packageJson.version
 
-        buildConfigField "String", "EXPO_OBSERVE_VERSION", "\"${packageJson.version}\""
-    }
+    buildConfigField "String", "EXPO_OBSERVE_VERSION", "\"${packageJson.version}\""
+  }
 }
 
 repositories {
-    google()
-    mavenCentral()
+  google()
+  mavenCentral()
 }
 
 dependencies {
-    implementation project(':expo-app-metrics')
-    implementation project(':expo-eas-client')
-    implementation project(':expo-updates-interface')
-    implementation "com.facebook.react:react-android"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
-    implementation "com.squareup.okhttp3:okhttp:4.9.2"
-    // This is a workaround for IDE warning - https://youtrack.jetbrains.com/issue/KTIJ-31549
-    implementation "androidx.annotation:annotation-experimental:1.5.1"
+  implementation project(':expo-app-metrics')
+  implementation project(':expo-eas-client')
+  implementation project(':expo-updates-interface')
+  implementation "com.facebook.react:react-android"
+  implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
+  implementation "com.squareup.okhttp3:okhttp:4.9.2"
+  // This is a workaround for IDE warning - https://youtrack.jetbrains.com/issue/KTIJ-31549
+  implementation "androidx.annotation:annotation-experimental:1.5.1"
 
-    def room_version = "2.8.3"
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "androidx.room:room-ktx:$room_version"
-    ksp "androidx.room:room-compiler:$room_version"
+  def room_version = "2.8.3"
+  implementation "androidx.room:room-runtime:$room_version"
+  implementation "androidx.room:room-ktx:$room_version"
+  ksp "androidx.room:room-compiler:$room_version"
 
-    implementation 'androidx.work:work-runtime-ktx:2.9.1'
+  implementation 'androidx.work:work-runtime-ktx:2.9.1'
 
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.11.1'
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.2'
-    testImplementation 'io.mockk:mockk:1.13.8'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation 'org.robolectric:robolectric:4.11.1'
+  testImplementation 'androidx.test:core:1.5.0'
+  testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.2'
+  testImplementation 'io.mockk:mockk:1.13.8'
+  testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 }

From 028373d721e968fc1bbf123eec8ff0ed5e92adeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 21:27:12 +0200
Subject: [PATCH 09/17] [metrics][Android] Remove `kotlin-android` plugin
 (#46819)

---
 .../expo-app-metrics/android/build.gradle     | 125 +++++++++---------
 1 file changed, 62 insertions(+), 63 deletions(-)

diff --git a/packages/expo-app-metrics/android/build.gradle b/packages/expo-app-metrics/android/build.gradle
index 02262aca314b35..60be8075550903 100644
--- a/packages/expo-app-metrics/android/build.gradle
+++ b/packages/expo-app-metrics/android/build.gradle
@@ -2,37 +2,36 @@ import expo.modules.plugin.gradle.ExpoModuleExtension
 
 apply plugin: 'com.android.library'
 apply plugin: 'expo-module-gradle-plugin'
-apply plugin: 'org.jetbrains.kotlin.android'
 
 buildscript {
-    ext {
-        getKspVersion = {
-            if (rootProject.hasProperty("kspVersion")) {
-                return rootProject["kspVersion"]
-            }
-
-            def kotlinVersion = rootProject.hasProperty("kotlinVersion") ? rootProject["kotlinVersion"] : "2.0.21"
-            if (kotlinVersion == "2.1.20") {
-                return "2.1.20-2.0.1"
-            } else if (kotlinVersion == "2.0.21") {
-                return "2.0.21-1.0.28"
-            } else if (kotlinVersion == "1.9.25") {
-                return "1.9.25-1.0.20"
-            }
-            return "1.9.24-1.0.20"
-        }
+  ext {
+    getKspVersion = {
+      if (rootProject.hasProperty("kspVersion")) {
+        return rootProject["kspVersion"]
+      }
+
+      def kotlinVersion = rootProject.hasProperty("kotlinVersion") ? rootProject["kotlinVersion"] : "2.0.21"
+      if (kotlinVersion == "2.1.20") {
+        return "2.1.20-2.0.1"
+      } else if (kotlinVersion == "2.0.21") {
+        return "2.0.21-1.0.28"
+      } else if (kotlinVersion == "1.9.25") {
+        return "1.9.25-1.0.20"
+      }
+      return "1.9.24-1.0.20"
     }
+  }
 
-    repositories
+  repositories
     {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
+      google()
+      mavenCentral()
+      gradlePluginPortal()
     }
 
-    dependencies {
-        classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:${getKspVersion()}"
-    }
+  dependencies {
+    classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:${getKspVersion()}"
+  }
 }
 apply plugin: 'com.google.devtools.ksp'
 
@@ -44,54 +43,54 @@ version = packageJson.version
 def reactNativeVersion = project.extensions.getByType(ExpoModuleExtension).reactNativeVersion
 
 def expoSdkVersion = providers.exec {
-    commandLine("node", "--print", "require('expo/package.json').version")
+  commandLine("node", "--print", "require('expo/package.json').version")
 }.standardOutput.asText.get().trim()
 
 def easBuildId = System.getenv("EAS_BUILD_ID")
 
 android {
-    namespace "expo.modules.appmetrics"
-
-    defaultConfig {
-        versionCode 1
-        versionName packageJson.version
-
-        buildConfigField "String", "REACT_NATIVE_VERSION",
-                "\"${reactNativeVersion.major}.${reactNativeVersion.minor}.${reactNativeVersion.patch}\""
-        buildConfigField "String", "EXPO_APP_METRICS_VERSION", "\"${packageJson.version}\""
-        buildConfigField "String", "EXPO_SDK_VERSION", "\"${expoSdkVersion}\""
-        buildConfigField "String", "EXPO_EAS_BUILD_ID",
-                easBuildId != null ? "\"${easBuildId}\"" : "null"
-    }
+  namespace "expo.modules.appmetrics"
+
+  defaultConfig {
+    versionCode 1
+    versionName packageJson.version
+
+    buildConfigField "String", "REACT_NATIVE_VERSION",
+      "\"${reactNativeVersion.major}.${reactNativeVersion.minor}.${reactNativeVersion.patch}\""
+    buildConfigField "String", "EXPO_APP_METRICS_VERSION", "\"${packageJson.version}\""
+    buildConfigField "String", "EXPO_SDK_VERSION", "\"${expoSdkVersion}\""
+    buildConfigField "String", "EXPO_EAS_BUILD_ID",
+      easBuildId != null ? "\"${easBuildId}\"" : "null"
+  }
 }
 
 repositories {
-    google()
-    mavenCentral()
+  google()
+  mavenCentral()
 }
 
 dependencies {
-    implementation project(':expo-updates-interface')
-    implementation "com.facebook.react:react-android"
-    // `api` because `NetworkRequestInterceptor` and `NetworkRequestEventListener` are part of the
-    // public surface (apps with their own `OkHttpClient.Builder` opt in by adding our interceptor
-    // and event listener factory), and consumers need `okhttp3.Interceptor` /
-    // `okhttp3.EventListener.Factory` on the classpath to write that wiring. RN already exposes
-    // OkHttp via its own `api` dep, but we don't want to rely on that.
-    api "com.squareup.okhttp3:okhttp:${expoModule.safeExtGet("okHttpVersion", '4.9.2')}"
-    // This is a workaround for IDE warning - https://youtrack.jetbrains.com/issue/KTIJ-31549
-    implementation "androidx.annotation:annotation-experimental:1.5.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
-
-    def room_version = "2.8.3"
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "androidx.room:room-ktx:$room_version"
-    ksp "androidx.room:room-compiler:$room_version"
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.11.1'
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'io.mockk:mockk:1.13.8'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
-    testImplementation "com.squareup.okhttp3:mockwebserver:${expoModule.safeExtGet("okHttpVersion", '4.9.2')}"
+  implementation project(':expo-updates-interface')
+  implementation "com.facebook.react:react-android"
+  // `api` because `NetworkRequestInterceptor` and `NetworkRequestEventListener` are part of the
+  // public surface (apps with their own `OkHttpClient.Builder` opt in by adding our interceptor
+  // and event listener factory), and consumers need `okhttp3.Interceptor` /
+  // `okhttp3.EventListener.Factory` on the classpath to write that wiring. RN already exposes
+  // OkHttp via its own `api` dep, but we don't want to rely on that.
+  api "com.squareup.okhttp3:okhttp:${expoModule.safeExtGet("okHttpVersion", '4.9.2')}"
+  // This is a workaround for IDE warning - https://youtrack.jetbrains.com/issue/KTIJ-31549
+  implementation "androidx.annotation:annotation-experimental:1.5.1"
+  implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
+
+  def room_version = "2.8.3"
+  implementation "androidx.room:room-runtime:$room_version"
+  implementation "androidx.room:room-ktx:$room_version"
+  ksp "androidx.room:room-compiler:$room_version"
+
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation 'org.robolectric:robolectric:4.11.1'
+  testImplementation 'androidx.test:core:1.5.0'
+  testImplementation 'io.mockk:mockk:1.13.8'
+  testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+  testImplementation "com.squareup.okhttp3:mockwebserver:${expoModule.safeExtGet("okHttpVersion", '4.9.2')}"
 }

From dff75e2351d4a164a0d98fc277b6e3ca064619e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 21:27:48 +0200
Subject: [PATCH 10/17] [log-box][Android] Use `kotlin.srcDirs` instead of
 `java.srcDirs` (#46818)

---
 packages/@expo/log-box/android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@expo/log-box/android/build.gradle b/packages/@expo/log-box/android/build.gradle
index 530d0d3fd42aac..078b31d1ef9be5 100644
--- a/packages/@expo/log-box/android/build.gradle
+++ b/packages/@expo/log-box/android/build.gradle
@@ -24,7 +24,7 @@ android {
 
   sourceSets {
     main {
-      java.srcDirs += "src/main"
+      kotlin.srcDirs += "src/main"
     }
     if (isEnabled) {
       debug {

From 9e2123f8ca87b04e426785e01750a5c85d677d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 21:28:10 +0200
Subject: [PATCH 11/17] [network-addons][Android] Use `compilerOptions` instead
 of `kotlinOptions` (#46822)

---
 .../expo-network-addons-gradle-plugin/build.gradle.kts       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/expo-network-addons/expo-network-addons-gradle-plugin/build.gradle.kts b/packages/expo-network-addons/expo-network-addons-gradle-plugin/build.gradle.kts
index 4f38b9a8a2b522..04e736445dd1d7 100644
--- a/packages/expo-network-addons/expo-network-addons-gradle-plugin/build.gradle.kts
+++ b/packages/expo-network-addons/expo-network-addons-gradle-plugin/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -22,8 +23,8 @@ java {
 }
 
 tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_11)
   }
 }
 

From 3c18c4b2e4b579ba5897658a862e82e8a5c0bf90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 21:28:46 +0200
Subject: [PATCH 12/17] [core][Android] Use `kotlin.srcDirs` instead of
 `java.srcDirs` (#46824)

---
 packages/expo-modules-core/android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/expo-modules-core/android/build.gradle b/packages/expo-modules-core/android/build.gradle
index 7a7de6f48b9b77..986a014c875dcd 100644
--- a/packages/expo-modules-core/android/build.gradle
+++ b/packages/expo-modules-core/android/build.gradle
@@ -180,7 +180,7 @@ android {
 
   sourceSets {
     main {
-      java {
+      kotlin {
         if (shouldIncludeCompose) {
           srcDirs += 'src/compose'
         } else {

From f0025061890d577ed0d85953af99802db8fd3475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 21:29:39 +0200
Subject: [PATCH 13/17] [autolinking][Android] Use `compilerOptions` instead of
 `kotlinOptions` (#46823)

---
 .../expo-autolinking-plugin-shared/build.gradle.kts          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/expo-modules-autolinking/android/expo-gradle-plugin/expo-autolinking-plugin-shared/build.gradle.kts b/packages/expo-modules-autolinking/android/expo-gradle-plugin/expo-autolinking-plugin-shared/build.gradle.kts
index 3aca925b1c8f79..a62ddab5071593 100644
--- a/packages/expo-modules-autolinking/android/expo-gradle-plugin/expo-autolinking-plugin-shared/build.gradle.kts
+++ b/packages/expo-modules-autolinking/android/expo-gradle-plugin/expo-autolinking-plugin-shared/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -23,8 +24,8 @@ java {
 }
 
 tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_11)
   }
 }
 

From 7b5ed345d84583fb4695fe3b80d8dfd7c2b04805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= <kosmatylukasz@gmail.com>
Date: Thu, 11 Jun 2026 22:13:07 +0200
Subject: [PATCH 14/17] [core][Android] Fix publish task registration on AGP 9
 (#46830)

---
 .../modules/plugin/ProjectConfiguration.kt    | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/expo-modules-core/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/ProjectConfiguration.kt b/packages/expo-modules-core/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/ProjectConfiguration.kt
index 99bbd1ca714d0e..7c7ba04047f75a 100644
--- a/packages/expo-modules-core/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/ProjectConfiguration.kt
+++ b/packages/expo-modules-core/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/ProjectConfiguration.kt
@@ -100,25 +100,31 @@ internal fun Project.applyPublishing(expoModulesExtension: ExpoModuleExtension)
     .applyPublishingVariant()
 
   afterEvaluate {
-    val publicationInfo = PublicationInfo(this)
-
-    publishingExtension()
-      .publications
-      .createReleasePublication(
-        publicationInfo,
-        expoModulesExtension.pomConfigurator
-      )
-
-    createExpoPublishToMavenLocalTask(publicationInfo, expoModulesExtension)
-
-    val npmLocalRepositoryRelativePath = "local-maven-repo"
-    val npmLocalRepository = File("${project.projectDir.parentFile}/${npmLocalRepositoryRelativePath}").toURI()
-    publishingExtension().repositories.mavenLocal { mavenRepo ->
-      mavenRepo.name = "NPMPackage"
-      mavenRepo.url = npmLocalRepository
+    val project = this
+    // AGP 9's built-in Kotlin registers the "release" software component later than our
+    // afterEvaluate, so react when it becomes available instead of reading it eagerly. On AGP 8
+    // the component already exists, so this fires immediately.
+    components.matching { it.name == "release" }.all {
+      val publicationInfo = PublicationInfo(project)
+
+      project.publishingExtension()
+        .publications
+        .createReleasePublication(
+          publicationInfo,
+          expoModulesExtension.pomConfigurator
+        )
+
+      project.createExpoPublishToMavenLocalTask(publicationInfo, expoModulesExtension)
+
+      val npmLocalRepositoryRelativePath = "local-maven-repo"
+      val npmLocalRepository = File("${project.projectDir.parentFile}/${npmLocalRepositoryRelativePath}").toURI()
+      project.publishingExtension().repositories.mavenLocal { mavenRepo ->
+        mavenRepo.name = "NPMPackage"
+        mavenRepo.url = npmLocalRepository
+      }
+
+      project.createExpoPublishTask(publicationInfo, expoModulesExtension, npmLocalRepositoryRelativePath)
     }
-
-    createExpoPublishTask(publicationInfo, expoModulesExtension, npmLocalRepositoryRelativePath)
   }
 }
 

From 9d3a36bc86a7bb92abb52363b34160a3dcd85c50 Mon Sep 17 00:00:00 2001
From: Tomasz Sapeta <tsapeta@expo.dev>
Date: Thu, 11 Jun 2026 23:09:19 +0200
Subject: [PATCH 15/17] [app-metrics] Add native-side filtering for
 NetworkRequestObserver (#46775)

---
 apps/test-suite/tests/AppMetrics.ts           | 141 ++++++++++++++-
 packages/expo-app-metrics/CHANGELOG.md        |   1 +
 .../modules/appmetrics/AppMetricsModule.kt    |   9 +-
 .../networkrequests/NetworkRequestFilter.kt   |  63 +++++++
 .../networkrequests/NetworkRequestMonitor.kt  |  17 +-
 .../networkrequests/NetworkRequestObserver.kt |  19 +-
 .../NetworkRequestFilterTest.kt               |  69 ++++++++
 .../NetworkRequestMonitorTest.kt              |  42 +++++
 packages/expo-app-metrics/build/types.d.ts    |  40 ++++-
 .../expo-app-metrics/build/types.d.ts.map     |   2 +-
 .../build/useNetworkRequestObserver.d.ts      |   8 +-
 .../build/useNetworkRequestObserver.d.ts.map  |   2 +-
 .../ios/AppMetricsModule.swift                |   8 +-
 .../NetworkRequestFilter.swift                |  47 +++++
 .../NetworkRequestMonitor.swift               |  25 ++-
 .../NetworkRequestObserver.swift              |  21 ++-
 .../ios/Tests/NetworkRequestTests.swift       | 167 ++++++++++++++++++
 packages/expo-app-metrics/src/types.ts        |  42 ++++-
 .../src/useNetworkRequestObserver.ts          |  43 ++++-
 19 files changed, 743 insertions(+), 23 deletions(-)
 create mode 100644 packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilter.kt
 create mode 100644 packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilterTest.kt
 create mode 100644 packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestFilter.swift

diff --git a/apps/test-suite/tests/AppMetrics.ts b/apps/test-suite/tests/AppMetrics.ts
index 18230da4e73f48..f55d9424f88144 100644
--- a/apps/test-suite/tests/AppMetrics.ts
+++ b/apps/test-suite/tests/AppMetrics.ts
@@ -1,6 +1,7 @@
 import { fetch } from 'expo/fetch';
 import AppMetrics, {
   type NetworkRequestCompletedEvent,
+  type NetworkRequestFilter,
   type NetworkRequestObserver,
   type NetworkRequestStartedEvent,
 } from 'expo-app-metrics';
@@ -8,6 +9,7 @@ import AppMetrics, {
 export const name = 'AppMetrics';
 
 const TEST_HOST = 'https://httpbin.io';
+const TEST_HOSTNAME = 'httpbin.io';
 const EVENT_TIMEOUT_MS = 5_000;
 
 type EventCapture = {
@@ -18,14 +20,18 @@ type EventCapture = {
 /**
  * Subscribes to a fresh `NetworkRequestObserver` and returns the capture buffer plus a teardown
  * function. The buffer is populated as events fire on the native side. Filters by URL so tests
- * don't see events from unrelated background traffic.
+ * don't see events from unrelated background traffic. Pass a native `filter` to exercise the
+ * native-side filtering; it is applied on top of (before) the JS `filterUrl` predicate.
  */
-function captureEvents(filterUrl: (url: string) => boolean): {
+function captureEvents(
+  filterUrl: (url: string) => boolean,
+  filter?: NetworkRequestFilter | null
+): {
   capture: EventCapture;
   observer: NetworkRequestObserver;
   release: () => void;
 } {
-  const observer = new AppMetrics.NetworkRequestObserver();
+  const observer = new AppMetrics.NetworkRequestObserver(filter);
   const capture: EventCapture = { started: [], completed: [] };
 
   const startedSub = observer.addListener('requestStarted', (event) => {
@@ -53,18 +59,24 @@ function captureEvents(filterUrl: (url: string) => boolean): {
   };
 }
 
+/**
+ * Waits until a `requestCompleted` event lands in the capture buffer. With a `url`, waits for a
+ * completion matching that URL specifically; otherwise waits for any completion.
+ */
 async function waitForCompletion(
   capture: EventCapture,
+  url?: string,
   timeoutMs = EVENT_TIMEOUT_MS
 ): Promise<void> {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    if (capture.completed.length > 0) {
+    if (url ? capture.completed.some((event) => event.url === url) : capture.completed.length > 0) {
       return;
     }
     await new Promise((resolve) => setTimeout(resolve, 100));
   }
-  throw new Error(`Timed out after ${timeoutMs}ms waiting for requestCompleted event`);
+  const target = url ? `requestCompleted for ${url}` : 'requestCompleted event';
+  throw new Error(`Timed out after ${timeoutMs}ms waiting for ${target}`);
 }
 
 export function test({ describe, expect, it, beforeAll }) {
@@ -179,5 +191,124 @@ export function test({ describe, expect, it, beforeAll }) {
         release();
       }
     });
+
+    describe('filtering', () => {
+      it('emits only requests matching the hosts filter', async () => {
+        const matchingUrl = `${TEST_HOST}/get?case=hosts-match`;
+        const { capture, release } = captureEvents((u) => u === matchingUrl, {
+          hosts: [TEST_HOSTNAME],
+        });
+        try {
+          await fetch(matchingUrl);
+          await waitForCompletion(capture);
+          expect(capture.completed.length).toBe(1);
+          expect(capture.completed[0].url).toBe(matchingUrl);
+          expect(capture.started.length).toBe(1);
+        } finally {
+          release();
+        }
+      });
+
+      it('drops requests whose host is not in the hosts filter', async () => {
+        const url = `${TEST_HOST}/get?case=hosts-miss`;
+        const { capture, release } = captureEvents((u) => u === url, {
+          hosts: ['some-other-host.example.com'],
+        });
+        try {
+          await fetch(url);
+          // No matching event will ever arrive — wait a window, then assert nothing leaked through.
+          await new Promise((resolve) => setTimeout(resolve, 1_500));
+          expect(capture.started.length).toBe(0);
+          expect(capture.completed.length).toBe(0);
+        } finally {
+          release();
+        }
+      });
+
+      it('emits only requests matching the methods filter', async () => {
+        const postUrl = `${TEST_HOST}/post?case=methods-post`;
+        const getUrl = `${TEST_HOST}/get?case=methods-get`;
+        const { capture, release } = captureEvents((u) => u === postUrl || u === getUrl, {
+          methods: ['POST'],
+        });
+        try {
+          await fetch(getUrl);
+          await fetch(postUrl, { method: 'POST' });
+          await waitForCompletion(capture, postUrl);
+          // Only the POST passes the filter; the GET is dropped natively.
+          expect(capture.completed.map((event) => event.url)).toEqual([postUrl]);
+          expect(capture.completed.every((event) => event.method === 'POST')).toBe(true);
+        } finally {
+          release();
+        }
+      });
+
+      it('combines hosts and methods with AND', async () => {
+        const postUrl = `${TEST_HOST}/post?case=combined-post`;
+        const getUrl = `${TEST_HOST}/get?case=combined-get`;
+        const { capture, release } = captureEvents((u) => u === postUrl || u === getUrl, {
+          hosts: [TEST_HOSTNAME],
+          methods: ['POST'],
+        });
+        try {
+          await fetch(getUrl);
+          await fetch(postUrl, { method: 'POST' });
+          await waitForCompletion(capture, postUrl);
+          // Host matches both, but only the POST satisfies the method constraint.
+          expect(capture.completed.map((event) => event.url)).toEqual([postUrl]);
+        } finally {
+          release();
+        }
+      });
+
+      it('emits every request when the filter is empty', async () => {
+        const url = `${TEST_HOST}/get?case=empty-filter`;
+        const { capture, release } = captureEvents((u) => u === url, {});
+        try {
+          await fetch(url);
+          await waitForCompletion(capture);
+          expect(capture.completed.length).toBe(1);
+        } finally {
+          release();
+        }
+      });
+
+      it('applies a filter set at runtime via setFilter', async () => {
+        const beforeUrl = `${TEST_HOST}/get?case=set-filter-before`;
+        const afterUrl = `${TEST_HOST}/get?case=set-filter-after`;
+        const { capture, observer, release } = captureEvents(
+          (u) => u === beforeUrl || u === afterUrl
+        );
+        try {
+          // Starts unfiltered: the first request is observed.
+          await fetch(beforeUrl);
+          await waitForCompletion(capture);
+          expect(capture.completed.length).toBe(1);
+
+          // Narrow to a host that doesn't match; the next request must be dropped. `setFilter` is
+          // applied before the fetch is issued, and the request's full network round-trip dwarfs
+          // the time the native side needs to apply the filter, so it's in effect by the time the
+          // request is recorded.
+          observer.setFilter({ hosts: ['some-other-host.example.com'] });
+          await fetch(afterUrl);
+          await new Promise((resolve) => setTimeout(resolve, 1_500));
+          expect(capture.completed.filter((event) => event.url === afterUrl).length).toBe(0);
+
+          // Clearing the filter resumes observing everything.
+          observer.setFilter(null);
+          const lastUrl = `${TEST_HOST}/get?case=set-filter-cleared`;
+          const cleared = captureEvents((u) => u === lastUrl);
+          try {
+            await fetch(lastUrl);
+            await waitForCompletion(cleared.capture);
+            expect(cleared.capture.completed.length).toBe(1);
+          } finally {
+            cleared.release();
+          }
+        } finally {
+          release();
+        }
+      });
+    });
   });
 }
diff --git a/packages/expo-app-metrics/CHANGELOG.md b/packages/expo-app-metrics/CHANGELOG.md
index 8a243cf71ca7d8..2eec13311d3b66 100644
--- a/packages/expo-app-metrics/CHANGELOG.md
+++ b/packages/expo-app-metrics/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### 🎉 New features
 
 - Observe HTTP requests on iOS and Android and expose them to JS via the `NetworkRequestObserver` class and `useNetworkRequestObserver` hook. The TTI metric also carries an `expo.network.requests.*` summary for requests that completed in the launch window. ([#46475](https://github.com/expo/expo/pull/46475) by [@tsapeta](https://github.com/tsapeta))
+- Add native-side filtering to `NetworkRequestObserver` by host and method, configurable at construction or at runtime via `setFilter`, so non-matching requests never cross into JS. ([#46775](https://github.com/expo/expo/pull/46775) by [@tsapeta](https://github.com/tsapeta))
 
 ### 🐛 Bug fixes
 
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt
index 3a87f239102d72..0a7abd9a747d2a 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/AppMetricsModule.kt
@@ -3,6 +3,7 @@ package expo.modules.appmetrics
 import android.content.Context
 import expo.modules.appmetrics.appstartup.AppStartupManager
 import expo.modules.appmetrics.logevents.LogEventOptions
+import expo.modules.appmetrics.networkrequests.NetworkRequestFilter
 import expo.modules.appmetrics.networkrequests.NetworkRequestObserver
 import expo.modules.appmetrics.logevents.Severity
 import expo.modules.appmetrics.logevents.sanitizeLogEventAttributes
@@ -200,8 +201,12 @@ class AppMetricsModule : Module(), UpdatesStateChangeListener {
       }
 
       Class(NetworkRequestObserver::class) {
-        Constructor {
-          NetworkRequestObserver(appContext)
+        Constructor { filter: NetworkRequestFilter? ->
+          NetworkRequestObserver(appContext, filter)
+        }
+
+        Function("setFilter") { observer: NetworkRequestObserver, filter: NetworkRequestFilter? ->
+          observer.setFilter(filter)
         }
       }
       
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilter.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilter.kt
new file mode 100644
index 00000000000000..b43b694458dea7
--- /dev/null
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilter.kt
@@ -0,0 +1,63 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+package expo.modules.appmetrics.networkrequests
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+
+/**
+ * Declares which requests a `NetworkRequestObserver` emits events for. Mirrors the JS
+ * `NetworkRequestFilter` type and the iOS `NetworkRequestFilter`.
+ *
+ * Only attributes knowable the moment a request starts are supported — host and method — so the
+ * same predicate yields the same answer at start and at completion. That keeps the
+ * `requestStarted`/`requestCompleted` pair consistent: a request that matches always emits both, a
+ * request that doesn't matches neither.
+ *
+ * Different fields combine with AND; entries within a field combine with OR. A field that is left
+ * unset (`null`) places no constraint on its dimension, while a field set to an empty list allows
+ * nothing through it (an empty allow-list matches no value), so any empty field drops every
+ * request. A filter with no fields set matches every request, matching the no-filter default.
+ */
+data class NetworkRequestFilter(
+  /**
+   * Exact host matches, compared case-insensitively against the request URL's host.
+   */
+  @Field val hosts: List<String>? = null,
+  /**
+   * Allowed HTTP methods (`GET`, `POST`, …), compared case-insensitively.
+   */
+  @Field val methods: List<String>? = null
+) : Record {
+  /**
+   * Returns whether a request with the given URL and method passes this filter. Host and method
+   * comparisons are case-insensitive. An unset (`null`) field places no constraint on its
+   * dimension; a field set to an empty list allows nothing through it.
+   */
+  fun matches(url: String, method: String): Boolean {
+    hosts?.let { allowedHosts ->
+      val host = hostOf(url)
+      val allowed = allowedHosts.any { it.equals(host, ignoreCase = true) }
+      if (!allowed) {
+        return false
+      }
+    }
+    methods?.let { allowedMethods ->
+      val allowed = allowedMethods.any { it.equals(method, ignoreCase = true) }
+      if (!allowed) {
+        return false
+      }
+    }
+    return true
+  }
+
+  private fun hostOf(url: String): String? {
+    // Parse with OkHttp's `HttpUrl`, the same engine that issued the request, so host extraction
+    // matches how the request was actually routed. `java.net.URI` is stricter (RFC 2396) and
+    // rejects hosts OkHttp accepts (underscores, some IDN/Unicode forms), which would silently
+    // drop a request a `hosts` entry was meant to match. A URL with no parseable host yields
+    // `null` and can't match any `hosts` entry.
+    return url.toHttpUrlOrNull()?.host
+  }
+}
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitor.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitor.kt
index 750357eb2f3f1b..406bb8578f6d54 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitor.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitor.kt
@@ -13,6 +13,15 @@ import java.util.Date
 interface NetworkRequestObserverDelegate {
   fun onNetworkRequestStarted(request: NetworkRequestStarted) {}
   fun onNetworkRequestCompleted(request: NetworkRequest) {}
+
+  /**
+   * Whether this delegate wants events for a request with the given URL and method. Consulted by
+   * the monitor before each fan-out call so a delegate's filter is evaluated before the payload is
+   * built. Only the URL and method are passed because those are the only attributes available at
+   * both start and completion, which keeps the started/completed decision consistent. Defaults to
+   * accepting every request.
+   */
+  fun shouldObserveRequest(url: String, method: String): Boolean = true
 }
 
 /**
@@ -79,7 +88,9 @@ class NetworkRequestMonitor internal constructor() {
       delegates.mapNotNull { it.get() }
     }
     for (delegate in snapshot) {
-      delegate.onNetworkRequestCompleted(request)
+      if (delegate.shouldObserveRequest(request.url, request.method)) {
+        delegate.onNetworkRequestCompleted(request)
+      }
     }
   }
 
@@ -94,7 +105,9 @@ class NetworkRequestMonitor internal constructor() {
       delegates.mapNotNull { it.get() }
     }
     for (delegate in snapshot) {
-      delegate.onNetworkRequestStarted(request)
+      if (delegate.shouldObserveRequest(request.url, request.method)) {
+        delegate.onNetworkRequestStarted(request)
+      }
     }
   }
 
diff --git a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestObserver.kt b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestObserver.kt
index c0391aa0dc704b..d12d2c49ed9fe3 100644
--- a/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestObserver.kt
+++ b/packages/expo-app-metrics/android/src/main/java/expo/modules/appmetrics/networkrequests/NetworkRequestObserver.kt
@@ -5,6 +5,7 @@ package expo.modules.appmetrics.networkrequests
 import expo.modules.appmetrics.utils.TimeUtils
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.sharedobjects.SharedObject
+import java.util.concurrent.atomic.AtomicReference
 
 /** Event names emitted by `NetworkRequestObserver`, matching the keys in the JS `NetworkRequestObserverEvents` type. */
 internal const val REQUEST_STARTED_EVENT = "requestStarted"
@@ -19,10 +20,15 @@ internal const val REQUEST_COMPLETED_EVENT = "requestCompleted"
  * The class only forwards events — it doesn't store request history. Use
  * `NetworkRequestMonitor.shared.recent` for that.
  */
-class NetworkRequestObserver(appContext: AppContext) :
+class NetworkRequestObserver(appContext: AppContext, filter: NetworkRequestFilter? = null) :
   SharedObject(appContext),
   NetworkRequestObserverDelegate {
 
+  // The active filter, or null to observe every request. An `AtomicReference` so the read from the
+  // monitor's fan-out (`shouldObserveRequest`) and the swap from `setFilter` are atomic: a
+  // `setFilter` call never leaves a request observed under a half-applied filter.
+  private val filter = AtomicReference(filter)
+
   init {
     NetworkRequestMonitor.shared.addDelegate(this)
   }
@@ -32,6 +38,17 @@ class NetworkRequestObserver(appContext: AppContext) :
     super.sharedObjectDidRelease()
   }
 
+  /**
+   * Replaces the active filter. Pass null to observe every request. The swap is atomic.
+   */
+  fun setFilter(filter: NetworkRequestFilter?) {
+    this.filter.set(filter)
+  }
+
+  override fun shouldObserveRequest(url: String, method: String): Boolean {
+    return filter.get()?.matches(url, method) ?: true
+  }
+
   override fun onNetworkRequestStarted(request: NetworkRequestStarted) {
     emit(REQUEST_STARTED_EVENT, startedPayload(request))
   }
diff --git a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilterTest.kt b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilterTest.kt
new file mode 100644
index 00000000000000..7f1d52ee446d76
--- /dev/null
+++ b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestFilterTest.kt
@@ -0,0 +1,69 @@
+package expo.modules.appmetrics.networkrequests
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class NetworkRequestFilterTest {
+  @Test
+  fun `a filter with no fields set matches every request`() {
+    val filter = NetworkRequestFilter()
+    assertTrue(filter.matches("https://anything.example.com/path", "GET"))
+    assertTrue(filter.matches("https://other.test/x", "DELETE"))
+  }
+
+  @Test
+  fun `an empty array allows nothing through that dimension`() {
+    assertFalse(NetworkRequestFilter(hosts = emptyList()).matches("https://api.expo.dev/x", "GET"))
+    assertFalse(NetworkRequestFilter(methods = emptyList()).matches("https://api.expo.dev/x", "GET"))
+  }
+
+  @Test
+  fun `hosts match exactly and case-insensitively`() {
+    val filter = NetworkRequestFilter(hosts = listOf("API.Expo.dev"))
+    assertTrue(filter.matches("https://api.expo.dev/v2", "GET"))
+    // Exact host only - subdomains and unrelated hosts are excluded.
+    assertFalse(filter.matches("https://cdn.expo.dev/v2", "GET"))
+    assertFalse(filter.matches("https://example.com/v2", "GET"))
+  }
+
+  @Test
+  fun `hosts is an OR across the listed entries`() {
+    val filter = NetworkRequestFilter(hosts = listOf("api.expo.dev", "u.expo.dev"))
+    assertTrue(filter.matches("https://api.expo.dev/x", "GET"))
+    assertTrue(filter.matches("https://u.expo.dev/x", "GET"))
+    assertFalse(filter.matches("https://cdn.expo.dev/x", "GET"))
+  }
+
+  @Test
+  fun `methods match case-insensitively`() {
+    val filter = NetworkRequestFilter(methods = listOf("post", "PUT"))
+    assertTrue(filter.matches("https://expo.dev/x", "POST"))
+    assertTrue(filter.matches("https://expo.dev/x", "put"))
+    assertFalse(filter.matches("https://expo.dev/x", "GET"))
+  }
+
+  @Test
+  fun `fields combine with AND`() {
+    val filter = NetworkRequestFilter(hosts = listOf("api.expo.dev"), methods = listOf("POST"))
+    // Both the host and the method must match.
+    assertTrue(filter.matches("https://api.expo.dev/x", "POST"))
+    assertFalse(filter.matches("https://api.expo.dev/x", "GET"))
+    assertFalse(filter.matches("https://cdn.expo.dev/x", "POST"))
+  }
+
+  @Test
+  fun `a malformed url matches no host constraint`() {
+    val filter = NetworkRequestFilter(hosts = listOf("api.expo.dev"))
+    assertFalse(filter.matches("not a url", "GET"))
+  }
+
+  @Test
+  fun `hosts match the same way OkHttp routed the request`() {
+    // Hosts with underscores are accepted by OkHttp (which actually issued the request) but
+    // rejected by `java.net.URI`. Parsing the host with the same engine that routed the request
+    // keeps the filter from silently dropping a request a `hosts` entry was meant to match.
+    val filter = NetworkRequestFilter(hosts = listOf("my_service.internal"))
+    assertTrue(filter.matches("https://my_service.internal/x", "GET"))
+  }
+}
diff --git a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitorTest.kt b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitorTest.kt
index 4d783144f8801f..a0b480aed0de2b 100644
--- a/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitorTest.kt
+++ b/packages/expo-app-metrics/android/src/test/java/expo/modules/appmetrics/networkrequests/NetworkRequestMonitorTest.kt
@@ -3,6 +3,7 @@ package expo.modules.appmetrics.networkrequests
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import java.net.URI
 import java.util.Date
 import java.util.UUID
 
@@ -68,6 +69,28 @@ class NetworkRequestMonitorTest {
     assertEquals(0, collector.completed.size)
   }
 
+  @Test
+  fun `does not fan out events the delegate filters out`() {
+    val monitor = NetworkRequestMonitor()
+    val collector = FilteringDelegate(allowedHost = "api.expo.dev")
+    monitor.addDelegate(collector)
+
+    monitor.recordStart(
+      NetworkRequestStarted(UUID.randomUUID(), "https://api.expo.dev/v2/sessions", "POST", Date())
+    )
+    monitor.recordStart(
+      NetworkRequestStarted(UUID.randomUUID(), "https://cdn.example.com/asset.png", "GET", Date())
+    )
+    monitor.record(makeRequest(url = "https://api.expo.dev/v2/sessions"))
+    monitor.record(makeRequest(url = "https://cdn.example.com/asset.png"))
+
+    // Only the matching host reaches the delegate, on both the start and the completion path.
+    assertEquals(1, collector.started.size)
+    assertEquals("https://api.expo.dev/v2/sessions", collector.started.first().url)
+    assertEquals(1, collector.completed.size)
+    assertEquals("https://api.expo.dev/v2/sessions", collector.completed.first().url)
+  }
+
   private fun makeRequest(
     url: String = "https://expo.dev/x",
     fetchStart: Date = Date()
@@ -109,4 +132,23 @@ class NetworkRequestMonitorTest {
       completed.add(request)
     }
   }
+
+  /**
+   * Collecting delegate that only accepts requests for a single host, exercising the monitor's
+   * per-delegate `shouldObserveRequest` consult at the fan-out site.
+   */
+  private class FilteringDelegate(private val allowedHost: String) : NetworkRequestObserverDelegate {
+    val completed = mutableListOf<NetworkRequest>()
+    val started = mutableListOf<NetworkRequestStarted>()
+
+    override fun shouldObserveRequest(url: String, method: String): Boolean = URI(url).host == allowedHost
+
+    override fun onNetworkRequestStarted(request: NetworkRequestStarted) {
+      started.add(request)
+    }
+
+    override fun onNetworkRequestCompleted(request: NetworkRequest) {
+      completed.add(request)
+    }
+  }
 }
diff --git a/packages/expo-app-metrics/build/types.d.ts b/packages/expo-app-metrics/build/types.d.ts
index df68dc5ff58a8c..217584af631bb9 100644
--- a/packages/expo-app-metrics/build/types.d.ts
+++ b/packages/expo-app-metrics/build/types.d.ts
@@ -299,6 +299,32 @@ export type NetworkRequestCompletedEvent = {
      */
     redirects: NetworkRequestRedirect[];
 };
+/**
+ * Declares which requests a `NetworkRequestObserver` should emit events for. The filter is
+ * evaluated natively, before the request payload crosses into JS, so requests that don't match
+ * never materialize a `requestStarted`/`requestCompleted` event.
+ *
+ * Only request attributes that are known the moment a request starts are supported, so a request
+ * that matches always emits both its `requestStarted` and `requestCompleted` events as a pair —
+ * the filter decision never changes between the two.
+ *
+ * A field left unset (`undefined` or `null`) places no constraint on that dimension. A field set
+ * to an empty array allows nothing through it, so it drops every request. Different fields combine
+ * with AND (host **and** method must match); entries within a single field combine with OR (any
+ * listed host matches). A filter with no fields set, or a `null` filter, matches every request.
+ */
+export type NetworkRequestFilter = {
+    /**
+     * Allowed hosts, compared for exact, case-insensitive equality against the request URL's host.
+     * Subdomains are not implied: `['expo.dev']` matches `expo.dev` but not `api.expo.dev`. List each
+     * host you want to observe.
+     */
+    hosts?: string[] | null;
+    /**
+     * Allowed HTTP methods (`GET`, `POST`, …), compared case-insensitively.
+     */
+    methods?: string[] | null;
+};
 /**
  * Map of events emitted by `NetworkRequestObserver`. Used by the underlying `SharedObject`
  * event-emitter to type listener callbacks.
@@ -314,11 +340,15 @@ export type NetworkRequestObserverEvents = {
  *
  * Subscribe to events via `addListener`/`removeListener` (inherited from the SharedObject base).
  *
+ * Pass a `NetworkRequestFilter` to only receive events for matching requests; the filter is
+ * applied natively so non-matching payloads never cross into JS. Omit it (or pass `null`) to
+ * observe every request.
+ *
  * @example
  * ```ts
  * import AppMetrics from 'expo-app-metrics';
  *
- * const observer = new AppMetrics.NetworkRequestObserver();
+ * const observer = new AppMetrics.NetworkRequestObserver({ hosts: ['api.expo.dev'] });
  * const sub = observer.addListener('requestCompleted', event => {
  *   console.log(event.url, event.totalDuration);
  * });
@@ -327,7 +357,13 @@ export type NetworkRequestObserverEvents = {
  * ```
  */
 export declare class NetworkRequestObserver extends SharedObject<NetworkRequestObserverEvents> {
-    constructor();
+    constructor(filter?: NetworkRequestFilter | null);
+    /**
+     * Replaces the active filter. Pass `null` to observe every request. The change applies
+     * atomically: events already mid-flight are emitted under either the old or the new filter,
+     * never a partially-applied mix.
+     */
+    setFilter(filter: NetworkRequestFilter | null): void;
 }
 /**
  * A historic session and its recorded data, returned by `getInactiveSessions()`
diff --git a/packages/expo-app-metrics/build/types.d.ts.map b/packages/expo-app-metrics/build/types.d.ts.map
index 24d8764c34878a..cfb6407666f1a1 100644
--- a/packages/expo-app-metrics/build/types.d.ts.map
+++ b/packages/expo-app-metrics/build/types.d.ts.map
@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AAElF;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GACzB,MAAM,GACN,MAAM,GACN,OAAO,GACP,iBAAiB,EAAE,GACnB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAE,CAAC;AAEzC;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAAC;IACtD;;OAEG;IACH,QAAQ,EAAE,WAAW,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAAC;IACtD;;;;OAIG;IACH,QAAQ,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAElF,MAAM,MAAM,SAAS,GACjB,WAAW,GACX,YAAY,GACZ,cAAc,GACd,gBAAgB,GAChB,kBAAkB,GAClB,eAAe,GACf,eAAe,CAAC;AAEpB;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2BAA2B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACpC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,gBAAgB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,mBAAmB,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,eAAe,CAAC,EAAE;QAChB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,IAAI,CAAC;IACT,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACvC,gFAAgF;IAChF,EAAE,EAAE,MAAM,CAAC;IACX,0GAA0G;IAC1G,GAAG,EAAE,MAAM,CAAC;IACZ,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,kFAAkF;IAClF,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC,8EAA8E;IAC9E,EAAE,EAAE,MAAM,CAAC;IACX,0GAA0G;IAC1G,GAAG,EAAE,MAAM,CAAC;IACZ,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,0FAA0F;IAC1F,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;OAEG;IACH,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kFAAkF;IAClF,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,mFAAmF;IACnF,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;OAGG;IACH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;OAGG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,SAAS,EAAE,sBAAsB,EAAE,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,4BAA4B,GAAG,IAAI,CAAC;CAC7D,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,YAAY,CAAC,4BAA4B,CAAC;;CAE7F;AAED;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,+CAA+C;IAC/C,EAAE,EAAE,MAAM,CAAC;IACX,uBAAuB;IACvB,IAAI,EAAE,WAAW,CAAC;IAClB,sDAAsD;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8CAA8C;IAC9C,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,sGAAsG;IACtG,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,eAAe,IAAI,IAAI,CAAC;IACxB,eAAe,CAAC,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrD;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IACxD;;;;;;;;;;;;OAYG;IACH,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IACjF,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC;;;;;;;;;OASG;IACH,mBAAmB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAE/C;;;;;;OAMG;IACH,mBAAmB,IAAI,IAAI,CAAC;IAE5B;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAEpC;;OAEG;IACH,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;;;;;;OAUG;IACH,cAAc,IAAI,OAAO,CAAC;IAE1B;;;;;;;;OAQG;IACH,oBAAoB,IAAI,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAEhD;;;;OAIG;IACH,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IAEtD;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,OAAO,CAAC;CACzB"}
\ No newline at end of file
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts b/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts
index 2841ba2de4daab..a9469c4810e634 100644
--- a/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts
+++ b/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts
@@ -1,5 +1,11 @@
-import type { NetworkRequestCompletedEvent, NetworkRequestObserver, NetworkRequestStartedEvent } from './types';
+import type { NetworkRequestCompletedEvent, NetworkRequestFilter, NetworkRequestObserver, NetworkRequestStartedEvent } from './types';
 export type UseNetworkRequestObserverOptions = {
+    /**
+     * Restricts which requests fire events. Applied natively so non-matching requests never cross
+     * into JS. Omit to observe every request. Updating it re-applies the filter on the existing
+     * observer without dropping subscriptions.
+     */
+    filter?: NetworkRequestFilter | null;
     /**
      * Called when a request begins. Fired before any response or timing data exists; correlate
      * with the matching `onCompleted` call via the shared `id`.
diff --git a/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts.map b/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts.map
index dbb831c3b68cdb..ce53c454bb60b5 100644
--- a/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts.map
+++ b/packages/expo-app-metrics/build/useNetworkRequestObserver.d.ts.map
@@ -1 +1 @@
-{"version":3,"file":"useNetworkRequestObserver.d.ts","sourceRoot":"","sources":["../src/useNetworkRequestObserver.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,4BAA4B,EAC5B,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,gCAAgC,GAAG;IAC7C;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAExD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,4BAA4B,KAAK,IAAI,CAAC;CAC7D,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,gCAAqC,GAC7C,sBAAsB,CAOxB"}
\ No newline at end of file
+{"version":3,"file":"useNetworkRequestObserver.d.ts","sourceRoot":"","sources":["../src/useNetworkRequestObserver.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,4BAA4B,EAC5B,oBAAoB,EACpB,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAcjB,MAAM,MAAM,gCAAgC,GAAG;IAC7C;;;;OAIG;IACH,MAAM,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAErC;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAExD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,4BAA4B,KAAK,IAAI,CAAC;CAC7D,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,gCAAqC,GAC7C,sBAAsB,CA2BxB"}
\ No newline at end of file
diff --git a/packages/expo-app-metrics/ios/AppMetricsModule.swift b/packages/expo-app-metrics/ios/AppMetricsModule.swift
index d595c7810c6e8e..fc2f50732fa2f4 100644
--- a/packages/expo-app-metrics/ios/AppMetricsModule.swift
+++ b/packages/expo-app-metrics/ios/AppMetricsModule.swift
@@ -151,8 +151,12 @@ public final class AppMetricsModule: Module, UpdatesStateChangeListener {
     }
 
     Class(NetworkRequestObserver.self) {
-      Constructor {
-        return NetworkRequestObserver()
+      Constructor { (filter: NetworkRequestFilter?) in
+        return NetworkRequestObserver(filter: filter)
+      }
+
+      Function("setFilter") { (observer: NetworkRequestObserver, filter: NetworkRequestFilter?) in
+        observer.setFilter(filter)
       }
     }
   }
diff --git a/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestFilter.swift b/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestFilter.swift
new file mode 100644
index 00000000000000..860989afc3791a
--- /dev/null
+++ b/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestFilter.swift
@@ -0,0 +1,47 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import Foundation
+
+/// Declares which requests a `NetworkRequestObserver` emits events for. Mirrors the JS
+/// `NetworkRequestFilter` type.
+///
+/// Only attributes knowable the moment a request starts are supported (host and method), so the
+/// same predicate yields the same answer at start and at completion. That keeps the
+/// `requestStarted`/`requestCompleted` pair consistent: a request that matches always emits both, a
+/// request that doesn't matches neither.
+///
+/// Different fields combine with AND; entries within a field combine with OR. A field that is left
+/// unset places no constraint on its dimension, while a field set to an empty array allows nothing
+/// through it (an empty allow-list matches no value), so any empty field drops every request. A
+/// filter with no fields set matches every request, matching the no-filter default.
+public struct NetworkRequestFilter: Record, Sendable {
+  public init() {}
+
+  @Field
+  public var hosts: [String]?
+
+  @Field
+  public var methods: [String]?
+
+  /// Returns whether a request with the given URL and method passes this filter. Host and method
+  /// comparisons are case-insensitive. An unset (`nil`) field places no constraint on its
+  /// dimension; a field set to an empty array allows nothing through it.
+  public func matches(url: URL, method: String) -> Bool {
+    if let hosts {
+      let host = url.host?.lowercased()
+      let allowed = hosts.contains { $0.lowercased() == host }
+      if !allowed {
+        return false
+      }
+    }
+    if let methods {
+      let requestMethod = method.uppercased()
+      let allowed = methods.contains { $0.uppercased() == requestMethod }
+      if !allowed {
+        return false
+      }
+    }
+    return true
+  }
+}
diff --git a/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestMonitor.swift b/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestMonitor.swift
index d8c9279630e576..ed8b23d221f7db 100644
--- a/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestMonitor.swift
+++ b/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestMonitor.swift
@@ -10,11 +10,22 @@ import Foundation
 public protocol NetworkRequestObserverDelegate: AnyObject, Sendable {
   func onNetworkRequestStarted(_ request: NetworkRequestStarted)
   func onNetworkRequestCompleted(_ request: NetworkRequest)
+
+  /// Whether this delegate wants events for a request with the given URL and method. Consulted by
+  /// the monitor before each fan-out call so a delegate's filter is evaluated before the payload is
+  /// built. Only the URL and method are passed because those are the only attributes available at
+  /// both start and completion, which keeps the started/completed decision consistent. The default
+  /// implementation accepts every request.
+  func shouldObserveRequest(url: URL, method: String) -> Bool
 }
 
 public extension NetworkRequestObserverDelegate {
   func onNetworkRequestStarted(_ request: NetworkRequestStarted) {}
   func onNetworkRequestCompleted(_ request: NetworkRequest) {}
+
+  func shouldObserveRequest(url: URL, method: String) -> Bool {
+    return true
+  }
 }
 
 /**
@@ -104,7 +115,12 @@ public final class NetworkRequestMonitor: Sendable {
     }
     pruneDelegates()
     for entry in delegates {
-      entry.value?.onNetworkRequestCompleted(request)
+      guard let delegate = entry.value else {
+        continue
+      }
+      if delegate.shouldObserveRequest(url: request.url, method: request.method) {
+        delegate.onNetworkRequestCompleted(request)
+      }
     }
   }
 
@@ -116,7 +132,12 @@ public final class NetworkRequestMonitor: Sendable {
   func recordStart(_ request: NetworkRequestStarted) {
     pruneDelegates()
     for entry in delegates {
-      entry.value?.onNetworkRequestStarted(request)
+      guard let delegate = entry.value else {
+        continue
+      }
+      if delegate.shouldObserveRequest(url: request.url, method: request.method) {
+        delegate.onNetworkRequestStarted(request)
+      }
     }
   }
 
diff --git a/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestObserver.swift b/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestObserver.swift
index b95e2b341f2447..1fc1c52378d117 100644
--- a/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestObserver.swift
+++ b/packages/expo-app-metrics/ios/NetworkRequests/NetworkRequestObserver.swift
@@ -18,8 +18,14 @@ let REQUEST_COMPLETED_EVENT = "requestCompleted"
  in-process API for that.
  */
 public final class NetworkRequestObserver: SharedObject, NetworkRequestObserverDelegate, @unchecked Sendable {
-  public override init() {
+  /// The active filter, or `nil` to observe every request. Held in a `Mutex` so the read from the
+  /// monitor's fan-out (`shouldObserveRequest`) and the swap from `setFilter` are atomic: a
+  /// `setFilter` call never leaves a request evaluated under a half-applied filter.
+  private let filter = Mutex<NetworkRequestFilter?>(nil)
+
+  public init(filter: NetworkRequestFilter? = nil) {
     super.init()
+    self.filter.withLock { $0 = filter }
     AppMetricsActor.isolated { [weak self] in
       guard let self else {
         return
@@ -28,6 +34,12 @@ public final class NetworkRequestObserver: SharedObject, NetworkRequestObserverD
     }
   }
 
+  /// Replaces the active filter. Pass `nil` to observe every request. The swap is atomic: a request
+  /// mid-fan-out is evaluated against either the old or the new filter, never a mix.
+  public func setFilter(_ filter: NetworkRequestFilter?) {
+    self.filter.withLock { $0 = filter }
+  }
+
   public override func sharedObjectWillRelease() {
     // The monitor holds delegates weakly, but deregister explicitly so the slot doesn't linger
     // until the next fan-out prunes it — matches the Android `sharedObjectDidRelease` cleanup.
@@ -50,6 +62,13 @@ public final class NetworkRequestObserver: SharedObject, NetworkRequestObserverD
     emit(event: REQUEST_COMPLETED_EVENT, payload: NetworkRequestObserver.completedPayload(for: request))
   }
 
+  public func shouldObserveRequest(url: URL, method: String) -> Bool {
+    guard let filter = filter.withLock({ $0 }) else {
+      return true
+    }
+    return filter.matches(url: url, method: method)
+  }
+
   /** Internal so tests can assert the payload shape without going through `emit`, which needs a
    live JS runtime. The keys here are part of the public JS contract — additions are safe but
    renames are breaking. */
diff --git a/packages/expo-app-metrics/ios/Tests/NetworkRequestTests.swift b/packages/expo-app-metrics/ios/Tests/NetworkRequestTests.swift
index 65f15915b4e84b..6ff06b2c6e172c 100644
--- a/packages/expo-app-metrics/ios/Tests/NetworkRequestTests.swift
+++ b/packages/expo-app-metrics/ios/Tests/NetworkRequestTests.swift
@@ -134,6 +134,124 @@ struct NetworkRequestMonitorTests {
     }
     #expect(monitor.recent.count == 200)
   }
+
+  @Test
+  func `does not fan out events the delegate filters out`() {
+    let monitor = NetworkRequestMonitor()
+    let collector = FilteringDelegate(allowedHost: "api.expo.dev")
+    monitor.addDelegate(collector)
+
+    monitor.recordStart(makeStarted(url: "https://api.expo.dev/v2/sessions", method: "POST"))
+    monitor.recordStart(makeStarted(url: "https://cdn.example.com/asset.png", method: "GET"))
+    monitor.record(makeRequest(url: "https://api.expo.dev/v2/sessions"))
+    monitor.record(makeRequest(url: "https://cdn.example.com/asset.png"))
+
+    // Only the matching host reaches the delegate, on both the start and the completion path.
+    #expect(collector.receivedStarts.count == 1)
+    #expect(collector.receivedStarts.first?.url.host == "api.expo.dev")
+    #expect(collector.received.count == 1)
+    #expect(collector.received.first?.url.host == "api.expo.dev")
+  }
+
+  private func makeStarted(url: String, method: String) -> NetworkRequestStarted {
+    return NetworkRequestStarted(id: UUID(), url: URL(string: url)!, method: method, startedAt: Date())
+  }
+
+  private func makeRequest(url: String) -> NetworkRequest {
+    return NetworkRequest.from(
+      id: UUID(),
+      request: URLRequest(url: URL(string: url)!),
+      response: nil,
+      taskBytesSent: nil,
+      taskBytesReceived: nil,
+      metrics: nil,
+      fallbackStart: Date(),
+      fallbackEnd: Date(),
+      error: nil
+    )
+  }
+}
+
+@Suite("NetworkRequestFilter")
+struct NetworkRequestFilterTests {
+  @Test
+  func `a filter with no fields set matches every request`() {
+    let filter = NetworkRequestFilter()
+    #expect(filter.matches(url: URL(string: "https://anything.example.com/path")!, method: "GET"))
+    #expect(filter.matches(url: URL(string: "https://other.test/x")!, method: "DELETE"))
+  }
+
+  @Test
+  func `an empty array allows nothing through that dimension`() {
+    var emptyHosts = NetworkRequestFilter()
+    emptyHosts.hosts = []
+    #expect(!emptyHosts.matches(url: URL(string: "https://api.expo.dev/x")!, method: "GET"))
+
+    var emptyMethods = NetworkRequestFilter()
+    emptyMethods.methods = []
+    #expect(!emptyMethods.matches(url: URL(string: "https://api.expo.dev/x")!, method: "GET"))
+  }
+
+  @Test
+  func `hosts match exactly and case-insensitively`() {
+    var filter = NetworkRequestFilter()
+    filter.hosts = ["API.Expo.dev"]
+    #expect(filter.matches(url: URL(string: "https://api.expo.dev/v2")!, method: "GET"))
+    // Exact host only — subdomains and unrelated hosts are excluded.
+    #expect(!filter.matches(url: URL(string: "https://cdn.expo.dev/v2")!, method: "GET"))
+    #expect(!filter.matches(url: URL(string: "https://example.com/v2")!, method: "GET"))
+  }
+
+  @Test
+  func `hosts is an OR across the listed entries`() {
+    var filter = NetworkRequestFilter()
+    filter.hosts = ["api.expo.dev", "u.expo.dev"]
+    #expect(filter.matches(url: URL(string: "https://api.expo.dev/x")!, method: "GET"))
+    #expect(filter.matches(url: URL(string: "https://u.expo.dev/x")!, method: "GET"))
+    #expect(!filter.matches(url: URL(string: "https://cdn.expo.dev/x")!, method: "GET"))
+  }
+
+  @Test
+  func `methods match case-insensitively`() {
+    var filter = NetworkRequestFilter()
+    filter.methods = ["post", "PUT"]
+    #expect(filter.matches(url: URL(string: "https://expo.dev/x")!, method: "POST"))
+    #expect(filter.matches(url: URL(string: "https://expo.dev/x")!, method: "put"))
+    #expect(!filter.matches(url: URL(string: "https://expo.dev/x")!, method: "GET"))
+  }
+
+  @Test
+  func `fields combine with AND`() {
+    var filter = NetworkRequestFilter()
+    filter.hosts = ["api.expo.dev"]
+    filter.methods = ["POST"]
+    // Both the host and the method must match.
+    #expect(filter.matches(url: URL(string: "https://api.expo.dev/x")!, method: "POST"))
+    #expect(!filter.matches(url: URL(string: "https://api.expo.dev/x")!, method: "GET"))
+    #expect(!filter.matches(url: URL(string: "https://cdn.expo.dev/x")!, method: "POST"))
+  }
+}
+
+@Suite("NetworkRequestObserver filtering")
+struct NetworkRequestObserverFilterTests {
+  @Test
+  func `setFilter swaps the active filter synchronously`() {
+    var post = NetworkRequestFilter()
+    post.methods = ["POST"]
+    let observer = NetworkRequestObserver(filter: post)
+    #expect(observer.shouldObserveRequest(url: URL(string: "https://expo.dev/x")!, method: "POST"))
+    #expect(!observer.shouldObserveRequest(url: URL(string: "https://expo.dev/x")!, method: "GET"))
+
+    var get = NetworkRequestFilter()
+    get.methods = ["GET"]
+    observer.setFilter(get)
+    #expect(observer.shouldObserveRequest(url: URL(string: "https://expo.dev/x")!, method: "GET"))
+    #expect(!observer.shouldObserveRequest(url: URL(string: "https://expo.dev/x")!, method: "POST"))
+
+    // No filter falls back to observing everything.
+    observer.setFilter(nil)
+    #expect(observer.shouldObserveRequest(url: URL(string: "https://expo.dev/x")!, method: "POST"))
+  }
 }
 
 @Suite("NetworkRequestSummary")
@@ -687,6 +805,55 @@ private final class CollectingDelegate: NetworkRequestObserverDelegate, @uncheck
   }
 }
 
+/** Collecting delegate that only accepts requests for a single host, exercising the monitor's
+ per-delegate `shouldObserveRequest` consult at the fan-out site. */
+private final class FilteringDelegate: NetworkRequestObserverDelegate, @unchecked Sendable {
+  private let allowedHost: String
+  private let lock = NSLock()
+  private var completed: [NetworkRequest] = []
+  private var started: [NetworkRequestStarted] = []
+
+  init(allowedHost: String) {
+    self.allowedHost = allowedHost
+  }
+
+  var received: [NetworkRequest] {
+    lock.lock()
+    defer {
+      lock.unlock()
+    }
+    return completed
+  }
+
+  var receivedStarts: [NetworkRequestStarted] {
+    lock.lock()
+    defer {
+      lock.unlock()
+    }
+    return started
+  }
+
+  func shouldObserveRequest(url: URL, method: String) -> Bool {
+    return url.host == allowedHost
+  }
+
+  func onNetworkRequestStarted(_ request: NetworkRequestStarted) {
+    lock.lock()
+    defer {
+      lock.unlock()
+    }
+    started.append(request)
+  }
+
+  func onNetworkRequestCompleted(_ request: NetworkRequest) {
+    lock.lock()
+    defer {
+      lock.unlock()
+    }
+    completed.append(request)
+  }
+}
+
 /**
  A trivial `URLProtocol` that pretends to be a server. Routes by URL path:
  - `/cookie-test` returns a `Set-Cookie` header so the cookie-isolation test can detect a leak.
diff --git a/packages/expo-app-metrics/src/types.ts b/packages/expo-app-metrics/src/types.ts
index f1d59c875568ff..5a654c8c5a558c 100644
--- a/packages/expo-app-metrics/src/types.ts
+++ b/packages/expo-app-metrics/src/types.ts
@@ -330,6 +330,33 @@ export type NetworkRequestCompletedEvent = {
   redirects: NetworkRequestRedirect[];
 };
 
+/**
+ * Declares which requests a `NetworkRequestObserver` should emit events for. The filter is
+ * evaluated natively, before the request payload crosses into JS, so requests that don't match
+ * never materialize a `requestStarted`/`requestCompleted` event.
+ *
+ * Only request attributes that are known the moment a request starts are supported, so a request
+ * that matches always emits both its `requestStarted` and `requestCompleted` events as a pair —
+ * the filter decision never changes between the two.
+ *
+ * A field left unset (`undefined` or `null`) places no constraint on that dimension. A field set
+ * to an empty array allows nothing through it, so it drops every request. Different fields combine
+ * with AND (host **and** method must match); entries within a single field combine with OR (any
+ * listed host matches). A filter with no fields set, or a `null` filter, matches every request.
+ */
+export type NetworkRequestFilter = {
+  /**
+   * Allowed hosts, compared for exact, case-insensitive equality against the request URL's host.
+   * Subdomains are not implied: `['expo.dev']` matches `expo.dev` but not `api.expo.dev`. List each
+   * host you want to observe.
+   */
+  hosts?: string[] | null;
+  /**
+   * Allowed HTTP methods (`GET`, `POST`, …), compared case-insensitively.
+   */
+  methods?: string[] | null;
+};
+
 /**
  * Map of events emitted by `NetworkRequestObserver`. Used by the underlying `SharedObject`
  * event-emitter to type listener callbacks.
@@ -346,11 +373,15 @@ export type NetworkRequestObserverEvents = {
  *
  * Subscribe to events via `addListener`/`removeListener` (inherited from the SharedObject base).
  *
+ * Pass a `NetworkRequestFilter` to only receive events for matching requests; the filter is
+ * applied natively so non-matching payloads never cross into JS. Omit it (or pass `null`) to
+ * observe every request.
+ *
  * @example
  * ```ts
  * import AppMetrics from 'expo-app-metrics';
  *
- * const observer = new AppMetrics.NetworkRequestObserver();
+ * const observer = new AppMetrics.NetworkRequestObserver({ hosts: ['api.expo.dev'] });
  * const sub = observer.addListener('requestCompleted', event => {
  *   console.log(event.url, event.totalDuration);
  * });
@@ -359,7 +390,14 @@ export type NetworkRequestObserverEvents = {
  * ```
  */
 export declare class NetworkRequestObserver extends SharedObject<NetworkRequestObserverEvents> {
-  constructor();
+  constructor(filter?: NetworkRequestFilter | null);
+
+  /**
+   * Replaces the active filter. Pass `null` to observe every request. The change applies
+   * atomically: events already mid-flight are emitted under either the old or the new filter,
+   * never a partially-applied mix.
+   */
+  setFilter(filter: NetworkRequestFilter | null): void;
 }
 
 /**
diff --git a/packages/expo-app-metrics/src/useNetworkRequestObserver.ts b/packages/expo-app-metrics/src/useNetworkRequestObserver.ts
index 28ac83457da25a..50267787b2c47d 100644
--- a/packages/expo-app-metrics/src/useNetworkRequestObserver.ts
+++ b/packages/expo-app-metrics/src/useNetworkRequestObserver.ts
@@ -1,14 +1,35 @@
 import { useEventListener } from 'expo';
 import { useReleasingSharedObject } from 'expo-modules-core';
+import { useEffect, useRef } from 'react';
 
 import AppMetrics from './module';
 import type {
   NetworkRequestCompletedEvent,
+  NetworkRequestFilter,
   NetworkRequestObserver,
   NetworkRequestStartedEvent,
 } from './types';
 
+/**
+ * Order-stable serialization of a filter, used as the effect's dependency key. Listing the fields
+ * explicitly keeps `{ hosts, methods }` and `{ methods, hosts }` (the same filter) from producing
+ * different keys and re-applying the filter for nothing.
+ */
+function filterKeyOf(filter: NetworkRequestFilter | null | undefined): string {
+  return JSON.stringify({
+    hosts: filter?.hosts ?? null,
+    methods: filter?.methods ?? null,
+  });
+}
+
 export type UseNetworkRequestObserverOptions = {
+  /**
+   * Restricts which requests fire events. Applied natively so non-matching requests never cross
+   * into JS. Omit to observe every request. Updating it re-applies the filter on the existing
+   * observer without dropping subscriptions.
+   */
+  filter?: NetworkRequestFilter | null;
+
   /**
    * Called when a request begins. Fired before any response or timing data exists; correlate
    * with the matching `onCompleted` call via the shared `id`.
@@ -30,7 +51,27 @@ export type UseNetworkRequestObserverOptions = {
 export function useNetworkRequestObserver(
   options: UseNetworkRequestObserverOptions = {}
 ): NetworkRequestObserver {
-  const observer = useReleasingSharedObject(() => new AppMetrics.NetworkRequestObserver(), []);
+  // Serialized so a fresh object literal with the same contents doesn't re-run the effect every
+  // render. The observer is created once with the initial filter; later changes go through
+  // `setFilter` so subscriptions survive.
+  const filterKey = filterKeyOf(options.filter);
+  const observer = useReleasingSharedObject(
+    () => new AppMetrics.NetworkRequestObserver(options.filter),
+    []
+  );
+
+  // The constructor already applied the initial filter, so skip re-applying it on mount; only push
+  // later changes through `setFilter`. Seeded with the mount key so the first effect run is a no-op
+  // unless the filter changed before it fired.
+  const appliedFilterKey = useRef(filterKey);
+  useEffect(() => {
+    if (appliedFilterKey.current === filterKey) {
+      return;
+    }
+    appliedFilterKey.current = filterKey;
+    observer.setFilter(options.filter ?? null);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [observer, filterKey]);
 
   useEventListener(observer, 'requestStarted', (event) => options.onStarted?.(event));
   useEventListener(observer, 'requestCompleted', (event) => options.onCompleted?.(event));

From 6eb29bf9411d294f1fe9d9eaac2f7a49e5935ac6 Mon Sep 17 00:00:00 2001
From: Mathieu Acthernoene <zoontek@gmail.com>
Date: Thu, 11 Jun 2026 23:26:54 +0200
Subject: [PATCH 16/17] [ci] Update CI to Node 24 and refresh GitHub Actions
 (#46826)

# Why

Keep CI on a supported Node version and up-to-date GitHub Actions. Node
22 is aging out, and several action pins had imprecise or stale version
comments.

# How

- Bumped `node-version` to `24` (or `[22, 24]` matrices) across
workflows and docs examples.
- Updated Expo actions and other third-party actions, fixing the `# vX`
comments left by Dependabot to point at exact released versions.

# Test Plan

CI-only change. Verified by the workflow runs on this PR passing.

# Checklist

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
---
 .../actions/detect-platform-change/action.yml |  4 +-
 .../actions/use-android-emulator/action.yml   |  6 +--
 .../android-instrumentation-tests.yml         |  8 ++--
 .github/workflows/android-unit-tests.yml      |  8 ++--
 .github/workflows/bare-diffs.yml              |  6 +--
 .github/workflows/check-issues-nightly.yml    |  6 +--
 .github/workflows/cli.yml                     | 32 ++++++-------
 .github/workflows/code-review.yml             |  8 ++--
 .github/workflows/commentator.yml             |  6 +--
 .github/workflows/create-expo-app.yml         |  8 ++--
 .github/workflows/create-expo-module.yml      |  6 +--
 .github/workflows/development-client-e2e.yml  |  8 ++--
 .../development-client-latest-e2e.yml         | 10 ++--
 .github/workflows/development-client.yml      | 12 ++---
 .github/workflows/docs-pr-destroy.yml         |  8 ++--
 .github/workflows/docs-pr.yml                 |  8 ++--
 .github/workflows/docs.yml                    |  8 ++--
 .github/workflows/expo-go-android-lint.yml    |  8 ++--
 .github/workflows/expotools.yml               |  6 +--
 .github/workflows/fingerprint.yml             | 14 +++---
 .../ios-prebuild-external-xcframeworks.yml    |  8 ++--
 .github/workflows/ios-static-frameworks.yml   |  8 ++--
 .github/workflows/ios-unit-tests.yml          |  8 ++--
 .github/workflows/issue-closed.yml            |  6 +--
 .github/workflows/issue-opened.yml            |  6 +--
 .github/workflows/issue-triage.yml            |  6 +--
 .github/workflows/native-component-list.yml   |  6 +--
 .github/workflows/pr-labeler.yml              |  8 ++--
 .github/workflows/publish-canaries.yml        |  8 ++--
 .github/workflows/router.yml                  |  8 ++--
 .github/workflows/sdk.yml                     | 16 +++----
 .github/workflows/swift-format.yml            |  2 +-
 .../workflows/test-react-native-nightly.yml   | 20 ++++----
 .github/workflows/test-suite-lint.yml         |  6 +--
 .github/workflows/test-suite-macos.yml        |  8 ++--
 .github/workflows/test-suite-nightly.yml      | 40 ++++++++--------
 .github/workflows/test-suite.yml              | 48 +++++++++----------
 .github/workflows/validate-npm-owners.yml     |  6 +--
 docs/pages/build/building-on-ci.mdx           |  2 +-
 docs/pages/eas-update/github-actions.mdx      |  2 +-
 docs/scripts/append-dates.js                  |  2 +-
 41 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/.github/actions/detect-platform-change/action.yml b/.github/actions/detect-platform-change/action.yml
index ab7b3635e48daa..5c18311feb6c82 100644
--- a/.github/actions/detect-platform-change/action.yml
+++ b/.github/actions/detect-platform-change/action.yml
@@ -26,13 +26,13 @@ runs:
   using: 'composite'
   steps:
     - name: 👀 Checkout
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
       with:
         fetch-depth: 1000
         filter: 'blob:none'
     - name: 🧐 Check changes categories
       id: changes
-      uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47
+      uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
       with:
         # If the number of commits from actions/checkout is not sufficient to find a base commit,
         # tj-actions/changed-files tries 10 times to fetch more commits by this amount:
diff --git a/.github/actions/use-android-emulator/action.yml b/.github/actions/use-android-emulator/action.yml
index 898525ff51f2db..d7105bd6cab4ed 100644
--- a/.github/actions/use-android-emulator/action.yml
+++ b/.github/actions/use-android-emulator/action.yml
@@ -39,7 +39,7 @@ runs:
     - name: '💿 Setup Android Emulator #1'
       id: retries-1
       continue-on-error: true
-      uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2
+      uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
       with:
         api-level: ${{ inputs.avd-api }}
         avd-name: ${{ inputs.avd-name }}
@@ -62,7 +62,7 @@ runs:
       id: retries-2
       continue-on-error: true
       if: steps.retries-1.outcome == 'failure'
-      uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2
+      uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
       with:
         api-level: ${{ inputs.avd-api }}
         avd-name: ${{ inputs.avd-name }}
@@ -84,7 +84,7 @@ runs:
       id: retries-3
       # continue-on-error: true
       if: steps.retries-2.outcome == 'failure'
-      uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2
+      uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
       with:
         api-level: ${{ inputs.avd-api }}
         avd-name: ${{ inputs.avd-name }}
diff --git a/.github/workflows/android-instrumentation-tests.yml b/.github/workflows/android-instrumentation-tests.yml
index f28b91e2cdcebd..65ec163703525c 100644
--- a/.github/workflows/android-instrumentation-tests.yml
+++ b/.github/workflows/android-instrumentation-tests.yml
@@ -60,18 +60,18 @@ jobs:
       - name: 👀 Check out repository
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 🧹 Cleanup GitHub Linux runner disk space
         uses: ./.github/actions/cleanup-linux-disk-space
       - name: 🔨 Use JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/android-unit-tests.yml b/.github/workflows/android-unit-tests.yml
index 63ba32b650dc5c..d9f8a88bcb6aa9 100644
--- a/.github/workflows/android-unit-tests.yml
+++ b/.github/workflows/android-unit-tests.yml
@@ -37,18 +37,18 @@ jobs:
       - name: 👀 Check out repository
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 🧹 Cleanup GitHub Linux runner disk space
         uses: ./.github/actions/cleanup-linux-disk-space
       - name: 🔨 Use JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/bare-diffs.yml b/.github/workflows/bare-diffs.yml
index 27b8b71b9e0d77..40b9f56eca1a3b 100644
--- a/.github/workflows/bare-diffs.yml
+++ b/.github/workflows/bare-diffs.yml
@@ -14,13 +14,13 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/check-issues-nightly.yml b/.github/workflows/check-issues-nightly.yml
index feb2d438844d5d..ca0e6c5023d417 100644
--- a/.github/workflows/check-issues-nightly.yml
+++ b/.github/workflows/check-issues-nightly.yml
@@ -15,13 +15,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index bf18f2adfc506e..3354d8708764cc 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -71,18 +71,18 @@ jobs:
         if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
 
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
 
       - name: 🏗️ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
 
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: '1.x'
 
@@ -129,18 +129,18 @@ jobs:
         if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
 
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
 
       - name: 🏗️ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
 
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: '1.x'
 
@@ -173,18 +173,18 @@ jobs:
         if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
 
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
 
       - name: 🏗️ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
 
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: '1.x'
 
@@ -254,18 +254,18 @@ jobs:
         if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
 
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
 
       - name: 🏗️ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
 
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: '1.x'
 
diff --git a/.github/workflows/code-review.yml b/.github/workflows/code-review.yml
index bd61caefac3911..56df33607a7de5 100644
--- a/.github/workflows/code-review.yml
+++ b/.github/workflows/code-review.yml
@@ -29,13 +29,13 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
@@ -54,7 +54,7 @@ jobs:
       #     swift build -c release
       #     cp .build/release/swiftlint /usr/local/bin/
       # - name: 📦 Make an artifact
-      #   uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      #   uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       #   with:
       #     name: swiftlint
       #     path: SwiftLint/.build
diff --git a/.github/workflows/commentator.yml b/.github/workflows/commentator.yml
index 0fbedb6bea7d86..be30add108f767 100644
--- a/.github/workflows/commentator.yml
+++ b/.github/workflows/commentator.yml
@@ -17,13 +17,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/create-expo-app.yml b/.github/workflows/create-expo-app.yml
index 3f547d3d52ca36..a6b7366a907626 100644
--- a/.github/workflows/create-expo-app.yml
+++ b/.github/workflows/create-expo-app.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [20, 22]
+        node: [22, 24]
     steps:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
@@ -36,14 +36,14 @@ jobs:
         run: git fetch origin ${{ github.event.before || github.base_ref || 'main' }}:${{ github.event.before || github.base_ref || 'main' }} --depth 100
         if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node }}
           cache: 'pnpm'
diff --git a/.github/workflows/create-expo-module.yml b/.github/workflows/create-expo-module.yml
index e1aaea2f66180f..87677126415895 100644
--- a/.github/workflows/create-expo-module.yml
+++ b/.github/workflows/create-expo-module.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [20, 22]
+        node: [22, 24]
     steps:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
@@ -36,10 +36,10 @@ jobs:
         run: git fetch origin ${{ github.event.before || github.base_ref || 'main' }}:${{ github.event.before || github.base_ref || 'main' }} --depth 100
         if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node }}
           cache: 'pnpm'
diff --git a/.github/workflows/development-client-e2e.yml b/.github/workflows/development-client-e2e.yml
index 602ec27a5e1172..0299f34d242199 100644
--- a/.github/workflows/development-client-e2e.yml
+++ b/.github/workflows/development-client-e2e.yml
@@ -34,20 +34,20 @@ jobs:
           brew install applesimutils
           brew install watchman
       - name: 💎 Setup Ruby and install gems
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           bundler-cache: true
           ruby-version: 3.2.2
       - name: 💎 Install cocoapods
         run: sudo gem install cocoapods
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/development-client-latest-e2e.yml b/.github/workflows/development-client-latest-e2e.yml
index fd2d157850412b..a512dcd5eb88a5 100644
--- a/.github/workflows/development-client-latest-e2e.yml
+++ b/.github/workflows/development-client-latest-e2e.yml
@@ -27,25 +27,25 @@ jobs:
           brew install applesimutils
           brew install watchman
       - name: 💎 Setup Ruby and install gems
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           bundler-cache: true
           ruby-version: 3.2.2
       - name: 💎 Install cocoapods
         run: sudo gem install cocoapods
       - name: 🔨 Use JDK 11
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '11'
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/development-client.yml b/.github/workflows/development-client.yml
index 23e511e7978050..54aeb3ea1170ed 100644
--- a/.github/workflows/development-client.yml
+++ b/.github/workflows/development-client.yml
@@ -30,13 +30,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
@@ -94,13 +94,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/docs-pr-destroy.yml b/.github/workflows/docs-pr-destroy.yml
index 419070b83d909d..ab714d984250b8 100644
--- a/.github/workflows/docs-pr-destroy.yml
+++ b/.github/workflows/docs-pr-destroy.yml
@@ -15,14 +15,14 @@ concurrency:
 jobs:
   docs-pr-destroy:
     if: github.repository == 'expo/expo' &&
-        ((github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'preview')) ||
-         (github.event.action == 'unlabeled' && github.event.label.name == 'preview'))
+      ((github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'preview')) ||
+      (github.event.action == 'unlabeled' && github.event.label.name == 'preview'))
     runs-on: ubuntu-24.04
     steps:
       - name: 👀 Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 24
       - name: 🧹 Delete preview deployments
diff --git a/.github/workflows/docs-pr.yml b/.github/workflows/docs-pr.yml
index 5713f9755922be..c24d14be5fdc3e 100644
--- a/.github/workflows/docs-pr.yml
+++ b/.github/workflows/docs-pr.yml
@@ -26,15 +26,15 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: 👀 Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
           cache-dependency-path: docs/pnpm-lock.yaml
       - name: ♻️ Restore caches
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index b5aa1887093238..d87610444ffc25 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -25,17 +25,17 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: 👀 Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 30000
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/expo-go-android-lint.yml b/.github/workflows/expo-go-android-lint.yml
index f702d1c2ea1216..8629d05794cecc 100644
--- a/.github/workflows/expo-go-android-lint.yml
+++ b/.github/workflows/expo-go-android-lint.yml
@@ -29,18 +29,18 @@ jobs:
         with:
           submodules: true
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 🧹 Cleanup GitHub Linux runner disk space
         uses: ./.github/actions/cleanup-linux-disk-space
       - name: 🔨 Use JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/expotools.yml b/.github/workflows/expotools.yml
index 8ddc5efca04618..b5897b89e7bb84 100644
--- a/.github/workflows/expotools.yml
+++ b/.github/workflows/expotools.yml
@@ -23,13 +23,13 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/fingerprint.yml b/.github/workflows/fingerprint.yml
index ca487c22e33a9b..4aeafbfc142ac8 100644
--- a/.github/workflows/fingerprint.yml
+++ b/.github/workflows/fingerprint.yml
@@ -35,16 +35,16 @@ jobs:
         with:
           fetch-depth: 100
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 🚀 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: latest
       - name: ⬇️ Fetch commits from base branch
@@ -135,17 +135,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 📥 Download fingerprint (macos)
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: fingerprint-macos-latest
 
       - name: 📥 Download fingerprint (ubuntu)
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: fingerprint-ubuntu-latest
 
       - name: 📥 Download fingerprint (windows)
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: fingerprint-windows-latest
 
diff --git a/.github/workflows/ios-prebuild-external-xcframeworks.yml b/.github/workflows/ios-prebuild-external-xcframeworks.yml
index 9476f37bb82015..c3e5d6eeed593f 100644
--- a/.github/workflows/ios-prebuild-external-xcframeworks.yml
+++ b/.github/workflows/ios-prebuild-external-xcframeworks.yml
@@ -175,14 +175,14 @@ jobs:
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
 
       - name: Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
 
       - name: Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
 
       - name: Install node modules
@@ -219,7 +219,7 @@ jobs:
 
       - name: Authenticate to Google Cloud
         if: ${{ success() && (github.event.inputs.publish == 'true' || github.event_name == 'push') && github.repository == 'expo/expo' }}
-        uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3
+        uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
         with:
           project_id: exponentjs
           workload_identity_provider: projects/321830142373/locations/global/workloadIdentityPools/github/providers/expo
diff --git a/.github/workflows/ios-static-frameworks.yml b/.github/workflows/ios-static-frameworks.yml
index 78eb328c3f42f6..b78652a07f1f0d 100644
--- a/.github/workflows/ios-static-frameworks.yml
+++ b/.github/workflows/ios-static-frameworks.yml
@@ -24,19 +24,19 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 💎 Setup Ruby
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           ruby-version: 3.2.2
       - name: 💎 Install Ruby gems
         run: gem install cocoapods xcpretty
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/ios-unit-tests.yml b/.github/workflows/ios-unit-tests.yml
index 3617a2cb2329e3..cbc444c9514c37 100644
--- a/.github/workflows/ios-unit-tests.yml
+++ b/.github/workflows/ios-unit-tests.yml
@@ -47,7 +47,7 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 💎 Setup Ruby and install gems
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           bundler-cache: true
           ruby-version: 3.2.2
@@ -59,13 +59,13 @@ jobs:
           xcrun simctl shutdown all
           sudo xcodebuild -runFirstLaunch
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: Setup ccache
         uses: ./.github/actions/setup-ccache
diff --git a/.github/workflows/issue-closed.yml b/.github/workflows/issue-closed.yml
index 076bfb17f7ea0c..bf7f0934614bf6 100644
--- a/.github/workflows/issue-closed.yml
+++ b/.github/workflows/issue-closed.yml
@@ -14,13 +14,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/issue-opened.yml b/.github/workflows/issue-opened.yml
index a4ef525b2ecb51..f644c6c91a1c59 100644
--- a/.github/workflows/issue-opened.yml
+++ b/.github/workflows/issue-opened.yml
@@ -41,13 +41,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/issue-triage.yml b/.github/workflows/issue-triage.yml
index a335455cd2648d..496da36cbfd1b8 100644
--- a/.github/workflows/issue-triage.yml
+++ b/.github/workflows/issue-triage.yml
@@ -129,13 +129,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/native-component-list.yml b/.github/workflows/native-component-list.yml
index ea092fed92f242..8d8d5d5f5855a3 100644
--- a/.github/workflows/native-component-list.yml
+++ b/.github/workflows/native-component-list.yml
@@ -29,13 +29,13 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index cbfc09fe6cb5ce..78921c269a05ca 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -44,13 +44,13 @@ jobs:
         run: git fetch origin main:main --depth 100
         if: github.event_name == 'pull_request'
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
@@ -61,7 +61,7 @@ jobs:
           echo base-commit=$(git log -n 1 main --pretty=format:'%H' -- .github/workflows/pr-labeler.yml apps/bare-expo apps/test-suite packages pnpm-lock.yaml) >> "$GITHUB_OUTPUT"
       - name: 📷 Check fingerprint
         id: fingerprint
-        uses: expo/actions/fingerprint@d56a519244cfad3b09a73b4b485a1de7f44590cd # main
+        uses: expo/actions/fingerprint@150c682164cec02a2d43347b70906d234d33f575 # main
         with:
           working-directory: apps/bare-expo
           previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
diff --git a/.github/workflows/publish-canaries.yml b/.github/workflows/publish-canaries.yml
index 1f79d3cf4c588d..a210b51c6f9cb4 100644
--- a/.github/workflows/publish-canaries.yml
+++ b/.github/workflows/publish-canaries.yml
@@ -32,17 +32,17 @@ jobs:
       - name: 🔨 Add bin to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
           registry-url: https://registry.npmjs.org/
       - name: 🔨 Use JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/router.yml b/.github/workflows/router.yml
index ae910047d0f3bb..445b488b33281f 100644
--- a/.github/workflows/router.yml
+++ b/.github/workflows/router.yml
@@ -28,16 +28,16 @@ jobs:
         with:
           fetch-depth: 100
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: latest
       - name: 📦 Install dependencies
diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index 2207357e1dfff5..0feeb2fab8db66 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -49,15 +49,15 @@ jobs:
         run: git fetch origin ${{ github.base_ref || github.event.before || 'main' }}:${{ github.base_ref || github.event.before || 'main' }} --depth 100
         if: github.event_name == 'pull_request'
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: latest
       - name: 📦 Install dependencies
@@ -90,15 +90,15 @@ jobs:
         with:
           fetch-depth: 100
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: latest
       - name: 📦 Install dependencies
diff --git a/.github/workflows/swift-format.yml b/.github/workflows/swift-format.yml
index 6748f812d1e4f2..12b78a6fc1ccf6 100644
--- a/.github/workflows/swift-format.yml
+++ b/.github/workflows/swift-format.yml
@@ -52,7 +52,7 @@ jobs:
           echo "/opt/swift/usr/bin" >> "$GITHUB_PATH"
       - name: ♻️ Cache swift-format binary
         id: swift-format-cache
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.local/bin/swift-format
           key: swift-format-${{ runner.os }}-${{ env.SWIFT_FORMAT_VERSION }}
diff --git a/.github/workflows/test-react-native-nightly.yml b/.github/workflows/test-react-native-nightly.yml
index 160432ed4032c2..0625398cbccfa5 100644
--- a/.github/workflows/test-react-native-nightly.yml
+++ b/.github/workflows/test-react-native-nightly.yml
@@ -35,20 +35,20 @@ jobs:
         run: |
           brew install watchman || true
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🚀 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: latest
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
       - name: 💎 Setup Ruby
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           ruby-version: 3.2.2
       - name: 💎 Install Ruby gems
@@ -103,20 +103,20 @@ jobs:
       - name: 🧹 Cleanup GitHub Linux runner disk space
         uses: ./.github/actions/cleanup-linux-disk-space
       - name: 🏗️ Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🚀 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: latest
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
       - name: 🔨 Use JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/test-suite-lint.yml b/.github/workflows/test-suite-lint.yml
index 8946ddc60b2884..a29f2c336fc458 100644
--- a/.github/workflows/test-suite-lint.yml
+++ b/.github/workflows/test-suite-lint.yml
@@ -21,13 +21,13 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: ⬢ Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/.github/workflows/test-suite-macos.yml b/.github/workflows/test-suite-macos.yml
index 5581073557f1e9..c4b733cdec8a5e 100644
--- a/.github/workflows/test-suite-macos.yml
+++ b/.github/workflows/test-suite-macos.yml
@@ -64,18 +64,18 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 💎 Setup Ruby and install gems
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           bundler-cache: true
           ruby-version: 3.2.2
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/test-suite-nightly.yml b/.github/workflows/test-suite-nightly.yml
index 067914069e0832..c6646f691201ed 100644
--- a/.github/workflows/test-suite-nightly.yml
+++ b/.github/workflows/test-suite-nightly.yml
@@ -26,7 +26,7 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🔨 Switch to Xcode 26.4.1
@@ -37,18 +37,18 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 💎 Setup Ruby and install gems
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           bundler-cache: true
           ruby-version: 3.2.2
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
@@ -93,7 +93,7 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🔨 Switch to Xcode 26.4.1
@@ -101,7 +101,7 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🌠 Download builds
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: bare-expo-ios-builds
           path: apps/bare-expo/ios/build/BareExpo.app
@@ -117,13 +117,13 @@ jobs:
           curl -Ls "https://get.maestro.mobile.dev" | bash
           echo "${HOME}/.maestro/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
@@ -162,24 +162,24 @@ jobs:
       - name: 🧹 Cleanup GitHub Linux runner disk space
         uses: ./.github/actions/cleanup-linux-disk-space
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🔨 Use JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
@@ -223,11 +223,11 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🌠 Download builds
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: bare-expo-android-builds
           path: apps/bare-expo/android/app/build/outputs/apk
@@ -239,13 +239,13 @@ jobs:
           curl -Ls "https://get.maestro.mobile.dev" | MAESTRO_VERSION=2.4.0 bash
           echo "${HOME}/.maestro/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index d3bc0fe248d66c..15b257d6d2608b 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -146,7 +146,7 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🔨 Switch to Xcode 26.4.1
@@ -157,20 +157,20 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 💎 Setup Ruby and install gems
-        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
+        uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1.312.0
         with:
           bundler-cache: true
           ruby-version: 3.2.2
       - name: Setup ccache
         uses: ./.github/actions/setup-ccache
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
@@ -199,14 +199,14 @@ jobs:
           echo base-commit=$(git log -n 1 main --pretty=format:'%H' -- .github/workflows/test-suite.yml apps/bare-expo apps/test-suite packages pnpm-lock.yaml) >> "$GITHUB_OUTPUT"
       - name: 📹 Check fingerprint
         id: fingerprint
-        uses: expo/actions/fingerprint@d56a519244cfad3b09a73b4b485a1de7f44590cd # main
+        uses: expo/actions/fingerprint@150c682164cec02a2d43347b70906d234d33f575 # main
         with:
           working-directory: apps/bare-expo
           previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
           fingerprint-state-output-file: ${{ runner.temp }}/fingerprint-state.json
           fingerprint-db-cache-path: .fingerprint.db
       - name: 🏗️ Build/Repack iOS project (bare-expo)
-        uses: expo/actions/repack-app-artifact@d56a519244cfad3b09a73b4b485a1de7f44590cd # main
+        uses: expo/actions/repack-app-artifact@150c682164cec02a2d43347b70906d234d33f575 # main
         timeout-minutes: 55
         env:
           EXPO_DEBUG: 1
@@ -244,7 +244,7 @@ jobs:
       - name: 👀 Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🔨 Switch to Xcode 26.4.1
@@ -252,7 +252,7 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🌠 Download builds
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: bare-expo-ios-builds
           path: apps/bare-expo/ios/build/BareExpo.app
@@ -268,13 +268,13 @@ jobs:
           curl -Ls "https://get.maestro.mobile.dev" | bash
           echo "${HOME}/.maestro/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
@@ -353,11 +353,11 @@ jobs:
       - name: 🧹 Cleanup GitHub Linux runner disk space
         uses: ./.github/actions/cleanup-linux-disk-space
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🔨 Use JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -366,13 +366,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
@@ -401,14 +401,14 @@ jobs:
           echo base-commit=$(git log -n 1 main --pretty=format:'%H' -- .github/workflows/test-suite.yml apps/bare-expo apps/test-suite packages pnpm-lock.yaml) >> "$GITHUB_OUTPUT"
       - name: 📹 Check fingerprint
         id: fingerprint
-        uses: expo/actions/fingerprint@d56a519244cfad3b09a73b4b485a1de7f44590cd # main
+        uses: expo/actions/fingerprint@150c682164cec02a2d43347b70906d234d33f575 # main
         with:
           working-directory: apps/bare-expo
           previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
           fingerprint-state-output-file: ${{ runner.temp }}/fingerprint-state.json
           fingerprint-db-cache-path: .fingerprint.db
       - name: 🏗️ Build/Repack Android project (bare-expo)
-        uses: expo/actions/repack-app-artifact@d56a519244cfad3b09a73b4b485a1de7f44590cd # main
+        uses: expo/actions/repack-app-artifact@150c682164cec02a2d43347b70906d234d33f575 # main
         timeout-minutes: 35
         env:
           EXPO_DEBUG: 1
@@ -445,11 +445,11 @@ jobs:
       - name: 🧹 Cleanup GitHub Linux runner disk space
         uses: ./.github/actions/cleanup-linux-disk-space
       - name: 🏗️ Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.x
       - name: 🌠 Download builds
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: bare-expo-android-builds
           path: apps/bare-expo/android/app/build/outputs/apk/release
@@ -461,13 +461,13 @@ jobs:
           curl -Ls "https://get.maestro.mobile.dev" | MAESTRO_VERSION=2.4.0 bash
           echo "${HOME}/.maestro/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: ♻️ Restore caches
         uses: ./.github/actions/expo-caches
diff --git a/.github/workflows/validate-npm-owners.yml b/.github/workflows/validate-npm-owners.yml
index 78b31fc8aeb751..9bae3d469244e1 100644
--- a/.github/workflows/validate-npm-owners.yml
+++ b/.github/workflows/validate-npm-owners.yml
@@ -15,13 +15,13 @@ jobs:
       - name: ➕ Add `bin` to GITHUB_PATH
         run: echo "$(pwd)/bin" >> $GITHUB_PATH
       - name: 🔨 Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
         with:
           version: 10
       - name: 🔨 Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22
+          node-version: 24
           cache: 'pnpm'
       - name: 📦 Install dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
diff --git a/docs/pages/build/building-on-ci.mdx b/docs/pages/build/building-on-ci.mdx
index 554e66f0b4185f..8200e50774df3c 100644
--- a/docs/pages/build/building-on-ci.mdx
+++ b/docs/pages/build/building-on-ci.mdx
@@ -250,7 +250,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: npm
       - name: Setup Expo and EAS
         uses: expo/expo-github-action@v8
diff --git a/docs/pages/eas-update/github-actions.mdx b/docs/pages/eas-update/github-actions.mdx
index 58a6f2cf8792a6..c02a8ba4bd0b98 100644
--- a/docs/pages/eas-update/github-actions.mdx
+++ b/docs/pages/eas-update/github-actions.mdx
@@ -49,7 +49,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: yarn
 
       - name: Setup EAS
diff --git a/docs/scripts/append-dates.js b/docs/scripts/append-dates.js
index 4e0a112115fcfa..4209151c7ec7a6 100644
--- a/docs/scripts/append-dates.js
+++ b/docs/scripts/append-dates.js
@@ -27,7 +27,7 @@ async function appendModificationDate(dir = './pages') {
     const files = await readdir(dir, { recursive: true, withFileTypes: true });
     const mdxFiles = files
       .filter(file => !file.isDirectory() && file.name.endsWith('.mdx'))
-      .map(file => path.join(file.path, file.name));
+      .map(file => path.join(file.parentPath, file.name));
 
     // Process files in batches with limited concurrency
     for (let i = 0; i < mdxFiles.length; i += CONCURRENCY) {

From e701e30805cdf572546a19f4ba34a454e60ca213 Mon Sep 17 00:00:00 2001
From: Byron Karlen <byronkarlen@gmail.com>
Date: Thu, 11 Jun 2026 14:43:03 -0700
Subject: [PATCH 17/17] [expo-cli] Make browser-based login default (#46832)

# Why
Closes ENG-21850 , and gets expo-cli up-to-date with eas-cli:
https://github.com/expo/eas-cli/pull/3746

# How
Added a --no-browser option for parity with eas-cli, and for anyone that
wants to keep the current behavior. Made the --browser option the
default when in an interactive env.

# Test Plan
Run tests. Also verified happy-path manually.

<!--
Please describe how you tested this change and how a reviewer could
reproduce your test, especially if this PR does not include automated
tests! If possible, please also provide terminal output and/or
screenshots demonstrating your test/reproduction.
-->

# Checklist

<!--
Please check the appropriate items below if they apply to your diff.
-->

- [ ] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
---
 packages/@expo/cli/CHANGELOG.md               |  2 +
 .../@expo/cli/e2e/__tests__/login-test.ts     |  3 +-
 .../src/api/user/__tests__/actions-test.ts    | 54 +++++++++++++++++++
 packages/@expo/cli/src/api/user/actions.ts    |  7 ++-
 packages/@expo/cli/src/login/index.ts         |  8 ++-
 5 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/packages/@expo/cli/CHANGELOG.md b/packages/@expo/cli/CHANGELOG.md
index 0b4a5ec82f9e4f..c4d42b74ae4762 100644
--- a/packages/@expo/cli/CHANGELOG.md
+++ b/packages/@expo/cli/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### 🛠 Breaking changes
 
+- Make browser-based login the default for `expo login`. Use `--no-browser` (or pass `--username`/`--password`) for username/password login. Non-interactive environments such as CI continue to use username/password login. ([#46832](https://github.com/expo/expo/pull/46832) by [@byronkarlen](https://github.com/byronkarlen))
+
 ### 🎉 New features
 
 - Add option to specify targets to use with inline modules ([#46698](https://github.com/expo/expo/pull/46698) by [@HubertBer](https://github.com/HubertBer))
diff --git a/packages/@expo/cli/e2e/__tests__/login-test.ts b/packages/@expo/cli/e2e/__tests__/login-test.ts
index fadaa4bff9dc6b..bf20c1cc551cf9 100644
--- a/packages/@expo/cli/e2e/__tests__/login-test.ts
+++ b/packages/@expo/cli/e2e/__tests__/login-test.ts
@@ -41,7 +41,8 @@ it('runs `npx expo login --help`', async () => {
         -p, --password <string>  Password ("-" for stdin)
         --otp <string>           One-time password from your 2FA device
         -s, --sso                Log in with SSO
-        -b, --browser            Log in with a browser
+        -b, --browser            Log in with a browser (default)
+        --no-browser             Log in with username and password instead of a browser
         -h, --help               Usage info
     "
   `);
diff --git a/packages/@expo/cli/src/api/user/__tests__/actions-test.ts b/packages/@expo/cli/src/api/user/__tests__/actions-test.ts
index 6da55074bcab21..9cb98a560fcc21 100644
--- a/packages/@expo/cli/src/api/user/__tests__/actions-test.ts
+++ b/packages/@expo/cli/src/api/user/__tests__/actions-test.ts
@@ -1,3 +1,4 @@
+import { isInteractive } from '../../../utils/interactive';
 import { promptAsync } from '../../../utils/prompts';
 import { ApiV2Error } from '../../rest/client';
 import { showLoginPromptAsync } from '../actions';
@@ -5,6 +6,7 @@ import { retryUsernamePasswordAuthWithOTPAsync, UserSecondFactorDeviceMethod } f
 import { loginAsync, browserLoginAsync } from '../user';
 
 jest.mock('../../../log');
+jest.mock('../../../utils/interactive');
 jest.mock('../../../utils/prompts');
 jest.mock('../../rest/client', () => {
   const { ApiV2Error } = jest.requireActual('../../rest/client');
@@ -23,6 +25,10 @@ beforeEach(() => {
 
   jest.mocked(loginAsync).mockClear();
   jest.mocked(browserLoginAsync).mockClear();
+
+  // Default to a non-interactive environment so the credential prompt path is
+  // exercised unless a test opts into an interactive terminal.
+  jest.mocked(isInteractive).mockReturnValue(false);
 });
 
 describe(showLoginPromptAsync, () => {
@@ -118,4 +124,52 @@ describe(showLoginPromptAsync, () => {
     expect(browserLoginAsync).toHaveBeenCalledTimes(1);
     expect(browserLoginAsync).toHaveBeenCalledWith({ sso: false });
   });
+
+  it('defaults to browser login in an interactive terminal when browser is unset', async () => {
+    jest.mocked(isInteractive).mockReturnValue(true);
+
+    await showLoginPromptAsync();
+
+    expect(browserLoginAsync).toHaveBeenCalledTimes(1);
+    expect(browserLoginAsync).toHaveBeenCalledWith({ sso: false });
+    expect(loginAsync).not.toHaveBeenCalled();
+  });
+
+  it('falls back to username/password login in a non-interactive environment', async () => {
+    jest.mocked(isInteractive).mockReturnValue(false);
+    jest
+      .mocked(promptAsync)
+      .mockReset()
+      .mockImplementationOnce(async () => ({ username: 'USERNAME', password: 'PASSWORD' }));
+    jest.mocked(loginAsync).mockImplementation(async () => {});
+
+    await showLoginPromptAsync();
+
+    expect(loginAsync).toHaveBeenCalledTimes(1);
+    expect(browserLoginAsync).not.toHaveBeenCalled();
+  });
+
+  it('uses username/password login when credentials are provided, even in an interactive terminal', async () => {
+    jest.mocked(isInteractive).mockReturnValue(true);
+    jest.mocked(loginAsync).mockImplementation(async () => {});
+
+    await showLoginPromptAsync({ username: 'hello', password: 'world' });
+
+    expect(loginAsync).toHaveBeenCalledTimes(1);
+    expect(browserLoginAsync).not.toHaveBeenCalled();
+  });
+
+  it('uses username/password login when browser is explicitly false', async () => {
+    jest.mocked(isInteractive).mockReturnValue(true);
+    jest
+      .mocked(promptAsync)
+      .mockReset()
+      .mockImplementationOnce(async () => ({ username: 'USERNAME', password: 'PASSWORD' }));
+    jest.mocked(loginAsync).mockImplementation(async () => {});
+
+    await showLoginPromptAsync({ browser: false });
+
+    expect(loginAsync).toHaveBeenCalledTimes(1);
+    expect(browserLoginAsync).not.toHaveBeenCalled();
+  });
 });
diff --git a/packages/@expo/cli/src/api/user/actions.ts b/packages/@expo/cli/src/api/user/actions.ts
index f7622493e9c2c9..fdc798e0e54b16 100644
--- a/packages/@expo/cli/src/api/user/actions.ts
+++ b/packages/@expo/cli/src/api/user/actions.ts
@@ -31,7 +31,9 @@ export async function showLoginPromptAsync({
   }
   const hasCredentials = options.username && options.password;
   const sso = options.sso;
-  const browser = options.browser;
+
+  // Browser-based login is the default.
+  const browser = options.browser ?? (!hasCredentials && isInteractive());
 
   if (printNewLine) {
     Log.log();
@@ -39,6 +41,7 @@ export async function showLoginPromptAsync({
 
   if (sso || browser) {
     await browserLoginAsync({ sso: !!sso });
+    Log.log('Logged in');
     return;
   }
 
@@ -94,6 +97,8 @@ export async function showLoginPromptAsync({
       throw e;
     }
   }
+
+  Log.log('Logged in');
 }
 
 export async function tryGetUserAsync(): Promise<Actor | null> {
diff --git a/packages/@expo/cli/src/login/index.ts b/packages/@expo/cli/src/login/index.ts
index 348252282bb768..4220968beb190d 100644
--- a/packages/@expo/cli/src/login/index.ts
+++ b/packages/@expo/cli/src/login/index.ts
@@ -13,6 +13,7 @@ export const expoLogin: Command = async (argv) => {
       '--otp': String,
       '--sso': Boolean,
       '--browser': Boolean,
+      '--no-browser': Boolean,
       // Aliases
       '-h': '--help',
       '-u': '--username',
@@ -32,7 +33,8 @@ export const expoLogin: Command = async (argv) => {
         `-p, --password <string>  Password ("-" for stdin)`,
         `--otp <string>           One-time password from your 2FA device`,
         `-s, --sso                Log in with SSO`,
-        `-b, --browser            Log in with a browser`,
+        `-b, --browser            Log in with a browser (default)`,
+        `--no-browser             Log in with username and password instead of a browser`,
         `-h, --help               Usage info`,
       ].join('\n')
     );
@@ -40,6 +42,8 @@ export const expoLogin: Command = async (argv) => {
 
   const password = args['--password'] === '-' ? await readWordFromStdin() : args['--password'];
 
+  const browser = args['--no-browser'] ? false : args['--browser'] ? true : undefined;
+
   const { showLoginPromptAsync } = await import('../api/user/actions.js');
   return showLoginPromptAsync({
     // Parsed options
@@ -47,7 +51,7 @@ export const expoLogin: Command = async (argv) => {
     password,
     otp: args['--otp'],
     sso: !!args['--sso'],
-    browser: !!args['--browser'],
+    browser,
   }).catch(logCmdError);
 };