diff --git a/.agents/skills/ts-js-validation/SKILL.md b/.agents/skills/ts-js-validation/SKILL.md
index 5d027553f4..2ae92d2abf 100644
--- a/.agents/skills/ts-js-validation/SKILL.md
+++ b/.agents/skills/ts-js-validation/SKILL.md
@@ -1,22 +1,22 @@
 ---
 name: ts-js-validation
-description: Validate TypeScript and JavaScript changes in React Native Firebase by running the root prepare, TypeScript compile, API reference, Jest, formatting, and compare-types scripts. Use when a developer updates TS/JS code and wants the standard RNFB validation pass before handing off or committing.
+description: Validate React Native Firebase changes by running the CI-equivalent prepare, TypeScript, lint, Jest, formatting, and compare-types scripts. Use before handoff, commit, or push when package sources, native bridge code, or docs changed.
 metadata:
   owner_team: react-native-firebase
   maintainer: russell.wheatley
   status: draft
   tags: typescript,javascript,testing,validation,formatting,react-native-firebase
-  last_reviewed: "2026-05-08"
-  version: "0.1.0"
+  last_reviewed: "2026-07-06"
+  version: "0.2.0"
 ---
 
 # React Native Firebase TS/JS Validation
 
 ## Scope
 
-Use this skill to validate changes to TypeScript or JavaScript code in the React Native Firebase monorepo.
+Use this skill to validate changes in the React Native Firebase monorepo before handoff, commit, or push.
 
-It is for developer-facing validation after editing package JS/TS sources, type tests, Jest tests, or shared TypeScript configuration. It runs the standard root validation commands that catch generated package setup issues, TypeScript errors, consumer type regressions, API reference regressions, Jest failures, formatting drift, and firebase-js-sdk type parity drift.
+It runs the same static-analysis and compile/test commands CI uses for the Lint, TypeScript, Jest, docs, and compare-types jobs — not a narrowed JS-only subset.
 
 ## Triggers
 
@@ -24,27 +24,23 @@ Use this skill when the user asks for:
 
 - testing TS or JS changes
 - validating TypeScript or JavaScript edits before commit or handoff
-- running the standard JS validation pass for RNFB
-- checking whether package JS/TS changes compile and pass Jest
-- formatting package JS/TS code and then running validation
+- running the standard validation pass for RNFB
+- checking whether package changes compile and pass Jest
+- formatting and linting before push
+- CI-equivalent validation before publication
 
 ## Out-of-scope boundaries
 
 Do not use this skill for:
 
-- Android Java/Kotlin formatting or build validation
-- iOS Objective-C, Objective-C++, C++, Swift, or pod validation
-- documentation-only changes that do not affect JS/TS behavior
-- release validation that requires the full platform, emulator, Detox, or packaging matrix
+- release validation that requires the full platform, emulator, Detox, or packaging matrix (see [validation checklist § e2e](../../../okf-bundle/testing/validation-checklist.md))
 - migrating a package from JavaScript to TypeScript; use the TypeScript refactor or migration skills instead
 
 ## Defaults
 
-Set one clear default path so the agent does not choose randomly between options.
-
 - Default tool or method: run the canonical command sequence below from the repository root
-- Fallback when default fails: if a command fails, stop the sequence, inspect the failure, fix issues only when the user asked for fixes or the fix is clearly in the current change set, then rerun the failed command and any later commands
-- Why this default exists: `lerna:prepare`, both TypeScript compiles, API reference generation, Jest, formatting, and compare-types cover the JS/TS surfaces most likely to regress in this monorepo
+- Fallback when default fails: stop, inspect the failure, fix issues in the current change set when authorized, then rerun the failed command and any later commands
+- Why this default exists: the sequence mirrors CI Lint + TypeScript + Jest + docs + compare-types gates
 
 ## Command sequence
 
@@ -54,43 +50,42 @@ Run these root `package.json` scripts in order. **Canonical checklist:** [valida
 2. `yarn tsc:compile`
 3. `yarn tsc:compile:consumer`
 4. `yarn reference:api`
-5. `yarn lint:js` (use `yarn lint:js --fix` then re-run until clean)
-6. `yarn tests:jest`
-7. `yarn format:js`
-8. `yarn compare:types`
+5. `yarn lint` — **CI Lint job** (`lint:js` + `lint:android` + `lint:ios:check`). When `lint:android` reformats Java, commit the formatter output and rerun until exit 0.
+6. When `docs/**` changed: `yarn lint:markdown` then `yarn lint:spellcheck` — **CI docs job**
+7. `yarn lint:js --fix` then `yarn lint:js` when step 5 reported ESLint issues only (optional shortcut before re-running full `yarn lint`)
+8. `yarn tests:jest`
+9. `yarn format:js` — inspect diff; rerun `yarn lint` if formatting touched files
+10. `yarn compare:types`
 
 ## Gotchas
 
 - **Forbidden:** `yarn workspace … prepare`, `cd packages/<pkg> && yarn prepare/build`, `yarn jet`, `npx jet` — see [agent command policy](../../../okf-bundle/testing/agent-command-policy.md). On failure, fix product code and re-run the **same** canonical command.
+- **`yarn lint` is not optional** when native Java or iOS sources are in the diff — `lint:js` alone does not match CI.
+- **`yarn lint:spellcheck` is not optional** when `docs/**` is in the diff — `lint:markdown` alone does not match CI.
 - `yarn format:js` writes changes across `packages/**/*.{js,ts,tsx}`. Check the diff after formatting and do not revert user changes.
 - Run commands from the repository root so workspace resolution, root `tsconfig.json`, and Jest configuration are consistent.
 - `yarn lerna:prepare` may rebuild or refresh package artifacts needed before TypeScript or tests run.
-- `yarn tsc:compile` checks the repository TypeScript project, while `yarn tsc:compile:consumer` checks the consumer-facing TypeScript project. Run both.
-- `yarn reference:api` runs TypeDoc and should come after consumer TypeScript compilation.
-- `yarn tests:jest` is the root Jest entrypoint. If it fails, report the failing test file or suite and the first actionable error rather than dumping the full output.
 - `yarn compare:types` installs dependencies under `.github/scripts/compare-types` before running the type parity comparison. Keep it last.
-- If validation is slow, keep the command running rather than replacing it with a narrower command unless the user explicitly asks for targeted validation.
+- If validation is slow, keep the command running rather than replacing it with a narrower command unless the user explicitly narrows validation.
 
 ## Workflow
 
-1. Confirm the task is TS/JS validation and note any specific changed package or test files the user mentioned.
+1. Confirm the task scope and note changed packages, native paths, or docs.
 2. Check whether the worktree has unrelated dirty files if the current task includes code edits or commit preparation.
 3. Run the command sequence from the repository root.
-4. If `yarn format:js` changes files, include those formatting changes in the validation context and inspect the relevant diff before continuing.
+4. If `yarn lint:android` or `yarn format:js` changes files, include those changes and rerun `yarn lint` before continuing.
 5. If a command fails:
    - stop before running later commands
-   - identify whether the failure belongs to the current TS/JS changes, pre-existing repo state, or missing local setup
+   - identify whether the failure belongs to the current changes, pre-existing repo state, or missing local setup
    - fix current-change failures when authorized, then rerun the failed command and continue the remaining sequence
 6. Return a concise result with the commands run, pass/fail status, and any remaining blockers.
 
 ## Validation loop
 
-Use this loop before finalizing:
-
 1. Run the command sequence.
-2. If validation fails because of current TS/JS changes and fixing is in scope, fix the issue and rerun the failed command plus all later commands.
+2. If validation fails because of current changes and fixing is in scope, fix the issue and rerun the failed command plus all later commands.
 3. If validation fails for unrelated or environment-specific reasons, stop and report the blocker with the command that failed and the shortest useful error summary.
-4. Only report success when every command in the sequence completes successfully.
+4. Only report success when every applicable command in the sequence completes successfully.
 
 ## Output format
 
@@ -108,7 +103,9 @@ Use this template:
 - `yarn tsc:compile`: passed | failed | not run
 - `yarn tsc:compile:consumer`: passed | failed | not run
 - `yarn reference:api`: passed | failed | not run
-- `yarn lint:js`: passed | failed | not run
+- `yarn lint`: passed | failed | not run
+- `yarn lint:markdown`: passed | failed | not run | n/a
+- `yarn lint:spellcheck`: passed | failed | not run | n/a
 - `yarn tests:jest`: passed | failed | not run
 - `yarn format:js`: passed | failed | changed files
 - `yarn compare:types`: passed | failed | not run
@@ -123,7 +120,7 @@ Use this template:
 ## Constraints
 
 - Keep responses factual and grounded in command output.
-- Do not skip any command in the default sequence unless the user explicitly narrows validation.
+- Do not skip `yarn lint` or docs lint rows when the diff requires them.
 - Do not claim validation passed unless `compare:types` ran after any formatting changes.
 - Do not revert unrelated local changes.
 - Avoid broad refactors while fixing validation failures.
@@ -132,6 +129,6 @@ Use this template:
 
 Load files only when needed:
 
-- **`okf-bundle/testing/validation-checklist.md`** — full validation command list including e2e, coverage, and doc lints
+- **`okf-bundle/testing/validation-checklist.md`** — full validation command list including e2e, coverage, and CI job mapping
 - Read `package.json` if command names or script definitions need to be confirmed.
-- Read affected package `package.json`, `type-test.ts`, or nearby `__tests__/` files only when a failure needs package-specific diagnosis.
+- Read affected package `type-test.ts` or nearby `__tests__/` files only when a failure needs package-specific diagnosis.
diff --git a/.github/scripts/compare-types/README.md b/.github/scripts/compare-types/README.md
index fbe85e0106..4af0303ca6 100644
--- a/.github/scripts/compare-types/README.md
+++ b/.github/scripts/compare-types/README.md
@@ -15,6 +15,18 @@ Every difference must have an entry in the package's `configs/<package-name>.ts`
 - A difference is **undocumented** — add it to `configs/<package-name>.ts` with a reason, or fix the RN Firebase types to match.
 - A config entry is **stale** — the API now matches the firebase-js-sdk, so the entry should be removed from `configs/<package-name>.ts`.
 
+<a id="justification-bar"></a>
+
+### Justification bar
+
+A documented difference is not a free pass. Every `missingInRN`, `extraInRN`, and `differentShape` entry must clear one of the OKF change-authoring [acceptable exceptions](../../../okf-bundle/testing/change-authoring-workflow.md#acceptable-exceptions): an evidence-backed **intractable technical reason** (platform SDK, native bridge, Hermes/Metro, or toolchain limitation), **or** a **user-accepted deferral** with a documented rationale (e.g. an alignment that needs architectural review). Both require the user's explicit acceptance — convenience, "harmless", or optional-parameter drift never qualifies on its own:
+
+- **`missingInRN`** — an export we simply have not built yet is a backlog item, not a documented difference; only keep it here when it clears an acceptable exception.
+- **`extraInRN`** — an RN-only export, overload, or parameter is **drift, not a feature**. If firebase-js-sdk does not expose it and no acceptable exception applies, remove it rather than documenting it.
+- **`differentShape`** — align the RN Firebase types to firebase-js-sdk and remove the entry unless the shape difference is forced by an intractable reason (e.g. a native module that can only resolve `Promise<null>`) or a user-accepted deferral.
+
+When implementing a `missingInRN` export, do not introduce new `extraInRN` / `differentShape` drift that would not itself clear an acceptable exception.
+
 ## Prerequisites
 
 The root repository dependencies must be installed because the script reads the Firebase JS SDK types from the installed root `node_modules/firebase` package.
diff --git a/.github/scripts/compare-types/configs/analytics.ts b/.github/scripts/compare-types/configs/analytics.ts
index a6d1069323..d03f0195fa 100644
--- a/.github/scripts/compare-types/configs/analytics.ts
+++ b/.github/scripts/compare-types/configs/analytics.ts
@@ -103,8 +103,9 @@ const config: PackageConfig = {
     {
       name: 'logEvent',
       reason:
-        'RN Firebase `logEvent` returns `Promise<void>` and RN overloads omit the web `[key: string]: any` index signature on event params. ' +
-        'Phase S hint: **Promise that could maybe sync-void+queue** (ordered native fire-and-forget; see PS-S2-gap).',
+        'Return type aligned to firebase-js-sdk sync `void` (Phase B). Remaining drift is ' +
+        'cosmetic: firebase-js-sdk overloads include `[key: string]: any` index signatures and ' +
+        'slightly different property ordering on typed event params; behaviour is equivalent.',
     },
     {
       name: 'setAnalyticsCollectionEnabled',
diff --git a/.github/scripts/compare-types/configs/app-check.ts b/.github/scripts/compare-types/configs/app-check.ts
index 30f702ba3b..8e89adb1fc 100644
--- a/.github/scripts/compare-types/configs/app-check.ts
+++ b/.github/scripts/compare-types/configs/app-check.ts
@@ -12,11 +12,6 @@ import type { PackageConfig } from '../src/types';
 const config: PackageConfig = {
   nameMapping: {},
   missingInRN: [
-    {
-      name: 'AppCheckTokenListener',
-      reason:
-        'RN Firebase exposes token change listeners through the `onTokenChanged` overloads but does not export the standalone listener type alias from the firebase-js-sdk.',
-    },
     {
       name: 'PartialObserver',
       reason:
@@ -86,12 +81,6 @@ const config: PackageConfig = {
     },
   ],
   differentShape: [
-    {
-      name: 'initializeAppCheck',
-      reason:
-        'RN Firebase returns `Promise<AppCheck>` whereas the firebase-js-sdk returns `AppCheck` synchronously. ' +
-        'Phase S hint: **Promise that could maybe sync-void+queue** after provider/refresh state is installed synchronously (see PS-S2-gap).',
-    },
     {
       name: 'AppCheckOptions',
       reason:
diff --git a/.github/scripts/compare-types/configs/firestore-pipelines.ts b/.github/scripts/compare-types/configs/firestore-pipelines.ts
index 9e97c7bc91..b1e5448620 100644
--- a/.github/scripts/compare-types/configs/firestore-pipelines.ts
+++ b/.github/scripts/compare-types/configs/firestore-pipelines.ts
@@ -21,75 +21,9 @@ import type { PackageConfig } from '../src/types';
 
 const config: PackageConfig = {
   nameMapping: {},
-  missingInRN: [
-    {
-      name: 'documentMatches',
-      reason:
-        'Newer firebase-js-sdk document expression helper not yet exposed by RN Firebase pipelines.',
-    },
-    {
-      name: 'geoDistance',
-      reason:
-        'Newer firebase-js-sdk geospatial expression helper not yet exposed by RN Firebase pipelines.',
-    },
-    {
-      name: 'score',
-      reason:
-        'Newer firebase-js-sdk search score expression helper not yet exposed by RN Firebase pipelines.',
-    },
-    {
-      name: 'DefineStageOptions',
-      reason: 'Newer firebase-js-sdk stage options type not yet exposed by RN Firebase pipelines.',
-    },
-    {
-      name: 'parent',
-      reason: 'Newer firebase-js-sdk parent stage helper not yet exposed by RN Firebase pipelines.',
-    },
-    {
-      name: 'SearchStageOptions',
-      reason:
-        'Newer firebase-js-sdk search stage options type not yet exposed by RN Firebase pipelines.',
-    },
-  ],
-  extraInRN: [
-    {
-      name: 'Type',
-      reason:
-        'RN Firebase exposes a local type discriminator alias for pipeline expression helpers.',
-    },
-  ],
-  differentShape: [
-    {
-      name: 'constant',
-      reason:
-        'firebase-js-sdk added an optional `preferIntegers` option to pipeline constant expressions; not yet exposed by RN Firebase pipelines.',
-    },
-    {
-      name: 'isType',
-      reason:
-        'RN Firebase accepts its local `Type` alias where the firebase-js-sdk declaration accepts a string.',
-    },
-    {
-      name: 'ExpressionType',
-      reason:
-        'Declaration member ordering differs from the firebase-js-sdk file, but the same expression kinds are supported (including `PipelineValue`).',
-    },
-    {
-      name: 'StageOptions',
-      reason:
-        'Declaration formatting differs for the raw options object, but the public shape is equivalent.',
-    },
-    {
-      name: 'TimeGranularity',
-      reason:
-        'RN Firebase uses the existing `isoWeek` and `isoYear` casing while the firebase-js-sdk declaration includes lowercase variants.',
-    },
-    {
-      name: 'timestampDiff',
-      reason:
-        'Declaration overload ordering differs from the firebase-js-sdk file, but all four end/start field and expression combinations are supported.',
-    },
-  ],
+  missingInRN: [],
+  extraInRN: [],
+  differentShape: [],
 };
 
 export default config;
diff --git a/.github/scripts/compare-types/configs/firestore.ts b/.github/scripts/compare-types/configs/firestore.ts
index 9e365659c9..361c378230 100644
--- a/.github/scripts/compare-types/configs/firestore.ts
+++ b/.github/scripts/compare-types/configs/firestore.ts
@@ -26,23 +26,12 @@ const config: PackageConfig = {
   // ---------------------------------------------------------------------------
   missingInRN: [
     // --- Functions ---
-    {
-      name: 'aggregateFieldEqual',
-      reason:
-        'Equality comparison helper for AggregateField instances. Not yet ' +
-        'implemented in RN Firebase.',
-    },
-    {
-      name: 'aggregateQuerySnapshotEqual',
-      reason:
-        'Equality comparison helper for AggregateQuerySnapshot instances. Not ' +
-        'yet implemented in RN Firebase.',
-    },
     {
       name: 'documentSnapshotFromJSON',
       reason:
-        'Deserialises a DocumentSnapshot from a JSON representation. Part of ' +
-        'the firebase-js-sdk serialization API not yet available in RN Firebase.',
+        'firebase-js-sdk reconstructs web SDK snapshot wrappers from JSON. RN Firebase ' +
+        'snapshots are native-backed wrappers, and the Android/iOS Firestore SDKs do not ' +
+        'expose cross-platform DocumentSnapshot JSON constructors.',
     },
     {
       name: 'enableIndexedDbPersistence',
@@ -60,45 +49,54 @@ const config: PackageConfig = {
     {
       name: 'maximum',
       reason:
-        'Aggregate field helper added in firebase-js-sdk; not yet implemented in RN Firebase.',
+        'FieldValue set/update sentinel (`maximum(n: number)`) exported by firebase-js-sdk ' +
+        '12.15.0. Firebase Firestore iOS SDK 12.15.0 does not expose FIRFieldValue ' +
+        'maximum/minimum factories (see Firebase iOS FIRFieldValue reference). Firebase ' +
+        'Firestore Android SDK 34.15.0 (BOM) exposes FieldValue.maximum/minimum but RN ' +
+        'Firebase native serialization does not wire them; cross-platform parity deferred ' +
+        'until iOS SDK adds support. User-accepted gap (C1.2b).',
     },
     {
       name: 'memoryEagerGarbageCollector',
       reason:
-        'Factory for the memory eager garbage collector used with memoryLocalCache. ' +
-        'The local cache configuration API is not yet implemented in RN Firebase; ' +
-        'persistence is controlled via native platform settings.',
+        'Web local-cache component factory for memoryLocalCache. RN Firebase delegates ' +
+        'persistence to the native Firestore SDKs, which do not expose the firebase-js-sdk ' +
+        'LocalCache/GarbageCollector component model.',
     },
     {
       name: 'memoryLocalCache',
       reason:
-        'Factory for an in-memory local cache instance. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web local-cache factory. React Native targets use the native Firestore SDK cache ' +
+        'configured through RN Firebase settings, not firebase-js-sdk LocalCache instances.',
     },
     {
       name: 'memoryLruGarbageCollector',
       reason:
-        'Factory for the memory LRU garbage collector used with memoryLocalCache. ' +
-        'The local cache configuration API is not yet implemented in RN Firebase.',
+        'Web local-cache component factory for memoryLocalCache. Native Firestore SDK cache ' +
+        'configuration does not expose a firebase-js-sdk MemoryLruGarbageCollector object.',
     },
     {
       name: 'minimum',
       reason:
-        'Aggregate field helper added in firebase-js-sdk; not yet implemented in RN Firebase.',
+        'FieldValue set/update sentinel (`minimum(n: number)`) exported by firebase-js-sdk ' +
+        '12.15.0. Firebase Firestore iOS SDK 12.15.0 does not expose FIRFieldValue ' +
+        'maximum/minimum factories (see Firebase iOS FIRFieldValue reference). Firebase ' +
+        'Firestore Android SDK 34.15.0 (BOM) exposes FieldValue.maximum/minimum but RN ' +
+        'Firebase native serialization does not wire them; cross-platform parity deferred ' +
+        'until iOS SDK adds support. User-accepted gap (C1.2b).',
     },
     {
       name: 'onSnapshotResume',
       reason:
-        'Resumes a snapshot listener from a previously-serialized resume token. ' +
-        'Part of the firebase-js-sdk snapshot serialization API not yet available ' +
-        'in RN Firebase.',
+        'firebase-js-sdk web snapshot resume API depends on serialized web SDK listener ' +
+        'state. RN Firebase listeners are backed by Android/iOS SDK listener state, and ' +
+        'those SDKs do not expose a compatible public resume-token constructor.',
     },
     {
       name: 'persistentLocalCache',
       reason:
-        'Factory for a persistent local cache instance. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase; persistence ' +
-        'is controlled via native platform settings.',
+        'Web persistent local-cache factory. RN Firebase uses native Firestore persistence ' +
+        'settings instead of firebase-js-sdk PersistentLocalCache component instances.',
     },
     {
       name: 'persistentMultipleTabManager',
@@ -109,20 +107,22 @@ const config: PackageConfig = {
     {
       name: 'persistentSingleTabManager',
       reason:
-        'Factory for the persistent single-tab manager. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web tab-manager factory for persistentLocalCache. React Native has no ' +
+        'firebase-js-sdk tab-manager component path; native persistence is controlled by ' +
+        'platform SDK settings.',
     },
     {
       name: 'querySnapshotFromJSON',
       reason:
-        'Deserialises a QuerySnapshot from a JSON representation. Part of ' +
-        'the firebase-js-sdk serialization API not yet available in RN Firebase.',
+        'firebase-js-sdk reconstructs web SDK query snapshot wrappers from JSON. RN Firebase ' +
+        'query snapshots are native-backed wrappers, and the Android/iOS Firestore SDKs do ' +
+        'not expose cross-platform QuerySnapshot JSON constructors.',
     },
     {
       name: 'setIndexConfiguration',
       reason:
-        'Configures Firestore indexes from a JSON or Protobuf configuration. ' +
-        'Deprecated in the firebase-js-sdk. Not implemented in RN Firebase.',
+        'Deprecated in firebase-js-sdk; React Native Firebase will not implement. Native ' +
+        'Firestore SDKs do not expose the web JSON/Protobuf index configuration API.',
     },
 
     // --- Types / Interfaces ---
@@ -135,44 +135,44 @@ const config: PackageConfig = {
     {
       name: 'Index',
       reason:
-        'Type used with setIndexConfiguration. Not implemented in RN Firebase ' +
-        'as setIndexConfiguration is not supported.',
+        'Deprecated firebase-js-sdk type used only by setIndexConfiguration. React Native ' +
+        'Firebase will not implement that web index configuration API.',
     },
     {
       name: 'IndexConfiguration',
       reason:
-        'Type used with setIndexConfiguration. Not implemented in RN Firebase ' +
-        'as setIndexConfiguration is not supported.',
+        'Deprecated firebase-js-sdk type used only by setIndexConfiguration. React Native ' +
+        'Firebase will not implement that web index configuration API.',
     },
     {
       name: 'IndexField',
       reason:
-        'Type used with setIndexConfiguration. Not implemented in RN Firebase ' +
-        'as setIndexConfiguration is not supported.',
+        'Deprecated firebase-js-sdk type used only by setIndexConfiguration. React Native ' +
+        'Firebase will not implement that web index configuration API.',
     },
     {
       name: 'MemoryCacheSettings',
       reason:
-        'Configuration interface for the memory local cache. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web memory local-cache configuration interface. RN Firebase exposes native ' +
+        'Firestore persistence/cache settings rather than firebase-js-sdk LocalCache objects.',
     },
     {
       name: 'MemoryEagerGarbageCollector',
       reason:
-        'Interface for the memory eager garbage collector. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web memory local-cache garbage-collector interface. Native Firestore SDK cache ' +
+        'configuration does not expose this firebase-js-sdk component model.',
     },
     {
       name: 'MemoryGarbageCollector',
       reason:
-        'Base interface for memory garbage collector strategies. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web memory local-cache garbage-collector base interface. Native Firestore SDK cache ' +
+        'configuration does not expose this firebase-js-sdk component model.',
     },
     {
       name: 'MemoryLruGarbageCollector',
       reason:
-        'Interface for the memory LRU garbage collector. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web memory local-cache LRU garbage-collector interface. Native Firestore SDK cache ' +
+        'configuration does not expose this firebase-js-sdk component model.',
     },
     {
       name: 'PersistentCacheIndexManager',
@@ -183,8 +183,8 @@ const config: PackageConfig = {
     {
       name: 'PersistentCacheSettings',
       reason:
-        'Configuration interface for the persistent local cache. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web persistent local-cache configuration interface. RN Firebase uses native ' +
+        'Firestore persistence settings instead of firebase-js-sdk PersistentLocalCache objects.',
     },
     {
       name: 'PersistentMultipleTabManager',
@@ -195,26 +195,21 @@ const config: PackageConfig = {
     {
       name: 'PersistentSingleTabManager',
       reason:
-        'Interface for the persistent single-tab manager. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
+        'Web persistent-cache tab-manager interface. React Native has no firebase-js-sdk ' +
+        'single-tab manager path; native persistence is controlled by platform SDK settings.',
     },
     {
       name: 'PersistentSingleTabManagerSettings',
       reason:
-        'Configuration interface for the persistent single-tab manager. The local ' +
-        'cache configuration API is not yet implemented in RN Firebase.',
+        'Web persistent-cache single-tab manager settings. React Native has no ' +
+        'firebase-js-sdk tab-manager component path.',
     },
     {
       name: 'PersistentTabManager',
       reason:
-        'Base interface for persistent tab manager strategies. The local cache ' +
-        'configuration API is not yet implemented in RN Firebase.',
-    },
-    {
-      name: 'TransactionOptions',
-      reason:
-        'Options object for runTransaction (e.g. maxAttempts). Not yet supported ' +
-        'by the RN Firebase native transaction implementation.',
+        'Web persistent-cache tab-manager base interface. React Native has no ' +
+        'firebase-js-sdk tab-manager component path; native persistence is controlled by ' +
+        'platform SDK settings.',
     },
   ],
 
@@ -273,40 +268,22 @@ const config: PackageConfig = {
       name: 'deleteAllPersistentCacheIndexes',
       reason:
         'Returns `Promise<void>` in RN Firebase vs `void` in the firebase-js-sdk. ' +
-        'Phase S hint: **keep-async: deferred persistent-cache IO** (web void schedules disk/index work; see PS-S2-gap).',
+        'RN Firebase delegates persistent-cache index deletion to native SDK IO and exposes ' +
+        'completion/failure through the returned Promise; the web SDK starts the operation and returns void.',
     },
     {
       name: 'disablePersistentCacheIndexAutoCreation',
       reason:
         'Returns `Promise<void>` in RN Firebase vs `void` in the firebase-js-sdk. ' +
-        'Phase S hint: **keep-async: deferred persistent-cache IO** (see PS-S2-gap).',
+        'RN Firebase delegates persistent-cache index state to native SDK IO and exposes ' +
+        'completion/failure through the returned Promise; the web SDK starts the operation and returns void.',
     },
     {
       name: 'enablePersistentCacheIndexAutoCreation',
       reason:
         'Returns `Promise<void>` in RN Firebase vs `void` in the firebase-js-sdk. ' +
-        'Phase S hint: **keep-async: deferred persistent-cache IO** (see PS-S2-gap).',
-    },
-    {
-      name: 'initializeFirestore',
-      reason:
-        'Returns `Promise<Firestore>` in RN Firebase vs `Firestore` in the firebase-js-sdk. ' +
-        'Phase S hint: **Promise that could maybe sync-void+gate** (in-memory settings visible before return; see PS-S2-gap).',
-    },
-    {
-      name: 'onSnapshotsInSync',
-      reason:
-        'The observer `next` callback has no parameter in RN Firebase vs ' +
-        '`(value: void) => void` in the firebase-js-sdk, and the `error` callback ' +
-        'uses `Error` instead of `FirestoreError`. Both differences are cosmetic; ' +
-        'the behaviour is equivalent.',
-    },
-    {
-      name: 'runTransaction',
-      reason:
-        'The firebase-js-sdk accepts an optional `TransactionOptions` parameter ' +
-        '(e.g. maxAttempts) which is not yet supported by the RN Firebase native ' +
-        'transaction implementation.',
+        'RN Firebase delegates persistent-cache index state to native SDK IO and exposes ' +
+        'completion/failure through the returned Promise; the web SDK starts the operation and returns void.',
     },
     {
       name: 'FirestoreSettings',
diff --git a/.github/scripts/compare-types/configs/functions.ts b/.github/scripts/compare-types/configs/functions.ts
index e879aac2eb..168eaf2516 100644
--- a/.github/scripts/compare-types/configs/functions.ts
+++ b/.github/scripts/compare-types/configs/functions.ts
@@ -1,8 +1,10 @@
 /**
- * Known differences between the firebase-js-sdk public API and
- * the @react-native-firebase/functions modular API.
+ * Known differences between the firebase-js-sdk @firebase/functions public
+ * API and the @react-native-firebase/functions modular API.
  *
- * Each entry must have a `name` and a `reason`. Undocumented drift fails CI.
+ * Each entry must have a `name` (the export name) and a `reason` explaining
+ * why the difference exists. Any difference NOT listed here will cause CI to
+ * fail so that new drift is caught and deliberately acknowledged.
  */
 
 import type { PackageConfig } from '../src/types';
@@ -11,23 +13,57 @@ const config: PackageConfig = {
   nameMapping: {
     httpsCallableFromURL: 'httpsCallableFromUrl',
   },
-
-  missingInRN: [
-    { name: 'FunctionsError', reason: 'RN Firebase surfaces callable failures through the `HttpsError` class instead of the firebase-js-sdk `FunctionsError` export.' },
-    { name: 'FunctionsErrorCodeCore', reason: 'Internal firebase-js-sdk error-code helper not re-exported by RN Firebase. Callable errors use `HttpsErrorCode` constants instead.' },
-  ],
-
+  missingInRN: [],
   extraInRN: [
-    { name: 'HttpsErrorCode', reason: 'RN Firebase exposes callable error code constants as a standalone export. The firebase-js-sdk surfaces these through the `FunctionsErrorCode` enum instead.' },
-    { name: 'SDK_VERSION', reason: 'RN Firebase package version string exported from the modular entry point. The firebase-js-sdk does not export SDK_VERSION from @firebase/functions.' },
-    { name: 'HttpsError', reason: 'RN Firebase re-exports the callable `HttpsError` class from its modular entry point for ergonomic imports.' },
-    { name: 'FunctionsStatics', reason: 'RN Firebase statics namespace type used by the legacy namespaced API surface. Not part of the firebase-js-sdk modular public API.' },
-    { name: 'FirebaseApp', reason: 'RN Firebase re-exports `FirebaseApp` from the modular entry point for convenience.' },
+    {
+      name: 'SDK_VERSION',
+      reason:
+        'RN Firebase package version string exported from the modular entry point. The firebase-js-sdk does not export SDK_VERSION from @firebase/functions.',
+    },
+    {
+      name: 'HttpsError',
+      reason:
+        'RN Firebase exports the runtime callable error class as `HttpsError` (also aliased as `FunctionsError`). ' +
+        'The firebase-js-sdk exports the `FunctionsError` class name only.',
+    },
+    {
+      name: 'HttpsErrorCode',
+      reason:
+        'RN Firebase exports a const object of callable error code strings for backwards-compatible namespaced usage. ' +
+        'The firebase-js-sdk does not export this helper from the modular entry point.',
+    },
+    {
+      name: 'HttpsErrorCodeValue',
+      reason:
+        'RN Firebase type for unprefixed error codes returned by `HttpsError`, including RN-specific codes. ' +
+        'The firebase-js-sdk uses prefixed `FunctionsErrorCode` values at runtime.',
+    },
+    {
+      name: 'FunctionsStatics',
+      reason:
+        'Deprecated namespaced statics type retained for backwards compatibility. The firebase-js-sdk modular API does not export this helper type.',
+    },
+    {
+      name: 'FirebaseApp',
+      reason:
+        'Deprecated re-export of `@react-native-firebase/app` `FirebaseApp` from the functions types module. ' +
+        'Prefer importing `FirebaseApp` from `@react-native-firebase/app`.',
+    },
   ],
-
   differentShape: [
-    { name: 'Functions', reason: 'RN Firebase extends the Functions service interface with native region/custom-domain helpers and uses async callable factories.' },
-    { name: 'FunctionsErrorCode', reason: 'RN Firebase `FunctionsErrorCode` enum includes additional native bridge error codes beyond the firebase-js-sdk set.' },
+    {
+      name: 'FunctionsError',
+      reason:
+        'RN Firebase `FunctionsError` is an alias for `HttpsError`, whose runtime `code` values are unprefixed ' +
+        'strings from the native bridge. The firebase-js-sdk `FunctionsError` class extends `FirebaseError` with ' +
+        'prefixed `functions/` error codes.',
+    },
+    {
+      name: 'Functions',
+      reason:
+        'RN Firebase `Functions` is a native module wrapper with `useEmulator` / deprecated `useFunctionsEmulator` ' +
+        'methods. The firebase-js-sdk modular `Functions` service type has a different class shape.',
+    },
   ],
 };
 
diff --git a/.github/scripts/compare-types/configs/remote-config.ts b/.github/scripts/compare-types/configs/remote-config.ts
index f62440bc0b..ddb2f5c52e 100644
--- a/.github/scripts/compare-types/configs/remote-config.ts
+++ b/.github/scripts/compare-types/configs/remote-config.ts
@@ -17,36 +17,12 @@ import type { PackageConfig } from '../src/types';
 
 const config: PackageConfig = {
   missingInRN: [
-    {
-      name: 'FetchResponse',
-      reason:
-        'Part of the firebase-js-sdk initialization options surface. RN Firebase ' +
-        'does not expose `RemoteConfigOptions` or the web fetch-response bootstrap path.',
-    },
     {
       name: 'FetchType',
       reason:
         'Used by the firebase-js-sdk web fetch-response bootstrap path. RN Firebase ' +
         'does not expose that initialization surface.',
     },
-    {
-      name: 'FirebaseExperimentDescription',
-      reason:
-        'Only used by the firebase-js-sdk fetch-response bootstrap types. RN Firebase ' +
-        'does not expose that initialization surface.',
-    },
-    {
-      name: 'FirebaseRemoteConfigObject',
-      reason:
-        'Only used by the firebase-js-sdk fetch-response bootstrap types. RN Firebase ' +
-        'does not expose that initialization surface.',
-    },
-    {
-      name: 'RemoteConfigOptions',
-      reason:
-        'The firebase-js-sdk supports optional initialization options when creating ' +
-        'a Remote Config instance. RN Firebase does not expose this initialization API.',
-    },
   ],
   // ---------------------------------------------------------------------------
   // Extra in RN Firebase
@@ -81,26 +57,14 @@ const config: PackageConfig = {
     },
   ],
   differentShape: [
-    {
-      name: 'ConfigUpdateObserver',
-      reason:
-        'The `error` callback parameter uses `ReactNativeFirebase.NativeFirebaseError` ' +
-        'instead of `FirebaseError` from `@firebase/app`. Both represent Firebase ' +
-        'errors but the RN type extends the native bridge error structure.',
-    },
     {
       name: 'FetchStatus',
       reason:
-        'RN Firebase preserves the long-standing native string literals ' +
-        '(`no_fetch_yet` / `throttled`) used by both the namespaced API and native bridge, ' +
-        'instead of the firebase-js-sdk web literals (`no-fetch-yet` / `throttle`).',
-    },
-    {
-      name: 'getRemoteConfig',
-      reason:
-        'The firebase-js-sdk accepts an optional `RemoteConfigOptions` second argument. ' +
-        'RN Firebase only accepts the optional app instance and does not expose the ' +
-        'initialization-options surface.',
+        'Intentional native bridge contract: RN Firebase preserves underscore literals ' +
+        '(`no_fetch_yet`, `throttled`) returned by the iOS/Android Remote Config SDKs and ' +
+        'used by the long-standing namespaced API. Aligning to firebase-js-sdk hyphen literals ' +
+        '(`no-fetch-yet`, `throttle`) would be a breaking change for existing comparisons and ' +
+        'cannot be normalized without native/bridge churn; not planned for compare-types parity.',
     },
     {
       name: 'ValueSource',
diff --git a/.github/scripts/compare-types/configs/storage.ts b/.github/scripts/compare-types/configs/storage.ts
index 4b9f18bbd4..48a6db1e64 100644
--- a/.github/scripts/compare-types/configs/storage.ts
+++ b/.github/scripts/compare-types/configs/storage.ts
@@ -25,13 +25,6 @@ const config: PackageConfig = {
   // Missing in RN Firebase
   // ---------------------------------------------------------------------------
   missingInRN: [
-    {
-      name: 'StorageError',
-      reason:
-        'RN Firebase surfaces Storage failures as `NativeFirebaseError` instances from ' +
-        '`@react-native-firebase/app` rather than exporting the firebase-js-sdk web ' +
-        '`StorageError` subclass.',
-    },
     {
       name: 'StorageErrorCode',
       reason:
@@ -135,21 +128,6 @@ const config: PackageConfig = {
         'in RN Firebase (they are set via dedicated modular functions) whereas the ' +
         'firebase-js-sdk declares them as mutable properties.',
     },
-    {
-      name: 'StorageObserver',
-      reason:
-        'The `error` callback parameter uses `NativeFirebaseError` instead of ' +
-        '`StorageError`. Both represent Firebase Storage errors but the RN type ' +
-        'extends the native bridge error structure.',
-    },
-    {
-      name: 'UploadTask',
-      reason:
-        'RN Firebase returns `Promise<boolean>` from `cancel()`, `pause()`, and ' +
-        '`resume()` whereas the firebase-js-sdk returns a synchronous `boolean`. ' +
-        'Error callback types also use `NativeFirebaseError` instead of `StorageError`. ' +
-        'Phase S hint: **convert after native fix** (sync boolean from native task state; see PS-S2-gap).',
-    },
     {
       name: 'EmulatorMockTokenOptions',
       reason:
@@ -173,20 +151,6 @@ const config: PackageConfig = {
         '(the Web Streams API type). The Node.js stream type is used because the ' +
         'React Native environment does not have the Web Streams API.',
     },
-    {
-      name: 'uploadBytes',
-      reason:
-        'Returns `Promise<TaskResult>` in RN Firebase instead of `Promise<UploadResult>`. ' +
-        '`TaskResult` is a type alias for `UploadResult`, so the runtime shape is identical; ' +
-        'the different name is for consistency with the native task system.',
-    },
-    {
-      name: 'uploadBytesResumable',
-      reason:
-        'Returns `Task` in RN Firebase instead of `UploadTask`. `Task` is a type alias ' +
-        'for `UploadTask`, so the runtime shape is identical; the different name is for ' +
-        'consistency with the native task system.',
-    },
     {
       name: 'uploadString',
       reason:
@@ -211,6 +175,22 @@ const config: PackageConfig = {
         '`(typeof TaskState)[keyof typeof TaskState]`. The RN const additionally includes ' +
         "a `CANCELLED` alias (with double-L) for `'canceled'` for backwards compatibility.",
     },
+    {
+      name: 'StorageObserver',
+      reason:
+        'RN Firebase types `error` as `((error: StorageError) => unknown) | null`, placing ' +
+        '`| null` on the optional callback property. The firebase-js-sdk `.d.ts` parses as ' +
+        '`(error: StorageError) => void | null`, binding `| null` to the return type; RN aligns ' +
+        'with other task callback signatures (`unknown` return) and correct optional-null placement.',
+    },
+    {
+      name: 'UploadTask',
+      reason:
+        'RN Firebase types the `on()` `complete` parameter as `CompleteFn | null`, matching ' +
+        'observer callback semantics and the `Subscribe` helper. The firebase-js-sdk public ' +
+        '`.d.ts` compare surface shows `Unsubscribe | null` for that parameter — an extraction ' +
+        'artifact, not the intended complete-handler type.',
+    },
   ],
 };
 
diff --git a/.github/workflows/scripts/README-firestore.md b/.github/workflows/scripts/README-firestore.md
index fb1c656340..e3f65a5514 100644
--- a/.github/workflows/scripts/README-firestore.md
+++ b/.github/workflows/scripts/README-firestore.md
@@ -48,6 +48,11 @@ firebase firestore:indexes --project react-native-firebase-testing --database pi
 
 There is no `firebase firestore:rules` pull command; edit the `.rules` files in-repo and deploy.
 
+
+## Index deploy verify cycle
+
+Canonical workflow (CLI ≥ 15.17.0 for search indexes): sync → edit JSON → `./deploy-firestore.sh` (runs `verify-firestore-indexes.sh`) → sync again → confirm cloud pull matches intent. Full policy and tooling surfaces: [okf-bundle Firebase testing project doc](../../../okf-bundle/testing/firebase-testing-project.md#index-change-workflow-sync--edit--deploy--verify).
+
 ## Deploy to cloud
 
 ```bash
diff --git a/.github/workflows/scripts/deploy-firestore.sh b/.github/workflows/scripts/deploy-firestore.sh
index badd2d8993..f1d30f75d4 100755
--- a/.github/workflows/scripts/deploy-firestore.sh
+++ b/.github/workflows/scripts/deploy-firestore.sh
@@ -22,3 +22,7 @@ echo ""
 # Use full firestore target (not firestore:rules / firestore:indexes) — sub-targets can
 # silently no-op with multi-database config.
 "${FIREBASE_CMD[@]}" deploy --only firestore --config firebase.deploy.json
+
+echo ""
+echo "Running post-deploy index verification..."
+"$SCRIPT_DIR/verify-firestore-indexes.sh"
diff --git a/.github/workflows/scripts/firestore.pipelines-e2e.indexes.json b/.github/workflows/scripts/firestore.pipelines-e2e.indexes.json
index 7779225732..30f93ab34a 100644
--- a/.github/workflows/scripts/firestore.pipelines-e2e.indexes.json
+++ b/.github/workflows/scripts/firestore.pipelines-e2e.indexes.json
@@ -11,7 +11,28 @@
             "flat": {}
           }
         }
-      ]
+      ],
+      "density": "DENSE"
+    },
+    {
+      "collectionGroup": "search-text",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "menu",
+          "searchConfig": {
+            "textSpec": {
+              "indexSpecs": [
+                {
+                  "indexType": "TOKENIZED",
+                  "matchType": "MATCH_GLOBALLY"
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "density": "SPARSE_ANY"
     }
   ],
   "fieldOverrides": []
diff --git a/.github/workflows/scripts/functions/package.json b/.github/workflows/scripts/functions/package.json
index c09b5131f5..d6aa6a8c7a 100644
--- a/.github/workflows/scripts/functions/package.json
+++ b/.github/workflows/scripts/functions/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "firebase-functions-test": "^3.4.1",
-    "firebase-tools": "^15.16.0",
+    "firebase-tools": "^15.22.4",
     "typescript": "^6.0.3"
   },
   "private": true,
diff --git a/.github/workflows/scripts/functions/yarn.lock b/.github/workflows/scripts/functions/yarn.lock
index 0aeb647b78..8102a387b1 100644
--- a/.github/workflows/scripts/functions/yarn.lock
+++ b/.github/workflows/scripts/functions/yarn.lock
@@ -17,22 +17,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apphosting/build@npm:^0.1.7":
-  version: 0.1.7
-  resolution: "@apphosting/build@npm:0.1.7"
-  dependencies:
-    "@apphosting/common": "npm:^0.0.9"
-    "@npmcli/promise-spawn": "npm:^3.0.0"
-    colorette: "npm:^2.0.20"
-    commander: "npm:^11.1.0"
-    npm-pick-manifest: "npm:^9.0.0"
-    ts-node: "npm:^10.9.1"
-  bin:
-    apphosting-local-build: dist/bin/localbuild.js
-  checksum: 10/2a38c1792943b1fb7f73168ff2a556c1fd60197113ac3f8ac1165341379d2ca772fe915ad8aa1b3cc95a0417a6407acf123331d5edb0f408dea8e289f87b6028
-  languageName: node
-  linkType: hard
-
 "@apphosting/common@npm:^0.0.8":
   version: 0.0.8
   resolution: "@apphosting/common@npm:0.0.8"
@@ -40,13 +24,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apphosting/common@npm:^0.0.9":
-  version: 0.0.9
-  resolution: "@apphosting/common@npm:0.0.9"
-  checksum: 10/117068ce2860a2ba481ec217ed29df782eeca244abe1fff86525e6a69d19ed3879e98889d46d9c87a70a1aa32cd79535b71bd4fd2405e849e861b873f58b34a4
-  languageName: node
-  linkType: hard
-
 "@colors/colors@npm:1.5.0":
   version: 1.5.0
   resolution: "@colors/colors@npm:1.5.0"
@@ -61,15 +38,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspotcode/source-map-support@npm:^0.8.0":
-  version: 0.8.1
-  resolution: "@cspotcode/source-map-support@npm:0.8.1"
-  dependencies:
-    "@jridgewell/trace-mapping": "npm:0.3.9"
-  checksum: 10/b6e38a1712fab242c86a241c229cf562195aad985d0564bd352ac404be583029e89e93028ffd2c251d2c407ecac5fb0cbdca94a2d5c10f29ac806ede0508b3ff
-  languageName: node
-  linkType: hard
-
 "@dabh/diagnostics@npm:^2.0.2":
   version: 2.0.3
   resolution: "@dabh/diagnostics@npm:2.0.3"
@@ -712,30 +680,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/resolve-uri@npm:^3.0.3":
-  version: 3.1.2
-  resolution: "@jridgewell/resolve-uri@npm:3.1.2"
-  checksum: 10/97106439d750a409c22c8bff822d648f6a71f3aa9bc8e5129efdc36343cd3096ddc4eeb1c62d2fe48e9bdd4db37b05d4646a17114ecebd3bbcacfa2de51c3c1d
-  languageName: node
-  linkType: hard
-
-"@jridgewell/sourcemap-codec@npm:^1.4.10":
-  version: 1.5.5
-  resolution: "@jridgewell/sourcemap-codec@npm:1.5.5"
-  checksum: 10/5d9d207b462c11e322d71911e55e21a4e2772f71ffe8d6f1221b8eb5ae6774458c1d242f897fb0814e8714ca9a6b498abfa74dfe4f434493342902b1a48b33a5
-  languageName: node
-  linkType: hard
-
-"@jridgewell/trace-mapping@npm:0.3.9":
-  version: 0.3.9
-  resolution: "@jridgewell/trace-mapping@npm:0.3.9"
-  dependencies:
-    "@jridgewell/resolve-uri": "npm:^3.0.3"
-    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
-  checksum: 10/83deafb8e7a5ca98993c2c6eeaa93c270f6f647a4c0dc00deb38c9cf9b2d3b7bf15e8839540155247ef034a052c0ec4466f980bf0c9e2ab63b97d16c0cedd3ff
-  languageName: node
-  linkType: hard
-
 "@js-sdsl/ordered-map@npm:^4.4.2":
   version: 4.4.2
   resolution: "@js-sdsl/ordered-map@npm:4.4.2"
@@ -812,15 +756,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/promise-spawn@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@npmcli/promise-spawn@npm:3.0.0"
-  dependencies:
-    infer-owner: "npm:^1.0.4"
-  checksum: 10/3454465a2731cea5875ba51f80873e2205e5bd878c31517286b0ede4ea931c7bf3de895382287e906d03710fff6f9e44186bd0eee068ce578901c5d3b58e7692
-  languageName: node
-  linkType: hard
-
 "@opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:~1.9.0":
   version: 1.9.0
   resolution: "@opentelemetry/api@npm:1.9.0"
@@ -988,34 +923,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tsconfig/node10@npm:^1.0.7":
-  version: 1.0.11
-  resolution: "@tsconfig/node10@npm:1.0.11"
-  checksum: 10/51fe47d55fe1b80ec35e6e5ed30a13665fd3a531945350aa74a14a1e82875fb60b350c2f2a5e72a64831b1b6bc02acb6760c30b3738b54954ec2dea82db7a267
-  languageName: node
-  linkType: hard
-
-"@tsconfig/node12@npm:^1.0.7":
-  version: 1.0.11
-  resolution: "@tsconfig/node12@npm:1.0.11"
-  checksum: 10/5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a
-  languageName: node
-  linkType: hard
-
-"@tsconfig/node14@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "@tsconfig/node14@npm:1.0.3"
-  checksum: 10/19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d
-  languageName: node
-  linkType: hard
-
-"@tsconfig/node16@npm:^1.0.2":
-  version: 1.0.4
-  resolution: "@tsconfig/node16@npm:1.0.4"
-  checksum: 10/202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff
-  languageName: node
-  linkType: hard
-
 "@types/body-parser@npm:*":
   version: 1.19.6
   resolution: "@types/body-parser@npm:1.19.6"
@@ -1233,24 +1140,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.1.1":
-  version: 8.3.4
-  resolution: "acorn-walk@npm:8.3.4"
-  dependencies:
-    acorn: "npm:^8.11.0"
-  checksum: 10/871386764e1451c637bb8ab9f76f4995d408057e9909be6fb5ad68537ae3375d85e6a6f170b98989f44ab3ff6c74ad120bc2779a3d577606e7a0cd2b4efcaf77
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.11.0, acorn@npm:^8.4.1":
-  version: 8.15.0
-  resolution: "acorn@npm:8.15.0"
-  bin:
-    acorn: bin/acorn
-  checksum: 10/77f2de5051a631cf1729c090e5759148459cdb76b5f5c70f890503d629cf5052357b0ce783c0f976dd8a93c5150f59f6d18df1def3f502396a20f81282482fa4
-  languageName: node
-  linkType: hard
-
 "agent-base@npm:6":
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"
@@ -1402,22 +1291,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arg@npm:^4.1.0":
-  version: 4.1.3
-  resolution: "arg@npm:4.1.3"
-  checksum: 10/969b491082f20cad166649fa4d2073ea9e974a4e5ac36247ca23d2e5a8b3cb12d60e9ff70a8acfe26d76566c71fd351ee5e6a9a6595157eb36f92b1fd64e1599
-  languageName: node
-  linkType: hard
-
-"argparse@npm:^1.0.7":
-  version: 1.0.10
-  resolution: "argparse@npm:1.0.10"
-  dependencies:
-    sprintf-js: "npm:~1.0.2"
-  checksum: 10/c6a621343a553ff3779390bb5ee9c2263d6643ebcd7843227bdde6cc7adbed796eb5540ca98db19e3fd7b4714e1faa51551f8849b268bb62df27ddb15cbcd91e
-  languageName: node
-  linkType: hard
-
 "argparse@npm:^2.0.1":
   version: 2.0.1
   resolution: "argparse@npm:2.0.1"
@@ -1952,7 +1825,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.19, colorette@npm:^2.0.20":
+"colorette@npm:^2.0.19":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
   checksum: 10/0b8de48bfa5d10afc160b8eaa2b9938f34a892530b2f7d7897e0458d9535a066e3998b49da9d21161c78225b272df19ae3a64d6df28b4c9734c0e55bbd02406f
@@ -1985,13 +1858,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "commander@npm:11.1.0"
-  checksum: 10/66bd2d8a0547f6cb1d34022efb25f348e433b0e04ad76a65279b1b09da108f59a4d3001ca539c60a7a46ea38bcf399fc17d91adad76a8cf43845d8dcbaf5cda1
-  languageName: node
-  linkType: hard
-
 "commander@npm:^2.19.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -2175,13 +2041,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"create-require@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "create-require@npm:1.1.1"
-  checksum: 10/a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff
-  languageName: node
-  linkType: hard
-
 "cross-env@npm:^7.0.3":
   version: 7.0.3
   resolution: "cross-env@npm:7.0.3"
@@ -2278,16 +2137,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-equal-in-any-order@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "deep-equal-in-any-order@npm:2.0.6"
-  dependencies:
-    lodash.mapvalues: "npm:^4.6.0"
-    sort-any: "npm:^2.0.0"
-  checksum: 10/c975530c2455a15c835306bf388e9c5f7a79b6a45ff0c9c9c5c3ba089c36613ffa7b5b63031ec666e5209f7c7b035155039575d6b7c9876b9cfb7b410af3de2f
-  languageName: node
-  linkType: hard
-
 "deep-extend@npm:^0.6.0":
   version: 0.6.0
   resolution: "deep-extend@npm:0.6.0"
@@ -2350,13 +2199,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff@npm:^4.0.1":
-  version: 4.0.2
-  resolution: "diff@npm:4.0.2"
-  checksum: 10/ec09ec2101934ca5966355a229d77afcad5911c92e2a77413efda5455636c4cf2ce84057e2d7715227a2eeeda04255b849bd3ae3a4dd22eb22e86e76456df069
-  languageName: node
-  linkType: hard
-
 "discontinuous-range@npm:1.0.0":
   version: 1.0.0
   resolution: "discontinuous-range@npm:1.0.0"
@@ -2583,7 +2425,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
+"esprima@npm:^4.0.1":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"
   bin:
@@ -2882,13 +2724,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"filesize@npm:^6.1.0":
-  version: 6.4.0
-  resolution: "filesize@npm:6.4.0"
-  checksum: 10/20ddfd66059aa4cdd0db34e36adb368696811d083bbc31952f64f33f5f7792d8351ab33cd47416ef478acfd869cf77eee47235749090ad9b1cac26d2c18a05e5
-  languageName: node
-  linkType: hard
-
 "fill-range@npm:^7.1.1":
   version: 7.1.1
   resolution: "fill-range@npm:7.1.1"
@@ -3009,11 +2844,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"firebase-tools@npm:^15.16.0":
-  version: 15.16.0
-  resolution: "firebase-tools@npm:15.16.0"
+"firebase-tools@npm:^15.22.4":
+  version: 15.22.4
+  resolution: "firebase-tools@npm:15.22.4"
   dependencies:
-    "@apphosting/build": "npm:^0.1.7"
     "@apphosting/common": "npm:^0.0.8"
     "@electric-sql/pglite": "npm:^0.3.3"
     "@electric-sql/pglite-tools": "npm:^0.2.8"
@@ -3037,11 +2871,9 @@ __metadata:
     cross-env: "npm:^7.0.3"
     cross-spawn: "npm:^7.0.5"
     csv-parse: "npm:^5.0.4"
-    deep-equal-in-any-order: "npm:^2.0.6"
     exegesis: "npm:^4.2.0"
     exegesis-express: "npm:^4.0.0"
     express: "npm:^4.16.4"
-    filesize: "npm:^6.1.0"
     form-data: "npm:^4.0.1"
     fs-extra: "npm:^10.1.0"
     fuzzy: "npm:^0.1.3"
@@ -3049,9 +2881,8 @@ __metadata:
     glob: "npm:^10.5.0"
     google-auth-library: "npm:^9.11.0"
     ignore: "npm:^7.0.4"
-    js-yaml: "npm:^3.14.2"
+    js-yaml: "npm:^4.2.0"
     jsonwebtoken: "npm:^9.0.2"
-    leven: "npm:^3.1.0"
     libsodium-wrappers: "npm:^0.7.10"
     lodash: "npm:^4.18.0"
     lsofi: "npm:^2.0.0"
@@ -3063,7 +2894,6 @@ __metadata:
     node-fetch: "npm:^2.6.7"
     open: "npm:^6.3.0"
     ora: "npm:^5.4.1"
-    p-limit: "npm:^3.0.1"
     pg: "npm:^8.11.3"
     pg-gateway: "npm:^0.3.0-beta.4"
     pglite-2: "npm:@electric-sql/pglite@0.2.17"
@@ -3082,16 +2912,14 @@ __metadata:
     triple-beam: "npm:^1.3.0"
     universal-analytics: "npm:^0.5.3"
     update-notifier-cjs: "npm:^5.1.6"
-    uuid: "npm:^8.3.2"
     winston: "npm:^3.0.0"
     winston-transport: "npm:^4.4.0"
     ws: "npm:^7.5.10"
     yaml: "npm:^2.8.3"
-    zod: "npm:^3.24.3"
-    zod-to-json-schema: "npm:^3.24.5"
+    zod: "npm:^4.0.0"
   bin:
     firebase: lib/bin/firebase.js
-  checksum: 10/beba86e13615609295f36462719092dae5d621aa6211fc4ccf39d73e4f5ee6fead14ab106fafc05ff8183bd402867f5719dc0729d9fbd2348100ebfd546e5b2e
+  checksum: 10/d8a907a2859e981aca73e06a04936b9d36ed0d7cee8139cb728f1ad721d00fa7c77a473fbf48a9b5857f5e189416d9c3ca18e354859c5220fddb8b5e2488f1a8
   languageName: node
   linkType: hard
 
@@ -3230,7 +3058,7 @@ __metadata:
     firebase-admin: "npm:^13.8.0"
     firebase-functions: "npm:^7.2.5"
     firebase-functions-test: "npm:^3.4.1"
-    firebase-tools: "npm:^15.16.0"
+    firebase-tools: "npm:^15.22.4"
     typescript: "npm:^6.0.3"
   dependenciesMeta:
     "@firebase/util":
@@ -3670,15 +3498,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "hosted-git-info@npm:7.0.2"
-  dependencies:
-    lru-cache: "npm:^10.0.1"
-  checksum: 10/8f085df8a4a637d995f357f48b1e3f6fc1f9f92e82b33fb406415b5741834ed431a510a09141071001e8deea2eee43ce72786463e2aa5e5a70db8648c0eedeab
-  languageName: node
-  linkType: hard
-
 "html-entities@npm:^2.5.2":
   version: 2.6.0
   resolution: "html-entities@npm:2.6.0"
@@ -3822,13 +3641,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 10/181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
-  languageName: node
-  linkType: hard
-
 "inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3, inherits@npm:~2.0.4":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
@@ -4133,26 +3945,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.14.2":
-  version: 3.14.2
-  resolution: "js-yaml@npm:3.14.2"
+"js-yaml@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "js-yaml@npm:4.1.0"
   dependencies:
-    argparse: "npm:^1.0.7"
-    esprima: "npm:^4.0.0"
+    argparse: "npm:^2.0.1"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 10/172e0b6007b0bf0fc8d2469c94424f7dd765c64a047d2b790831fecef2204a4054eabf4d911eb73ab8c9a3256ab8ba1ee8d655b789bf24bf059c772acc2075a1
+  checksum: 10/c138a34a3fd0d08ebaf71273ad4465569a483b8a639e0b118ff65698d257c2791d3199e3f303631f2cb98213fa7b5f5d6a4621fd0fff819421b990d30d967140
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "js-yaml@npm:4.1.0"
+"js-yaml@npm:^4.2.0":
+  version: 4.3.0
+  resolution: "js-yaml@npm:4.3.0"
   dependencies:
     argparse: "npm:^2.0.1"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 10/c138a34a3fd0d08ebaf71273ad4465569a483b8a639e0b118ff65698d257c2791d3199e3f303631f2cb98213fa7b5f5d6a4621fd0fff819421b990d30d967140
+  checksum: 10/2bcec3a8118d7f744badeb04e14366578d234a736f353d41fe35d2305e4ce2409a8e041d277f07cd6bbc8aaa12128d650a68ce43247072519bede20962d2126f
   languageName: node
   linkType: hard
 
@@ -4326,13 +4137,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"leven@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "leven@npm:3.1.0"
-  checksum: 10/638401d534585261b6003db9d99afd244dfe82d75ddb6db5c0df412842d5ab30b2ef18de471aaec70fe69a46f17b4ae3c7f01d8a4e6580ef7adb9f4273ad1e55
-  languageName: node
-  linkType: hard
-
 "libsodium-wrappers@npm:^0.7.10":
   version: 0.7.15
   resolution: "libsodium-wrappers@npm:0.7.15"
@@ -4428,13 +4232,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.mapvalues@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.mapvalues@npm:4.6.0"
-  checksum: 10/566032abaacbc5dc7e74673e589830d2694ec03dc979ac134c93985b47409ac845cbd4eea3786cc0b4db4e80d726a32c1119af63d0151520e27789568aa76bd2
-  languageName: node
-  linkType: hard
-
 "lodash.once@npm:^4.0.0":
   version: 4.1.1
   resolution: "lodash.once@npm:4.1.1"
@@ -4449,7 +4246,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.5":
+"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.5":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
@@ -4543,13 +4340,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-error@npm:^1.1.1":
-  version: 1.3.6
-  resolution: "make-error@npm:1.3.6"
-  checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
-  languageName: node
-  linkType: hard
-
 "make-fetch-happen@npm:^14.0.3":
   version: 14.0.3
   resolution: "make-fetch-happen@npm:14.0.3"
@@ -5042,46 +4832,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-install-checks@npm:^6.0.0":
-  version: 6.3.0
-  resolution: "npm-install-checks@npm:6.3.0"
-  dependencies:
-    semver: "npm:^7.1.1"
-  checksum: 10/6c20dadb878a0d2f1f777405217b6b63af1299d0b43e556af9363ee6eefaa98a17dfb7b612a473a473e96faf7e789c58b221e0d8ffdc1d34903c4f71618df3b4
-  languageName: node
-  linkType: hard
-
-"npm-normalize-package-bin@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "npm-normalize-package-bin@npm:3.0.1"
-  checksum: 10/de416d720ab22137a36292ff8a333af499ea0933ef2320a8c6f56a73b0f0448227fec4db5c890d702e26d21d04f271415eab6580b5546456861cc0c19498a4bf
-  languageName: node
-  linkType: hard
-
-"npm-package-arg@npm:^11.0.0":
-  version: 11.0.3
-  resolution: "npm-package-arg@npm:11.0.3"
-  dependencies:
-    hosted-git-info: "npm:^7.0.0"
-    proc-log: "npm:^4.0.0"
-    semver: "npm:^7.3.5"
-    validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/bacc863907edf98940286edc2fd80327901c1e8b34426d538cdc708ed66bc6567f06d742d838eaf35db6804347bb4ba56ca9cef032c4b52743b33e7a22a2678e
-  languageName: node
-  linkType: hard
-
-"npm-pick-manifest@npm:^9.0.0":
-  version: 9.1.0
-  resolution: "npm-pick-manifest@npm:9.1.0"
-  dependencies:
-    npm-install-checks: "npm:^6.0.0"
-    npm-normalize-package-bin: "npm:^3.0.0"
-    npm-package-arg: "npm:^11.0.0"
-    semver: "npm:^7.3.5"
-  checksum: 10/e759e4fe4076da9169cf522964a80bbc096d50cd24c8c44b50b44706c4479bd9d9d018fbdb76c6ea0c6037e012e07c6c917a1ecaa7ae1a1169cddfae1c0f24b6
-  languageName: node
-  linkType: hard
-
 "object-assign@npm:^4, object-assign@npm:^4.0.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -5486,13 +5236,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proc-log@npm:^4.0.0":
-  version: 4.2.0
-  resolution: "proc-log@npm:4.2.0"
-  checksum: 10/4e1394491b717f6c1ade15c570ecd4c2b681698474d3ae2d303c1e4b6ab9455bd5a81566211e82890d5a5ae9859718cc6954d5150bb18b09b72ecb297beae90a
-  languageName: node
-  linkType: hard
-
 "proc-log@npm:^5.0.0":
   version: 5.0.0
   resolution: "proc-log@npm:5.0.0"
@@ -5978,15 +5721,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.1.1":
-  version: 7.7.3
-  resolution: "semver@npm:7.7.3"
-  bin:
-    semver: bin/semver.js
-  checksum: 10/8dbc3168e057a38fc322af909c7f5617483c50caddba135439ff09a754b20bdd6482a5123ff543dad4affa488ecf46ec5fb56d61312ad20bb140199b88dfaea9
-  languageName: node
-  linkType: hard
-
 "send@npm:0.19.0":
   version: 0.19.0
   resolution: "send@npm:0.19.0"
@@ -6182,15 +5916,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sort-any@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "sort-any@npm:2.0.0"
-  dependencies:
-    lodash: "npm:^4.17.21"
-  checksum: 10/d2dc6cc4f56298ce50b13ce6aafd8bf16010a8f8d0ae75345e8424118ac2cc017a8ffea0eedd136dd67751c09e7b0edb09c959d052ed7ed02afcfbab63c68277
-  languageName: node
-  linkType: hard
-
 "source-map@npm:~0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
@@ -6205,13 +5930,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sprintf-js@npm:~1.0.2":
-  version: 1.0.3
-  resolution: "sprintf-js@npm:1.0.3"
-  checksum: 10/c34828732ab8509c2741e5fd1af6b767c3daf2c642f267788f933a65b1614943c282e74c4284f4fa749c264b18ee016a0d37a3e5b73aee446da46277d3a85daa
-  languageName: node
-  linkType: hard
-
 "sql-formatter@npm:^15.3.0":
   version: 15.6.6
   resolution: "sql-formatter@npm:15.6.6"
@@ -6606,44 +6324,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:^10.9.1":
-  version: 10.9.2
-  resolution: "ts-node@npm:10.9.2"
-  dependencies:
-    "@cspotcode/source-map-support": "npm:^0.8.0"
-    "@tsconfig/node10": "npm:^1.0.7"
-    "@tsconfig/node12": "npm:^1.0.7"
-    "@tsconfig/node14": "npm:^1.0.0"
-    "@tsconfig/node16": "npm:^1.0.2"
-    acorn: "npm:^8.4.1"
-    acorn-walk: "npm:^8.1.1"
-    arg: "npm:^4.1.0"
-    create-require: "npm:^1.1.0"
-    diff: "npm:^4.0.1"
-    make-error: "npm:^1.1.1"
-    v8-compile-cache-lib: "npm:^3.0.1"
-    yn: "npm:3.1.1"
-  peerDependencies:
-    "@swc/core": ">=1.2.50"
-    "@swc/wasm": ">=1.2.50"
-    "@types/node": "*"
-    typescript: ">=2.7"
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    "@swc/wasm":
-      optional: true
-  bin:
-    ts-node: dist/bin.js
-    ts-node-cwd: dist/bin-cwd.js
-    ts-node-esm: dist/bin-esm.js
-    ts-node-script: dist/bin-script.js
-    ts-node-transpile-only: dist/bin-transpile.js
-    ts-script: dist/bin-script-deprecated.js
-  checksum: 10/a91a15b3c9f76ac462f006fa88b6bfa528130dcfb849dd7ef7f9d640832ab681e235b8a2bc58ecde42f72851cc1d5d4e22c901b0c11aa51001ea1d395074b794
-  languageName: node
-  linkType: hard
-
 "tslib@npm:^2.0.1, tslib@npm:^2.1.0":
   version: 2.8.1
   resolution: "tslib@npm:2.8.1"
@@ -6841,7 +6521,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^8.0.0, uuid@npm:^8.3.2":
+"uuid@npm:^8.0.0":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"
   bin:
@@ -6859,13 +6539,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"v8-compile-cache-lib@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "v8-compile-cache-lib@npm:3.0.1"
-  checksum: 10/88d3423a52b6aaf1836be779cab12f7016d47ad8430dffba6edf766695e6d90ad4adaa3d8eeb512cc05924f3e246c4a4ca51e089dccf4402caa536b5e5be8961
-  languageName: node
-  linkType: hard
-
 "valid-url@npm:^1":
   version: 1.0.9
   resolution: "valid-url@npm:1.0.9"
@@ -6873,13 +6546,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"validate-npm-package-name@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "validate-npm-package-name@npm:5.0.1"
-  checksum: 10/0d583a1af23aeffea7748742cf22b6802458736fb8b60323ba5949763824d46f796474b0e1b9206beb716f9d75269e19dbd7795d6b038b29d561be95dd827381
-  languageName: node
-  linkType: hard
-
 "vary@npm:^1, vary@npm:^1.1.2, vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
@@ -7170,13 +6836,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yn@npm:3.1.1":
-  version: 3.1.1
-  resolution: "yn@npm:3.1.1"
-  checksum: 10/2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6
-  languageName: node
-  linkType: hard
-
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"
@@ -7202,15 +6861,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod-to-json-schema@npm:^3.24.5":
-  version: 3.24.6
-  resolution: "zod-to-json-schema@npm:3.24.6"
-  peerDependencies:
-    zod: ^3.24.1
-  checksum: 10/a2c30cf1f250aa79a7f975e65b4236d1abafafd63b43c43475057f28ce6e13f4c882391553c656fb426fd09665e6ae293c2439b4ed8600863beda43fb1a56922
-  languageName: node
-  linkType: hard
-
 "zod-to-json-schema@npm:^3.25.1":
   version: 3.25.2
   resolution: "zod-to-json-schema@npm:3.25.2"
@@ -7220,16 +6870,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.24.3":
-  version: 3.25.76
-  resolution: "zod@npm:3.25.76"
-  checksum: 10/f0c963ec40cd96858451d1690404d603d36507c1fc9682f2dae59ab38b578687d542708a7fdbf645f77926f78c9ed558f57c3d3aa226c285f798df0c4da16995
-  languageName: node
-  linkType: hard
-
 "zod@npm:^3.25 || ^4.0":
   version: 4.4.1
   resolution: "zod@npm:4.4.1"
   checksum: 10/e9c62dc846ed4c6ab5b062ffdc9ac7d38eadc41a921b71015f3a9d9ef6d3448c72ac93beb0015bd33d774e68e804e65840834101296950f5cbd7e3d64973f64c
   languageName: node
   linkType: hard
+
+"zod@npm:^4.0.0":
+  version: 4.4.3
+  resolution: "zod@npm:4.4.3"
+  checksum: 10/804b9a42aa8f35f2b3c5a8dff906291cb749115f83ee2afe3576d70b5b5c53c965365c7f4967690647a9c54af9838ff232a85ff9577a0a36c44b68bc6cdefe36
+  languageName: node
+  linkType: hard
diff --git a/.github/workflows/scripts/simulator-logging.sh b/.github/workflows/scripts/simulator-logging.sh
index 4c5d3e217a..379713a212 100755
--- a/.github/workflows/scripts/simulator-logging.sh
+++ b/.github/workflows/scripts/simulator-logging.sh
@@ -9,7 +9,7 @@ restart_simulator_logging() {
   local sim_app_log="${log_dir}/sim-app.log"
   local resource_log="${log_dir}/resource-monitor.log"
   local repo_root="${RNFB_REPO_ROOT:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)}"
-  local log_predicate='process == "testing" OR (process == "SpringBoard" AND eventMessage CONTAINS "invertase")'
+  local log_predicate='process == "testing" OR (process == "SpringBoard" AND eventMessage CONTAINS "invertase") OR eventMessage CONTAINS[c] "RNFBStorage" OR eventMessage CONTAINS[c] "FIRStorage" OR eventMessage CONTAINS[c] "StorageTask"'
 
   if ! xcrun simctl list devices booted 2>/dev/null | grep -q Booted; then
     echo "[boot-status] phase=log_streams skipped=no_booted_simulator"
diff --git a/.github/workflows/scripts/verify-firestore-indexes.sh b/.github/workflows/scripts/verify-firestore-indexes.sh
new file mode 100755
index 0000000000..cbff368719
--- /dev/null
+++ b/.github/workflows/scripts/verify-firestore-indexes.sh
@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Post-deploy verification for pipelines-e2e composite/search indexes.
+# Fails non-zero when expected index definitions are absent from cloud export.
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# shellcheck source=firebase-cli.sh
+source "$SCRIPT_DIR/firebase-cli.sh"
+
+PROJECT="${FIREBASE_PROJECT:-react-native-firebase-testing}"
+DATABASE="${FIRESTORE_VERIFY_DATABASE:-pipelines-e2e}"
+TMP_INDEXES="$(mktemp)"
+trap 'rm -f "$TMP_INDEXES"' EXIT
+
+MIN_FIREBASE_TOOLS_VERSION="${MIN_FIREBASE_TOOLS_VERSION:-15.17.0}"
+
+version_ge() {
+  local installed="$1"
+  local required="$2"
+  if [ "$(printf '%s\n' "$required" "$installed" | sort -V | head -n1)" != "$required" ]; then
+    return 1
+  fi
+  return 0
+}
+
+INSTALLED_VERSION="$("${FIREBASE_CMD[@]}" --version | tr -d '\r')"
+if ! version_ge "$INSTALLED_VERSION" "$MIN_FIREBASE_TOOLS_VERSION"; then
+  echo "❌ firebase-tools ${INSTALLED_VERSION} is below required ${MIN_FIREBASE_TOOLS_VERSION} (search index deploy)." >&2
+  exit 1
+fi
+
+echo "Verifying Firestore indexes for project=${PROJECT} database=${DATABASE} (firebase-tools ${INSTALLED_VERSION})"
+
+"${FIREBASE_CMD[@]}" use "$PROJECT" >/dev/null
+"${FIREBASE_CMD[@]}" firestore:indexes --project "$PROJECT" --database "$DATABASE" >"$TMP_INDEXES"
+
+# B2: full-text search composite on search-text/menu (not find-nearest vector index).
+if ! python3 - "$TMP_INDEXES" <<'PY'
+import json, sys
+path = sys.argv[1]
+with open(path) as f:
+    data = json.load(f)
+indexes = data.get("indexes") or []
+
+def has_search_menu_index(indexes):
+    for entry in indexes:
+        if entry.get("collectionGroup") != "search-text":
+            continue
+        for field in entry.get("fields") or []:
+            if field.get("fieldPath") != "menu":
+                continue
+            sc = field.get("searchConfig") or {}
+            specs = ((sc.get("textSpec") or {}).get("indexSpecs") or [])
+            for spec in specs:
+                if spec.get("indexType") == "TOKENIZED" and spec.get("matchType") == "MATCH_GLOBALLY":
+                    return True
+    return False
+
+if not has_search_menu_index(indexes):
+    print("Missing expected search-text/menu TOKENIZED MATCH_GLOBALLY searchConfig index in cloud export.", file=sys.stderr)
+    print("Triage: firebase-tools version, firestore.pipelines-e2e.indexes.json schema, index BUILDING state.", file=sys.stderr)
+    sys.exit(1)
+print("OK: search-text/menu search index present in cloud export.")
+PY
+then
+  exit 1
+fi
+
+# Optional: warn when vector find-nearest index missing (separate from search spine).
+if ! python3 - "$TMP_INDEXES" <<'PY'
+import json, sys
+path = sys.argv[1]
+with open(path) as f:
+    data = json.load(f)
+for entry in data.get("indexes") or []:
+    if entry.get("collectionGroup") == "find-nearest":
+        for field in entry.get("fields") or []:
+            if field.get("fieldPath") == "embedding" and field.get("vectorConfig"):
+                print("OK: find-nearest vector index present.")
+                sys.exit(0)
+print("WARN: find-nearest vector index not found in cloud export (may still be BUILDING).", file=sys.stderr)
+PY
+then
+  :
+fi
+
+echo "Firestore index verification passed."
diff --git a/.github/workflows/tests_e2e_ios.yml b/.github/workflows/tests_e2e_ios.yml
index b416f50275..1d3e04a482 100644
--- a/.github/workflows/tests_e2e_ios.yml
+++ b/.github/workflows/tests_e2e_ios.yml
@@ -357,11 +357,12 @@ jobs:
           command: RNFB_START_SIM_LOGS=0 ./.github/workflows/scripts/boot-simulator.sh
 
       - name: Start Simulator App Log
-        # One filtered sim log stream (testing + SpringBoard/invertase); optional sim video when record_screens.
+        # One filtered sim log stream (testing + SpringBoard/invertase + Storage); optional sim video when record_screens.
+        # RNFB_SIM_LOG_STDOUT=1 surfaces sim-app.log lines in the step log for iOS Storage diagnosis (B3.1).
         continue-on-error: true
         run: |
           chmod +x ./.github/workflows/scripts/boot-simulator.sh
-          RNFB_RECORD_SCREENS="${RNFB_RECORD_SCREENS}" RNFB_SIM_BOOT_MODE=logs ./.github/workflows/scripts/boot-simulator.sh
+          RNFB_RECORD_SCREENS="${RNFB_RECORD_SCREENS}" RNFB_SIM_BOOT_MODE=logs RNFB_SIM_LOG_STDOUT=1 ./.github/workflows/scripts/boot-simulator.sh
 
       - name: Wait for host load to settle
         continue-on-error: true
diff --git a/.spellcheck.dict.txt b/.spellcheck.dict.txt
index 4d7ed610e2..c07a72a573 100644
--- a/.spellcheck.dict.txt
+++ b/.spellcheck.dict.txt
@@ -5,6 +5,7 @@ AdMob
 AirPods
 analytics
 Analytics
+args
 ANR
 APIs
 APIs.
@@ -88,6 +89,7 @@ FirebaseApp
 FirebaseCore
 firestore
 Firestore
+FieldValue
 geospatial
 Geospatial
 freeform
@@ -138,6 +140,7 @@ macOS
 MDX
 mlkit
 MLKit
+microtask
 mono-repo
 multidex
 Multidex
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 894bf1ef8f..1cdf733628 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -48,3 +48,4 @@ npmPreapprovedPackages:
   - '@firebase/util@1.15.1'
   - '@react-native-firebase/*'
   - 'firebase@12.15.0' # If adopting recent firebase-js-sdk, specify directly here
+  - 'firebase-tools@15.22.4'
diff --git a/AGENTS.md b/AGENTS.md
index 66ab87c7a2..a2d05ab12b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -12,7 +12,7 @@
 - **Agent shell commands:** [agent-command-policy.md](okf-bundle/testing/agent-command-policy.md) only (allowlist). E2e additionally [running-e2e.md § agent rule](okf-bundle/testing/running-e2e.md#agent-rule-read-first).
 - Follow local package patterns; check `type-test.ts`, `__tests__/`, and plugin dirs before public API/platform changes.
 - Start with `okf-bundle/index.md` for repo-specific implementation/testing/maintenance knowledge.
-- **Change authoring:** [change-authoring-workflow.md](okf-bundle/testing/change-authoring-workflow.md) — baseline → unit-focused implementation → area-focused review → commit.
+- **Change authoring:** [change-authoring-workflow.md](okf-bundle/testing/change-authoring-workflow.md) — baseline → unit-focused implementation → area-focused review → commit; [**validation evidence**](okf-bundle/testing/change-authoring-workflow.md#validation-evidence-blocking) and [**coverage evidence**](okf-bundle/testing/coverage-design.md#coverage-evidence-package) required before gates close or push.
 - Use package indexes under `okf-bundle/packages/` for package-specific workflows and active work queues.
 - Follow `okf-bundle/documentation-policy.md`: durable knowledge in reference docs; ephemeral state only in explicit work queues; commits are documentation; single-commit PR titles must match the commit subject exactly.
 - Testing entry points: `okf-bundle/testing/index.md`; validation requirements: `okf-bundle/testing/validation-checklist.md`.
diff --git a/docs/firestore/pipelines/sdk-compatibility.mdx b/docs/firestore/pipelines/sdk-compatibility.mdx
index 555de99155..f8f424a08f 100644
--- a/docs/firestore/pipelines/sdk-compatibility.mdx
+++ b/docs/firestore/pipelines/sdk-compatibility.mdx
@@ -11,45 +11,25 @@ CI enforces parity through `yarn compare:types` and the `firestore-pipelines` al
 
 # Summary
 
-| Category                                                                    | Status                                                                |
-| --------------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| Core pipeline builder (`pipeline()`, stages, `execute()`)                   | **Supported** on Android, iOS, and macOS                              |
-| Expression helpers (aggregates, strings, arrays, maps, timestamps, vectors) | **Mostly supported** — see gaps below                                 |
-| Newer firebase-js-sdk helpers (2025–2026)                                   | **Partial** — tracked in "Not yet available"                          |
-| firebase-js-sdk `Type` export                                               | **React Native Firebase only** — use `isType()` with our `Type` union |
+| Category                                                                    | Status                                   |
+| --------------------------------------------------------------------------- | ---------------------------------------- |
+| Core pipeline builder (`pipeline()`, stages, `execute()`)                   | **Supported** on Android, iOS, and macOS |
+| Expression helpers (aggregates, strings, arrays, maps, timestamps, vectors) | **Supported** on Android, iOS, and macOS |
+| Current firebase-js-sdk pipeline exports                                    | **Supported** through compare-types      |
 
 # Not yet available in React Native Firebase
 
-These firebase-js-sdk pipeline exports are **not** exposed yet. They are listed in the repository compare-types allowlist until implemented:
+All pipeline exports currently tracked in the compare-types allowlist are supported. Check release notes when upgrading for newly added firebase-js-sdk pipeline APIs.
 
-| Export               | Kind       | Notes                                              |
-| -------------------- | ---------- | -------------------------------------------------- |
-| `documentMatches`    | Expression | Document matching helper (requires `search` stage) |
-| `geoDistance`        | Expression | Geospatial distance (requires `search` stage)      |
-| `score`              | Expression | Full-text search score                             |
-| `parent`             | Stage      | Parent document stage                              |
-| `DefineStageOptions` | Type       | Options for define stage                           |
-| `SearchStageOptions` | Type       | Full-text search stage options                     |
+## Platform notes
 
-If you depend on one of these, follow [Firebase pipeline release notes](https://firebase.google.com/support/release-notes/js) and React Native Firebase changelogs, or open a feature request with your use case.
-
-# Same name, slightly different shape
+Compare-types parity does not guarantee identical runtime behavior on every target. The `parent()` expression helper may be unavailable on web and on macOS when pipelines execute through the firebase-js-sdk interop path (**P-036**). Pipelines that use the search stage with text matching need a deployed composite search index on the Enterprise `pipelines-e2e` database used in CI (**P-035**); native iOS and Android e2e cover search after that index is deployed. The `geoDistance` helper is covered for types and serialization; dedicated runtime e2e is deferred because native platforms lower it through the generic function path. Maintainer drift IDs and e2e expectations are tracked in [`okf-bundle/packages/firestore/pipeline-platform-parity.md`](https://github.com/invertase/react-native-firebase/blob/main/okf-bundle/packages/firestore/pipeline-platform-parity.md).
 
-These exports exist in both SDKs but differ in typing or optional parameters:
-
-| Export            | Difference                                                            |
-| ----------------- | --------------------------------------------------------------------- |
-| `timestampDiff`   | Declaration overload ordering differs; all four SDK shapes supported  |
-| `constant`        | firebase-js-sdk added optional `preferIntegers`; not yet on RNFB      |
-| `isType`          | RNFB accepts the local `Type` alias; JS SDK accepts a broader string  |
-| `StageOptions`    | Equivalent runtime shape; declaration formatting differs              |
-| `TimeGranularity` | RNFB uses `isoWeek` / `isoYear`; JS SDK also lists lowercase variants |
+If you depend on one of these, follow [Firebase pipeline release notes](https://firebase.google.com/support/release-notes/js) and React Native Firebase changelogs, or open a feature request with your use case.
 
-# React Native Firebase only
+# Type-shape parity
 
-| Export | Notes                                                                   |
-| ------ | ----------------------------------------------------------------------- |
-| `Type` | Local type discriminator union used with `isType()` and related helpers |
+The current `firestore-pipelines` compare-types config has no `differentShape` entries. `StageOptions`, `TimeGranularity`, `isType`, and `timestampDiff` now match the firebase-js-sdk declarations, including the lowercase `isoweek` and `isoyear` time granularity literals.
 
 # Platform execution matrix
 
diff --git a/docs/migrating-to-v26.mdx b/docs/migrating-to-v26.mdx
index 67718dda7c..1d834a1b52 100644
--- a/docs/migrating-to-v26.mdx
+++ b/docs/migrating-to-v26.mdx
@@ -12,6 +12,8 @@ If you are upgrading from v24 or earlier, complete [Migrating to v25](/migrating
 ## Table of contents
 
 - [New Architecture requirement](/migrating-to-v26#new-architecture-requirement)
+- [Platform behavior differences](/migrating-to-v26#platform-behavior-differences)
+- [firebase-js-sdk API parity improvements](/migrating-to-v26#firebase-js-sdk-api-parity-improvements)
 - [General pattern](/migrating-to-v26#general-pattern)
 - [App](/migrating-to-v26#app)
 - [Machine Learning (ML)](/migrating-to-v26#machine-learning-ml)
@@ -81,22 +83,90 @@ Native builds fail early with explicit guards:
 
 When migrating from firebase-js-sdk web examples, watch for these high-impact runtime divergences:
 
-| Area                          | firebase-js-sdk (web)                                                                                                                        | React Native Firebase                                                                                                                                                                                                                                                                      |
-| ----------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **Auth**                      | Browser persistence, redirects, reCAPTCHA, `revokeAccessToken`, `useDeviceLanguage`, `linkWithPhoneNumber` / `reauthenticateWithPhoneNumber` | Native iOS/Android SDKs manage persistence. Several web-only helpers **throw synchronously** on React Native (`setPersistence`, `getRedirectResult`, `revokeAccessToken`, `useDeviceLanguage`, `linkWithPhoneNumber`, `reauthenticateWithPhoneNumber`). Use native provider flows instead. |
-| **Analytics**                 | Cross-platform modular API                                                                                                                   | On-device conversion measurement helpers (`initiateOnDeviceConversionMeasurement*`) are **iOS only**; on Android and web the JS layer resolves without calling native (no-op). `logTransaction` (verified iOS in-app purchase events) is **iOS only** and **rejects** on other platforms.  |
-| **Realtime Database**         | `goOnline` / `goOffline` are synchronous; web transport toggles                                                                              | `goOnline` / `goOffline` are **synchronous** through TurboModules, matching firebase-js-sdk. `getServerTime`, `setPersistenceEnabled`, and `setPersistenceCacheSizeBytes` are RN-specific. `forceLongPolling` / `forceWebSockets` **throw** — transport is native-controlled.              |
-| **Phone Number Verification** | N/A (Android SDK only)                                                                                                                       | **Android only** — all entry points throw on iOS and Web.                                                                                                                                                                                                                                  |
-| **Cloud Storage**             | `uploadBytes` / `uploadString` from JS blobs                                                                                                 | `putFile` and `writeToFile` are **native-only** file-path APIs with no firebase-js-sdk equivalent. Retry-time setters are modular functions on RN, not instance properties.                                                                                                                |
-| **Cloud Messaging**           | Web push / service-worker surface                                                                                                            | FCM token lifecycle, permissions, background handlers, and **APNs token APIs are iOS only**. Event delivery still uses the legacy native event proxy during the TurboModule migration; behavior matches pre-v26 releases but will change when Codegen events land in a future release.     |
-| **Remote Config**             | `reset()` clears server and local state                                                                                                      | `reset()` is **Android only** — iOS does not clear activated, fetched, or default Remote Config values. `setDefaultsFromResource` loads from native resource files (`.plist` / XML).                                                                                                       |
-| **Performance**               | `initializePerformance` returns synchronously; trace `start`/`stop` are sync                                                                 | `initializePerformance` is **synchronous** on RN (applies settings to the native instance). Trace, HTTP metric, and screen trace `start`/`stop` are **synchronous** through TurboModules, matching firebase-js-sdk.                                                                        |
-| **Firestore**                 | IndexedDB persistence, `memoryLocalCache`, `persistentLocalCache`                                                                            | Local cache factories and IndexedDB APIs are **web only**. Persistence is controlled by the native Firestore SDK. `initializeFirestore` is **async** on RN.                                                                                                                                |
-| **App Check**                 | reCAPTCHA version 3 / Enterprise web providers                                                                                               | Use `ReactNativeFirebaseAppCheckProvider` for Device Check, App Attest, Play Integrity, etc. Web reCAPTCHA provider classes have **no RN equivalent**.                                                                                                                                     |
-| **RN-native-only modules**    | No web SDK                                                                                                                                   | `crashlytics`, `in-app-messaging`, `app-distribution`, and `ml` are **React Native only** — no firebase-js-sdk modular surface.                                                                                                                                                            |
+{/* prettier-ignore */}
+| Area | firebase-js-sdk (web) | React Native Firebase |
+| --- | --- | --- |
+| **Auth** | Browser persistence, redirects, reCAPTCHA, `revokeAccessToken`, `useDeviceLanguage`, `linkWithPhoneNumber` / `reauthenticateWithPhoneNumber` | Native iOS/Android SDKs manage persistence. Several web-only helpers **throw synchronously** on React Native (`setPersistence`, `getRedirectResult`, `revokeAccessToken`, `useDeviceLanguage`, `linkWithPhoneNumber`, `reauthenticateWithPhoneNumber`). Use native provider flows instead. |
+| **Analytics** | Cross-platform modular API | On-device conversion measurement helpers (`initiateOnDeviceConversionMeasurement*`) are **iOS only**; on Android and web the JS layer resolves without calling native (no-op). `logTransaction` (verified iOS in-app purchase events) is **iOS only** and **rejects** on other platforms. |
+| **Realtime Database** | `goOnline` / `goOffline` are synchronous; web transport toggles | `goOnline` / `goOffline` are **synchronous** through TurboModules, matching firebase-js-sdk. `getServerTime`, `setPersistenceEnabled`, and `setPersistenceCacheSizeBytes` are RN-specific. `forceLongPolling` / `forceWebSockets` **throw** — transport is native-controlled. |
+| **Phone Number Verification** | N/A (Android SDK only) | **Android only** — all entry points throw on iOS and Web. |
+| **Cloud Storage** | `uploadBytes` / `uploadString` from JS blobs; upload task controls return sync `boolean` | `putFile` and `writeToFile` are **native-only** file-path APIs. `UploadTask.pause()` / `.resume()` / `.cancel()` also return sync `boolean` values through native TurboModules. |
+| **Cloud Messaging** | Web push / service-worker surface | FCM token lifecycle, permissions, background handlers, and **APNs token APIs are iOS only**. Event delivery still uses the legacy native event proxy during the TurboModule migration; behavior matches pre-v26 releases but will change when Codegen events land in a future release. |
+| **Remote Config** | `reset()` clears server and local state | `reset()` is **Android only** — iOS does not clear activated, fetched, or default Remote Config values. `setDefaultsFromResource` loads from native resource files (`.plist` / XML). |
+| **Performance** | `initializePerformance` returns synchronously; trace `start`/`stop` are sync | `initializePerformance` is **synchronous** on RN (applies settings to the native instance). Trace, HTTP metric, and screen trace `start`/`stop` are **synchronous** through TurboModules, matching firebase-js-sdk. |
+| **Firestore** | IndexedDB persistence, `memoryLocalCache`, `persistentLocalCache`, FieldValue `maximum()` / `minimum()` sentinels | Local cache factories and IndexedDB APIs are **web only**. Persistence is controlled by the native Firestore SDK. `initializeFirestore` returns **`Firestore` synchronously**. FieldValue `maximum()` / `minimum()` are not exported yet because iOS SDK 12.15.0 lacks matching native factories. |
+| **App Check** | reCAPTCHA version 3 / Enterprise web providers | Use `ReactNativeFirebaseAppCheckProvider` for Device Check, App Attest, Play Integrity, etc. Web reCAPTCHA provider classes have **no RN equivalent**. |
+| **RN-native-only modules** | No web SDK | `crashlytics`, `in-app-messaging`, `app-distribution`, and `ml` are **React Native only** — no firebase-js-sdk modular surface. |
 
 Per-package notes also appear in each module's [usage](/) page under **Platform support**.
 
+## firebase-js-sdk API parity improvements
+
+v26 aligns React Native Firebase modular types and several runtime signatures with **firebase-js-sdk** where TurboModules removed bridge-forced `Promise` wrappers. Use this section when porting web SDK examples or when scripted upgrades hit TypeScript or runtime errors.
+
+**Migration rule:** If a method below is **sync**, remove `await` and any `.then()` / `.catch()` chain on its return value — sync APIs return `void` or a value directly; calling `.then()` on `void` throws at runtime.
+
+### Synchronous APIs enabled by TurboModules
+
+{/* prettier-ignore */}
+| Method | Before (pre-v26 / legacy bridge) | After (v26) | Notes |
+| ------ | -------------------------------- | ----------- | ----- |
+| `registerVersion(library, version, variant?)` | `Promise<void>` (web) | `void` — throws on RN | Web-only on RN; remove `await` if copied from web samples |
+| `isSignInWithEmailLink(auth, emailLink)` | `Promise<boolean>` | `boolean` | Remove `await` |
+| `TotpSecret.generateQrCodeUrl(accountName?, issuer?)` | `Promise<string>` | `string` | Remove `await`; omitted args default from current user / app name |
+| `trace(…).start()` / `.stop()` | `Promise<null>` | `void` | Remove `await` on perf trace lifecycle |
+| `httpMetric(…).start()` / `.stop()` | `Promise<null>` | `void` | Same as traces |
+| `ScreenTrace.start()` / `.stop()` | `Promise<null>` | `void` | Same as traces |
+| `startScreenTrace(performance, screenName)` | `Promise<ScreenTrace>` | `ScreenTrace` | Remove `await` |
+| `goOnline(db)` / `goOffline(db)` | `Promise<void>` | `void` | Remove `await` |
+| `UploadTask.pause()` / `.resume()` / `.cancel()` | `Promise<boolean>` | `boolean` | Remove `await`; use the returned boolean directly |
+
+### Type parity improvements
+
+{/* prettier-ignore */}
+| Export / method | Before | After | Notes |
+| --------------- | ------ | ----- | ----- |
+| `onSnapshotsInSync(firestore, observer)` | `next?: () => void`; `error?: Error` | `next?: (value: void) => void`; `error?: FirestoreError` | Callback overload `onSnapshotsInSync(firestore, () => {})` unchanged |
+| `uploadBytes(ref, data, metadata?)` | Return type `TaskResult` | `UploadResult` | Alias rename only |
+| `uploadBytesResumable(ref, data, metadata?)` | Return type `Task` | `UploadTask` | Alias rename only |
+| Storage / Remote Config error callbacks | `NativeFirebaseError` | `FirebaseError` / `StorageError` | `NativeFirebaseError` remains assignable to `FirebaseError` |
+| `AppCheckTokenListener` | Not exported | Exported type alias | Matches firebase-js-sdk observer typing |
+| `FunctionsError`, `FunctionsErrorCodeCore` | Missing or misaligned | Exported / aligned | Registry + compare-types config |
+| `firestore/pipelines` (`StageOptions`, `TimeGranularity`, `isType`, …) | Declaration drift | Aligned to SDK `.d.ts` | Type-only; no call-shape change |
+
+### Synchronous modular return values
+
+{/* prettier-ignore */}
+| Method | Before | After | Notes |
+| ------ | ------ | ----- | ----- |
+| `logEvent(analytics, …)` | `Promise<void>` | `void` | Fire-and-forget; remove `await` / `.then()` |
+| `initializeAppCheck(app?, options?)` | `Promise<AppCheck>` | `AppCheck` | Returns handle immediately; provider setup continues natively |
+| `initializeFirestore(app, settings, databaseId?)` | `Promise<Firestore>` | `Firestore` | Returns instance immediately; `settings()` runs on native bridge |
+| `getRemoteConfig(app?, options?)` | `(app?)` only | `(app?, options?: RemoteConfigOptions)` | `options` accepted for parity; no-op on native |
+| `aggregateFieldEqual()` | Not exported | Exported | Aggregate query helper |
+| `LastFetchStatus` literals | — | — | **Unchanged** — native still uses `no_fetch_yet` / `throttled` (documented drift) |
+
+### Firestore parity additions
+
+{/* prettier-ignore */}
+| Export / method | Before | After | Notes |
+| --------------- | ------ | ----- | ----- |
+| `TransactionOptions` | Not exported | Exported | Type for transaction retry options |
+| `runTransaction(firestore, updateFunction, options?)` | No options argument | Accepts `options?: TransactionOptions` | `{ maxAttempts?: number }` on native iOS and Android; omitted options use the SDK default of **5** retries; explicit values **&lt; 1** throw `Max attempts must be at least 1` (firebase-js-sdk parity) |
+| `aggregateQuerySnapshotEqual()` | Not exported | Exported | Aggregate query snapshot equality helper, alongside `aggregateFieldEqual()` |
+| `maximum(n)` / `minimum(n)` FieldValue sentinels | Exported by firebase-js-sdk 12.15.0 | Not exported by RNFB yet | Android SDK 34.15.0 has native factories, but iOS Firebase Firestore SDK 12.15.0 does not; RNFB waits for cross-platform parity |
+
+### Observer and Promise pitfalls
+
+{/* prettier-ignore */}
+| Pitfall | Symptom | Fix |
+| ------- | ------- | --- |
+| `.then()` on sync API | `TypeError: … .then is not a function` | Use direct call: `logEvent(…)` not `logEvent(…).then(…)` |
+| `await` on sync API | Unnecessary microtask delay; misleading types in strict TS | Drop `await` where the table above marks the API sync |
+| `onConfigUpdate(remoteConfig, observer)` | Runtime throw: observer must include **both** `next` and `error` functions | Pass `{ next: (update) => {…}, error: (err) => {…} }` — do not omit `error` |
+| `onSnapshotsInSync` observer form | Type error on `error` callback | Type `error` as `(error: FirestoreError) => void`, or use the `() => void` callback overload |
+| `runTransaction(..., { maxAttempts: 0 })` or negative | Runtime throw: `Max attempts must be at least 1` | Omit `options` for the default **5** attempts, or pass `maxAttempts: 1` or higher |
+
 ## General pattern
 
 For each package listed in this guide:
@@ -420,6 +490,10 @@ The namespaced API for `@react-native-firebase/app-check` has been **removed**.
 | `FirebaseAppCheckTypes`     | Import `AppCheck`, `AppCheckTokenResult`, etc. from package root |
 | `appCheck().getToken()`     | `getToken(appCheck, forceRefresh?)`                              |
 
+## Signature changes
+
+- `initializeAppCheck(app?, options?)` returns `AppCheck` synchronously (previously `Promise<AppCheck>`). Native provider setup continues in the background — remove `await` and do not chain `.then()`.
+
 # Analytics
 
 The namespaced API for `@react-native-firebase/analytics` has been **removed**. This package is **modular-only** — use `getAnalytics()` and root-level helper functions.
@@ -437,6 +511,10 @@ Analytics supports only the **default Firebase app** (same as before). Calling `
 | `analytics().setUserId(...)` etc.                            | `setUserId(analytics, ...)`, `setConsent(analytics, ...)`, etc.                        |
 | Deprecated helper events (`logScreenView`, `logPurchase`, …) | Still exported as modular helpers; prefer `logEvent(analytics, 'screen_view', params)` |
 
+## Signature changes
+
+- `logEvent(analytics, …)` returns `void` synchronously (previously `Promise<void>`). Remove `await` and `.then()` chains.
+
 ## Example
 
 ```js
@@ -453,7 +531,7 @@ await analytics().setUserId('user-123');
 import { getAnalytics, logEvent, setUserId } from '@react-native-firebase/analytics';
 
 const analytics = getAnalytics();
-await logEvent(analytics, 'screen_view', { screen_name: 'Home' });
+logEvent(analytics, 'screen_view', { screen_name: 'Home' });
 await setUserId(analytics, 'user-123');
 ```
 
@@ -552,6 +630,11 @@ The namespaced API for `@react-native-firebase/storage` has been **removed**. Th
 | `storage().ref()`          | `ref(storage, path?)`                                                |
 | `storageRef.put()`         | `uploadBytesResumable(storageRef, data, metadata?)`                  |
 
+## Signature changes
+
+- `UploadTask.pause()`, `UploadTask.resume()`, and `UploadTask.cancel()` now return `boolean` synchronously (previously `Promise<boolean>`), matching firebase-js-sdk task semantics. Remove `await`, `.then()`, and `.catch()` from these control calls and use the returned boolean directly.
+- `cancel()` delegates to the native SDK. Android cancels active uploads; iOS active-upload cancel follows the current Firebase Storage iOS SDK 12.15.0 behavior tracked in [firebase-ios-sdk#16353](https://github.com/firebase/firebase-ios-sdk/issues/16353).
+
 # Authentication
 
 The namespaced API for `@react-native-firebase/auth` has been **removed**. This package is **modular-only** — use `getAuth()` / `initializeAuth()` and root-level helper functions.
@@ -606,12 +689,19 @@ The namespaced API for `@react-native-firebase/firestore` has been **removed**.
 | `firestore().collection(...)`                  | `collection(getFirestore(), ...)`                                                     |
 | `firestore().doc(...)`                         | `doc(getFirestore(), ...)`                                                            |
 | `firestore().batch()`                          | `writeBatch(getFirestore())`                                                          |
-| `firestore().runTransaction(...)`              | `runTransaction(getFirestore(), ...)`                                                 |
+| `firestore().runTransaction(...)`              | `runTransaction(getFirestore(), updateFunction, options?)`                            |
 | `firestore().useEmulator(...)`                 | `connectFirestoreEmulator(getFirestore(), ...)`                                       |
 | `firestore().settings(...)`                    | `initializeFirestore(app, settings, databaseId?)`                                     |
 | `firestore.FieldValue` / `firestore.Timestamp` | `FieldValue`, `Timestamp`, `FieldPath`, `Bytes`, `GeoPoint`, `Filter` (named exports) |
 | `firestore.Blob`                               | `Bytes`                                                                               |
 
+## Signature changes
+
+- `initializeFirestore(app, settings, databaseId?)` returns `Firestore` synchronously (previously `Promise<Firestore>`). Remove `await` and `.then()`; settings apply on the native bridge after return.
+- `TransactionOptions` is now exported. `runTransaction(firestore, updateFunction, options?)` accepts `{ maxAttempts?: number }` and passes the retry limit to the native iOS and Android Firestore SDKs. When `options` is omitted, the native default applies (**5** attempts, matching [firebase-js-sdk `runTransaction`](https://firebase.google.com/docs/reference/js/firestore_.md#runtransaction)). When `maxAttempts` is provided explicitly, values below **1** throw synchronously with `Max attempts must be at least 1` — the same validation as firebase-js-sdk.
+- `aggregateFieldEqual()` and `aggregateQuerySnapshotEqual()` are now exported for aggregate query equality checks (firebase-js-sdk parity).
+- FieldValue `maximum(n)` and `minimum(n)` sentinels from firebase-js-sdk 12.15.0 are not exported yet. Android Firebase Firestore SDK 34.15.0 supports them, but iOS Firebase Firestore SDK 12.15.0 does not expose matching `FIRFieldValue` factories, so React Native Firebase waits for cross-platform support.
+
 ## Example
 
 ```js
@@ -676,6 +766,8 @@ For each modular-only package you use:
 | `storage`          | `firebase.storage()`, default `storage()`, `FirebaseStorageTypes`, instance/reference methods                                        | `getStorage()`, `ref`, `uploadBytesResumable`, `getDownloadURL`, `connectStorageEmulator`, `StringFormat`, `TaskEvent`, `TaskState`                            |
 | `firestore`        | `firebase.firestore()`, default `firestore()`, `FirebaseFirestoreTypes`, instance methods                                            | `getFirestore()`, `doc`, `collection`, `setDoc`, `writeBatch`, `runTransaction`, `connectFirestoreEmulator`, `FieldValue`, `Timestamp`, `Bytes`, `SDK_VERSION` |
 
+Also remove `await`, `.then()`, and `.catch()` from `UploadTask.pause()`, `UploadTask.resume()`, and `UploadTask.cancel()`. For Firestore transactions, import `TransactionOptions` when you pass `{ maxAttempts }` (omit `options` for the default **5** retries; do not pass `0` or negative values). Import `aggregateFieldEqual()` / `aggregateQuerySnapshotEqual()` for aggregate equality checks.
+
 ## 3. Validate
 
 ```bash
diff --git a/jest.setup.ts b/jest.setup.ts
index 2d6c25fb4f..66d3ecea4f 100644
--- a/jest.setup.ts
+++ b/jest.setup.ts
@@ -608,7 +608,7 @@ jest.doMock('react-native', () => {
           updateMetadata: jest.fn(() => Promise.resolve({})),
           writeToFile: jest.fn(() => Promise.resolve()),
           putFile: jest.fn(() => Promise.resolve()),
-          setTaskStatus: jest.fn(() => Promise.resolve()),
+          setTaskStatus: jest.fn(() => true),
           list: jest.fn(() => Promise.resolve({ items: [], prefixes: [], pageToken: null })),
           listAll: jest.fn(() => Promise.resolve({ items: [], prefixes: [], pageToken: null })),
         },
@@ -627,7 +627,7 @@ jest.doMock('react-native', () => {
           updateMetadata: jest.fn(() => Promise.resolve({})),
           writeToFile: jest.fn(() => Promise.resolve()),
           putFile: jest.fn(() => Promise.resolve()),
-          setTaskStatus: jest.fn(() => Promise.resolve()),
+          setTaskStatus: jest.fn(() => true),
           list: jest.fn(() => Promise.resolve({ items: [], prefixes: [], pageToken: null })),
           listAll: jest.fn(() => Promise.resolve({ items: [], prefixes: [], pageToken: null })),
         },
diff --git a/okf-bundle/documentation-policy.md b/okf-bundle/documentation-policy.md
index 72e2fb3654..88b65ca904 100644
--- a/okf-bundle/documentation-policy.md
+++ b/okf-bundle/documentation-policy.md
@@ -44,7 +44,7 @@ Confirm:
 
 | Check | Requirement |
 |-------|-------------|
-| **Canonical location** | Each topic has one owning doc; others link to it ([agent command policy](testing/agent-command-policy.md) for **all** agent shell commands; [change authoring](testing/change-authoring-workflow.md) for workflow/gates/frozen tree; [running e2e](testing/running-e2e.md) for e2e `yarn tests:*` detail — [agent rule](testing/running-e2e.md#agent-rule-read-first); [platform coverage gate](testing/running-e2e.md#platform-coverage-gate-blocking); [iteration vocabulary](testing/iteration-vocabulary.md) for term ids only; [documentation site maintenance](documentation-site-maintenance.md) for `docs.json`, TypeDoc, and legacy redirect audits; this file for doc/commit policy, etc.) |
+| **Canonical location** | Each topic has one owning doc; others link to it ([agent command policy](testing/agent-command-policy.md) for **all** agent shell commands; [change authoring](testing/change-authoring-workflow.md) for workflow/gates/frozen tree; [change authoring § validation evidence (blocking)](testing/change-authoring-workflow.md#validation-evidence-blocking); [running e2e](testing/running-e2e.md) for e2e `yarn tests:*` detail — [agent rule](testing/running-e2e.md#agent-rule-read-first); [platform coverage gate](testing/running-e2e.md#platform-coverage-gate-blocking); [iteration vocabulary](testing/iteration-vocabulary.md) for term ids only; [change authoring § quality standards](testing/change-authoring-workflow.md#quality-standards) for the review-findings resolution rule and the intractable-limitation bar; [compare-types README § justification bar](../.github/scripts/compare-types/README.md#justification-bar) for firebase-js-sdk type/API drift justification; [coverage design § expectations](testing/coverage-design.md#coverage-expectations-policy); [coverage design § evidence package](testing/coverage-design.md#coverage-evidence-package) for coverage completion evidence; [documentation site maintenance](documentation-site-maintenance.md) for `docs.json`, TypeDoc, and legacy redirect audits; this file for doc/commit policy, etc.) |
 | **DRY** | No duplicated procedures, policy paragraphs, or ephemeral snapshots outside work queues |
 | **Link hygiene** | Cross-links resolve; indexes list canonical entry points |
 | **Durability** | No ephemeral fields leaked into general reference docs |
diff --git a/okf-bundle/index.md b/okf-bundle/index.md
index 9ddff16c09..8dc72f5fd5 100644
--- a/okf-bundle/index.md
+++ b/okf-bundle/index.md
@@ -14,7 +14,7 @@ okf_version: "0.1"
 # Testing
 
 * [Agent command policy](/testing/agent-command-policy.md) — allowlisted shell commands for agents (install, prepare, validation, e2e)
-* [Change authoring workflow](/testing/change-authoring-workflow.md) — verified product change loop (unit-focused → area-focused review → commit)
+* [Change authoring workflow](/testing/change-authoring-workflow.md) — verified product change loop (unit-focused → area-focused review → commit); [§ validation evidence (blocking)](testing/change-authoring-workflow.md#validation-evidence-blocking); [coverage evidence package](testing/coverage-design.md#coverage-evidence-package)
 * [Iteration vocabulary](/testing/iteration-vocabulary.md) — work type, tier, and queue field identifiers
 * [Running e2e tests](/testing/running-e2e.md) — canonical e2e commands, narrowing, environment, diagnosis
 * [Validation checklist](/testing/validation-checklist.md) — compile, Jest, lint, `compare:types`, e2e, coverage
diff --git a/okf-bundle/namespace-api-removal-work-queue.md b/okf-bundle/namespace-api-removal-work-queue.md
index e468d7d6e2..e6768e8abc 100644
--- a/okf-bundle/namespace-api-removal-work-queue.md
+++ b/okf-bundle/namespace-api-removal-work-queue.md
@@ -56,7 +56,7 @@ Each module follows **one** serial loop. Work types: [change authoring workflow
 | **3** | `implementation` | `implementation` | [Workflow checklist](namespace-api-removal-workflow.md#per-module-implementation); **unit-focused** tier; `.only` OK locally; **no commit** |
 | **4** | `independent-review` | `review` | **Frozen tree**; **area-focused** tier; removal greps; minor/nit → remediation + delta re-review |
 | **5** | `documentation` | — | Migration guide + OKF if durable learnings |
-| **6** | `commit` | `commit` | Set `commit_subject`, close gates in queue doc, stage queue **with** product commit; one focused commit |
+| **6** | `commit` | `commit` | [Validation evidence package](testing/validation-checklist.md#validation-evidence-package) recorded; set `commit_subject`, close gates in queue doc, stage queue **with** product commit; one focused commit |
 
 ---
 
diff --git a/okf-bundle/namespace-api-removal-workflow.md b/okf-bundle/namespace-api-removal-workflow.md
index 95bd6d9ba4..a6c6388575 100644
--- a/okf-bundle/namespace-api-removal-workflow.md
+++ b/okf-bundle/namespace-api-removal-workflow.md
@@ -90,7 +90,7 @@ Complete modular-only checklist (one focused commit scope):
 
 ## Per-module `independent-review`
 
-On a **frozen tree** — [change authoring § independent-review](testing/change-authoring-workflow.md#independent-review), plus removal greps and module-specific **area-focused** e2e on [**every required platform**](testing/running-e2e.md#platform-coverage-gate-blocking) (no `.only`; **no Android/macOS shortcuts**). Minor/nit findings: fix or defer-with-rationale, then delta re-review before `commit`.
+On a **frozen tree** — [change authoring § independent-review](testing/change-authoring-workflow.md#independent-review), plus removal greps and module-specific **area-focused** e2e on [**every required platform**](testing/running-e2e.md#platform-coverage-gate-blocking) (no `.only`; **no Android/macOS shortcuts**). Resolve **every** finding, including minor/nit — fix it, or record a user-accepted [exception](testing/change-authoring-workflow.md#acceptable-exceptions) ([review findings](testing/change-authoring-workflow.md#review-findings--resolve-do-not-defer)); no self-authorized deferral — then delta re-review before `commit`.
 
 ## Module area harness
 
@@ -112,9 +112,10 @@ refactor(<module>): remove deprecated namespaced API
 
 Before `git commit`:
 
-1. Set the queue row's `commit_subject` to that exact line (replace `<module>`).
-2. Close `commit_gate` and update the header/next-pickup line in [namespace API removal work queue](namespace-api-removal-work-queue.md).
-3. Stage product, user docs, durable OKF learnings, **and** the queue doc together — one commit.
+1. [Validation evidence package](testing/validation-checklist.md#validation-evidence-package) recorded; [coverage evidence package](testing/coverage-design.md#coverage-evidence-package) when lib/native bridge touched.
+2. Set the queue row's `commit_subject` to that exact line (replace `<module>`).
+3. Close `commit_gate` and update the header/next-pickup line in [namespace API removal work queue](namespace-api-removal-work-queue.md).
+4. Stage product, user docs, durable OKF learnings, **and** the queue doc together — one commit.
 
 **Never stage:** area narrowing, any `.only`, ad-hoc harness edits, or **`RNFBDebug = true`** in `tests/globals.js`.
 
diff --git a/okf-bundle/new-architecture/migration-work-queue.md b/okf-bundle/new-architecture/migration-work-queue.md
index 3995fa7f51..469d831023 100644
--- a/okf-bundle/new-architecture/migration-work-queue.md
+++ b/okf-bundle/new-architecture/migration-work-queue.md
@@ -355,7 +355,7 @@ Each package (or one legacy module within a multi-module package) follows **one*
 | **3** | `implementation` | `implementation` | Spec, codegen, native, JS; Jest + **unit-focused** tier on **every required platform** when native bridge touched ([platform coverage gate](../testing/running-e2e.md#platform-coverage-gate-blocking)); handoff includes e2e platform matrix or env blocker — Jest-only insufficient; `.only` / area narrowing OK locally; **no commit** |
 | **4** | `independent-review` | `review` | **Frozen tree**; **area-focused** tier; no `.only`; [area harness](turbomodule-implementation-workflow.md#turbomodule-area-harness); serial [host rule](../testing/change-authoring-workflow.md#host-rule) |
 | **5** | `documentation` | — | User docs + durable OKF when applicable |
-| **6** | `commit` | `commit` | One focused commit only after `review_gate` closed |
+| **6** | `commit` | `commit` | One focused commit only after `review_gate` closed **with** [validation/coverage evidence](../testing/validation-checklist.md#validation-evidence-package) recorded |
 
 Canonical commands: [validation checklist](../testing/validation-checklist.md), [serialized dispatch](../testing/running-e2e.md#serialized-e2e-dispatch).
 
diff --git a/okf-bundle/new-architecture/turbomodule-implementation-workflow.md b/okf-bundle/new-architecture/turbomodule-implementation-workflow.md
index 552696edff..00d38dc6a3 100644
--- a/okf-bundle/new-architecture/turbomodule-implementation-workflow.md
+++ b/okf-bundle/new-architecture/turbomodule-implementation-workflow.md
@@ -211,7 +211,7 @@ Runs **after** every native package is on TurboModules (Phases 0–5), **before*
 
 **Completion signal (per package):** the corresponding async-vs-sync entry is removed from the package's `compare:types` config and `yarn compare:types` is clean for that package ([validation checklist § type parity](../testing/validation-checklist.md#api-reference-and-type-parity)).
 
-**Caution:** sync across JSI runs on the JS thread — never convert a method that does real I/O. When unsure, keep it async; over-converting is a perf/ANR risk, under-converting is harmless.
+**Caution:** sync across JSI runs on the JS thread — never convert a method that does real I/O. When unsure, keep it async: over-converting is a perf/ANR risk; under-converting keeps the correct async signature but leaves a documented async→sync parity gap tracked in `compare:types` until resolved.
 
 ## TurboModule `documentation`
 
@@ -237,6 +237,8 @@ Breaking change (`!`): TurboModule migration requires New Architecture; legacy b
 
 **Never stage:** `tests/harness.overrides.js`, any `.only`, temporary sub-suite edits in `tests/app.js`.
 
+Before `git commit`: [validation evidence package](../../testing/validation-checklist.md#validation-evidence-package) recorded; [coverage evidence package](../../testing/coverage-design.md#coverage-evidence-package) when lib/native bridge touched ([change authoring § commit](../../testing/change-authoring-workflow.md#commit)).
+
 ## Gotchas
 
 * **macOS / web turbo name registration** — [`nativeModuleWeb.ts`](../../../packages/app/lib/internal/nativeModuleWeb.ts) registers JS-SDK shims by module name in the **registry object initializer** (not deferred to bottom-of-file calls) so `NativeRNFBTurbo*` names exist before `RNFBNativeEventEmitter` instantiates during circular imports. When [`APP_NATIVE_MODULE`](../../../packages/app/lib/internal/constants.ts) changes ([NewArch-AD-2](architecture-decisions.md#newarch-ad-2--naming-nativernfbturbo--accepted)), register **both** legacy `RNFBAppModule` and turbo keys. Missing registration → macOS **blank window** / `Native module NativeRNFBTurboApp is not registered` in `com.facebook.react.log:javascript`.
diff --git a/okf-bundle/packages/firestore/pipeline-coverage-work-queue.md b/okf-bundle/packages/firestore/pipeline-coverage-work-queue.md
index 8c25a832de..00ae97cb0d 100644
--- a/okf-bundle/packages/firestore/pipeline-coverage-work-queue.md
+++ b/okf-bundle/packages/firestore/pipeline-coverage-work-queue.md
@@ -8,7 +8,7 @@ timestamp: 2026-06-25T12:00:00Z
 
 # Pipeline coverage and parity — work queue
 
-> **COMPLETE:** **Merge gate** closed — static pre-merge green; **R** closed. Ready for PR [9086](https://github.com/invertase/react-native-firebase/pull/9086) force-push + CI.
+> **COMPLETE:** **Merge gate** closed — static pre-merge green; **R** closed. Ready for PR [9086](https://github.com/invertase/react-native-firebase/pull/9086) force-push + CI **after** [validation evidence](../../testing/change-authoring-workflow.md#validation-evidence-blocking) still valid on published commits.
 > **Goal/order:** platform parity first; then TS/native coverage toward intractable limits. Links: [parity](pipeline-platform-parity.md), [SDK audit](pipeline-sdk-support-audit.md), [coverage](../../testing/coverage-design.md), [e2e](../../testing/running-e2e.md), [architecture](pipelines.md).
 
 ---
@@ -78,7 +78,7 @@ Gate prerequisites before any `:test-cover` ([host rule](../../testing/change-au
 
 **Label:** `after-phase-r-final`; **harness:** full app (committed defaults)
 
-**Next item:** force-push branch → PR 9086 CI → paste [PR post draft](#pr-post-draft-coverage-table--copy-for-merge-comment).
+**Next item:** force-push branch → PR 9086 CI → paste [PR post draft](#pr-post-draft-coverage-table--copy-for-merge-comment) — only after [validation evidence](../../testing/change-authoring-workflow.md#validation-evidence-blocking) still valid on published commits.
 
 **Current gates:** **Merge gate** **closed** (2026-07-03). compare:types 19/19 documented; Jest 1146/1146; tsc + lint green. **K–R** complete.
 
@@ -255,7 +255,7 @@ Each J0 probe / J1–J6 bridge step follows **one** serial loop. No overlap. Wor
 | ----- | -------------------- | ---------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **1** | `implementation`     | `implementation` | Code/e2e changes; Jest + **unit-focused** tier; `.only` / tight area narrowing OK locally; **no commit**                                                                         |
 | **2** | `independent-review` | `review`         | **Frozen tree**; **area-focused** tier; no `.only`; area narrowing only in `tests/app.js` + `tests/globals.js`; serial [host rule](../../testing/change-authoring-workflow.md#host-rule) |
-| **3** | `commit`             | `commit`         | One focused commit only after `review_gate` closed                                                                                                                          |
+| **3** | `commit`             | `commit`         | One focused commit only after `review_gate` closed **with** [validation/coverage evidence](../../testing/validation-checklist.md#validation-evidence-package) recorded |
 
 
 Canonical commands: [serialized dispatch](../../testing/running-e2e.md#serialized-e2e-dispatch), [one iteration](../../testing/running-e2e.md#running-one-iteration), [guard probes](pipeline-implementation-workflow.md#ios-guard-probe-iterations).
diff --git a/okf-bundle/packages/firestore/pipeline-implementation-workflow.md b/okf-bundle/packages/firestore/pipeline-implementation-workflow.md
index 5b86dd681f..ad7c17ac04 100644
--- a/okf-bundle/packages/firestore/pipeline-implementation-workflow.md
+++ b/okf-bundle/packages/firestore/pipeline-implementation-workflow.md
@@ -64,15 +64,9 @@ Primary backlog: **`missingInRN`** in `.github/scripts/compare-types/configs/fir
 
 `compare-types` config is backlog, not permission.
 
-### Shape differences: `differentShape`
+### Shape differences: `differentShape` / `extraInRN`
 
-Each entry needs a strict, intractable RN technical reason (bridge, platform SDK, Hermes/Metro, etc.).
-
-- If indefensible, align RNFB to firebase-js-sdk and remove the entry.
-- Do not use `differentShape` for avoidable drift (formatting, naming, optional params).
-- When implementing a `missingInRN` export, do not introduce new `differentShape` drift without the same intractability bar.
-
-`extraInRN`: justify RN-specific surface or remove.
+Every documented difference must clear the [compare-types justification bar](../../../.github/scripts/compare-types/README.md#justification-bar). Avoidable drift is aligned to firebase-js-sdk and the entry removed; do not introduce new `differentShape` / `extraInRN` drift when implementing a `missingInRN` export.
 
 ## Pipeline `implementation`
 
@@ -123,6 +117,8 @@ feat(firestore): expose pipeline <export-name>
 
 **Never stage:** area narrowing in `tests/app.js` / `tests/globals.js`, any `.only`.
 
+Before `git commit`: [validation evidence package](../../testing/validation-checklist.md#validation-evidence-package) recorded; [coverage evidence package](../../testing/coverage-design.md#coverage-evidence-package) when lib/native bridge touched ([change authoring § commit](../../testing/change-authoring-workflow.md#commit)).
+
 ## Gotchas
 
 - **macOS is first-class** — web SDK interop; parity bugs often appear there first.
diff --git a/okf-bundle/packages/firestore/pipeline-platform-parity.md b/okf-bundle/packages/firestore/pipeline-platform-parity.md
index aa64a7b764..cb2b068d9e 100644
--- a/okf-bundle/packages/firestore/pipeline-platform-parity.md
+++ b/okf-bundle/packages/firestore/pipeline-platform-parity.md
@@ -73,6 +73,8 @@ No permanent `Platform.android` / `Platform.ios` e2e workaround without registry
 | **P-026** | findNearest validation | L4011–4013 | Vacuous pass |
 | **P-027** | empty addFields/removeFields | L4047–4049 | Vacuous pass |
 | **P-028** | findNearest DOTPRODUCT alias | L4073–4075 | Vacuous pass |
+| **P-035** | Search stage + text index | L3007–3036 | Vacuous pass on macOS-js; firebase-js-sdk path requires deployed composite search index on `pipelines-e2e` — native iOS/Android run full assertions after index deploy |
+| **P-036** | `define` stage + `parent()` | L2975–3094 | Vacuous pass on macOS-js for define and parent; web SDK rejects `parent(...)` operand shapes (STRING/MAP vs Reference) — native iOS/Android only (define L2975–2996; parent probes L2998–3094) |
 
 **macOS count note:** lower macOS total is app `utils*` registration, not Pipeline drift. Pipeline tests register on every platform; some macOS passes are vacuous (table).
 
@@ -85,6 +87,7 @@ No permanent `Platform.android` / `Platform.ios` e2e workaround without registry
 | **P-029** | Android receiver-chain / deferred-unary lowering vs iOS direct `coerceExpressionTree` — no known e2e split |
 | **P-030** | iOS-only builder features: `xor`/`nor`, `pipelinevalue` direct build, `.condition` boolean unwrap — low traffic |
 | **P-031** | iOS `rawStage` skip (L3981) + iOS index-hint skip (L3796) — align with P-014/P-015 SDK gaps |
+| **P-037** | `coerceDocumentPathValue` `DocumentReference` branches (iOS L548, Android L2463) | **Wire-unreachable** from RN pipeline execute: JS `serializeValue` (`packages/firestore/lib/pipelines/pipeline_runtime.ts` L313–318) always sends document/collection refs as `{ path }` constant maps, never a live `DocumentReference` on the bridge. Native branches are defensive parity for non-JS callers. **Intractable** native coverage gap (not missing e2e): parent wire shapes exercised in `pipelines-serialization-matrix.test.ts` (DocumentReference → `{ path }` constant) and `Pipeline.e2e.js` L2998–3094 (ref, constant-wrapped path map, string, field `__name__` deferred path). |
 
 ---
 
diff --git a/okf-bundle/packages/firestore/pipeline-sdk-support-audit.md b/okf-bundle/packages/firestore/pipeline-sdk-support-audit.md
index 4099379157..b37643086c 100644
--- a/okf-bundle/packages/firestore/pipeline-sdk-support-audit.md
+++ b/okf-bundle/packages/firestore/pipeline-sdk-support-audit.md
@@ -131,7 +131,7 @@ Probe order/gates/live status: [work queue](pipeline-coverage-work-queue.md#j0--
 2. Implement or fix native lowering; unify matching `Pipeline.e2e.js` assertions cross-platform.
 3. Run the implement/review gate defined in the [work queue runtime protocol](pipeline-coverage-work-queue.md#phase-j-iteration-protocol-strict).
 4. Record outcome:
-   - **`independent-review` pass** → `sdk-supported-bridge-ok`; close parity row; `commit` after `review_gate` closed.
+   - **`independent-review` pass** → `sdk-supported-bridge-ok`; close parity row; `commit` after `review_gate` closed **with** [validation/coverage evidence](../../testing/validation-checklist.md#validation-evidence-package) recorded.
    - **`invalid-argument` / pipeline execute error** → capture exact message; classify `sdk-unsupported-confirmed` or `rnfb-bridge-gap` (compare native request in debug logs).
 
 Android already runs full pipelines; macOS uses JS SDK. Probes focus on **native iOS/Android** execute paths.
diff --git a/okf-bundle/packages/firestore/pipelines.md b/okf-bundle/packages/firestore/pipelines.md
index 6415bc346f..6c3a3b5331 100644
--- a/okf-bundle/packages/firestore/pipelines.md
+++ b/okf-bundle/packages/firestore/pipelines.md
@@ -163,16 +163,16 @@ Live-path holes concentrate in **expression lowering** and **stage coercion**, n
 
 Quantified tables/priorities: [work queue](pipeline-coverage-work-queue.md). Script: `bash scripts/map-pipeline-coverage-gaps.sh <label>`.
 
-### DEFERRED: native coverage to 100% (pending approval)
+### Native coverage — live-path gap inventory
 
-**Status: needed, not done.** Per [Coverage expectations](/testing/coverage-design.md):
+Durable inventory of where live-path holes concentrate (live status and quantified baselines belong in the [work queue](pipeline-coverage-work-queue.md), not here):
 
 1. **E2e per live-but-untested operator/stage** in `coerceExpressionTree` (iOS) and live Android lowering, plus remaining executor error branches.
 2. **Android parsed-aggregate tail** — partially live (`coerceAliasedAggregate` from Executor); target with e2e, not deletion.
 
-Baselines: iOS NodeBuilder ~69%, Android NodeBuilder ~68%, Android Executor ~58%. Prefer cost-efficient passes.
+Completion standard: [coverage expectations](/testing/coverage-design.md#coverage-expectations-policy) — touched sources reach 100% or an evidence-backed intractable limit; no cost/convenience deferral.
 
-**Compare-types exports:** deferred — separate track from coverage expansion ([work queue](pipeline-coverage-work-queue.md)).
+**Compare-types exports:** tracked separately from coverage expansion ([work queue](pipeline-coverage-work-queue.md)).
 
 # Integer / boolean coercion (iOS bridge)
 
diff --git a/okf-bundle/testing/agent-command-policy.md b/okf-bundle/testing/agent-command-policy.md
index a795391399..dc8dfdf41d 100644
--- a/okf-bundle/testing/agent-command-policy.md
+++ b/okf-bundle/testing/agent-command-policy.md
@@ -113,6 +113,7 @@ Prepare/install: yarn or yarn lerna:prepare must exit 0 before ANY other command
 Area harness: okf-bundle/testing/running-e2e.md#local-harness-overrides-harnessoverridesjs — copy harness.overrides.example.js to gitignored harness.overrides.js; set modules + RNFBDebug; delete overrides after run.
 TurboModule contract test (NewArch-AD-17.1): packages/app/__tests__/nativeModuleContract.test.ts — yarn tests:jest -- packages/app/__tests__/nativeModuleContract.test.ts
 On failure: fix product code, re-run the same canonical command.
+Gate close / push: return [validation evidence package](validation-checklist.md#validation-evidence-package) and [coverage evidence package](coverage-design.md#coverage-evidence-package) when lib/native touched — required before commit or publication ([change authoring § validation evidence](change-authoring-workflow.md#validation-evidence-blocking)).
 ```
 
 ## Related docs
diff --git a/okf-bundle/testing/change-authoring-workflow.md b/okf-bundle/testing/change-authoring-workflow.md
index d68e46cfbe..9dfc07a677 100644
--- a/okf-bundle/testing/change-authoring-workflow.md
+++ b/okf-bundle/testing/change-authoring-workflow.md
@@ -31,8 +31,8 @@ flowchart TD
   IG -->|yes| REV
 
   REV["independent-review<br/>tier: area-focused<br/>frozen tree"]
-  REV --> RG{review gate<br/>green?}
-  RG -->|blocking findings| IMPL
+  REV --> RG{all findings<br/>resolved?}
+  RG -->|any unresolved| IMPL
   RG -->|yes| DOC
 
   DOC{User-facing or<br/>OKF durable updates?}
@@ -98,12 +98,70 @@ E2e scope, pre-flight, and harness gate: [running e2e § agent rule](running-e2e
 | Gate | Closes when |
 |------|-------------|
 | `implementation` | `implementation` work type complete — code plus **unit-focused**-tier checks green on **every required platform** when native bridge or embed path changed ([platform coverage gate](running-e2e.md#platform-coverage-gate-blocking)); [static analysis](validation-checklist.md#lint-and-formatting) green on the diff |
-| `review` | `independent-review` complete — **area-focused**-tier checks green on frozen tree; applicable [validation checklist](validation-checklist.md) rows green (including static analysis) |
-| `commit` | Durable commit exists for the item |
+| `review` | `independent-review` complete — **area-focused**-tier checks green on frozen tree; applicable [validation checklist](validation-checklist.md) rows green (including static analysis); **every review finding resolved** ([§ quality standards](#quality-standards)) |
+| `commit` | Durable commit exists for the item **after** prior gates closed with [recorded evidence](#validation-evidence-blocking) |
 
 **Trust rule:** Code on disk or in git with `review` still **open** is unverified until `independent-review` closes the gate.
 
-If review finds blocking issues, return to **`implementation`** (`unit-focused`), then repeat **`independent-review`** (`area-focused`).
+Any unresolved review finding returns the item to **`implementation`** (`unit-focused`), then repeats **`independent-review`** (`area-focused`) — see [§ quality standards](#quality-standards).
+
+<a id="validation-evidence-blocking"></a>
+
+### Validation evidence (blocking)
+
+Gates close **only** when **recorded evidence** shows the required validation tier ran and passed. Assumed green, implementer summaries without exit codes, or "tests passed earlier" without a log path **do not** close a gate.
+
+| Gate | Minimum evidence (record in work-queue notes or review handoff) |
+|------|------------------------------------------------------------------|
+| **`implementation`** | Prepare/tsc/jest **exit codes**; when native or macOS runtime touched: **e2e pass count per required platform** + log path (e.g. `/tmp/rnfb-e2e-*.log`); **`yarn lint` exit code 0**; when `docs/**` changed: **`yarn lint:markdown`** + **`yarn lint:spellcheck` exit code 0** |
+| **`review`** | Frozen-tree re-run of area-focused checklist; **`yarn lint` exit code 0**; when `docs/**` in frozen diff: **`yarn lint:markdown`** + **`yarn lint:spellcheck` exit code 0**; **coverage evidence package** when native or `packages/*/lib/**` bridge code touched ([coverage design § evidence package](coverage-design.md#coverage-evidence-package)); compare:types row for touched registered package |
+| **`commit`** | Prior gates closed **with evidence**; no `.only` / harness overrides staged |
+| **Publication** (`git push`, force-push, PR refresh) | **`review` gate closed on the exact commits being published**; evidence still valid (no product edits since last area-focused run) |
+
+**Investigate before close:** Any coverage plateau, parity asymmetry, or review finding gets **root-cause analysis** — add tests, delete dead code, or record an [acceptable exception](#acceptable-exceptions) with evidence. Do not label gaps "informational" or "defensive" without wire/runtime proof.
+
+<a id="forbidden-shortcuts"></a>
+
+### Forbidden shortcuts
+
+- **`git commit`** while the current work type's validation tier is incomplete or evidence is missing.
+- **`git push` / force-push / PR update** claiming remediation or review-green **without** fresh area-focused evidence after the last product edit on the published commits.
+- **History rewrite** (rebase, amend stack) **without** re-running validation for the rewritten scope — prior green results are **invalid**.
+- **Self-accepted** parity or coverage gaps — only [acceptable exceptions](#acceptable-exceptions) with user confirmation or intractability evidence in durable OKF (e.g. parity registry row).
+
+Publication is not a separate work type; it follows the same evidence bar as `review` + `commit`.
+
+## Quality standards
+
+Two authoring standards gate every item, and both admit the same narrow set of [acceptable exceptions](#acceptable-exceptions) — the only things that may be documented and tracked instead of fixed.
+
+<a id="acceptable-exceptions-intractable-limitation-bar"></a>
+
+### Acceptable exceptions
+
+Only two things may be documented and tracked instead of fixed. **Both require the user's explicit acceptance and confirmation plus a recorded rationale** — an agent or reviewer may not grant either on its own, and the item stays tracked until resolved.
+
+1. **Intractable-limitation bar.** The gap or firebase-js-sdk divergence is caused by an intractable technical limitation of the language, platform SDK, compiler, or toolchain, shown with evidence — e.g. a compiler/codegen-expanded branch that is provably unreachable, or a native SDK that does not expose the capability, cited by version.
+2. **User-accepted deferral.** The gap is addressable, but the user explicitly defers it with a documented rationale — e.g. it needs architectural design or human review not available now, or the compute cost is not currently justified.
+
+Anything else is drift or a defect, never a self-justifying exception:
+
+- **If code can be authored, a test that exercises it can be authored** — otherwise it is dead code; delete it, do not document it.
+- **A divergence with no accepted exception is drift** — align to firebase-js-sdk and remove any config entry.
+- Convenience, time pressure, "harmless", "low-value", or "low-risk" carry weight **only** through an explicit user-accepted deferral (2), never on an agent's own authority.
+
+<a id="review-findings--resolve-do-not-defer"></a>
+
+### Review findings — resolve, do not defer
+
+`independent-review` classifies findings **critical / serious / minor / nit**. The **`review` gate closes only when every finding — including minor and nit — is resolved by a fix**, unless the finding is covered by one of the two [acceptable exceptions](#acceptable-exceptions). An agent or reviewer may **not** defer a finding on its own authority: "green with minors" is not green, and parity, quality, and coverage gaps are cheapest to fix while the diff is fresh.
+
+A finding covered by an accepted exception is recorded — with evidence or the user's rationale — and tracked, not silently dropped. A finding that is neither fixed nor covered by an accepted exception returns the item to **`implementation`**.
+
+Domain applications reference this section rather than restating it:
+
+- **Coverage completion:** [coverage design § expectations](coverage-design.md#coverage-expectations-policy).
+- **Type parity / API drift:** [compare-types justification bar](../../.github/scripts/compare-types/README.md#justification-bar).
 
 ## Frozen tree
 
@@ -142,7 +200,7 @@ flowchart TD
 
 **Host rule:** one `:test-cover` at a time; never overlap **unit-focused** and **area-focused** tiers on one host ([§ host rule](#host-rule)).
 
-**Static analysis before handoff:** Before closing the **`implementation`** gate, run the [validation checklist § lint and formatting](validation-checklist.md#lint-and-formatting) rows (`yarn lint:js`; `yarn lint:markdown` / `yarn lint:spellcheck` when docs changed). Fix violations in product code — do not hand off with lint failures. Command list lives only in the checklist; do not duplicate here.
+**Static analysis before handoff:** Before closing the **`implementation`** gate, run the [validation checklist § lint and formatting](validation-checklist.md#lint-and-formatting) rows — **`yarn lint`** (CI Lint job: js + android + ios check) on every diff with package sources; **`yarn lint:markdown`** + **`yarn lint:spellcheck`** when `docs/**` changed (CI docs job). Fix violations in product code — do not hand off with lint failures. Command list lives only in the checklist; do not duplicate here.
 
 Step detail: [running e2e § unit-focused iteration loop](running-e2e.md#unit-focused-tier-iteration-loop).
 
@@ -177,7 +235,7 @@ On a **frozen tree**:
 1. Revert all `.only`.
 2. Keep area narrowing; run **area-focused**-tier e2e for loaded package spec(s) on [**every required platform**](running-e2e.md#platform-coverage-gate-blocking) (serial; pre-flight each run).
 3. Run applicable [validation checklist](validation-checklist.md) rows — **blocking:** [static analysis § lint and formatting](validation-checklist.md#lint-and-formatting) (`yarn lint:js` on the frozen tree; markdown/spellcheck when docs touched); `yarn reference:api` when public surface changed. For packages registered in `compare:types`, `yarn compare:types` is a **blocking review gate**: the touched package must have zero undocumented or stale differences before `review_gate` closes. If the global command fails on unrelated registered packages, record/fix that drift in the work queue; do not treat an unrelated failure as permission to skip the touched package's type-parity check.
-4. If the package workflow requires coverage: [coverage design § completion signal](coverage-design.md#coverage-as-completion-signal).
+4. **Coverage evidence package** — **blocking** when `packages/*/lib/**` or native bridge sources in the frozen diff: produce and attach per [coverage design § evidence package](coverage-design.md#coverage-evidence-package); investigate every non-100% reachable line before closing `review`.
 5. Outcome closes **review gate** or returns to **`implementation`**.
 
 Keep **`implementation`** and **`independent-review`** in separate passes ([§ frozen tree](#frozen-tree)).
@@ -200,6 +258,7 @@ Package workflows define **which module/spec** to load (e.g. Firestore → [pipe
 ## `commit`
 
 - One focused commit per item when gates close.
+- **Evidence required:** [§ validation evidence](#validation-evidence-blocking) must be recorded before `commit_gate` closes; orchestration summaries are not substitutes for exit codes, e2e counts, and coverage tables.
 - **Never stage:** `tests/harness.overrides.js`, any `.only`, temporary sub-suite edits in `tests/app.js`, or native instrumentation ([running e2e § before merge](running-e2e.md#before-merge-pr-handoff), [platform coverage gate](running-e2e.md#platform-coverage-gate-blocking)).
 - **Work queue:** before `git commit`, set the row's `commit_subject` to the commit's subject line, close `commit_gate`, and stage the queue doc **in the same commit** as the product change ([documentation policy § work queues](../documentation-policy.md#work-queue-documents)). Do not record SHAs in queue docs.
 
diff --git a/okf-bundle/testing/compare-types-work-queue.md b/okf-bundle/testing/compare-types-work-queue.md
new file mode 100644
index 0000000000..aa889baf75
--- /dev/null
+++ b/okf-bundle/testing/compare-types-work-queue.md
@@ -0,0 +1,403 @@
+---
+type: Reference
+title: Compare-types parity work queue
+description: Phased backlog to reduce documented compare-types drift between firebase-js-sdk and @react-native-firebase/* — ranked by fixability.
+tags: [testing, compare-types, types, parity, work-queue]
+timestamp: 2026-07-03T00:00:00Z
+---
+
+# Compare-types parity — work queue
+
+> **IN PROGRESS:** iOS Storage upload pause/resume diagnosis (B3.1); iOS E2E temporarily skips that test.
+> **Stack:** `main` → `new-architecture` ([#9080](https://github.com/invertase/react-native-firebase/pull/9080)) → `pipeline-continue-workqueue` ([#9086](https://github.com/invertase/react-native-firebase/pull/9086)) → **`compare-types-work-queue`** (frontier).
+> **Goal:** shrink `.github/scripts/compare-types/configs/*.ts` by fixing real drift or tightening intractable documentation — not blanket parity for native-only surfaces. Machinery: [compare-types README](../../../.github/scripts/compare-types/README.md). Term ids: [iteration vocabulary](iteration-vocabulary.md). Policy: [documentation policy](../documentation-policy.md).
+
+---
+
+Ephemeral tracker; see [OKF policy](../documentation-policy.md).
+
+**Baseline (2026-07-03):** `yarn compare:types` green — **19/19** packages documented, **0** undoc, **0** stale. ~**411** listed diffs across registered packages (missing + extra + differentShape).
+
+---
+
+## Phase ordering
+
+Fixability-first — cheap type-only wins before native/structural work; confirm intractable rows last so we do not invest in unfixable surface.
+
+| Phase | Tier | Focus |
+| ----- | ---- | ----- |
+| **A** | 1 — Easiest | Types/docs only — no native bridge |
+| **B** | 2 — Moderate | Small product work + TurboModule sync candidates |
+| **C** | 3 — Hard | Large implementation or structural wrapper typing |
+| **D** | 4 — Document | Intentional drift — audit & harden config reasons only |
+
+Each phase starts with item `<phase>0` `gap-analysis` / scope review — use decision branches until scope, ordering, fix-vs-document, and validation tier per item are locked.
+
+---
+
+## Resume checklist
+
+Before any item's `implementation`:
+
+1. `yarn && yarn lerna:prepare` when `packages/*/lib/**` touched ([agent command policy](agent-command-policy.md)).
+2. `yarn compare:types` — item closes only when its config row(s) removed or reason updated with intractability bar ([validation checklist § API reference](validation-checklist.md#api-reference-and-type-parity)).
+3. Package-scoped: `yarn tsc:compile`, `yarn tsc:compile:consumer`, affected `yarn tests:jest` — full checklist when types touch public exports.
+4. E2e only when native/runtime behaviour changes ([change authoring § work types](change-authoring-workflow.md#work-types)).
+
+**Deprecated SDK exports (batch rule):** When a `missingInRN` export is **already deprecated in firebase-js-sdk**, RNFB will **not** implement it. Accept the gap; harden the compare-types config `reason` to: *"Deprecated in firebase-js-sdk; React Native Firebase will not implement."* Process in **Phase D** (config-only), not Phase C implementation.
+
+---
+
+## Phase table
+
+| Phase | Focus | Status | Outcome |
+| ----- | ----- | ------ | ------- |
+| **A** | Tier 1 — types/docs only | **partial** | A1–A5, A7–A8, A10 committed; A6/A9 deferred |
+| **B** | Tier 2 — moderate / sync conversion | **complete** | B1–B9 committed (B3 ✅ 2026-07-05) |
+| **C** | Tier 3 — hard / structural | **in progress** | C1.1 ✅ committed; C1.2 ✅ committed; C1.2b documented |
+| **D** | Tier 4 — document intractable | **queued** | — |
+
+---
+
+## Current snapshot
+
+**Label:** `ios-storage-upload-pause-diagnosis-2026-07-06`
+
+**Next item:** B3.1 — local iOS e2e + CI `sim-app.log` review for upload pause/resume failure.
+
+**Current gates:** B3.1 open (diagnosis). C1.1, C1.2, C1.2b and PMR-1 closed.
+
+---
+
+## Item arbiter
+
+| Item | Package / scope | `commit_subject` | `implementation_gate` | `review_gate` | `commit_gate` | `next_work_type` | `validation_tier` | Notes |
+| ---- | --------------- | ---------------- | ----------------------- | ------------- | ------------- | ---------------- | ------------------- | ----- |
+| **A0** | Phase A scope | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `none` | Scope review closed 2026-07-03 — see [Phase A Notes](#phase-a-notes) |
+| **A1** | firestore | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green; `onSnapshotsInSync` row removed |
+| **A2** | firestore-pipelines | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green — A2 rows removed (batched A2–A4) |
+| **A3** | firestore-pipelines | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green — `TimeGranularity` row removed |
+| **A4** | firestore-pipelines | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green — `isType` row removed |
+| **A5** | storage | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green — upload return type rows removed |
+| **A6** | storage | — | open | open | open | — | `unit-focused` | `TaskEvent` / `TaskState` — **user-accepted deferral** ([acceptable exceptions](change-authoring-workflow.md#acceptable-exceptions)): const-vs-literal alignment needs architectural review; accepted for now, tracked. Resolve by SDK alignment or recorded rationale once reviewed |
+| **A7** | app-check | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green — `AppCheckTokenListener` removed |
+| **A8** | functions | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green — registry + config; `FunctionsError` documented |
+| **A9** | remote-config | — | open | open | open | — | `unit-focused` | `ValueSource` — **user-accepted deferral** ([acceptable exceptions](change-authoring-workflow.md#acceptable-exceptions)): const-vs-literal alignment needs architectural review; accepted for now, tracked. Resolve by SDK alignment or recorded rationale once reviewed |
+| **A10** | cross-cutting | `fix(types): align compare-types modular API with firebase-js-sdk` | closed | closed | closed | — | `area-focused` | Review green — app structural + callbacks |
+| **B0** | Phase B scope | `refactor!(types): align modular APIs with firebase-js-sdk sync signatures` | closed | closed | closed | — | `none` | Gap-analysis + scope decisions 2026-07-03 — see [Phase B Notes](#phase-b-notes) |
+| **B1** | firestore-pipelines | `refactor(firestore/pipelines): add constant preferIntegers option` | closed | closed | closed | — | `area-focused` | Re-review green 2026-07-04: parser integerLiteral iOS/Android, preferIntegers e2e, sdk-compat; macOS 147 / iOS 152 / Android 152 |
+| **B2** | firestore-pipelines | `feat(firestore/pipelines): expose search stage and pipeline expressions` | closed | closed | closed | — | `area-focused` | 6× `missingInRN` cleared; macOS 150/150; iOS/Android 155/155; firebase-tools 15.22.4; search index verify cycle. Follow-up: dropped RN-only `Type` export → pipelines 0 documented diffs |
+| **B3** | storage | `refactor!(storage): sync UploadTask pause resume cancel booleans` | closed | closed | closed | — | `area-focused` | Committed 2026-07-05: sync `setTaskStatus` boolean; mid-transfer e2e; iOS upload-cancel skip — user-accepted + [firebase-ios-sdk#16353](https://github.com/firebase/firebase-ios-sdk/issues/16353); iOS upload pause/resume e2e temporarily skipped 2026-07-06 (CI failure — see B3.1) |
+| **B3.1** | storage / iOS | `test(storage, ios): temporarily skip upload pause/resume testing` | open | open | open | `implementation` | `area-focused` | CI iOS debug+release fail `successfully pauses and resumes an upload` ([storage/unknown], ~50s); Android/macOS pass. **Local:** re-run `StorageTask.e2e.js` on iOS with test unskipped + `RNFBDebug`; capture `xcrun simctl spawn booted log stream` / native `NSError`. **CI:** `RNFB_SIM_LOG_STDOUT=1` + widened sim log predicate; review `sim-app.log` artifact on [Testing E2E iOS](https://github.com/invertase/react-native-firebase/actions/workflows/tests_e2e_ios.yml) runs before root-cause call |
+| **C1.1** | firestore | `feat(firestore): support TransactionOptions maxAttempts in runTransaction` | closed | closed | closed | — | `area-focused` | Committed 2026-07-05: TransactionOptions + runTransaction maxAttempts; e2e Transaction 20/20 iOS+Android |
+| **B4** | analytics | `refactor!(types): align modular APIs with firebase-js-sdk sync signatures` | closed | closed | closed | — | `unit-focused` | logEvent sync void |
+| **B5** | app-check | `refactor!(types): align modular APIs with firebase-js-sdk sync signatures` | closed | closed | closed | — | `area-focused` | initializeAppCheck sync AppCheck |
+| **B6** | firestore | `refactor!(types): align modular APIs with firebase-js-sdk sync signatures` | closed | closed | closed | — | `area-focused` | initializeFirestore sync Firestore |
+| **B7** | remote-config | `refactor!(types): align modular APIs with firebase-js-sdk sync signatures` | closed | closed | closed | — | `unit-focused` | FetchStatus native literals documented |
+| **B8** | remote-config | `refactor!(types): align modular APIs with firebase-js-sdk sync signatures` | closed | closed | closed | — | `unit-focused` | RemoteConfigOptions on getRemoteConfig |
+| **B9** | firestore | `refactor!(types): align modular APIs with firebase-js-sdk sync signatures` | closed | closed | closed | — | `unit-focused` | aggregateFieldEqual exported |
+| **C0** | Phase C scope | — | open | open | open | `gap-analysis` | `none` | [Scope review](#phase-c--tier-3-hard--structural) |
+| **C1.2** | firestore | `feat(firestore): export aggregateQuerySnapshotEqual for SDK parity` | closed | closed | closed | — | `unit-focused` | Committed 2026-07-05: pure JS helper; jest 315/315 |
+| **C1.2b** | firestore | — | closed | closed | closed | — | `none` | User-accepted: FieldValue `maximum`/`minimum` — iOS Firebase Firestore 12.15.0 lacks APIs; config hardened 2026-07-05 |
+| **PMR-1** | pre-merge review remediation | `fix(firestore): validate TransactionOptions maxAttempts` | closed | closed | closed | — | `area-focused` | Review green: markdown/docs/config/runtime findings fixed; validation evidence recorded below |
+| **C1.3** | firestore | — | open | open | open | — | `none` | Local-cache config (15 exports) — **document-only** (Phase D): web/N/A on native |
+| **C1.4** | firestore | — | open | open | open | — | `none` | Snapshot serialization (3 exports) — **document-only** (Phase D): web-only |
+| **C1.5** | firestore | — | open | open | open | — | `none` | Index config (4 exports) — **document-only** (Phase D): deprecated in firebase-js-sdk; RNFB will not implement |
+| **C1.6** | firestore | — | open | open | open | — | `none` | IndexedDB persistence (2 exports) — **document-only** (Phase D): deprecated in firebase-js-sdk; RNFB will not implement |
+| **C1.7** | firestore | — | open | open | open | — | `none` | `FirestoreErrorCode` — **document-only** (Phase D): D3 error-branding policy |
+| **C2** | firestore | — | open | open | open | — | `none` | Wrapper shapes: `DocumentReference`, `Firestore`, snapshots, `Transaction` |
+| **C3** | firestore | — | open | open | open | — | `unit-focused` | `FirestoreSettings.persistence`, `LogLevel` subset |
+| **C4** | firestore | — | open | open | open | — | `none` | Persistent cache index APIs — keep-async (PS-S2) |
+| **C5** | auth | — | open | open | open | — | `area-focused` | Redirect flows, `credentialFromResult`, Recaptcha |
+| **C6** | messaging | — | open | open | open | — | `none` | Native FCM vs web push (53 diffs) |
+| **C7** | analytics | — | open | open | open | — | `none` | RN-only native APIs (80 extra exports) |
+| **C8** | ai | — | open | open | open | — | `none` | Browser-only audio/Web APIs |
+| **C9** | app (+ consumers) | — | open | open | open | — | `none` | `ReactNativeFirebase.FirebaseApp` extends SDK `FirebaseApp` |
+| **C10** | Native sync conversion (ex-JS façades) | — | open | open | open | — | `none` | Gap-analysis 2026-07-05 — follow-up to B4/B5/B6 façades + PS-S2 `needs-native-change`; see [C10 sub-items](#c10--native-sync-conversion-ex-js-façades) |
+| **C10.1** | storage | — | open | open | open | `implementation` | `area-focused` | `setMaxOperationRetryTime`, `setMaxUploadRetryTime` — spec `Promise<void>` → `void`; native already sync in-memory |
+| **C10.2** | analytics | — | open | open | open | `implementation` | `unit-focused` | B4 `logEvent` native follow-up + 5 setters — ordered serial analytics queue; clears 5× `differentShape` setter rows |
+| **C10.3** | app-check | — | open | open | open | `implementation` | `area-focused` | B5 `initializeAppCheck` follow-up — sync-void+gate; provider configured before return |
+| **C10.4** | firestore | — | open | open | open | `implementation` | `area-focused` | B6 `initializeFirestore` follow-up — sync-void+gate; in-memory settings registry before return |
+| **D0** | Phase D scope | — | open | open | open | `gap-analysis` | `none` | [Scope review](#phase-d--tier-4-document--leave) |
+| **D1** | all packages | — | open | open | open | — | `none` | `SDK_VERSION` extra exports — policy |
+| **D2** | database, perf, … | — | open | open | open | — | `none` | RN-only native helpers |
+| **D3** | cross-cutting | — | open | open | open | — | `none` | Error branding: keep vs unify |
+| **D4** | storage | — | open | open | open | — | `none` | `EmulatorMockTokenOptions` simplification |
+| **D5** | storage | — | open | open | open | — | `none` | `getStream` → `NodeJS.ReadableStream` |
+
+---
+
+## PMR-1 Notes
+
+Pre-merge remediation completed 2026-07-05. Findings fixed: markdown table formatting, Firestore compare-types rationale hardening, public OKF wording/state, transaction `maxAttempts` validation, user-facing v26 migration labels, and stale pipeline compatibility rows.
+
+| Command | Exit code | Evidence |
+| ------- | --------- | -------- |
+| `yarn lerna:prepare` | 0 | 20 packages prepared |
+| `yarn tsc:compile` | 0 | Root TypeScript compile green |
+| `yarn compare:types` | 0 | Registered package parity documented, no stale entries |
+| `yarn lint:js` | 0 | JS/TS lint green |
+| `yarn lint:markdown` | 0 | Prettier markdown check green |
+| `yarn tests:jest --watchman=false packages/firestore/__tests__/runTransaction.test.ts` | 0 | 1 suite, 4 tests passed |
+| `git diff --check` | 0 | Independent remediation review |
+| OKF consistency scan | green | Canonical ownership, DRY, links, and durability pass |
+
+---
+
+## Phase A — Tier 1 (types/docs only)
+
+**Goal:** Remove or shrink `differentShape` rows with **TypeScript-only** changes; no native bridge edits.
+
+### A0 — Scope Review (blocking)
+
+**Method:** `gap-analysis` with decision branches for scope, order, fix-vs-document, validation tier, and done signal.
+
+**Resolve before A1:**
+
+| Branch | Questions |
+| ------ | ----------- |
+| Scope | Batch one PR per package vs one PR per item? Any items defer to B/C? |
+| A10 cross-cutting | Single `NativeFirebaseError` structural fix vs per-package callback types? |
+| firestore-pipelines | Declaration-only fixes — regenerate from SDK or hand-edit `.d.ts`? |
+| Validation | Is `yarn compare:types` + tsc sufficient for all A items, or any need e2e? |
+| Ordering | Strict A1→A10 or parallel by package after scope review? |
+| Done signal | Config entry **removed** vs **reason narrowed** — rubric for “cosmetic equivalent”? |
+
+**Deliverable:** Phase A **Notes** below updated with decisions; `A0` gates closed; `next_work_type` on A1 set to `implementation`.
+
+### Items
+
+| Item | Config / export | Current reason (summary) | Proposed fix |
+| ---- | --------------- | ------------------------ | ------------ |
+| **A1** ✅ | firestore `onSnapshotsInSync` | Cosmetic callback signatures; behaviour equivalent | Align `next`/`error` types to SDK |
+| **A2** ✅ | firestore-pipelines `StageOptions`, `ExpressionType`, `timestampDiff` | Declaration ordering/format only | Match SDK declaration file |
+| **A3** ✅ | firestore-pipelines `TimeGranularity` | Lowercase `isoweek`/`isoyear` literals aligned | Match SDK literals |
+| **A4** ✅ | firestore-pipelines `isType` | RN `Type` alias vs SDK `string` | Widen param type |
+| **A5** ✅ | storage `uploadBytes`, `uploadBytesResumable` | `TaskResult`/`Task` aliases identical at runtime | Rename to SDK export names |
+| **A6** ❓ | storage `TaskEvent`, `TaskState` | const object vs string-literal union | Export SDK-style literals |
+| **A7** ✅ | app-check `AppCheckTokenListener` | Missing type re-export | Re-export SDK alias |
+| **A8** ✅ | functions `FunctionsError`, `FunctionsErrorCodeCore` | RN uses `HttpsError` at runtime | Thin re-export or alias |
+| **A9** ❓ | remote-config `ValueSource` | const object vs type alias | Add SDK-style type alias |
+| **A10** ✅ | remote-config, storage, … callbacks | `NativeFirebaseError` vs `FirebaseError` | Structural assignability or unified callback error type |
+
+### Phase A Notes
+
+**Gap-analysis (2026-07-03):** All A1–A9 are types-only; no native bridge edits. A8 needs compare-types registry + baseline config first (`functions` not registered). A6/A9 moderate: const objects used in tests (`TaskEvent.STATE_CHANGED`, `ValueSource.REMOTE`) — dual const+SDK-type pattern likely. A10 touches `remote-config` + `storage` callbacks; app-level `NativeFirebaseError` structural assignability recommended before consumer updates.
+
+**Proposed batching (per package, not per item):**
+
+| Batch | Items |
+| ----- | ----- |
+| firestore | A1 |
+| firestore-pipelines | A2, A3, A4 |
+| storage | A5 (+ storage slice of A10); A6 deferred |
+| app-check | A7 |
+| functions | A8 (+ registry infra) |
+| app | A10 structural |
+| remote-config | A10 slice; A9 deferred |
+
+**Proposed ordering:** A8 infra → A10 app structural → parallel A1, A2–A4, A5–A6, A7, A8 aliases, A9 → A10 consumers.
+
+**Validation:** `yarn compare:types` + `yarn tsc:compile` + `yarn tsc:compile:consumer` + affected `yarn tests:jest` — no e2e for Phase A.
+
+**Done signal:** Remove config row when shapes match; do not narrow reasons for cosmetic equivalence (reason-narrow reserved for Phase D intractability).
+
+**Deferrals:** UploadTask sync `boolean` stays B3. **A6, A9 deferred** — team consensus before pickup (lean option 1 below).
+
+**Scope decisions:**
+- **A10 (confirmed):** App-level structural assignability for `NativeFirebaseError` → `FirebaseError`, then update callback params in remote-config + storage; remove config rows. Runtime stays `NativeFirebaseError`; SDK drop-in via `FirebaseError`; RN extras via `'namespace' in error` or cast.
+- **A6 (user-accepted deferral):** `TaskEvent`/`TaskState` const-vs-literal alignment needs architectural design/human review not available now, so it is a [user-accepted deferral](change-authoring-workflow.md#acceptable-exceptions) — accepted for now and tracked, not closed by documenting convenience drift. Once reviewed, resolve by aligning to the SDK (literal-only) or by recording the rationale (e.g. removing a shipped public const is a breaking change). Do not strip constants before that review.
+- **A9 (user-accepted deferral):** Same as A6 for `ValueSource` const vs SDK literal union — accepted and tracked pending architectural review; resolve by SDK alignment or recorded rationale, not convenience.
+
+**Scope (gap-analysis defaults — locked unless revised):** Per-package PR batching; hand-edit firestore-pipelines sources; `compare:types` + tsc + jest, no e2e; ordering A8 infra → A10 app → parallel A1, A2–A4, A5, A7, A8 aliases → A10 consumers (skip A6, A9 until consensus).
+
+**firestore-pipelines:** Hand-edit `packages/firestore/lib/pipelines/*.ts`; no SDK codegen.
+
+---
+
+## Phase B — Tier 2 (moderate / sync conversion)
+
+**Goal:** Small API additions and async→sync parity where TurboModule sync analysis already flagged candidates.
+
+### B0 — Scope Review (blocking)
+
+**Method:** `gap-analysis` with decision branches for dependencies, native scope, validation tier, and batching.
+
+**Resolve before B1:**
+
+| Branch | Questions |
+| ------ | ----------- |
+| Sync dependency | Block B on `new-architecture` / sync-infra merge? Which items require TurboModule sync path? |
+| B2 pipelines missing | One export per commit vs batched `documentMatches`+`score`? Native lowering required for each? |
+| B7 FetchStatus | Breaking change acceptable for literal rename (`no_fetch_yet` → `no-fetch-yet`)? |
+| Native scope | B3/B6 — confirm native can return sync bool / sync Firestore instance today |
+| Validation tier | Which B items need `:test-cover` vs compare-types + Jest only? |
+
+**Deliverable:** Phase B Notes; item ordering and `commit_subject` templates per slice.
+
+### Items
+
+| Item | Config / export | Proposed fix |
+| ---- | --------------- | ------------ |
+| **B1** ✅ | firestore-pipelines `constant` `preferIntegers` | Add optional param + wire lowering |
+| **B2** ✅ | firestore-pipelines 6× `missingInRN` | Implement pipeline expressions/types per [pipeline workflow](../packages/firestore/pipeline-implementation-workflow.md) |
+| **B3** ✅ | storage `UploadTask` sync methods | Native sync TurboModule: spec `setTaskStatus` → `boolean`, codegen regen, iOS resolve fix; breaking-change queue |
+| **B4** ✅ | analytics `logEvent` | TurboModule sync-void queue |
+| **B5** ✅ | app-check `initializeAppCheck` | TurboModule sync-void gate |
+| **B6** ✅ | firestore `initializeFirestore` | TurboModule sync return when settings in-memory |
+| **B7** ✅ | remote-config `FetchStatus` | Align literals or document permanent native form |
+| **B8** ✅ | remote-config `getRemoteConfig` | Expose `RemoteConfigOptions` (no-op ok on native?) |
+| **B9** ✅ | firestore `aggregateFieldEqual` | Export helper if native supports |
+
+### Phase B Notes
+
+**Gap-analysis (2026-07-03):** TurboModule sync infra landed on `new-architecture`. Pipeline queue: compare-types exports were **out of scope until phase R** on `main` — **stale on this branch:** [pipeline coverage queue](../packages/firestore/pipeline-coverage-work-queue.md) shows **K–R complete**, merge gate closed 2026-07-03, **compare-types exports unblocked**.
+
+**Scope decisions (B0):**
+- **B1, B2:** Were deferred until pipeline **R** — **R is complete** on `pipeline-continue-workqueue`; proceed per [pipeline workflow](../packages/firestore/pipeline-implementation-workflow.md).
+- **B7:** Reclassify **→ Phase D** — document native `no_fetch_yet`/`throttled` literals (mirror deferred A9).
+- **B10:** Moved to **C1.1** (2026-07-05 gap-analysis) — `TransactionOptions` + `runTransaction` `maxAttempts`.
+- **B3:** Native sync TurboModule shipped; mid-transfer e2e enabled (8 MB fixture). iOS upload-cancel `it.skip` — user-accepted platform gap (FirebaseStorage 12.15.0); upstream [firebase-ios-sdk#16353](https://github.com/firebase/firebase-ios-sdk/issues/16353) filed 2026-07-05; related 750ms pause workaround since 2019-05-03 (RNFB #2043). iOS upload pause/resume e2e skipped 2026-07-06 pending B3.1 diagnosis (CI `[storage/unknown]`; download pause/resume still passes on iOS).
+- **B5, B6:** JS façade shipped for compare-types shape (true sync deferred where applicable).
+- **B4:** Analytics registry + `logEvent` sync `void` JS shim.
+- **B8, B9:** Quick wins — types/JS only.
+
+**Ordering:** B9 → B8 → B7-doc → B4 → B5/B6 façades → **B1/B2** (done) | **B3** (coverage follow-up, then delta review + commit) | B10 → C1.1.
+
+**Validation:** B8/B9/B7-doc/B4 — unit-focused (no e2e). B3 — **unit-focused** storage `:test-cover` after coverage edits (then delta **area-focused** review). B1/B2 — pipeline workflow e2e (done).
+
+**Batching:** Per-package PRs: storage (B3), firestore C1.1+.
+
+**Done signal:** Row removal when fixed; B7 reason-harden only (D treatment).
+
+**Review notes (2026-07-03):** B5/B6 JS façades accepted for compare-types shape — sync return, async native via `void`. B3 is the exception: ship true native sync via TurboModule in breaking-change window.
+
+---
+
+## Phase C — Tier 3 (hard / structural)
+
+**Goal:** Track large efforts — may spawn sub-queues or ADRs; many rows may remain documented after audit.
+
+### C0 — Scope Review (blocking)
+
+**Method:** `gap-analysis` with decision branches for structural items, document-only items, out-of-scope packages, and architecture-decision needs.
+
+**Resolve before C1.1:**
+
+| Branch | Questions |
+| ------ | ----------- |
+| C2 wrappers | Generated structural types vs `interface` extends SDK vs status quo? |
+| C9 FirebaseApp | Monorepo-wide type unification — prerequisite for C2? |
+| C1.3–C1.7 document-only | Confirm accepted gaps move to Phase D with hardened config reasons (see [deprecated SDK batch rule](#resume-checklist))? |
+| Out of scope | Confirm C6/C7/C8 are **document-only** for this queue |
+| ADR | When does a C item need `okf-bundle/new-architecture/architecture-decisions.md` entry? |
+
+**Deliverable:** Phase C Notes; C1 gap-analysis complete (2026-07-05) — see [Phase C Notes](#phase-c-notes).
+
+### C1 — firestore `missingInRN` sub-items
+
+Gap-analysis 2026-07-05: 30 `missingInRN` entries + `differentShape: runTransaction` (ex-B10). Of these, **~5 are implementable**; **~24–25 reclassify to Phase D** (web-only, deprecated, or blocked-on-native-sdk).
+
+| Item | Exports | Verdict | Proposed fix |
+| ---- | ------- | ------- | ------------ |
+| **C1.1** ✅ | `TransactionOptions`, `runTransaction` | **implement** | Wire `maxAttempts` through JS → `transactionBegin` → native `runTransactionWithOptions` / `TransactionOptions` |
+| **C1.2** ✅ | `aggregateQuerySnapshotEqual` | **implement** | Pure JS equality helper (mirror B9 `aggregateFieldEqual`) |
+| **C1.2b** ✅ | `maximum`, `minimum` | **document-only** | FieldValue set/update sentinels — user-accepted gap; iOS SDK lacks APIs; see Phase C Notes |
+| **C1.3** ❓ | Local-cache factories + 9 types (15 exports) | **document-only** | Web/local-cache API; RN uses native `persistence`/`cacheSizeBytes` — accept gap (Phase D) |
+| **C1.4** ❓ | `documentSnapshotFromJSON`, `querySnapshotFromJSON`, `onSnapshotResume` | **document-only** | Web-only serialization API — accept gap (Phase D) |
+| **C1.5** ❓ | `setIndexConfiguration`, `Index`, `IndexConfiguration`, `IndexField` | **document-only** | **Deprecated in firebase-js-sdk; RNFB will not implement** — harden config reason (Phase D) |
+| **C1.6** ❓ | `enableIndexedDbPersistence`, `enableMultiTabIndexedDbPersistence` | **document-only** | **Deprecated in firebase-js-sdk; RNFB will not implement** — harden config reason (Phase D) |
+| **C1.7** ❓ | `FirestoreErrorCode` | **document-only** | Type union; align with D3 `NativeFirebaseError` branding — accept gap (Phase D) |
+
+**Ordering (fixability-first):** C1.1 → C1.2 → C1.3–C1.7 / C1.2b (Phase D config commits, batched where sensible).
+
+### Other Phase C items
+
+| Item | Scope | Notes |
+| ---- | ----- | ----- |
+| **C2** | firestore wrapper classes | Getters vs properties, `toJSON`, internal members |
+| **C3** | firestore settings types | RN-specific `persistence`, log level subset |
+| **C4** | firestore cache index APIs | PS-S2: keep-async; `PersistentCacheIndexManager` differentShape |
+| **C5** | auth platform matrix | Redirect, Recaptcha, credential extraction |
+| **C6** | messaging | Native FCM surface — not SDK parity target |
+| **C7** | analytics | RN-only methods — not SDK parity target |
+| **C8** | ai | Browser APIs — not on RN |
+| **C9** | app | `FirebaseApp` type hierarchy |
+
+### C10 — native sync conversion (ex-JS façades)
+
+Gap-analysis 2026-07-05: replace Phase B compare-types façades (B4/B5/B6) and remaining PS-S2 `needs-native-change` rows with **true TurboModule sync**. **Out of scope:** B3 (`UploadTask` — in flight); C4 cache-index APIs (**keep-async**).
+
+| Item | Exports / scope | Verdict | Proposed fix |
+| ---- | --------------- | ------- | ------------ |
+| **C10.1** | storage `setMaxOperationRetryTime`, `setMaxUploadRetryTime` | **implement** | Spec → `void`; regen codegen; drop Promise wrappers (native SDK calls already sync) |
+| **C10.2** | analytics `logEvent` (B4 follow-up) + 5 setters | **implement** | Ordered serial native queue; spec `Promise<void>` → `void`; modular + namespace sync `void` |
+| **C10.3** | app-check `initializeAppCheck` (B5 follow-up) | **implement** | Spec `configureProvider` → `void`; sync-void+gate — provider state before return |
+| **C10.4** | firestore `initializeFirestore` / `settings` (B6 follow-up) | **implement** (gate design) | Spec `settings` → `void`; in-memory settings registry visible before return |
+
+**Ordering:** C10.1 → C10.2 → C10.3 → C10.4 (after B3; C10.1 shares storage spec/codegen with B3 but different methods).
+
+### Phase C Notes
+
+**C1.2b analysis (2026-07-05, user-accepted):** Compare-types `maximum`/`minimum` are **FieldValue set/update sentinels** (`maximum(n: number): FieldValue` in firebase-js-sdk **12.15.0**), not aggregate-query helpers. **iOS Firebase Firestore 12.15.0** — `FIRFieldValue` public API has no maximum/minimum factories ([iOS reference](https://firebase.google.com/docs/reference/ios/firebasefirestore/api/reference/Classes/FIRFieldValue)). **Android Firebase Firestore BOM 34.15.0** — `FieldValue.maximum`/`minimum` exist for set/update ([Android reference](https://firebase.google.com/docs/reference/android/com/google/firebase/firestore/FieldValue)) but RNFB serialization (`RNFBFirestoreSerialize.m` / `ReactNativeFirebaseFirestoreSerialize.java`) does not wire them. Cross-platform parity deferred until iOS SDK exposes the APIs.
+
+**C1 gap-analysis (2026-07-05):** … Bulk of C1 is **accepted platform drift** — **document-only in Phase D** (C1.2b iOS-native-limited; C1.3–C1.6 web/deprecated; C1.7 D3 error-branding). Deprecated-in-SDK exports (C1.5, C1.6) use the batch rule: *"Deprecated in firebase-js-sdk; React Native Firebase will not implement."*
+
+**C10 gap-analysis (2026-07-05):** B4/B5/B6 closed compare-types with `void native.X()` façades while native remains async. Three shipped façades + seven still-`Promise` exports (analytics setters, storage retry setters) need native follow-up. B5/B6 config rows already removed — C10.3/C10.4 completion = behavioral correctness, not config row removal. C10.2 clears 5 analytics setter `differentShape` rows.
+
+**Validation:** C1.1 — area-focused + `:test-cover`. C1.2 — unit-focused. C10.1 — area-focused storage. C10.2 — unit-focused + analytics ordering e2e. C10.3/C10.4 — area-focused. C1.3–C1.7 / C1.2b — documentation-only when moved to D.
+
+---
+
+## Phase D — Tier 4 (document & leave)
+
+**Goal:** Harden `configs/*.ts` reasons; **no product fix** unless `gap-analysis` reclassifies an item upward.
+
+### D0 — Scope Review (blocking)
+
+**Method:** `gap-analysis` with decision branches for keep/remove policy, error branding, and audit deliverables.
+
+**Resolve before D1:**
+
+| Branch | Questions |
+| ------ | ----------- |
+| SDK_VERSION | Remove from modular exports vs keep documented forever? |
+| D3 errors | Publish policy doc in OKF for `NativeFirebaseError` branding? |
+| Audit bar | **Resolved** — canonical [compare-types justification bar](../../../.github/scripts/compare-types/README.md#justification-bar) / [intractable-limitation bar](change-authoring-workflow.md#acceptable-exceptions-intractable-limitation-bar): evidence-backed platform/toolchain limitation only; convenience drift aligns to firebase-js-sdk. |
+| Deliverable | D phase = documentation commits only? |
+
+**Deliverable:** Phase D Notes. Intractability rubric is canonical in the [compare-types justification bar](../../../.github/scripts/compare-types/README.md#justification-bar) — reference it; do not restate.
+
+### Items
+
+| Item | Pattern | Action |
+| ---- | ------- | ------ |
+| **D1** | `SDK_VERSION` on ~15 packages | Confirm keep + standard reason text |
+| **D2** | RN-only helpers (`keepSynced`, FCM, crashlytics, …) | Audit reasons |
+| **D3** | Error type branding | Policy: keep native error type in callbacks |
+| **D4** | storage emulator mock tokens | Confirm simplified JWT policy |
+| **D5** | storage `getStream` | Confirm Node stream vs Web Streams |
+
+### Phase D Notes
+
+_(Populated by D0 gap-analysis.)_
+
+---
+
+## Workflow (each item)
+
+Per [change authoring workflow](change-authoring-workflow.md):
+
+1. **`gap-analysis`** — confirm diff still present (`yarn compare:types`); read SDK `.d.ts` + RN `dist/typescript`.
+2. **`implementation`** — fix types/product; **`unit-focused`** or **`area-focused`** per arbiter table.
+3. **`independent-review`** — frozen tree; `yarn compare:types` must show row removed or reason updated.
+4. **`commit`** — one focused commit; `commit_subject` set before commit; [validation evidence package](validation-checklist.md#validation-evidence-package) recorded ([documentation policy](../documentation-policy.md)).
+5. Remove stale config entries when shapes match.
+
+**Scope-review items (`*0`):** `gap-analysis` only — no product commits until scope Notes complete and gates on `*0` closed.
+
+---
+
+## Historical notes
+
+- **2026-07-03:** Queue created from repo-wide compare-types gap analysis (19 packages, 411 documented diffs, 0 undoc). Source ranking: fixability tiers 1–4.
diff --git a/okf-bundle/testing/coverage-design.md b/okf-bundle/testing/coverage-design.md
index c0c8685553..edc3d5b355 100644
--- a/okf-bundle/testing/coverage-design.md
+++ b/okf-bundle/testing/coverage-design.md
@@ -22,11 +22,11 @@ Codecov merges CI uploads. Project-level % can be noise; **file-level changed-so
 For **new code**:
 
 * **Coverage only goes up** on files the change touches.
-* **100% is the goal** for touched TS/native sources. "Mostly covered" is not enough.
-* **Gaps need quantified intractability** — e.g. "~NN% unreachable Swift codegen"; no hand-waving.
-* **Any other gap is either testable or dead code** — add tests (negative paths, failure branches, every reachable branch) or delete unreachable/duplicate/superseded code. Large uncovered blocks: ask "is this reachable?" before writing tests.
+* **100% on touched TS/native sources is the requirement**, not an aspiration. "Mostly covered" does not close the gate.
+* **The only acceptable uncovered line is covered by an [acceptable exception](change-authoring-workflow.md#acceptable-exceptions)** — an evidence-backed intractable limitation, quantified (e.g. "~NN% provably-unreachable Swift codegen"), or a user-accepted deferral with recorded rationale.
+* **Every other gap is testable or dead code** — add the test (negative paths, failure branches, every reachable branch) or delete the unreachable/duplicate/superseded code.
 
-Gap passes should **add tests and remove dead code** together.
+An uncovered line surfaced in `independent-review` is a review finding subject to [zero-deferral resolution](change-authoring-workflow.md#review-findings--resolve-do-not-defer): fix it (add the test or delete the code) or clear it against the bar. Gap passes **add tests and remove dead code** together.
 
 ## Coverage as completion signal
 
@@ -44,6 +44,25 @@ File-level coverage, not green tests/types alone, marks completion.
 
 Do not hand off closable gaps. Package workflows may define snapshot tooling (e.g. [pipeline scripts](../packages/firestore/pipeline-implementation-workflow.md)).
 
+<a id="coverage-evidence-package"></a>
+
+## Coverage evidence package (blocking)
+
+Required before **`review` gate** closes when the frozen diff touches `packages/*/lib/**` or native bridge sources (`packages/*/{android,ios}/**`). Jest green alone is insufficient.
+
+Produce after fresh e2e on every required platform, then post-process native artifacts ([§ stale coverage](#stale-coverage-data)):
+
+| Section | Contents |
+|---------|----------|
+| **Artifacts** | Timestamps for `coverage/ios-native/lcov.info`, Android `jacocoAndroidTestReport.xml`, and any Jest coverage run |
+| **Touched regions** | Per-file or per-function line % for changed logic (not whole-package aggregates only) |
+| **Branch map** | Table: branch / input shape → test or e2e that exercises it |
+| **Gaps** | Every line or branch below 100%: **fix** (test or delete dead code), or **acceptable exception** with wire/runtime evidence in durable OKF (e.g. [pipeline platform parity](../packages/firestore/pipeline-platform-parity.md) probe row) |
+
+**Verdict line:** `100% on reachable touched lines` **or** `NOT 100%` with numbered gaps and disposition (fixed / intractable with evidence / user-accepted deferral).
+
+Reviewers treat missing or stale coverage evidence as a **blocking** finding — same bar as missing e2e counts ([change authoring § validation evidence](change-authoring-workflow.md#validation-evidence-blocking)).
+
 ## Platform parity (pipeline and bridge code)
 
 For native-bridge features, **platform parity precedes coverage expansion**: iOS/Android/macOS behavior must match unless blocked by native SDK. RNFB bridge gaps are defects, not permanent `Platform.*` e2e branches.
diff --git a/okf-bundle/testing/firebase-testing-project.md b/okf-bundle/testing/firebase-testing-project.md
index 5b233cd8ad..0840586fa2 100644
--- a/okf-bundle/testing/firebase-testing-project.md
+++ b/okf-bundle/testing/firebase-testing-project.md
@@ -212,57 +212,48 @@ Restart emulator after rebuilding `functions/` — [running e2e § Rules #2](run
 
 # Cloud project: deploy rules and indexes
 
-Firebase CLI must be authenticated for `react-native-firebase-testing`. Scripts use repo `firebase-tools`; global install optional.
+Firebase CLI must be authenticated for `react-native-firebase-testing`. Scripts resolve `firebase-tools` from the repo (see [`firebase-cli.sh`](../../.github/workflows/scripts/firebase-cli.sh)); a global install is optional.
 
-## Multi-database `firebase.json`
+## Firebase tooling version and coordinated surfaces
 
-```json
-"firestore": [
-  { "database": "(default)", "rules": "firestore.rules", "indexes": "firestore.indexes.json" },
-  { "database": "pipelines-e2e", "rules": "firestore.pipelines-e2e.rules", "indexes": "firestore.pipelines-e2e.indexes.json" }
-]
-```
+`firebase-tools` **≥ 15.17.0** is required to deploy Firestore **search** composite indexes (`searchConfig` on index fields; [firebase-tools#10431](https://github.com/firebase/firebase-tools/pull/10431)). After bumping tooling or Firebase JS/native SDKs, update every surface that pins or consumes them:
 
-## Pull indexes from cloud (sync repo → truth)
+| Surface | Location |
+|---------|----------|
+| JS `firebase-tools` | Repo root `package.json`, `tests/package.json`, `.github/workflows/scripts/functions/package.json` — run `yarn` at repo root and `yarn` in `functions/` |
+| JS Firebase SDK (compare-types) | Repo root `firebase` dependency — [`.github/scripts/compare-types/`](../../.github/scripts/compare-types/) does **not** declare `firebase-tools`; it uses root `node_modules/firebase` for SDK types only |
+| Native test apps | `tests/android/build.gradle`, `tests/android/app/build.gradle`, `tests/ios/Podfile`, `tests/macos/Podfile` |
 
-```bash
-cd .github/workflows/scripts
-./sync-firestore-indexes.sh
-```
+Verify CLI: `node_modules/.bin/firebase --version`.
 
-Uses `firebase firestore:indexes --database …`. No CLI pulls security rules; edit `.rules` in repo.
+## Multi-database deploy config
 
-**Sync `(default)` indexes before deploy** if cloud has indexes not in repo; deploy deletes missing indexes.
+Emulator vs cloud split: [`README-firestore.md`](../../.github/workflows/scripts/README-firestore.md). Cloud deploy uses `firebase.deploy.json` (multi-database array); `firebase.json` stays single-database for the emulator.
 
-## Deploy to cloud
+## Index change workflow (sync → edit → deploy → verify)
 
-```bash
-cd .github/workflows/scripts
-./deploy-firestore.sh
-```
+Wrong index JSON or an old CLI can yield **deploy exit 0** without the intended index in cloud. Use this cycle for `(default)` and `pipelines-e2e`:
 
-Deploys **both** databases via `firebase deploy --only firestore`.
+1. `./sync-firestore-indexes.sh` — baseline from cloud
+2. Edit `firestore.indexes.json` and/or `firestore.pipelines-e2e.indexes.json` in-repo
+3. `./deploy-firestore.sh` — deploys both DBs and runs [`verify-firestore-indexes.sh`](../../.github/workflows/scripts/verify-firestore-indexes.sh)
+4. `./sync-firestore-indexes.sh` again
+5. **Verify** the pulled JSON matches baseline plus intended changes (e.g. `search-text` / `menu` `searchConfig` for pipeline search e2e). If deploy succeeded but post-sync pull **does not** include the change → **stop**; do not run pipeline search e2e until triaged (CLI version, JSON schema, index `BUILDING` in console).
 
-**Do not use** `--only firestore:indexes` or `firestore:rules`; with multi-DB array they can exit 0 while deploying nothing ([firebase-tools#10447](https://github.com/firebase/firebase-tools/issues/10447)).
+There is no `firebase firestore:rules` pull; edit `.rules` files in-repo.
 
-### Vector indexes (`findNearest`)
+**`(default)` safety:** sync `(default)` indexes before deploy if cloud has indexes not in repo — deploy removes indexes missing from the repo file.
 
-Vector indexes live in **`firestore.pipelines-e2e.indexes.json`**, not rules:
+**Deploy target:** `firebase deploy --only firestore --config firebase.deploy.json`. Do **not** use `--only firestore:indexes` or `firestore:rules`; with multi-DB config they can exit 0 while deploying nothing ([firebase-tools#10447](https://github.com/firebase/firebase-tools/issues/10447)).
 
-```json
-{
-  "collectionGroup": "find-nearest",
-  "queryScope": "COLLECTION",
-  "fields": [
-    {
-      "fieldPath": "embedding",
-      "vectorConfig": { "dimension": 3, "flat": {} }
-    }
-  ]
-}
-```
+### Index types on `pipelines-e2e`
+
+| Kind | Repo file | Notes |
+|------|-----------|--------|
+| Vector `findNearest` | `firestore.pipelines-e2e.indexes.json` — `vectorConfig` on `find-nearest` / `embedding` | Async until console shows `READY` |
+| Full-text search | Same file — composite index on `search-text` with `searchConfig` on `menu`, `"density": "SPARSE_ANY"` (not `fieldOverrides` / `searchConfiguration`) | Required for `documentMatches` search e2e; verify script enforces cloud presence |
 
-After deploy, index creation is async; `findNearest` may wait/stay skipped until console shows `READY`.
+Post-deploy verification: `./verify-firestore-indexes.sh` (optional env: `FIRESTORE_VERIFY_DATABASE`, `MIN_FIREBASE_TOOLS_VERSION`). Index creation may remain `BUILDING`; search e2e may fail until `READY`.
 
 ### `pipelines-e2e` rules
 
@@ -292,11 +283,11 @@ Pipeline-only debugging may temporarily scope `tests/app.js` to `Pipeline.e2e.js
 | **Why pipelines split from emulator** | Emulator multi-database + shared rules bundle broke Standard e2e security-rules testing; `pipelines-e2e` moved to dedicated cloud rules/indexes files |
 | `second-rnfb` on emulator | Same `firestore.rules` file with `database == "second-rnfb"` guards — not a separate `firebase.json` deploy entry |
 | `helpers.wipe()` | Emulator REST only; does not clear cloud `pipelines-e2e` |
-| Index deploy safety | Pull `(default)` indexes before `deploy-firestore.sh` |
+| Index deploy safety | Sync → edit → deploy → verify cycle; `verify-firestore-indexes.sh`; CLI ≥ 15.17.0 for search indexes |
 | Multi-DB deploy | Use `--only firestore`, not `:indexes` / `:rules` sub-targets |
 | Emulator rules | File edits + restart (or hot-reload for rules); no `firebase deploy` |
 | `cp` / shell aliases | Use `/bin/cp -f` or `sync-firestore-indexes.sh` — interactive `cp` alias can hang on overwrite prompts |
-| Vector search | Index in `firestore.pipelines-e2e.indexes.json`; deploy to cloud; not emulator rules |
+| Vector + text search | Indexes in `firestore.pipelines-e2e.indexes.json`; deploy + verify; not emulator rules |
 | Firestore cache | `clearIndexedDbPersistence` in `tests/app.js` for non-macOS platforms between runs |
 | Native coverage | iOS profraw pulled in `finally` even when Jet fails — see [Coverage design](/testing/coverage-design.md) |
 | Installations / RC | Live FIS + RC on shared project; not emulated — parallel matrix can 503 / “Too many server requests” |
diff --git a/okf-bundle/testing/index.md b/okf-bundle/testing/index.md
index cc43c939ad..e26eb261f9 100644
--- a/okf-bundle/testing/index.md
+++ b/okf-bundle/testing/index.md
@@ -2,7 +2,7 @@
 
 * [Agent command policy](agent-command-policy.md) — **read before any shell command** (install, prepare, validation, e2e); **`yarn` / `yarn lerna:prepare` must exit 0 before any other command**
 * [Documentation/commit policy](../documentation-policy.md) — durable vs ephemeral, OKF scan
-* [Change authoring workflow](change-authoring-workflow.md) — verified product change loop (unit-focused → area-focused review → commit)
+* [Change authoring workflow](change-authoring-workflow.md) — verified product change loop (unit-focused → area-focused review → commit); [§ quality standards](change-authoring-workflow.md#quality-standards); [§ validation evidence (blocking)](change-authoring-workflow.md#validation-evidence-blocking); [coverage evidence package](coverage-design.md#coverage-evidence-package)
 * [Iteration vocabulary](iteration-vocabulary.md) — work type, tier, and queue field identifiers
 * [Running e2e tests](running-e2e.md) — canonical e2e commands; start here for `:test-cover`
 * [Validation checklist](validation-checklist.md) — handoff command sequence
diff --git a/okf-bundle/testing/iteration-vocabulary.md b/okf-bundle/testing/iteration-vocabulary.md
index 56cf76a84c..48d42d931c 100644
--- a/okf-bundle/testing/iteration-vocabulary.md
+++ b/okf-bundle/testing/iteration-vocabulary.md
@@ -52,11 +52,11 @@ Work queues use these **field names** (values: `open` | `closed`):
 |-------|--------|
 | `implementation_gate` | `implementation` work type complete |
 | `review_gate` | `independent-review` work type complete |
-| `commit_gate` | Durable commit exists for the item |
+| `commit_gate` | Durable commit exists for the item **after** prior gates closed with [validation evidence](change-authoring-workflow.md#validation-evidence-blocking) |
 
 What closes each gate, trust rules, and loop transitions: [change authoring § gates](change-authoring-workflow.md#gates).
 
-`commit_gate` closes when a durable commit exists whose subject matches the row's `commit_subject`.
+`commit_gate` closes when a durable commit exists whose subject matches the row's `commit_subject`, **after** `implementation_gate` and `review_gate` closed with [validation evidence](change-authoring-workflow.md#validation-evidence-blocking).
 
 Items may also be marked **`blocked`** when a dependency gate is open elsewhere.
 
diff --git a/okf-bundle/testing/running-e2e.md b/okf-bundle/testing/running-e2e.md
index 20c27c4b6c..5f4ca2a84d 100644
--- a/okf-bundle/testing/running-e2e.md
+++ b/okf-bundle/testing/running-e2e.md
@@ -630,6 +630,7 @@ Pre-merge applies once to the branch commit stream before merge/push intended fo
 2. [Pre-flight](#pre-flight-is-the-host-clear-to-start) — [host-clear probes](#host-clear-probes) pass before each platform run.
 3. Rebuild when needed (`tests:<platform>:build`; `yarn lerna:prepare` for `lib/**`). After TurboModule codegen or native bridge edits, see [TurboModule stale toolchain](#turbomodule-stale-toolchain-blocking).
 4. Full unfocused suite with coverage on **iOS, Android, macOS** — one platform at a time, all green.
+5. Record [validation evidence package](validation-checklist.md#validation-evidence-package) and [coverage evidence package](coverage-design.md#coverage-evidence-package) when lib/native touched — required before merge or push ([change authoring § validation evidence](change-authoring-workflow.md#validation-evidence-blocking)).
 
 ## Notes
 
diff --git a/okf-bundle/testing/validation-checklist.md b/okf-bundle/testing/validation-checklist.md
index a555a41708..553e6af2f7 100644
--- a/okf-bundle/testing/validation-checklist.md
+++ b/okf-bundle/testing/validation-checklist.md
@@ -55,7 +55,7 @@ For any package registered in `compare:types`, type parity is a **review-gate re
 
 - no undocumented differences,
 - no stale config entries,
-- and any intentional RN-only exports documented in that package config.
+- and any intentional RN-only exports documented in that package config to the [compare-types justification bar](../../.github/scripts/compare-types/README.md#justification-bar).
 
 If `yarn compare:types` fails because of unrelated packages, keep the touched package's result in the handoff and add/fix a work-queue item for the unrelated drift. Do not close a review gate for a registered package when its own compare-types output is failing.
 
@@ -92,9 +92,20 @@ yarn lint:markdown
 yarn lint:spellcheck
 ```
 
-Native (when platform sources in diff): `yarn lint:android`, `yarn lint:ios:check`. `lint:android` can flake; rerun once/twice if failure is not clearly in diff.
+**CI Lint job equivalent** (required before `review` / publication when the diff touches JS, Java, or Objective-C/C++ sources):
 
-Full aggregate (pre-merge optional): `yarn lint` (= js + android + ios check).
+```bash
+yarn lint                              # lint:js + lint:android + lint:ios:check — matches .github/workflows/linting.yml
+```
+
+`lint:android` runs `google-java-format` and fails if it would change committed files — commit formatter output. `lint:android` can flake; rerun once/twice if failure is not clearly in diff.
+
+**CI docs job equivalent** (required before `review` / publication when `docs/**` changed):
+
+```bash
+yarn lint:markdown                     # matches .github/workflows/docs.yml
+yarn lint:spellcheck
+```
 
 ## E2e with coverage
 
@@ -114,6 +125,29 @@ Before handoff, follow [OKF policy](../documentation-policy.md#okf-update-contra
 
 Goal: each iteration improves OKF and removes conflicting guidance.
 
+<a id="validation-evidence-package"></a>
+
+## Validation evidence package (blocking)
+
+Before closing **`implementation_gate`**, **`review_gate`**, **`commit_gate`**, or publishing (`git push` / PR update), record evidence per [change authoring § validation evidence](change-authoring-workflow.md#validation-evidence-blocking). Minimum template:
+
+```markdown
+| Step | Command | Exit | Evidence |
+|------|---------|------|----------|
+| prepare | yarn lerna:prepare | 0 | — |
+| jest | yarn tests:jest <paths> | 0 | N/N tests |
+| e2e macOS | yarn tests:macos:test-cover | 0 | X passing — /tmp/...log |
+| e2e iOS | yarn tests:ios:test-cover | 0 | Y passing — /tmp/...log |
+| e2e Android | yarn tests:android:test-cover | 0 | Z passing — /tmp/...log |
+| compare:types | yarn compare:types | 0 | <pkg> 0/0/0 |
+| lint (CI) | yarn lint | 0 | — |
+| lint:markdown (CI docs) | yarn lint:markdown | 0 | when docs/** in diff |
+| lint:spellcheck (CI docs) | yarn lint:spellcheck | 0 | when docs/** in diff |
+| coverage | post-process + region table | — | see coverage-design § evidence package |
+```
+
+**History rewrite invalidates** prior rows — re-run and replace the table after amend/rebase.
+
 ## Handoff checklist
 
 - [ ] `yarn lerna:prepare` (after any `packages/*/lib/**` edits)
@@ -123,10 +157,10 @@ Goal: each iteration improves OKF and removes conflicting guidance.
 - [ ] `yarn tests:jest`
 - [ ] TurboModule wrapper contract ([NewArch-AD-17.1](../new-architecture/architecture-decisions.md#newarch-ad-171--jest-turbomodule-contract-test--accepted)) when `packages/app/lib/internal/registry/nativeModule.ts`, `nativeModuleAndroidIos.ts`, or TurboModule wrapper behavior changed: `yarn tests:jest -- packages/app/__tests__/nativeModuleContract.test.ts`
 - [ ] `yarn compare:types` (stale config entries removed)
-- [ ] `yarn lint:js` (+ markdown/spellcheck if docs; + platform lint if native)
+- [ ] `yarn lint` (CI Lint job); `yarn lint:markdown` + `yarn lint:spellcheck` when `docs/**` changed
 - [ ] E2e green on **every required platform** for the changed module ([platform coverage gate](running-e2e.md#platform-coverage-gate-blocking); [harness narrowing gate](running-e2e.md#harness-narrowing-gate-blocking); no `.only`; committed `RNFBDebug` remains `false`)
-- [ ] Native coverage post-processing per [coverage-design](coverage-design.md)
-- [ ] [Coverage policy](coverage-design.md#coverage-expectations-policy) satisfied on touched files
+- [ ] [Validation evidence package](validation-checklist.md#validation-evidence-package) recorded (exit codes, e2e counts, log paths)
+- [ ] [Coverage evidence package](coverage-design.md#coverage-evidence-package) when lib/native bridge touched — gaps investigated to fix, delete, or acceptable-exception bar
 - [ ] OKF bundle reviewed/updated per § above
 
 Package workflows may add items (e.g. pipeline before/after snapshots — [pipeline workflow](../packages/firestore/pipeline-implementation-workflow.md)).
diff --git a/package.json b/package.json
index 9b04e4b721..a33b152201 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
     "firebase": "^12.15.0",
-    "firebase-tools": "^15.16.0",
+    "firebase-tools": "^15.22.4",
     "genversion": "^3.2.0",
     "google-java-format": "^2.2.0",
     "jest": "^30.3.0",
diff --git a/packages/analytics/lib/index.ts b/packages/analytics/lib/index.ts
index 053e650e47..99668d84d8 100644
--- a/packages/analytics/lib/index.ts
+++ b/packages/analytics/lib/index.ts
@@ -975,7 +975,7 @@ export function logEvent(
     payment_type?: EventParams['payment_type'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -988,7 +988,7 @@ export function logEvent(
     shipping_tier?: EventParams['shipping_tier'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -999,7 +999,7 @@ export function logEvent(
     value?: EventParams['value'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1010,7 +1010,7 @@ export function logEvent(
     value?: EventParams['value'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1023,7 +1023,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1034,7 +1034,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1045,7 +1045,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1055,7 +1055,7 @@ export function logEvent(
     value?: EventParams['value'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1064,7 +1064,7 @@ export function logEvent(
     method: EventParams['method'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1076,7 +1076,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1093,7 +1093,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1109,7 +1109,7 @@ export function logEvent(
     transaction_id?: EventParams['transaction_id'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1120,7 +1120,7 @@ export function logEvent(
     currency?: EventParams['currency'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1131,7 +1131,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1148,7 +1148,7 @@ export function logEvent(
     travel_class?: string;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1158,7 +1158,7 @@ export function logEvent(
     item_id: EventParams['item_id'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1170,7 +1170,7 @@ export function logEvent(
     item_list_name: EventParams['item_list_name'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1184,7 +1184,7 @@ export function logEvent(
     promotion_name: EventParams['promotion_name'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1195,7 +1195,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1206,7 +1206,7 @@ export function logEvent(
     method: EventParams['method'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1215,7 +1215,7 @@ export function logEvent(
     method: EventParams['method'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1224,7 +1224,7 @@ export function logEvent(
     [key: string]: any;
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1235,7 +1235,7 @@ export function logEvent(
     value?: EventParams['value'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1246,7 +1246,7 @@ export function logEvent(
     value?: EventParams['value'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1257,7 +1257,7 @@ export function logEvent(
     item_list_name?: EventParams['item_list_name'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1271,7 +1271,7 @@ export function logEvent(
     promotion_name?: EventParams['promotion_name'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
@@ -1280,7 +1280,7 @@ export function logEvent(
     search_term: EventParams['search_term'];
   },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 // Generic fallback for custom event names
 export function logEvent<T extends string>(
@@ -1288,15 +1288,15 @@ export function logEvent<T extends string>(
   name: CustomEventName<T>,
   params?: { [key: string]: any },
   options?: AnalyticsCallOptions,
-): Promise<void>;
+): void;
 
 export function logEvent(
   analytics: Analytics,
   name: string,
   params: { [key: string]: any } = {},
   options: AnalyticsCallOptions = { global: false },
-): Promise<void> {
-  return analytics.logEvent(name, params, options);
+): void {
+  void analytics.logEvent(name, params, options);
 }
 
 /**
diff --git a/packages/app-check/__tests__/appcheck.test.ts b/packages/app-check/__tests__/appcheck.test.ts
index 85136abd4c..581cc123c4 100644
--- a/packages/app-check/__tests__/appcheck.test.ts
+++ b/packages/app-check/__tests__/appcheck.test.ts
@@ -20,8 +20,8 @@ describe('appCheck()', function () {
       expect(initializeAppCheck).toBeDefined();
     });
 
-    it('`initializeAppCheck` rejects missing options at runtime', async function () {
-      await expect(initializeAppCheck(undefined, undefined)).rejects.toThrow(
+    it('`initializeAppCheck` throws when options are missing at runtime', function () {
+      expect(() => initializeAppCheck(undefined, undefined)).toThrow(
         'Invalid configuration: no options defined.',
       );
     });
diff --git a/packages/app-check/lib/index.ts b/packages/app-check/lib/index.ts
index f01a828d50..6a5d8d1517 100644
--- a/packages/app-check/lib/index.ts
+++ b/packages/app-check/lib/index.ts
@@ -258,19 +258,17 @@ function getModularAppCheck(app?: FirebaseApp): AppCheck {
 /**
  * Initializes App Check for the given Firebase app.
  *
- * @remarks On native platforms use {@link ReactNativeFirebaseAppCheckProvider} to configure
+ * @remarks Returns synchronously for firebase-js-sdk parity; native provider setup continues in
+ * the background. On native platforms use {@link ReactNativeFirebaseAppCheckProvider} to configure
  * Device Check, App Attest, Play Integrity, or debug providers. firebase-js-sdk
  * `ReCaptchaEnterpriseProvider` / `ReCaptchaV3Provider` are **web only** and have no RN equivalent.
  */
-export async function initializeAppCheck(
-  app?: FirebaseApp,
-  options?: AppCheckOptions,
-): Promise<AppCheck> {
+export function initializeAppCheck(app?: FirebaseApp, options?: AppCheckOptions): AppCheck {
   if (!isObject(options)) {
     throw new Error('Invalid configuration: no options defined.');
   }
   const appCheck = getModularAppCheck(app);
-  await (appCheck as AppCheckInternal).initializeAppCheck(options);
+  void (appCheck as AppCheckInternal).initializeAppCheck(options);
   return appCheck;
 }
 
diff --git a/packages/app-check/lib/types/appcheck.ts b/packages/app-check/lib/types/appcheck.ts
index 71b2683762..b631c3b5f0 100644
--- a/packages/app-check/lib/types/appcheck.ts
+++ b/packages/app-check/lib/types/appcheck.ts
@@ -97,6 +97,12 @@ export interface AppCheckTokenResult {
   readonly token: string;
 }
 
+/**
+ * Callback invoked when the App Check token changes.
+ * @public
+ */
+export type AppCheckTokenListener = (token: AppCheckTokenResult) => void;
+
 /**
  * An App Check provider. This can be either the built-in reCAPTCHA provider
  * or a custom provider. For more on custom providers, see
diff --git a/packages/app-check/type-test.ts b/packages/app-check/type-test.ts
index d20af39c9c..7b40d39332 100644
--- a/packages/app-check/type-test.ts
+++ b/packages/app-check/type-test.ts
@@ -7,7 +7,6 @@ import {
   onTokenChanged,
   CustomProvider,
   SDK_VERSION,
-  type AppCheck,
   type AppCheckOptions,
   type AppCheckTokenResult,
 } from '.';
@@ -19,11 +18,8 @@ const options: AppCheckOptions = {
     },
   },
 };
-const appCheck = {} as AppCheck;
-
-initializeAppCheck(getApp(), options).then((instance: AppCheck) => {
-  console.log(instance.app.name);
-});
+const appCheck = initializeAppCheck(getApp(), options);
+console.log(appCheck.app.name);
 
 getToken(appCheck).then((result: AppCheckTokenResult) => {
   console.log(result.token);
diff --git a/packages/app/lib/internal/NativeFirebaseError.ts b/packages/app/lib/internal/NativeFirebaseError.ts
index dbf0d63816..768a3af43c 100644
--- a/packages/app/lib/internal/NativeFirebaseError.ts
+++ b/packages/app/lib/internal/NativeFirebaseError.ts
@@ -22,7 +22,7 @@ export default class NativeFirebaseError extends Error {
   readonly code!: string;
   readonly jsStack!: string;
   readonly userInfo!: NativeErrorUserInfo;
-  readonly customData: any;
+  readonly customData!: Record<string, unknown> | null;
   readonly operationType!: string | null;
   readonly nativeErrorCode!: string | number | null;
   readonly nativeErrorMessage!: string | null;
diff --git a/packages/app/lib/types/app.ts b/packages/app/lib/types/app.ts
index 0be0b8cf58..6fff9986b9 100644
--- a/packages/app/lib/types/app.ts
+++ b/packages/app/lib/types/app.ts
@@ -26,6 +26,11 @@ export namespace ReactNativeFirebase {
      */
     readonly code: string;
 
+    /**
+     * Optional extra data included with the error, matching FirebaseError from `@firebase/app`.
+     */
+    customData?: Record<string, unknown>;
+
     /**
      * Firebase error message
      */
diff --git a/packages/app/type-test.ts b/packages/app/type-test.ts
index 40c495bb73..8be9376dc7 100644
--- a/packages/app/type-test.ts
+++ b/packages/app/type-test.ts
@@ -14,7 +14,16 @@
  *  limitations under the License.
  */
 
-import { getApp, getApps, getUtils, initializeApp, SDK_VERSION, FilePath } from '.';
+import {
+  getApp,
+  getApps,
+  getUtils,
+  initializeApp,
+  SDK_VERSION,
+  FilePath,
+} from '.';
+import type { ReactNativeFirebase } from '.';
+import type { FirebaseError } from '@firebase/app';
 
 // modular app accessors
 console.log(getUtils().app.name);
@@ -41,3 +50,7 @@ modularUtils.resolutionForPlayServices();
 // checks root exists
 console.log(SDK_VERSION);
 console.log(getApps().length);
+
+// NativeFirebaseError is structurally assignable to FirebaseError for SDK callback parity
+export type NativeFirebaseErrorAssignableToFirebaseError =
+  ReactNativeFirebase.NativeFirebaseError extends FirebaseError ? true : false;
diff --git a/packages/firestore/__tests__/aggregateEqual.test.ts b/packages/firestore/__tests__/aggregateEqual.test.ts
new file mode 100644
index 0000000000..90ee64b21d
--- /dev/null
+++ b/packages/firestore/__tests__/aggregateEqual.test.ts
@@ -0,0 +1,87 @@
+import { describe, expect, it } from '@jest/globals';
+
+import {
+  aggregateFieldEqual,
+  aggregateQuerySnapshotEqual,
+  collection,
+  count,
+  getFirestore,
+  query,
+  sum,
+  where,
+} from '../lib';
+import { AggregateField, AggregateQuerySnapshot } from '../lib/FirestoreAggregate';
+
+describe('aggregate equality helpers', function () {
+  const db = getFirestore();
+  const coll = collection(db, 'aggregate-equal-test');
+  const queryA = query(coll, where('author', '==', 'authorA'));
+  const queryB = query(coll, where('author', '==', 'authorA'));
+  const queryC = query(coll, where('author', '==', 'authorB'));
+
+  describe('aggregateFieldEqual()', function () {
+    it('returns true for matching aggregate fields', function () {
+      expect(aggregateFieldEqual(count(), count())).toBe(true);
+      expect(aggregateFieldEqual(sum('age'), sum('age'))).toBe(true);
+    });
+
+    it('returns false for different aggregate types or field paths', function () {
+      expect(aggregateFieldEqual(count(), sum('age'))).toBe(false);
+      expect(aggregateFieldEqual(sum('age'), sum('score'))).toBe(false);
+      expect(aggregateFieldEqual(count(), {} as AggregateField<number>)).toBe(false);
+    });
+  });
+
+  describe('aggregateQuerySnapshotEqual()', function () {
+    it('returns true when queries and count data match', function () {
+      const left = new AggregateQuerySnapshot(queryA, { count: 2 }, true);
+      const right = new AggregateQuerySnapshot(queryA, { count: 2 }, true);
+      const equivalentQuery = new AggregateQuerySnapshot(queryB, { count: 2 }, true);
+
+      expect(aggregateQuerySnapshotEqual(left, right)).toBe(true);
+      expect(aggregateQuerySnapshotEqual(left, equivalentQuery)).toBe(true);
+    });
+
+    it('returns false when aggregate data differs', function () {
+      const left = new AggregateQuerySnapshot(queryA, { count: 2 }, true);
+      const right = new AggregateQuerySnapshot(queryA, { count: 3 }, true);
+
+      expect(aggregateQuerySnapshotEqual(left, right)).toBe(false);
+    });
+
+    it('returns false when underlying queries differ', function () {
+      const left = new AggregateQuerySnapshot(queryA, { count: 2 }, true);
+      const right = new AggregateQuerySnapshot(queryC, { count: 2 }, true);
+
+      expect(aggregateQuerySnapshotEqual(left, right)).toBe(false);
+    });
+
+    it('compares aggregate spec data from getAggregateFromServer snapshots', function () {
+      const left = new AggregateQuerySnapshot(
+        queryA,
+        { totalAge: 100, avgAge: 50, count: 2 },
+        false,
+      );
+      const right = new AggregateQuerySnapshot(
+        queryA,
+        { totalAge: 100, avgAge: 50, count: 2 },
+        false,
+      );
+      const different = new AggregateQuerySnapshot(
+        queryA,
+        { totalAge: 100, avgAge: null, count: 2 },
+        false,
+      );
+
+      expect(aggregateQuerySnapshotEqual(left, right)).toBe(true);
+      expect(aggregateQuerySnapshotEqual(left, different)).toBe(false);
+    });
+
+    it('returns false for non-AggregateQuerySnapshot arguments', function () {
+      const snapshot = new AggregateQuerySnapshot(queryA, { count: 2 }, true);
+
+      expect(aggregateQuerySnapshotEqual(snapshot, {} as AggregateQuerySnapshot)).toBe(false);
+      expect(aggregateQuerySnapshotEqual({} as AggregateQuerySnapshot, snapshot)).toBe(false);
+    });
+  });
+});
diff --git a/packages/firestore/__tests__/nativeModuleContract.test.ts b/packages/firestore/__tests__/nativeModuleContract.test.ts
index 1f72236b28..2be3a2e11f 100644
--- a/packages/firestore/__tests__/nativeModuleContract.test.ts
+++ b/packages/firestore/__tests__/nativeModuleContract.test.ts
@@ -122,4 +122,44 @@ describe('TurboModule wrapper contract (NewArch-AD-17.1)', function () {
       'transactionBegin',
     ]);
   });
+
+  it('forwards maxAttempts through transactionBegin', function () {
+    const transactionBegin = jest.fn();
+    const hostTransaction = createTurboModuleFixture({ transactionBegin });
+
+    jest
+      .mocked(TurboModuleRegistry.get)
+      .mockReturnValueOnce(createTurboModuleFixture({}))
+      .mockReturnValueOnce(createTurboModuleFixture({}))
+      .mockReturnValueOnce(createTurboModuleFixture({}))
+      .mockReturnValueOnce(hostTransaction);
+
+    const config: ModuleConfig = {
+      namespace: 'firestoreContractMaxAttempts',
+      nativeModuleName: [
+        'NativeRNFBTurboFirestore',
+        'NativeRNFBTurboFirestoreCollection',
+        'NativeRNFBTurboFirestoreDocument',
+        'NativeRNFBTurboFirestoreTransaction',
+      ],
+      nativeEvents: false,
+      hasMultiAppSupport: true,
+      hasCustomUrlOrRegionSupport: true,
+      turboModule: true,
+    };
+
+    class MergeModule extends FirebaseModule<any> {
+      constructor() {
+        super({ name: '[DEFAULT]' } as any, config);
+      }
+    }
+
+    const wrapped = getNativeModule(new MergeModule()) as WrappedNativeModule & {
+      transactionBegin: (transactionId: number, maxAttempts: number) => void;
+    };
+
+    wrapped.transactionBegin(7, 5);
+
+    expect(transactionBegin).toHaveBeenCalledWith('[DEFAULT]', null, 7, 5);
+  });
 });
diff --git a/packages/firestore/__tests__/pipelines-parity.test.ts b/packages/firestore/__tests__/pipelines-parity.test.ts
index d61dab8689..13a82031f0 100644
--- a/packages/firestore/__tests__/pipelines-parity.test.ts
+++ b/packages/firestore/__tests__/pipelines-parity.test.ts
@@ -26,6 +26,30 @@ const IOS_NODE_BUILDER_PATH = join(
   'packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineNodeBuilder.swift',
 );
 
+function extractJavaMethod(source: string, signature: string, nextSignature: string): string {
+  const start = source.indexOf(signature);
+  if (start === -1) {
+    throw new Error(`Could not find Java method "${signature}".`);
+  }
+  const end = source.indexOf(nextSignature, start + signature.length);
+  if (end === -1) {
+    throw new Error(`Could not find end marker "${nextSignature}" for "${signature}".`);
+  }
+  return source.slice(start, end);
+}
+
+function extractSwiftFunction(source: string, signature: string, nextSignature: string): string {
+  const start = source.indexOf(signature);
+  if (start === -1) {
+    throw new Error(`Could not find Swift function "${signature}".`);
+  }
+  const end = source.indexOf(nextSignature, start + signature.length);
+  if (end === -1) {
+    throw new Error(`Could not find end marker "${nextSignature}" for "${signature}".`);
+  }
+  return source.slice(start, end);
+}
+
 function extractQuotedList(source: string, marker: string, endMarker: string): string[] {
   const markerIndex = source.indexOf(marker);
   if (markerIndex === -1) {
@@ -113,4 +137,31 @@ describe('Firestore pipeline native parity', function () {
     expect(androidSource).toContain('count_if');
     expect(androidSource).toContain('coerceBooleanValueNode');
   });
+
+  it('coerceDocumentPathValue uses resolved string after constant unwrapping on native builders', function () {
+    const androidSource = readFileSync(ANDROID_NODE_BUILDER_PATH, 'utf8');
+    const iosSource = readFileSync(IOS_NODE_BUILDER_PATH, 'utf8');
+
+    const androidFn = extractJavaMethod(
+      androidSource,
+      'private String coerceDocumentPathValue(Object value, String fieldName)',
+      'private Object resolveConstantValue(Object value, String fieldName)',
+    );
+    const iosFn = extractSwiftFunction(
+      iosSource,
+      'private func coerceDocumentPathValue(_ value: Any, fieldName: String) throws -> String {',
+      'private func buildParentExprBridge(referenceArg: ExprBridge) -> ExprBridge {',
+    );
+
+    expect(androidFn).toContain('unwrapConstantValue(map, fieldName)');
+    expect(androidFn).toContain('isSerializedReferencePathConstantMap(map)');
+    expect(androidFn).toContain('instanceof DocumentReference');
+    expect(androidFn).toContain('return coerceStringValue(resolved, fieldName);');
+    expect(androidFn).not.toContain('return coerceStringValue(value, fieldName);');
+
+    expect(iosFn).toContain('resolved as? DocumentReference');
+    expect(iosFn).toContain('isSerializedReferencePathConstantMap(map)');
+    expect(iosFn).toContain('return try coerceStringValue(resolved, fieldName: fieldName)');
+    expect(iosFn).not.toContain('return try coerceStringValue(value, fieldName: fieldName)');
+  });
 });
diff --git a/packages/firestore/__tests__/pipelines-serialization-matrix.test.ts b/packages/firestore/__tests__/pipelines-serialization-matrix.test.ts
index f1a1c37d6f..b36a3e41df 100644
--- a/packages/firestore/__tests__/pipelines-serialization-matrix.test.ts
+++ b/packages/firestore/__tests__/pipelines-serialization-matrix.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from '@jest/globals';
 import { getFirestore } from '../lib';
-import { field, timestampDiff, timestampExtract } from '../lib/pipelines';
+import { constant, field, parent, timestampDiff, timestampExtract } from '../lib/pipelines';
+import type { ConstantExpression } from '../lib/pipelines/expressions';
 import '../lib/pipelines';
 
 /** Standalone firebase-js-sdk helpers that must not get fluent `.name()` chains. */
@@ -12,6 +13,52 @@ function selectExpr(db: any, expr: unknown) {
 }
 
 describe('pipelines serialization matrix', function () {
+  describe('parent document path serialization', function () {
+    const db: any = getFirestore();
+
+    it('serializes string document paths as constant parent args', function () {
+      expect(selectExpr(db, parent('users/alice/posts/post1').as('parentRef'))).toMatchObject({
+        exprType: 'Function',
+        name: 'parent',
+        args: [{ exprType: 'Constant', value: 'users/alice/posts/post1' }],
+      });
+    });
+
+    it('serializes constant-wrapped string document paths for parent args', function () {
+      const wrapped = constant('users/alice/posts/post1') as ConstantExpression;
+      expect(selectExpr(db, parent(wrapped).as('parentRef'))).toMatchObject({
+        exprType: 'Function',
+        name: 'parent',
+        args: [{ exprType: 'Constant', value: 'users/alice/posts/post1' }],
+      });
+    });
+    it('serializes DocumentReference document paths as path constant parent args', function () {
+      const ref = db.doc('users/alice/posts/post1');
+      expect(selectExpr(db, parent(ref).as('parentRef'))).toMatchObject({
+        exprType: 'Function',
+        name: 'parent',
+        args: [{ exprType: 'Constant', value: { path: 'users/alice/posts/post1' } }],
+      });
+    });
+
+    it('serializes constant-wrapped reference path maps for parent args', function () {
+      const wrapped = constant({ path: 'users/alice/posts/post1' }) as ConstantExpression;
+      expect(selectExpr(db, parent(wrapped).as('parentRef'))).toMatchObject({
+        exprType: 'Function',
+        name: 'parent',
+        args: [{ exprType: 'Constant', value: { path: 'users/alice/posts/post1' } }],
+      });
+    });
+
+    it('serializes lowerable field path expressions for parent args', function () {
+      expect(selectExpr(db, parent(field('docPath')).as('parentRef'))).toMatchObject({
+        exprType: 'Function',
+        name: 'parent',
+        args: [{ exprType: 'Field', path: 'docPath' }],
+      });
+    });
+  });
+
   describe('standalone-only expression helpers', function () {
     it.each(STANDALONE_ONLY_EXPRESSIONS)('does not expose fluent %s on field()', function (name) {
       expect(typeof (field('x') as any)[name]).toBe('undefined');
@@ -164,4 +211,50 @@ describe('pipelines serialization matrix', function () {
       });
     });
   });
+
+  describe('constant preferIntegers option', function () {
+    const db: any = getFirestore();
+
+    it('auto-tags integer literals when options are omitted', function () {
+      expect(selectExpr(db, (constant(1) as ConstantExpression).as('one'))).toMatchObject({
+        exprType: 'Constant',
+        value: 1,
+        integerLiteral: true,
+      });
+    });
+
+    it('serializes integerLiteral when preferIntegers is true', function () {
+      expect(
+        selectExpr(
+          db,
+          (constant(1.5, { preferIntegers: true }) as ConstantExpression).as('onePointFive'),
+        ),
+      ).toMatchObject({
+        exprType: 'Constant',
+        value: 1.5,
+        integerLiteral: true,
+      });
+    });
+
+    it('omits integerLiteral when preferIntegers is false', function () {
+      const serialized = selectExpr(
+        db,
+        (constant(1, { preferIntegers: false }) as ConstantExpression).as('one'),
+      );
+      expect(serialized).toMatchObject({
+        exprType: 'Constant',
+        value: 1,
+      });
+      expect(serialized).not.toHaveProperty('integerLiteral');
+    });
+
+    it('omits integerLiteral for non-integers when options are omitted', function () {
+      const serialized = selectExpr(db, (constant(1.5) as ConstantExpression).as('onePointFive'));
+      expect(serialized).toMatchObject({
+        exprType: 'Constant',
+        value: 1.5,
+      });
+      expect(serialized).not.toHaveProperty('integerLiteral');
+    });
+  });
 });
diff --git a/packages/firestore/__tests__/pipelines-validate.test.ts b/packages/firestore/__tests__/pipelines-validate.test.ts
index 911d2939c8..e60d202598 100644
--- a/packages/firestore/__tests__/pipelines-validate.test.ts
+++ b/packages/firestore/__tests__/pipelines-validate.test.ts
@@ -278,6 +278,27 @@ describe('validateSerializedPipeline — failure branches', function () {
           validateSerializedPipeline(pipelineWithStage({ stage, options })),
         ).not.toThrow();
       }
+      expect(() =>
+        validateSerializedPipeline(
+          pipelineWithStage({
+            stage: 'search',
+            options: { query: { exprType: 'Function', name: 'documentMatches', args: [] } },
+          }),
+        ),
+      ).not.toThrow();
+      expect(() =>
+        validateSerializedPipeline(
+          pipelineWithStage({ stage: 'define', options: { variables: [{}] } }),
+        ),
+      ).not.toThrow();
+      expect(() =>
+        validateSerializedPipeline(pipelineWithStage({ stage: 'search', options: {} })),
+      ).toThrow('pipelineExecute() expected search stage to include query.');
+      expect(() =>
+        validateSerializedPipeline(pipelineWithStage({ stage: 'define', options: {} })),
+      ).toThrow(
+        'pipelineExecute() expected stage.options.variables to contain at least one value.',
+      );
     });
 
     it('accepts a valid subcollection source', function () {
@@ -289,6 +310,59 @@ describe('validateSerializedPipeline — failure branches', function () {
       ).not.toThrow();
     });
 
+    it('accepts parent expression with document path constants', function () {
+      expect(() =>
+        validateSerializedPipeline({
+          source: { source: 'collection', path: 'events' },
+          stages: [
+            {
+              stage: 'select',
+              options: {
+                selections: [
+                  {
+                    alias: 'parentRef',
+                    expr: {
+                      exprType: 'Function',
+                      name: 'parent',
+                      args: [{ exprType: 'Constant', value: 'users/alice/posts/post1' }],
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        }),
+      ).not.toThrow();
+
+      expect(() =>
+        validateSerializedPipeline({
+          source: { source: 'collection', path: 'events' },
+          stages: [
+            {
+              stage: 'select',
+              options: {
+                selections: [
+                  {
+                    alias: 'parentRef',
+                    expr: {
+                      exprType: 'Function',
+                      name: 'parent',
+                      args: [
+                        {
+                          exprType: 'Constant',
+                          value: { path: 'users/alice/posts/post1' },
+                        },
+                      ],
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        }),
+      ).not.toThrow();
+    });
+
     it('accepts a fully valid pipeline', function () {
       expect(() => validateSerializedPipeline(validPipeline())).not.toThrow();
     });
diff --git a/packages/firestore/__tests__/pipelines.test.ts b/packages/firestore/__tests__/pipelines.test.ts
index a07a797c37..11413e6ec5 100644
--- a/packages/firestore/__tests__/pipelines.test.ts
+++ b/packages/firestore/__tests__/pipelines.test.ts
@@ -988,4 +988,75 @@ describe('Firestore pipelines runtime', function () {
       stages: [],
     });
   });
+
+  it('serializes search, define, and B2 expression helpers', function () {
+    const {
+      field,
+      documentMatches,
+      score,
+      geoDistance,
+      parent,
+      variable,
+    } = require('../lib/pipelines');
+    const { GeoPoint } = require('../lib/FirestoreGeoPoint');
+    const db: any = getFirestore();
+
+    const searchSerialized = db
+      .pipeline()
+      .collection('restaurants')
+      .search({
+        query: documentMatches('waffles'),
+        sort: [score().descending()],
+        addFields: [score().as('searchScore')],
+      })
+      .serialize();
+
+    expect(searchSerialized.stages[0]).toMatchObject({
+      stage: 'search',
+      options: {
+        query: {
+          exprType: 'Function',
+          name: 'documentMatches',
+          args: [{ exprType: 'Constant', value: 'waffles' }],
+        },
+        sort: [{ direction: 'descending' }],
+        addFields: [
+          {
+            alias: 'searchScore',
+            expr: { exprType: 'Function', name: 'score', args: [] },
+          },
+        ],
+      },
+    });
+
+    const defineSerialized = db
+      .pipeline()
+      .collection('products')
+      .define(field('price').as('unitPrice'))
+      .where(field('price').greaterThan(variable('unitPrice')))
+      .serialize();
+
+    expect(defineSerialized.stages[0]).toMatchObject({
+      stage: 'define',
+      options: {
+        variables: [{ path: 'price', alias: 'unitPrice', as: 'unitPrice' }],
+      },
+    });
+
+    const exprPipeline = db
+      .pipeline()
+      .collection('places')
+      .search({
+        query: field('location').geoDistance(new GeoPoint(0, 0)).lessThanOrEqual(1000),
+        sort: geoDistance('location', new GeoPoint(1, 2)).ascending(),
+        addFields: [parent('users/alice').as('parentRef')],
+      })
+      .serialize();
+
+    expect(exprPipeline.stages[0].options.query).toBeDefined();
+    expect(exprPipeline.stages[0].options.sort).toBeDefined();
+    expect(exprPipeline.stages[0].options.addFields).toHaveLength(1);
+    expect(field('x').geoDistance).toBeDefined();
+    expect(field('x').documentMatches).toBeUndefined();
+  });
 });
diff --git a/packages/firestore/__tests__/runTransaction.test.ts b/packages/firestore/__tests__/runTransaction.test.ts
new file mode 100644
index 0000000000..98b59bf9bd
--- /dev/null
+++ b/packages/firestore/__tests__/runTransaction.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it, jest } from '@jest/globals';
+
+import FirestoreTransactionHandler from '../lib/FirestoreTransactionHandler';
+import type { FirestoreInternal } from '../lib/types/internal';
+
+function createHandler(transactionBegin: jest.Mock) {
+  const firestore = {
+    native: { transactionBegin, transactionDispose: jest.fn(), transactionApplyBuffer: jest.fn() },
+    emitter: { addListener: jest.fn() },
+    eventNameForApp: jest.fn((name: string) => name),
+  } as unknown as FirestoreInternal;
+
+  return new FirestoreTransactionHandler(firestore);
+}
+
+describe('runTransaction options passthrough', function () {
+  it('passes maxAttempts to native transactionBegin when provided', function () {
+    const transactionBegin = jest.fn();
+    const handler = createHandler(transactionBegin);
+
+    void handler._add(async () => 'ok', { maxAttempts: 5 });
+
+    expect(transactionBegin).toHaveBeenCalledWith(0, 5);
+  });
+
+  it('passes zero maxAttempts when options are omitted', function () {
+    const transactionBegin = jest.fn();
+    const handler = createHandler(transactionBegin);
+
+    void handler._add(async () => 'ok');
+
+    expect(transactionBegin).toHaveBeenCalledWith(expect.any(Number), 0);
+  });
+
+  it.each([0, -1])('throws when maxAttempts is %s', function (maxAttempts) {
+    const transactionBegin = jest.fn();
+    const handler = createHandler(transactionBegin);
+
+    expect(() => handler._add(async () => 'ok', { maxAttempts })).toThrow(
+      'Max attempts must be at least 1',
+    );
+    expect(transactionBegin).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/NativeRNFBTurboFirestoreTransaction.java b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/NativeRNFBTurboFirestoreTransaction.java
index 0191908724..c6caa89cb0 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/NativeRNFBTurboFirestoreTransaction.java
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/NativeRNFBTurboFirestoreTransaction.java
@@ -29,6 +29,7 @@
 import android.util.SparseArray;
 import com.facebook.fbreact.specs.NativeRNFBTurboFirestoreTransactionSpec;
 import com.facebook.react.bridge.*;
+import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.firestore.*;
 import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
@@ -123,7 +124,8 @@ public void transactionApplyBuffer(
   }
 
   @Override
-  public void transactionBegin(String appName, String databaseId, double transactionId) {
+  public void transactionBegin(
+      String appName, String databaseId, double transactionId, double maxAttempts) {
     ReactNativeFirebaseFirestoreTransactionHandler transactionHandler =
         new ReactNativeFirebaseFirestoreTransactionHandler(appName, (int) transactionId);
     transactionHandlers.put((int) transactionId, transactionHandler);
@@ -131,109 +133,16 @@ public void transactionBegin(String appName, String databaseId, double transacti
     FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     ReactNativeFirebaseEventEmitter emitter = ReactNativeFirebaseEventEmitter.getSharedInstance();
 
-    // Provides its own executor
-    firebaseFirestore
-        .runTransaction(
-            (Transaction.Function<Void>)
-                transaction -> {
-                  transactionHandler.resetState(transaction);
-
-                  AsyncTask.execute(
-                      () -> {
-                        WritableMap eventMap = Arguments.createMap();
-                        eventMap.putString("type", "update");
-
-                        // Send an update signal to JS - telling it to now run the transaction
-                        emitter.sendEvent(
-                            new ReactNativeFirebaseFirestoreEvent(
-                                ReactNativeFirebaseFirestoreEvent.TRANSACTION_EVENT_SYNC,
-                                eventMap,
-                                transactionHandler.getAppName(),
-                                databaseId,
-                                transactionHandler.getTransactionId()));
-                      });
-
-                  // wait for a signal to be received from JS land code
-                  transactionHandler.await();
-
-                  // exit early if aborted - has to throw an exception otherwise will just keep
-                  // trying ...
-                  if (transactionHandler.aborted) {
-                    throw new FirebaseFirestoreException(
-                        "abort", FirebaseFirestoreException.Code.ABORTED);
-                  }
-
-                  // exit early if timeout from bridge - has to throw an exception otherwise will
-                  // just keep trying ...
-                  if (transactionHandler.timeout) {
-                    throw new FirebaseFirestoreException(
-                        "timeout", FirebaseFirestoreException.Code.DEADLINE_EXCEEDED);
-                  }
+    Transaction.Function<Void> transactionFunction =
+        transaction -> {
+          transactionHandler.resetState(transaction);
 
-                  // process any buffered commands from JS land
-                  ReadableArray buffer = transactionHandler.getCommandBuffer();
-
-                  // exit early if no commands
-                  if (buffer == null) {
-                    return null;
-                  }
-
-                  // iterate over the user buffer running transactions in order
-                  for (int i = 0, size = buffer.size(); i < size; i++) {
-                    Map<String, Object> serialized;
-
-                    ReadableMap command = buffer.getMap(i);
-                    String path = Objects.requireNonNull(command).getString("path");
-                    String type = command.getString("type");
-                    DocumentReference documentReference =
-                        getDocumentForFirestore(firebaseFirestore, path);
-
-                    switch (Objects.requireNonNull(type)) {
-                      case "SET":
-                        serialized = parseReadableMap(firebaseFirestore, command.getMap("data"));
-                        ReadableMap options = command.getMap("options");
-
-                        if (Objects.requireNonNull(options).hasKey("merge")
-                            && options.getBoolean("merge")) {
-                          transaction.set(documentReference, serialized, SetOptions.merge());
-                        } else if (options.hasKey("mergeFields")) {
-                          List<String> fields = new ArrayList<>();
-                          ReadableArray fieldPaths = options.getArray("mergeFields");
-
-                          for (Object object : toArrayList(fieldPaths)) {
-                            fields.add((String) object);
-                          }
-
-                          transaction.set(
-                              documentReference, serialized, SetOptions.mergeFields(fields));
-                        } else {
-                          transaction.set(documentReference, serialized);
-                        }
-
-                        break;
-                      case "UPDATE":
-                        serialized = parseReadableMap(firebaseFirestore, command.getMap("data"));
-                        transaction.update(documentReference, serialized);
-                        break;
-                      case "DELETE":
-                        transaction.delete(documentReference);
-                        break;
-                    }
-                  }
-
-                  return null;
-                })
-        .addOnCompleteListener(
-            task -> {
-              if (transactionHandler.aborted) {
-                return;
-              }
-
-              WritableMap eventMap = Arguments.createMap();
-
-              if (task.isSuccessful()) {
-                eventMap.putString("type", "complete");
+          AsyncTask.execute(
+              () -> {
+                WritableMap eventMap = Arguments.createMap();
+                eventMap.putString("type", "update");
 
+                // Send an update signal to JS - telling it to now run the transaction
                 emitter.sendEvent(
                     new ReactNativeFirebaseFirestoreEvent(
                         ReactNativeFirebaseFirestoreEvent.TRANSACTION_EVENT_SYNC,
@@ -241,28 +150,125 @@ public void transactionBegin(String appName, String databaseId, double transacti
                         transactionHandler.getAppName(),
                         databaseId,
                         transactionHandler.getTransactionId()));
-              } else {
-                eventMap.putString("type", "error");
+              });
 
-                Exception exception = task.getException();
-                WritableMap errorMap = Arguments.createMap();
+          // wait for a signal to be received from JS land code
+          transactionHandler.await();
+
+          // exit early if aborted - has to throw an exception otherwise will just keep
+          // trying ...
+          if (transactionHandler.aborted) {
+            throw new FirebaseFirestoreException("abort", FirebaseFirestoreException.Code.ABORTED);
+          }
+
+          // exit early if timeout from bridge - has to throw an exception otherwise will
+          // just keep trying ...
+          if (transactionHandler.timeout) {
+            throw new FirebaseFirestoreException(
+                "timeout", FirebaseFirestoreException.Code.DEADLINE_EXCEEDED);
+          }
+
+          // process any buffered commands from JS land
+          ReadableArray buffer = transactionHandler.getCommandBuffer();
+
+          // exit early if no commands
+          if (buffer == null) {
+            return null;
+          }
+
+          // iterate over the user buffer running transactions in order
+          for (int i = 0, size = buffer.size(); i < size; i++) {
+            Map<String, Object> serialized;
+
+            ReadableMap command = buffer.getMap(i);
+            String path = Objects.requireNonNull(command).getString("path");
+            String type = command.getString("type");
+            DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
+
+            switch (Objects.requireNonNull(type)) {
+              case "SET":
+                serialized = parseReadableMap(firebaseFirestore, command.getMap("data"));
+                ReadableMap options = command.getMap("options");
+
+                if (Objects.requireNonNull(options).hasKey("merge")
+                    && options.getBoolean("merge")) {
+                  transaction.set(documentReference, serialized, SetOptions.merge());
+                } else if (options.hasKey("mergeFields")) {
+                  List<String> fields = new ArrayList<>();
+                  ReadableArray fieldPaths = options.getArray("mergeFields");
+
+                  for (Object object : toArrayList(fieldPaths)) {
+                    fields.add((String) object);
+                  }
 
-                UniversalFirebaseFirestoreException universalException =
-                    new UniversalFirebaseFirestoreException(
-                        (FirebaseFirestoreException) exception, exception.getCause());
-                errorMap.putString("code", universalException.getCode());
-                errorMap.putString("message", universalException.getMessage());
+                  transaction.set(documentReference, serialized, SetOptions.mergeFields(fields));
+                } else {
+                  transaction.set(documentReference, serialized);
+                }
 
-                eventMap.putMap("error", errorMap);
+                break;
+              case "UPDATE":
+                serialized = parseReadableMap(firebaseFirestore, command.getMap("data"));
+                transaction.update(documentReference, serialized);
+                break;
+              case "DELETE":
+                transaction.delete(documentReference);
+                break;
+            }
+          }
+
+          return null;
+        };
+
+    Task<Void> transactionTask;
+    if (maxAttempts > 0) {
+      TransactionOptions transactionOptions =
+          new TransactionOptions.Builder().setMaxAttempts((int) maxAttempts).build();
+      transactionTask = firebaseFirestore.runTransaction(transactionOptions, transactionFunction);
+    } else {
+      transactionTask = firebaseFirestore.runTransaction(transactionFunction);
+    }
 
-                emitter.sendEvent(
-                    new ReactNativeFirebaseFirestoreEvent(
-                        ReactNativeFirebaseFirestoreEvent.TRANSACTION_EVENT_SYNC,
-                        eventMap,
-                        transactionHandler.getAppName(),
-                        databaseId,
-                        transactionHandler.getTransactionId()));
-              }
-            });
+    transactionTask.addOnCompleteListener(
+        task -> {
+          if (transactionHandler.aborted) {
+            return;
+          }
+
+          WritableMap eventMap = Arguments.createMap();
+
+          if (task.isSuccessful()) {
+            eventMap.putString("type", "complete");
+
+            emitter.sendEvent(
+                new ReactNativeFirebaseFirestoreEvent(
+                    ReactNativeFirebaseFirestoreEvent.TRANSACTION_EVENT_SYNC,
+                    eventMap,
+                    transactionHandler.getAppName(),
+                    databaseId,
+                    transactionHandler.getTransactionId()));
+          } else {
+            eventMap.putString("type", "error");
+
+            Exception exception = task.getException();
+            WritableMap errorMap = Arguments.createMap();
+
+            UniversalFirebaseFirestoreException universalException =
+                new UniversalFirebaseFirestoreException(
+                    (FirebaseFirestoreException) exception, exception.getCause());
+            errorMap.putString("code", universalException.getCode());
+            errorMap.putString("message", universalException.getMessage());
+
+            eventMap.putMap("error", errorMap);
+
+            emitter.sendEvent(
+                new ReactNativeFirebaseFirestoreEvent(
+                    ReactNativeFirebaseFirestoreEvent.TRANSACTION_EVENT_SYNC,
+                    eventMap,
+                    transactionHandler.getAppName(),
+                    databaseId,
+                    transactionHandler.getTransactionId()));
+          }
+        });
   }
 }
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineExecutor.java b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineExecutor.java
index dc5e704f6d..0b41fc67a8 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineExecutor.java
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineExecutor.java
@@ -39,6 +39,7 @@
 import com.google.firebase.firestore.Query;
 import com.google.firebase.firestore.pipeline.AggregateStage;
 import com.google.firebase.firestore.pipeline.AliasedAggregate;
+import com.google.firebase.firestore.pipeline.AliasedExpression;
 import com.google.firebase.firestore.pipeline.BooleanExpression;
 import com.google.firebase.firestore.pipeline.CollectionGroupOptions;
 import com.google.firebase.firestore.pipeline.CollectionHints;
@@ -51,6 +52,7 @@
 import com.google.firebase.firestore.pipeline.RawOptions;
 import com.google.firebase.firestore.pipeline.RawStage;
 import com.google.firebase.firestore.pipeline.SampleStage;
+import com.google.firebase.firestore.pipeline.SearchStage;
 import com.google.firebase.firestore.pipeline.Selectable;
 import com.google.firebase.firestore.pipeline.UnnestOptions;
 import java.util.ArrayDeque;
@@ -113,7 +115,7 @@ private static final class ExitPipelineBuildFrame extends PipelineBuildFrame {
 
   ReactNativeFirebaseFirestorePipelineExecutor(FirebaseFirestore firestore) {
     this.firestore = firestore;
-    this.nodeBuilder = new ReactNativeFirebaseFirestorePipelineNodeBuilder();
+    this.nodeBuilder = new ReactNativeFirebaseFirestorePipelineNodeBuilder(firestore);
     this.nodeBuilder.setNestedPipelineBuilder(this::buildNativePipeline);
   }
 
@@ -408,6 +410,14 @@ private Pipeline applyStage(
       return applyFindNearestStage(
           pipeline, (ReactNativeFirebaseFirestorePipelineParser.ParsedFindNearestStage) stage);
     }
+    if (stage instanceof ReactNativeFirebaseFirestorePipelineParser.ParsedSearchStage) {
+      return applySearchStage(
+          pipeline, (ReactNativeFirebaseFirestorePipelineParser.ParsedSearchStage) stage);
+    }
+    if (stage instanceof ReactNativeFirebaseFirestorePipelineParser.ParsedDefineStage) {
+      return applyDefineStage(
+          pipeline, (ReactNativeFirebaseFirestorePipelineParser.ParsedDefineStage) stage);
+    }
     if (stage instanceof ReactNativeFirebaseFirestorePipelineParser.ParsedReplaceWithStage) {
       return applyReplaceWithStage(
           pipeline, (ReactNativeFirebaseFirestorePipelineParser.ParsedReplaceWithStage) stage);
@@ -605,6 +615,80 @@ private Pipeline applyFindNearestStage(
     return pipeline.findNearest(fieldPath, Expression.vector(vector), distanceMeasure, options);
   }
 
+  private Pipeline applySearchStage(
+      Pipeline pipeline, ReactNativeFirebaseFirestorePipelineParser.ParsedSearchStage stage)
+      throws PipelineValidationException {
+    BooleanExpression query =
+        nodeBuilder.coerceBooleanExpression(stage.query, "stage.options.query");
+    SearchStage searchStage = SearchStage.Companion.withQuery(query);
+
+    if (stage.languageCode != null && !stage.languageCode.isEmpty()) {
+      searchStage = searchStage.withLanguageCode(stage.languageCode);
+    }
+    if (stage.retrievalDepth != null) {
+      searchStage =
+          searchStage.withRetrievalDepth(
+              coerceLong(stage.retrievalDepth, "stage.options.retrievalDepth"));
+    }
+    if (stage.sort != null && !stage.sort.isEmpty()) {
+      Ordering[] orderings = new Ordering[stage.sort.size()];
+      for (int i = 0; i < stage.sort.size(); i++) {
+        orderings[i] =
+            nodeBuilder.coerceOrdering(stage.sort.get(i), "stage.options.sort[" + i + "]");
+      }
+      searchStage =
+          searchStage.withSort(orderings[0], Arrays.copyOfRange(orderings, 1, orderings.length));
+    }
+    if (stage.offset != null) {
+      searchStage = searchStage.withOffset(coerceLong(stage.offset, "stage.options.offset"));
+    }
+    if (stage.limit != null) {
+      searchStage = searchStage.withLimit(coerceLong(stage.limit, "stage.options.limit"));
+    }
+    if (stage.addFields != null && !stage.addFields.isEmpty()) {
+      Selectable[] selectables = new Selectable[stage.addFields.size()];
+      for (int i = 0; i < stage.addFields.size(); i++) {
+        selectables[i] =
+            nodeBuilder.coerceSelectable(
+                stage.addFields.get(i), "stage.options.addFields[" + i + "]");
+      }
+      searchStage =
+          searchStage.withAddFields(
+              selectables[0], Arrays.copyOfRange(selectables, 1, selectables.length));
+    }
+
+    return pipeline.search(searchStage);
+  }
+
+  private Pipeline applyDefineStage(
+      Pipeline pipeline, ReactNativeFirebaseFirestorePipelineParser.ParsedDefineStage stage)
+      throws PipelineValidationException {
+    List<ReactNativeFirebaseFirestorePipelineParser.ParsedSelectableNode> variables =
+        stage.variables;
+    if (variables.isEmpty()) {
+      throw new PipelineValidationException(
+          "pipelineExecute() expected stage.options.variables to contain at least one value.");
+    }
+
+    AliasedExpression[] aliasedExpressions = new AliasedExpression[variables.size()];
+    for (int i = 0; i < variables.size(); i++) {
+      ReactNativeFirebaseFirestorePipelineParser.ParsedSelectableNode variable = variables.get(i);
+      String alias = variable.alias;
+      if (alias == null || alias.isEmpty()) {
+        throw new PipelineValidationException(
+            "pipelineExecute() expected stage.options.variables[" + i + "] to include an alias.");
+      }
+      Expression expression =
+          nodeBuilder.coerceExpression(
+              variable.expression, "stage.options.variables[" + i + "].expr");
+      aliasedExpressions[i] = new AliasedExpression(alias, expression);
+    }
+
+    AliasedExpression first = aliasedExpressions[0];
+    AliasedExpression[] rest = Arrays.copyOfRange(aliasedExpressions, 1, aliasedExpressions.length);
+    return pipeline.define(first, rest);
+  }
+
   private Pipeline applyReplaceWithStage(
       Pipeline pipeline, ReactNativeFirebaseFirestorePipelineParser.ParsedReplaceWithStage stage)
       throws PipelineValidationException {
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineNodeBuilder.java b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineNodeBuilder.java
index 60b05308b6..dfa0900ba6 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineNodeBuilder.java
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineNodeBuilder.java
@@ -2,6 +2,7 @@
 
 import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.pipeline.AggregateFunction;
 import com.google.firebase.firestore.pipeline.AliasedAggregate;
 import com.google.firebase.firestore.pipeline.BooleanExpression;
@@ -27,6 +28,11 @@ com.google.firebase.firestore.Pipeline build(
   }
 
   private NestedPipelineBuilder nestedPipelineBuilder;
+  private final FirebaseFirestore firestore;
+
+  ReactNativeFirebaseFirestorePipelineNodeBuilder(FirebaseFirestore firestore) {
+    this.firestore = firestore;
+  }
 
   void setNestedPipelineBuilder(NestedPipelineBuilder nestedPipelineBuilder) {
     this.nestedPipelineBuilder = nestedPipelineBuilder;
@@ -338,6 +344,28 @@ private static final class ExitObjectRawBooleanFunctionFrame implements ObjectLo
     }
   }
 
+  private static final class ExitObjectDocumentMatchesExpressionFrame
+      implements ObjectLoweringFrame {
+    final LoweredExpressionBox box;
+    final LoweredExpressionBox queryBox;
+
+    ExitObjectDocumentMatchesExpressionFrame(
+        LoweredExpressionBox box, LoweredExpressionBox queryBox) {
+      this.box = box;
+      this.queryBox = queryBox;
+    }
+  }
+
+  private static final class ExitObjectParentExpressionFrame implements ObjectLoweringFrame {
+    final LoweredExpressionBox box;
+    final LoweredExpressionBox pathBox;
+
+    ExitObjectParentExpressionFrame(LoweredExpressionBox box, LoweredExpressionBox pathBox) {
+      this.box = box;
+      this.pathBox = pathBox;
+    }
+  }
+
   private static final class ContinueReceiverExpressionChainFrame implements ObjectLoweringFrame {
     final LoweredExpressionBox box;
     final LoweredExpressionBox baseBox;
@@ -803,6 +831,17 @@ String coerceStageOptionFieldName(
   Selectable coerceSelectable(
       ReactNativeFirebaseFirestorePipelineParser.ParsedSelectableNode value, String fieldName)
       throws ReactNativeFirebaseFirestorePipelineExecutor.PipelineValidationException {
+    if (value.alias == null || value.alias.isEmpty()) {
+      if (value.expression
+          instanceof ReactNativeFirebaseFirestorePipelineParser.ParsedVariableExpressionNode) {
+        String name =
+            ((ReactNativeFirebaseFirestorePipelineParser.ParsedVariableExpressionNode)
+                    value.expression)
+                .name;
+        return Expression.variable(name).alias(name);
+      }
+    }
+
     Expression expr = coerceExpression(value.expression, fieldName + ".expr");
     if (value.alias != null && !value.alias.isEmpty()) {
       return expr.alias(value.alias);
@@ -1155,6 +1194,20 @@ && tryEnterNumericOperandConstant(enterFrame, stack)) {
             && tryEnterComparisonOperandConstant(enterFrame, stack)) {
           continue;
         }
+        if (enterFrame.value instanceof Map) {
+          @SuppressWarnings("unchecked")
+          Map<String, Object> map = (Map<String, Object>) enterFrame.value;
+          Object constantValue = unwrapConstantValue(map, enterFrame.fieldName);
+          Object resolvedValue = constantValue != null ? constantValue : map;
+          if (resolvedValue instanceof Map) {
+            @SuppressWarnings("unchecked")
+            Map<String, Object> resolvedMap = (Map<String, Object>) resolvedValue;
+            if (isSerializedReferencePathConstantMap(resolvedMap)) {
+              enterFrame.box.value = Expression.constant((String) resolvedMap.get("path"));
+              continue;
+            }
+          }
+        }
         if (containsLowerableExpression(enterFrame.value)) {
           stack.push(
               new EnterObjectExpressionFrame(
@@ -1359,6 +1412,21 @@ && tryEnterComparisonOperandConstant(enterFrame, stack)) {
         continue;
       }
 
+      if (frame instanceof ExitObjectDocumentMatchesExpressionFrame) {
+        ExitObjectDocumentMatchesExpressionFrame exitFrame =
+            (ExitObjectDocumentMatchesExpressionFrame) frame;
+        exitFrame.box.value =
+            BooleanExpression.rawFunction(
+                "documentMatches", new Expression[] {exitFrame.queryBox.value});
+        continue;
+      }
+
+      if (frame instanceof ExitObjectParentExpressionFrame) {
+        ExitObjectParentExpressionFrame exitFrame = (ExitObjectParentExpressionFrame) frame;
+        exitFrame.box.value = Expression.parent(exitFrame.pathBox.value);
+        continue;
+      }
+
       if (frame instanceof ExitObjectRawBooleanFunctionFrame) {
         ExitObjectRawBooleanFunctionFrame exitFrame = (ExitObjectRawBooleanFunctionFrame) frame;
         Expression[] expressions = new Expression[exitFrame.childBoxes.size()];
@@ -2033,6 +2101,43 @@ private void scheduleExpressionFunctionLowering(
         requireArgumentCount(args, 0, functionName, fieldName);
         box.value = Expression.currentTimestamp();
         return;
+      case "score":
+        requireArgumentCount(args, 0, functionName, fieldName);
+        box.value = Expression.score();
+        return;
+      case "currentdocument":
+        requireArgumentCount(args, 0, functionName, fieldName);
+        box.value = Expression.currentDocument();
+        return;
+      case "parent":
+        requireArgumentCount(args, 1, functionName, fieldName);
+        if (!containsLowerableExpression(args.get(0))) {
+          String documentPath = coerceDocumentPathValue(args.get(0), fieldName + ".args[0]");
+          DocumentReference reference = firestore.document(documentPath);
+          box.value = Expression.parent(reference);
+          return;
+        }
+        {
+          LoweredExpressionBox pathBox = new LoweredExpressionBox();
+          stack.push(new ExitObjectParentExpressionFrame(box, pathBox));
+          stack.push(
+              new EnterObjectExpressionValueFrame(args.get(0), fieldName + ".args[0]", pathBox));
+          return;
+        }
+      case "documentmatches":
+        requireArgumentCount(args, 1, functionName, fieldName);
+        if (!containsLowerableExpression(args.get(0))) {
+          String query = coerceStringValue(args.get(0), fieldName + ".args[0]");
+          box.value = Expression.documentMatches(query);
+          return;
+        }
+        {
+          LoweredExpressionBox queryBox = new LoweredExpressionBox();
+          stack.push(new ExitObjectDocumentMatchesExpressionFrame(box, queryBox));
+          stack.push(
+              new EnterObjectExpressionValueFrame(args.get(0), fieldName + ".args[0]", queryBox));
+          return;
+        }
       case "istype":
         {
           requireArgumentCount(args, 2, functionName, fieldName);
@@ -2342,6 +2447,30 @@ private String coerceStringValue(Object value, String fieldName)
         "pipelineExecute() expected " + fieldName + " to resolve to a string.");
   }
 
+  private String coerceDocumentPathValue(Object value, String fieldName)
+      throws ReactNativeFirebaseFirestorePipelineExecutor.PipelineValidationException {
+    Object resolved = value;
+    if (value instanceof Map) {
+      @SuppressWarnings("unchecked")
+      Map<String, Object> map = (Map<String, Object>) value;
+      Object constantValue = unwrapConstantValue(map, fieldName);
+      if (constantValue != null) {
+        resolved = constantValue;
+      }
+    }
+    if (resolved instanceof DocumentReference) {
+      return ((DocumentReference) resolved).getPath();
+    }
+    if (resolved instanceof Map) {
+      @SuppressWarnings("unchecked")
+      Map<String, Object> map = (Map<String, Object>) resolved;
+      if (isSerializedReferencePathConstantMap(map)) {
+        return (String) map.get("path");
+      }
+    }
+    return coerceStringValue(resolved, fieldName);
+  }
+
   private Object resolveConstantValue(Object value, String fieldName)
       throws ReactNativeFirebaseFirestorePipelineExecutor.PipelineValidationException {
     ConstantValueBox rootBox = new ConstantValueBox();
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineParser.java b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineParser.java
index a0e1ac8eb2..d62b0b44e2 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineParser.java
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestorePipelineParser.java
@@ -31,6 +31,8 @@ final class ReactNativeFirebaseFirestorePipelineParser {
               "aggregate",
               "distinct",
               "findNearest",
+              "search",
+              "define",
               "replaceWith",
               "sample",
               "union",
@@ -466,6 +468,21 @@ private static ParsedPipelineStage parseStage(String stageName, Map<String, Obje
             requireString(stageOptions, "distanceMeasure", "stage.options.distanceMeasure"),
             stageOptions.get("limit"),
             optionalExpressionNode(stageOptions, "distanceField", "stage.options.distanceField"));
+      case "search":
+        return new ParsedSearchStage(
+            parseExpressionNode(
+                requireValue(stageOptions, "query", "stage.options.query"), "stage.options.query"),
+            optionalString(stageOptions, "languageCode"),
+            stageOptions.get("retrievalDepth"),
+            optionalOrderingNodes(stageOptions, "sort", "stage.options.sort"),
+            stageOptions.get("offset"),
+            stageOptions.get("limit"),
+            optionalSelectableNodes(stageOptions, "addFields", "stage.options.addFields"));
+      case "define":
+        return new ParsedDefineStage(
+            parseSelectableNodes(
+                requireArray(stageOptions, "variables", "stage.options.variables"),
+                "stage.options.variables"));
       case "replaceWith":
         return new ParsedReplaceWithStage(
             parseExpressionNode(
@@ -642,6 +659,13 @@ private static List<ParsedOrderingNode> parseOrderingNodes(List<Object> values,
     return output;
   }
 
+  private static List<ParsedOrderingNode> optionalOrderingNodes(
+      Map<String, Object> map, String key, String fieldName)
+      throws ReactNativeFirebaseFirestorePipelineExecutor.PipelineValidationException {
+    List<Object> values = optionalArray(map, key, fieldName);
+    return values == null ? null : parseOrderingNodes(values, fieldName);
+  }
+
   private static List<ParsedAggregateNode> parseAggregateNodes(
       List<Object> values, String fieldName)
       throws ReactNativeFirebaseFirestorePipelineExecutor.PipelineValidationException {
@@ -802,6 +826,31 @@ private static ParsedValueNode parseValueNode(Object value, String fieldName)
     return rootBox.value;
   }
 
+  private static Object constantValueFromSerializedConstantMap(Map<?, ?> map) {
+    Object value = map.get("value");
+    if (Boolean.TRUE.equals(map.get("integerLiteral"))) {
+      return coerceIntegerLiteralConstantValue(value);
+    }
+    return value;
+  }
+
+  private static Object coerceIntegerLiteralConstantValue(Object value) {
+    if (value instanceof Boolean) {
+      return ((Boolean) value) ? 1 : 0;
+    }
+    if (value instanceof Number) {
+      Number number = (Number) value;
+      double doubleValue = number.doubleValue();
+      if (Double.isFinite(doubleValue)
+          && doubleValue == Math.rint(doubleValue)
+          && doubleValue >= Integer.MIN_VALUE
+          && doubleValue <= Integer.MAX_VALUE) {
+        return number.intValue();
+      }
+    }
+    return value;
+  }
+
   private static boolean isReferencePathConstantMap(Map<?, ?> map) {
     Object pathValue = map.get("path");
     if (!(pathValue instanceof String)) {
@@ -996,7 +1045,9 @@ private static void parseExpressionValueTree(ExpressionValueParseFrame initialFr
             if ("constant".equals(normalizedType)) {
               ParsedValueNodeBox valueBox = new ParsedValueNodeBox();
               stack.push(new ExpressionConstantExitFrame(enterFrame.box, valueBox, fieldName));
-              stack.push(new ValueEnterFrame(map.get("value"), valueBox, fieldName + ".value"));
+              stack.push(
+                  new ValueEnterFrame(
+                      constantValueFromSerializedConstantMap(map), valueBox, fieldName + ".value"));
               continue;
             }
             if ("variable".equals(normalizedType)) {
@@ -1650,6 +1701,43 @@ static final class ParsedFindNearestStage extends ParsedPipelineStage {
     }
   }
 
+  static final class ParsedSearchStage extends ParsedPipelineStage {
+    final ParsedExpressionNode query;
+    final String languageCode;
+    final Object retrievalDepth;
+    final List<ParsedOrderingNode> sort;
+    final Object offset;
+    final Object limit;
+    final List<ParsedSelectableNode> addFields;
+
+    ParsedSearchStage(
+        ParsedExpressionNode query,
+        String languageCode,
+        Object retrievalDepth,
+        List<ParsedOrderingNode> sort,
+        Object offset,
+        Object limit,
+        List<ParsedSelectableNode> addFields) {
+      super("search");
+      this.query = query;
+      this.languageCode = languageCode;
+      this.retrievalDepth = retrievalDepth;
+      this.sort = sort;
+      this.offset = offset;
+      this.limit = limit;
+      this.addFields = addFields;
+    }
+  }
+
+  static final class ParsedDefineStage extends ParsedPipelineStage {
+    final List<ParsedSelectableNode> variables;
+
+    ParsedDefineStage(List<ParsedSelectableNode> variables) {
+      super("define");
+      this.variables = variables;
+    }
+  }
+
   static final class ParsedReplaceWithStage extends ParsedPipelineStage {
     final ParsedExpressionNode map;
 
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboFirestoreTransactionSpec.java b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboFirestoreTransactionSpec.java
index b10cbd061a..0b9ace7433 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboFirestoreTransactionSpec.java
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboFirestoreTransactionSpec.java
@@ -35,7 +35,7 @@ public NativeRNFBTurboFirestoreTransactionSpec(ReactApplicationContext reactCont
 
   @ReactMethod
   @DoNotStrip
-  public abstract void transactionBegin(String appName, String databaseId, double transactionId);
+  public abstract void transactionBegin(String appName, String databaseId, double transactionId, double maxAttempts);
 
   @ReactMethod
   @DoNotStrip
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/RNFBFirestoreTurboModules-generated.cpp b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/RNFBFirestoreTurboModules-generated.cpp
index d1d668ed6b..c8d4526efd 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/RNFBFirestoreTurboModules-generated.cpp
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/RNFBFirestoreTurboModules-generated.cpp
@@ -185,7 +185,7 @@ NativeRNFBTurboFirestoreDocumentSpecJSI::NativeRNFBTurboFirestoreDocumentSpecJSI
 }
 static facebook::jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionBegin(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "transactionBegin", "(Ljava/lang/String;Ljava/lang/String;D)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "transactionBegin", "(Ljava/lang/String;Ljava/lang/String;DD)V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionGetDocument(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -205,7 +205,7 @@ static facebook::jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionSp
 
 NativeRNFBTurboFirestoreTransactionSpecJSI::NativeRNFBTurboFirestoreTransactionSpecJSI(const JavaTurboModule::InitParams &params)
   : JavaTurboModule(params) {
-  methodMap_["transactionBegin"] = MethodMetadata {3, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionBegin};
+  methodMap_["transactionBegin"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionBegin};
   methodMap_["transactionGetDocument"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionGetDocument};
   methodMap_["transactionDispose"] = MethodMetadata {3, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionDispose};
   methodMap_["transactionApplyBuffer"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionApplyBuffer};
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI-generated.cpp b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI-generated.cpp
index 3a1062e6af..4b9db23e89 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI-generated.cpp
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI-generated.cpp
@@ -312,7 +312,8 @@ static jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_t
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
     count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
-    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber()
+    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber(),
+    count <= 3 ? throw jsi::JSError(rt, "Expected argument in position 3 to be passed") : args[3].asNumber()
   );
   return jsi::Value::undefined();
 }
@@ -347,7 +348,7 @@ static jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_t
 
 NativeRNFBTurboFirestoreTransactionCxxSpecJSI::NativeRNFBTurboFirestoreTransactionCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("NativeRNFBTurboFirestoreTransaction", jsInvoker) {
-  methodMap_["transactionBegin"] = MethodMetadata {3, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionBegin};
+  methodMap_["transactionBegin"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionBegin};
   methodMap_["transactionGetDocument"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionGetDocument};
   methodMap_["transactionDispose"] = MethodMetadata {3, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionDispose};
   methodMap_["transactionApplyBuffer"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionApplyBuffer};
diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI.h b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI.h
index 0a6983ebd3..8de2ef408d 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI.h
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/generated/jni/react/renderer/components/RNFBFirestoreTurboModules/RNFBFirestoreTurboModulesJSI.h
@@ -559,7 +559,7 @@ class JSI_EXPORT NativeRNFBTurboFirestoreDocumentCxxSpec : public TurboModule {
   NativeRNFBTurboFirestoreTransactionCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
 
 public:
-  virtual void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId) = 0;
+  virtual void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, double maxAttempts) = 0;
   virtual jsi::Value transactionGetDocument(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, jsi::String path) = 0;
   virtual void transactionDispose(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId) = 0;
   virtual void transactionApplyBuffer(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, jsi::Array commandBuffer) = 0;
@@ -593,13 +593,13 @@ class JSI_EXPORT NativeRNFBTurboFirestoreTransactionCxxSpec : public TurboModule
 
     }
 
-    void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId) override {
+    void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, double maxAttempts) override {
       static_assert(
-          bridging::getParameterCount(&T::transactionBegin) == 4,
-          "Expected transactionBegin(...) to have 4 parameters");
+          bridging::getParameterCount(&T::transactionBegin) == 5,
+          "Expected transactionBegin(...) to have 5 parameters");
 
       return bridging::callFromJs<void>(
-          rt, &T::transactionBegin, jsInvoker_, instance_, std::move(appName), std::move(databaseId), std::move(transactionId));
+          rt, &T::transactionBegin, jsInvoker_, instance_, std::move(appName), std::move(databaseId), std::move(transactionId), std::move(maxAttempts));
     }
     jsi::Value transactionGetDocument(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, jsi::String path) override {
       static_assert(
diff --git a/packages/firestore/consumer-type-test.ts b/packages/firestore/consumer-type-test.ts
index 442b15b9a0..6f211b1e3e 100644
--- a/packages/firestore/consumer-type-test.ts
+++ b/packages/firestore/consumer-type-test.ts
@@ -25,6 +25,7 @@ import {
   runTransaction,
   getCountFromServer,
   getAggregateFromServer,
+  aggregateQuerySnapshotEqual,
   sum,
   average,
   count,
@@ -238,6 +239,10 @@ import {
   cosineDistance,
   dotProduct,
   euclideanDistance,
+  documentMatches,
+  score,
+  geoDistance,
+  parent,
   vectorLength,
   // result utility
   pipelineResultEqual,
@@ -254,7 +259,6 @@ import type {
   FunctionExpression,
   AggregateFunction,
   ExpressionType,
-  Type as PipelineValueType,
   TimeGranularity,
   TimePart,
   TimeUnit,
@@ -269,6 +273,8 @@ import type {
   DistinctStageOptions,
   DocumentsStageOptions,
   FindNearestStageOptions,
+  SearchStageOptions,
+  DefineStageOptions,
   LimitStageOptions,
   OffsetStageOptions,
   RemoveFieldsStageOptions,
@@ -307,11 +313,10 @@ connectFirestoreEmulator(modFirestore1, 'localhost', 8080, {
 setLogLevel('debug');
 
 // ----- initializeFirestore -----
-initializeFirestore(getApp(), {
+const initializedFirestore = initializeFirestore(getApp(), {
   cacheSizeBytes: CACHE_SIZE_UNLIMITED,
-}).then((fs: Firestore) => {
-  void fs.app.name;
 });
+void initializedFirestore.app.name;
 
 // ----- doc, collection, collectionGroup, refEqual -----
 const modColl = collection(modFirestore1, 'users');
@@ -353,6 +358,15 @@ runTransaction(modFirestore1, async tx => {
   return 'done';
 }).then(() => {});
 
+runTransaction(
+  modFirestore1,
+  async tx => {
+    tx.set(modDoc, { attempts: 1 });
+    return 'configured';
+  },
+  { maxAttempts: 5 },
+).then(() => {});
+
 // Root runtime exports must also carry the public modular Transaction type surface.
 function acceptRootTransaction(tx: Transaction, tRef: DocumentReference<DocumentData>) {
   const chainedTx: Transaction = tx
@@ -441,6 +455,13 @@ getAggregateFromServer(modQuery1, aggSpec).then(
   },
 );
 
+// ----- aggregateQuerySnapshotEqual -----
+getCountFromServer(modQuery1).then(snap1 => {
+  getCountFromServer(modQuery1).then(snap2 => {
+    void aggregateQuerySnapshotEqual(snap1, snap2);
+  });
+});
+
 // ----- getDoc, getDocFromCache, getDocFromServer -----
 getDoc(modDoc).then(snap => snap.data());
 getDocFromCache(modDoc).then(snap => snap.data());
@@ -830,6 +851,29 @@ const pipelineFindNearest = pipelineDb
   });
 void pipelineFindNearest;
 
+const pipelineSearch = pipelineDb
+  .pipeline()
+  .collection('restaurants')
+  .search({
+    query: documentMatches('waffles OR pancakes'),
+    sort: descending(score()),
+    addFields: [(score() as FunctionExpression).as('searchScore')],
+  });
+void pipelineSearch;
+
+const pipelineDefine = pipelineDb
+  .pipeline()
+  .collection('products')
+  .define(field('price').as('unitPrice'))
+  .where(lessThan(field('price'), constant(100)));
+void pipelineDefine;
+
+void documentMatches('breakfast');
+void score();
+void geoDistance('location', new GeoPoint(37.0, -122.0));
+void field('location').geoDistance(new GeoPoint(37.0, -122.0));
+void parent('users/alice');
+
 const pipelineSampleAndUnnest = pipelineDb
   .pipeline()
   .collection('users')
@@ -874,7 +918,6 @@ type _AllPipelineTypes = [
   FunctionExpression,
   AggregateFunction,
   ExpressionType,
-  PipelineValueType,
   TimeGranularity,
   TimePart,
   TimeUnit,
@@ -889,6 +932,8 @@ type _AllPipelineTypes = [
   DistinctStageOptions,
   DocumentsStageOptions,
   FindNearestStageOptions,
+  SearchStageOptions,
+  DefineStageOptions,
   LimitStageOptions,
   OffsetStageOptions,
   RemoveFieldsStageOptions,
@@ -909,11 +954,15 @@ const xDb = getFirestore();
 
 // ----- constant: all overloads -----
 const _cNum: Expression = constant(42);
+const _cNumPreferInt: Expression = constant(42, { preferIntegers: true });
+const _cNumNoPreferInt: Expression = constant(42, { preferIntegers: false });
 const _cStr: Expression = constant('hello');
 const _cBool: BooleanExpression = constant(true);
 const _cNull: Expression = constant(null);
 const _cUnknown: Expression = constant({ nested: true });
 void _cNum;
+void _cNumPreferInt;
+void _cNumNoPreferInt;
 void _cStr;
 void _cBool;
 void _cNull;
@@ -975,7 +1024,7 @@ void isAbsent(field('optionalField'));
 void isAbsent('optionalField');
 // isError
 void isError(field('computedField'));
-// isType: (string, Type) | (Expression, Type)
+// isType: (string, string) | (Expression, string)
 void isType(field('value'), 'string');
 void isType('value', 'number');
 // ifAbsent: (Expression, Expression) | (Expression, unknown) | (string, Expression)
@@ -1767,6 +1816,14 @@ const findNearestStageOpts: FindNearestStageOptions = {
   distanceField: 'dist',
   limit: 5,
 };
+const searchStageOpts: SearchStageOptions = {
+  query: documentMatches('breakfast'),
+  sort: [descending(score())],
+  addFields: [(score() as FunctionExpression).as('searchScore')],
+};
+const defineStageOpts: DefineStageOptions = {
+  variables: [field('price').as('unitPrice')],
+};
 const unionStageOpts: UnionStageOptions = {
   other: xDb.pipeline().collection('backup'),
 };
@@ -1794,6 +1851,8 @@ void collectionGroupStageOpts;
 void databaseStageOpts;
 void documentsStageOpts;
 void findNearestStageOpts;
+void searchStageOpts;
+void defineStageOpts;
 void unionStageOpts;
 void unnestStageOpts;
 void executeOpts;
diff --git a/packages/firestore/e2e/Pipeline.e2e.js b/packages/firestore/e2e/Pipeline.e2e.js
index a16deb9d5c..38c0a0fc60 100644
--- a/packages/firestore/e2e/Pipeline.e2e.js
+++ b/packages/firestore/e2e/Pipeline.e2e.js
@@ -2937,6 +2937,196 @@ describe('FirestorePipeline', function () {
         data.computedMap.should.eql({ total: 15, doubled: 4, active: true });
       });
 
+      it('evaluates constant preferIntegers through native integerLiteral path', async function () {
+        const { execute, constant } = firestorePipelinesModular;
+        const { getFirestore, doc, setDoc } = firestoreModular;
+        const db = getFirestore(DATABASE_ID);
+        const docPath = `${COLLECTION}/${Utils.randString(12, '#aA')}`;
+
+        await setDoc(doc(db, docPath), { marker: true });
+
+        const snapshot = await execute(
+          db
+            .pipeline()
+            .documents([docPath])
+            .select(
+              constant(1, { preferIntegers: true }).as('forcedOne'),
+              constant(0, { preferIntegers: true }).as('forcedZero'),
+              constant(1.5, { preferIntegers: true }).as('forcedOnePointFive'),
+              constant(42, { preferIntegers: false }).as('plainFortyTwo'),
+              constant(1.5, { preferIntegers: false }).as('plainOnePointFive'),
+            ),
+        );
+
+        snapshot.results.should.have.length(1);
+        const data = snapshot.results[0].data();
+        data.forcedOne.should.equal(1);
+        data.forcedZero.should.equal(0);
+        data.forcedOnePointFive.should.equal(1.5);
+        data.plainFortyTwo.should.equal(42);
+        data.plainOnePointFive.should.equal(1.5);
+        (typeof data.forcedOne).should.equal('number');
+        (typeof data.forcedZero).should.equal('number');
+        (typeof data.forcedOnePointFive).should.equal('number');
+        (typeof data.plainFortyTwo).should.equal('number');
+        (typeof data.plainOnePointFive).should.equal('number');
+      });
+
+      it('executes define stage with pipeline variables', async function () {
+        if (Platform.other) {
+          return;
+        }
+        const { execute, field, variable } = firestorePipelinesModular;
+        const { getFirestore, doc, setDoc } = firestoreModular;
+        const db = getFirestore(DATABASE_ID);
+        const docPath = `${COLLECTION}/${Utils.randString(12, '#aA')}`;
+
+        await setDoc(doc(db, docPath), { price: 40, label: 'child' });
+
+        const defineSnapshot = await execute(
+          db
+            .pipeline()
+            .documents([docPath])
+            .define(field('price').as('halfPrice'))
+            .select(field('label'), variable('halfPrice')),
+        );
+
+        defineSnapshot.results.should.have.length(1);
+        defineSnapshot.results[0].data().should.eql({ label: 'child', halfPrice: 40 });
+      });
+
+      it('executes parent expression helper', async function () {
+        if (Platform.other) {
+          return;
+        }
+        const { execute, parent } = firestorePipelinesModular;
+        const { getFirestore, doc, setDoc } = firestoreModular;
+        const db = getFirestore(DATABASE_ID);
+        const parentDocPath = `${COLLECTION}/${Utils.randString(12, '#aA')}`;
+        const childPath = `${parentDocPath}/define-parent/child-doc`;
+        const childRef = doc(db, childPath);
+
+        await setDoc(doc(db, parentDocPath), { label: 'parent' });
+        await setDoc(childRef, { price: 40, label: 'child' });
+
+        const parentSnapshot = await execute(
+          db
+            .pipeline()
+            .collection(`${parentDocPath}/define-parent`)
+            .select(parent(childRef).as('parentPath')),
+        );
+
+        parentSnapshot.results.should.have.length(1);
+        parentSnapshot.results[0].data().parentPath.path.should.equal(parentDocPath);
+      });
+
+      it('executes parent expression with constant-wrapped string document path', async function () {
+        if (Platform.other) {
+          return;
+        }
+        const { execute, parent, constant } = firestorePipelinesModular;
+        const { getFirestore, doc, setDoc } = firestoreModular;
+        const db = getFirestore(DATABASE_ID);
+        const parentDocPath = `${COLLECTION}/${Utils.randString(12, '#aA')}`;
+        const childPath = `${parentDocPath}/define-parent/child-doc`;
+
+        await setDoc(doc(db, parentDocPath), { label: 'parent' });
+        await setDoc(doc(db, childPath), { price: 40, label: 'child' });
+
+        const parentSnapshot = await execute(
+          db
+            .pipeline()
+            .collection(`${parentDocPath}/define-parent`)
+            .select(parent(constant(childPath)).as('parentPath')),
+        );
+
+        parentSnapshot.results.should.have.length(1);
+        parentSnapshot.results[0].data().parentPath.path.should.equal(parentDocPath);
+      });
+
+      it('executes parent expression with string document path', async function () {
+        // Regression: constant-envelope string paths must lower via coerceDocumentPathValue(resolved).
+        if (Platform.other) {
+          return;
+        }
+        const { execute, parent } = firestorePipelinesModular;
+        const { getFirestore, doc, setDoc } = firestoreModular;
+        const db = getFirestore(DATABASE_ID);
+        const parentDocPath = `${COLLECTION}/${Utils.randString(12, '#aA')}`;
+        const childPath = `${parentDocPath}/define-parent/child-doc`;
+
+        await setDoc(doc(db, parentDocPath), { label: 'parent' });
+        await setDoc(doc(db, childPath), { price: 40, label: 'child' });
+
+        const parentSnapshot = await execute(
+          db
+            .pipeline()
+            .collection(`${parentDocPath}/define-parent`)
+            .select(parent(childPath).as('parentPath')),
+        );
+
+        parentSnapshot.results.should.have.length(1);
+        parentSnapshot.results[0].data().parentPath.path.should.equal(parentDocPath);
+      });
+
+      it('executes parent expression with lowerable document path expression', async function () {
+        // Native: parent() deferred lowering when arg is a lowerable expression (field ref, not constant fast-path).
+        if (Platform.other) {
+          return;
+        }
+        const { execute, parent, field } = firestorePipelinesModular;
+        const { getFirestore, doc, setDoc } = firestoreModular;
+        const db = getFirestore(DATABASE_ID);
+        const parentDocPath = `${COLLECTION}/${Utils.randString(12, '#aA')}`;
+        const childPath = `${parentDocPath}/define-parent/child-doc`;
+
+        await setDoc(doc(db, parentDocPath), { label: 'parent' });
+        await setDoc(doc(db, childPath), { label: 'child' });
+
+        const parentSnapshot = await execute(
+          db
+            .pipeline()
+            .collection(`${parentDocPath}/define-parent`)
+            .select(parent(field('__name__')).as('parentPath')),
+        );
+
+        parentSnapshot.results.should.have.length(1);
+        parentSnapshot.results[0].data().parentPath.path.should.equal(parentDocPath);
+      });
+
+      it('executes search stage with documentMatches and score', async function () {
+        if (Platform.other) {
+          return;
+        }
+        const { execute, documentMatches, score } = firestorePipelinesModular;
+        const { getFirestore, collection, doc, setDoc } = firestoreModular;
+        const db = getFirestore(DATABASE_ID);
+        const collPath = `${COLLECTION}/${Utils.randString(12, '#aA')}/search-text`;
+        const coll = collection(db, collPath);
+
+        await Promise.all([
+          setDoc(doc(coll, 'a'), { menu: 'waffles and coffee', label: 'A' }),
+          setDoc(doc(coll, 'b'), { menu: 'pancakes only', label: 'B' }),
+        ]);
+
+        const snapshot = await execute(
+          db
+            .pipeline()
+            .collection(collPath)
+            .search({
+              query: documentMatches('waffles'),
+              sort: [score().descending()],
+              addFields: [score().as('searchScore')],
+              limit: 5,
+            }),
+        );
+
+        snapshot.results.length.should.be.greaterThan(0);
+        const labels = snapshot.results.map(result => result.data().label);
+        labels[0].should.eql('A');
+        labels.should.not.containEql('B');
+      });
+
       it('unwraps constant-wrapped array arguments during native lowering', async function () {
         const { execute, field, constant, array, add } = firestorePipelinesModular;
         const { getFirestore, doc, setDoc } = firestoreModular;
diff --git a/packages/firestore/e2e/Transaction.e2e.js b/packages/firestore/e2e/Transaction.e2e.js
index f9ac0733cc..291b135731 100644
--- a/packages/firestore/e2e/Transaction.e2e.js
+++ b/packages/firestore/e2e/Transaction.e2e.js
@@ -50,6 +50,29 @@ describe('firestore.Transaction', function () {
       value.should.eql(expected);
     });
 
+    it('should accept optional TransactionOptions maxAttempts', async function () {
+      const { getFirestore, runTransaction, doc, setDoc, getDoc } = firestoreModular;
+      const db = getFirestore();
+      const ref = doc(db, `${COLLECTION}/transaction-options-${Date.now()}`);
+
+      await setDoc(ref, { count: 0 });
+
+      const value = await runTransaction(
+        db,
+        async transaction => {
+          const snapshot = await transaction.get(ref);
+          const count = snapshot.data()?.count ?? 0;
+          transaction.update(ref, { count: count + 1 });
+          return count + 1;
+        },
+        { maxAttempts: 5 },
+      );
+
+      value.should.eql(1);
+      const after = await getDoc(ref);
+      after.data()?.count.should.eql(1);
+    });
+
     it('should reject with user Error', async function () {
       const { getFirestore, runTransaction } = firestoreModular;
       const message = `Error: ${Date.now()}`;
diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineBridgeFactory.swift b/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineBridgeFactory.swift
index 10d5330ca7..d9d28728c9 100644
--- a/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineBridgeFactory.swift
+++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineBridgeFactory.swift
@@ -243,6 +243,10 @@ final class RNFBFirestorePipelineBridgeFactory {
         groups: try nodeBuilder.coerceNamedSelectables(parsed.groups, fieldName: "stage.options.groups"))
     case let .findNearestStage(parsed):
       return try buildFindNearestStage(parsed)
+    case let .searchStage(parsed):
+      return try buildSearchStage(parsed)
+    case let .defineStage(parsed):
+      return try buildDefineStage(parsed)
     case let .replaceWithStage(parsed):
       return ReplaceWithStageBridge(expr: try nodeBuilder.coerceExpression(parsed.value, fieldName: "stage.options.map"))
     case let .sampleStage(parsed):
@@ -336,6 +340,137 @@ final class RNFBFirestorePipelineBridgeFactory {
     )
   }
 
+  private func buildSearchStage(_ stage: RNFBFirestoreParsedSearchStage) throws -> StageBridge {
+    // Mirror FirebaseFirestore Search stage construction (Stages.swift): option values are
+    // Sendable literals or Expression values converted through Constant/Expression.toBridge().
+    var options: [String: ExprBridge] = [:]
+    options["query"] = try buildSearchQueryBridge(from: stage.query)
+
+    if let languageCode = stage.languageCode {
+      options["language_code"] = ConstantBridge(languageCode)
+    }
+    if let retrievalDepth = stage.retrievalDepth {
+      options["retrieval_depth"] = ConstantBridge(retrievalDepth.intValue)
+    }
+    if let offset = stage.offset {
+      options["offset"] = ConstantBridge(offset.intValue)
+    }
+    if let limit = stage.limit {
+      options["limit"] = ConstantBridge(limit.intValue)
+    }
+
+    var sortBridge: [OrderingBridge] = []
+    if !stage.sort.isEmpty {
+      sortBridge = try stage.sort.enumerated().map { index, ordering in
+        try buildSearchOrderingBridge(ordering, fieldName: "stage.options.sort[\(index)]")
+      }
+    }
+
+    var addFields: [String: ExprBridge] = [:]
+    if !stage.addFields.isEmpty {
+      addFields = try buildSearchAddFields(from: stage.addFields)
+    }
+
+    return SearchStageBridge(
+      options: options,
+      addFields: addFields,
+      select: [:],
+      sort: sortBridge
+    )
+  }
+
+  private func buildSearchQueryBridge(from expression: RNFBFirestoreParsedExpressionNode) throws -> ExprBridge {
+    if case let .function(name, args) = expression,
+       normalizePipelineFunctionName(name) == "documentmatches",
+       args.count == 1 {
+      if let query = try searchDocumentMatchesQueryString(from: args[0]) {
+        return DocumentMatches(query).bridge
+      }
+
+      let queryArg = try nodeBuilder.coerceExpression(
+        args[0],
+        fieldName: "stage.options.query.args[0]"
+      )
+      return FunctionExprBridge(name: "document_matches", args: [queryArg])
+    }
+
+    return try nodeBuilder.coerceBooleanExpression(expression, fieldName: "stage.options.query")
+  }
+
+  private func searchDocumentMatchesQueryString(
+    from value: RNFBFirestoreParsedValueNode
+  ) throws -> String? {
+    switch value {
+    case let .primitive(stringValue as String):
+      return stringValue
+    case let .expression(.constant(constantValue)):
+      if case let .primitive(stringValue as String) = constantValue {
+        return stringValue
+      }
+      return nil
+    default:
+      return nil
+    }
+  }
+
+  private func buildSearchOrderingBridge(
+    _ ordering: RNFBFirestoreParsedOrderingNode,
+    fieldName: String
+  ) throws -> OrderingBridge {
+    if case let .function(name, args) = ordering.expression,
+       normalizePipelineFunctionName(name) == "score",
+       args.isEmpty {
+      return OrderingBridge(
+        expr: Score().bridge,
+        direction: ordering.descending ? "descending" : "ascending"
+      )
+    }
+
+    return try nodeBuilder.coerceOrdering(ordering, fieldName: fieldName)
+  }
+
+  private func buildSearchAddFields(
+    from selectables: [RNFBFirestoreParsedSelectableNode]
+  ) throws -> [String: ExprBridge] {
+    var output: [String: ExprBridge] = [:]
+
+    for (index, selectable) in selectables.enumerated() {
+      guard let alias = selectable.alias, !alias.isEmpty else {
+        throw PipelineValidationError(
+          "pipelineExecute() expected stage.options.addFields[\(index)] to include an alias."
+        )
+      }
+
+      if case let .function(name, args) = selectable.expression,
+         normalizePipelineFunctionName(name) == "score",
+         args.isEmpty {
+        output[alias] = Score().bridge
+        continue
+      }
+
+      output[alias] = try nodeBuilder.coerceExpression(
+        selectable.expression,
+        fieldName: "stage.options.addFields[\(index)].expr"
+      )
+    }
+
+    return output
+  }
+
+  private func normalizePipelineFunctionName(_ name: String) -> String {
+    name.lowercased()
+      .replacingOccurrences(of: "_", with: "")
+      .replacingOccurrences(of: "-", with: "")
+  }
+
+  private func buildDefineStage(_ stage: RNFBFirestoreParsedDefineStage) throws -> StageBridge {
+    let variables = try nodeBuilder.coerceNamedSelectables(
+      stage.variables,
+      fieldName: "stage.options.variables"
+    )
+    return DefineStageBridge(variables: variables)
+  }
+
   private func normalizeDistanceMeasure(_ value: String, fieldName: String) throws -> String {
     let normalized = value
       .trimmingCharacters(in: .whitespacesAndNewlines)
diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineNodeBuilder.swift b/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineNodeBuilder.swift
index e5b0f31b11..fa03dec3b8 100644
--- a/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineNodeBuilder.swift
+++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineNodeBuilder.swift
@@ -231,7 +231,7 @@ final class RNFBFirestorePipelineNodeBuilder {
     var output: [String: ExprBridge] = [:]
     for (index, value) in values.enumerated() {
       let expression = try coerceExpression(value.expression, fieldName: "\(fieldName)[\(index)].expr")
-      let alias = coerceAlias(from: value) ?? expressionAlias(expression) ?? "field_\(index)"
+      let alias = selectableOutputAlias(from: value, expression: expression, index: index)
       output[alias] = expression
     }
     return output
@@ -246,13 +246,31 @@ final class RNFBFirestorePipelineNodeBuilder {
     }
 
     return try values.enumerated().map { index, value in
-      OrderingBridge(
-        expr: try coerceExpression(value.expression, fieldName: "\(fieldName)[\(index)].expr"),
-        direction: value.descending ? "descending" : "ascending"
-      )
+      try coerceOrdering(value, fieldName: "\(fieldName)[\(index)]")
     }
   }
 
+  func coerceOrdering(
+    _ value: RNFBFirestoreParsedOrderingNode,
+    fieldName: String
+  ) throws -> OrderingBridge {
+    let expression: ExprBridge
+    if value.fieldShortcut, case let .field(path) = value.expression {
+      expression = FieldBridge(name: path)
+    } else if case let .function(name, args) = value.expression,
+              canonicalizeFunctionName(name) == "score",
+              args.isEmpty {
+      expression = Score().bridge
+    } else {
+      expression = try coerceExpression(value.expression, fieldName: "\(fieldName).expr")
+    }
+
+    return OrderingBridge(
+      expr: expression,
+      direction: value.descending ? "descending" : "ascending"
+    )
+  }
+
   func coerceAliasedAggregate(
     _ value: RNFBFirestoreParsedAggregateNode,
     fieldName: String
@@ -366,7 +384,20 @@ final class RNFBFirestorePipelineNodeBuilder {
     var output: [String: ExprBridge] = [:]
     for (index, value) in values.enumerated() {
       let expression = try coerceExpression(value, fieldName: "\(fieldName)[\(index)]")
-      let alias = coerceAlias(from: value) ?? expressionAlias(expression) ?? "field_\(index)"
+      let alias: String
+      if let explicitAlias = coerceAlias(from: value), !explicitAlias.isEmpty {
+        alias = explicitAlias
+      } else if let map = value as? [String: Any],
+                let kind = (map["exprType"] as? String)?.lowercased(),
+                kind == "variable",
+                let name = map["name"] as? String,
+                !name.isEmpty {
+        alias = name
+      } else if let fieldAlias = expressionAlias(expression) {
+        alias = fieldAlias
+      } else {
+        alias = "field_\(index)"
+      }
       output[alias] = expression
     }
     return output
@@ -507,6 +538,25 @@ final class RNFBFirestorePipelineNodeBuilder {
     return string
   }
 
+  private func coerceDocumentPathValue(_ value: Any, fieldName: String) throws -> String {
+    var resolved: Any = value
+    if let map = value as? [String: Any],
+       let constantValue = try unwrapConstantValue(map, fieldName: fieldName) {
+      resolved = constantValue
+    }
+    if let reference = resolved as? DocumentReference {
+      return reference.path
+    }
+    if let map = resolved as? [String: Any], isSerializedReferencePathConstantMap(map) {
+      return try coerceFieldPath(map, fieldName: fieldName)
+    }
+    return try coerceStringValue(resolved, fieldName: fieldName)
+  }
+
+  private func buildParentExprBridge(referenceArg: ExprBridge) -> ExprBridge {
+    FunctionExprBridge(name: "parent", args: [referenceArg])
+  }
+
   func requireValue(
     _ map: [String: Any],
     key: String,
@@ -598,6 +648,10 @@ final class RNFBFirestorePipelineNodeBuilder {
       }
 
       if let map = currentValue as? [String: Any] {
+        if isSerializedReferencePathConstantMap(map) {
+          return false
+        }
+
         if isSerializedExpressionLike(map) {
           return true
         }
@@ -706,11 +760,32 @@ final class RNFBFirestorePipelineNodeBuilder {
       return false
     }
 
+    if isSerializedReferencePathConstantMap(map) {
+      return false
+    }
+
     return map["exprType"] != nil || map["operator"] != nil || map["name"] != nil || map["expr"] != nil ||
       map["expression"] != nil || map["fieldPath"] != nil || map["path"] != nil ||
       map["segments"] != nil || map["_segments"] != nil
   }
 
+  private func isSerializedReferencePathConstantMap(_ map: [String: Any]) -> Bool {
+    guard let path = map["path"] as? String, path.contains("/") else {
+      return false
+    }
+
+    for key in map.keys {
+      switch key {
+      case "path", "firestore", "alias", "as", "__kind":
+        continue
+      default:
+        return false
+      }
+    }
+
+    return true
+  }
+
   private let booleanComparisonFunctions: Set<String> = [
     "equal", "notequal", "greaterthan", "greaterthanorequal", "lessthan", "lessthanorequal",
     "arraycontains", "arraycontainsany", "arraycontainsall", "equalany", "notequalany",
@@ -1212,7 +1287,13 @@ final class RNFBFirestorePipelineNodeBuilder {
         case "field":
           return Field(try coerceFieldPath(map, fieldName: currentField))
         case "constant":
-          return firebaseConstantExpression(try constantExpressionValue(fromConstantMap: map, fieldName: currentField))
+          let constantValue = try constantExpressionValue(fromConstantMap: map, fieldName: currentField)
+          if let refMap = constantValue as? [String: Any], isSerializedReferencePathConstantMap(refMap),
+             let firestore = currentFirestore {
+            let reference = firestore.document(try coerceFieldPath(refMap, fieldName: "\(currentField).value"))
+            return firebaseConstantExpression(reference)
+          }
+          return firebaseConstantExpression(constantValue)
         case "variable":
           guard let name = map["name"] as? String, !name.isEmpty else {
             throw PipelineValidationError(
@@ -1557,6 +1638,25 @@ final class RNFBFirestorePipelineNodeBuilder {
     return rootBox.value as Any
   }
 
+
+  private func bridgeFromPipelineExpression(_ expression: any FirebaseFirestore.Expression, fieldName: String) throws -> ExprBridge {
+    if let bridge = bridgeFromSDKValue(expression) {
+      return bridge
+    }
+    throw PipelineValidationError(
+      "pipelineExecute() could not convert \(fieldName) into an expression bridge.")
+  }
+
+  private func bridgeFromPipelineBooleanExpression(
+    _ expression: any FirebaseFirestore.BooleanExpression,
+    fieldName: String
+  ) throws -> ExprBridge {
+    if let bridge = bridgeFromSDKValue(expression) {
+      return bridge
+    }
+    return try booleanExpressionBridge(expression, fieldName: fieldName)
+  }
+
   // NOTE: iOS pipeline function lowering lives in this builder.
   //
   // If a serialized JS pipeline function is not supported by the currently linked
@@ -1588,6 +1688,18 @@ final class RNFBFirestorePipelineNodeBuilder {
             box.value = try scalarConstantBridge(fromConstantMap: map, fieldName: currentFieldName)
             continue
           }
+          if let map = value as? [String: Any], isSerializedReferencePathConstantMap(map) {
+            guard let firestore = currentFirestore else {
+              throw PipelineValidationError(
+                "pipelineExecute() expected \(currentFieldName) to resolve against a Firestore instance.")
+            }
+            let reference = firestore.document(try coerceFieldPath(map, fieldName: currentFieldName))
+            box.value = try expressionBridge(
+              firebaseConstantExpression(reference),
+              fieldName: currentFieldName
+            )
+            continue
+          }
           if containsSerializedExpression(value) {
             stack.append(.enter(value, currentFieldName, .expression, box))
           } else {
@@ -1896,6 +2008,57 @@ final class RNFBFirestorePipelineNodeBuilder {
                 break expressionLoop
               }
 
+
+              if normalized == "score" {
+                guard rawArgs.isEmpty else {
+                  throw PipelineValidationError(
+                    "pipelineExecute() expected \(currentField).score to include no arguments.")
+                }
+                box.value = Score().bridge
+                break expressionLoop
+              }
+
+              if normalized == "documentmatches" {
+                guard rawArgs.count == 1 else {
+                  throw PipelineValidationError(
+                    "pipelineExecute() expected \(currentField).documentMatches to include exactly 1 argument.")
+                }
+                if containsSerializedExpression(rawArgs[0]) {
+                  let queryBridge = try coerceExpression(
+                    rawArgs[0],
+                    fieldName: "\(currentField).args[0]"
+                  )
+                  box.value = FunctionExprBridge(name: "document_matches", args: [queryBridge])
+                } else {
+                  let query = try coerceStringValue(rawArgs[0], fieldName: "\(currentField).args[0]")
+                  box.value = DocumentMatches(query).bridge
+                }
+                break expressionLoop
+              }
+
+              if normalized == "parent" {
+                guard rawArgs.count == 1 else {
+                  throw PipelineValidationError(
+                    "pipelineExecute() expected \(currentField).parent to include exactly 1 argument.")
+                }
+                if containsSerializedExpression(rawArgs[0]) {
+                  let baseBridge = try coerceExpression(
+                    rawArgs[0],
+                    fieldName: "\(currentField).args[0]"
+                  )
+                  box.value = buildParentExprBridge(referenceArg: baseBridge)
+                  break expressionLoop
+                }
+                let documentPath = try coerceDocumentPathValue(rawArgs[0], fieldName: "\(currentField).args[0]")
+                guard let firestore = currentFirestore else {
+                  throw PipelineValidationError(
+                    "pipelineExecute() expected \(currentField).parent to resolve against a Firestore instance.")
+                }
+                let reference = firestore.document(documentPath)
+                box.value = buildParentExprBridge(referenceArg: ConstantBridge(reference))
+                break expressionLoop
+              }
+
               if normalized == "arrayfirst" {
                 guard rawArgs.count == 1 else {
                   throw PipelineValidationError(
@@ -2422,6 +2585,23 @@ final class RNFBFirestorePipelineNodeBuilder {
     return nil
   }
 
+  private func selectableOutputAlias(
+    from value: RNFBFirestoreParsedSelectableNode,
+    expression: ExprBridge,
+    index: Int
+  ) -> String {
+    if let alias = coerceAlias(from: value), !alias.isEmpty {
+      return alias
+    }
+    if case let .variable(name) = value.expression, !name.isEmpty {
+      return name
+    }
+    if let fieldAlias = expressionAlias(expression) {
+      return fieldAlias
+    }
+    return "field_\(index)"
+  }
+
   private func expressionAlias(_ expression: ExprBridge) -> String? {
     if let field = expression as? FieldBridge {
       return field.field_name()
diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineParser.swift b/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineParser.swift
index eac4a85611..99777b03eb 100644
--- a/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineParser.swift
+++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestorePipelineParser.swift
@@ -82,6 +82,8 @@ enum RNFBFirestoreParsedPipelineStage {
   case aggregateStage(RNFBFirestoreParsedAggregateStage)
   case distinctStage(RNFBFirestoreParsedDistinctStage)
   case findNearestStage(RNFBFirestoreParsedFindNearestStage)
+  case searchStage(RNFBFirestoreParsedSearchStage)
+  case defineStage(RNFBFirestoreParsedDefineStage)
   case replaceWithStage(RNFBFirestoreParsedReplaceWithStage)
   case sampleStage(RNFBFirestoreParsedSampleStage)
   case unionStage(RNFBFirestoreParsedUnionStage)
@@ -100,6 +102,8 @@ enum RNFBFirestoreParsedPipelineStage {
     case .aggregateStage: return "aggregate"
     case .distinctStage: return "distinct"
     case .findNearestStage: return "findNearest"
+    case .searchStage: return "search"
+    case .defineStage: return "define"
     case .replaceWithStage: return "replaceWith"
     case .sampleStage: return "sample"
     case .unionStage: return "union"
@@ -163,6 +167,20 @@ struct RNFBFirestoreParsedFindNearestStage {
   let distanceField: RNFBFirestoreParsedExpressionNode?
 }
 
+struct RNFBFirestoreParsedSearchStage {
+  let query: RNFBFirestoreParsedExpressionNode
+  let languageCode: String?
+  let retrievalDepth: NSNumber?
+  let sort: [RNFBFirestoreParsedOrderingNode]
+  let offset: NSNumber?
+  let limit: NSNumber?
+  let addFields: [RNFBFirestoreParsedSelectableNode]
+}
+
+struct RNFBFirestoreParsedDefineStage {
+  let variables: [RNFBFirestoreParsedSelectableNode]
+}
+
 struct RNFBFirestoreParsedReplaceWithStage {
   let value: RNFBFirestoreParsedExpressionNode
 }
@@ -194,7 +212,7 @@ enum RNFBFirestorePipelineParser {
 
   private static let knownStages: Set<String> = [
     "where", "select", "addFields", "removeFields", "sort", "limit", "offset",
-    "aggregate", "distinct", "findNearest", "replaceWith", "sample", "union", "unnest", "rawStage",
+    "aggregate", "distinct", "findNearest", "search", "define", "replaceWith", "sample", "union", "unnest", "rawStage",
   ]
 
   private final class ParsedPipelineRequestBox {
@@ -571,6 +589,10 @@ enum RNFBFirestorePipelineParser {
       ))
     case "findNearest":
       return .findNearestStage(try parseFindNearestStage(options, fieldName: "\(fieldName).options"))
+    case "search":
+      return .searchStage(try parseSearchStage(options, fieldName: "\(fieldName).options"))
+    case "define":
+      return .defineStage(try parseDefineStage(options, fieldName: "\(fieldName).options"))
     case "replaceWith":
       return .replaceWithStage(RNFBFirestoreParsedReplaceWithStage(
         value: try parseExpressionNode(
@@ -765,6 +787,22 @@ enum RNFBFirestorePipelineParser {
     return number
   }
 
+  private static func optionalString(
+    _ map: [String: Any],
+    key: String,
+    fieldName: String
+  ) throws -> String? {
+    guard let value = map[key] else {
+      return nil
+    }
+
+    guard let stringValue = value as? String else {
+      throw PipelineValidationError("pipelineExecute() expected \(fieldName) to be a string.")
+    }
+
+    return stringValue
+  }
+
   private static func requireStringArray(
     _ map: [String: Any],
     key: String,
@@ -831,6 +869,55 @@ enum RNFBFirestorePipelineParser {
     )
   }
 
+  private static func parseSearchStage(
+    _ options: [String: Any],
+    fieldName: String
+  ) throws -> RNFBFirestoreParsedSearchStage {
+    let sort: [RNFBFirestoreParsedOrderingNode]
+    if options["sort"] != nil {
+      let sortValues = try requireArray(options, key: "sort", fieldName: "\(fieldName).sort")
+      sort = try parseOrderingNodes(sortValues, fieldName: "\(fieldName).sort")
+    } else {
+      sort = []
+    }
+
+    let addFields: [RNFBFirestoreParsedSelectableNode]
+    if options["addFields"] != nil {
+      addFields = try parseSelectableNodes(
+        requireArray(options, key: "addFields", fieldName: "\(fieldName).addFields"),
+        fieldName: "\(fieldName).addFields",
+        requireNonEmpty: false
+      )
+    } else {
+      addFields = []
+    }
+
+    return RNFBFirestoreParsedSearchStage(
+      query: try parseExpressionNode(
+        requireValue(options, key: "query", fieldName: "\(fieldName).query"),
+        fieldName: "\(fieldName).query"
+      ),
+      languageCode: try optionalString(options, key: "languageCode", fieldName: "\(fieldName).languageCode"),
+      retrievalDepth: try optionalNumber(options, key: "retrievalDepth", fieldName: "\(fieldName).retrievalDepth"),
+      sort: sort,
+      offset: try optionalNumber(options, key: "offset", fieldName: "\(fieldName).offset"),
+      limit: try optionalNumber(options, key: "limit", fieldName: "\(fieldName).limit"),
+      addFields: addFields
+    )
+  }
+
+  private static func parseDefineStage(
+    _ options: [String: Any],
+    fieldName: String
+  ) throws -> RNFBFirestoreParsedDefineStage {
+    RNFBFirestoreParsedDefineStage(
+      variables: try parseSelectableNodes(
+        requireArray(options, key: "variables", fieldName: "\(fieldName).variables"),
+        fieldName: "\(fieldName).variables"
+      )
+    )
+  }
+
   private static func parseSampleStage(
     _ options: [String: Any],
     fieldName: String
@@ -933,14 +1020,19 @@ enum RNFBFirestorePipelineParser {
     }
 
     let direction = (map["direction"] as? String) ?? "asc"
-    let expressionValue = firstNonNil(
-      map["expression"],
-      map["expr"],
-      map["field"],
-      map["fieldPath"],
-      map["path"],
-      value
-    ) as Any
+    let expressionValue: Any
+    if (map["__kind"] as? String) == "ordering", let expr = map["expr"] {
+      expressionValue = expr
+    } else {
+      expressionValue = firstNonNil(
+        map["expression"],
+        map["expr"],
+        map["field"],
+        map["fieldPath"],
+        map["path"],
+        value
+      ) as Any
+    }
 
     return RNFBFirestoreParsedOrderingNode(
       expression: try parseExpressionNode(expressionValue, fieldName: fieldName),
@@ -1095,6 +1187,9 @@ enum RNFBFirestorePipelineParser {
   }
 
   private static func isExpressionLike(_ map: [String: Any]) -> Bool {
+    if isSerializedReferencePathConstantMap(map) {
+      return false
+    }
     if let exprType = map["exprType"] as? String, exprType.lowercased() == "pipelinevalue" {
       return false
     }
@@ -1103,6 +1198,23 @@ enum RNFBFirestorePipelineParser {
       map["segments"] != nil || map["_segments"] != nil
   }
 
+  private static func isSerializedReferencePathConstantMap(_ map: [String: Any]) -> Bool {
+    guard let path = map["path"] as? String, path.contains("/") else {
+      return false
+    }
+
+    for key in map.keys {
+      switch key {
+      case "path", "firestore", "alias", "as", "__kind":
+        continue
+      default:
+        return false
+      }
+    }
+
+    return true
+  }
+
   private static func coerceFieldPath(
     _ value: Any,
     fieldName: String
@@ -1201,8 +1313,12 @@ enum RNFBFirestorePipelineParser {
             }
             if normalizedType == "constant" {
               let valueBox = ParsedValueNodeBox()
+              var constantValue = map["value"] as Any
+              if map["integerLiteral"] as? Bool == true {
+                constantValue = coerceIntegerLiteralConstantValue(constantValue)
+              }
               stack.append(.expressionConstantExit(box, valueBox, fieldName))
-              stack.append(.valueEnter(map["value"] as Any, valueBox, "\(fieldName).value"))
+              stack.append(.valueEnter(constantValue, valueBox, "\(fieldName).value"))
               continue
             }
             if normalizedType == "variable" {
@@ -1236,6 +1352,12 @@ enum RNFBFirestorePipelineParser {
             continue
           }
 
+          if isSerializedReferencePathConstantMap(map) {
+            let path = try coerceFieldPath(value, fieldName: fieldName)
+            box.value = .constant(.primitive(path))
+            continue
+          }
+
           if map["fieldPath"] != nil || map["path"] != nil || map["segments"] != nil || map["_segments"] != nil {
             box.value = .field(path: try coerceFieldPath(value, fieldName: fieldName))
             continue
@@ -1364,6 +1486,29 @@ enum RNFBFirestorePipelineParser {
     return normalized == "desc" || normalized == "descending"
   }
 
+
+  private static func coerceIntegerLiteralConstantValue(_ value: Any) -> Any {
+    if let boolValue = value as? Bool {
+      return boolValue ? 1 : 0
+    }
+    if let number = value as? NSNumber {
+      if CFGetTypeID(number) == CFBooleanGetTypeID() {
+        return number.boolValue ? 1 : 0
+      }
+      let doubleValue = number.doubleValue
+      if doubleValue.isFinite,
+         doubleValue.rounded() == doubleValue,
+         doubleValue >= Double(Int.min),
+         doubleValue <= Double(Int.max) {
+        return number.intValue
+      }
+    }
+    if let intValue = value as? Int {
+      return intValue
+    }
+    return value
+  }
+
   private static func mapOperatorToFunction(_ operatorName: String) -> String {
     switch operatorName {
     case "==", "=", "EQUAL": return "equal"
diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.mm b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.mm
index 1a4032b6b2..98fcd2423f 100644
--- a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.mm
+++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.mm
@@ -69,7 +69,8 @@ - (void)invalidate {
 
 - (void)transactionBegin:(NSString *)appName
               databaseId:(NSString *)databaseId
-           transactionId:(double)transactionId {
+           transactionId:(double)transactionId
+             maxAttempts:(double)maxAttempts {
   FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
   NSNumber *transactionIdNumber = @(transactionId);
 
@@ -191,7 +192,13 @@ - (void)transactionBegin:(NSString *)appName
     }
   };
 
-  [firestore runTransactionWithBlock:transactionBlock completion:completionBlock];
+  if (maxAttempts > 0) {
+    FIRTransactionOptions *options = [[FIRTransactionOptions alloc] init];
+    options.maxAttempts = (NSInteger)maxAttempts;
+    [firestore runTransactionWithOptions:options block:transactionBlock completion:completionBlock];
+  } else {
+    [firestore runTransactionWithBlock:transactionBlock completion:completionBlock];
+  }
 }
 
 - (void)transactionGetDocument:(NSString *)appName
diff --git a/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules-generated.mm b/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules-generated.mm
index 780b2d7f87..bf8453ad21 100644
--- a/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules-generated.mm
+++ b/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules-generated.mm
@@ -278,7 +278,7 @@ - (void)setEventEmitterCallback:(EventEmitterCallbackWrapper *)eventEmitterCallb
 namespace facebook::react {
   
     static facebook::jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionBegin(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "transactionBegin", @selector(transactionBegin:databaseId:transactionId:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "transactionBegin", @selector(transactionBegin:databaseId:transactionId:maxAttempts:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionGetDocument(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -296,7 +296,7 @@ - (void)setEventEmitterCallback:(EventEmitterCallbackWrapper *)eventEmitterCallb
   NativeRNFBTurboFirestoreTransactionSpecJSI::NativeRNFBTurboFirestoreTransactionSpecJSI(const ObjCTurboModule::InitParams &params)
     : ObjCTurboModule(params) {
       
-        methodMap_["transactionBegin"] = MethodMetadata {3, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionBegin};
+        methodMap_["transactionBegin"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionBegin};
         
         
         methodMap_["transactionGetDocument"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionSpecJSI_transactionGetDocument};
diff --git a/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules.h b/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules.h
index b0e2188cf1..e3a3462e28 100644
--- a/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules.h
+++ b/packages/firestore/ios/generated/RNFBFirestoreTurboModules/RNFBFirestoreTurboModules.h
@@ -288,7 +288,8 @@ namespace facebook::react {
 
 - (void)transactionBegin:(NSString *)appName
               databaseId:(NSString *)databaseId
-           transactionId:(double)transactionId;
+           transactionId:(double)transactionId
+             maxAttempts:(double)maxAttempts;
 - (void)transactionGetDocument:(NSString *)appName
                     databaseId:(NSString *)databaseId
                  transactionId:(double)transactionId
diff --git a/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI-generated.cpp b/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI-generated.cpp
index 3a1062e6af..4b9db23e89 100644
--- a/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI-generated.cpp
+++ b/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI-generated.cpp
@@ -312,7 +312,8 @@ static jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_t
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
     count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
-    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber()
+    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber(),
+    count <= 3 ? throw jsi::JSError(rt, "Expected argument in position 3 to be passed") : args[3].asNumber()
   );
   return jsi::Value::undefined();
 }
@@ -347,7 +348,7 @@ static jsi::Value __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_t
 
 NativeRNFBTurboFirestoreTransactionCxxSpecJSI::NativeRNFBTurboFirestoreTransactionCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("NativeRNFBTurboFirestoreTransaction", jsInvoker) {
-  methodMap_["transactionBegin"] = MethodMetadata {3, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionBegin};
+  methodMap_["transactionBegin"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionBegin};
   methodMap_["transactionGetDocument"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionGetDocument};
   methodMap_["transactionDispose"] = MethodMetadata {3, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionDispose};
   methodMap_["transactionApplyBuffer"] = MethodMetadata {4, __hostFunction_NativeRNFBTurboFirestoreTransactionCxxSpecJSI_transactionApplyBuffer};
diff --git a/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI.h b/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI.h
index 0a6983ebd3..8de2ef408d 100644
--- a/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI.h
+++ b/packages/firestore/ios/generated/RNFBFirestoreTurboModulesJSI.h
@@ -559,7 +559,7 @@ class JSI_EXPORT NativeRNFBTurboFirestoreDocumentCxxSpec : public TurboModule {
   NativeRNFBTurboFirestoreTransactionCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
 
 public:
-  virtual void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId) = 0;
+  virtual void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, double maxAttempts) = 0;
   virtual jsi::Value transactionGetDocument(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, jsi::String path) = 0;
   virtual void transactionDispose(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId) = 0;
   virtual void transactionApplyBuffer(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, jsi::Array commandBuffer) = 0;
@@ -593,13 +593,13 @@ class JSI_EXPORT NativeRNFBTurboFirestoreTransactionCxxSpec : public TurboModule
 
     }
 
-    void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId) override {
+    void transactionBegin(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, double maxAttempts) override {
       static_assert(
-          bridging::getParameterCount(&T::transactionBegin) == 4,
-          "Expected transactionBegin(...) to have 4 parameters");
+          bridging::getParameterCount(&T::transactionBegin) == 5,
+          "Expected transactionBegin(...) to have 5 parameters");
 
       return bridging::callFromJs<void>(
-          rt, &T::transactionBegin, jsInvoker_, instance_, std::move(appName), std::move(databaseId), std::move(transactionId));
+          rt, &T::transactionBegin, jsInvoker_, instance_, std::move(appName), std::move(databaseId), std::move(transactionId), std::move(maxAttempts));
     }
     jsi::Value transactionGetDocument(jsi::Runtime &rt, jsi::String appName, jsi::String databaseId, double transactionId, jsi::String path) override {
       static_assert(
diff --git a/packages/firestore/lib/FirestoreAggregate.ts b/packages/firestore/lib/FirestoreAggregate.ts
index 8b3bd5229c..d09c9f53bd 100644
--- a/packages/firestore/lib/FirestoreAggregate.ts
+++ b/packages/firestore/lib/FirestoreAggregate.ts
@@ -23,6 +23,7 @@ import type {
   Query as FirestoreQuery,
 } from './types/firestore';
 import { FieldPath, fromDotSeparatedString } from './FieldPath';
+import { queryEqual } from './modular/query';
 
 import type FirestorePath from './FirestorePath';
 import type { Query as QueryImplementation } from './FirestoreQuery';
@@ -122,3 +123,54 @@ export function fieldPathFromArgument(path: string | FieldPath): FieldPath {
   }
   throw new Error('Field path arguments must be of type `string` or `FieldPath`');
 }
+
+/**
+ * Compares two `AggregateField` instances for equality.
+ */
+export function aggregateFieldEqual(
+  left: AggregateField<unknown>,
+  right: AggregateField<unknown>,
+): boolean {
+  return (
+    left instanceof AggregateField &&
+    right instanceof AggregateField &&
+    left.aggregateType === right.aggregateType &&
+    left._internalFieldPath?._toPath() === right._internalFieldPath?._toPath()
+  );
+}
+
+function aggregateSpecDataEqual(
+  left: AggregateSpecData<AggregateSpec>,
+  right: AggregateSpecData<AggregateSpec>,
+): boolean {
+  const leftKeys = Object.keys(left);
+  const rightKeys = Object.keys(right);
+  if (leftKeys.length !== rightKeys.length) {
+    return false;
+  }
+  for (const key of leftKeys) {
+    if (!Object.prototype.hasOwnProperty.call(right, key) || left[key] !== right[key]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * Compares two `AggregateQuerySnapshot` instances for equality.
+ */
+export function aggregateQuerySnapshotEqual<
+  AggregateSpecType extends AggregateSpec,
+  AppModelType,
+  DbModelType extends DocumentData,
+>(
+  left: AggregateQuerySnapshot<AggregateSpecType, AppModelType, DbModelType>,
+  right: AggregateQuerySnapshot<AggregateSpecType, AppModelType, DbModelType>,
+): boolean {
+  return (
+    left instanceof AggregateQuerySnapshot &&
+    right instanceof AggregateQuerySnapshot &&
+    queryEqual(left.query, right.query) &&
+    aggregateSpecDataEqual(left.data(), right.data())
+  );
+}
diff --git a/packages/firestore/lib/FirestoreModule.ts b/packages/firestore/lib/FirestoreModule.ts
index d08f09e371..64b4388f17 100644
--- a/packages/firestore/lib/FirestoreModule.ts
+++ b/packages/firestore/lib/FirestoreModule.ts
@@ -302,14 +302,17 @@ export class FirebaseFirestoreModule extends FirebaseModule<'NativeRNFBTurboFire
     await this.native.enableNetwork();
   }
 
-  runTransaction(updateFunction: (transaction: unknown) => Promise<unknown>): Promise<unknown> {
+  runTransaction(
+    updateFunction: (transaction: unknown) => Promise<unknown>,
+    options?: { maxAttempts?: number },
+  ): Promise<unknown> {
     if (!isFunction(updateFunction)) {
       return Promise.reject(
         new Error("firebase.firestore().runTransaction(*) 'updateFunction' must be a function."),
       );
     }
 
-    return this._transactionHandler._add(updateFunction);
+    return this._transactionHandler._add(updateFunction, options);
   }
 
   settings(settings: Record<string, unknown>): Promise<void> {
diff --git a/packages/firestore/lib/FirestoreTransactionHandler.ts b/packages/firestore/lib/FirestoreTransactionHandler.ts
index 40b29e6410..bd667790bb 100644
--- a/packages/firestore/lib/FirestoreTransactionHandler.ts
+++ b/packages/firestore/lib/FirestoreTransactionHandler.ts
@@ -23,6 +23,20 @@ let transactionId = 0;
 
 const generateTransactionId = (): number => transactionId++;
 
+function validateMaxAttempts(options?: { maxAttempts?: number }): number {
+  const maxAttempts = options?.maxAttempts;
+
+  if (maxAttempts === undefined) {
+    return 0;
+  }
+
+  if (maxAttempts < 1) {
+    throw new Error('Max attempts must be at least 1');
+  }
+
+  return maxAttempts;
+}
+
 export interface TransactionPendingEntry {
   meta: TransactionMeta;
   transaction: Transaction;
@@ -138,7 +152,11 @@ export default class FirestoreTransactionHandler {
     }
   }
 
-  _add(updateFunction: (transaction: Transaction) => Promise<unknown>): Promise<unknown> {
+  _add(
+    updateFunction: (transaction: Transaction) => Promise<unknown>,
+    options?: { maxAttempts?: number },
+  ): Promise<unknown> {
+    const maxAttempts = validateMaxAttempts(options);
     const id = generateTransactionId();
 
     const meta: TransactionMeta = {
@@ -153,7 +171,7 @@ export default class FirestoreTransactionHandler {
     };
 
     return new Promise((resolve, reject) => {
-      this._firestore.native.transactionBegin(id);
+      this._firestore.native.transactionBegin(id, maxAttempts);
 
       meta.resolve = (result: unknown) => {
         this._remove(id);
diff --git a/packages/firestore/lib/index.ts b/packages/firestore/lib/index.ts
index 42ecce7b02..9076efabdf 100644
--- a/packages/firestore/lib/index.ts
+++ b/packages/firestore/lib/index.ts
@@ -79,5 +79,6 @@ export type {
   QuerySnapshot,
   SnapshotMetadata,
   Transaction,
+  TransactionOptions,
   WriteBatch,
 } from './types/firestore';
diff --git a/packages/firestore/lib/modular.ts b/packages/firestore/lib/modular.ts
index b234713c56..32464d3428 100644
--- a/packages/firestore/lib/modular.ts
+++ b/packages/firestore/lib/modular.ts
@@ -24,6 +24,8 @@ import { LoadBundleTask } from './LoadBundleTask';
 import { version } from './version';
 import {
   AggregateField,
+  aggregateFieldEqual,
+  aggregateQuerySnapshotEqual,
   fieldPathFromArgument,
   AggregateQuerySnapshot,
 } from './FirestoreAggregate';
@@ -47,6 +49,8 @@ import type {
   LogLevel,
   Unsubscribe,
   LoadBundleTaskProgress,
+  FirestoreError,
+  TransactionOptions,
 } from './types/firestore';
 import type {
   CollectionReferenceInternal,
@@ -225,14 +229,22 @@ let snapshotInSyncListenerId = 0;
 
 export function onSnapshotsInSync(
   firestore: Firestore,
-  observer: { next?: () => void; error?: (error: Error) => void; complete?: () => void },
+  observer: {
+    next?: (value: void) => void;
+    error?: (error: FirestoreError) => void;
+    complete?: () => void;
+  },
 ): Unsubscribe;
 export function onSnapshotsInSync(firestore: Firestore, onSync: () => void): Unsubscribe;
 export function onSnapshotsInSync(
   firestore: Firestore,
   callback:
     | (() => void)
-    | { next?: () => void; error?: (error: Error) => void; complete?: () => void },
+    | {
+        next?: (value: void) => void;
+        error?: (error: FirestoreError) => void;
+        complete?: () => void;
+      },
 ): Unsubscribe {
   const listenerId = snapshotInSyncListenerId++;
   const syncFirestore = firestore as FirestoreInternal;
@@ -350,22 +362,23 @@ export function waitForPendingWrites(firestore: Firestore): Promise<void> {
 /**
  * Creates a Firestore instance with the given settings.
  *
- * @remarks **Async on React Native Firebase** — settings are applied through the native bridge.
- * Web-only `settings.localCache` values (`memoryLocalCache`, `persistentLocalCache`, IndexedDB
- * factories) are **not supported**; persistence is controlled by the native Firestore SDK.
+ * @remarks Returns synchronously for firebase-js-sdk parity; settings are applied through the
+ * native bridge in the background. Web-only `settings.localCache` values (`memoryLocalCache`,
+ * `persistentLocalCache`, IndexedDB factories) are **not supported**; persistence is controlled
+ * by the native Firestore SDK.
  */
-export async function initializeFirestore(
+export function initializeFirestore(
   app: FirebaseApp,
   settings: FirestoreSettings,
   databaseId?: string,
-): Promise<Firestore> {
+): Firestore {
   const firestore = getOrCreateModularInstance(
     FirebaseFirestoreModule,
     config,
     app,
     databaseId,
   ) as unknown as FirestoreInternal;
-  await firestore.settings(settings);
+  void firestore.settings(settings);
   return firestore as Firestore;
 }
 
@@ -386,10 +399,13 @@ export function setLogLevel(logLevel: LogLevel): void {
 export function runTransaction<T>(
   firestore: Firestore,
   updateFunction: (transaction: Transaction) => Promise<T>,
+  options?: TransactionOptions,
 ): Promise<T> {
-  return (firestore as FirestoreInternal).runTransaction(updateFunction) as Promise<T>;
+  return (firestore as FirestoreInternal).runTransaction(updateFunction, options) as Promise<T>;
 }
 
+export type { TransactionOptions };
+
 export function getCountFromServer<AppModelType, DbModelType extends DocumentData>(
   query: Query<AppModelType, DbModelType>,
 ): Promise<AggregateQuerySnapshot<{ count: AggregateField<number> }, AppModelType, DbModelType>> {
@@ -488,6 +504,8 @@ export function count(): AggregateField<number> {
   return new AggregateField('count');
 }
 
+export { aggregateFieldEqual, aggregateQuerySnapshotEqual };
+
 export function loadBundle(
   firestore: Firestore,
   bundleData: ReadableStream<Uint8Array> | ArrayBuffer | string,
diff --git a/packages/firestore/lib/pipelines/expressions.ts b/packages/firestore/lib/pipelines/expressions.ts
index ad3dbf27dd..52cbc6882f 100644
--- a/packages/firestore/lib/pipelines/expressions.ts
+++ b/packages/firestore/lib/pipelines/expressions.ts
@@ -17,6 +17,7 @@
 
 import type { DocumentReference } from '../types/firestore';
 import type { VectorValue } from '../FirestoreVectorValue';
+import type { GeoPoint } from '../FirestoreGeoPoint';
 import type { Bytes } from '../modular/Bytes';
 
 /**
@@ -26,39 +27,13 @@ import type { Bytes } from '../modular/Bytes';
 export type ExpressionType =
   | 'Field'
   | 'Constant'
-  | 'Variable'
   | 'Function'
   | 'AggregateFunction'
   | 'ListOfExpressions'
   | 'AliasedExpression'
+  | 'Variable'
   | 'PipelineValue';
 
-/**
- * @beta
- * Firestore value type for isType() checks.
- */
-export type Type =
-  | 'null'
-  | 'array'
-  | 'boolean'
-  | 'bytes'
-  | 'timestamp'
-  | 'geo_point'
-  | 'number'
-  | 'int32'
-  | 'int64'
-  | 'float64'
-  | 'decimal128'
-  | 'map'
-  | 'reference'
-  | 'string'
-  | 'vector'
-  | 'max_key'
-  | 'min_key'
-  | 'object_id'
-  | 'regex'
-  | 'request_timestamp';
-
 /**
  * @beta
  * Time unit for timestamp arithmetic expressions.
@@ -70,12 +45,7 @@ export type TimeUnit = 'microsecond' | 'millisecond' | 'second' | 'minute' | 'ho
  * Time granularity for timestampTruncate.
  */
 export type TimeGranularity =
-  | 'microsecond'
-  | 'millisecond'
-  | 'second'
-  | 'minute'
-  | 'hour'
-  | 'day'
+  | TimeUnit
   | 'week'
   | 'week(monday)'
   | 'week(tuesday)'
@@ -84,11 +54,11 @@ export type TimeGranularity =
   | 'week(friday)'
   | 'week(saturday)'
   | 'week(sunday)'
-  | 'isoWeek'
+  | 'isoweek'
   | 'month'
   | 'quarter'
   | 'year'
-  | 'isoYear';
+  | 'isoyear';
 
 /**
  * @beta
@@ -167,6 +137,11 @@ export interface Selectable {
  */
 export interface Field extends Selectable, FluentExpressionMethods {
   readonly _brand?: 'Field';
+  /**
+   * @beta
+   * Evaluates to geospatial distance in meters (search stage only).
+   */
+  geoDistance(location: GeoPoint | Expression): FunctionExpression;
 }
 
 /**
@@ -302,6 +277,7 @@ interface RuntimeAliasedAggregateNode extends RuntimeNodeBase {
 }
 
 type RuntimeExpressionMethods = FluentExpressionMethods;
+type RuntimeFieldMethods = RuntimeExpressionMethods & Pick<Field, 'geoDistance'>;
 type RuntimeOrderingMethods = Pick<Ordering, 'ascending' | 'descending'>;
 type RuntimeAggregateMethods = Pick<Accumulator, 'as'>;
 
@@ -441,6 +417,7 @@ const EXPRESSION_METHOD_NAMES = [
   'divide',
   'multiply',
   'documentId',
+  'parent',
   'sum',
   'count',
   'average',
@@ -584,7 +561,19 @@ function createExpressionProto(): RuntimeExpressionMethods {
   return proto as RuntimeExpressionMethods;
 }
 
+function createFieldProto(): RuntimeFieldMethods {
+  const proto = Object.create(createExpressionProto()) as RuntimeFieldMethods;
+  proto.geoDistance = function (
+    this: RuntimeExpressionFluentNode,
+    location: unknown,
+  ): FunctionExpressionNode {
+    return createFunctionExpression('geoDistance', [this, toExpressionArgument(location)]);
+  };
+  return proto;
+}
+
 const expressionProto = createExpressionProto();
+const fieldProto = createFieldProto();
 
 const aggregateProto: RuntimeAggregateMethods = {
   as(this: AggregateNode, name: string): AliasedAggregateNode {
@@ -603,7 +592,7 @@ const orderingProto: RuntimeOrderingMethods = {
 };
 
 function createField(path: unknown): FieldNode {
-  return createNode(expressionProto, {
+  return createNode(fieldProto, {
     [RUNTIME_NODE_SYMBOL]: true,
     __kind: 'expression',
     exprType: 'Field',
@@ -612,7 +601,30 @@ function createField(path: unknown): FieldNode {
   });
 }
 
-function createConstant(value: unknown): ConstantExpressionNode {
+function applyConstantIntegerLiteralTag(
+  node: ConstantExpressionNode,
+  value: unknown,
+  options?: { preferIntegers?: boolean },
+): void {
+  const record = node as unknown as Record<string, unknown>;
+
+  if (options === undefined) {
+    if (typeof value === 'number' && Number.isInteger(value)) {
+      // iOS RN bridge can coerce 0/1 integer constants to booleans; tag explicit integers.
+      record.integerLiteral = true;
+    }
+    return;
+  }
+
+  if (options.preferIntegers === true) {
+    record.integerLiteral = true;
+  }
+}
+
+function createConstant(
+  value: unknown,
+  options?: { preferIntegers?: boolean },
+): ConstantExpressionNode {
   const node = createNode(expressionProto, {
     [RUNTIME_NODE_SYMBOL]: true,
     __kind: 'expression',
@@ -620,10 +632,7 @@ function createConstant(value: unknown): ConstantExpressionNode {
     value,
   }) as ConstantExpressionNode;
 
-  if (typeof value === 'number' && Number.isInteger(value)) {
-    // iOS RN bridge can coerce 0/1 integer constants to booleans; tag explicit integers.
-    (node as unknown as Record<string, unknown>).integerLiteral = true;
-  }
+  applyConstantIntegerLiteralTag(node, value, options);
 
   return node;
 }
@@ -830,6 +839,7 @@ function normalizeGlobalArguments(name: string, args: unknown[]): RuntimeNode[]
     case 'cosineDistance':
     case 'dotProduct':
     case 'euclideanDistance':
+    case 'geoDistance':
     case 'isAbsent':
     case 'isType':
     case 'logicalMaximum':
@@ -933,7 +943,12 @@ function createMethodResult(
     ]);
   }
 
-  if ((canonicalName === 'currentTimestamp' || canonicalName === 'rand') && rawArgs.length === 0) {
+  if (
+    (canonicalName === 'currentTimestamp' ||
+      canonicalName === 'rand' ||
+      canonicalName === 'score') &&
+    rawArgs.length === 0
+  ) {
     return createFunctionExpression(canonicalName, []);
   }
 
@@ -1272,7 +1287,10 @@ export function array(_elements: unknown[]): FunctionExpression {
 /**
  * @beta
  * Creates a constant expression for a number value.
+ *
+ * @param _options - Optional `{ preferIntegers }` to force integer literal tagging on native.
  */
+export function constant(_value: number, _options?: { preferIntegers?: boolean }): Expression;
 export function constant(_value: number): Expression;
 /**
  * @beta
@@ -1296,8 +1314,13 @@ export function constant(_value: null): Expression;
 export function constant(_value: unknown): Expression;
 export function constant(
   _value: number | string | boolean | null | unknown,
+  _options?: { preferIntegers?: boolean },
 ): Expression | BooleanExpression {
-  return createConstant(normalizeRawValue(_value));
+  const normalized = normalizeRawValue(_value);
+  if (typeof _value === 'number' && _options !== undefined) {
+    return createConstant(normalized, _options);
+  }
+  return createConstant(normalized);
 }
 
 /**
@@ -1417,6 +1440,47 @@ export function documentId(
   return callFunctionHelper('documentId', arguments);
 }
 
+/**
+ * @beta
+ * Returns the parent document reference of a document path or expression.
+ */
+export function parent(_documentPath: string | DocumentReference): FunctionExpression;
+/**
+ * @beta
+ * Returns the parent document reference from a path expression.
+ */
+export function parent(_documentPathExpr: Expression): FunctionExpression;
+export function parent(_documentPath: string | DocumentReference | Expression): FunctionExpression {
+  return callFunctionHelper('parent', arguments);
+}
+
+/**
+ * @beta
+ * Full-text search predicate for use within a search stage.
+ */
+export function documentMatches(_rquery: string | Expression): BooleanExpression {
+  return callBooleanHelper('documentMatches', arguments);
+}
+
+/**
+ * @beta
+ * Search relevance score expression for use within a search stage.
+ */
+export function score(): Expression {
+  return createFunctionExpression('score', []);
+}
+
+/**
+ * @beta
+ * Geospatial distance in meters between a field location and a query point (search stage only).
+ */
+export function geoDistance(
+  _fieldName: string | Field,
+  _location: GeoPoint | Expression,
+): Expression {
+  return callFunctionHelper('geoDistance', arguments);
+}
+
 /**
  * @beta
  * Creates an aggregation that sums values from an expression across stage inputs.
@@ -2253,9 +2317,9 @@ export function isError(_value: Expression): BooleanExpression {
   return callBooleanHelper('isError', arguments);
 }
 
-export function isType(_fieldName: string, _type: Type): BooleanExpression;
-export function isType(_expression: Expression, _type: Type): BooleanExpression;
-export function isType(_fieldOrExpr: string | Expression, _type: Type): BooleanExpression {
+export function isType(_fieldName: string, _type: string): BooleanExpression;
+export function isType(_expression: Expression, _type: string): BooleanExpression;
+export function isType(_fieldOrExpr: string | Expression, _type: string): BooleanExpression {
   return callBooleanHelper('isType', arguments);
 }
 
@@ -2634,22 +2698,22 @@ export function timestampSubtract(
  * Difference between two timestamps in the given unit.
  */
 export function timestampDiff(
-  _endExpression: Expression,
+  _endFieldName: string,
   _startFieldName: string,
   _unit: TimeUnit | Expression,
 ): FunctionExpression;
 export function timestampDiff(
-  _endExpression: Expression,
+  _endFieldName: string,
   _startExpression: Expression,
   _unit: TimeUnit | Expression,
 ): FunctionExpression;
 export function timestampDiff(
-  _endFieldName: string,
+  _endExpression: Expression,
   _startFieldName: string,
   _unit: TimeUnit | Expression,
 ): FunctionExpression;
 export function timestampDiff(
-  _endFieldName: string,
+  _endExpression: Expression,
   _startExpression: Expression,
   _unit: TimeUnit | Expression,
 ): FunctionExpression;
diff --git a/packages/firestore/lib/pipelines/index.ts b/packages/firestore/lib/pipelines/index.ts
index 36d2f135ff..c59fecb05e 100644
--- a/packages/firestore/lib/pipelines/index.ts
+++ b/packages/firestore/lib/pipelines/index.ts
@@ -35,7 +35,6 @@ export type {
   FunctionExpression,
   AggregateFunction,
   ExpressionType,
-  Type,
   TimeGranularity,
   TimePart,
   TimeUnit,
@@ -62,6 +61,8 @@ export type {
   SubcollectionStageOptions,
   UnionStageOptions,
   UnnestStageOptions,
+  DefineStageOptions,
+  SearchStageOptions,
   WhereStageOptions,
 } from './stage_options';
 export type { PipelineExecuteOptions } from './pipeline_options';
@@ -99,6 +100,10 @@ export {
   divide,
   multiply,
   documentId,
+  parent,
+  documentMatches,
+  score,
+  geoDistance,
   sum,
   count,
   average,
diff --git a/packages/firestore/lib/pipelines/pipeline.ts b/packages/firestore/lib/pipelines/pipeline.ts
index 6eda2becca..33fab983a8 100644
--- a/packages/firestore/lib/pipelines/pipeline.ts
+++ b/packages/firestore/lib/pipelines/pipeline.ts
@@ -18,12 +18,16 @@
 import type {
   PipelineAggregateOptions,
   PipelineDistinctOptions,
+  PipelineDefineOptions,
   PipelineFindNearestOptions,
   PipelineReplaceWithOptions,
   PipelineSampleOptions,
+  PipelineSearchOptions,
   PipelineUnionOptions,
   PipelineUnnestOptions,
   PipelineRawStageOptions,
+  DefineStageOptions,
+  SearchStageOptions,
 } from './stage_options';
 import type {
   BooleanExpression,
@@ -31,6 +35,7 @@ import type {
   Field,
   Ordering,
   AliasedAggregate,
+  AliasedExpression,
   FunctionExpression,
 } from './expressions';
 import type { DocumentData } from '../types/firestore';
@@ -79,6 +84,24 @@ export interface Pipeline<T = DocumentData> {
 
   findNearest(options: PipelineFindNearestOptions): Pipeline<T>;
 
+  /**
+   * @beta
+   * Add a search stage to the pipeline (full-text and geo search). Must be the first stage.
+   */
+  search(options: PipelineSearchOptions): Pipeline<T>;
+  search(options: SearchStageOptions): Pipeline<T>;
+
+  /**
+   * @beta
+   * Defines one or more variables in the pipeline scope for reuse via variable().
+   */
+  define(
+    aliasedExpression: AliasedExpression,
+    ...additionalExpressions: AliasedExpression[]
+  ): Pipeline<T>;
+  define(options: DefineStageOptions): Pipeline<T>;
+  define(options: PipelineDefineOptions): Pipeline<T>;
+
   replaceWith(fieldName: string): Pipeline<T>;
   replaceWith(expr: Selectable): Pipeline<T>;
   replaceWith(options: PipelineReplaceWithOptions): Pipeline<T>;
diff --git a/packages/firestore/lib/pipelines/pipeline_runtime.ts b/packages/firestore/lib/pipelines/pipeline_runtime.ts
index b745dcfaa6..90f64703f6 100644
--- a/packages/firestore/lib/pipelines/pipeline_runtime.ts
+++ b/packages/firestore/lib/pipelines/pipeline_runtime.ts
@@ -67,16 +67,25 @@ import type { PipelineResult, PipelineSnapshot } from './pipeline-result';
 import type {
   PipelineAggregateOptions,
   PipelineDistinctOptions,
+  PipelineDefineOptions,
   PipelineFindNearestOptions,
   PipelineRawStageOptions,
   PipelineReplaceWithOptions,
   PipelineSampleOptions,
+  PipelineSearchOptions,
   PipelineUnionOptions,
   PipelineUnnestOptions,
+  DefineStageOptions,
+  SearchStageOptions,
 } from './stage_options';
 import type { PipelineExecuteOptions } from './pipeline_options';
 import { validateExecuteOptions, validateSerializedPipeline } from './pipeline_validate';
-import { createPipelineSubqueryExpression, type FunctionExpression } from './expressions';
+import {
+  createPipelineSubqueryExpression,
+  documentMatches,
+  type AliasedExpression,
+  type FunctionExpression,
+} from './expressions';
 
 const PIPELINE_RUNTIME_SYMBOL = Symbol.for('RNFBFirestorePipelineRuntime');
 const PIPELINE_RUNTIME_INSTALLER_SYMBOL = Symbol.for('RNFBFirestorePipelineRuntimeInstaller');
@@ -509,6 +518,42 @@ class RuntimePipelineImpl<T = DocumentData> implements RuntimePipeline {
     return this.append('findNearest', options as unknown as Record<string, unknown>);
   }
 
+  search(options: PipelineSearchOptions | SearchStageOptions): Pipeline<T> {
+    const normalized: Record<string, unknown> = { ...options };
+    const query = normalized.query;
+    if (isString(query)) {
+      normalized.query = documentMatches(query);
+    }
+    if (normalized.sort !== undefined && !isArray(normalized.sort)) {
+      normalized.sort = [normalized.sort];
+    }
+    return this.append('search', normalized);
+  }
+
+  define(
+    aliasedExpression: AliasedExpression,
+    ...additionalExpressions: AliasedExpression[]
+  ): Pipeline<T>;
+  define(options: DefineStageOptions | PipelineDefineOptions): Pipeline<T>;
+  define(
+    firstOrOptions: AliasedExpression | DefineStageOptions | PipelineDefineOptions,
+    ...additionalExpressions: AliasedExpression[]
+  ): Pipeline<T> {
+    if (
+      isRecord(firstOrOptions) &&
+      hasAnyKey(firstOrOptions, ['variables']) &&
+      !hasAnyKey(firstOrOptions, ['__kind', 'exprType', 'expr', 'alias'])
+    ) {
+      return this.append('define', {
+        variables: firstOrOptions.variables ?? [],
+      });
+    }
+
+    return this.append('define', {
+      variables: [firstOrOptions, ...additionalExpressions],
+    });
+  }
+
   replaceWith(fieldName: string): Pipeline<T>;
   replaceWith(expr: Selectable): Pipeline<T>;
   replaceWith(options: PipelineReplaceWithOptions): Pipeline<T>;
diff --git a/packages/firestore/lib/pipelines/pipeline_support.ts b/packages/firestore/lib/pipelines/pipeline_support.ts
index 575ac90994..40b8bdb9a5 100644
--- a/packages/firestore/lib/pipelines/pipeline_support.ts
+++ b/packages/firestore/lib/pipelines/pipeline_support.ts
@@ -37,6 +37,8 @@ export const PIPELINE_STAGE_TYPES = [
   'aggregate',
   'distinct',
   'findNearest',
+  'search',
+  'define',
   'replaceWith',
   'sample',
   'union',
diff --git a/packages/firestore/lib/pipelines/pipeline_validate.ts b/packages/firestore/lib/pipelines/pipeline_validate.ts
index 02a655cd28..428ad409cf 100644
--- a/packages/firestore/lib/pipelines/pipeline_validate.ts
+++ b/packages/firestore/lib/pipelines/pipeline_validate.ts
@@ -154,6 +154,15 @@ function validateStage(stage: unknown, stagePath: string, optionsPath: string):
     case 'limit':
     case 'offset':
     case 'findNearest':
+      return undefined;
+    case 'search':
+      if (stage.options.query === undefined) {
+        throw new Error('pipelineExecute() expected search stage to include query.');
+      }
+      return undefined;
+    case 'define':
+      validateNonEmptyStageArray(stage.options.variables, `${optionsPath}.variables`);
+      return undefined;
     case 'replaceWith':
     case 'unnest':
     case 'rawStage':
diff --git a/packages/firestore/lib/pipelines/stage_options.ts b/packages/firestore/lib/pipelines/stage_options.ts
index 244eb964cc..06a63891ff 100644
--- a/packages/firestore/lib/pipelines/stage_options.ts
+++ b/packages/firestore/lib/pipelines/stage_options.ts
@@ -26,6 +26,7 @@ import type {
   BooleanExpression,
   Expression,
   AliasedAggregate,
+  AliasedExpression,
 } from './expressions';
 
 /**
@@ -51,6 +52,28 @@ export interface PipelineDistinctOptions {
   groups?: (Field | string)[];
 }
 
+/**
+ * @beta
+ * Options for pipeline define() stage.
+ */
+export interface PipelineDefineOptions {
+  variables?: AliasedExpression[];
+}
+
+/**
+ * @beta
+ * Options for pipeline search() stage (full-text and geo search).
+ */
+export interface PipelineSearchOptions {
+  query: BooleanExpression | string;
+  languageCode?: string;
+  retrievalDepth?: number;
+  sort?: Ordering | Ordering[];
+  offset?: number;
+  limit?: number;
+  addFields?: Selectable[];
+}
+
 /**
  * @beta
  * Options for pipeline findNearest() stage (vector search).
@@ -109,7 +132,7 @@ export interface PipelineRawStageOptions {
  * @beta
  * Options defining how a Stage is evaluated. Base type for stage option types.
  */
-export interface StageOptions {
+export type StageOptions = {
   /**
    * @beta
    * Escape hatch for options not known at build time (e.g. backend-specific snake_case options).
@@ -117,7 +140,7 @@ export interface StageOptions {
   rawOptions?: {
     [name: string]: unknown;
   };
-}
+};
 
 /**
  * @beta
@@ -375,6 +398,60 @@ export type UnnestStageOptions = StageOptions & {
   indexField?: string;
 };
 
+/**
+ * @beta
+ * Options defining how a Define stage is evaluated. See {@link Pipeline.define}.
+ */
+export type DefineStageOptions = StageOptions & {
+  /**
+   * @beta
+   * The variables to define.
+   */
+  variables: AliasedExpression[];
+};
+
+/**
+ * @beta
+ * Options defining how a Search stage is evaluated. See {@link Pipeline.search}.
+ */
+export type SearchStageOptions = StageOptions & {
+  /**
+   * @beta
+   * Specifies the search query that will be used to query and score documents by the search stage.
+   */
+  query: BooleanExpression | string;
+  /**
+   * @beta
+   * The BCP-47 language code of text in the search query, such as "en" or "sr".
+   */
+  languageCode?: string;
+  /**
+   * @beta
+   * The maximum number of documents to retrieve from the search index before scoring and sorting.
+   */
+  retrievalDepth?: number;
+  /**
+   * @beta
+   * Orderings specify how the returned documents are sorted. One or more orderings are required.
+   */
+  sort?: Ordering | Ordering[];
+  /**
+   * @beta
+   * The number of documents to skip from the beginning of the search result set.
+   */
+  offset?: number;
+  /**
+   * @beta
+   * The maximum number of documents to return from the search stage after scoring and sorting.
+   */
+  limit?: number;
+  /**
+   * @beta
+   * The fields to add to each document, specified as a Selectable.
+   */
+  addFields?: Selectable[];
+};
+
 /**
  * @beta
  * Options for Where stage.
diff --git a/packages/firestore/lib/types/firestore.ts b/packages/firestore/lib/types/firestore.ts
index 26bf05234f..cfb198c699 100644
--- a/packages/firestore/lib/types/firestore.ts
+++ b/packages/firestore/lib/types/firestore.ts
@@ -415,6 +415,10 @@ export declare class WriteBatch {
   commit(): Promise<void>;
 }
 
+export interface TransactionOptions {
+  readonly maxAttempts?: number;
+}
+
 export declare class LiteTransaction {}
 
 export declare class Transaction extends LiteTransaction {
diff --git a/packages/firestore/lib/types/internal.ts b/packages/firestore/lib/types/internal.ts
index edbbccbafc..452d8a45a4 100644
--- a/packages/firestore/lib/types/internal.ts
+++ b/packages/firestore/lib/types/internal.ts
@@ -295,6 +295,24 @@ export type FirestorePipelineStageInternal =
         distanceField?: string;
       };
     }
+  | {
+      stage: 'search';
+      options: {
+        query: FirestorePipelineExpressionInternal | string;
+        languageCode?: string;
+        retrievalDepth?: number;
+        sort?: FirestorePipelineOrderingInternal[];
+        offset?: number;
+        limit?: number;
+        addFields?: FirestorePipelineSelectableInternal[];
+      };
+    }
+  | {
+      stage: 'define';
+      options: {
+        variables: FirestorePipelineSelectableInternal[];
+      };
+    }
   | {
       stage: 'replaceWith';
       options: {
@@ -524,7 +542,7 @@ export interface RNFBFirestoreModule {
   documentBatch(writes: Array<Record<string, unknown>>): Promise<void>;
 
   // --- Transaction module (NativeRNFBTurboFirestoreTransaction) ---
-  transactionBegin(transactionId: number): Promise<void>;
+  transactionBegin(transactionId: number, maxAttempts?: number): Promise<void>;
   transactionDispose(transactionId: number): void;
   transactionGetDocument(transactionId: number, path: string): Promise<unknown>;
   transactionApplyBuffer(transactionId: number, commandBuffer: unknown[]): void;
@@ -726,6 +744,7 @@ export interface FirestoreInternal extends ParentReferenceInternal, Firestore {
   ): void;
   runTransaction(
     updateFunction: (transaction: Transaction) => Promise<unknown>,
+    options?: { maxAttempts?: number },
     deprecationArg?: FirestoreModularDeprecationArg,
   ): Promise<unknown>;
   loadBundle(
diff --git a/packages/firestore/lib/web/RNFBFirestoreModule.ts b/packages/firestore/lib/web/RNFBFirestoreModule.ts
index 8b7f6c10a1..4ae86346f1 100644
--- a/packages/firestore/lib/web/RNFBFirestoreModule.ts
+++ b/packages/firestore/lib/web/RNFBFirestoreModule.ts
@@ -476,60 +476,70 @@ export default {
     }
   },
 
-  transactionBegin(appName: string, databaseId: string, transactionId: number): Promise<void> {
+  transactionBegin(
+    appName: string,
+    databaseId: string,
+    transactionId: number,
+    maxAttempts: number,
+  ): Promise<void> {
     return guard(async () => {
       const firestore = getCachedFirestoreInstance(appName, databaseId);
+      const transactionOptions = maxAttempts > 0 ? { maxAttempts } : undefined;
 
       try {
-        await runTransaction(firestore, async (tsx: Transaction) => {
-          transactionHandler[transactionId] = tsx;
-
-          emitEvent('firestore_transaction_event', {
-            eventName: 'firestore_transaction_event',
-            body: { type: 'update' },
-            appName,
-            databaseId,
-            listenerId: transactionId,
-          });
-
-          const getBuffer = (): TransactionCommand[] | undefined =>
-            transactionBuffer[transactionId];
-
-          const buffer = await new Promise<TransactionCommand[]>(resolve => {
-            const interval = setInterval(() => {
-              const b = getBuffer();
-              if (b) {
-                clearInterval(interval);
-                resolve(b);
-              }
-            }, 100);
-          });
-
-          for (const serialized of buffer) {
-            const { path: docPath, type, data } = serialized;
-            const docRef = doc(firestore, docPath);
-
-            switch (type) {
-              case 'DELETE':
-                tsx.delete(docRef);
-                break;
-              case 'UPDATE':
-                tsx.update(docRef, readableToObject(firestore, data ?? {}));
-                break;
-              case 'SET': {
-                const options = serialized.options ?? {};
-                const setOptions: Record<string, unknown> = {};
-                if ('merge' in options) {
-                  setOptions.merge = options.merge;
-                } else if ('mergeFields' in options) {
-                  setOptions.mergeFields = options.mergeFields;
+        await runTransaction(
+          firestore,
+          async (tsx: Transaction) => {
+            transactionHandler[transactionId] = tsx;
+
+            emitEvent('firestore_transaction_event', {
+              eventName: 'firestore_transaction_event',
+              body: { type: 'update' },
+              appName,
+              databaseId,
+              listenerId: transactionId,
+            });
+
+            const getBuffer = (): TransactionCommand[] | undefined =>
+              transactionBuffer[transactionId];
+
+            const buffer = await new Promise<TransactionCommand[]>(resolve => {
+              const interval = setInterval(() => {
+                const b = getBuffer();
+                if (b) {
+                  clearInterval(interval);
+                  resolve(b);
+                }
+              }, 100);
+            });
+
+            for (const serialized of buffer) {
+              const { path: docPath, type, data } = serialized;
+              const docRef = doc(firestore, docPath);
+
+              switch (type) {
+                case 'DELETE':
+                  tsx.delete(docRef);
+                  break;
+                case 'UPDATE':
+                  tsx.update(docRef, readableToObject(firestore, data ?? {}));
+                  break;
+                case 'SET': {
+                  const options = serialized.options ?? {};
+                  const setOptions: Record<string, unknown> = {};
+                  if ('merge' in options) {
+                    setOptions.merge = options.merge;
+                  } else if ('mergeFields' in options) {
+                    setOptions.mergeFields = options.mergeFields;
+                  }
+                  tsx.set(docRef, readableToObject(firestore, data ?? {}), setOptions);
+                  break;
                 }
-                tsx.set(docRef, readableToObject(firestore, data ?? {}), setOptions);
-                break;
               }
             }
-          }
-        });
+          },
+          transactionOptions,
+        );
 
         emitEvent('firestore_transaction_event', {
           eventName: 'firestore_transaction_event',
diff --git a/packages/firestore/lib/web/pipelines/pipeline_bridge_factory.ts b/packages/firestore/lib/web/pipelines/pipeline_bridge_factory.ts
index 5e4ca0b9a3..a9a370b1b5 100644
--- a/packages/firestore/lib/web/pipelines/pipeline_bridge_factory.ts
+++ b/packages/firestore/lib/web/pipelines/pipeline_bridge_factory.ts
@@ -303,6 +303,14 @@ function applyPipelineStage(
       ) as WebPipelineInstance;
     case 'findNearest':
       return method.call(current, normalizeWebFindNearestOptions(stageArgs)) as WebPipelineInstance;
+    case 'search':
+      return method.call(current, stageArgs) as WebPipelineInstance;
+    case 'define':
+      return (
+        Array.isArray(stageArgs.variables) && stageArgs.variables.length > 0
+          ? method.call(current, ...stageArgs.variables)
+          : method.call(current, stageArgs)
+      ) as WebPipelineInstance;
     default:
       return method.call(current, stageArgs) as WebPipelineInstance;
   }
diff --git a/packages/firestore/specs/NativeRNFBTurboFirestoreTransaction.ts b/packages/firestore/specs/NativeRNFBTurboFirestoreTransaction.ts
index 32367c6bfe..8c9beac64f 100644
--- a/packages/firestore/specs/NativeRNFBTurboFirestoreTransaction.ts
+++ b/packages/firestore/specs/NativeRNFBTurboFirestoreTransaction.ts
@@ -3,7 +3,12 @@ import type { TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
-  transactionBegin(appName: string, databaseId: string, transactionId: number): void;
+  transactionBegin(
+    appName: string,
+    databaseId: string,
+    transactionId: number,
+    maxAttempts: number,
+  ): void;
   transactionGetDocument(
     appName: string,
     databaseId: string,
diff --git a/packages/firestore/type-test.ts b/packages/firestore/type-test.ts
index ea89b2b63d..8f65b196bd 100644
--- a/packages/firestore/type-test.ts
+++ b/packages/firestore/type-test.ts
@@ -24,6 +24,7 @@ import {
   runTransaction,
   getCountFromServer,
   getAggregateFromServer,
+  aggregateQuerySnapshotEqual,
   sum,
   average,
   count,
@@ -225,6 +226,10 @@ import {
   cosineDistance,
   dotProduct,
   euclideanDistance,
+  documentMatches,
+  score,
+  geoDistance,
+  parent,
   vectorLength,
   pipelineResultEqual,
 } from '@react-native-firebase/firestore/pipelines';
@@ -240,7 +245,6 @@ import type {
   FunctionExpression,
   AggregateFunction,
   ExpressionType,
-  Type as PipelineValueType,
   TimeGranularity,
   TimePart,
   TimeUnit,
@@ -255,6 +259,8 @@ import type {
   DistinctStageOptions,
   DocumentsStageOptions,
   FindNearestStageOptions,
+  SearchStageOptions,
+  DefineStageOptions,
   LimitStageOptions,
   OffsetStageOptions,
   RemoveFieldsStageOptions,
@@ -290,11 +296,10 @@ connectFirestoreEmulator(modFirestore1, 'localhost', 8080, {
 setLogLevel('debug');
 
 // ----- initializeFirestore -----
-initializeFirestore(getApp(), {
+const initializedFirestore = initializeFirestore(getApp(), {
   cacheSizeBytes: CACHE_SIZE_UNLIMITED,
-}).then((fs: Firestore) => {
-  console.log(fs.app.name);
 });
+console.log(initializedFirestore.app.name);
 
 // ----- doc, collection, collectionGroup, refEqual -----
 const modColl = collection(modFirestore1, 'users');
@@ -336,6 +341,15 @@ runTransaction(modFirestore1, async tx => {
   return 'done';
 }).then(() => {});
 
+runTransaction(
+  modFirestore1,
+  async tx => {
+    tx.set(modDoc, { attempts: 1 });
+    return 'configured';
+  },
+  { maxAttempts: 5 },
+).then(() => {});
+
 // Root runtime exports must also carry the generic modular type surface.
 function acceptRootDocumentSnapshot(_snap: FirestoreDocumentSnapshot<DocumentData>) {}
 runTransaction(modFirestore1, async tx => {
@@ -415,6 +429,13 @@ getAggregateFromServer(modQuery1, aggSpec).then(
   },
 );
 
+// ----- aggregateQuerySnapshotEqual -----
+getCountFromServer(modQuery1).then(snap1 => {
+  getCountFromServer(modQuery1).then(snap2 => {
+    console.log(aggregateQuerySnapshotEqual(snap1, snap2));
+  });
+});
+
 // ----- getDoc, getDocFromCache, getDocFromServer -----
 getDoc(modDoc).then(snap => snap.data());
 getDocFromCache(modDoc).then(snap => snap.data());
@@ -802,6 +823,29 @@ const pipelineFindNearest = pipelineDb
   });
 void pipelineFindNearest;
 
+const pipelineSearch = pipelineDb
+  .pipeline()
+  .collection('restaurants')
+  .search({
+    query: documentMatches('waffles OR pancakes'),
+    sort: descending(score()),
+    addFields: [(score() as FunctionExpression).as('searchScore')],
+  });
+void pipelineSearch;
+
+const pipelineDefine = pipelineDb
+  .pipeline()
+  .collection('products')
+  .define(field('price').as('unitPrice'))
+  .where(lessThan(field('price'), constant(100)));
+void pipelineDefine;
+
+void documentMatches('breakfast');
+void score();
+void geoDistance('location', new GeoPoint(37.0, -122.0));
+void field('location').geoDistance(new GeoPoint(37.0, -122.0));
+void parent('users/alice');
+
 const pipelineSampleAndUnnest = pipelineDb
   .pipeline()
   .collection('users')
@@ -846,7 +890,6 @@ type _AllPipelineTypes = [
   FunctionExpression,
   AggregateFunction,
   ExpressionType,
-  PipelineValueType,
   TimeGranularity,
   TimePart,
   TimeUnit,
@@ -861,6 +904,8 @@ type _AllPipelineTypes = [
   DistinctStageOptions,
   DocumentsStageOptions,
   FindNearestStageOptions,
+  SearchStageOptions,
+  DefineStageOptions,
   LimitStageOptions,
   OffsetStageOptions,
   RemoveFieldsStageOptions,
@@ -880,11 +925,15 @@ const xDb = getFirestore();
 
 // ----- constant: all overloads -----
 const _cNum: Expression = constant(42);
+const _cNumPreferInt: Expression = constant(42, { preferIntegers: true });
+const _cNumNoPreferInt: Expression = constant(42, { preferIntegers: false });
 const _cStr: Expression = constant('hello');
 const _cBool: BooleanExpression = constant(true);
 const _cNull: Expression = constant(null);
 const _cUnknown: Expression = constant({ nested: true });
 void _cNum;
+void _cNumPreferInt;
+void _cNumNoPreferInt;
 void _cStr;
 void _cBool;
 void _cNull;
@@ -946,7 +995,7 @@ void isAbsent(field('optionalField'));
 void isAbsent('optionalField');
 // isError
 void isError(field('computedField'));
-// isType: (string, Type) | (Expression, Type)
+// isType: (string, string) | (Expression, string)
 void isType(field('value'), 'string');
 void isType('value', 'number');
 // ifAbsent: (Expression, Expression) | (Expression, unknown) | (string, Expression)
@@ -1738,6 +1787,14 @@ const findNearestStageOpts: FindNearestStageOptions = {
   distanceField: 'dist',
   limit: 5,
 };
+const searchStageOpts: SearchStageOptions = {
+  query: documentMatches('breakfast'),
+  sort: [descending(score())],
+  addFields: [(score() as FunctionExpression).as('searchScore')],
+};
+const defineStageOpts: DefineStageOptions = {
+  variables: [field('price').as('unitPrice')],
+};
 const unionStageOpts: UnionStageOptions = {
   other: xDb.pipeline().collection('backup'),
 };
@@ -1765,6 +1822,8 @@ void collectionGroupStageOpts;
 void databaseStageOpts;
 void documentsStageOpts;
 void findNearestStageOpts;
+void searchStageOpts;
+void defineStageOpts;
 void unionStageOpts;
 void unnestStageOpts;
 void executeOpts;
diff --git a/packages/functions/lib/index.ts b/packages/functions/lib/index.ts
index ef47cf3006..249a59b038 100644
--- a/packages/functions/lib/index.ts
+++ b/packages/functions/lib/index.ts
@@ -440,7 +440,7 @@ const config: ModuleConfig = {
 };
 
 export const SDK_VERSION = version;
-export { HttpsError };
+export { HttpsError, HttpsError as FunctionsError };
 
 /**
  * Returns a {@link Functions} instance for the default or given {@link FirebaseApp}.
@@ -504,6 +504,8 @@ export type {
   HttpsCallableResult,
   Functions,
   FunctionsErrorCode,
+  FunctionsErrorCodeCore,
+  HttpsErrorCodeValue,
 } from './types/functions';
 
 setReactNativeModule(nativeModuleName, fallBackModule);
diff --git a/packages/functions/lib/types/functions.ts b/packages/functions/lib/types/functions.ts
index 7a279452c1..e50ed8b43f 100644
--- a/packages/functions/lib/types/functions.ts
+++ b/packages/functions/lib/types/functions.ts
@@ -80,7 +80,7 @@ export interface HttpsCallable<
 
 // ============ Error Code Types ============
 
-export type FunctionsErrorCode =
+export type FunctionsErrorCodeCore =
   | 'ok'
   | 'cancelled'
   | 'unknown'
@@ -97,7 +97,19 @@ export type FunctionsErrorCode =
   | 'internal'
   | 'unavailable'
   | 'data-loss'
-  | 'unauthenticated'
+  | 'unauthenticated';
+
+/**
+ * Standard Functions error code, including the `functions/` product prefix.
+ * @public
+ */
+export type FunctionsErrorCode = `functions/${FunctionsErrorCodeCore}`;
+
+/**
+ * Error codes returned by {@link HttpsError} at runtime (unprefixed, includes RN-specific codes).
+ */
+export type HttpsErrorCodeValue =
+  | FunctionsErrorCodeCore
   | 'unsupported-type'
   | 'failed-to-parse-wrapped-number';
 
@@ -124,7 +136,7 @@ export interface HttpsErrorCode {
 }
 
 export interface HttpsError extends Error {
-  readonly code: FunctionsErrorCode;
+  readonly code: HttpsErrorCodeValue;
   readonly details?: unknown;
 }
 
diff --git a/packages/remote-config/lib/index.ts b/packages/remote-config/lib/index.ts
index 54eb45129a..a7238b807a 100644
--- a/packages/remote-config/lib/index.ts
+++ b/packages/remote-config/lib/index.ts
@@ -43,6 +43,7 @@ import type {
   FetchStatus,
   LogLevel,
   RemoteConfig,
+  RemoteConfigOptions,
   RemoteConfigSettings,
   Unsubscribe,
   Value,
@@ -536,7 +537,8 @@ export const SDK_VERSION = version;
  * Returns a RemoteConfig instance for the given app.
  * @param app - FirebaseApp. Optional.
  */
-export function getRemoteConfig(app?: FirebaseApp): RemoteConfig {
+export function getRemoteConfig(app?: FirebaseApp, options?: RemoteConfigOptions): RemoteConfig {
+  void options;
   return getOrCreateModularInstance(FirebaseConfigModule, config, app) as unknown as RemoteConfig;
 }
 
@@ -682,9 +684,13 @@ export type {
   ConfigUpdate,
   ConfigUpdateObserver,
   CustomSignals,
+  FetchResponse,
   FetchStatus,
+  FirebaseExperimentDescription,
+  FirebaseRemoteConfigObject,
   LogLevel,
   RemoteConfig,
+  RemoteConfigOptions,
   RemoteConfigSettings,
   Unsubscribe,
   Value,
diff --git a/packages/remote-config/lib/types/remote-config.ts b/packages/remote-config/lib/types/remote-config.ts
index b535c5177b..ef8cb417dc 100644
--- a/packages/remote-config/lib/types/remote-config.ts
+++ b/packages/remote-config/lib/types/remote-config.ts
@@ -15,8 +15,7 @@
  *
  */
 
-import type { FirebaseApp } from '@firebase/app';
-import type { ReactNativeFirebase } from '@react-native-firebase/app';
+import type { FirebaseApp, FirebaseError } from '@firebase/app';
 
 export type LogLevel = 'debug' | 'error' | 'silent';
 
@@ -24,6 +23,32 @@ export type FetchStatus = 'success' | 'failure' | 'no_fetch_yet' | 'throttled';
 
 export type ValueSource = 'static' | 'default' | 'remote';
 
+export interface FirebaseRemoteConfigObject {
+  [key: string]: string;
+}
+
+export interface FirebaseExperimentDescription {
+  experimentId: string;
+  variantId: string;
+  experimentStartTime: string;
+  triggerTimeoutMillis: string;
+  timeToLiveMillis: string;
+  affectedParameterKeys?: string[];
+}
+
+export interface FetchResponse {
+  status: number;
+  eTag?: string;
+  config?: FirebaseRemoteConfigObject;
+  templateVersion?: number;
+  experiments?: FirebaseExperimentDescription[];
+}
+
+export interface RemoteConfigOptions {
+  templateId?: string;
+  initialFetchResponse?: FetchResponse;
+}
+
 export interface Value {
   getSource(): ValueSource;
   asBoolean(): boolean;
@@ -42,7 +67,7 @@ export interface ConfigUpdate {
 
 export interface ConfigUpdateObserver {
   next: (configUpdate: ConfigUpdate) => void;
-  error: (error: ReactNativeFirebase.NativeFirebaseError) => void;
+  error: (error: FirebaseError) => void;
   complete: () => void;
 }
 
diff --git a/packages/storage/__tests__/StorageTask.test.ts b/packages/storage/__tests__/StorageTask.test.ts
new file mode 100644
index 0000000000..d2a148c85d
--- /dev/null
+++ b/packages/storage/__tests__/StorageTask.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, it, jest } from '@jest/globals';
+
+import StorageUploadTask from '../lib/StorageUploadTask';
+import type { StorageReferenceInternal, StorageInternal } from '../lib/types/internal';
+import type { TaskSnapshot } from '../lib/types/storage';
+
+function createTask(setTaskStatus: jest.Mock<(taskId: number, status: number) => boolean>) {
+  const storage = {
+    native: { setTaskStatus },
+    emitter: { addListener: jest.fn() },
+    eventNameForApp: jest.fn(),
+  } as unknown as StorageInternal;
+
+  const ref = {
+    _storage: storage,
+    bucket: 'test-bucket',
+    fullPath: 'path/file.json',
+    name: 'file.json',
+    toString: () => 'gs://test-bucket/path/file.json',
+  } as StorageReferenceInternal;
+
+  return new StorageUploadTask(ref, () => Promise.resolve({} as TaskSnapshot));
+}
+
+describe('StorageTask pause/resume/cancel', function () {
+  it('pause, resume, and cancel return synchronous booleans from native setTaskStatus', function () {
+    const setTaskStatus = jest
+      .fn<(taskId: number, status: number) => boolean>()
+      .mockImplementation((_taskId, status) => status !== 2);
+    const task = createTask(setTaskStatus);
+
+    expect(task.pause()).toBe(true);
+    expect(setTaskStatus).toHaveBeenCalledWith(0, 0);
+    expect(task.pause()).not.toBeInstanceOf(Promise);
+
+    expect(task.resume()).toBe(true);
+    expect(setTaskStatus).toHaveBeenCalledWith(0, 1);
+
+    expect(task.cancel()).toBe(false);
+    expect(setTaskStatus).toHaveBeenCalledWith(0, 2);
+  });
+
+  it('returns false when native setTaskStatus rejects the operation', function () {
+    const setTaskStatus = jest.fn(() => false);
+    const task = createTask(setTaskStatus);
+
+    expect(task.pause()).toBe(false);
+    expect(task.resume()).toBe(false);
+    expect(task.cancel()).toBe(false);
+  });
+});
diff --git a/packages/storage/__tests__/nativeModuleContract.test.ts b/packages/storage/__tests__/nativeModuleContract.test.ts
index 85d706974d..46f12fa852 100644
--- a/packages/storage/__tests__/nativeModuleContract.test.ts
+++ b/packages/storage/__tests__/nativeModuleContract.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, jest } from '@jest/globals';
+import { describe, expect, it, jest } from '@jest/globals';
 import { assertTurboContract } from '../../app/__tests__/turboModuleContractHelper';
 
 const SPEC_METHODS = [
@@ -33,11 +33,11 @@ describe('TurboModule wrapper contract (NewArch-AD-17.1)', function () {
         customUrlOrRegion: 'gs://test-bucket',
         createMock: method =>
           jest.fn(() =>
-            method === 'useEmulator' || method === 'setTaskStatus'
-              ? method === 'setTaskStatus'
-                ? Promise.resolve(true)
-                : undefined
-              : Promise.resolve(),
+            method === 'useEmulator'
+              ? undefined
+              : method === 'setTaskStatus'
+                ? true
+                : Promise.resolve(),
           ),
         customizeRaw: raw => {
           Object.defineProperty(raw, 'getConstants', {
@@ -86,7 +86,8 @@ describe('TurboModule wrapper contract (NewArch-AD-17.1)', function () {
           void wrapped.writeToFile('gs://test-bucket/path', '/tmp/file', 1);
         },
         setTaskStatus: wrapped => {
-          void wrapped.setTaskStatus(1, 0);
+          const result = wrapped.setTaskStatus(1, 0);
+          expect(result).toBe(true);
         },
         setMaxDownloadRetryTime: wrapped => {
           void wrapped.setMaxDownloadRetryTime(60000);
diff --git a/packages/storage/android/src/main/java/io/invertase/firebase/storage/NativeRNFBTurboStorage.java b/packages/storage/android/src/main/java/io/invertase/firebase/storage/NativeRNFBTurboStorage.java
index 63a5bf8a95..6a4a6ab76c 100644
--- a/packages/storage/android/src/main/java/io/invertase/firebase/storage/NativeRNFBTurboStorage.java
+++ b/packages/storage/android/src/main/java/io/invertase/firebase/storage/NativeRNFBTurboStorage.java
@@ -320,20 +320,16 @@ public void putFile(
   }
 
   @Override
-  public void setTaskStatus(String appName, double taskId, double status, Promise promise) {
+  public boolean setTaskStatus(String appName, double taskId, double status) {
     switch ((int) status) {
       case 0:
-        promise.resolve(ReactNativeFirebaseStorageTask.pauseTaskById((int) taskId));
-        break;
+        return ReactNativeFirebaseStorageTask.pauseTaskById((int) taskId);
       case 1:
-        promise.resolve(ReactNativeFirebaseStorageTask.resumeTaskById((int) taskId));
-        break;
+        return ReactNativeFirebaseStorageTask.resumeTaskById((int) taskId);
       case 2:
-        promise.resolve(ReactNativeFirebaseStorageTask.cancelTaskById((int) taskId));
-        break;
+        return ReactNativeFirebaseStorageTask.cancelTaskById((int) taskId);
       default:
-        promise.resolve(false);
-        break;
+        return false;
     }
   }
 
diff --git a/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboStorageSpec.java b/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboStorageSpec.java
index 9005d05606..fa4b6fa0dc 100644
--- a/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboStorageSpec.java
+++ b/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/java/com/facebook/fbreact/specs/NativeRNFBTurboStorageSpec.java
@@ -119,7 +119,7 @@ public NativeRNFBTurboStorageSpec(ReactApplicationContext reactContext) {
   @DoNotStrip
   public abstract void putString(String appName, String url, String string, String format, @Nullable ReadableMap metadata, double taskId, Promise promise);
 
-  @ReactMethod
+  @ReactMethod(isBlockingSynchronousMethod = true)
   @DoNotStrip
-  public abstract void setTaskStatus(String appName, double taskId, double status, Promise promise);
+  public abstract boolean setTaskStatus(String appName, double taskId, double status);
 }
diff --git a/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/RNFBStorageTurboModules-generated.cpp b/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/RNFBStorageTurboModules-generated.cpp
index e4ba380618..e45eb22a11 100644
--- a/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/RNFBStorageTurboModules-generated.cpp
+++ b/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/RNFBStorageTurboModules-generated.cpp
@@ -84,7 +84,7 @@ static facebook::jsi::Value __hostFunction_NativeRNFBTurboStorageSpecJSI_putStri
 
 static facebook::jsi::Value __hostFunction_NativeRNFBTurboStorageSpecJSI_setTaskStatus(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "setTaskStatus", "(Ljava/lang/String;DDLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, BooleanKind, "setTaskStatus", "(Ljava/lang/String;DD)Z", args, count, cachedMethodId);
 }
 
 NativeRNFBTurboStorageSpecJSI::NativeRNFBTurboStorageSpecJSI(const JavaTurboModule::InitParams &params)
diff --git a/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/react/renderer/components/RNFBStorageTurboModules/RNFBStorageTurboModulesJSI.h b/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/react/renderer/components/RNFBStorageTurboModules/RNFBStorageTurboModulesJSI.h
index 5f20d4467e..3d80de91b3 100644
--- a/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/react/renderer/components/RNFBStorageTurboModules/RNFBStorageTurboModulesJSI.h
+++ b/packages/storage/android/src/main/java/io/invertase/firebase/storage/generated/jni/react/renderer/components/RNFBStorageTurboModules/RNFBStorageTurboModulesJSI.h
@@ -83,7 +83,7 @@ class JSI_EXPORT NativeRNFBTurboStorageCxxSpecJSI : public TurboModule {
   virtual jsi::Value writeToFile(jsi::Runtime &rt, jsi::String appName, jsi::String url, jsi::String localFilePath, double taskId) = 0;
   virtual jsi::Value putFile(jsi::Runtime &rt, jsi::String appName, jsi::String url, jsi::String localFilePath, std::optional<jsi::Object> metadata, double taskId) = 0;
   virtual jsi::Value putString(jsi::Runtime &rt, jsi::String appName, jsi::String url, jsi::String string, jsi::String format, std::optional<jsi::Object> metadata, double taskId) = 0;
-  virtual jsi::Value setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) = 0;
+  virtual bool setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) = 0;
 
 };
 
@@ -226,12 +226,12 @@ class JSI_EXPORT NativeRNFBTurboStorageCxxSpec : public TurboModule {
       return bridging::callFromJs<jsi::Value>(
           rt, &T::putString, jsInvoker_, instance_, std::move(appName), std::move(url), std::move(string), std::move(format), std::move(metadata), std::move(taskId));
     }
-    jsi::Value setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) override {
+    bool setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) override {
       static_assert(
           bridging::getParameterCount(&T::setTaskStatus) == 4,
           "Expected setTaskStatus(...) to have 4 parameters");
 
-      return bridging::callFromJs<jsi::Value>(
+      return bridging::callFromJs<bool>(
           rt, &T::setTaskStatus, jsInvoker_, instance_, std::move(appName), std::move(taskId), std::move(status));
     }
 
diff --git a/packages/storage/e2e/StorageTask.e2e.js b/packages/storage/e2e/StorageTask.e2e.js
index 1655d3c6c8..bbd233c729 100644
--- a/packages/storage/e2e/StorageTask.e2e.js
+++ b/packages/storage/e2e/StorageTask.e2e.js
@@ -15,7 +15,7 @@
  *
  */
 
-const { PATH, seed, WRITE_ONLY_NAME } = require('./helpers');
+const { PATH, seed, seedLargeFixture, LARGE_FIXTURE_PATH, WRITE_ONLY_NAME } = require('./helpers');
 const { FilePath } = modular;
 
 function snapshotProperties(snapshot) {
@@ -27,6 +27,76 @@ function snapshotProperties(snapshot) {
   snapshot.should.have.property('bytesTransferred');
 }
 
+function isCancelledState(state) {
+  return state === 'cancelled' || state === storageModular.TaskState.CANCELLED;
+}
+
+function expectMidTransferCancel(
+  task,
+  taskLabel,
+  { waitForProgress = false, cancelDelayMs = 0 } = {},
+) {
+  const { TaskState } = storageModular;
+  const { resolve, reject, promise } = Promise.defer();
+  let hadRunningStatus = false;
+  let settled = false;
+
+  const finishCancelled = error => {
+    if (settled) {
+      return;
+    }
+    settled = true;
+    should.equal(hadRunningStatus, true);
+    if (error) {
+      error.code.should.equal('storage/cancelled');
+      error.message.should.containEql('User cancelled the operation.');
+    }
+    resolve();
+  };
+
+  task.on(
+    'state_changed',
+    snapshot => {
+      if (snapshot.state === TaskState.RUNNING && !hadRunningStatus) {
+        const readyToCancel = !waitForProgress || snapshot.bytesTransferred > 0;
+        if (!readyToCancel) {
+          return;
+        }
+        hadRunningStatus = true;
+        const cancelTask = () => {
+          task.cancel().should.eql(true);
+        };
+        if (cancelDelayMs > 0) {
+          setTimeout(cancelTask, cancelDelayMs);
+        } else {
+          cancelTask();
+        }
+      }
+
+      if (isCancelledState(snapshot.state)) {
+        finishCancelled();
+      }
+
+      if (snapshot.state === TaskState.ERROR) {
+        throw new Error('Should not error if cancelled?');
+      }
+
+      if (snapshot.state === TaskState.SUCCESS) {
+        reject(new Error(`${taskLabel} did not cancel!`));
+      }
+    },
+    error => {
+      finishCancelled(error);
+    },
+  );
+
+  task.catch(error => {
+    finishCancelled(error);
+  });
+
+  return promise;
+}
+
 describe('storage() -> StorageTask', function () {
   describe('storage() -> StorageTask modular', function () {});
 
@@ -696,47 +766,61 @@ describe('storage() -> StorageTask', function () {
     });
 
     // TODO get files staged for emulator testing
-    xdescribe('pause() resume()', function () {
-      it('successfully pauses and resumes an upload', async function testRunner() {
-        this.timeout(100 * 1000);
-        const { getStorage, ref, writeToFile, putFile, TaskState } = storageModular;
-        const storageRef = ref(getStorage(), Platform.ios ? '/smallFileTest.png' : '/cat.gif');
+    describe('pause() resume() cancel() sync boolean contract', function () {
+      it('returns false synchronously for completed uploads', async function () {
+        const { getStorage, ref, uploadString, TaskState } = storageModular;
 
-        await writeToFile(storageRef, `${FilePath.DOCUMENT_DIRECTORY}/pauseUpload_test1.gif`);
+        const uploadTask = uploadString(
+          ref(getStorage(), `${PATH}/syncBoolCompleted.${WRITE_ONLY_NAME}`),
+          JSON.stringify({ sync: true }),
+        );
 
-        const ref2 = ref(getStorage(), '/uploadCat.gif');
+        const snapshot = await uploadTask;
+        snapshot.state.should.eql(TaskState.SUCCESS);
+
+        uploadTask.pause().should.eql(false);
+        (uploadTask.pause() instanceof Promise).should.eql(false);
+        uploadTask.resume().should.eql(false);
+        (uploadTask.resume() instanceof Promise).should.eql(false);
+        uploadTask.cancel().should.eql(false);
+        (uploadTask.cancel() instanceof Promise).should.eql(false);
+      });
+    });
+
+    describe('pause() resume()', function () {
+      before(async function () {
+        await seedLargeFixture(PATH);
+      });
+
+      it('successfully pauses and resumes a download', async function () {
+        if (Platform.other) return;
+        const { getStorage, ref, writeToFile, TaskState } = storageModular;
+        const storageRef = ref(getStorage(), LARGE_FIXTURE_PATH);
 
         const { resolve, reject, promise } = Promise.defer();
-        const path = `${FilePath.DOCUMENT_DIRECTORY}/pauseUpload_test1.gif`;
-        const uploadTask = putFile(ref2, path);
+        const path = `${
+          FilePath.DOCUMENT_DIRECTORY
+        }/invertase/pauseDownload${Math.round(Math.random() * 1000)}.bin`;
+        const downloadTask = writeToFile(storageRef, path);
 
         let hadRunningStatus = false;
         let hadPausedStatus = false;
         let hadResumedStatus = false;
 
-        uploadTask.on(
+        downloadTask.on(
           'state_changed',
           snapshot => {
-            // 1) pause when we receive first running event
             if (snapshot.state === TaskState.RUNNING && !hadRunningStatus) {
               hadRunningStatus = true;
-              if (Platform.android) {
-                uploadTask.pause();
-              } else {
-                // TODO (salakar) submit bug report to Firebase iOS SDK repo (pausing immediately after the first progress event will fail the upload with an unknown error)
-                setTimeout(() => {
-                  uploadTask.pause();
-                }, 750);
-              }
+              downloadTask.pause().should.eql(true);
+              downloadTask.pause().should.eql(false);
             }
 
-            // 2) resume when we receive first paused event
             if (snapshot.state === TaskState.PAUSED) {
               hadPausedStatus = true;
-              uploadTask.resume();
+              downloadTask.resume().should.eql(true);
             }
 
-            // 3) track that we resumed on 2nd running status whilst paused
             if (
               snapshot.state === TaskState.RUNNING &&
               hadRunningStatus &&
@@ -746,7 +830,6 @@ describe('storage() -> StorageTask', function () {
               hadResumedStatus = true;
             }
 
-            // 4) finally confirm we received all statuses
             if (snapshot.state === TaskState.SUCCESS) {
               should.equal(hadRunningStatus, true);
               should.equal(hadPausedStatus, true);
@@ -762,40 +845,43 @@ describe('storage() -> StorageTask', function () {
         await promise;
       });
 
-      it('successfully pauses and resumes a download', async function () {
-        if (Platform.other) return; // TODO refactor to use putString instead of writeToFile
-        const { getStorage, ref, writeToFile, TaskState } = storageModular;
-        const storageRef = ref(getStorage(), Platform.ios ? '/1mbTestFile.gif' : '/cat.gif');
+      // Platform gap — iOS upload mid-transfer pause/resume (temporary skip pending diagnosis).
+      // CI iOS debug+release fail with [storage/unknown] after ~50s on first RUNNING pause;
+      // Android and macOS pass. Download pause/resume passes on iOS. Related cancel gap:
+      // firebase-ios-sdk#16353, RNFB #2043. Re-enable after B3.1 local e2e + sim-app.log review.
+      (Platform.ios ? it.skip : it)('successfully pauses and resumes an upload', async function () {
+        if (Platform.other) return;
+        const { getStorage, ref, writeToFile, putFile, TaskState } = storageModular;
 
-        const { resolve, reject, promise } = Promise.defer();
+        const localPath = `${FilePath.DOCUMENT_DIRECTORY}/pauseUpload_large.bin`;
+        await writeToFile(ref(getStorage(), LARGE_FIXTURE_PATH), localPath);
 
-        // random file name as Android does not allow overriding if file already exists
-        const path = `${
-          FilePath.DOCUMENT_DIRECTORY
-        }/invertase/pauseDownload${Math.round(Math.random() * 1000)}.gif`;
-        const downloadTask = writeToFile(storageRef, path);
+        const uploadRef = ref(getStorage(), `${PATH}/upload/pauseResume.bin`);
+        const { resolve, reject, promise } = Promise.defer();
+        const uploadTask = putFile(uploadRef, localPath);
 
         let hadRunningStatus = false;
         let hadPausedStatus = false;
         let hadResumedStatus = false;
 
-        downloadTask.on(
+        const pauseUpload = () => {
+          uploadTask.pause().should.eql(true);
+          uploadTask.pause().should.eql(false);
+        };
+
+        uploadTask.on(
           'state_changed',
           snapshot => {
-            // TODO(salakar) validate snapshot props
-            // 1) pause when we receive first running event
             if (snapshot.state === TaskState.RUNNING && !hadRunningStatus) {
               hadRunningStatus = true;
-              downloadTask.pause();
+              pauseUpload();
             }
 
-            // 2) resume when we receive first paused event
             if (snapshot.state === TaskState.PAUSED) {
               hadPausedStatus = true;
-              downloadTask.resume();
+              uploadTask.resume().should.eql(true);
             }
 
-            // 3) track that we resumed on 2nd running status whilst paused
             if (
               snapshot.state === TaskState.RUNNING &&
               hadRunningStatus &&
@@ -805,7 +891,6 @@ describe('storage() -> StorageTask', function () {
               hadResumedStatus = true;
             }
 
-            // 4) finally confirm we received all statuses
             if (snapshot.state === TaskState.SUCCESS) {
               should.equal(hadRunningStatus, true);
               should.equal(hadPausedStatus, true);
@@ -823,105 +908,41 @@ describe('storage() -> StorageTask', function () {
     });
 
     describe('cancel()', function () {
-      // TODO stage a file big enough to test upload cancel
-      xit('successfully cancels an upload', async function () {
-        const { getStorage, ref, writeToFile, putFile, TaskState } = storageModular;
-        const storageRef = ref(getStorage(), Platform.ios ? '/1mbTestFile.gif' : '/cat.gif');
-        await writeToFile(storageRef, `${FilePath.DOCUMENT_DIRECTORY}/pauseUpload.gif`);
-
-        const ref2 = ref(getStorage(), '/successful-cancel.jpg');
-
-        //Upload and cancel
-        const { resolve, reject, promise } = Promise.defer();
-        const path = `${FilePath.DOCUMENT_DIRECTORY}/pauseUpload.gif`;
-        const uploadTask = putFile(ref2, path);
-
-        let hadRunningStatus = false;
-        let hadCancelledStatus = false;
-
-        uploadTask.on(
-          'state_changed',
-          snapshot => {
-            // TODO(salakar) validate snapshot props
-            // 1) cancel it when we receive first running event
-            if (snapshot.state === TaskState.RUNNING && !hadRunningStatus) {
-              hadRunningStatus = true;
-              uploadTask.cancel();
-            }
-
-            // 2) confirm cancellation
-            if (snapshot.state === TaskState.CANCELLED) {
-              should.equal(hadRunningStatus, true);
-              hadCancelledStatus = true;
-            }
-
-            if (snapshot.state === TaskState.ERROR) {
-              throw new Error('Should not error if cancelled?');
-            }
+      before(async function () {
+        await seedLargeFixture(PATH);
+      });
 
-            if (snapshot.state === TaskState.SUCCESS) {
-              reject(new Error('UploadTask did not cancel!'));
-            }
-          },
-          error => {
-            should.equal(hadRunningStatus, true);
-            should.equal(hadCancelledStatus, true);
-            error.code.should.equal('storage/cancelled');
-            error.message.should.containEql('User cancelled the operation.');
-            resolve();
-          },
-        );
+      it('successfully cancels a download', async function () {
+        if (Platform.other) return;
+        const { getStorage, ref, writeToFile } = storageModular;
+        const storageRef = ref(getStorage(), LARGE_FIXTURE_PATH);
+        const path = `${
+          FilePath.DOCUMENT_DIRECTORY
+        }/invertase/cancelDownload${Math.round(Math.random() * 1000)}.bin`;
+        const downloadTask = writeToFile(storageRef, path);
 
-        await promise;
+        await expectMidTransferCancel(downloadTask, 'DownloadTask');
       });
-    });
-
-    // TODO stage a file big enough to cancel a download
-    xit('successfully cancels a download', async function () {
-      const { getStorage, ref, writeToFile, TaskState } = storageModular;
-      const storageRef = ref(getStorage(), '/1mbTestFile.gif');
-      await Utils.sleep(10000);
-      const { resolve, reject, promise } = Promise.defer();
-      const path = `${FilePath.DOCUMENT_DIRECTORY}/testUploadFile.jpg`;
-      const downloadTask = writeToFile(storageRef, path);
-
-      let hadRunningStatus = false;
-      let hadCancelledStatus = false;
-
-      downloadTask.on(
-        'state_changed',
-        snapshot => {
-          // TODO(salakar) validate snapshot props
-          // 1) cancel it when we receive first running event
-          if (snapshot.state === TaskState.RUNNING && !hadRunningStatus) {
-            hadRunningStatus = true;
-            downloadTask.cancel();
-          }
 
-          // 2) confirm cancellation
-          if (snapshot.state === TaskState.CANCELLED) {
-            should.equal(hadRunningStatus, true);
-            hadCancelledStatus = true;
-          }
+      // Platform gap — iOS upload mid-transfer cancel (user-accepted acceptable exception).
+      // Firebase Storage iOS SDK 12.15.0: immediate cancel on first RUNNING hangs (~7+ min);
+      // delayed cancel races SUCCESS; pause-then-cancel also hangs. Android passes below.
+      // Related: immediate pause() after first progress was unreliable since 2019-05-03 (RNFB
+      // #2043); a ~750ms delay before pause worked, but that timing is hard to test reliably
+      // against the fixture size. Revisit when Podfile.lock FirebaseStorage != 12.15.0 or when
+      // https://github.com/firebase/firebase-ios-sdk/issues/16353 is closed/fixed.
+      (Platform.ios ? it.skip : it)('successfully cancels an upload', async function () {
+        if (Platform.other) return;
+        const { getStorage, ref, writeToFile, putFile } = storageModular;
 
-          if (snapshot.state === TaskState.ERROR) {
-            throw new Error('Should not error if cancelled?');
-          }
+        const localPath = `${FilePath.DOCUMENT_DIRECTORY}/cancelUpload_large.bin`;
+        await writeToFile(ref(getStorage(), LARGE_FIXTURE_PATH), localPath);
 
-          if (snapshot.state === TaskState.SUCCESS) {
-            reject(new Error('DownloadTask did not cancel!'));
-          }
-        },
-        error => {
-          should.equal(hadRunningStatus, true);
-          should.equal(hadCancelledStatus, true);
-          error.code.should.equal('storage/cancelled');
-          error.message.should.containEql('User cancelled the operation.');
-          resolve();
-        },
-      );
+        const uploadRef = ref(getStorage(), `${PATH}/upload/cancel.bin`);
+        const uploadTask = putFile(uploadRef, localPath);
 
-      await promise;
+        await expectMidTransferCancel(uploadTask, 'UploadTask');
+      });
     });
   });
 });
diff --git a/packages/storage/e2e/helpers.js b/packages/storage/e2e/helpers.js
index f4d41d3ebf..ed21b7f4ee 100644
--- a/packages/storage/e2e/helpers.js
+++ b/packages/storage/e2e/helpers.js
@@ -10,6 +10,32 @@ const SEED_INITIAL_BACKOFF_MS = 250;
 
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 
+const LARGE_FIXTURE_RELATIVE_PATH = 'fixtures/large.bin';
+const DEFAULT_LARGE_FIXTURE_BYTES = 8 * 1024 * 1024;
+
+function createLargeFixtureBytes(sizeBytes) {
+  const data = new Uint8Array(sizeBytes);
+  for (let i = 0; i < sizeBytes; i += 65536) {
+    data[i] = i & 0xff;
+  }
+  return data;
+}
+
+async function seedLargeFixture(path, sizeBytes = DEFAULT_LARGE_FIXTURE_BYTES) {
+  const { getStorage, ref, uploadBytesResumable, TaskState } = storageModular;
+  const snapshot = await uploadBytesResumable(
+    ref(getStorage(), `${path}/${LARGE_FIXTURE_RELATIVE_PATH}`),
+    createLargeFixtureBytes(sizeBytes),
+    {
+      contentType: 'application/octet-stream',
+    },
+  );
+
+  if (snapshot.state !== TaskState.SUCCESS) {
+    throw new Error(`failed to seed large fixture (${sizeBytes} bytes): ${snapshot.state}`);
+  }
+}
+
 async function uploadSeedFixtures(path) {
   const { getStorage, ref, uploadString, StringFormat } = storageModular;
 
@@ -60,3 +86,7 @@ exports.wipe = function wipe(path) {
 
 exports.PATH = PATH;
 exports.WRITE_ONLY_NAME = WRITE_ONLY_NAME;
+exports.LARGE_FIXTURE_PATH = `${PATH}/${LARGE_FIXTURE_RELATIVE_PATH}`;
+exports.DEFAULT_LARGE_FIXTURE_BYTES = DEFAULT_LARGE_FIXTURE_BYTES;
+exports.createLargeFixtureBytes = createLargeFixtureBytes;
+exports.seedLargeFixture = seedLargeFixture;
diff --git a/packages/storage/ios/RNFBStorage/RNFBStorageModule.mm b/packages/storage/ios/RNFBStorage/RNFBStorageModule.mm
index 8ba40cc48f..6993d78c39 100644
--- a/packages/storage/ios/RNFBStorage/RNFBStorageModule.mm
+++ b/packages/storage/ios/RNFBStorage/RNFBStorageModule.mm
@@ -546,34 +546,64 @@ - (void)useEmulator:(NSString *)appName
 /**
  * @url N/A - RNFB Specific
  */
-- (void)setTaskStatus:(NSString *)appName
-               taskId:(double)taskId
-               status:(double)status
-              resolve:(RCTPromiseResolveBlock)resolve
-               reject:(RCTPromiseRejectBlock)reject {
+- (NSNumber *)setTaskStatus:(NSString *)appName taskId:(double)taskId status:(double)status {
   NSNumber *taskIdNumber = @(taskId);
   id task = PENDING_TASKS[taskIdNumber];
   if (task == nil) {
-    resolve(@(NO));
-    return;
+    return @NO;
   }
 
+  FIRStorageTaskSnapshot *snapshot = nil;
+  if ([task isKindOfClass:[FIRStorageUploadTask class]]) {
+    snapshot = [(FIRStorageUploadTask *)task snapshot];
+  } else if ([task isKindOfClass:[FIRStorageDownloadTask class]]) {
+    snapshot = [(FIRStorageDownloadTask *)task snapshot];
+  } else {
+    return @NO;
+  }
+
+  FIRStorageTaskStatus currentStatus = snapshot.status;
+
   switch ((NSInteger)status) {
     case 0:
-      [task pause];
-      break;
+      if (currentStatus != FIRStorageTaskStatusPause &&
+          (currentStatus == FIRStorageTaskStatusResume ||
+           currentStatus == FIRStorageTaskStatusProgress)) {
+        if ([task isKindOfClass:[FIRStorageDownloadTask class]]) {
+          [(FIRStorageDownloadTask *)task pause];
+        } else {
+          [(FIRStorageUploadTask *)task pause];
+        }
+        return @YES;
+      }
+      return @NO;
     case 1:
-      if ([task isKindOfClass:[FIRStorageDownloadTask class]]) {
-        [(FIRStorageDownloadTask *)task resume];
-      } else {
-        [(FIRStorageUploadTask *)task resume];
+      if (currentStatus == FIRStorageTaskStatusPause) {
+        if ([task isKindOfClass:[FIRStorageDownloadTask class]]) {
+          [(FIRStorageDownloadTask *)task resume];
+        } else {
+          [(FIRStorageUploadTask *)task resume];
+        }
+        return @YES;
       }
-      break;
+      return @NO;
     case 2:
-      [task cancel];
-      break;
+      if (currentStatus != FIRStorageTaskStatusSuccess &&
+          currentStatus != FIRStorageTaskStatusFailure &&
+          (currentStatus == FIRStorageTaskStatusResume ||
+           currentStatus == FIRStorageTaskStatusProgress ||
+           currentStatus == FIRStorageTaskStatusPause)) {
+        [PENDING_TASKS removeObjectForKey:taskIdNumber];
+        if ([task isKindOfClass:[FIRStorageDownloadTask class]]) {
+          [(FIRStorageDownloadTask *)task cancel];
+        } else {
+          [(FIRStorageUploadTask *)task cancel];
+        }
+        return @YES;
+      }
+      return @NO;
     default:
-      break;
+      return @NO;
   }
 }
 
diff --git a/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules-generated.mm b/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules-generated.mm
index 4b626eea2d..8b33f03cf9 100644
--- a/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules-generated.mm
+++ b/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules-generated.mm
@@ -84,7 +84,7 @@ + (RCTManagedPointer *)JS_NativeRNFBTurboStorage_StorageListOptions:(id)json
     }
 
     static facebook::jsi::Value __hostFunction_NativeRNFBTurboStorageSpecJSI_setTaskStatus(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "setTaskStatus", @selector(setTaskStatus:taskId:status:resolve:reject:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, "setTaskStatus", @selector(setTaskStatus:taskId:status:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeRNFBTurboStorageSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
diff --git a/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules.h b/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules.h
index 1ecf4b1e37..fbbb36ec52 100644
--- a/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules.h
+++ b/packages/storage/ios/generated/RNFBStorageTurboModules/RNFBStorageTurboModules.h
@@ -142,11 +142,9 @@ namespace JS {
            taskId:(double)taskId
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject;
-- (void)setTaskStatus:(NSString *)appName
-               taskId:(double)taskId
-               status:(double)status
-              resolve:(RCTPromiseResolveBlock)resolve
-               reject:(RCTPromiseRejectBlock)reject;
+- (NSNumber *)setTaskStatus:(NSString *)appName
+                     taskId:(double)taskId
+                     status:(double)status;
 - (facebook::react::ModuleConstants<JS::NativeRNFBTurboStorage::Constants::Builder>)constantsToExport;
 - (facebook::react::ModuleConstants<JS::NativeRNFBTurboStorage::Constants::Builder>)getConstants;
 
diff --git a/packages/storage/ios/generated/RNFBStorageTurboModulesJSI.h b/packages/storage/ios/generated/RNFBStorageTurboModulesJSI.h
index 5f20d4467e..3d80de91b3 100644
--- a/packages/storage/ios/generated/RNFBStorageTurboModulesJSI.h
+++ b/packages/storage/ios/generated/RNFBStorageTurboModulesJSI.h
@@ -83,7 +83,7 @@ class JSI_EXPORT NativeRNFBTurboStorageCxxSpecJSI : public TurboModule {
   virtual jsi::Value writeToFile(jsi::Runtime &rt, jsi::String appName, jsi::String url, jsi::String localFilePath, double taskId) = 0;
   virtual jsi::Value putFile(jsi::Runtime &rt, jsi::String appName, jsi::String url, jsi::String localFilePath, std::optional<jsi::Object> metadata, double taskId) = 0;
   virtual jsi::Value putString(jsi::Runtime &rt, jsi::String appName, jsi::String url, jsi::String string, jsi::String format, std::optional<jsi::Object> metadata, double taskId) = 0;
-  virtual jsi::Value setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) = 0;
+  virtual bool setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) = 0;
 
 };
 
@@ -226,12 +226,12 @@ class JSI_EXPORT NativeRNFBTurboStorageCxxSpec : public TurboModule {
       return bridging::callFromJs<jsi::Value>(
           rt, &T::putString, jsInvoker_, instance_, std::move(appName), std::move(url), std::move(string), std::move(format), std::move(metadata), std::move(taskId));
     }
-    jsi::Value setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) override {
+    bool setTaskStatus(jsi::Runtime &rt, jsi::String appName, double taskId, double status) override {
       static_assert(
           bridging::getParameterCount(&T::setTaskStatus) == 4,
           "Expected setTaskStatus(...) to have 4 parameters");
 
-      return bridging::callFromJs<jsi::Value>(
+      return bridging::callFromJs<bool>(
           rt, &T::setTaskStatus, jsInvoker_, instance_, std::move(appName), std::move(taskId), std::move(status));
     }
 
diff --git a/packages/storage/lib/StorageTask.ts b/packages/storage/lib/StorageTask.ts
index 582d96ee6e..e84862ab49 100644
--- a/packages/storage/lib/StorageTask.ts
+++ b/packages/storage/lib/StorageTask.ts
@@ -18,9 +18,9 @@
 import { isFunction, isNull, isObject } from '@react-native-firebase/app/dist/module/common';
 import type { EmitterSubscription } from 'react-native';
 import { TaskEvent } from './StorageStatics';
-import type { ReactNativeFirebase } from '@react-native-firebase/app';
 import type {
   FullMetadata,
+  StorageError,
   StorageObserver,
   StorageReference,
   Subscribe,
@@ -50,7 +50,7 @@ function createEmptyMetadata(ref: StorageReference): FullMetadata {
 }
 
 function wrapErrorEventListener(
-  listenerFn: ((error: ReactNativeFirebase.NativeFirebaseError) => void) | null | undefined,
+  listenerFn: ((error: StorageError) => void) | null | undefined,
   unsubscribe: (() => void) | null | undefined,
 ): (snapshot: TaskSnapshot) => void {
   return (snapshot: TaskSnapshot) => {
@@ -59,7 +59,7 @@ function wrapErrorEventListener(
     } // 1 frame = 16ms, pushing to next frame
     if (isFunction(listenerFn)) {
       const errorEvent = snapshot as TaskSnapshot & {
-        error?: ReactNativeFirebase.NativeFirebaseError;
+        error?: StorageError;
       };
       if (errorEvent.error) {
         listenerFn(errorEvent.error);
@@ -123,7 +123,7 @@ function addTaskEventListener(
 function subscribeToEvents(
   task: StorageTask,
   nextOrObserver?: ((snapshot: TaskSnapshot) => unknown) | StorageObserver<TaskSnapshot> | null,
-  error?: ((error: ReactNativeFirebase.NativeFirebaseError) => unknown) | null,
+  error?: ((error: StorageError) => unknown) | null,
   complete?: (() => unknown) | null,
 ): () => void {
   let _error: ((snapshot: TaskSnapshot) => void) | undefined;
@@ -215,7 +215,7 @@ export default class StorageTask {
    */
   get then(): (
     onFulfilled?: ((snapshot: TaskSnapshot) => TaskSnapshot) | null,
-    onRejected?: ((error: ReactNativeFirebase.NativeFirebaseError) => any) | null,
+    onRejected?: ((error: StorageError) => any) | null,
   ) => Promise<TaskSnapshot> {
     if (!this._promise) {
       this._promise = this._beginTask(this);
@@ -224,7 +224,7 @@ export default class StorageTask {
     const promise = this._promise;
     return (
       onFulfilled?: ((snapshot: TaskSnapshot) => any) | null,
-      onRejected?: ((error: ReactNativeFirebase.NativeFirebaseError) => any) | null,
+      onRejected?: ((error: StorageError) => any) | null,
     ) => {
       return new Promise((resolve, reject) => {
         promise
@@ -242,7 +242,7 @@ export default class StorageTask {
               resolve(response);
             }
           })
-          .catch((error: ReactNativeFirebase.NativeFirebaseError) => {
+          .catch((error: StorageError) => {
             if (onRejected) {
               resolve(onRejected(error));
             } else {
@@ -256,9 +256,7 @@ export default class StorageTask {
   /**
    * @url https://firebase.google.com/docs/reference/js/firebase.storage.UploadTask#catch
    */
-  get catch(): (
-    onRejected: (error: ReactNativeFirebase.NativeFirebaseError) => any,
-  ) => Promise<any> {
+  get catch(): (onRejected: (error: StorageError) => any) => Promise<any> {
     if (!this._promise) {
       this._promise = this._beginTask(this);
     }
@@ -285,13 +283,13 @@ export default class StorageTask {
   on(
     event: TaskEventType,
     nextOrObserver?: StorageObserver<TaskSnapshot> | null | ((snapshot: TaskSnapshot) => unknown),
-    error?: ((error: ReactNativeFirebase.NativeFirebaseError) => unknown) | null,
+    error?: ((error: StorageError) => unknown) | null,
     complete?: (() => unknown) | null,
   ): Unsubscribe;
   on(
     event: TaskEventType,
     nextOrObserver?: StorageObserver<TaskSnapshot> | null | ((snapshot: TaskSnapshot) => unknown),
-    error?: ((error: ReactNativeFirebase.NativeFirebaseError) => unknown) | null,
+    error?: ((error: StorageError) => unknown) | null,
     complete?: (() => unknown) | null,
   ): Unsubscribe | Subscribe<TaskSnapshot> {
     if (event !== TaskEvent.STATE_CHANGED) {
@@ -316,21 +314,21 @@ export default class StorageTask {
   /**
    * @url https://firebase.google.com/docs/reference/js/firebase.storage.UploadTask#pause
    */
-  pause(): Promise<boolean> {
+  pause(): boolean {
     return this._storage.native.setTaskStatus(this._id, 0);
   }
 
   /**
    * @url https://firebase.google.com/docs/reference/js/firebase.storage.UploadTask#pause
    */
-  resume(): Promise<boolean> {
+  resume(): boolean {
     return this._storage.native.setTaskStatus(this._id, 1);
   }
 
   /**
    * @url https://firebase.google.com/docs/reference/js/firebase.storage.UploadTask#cancel
    */
-  cancel(): Promise<boolean> {
+  cancel(): boolean {
     return this._storage.native.setTaskStatus(this._id, 2);
   }
 }
diff --git a/packages/storage/lib/index.ts b/packages/storage/lib/index.ts
index d1703c21f2..5f4a2c7d71 100644
--- a/packages/storage/lib/index.ts
+++ b/packages/storage/lib/index.ts
@@ -38,8 +38,9 @@ import type {
   SettableMetadata,
   StorageReference,
   Task,
-  TaskResult,
   UploadMetadata,
+  UploadResult,
+  UploadTask,
 } from './types/storage';
 import type { StorageInternal, StorageReferenceInternal } from './types/internal';
 
@@ -417,13 +418,13 @@ export function updateMetadata(
  * @param _storageRef - Storage `Reference` instance.
  * @param _data - The data (Blob | Uint8Array | ArrayBuffer) to upload to the storage bucket at the reference location.
  * @param _metadata - A Storage `UploadMetadata` instance to update. Optional.
- * @returns {Promise<TaskResult>}
+ * @returns {Promise<UploadResult>}
  */
 export async function uploadBytes(
   _storageRef: StorageReference,
   _data: Blob | Uint8Array | ArrayBuffer,
   _metadata?: UploadMetadata,
-): Promise<TaskResult> {
+): Promise<UploadResult> {
   throw new Error('`uploadBytes()` is not implemented');
 }
 
@@ -432,13 +433,13 @@ export async function uploadBytes(
  * @param storageRef - Storage `Reference` instance.
  * @param data - The data (Blob | Uint8Array | ArrayBuffer) to upload to the storage bucket at the reference location.
  * @param metadata - A Storage `UploadMetadata` instance to update. Optional.
- * @returns {Task}
+ * @returns {UploadTask}
  */
 export function uploadBytesResumable(
   storageRef: StorageReference,
   data: Blob | Uint8Array | ArrayBuffer,
   metadata?: UploadMetadata,
-): Task {
+): UploadTask {
   return (storageRef as StorageReferenceInternal).put(data, metadata);
 }
 
diff --git a/packages/storage/lib/types/internal.ts b/packages/storage/lib/types/internal.ts
index f21564246d..f836d434f1 100644
--- a/packages/storage/lib/types/internal.ts
+++ b/packages/storage/lib/types/internal.ts
@@ -172,7 +172,7 @@ export interface NativeRNFBTurboStorage {
    * - 1: resume
    * - 2: cancel
    */
-  setTaskStatus(taskId: number, status: number): Promise<boolean>;
+  setTaskStatus(taskId: number, status: number): boolean;
 
   /**
    * Configure storage emulator.
diff --git a/packages/storage/lib/types/storage.ts b/packages/storage/lib/types/storage.ts
index a35c76e6eb..11de1ebf20 100644
--- a/packages/storage/lib/types/storage.ts
+++ b/packages/storage/lib/types/storage.ts
@@ -15,6 +15,7 @@
  *
  */
 import type { FirebaseApp, ReactNativeFirebase } from '@react-native-firebase/app';
+import type { FirebaseError } from '@firebase/app';
 import type {
   CompleteFn,
   NextFn,
@@ -22,6 +23,14 @@ import type {
 } from '@react-native-firebase/app/dist/module/types/common';
 export type { CompleteFn, NextFn, Unsubscribe };
 export type NativeFirebaseError = ReactNativeFirebase.NativeFirebaseError;
+
+/**
+ * Storage failure error type for public observer callbacks.
+ * Runtime values are {@link NativeFirebaseError} instances structurally compatible with `FirebaseError`.
+ * @public
+ */
+export type StorageError = FirebaseError;
+
 /**
  * Storage module instance
  */
@@ -260,15 +269,13 @@ export const TaskState = {
  */
 export interface StorageObserver<T> {
   next?: NextFn<T> | null;
-  error?: ((error: NativeFirebaseError) => void) | null;
+  error?: ((error: StorageError) => unknown) | null;
   complete?: CompleteFn | null;
 }
 
 /**
  * Represents the process of uploading an object. Allows you to monitor and manage the upload.
  *
- * Note: React Native Firebase returns Promises for pause/resume/cancel to communicate with native iOS/Android.
- *
  * @public
  */
 export interface UploadTask {
@@ -276,12 +283,12 @@ export interface UploadTask {
    * Cancels a running task. Has no effect on a complete or failed task.
    * @returns True if the cancel had an effect.
    */
-  cancel(): Promise<boolean>;
+  cancel(): boolean;
 
   /**
    * Equivalent to calling `then(null, onRejected)`.
    */
-  catch(onRejected: (error: NativeFirebaseError) => unknown): Promise<unknown>;
+  catch(onRejected: (error: StorageError) => unknown): Promise<unknown>;
 
   /**
    * Listens for events on this task.
@@ -295,7 +302,7 @@ export interface UploadTask {
       | StorageObserver<UploadTaskSnapshot>
       | null
       | ((snapshot: UploadTaskSnapshot) => unknown),
-    error?: ((error: NativeFirebaseError) => unknown) | null,
+    error?: ((error: StorageError) => unknown) | null,
     complete?: CompleteFn | null,
   ): Unsubscribe | Subscribe<UploadTaskSnapshot>;
 
@@ -303,13 +310,13 @@ export interface UploadTask {
    * Pauses a currently running task. Has no effect on a paused or failed task.
    * @returns True if the operation took effect, false if ignored.
    */
-  pause(): Promise<boolean>;
+  pause(): boolean;
 
   /**
    * Resumes a paused task. Has no effect on a currently running or failed task.
    * @returns True if the operation took effect, false if ignored.
    */
-  resume(): Promise<boolean>;
+  resume(): boolean;
 
   /**
    * A snapshot of the current task state.
@@ -321,7 +328,7 @@ export interface UploadTask {
    */
   then(
     onFulfilled?: ((snapshot: UploadTaskSnapshot) => unknown) | null,
-    onRejected?: ((error: NativeFirebaseError) => unknown) | null,
+    onRejected?: ((error: StorageError) => unknown) | null,
   ): Promise<unknown>;
 }
 
@@ -380,7 +387,7 @@ export interface UploadResult {
 
 export type Subscribe<T> = (
   nextOrObserver?: StorageObserver<T> | null | NextFn<T>,
-  error?: ((error: NativeFirebaseError) => unknown) | null,
+  error?: ((error: StorageError) => unknown) | null,
   complete?: CompleteFn | null,
 ) => Unsubscribe;
 
diff --git a/packages/storage/lib/web/RNFBStorageModule.ts b/packages/storage/lib/web/RNFBStorageModule.ts
index abec934786..11a0484469 100644
--- a/packages/storage/lib/web/RNFBStorageModule.ts
+++ b/packages/storage/lib/web/RNFBStorageModule.ts
@@ -516,14 +516,10 @@ export default {
    * @param appName - The app name.
    * @param taskId - The task ID.
    * @param status - The status.
-   * @return {Promise<boolean>} Whether the status was set.
+   * @return Whether the status was set.
    */
-  setTaskStatus(appName: string, taskId: string, status: number): Promise<boolean> {
-    // TODO this function implementation cannot
-    // be tested right now since we're unable
-    // to create a big enough upload to be able to
-    // pause/resume/cancel it in time.
-    return guard(async () => {
+  setTaskStatus(appName: string, taskId: string, status: number): boolean {
+    try {
       const task = tasks[taskId];
 
       // If the task doesn't exist, return false.
@@ -535,13 +531,13 @@ export default {
 
       switch (status) {
         case 0:
-          result = await task.pause();
+          result = task.pause();
           break;
         case 1:
-          result = await task.resume();
+          result = task.resume();
           break;
         case 2:
-          result = await task.cancel();
+          result = task.cancel();
           break;
       }
 
@@ -552,6 +548,8 @@ export default {
       });
 
       return result;
-    });
+    } catch (e) {
+      throw getWebError(e as Error & { code?: string });
+    }
   },
 };
diff --git a/packages/storage/specs/NativeRNFBTurboStorage.ts b/packages/storage/specs/NativeRNFBTurboStorage.ts
index 3460e404b2..15f6934294 100644
--- a/packages/storage/specs/NativeRNFBTurboStorage.ts
+++ b/packages/storage/specs/NativeRNFBTurboStorage.ts
@@ -40,7 +40,7 @@ export interface Spec extends TurboModule {
     metadata: Object | null,
     taskId: number,
   ): Promise<Object>;
-  setTaskStatus(appName: string, taskId: number, status: number): Promise<boolean>;
+  setTaskStatus(appName: string, taskId: number, status: number): boolean;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('NativeRNFBTurboStorage');
diff --git a/packages/storage/type-test.ts b/packages/storage/type-test.ts
index ce354c5a63..9b318ec8ea 100644
--- a/packages/storage/type-test.ts
+++ b/packages/storage/type-test.ts
@@ -22,6 +22,7 @@ import {
   type FirebaseStorage,
   type StorageReference,
 } from '.';
+import type { StorageObserver } from './lib/types/storage';
 
 const storage = getStorage();
 console.log(storage.app.name);
@@ -53,3 +54,10 @@ console.log(SDK_VERSION);
 
 const typedStorage: FirebaseStorage = storage;
 console.log(typedStorage.app.name);
+
+const _nullNextObserver: StorageObserver<unknown> = { next: null };
+const _nullErrorObserver: StorageObserver<unknown> = { error: null };
+const _nullCompleteObserver: StorageObserver<unknown> = { complete: null };
+void _nullNextObserver;
+void _nullErrorObserver;
+void _nullCompleteObserver;
diff --git a/tests/package.json b/tests/package.json
index 4e8a425b67..a4d9009c13 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -50,7 +50,7 @@
     "cpy-cli": "^7.0.0",
     "detox": "patch:detox@npm%3A20.51.0#~/.yarn/patches/detox-npm-20.51.0-3e13b6e309.patch",
     "firebase": "^12.15.0",
-    "firebase-tools": "^15.16.0",
+    "firebase-tools": "^15.22.4",
     "jest-circus": "^30.3.0",
     "jest-environment-node": "^30.3.0",
     "jet": "patch:jet@npm%3A0.9.0-dev.13#~/.yarn/patches/jet-npm-0.9.0-dev.13-3321aeea6e.patch",
diff --git a/yarn.lock b/yarn.lock
index 556ffb4789..a68ee1efb2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,22 +17,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apphosting/build@npm:^0.1.7":
-  version: 0.1.7
-  resolution: "@apphosting/build@npm:0.1.7"
-  dependencies:
-    "@apphosting/common": "npm:^0.0.9"
-    "@npmcli/promise-spawn": "npm:^3.0.0"
-    colorette: "npm:^2.0.20"
-    commander: "npm:^11.1.0"
-    npm-pick-manifest: "npm:^9.0.0"
-    ts-node: "npm:^10.9.1"
-  bin:
-    apphosting-local-build: dist/bin/localbuild.js
-  checksum: 10/2a38c1792943b1fb7f73168ff2a556c1fd60197113ac3f8ac1165341379d2ca772fe915ad8aa1b3cc95a0417a6407acf123331d5edb0f408dea8e289f87b6028
-  languageName: node
-  linkType: hard
-
 "@apphosting/common@npm:^0.0.8":
   version: 0.0.8
   resolution: "@apphosting/common@npm:0.0.8"
@@ -40,13 +24,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apphosting/common@npm:^0.0.9":
-  version: 0.0.9
-  resolution: "@apphosting/common@npm:0.0.9"
-  checksum: 10/117068ce2860a2ba481ec217ed29df782eeca244abe1fff86525e6a69d19ed3879e98889d46d9c87a70a1aa32cd79535b71bd4fd2405e849e861b873f58b34a4
-  languageName: node
-  linkType: hard
-
 "@ark/schema@npm:0.56.0":
   version: 0.56.0
   resolution: "@ark/schema@npm:0.56.0"
@@ -5054,15 +5031,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/promise-spawn@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@npmcli/promise-spawn@npm:3.0.0"
-  dependencies:
-    infer-owner: "npm:^1.0.4"
-  checksum: 10/3454465a2731cea5875ba51f80873e2205e5bd878c31517286b0ede4ea931c7bf3de895382287e906d03710fff6f9e44186bd0eee068ce578901c5d3b58e7692
-  languageName: node
-  linkType: hard
-
 "@npmcli/promise-spawn@npm:^7.0.0":
   version: 7.0.2
   resolution: "@npmcli/promise-spawn@npm:7.0.2"
@@ -9558,7 +9526,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.19, colorette@npm:^2.0.20":
+"colorette@npm:^2.0.19":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
   checksum: 10/0b8de48bfa5d10afc160b8eaa2b9938f34a892530b2f7d7897e0458d9535a066e3998b49da9d21161c78225b272df19ae3a64d6df28b4c9734c0e55bbd02406f
@@ -9634,13 +9602,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "commander@npm:11.1.0"
-  checksum: 10/66bd2d8a0547f6cb1d34022efb25f348e433b0e04ad76a65279b1b09da108f59a4d3001ca539c60a7a46ea38bcf399fc17d91adad76a8cf43845d8dcbaf5cda1
-  languageName: node
-  linkType: hard
-
 "commander@npm:^12.0.0":
   version: 12.1.0
   resolution: "commander@npm:12.1.0"
@@ -10491,16 +10452,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-equal-in-any-order@npm:^2.0.6":
-  version: 2.1.0
-  resolution: "deep-equal-in-any-order@npm:2.1.0"
-  dependencies:
-    lodash.mapvalues: "npm:^4.6.0"
-    sort-any: "npm:^2.0.0"
-  checksum: 10/aa48cfd68f2498e17ac876e4cbbd83d3d9378f7eb44490ab49772dfa69e9c64c759bed6f4903045c2a72ae70c435a1eb90a20d5fb8616e918475572407ccd68f
-  languageName: node
-  linkType: hard
-
 "deep-extend@npm:^0.6.0":
   version: 0.6.0
   resolution: "deep-extend@npm:0.6.0"
@@ -12343,13 +12294,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"filesize@npm:^6.1.0":
-  version: 6.4.0
-  resolution: "filesize@npm:6.4.0"
-  checksum: 10/20ddfd66059aa4cdd0db34e36adb368696811d083bbc31952f64f33f5f7792d8351ab33cd47416ef478acfd869cf77eee47235749090ad9b1cac26d2c18a05e5
-  languageName: node
-  linkType: hard
-
 "fill-range@npm:^7.1.1":
   version: 7.1.1
   resolution: "fill-range@npm:7.1.1"
@@ -12510,11 +12454,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"firebase-tools@npm:^15.16.0":
-  version: 15.16.0
-  resolution: "firebase-tools@npm:15.16.0"
+"firebase-tools@npm:^15.22.4":
+  version: 15.22.4
+  resolution: "firebase-tools@npm:15.22.4"
   dependencies:
-    "@apphosting/build": "npm:^0.1.7"
     "@apphosting/common": "npm:^0.0.8"
     "@electric-sql/pglite": "npm:^0.3.3"
     "@electric-sql/pglite-tools": "npm:^0.2.8"
@@ -12538,11 +12481,9 @@ __metadata:
     cross-env: "npm:^7.0.3"
     cross-spawn: "npm:^7.0.5"
     csv-parse: "npm:^5.0.4"
-    deep-equal-in-any-order: "npm:^2.0.6"
     exegesis: "npm:^4.2.0"
     exegesis-express: "npm:^4.0.0"
     express: "npm:^4.16.4"
-    filesize: "npm:^6.1.0"
     form-data: "npm:^4.0.1"
     fs-extra: "npm:^10.1.0"
     fuzzy: "npm:^0.1.3"
@@ -12550,9 +12491,8 @@ __metadata:
     glob: "npm:^10.5.0"
     google-auth-library: "npm:^9.11.0"
     ignore: "npm:^7.0.4"
-    js-yaml: "npm:^3.14.2"
+    js-yaml: "npm:^4.2.0"
     jsonwebtoken: "npm:^9.0.2"
-    leven: "npm:^3.1.0"
     libsodium-wrappers: "npm:^0.7.10"
     lodash: "npm:^4.18.0"
     lsofi: "npm:^2.0.0"
@@ -12564,7 +12504,6 @@ __metadata:
     node-fetch: "npm:^2.6.7"
     open: "npm:^6.3.0"
     ora: "npm:^5.4.1"
-    p-limit: "npm:^3.0.1"
     pg: "npm:^8.11.3"
     pg-gateway: "npm:^0.3.0-beta.4"
     pglite-2: "npm:@electric-sql/pglite@0.2.17"
@@ -12583,16 +12522,14 @@ __metadata:
     triple-beam: "npm:^1.3.0"
     universal-analytics: "npm:^0.5.3"
     update-notifier-cjs: "npm:^5.1.6"
-    uuid: "npm:^8.3.2"
     winston: "npm:^3.0.0"
     winston-transport: "npm:^4.4.0"
     ws: "npm:^7.5.10"
     yaml: "npm:^2.8.3"
-    zod: "npm:^3.24.3"
-    zod-to-json-schema: "npm:^3.24.5"
+    zod: "npm:^4.0.0"
   bin:
     firebase: lib/bin/firebase.js
-  checksum: 10/beba86e13615609295f36462719092dae5d621aa6211fc4ccf39d73e4f5ee6fead14ab106fafc05ff8183bd402867f5719dc0729d9fbd2348100ebfd546e5b2e
+  checksum: 10/d8a907a2859e981aca73e06a04936b9d36ed0d7cee8139cb728f1ad721d00fa7c77a473fbf48a9b5857f5e189416d9c3ca18e354859c5220fddb8b5e2488f1a8
   languageName: node
   linkType: hard
 
@@ -14281,13 +14218,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 10/181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
-  languageName: node
-  linkType: hard
-
 "inflight@npm:^1.0.4":
   version: 1.0.6
   resolution: "inflight@npm:1.0.6"
@@ -15993,7 +15923,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.2":
+"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1":
   version: 3.14.2
   resolution: "js-yaml@npm:3.14.2"
   dependencies:
@@ -16005,6 +15935,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-yaml@npm:^4.2.0":
+  version: 4.3.0
+  resolution: "js-yaml@npm:4.3.0"
+  dependencies:
+    argparse: "npm:^2.0.1"
+  bin:
+    js-yaml: bin/js-yaml.js
+  checksum: 10/2bcec3a8118d7f744badeb04e14366578d234a736f353d41fe35d2305e4ce2409a8e041d277f07cd6bbc8aaa12128d650a68ce43247072519bede20962d2126f
+  languageName: node
+  linkType: hard
+
 "jsc-safe-url@npm:^0.2.2, jsc-safe-url@npm:^0.2.4":
   version: 0.2.4
   resolution: "jsc-safe-url@npm:0.2.4"
@@ -16861,13 +16802,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.mapvalues@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.mapvalues@npm:4.6.0"
-  checksum: 10/566032abaacbc5dc7e74673e589830d2694ec03dc979ac134c93985b47409ac845cbd4eea3786cc0b4db4e80d726a32c1119af63d0151520e27789568aa76bd2
-  languageName: node
-  linkType: hard
-
 "lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
@@ -16903,7 +16837,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21":
+"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
@@ -19899,7 +19833,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-limit@npm:^3.0.1, p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
+"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
   version: 3.1.0
   resolution: "p-limit@npm:3.1.0"
   dependencies:
@@ -21405,7 +21339,7 @@ __metadata:
     cpy-cli: "npm:^7.0.0"
     detox: "patch:detox@npm%3A20.51.0#~/.yarn/patches/detox-npm-20.51.0-3e13b6e309.patch"
     firebase: "npm:^12.15.0"
-    firebase-tools: "npm:^15.16.0"
+    firebase-tools: "npm:^15.22.4"
     jest-circus: "npm:^30.3.0"
     jest-environment-node: "npm:^30.3.0"
     jet: "patch:jet@npm%3A0.9.0-dev.13#~/.yarn/patches/jet-npm-0.9.0-dev.13-3321aeea6e.patch"
@@ -21457,7 +21391,7 @@ __metadata:
     eslint-plugin-prettier: "npm:^5.5.5"
     eslint-plugin-react: "npm:^7.37.5"
     firebase: "npm:^12.15.0"
-    firebase-tools: "npm:^15.16.0"
+    firebase-tools: "npm:^15.22.4"
     genversion: "npm:^3.2.0"
     google-java-format: "npm:^2.2.0"
     jest: "npm:^30.3.0"
@@ -23061,15 +22995,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sort-any@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "sort-any@npm:2.0.0"
-  dependencies:
-    lodash: "npm:^4.17.21"
-  checksum: 10/d2dc6cc4f56298ce50b13ce6aafd8bf16010a8f8d0ae75345e8424118ac2cc017a8ffea0eedd136dd67751c09e7b0edb09c959d052ed7ed02afcfbab63c68277
-  languageName: node
-  linkType: hard
-
 "source-map-js@npm:^1.2.1":
   version: 1.2.1
   resolution: "source-map-js@npm:1.2.1"
@@ -24254,7 +24179,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:^10.9.1, ts-node@npm:^10.9.2":
+"ts-node@npm:^10.9.2":
   version: 10.9.2
   resolution: "ts-node@npm:10.9.2"
   dependencies:
@@ -25975,15 +25900,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod-to-json-schema@npm:^3.24.5":
-  version: 3.25.0
-  resolution: "zod-to-json-schema@npm:3.25.0"
-  peerDependencies:
-    zod: ^3.25 || ^4
-  checksum: 10/cb932e20b5b5e64c75b2c34a7e6dae74b727292eab9e014b93c2607378b8cb1b227f80b429053ceb77c8e0dddc338837f9e534b2a658540ff60c9e4ffdc7cc19
-  languageName: node
-  linkType: hard
-
 "zod-to-json-schema@npm:^3.25.1":
   version: 3.25.2
   resolution: "zod-to-json-schema@npm:3.25.2"
@@ -25993,7 +25909,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.24.1, zod@npm:^3.24.3, zod@npm:^3.25.76":
+"zod@npm:^3.24.1, zod@npm:^3.25.76":
   version: 3.25.76
   resolution: "zod@npm:3.25.76"
   checksum: 10/f0c963ec40cd96858451d1690404d603d36507c1fc9682f2dae59ab38b578687d542708a7fdbf645f77926f78c9ed558f57c3d3aa226c285f798df0c4da16995
@@ -26007,6 +25923,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zod@npm:^4.0.0":
+  version: 4.4.3
+  resolution: "zod@npm:4.4.3"
+  checksum: 10/804b9a42aa8f35f2b3c5a8dff906291cb749115f83ee2afe3576d70b5b5c53c965365c7f4967690647a9c54af9838ff232a85ff9577a0a36c44b68bc6cdefe36
+  languageName: node
+  linkType: hard
+
 "zwitch@npm:^2.0.0, zwitch@npm:^2.0.4":
   version: 2.0.4
   resolution: "zwitch@npm:2.0.4"