diff --git a/.cursor/skills/ode-synk-bundle-publish/SKILL.md b/.cursor/skills/ode-synk-bundle-publish/SKILL.md
index 2b4e1ddf9..6d6f1c1b9 100644
--- a/.cursor/skills/ode-synk-bundle-publish/SKILL.md
+++ b/.cursor/skills/ode-synk-bundle-publish/SKILL.md
@@ -21,6 +21,31 @@ description: >-
 3. Store **API URLs and tokens** in CI secrets; never embed production credentials in source.
 4. For bundle structure reminders, see **[CONTEXT_BUNDLE_AND_CI.md](https://github.com/OpenDataEnsemble/custom_app/blob/main/CONTEXT_BUNDLE_AND_CI.md)** in **custom_app** (summary only).
 
+## CI / GitHub Actions (recommended pattern)
+
+Do **not** build synk from source in app repos. Pin an ODE release:
+
+```yaml
+env:
+  SYNK_CLI_VERSION: v1.1.2   # bump intentionally
+
+- name: Install synk
+  run: |
+    curl -fsSL "https://github.com/OpenDataEnsemble/ode/releases/download/${SYNK_CLI_VERSION}/synkronus-cli-linux-amd64.tar.gz" \
+      | tar -xz -C /tmp
+    install -m 0755 /tmp/synkronus-cli-linux-amd64 /usr/local/bin/synk
+```
+
+Deploy steps:
+
+```bash
+synk --config "$CONFIG_FILE" login -u "$USER" --password "$PASS"
+synk --config "$CONFIG_FILE" app-bundle upload bundle-v1.0.0.zip
+synk --config "$CONFIG_FILE" app-bundle switch "$VERSION"
+```
+
+Alternative: `ghcr.io/opendataensemble/synkronus-cli:vX.Y.Z` for Docker-based local tooling.
+
 ## Related
 
 - [App bundles (using)](https://opendataensemble.org/docs/using/app-bundles)
diff --git a/.github/CICD.md b/.github/CICD.md
index dc45ad62f..fa0b39673 100644
--- a/.github/CICD.md
+++ b/.github/CICD.md
@@ -73,6 +73,32 @@ The workflow requires these permissions:
 
 - `GITHUB_TOKEN` - Automatically provided by GitHub Actions
 
+### Synkronus CLI Docker Build & Publish
+
+**Workflow File**: `.github/workflows/synkronus-cli-docker.yml`
+
+#### Triggers
+
+- **Push to `main` / `dev`** when `synkronus-cli/**` or `Dockerfile.cli.slim` changes
+- **Pull Requests** — build only, no publish
+- **Release published** — versioned tags
+- **Manual dispatch**
+
+#### Image Registry
+
+- Image: `ghcr.io/opendataensemble/synkronus-cli`
+- Dockerfile: `Dockerfile.cli.slim` (pre-built static `synk` binary, Alpine 3.23)
+
+Tagging follows the same strategy as the Synkronus server image (`latest`, `dev`, `main`, `v{X.Y.Z}`, `sha-{short}`, etc.).
+
+#### CLI binaries (primary install path)
+
+**Workflow File**: `.github/workflows/synkronus-cli.yml`
+
+Release assets: `synkronus-cli-{os}-{arch}.tar.gz` attached to GitHub Releases. Custom app CI should pin a release tag via `SYNK_CLI_VERSION` and download `synkronus-cli-linux-amd64.tar.gz`.
+
+Non-interactive CI login: `synk login -u USER --password "$SYNK_PASSWORD"` (v1.1.2+).
+
 ### Formulus Android Build
 
 **Workflow File**: `.github/workflows/formulus-android.yml`
diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml
index e1cf54db0..6c55c71de 100644
--- a/.github/workflows/auto-label.yml
+++ b/.github/workflows/auto-label.yml
@@ -16,10 +16,10 @@ jobs:
     
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
       
       - name: Label PR based on changed files
-        uses: actions/labeler@v5
+        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca05a838f..2bc3ac474 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,12 +37,12 @@ jobs:
       synkronus-cli: ${{ steps.filter.outputs.synkronus-cli }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           fetch-depth: 0
 
       - name: Detect changed components
-        uses: dorny/paths-filter@v2
+        uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2
         id: filter
         with:
           filters: |
@@ -68,15 +68,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -111,15 +111,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -160,10 +160,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: synkronus/go.sum
@@ -212,10 +212,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: synkronus-cli/go.sum
diff --git a/.github/workflows/e2e-attachments.yml b/.github/workflows/e2e-attachments.yml
index d9a40c939..0ad9d62fe 100644
--- a/.github/workflows/e2e-attachments.yml
+++ b/.github/workflows/e2e-attachments.yml
@@ -32,10 +32,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version-file: synkronus/go.mod
           cache: true
@@ -73,15 +73,15 @@ jobs:
     timeout-minutes: 20
     needs: contract
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: 20
 
diff --git a/.github/workflows/formulus-android.yml b/.github/workflows/formulus-android.yml
index 5c020c844..0a8024c9c 100644
--- a/.github/workflows/formulus-android.yml
+++ b/.github/workflows/formulus-android.yml
@@ -39,15 +39,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js for assets
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -68,7 +68,7 @@ jobs:
         run: pnpm run build:copy
 
       - name: Upload formplayer assets artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: formplayer-assets
           path: formulus/android/app/src/main/assets/formplayer_dist
@@ -83,21 +83,21 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Download formplayer assets artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
         with:
           name: formplayer-assets
           path: formulus/android/app/src/main/assets/formplayer_dist
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -132,7 +132,7 @@ jobs:
         run: pnpm run generate
 
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -182,7 +182,7 @@ jobs:
         run: ./gradlew bundleRelease --no-daemon
 
       - name: Upload APK artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: formulus-android-apk-${{ github.event_name }}-${{ github.run_id }}
           path: |
@@ -190,7 +190,7 @@ jobs:
 
       - name: Upload AAB artifact
         if: github.event_name != 'pull_request'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: formulus-android-aab-${{ github.event_name }}-${{ github.run_id }}
           path: |
@@ -198,7 +198,7 @@ jobs:
 
       - name: Upload APK to GitHub Release
         if: github.event_name == 'release'
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
         with:
           files: |
             formulus/android/app/build/outputs/apk/**/**/*.apk
diff --git a/.github/workflows/ode-desktop.yml b/.github/workflows/ode-desktop.yml
index 3fbfa2bea..e768b4678 100644
--- a/.github/workflows/ode-desktop.yml
+++ b/.github/workflows/ode-desktop.yml
@@ -45,15 +45,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -97,7 +97,7 @@ jobs:
             xdg-utils
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
         with:
           components: rustfmt, clippy
 
@@ -117,15 +117,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -153,7 +153,7 @@ jobs:
           cp -a formulus-formplayer/build/. desktop/public/formplayer_dist/
 
       - name: Upload formplayer dist
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: desktop-formplayer-dist
           path: desktop/public/formplayer_dist
@@ -194,21 +194,21 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Download embedded formplayer
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
         with:
           name: desktop-formplayer-dist
           path: desktop/public/formplayer_dist
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -234,12 +234,12 @@ jobs:
             xdg-utils
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
         with:
           targets: ${{ matrix.rust_target }}
 
       - name: Rust cache
-        uses: Swatinem/rust-cache@v2
+        uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
           workspaces: desktop/src-tauri
           shared-key: ode-desktop-${{ matrix.platform }}
@@ -249,20 +249,28 @@ jobs:
         env:
           CI: 'true'
           RUST_TARGET: ${{ matrix.rust_target }}
+          CARGO_NET_RETRY: '10'
+          CARGO_HTTP_MULTIPLEXING: 'false'
         run: |
           set -euo pipefail
           if [[ "${RUNNER_OS}" == "macOS" ]]; then
             hdiutil detach "/Volumes/ODE Desktop" 2>/dev/null || true
             find "src-tauri/target/${RUST_TARGET}/release/bundle" -name 'rw.*.dmg' -delete 2>/dev/null || true
           fi
-          if ! pnpm exec tauri build --verbose --target "${RUST_TARGET}" -c '${{ env.TAURI_BEFORE_BUILD }}'; then
-            if [[ "${RUNNER_OS}" != "macOS" ]]; then
-              exit 1
+          build_tauri() {
+            pnpm exec tauri build --verbose --target "${RUST_TARGET}" -c '${{ env.TAURI_BEFORE_BUILD }}' "$@"
+          }
+          if ! build_tauri; then
+            if [[ "${RUNNER_OS}" == "macOS" ]]; then
+              echo "::warning::Tauri build failed; retrying DMG bundle on macOS"
+              hdiutil detach "/Volumes/ODE Desktop" 2>/dev/null || true
+              find "src-tauri/target/${RUST_TARGET}/release/bundle" -name 'rw.*.dmg' -delete 2>/dev/null || true
+              build_tauri --bundles dmg
+            else
+              echo "::warning::Tauri build failed; retrying after crates.io network glitch"
+              sleep 15
+              build_tauri
             fi
-            echo "::warning::Tauri build failed; retrying DMG bundle on macOS"
-            hdiutil detach "/Volumes/ODE Desktop" 2>/dev/null || true
-            find "src-tauri/target/${RUST_TARGET}/release/bundle" -name 'rw.*.dmg' -delete 2>/dev/null || true
-            pnpm exec tauri build --verbose --bundles dmg --target "${RUST_TARGET}" -c '${{ env.TAURI_BEFORE_BUILD }}'
           fi
 
       - name: Collect installers for upload
@@ -304,7 +312,7 @@ jobs:
           fi
 
       - name: Upload installer artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: ode-desktop-${{ matrix.platform }}
           path: desktop/dist-ci/*
@@ -347,21 +355,21 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Download embedded formplayer
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
         with:
           name: desktop-formplayer-dist
           path: desktop/public/formplayer_dist
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -387,12 +395,12 @@ jobs:
             xdg-utils
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
         with:
           targets: ${{ matrix.rust_target }}
 
       - name: Rust cache
-        uses: Swatinem/rust-cache@v2
+        uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
         with:
           workspaces: desktop/src-tauri
           shared-key: ode-desktop-release-${{ matrix.platform }}
@@ -402,20 +410,28 @@ jobs:
         env:
           CI: 'true'
           RUST_TARGET: ${{ matrix.rust_target }}
+          CARGO_NET_RETRY: '10'
+          CARGO_HTTP_MULTIPLEXING: 'false'
         run: |
           set -euo pipefail
           if [[ "${RUNNER_OS}" == "macOS" ]]; then
             hdiutil detach "/Volumes/ODE Desktop" 2>/dev/null || true
             find "src-tauri/target/${RUST_TARGET}/release/bundle" -name 'rw.*.dmg' -delete 2>/dev/null || true
           fi
-          if ! pnpm exec tauri build --verbose --target "${RUST_TARGET}" -c '${{ env.TAURI_BEFORE_BUILD }}'; then
-            if [[ "${RUNNER_OS}" != "macOS" ]]; then
-              exit 1
+          build_tauri() {
+            pnpm exec tauri build --verbose --target "${RUST_TARGET}" -c '${{ env.TAURI_BEFORE_BUILD }}' "$@"
+          }
+          if ! build_tauri; then
+            if [[ "${RUNNER_OS}" == "macOS" ]]; then
+              echo "::warning::Tauri build failed; retrying DMG bundle on macOS"
+              hdiutil detach "/Volumes/ODE Desktop" 2>/dev/null || true
+              find "src-tauri/target/${RUST_TARGET}/release/bundle" -name 'rw.*.dmg' -delete 2>/dev/null || true
+              build_tauri --bundles dmg
+            else
+              echo "::warning::Tauri build failed; retrying after crates.io network glitch"
+              sleep 15
+              build_tauri
             fi
-            echo "::warning::Tauri build failed; retrying DMG bundle on macOS"
-            hdiutil detach "/Volumes/ODE Desktop" 2>/dev/null || true
-            find "src-tauri/target/${RUST_TARGET}/release/bundle" -name 'rw.*.dmg' -delete 2>/dev/null || true
-            pnpm exec tauri build --verbose --bundles dmg --target "${RUST_TARGET}" -c '${{ env.TAURI_BEFORE_BUILD }}'
           fi
 
       - name: Collect installers for GitHub Release
@@ -457,7 +473,7 @@ jobs:
           fi
 
       - name: Attach installers to Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
         with:
           tag_name: ${{ github.event.release.tag_name }}
           files: desktop/dist-release/*
diff --git a/.github/workflows/pr-title-check.yml b/.github/workflows/pr-title-check.yml
index b3bd30782..74bb2ffa9 100644
--- a/.github/workflows/pr-title-check.yml
+++ b/.github/workflows/pr-title-check.yml
@@ -15,7 +15,7 @@ jobs:
     
     steps:
       - name: Check PR Title Format
-        uses: amannn/action-semantic-pull-request@v5
+        uses: amannn/action-semantic-pull-request@e32d7e603df1aa1ba07e981f2a23455dee596825 # v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/sbom-release.yml b/.github/workflows/sbom-release.yml
index ae9a66905..7ebc6566a 100644
--- a/.github/workflows/sbom-release.yml
+++ b/.github/workflows/sbom-release.yml
@@ -23,16 +23,16 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
         # scripts/sbom/generate-sboms.mjs shells out to `pnpm list`; needs pnpm on PATH.
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
@@ -46,7 +46,7 @@ jobs:
             desktop/pnpm-lock.yaml
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -63,7 +63,7 @@ jobs:
 
       - name: Upload SBOM artifact (manual runs)
         if: github.event_name == 'workflow_dispatch'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: cyclonedx-sbom
           path: sbom-dist/*.cdx.json
@@ -71,7 +71,7 @@ jobs:
 
       - name: Upload SBOMs to GitHub Release
         if: github.event_name == 'release'
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
         with:
           tag_name: ${{ github.event.release.tag_name }}
           files: sbom-dist/*.cdx.json
diff --git a/.github/workflows/synkronus-cli-docker.yml b/.github/workflows/synkronus-cli-docker.yml
new file mode 100644
index 000000000..bc783ec4e
--- /dev/null
+++ b/.github/workflows/synkronus-cli-docker.yml
@@ -0,0 +1,290 @@
+name: Synkronus CLI Docker Build & Publish
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    paths:
+      - 'synkronus-cli/**'
+      - 'Dockerfile.cli.slim'
+      - '.github/workflows/synkronus-cli-docker.yml'
+  pull_request:
+    paths:
+      - 'synkronus-cli/**'
+      - 'Dockerfile.cli.slim'
+      - '.github/workflows/synkronus-cli-docker.yml'
+  workflow_dispatch:
+  release:
+    types: [published]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: opendataensemble/synkronus-cli
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Cross-compile synkronus-cli
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Determine CLI version from git
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" == "release" ]; then
+            VERSION="${{ github.event.release.tag_name }}"
+          else
+            VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "1.0.0")
+          fi
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "Building synkronus-cli with version: ${VERSION}"
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25.x'
+          cache-dependency-path: synkronus-cli/go.sum
+
+      - name: Build synkronus-cli binaries
+        working-directory: synkronus-cli
+        env:
+          CLI_VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          set -euo pipefail
+          ROOT="${GITHUB_WORKSPACE}"
+          LD_FLAGS="-w -s -X github.com/OpenDataEnsemble/ode/synkronus-cli/internal/cmd.Version=${CLI_VERSION#v}"
+          mkdir -p "${ROOT}/docker-dist"
+          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="${LD_FLAGS}" -o "${ROOT}/docker-dist/synk-linux-amd64" ./cmd/synkronus
+          CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="${LD_FLAGS}" -o "${ROOT}/docker-dist/synk-linux-arm64" ./cmd/synkronus
+
+      - name: Upload docker build context artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: synkronus-cli-docker-dist
+          path: docker-dist/
+          if-no-files-found: error
+
+  image-amd64:
+    needs: build
+    runs-on: ubuntu-latest
+    name: Build linux/amd64 image
+    permissions:
+      contents: read
+      packages: write
+    outputs:
+      digest: ${{ steps.push.outputs.digest }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download docker build context
+        uses: actions/download-artifact@v4
+        with:
+          name: synkronus-cli-docker-dist
+          path: docker-dist/
+
+      - name: Stage build context for Dockerfile.cli.slim
+        run: |
+          set -euo pipefail
+          mkdir -p docker-context
+          cp docker-dist/synk-linux-amd64 docker-context/synk
+          chmod +x docker-context/synk
+
+      - name: Log in to Github Container Registry
+        if: github.event_name != 'pull_request'
+        uses: redhat-actions/podman-login@v1
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+
+      - name: Compute image metadata (scratch tag)
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=tmp-${{ github.run_id }}-amd64
+
+      - name: Build image with Buildah
+        id: build-image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: ${{ env.IMAGE_NAME }}
+          tags: ${{ steps.meta.outputs.tag-names }}
+          labels: ${{ steps.meta.outputs.labels }}
+          archs: amd64
+          containerfiles: |
+            ./Dockerfile.cli.slim
+          context: docker-context
+
+      - name: Push image to registry
+        id: push
+        if: github.event_name != 'pull_request'
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ${{ steps.build-image.outputs.image }}
+          tags: ${{ steps.build-image.outputs.tags }}
+          registry: ${{ env.REGISTRY }}
+
+  image-arm64:
+    needs: build
+    runs-on: ubuntu-24.04-arm
+    name: Build linux/arm64 image
+    permissions:
+      contents: read
+      packages: write
+    outputs:
+      digest: ${{ steps.push.outputs.digest }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download docker build context
+        uses: actions/download-artifact@v4
+        with:
+          name: synkronus-cli-docker-dist
+          path: docker-dist/
+
+      - name: Stage build context for Dockerfile.cli.slim
+        run: |
+          set -euo pipefail
+          mkdir -p docker-context
+          cp docker-dist/synk-linux-arm64 docker-context/synk
+          chmod +x docker-context/synk
+
+      - name: Log in to Github Container Registry
+        if: github.event_name != 'pull_request'
+        uses: redhat-actions/podman-login@v1
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+
+      - name: Compute image metadata (scratch tag)
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=tmp-${{ github.run_id }}-arm64
+
+      - name: Build image with Buildah
+        id: build-image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: ${{ env.IMAGE_NAME }}
+          tags: ${{ steps.meta.outputs.tag-names }}
+          labels: ${{ steps.meta.outputs.labels }}
+          archs: arm64
+          containerfiles: |
+            ./Dockerfile.cli.slim
+          context: docker-context
+
+      - name: Push image to registry
+        id: push
+        if: github.event_name != 'pull_request'
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ${{ steps.build-image.outputs.image }}
+          tags: ${{ steps.build-image.outputs.tags }}
+          registry: ${{ env.REGISTRY }}
+
+  merge-manifests:
+    if: github.event_name != 'pull_request'
+    needs: [image-amd64, image-arm64]
+    runs-on: ubuntu-latest
+    name: Merge multi-arch manifest and publish tags
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+      attestations: write
+    steps:
+      - name: Log in to Github Container Registry (docker)
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Compute image tags and labels
+        id: tags
+        uses: docker/metadata-action@v6
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
+          tags: |
+            type=semver,pattern=v{{version}},value=${{ github.event.release.tag_name }},enable=${{ github.event_name == 'release' }},priority=1100
+            type=semver,pattern=v{{major}}.{{minor}},value=${{ github.event.release.tag_name }},enable=${{ github.event_name == 'release' && github.event.release.prerelease == false }},priority=900
+            type=semver,pattern=v{{major}},value=${{ github.event.release.tag_name }},enable=${{ github.event_name == 'release' && github.event.release.prerelease == false }},priority=800
+            type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.release.prerelease == false }},priority=700
+            type=raw,value=latest-pre-release,enable=${{ github.event_name == 'release' && github.event.release.prerelease == true }},priority=700
+            type=raw,value=main,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }},priority=1000
+            type=raw,value=dev,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' }},priority=1000
+            type=ref,event=branch,enable=${{ github.event_name == 'push' && github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }},priority=900
+            type=ref,event=pr,priority=1000
+            type=sha,enable=${{ github.event_name != 'release' && github.event_name != 'pull_request' }},priority=100
+
+      - name: Create and push multi-arch manifest
+        id: merge
+        env:
+          AMD64_DIGEST: ${{ needs.image-amd64.outputs.digest }}
+          ARM64_DIGEST: ${{ needs.image-arm64.outputs.digest }}
+          TAG_NAMES: ${{ steps.tags.outputs.tag-names }}
+        run: |
+          set -euo pipefail
+          IMG="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
+          AMD64_REF="${IMG}@${AMD64_DIGEST}"
+          ARM64_REF="${IMG}@${ARM64_DIGEST}"
+          mapfile -t TAGS < <(echo "${TAG_NAMES}" | sed '/^$/d')
+          if [ "${#TAGS[@]}" -eq 0 ]; then
+            echo "No tags from metadata-action" >&2
+            exit 1
+          fi
+          TAG_ARGS=()
+          for t in "${TAGS[@]}"; do
+            TAG_ARGS+=(-t "${IMG}:${t}")
+          done
+          docker buildx imagetools create "${TAG_ARGS[@]}" "${AMD64_REF}" "${ARM64_REF}"
+
+      - name: Verify image
+        shell: bash
+        run: |
+          set -euo pipefail
+          IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
+          PRIMARY_TAG="${{ steps.tags.outputs.version }}"
+
+          docker manifest inspect "${IMAGE}:${PRIMARY_TAG}" | \
+            jq -e '[.manifests[].platform | "\(.os)/\(.architecture)"] | index("linux/amd64") and index("linux/arm64")' >/dev/null
+          echo "Verified manifest platforms for ${IMAGE}:${PRIMARY_TAG}"
+
+          docker pull --platform linux/amd64 "${IMAGE}:${PRIMARY_TAG}"
+          docker pull --platform linux/arm64 "${IMAGE}:${PRIMARY_TAG}"
+
+      - name: Capture manifest digest for attestation
+        id: manifest-digest
+        run: |
+          set -euo pipefail
+          IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
+          PRIMARY_TAG="${{ steps.tags.outputs.version }}"
+          DIGEST=$(docker buildx imagetools inspect "${IMAGE}:${PRIMARY_TAG}" --format '{{json .}}' | jq -r '.manifest.digest')
+          echo "digest=${DIGEST}" >> "${GITHUB_OUTPUT}"
+
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          subject-digest: ${{ steps.manifest-digest.outputs.digest }}
+          push-to-registry: true
diff --git a/.github/workflows/synkronus-cli.yml b/.github/workflows/synkronus-cli.yml
index 54acb0b6c..d02286a0f 100644
--- a/.github/workflows/synkronus-cli.yml
+++ b/.github/workflows/synkronus-cli.yml
@@ -31,10 +31,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version: '1.25.x'
           cache-dependency-path: synkronus-cli/go.sum
@@ -58,7 +58,7 @@ jobs:
           rm dist/${FILENAME}${EXT}
 
       - name: Upload build artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: synkronus-cli-${{ matrix.goos }}-${{ matrix.goarch }}
           path: synkronus-cli/dist/synkronus-cli-${{ matrix.goos }}-${{ matrix.goarch }}*
@@ -81,10 +81,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version: '1.25.x'
           cache-dependency-path: synkronus-cli/go.sum
@@ -100,7 +100,7 @@ jobs:
           ls -R dist
 
       - name: Upload assets to GitHub Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
         with:
           files: |
             synkronus-cli/dist/synkronus-cli-*
diff --git a/.github/workflows/synkronus-docker.yml b/.github/workflows/synkronus-docker.yml
index bb635d929..89709578e 100644
--- a/.github/workflows/synkronus-docker.yml
+++ b/.github/workflows/synkronus-docker.yml
@@ -41,7 +41,7 @@ jobs:
       version: ${{ steps.version.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           fetch-depth: 0
 
@@ -57,18 +57,18 @@ jobs:
           echo "Building Synkronus with version: ${VERSION}"
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version: '1.25.x'
           cache-dependency-path: synkronus/go.sum
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
         with:
           version: 10.33.2
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: '24'
           cache: pnpm
@@ -78,7 +78,7 @@ jobs:
             packages/components/pnpm-lock.yaml
 
       - name: Set up Java (OpenAPI Generator)
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
         with:
           distribution: temurin
           java-version: '21'
@@ -109,7 +109,7 @@ jobs:
           cp -a static "${ROOT}/docker-dist/"
 
       - name: Upload docker build context artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: synkronus-docker-dist
           path: docker-dist/
@@ -126,10 +126,10 @@ jobs:
       digest: ${{ steps.push.outputs.digest }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Download docker build context
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: synkronus-docker-dist
           path: docker-dist/
@@ -145,7 +145,7 @@ jobs:
 
       - name: Log in to Github Container Registry
         if: github.event_name != 'pull_request'
-        uses: redhat-actions/podman-login@v1
+        uses: redhat-actions/podman-login@4934294ad0449894bcd1e9f191899d7292469603 # v1
         with:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
@@ -153,7 +153,7 @@ jobs:
 
       - name: Compute image metadata (scratch tag)
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -162,7 +162,7 @@ jobs:
 
       - name: Build image with Buildah
         id: build-image
-        uses: redhat-actions/buildah-build@v2
+        uses: redhat-actions/buildah-build@7a95fa7ee0f02d552a32753e7414641a04307056 # v2
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ steps.meta.outputs.tag-names }}
@@ -175,7 +175,7 @@ jobs:
       - name: Push image to registry
         id: push
         if: github.event_name != 'pull_request'
-        uses: redhat-actions/push-to-registry@v2
+        uses: redhat-actions/push-to-registry@5ed88d269cf581ea9ef6dd6806d01562096bee9c # v2
         with:
           image: ${{ steps.build-image.outputs.image }}
           tags: ${{ steps.build-image.outputs.tags }}
@@ -192,10 +192,10 @@ jobs:
       digest: ${{ steps.push.outputs.digest }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Download docker build context
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: synkronus-docker-dist
           path: docker-dist/
@@ -211,7 +211,7 @@ jobs:
 
       - name: Log in to Github Container Registry
         if: github.event_name != 'pull_request'
-        uses: redhat-actions/podman-login@v1
+        uses: redhat-actions/podman-login@4934294ad0449894bcd1e9f191899d7292469603 # v1
         with:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
@@ -219,7 +219,7 @@ jobs:
 
       - name: Compute image metadata (scratch tag)
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -228,7 +228,7 @@ jobs:
 
       - name: Build image with Buildah
         id: build-image
-        uses: redhat-actions/buildah-build@v2
+        uses: redhat-actions/buildah-build@7a95fa7ee0f02d552a32753e7414641a04307056 # v2
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ steps.meta.outputs.tag-names }}
@@ -241,7 +241,7 @@ jobs:
       - name: Push image to registry
         id: push
         if: github.event_name != 'pull_request'
-        uses: redhat-actions/push-to-registry@v2
+        uses: redhat-actions/push-to-registry@5ed88d269cf581ea9ef6dd6806d01562096bee9c # v2
         with:
           image: ${{ steps.build-image.outputs.image }}
           tags: ${{ steps.build-image.outputs.tags }}
@@ -259,7 +259,7 @@ jobs:
       attestations: write
     steps:
       - name: Log in to Github Container Registry (docker)
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -267,7 +267,7 @@ jobs:
 
       - name: Compute image tags and labels
         id: tags
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -331,7 +331,7 @@ jobs:
           echo "digest=${DIGEST}" >> "${GITHUB_OUTPUT}"
 
       - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
+        uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1
         with:
           subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           subject-digest: ${{ steps.manifest-digest.outputs.digest }}
diff --git a/AGENTS.md b/AGENTS.md
index 3a8faf404..a0f08d97a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -60,6 +60,73 @@ Do not assume custom app authors have local checkouts of **ODE** or internal exa
 
 ---
 
+## Release version bump checklist
+
+Use this when preparing a new ODE release (pre-release or stable). Full tagging and CI behaviour: [RELEASE.md](RELEASE.md). Android Play/F-Droid `versionCode` rules: [formulus/android/ANDROID_RELEASE.md](formulus/android/ANDROID_RELEASE.md).
+
+### Pre-release vs stable
+
+| Layer | Pre-release (e.g. `v1.1.1-alpha.3`) | Stable (e.g. `v1.1.1`) |
+|-------|--------------------------------------|-------------------------|
+| Client manifests (`package.json`, `versionName`, CLI, Desktop, Portal) | Target semver **without** suffix (`1.1.1`) | Same (`1.1.1`) |
+| Git tag + GitHub release | `v1.1.1-alpha.3` (mark **pre-release**) | `v1.1.1` |
+| Synkronus Docker / server `BuildVersion()` | From release tag via CI ldflags | From release tag |
+
+For stable, you usually **do not** re-bump client manifests if they already match the target version; bump Android `versionCode` only when shipping a new Play build.
+
+### What to edit
+
+| File | Field | Purpose |
+|------|-------|---------|
+| `formulus/package.json` | `version` | Source for `ODE_VERSION` / `x-ode-version` ([`formulus/src/version.ts`](formulus/src/version.ts)) |
+| `formulus/android/app/build.gradle` | `versionCode`, `versionName` | Google Play; run `pnpm run sync:version` from `formulus/` after `package.json` bump for `versionName` |
+| `formulus/ios/Formulus.xcodeproj/project.pbxproj` | `MARKETING_VERSION`, `CURRENT_PROJECT_VERSION` | iOS display + build number (align `CURRENT_PROJECT_VERSION` with Android `versionCode`) |
+| `synkronus-cli/internal/cmd/version.go` | `Version` | `synk version` output |
+| `synkronus-cli/versioninfo.json` | Windows file/product version | Windows binary metadata |
+| `desktop/package.json`, `desktop/src-tauri/tauri.conf.json`, `desktop/src-tauri/Cargo.toml` | `version` | ODE Desktop app version (keep all three in sync) |
+| `desktop/src/lib/synkConstants.ts` | `SYNKRONUS_CLIENT_VERSION` | Desktop `x-ode-version` header |
+| `synkronus-portal/package.json` | `version` | Portal `x-ode-version` ([`synkronus-portal/src/version.ts`](synkronus-portal/src/version.ts)) |
+
+**Synkronus server** version is **not** edited in source for releases — CI injects it from the git tag ([`.github/workflows/synkronus-docker.yml`](.github/workflows/synkronus-docker.yml)).
+
+**Synkronus CLI** Docker image (`ghcr.io/opendataensemble/synkronus-cli`) is published by [`.github/workflows/synkronus-cli-docker.yml`](.github/workflows/synkronus-cli-docker.yml) on release; confirm GHCR tags alongside GitHub Release CLI binaries.
+
+### Increment rules
+
+- **Semver:** bump `MAJOR.MINOR.PATCH` in client manifests to match the release line (e.g. `1.1.1`).
+- **Android `versionCode`:** must increase monotonically for Google Play (+10 per release is a common convention; +1 per shipped alpha build is also fine).
+- **In-app version display:** Formulus About/Settings use native `versionName` + `versionCode` via [`AppVersionService`](formulus/src/services/AppVersionService.ts); Desktop About uses Tauri `getVersion()`.
+
+### Commands
+
+```bash
+# After bumping formulus/package.json
+cd formulus && pnpm run sync:version
+
+# Pre-flight on touched JS packages
+cd formulus-formplayer && pnpm run lint && pnpm run format:check
+cd formulus && pnpm run lint && pnpm run format:check
+cd desktop && pnpm run lint && pnpm run format:check && pnpm run typecheck && pnpm test
+cd synkronus-cli && go build ./cmd/synkronus && ./synk version   # or synkronus-cli.exe on Windows
+```
+
+### Do not bump
+
+- `FORMULUS_INTERFACE_VERSION` in [`formulus/src/webview/FormulusInterfaceDefinition.ts`](formulus/src/webview/FormulusInterfaceDefinition.ts) — WebView bridge API contract, not app release version
+- `formulus-formplayer/package.json` — embedded library semver
+- OpenAPI document version comments in generated API clients
+- `synkronus-cli/internal/config/config.go` default `api.version` — Synkronus **API contract** major version for compatibility checks, not CLI display version
+
+### Tag and publish
+
+```bash
+git tag v1.1.1-alpha.3    # or v1.1.1 for stable
+git push origin v1.1.1-alpha.3
+# GitHub → Releases → publish (pre-release checkbox for alpha/rc tags)
+```
+
+---
+
 ## Cross-cutting contracts
 
 - **Formulus ↔ WebView (custom apps + formplayer):** [`formulus/src/webview/FormulusInterfaceDefinition.ts`](formulus/src/webview/FormulusInterfaceDefinition.ts) is the **source of truth** for the injected JavaScript API. Formplayer copies a synced TypeScript snapshot via `pnpm run sync-interface` in `formulus-formplayer` (see [formulus-formplayer/AGENTS.md](formulus-formplayer/AGENTS.md)).
@@ -75,7 +142,7 @@ Do not assume custom app authors have local checkouts of **ODE** or internal exa
 
 - **Pipelines:** [.github/CICD.md](.github/CICD.md).
 - **Lint/format:** Run the relevant scripts in the **package you touch** (see root [README.md](README.md) and each package).
-- **Pre-flight before opening a PR:** each package `AGENTS.md` lists the local `lint` / `format:check` / `test` / `build` commands that match CI — run them in every package you changed (e.g. [formulus-formplayer/AGENTS.md](formulus-formplayer/AGENTS.md#pre-flight-before-a-pr)).
+- **Pre-flight before opening a PR:** each package `AGENTS.md` lists the local `lint` / `format` / `format:check` / `test` / `build` commands that match CI — run them in every package you changed (e.g. [formulus-formplayer/AGENTS.md](formulus-formplayer/AGENTS.md#pre-flight-before-a-pr)).
 - **Commits/PRs:** Conventional Commits and PR expectations are documented in [formulus-formplayer/AGENTS.md](formulus-formplayer/AGENTS.md) (project-wide convention).
 
 ---
diff --git a/Dockerfile.cli.slim b/Dockerfile.cli.slim
new file mode 100644
index 000000000..48a1c0fa1
--- /dev/null
+++ b/Dockerfile.cli.slim
@@ -0,0 +1,13 @@
+# CI/runtime-only image: expects a pre-built synk binary in the build context.
+# Build context layout: ./synk (static binary)
+
+FROM alpine:3.23
+
+RUN apk --no-cache add ca-certificates
+
+COPY synk /usr/local/bin/synk
+RUN chmod +x /usr/local/bin/synk
+
+WORKDIR /workspace
+
+ENTRYPOINT ["/usr/local/bin/synk"]
diff --git a/RELEASE.md b/RELEASE.md
index fc7924a2a..562f993ca 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -67,7 +67,7 @@ Avoid tags like `v.1.2.0` (extra dot after `v`), which are not semver-style and
 The ODE monorepo contains multiple artefacts that must stay in sync:
 
 - **Synkronus** backend Docker image
-- **Synkronus CLI** (multi-platform binaries)
+- **Synkronus CLI** (multi-platform binaries and GHCR image `ghcr.io/opendataensemble/synkronus-cli`)
 - **Formulus** React Native Android app (signed APK)
 
 All share the same **semantic version tag**:
@@ -77,7 +77,7 @@ All share the same **semantic version tag**:
 
 These tags are used consistently by the GitHub Actions workflows to:
 
-- Build and tag Docker images in GHCR
+- Build and tag Docker images in GHCR (Synkronus server and CLI)
 - Attach CLI binaries to GitHub Releases
 - Attach signed Android APKs to GitHub Releases
 
diff --git a/ROADMAP.md b/ROADMAP.md
index a16e15568..b4fdcb946 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -37,6 +37,8 @@ Same Synkronus API as everything else. Form behaviour should match **Formulus**
 
 Detailed requirements live in the **ODE Desktop** project plan ([`desktop/`](desktop/) in this repo). Implementation is modular, not phased.
 
+**Backlog:** [Custom data-management apps](desktop/docs/CUSTOM_DATA_APPS.md) — optional Workbench mini-apps shipped in the bundle for choice-list admin, randomization, cleaning, etc.
+
 ---
 
 ## Product map
diff --git a/desktop/AGENTS.md b/desktop/AGENTS.md
index 7a19520a3..039a5e07f 100644
--- a/desktop/AGENTS.md
+++ b/desktop/AGENTS.md
@@ -4,6 +4,8 @@
 
 Published docs: [ODE Desktop developer mode](https://opendataensemble.org/docs/guides/ode-desktop-developer-mode) (local custom app iteration).
 
+**Release version bumps:** see [../AGENTS.md#release-version-bump-checklist](../AGENTS.md#release-version-bump-checklist) (`package.json`, `tauri.conf.json`, `Cargo.toml`, `synkConstants.ts` — keep in sync).
+
 ---
 
 ## Layout
@@ -95,4 +97,14 @@ pnpm typecheck
 cd src-tauri && cargo test
 ```
 
+**Pre-flight before a PR** (from `desktop/`):
+
+```bash
+pnpm run lint
+pnpm run format
+pnpm run format:check
+pnpm test
+pnpm typecheck
+```
+
 Conventional Commits; see root [AGENTS.md](../AGENTS.md) and [.github/CICD.md](../.github/CICD.md).
diff --git a/desktop/README.md b/desktop/README.md
index 7625a7f19..47673495d 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -93,7 +93,7 @@ User guide: [ODE Desktop developer mode](https://opendataensemble.org/docs/guide
 
 - **Bridge contract**: [`formulus/src/webview/FormulusInterfaceDefinition.ts`](../formulus/src/webview/FormulusInterfaceDefinition.ts) — source of truth for `formulusAPI` / postMessage. After changes, run **`sync-interface`** in `formulus-formplayer` and mirror behavior in the desktop WebView host.
 - **Dev mirror paths**: `bundles/dev-local/app/`, `bundles/dev-local/forms/` when developer mode is on; `bundles/active/` otherwise (see [AGENTS.md](AGENTS.md)).
-- **Form preview host** (Workbench → Form preview): `public/formulus-injection.js` + iframe shim; parent handles `postMessage` in **`src/lib/formPreviewBridge.ts`** (explicit matrix per `FormulusInjectionScript` request `type`; device APIs including camera, audio, and video are stubbed in preview; observations + URIs use Tauri where applicable). Nested **sub-observation** flows (`openFormplayer` + `options.subObservationMode`) open a stacked Form preview iframe and resolve the parent promise with `FormCompletionResult` without persisting the child as a top-level observation. `skipFinalize` and `skipDraftSelection` from `openFormplayer` options are forwarded into nested `FormInitData` when supported. Child sessions validate their own schema on Done (`skipFinalize` only omits the Finalize page); see [Custom Extensions — nested sessions](https://opendataensemble.org/docs/guides/custom-extensions#nested-sessions-and-custom-validators).
+- **Form preview host** (Workbench → Form preview): `public/formulus-injection.js` + iframe shim; parent handles `postMessage` in **`src/lib/formPreviewBridge.ts`** (explicit matrix per `FormulusInjectionScript` request `type`; device APIs including camera, audio, and video are stubbed in preview; observations + URIs use Tauri where applicable). **`persistObservation`** writes headlessly to the workspace DB (no finalize dialog) — used by custom apps for orchestrated writes such as inclusion decisions. Nested **sub-observation** flows (`openFormplayer` + `options.subObservationMode`) open a stacked Form preview iframe and resolve the parent promise with `FormCompletionResult` without persisting the child as a top-level observation. `skipFinalize` and `skipDraftSelection` from `openFormplayer` options are forwarded into nested `FormInitData` when supported. Child sessions validate their own schema on Done (`skipFinalize` only omits the Finalize page); see [Custom Extensions — nested sessions](https://opendataensemble.org/docs/guides/custom-extensions#nested-sessions-and-custom-validators).
 - **Bundle extensions**: merge rules for `forms/ext.json` and `forms/{form}/ext.json` follow Formulus `ExtensionService`; see `src/lib/bundleResolution.ts`.
 - **Embedded formplayer**: production build copied into `public/formplayer_dist/`; load in a WebView with the same **`FormInitData`** expectations as mobile (see `src/lib/formplayerHost.ts` for placeholder types).
 
diff --git a/desktop/docs/CUSTOM_DATA_APPS.md b/desktop/docs/CUSTOM_DATA_APPS.md
new file mode 100644
index 000000000..560c036df
--- /dev/null
+++ b/desktop/docs/CUSTOM_DATA_APPS.md
@@ -0,0 +1,104 @@
+# Custom data-management apps (ODE Desktop backlog)
+
+**Status:** design only — not implemented.
+
+## Goal
+
+Load optional **custom data-management mini-apps** in the ODE Desktop Workbench alongside the Synkronus-downloaded **custom_app** bundle. These tools support study stewards and developers who need specialized UIs that are not part of the field collection app:
+
+- Choice-list CRUD stored as observations
+- Randomization administration
+- Data cleaning / QA workflows
+- Export prep or one-off transforms
+
+Field enumerators continue to use the **custom_app** (e.g. GBMIS) in Formulus. Data-management apps are for **desktop custody** work against the same workspace SQLite database.
+
+## Relationship to existing Workbench surfaces
+
+| Surface                                  | Audience              | Data path                                       |
+| ---------------------------------------- | --------------------- | ----------------------------------------------- |
+| **Custom app** (`/workbench/custom-app`) | Field workflow mirror | `bundles/active/app/` or dev mirror             |
+| **Form preview**                         | Form authors          | `bundles/active/forms/` + formplayer            |
+| **Observations** (Data management)       | Custodians            | Workspace DB via Tauri                          |
+| **Data apps** (proposed)                 | Study admins / devs   | Bundle-shipped HTML + same bridge as custom app |
+
+## Proposed bundle layout
+
+```
+bundles/active/
+  app/                    # existing custom_app (field)
+  forms/                  # existing forms
+  data_apps/
+    manifest.json         # registry
+    choice_admin/
+      index.html
+    randomization/
+      index.html
+```
+
+Example `manifest.json`:
+
+```json
+{
+  "dataApps": [
+    {
+      "id": "choice_admin",
+      "title": "Choice list editor",
+      "entry": "data_apps/choice_admin/index.html",
+      "description": "Edit shared lookup observations"
+    }
+  ]
+}
+```
+
+Synkronus bundle upload would include `data_apps/` when present; Desktop scans the active bundle on load.
+
+## Runtime architecture
+
+```mermaid
+flowchart LR
+  BundleZip[App bundle zip]
+  BundleZip --> ActiveApp[bundles/active/app]
+  BundleZip --> DataApps[bundles/active/data_apps/manifest.json]
+  Workbench[ODE Desktop Workbench]
+  Workbench --> CustomAppEmbed
+  Workbench --> DataAppHost[DataAppHost iframe]
+  DataAppHost --> SameBridge[formulus bridge subset]
+  SameBridge --> TauriDB[workspace SQLite]
+```
+
+### Host components (to build)
+
+1. **`DataAppManifestLoader`** — read `bundles/active/data_apps/manifest.json` (and dev mirror equivalent when developer mode mirrors `data_apps/`).
+2. **`DataAppHostPage`** — route `/workbench/data-apps/:id`; embed via reused `CustomAppEmbed` pattern with `indexRelativePath` pointing at manifest `entry`.
+3. **Navigation** — sidebar or Bundles page section listing registered data apps for the active bundle.
+4. **Bridge** — reuse [`formPreviewBridge.ts`](../src/lib/formPreviewBridge.ts) + `formulus-injection.js`. Subset is sufficient for admin tools:
+   - `getObservations` / `getObservationsByQuery`
+   - `persistObservation` (headless writes)
+   - `submitObservation` / `updateObservation` (optional finalize dialog)
+   - `sync` (when implemented on Desktop)
+   - `getCustomAppUri` / `getFormSpecsUri` (if app needs form specs)
+   - Stub or omit device APIs (camera, QR, GPS)
+
+### Security model
+
+- Load HTML **only** from paths declared in the signed bundle manifest (same trust model as `custom_app`).
+- No arbitrary folder picker for data apps (unlike developer-mode custom app mirror).
+- Data apps run in an iframe with the same `ReactNativeWebView` shim as the field custom app.
+
+## Developer mode
+
+When **custom app developer mode** is on, optionally mirror `data_apps/` from the local source folder if present (`<localFolder>/data_apps/`). Same pattern as `bundles/dev-local/app/` today.
+
+## Open questions
+
+1. Should data apps ship in the **same** Synkronus zip as the field app, or as a separate bundle type?
+2. Manifest versioning and compatibility checks (bridge API version).
+3. Whether data apps need Formplayer embed (nested forms) or only observation CRUD.
+4. Portal UI for uploading / validating `data_apps/manifest.json`.
+
+## References
+
+- [desktop/AGENTS.md](../AGENTS.md) — Workbench layout, developer mode, bridge
+- [formPreviewBridge.ts](../src/lib/formPreviewBridge.ts) — bridge message matrix
+- Formulus `FormulusInterfaceDefinition.ts` — contract source of truth
diff --git a/desktop/package.json b/desktop/package.json
index a969a6444..e27af5081 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ode-desktop",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.1.1",
   "packageManager": "pnpm@10.33.2",
   "type": "module",
   "scripts": {
diff --git a/desktop/public/formplayer-host-stub.js b/desktop/public/formplayer-host-stub.js
index df3518a0a..c284f4060 100644
--- a/desktop/public/formplayer-host-stub.js
+++ b/desktop/public/formplayer-host-stub.js
@@ -34,4 +34,43 @@
       }
     },
   };
+
+  /**
+   * ODE Desktop: deliver bridge *_response to pending Formulus promises without
+   * relying on postMessage from the outer shell (unreliable for srcdoc iframes in WebView2).
+   */
+  function deliverBridgeResponseBody(body) {
+    if (!body || !body.type || !body.messageId) {
+      return;
+    }
+    window.dispatchEvent(
+      new MessageEvent('message', {
+        data: JSON.stringify(body),
+      }),
+    );
+  }
+
+  window.__odeFormplayerDeliverBridgeResponse = function (
+    requestType,
+    messageId,
+    payload,
+  ) {
+    var responseType = requestType + '_response';
+    var body = { type: responseType, messageId: messageId };
+    if (payload && typeof payload === 'object') {
+      if ('result' in payload) body.result = payload.result;
+      if ('error' in payload) body.error = payload.error;
+    }
+    deliverBridgeResponseBody(body);
+  };
+
+  /** Same-origin broadcast fallback when the outer shell cannot postMessage into srcdoc iframes (WebView2). */
+  if (typeof BroadcastChannel !== 'undefined') {
+    var bridgeResponseChannel = new BroadcastChannel(
+      'ode-formplayer-bridge-response',
+    );
+    bridgeResponseChannel.onmessage = function (event) {
+      deliverBridgeResponseBody(event.data);
+    };
+  }
 })();
diff --git a/desktop/public/formulus-injection.js b/desktop/public/formulus-injection.js
index 4a93337c0..7207daf0d 100644
--- a/desktop/public/formulus-injection.js
+++ b/desktop/public/formulus-injection.js
@@ -1,6 +1,6 @@
 // Auto-generated from FormulusInterfaceDefinition.ts
 // Do not edit directly - this file will be overwritten
-// Last generated: 2026-05-02T16:53:14.030Z
+// Last generated: 2026-06-19T12:32:54.430Z
 
 (function () {
   // Enhanced API availability detection and recovery
@@ -229,7 +229,7 @@
       });
     },
 
-    // openFormplayer: formType, params, savedData, options?: { subObservationMode?, skipFinalize?, skipDraftSelection? }
+    // openFormplayer: formType: string, params: Record<string, unknown>, savedData: Record<string, unknown>, options: { subObservationMode?: boolean; skipFinalize?: boolean; skipDraftSelection?: boolean; } => Promise<FormCompletionResult>
     openFormplayer: function (formType, params, savedData, options) {
       return new Promise((resolve, reject) => {
         const messageId =
@@ -356,7 +356,7 @@
       });
     },
 
-    // getObservationsByQuery: options: { formType: string; isDraft?: boolean; includeDeleted?: boolean; whereClause?: string; } => Promise<FormObservation[]>
+    // getObservationsByQuery: options: { formType: string; isDraft?: boolean; includeDeleted?: boolean; filter?: ObservationFilter; whereClause?: string; } => Promise<FormObservation[]>
     getObservationsByQuery: function (options) {
       return new Promise((resolve, reject) => {
         const messageId =
@@ -664,6 +664,251 @@
       });
     },
 
+    // getCachedLocation: fieldId: string => Promise<LocationResult>
+    getCachedLocation: function (fieldId) {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('getCachedLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'getCachedLocation callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (
+              data.type === 'getCachedLocation_response' &&
+              data.messageId === messageId
+            ) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'getCachedLocation' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'getCachedLocation',
+            messageId,
+            fieldId: fieldId,
+          }),
+        );
+      });
+    },
+
+    // allocateSequence: scopeKey: string, options: { startAt?: number; peek?: boolean; } => Promise<number>
+    allocateSequence: function (scopeKey, options) {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('allocateSequence callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'allocateSequence callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (
+              data.type === 'allocateSequence_response' &&
+              data.messageId === messageId
+            ) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'allocateSequence' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'allocateSequence',
+            messageId,
+            scopeKey: scopeKey,
+            options: options,
+          }),
+        );
+      });
+    },
+
+    // watchLocation: fieldId: string => Promise<{ status: "started" | "error"; message?: string; }>
+    watchLocation: function (fieldId) {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('watchLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'watchLocation callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (
+              data.type === 'watchLocation_response' &&
+              data.messageId === messageId
+            ) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'watchLocation' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'watchLocation',
+            messageId,
+            fieldId: fieldId,
+          }),
+        );
+      });
+    },
+
+    // stopWatchLocation: fieldId: string => Promise<void>
+    stopWatchLocation: function (fieldId) {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('stopWatchLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'stopWatchLocation callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (
+              data.type === 'stopWatchLocation_response' &&
+              data.messageId === messageId
+            ) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'stopWatchLocation' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'stopWatchLocation',
+            messageId,
+            fieldId: fieldId,
+          }),
+        );
+      });
+    },
+
     // requestFile: fieldId: string => Promise<FileResult>
     requestFile: function (fieldId) {
       return new Promise((resolve, reject) => {
@@ -917,15 +1162,18 @@
         const messageId =
           'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
 
+        // Add response handler for methods that return values
+
         const callback = event => {
           try {
             let data;
             if (typeof event.data === 'string') {
               data = JSON.parse(event.data);
             } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data;
+              data = event.data; // Already an object
             } else {
-              window.removeEventListener('message', callback);
+              // console.warn('requestVideo callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
               reject(
                 new Error(
                   'requestVideo callback: Received response with unexpected data type. Raw: ' +
@@ -952,12 +1200,13 @@
               'Raw event.data:',
               event.data,
             );
-            window.removeEventListener('message', callback);
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
             reject(e);
           }
         };
         window.addEventListener('message', callback);
 
+        // Send the message to React Native
         globalThis.ReactNativeWebView.postMessage(
           JSON.stringify({
             type: 'requestVideo',
@@ -1633,6 +1882,245 @@
         );
       });
     },
+
+    // persistObservation: input: PersistObservationInput => Promise<PersistObservationResult>
+    persistObservation: function (input) {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('persistObservation callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'persistObservation callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (
+              data.type === 'persistObservation_response' &&
+              data.messageId === messageId
+            ) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'persistObservation' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'persistObservation',
+            messageId,
+            input: input,
+          }),
+        );
+      });
+    },
+
+    // sync: options: { includeAttachments?: boolean; } => Promise<SyncResult>
+    sync: function (options) {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('sync callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'sync callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (data.type === 'sync_response' && data.messageId === messageId) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'sync' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'sync',
+            messageId,
+            options: options,
+          }),
+        );
+      });
+    },
+
+    // getConnectivityStatus:  => Promise<ConnectivityStatus>
+    getConnectivityStatus: function () {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('getConnectivityStatus callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'getConnectivityStatus callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (
+              data.type === 'getConnectivityStatus_response' &&
+              data.messageId === messageId
+            ) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'getConnectivityStatus' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'getConnectivityStatus',
+            messageId,
+          }),
+        );
+      });
+    },
+
+    // getCurrentDataRevisionCount:  => Promise<number>
+    getCurrentDataRevisionCount: function () {
+      return new Promise((resolve, reject) => {
+        const messageId =
+          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+
+        // Add response handler for methods that return values
+
+        const callback = event => {
+          try {
+            let data;
+            if (typeof event.data === 'string') {
+              data = JSON.parse(event.data);
+            } else if (typeof event.data === 'object' && event.data !== null) {
+              data = event.data; // Already an object
+            } else {
+              // console.warn('getCurrentDataRevisionCount callback: Received response with unexpected data type:', typeof event.data, event.data);
+              window.removeEventListener('message', callback); // Clean up listener
+              reject(
+                new Error(
+                  'getCurrentDataRevisionCount callback: Received response with unexpected data type. Raw: ' +
+                    String(event.data),
+                ),
+              );
+              return;
+            }
+            if (
+              data.type === 'getCurrentDataRevisionCount_response' &&
+              data.messageId === messageId
+            ) {
+              window.removeEventListener('message', callback);
+              if (data.error) {
+                reject(new Error(data.error));
+              } else {
+                resolve(data.result);
+              }
+            }
+          } catch (e) {
+            console.error(
+              "'getCurrentDataRevisionCount' callback: Error processing response:",
+              e,
+              'Raw event.data:',
+              event.data,
+            );
+            window.removeEventListener('message', callback); // Ensure listener is removed on error too
+            reject(e);
+          }
+        };
+        window.addEventListener('message', callback);
+
+        // Send the message to React Native
+        globalThis.ReactNativeWebView.postMessage(
+          JSON.stringify({
+            type: 'getCurrentDataRevisionCount',
+            messageId,
+          }),
+        );
+      });
+    },
   };
 
   // Register the callback handler with the window object
diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
index 598c70279..93b92c6ba 100644
--- a/desktop/src-tauri/Cargo.lock
+++ b/desktop/src-tauri/Cargo.lock
@@ -2600,7 +2600,7 @@ dependencies = [
 
 [[package]]
 name = "odedesktop"
-version = "1.0.1"
+version = "1.1.1"
 dependencies = [
  "chrono",
  "keyring",
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index 0a8ec74fb..60fbc37b9 100644
--- a/desktop/src-tauri/Cargo.toml
+++ b/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "odedesktop"
-version = "1.0.1"
+version = "1.1.1"
 description = "ODE Desktop"
 authors = ["OpenDataEnsemble.org"]
 edition = "2024"
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index e31a5d2b2..c0abc3a63 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -1021,6 +1021,21 @@ fn mirror_custom_app_dev_folder(ws: &Path, source: &Path) -> Result<u64, Custodi
         let mirror_forms = dev_local.join("forms");
         copy_dir_recursive_counting(&forms_src, &mirror_forms, &mut copied_files)?;
     }
+    let mirror_qt = mirror_app.join("question_types");
+    if !mirror_qt.is_dir() {
+        let qt_candidates = [
+            source.join("question_types"),
+            source.join("public").join("question_types"),
+            source.join("..").join("public").join("question_types"),
+            source.join("..").join("..").join("question_types"),
+        ];
+        for qt_src in qt_candidates {
+            if qt_src.is_dir() {
+                copy_dir_recursive_counting(&qt_src, &mirror_qt, &mut copied_files)?;
+                break;
+            }
+        }
+    }
     Ok(copied_files)
 }
 
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index f12d1d540..b9e978466 100644
--- a/desktop/src-tauri/tauri.conf.json
+++ b/desktop/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "ODE Desktop",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "identifier": "org.opendataensemble.custodian",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/desktop/src/components/CustomAppEmbed.tsx b/desktop/src/components/CustomAppEmbed.tsx
index ac1e5b3b4..9542d418e 100644
--- a/desktop/src/components/CustomAppEmbed.tsx
+++ b/desktop/src/components/CustomAppEmbed.tsx
@@ -72,6 +72,8 @@ export type CustomAppEmbedProps = {
   /** Workspace-relative path to `index.html`; defaults from {@link mode}. */
   indexRelativePath?: string;
   loadingLabel?: string;
+  /** Fired when the iframe document loads (bridge routing in WebView2). */
+  onContentWindowReady?: (contentWindow: Window | null) => void;
 };
 
 function defaultIndexRelativePath(mode: CustomAppEmbedMode): string {
@@ -93,10 +95,12 @@ export const CustomAppEmbed = forwardRef<
   HTMLIFrameElement,
   CustomAppEmbedProps
 >(function CustomAppEmbed(
-  { mountKey, mode, indexRelativePath, loadingLabel },
+  { mountKey, mode, indexRelativePath, loadingLabel, onContentWindowReady },
   ref,
 ) {
   const innerRef = useRef<HTMLIFrameElement | null>(null);
+  const onContentWindowReadyRef = useRef(onContentWindowReady);
+  onContentWindowReadyRef.current = onContentWindowReady;
   const setRefs = useCallback(
     (el: HTMLIFrameElement | null) => {
       (innerRef as MutableRefObject<HTMLIFrameElement | null>).current = el;
@@ -149,6 +153,7 @@ export const CustomAppEmbed = forwardRef<
       // hash for routing (HashRouter or path), so `#ode-…` would break the initial route.
       const url = `${indexAssetUrl}?ode=${Date.now()}`;
       el.onload = () => {
+        onContentWindowReadyRef.current?.(el.contentWindow);
         setLoading(false);
       };
       el.src = url;
diff --git a/desktop/src/components/FormplayerEmbed.tsx b/desktop/src/components/FormplayerEmbed.tsx
index e655d2a4d..0b691fb4d 100644
--- a/desktop/src/components/FormplayerEmbed.tsx
+++ b/desktop/src/components/FormplayerEmbed.tsx
@@ -2,10 +2,11 @@ import {
   forwardRef,
   useCallback,
   useEffect,
+  useImperativeHandle,
   useRef,
   useState,
-  type MutableRefObject,
 } from 'react';
+import { postFormplayerBridgeReply } from '../lib/formPreviewBridge';
 import type { FormInitData } from '../lib/formplayerHost';
 
 const FORMSPLAYER_INDEX = `${import.meta.env.BASE_URL}formplayer_dist/index.html`;
@@ -40,6 +41,18 @@ export type FormplayerEmbedProps = {
   /** Full `FormInitData` for the embedded formplayer; `null` shows `emptyMessage` only. */
   formInitData: FormInitData | null;
   emptyMessage?: string;
+  /** Fired when the iframe document loads (used to register `contentWindow` for bridge routing). */
+  onContentWindowReady?: (contentWindow: Window | null) => void;
+};
+
+/** Imperative handle for bridge delivery into the iframe document (WebView2-safe). */
+export type FormplayerEmbedHandle = {
+  getIframe: () => HTMLIFrameElement | null;
+  deliverBridgeResponse: (
+    requestType: string,
+    messageId: string,
+    payload: { result?: unknown; error?: string },
+  ) => void;
 };
 
 /**
@@ -48,27 +61,40 @@ export type FormplayerEmbedProps = {
  * base href) so Finalize / `submitObservation` and extension APIs work.
  */
 export const FormplayerEmbed = forwardRef<
-  HTMLIFrameElement,
+  FormplayerEmbedHandle,
   FormplayerEmbedProps
 >(function FormplayerEmbed(
   {
     formInitData,
     emptyMessage = 'Select a form type and apply params/saved JSON to load the preview.',
+    onContentWindowReady,
   },
   ref,
 ) {
   const innerRef = useRef<HTMLIFrameElement | null>(null);
   const timeoutRef = useRef<number | null>(null);
-  const setRefs = useCallback(
-    (el: HTMLIFrameElement | null) => {
-      (innerRef as MutableRefObject<HTMLIFrameElement | null>).current = el;
-      if (typeof ref === 'function') {
-        ref(el);
-      } else if (ref) {
-        (ref as MutableRefObject<HTMLIFrameElement | null>).current = el;
-      }
-    },
-    [ref],
+  const onContentWindowReadyRef = useRef(onContentWindowReady);
+  onContentWindowReadyRef.current = onContentWindowReady;
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      getIframe: () => innerRef.current,
+      deliverBridgeResponse: (requestType, messageId, payload) => {
+        const win = innerRef.current?.contentWindow ?? null;
+        if (!win) {
+          return;
+        }
+        postFormplayerBridgeReply(
+          innerRef.current,
+          requestType,
+          messageId,
+          payload,
+          win,
+        );
+      },
+    }),
+    [],
   );
 
   const [error, setError] = useState<string | null>(null);
@@ -122,6 +148,7 @@ export const FormplayerEmbed = forwardRef<
           window.clearTimeout(timeoutRef.current);
           timeoutRef.current = null;
         }
+        onContentWindowReadyRef.current?.(el.contentWindow);
         setLoading(false);
       };
       // WebView2 can behave inconsistently with blob: + module scripts in packaged apps.
@@ -160,7 +187,9 @@ export const FormplayerEmbed = forwardRef<
       {error ? <p className="notice warn">{error}</p> : null}
       {loading && !error ? <p className="muted">Loading formplayer…</p> : null}
       <iframe
-        ref={setRefs}
+        ref={el => {
+          innerRef.current = el;
+        }}
         title="Formplayer preview"
         className="formplayer-embed-frame"
       />
diff --git a/desktop/src/lib/__tests__/formPreviewBridge.test.ts b/desktop/src/lib/__tests__/formPreviewBridge.test.ts
index e9f7734c8..4df7f2796 100644
--- a/desktop/src/lib/__tests__/formPreviewBridge.test.ts
+++ b/desktop/src/lib/__tests__/formPreviewBridge.test.ts
@@ -49,6 +49,7 @@ vi.mock('../tauriClient', () => ({
       .fn()
       .mockResolvedValue('file:///tmp/ws/attachments/synced/'),
     workspaceAttachmentFileUrl: vi.fn().mockResolvedValue(null),
+    saveObservation: vi.fn().mockResolvedValue({ id: 'saved-1' }),
   },
 }));
 
@@ -69,6 +70,7 @@ describe('FORMULUS_INJECTION_REQUEST_TYPES', () => {
   it('lists known injection request types', () => {
     expect(FORMULUS_INJECTION_REQUEST_TYPES).toContain('getVersion');
     expect(FORMULUS_INJECTION_REQUEST_TYPES).toContain('submitObservation');
+    expect(FORMULUS_INJECTION_REQUEST_TYPES).toContain('persistObservation');
     expect(FORMULUS_INJECTION_REQUEST_TYPES).toContain('requestVideo');
   });
 });
@@ -161,6 +163,7 @@ describe('handleFormPreviewBridgeMessage', () => {
     expect(postPrimary).not.toHaveBeenCalled();
     expect(defer).toHaveBeenCalledWith({
       parentIframe: primaryIframe,
+      parentContentWindow: primaryCw,
       messageId: 'op-def',
       formType: 'child_form',
       params: { a: 1 },
@@ -205,6 +208,36 @@ describe('handleFormPreviewBridgeMessage', () => {
     expect(payload.result).toBe('nested-synthetic-id');
   });
 
+  it('allocateSequence honors peek (nested in options) without advancing the counter', async () => {
+    const postMessage = vi.fn();
+    const cw = { postMessage } as unknown as Window;
+    const iframe = { contentWindow: cw } as HTMLIFrameElement;
+
+    const allocate = async (
+      options: Record<string, unknown> | undefined,
+      messageId: string,
+    ) => {
+      await handleFormPreviewBridgeMessage(
+        bridgeMessageFromIframe(iframe, {
+          type: 'allocateSequence',
+          messageId,
+          scopeKey: 'tb:peek-test:role:A:af',
+          options,
+        }),
+        { iframe, onFinalize: async () => ({ error: 'no' }) },
+      );
+      const calls = postMessage.mock.calls;
+      const payload = JSON.parse(calls[calls.length - 1][0] as string);
+      return payload.result as number;
+    };
+
+    // Consume -> 1, peek -> 2 (no advance), consume -> 2.
+    expect(await allocate(undefined, 'seq1')).toBe(1);
+    expect(await allocate({ peek: true }, 'seq2')).toBe(2);
+    expect(await allocate({ peek: true }, 'seq3')).toBe(2);
+    expect(await allocate(undefined, 'seq4')).toBe(2);
+  });
+
   it('stubs requestCamera with prefixed error', async () => {
     const postMessage = vi.fn();
     const cw = { postMessage } as unknown as Window;
@@ -478,4 +511,116 @@ describe('postFormplayerBridgeReply', () => {
     const payload = JSON.parse(postMessage.mock.calls[0][0] as string);
     expect(payload.type).toBe('getThemeMode_response');
   });
+
+  it('persistObservation creates observation headlessly', async () => {
+    vi.mocked(tauriClient.saveObservation).mockClear();
+    const postMessage = vi.fn();
+    const cw = { postMessage } as unknown as Window;
+    const iframe = { contentWindow: cw } as HTMLIFrameElement;
+    const finalData = { region: 'Bafata', released_extras: 1 };
+
+    await handleFormPreviewBridgeMessage(
+      bridgeMessageFromIframe(iframe, {
+        type: 'persistObservation',
+        messageId: 'po-create',
+        input: { formType: 'inclusion_decision', finalData },
+      }),
+      {
+        iframe,
+        onFinalize: async () => ({ error: 'no' }),
+      },
+    );
+
+    expect(tauriClient.saveObservation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        formType: 'inclusion_decision',
+        payload: finalData,
+      }),
+    );
+    const payload = JSON.parse(postMessage.mock.calls[0][0] as string);
+    expect(payload.type).toBe('persistObservation_response');
+    expect(payload.result.formData).toEqual(finalData);
+    expect(payload.result.observationId).toBeTruthy();
+  });
+
+  it('persistObservation updates when observationId provided', async () => {
+    vi.mocked(tauriClient.saveObservation).mockClear();
+    const postMessage = vi.fn();
+    const cw = { postMessage } as unknown as Window;
+    const iframe = { contentWindow: cw } as HTMLIFrameElement;
+    const finalData = { released_extras: 2 };
+
+    await handleFormPreviewBridgeMessage(
+      bridgeMessageFromIframe(iframe, {
+        type: 'persistObservation',
+        messageId: 'po-update',
+        input: {
+          formType: 'inclusion_decision',
+          finalData,
+          observationId: 'existing-id-42',
+        },
+      }),
+      {
+        iframe,
+        onFinalize: async () => ({ error: 'no' }),
+      },
+    );
+
+    expect(tauriClient.saveObservation).toHaveBeenCalledWith({
+      id: 'existing-id-42',
+      formType: 'inclusion_decision',
+      payload: finalData,
+    });
+    const payload = JSON.parse(postMessage.mock.calls[0][0] as string);
+    expect(payload.result.observationId).toBe('existing-id-42');
+  });
+
+  it('persistObservation rejects missing formType', async () => {
+    vi.mocked(tauriClient.saveObservation).mockClear();
+    const postMessage = vi.fn();
+    const cw = { postMessage } as unknown as Window;
+    const iframe = { contentWindow: cw } as HTMLIFrameElement;
+
+    await handleFormPreviewBridgeMessage(
+      bridgeMessageFromIframe(iframe, {
+        type: 'persistObservation',
+        messageId: 'po-bad',
+        input: { finalData: {} },
+      }),
+      {
+        iframe,
+        onFinalize: async () => ({ error: 'no' }),
+      },
+    );
+
+    const payload = JSON.parse(postMessage.mock.calls[0][0] as string);
+    expect(payload.error).toContain('formType is required');
+    expect(tauriClient.saveObservation).not.toHaveBeenCalled();
+  });
+
+  it('delivers via __odeFormplayerDeliverBridgeResponse and postMessage', () => {
+    const postMessage = vi.fn();
+    const deliver = vi.fn();
+    const cw = {
+      postMessage,
+      __odeFormplayerDeliverBridgeResponse: deliver,
+    } as unknown as Window;
+    const iframe = { contentWindow: cw } as HTMLIFrameElement;
+
+    postFormplayerBridgeReply(
+      iframe,
+      'openFormplayer',
+      'msg-parent',
+      { result: { status: 'form_submitted', formData: { a: 1 } } },
+      cw,
+    );
+
+    expect(deliver).toHaveBeenCalledWith('openFormplayer', 'msg-parent', {
+      result: { status: 'form_submitted', formData: { a: 1 } },
+    });
+    expect(postMessage).toHaveBeenCalledTimes(1);
+    const payload = JSON.parse(postMessage.mock.calls[0][0] as string);
+    expect(payload.type).toBe('openFormplayer_response');
+    expect(payload.messageId).toBe('msg-parent');
+  });
 });
diff --git a/desktop/src/lib/__tests__/formPreviewSubObservationBridge.test.ts b/desktop/src/lib/__tests__/formPreviewSubObservationBridge.test.ts
new file mode 100644
index 000000000..75c80e1b7
--- /dev/null
+++ b/desktop/src/lib/__tests__/formPreviewSubObservationBridge.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { FormplayerEmbedHandle } from '../../components/FormplayerEmbed';
+import {
+  clearPendingSubObservationOpensForTests,
+  deliverSubObservationCompletion,
+  registerPendingSubObservationOpen,
+} from '../formPreviewSubObservationBridge';
+
+describe('formPreviewSubObservationBridge', () => {
+  it('delivers completion via parent embed handle and content window', () => {
+    clearPendingSubObservationOpensForTests();
+    const postMessage = vi.fn();
+    const deliver = vi.fn();
+    const parentWindow = { postMessage } as unknown as Window;
+    const handle = {
+      getIframe: () => ({ contentWindow: parentWindow }) as HTMLIFrameElement,
+      deliverBridgeResponse: deliver,
+    } satisfies FormplayerEmbedHandle;
+
+    registerPendingSubObservationOpen({
+      parentMessageId: 'msg-1',
+      parentEmbed: handle,
+      parentContentWindow: parentWindow,
+      formType: 'child_form',
+    });
+
+    const ok = deliverSubObservationCompletion('msg-1', {
+      status: 'form_submitted',
+      formType: 'child_form',
+      formData: { k: 'v' },
+    });
+
+    expect(ok).toBe(true);
+    expect(deliver).toHaveBeenCalledWith('openFormplayer', 'msg-1', {
+      result: {
+        status: 'form_submitted',
+        formType: 'child_form',
+        formData: { k: 'v' },
+      },
+    });
+    expect(postMessage).toHaveBeenCalled();
+  });
+});
diff --git a/desktop/src/lib/bundleExtensionLoader.ts b/desktop/src/lib/bundleExtensionLoader.ts
index c004e097b..54e97aaf7 100644
--- a/desktop/src/lib/bundleExtensionLoader.ts
+++ b/desktop/src/lib/bundleExtensionLoader.ts
@@ -1,5 +1,7 @@
-import { bundleFormsRel } from './bundleLayout';
-import type { FormInitData } from './formplayerHost';
+import { convertFileSrc } from '@tauri-apps/api/core';
+import { join } from '@tauri-apps/api/path';
+import { bundleFormsRel, bundleSegment } from './bundleLayout';
+import type { ExtensionMetadata, FormInitData } from './formplayerHost';
 import { tauriClient } from './tauriClient';
 
 export type ExtensionFunctionShape = {
@@ -96,8 +98,8 @@ function mergeLayer(
 export function formplayerExtensionsFromMerged(
   merged: ReturnType<typeof normalizeJson>,
   basePath: string,
-): NonNullable<FormInitData['extensions']> {
-  const functions: Record<string, unknown> = {};
+): ExtensionMetadata {
+  const functions: NonNullable<ExtensionMetadata['functions']> = {};
   for (const [key, func] of Object.entries(merged.functions)) {
     const modulePath = (func.module || '').replace(/^\/+/, '');
     functions[key] = {
@@ -106,7 +108,7 @@ export function formplayerExtensionsFromMerged(
       export: func.export,
     };
   }
-  const renderers: Record<string, unknown> = {};
+  const renderers: NonNullable<ExtensionMetadata['renderers']> = {};
   for (const [key, r] of Object.entries(merged.renderers)) {
     const modulePath = (r.module || '').replace(/^\/+/, '');
     renderers[key] = {
@@ -173,6 +175,27 @@ export async function loadBundleFormplayerExtensions(
   if (hasExtensionContent) {
     const basePath = await tauriClient.getActiveBundleFormsFileBaseUrl();
     extensions = formplayerExtensionsFromMerged(merged, basePath);
+
+    const ws = await tauriClient.getWorkspace();
+    if (ws && extensions?.functions) {
+      const segment = bundleSegment(developerMode);
+      const gbmisAbs = await join(
+        ws,
+        'bundles',
+        segment,
+        'app',
+        'extensions',
+        'gbmis.js',
+      );
+      const gbmisUrl = convertFileSrc(gbmisAbs);
+      for (const fn of Object.values(extensions.functions)) {
+        const meta = fn as Record<string, unknown>;
+        const modulePath = String(meta.module ?? '');
+        if (modulePath.includes('gbmis.js')) {
+          meta.module = gbmisUrl;
+        }
+      }
+    }
   } else {
     extensions = undefined;
   }
diff --git a/desktop/src/lib/formPreviewBridge.ts b/desktop/src/lib/formPreviewBridge.ts
index 60be09a23..af03ac3d1 100644
--- a/desktop/src/lib/formPreviewBridge.ts
+++ b/desktop/src/lib/formPreviewBridge.ts
@@ -11,6 +11,7 @@
  * | `getObservations` | Local SQLite via `listObservationsPage`. |
  * | `getObservationsByQuery` | `query_observations` with structured `filter` AST. |
  * | `submitObservation` / `updateObservation` | Finalize dialog (JSON export or DB). |
+ * | `persistObservation` | Headless create/update via `saveObservation` (no finalize dialog). |
  * | `requestCamera` / `requestLocation` / `requestFile` / `requestAudio` / `requestVideo` / `requestQrcode` / `requestBiometric` | **Stub** — no device bridge in preview. |
  * | `launchIntent` / `callSubform` | **Stub** — not supported in preview. |
  * | `requestConnectivityStatus` / `requestSyncStatus` | **No-op** success (`result` omitted) so callers resolve. |
@@ -32,8 +33,29 @@ import { dirname, join } from '@tauri-apps/api/path';
 import { tauriClient } from './tauriClient';
 import type { ObservationRecord } from '../types/domain';
 
+/** Preview-local sequence counters (device id stub + app scope suffix). */
+const previewSequenceCounters = new Map<string, number>();
+
+function previewAllocateSequence(
+  scopeKey: string,
+  options?: { startAt?: number; peek?: boolean },
+): number {
+  const key = `device:desktop-preview:${scopeKey.trim()}`;
+  const startAt = options?.startAt ?? 1;
+  const last = previewSequenceCounters.get(key) ?? startAt - 1;
+  const next = last + 1;
+  if (!options?.peek) {
+    previewSequenceCounters.set(key, next);
+  }
+  return next;
+}
+
 /** Matches `FORMULUS_INTERFACE_VERSION` in formplayer (`FormulusInterfaceDefinition.ts`). */
-export const FORM_PREVIEW_FORMULUS_INTERFACE_VERSION = '1.2.1';
+export const FORM_PREVIEW_FORMULUS_INTERFACE_VERSION = '1.5.0';
+
+/** Must match `formplayer-host-stub.js` — delivers `*_response` to pending Formulus promises in iframes. */
+export const FORMPLAYER_BRIDGE_RESPONSE_CHANNEL =
+  'ode-formplayer-bridge-response';
 
 /** Prefix for stub `error` strings so logs and issues are easy to grep. */
 export const DESKTOP_FORM_PREVIEW_PREFIX = 'ODE Desktop form preview';
@@ -68,6 +90,8 @@ export const FORMULUS_INJECTION_REQUEST_TYPES = [
   'getAttachmentsUri',
   'getCustomAppUri',
   'getFormSpecsUri',
+  'allocateSequence',
+  'persistObservation',
 ] as const;
 
 export type FinalizeRequest =
@@ -82,6 +106,8 @@ export type FinalizeRequest =
 /** Payload when formplayer requests a nested sub-observation session (`openFormplayer` + `subObservationMode`). */
 export type FormPreviewDeferOpenSubObservationPayload = {
   parentIframe: HTMLIFrameElement;
+  /** Parent formplayer `contentWindow` from the bridge message (`event.source`). */
+  parentContentWindow: Window | null;
   messageId: string;
   formType: string;
   params: Record<string, unknown>;
@@ -108,6 +134,7 @@ export type FormPreviewBridgeContext = {
     formType: string;
     params: Record<string, unknown>;
     savedData: Record<string, unknown>;
+    observationId?: string;
   }) => void;
   /**
    * Form preview: defer `openFormplayer_response` until nested finalize/cancel.
@@ -152,17 +179,60 @@ function resolveBridgeReplyIframe(
   return primary;
 }
 
+function buildBridgeResponseBody(
+  requestType: string,
+  messageId: string,
+  payload: { result?: unknown; error?: string },
+): Record<string, unknown> {
+  return { type: `${requestType}_response`, messageId, ...payload };
+}
+
 export function postFormplayerBridgeReply(
   iframe: HTMLIFrameElement | null,
   requestType: string,
   messageId: string,
   payload: { result?: unknown; error?: string },
+  /** Prefer a window captured on iframe load (srcdoc / WebView2). */
+  targetWindow?: Window | null,
 ): void {
-  const responseType = `${requestType}_response`;
-  iframe?.contentWindow?.postMessage(
-    JSON.stringify({ type: responseType, messageId, ...payload }),
-    '*',
-  );
+  const body = buildBridgeResponseBody(requestType, messageId, payload);
+  const serialized = JSON.stringify(body);
+  const win = targetWindow ?? iframe?.contentWindow ?? null;
+
+  if (win) {
+    try {
+      const deliver = (
+        win as Window & {
+          __odeFormplayerDeliverBridgeResponse?: (
+            requestType: string,
+            messageId: string,
+            payload: { result?: unknown; error?: string },
+          ) => void;
+        }
+      ).__odeFormplayerDeliverBridgeResponse;
+      if (typeof deliver === 'function') {
+        deliver(requestType, messageId, payload);
+      }
+    } catch {
+      // cross-origin or inaccessible — fall back below
+    }
+
+    try {
+      win.postMessage(serialized, '*');
+    } catch {
+      // ignore — BroadcastChannel may still reach the iframe
+    }
+  }
+
+  try {
+    if (typeof BroadcastChannel !== 'undefined') {
+      const channel = new BroadcastChannel(FORMPLAYER_BRIDGE_RESPONSE_CHANNEL);
+      channel.postMessage(body);
+      channel.close();
+    }
+  } catch {
+    // optional fallback
+  }
 }
 
 function stubReason(detail: string): { error: string } {
@@ -310,6 +380,28 @@ export async function handleFormPreviewBridgeMessage(
         });
         return;
 
+      case 'allocateSequence': {
+        const scopeKey =
+          typeof data.scopeKey === 'string'
+            ? data.scopeKey
+            : typeof data.payload === 'string'
+              ? data.payload
+              : '';
+        // Injection sends options nested under `options`; fall back to flat
+        // top-level fields for back-compat with older callers.
+        const opts = (
+          data.options && typeof data.options === 'object'
+            ? (data.options as Record<string, unknown>)
+            : data
+        ) as { startAt?: unknown; peek?: unknown };
+        const startAt =
+          typeof opts.startAt === 'number' ? opts.startAt : undefined;
+        const peek = Boolean(opts.peek);
+        const result = previewAllocateSequence(scopeKey, { startAt, peek });
+        reply('allocateSequence', { result });
+        return;
+      }
+
       case 'getAvailableForms': {
         const rows = await tauriClient.listActiveBundleForms();
         const result = rows.map(r => ({
@@ -332,16 +424,24 @@ export async function handleFormPreviewBridgeMessage(
               subObservationMode?: boolean;
               skipFinalize?: boolean;
               skipDraftSelection?: boolean;
+              observationId?: string | null;
             }
           | undefined;
         const subObservationMode = Boolean(options?.subObservationMode);
+        const observationId =
+          typeof options?.observationId === 'string'
+            ? options.observationId.trim()
+            : '';
 
         if (subObservationMode && ctx.onDeferOpenSubObservation) {
-          const parentIframe =
-            resolveBridgeReplyIframe(eventSource, ctx) ?? ctx.iframe;
+          const parentIframe = resolveBridgeReplyIframe(eventSource, ctx);
           if (parentIframe) {
             ctx.onDeferOpenSubObservation({
               parentIframe,
+              parentContentWindow:
+                eventSource != null && typeof eventSource === 'object'
+                  ? (eventSource as Window)
+                  : null,
               messageId,
               formType,
               params,
@@ -351,10 +451,22 @@ export async function handleFormPreviewBridgeMessage(
             });
             return;
           }
+          reply(
+            'openFormplayer',
+            stubReason(
+              'Could not identify the parent formplayer iframe for nested sub-observation open.',
+            ),
+          );
+          return;
         }
 
         if (ctx.onOpenFormplayerNavigate) {
-          ctx.onOpenFormplayerNavigate({ formType, params, savedData });
+          ctx.onOpenFormplayerNavigate({
+            formType,
+            params,
+            savedData,
+            ...(observationId ? { observationId } : {}),
+          });
           reply('openFormplayer', {
             result: {
               status: 'cancelled',
@@ -670,6 +782,45 @@ export async function handleFormPreviewBridgeMessage(
         return;
       }
 
+      case 'persistObservation': {
+        const input = (data.input ?? data) as {
+          formType?: string;
+          finalData?: Record<string, unknown>;
+          observationId?: string | null;
+        };
+        const formType = String(input.formType ?? '').trim();
+        if (!formType) {
+          reply('persistObservation', {
+            error: 'persistObservation: formType is required',
+          });
+          return;
+        }
+        if (
+          !input.finalData ||
+          typeof input.finalData !== 'object' ||
+          Array.isArray(input.finalData)
+        ) {
+          reply('persistObservation', {
+            error: 'persistObservation: finalData object is required',
+          });
+          return;
+        }
+        const existingId =
+          typeof input.observationId === 'string'
+            ? input.observationId.trim()
+            : '';
+        const id = existingId || crypto.randomUUID();
+        await tauriClient.saveObservation({
+          id,
+          formType,
+          payload: input.finalData,
+        });
+        reply('persistObservation', {
+          result: { observationId: id, formData: input.finalData },
+        });
+        return;
+      }
+
       default:
         reply(t, {
           error: `${DESKTOP_FORM_PREVIEW_PREFIX}: unhandled message type "${t}" (regenerate FORMULUS_INJECTION_REQUEST_TYPES or add a case).`,
diff --git a/desktop/src/lib/formPreviewSubObservationBridge.ts b/desktop/src/lib/formPreviewSubObservationBridge.ts
new file mode 100644
index 000000000..2234977c6
--- /dev/null
+++ b/desktop/src/lib/formPreviewSubObservationBridge.ts
@@ -0,0 +1,83 @@
+/**
+ * Tracks deferred `openFormplayer` (subObservationMode) sessions in the ODE Desktop shell.
+ *
+ * Formulus resolves nested completion by injecting `postMessage` into the *parent* WebView.
+ * ODE Desktop uses stacked srcdoc iframes; delivery must target the parent embed's live
+ * `contentWindow` via {@link FormplayerEmbedHandle}, not a captured HTMLIFrameElement ref.
+ */
+
+import type { FormplayerEmbedHandle } from '../components/FormplayerEmbed';
+import { postFormplayerBridgeReply } from './formPreviewBridge';
+
+export type PendingSubObservationOpen = {
+  parentMessageId: string;
+  parentEmbed: FormplayerEmbedHandle | null;
+  /** Parent iframe `contentWindow` captured when the nested open was deferred. */
+  parentContentWindow: Window | null;
+  formType: string;
+};
+
+const pendingOpens = new Map<string, PendingSubObservationOpen>();
+
+export function registerPendingSubObservationOpen(
+  entry: PendingSubObservationOpen,
+): void {
+  pendingOpens.set(entry.parentMessageId, entry);
+}
+
+export function dropPendingSubObservationOpen(messageId: string): void {
+  pendingOpens.delete(messageId);
+}
+
+export function deliverSubObservationCompletion(
+  messageId: string,
+  completion: Record<string, unknown>,
+): boolean {
+  const entry = pendingOpens.get(messageId);
+  if (!entry) {
+    return false;
+  }
+  pendingOpens.delete(messageId);
+
+  const payload = { result: completion };
+
+  entry.parentEmbed?.deliverBridgeResponse(
+    'openFormplayer',
+    messageId,
+    payload,
+  );
+
+  const send = () => {
+    if (entry.parentContentWindow) {
+      postFormplayerBridgeReply(
+        entry.parentEmbed?.getIframe() ?? null,
+        'openFormplayer',
+        messageId,
+        payload,
+        entry.parentContentWindow,
+      );
+    }
+  };
+  send();
+  queueMicrotask(send);
+  requestAnimationFrame(send);
+  window.setTimeout(send, 0);
+  window.setTimeout(send, 50);
+
+  return true;
+}
+
+export function deliverSubObservationCancelled(
+  messageId: string,
+  formType: string,
+): boolean {
+  return deliverSubObservationCompletion(messageId, {
+    status: 'cancelled',
+    formType,
+  });
+}
+
+/** @internal test helper */
+export function clearPendingSubObservationOpensForTests(): void {
+  pendingOpens.clear();
+}
diff --git a/desktop/src/lib/formplayerHost.ts b/desktop/src/lib/formplayerHost.ts
index 91d8b5661..6f380f5d1 100644
--- a/desktop/src/lib/formplayerHost.ts
+++ b/desktop/src/lib/formplayerHost.ts
@@ -3,6 +3,30 @@
  * Full WebView host wiring is tracked in the ODE Desktop plan.
  */
 
+/** Mirrors `FormulusInterfaceDefinition.ExtensionMetadata`. */
+export interface ExtensionMetadata {
+  definitions?: Record<string, unknown>;
+  functions?: Record<
+    string,
+    {
+      name: string;
+      module: string;
+      export?: string;
+    }
+  >;
+  renderers?: Record<
+    string,
+    {
+      name: string;
+      format: string;
+      module: string;
+      tester?: string;
+      renderer?: string;
+    }
+  >;
+  basePath?: string;
+}
+
 /** Mirrors `FormulusInterfaceDefinition.FormInitData` for the embedded formplayer host. */
 export interface FormInitData {
   formType: string;
@@ -17,7 +41,7 @@ export interface FormInitData {
   skipFinalize?: boolean;
   /** Skip DraftSelector when the host orchestrates the session. */
   skipDraftSelection?: boolean;
-  extensions?: unknown;
+  extensions?: ExtensionMetadata;
   customQuestionTypes?: unknown;
 }
 
diff --git a/desktop/src/lib/iframeMessageSource.ts b/desktop/src/lib/iframeMessageSource.ts
new file mode 100644
index 000000000..21b1a4b3b
--- /dev/null
+++ b/desktop/src/lib/iframeMessageSource.ts
@@ -0,0 +1,25 @@
+/**
+ * WebKit / WCO (Tauri): `MessageEvent.source` may not be strictly `===` to
+ * `iframe.contentWindow`, and `instanceof Window` can be false for iframe globals.
+ * `window.frameElement === iframe` identifies the embedding element reliably for same-origin frames.
+ */
+export function messageSourceMatchesIframe(
+  source: Window,
+  iframe: HTMLIFrameElement | null | undefined,
+  registeredContentWindow?: Window | null,
+): boolean {
+  if (registeredContentWindow && source === registeredContentWindow) {
+    return true;
+  }
+  if (!iframe) {
+    return false;
+  }
+  try {
+    if (iframe.contentWindow === source) {
+      return true;
+    }
+    return source.frameElement === iframe;
+  } catch {
+    return false;
+  }
+}
diff --git a/desktop/src/lib/synkConstants.ts b/desktop/src/lib/synkConstants.ts
index 690620027..c76620a44 100644
--- a/desktop/src/lib/synkConstants.ts
+++ b/desktop/src/lib/synkConstants.ts
@@ -1,2 +1,2 @@
 /** Must match Synkronus OpenAPI `x-ode-version` (semver). */
-export const SYNKRONUS_CLIENT_VERSION = '1.0.0';
+export const SYNKRONUS_CLIENT_VERSION = '1.1.1';
diff --git a/desktop/src/pages/AboutPage.tsx b/desktop/src/pages/AboutPage.tsx
index ca3b4d2ee..28b33d182 100644
--- a/desktop/src/pages/AboutPage.tsx
+++ b/desktop/src/pages/AboutPage.tsx
@@ -1,4 +1,8 @@
+import { useEffect, useState } from 'react';
+import { getVersion } from '@tauri-apps/api/app';
+import { isTauri } from '@tauri-apps/api/core';
 import brandMarkUrl from '../assets/custodian.png';
+import packageJson from '../../package.json';
 
 const LINKS = [
   { href: 'https://opendataensemble.org', label: 'Website' },
@@ -11,6 +15,23 @@ const LINKS = [
 ] as const;
 
 export function AboutPage() {
+  const [version, setVersion] = useState('');
+
+  useEffect(() => {
+    const load = async () => {
+      try {
+        if (isTauri()) {
+          setVersion(await getVersion());
+        } else {
+          setVersion(packageJson.version?.trim() ?? '');
+        }
+      } catch {
+        setVersion('');
+      }
+    };
+    void load();
+  }, []);
+
   return (
     <section className="page page-about">
       <img
@@ -21,6 +42,7 @@ export function AboutPage() {
         height={256}
       />
       <h2>ODE Desktop</h2>
+      {version ? <p className="about-version">v{version}</p> : null}
       <p>
         Open Data Ensemble is an offline-first ecosystem for field data
         collection, synchronization, and stewardship. ODE Desktop helps you
diff --git a/desktop/src/pages/FormPreviewPage.tsx b/desktop/src/pages/FormPreviewPage.tsx
index c1be7171c..317745108 100644
--- a/desktop/src/pages/FormPreviewPage.tsx
+++ b/desktop/src/pages/FormPreviewPage.tsx
@@ -1,7 +1,10 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { FormFinalizeDialog } from '../components/FormFinalizeDialog';
-import { FormplayerEmbed } from '../components/FormplayerEmbed';
+import {
+  FormplayerEmbed,
+  type FormplayerEmbedHandle,
+} from '../components/FormplayerEmbed';
 import {
   buildFormPreviewInit,
   inferObservationIdFromSavedData,
@@ -12,44 +15,31 @@ import { useDeveloperMode } from '../hooks/useDeveloperMode';
 import type { FinalizeRequest } from '../lib/formPreviewBridge';
 import {
   handleFormPreviewBridgeMessage,
-  postFormplayerBridgeReply,
   type FormPreviewDeferOpenSubObservationPayload,
 } from '../lib/formPreviewBridge';
 import type { FormPreviewEditState } from '../lib/formPreviewNavigation';
 import { tauriClient } from '../lib/tauriClient';
 import type { FormInitData } from '../lib/formplayerHost';
 import type { ActiveBundleFormEntry, BundleFormSpec } from '../types/domain';
+import { messageSourceMatchesIframe } from '../lib/iframeMessageSource';
+import {
+  deliverSubObservationCancelled,
+  deliverSubObservationCompletion,
+  dropPendingSubObservationOpen,
+  registerPendingSubObservationOpen,
+} from '../lib/formPreviewSubObservationBridge';
 
 const DEFAULT_JSON = '{}';
 
-/**
- * WebKit / WCO (Tauri): `MessageEvent.source` may not be strictly `===` to
- * `iframe.contentWindow`, and `instanceof Window` can be false for iframe globals.
- * `window.frameElement === iframe` identifies the embedding element reliably for same-origin frames.
- */
-function messageSourceMatchesIframe(
-  source: Window,
-  iframe: HTMLIFrameElement | null | undefined,
-): boolean {
-  if (!iframe) {
-    return false;
-  }
-  try {
-    if (iframe.contentWindow === source) {
-      return true;
-    }
-    return source.frameElement === iframe;
-  } catch {
-    return false;
-  }
-}
-
 type LocationState = {
   formPreviewEdit?: FormPreviewEditState;
 };
 
 type NestedSubObservationSession = {
   parentIframe: HTMLIFrameElement;
+  parentEmbed: FormplayerEmbedHandle | null;
+  /** Parent iframe `contentWindow` captured when the nested open was deferred. */
+  parentContentWindow: Window | null;
   parentMessageId: string;
   formType: string;
   /** Null while bundle init is loading */
@@ -81,7 +71,11 @@ export function FormPreviewPage() {
 
   const [formInitData, setFormInitData] = useState<FormInitData | null>(null);
 
-  const iframeRef = useRef<HTMLIFrameElement>(null);
+  const iframeRef = useRef<FormplayerEmbedHandle>(null);
+  const rootContentWindowRef = useRef<Window | null>(null);
+  const nestedEmbedByMessageIdRef = useRef<Map<string, FormplayerEmbedHandle>>(
+    new Map(),
+  );
   const finalizeResolverRef = useRef<
     ((v: { result?: string; error?: string }) => void) | null
   >(null);
@@ -95,11 +89,51 @@ export function FormPreviewPage() {
   const nestedIframeByMessageIdRef = useRef<
     Map<string, HTMLIFrameElement | null>
   >(new Map());
+  const nestedContentWindowByMessageIdRef = useRef<Map<string, Window | null>>(
+    new Map(),
+  );
 
   useEffect(() => {
     nestedSessionsRef.current = nestedSessions;
   }, [nestedSessions]);
 
+  const resolveParentEmbed = useCallback(
+    (source: Window): FormplayerEmbedHandle | null => {
+      const rootHandle = iframeRef.current;
+      const rootIframe = rootHandle?.getIframe() ?? null;
+      if (
+        messageSourceMatchesIframe(
+          source,
+          rootIframe,
+          rootContentWindowRef.current,
+        )
+      ) {
+        return rootHandle;
+      }
+      for (const handle of nestedEmbedByMessageIdRef.current.values()) {
+        const el = handle.getIframe();
+        const cw = el?.contentWindow ?? null;
+        if (messageSourceMatchesIframe(source, el, cw)) {
+          return handle;
+        }
+      }
+      return null;
+    },
+    [],
+  );
+
+  const finishNestedSession = useCallback((parentMessageId: string) => {
+    dropPendingSubObservationOpen(parentMessageId);
+    nestedEmbedByMessageIdRef.current.delete(parentMessageId);
+    nestedIframeByMessageIdRef.current.delete(parentMessageId);
+    nestedContentWindowByMessageIdRef.current.delete(parentMessageId);
+    queueMicrotask(() => {
+      setNestedSessions(prev =>
+        prev.filter(sess => sess.parentMessageId !== parentMessageId),
+      );
+    });
+  }, []);
+
   const loadForms = useCallback(async () => {
     setListLoading(true);
     setListError(null);
@@ -262,31 +296,19 @@ export function FormPreviewPage() {
   }, []);
 
   const dismissTopNestedSession = useCallback(() => {
-    setNestedSessions(prev => {
-      const top = prev[prev.length - 1];
-      if (!top) {
-        return prev;
-      }
-      postFormplayerBridgeReply(
-        top.parentIframe,
-        'openFormplayer',
-        top.parentMessageId,
-        {
-          result: {
-            status: 'cancelled',
-            formType: top.formType,
-          },
-        },
-      );
-      nestedIframeByMessageIdRef.current.delete(top.parentMessageId);
-      return prev.slice(0, -1);
-    });
-  }, []);
+    const top = nestedSessionsRef.current[nestedSessionsRef.current.length - 1];
+    if (!top) {
+      return;
+    }
+    deliverSubObservationCancelled(top.parentMessageId, top.formType);
+    finishNestedSession(top.parentMessageId);
+  }, [finishNestedSession]);
 
   const beginDeferredNestedOpen = useCallback(
     (payload: FormPreviewDeferOpenSubObservationPayload) => {
       const {
         parentIframe,
+        parentContentWindow,
         messageId,
         formType,
         params,
@@ -294,10 +316,22 @@ export function FormPreviewPage() {
         skipFinalize,
         skipDraftSelection,
       } = payload;
+      const parentEmbed =
+        parentContentWindow != null
+          ? resolveParentEmbed(parentContentWindow)
+          : null;
+      registerPendingSubObservationOpen({
+        parentMessageId: messageId,
+        parentEmbed,
+        parentContentWindow,
+        formType,
+      });
       setNestedSessions(prev => [
         ...prev,
         {
           parentIframe,
+          parentEmbed,
+          parentContentWindow,
           parentMessageId: messageId,
           formType,
           initData: null,
@@ -330,21 +364,16 @@ export function FormPreviewPage() {
             ),
           );
         } catch (e) {
-          postFormplayerBridgeReply(parentIframe, 'openFormplayer', messageId, {
-            result: {
-              status: 'error',
-              formType,
-              message: e instanceof Error ? e.message : String(e),
-            },
+          deliverSubObservationCompletion(messageId, {
+            status: 'error',
+            formType,
+            message: e instanceof Error ? e.message : String(e),
           });
-          nestedIframeByMessageIdRef.current.delete(messageId);
-          setNestedSessions(prev =>
-            prev.filter(sess => sess.parentMessageId !== messageId),
-          );
+          finishNestedSession(messageId);
         }
       })();
     },
-    [developerMode],
+    [developerMode, finishNestedSession, resolveParentEmbed],
   );
 
   const tryCompleteNestedSubObservationFinalize = useCallback(
@@ -353,14 +382,25 @@ export function FormPreviewPage() {
       request: FinalizeRequest,
     ): Promise<{ result?: string; error?: string } | null> => {
       const stack = nestedSessionsRef.current;
-      const top = stack[stack.length - 1];
-      if (!top?.initData) {
-        return null;
+      let matchedIndex = -1;
+      for (let i = stack.length - 1; i >= 0; i -= 1) {
+        const sess = stack[i];
+        if (!sess.initData) {
+          continue;
+        }
+        const el = nestedIframeByMessageIdRef.current.get(sess.parentMessageId);
+        const cw = nestedContentWindowByMessageIdRef.current.get(
+          sess.parentMessageId,
+        );
+        if (messageSourceMatchesIframe(eventSource, el, cw)) {
+          matchedIndex = i;
+          break;
+        }
       }
-      const topEl = nestedIframeByMessageIdRef.current.get(top.parentMessageId);
-      if (!messageSourceMatchesIframe(eventSource, topEl)) {
+      if (matchedIndex < 0) {
         return null;
       }
+      const matched = stack[matchedIndex];
 
       const syntheticResult =
         request.kind === 'update' ? request.observationId : crypto.randomUUID();
@@ -369,38 +409,42 @@ export function FormPreviewPage() {
         request.kind === 'update'
           ? {
               status: 'form_updated' as const,
-              formType: top.formType,
+              formType: matched.formType,
               observationId: request.observationId,
               formData: request.finalData,
             }
           : {
               status: 'form_submitted' as const,
-              formType: top.formType,
+              formType: matched.formType,
               formData: request.finalData,
             };
 
-      postFormplayerBridgeReply(
-        top.parentIframe,
-        'openFormplayer',
-        top.parentMessageId,
-        { result: completion },
-      );
-
-      nestedIframeByMessageIdRef.current.delete(top.parentMessageId);
-      setNestedSessions(prev => prev.slice(0, -1));
+      deliverSubObservationCompletion(matched.parentMessageId, completion);
+      finishNestedSession(matched.parentMessageId);
 
       return { result: syntheticResult };
     },
-    [],
+    [finishNestedSession],
   );
 
   const resolveReplyIframe = useCallback((source: Window) => {
-    if (messageSourceMatchesIframe(source, iframeRef.current)) {
-      return iframeRef.current;
+    const rootIframe = iframeRef.current?.getIframe() ?? null;
+    if (
+      messageSourceMatchesIframe(
+        source,
+        rootIframe,
+        rootContentWindowRef.current,
+      )
+    ) {
+      return rootIframe;
     }
-    for (const s of nestedSessionsRef.current) {
+    for (let i = nestedSessionsRef.current.length - 1; i >= 0; i -= 1) {
+      const s = nestedSessionsRef.current[i];
       const el = nestedIframeByMessageIdRef.current.get(s.parentMessageId);
-      if (messageSourceMatchesIframe(source, el)) {
+      const cw = nestedContentWindowByMessageIdRef.current.get(
+        s.parentMessageId,
+      );
+      if (messageSourceMatchesIframe(source, el, cw)) {
         return el ?? null;
       }
     }
@@ -418,7 +462,7 @@ export function FormPreviewPage() {
         return;
       }
       void handleFormPreviewBridgeMessage(e, {
-        iframe: iframeRef.current,
+        iframe: iframeRef.current?.getIframe() ?? null,
         resolveReplyIframe,
         onFinalize,
         onDeferOpenSubObservation: beginDeferredNestedOpen,
@@ -473,10 +517,27 @@ export function FormPreviewPage() {
                 </div>
                 {session.initData ? (
                   <FormplayerEmbed
-                    ref={el => {
-                      const map = nestedIframeByMessageIdRef.current;
-                      if (el) {
-                        map.set(session.parentMessageId, el);
+                    ref={handle => {
+                      const embedMap = nestedEmbedByMessageIdRef.current;
+                      const iframeMap = nestedIframeByMessageIdRef.current;
+                      if (handle) {
+                        embedMap.set(session.parentMessageId, handle);
+                        iframeMap.set(
+                          session.parentMessageId,
+                          handle.getIframe(),
+                        );
+                      } else {
+                        embedMap.delete(session.parentMessageId);
+                        iframeMap.delete(session.parentMessageId);
+                        nestedContentWindowByMessageIdRef.current.delete(
+                          session.parentMessageId,
+                        );
+                      }
+                    }}
+                    onContentWindowReady={cw => {
+                      const map = nestedContentWindowByMessageIdRef.current;
+                      if (cw) {
+                        map.set(session.parentMessageId, cw);
                       } else {
                         map.delete(session.parentMessageId);
                       }
@@ -571,6 +632,9 @@ export function FormPreviewPage() {
         <div className="panel panel-form-preview-embed panel-embed-flush">
           <FormplayerEmbed
             ref={iframeRef}
+            onContentWindowReady={cw => {
+              rootContentWindowRef.current = cw;
+            }}
             formInitData={formInitData}
             emptyMessage="Choose a form type to load schema and ui from the active bundle, then adjust params / saved JSON and click Apply."
           />
diff --git a/desktop/src/pages/ImportPage.tsx b/desktop/src/pages/ImportPage.tsx
index 84e9e6b5a..e5cd30063 100644
--- a/desktop/src/pages/ImportPage.tsx
+++ b/desktop/src/pages/ImportPage.tsx
@@ -183,6 +183,7 @@ export function ImportPage() {
   const removeStagedAttachment = useImportStagingStore(
     s => s.removeStagedAttachment,
   );
+  const clearStagedFiles = useImportStagingStore(s => s.clearStagedFiles);
   const clearStagingLists = useImportStagingStore(s => s.clearStagingLists);
   const setMessage = useImportStagingStore(s => s.setMessage);
   const setError = useImportStagingStore(s => s.setError);
@@ -472,6 +473,7 @@ export function ImportPage() {
           ? ` Copied ${attachmentsCopied}/${copyItems.length} referenced attachment(s) to queue.${copyErrors.length ? ` Errors: ${copyErrors.slice(0, 5).join('; ')}${copyErrors.length > 5 ? '…' : ''}` : ''}`
           : '';
       setMessage(`${baseMsg}${attMsg}`);
+      clearStagedFiles();
       setPreviewReport(null);
     } catch (e) {
       setError(messageFromUnknown(e, 'Import failed'));
@@ -485,6 +487,7 @@ export function ImportPage() {
     setMessage,
     setError,
     setImportActivity,
+    clearStagedFiles,
     loadObservations,
     loadHealth,
   ]);
diff --git a/desktop/src/pages/WorkbenchCustomAppPage.tsx b/desktop/src/pages/WorkbenchCustomAppPage.tsx
index 51608001b..a832707f7 100644
--- a/desktop/src/pages/WorkbenchCustomAppPage.tsx
+++ b/desktop/src/pages/WorkbenchCustomAppPage.tsx
@@ -5,6 +5,7 @@ import { FormFinalizeDialog } from '../components/FormFinalizeDialog';
 import { useDeveloperMode } from '../hooks/useDeveloperMode';
 import type { FinalizeRequest } from '../lib/formPreviewBridge';
 import { handleFormPreviewBridgeMessage } from '../lib/formPreviewBridge';
+import { messageSourceMatchesIframe } from '../lib/iframeMessageSource';
 import { tauriClient } from '../lib/tauriClient';
 import { WORKSPACE_BUNDLE_STATE_FILE } from '../lib/workspacePaths';
 import type { AppBundleState } from '../types/domain';
@@ -12,6 +13,7 @@ import type { AppBundleState } from '../types/domain';
 export function WorkbenchCustomAppPage() {
   const navigate = useNavigate();
   const iframeRef = useRef<HTMLIFrameElement>(null);
+  const customAppContentWindowRef = useRef<Window | null>(null);
   const finalizeResolverRef = useRef<
     ((v: { result?: string; error?: string }) => void) | null
   >(null);
@@ -55,14 +57,20 @@ export function WorkbenchCustomAppPage() {
       formType: string;
       params: Record<string, unknown>;
       savedData: Record<string, unknown>;
+      observationId?: string;
     }) => {
+      const explicitId =
+        typeof payload.observationId === 'string'
+          ? payload.observationId.trim()
+          : '';
       const sd = payload.savedData;
       const observationId =
-        typeof sd.observationId === 'string'
+        explicitId ||
+        (typeof sd.observationId === 'string'
           ? sd.observationId
           : typeof sd.id === 'string'
             ? sd.id
-            : '';
+            : '');
       navigate('/workbench/form-preview', {
         state: {
           formPreviewEdit: {
@@ -79,7 +87,18 @@ export function WorkbenchCustomAppPage() {
 
   useEffect(() => {
     const onMessage = (e: MessageEvent) => {
-      if (e.source !== iframeRef.current?.contentWindow) {
+      const src = e.source;
+      if (src == null || typeof src !== 'object') {
+        return;
+      }
+      const winSrc = src as Window;
+      if (
+        !messageSourceMatchesIframe(
+          winSrc,
+          iframeRef.current,
+          customAppContentWindowRef.current,
+        )
+      ) {
         return;
       }
       void handleFormPreviewBridgeMessage(e, {
@@ -166,6 +185,9 @@ export function WorkbenchCustomAppPage() {
             ref={iframeRef}
             mountKey={mountKey}
             mode={embedMode}
+            onContentWindowReady={cw => {
+              customAppContentWindowRef.current = cw;
+            }}
           />
         ) : developerMode ? (
           <p className="notice warn">
diff --git a/desktop/src/store/useImportStagingStore.ts b/desktop/src/store/useImportStagingStore.ts
index 8f35a9fc5..ed2951cff 100644
--- a/desktop/src/store/useImportStagingStore.ts
+++ b/desktop/src/store/useImportStagingStore.ts
@@ -20,7 +20,9 @@ interface ImportStagingState {
   addScanEntries: (entries: ImportStagingScanEntry[]) => void;
   removeStagedJson: (nativePath: string) => void;
   removeStagedAttachment: (nativePath: string) => void;
-  /** Clears staged JSON + attachment lists. */
+  /** Clears staged JSON + attachment lists (keeps message/error). */
+  clearStagedFiles: () => void;
+  /** Clears staged files and resets message/error/activity. */
   clearStagingLists: () => void;
   setMessage: (m: string | null) => void;
   setError: (e: string | null) => void;
@@ -96,6 +98,8 @@ export const useImportStagingStore = create<ImportStagingState>(set => ({
       ),
     })),
 
+  clearStagedFiles: () => set({ stagedJson: [], stagedAttachments: [] }),
+
   clearStagingLists: () => set(emptyStagingState()),
 
   setMessage: m => set({ message: m }),
diff --git a/formulus-formplayer/AGENTS.md b/formulus-formplayer/AGENTS.md
index b20d8df19..ce0790119 100644
--- a/formulus-formplayer/AGENTS.md
+++ b/formulus-formplayer/AGENTS.md
@@ -58,6 +58,7 @@ This file gives AI assistants and developers enough context to work effectively
 3. **Custom question types**: Loaded from a **manifest** (source strings) from the RN app, evaluated in a sandbox with `React` and `MaterialUI` on `window`. They use **format** in the schema (e.g. `"format": "signature"`), not only `type`. Contract: `src/types/CustomQuestionTypeContract.ts`.
 4. **Design tokens**: Use `@ode/tokens` via `src/theme/tokens-adapter.ts` and the theme in `src/theme/theme.ts`; avoid hardcoding colors/spacing that exist in tokens.
 5. **Attachment-backed builtins** (`photo`, `audio`, `video`, `select_file`): Observation JSON stores **basename-only** `filename` plus portable metadata; RN writes files under **`attachments/draft/`** (etc.). Resolve previews with **`getAttachmentUri`** where applicable. **`select_file`** shows the chosen **name** only—no file preview.
+6. **Numeric inputs** (`type: integer` / `type: number`): Built-in control is **`NumberStepperRenderer`** (`src/renderers/NumberStepperRenderer.tsx`) backed by **`useNumericDraftInput`** (`src/hooks/useNumericDraftInput.ts`). Policy: **draft text while focused** (`type="text"` + `inputMode` + `enterKeyHint` from `FormContext`); observation JSON stores **JSON numbers only** (parse on commit, never strings); **never clamp** to `minimum`/`maximum` while typing—surface AJV errors instead. Custom numeric question types must follow the same contract (see `CustomQuestionTypeContract.ts`).
 
 ## Adding or changing behavior
 
@@ -88,6 +89,7 @@ Run from **`formulus-formplayer/`** (CI runs the same steps):
 
 ```bash
 pnpm run lint
+pnpm run format
 pnpm run format:check
 pnpm run test run
 pnpm run build
@@ -102,7 +104,7 @@ If the PR also touches **Formulus** (`../formulus/`), run `pnpm run lint` there
 ## Commit and pull request workflow
 
 - **Commit messages** must follow [Conventional Commits](https://www.conventionalcommits.org/) (e.g. `feat(scope): add X`, `fix(scope): resolve Y`).
-- **Before opening a PR**, run `pnpm run format` so Prettier has formatted the files.
+- **Before opening a PR**, run the pre-flight block above (including `pnpm run format` so CI `format:check` does not fail on unformatted files).
 - **PRs** should use the following template:
 
 ---
diff --git a/formulus-formplayer/README.md b/formulus-formplayer/README.md
index 3042e3781..d25e8e7e8 100644
--- a/formulus-formplayer/README.md
+++ b/formulus-formplayer/README.md
@@ -167,3 +167,45 @@ flowchart LR
   FP -->|postMessage events| SM
   CA -->|postMessage commands| SM
 ```
+
+## SwipeLayout options (keyboard & header)
+
+Forms that use a root `SwipeLayout` in `ui.json` support these `options`:
+
+| Option                | Default | Description                                                                                       |
+| --------------------- | ------- | ------------------------------------------------------------------------------------------------- |
+| `autoFocusFirstInput` | `false` | When `true`, focuses the first text-like field each time the user changes page (legacy behavior). |
+| `headerFields`        | `[]`    | Up to two field keys shown as context tags below the progress bar.                                |
+| `headerTitle`         | —       | Optional inner title below the context bar.                                                       |
+
+Per-control focus: set `options.autoFocus: true` on a `Control` to focus that field when its page is shown (takes precedence over `autoFocusFirstInput`).
+
+### Header progress chevrons
+
+On multi-page SwipeLayout forms, **Previous** / **Next** chevron buttons flank the progress bar (disabled on first/last page). They use the same navigation callbacks as the bottom bar.
+
+### Group layout inside SwipeLayout
+
+`Group` pages inside SwipeLayout render **flat** (no card panel) by default. Opt back into a card: `"options": { "variant": "card" }` on the Group.
+
+Swipe gestures attach to the full scroll area (not only the question panel).
+
+### Manual device regression matrix
+
+After formplayer changes, verify on a phone WebView (or ODE Desktop form preview with keyboard):
+
+| Scenario                                  | Pass criteria                                                |
+| ----------------------------------------- | ------------------------------------------------------------ |
+| Multi-page form header                    | Both chevrons visible; disabled at first/last page           |
+| Group page (e.g. GBMIS Sticker / amostra) | Full-width layout; swipe works on background below questions |
+| GBMIS `censo_milda_pessoa` → Anos         | No white scroll gap when typing digits                       |
+| GBMIS `censo` → IME Next                  | No gap when moving field-to-field via keyboard Next          |
+| `age_years` > 120                         | Single validation error via QuestionShell                    |
+
+Rebuild formplayer (`pnpm run build:copy`) before testing in Formulus or Desktop developer mode.
+
+## Validation error display
+
+Built-in controls and custom question types wrapped by `CustomQuestionTypeAdapter` show validation messages **once** in `QuestionShell` (error alert with icon below the field). Child widgets should use `error` / `validation.error` for red borders only — do not also render `validation.message` as `helperText` or inline copy.
+
+**Manual check (device):** trigger a required-field error on a shared `$ref` dropdown (e.g. GBMIS `censo_milda` → Iniciais do inquiridor), a plain string, and a custom `int` / `count_stepper` field — each should show **one** message with the exclamation icon, not duplicate text at the control.
diff --git a/formulus-formplayer/package.json b/formulus-formplayer/package.json
index 6a15f0cac..674b6d33e 100644
--- a/formulus-formplayer/package.json
+++ b/formulus-formplayer/package.json
@@ -66,6 +66,7 @@
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-storybook": "10.2.19",
     "globals": "^17.1.0",
+    "jsdom": "^26.1.0",
     "prettier": "3.8.1",
     "react-refresh": "^0.18.0",
     "storybook": "^10.2.19",
@@ -84,10 +85,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "esbuild"
-    ]
   }
 }
diff --git a/formulus-formplayer/pnpm-lock.yaml b/formulus-formplayer/pnpm-lock.yaml
index 890493449..ed5a3b119 100644
--- a/formulus-formplayer/pnpm-lock.yaml
+++ b/formulus-formplayer/pnpm-lock.yaml
@@ -22,7 +22,7 @@ importers:
         version: 3.7.0(@jsonforms/core@3.7.0)(ajv@8.20.0)
       '@jsonforms/material-renderers':
         specifier: ^3.7.0
-        version: 3.7.0(e723afd79d491ab8152b2b98a64cf86c)
+        version: 3.7.0(1d48787ac5fa740339f6e0d4632f3884)
       '@jsonforms/react':
         specifier: ^3.7.0
         version: 3.7.0(@jsonforms/core@3.7.0)(react@19.2.6)
@@ -34,7 +34,7 @@ importers:
         version: 7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@mui/x-date-pickers':
         specifier: ^8.26.0
-        version: 8.28.5(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@mui/material@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mui/system@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(dayjs@1.10.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 8.29.0(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@mui/material@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mui/system@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(dayjs@1.10.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@ode/components':
         specifier: file:../packages/components
         version: file:../packages/components(@ode/tokens@file:../packages/tokens)(react-native@0.85.3(@babel/core@7.29.0)(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
@@ -95,19 +95,19 @@ importers:
         version: 9.39.4
       '@storybook/addon-docs':
         specifier: ^10.2.19
-        version: 10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+        version: 10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       '@storybook/react':
         specifier: ^10.2.19
         version: 10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@5.9.3)
       '@storybook/react-vite':
         specifier: ^10.2.19
-        version: 10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+        version: 10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       '@types/node':
         specifier: ^24.10.9
         version: 24.12.4
       '@vitejs/plugin-react':
         specifier: ^4.7.0
-        version: 4.7.0(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+        version: 4.7.0(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       eslint:
         specifier: ^9.39.2
         version: 9.39.4
@@ -129,6 +129,9 @@ importers:
       globals:
         specifier: ^17.1.0
         version: 17.6.0
+      jsdom:
+        specifier: ^26.1.0
+        version: 26.1.0
       prettier:
         specifier: 3.8.1
         version: 3.8.1
@@ -143,20 +146,27 @@ importers:
         version: 8.59.3(eslint@9.39.4)(typescript@5.9.3)
       vite:
         specifier: ^6.4.1
-        version: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+        version: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
       vitest:
         specifier: ^3.2.4
-        version: 3.2.4(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+        version: 3.2.4(@types/node@24.12.4)(jsdom@26.1.0)(terser@5.48.0)(yaml@2.9.0)
 
 packages:
 
   '@adobe/css-tools@4.4.4':
     resolution: {integrity: sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==}
 
+  '@asamuzakjp/css-color@3.2.0':
+    resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==}
+
   '@babel/code-frame@7.29.0':
     resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.29.7':
+    resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.29.3':
     resolution: {integrity: sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==}
     engines: {node: '>=6.9.0'}
@@ -169,6 +179,10 @@ packages:
     resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.29.7':
+    resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-compilation-targets@7.28.6':
     resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
     engines: {node: '>=6.9.0'}
@@ -177,6 +191,10 @@ packages:
     resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-globals@7.29.7':
+    resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-imports@7.28.6':
     resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==}
     engines: {node: '>=6.9.0'}
@@ -195,10 +213,18 @@ packages:
     resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-string-parser@7.29.7':
+    resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-identifier@7.28.5':
     resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-identifier@7.29.7':
+    resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-option@7.27.1':
     resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
     engines: {node: '>=6.9.0'}
@@ -212,6 +238,11 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@7.29.7':
+    resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   '@babel/plugin-transform-react-jsx-self@7.27.1':
     resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==}
     engines: {node: '>=6.9.0'}
@@ -228,18 +259,62 @@ packages:
     resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/runtime@7.29.7':
+    resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/template@7.28.6':
     resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.29.7':
+    resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@7.29.0':
     resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.29.7':
+    resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@7.29.0':
     resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.29.7':
+    resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==}
+    engines: {node: '>=6.9.0'}
+
+  '@csstools/color-helpers@5.1.0':
+    resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==}
+    engines: {node: '>=18'}
+
+  '@csstools/css-calc@2.1.4':
+    resolution: {integrity: sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-color-parser@3.1.0':
+    resolution: {integrity: sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-parser-algorithms@3.0.5':
+    resolution: {integrity: sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-tokenizer@3.0.4':
+    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
+    engines: {node: '>=18'}
+
   '@date-io/core@3.2.0':
     resolution: {integrity: sha512-hqwXvY8/YBsT9RwQITG868ZNb1MVFFkF7W1Ecv4P472j/ZWa7EFcgSmxy8PUElNVZfvhdvfv+a8j6NWJqOX5mA==}
 
@@ -871,8 +946,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@mui/x-date-pickers@8.28.5':
-    resolution: {integrity: sha512-cjjJAe1cbg3tAJsCBokExqkr6aWLA8orEjPy7xFm7PDMOPp7Fi/kjwLZre0BE9s/0dMKeIlqvyICOjrKZAsqpA==}
+  '@mui/x-date-pickers@8.29.0':
+    resolution: {integrity: sha512-JfMSg7z9OCgaBg3DMhsSqGPkbkHnGZxZk+bx+i8/cNHTQmvJpUPPLhHc7KtbxEqvYSv9PNNg4NU/bB0JGUFebg==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       '@emotion/react': ^11.9.0
@@ -908,8 +983,8 @@ packages:
       moment-jalaali:
         optional: true
 
-  '@mui/x-internals@8.26.0':
-    resolution: {integrity: sha512-B9OZau5IQUvIxwpJZhoFJKqRpmWf5r0yMmSXjQuqb5WuqM755EuzWJOenY48denGoENzMLT8hQpA0hRTeU2IPA==}
+  '@mui/x-internals@8.29.0':
+    resolution: {integrity: sha512-xlqq765k39g6vkVGIypOBlsdYGawIP0JdSh+qqrkUCIIN39AUZRNMA/nGH0nSkhVHMHcCSDWBM5/6+6BLfc7Mg==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -1554,6 +1629,9 @@ packages:
   '@types/node@24.12.4':
     resolution: {integrity: sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==}
 
+  '@types/node@24.13.2':
+    resolution: {integrity: sha512-fRa09kZTgu8o71KFcDjUFuc7F+dEbZYZmkI0mg5YBTRs0yMKjYHsq/c0urDKeDb+D5qVgXOdFcuu+DZPKOITwA==}
+
   '@types/parse-json@4.0.2':
     resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
 
@@ -1700,6 +1778,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acorn@8.17.0:
+    resolution: {integrity: sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   agent-base@7.1.4:
     resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
     engines: {node: '>= 14'}
@@ -1974,9 +2057,17 @@ packages:
   css.escape@1.5.1:
     resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
 
+  cssstyle@4.6.0:
+    resolution: {integrity: sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==}
+    engines: {node: '>=18'}
+
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
+  data-urls@5.0.0:
+    resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
+    engines: {node: '>=18'}
+
   data-view-buffer@1.0.2:
     resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
     engines: {node: '>= 0.4'}
@@ -2009,6 +2100,9 @@ packages:
       supports-color:
         optional: true
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
   deep-eql@5.0.2:
     resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
     engines: {node: '>=6'}
@@ -2107,6 +2201,10 @@ packages:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
     engines: {node: '>=0.12'}
 
+  entities@6.0.1:
+    resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
+    engines: {node: '>=0.12'}
+
   error-ex@1.3.4:
     resolution: {integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==}
 
@@ -2473,14 +2571,26 @@ packages:
   hoist-non-react-statics@3.3.2:
     resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
 
+  html-encoding-sniffer@4.0.0:
+    resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
+    engines: {node: '>=18'}
+
   http-errors@2.0.1:
     resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
     engines: {node: '>= 0.8'}
 
+  http-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
+    engines: {node: '>= 14'}
+
   https-proxy-agent@7.0.6:
     resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
     engines: {node: '>= 14'}
 
+  iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+
   ignore@5.3.2:
     resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
     engines: {node: '>= 4'}
@@ -2602,6 +2712,9 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   is-regex@1.2.1:
     resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
     engines: {node: '>= 0.4'}
@@ -2709,6 +2822,15 @@ packages:
   jsc-safe-url@0.2.4:
     resolution: {integrity: sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q==}
 
+  jsdom@26.1.0:
+    resolution: {integrity: sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      canvas: ^3.0.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
   jsesc@3.1.0:
     resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
     engines: {node: '>=6'}
@@ -2775,6 +2897,9 @@ packages:
   loupe@3.2.1:
     resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==}
 
+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+
   lru-cache@11.3.6:
     resolution: {integrity: sha512-Gf/KoL3C/MlI7Bt0PGI9I+TeTC/I6r/csU58N4BSNc4lppLBeKsOdFYkK+dX0ABDUMJNfCHTyPpzwwO21Awd3A==}
     engines: {node: 20 || >=22}
@@ -2940,6 +3065,9 @@ packages:
   nullthrows@1.1.1:
     resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==}
 
+  nwsapi@2.2.24:
+    resolution: {integrity: sha512-7YRhZ3jS45LwmSCT4b2sVFHt/WuovaktDU07QrtOBY2PXskss5a9jfmR9jptyumwXST+rFjrmppMY1KT/yn35A==}
+
   ob1@0.84.4:
     resolution: {integrity: sha512-eJXMpz4aQHXF/YBB9ddqZDIS+ooO91hObo9FoW/xBkr54/zCwYYCDqT/O54vNo8kOkWs5Ou/y28NgdrV0edQNA==}
     engines: {node: ^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0}
@@ -3019,6 +3147,9 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
 
+  parse5@7.3.0:
+    resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
+
   parseurl@1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
     engines: {node: '>= 0.8'}
@@ -3139,6 +3270,9 @@ packages:
   react-is@19.2.6:
     resolution: {integrity: sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==}
 
+  react-is@19.2.7:
+    resolution: {integrity: sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==}
+
   react-native-svg@15.15.5:
     resolution: {integrity: sha512-L4go5jA+GWutdJ/JucuN20cjAbMg1HmMtAP+wZ+3JLCf6Jd0bhXQHxciRP/AQm/FlrIEZwkMcHNZP+FXAiic0w==}
     peerDependencies:
@@ -3235,6 +3369,9 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
+  rrweb-cssom@0.8.0:
+    resolution: {integrity: sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==}
+
   run-applescript@7.1.0:
     resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==}
     engines: {node: '>=18'}
@@ -3251,6 +3388,13 @@ packages:
     resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
     engines: {node: '>= 0.4'}
 
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
   scheduler@0.27.0:
     resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
@@ -3263,6 +3407,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.8.5:
+    resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@0.19.2:
     resolution: {integrity: sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==}
     engines: {node: '>= 0.8.0'}
@@ -3298,8 +3447,8 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  shell-quote@1.8.3:
-    resolution: {integrity: sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==}
+  shell-quote@1.8.4:
+    resolution: {integrity: sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==}
     engines: {node: '>= 0.4'}
 
   side-channel-list@1.0.1:
@@ -3445,12 +3594,15 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
+  symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
   synckit@0.11.12:
     resolution: {integrity: sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
-  terser@5.47.1:
-    resolution: {integrity: sha512-tPbLXTI6ohPASb/1YViL428oEHu6/qv1OxqYnfaonVCFHqx4+wCd95pHrQWsL5X4pl90CTyW9piSAsS2L0VoMw==}
+  terser@5.48.0:
+    resolution: {integrity: sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -3470,6 +3622,10 @@ packages:
     resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
     engines: {node: '>=12.0.0'}
 
+  tinyglobby@0.2.17:
+    resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
+    engines: {node: '>=12.0.0'}
+
   tinypool@1.1.1:
     resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -3482,6 +3638,13 @@ packages:
     resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
     engines: {node: '>=14.0.0'}
 
+  tldts-core@6.1.86:
+    resolution: {integrity: sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==}
+
+  tldts@6.1.86:
+    resolution: {integrity: sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==}
+    hasBin: true
+
   tmpl@1.0.5:
     resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
 
@@ -3493,6 +3656,14 @@ packages:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
 
+  tough-cookie@5.1.2:
+    resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}
+    engines: {node: '>=16'}
+
+  tr46@5.1.1:
+    resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
+    engines: {node: '>=18'}
+
   ts-api-utils@2.5.0:
     resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
     engines: {node: '>=18.12'}
@@ -3553,6 +3724,9 @@ packages:
   undici-types@7.16.0:
     resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
 
+  undici-types@7.18.2:
+    resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==}
+
   unpipe@1.0.0:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
@@ -3655,18 +3829,39 @@ packages:
   vlq@1.0.1:
     resolution: {integrity: sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==}
 
+  w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+
   walker@1.0.8:
     resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
 
   web-vitals@5.2.0:
     resolution: {integrity: sha512-i2z98bEmaCqSDiHEDu+gHl/dmR4Q+TxFmG3/13KkMO+o8UxQzCqWaDRCiLgEa41nlO4VpXSI0ASa1xWmO9sBlA==}
 
+  webidl-conversions@7.0.0:
+    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
+    engines: {node: '>=12'}
+
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
+  whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
+    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
+
   whatwg-fetch@3.6.20:
     resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
 
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
+  whatwg-url@14.2.0:
+    resolution: {integrity: sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==}
+    engines: {node: '>=18'}
+
   which-boxed-primitive@1.1.1:
     resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
     engines: {node: '>= 0.4'}
@@ -3701,8 +3896,8 @@ packages:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
 
-  ws@7.5.10:
-    resolution: {integrity: sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==}
+  ws@7.5.11:
+    resolution: {integrity: sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==}
     engines: {node: '>=8.3.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -3729,6 +3924,13 @@ packages:
     resolution: {integrity: sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==}
     engines: {node: '>=18'}
 
+  xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
   y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -3749,8 +3951,8 @@ packages:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
 
-  yargs@17.7.2:
-    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+  yargs@17.7.3:
+    resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==}
     engines: {node: '>=12'}
 
   yocto-queue@0.1.0:
@@ -3770,12 +3972,26 @@ snapshots:
 
   '@adobe/css-tools@4.4.4': {}
 
+  '@asamuzakjp/css-color@3.2.0':
+    dependencies:
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+      lru-cache: 10.4.3
+
   '@babel/code-frame@7.29.0':
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
+  '@babel/code-frame@7.29.7':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.29.7
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
   '@babel/compat-data@7.29.3': {}
 
   '@babel/core@7.29.0':
@@ -3806,6 +4022,14 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
+  '@babel/generator@7.29.7':
+    dependencies:
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
   '@babel/helper-compilation-targets@7.28.6':
     dependencies:
       '@babel/compat-data': 7.29.3
@@ -3816,6 +4040,8 @@ snapshots:
 
   '@babel/helper-globals@7.28.0': {}
 
+  '@babel/helper-globals@7.29.7': {}
+
   '@babel/helper-module-imports@7.28.6':
     dependencies:
       '@babel/traverse': 7.29.0
@@ -3836,8 +4062,12 @@ snapshots:
 
   '@babel/helper-string-parser@7.27.1': {}
 
+  '@babel/helper-string-parser@7.29.7': {}
+
   '@babel/helper-validator-identifier@7.28.5': {}
 
+  '@babel/helper-validator-identifier@7.29.7': {}
+
   '@babel/helper-validator-option@7.27.1': {}
 
   '@babel/helpers@7.29.2':
@@ -3849,6 +4079,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.0
 
+  '@babel/parser@7.29.7':
+    dependencies:
+      '@babel/types': 7.29.7
+
   '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.0)':
     dependencies:
       '@babel/core': 7.29.0
@@ -3861,12 +4095,20 @@ snapshots:
 
   '@babel/runtime@7.29.2': {}
 
+  '@babel/runtime@7.29.7': {}
+
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.29.0
       '@babel/parser': 7.29.3
       '@babel/types': 7.29.0
 
+  '@babel/template@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+
   '@babel/traverse@7.29.0':
     dependencies:
       '@babel/code-frame': 7.29.0
@@ -3879,11 +4121,48 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/traverse@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/types@7.29.0':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
+  '@babel/types@7.29.7':
+    dependencies:
+      '@babel/helper-string-parser': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+
+  '@csstools/color-helpers@5.1.0': {}
+
+  '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+
+  '@csstools/css-color-parser@3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/color-helpers': 5.1.0
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+
+  '@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/css-tokenizer': 3.0.4
+
+  '@csstools/css-tokenizer@3.0.4': {}
+
   '@date-io/core@3.2.0': {}
 
   '@date-io/dayjs@3.2.0(dayjs@1.10.7)':
@@ -4237,7 +4516,7 @@ snapshots:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.6
       '@types/istanbul-reports': 3.0.4
-      '@types/node': 24.12.4
+      '@types/node': 24.13.2
       '@types/yargs': 17.0.35
       chalk: 4.1.2
 
@@ -4251,11 +4530,11 @@ snapshots:
       '@types/yargs': 17.0.35
       chalk: 4.1.2
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
       glob: 13.0.6
       react-docgen-typescript: 2.4.0(typescript@5.9.3)
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
     optionalDependencies:
       typescript: 5.9.3
 
@@ -4298,7 +4577,7 @@ snapshots:
     transitivePeerDependencies:
       - ajv
 
-  '@jsonforms/material-renderers@3.7.0(e723afd79d491ab8152b2b98a64cf86c)':
+  '@jsonforms/material-renderers@3.7.0(1d48787ac5fa740339f6e0d4632f3884)':
     dependencies:
       '@date-io/dayjs': 3.2.0(dayjs@1.10.7)
       '@emotion/react': 11.14.0(@types/react@19.2.14)(react@19.2.6)
@@ -4307,7 +4586,7 @@ snapshots:
       '@jsonforms/react': 3.7.0(@jsonforms/core@3.7.0)(react@19.2.6)
       '@mui/icons-material': 7.3.11(@mui/material@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@types/react@19.2.14)(react@19.2.6)
       '@mui/material': 7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@mui/x-date-pickers': 8.28.5(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@mui/material@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mui/system@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(dayjs@1.10.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@mui/x-date-pickers': 8.29.0(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@mui/material@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mui/system@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(dayjs@1.10.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       dayjs: 1.10.7
       lodash: 4.18.1
       react: 19.2.6
@@ -4401,23 +4680,23 @@ snapshots:
 
   '@mui/utils@7.3.11(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       '@mui/types': 7.4.12(@types/react@19.2.14)
       '@types/prop-types': 15.7.15
       clsx: 2.1.1
       prop-types: 15.8.1
       react: 19.2.6
-      react-is: 19.2.6
+      react-is: 19.2.7
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@mui/x-date-pickers@8.28.5(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@mui/material@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mui/system@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(dayjs@1.10.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@mui/x-date-pickers@8.29.0(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@mui/material@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mui/system@7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(dayjs@1.10.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       '@mui/material': 7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@mui/system': 7.3.11(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6))(@types/react@19.2.14)(react@19.2.6)
       '@mui/utils': 7.3.11(@types/react@19.2.14)(react@19.2.6)
-      '@mui/x-internals': 8.26.0(@types/react@19.2.14)(react@19.2.6)
+      '@mui/x-internals': 8.29.0(@types/react@19.2.14)(react@19.2.6)
       '@types/react-transition-group': 4.4.12(@types/react@19.2.14)
       clsx: 2.1.1
       prop-types: 15.8.1
@@ -4431,9 +4710,9 @@ snapshots:
     transitivePeerDependencies:
       - '@types/react'
 
-  '@mui/x-internals@8.26.0(@types/react@19.2.14)(react@19.2.6)':
+  '@mui/x-internals@8.29.0(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       '@mui/utils': 7.3.11(@types/react@19.2.14)(react@19.2.6)
       react: 19.2.6
       reselect: 5.2.0
@@ -4456,7 +4735,9 @@ snapshots:
       react-native: 0.85.3(@babel/core@7.29.0)(@types/react@19.2.14)(react@19.2.6)
       react-native-svg: 15.15.5(react-native@0.85.3(@babel/core@7.29.0)(@types/react@19.2.14)(react@19.2.6))(react@19.2.6)
 
-  '@ode/observation-query@file:../packages/observation-query': {}
+  '@ode/observation-query@file:../packages/observation-query':
+    dependencies:
+      '@babel/runtime': 7.29.2
 
   '@ode/tokens@file:../packages/tokens': {}
 
@@ -4600,12 +4881,12 @@ snapshots:
   '@react-native/codegen@0.85.3(@babel/core@7.29.0)':
     dependencies:
       '@babel/core': 7.29.0
-      '@babel/parser': 7.29.3
+      '@babel/parser': 7.29.7
       hermes-parser: 0.33.3
       invariant: 2.2.4
       nullthrows: 1.1.1
-      tinyglobby: 0.2.16
-      yargs: 17.7.2
+      tinyglobby: 0.2.17
+      yargs: 17.7.3
 
   '@react-native/community-cli-plugin@0.85.3':
     dependencies:
@@ -4615,7 +4896,7 @@ snapshots:
       metro: 0.84.4
       metro-config: 0.84.4
       metro-core: 0.84.4
-      semver: 7.8.0
+      semver: 7.8.5
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -4644,7 +4925,7 @@ snapshots:
       nullthrows: 1.1.1
       open: 7.4.2
       serve-static: 1.16.3
-      ws: 7.5.10
+      ws: 7.5.11
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -4754,10 +5035,10 @@ snapshots:
 
   '@sinclair/typebox@0.34.49': {}
 
-  '@storybook/addon-docs@10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))':
+  '@storybook/addon-docs@10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
       '@mdx-js/react': 3.1.1(@types/react@19.2.14)(react@19.2.6)
-      '@storybook/csf-plugin': 10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+      '@storybook/csf-plugin': 10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       '@storybook/icons': 2.0.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@storybook/react-dom-shim': 10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))
       react: 19.2.6
@@ -4773,25 +5054,25 @@ snapshots:
       - vite
       - webpack
 
-  '@storybook/builder-vite@10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))':
+  '@storybook/builder-vite@10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
-      '@storybook/csf-plugin': 10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+      '@storybook/csf-plugin': 10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       storybook: 10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       ts-dedent: 2.2.0
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
     transitivePeerDependencies:
       - esbuild
       - rollup
       - webpack
 
-  '@storybook/csf-plugin@10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))':
+  '@storybook/csf-plugin@10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
       storybook: 10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       unplugin: 2.3.11
     optionalDependencies:
       esbuild: 0.27.7
       rollup: 4.60.4
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
 
   '@storybook/global@5.0.0': {}
 
@@ -4809,11 +5090,11 @@ snapshots:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@storybook/react-vite@10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))':
+  '@storybook/react-vite@10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(esbuild@0.27.7)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(typescript@5.9.3)(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       '@rollup/pluginutils': 5.3.0(rollup@4.60.4)
-      '@storybook/builder-vite': 10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+      '@storybook/builder-vite': 10.4.0(esbuild@0.27.7)(rollup@4.60.4)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       '@storybook/react': 10.4.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@5.9.3)
       empathic: 2.0.1
       magic-string: 0.30.21
@@ -4823,7 +5104,7 @@ snapshots:
       resolve: 1.22.12
       storybook: 10.4.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)(@testing-library/dom@10.4.1)(@types/react@19.2.14)(prettier@3.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       tsconfig-paths: 4.2.0
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
@@ -4947,6 +5228,10 @@ snapshots:
     dependencies:
       undici-types: 7.16.0
 
+  '@types/node@24.13.2':
+    dependencies:
+      undici-types: 7.18.2
+
   '@types/parse-json@4.0.2': {}
 
   '@types/prop-types@15.7.15': {}
@@ -5064,7 +5349,7 @@ snapshots:
       '@typescript-eslint/types': 8.59.3
       eslint-visitor-keys: 5.0.1
 
-  '@vitejs/plugin-react@4.7.0(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))':
+  '@vitejs/plugin-react@4.7.0(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
       '@babel/core': 7.29.0
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0)
@@ -5072,7 +5357,7 @@ snapshots:
       '@rolldown/pluginutils': 1.0.0-beta.27
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -5084,13 +5369,13 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))':
+  '@vitest/mocker@3.2.4(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -5135,6 +5420,8 @@ snapshots:
 
   acorn@8.16.0: {}
 
+  acorn@8.17.0: {}
+
   agent-base@7.1.4: {}
 
   ajv-errors@3.0.0(ajv@8.20.0):
@@ -5349,7 +5636,7 @@ snapshots:
 
   chrome-launcher@0.15.2:
     dependencies:
-      '@types/node': 24.12.4
+      '@types/node': 24.13.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2
@@ -5358,7 +5645,7 @@ snapshots:
 
   chromium-edge-launcher@0.3.0:
     dependencies:
-      '@types/node': 24.12.4
+      '@types/node': 24.13.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2
@@ -5436,8 +5723,18 @@ snapshots:
 
   css.escape@1.5.1: {}
 
+  cssstyle@4.6.0:
+    dependencies:
+      '@asamuzakjp/css-color': 3.2.0
+      rrweb-cssom: 0.8.0
+
   csstype@3.2.3: {}
 
+  data-urls@5.0.0:
+    dependencies:
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.2.0
+
   data-view-buffer@1.0.2:
     dependencies:
       call-bound: 1.0.4
@@ -5466,6 +5763,8 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  decimal.js@10.6.0: {}
+
   deep-eql@5.0.2: {}
 
   deep-is@0.1.4: {}
@@ -5511,7 +5810,7 @@ snapshots:
 
   dom-helpers@5.2.1:
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       csstype: 3.2.3
 
   dom-serializer@2.0.0:
@@ -5552,6 +5851,8 @@ snapshots:
 
   entities@4.5.0: {}
 
+  entities@6.0.1: {}
+
   error-ex@1.3.4:
     dependencies:
       is-arrayish: 0.2.1
@@ -6054,6 +6355,10 @@ snapshots:
     dependencies:
       react-is: 16.13.1
 
+  html-encoding-sniffer@4.0.0:
+    dependencies:
+      whatwg-encoding: 3.1.1
+
   http-errors@2.0.1:
     dependencies:
       depd: 2.0.0
@@ -6062,6 +6367,13 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
+  http-proxy-agent@7.0.2:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.4
@@ -6069,6 +6381,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  iconv-lite@0.6.3:
+    dependencies:
+      safer-buffer: 2.1.2
+
   ignore@5.3.2: {}
 
   ignore@7.0.5: {}
@@ -6179,6 +6495,8 @@ snapshots:
 
   is-number@7.0.0: {}
 
+  is-potential-custom-element-name@1.0.1: {}
+
   is-regex@1.2.1:
     dependencies:
       call-bound: 1.0.4
@@ -6279,7 +6597,7 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 24.12.4
+      '@types/node': 24.13.2
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
@@ -6305,7 +6623,7 @@ snapshots:
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 24.12.4
+      '@types/node': 24.13.2
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -6320,6 +6638,33 @@ snapshots:
 
   jsc-safe-url@0.2.4: {}
 
+  jsdom@26.1.0:
+    dependencies:
+      cssstyle: 4.6.0
+      data-urls: 5.0.0
+      decimal.js: 10.6.0
+      html-encoding-sniffer: 4.0.0
+      http-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.6
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.24
+      parse5: 7.3.0
+      rrweb-cssom: 0.8.0
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 5.1.2
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 3.1.1
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.2.0
+      ws: 8.20.1
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
   jsesc@3.1.0: {}
 
   json-buffer@3.0.1: {}
@@ -6377,6 +6722,8 @@ snapshots:
 
   loupe@3.2.1: {}
 
+  lru-cache@10.4.3: {}
+
   lru-cache@11.3.6: {}
 
   lru-cache@5.1.1:
@@ -6464,7 +6811,7 @@ snapshots:
   metro-minify-terser@0.84.4:
     dependencies:
       flow-enums-runtime: 0.0.6
-      terser: 5.47.1
+      terser: 5.48.0
 
   metro-resolver@0.84.4:
     dependencies:
@@ -6472,13 +6819,13 @@ snapshots:
 
   metro-runtime@0.84.4:
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       flow-enums-runtime: 0.0.6
 
   metro-source-map@0.84.4:
     dependencies:
-      '@babel/traverse': 7.29.0
-      '@babel/types': 7.29.0
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
       flow-enums-runtime: 0.0.6
       invariant: 2.2.4
       metro-symbolicate: 0.84.4
@@ -6503,9 +6850,9 @@ snapshots:
   metro-transform-plugins@0.84.4:
     dependencies:
       '@babel/core': 7.29.0
-      '@babel/generator': 7.29.1
-      '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/generator': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.7
       flow-enums-runtime: 0.0.6
       nullthrows: 1.1.1
     transitivePeerDependencies:
@@ -6514,9 +6861,9 @@ snapshots:
   metro-transform-worker@0.84.4:
     dependencies:
       '@babel/core': 7.29.0
-      '@babel/generator': 7.29.1
-      '@babel/parser': 7.29.3
-      '@babel/types': 7.29.0
+      '@babel/generator': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
       flow-enums-runtime: 0.0.6
       metro: 0.84.4
       metro-babel-transformer: 0.84.4
@@ -6533,13 +6880,13 @@ snapshots:
 
   metro@0.84.4:
     dependencies:
-      '@babel/code-frame': 7.29.0
+      '@babel/code-frame': 7.29.7
       '@babel/core': 7.29.0
-      '@babel/generator': 7.29.1
-      '@babel/parser': 7.29.3
-      '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
-      '@babel/types': 7.29.0
+      '@babel/generator': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
       accepts: 2.0.0
       ci-info: 2.0.0
       connect: 3.7.0
@@ -6570,8 +6917,8 @@ snapshots:
       serialize-error: 2.1.0
       source-map: 0.5.7
       throat: 5.0.0
-      ws: 7.5.10
-      yargs: 17.7.2
+      ws: 7.5.11
+      yargs: 17.7.3
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -6633,6 +6980,8 @@ snapshots:
 
   nullthrows@1.1.1: {}
 
+  nwsapi@2.2.24: {}
+
   ob1@0.84.4:
     dependencies:
       flow-enums-runtime: 0.0.6
@@ -6778,6 +7127,10 @@ snapshots:
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
+  parse5@7.3.0:
+    dependencies:
+      entities: 6.0.1
+
   parseurl@1.3.3: {}
 
   path-exists@4.0.0: {}
@@ -6836,7 +7189,7 @@ snapshots:
       '@jest/schemas': 30.4.1
       ansi-styles: 5.2.0
       react-is-18: react-is@18.3.1
-      react-is-19: react-is@19.2.6
+      react-is-19: react-is@19.2.7
 
   promise@8.3.0:
     dependencies:
@@ -6858,8 +7211,8 @@ snapshots:
 
   react-devtools-core@6.1.5:
     dependencies:
-      shell-quote: 1.8.3
-      ws: 7.5.10
+      shell-quote: 1.8.4
+      ws: 7.5.11
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -6896,6 +7249,8 @@ snapshots:
 
   react-is@19.2.6: {}
 
+  react-is@19.2.7: {}
+
   react-native-svg@15.15.5(react-native@0.85.3(@babel/core@7.29.0)(@types/react@19.2.14)(react@19.2.6))(react@19.2.6):
     dependencies:
       css-select: 5.2.2
@@ -6932,12 +7287,12 @@ snapshots:
       react-refresh: 0.14.2
       regenerator-runtime: 0.13.11
       scheduler: 0.27.0
-      semver: 7.8.0
+      semver: 7.8.5
       stacktrace-parser: 0.1.11
-      tinyglobby: 0.2.16
+      tinyglobby: 0.2.17
       whatwg-fetch: 3.6.20
-      ws: 7.5.10
-      yargs: 17.7.2
+      ws: 7.5.11
+      yargs: 17.7.3
     optionalDependencies:
       '@types/react': 19.2.14
     transitivePeerDependencies:
@@ -6960,7 +7315,7 @@ snapshots:
 
   react-transition-group@4.4.5(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       dom-helpers: 5.2.1
       loose-envify: 1.4.0
       prop-types: 15.8.1
@@ -7059,6 +7414,8 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.60.4
       fsevents: 2.3.3
 
+  rrweb-cssom@0.8.0: {}
+
   run-applescript@7.1.0: {}
 
   safe-array-concat@1.1.4:
@@ -7080,12 +7437,20 @@ snapshots:
       es-errors: 1.3.0
       is-regex: 1.2.1
 
+  safer-buffer@2.1.2: {}
+
+  saxes@6.0.0:
+    dependencies:
+      xmlchars: 2.2.0
+
   scheduler@0.27.0: {}
 
   semver@6.3.1: {}
 
   semver@7.8.0: {}
 
+  semver@7.8.5: {}
+
   send@0.19.2:
     dependencies:
       debug: 2.6.9
@@ -7145,7 +7510,7 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
-  shell-quote@1.8.3: {}
+  shell-quote@1.8.4: {}
 
   side-channel-list@1.0.1:
     dependencies:
@@ -7322,14 +7687,16 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  symbol-tree@3.2.4: {}
+
   synckit@0.11.12:
     dependencies:
       '@pkgr/core': 0.2.9
 
-  terser@5.47.1:
+  terser@5.48.0:
     dependencies:
       '@jridgewell/source-map': 0.3.11
-      acorn: 8.16.0
+      acorn: 8.17.0
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -7346,12 +7713,23 @@ snapshots:
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
 
+  tinyglobby@0.2.17:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
   tinypool@1.1.1: {}
 
   tinyrainbow@2.0.0: {}
 
   tinyspy@4.0.4: {}
 
+  tldts-core@6.1.86: {}
+
+  tldts@6.1.86:
+    dependencies:
+      tldts-core: 6.1.86
+
   tmpl@1.0.5: {}
 
   to-regex-range@5.0.1:
@@ -7360,6 +7738,14 @@ snapshots:
 
   toidentifier@1.0.1: {}
 
+  tough-cookie@5.1.2:
+    dependencies:
+      tldts: 6.1.86
+
+  tr46@5.1.1:
+    dependencies:
+      punycode: 2.3.1
+
   ts-api-utils@2.5.0(typescript@5.9.3):
     dependencies:
       typescript: 5.9.3
@@ -7435,6 +7821,8 @@ snapshots:
 
   undici-types@7.16.0: {}
 
+  undici-types@7.18.2: {}
+
   unpipe@1.0.0: {}
 
   unplugin@2.3.11:
@@ -7460,13 +7848,13 @@ snapshots:
 
   utils-merge@1.0.1: {}
 
-  vite-node@3.2.4(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0):
+  vite-node@3.2.4(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -7481,7 +7869,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0):
+  vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0):
     dependencies:
       esbuild: 0.25.12
       fdir: 6.5.0(picomatch@4.0.4)
@@ -7492,14 +7880,14 @@ snapshots:
     optionalDependencies:
       '@types/node': 24.12.4
       fsevents: 2.3.3
-      terser: 5.47.1
+      terser: 5.48.0
       yaml: 2.9.0
 
-  vitest@3.2.4(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0):
+  vitest@3.2.4(@types/node@24.12.4)(jsdom@26.1.0)(terser@5.48.0)(yaml@2.9.0):
     dependencies:
       '@types/chai': 5.2.3
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0))
+      '@vitest/mocker': 3.2.4(vite@6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -7517,11 +7905,12 @@ snapshots:
       tinyglobby: 0.2.16
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 6.4.2(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
-      vite-node: 3.2.4(@types/node@24.12.4)(terser@5.47.1)(yaml@2.9.0)
+      vite: 6.4.2(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
+      vite-node: 3.2.4(@types/node@24.12.4)(terser@5.48.0)(yaml@2.9.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 24.12.4
+      jsdom: 26.1.0
     transitivePeerDependencies:
       - jiti
       - less
@@ -7538,16 +7927,33 @@ snapshots:
 
   vlq@1.0.1: {}
 
+  w3c-xmlserializer@5.0.0:
+    dependencies:
+      xml-name-validator: 5.0.0
+
   walker@1.0.8:
     dependencies:
       makeerror: 1.0.12
 
   web-vitals@5.2.0: {}
 
+  webidl-conversions@7.0.0: {}
+
   webpack-virtual-modules@0.6.2: {}
 
+  whatwg-encoding@3.1.1:
+    dependencies:
+      iconv-lite: 0.6.3
+
   whatwg-fetch@3.6.20: {}
 
+  whatwg-mimetype@4.0.0: {}
+
+  whatwg-url@14.2.0:
+    dependencies:
+      tr46: 5.1.1
+      webidl-conversions: 7.0.0
+
   which-boxed-primitive@1.1.1:
     dependencies:
       is-bigint: 1.1.0
@@ -7606,7 +8012,7 @@ snapshots:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
-  ws@7.5.10: {}
+  ws@7.5.11: {}
 
   ws@8.20.1: {}
 
@@ -7614,6 +8020,10 @@ snapshots:
     dependencies:
       is-wsl: 3.1.1
 
+  xml-name-validator@5.0.0: {}
+
+  xmlchars@2.2.0: {}
+
   y18n@5.0.8: {}
 
   yallist@3.1.1: {}
@@ -7624,7 +8034,7 @@ snapshots:
 
   yargs-parser@21.1.1: {}
 
-  yargs@17.7.2:
+  yargs@17.7.3:
     dependencies:
       cliui: 8.0.1
       escalade: 3.2.0
diff --git a/formulus-formplayer/pnpm-workspace.yaml b/formulus-formplayer/pnpm-workspace.yaml
new file mode 100644
index 000000000..35245de10
--- /dev/null
+++ b/formulus-formplayer/pnpm-workspace.yaml
@@ -0,0 +1,4 @@
+# pnpm 10+ reads project settings here (not package.json#pnpm).
+# Allow lifecycle scripts only for these native/tooling deps.
+onlyBuiltDependencies:
+  - esbuild
diff --git a/formulus-formplayer/src/App.tsx b/formulus-formplayer/src/App.tsx
index 4a6a0bfee..7ea7fdb27 100644
--- a/formulus-formplayer/src/App.tsx
+++ b/formulus-formplayer/src/App.tsx
@@ -36,8 +36,8 @@ import FormulusClient from './services/FormulusInterface';
 import { FormInitData } from './types/FormulusInterfaceDefinition';
 import {
   applySchemaDefaultTokens,
-  dataMatchingSchemaRoot,
   initialFormDataFromParams,
+  prepareRootObservationData,
   shouldOfferDraftSelector,
 } from './utils/formObservationData';
 import {
@@ -51,6 +51,10 @@ import SwipeLayoutRenderer, {
   swipeLayoutTester,
   groupAsSwipeLayoutTester,
 } from './renderers/SwipeLayoutRenderer';
+import {
+  FlatGroupLayout,
+  flatGroupLayoutTester,
+} from './renderers/FlatGroupLayout';
 import { finalizeRenderer, finalizeTester } from './renderers/FinalizeRenderer';
 import PhotoQuestionRenderer, {
   photoQuestionTester,
@@ -100,7 +104,13 @@ import { loadCustomQuestionTypes } from './services/CustomQuestionTypeLoader';
 import { loadCustomValidators } from './services/CustomValidatorLoader';
 import { customValidatorRegistry } from './services/CustomValidatorRegistry';
 import { runCustomValidatorsAndRefreshData } from './services/customValidatorDataRefresh';
+import { resolveErrorPageIndex } from './utils/errorPageNavigation';
+import { applyAutoSequences } from './utils/autoSequence';
 import { newDraftSessionKey } from './utils/draftSessionKey';
+import {
+  formDataJsonEqual,
+  mergePreservingSubObsArrays,
+} from './renderers/subObservationHelpers';
 
 /** Embedded sub-observation session (also accepts legacy `returnOnly` from older hosts). */
 function isSubObservationSession(init: FormInitData): boolean {
@@ -108,6 +118,31 @@ function isSubObservationSession(init: FormInitData): boolean {
   return Boolean(i.subObservationMode || i.returnOnly);
 }
 
+function readAutoSequenceRuntime() {
+  const w = window as unknown as {
+    formulusSubObservationContext?: Record<string, unknown> | null;
+    formulusSessionContext?: Record<string, unknown> | null;
+  };
+  return {
+    subObservationContext: w.formulusSubObservationContext ?? null,
+    sessionContext: w.formulusSessionContext ?? null,
+  };
+}
+
+/** Root observation data aligned to schema, with platform `x-autoSequence` applied on open. */
+async function prepareInitialFormData(
+  raw: Record<string, unknown>,
+  formSchema: unknown,
+): Promise<Record<string, unknown>> {
+  const root = prepareRootObservationData(raw, formSchema);
+  const { data } = await applyAutoSequences(
+    root,
+    formSchema as JsonSchema7 | undefined,
+    readAutoSequenceRuntime(),
+  );
+  return data;
+}
+
 // Mock and DevTestbed are loaded only in development via dynamic import (see index.tsx).
 // This keeps ~2000+ lines of mock code out of production bundles.
 function isMockActive(): boolean {
@@ -250,12 +285,19 @@ interface FormContextType {
    * Not part of the native bridge.
    */
   draftSessionKey: string | null;
+  /**
+   * Commit a full root data object to App state (auto-sequence + validators).
+   * Used by sub-observation merge so nested rows survive JsonForms controlled-mode
+   * debounce races where `handleChange` alone does not reach `onChange` in time.
+   */
+  commitFormData?: (data: Record<string, unknown>) => void;
 }
 
 export const FormContext = createContext<FormContextType>({
   formInitData: null,
   keyboardEnterKeyHint: undefined,
   draftSessionKey: null,
+  commitFormData: undefined,
 });
 
 export const useFormContext = () => useContext(FormContext);
@@ -265,6 +307,7 @@ export const customRenderers = [
     tester: shellInputControlTester,
     renderer: ShellInputControl,
   },
+  { tester: flatGroupLayoutTester, renderer: FlatGroupLayout },
   { tester: swipeLayoutTester, renderer: SwipeLayoutRenderer },
   { tester: groupAsSwipeLayoutTester, renderer: SwipeLayoutRenderer },
   { tester: finalizeTester, renderer: finalizeRenderer.renderer },
@@ -302,6 +345,8 @@ function App() {
 
   // State for form data, schema, and UI schema
   const [data, setData] = useState<FormData>({});
+  /** Latest form data — read from event handlers that may run before React re-renders. */
+  const dataRef = useRef<FormData>({});
   const [schema, setSchema] = useState<FormSchema | null>(null);
   const [uischema, setUISchema] = useState<FormUISchema | null>(null);
 
@@ -579,11 +624,22 @@ function App() {
         ];
         (window as unknown as Record<string, unknown>).formulusSessionContext =
           sessionContext ?? null;
+        (
+          window as unknown as Record<string, unknown>
+        ).formulusSubObservationContext =
+          sessionContext &&
+          typeof sessionContext === 'object' &&
+          'subObservation' in (sessionContext as Record<string, unknown>)
+            ? (sessionContext as Record<string, unknown>).subObservation
+            : null;
 
         if (savedData && Object.keys(savedData).length > 0) {
           console.log('Preloading saved data:', savedData);
           setData(
-            dataMatchingSchemaRoot(savedData as FormData, formSchemaTyped),
+            await prepareInitialFormData(
+              savedData as Record<string, unknown>,
+              formSchemaTyped,
+            ),
           );
         } else if (!isSubObservationSession(initData)) {
           const formVersion = (formSchemaTyped as { version?: string })
@@ -604,14 +660,14 @@ function App() {
           );
           const withSticky = applyStickyDefaults(withTokens, relevantSticky);
           console.log('Preloading initialization form values:', withSticky);
-          setData(dataMatchingSchemaRoot(withSticky, formSchemaTyped));
+          setData(await prepareInitialFormData(withSticky, formSchemaTyped));
         } else {
           const defaultData = applySchemaDefaultTokens(
             initialFormDataFromParams(params),
             formSchemaTyped,
           );
           console.log('Preloading initialization form values:', defaultData);
-          setData(dataMatchingSchemaRoot(defaultData, formSchemaTyped));
+          setData(await prepareInitialFormData(defaultData, formSchemaTyped));
         }
 
         console.log('Form params (if any, beyond schemas/data):', params);
@@ -917,34 +973,141 @@ function App() {
     return instance;
   }, [extensionDefinitions, customTypeFormats]);
 
+  // Handler for resuming a draft
+  const handleResumeDraft = useCallback(
+    (draftId: string) => {
+      const draft = draftService.getDraft(draftId);
+      if (draft && pendingFormInit) {
+        console.log('Resuming draft:', draftId, draft);
+
+        // Create new FormInitData with draft data as savedData
+        const initDataWithDraft: FormInitData = {
+          ...pendingFormInit,
+          savedData: draft.data,
+        };
+
+        // Initialize form with draft data (keep the same draft row when saving)
+        initializeForm(
+          initDataWithDraft,
+          draft.draftSessionKey ?? `legacy_${draft.id}`,
+        );
+
+        // Hide draft selector
+        setShowDraftSelector(false);
+        setPendingFormInit(null);
+      }
+    },
+    [pendingFormInit, initializeForm],
+  );
+
+  // Handler for starting a new form (ignoring drafts)
+  const handleStartNewForm = useCallback(() => {
+    if (pendingFormInit) {
+      console.log('Starting new form, ignoring drafts');
+      initializeForm(pendingFormInit, newDraftSessionKey());
+      setShowDraftSelector(false);
+      setPendingFormInit(null);
+    }
+  }, [pendingFormInit, initializeForm]);
+
+  const refreshFormData = useCallback(
+    async (newData: Record<string, unknown>) => {
+      const autoRuntime = readAutoSequenceRuntime();
+      const { data: sequencedData } = await applyAutoSequences(
+        newData,
+        schema ?? undefined,
+        autoRuntime,
+      );
+      const { errors, data: refreshedData } = runCustomValidatorsAndRefreshData(
+        uischema ?? undefined,
+        schema ?? undefined,
+        sequencedData,
+        ajv,
+      );
+      setCustomValidatorErrors(errors);
+      return refreshedData;
+    },
+    [uischema, schema, ajv],
+  );
+
+  const persistDraftIfRootSession = useCallback(
+    (refreshedData: Record<string, unknown>) => {
+      if (formInitData && !isSubObservationSession(formInitData)) {
+        draftService.saveDraft(
+          formInitData.formType,
+          refreshedData,
+          formInitData,
+          draftSessionKey,
+        );
+      }
+    },
+    [formInitData, draftSessionKey],
+  );
+
+  const handleDataChange = useCallback(
+    ({ data: newData }: { data: FormData }) => {
+      const incoming = newData as Record<string, unknown>;
+      const baseline = dataRef.current as Record<string, unknown>;
+      const merged = mergePreservingSubObsArrays(baseline, incoming);
+      void (async () => {
+        const refreshedData = await refreshFormData(merged);
+        if (formDataJsonEqual(refreshedData, baseline)) {
+          return;
+        }
+        dataRef.current = refreshedData;
+        setData(refreshedData);
+        persistDraftIfRootSession(refreshedData);
+      })();
+    },
+    [refreshFormData, persistDraftIfRootSession],
+  );
+
+  const commitFormData = useCallback(
+    (newData: Record<string, unknown>) => {
+      void (async () => {
+        const refreshedData = await refreshFormData(newData);
+        dataRef.current = refreshedData;
+        setData(refreshedData);
+        persistDraftIfRootSession(refreshedData);
+      })();
+    },
+    [refreshFormData, persistDraftIfRootSession],
+  );
+
+  useEffect(() => {
+    dataRef.current = data;
+  }, [data]);
+
   // Set up event listeners for navigation and finalization
   useEffect(() => {
     const handleNavigateToError = (event: CustomEvent) => {
       if (!uischema) return;
 
-      const path = event.detail.path;
-      const field = path.split('/').pop();
-      const screens = uischema.elements;
-
-      for (let i = 0; i < screens.length; i++) {
-        const screen = screens[i];
-        // Skip the Finalize screen
-        if (screen.type === 'Finalize') continue;
-
-        // Type guard to ensure elements exists
-        if ('elements' in screen && screen.elements) {
-          if (screen.elements.some((el: any) => el.scope?.includes(field))) {
-            // Dispatch a custom event that SwipeLayoutWrapper will listen for
-            const navigateEvent = new CustomEvent('navigateToPage', {
-              detail: { page: i },
-            });
-            window.dispatchEvent(navigateEvent);
-            break;
-          }
-        }
+      const path = event.detail?.path;
+      if (!path || typeof path !== 'string') return;
+
+      const pageIndex = resolveErrorPageIndex(uischema, path);
+      if (pageIndex !== null) {
+        window.dispatchEvent(
+          new CustomEvent('navigateToPage', {
+            detail: { page: pageIndex },
+          }),
+        );
       }
     };
 
+    const handleRevalidate = () => {
+      const current = dataRef.current as Record<string, unknown>;
+      if (!current || Object.keys(current).length === 0) {
+        return;
+      }
+      void (async () => {
+        const refreshedData = await refreshFormData(current);
+        dataRef.current = refreshedData;
+        setData(refreshedData);
+      })();
+    };
+
     const handleShowValidation = () => {
       // Idempotent: once shown, stays shown for the session.
       setValidationMode(prev =>
@@ -955,13 +1118,14 @@ function App() {
     const handleFinalizeForm = (event: Event) => {
       // Reaching finalize is a meaningful checkpoint: ensure validation is shown.
       handleShowValidation();
-      // Prefer the payload from the FinalizeRenderer if available
       const customEvent = event as CustomEvent<{
         formInitData?: FormInitData;
         data?: FormData;
       }>;
       const payloadFormInit = customEvent.detail?.formInitData || formInitData;
-      const rawPayload = customEvent.detail?.data || data;
+      const rawPayload =
+        (dataRef.current as Record<string, unknown> | undefined) ??
+        customEvent.detail?.data;
 
       if (!payloadFormInit) {
         console.error(
@@ -973,7 +1137,7 @@ function App() {
         return;
       }
 
-      const rootPayload = dataMatchingSchemaRoot(rawPayload, schema);
+      const rootPayload = prepareRootObservationData(rawPayload ?? {}, schema);
       const { errors: finalizeValidatorErrors, data: payloadData } =
         runCustomValidatorsAndRefreshData(
           uischema ?? undefined,
@@ -1040,6 +1204,10 @@ function App() {
       'formShowValidation',
       handleShowValidation as EventListener,
     );
+    window.addEventListener(
+      'formRevalidate',
+      handleRevalidate as EventListener,
+    );
 
     return () => {
       window.removeEventListener(
@@ -1054,70 +1222,12 @@ function App() {
         'formShowValidation',
         handleShowValidation as EventListener,
       );
-    };
-  }, [data, formInitData, draftSessionKey, uischema, schema, ajv]); // Include all dependencies
-
-  // Handler for resuming a draft
-  const handleResumeDraft = useCallback(
-    (draftId: string) => {
-      const draft = draftService.getDraft(draftId);
-      if (draft && pendingFormInit) {
-        console.log('Resuming draft:', draftId, draft);
-
-        // Create new FormInitData with draft data as savedData
-        const initDataWithDraft: FormInitData = {
-          ...pendingFormInit,
-          savedData: draft.data,
-        };
-
-        // Initialize form with draft data (keep the same draft row when saving)
-        initializeForm(
-          initDataWithDraft,
-          draft.draftSessionKey ?? `legacy_${draft.id}`,
-        );
-
-        // Hide draft selector
-        setShowDraftSelector(false);
-        setPendingFormInit(null);
-      }
-    },
-    [pendingFormInit, initializeForm],
-  );
-
-  // Handler for starting a new form (ignoring drafts)
-  const handleStartNewForm = useCallback(() => {
-    if (pendingFormInit) {
-      console.log('Starting new form, ignoring drafts');
-      initializeForm(pendingFormInit, newDraftSessionKey());
-      setShowDraftSelector(false);
-      setPendingFormInit(null);
-    }
-  }, [pendingFormInit, initializeForm]);
-
-  const handleDataChange = useCallback(
-    ({ data: newData }: { data: FormData }) => {
-      const { errors, data: refreshedData } = runCustomValidatorsAndRefreshData(
-        uischema ?? undefined,
-        schema ?? undefined,
-        newData as Record<string, unknown>,
-        ajv,
+      window.removeEventListener(
+        'formRevalidate',
+        handleRevalidate as EventListener,
       );
-
-      setData(refreshedData);
-      setCustomValidatorErrors(errors);
-
-      // Save draft data whenever form data changes (skip embedded sub-observation sessions)
-      if (formInitData && !isSubObservationSession(formInitData)) {
-        draftService.saveDraft(
-          formInitData.formType,
-          refreshedData,
-          formInitData,
-          draftSessionKey,
-        );
-      }
-    },
-    [formInitData, draftSessionKey, uischema, schema, ajv],
-  );
+    };
+  }, [formInitData, draftSessionKey, uischema, schema, ajv, refreshFormData]);
 
   // Create dynamic theme based on dark mode preference and custom app colors.
   // When a custom app provides themeColors, they override the default palette
@@ -1251,7 +1361,8 @@ function App() {
 
   return (
     <ThemeProvider theme={currentTheme}>
-      <FormContext.Provider value={{ formInitData, draftSessionKey }}>
+      <FormContext.Provider
+        value={{ formInitData, draftSessionKey, commitFormData }}>
         <div
           className="App"
           style={{
diff --git a/formulus-formplayer/src/DynamicEnumControl.tsx b/formulus-formplayer/src/DynamicEnumControl.tsx
index 8aa3ecfe9..4c0ca6358 100644
--- a/formulus-formplayer/src/DynamicEnumControl.tsx
+++ b/formulus-formplayer/src/DynamicEnumControl.tsx
@@ -19,6 +19,7 @@ import {
   Alert,
   CircularProgress,
 } from '@mui/material';
+import QuestionShell from './components/QuestionShell';
 
 /**
  * Interface for x-dynamicEnum configuration
@@ -171,6 +172,14 @@ const DynamicEnumControl: React.FC<ControlProps> = ({
 
   const description = schema.description;
   const hasValidationErrors = errors && errors.length > 0;
+  const validationErrorStr = hasValidationErrors
+    ? Array.isArray(errors)
+      ? errors.filter(Boolean).join(', ')
+      : String(errors)
+    : null;
+  const isRequired = Boolean(
+    (uischema as { options?: { required?: boolean } })?.options?.required,
+  );
 
   // Load choices when component mounts or params change
   const loadChoices = useCallback(async () => {
@@ -305,27 +314,11 @@ const DynamicEnumControl: React.FC<ControlProps> = ({
   }
 
   return (
-    <Box sx={{ mb: 2 }}>
-      {/* Field Label */}
-      <Typography variant="h6" sx={{ mb: 1, fontWeight: 500 }}>
-        {label}
-        {schema.required && <span style={{ color: 'red' }}> *</span>}
-      </Typography>
-
-      {/* Description */}
-      {description && (
-        <Typography variant="body2" color="text.secondary" sx={{ mb: 1 }}>
-          {description}
-        </Typography>
-      )}
-
-      {/* Validation Errors */}
-      {hasValidationErrors && (
-        <Alert severity="error" sx={{ mb: 1 }}>
-          {Array.isArray(errors) ? errors.join(', ') : String(errors)}
-        </Alert>
-      )}
-      {/* Control */}
+    <QuestionShell
+      title={label}
+      description={description}
+      required={isRequired}
+      error={validationErrorStr}>
       {loading ? (
         <Box display="flex" alignItems="center" gap={2} sx={{ mt: 1 }}>
           <CircularProgress size={20} />
@@ -363,19 +356,12 @@ const DynamicEnumControl: React.FC<ControlProps> = ({
             <TextField
               {...params}
               error={!!hasValidationErrors}
-              helperText={
-                hasValidationErrors
-                  ? Array.isArray(errors)
-                    ? errors.join(', ')
-                    : String(errors)
-                  : ''
-              }
               placeholder="Select an option..."
             />
           )}
         />
       )}
-    </Box>
+    </QuestionShell>
   );
 };
 
diff --git a/formulus-formplayer/src/components/FormLayout.tsx b/formulus-formplayer/src/components/FormLayout.tsx
index 9e56cec82..1c0d18f78 100644
--- a/formulus-formplayer/src/components/FormLayout.tsx
+++ b/formulus-formplayer/src/components/FormLayout.tsx
@@ -66,6 +66,15 @@ interface FormLayoutProps {
     onTrigger: () => void;
     disabled?: boolean;
   };
+
+  /**
+   * Optional ref callback merged with the internal keyboard scroll ref
+   * (e.g. react-swipeable on the scroll area).
+   */
+  scrollRefMerge?: (el: HTMLDivElement | null) => void;
+
+  /** Extra props spread onto the scroll area (e.g. swipe gesture handlers). */
+  scrollHandlers?: Record<string, unknown>;
 }
 
 /**
@@ -92,9 +101,19 @@ const FormLayout: React.FC<FormLayoutProps> = ({
   showNavigation = true,
   keyboardSubmitAction,
   contentBottomPadding = 0,
+  scrollRefMerge,
+  scrollHandlers,
 }) => {
   const scrollRef = useKeyboardScrollClamp<HTMLDivElement>();
 
+  const mergedScrollRef = useCallback(
+    (el: HTMLDivElement | null) => {
+      scrollRef.current = el;
+      scrollRefMerge?.(el);
+    },
+    [scrollRef, scrollRefMerge],
+  );
+
   const handleFormSubmit = useCallback(
     (event: React.FormEvent<HTMLFormElement>) => {
       event.preventDefault();
@@ -106,8 +125,9 @@ const FormLayout: React.FC<FormLayoutProps> = ({
 
   const scrollArea = (
     <Box
-      ref={scrollRef}
+      ref={mergedScrollRef}
       data-testid="formplayer-scroll-area"
+      {...scrollHandlers}
       sx={theme => ({
         flex: 1,
         minHeight: 0,
@@ -258,15 +278,14 @@ const FormLayout: React.FC<FormLayoutProps> = ({
             width: '100%',
             boxSizing: 'border-box',
             backgroundColor: 'background.default',
-            paddingTop: `max(${theme.spacing(2)}, env(safe-area-inset-top, 0px))`,
-            paddingRight: theme.spacing(2),
-            paddingBottom: theme.spacing(2),
-            paddingLeft: theme.spacing(2),
+            paddingTop: `max(${theme.spacing(0.5)}, env(safe-area-inset-top, 0px))`,
+            paddingRight: theme.spacing(1.5),
+            paddingBottom: theme.spacing(0.5),
+            paddingLeft: theme.spacing(1.5),
             overflow: 'visible',
             borderBottom: `1px solid ${theme.palette.divider}`,
             borderRadius: 0,
             boxShadow: 'none',
-            minHeight: 82,
           })}>
           {header}
         </Box>
diff --git a/formulus-formplayer/src/components/FormProgressBar.test.tsx b/formulus-formplayer/src/components/FormProgressBar.test.tsx
new file mode 100644
index 000000000..1c50d9a53
--- /dev/null
+++ b/formulus-formplayer/src/components/FormProgressBar.test.tsx
@@ -0,0 +1,76 @@
+// @vitest-environment jsdom
+import React from 'react';
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { render, screen, cleanup } from '@testing-library/react';
+import { ThemeProvider, createTheme } from '@mui/material/styles';
+import FormProgressBar from './FormProgressBar';
+
+const theme = createTheme();
+
+afterEach(() => cleanup());
+
+const renderBar = (
+  props: Partial<React.ComponentProps<typeof FormProgressBar>> = {},
+) =>
+  render(
+    <ThemeProvider theme={theme}>
+      <FormProgressBar
+        currentPage={0}
+        totalScreens={3}
+        mode="screens"
+        onNavigatePrevious={vi.fn()}
+        onNavigateNext={vi.fn()}
+        {...props}
+      />
+    </ThemeProvider>,
+  );
+
+describe('FormProgressBar header navigation', () => {
+  it('shows both chevrons on multi-page forms', () => {
+    renderBar();
+    expect(screen.getByLabelText('Previous screen')).toBeInTheDocument();
+    expect(screen.getByLabelText('Next screen')).toBeInTheDocument();
+  });
+
+  it('disables previous chevron on first page', () => {
+    renderBar({
+      currentPage: 0,
+      canNavigatePrevious: false,
+      canNavigateNext: true,
+    });
+    expect(screen.getByLabelText('Previous screen')).toBeDisabled();
+    expect(screen.getByLabelText('Next screen')).not.toBeDisabled();
+  });
+
+  it('disables next chevron on last page', () => {
+    renderBar({
+      currentPage: 2,
+      canNavigatePrevious: true,
+      canNavigateNext: false,
+    });
+    expect(screen.getByLabelText('Previous screen')).not.toBeDisabled();
+    expect(screen.getByLabelText('Next screen')).toBeDisabled();
+  });
+
+  it('hides chevrons when only one screen', () => {
+    renderBar({ totalScreens: 1 });
+    expect(screen.queryByLabelText('Previous screen')).toBeNull();
+    expect(screen.queryByLabelText('Next screen')).toBeNull();
+  });
+
+  it('calls navigation callbacks when enabled', () => {
+    const onNavigatePrevious = vi.fn();
+    const onNavigateNext = vi.fn();
+    renderBar({
+      currentPage: 1,
+      canNavigatePrevious: true,
+      canNavigateNext: true,
+      onNavigatePrevious,
+      onNavigateNext,
+    });
+    screen.getByLabelText('Previous screen').click();
+    screen.getByLabelText('Next screen').click();
+    expect(onNavigatePrevious).toHaveBeenCalledTimes(1);
+    expect(onNavigateNext).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/formulus-formplayer/src/components/FormProgressBar.tsx b/formulus-formplayer/src/components/FormProgressBar.tsx
index 2ffa27d97..0a90c109f 100644
--- a/formulus-formplayer/src/components/FormProgressBar.tsx
+++ b/formulus-formplayer/src/components/FormProgressBar.tsx
@@ -47,6 +47,10 @@ interface FormProgressBarProps {
    */
   onNavigatePrevious?: () => void;
   onNavigateNext?: () => void;
+  /** When false, previous chevron is shown but disabled (multi-page forms). */
+  canNavigatePrevious?: boolean;
+  /** When false, next chevron is shown but disabled (multi-page forms). */
+  canNavigateNext?: boolean;
   /** When true, both header chevrons are disabled (e.g. navigation in flight). */
   navigationDisabled?: boolean;
 }
@@ -130,6 +134,7 @@ const countAnsweredQuestions = (
 const navIconButtonSx = {
   flexShrink: 0,
   p: 0.25,
+  minWidth: 32,
   color: 'text.secondary',
   '&.Mui-disabled': { opacity: 0.35 },
 } as const;
@@ -143,6 +148,8 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
   isOnFinalizePage = false,
   onNavigatePrevious,
   onNavigateNext,
+  canNavigatePrevious = false,
+  canNavigateNext = false,
   navigationDisabled = false,
 }) => {
   const progress = useMemo(() => {
@@ -184,26 +191,28 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
   }, [currentPage, totalScreens, data, schema, mode, isOnFinalizePage]);
 
   const handlePrev = useCallback(() => {
-    if (navigationDisabled || !onNavigatePrevious) return;
+    if (navigationDisabled || !canNavigatePrevious || !onNavigatePrevious)
+      return;
     onNavigatePrevious();
-  }, [navigationDisabled, onNavigatePrevious]);
+  }, [navigationDisabled, canNavigatePrevious, onNavigatePrevious]);
 
   const handleNext = useCallback(() => {
-    if (navigationDisabled || !onNavigateNext) return;
+    if (navigationDisabled || !canNavigateNext || !onNavigateNext) return;
     onNavigateNext();
-  }, [navigationDisabled, onNavigateNext]);
+  }, [navigationDisabled, canNavigateNext, onNavigateNext]);
 
   if (totalScreens === 0) {
     return null;
   }
 
-  const showHeaderNav = onNavigatePrevious != null || onNavigateNext != null;
+  const showHeaderNav = totalScreens > 1;
+  const prevDisabled = navigationDisabled || !canNavigatePrevious;
+  const nextDisabled = navigationDisabled || !canNavigateNext;
 
   return (
     <Box
       sx={{
         width: '100%',
-        mb: 1,
         px: 0,
       }}>
       <Box
@@ -211,7 +220,6 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
           display: 'flex',
           alignItems: 'center',
           gap: { xs: 0.25, sm: 0.5 },
-          mb: 0.5,
           px: { xs: 0.5, sm: 1 },
         }}>
         {showHeaderNav ? (
@@ -220,7 +228,7 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
             size="small"
             aria-label="Previous screen"
             onClick={handlePrev}
-            disabled={navigationDisabled || !onNavigatePrevious}
+            disabled={prevDisabled}
             edge="start"
             sx={navIconButtonSx}>
             <ChevronLeft sx={{ fontSize: 22 }} />
@@ -266,7 +274,7 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
             size="small"
             aria-label="Next screen"
             onClick={handleNext}
-            disabled={navigationDisabled || !onNavigateNext}
+            disabled={nextDisabled}
             edge="end"
             sx={navIconButtonSx}>
             <ChevronRight sx={{ fontSize: 22 }} />
diff --git a/formulus-formplayer/src/context/FormDensityContext.tsx b/formulus-formplayer/src/context/FormDensityContext.tsx
index 6dca609c1..d13225af9 100644
--- a/formulus-formplayer/src/context/FormDensityContext.tsx
+++ b/formulus-formplayer/src/context/FormDensityContext.tsx
@@ -1,13 +1,16 @@
 import { createContext, useContext } from 'react';
 
 export type LabelLayout = 'inline' | 'stacked';
+export type GroupVariant = 'flat' | 'card';
 
 export interface FormDensityContextValue {
   labelLayout: LabelLayout;
+  groupVariant: GroupVariant;
 }
 
 export const FormDensityContext = createContext<FormDensityContextValue>({
   labelLayout: 'stacked',
+  groupVariant: 'card',
 });
 
 export const useFormDensity = () => useContext(FormDensityContext);
diff --git a/formulus-formplayer/src/hooks/useKeyboardScrollClamp.integration.test.tsx b/formulus-formplayer/src/hooks/useKeyboardScrollClamp.integration.test.tsx
new file mode 100644
index 000000000..709c07174
--- /dev/null
+++ b/formulus-formplayer/src/hooks/useKeyboardScrollClamp.integration.test.tsx
@@ -0,0 +1,67 @@
+// @vitest-environment jsdom
+import { describe, it, expect, afterEach, vi } from 'vitest';
+import { render, screen, fireEvent, cleanup } from '@testing-library/react';
+import FormLayout from '../components/FormLayout';
+import * as keyboardScroll from '../utils/keyboardScroll';
+
+afterEach(() => cleanup());
+
+describe('FormLayout keyboard scroll integration', () => {
+  it('does not re-reveal on input or layout resize while focused', async () => {
+    const revealSpy = vi.spyOn(keyboardScroll, 'revealFieldIfNeeded');
+
+    render(
+      <FormLayout showNavigation={false}>
+        <div style={{ height: 1200 }}>
+          <input data-testid="field" type="number" defaultValue="" />
+        </div>
+      </FormLayout>,
+    );
+
+    const scrollArea = screen.getByTestId('formplayer-scroll-area');
+    const input = screen.getByTestId('field');
+
+    fireEvent.focusIn(input, { bubbles: true });
+    await new Promise(resolve => setTimeout(resolve, 150));
+    revealSpy.mockClear();
+
+    fireEvent.input(input, { target: { value: '5' }, bubbles: true });
+    scrollArea.appendChild(document.createElement('div'));
+
+    await new Promise(resolve => setTimeout(resolve, 50));
+
+    expect(revealSpy).not.toHaveBeenCalled();
+    revealSpy.mockRestore();
+  });
+
+  it('clamps scrollTop after input without exceeding max scroll', async () => {
+    const { container } = render(
+      <FormLayout showNavigation={false}>
+        <div style={{ height: 1200 }}>
+          <input data-testid="field" type="text" defaultValue="" />
+        </div>
+      </FormLayout>,
+    );
+
+    const scrollArea = screen.getByTestId('formplayer-scroll-area');
+    Object.defineProperty(scrollArea, 'scrollHeight', {
+      configurable: true,
+      value: 1200,
+    });
+    Object.defineProperty(scrollArea, 'clientHeight', {
+      configurable: true,
+      value: 400,
+    });
+    scrollArea.scrollTop = 900;
+
+    const input = screen.getByTestId('field');
+    fireEvent.focusIn(input, { bubbles: true });
+    fireEvent.input(input, { target: { value: 'x' }, bubbles: true });
+
+    await new Promise(resolve => setTimeout(resolve, 50));
+
+    const max = Math.max(0, scrollArea.scrollHeight - scrollArea.clientHeight);
+    expect(scrollArea.scrollTop).toBeLessThanOrEqual(max);
+    expect(container).toBeTruthy();
+  });
+});
diff --git a/formulus-formplayer/src/hooks/useKeyboardScrollClamp.test.ts b/formulus-formplayer/src/hooks/useKeyboardScrollClamp.test.ts
index 78cbdf49c..7e0759200 100644
--- a/formulus-formplayer/src/hooks/useKeyboardScrollClamp.test.ts
+++ b/formulus-formplayer/src/hooks/useKeyboardScrollClamp.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { clampScrollTop } from './useKeyboardScrollClamp';
+import { clampScrollTop, isClampableInputType } from './useKeyboardScrollClamp';
 
 describe('clampScrollTop', () => {
   it('does not change scrollTop when within range', () => {
@@ -32,3 +32,17 @@ describe('clampScrollTop', () => {
     expect(el.scrollTop).toBe(0);
   });
 });
+
+describe('isClampableInputType', () => {
+  it('includes number and text types', () => {
+    expect(isClampableInputType('number')).toBe(true);
+    expect(isClampableInputType('text')).toBe(true);
+    expect(isClampableInputType(undefined)).toBe(true);
+  });
+
+  it('excludes buttons and hidden inputs', () => {
+    expect(isClampableInputType('hidden')).toBe(false);
+    expect(isClampableInputType('button')).toBe(false);
+    expect(isClampableInputType('checkbox')).toBe(false);
+  });
+});
diff --git a/formulus-formplayer/src/hooks/useKeyboardScrollClamp.ts b/formulus-formplayer/src/hooks/useKeyboardScrollClamp.ts
index 5109815dc..32ab90c64 100644
--- a/formulus-formplayer/src/hooks/useKeyboardScrollClamp.ts
+++ b/formulus-formplayer/src/hooks/useKeyboardScrollClamp.ts
@@ -1,45 +1,84 @@
 import { useCallback, useEffect, useRef } from 'react';
+import { clampScrollTop, revealFieldIfNeeded } from '../utils/keyboardScroll';
 
-function isTextInput(
+/** Input types that should trigger scroll clamp on value change. */
+export function isClampableInputType(type: string | undefined): boolean {
+  const normalized = type?.toLowerCase() ?? 'text';
+  return ![
+    'hidden',
+    'checkbox',
+    'radio',
+    'file',
+    'button',
+    'submit',
+    'reset',
+  ].includes(normalized);
+}
+
+/** Inputs that participate in IME scroll clamping (focus + value change). */
+export function isFormFieldForScrollClamp(
   el: EventTarget | null,
-): el is HTMLInputElement | HTMLTextAreaElement {
+): el is HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement {
   if (!el || !(el instanceof HTMLElement)) return false;
-  if (el instanceof HTMLTextAreaElement) return true;
+  if (el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement) {
+    return true;
+  }
   if (el instanceof HTMLInputElement) {
-    const type = el.type?.toLowerCase() ?? 'text';
-    return ![
-      'hidden',
-      'checkbox',
-      'radio',
-      'file',
-      'button',
-      'submit',
-      'reset',
-    ].includes(type);
+    return isClampableInputType(el.type);
   }
   return false;
 }
 
-/** Prevent scrolling past the last real content row inside the form scroll area. */
-export function clampScrollTop(el: HTMLElement): void {
-  const max = Math.max(0, el.scrollHeight - el.clientHeight);
-  if (el.scrollTop > max) {
-    el.scrollTop = max;
-  }
-}
+export { clampScrollTop } from '../utils/keyboardScroll';
+
+const KEYBOARD_REVEAL_DELAY_MS = 100;
 
 /**
- * Clamps FormLayout scroll when the IME opens and after text field focus.
- * Avoids scrolling into flex filler / padding void above the nav bar.
+ * Clamps FormLayout scroll when the IME opens and reveals focused fields only
+ * when obscured after keyboard animation — never scrollIntoView on value change.
  */
 export function useKeyboardScrollClamp<T extends HTMLElement>() {
   const scrollRef = useRef<T | null>(null);
+  const focusedFieldRef = useRef<HTMLElement | null>(null);
+  const revealTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const clamp = useCallback(() => {
     const el = scrollRef.current;
     if (el) clampScrollTop(el);
   }, []);
 
+  const tryRevealFocused = useCallback(() => {
+    const container = scrollRef.current;
+    const field = focusedFieldRef.current;
+    if (!container || !field || !container.contains(field)) return;
+    revealFieldIfNeeded(container, field, { marginBottom: 24, marginTop: 8 });
+    clamp();
+  }, [clamp]);
+
+  const scheduleReveal = useCallback(() => {
+    if (revealTimerRef.current) {
+      clearTimeout(revealTimerRef.current);
+      revealTimerRef.current = null;
+    }
+
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        tryRevealFocused();
+        revealTimerRef.current = setTimeout(() => {
+          tryRevealFocused();
+          revealTimerRef.current = null;
+        }, KEYBOARD_REVEAL_DELAY_MS);
+      });
+    });
+  }, [tryRevealFocused]);
+
+  const runClampChain = useCallback(() => {
+    requestAnimationFrame(() => {
+      clamp();
+      requestAnimationFrame(clamp);
+    });
+  }, [clamp]);
+
   useEffect(() => {
     const el = scrollRef.current;
     if (!el) return;
@@ -47,37 +86,81 @@ export function useKeyboardScrollClamp<T extends HTMLElement>() {
     const vv = window.visualViewport;
 
     const onViewportChange = () => {
-      requestAnimationFrame(clamp);
+      if (focusedFieldRef.current) {
+        scheduleReveal();
+      } else {
+        requestAnimationFrame(clamp);
+      }
     };
 
     const onFocusIn = (event: FocusEvent) => {
       const target = event.target;
-      if (!isTextInput(target)) return;
+      if (!isFormFieldForScrollClamp(target)) return;
+      if (!(target instanceof HTMLElement)) return;
 
-      requestAnimationFrame(() => {
-        requestAnimationFrame(() => {
-          if (target instanceof HTMLElement) {
-            try {
-              target.scrollIntoView({ block: 'nearest', behavior: 'instant' });
-            } catch {
-              target.scrollIntoView({ block: 'nearest' });
-            }
-          }
-          clamp();
-        });
-      });
+      focusedFieldRef.current = target;
+      scheduleReveal();
+    };
+
+    const onFocusOut = (event: FocusEvent) => {
+      const target = event.target;
+      if (!isFormFieldForScrollClamp(target)) return;
+
+      const related = event.relatedTarget;
+      if (
+        related instanceof HTMLElement &&
+        isFormFieldForScrollClamp(related) &&
+        el.contains(related)
+      ) {
+        return;
+      }
+
+      if (focusedFieldRef.current === target) {
+        focusedFieldRef.current = null;
+      }
+      if (revealTimerRef.current) {
+        clearTimeout(revealTimerRef.current);
+        revealTimerRef.current = null;
+      }
+      runClampChain();
+    };
+
+    const onInputOrChange = (event: Event) => {
+      if (!isFormFieldForScrollClamp(event.target)) return;
+      runClampChain();
     };
 
+    // Clamp only on content resize (e.g. value change re-render). Re-revealing here
+    // caused a scroll gap above the keyboard on first keystroke in number fields.
+    const resizeObserver =
+      typeof ResizeObserver !== 'undefined'
+        ? new ResizeObserver(() => {
+            runClampChain();
+          })
+        : null;
+
+    resizeObserver?.observe(el);
+
     vv?.addEventListener('resize', onViewportChange);
     vv?.addEventListener('scroll', onViewportChange);
     el.addEventListener('focusin', onFocusIn);
+    el.addEventListener('focusout', onFocusOut);
+    el.addEventListener('input', onInputOrChange, true);
+    el.addEventListener('change', onInputOrChange, true);
 
     return () => {
+      resizeObserver?.disconnect();
       vv?.removeEventListener('resize', onViewportChange);
       vv?.removeEventListener('scroll', onViewportChange);
       el.removeEventListener('focusin', onFocusIn);
+      el.removeEventListener('focusout', onFocusOut);
+      el.removeEventListener('input', onInputOrChange, true);
+      el.removeEventListener('change', onInputOrChange, true);
+      if (revealTimerRef.current) {
+        clearTimeout(revealTimerRef.current);
+      }
     };
-  }, [clamp]);
+  }, [clamp, runClampChain, scheduleReveal, tryRevealFocused]);
 
   return scrollRef;
 }
diff --git a/formulus-formplayer/src/hooks/useNumericDraftInput.test.ts b/formulus-formplayer/src/hooks/useNumericDraftInput.test.ts
new file mode 100644
index 000000000..5a232a0d6
--- /dev/null
+++ b/formulus-formplayer/src/hooks/useNumericDraftInput.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from 'vitest';
+import {
+  formatNumericDisplay,
+  parseNumericDraft,
+} from './useNumericDraftInput';
+
+describe('formatNumericDisplay', () => {
+  it('formats numbers and empty values', () => {
+    expect(formatNumericDisplay(16)).toBe('16');
+    expect(formatNumericDisplay(12.5)).toBe('12.5');
+    expect(formatNumericDisplay(undefined)).toBe('');
+    expect(formatNumericDisplay(null)).toBe('');
+    expect(formatNumericDisplay('')).toBe('');
+  });
+});
+
+describe('parseNumericDraft', () => {
+  describe('integer', () => {
+    it('parses complete integers without clamping to bounds', () => {
+      expect(parseNumericDraft('35', 'integer')).toEqual({
+        kind: 'complete',
+        value: 35,
+      });
+      expect(parseNumericDraft('0', 'integer')).toEqual({
+        kind: 'complete',
+        value: 0,
+      });
+      expect(parseNumericDraft('-3', 'integer')).toEqual({
+        kind: 'complete',
+        value: -3,
+      });
+    });
+
+    it('returns empty for blank input', () => {
+      expect(parseNumericDraft('', 'integer')).toEqual({ kind: 'empty' });
+      expect(parseNumericDraft('   ', 'integer')).toEqual({ kind: 'empty' });
+    });
+
+    it('returns incomplete for partial integer entry', () => {
+      expect(parseNumericDraft('-', 'integer')).toEqual({ kind: 'incomplete' });
+      expect(parseNumericDraft('1.', 'integer')).toEqual({
+        kind: 'incomplete',
+      });
+    });
+
+    it('commits non-integer decimals as float for AJV to reject', () => {
+      expect(parseNumericDraft('1.5', 'integer')).toEqual({
+        kind: 'complete',
+        value: 1.5,
+      });
+    });
+  });
+
+  describe('number', () => {
+    it('parses decimals', () => {
+      expect(parseNumericDraft('12.5', 'number')).toEqual({
+        kind: 'complete',
+        value: 12.5,
+      });
+      expect(parseNumericDraft('.5', 'number')).toEqual({
+        kind: 'complete',
+        value: 0.5,
+      });
+    });
+
+    it('allows partial decimal entry', () => {
+      expect(parseNumericDraft('1.', 'number')).toEqual({ kind: 'incomplete' });
+      expect(parseNumericDraft('-', 'number')).toEqual({ kind: 'incomplete' });
+    });
+
+    it('parses integers as numbers', () => {
+      expect(parseNumericDraft('35', 'number')).toEqual({
+        kind: 'complete',
+        value: 35,
+      });
+    });
+  });
+});
diff --git a/formulus-formplayer/src/hooks/useNumericDraftInput.ts b/formulus-formplayer/src/hooks/useNumericDraftInput.ts
new file mode 100644
index 000000000..27aa1dab8
--- /dev/null
+++ b/formulus-formplayer/src/hooks/useNumericDraftInput.ts
@@ -0,0 +1,159 @@
+import { useCallback, useState } from 'react';
+import type { InputHTMLAttributes } from 'react';
+import type { KeyboardPrimaryEnterKeyHint } from '../utils/keyboardEnterKeyHint';
+
+export type NumericSchemaKind = 'integer' | 'number';
+
+export type ParseNumericResult =
+  | { kind: 'empty' }
+  | { kind: 'complete'; value: number }
+  | { kind: 'incomplete' };
+
+/** Format committed observation data for display when the field is not focused. */
+export function formatNumericDisplay(data: unknown): string {
+  if (data === undefined || data === null || data === '') return '';
+  if (typeof data === 'number' && !Number.isNaN(data)) return String(data);
+  return '';
+}
+
+/**
+ * Parse draft text from a numeric input.
+ * Never clamps to schema bounds — callers validate via AJV.
+ */
+export function parseNumericDraft(
+  text: string,
+  schemaKind: NumericSchemaKind,
+): ParseNumericResult {
+  const trimmed = text.trim();
+  if (trimmed === '') return { kind: 'empty' };
+
+  if (schemaKind === 'integer') {
+    if (trimmed === '-') return { kind: 'incomplete' };
+    if (/^-?\d+$/.test(trimmed)) {
+      return { kind: 'complete', value: parseInt(trimmed, 10) };
+    }
+    if (/^-?\d*\.$/.test(trimmed) || trimmed === '.') {
+      return { kind: 'incomplete' };
+    }
+    // Non-integer decimal text (e.g. "1.5") — commit as float so AJV type:integer fails.
+    const asFloat = parseFloat(trimmed);
+    if (!Number.isNaN(asFloat) && /^-?(\d+\.\d+|\.\d+)$/.test(trimmed)) {
+      return { kind: 'complete', value: asFloat };
+    }
+    return { kind: 'incomplete' };
+  }
+
+  if (trimmed === '-' || trimmed === '.' || trimmed === '-.') {
+    return { kind: 'incomplete' };
+  }
+  if (/^-?\d+\.$/.test(trimmed)) {
+    return { kind: 'incomplete' };
+  }
+  if (/^-?(\d+\.?\d*|\.\d+)$/.test(trimmed)) {
+    const value = parseFloat(trimmed);
+    if (!Number.isNaN(value)) {
+      return { kind: 'complete', value };
+    }
+  }
+  return { kind: 'incomplete' };
+}
+
+export type UseNumericDraftInputOptions = {
+  data: unknown;
+  path: string;
+  handleChange: (path: string, value: unknown) => void;
+  schemaKind: NumericSchemaKind;
+  enterKeyHint?: KeyboardPrimaryEnterKeyHint;
+  enabled?: boolean;
+};
+
+export type UseNumericDraftInputResult = {
+  isFocused: boolean;
+  displayValue: string;
+  inputMode: 'numeric' | 'decimal';
+  onFocus: () => void;
+  onBlur: () => void;
+  onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  /** Sync draft text after a programmatic value change (e.g. stepper +/-). */
+  syncDraftFromData: (value: unknown) => void;
+  inputProps: Pick<
+    InputHTMLAttributes<HTMLInputElement>,
+    'type' | 'inputMode' | 'enterKeyHint' | 'autoComplete'
+  >;
+};
+
+export function useNumericDraftInput({
+  data,
+  path,
+  handleChange,
+  schemaKind,
+  enterKeyHint,
+  enabled = true,
+}: UseNumericDraftInputOptions): UseNumericDraftInputResult {
+  const [isFocused, setIsFocused] = useState(false);
+  const [draftText, setDraftText] = useState<string | null>(null);
+
+  const commitParsed = useCallback(
+    (text: string) => {
+      const parsed = parseNumericDraft(text, schemaKind);
+      if (parsed.kind === 'empty') {
+        handleChange(path, undefined);
+      } else if (parsed.kind === 'complete') {
+        handleChange(path, parsed.value);
+      }
+    },
+    [handleChange, path, schemaKind],
+  );
+
+  const displayValue =
+    isFocused && draftText !== null ? draftText : formatNumericDisplay(data);
+
+  const onFocus = useCallback(() => {
+    if (!enabled) return;
+    setIsFocused(true);
+    setDraftText(formatNumericDisplay(data));
+  }, [data, enabled]);
+
+  const onBlur = useCallback(() => {
+    if (draftText !== null) {
+      commitParsed(draftText);
+    }
+    setIsFocused(false);
+    setDraftText(null);
+  }, [commitParsed, draftText]);
+
+  const onChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      const text = event.target.value;
+      setDraftText(text);
+      commitParsed(text);
+    },
+    [commitParsed],
+  );
+
+  const syncDraftFromData = useCallback(
+    (value: unknown) => {
+      const formatted = formatNumericDisplay(value);
+      if (isFocused) {
+        setDraftText(formatted);
+      }
+    },
+    [isFocused],
+  );
+
+  return {
+    isFocused,
+    displayValue,
+    inputMode: schemaKind === 'integer' ? 'numeric' : 'decimal',
+    onFocus,
+    onBlur,
+    onChange,
+    syncDraftFromData,
+    inputProps: {
+      type: 'text',
+      inputMode: schemaKind === 'integer' ? 'numeric' : 'decimal',
+      ...(enterKeyHint ? { enterKeyHint } : {}),
+      autoComplete: 'off',
+    },
+  };
+}
diff --git a/formulus-formplayer/src/jsonforms/MaterialTextControlWithImeHint.tsx b/formulus-formplayer/src/jsonforms/MaterialTextControlWithImeHint.tsx
index 9cb7f9e43..57a0df26a 100644
--- a/formulus-formplayer/src/jsonforms/MaterialTextControlWithImeHint.tsx
+++ b/formulus-formplayer/src/jsonforms/MaterialTextControlWithImeHint.tsx
@@ -26,15 +26,23 @@ const MaterialInputControlUntyped = MaterialInputControl as React.FC<
  */
 const MaterialTextControlWithImeHint = (props: ControlProps) => {
   const { keyboardEnterKeyHint } = useFormContext();
+  const { uischema } = props;
+  const autoFocus =
+    (uischema as { options?: { autoFocus?: boolean } })?.options?.autoFocus ===
+    true;
 
   return (
     <MaterialInputControlUntyped
       {...props}
-      muiInputProps={
-        keyboardEnterKeyHint
-          ? { enterKeyHint: keyboardEnterKeyHint }
-          : undefined
-      }
+      muiInputProps={{
+        ...(keyboardEnterKeyHint ? { enterKeyHint: keyboardEnterKeyHint } : {}),
+        ...(autoFocus
+          ? {
+              autoFocus: true,
+              'data-formplayer-autofocus': 'true',
+            }
+          : {}),
+      }}
       input={MuiInputText}
     />
   );
diff --git a/formulus-formplayer/src/jsonforms/ShellInputControl.tsx b/formulus-formplayer/src/jsonforms/ShellInputControl.tsx
index e4b638cea..20073e0ff 100644
--- a/formulus-formplayer/src/jsonforms/ShellInputControl.tsx
+++ b/formulus-formplayer/src/jsonforms/ShellInputControl.tsx
@@ -32,6 +32,30 @@ const ShellInputControl = (props: ControlProps) => {
     ? errors.filter(Boolean).join(', ')
     : errors || null;
   const isValid = !errorStr;
+  const autoFocus =
+    (uischema as { options?: { autoFocus?: boolean } })?.options?.autoFocus ===
+    true;
+  const uiOptions = (
+    uischema as {
+      options?: {
+        multi?: boolean;
+        minRows?: number;
+        rows?: number;
+        maxRows?: number;
+      };
+    }
+  )?.options;
+  const multiline = uiOptions?.multi === true;
+  const minRows =
+    typeof uiOptions?.minRows === 'number' ? uiOptions.minRows : undefined;
+  const rows = typeof uiOptions?.rows === 'number' ? uiOptions.rows : undefined;
+  const maxRows =
+    typeof uiOptions?.maxRows === 'number' ? uiOptions.maxRows : undefined;
+
+  const cellProps = {
+    ...(props as React.ComponentProps<typeof MuiInputText>),
+    errors: '',
+  };
 
   return (
     <QuestionShell
@@ -40,14 +64,24 @@ const ShellInputControl = (props: ControlProps) => {
       required={isRequired}
       error={errorStr}>
       <MuiInputText
-        {...(props as React.ComponentProps<typeof MuiInputText>)}
+        {...cellProps}
         label={undefined}
         isValid={isValid}
-        muiInputProps={
-          keyboardEnterKeyHint
+        muiInputProps={{
+          ...(multiline ? { multiline: true } : {}),
+          ...(minRows != null ? { minRows } : {}),
+          ...(rows != null ? { rows } : {}),
+          ...(maxRows != null ? { maxRows } : {}),
+          ...(keyboardEnterKeyHint
             ? { enterKeyHint: keyboardEnterKeyHint }
-            : undefined
-        }
+            : {}),
+          ...(autoFocus
+            ? {
+                autoFocus: true,
+                'data-formplayer-autofocus': 'true',
+              }
+            : {}),
+        }}
       />
     </QuestionShell>
   );
diff --git a/formulus-formplayer/src/mocks/webview-mock.ts b/formulus-formplayer/src/mocks/webview-mock.ts
index 87c3744b4..b92807759 100644
--- a/formulus-formplayer/src/mocks/webview-mock.ts
+++ b/formulus-formplayer/src/mocks/webview-mock.ts
@@ -47,6 +47,7 @@ type MockGlobalThis = typeof globalThis & {
 class WebViewMock {
   private messageListeners: ((message: any) => void)[] = [];
   private isActive = false;
+  private sequenceCounters = new Map<string, number>();
   private pendingCameraPromises = new Map<
     string,
     {
@@ -237,6 +238,19 @@ class WebViewMock {
       // getVersion is required by formulus-load.js so it accepts this as a valid API.
       mockGlobal.formulus = {
         getVersion: (): Promise<string> => Promise.resolve('mock-dev'),
+        allocateSequence: (
+          scopeKey: string,
+          options?: { startAt?: number; peek?: boolean },
+        ): Promise<number> => {
+          const key = `device:mock-dev:${scopeKey.trim()}`;
+          const startAt = options?.startAt ?? 1;
+          const last = this.sequenceCounters.get(key) ?? startAt - 1;
+          const next = last + 1;
+          if (!options?.peek) {
+            this.sequenceCounters.set(key, next);
+          }
+          return Promise.resolve(next);
+        },
         submitObservation: (
           formType: string,
           data: Record<string, any>,
diff --git a/formulus-formplayer/src/renderers/AdateQuestionRenderer.tsx b/formulus-formplayer/src/renderers/AdateQuestionRenderer.tsx
index 1ab73603a..d431ce46c 100644
--- a/formulus-formplayer/src/renderers/AdateQuestionRenderer.tsx
+++ b/formulus-formplayer/src/renderers/AdateQuestionRenderer.tsx
@@ -12,12 +12,11 @@ import {
   MenuItem,
   Box,
   Typography,
-  Alert,
   Button,
   FormControl,
   InputLabel,
 } from '@mui/material';
-import { CalendarToday, ErrorOutline } from '@mui/icons-material';
+import { CalendarToday } from '@mui/icons-material';
 import QuestionShell from '../components/QuestionShell';
 import {
   adateToStorageFormat,
@@ -357,21 +356,6 @@ const AdateQuestionRenderer: React.FC<ControlProps> = ({
             </Typography>
           </Box>
         )}
-
-        {/* Validation errors – same as QuestionShell: icon, no background, text color matches icon */}
-        {hasError && (
-          <Alert
-            severity="error"
-            icon={<ErrorOutline />}
-            sx={{
-              mt: 2,
-              backgroundColor: 'transparent',
-              color: 'error.main',
-              '& .MuiAlert-icon': { color: 'error.main' },
-            }}>
-            {Array.isArray(errors) ? errors.join(', ') : String(errors)}
-          </Alert>
-        )}
       </Box>
     </QuestionShell>
   );
diff --git a/formulus-formplayer/src/renderers/CustomQuestionTypeAdapter.tsx b/formulus-formplayer/src/renderers/CustomQuestionTypeAdapter.tsx
index e40d57b87..a0772f331 100644
--- a/formulus-formplayer/src/renderers/CustomQuestionTypeAdapter.tsx
+++ b/formulus-formplayer/src/renderers/CustomQuestionTypeAdapter.tsx
@@ -11,6 +11,7 @@ import { withJsonFormsControlProps, useJsonForms } from '@jsonforms/react';
 import type { ControlProps } from '@jsonforms/core';
 import QuestionShell from '../components/QuestionShell';
 import type { CustomQuestionTypeProps } from '../types/CustomQuestionTypeContract';
+import { formatControlErrors } from '../utils/formatControlErrors';
 
 // ---------------------------------------------------------------------------
 // Error Boundary — catches crashes in custom components
@@ -129,11 +130,18 @@ export function createCustomQuestionTypeRenderer(
     // Build the simplified props for the custom component
     const hasErrors =
       errors && (Array.isArray(errors) ? errors.length > 0 : true);
-    const errorMessage = hasErrors
-      ? Array.isArray(errors)
-        ? errors.map((e: any) => e.message || String(e)).join(', ')
-        : String(errors)
-      : '';
+    const errorMessage =
+      formatControlErrors(
+        hasErrors
+          ? Array.isArray(errors)
+            ? errors.map((e: { message?: string } | string) =>
+                typeof e === 'object' && e && 'message' in e && e.message
+                  ? String(e.message)
+                  : String(e),
+              )
+            : errors
+          : null,
+      ) ?? '';
 
     // Extract all schema properties (except reserved ones) as config
     // This allows parameters alongside "format" to be passed to the renderer
@@ -209,7 +217,9 @@ export function createCustomQuestionTypeRenderer(
       onChange: (newValue: unknown) => handleChange(path, newValue),
       validation: {
         error: Boolean(hasErrors),
-        message: errorMessage,
+        // QuestionShell shows errorMessage; omit copy here so legacy/custom
+        // widgets do not duplicate text via helperText / Typography.
+        message: '',
       },
       enabled: enabled ?? true,
       visible: visible ?? true,
@@ -233,7 +243,7 @@ export function createCustomQuestionTypeRenderer(
         title={label}
         description={description}
         required={required}
-        error={errors}>
+        error={errorMessage || null}>
         <CustomQuestionErrorBoundary formatName={formatName}>
           <CustomComponent {...customProps} />
         </CustomQuestionErrorBoundary>
diff --git a/formulus-formplayer/src/renderers/FlatGroupLayout.test.tsx b/formulus-formplayer/src/renderers/FlatGroupLayout.test.tsx
new file mode 100644
index 000000000..de4cd878d
--- /dev/null
+++ b/formulus-formplayer/src/renderers/FlatGroupLayout.test.tsx
@@ -0,0 +1,23 @@
+// @vitest-environment jsdom
+import { describe, it, expect, afterEach } from 'vitest';
+import { render, screen, cleanup } from '@testing-library/react';
+import { ThemeProvider, createTheme } from '@mui/material/styles';
+import { CardGroupShell } from './FlatGroupLayout';
+
+const theme = createTheme();
+
+afterEach(() => cleanup());
+
+describe('CardGroupShell', () => {
+  it('renders group title and children', () => {
+    render(
+      <ThemeProvider theme={theme}>
+        <CardGroupShell label="Sticker / amostra">
+          <div data-testid="child">Field</div>
+        </CardGroupShell>
+      </ThemeProvider>,
+    );
+    expect(screen.getByText('Sticker / amostra')).toBeInTheDocument();
+    expect(screen.getByTestId('child')).toBeInTheDocument();
+  });
+});
diff --git a/formulus-formplayer/src/renderers/FlatGroupLayout.tsx b/formulus-formplayer/src/renderers/FlatGroupLayout.tsx
new file mode 100644
index 000000000..99ed0466a
--- /dev/null
+++ b/formulus-formplayer/src/renderers/FlatGroupLayout.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import { withJsonFormsLayoutProps } from '@jsonforms/react';
+import {
+  LayoutProps,
+  RankedTester,
+  rankWith,
+  uiTypeIs,
+  UISchemaElement,
+} from '@jsonforms/core';
+import { MaterialLayoutRenderer } from '@jsonforms/material-renderers';
+import { Box, Card, CardContent, CardHeader, Typography } from '@mui/material';
+import { useFormDensity } from '../context/FormDensityContext';
+
+const isEmpty = (value: string | undefined): boolean =>
+  value === undefined || value === null || value.trim() === '';
+
+/** @internal for tests — card shell without JSON Forms wrapper */
+export function CardGroupShell({
+  label,
+  children,
+}: {
+  label?: string;
+  children: React.ReactNode;
+}) {
+  return (
+    <Card sx={{ mb: 1.25 }}>
+      {!isEmpty(label) && (
+        <CardHeader
+          title={label}
+          sx={{ pb: 0.5, '& .MuiCardHeader-title': { fontSize: '1rem' } }}
+        />
+      )}
+      <CardContent sx={{ pt: 0, '&:last-child': { pb: 2 } }}>
+        {children}
+      </CardContent>
+    </Card>
+  );
+}
+
+export const flatGroupLayoutTester: RankedTester = rankWith(
+  2,
+  uiTypeIs('Group'),
+);
+
+const FlatGroupLayoutRenderer = ({
+  uischema,
+  schema,
+  path,
+  visible,
+  enabled,
+  renderers,
+  cells,
+  direction,
+  label,
+}: LayoutProps) => {
+  const { groupVariant } = useFormDensity();
+  const groupLayout = uischema as {
+    elements: UISchemaElement[];
+    options?: { variant?: string };
+  };
+  const useCard =
+    groupVariant === 'card' || groupLayout.options?.variant === 'card';
+
+  if (!visible) {
+    return null;
+  }
+
+  const childProps = {
+    elements: groupLayout.elements,
+    schema,
+    path,
+    enabled,
+    direction,
+    visible,
+    renderers,
+    cells,
+  };
+
+  const layout = (
+    <MaterialLayoutRenderer
+      {...childProps}
+      visible={visible}
+      enabled={enabled}
+      elements={groupLayout.elements}
+    />
+  );
+
+  if (useCard) {
+    return <CardGroupShell label={label}>{layout}</CardGroupShell>;
+  }
+
+  return (
+    <Box sx={{ width: '100%', mb: 1 }}>
+      {!isEmpty(label) && (
+        <Typography
+          variant="subtitle2"
+          component="h2"
+          sx={{
+            fontWeight: 700,
+            fontSize: '1rem',
+            lineHeight: 1.3,
+            pt: 0,
+            pb: 0.5,
+            px: 0,
+            textAlign: 'left',
+          }}>
+          {label}
+        </Typography>
+      )}
+      {layout}
+    </Box>
+  );
+};
+
+export const FlatGroupLayout = withJsonFormsLayoutProps(
+  FlatGroupLayoutRenderer,
+);
diff --git a/formulus-formplayer/src/renderers/NumberStepperRenderer.test.tsx b/formulus-formplayer/src/renderers/NumberStepperRenderer.test.tsx
new file mode 100644
index 000000000..e1bd31686
--- /dev/null
+++ b/formulus-formplayer/src/renderers/NumberStepperRenderer.test.tsx
@@ -0,0 +1,185 @@
+// @vitest-environment jsdom
+import React, { useState } from 'react';
+import { describe, it, expect, afterEach } from 'vitest';
+import {
+  render,
+  screen,
+  cleanup,
+  fireEvent,
+  waitFor,
+} from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { ThemeProvider } from '@mui/material/styles';
+import { JsonForms } from '@jsonforms/react';
+import type { JsonSchema7, UISchemaElement } from '@jsonforms/core';
+import Ajv from 'ajv';
+import { theme } from '../theme/theme';
+import { FormContext } from '../App';
+import { numberStepperRenderer } from './NumberStepperRenderer';
+
+const ajv = new Ajv({ allErrors: true, strict: false });
+
+const hbSchema: JsonSchema7 = {
+  type: 'object',
+  properties: {
+    hb_resultado: {
+      type: 'number',
+      title: 'Resultado de hemoglobina',
+      minimum: 0,
+      maximum: 25,
+    },
+  },
+};
+
+const hbUischema: UISchemaElement = {
+  type: 'Control',
+  scope: '#/properties/hb_resultado',
+};
+
+function NumericTestHarness({
+  schema,
+  uischema,
+  initialData = {},
+  validationMode = 'ValidateAndShow' as const,
+}: {
+  schema: JsonSchema7;
+  uischema: UISchemaElement;
+  initialData?: Record<string, unknown>;
+  validationMode?: 'ValidateAndShow' | 'ValidateAndHide' | 'NoValidation';
+}) {
+  const [data, setData] = useState<Record<string, unknown>>(initialData);
+
+  return (
+    <ThemeProvider theme={theme}>
+      <FormContext.Provider
+        value={{
+          formInitData: null,
+          keyboardEnterKeyHint: 'next',
+          draftSessionKey: null,
+        }}>
+        <JsonForms
+          schema={schema}
+          uischema={uischema}
+          data={data}
+          renderers={[numberStepperRenderer]}
+          ajv={ajv}
+          validationMode={validationMode}
+          onChange={({ data: next }) => setData(next || {})}
+        />
+        <pre data-testid="committed-data">{JSON.stringify(data)}</pre>
+      </FormContext.Provider>
+    </ThemeProvider>
+  );
+}
+
+afterEach(() => cleanup());
+
+function readCommittedData(): Record<string, unknown> {
+  return JSON.parse(screen.getByTestId('committed-data').textContent || '{}');
+}
+
+describe('NumberStepperRenderer', () => {
+  it('uses text input with decimal inputMode and enterKeyHint', () => {
+    render(<NumericTestHarness schema={hbSchema} uischema={hbUischema} />);
+    const input = screen.getByRole('textbox');
+    expect(input).toHaveAttribute('type', 'text');
+    expect(input).toHaveAttribute('inputmode', 'decimal');
+    expect(input).toHaveAttribute('enterkeyhint', 'next');
+  });
+
+  it('stores JSON numbers not strings when typing', async () => {
+    const user = userEvent.setup();
+    render(<NumericTestHarness schema={hbSchema} uischema={hbUischema} />);
+
+    const input = screen.getByRole('textbox');
+    await user.click(input);
+    fireEvent.change(input, { target: { value: '16' } });
+    await user.tab();
+
+    await waitFor(() => {
+      const data = readCommittedData();
+      expect(data.hb_resultado).toBe(16);
+      expect(typeof data.hb_resultado).toBe('number');
+    });
+  });
+
+  it('allows clearing an over-max value without forcing a bound digit', async () => {
+    const user = userEvent.setup();
+    render(
+      <NumericTestHarness
+        schema={hbSchema}
+        uischema={hbUischema}
+        initialData={{ hb_resultado: 35 }}
+      />,
+    );
+
+    const input = screen.getByRole('textbox') as HTMLInputElement;
+    await user.click(input);
+    expect(input.value).toBe('35');
+
+    fireEvent.change(input, { target: { value: '' } });
+    expect(input.value).toBe('');
+    await user.tab();
+
+    await waitFor(() => {
+      expect(readCommittedData().hb_resultado).toBeUndefined();
+    });
+  });
+
+  it('shows validation error for values above maximum while keeping typed value', async () => {
+    const user = userEvent.setup();
+    render(<NumericTestHarness schema={hbSchema} uischema={hbUischema} />);
+
+    const input = screen.getByRole('textbox');
+    await user.click(input);
+    await user.type(input, '35');
+
+    expect((input as HTMLInputElement).value).toBe('35');
+    expect(screen.getByText(/must be <= 25/i)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(readCommittedData().hb_resultado).toBe(35);
+    });
+  });
+
+  it('disables stepper plus at maximum without altering typed draft', async () => {
+    const user = userEvent.setup();
+    render(
+      <NumericTestHarness
+        schema={hbSchema}
+        uischema={hbUischema}
+        initialData={{ hb_resultado: 25 }}
+      />,
+    );
+
+    await user.click(screen.getByRole('textbox'));
+
+    const addButton = screen.getByRole('button', { name: /increase/i });
+    expect(addButton).toBeDisabled();
+  });
+
+  it('commits decimal values for type number', async () => {
+    const user = userEvent.setup();
+    const decimalSchema: JsonSchema7 = {
+      type: 'object',
+      properties: {
+        value: { type: 'number', multipleOf: 0.1 },
+      },
+    };
+    const decimalUi: UISchemaElement = {
+      type: 'Control',
+      scope: '#/properties/value',
+    };
+
+    render(<NumericTestHarness schema={decimalSchema} uischema={decimalUi} />);
+
+    const input = screen.getByRole('textbox');
+    await user.click(input);
+    fireEvent.change(input, { target: { value: '12.5' } });
+    await user.tab();
+
+    await waitFor(() => {
+      expect(readCommittedData().value).toBe(12.5);
+    });
+    expect(input).toHaveAttribute('inputmode', 'decimal');
+  });
+});
diff --git a/formulus-formplayer/src/renderers/NumberStepperRenderer.tsx b/formulus-formplayer/src/renderers/NumberStepperRenderer.tsx
index 4a319e8f7..a0ffab3d1 100644
--- a/formulus-formplayer/src/renderers/NumberStepperRenderer.tsx
+++ b/formulus-formplayer/src/renderers/NumberStepperRenderer.tsx
@@ -3,9 +3,12 @@
  *
  * Custom renderer for number/integer fields that adds simple +/- buttons
  * via Material-UI's InputAdornment. Uses QuestionShell for unified layout.
+ *
+ * Numeric input policy: draft text while focused; observation JSON stores
+ * numbers only; never clamp to schema bounds while typing.
  */
 
-import React, { useState } from 'react';
+import React from 'react';
 import {
   ControlProps,
   RankedTester,
@@ -17,6 +20,11 @@ import { withJsonFormsControlProps } from '@jsonforms/react';
 import { TextField, InputAdornment, IconButton } from '@mui/material';
 import { Add, Remove } from '@mui/icons-material';
 import QuestionShell from '../components/QuestionShell';
+import { useFormContext } from '../App';
+import {
+  useNumericDraftInput,
+  type NumericSchemaKind,
+} from '../hooks/useNumericDraftInput';
 
 const isNumberControl: RankedTester = rankWith(
   5,
@@ -26,6 +34,12 @@ const isNumberControl: RankedTester = rankWith(
   }),
 );
 
+function committedNumeric(data: unknown): number | undefined {
+  if (data === undefined || data === null || data === '') return undefined;
+  const n = typeof data === 'number' ? data : Number(data);
+  return Number.isNaN(n) ? undefined : n;
+}
+
 const NumberStepperRenderer = ({
   data,
   handleChange,
@@ -38,12 +52,29 @@ const NumberStepperRenderer = ({
   visible,
   required,
 }: ControlProps) => {
-  const [isFocused, setIsFocused] = useState(false);
+  const { keyboardEnterKeyHint } = useFormContext();
+  const schemaKind: NumericSchemaKind =
+    schema.type === 'integer' ? 'integer' : 'number';
+
+  const {
+    isFocused,
+    displayValue,
+    onFocus,
+    onBlur,
+    onChange,
+    syncDraftFromData,
+    inputProps,
+  } = useNumericDraftInput({
+    data,
+    path,
+    handleChange,
+    schemaKind,
+    enterKeyHint: keyboardEnterKeyHint,
+    enabled,
+  });
 
   if (visible === false) return null;
 
-  const numericValue =
-    data !== undefined && data !== null && data !== '' ? Number(data) : 0;
   const min = schema.minimum ?? (schema as { minimum?: number }).minimum;
   const max = schema.maximum ?? (schema as { maximum?: number }).maximum;
   const step = schema.multipleOf ?? (schema as { step?: number }).step ?? 1;
@@ -55,37 +86,31 @@ const NumberStepperRenderer = ({
     (uischema as { options?: { required?: boolean } })?.options?.required ??
     required,
   );
+  const autoFocus =
+    (uischema as { options?: { autoFocus?: boolean } })?.options?.autoFocus ===
+    true;
+
+  const currentValue = committedNumeric(data) ?? 0;
+
+  const applyStepperValue = (newValue: number) => {
+    handleChange(path, newValue);
+    syncDraftFromData(newValue);
+  };
 
   const handleAdd = () => {
-    const currentValue = numericValue || 0;
     const newValue = currentValue + step;
     if (max === undefined || newValue <= max) {
-      handleChange(path, newValue);
+      applyStepperValue(newValue);
     }
   };
 
   const handleSubtract = () => {
-    const currentValue = numericValue || 0;
     const newValue = currentValue - step;
     if (min === undefined || newValue >= min) {
-      handleChange(path, newValue);
+      applyStepperValue(newValue);
     }
   };
 
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.target.value;
-    if (value === '') {
-      handleChange(path, undefined);
-      return;
-    }
-    const numValue = Number(value);
-    if (!isNaN(numValue)) {
-      // Do not clamp while typing — validation surfaces out-of-range values.
-      handleChange(path, numValue);
-    }
-  };
-
-  const currentValue = numericValue || 0;
   const addDisabled = max !== undefined && currentValue >= max;
   const subtractDisabled = min !== undefined && currentValue <= min;
 
@@ -100,15 +125,18 @@ const NumberStepperRenderer = ({
       required={isRequired}
       error={errorStr}>
       <TextField
-        type="number"
-        value={numericValue === 0 && data === undefined ? '' : numericValue}
-        onChange={handleInputChange}
-        onFocus={() => setIsFocused(true)}
-        onBlur={() => setIsFocused(false)}
+        value={displayValue}
+        onChange={onChange}
+        onFocus={onFocus}
+        onBlur={onBlur}
         disabled={!enabled}
         error={Boolean(errorStr)}
         fullWidth
-        inputProps={{ step }}
+        autoFocus={autoFocus}
+        inputProps={{
+          ...inputProps,
+          ...(autoFocus ? { 'data-formplayer-autofocus': 'true' } : {}),
+        }}
         InputProps={{
           endAdornment: isFocused ? (
             <InputAdornment position="end">
@@ -133,20 +161,7 @@ const NumberStepperRenderer = ({
             </InputAdornment>
           ) : null,
         }}
-        sx={{
-          width: '100%',
-          '& input[type="number"]': {
-            MozAppearance: 'textfield',
-            '&::-webkit-outer-spin-button': {
-              WebkitAppearance: 'none',
-              margin: 0,
-            },
-            '&::-webkit-inner-spin-button': {
-              WebkitAppearance: 'none',
-              margin: 0,
-            },
-          },
-        }}
+        sx={{ width: '100%' }}
       />
     </QuestionShell>
   );
diff --git a/formulus-formplayer/src/renderers/QrcodeQuestionRenderer.tsx b/formulus-formplayer/src/renderers/QrcodeQuestionRenderer.tsx
index bb122a634..1a2635e1c 100644
--- a/formulus-formplayer/src/renderers/QrcodeQuestionRenderer.tsx
+++ b/formulus-formplayer/src/renderers/QrcodeQuestionRenderer.tsx
@@ -95,6 +95,11 @@ const QrcodeQuestionRenderer: React.FC<ControlProps> = ({
         if (qrError.status === 'cancelled') {
           // User cancelled — don't show error
           console.log('QR scan cancelled by user');
+        } else if (
+          qrError.status === 'error' &&
+          qrError.message === 'QR scanner is already open'
+        ) {
+          setError('Scanner is already open. Close it first, then try again.');
         } else if (qrError.status === 'error') {
           setError(qrError.message || 'QR scanner error');
         } else {
diff --git a/formulus-formplayer/src/renderers/SubObservationQuestionRenderer.tsx b/formulus-formplayer/src/renderers/SubObservationQuestionRenderer.tsx
index fd2ecba6d..e08130a0c 100644
--- a/formulus-formplayer/src/renderers/SubObservationQuestionRenderer.tsx
+++ b/formulus-formplayer/src/renderers/SubObservationQuestionRenderer.tsx
@@ -4,7 +4,7 @@
  * `openFormplayer` with `subObservationMode`.
  */
 
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { withJsonFormsControlProps, useJsonForms } from '@jsonforms/react';
 import { ControlProps, rankWith, schemaMatches } from '@jsonforms/core';
 import { Box, Typography, Button, IconButton, Tooltip } from '@mui/material';
@@ -13,20 +13,25 @@ import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import QuestionShell from '../components/QuestionShell';
 import FormulusClient from '../services/FormulusInterface';
 import type { FormCompletionResult } from '../types/FormulusInterfaceDefinition';
+import { useFormContext } from '../App';
 import { tokens } from '../theme/tokens-adapter';
 import {
   buildColumns,
   coerceSubObservationRows,
   optionalRecordMap,
   readSubObservationField,
-  resolveInitialValues,
   sortRows,
   readDataPath,
+  writeDataPath,
   resolveItemLabel,
   resolveAddButtonLabel,
   resolveEmptyLabel,
   resolveDeleteFallbackLabel,
+  buildSubObservationOpenParams,
+  refreshSubObservationContextFromFormData,
+  writeSubObservationContextToWindow,
   type OrderBySpec,
+  type SubObservationContextMergeConfig,
 } from './subObservationHelpers';
 
 const RESERVED_SCHEMA_KEYS = new Set([
@@ -112,6 +117,7 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
   required,
 }) => {
   const jsonForms = useJsonForms();
+  const { commitFormData } = useFormContext();
   const config = useMemo(() => extractConfig(schema), [schema]);
 
   const childFormType =
@@ -153,52 +159,23 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
     [valueRows, missingKeys, config.orderBy],
   );
 
-  const [rows, setRows] = useState<Record<string, unknown>[]>(sortedFromProps);
+  // JsonForms `data` is the source of truth; pushSorted writes via handleChange only.
+  const rows = sortedFromProps;
+
   const [error, setError] = useState<string | null>(null);
   const [busyId, setBusyId] = useState<string | null>(null);
-  const [prevSortedFromProps, setPrevSortedFromProps] =
-    useState(sortedFromProps);
-
-  if (sortedFromProps !== prevSortedFromProps) {
-    setPrevSortedFromProps(sortedFromProps);
-    setRows(sortedFromProps);
-  }
 
-  useEffect(() => {
-    function refresh() {
-      setRows(prev => sortRows(prev, config.orderBy as OrderBySpec));
-    }
-    function onVisibility() {
-      if (document.visibilityState === 'visible') refresh();
-    }
-    document.addEventListener('visibilitychange', onVisibility);
-    window.addEventListener('focus', refresh);
-    return () => {
-      document.removeEventListener('visibilitychange', onVisibility);
-      window.removeEventListener('focus', refresh);
-    };
-  }, [config.orderBy]);
-
-  useEffect(() => {
-    const prev =
-      typeof window !== 'undefined'
-        ? (window as Window & { onReceiveFocus?: () => void }).onReceiveFocus
-        : undefined;
-    const wrapped = () => {
-      if (typeof prev === 'function') prev();
-      setRows(r => sortRows(r, config.orderBy as OrderBySpec));
-    };
-    if (typeof window !== 'undefined') {
-      (window as Window & { onReceiveFocus?: () => void }).onReceiveFocus =
-        wrapped;
-    }
-    return () => {
-      if (typeof window !== 'undefined') {
-        (window as Window & { onReceiveFocus?: () => void }).onReceiveFocus =
-          prev;
-      }
-    };
-  }, [config.orderBy]);
+  const getCurrentRows = useCallback((): Record<string, unknown>[] => {
+    const root = jsonForms.core?.data;
+    const raw =
+      root && typeof root === 'object' && path
+        ? readDataPath(root as Record<string, unknown>, path)
+        : data;
+    return sortRows(
+      coerceSubObservationRows(raw),
+      config.orderBy as OrderBySpec,
+    ) as Record<string, unknown>[];
+  }, [jsonForms.core?.data, data, path, config.orderBy]);
 
   const columns = useMemo(() => buildColumns(config, rows), [config, rows]);
 
@@ -227,13 +204,91 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
     [itemLabel],
   );
 
+  const requestFormRevalidation = useCallback(() => {
+    if (typeof window !== 'undefined') {
+      window.setTimeout(() => {
+        window.dispatchEvent(new CustomEvent('formRevalidate'));
+      }, 0);
+    }
+  }, []);
+
   const pushSorted = useCallback(
     (next: Record<string, unknown>[]) => {
       const sorted = sortRows(next, config.orderBy as OrderBySpec);
-      setRows(sorted);
-      handleChange(path, sorted);
+      const root = jsonForms.core?.data;
+      if (commitFormData && root && typeof root === 'object' && path) {
+        const merged = writeDataPath(
+          root as Record<string, unknown>,
+          path,
+          sorted,
+        );
+        commitFormData(merged);
+      } else {
+        handleChange(path, sorted);
+        requestFormRevalidation();
+      }
     },
-    [config.orderBy, handleChange, path],
+    [
+      commitFormData,
+      config.orderBy,
+      handleChange,
+      jsonForms.core?.data,
+      path,
+      requestFormRevalidation,
+    ],
+  );
+
+  const refreshSubObservationWindowContext = useCallback(
+    (rows: Record<string, unknown>[]) => {
+      const root = jsonForms.core?.data;
+      if (!root || typeof root !== 'object' || !path) return;
+      const parentData = writeDataPath(
+        root as Record<string, unknown>,
+        path,
+        rows,
+      );
+      const pv = resolveParentValue(formData, parentValuePath);
+      const contextTemplate = optionalRecordMap(config.subObservationContext);
+      const mergeConfigRaw = config.subObservationContextMerge;
+      const mergeConfig =
+        mergeConfigRaw && typeof mergeConfigRaw === 'object'
+          ? mergeConfigRaw
+          : undefined;
+      if (contextTemplate || mergeConfig) {
+        const refreshed = refreshSubObservationContextFromFormData(
+          parentData,
+          contextTemplate,
+          pv,
+          mergeConfig as SubObservationContextMergeConfig,
+        );
+        writeSubObservationContextToWindow(refreshed);
+      }
+    },
+    [
+      jsonForms.core?.data,
+      path,
+      formData,
+      parentValuePath,
+      config.subObservationContext,
+      config.subObservationContextMerge,
+    ],
+  );
+
+  const mergeSubmittedRow = useCallback(
+    (result: FormCompletionResult) => {
+      if (
+        !result?.formData ||
+        (result.status !== 'form_submitted' && result.status !== 'form_updated')
+      ) {
+        return false;
+      }
+      const row = result.formData as Record<string, unknown>;
+      const next = [...getCurrentRows(), row];
+      pushSorted(next);
+      refreshSubObservationWindowContext(next);
+      return true;
+    },
+    [getCurrentRows, pushSorted, refreshSubObservationWindowContext],
   );
 
   const handleAdd = useCallback(async () => {
@@ -242,27 +297,25 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
     try {
       setBusyId('add');
       const pv = resolveParentValue(formData, parentValuePath);
-      let baseValues = resolveInitialValues(
-        optionalRecordMap(config.subObservationInitValues),
+      const openParams = buildSubObservationOpenParams(
         formData,
+        config,
         pv,
+        optionalRecordMap(config.subObservationInitValues),
       );
-      if (parentKey && pv != null && baseValues[parentKey] == null) {
-        baseValues = { ...baseValues, [parentKey]: pv };
+      if (parentKey && pv != null && openParams[parentKey] == null) {
+        openParams[parentKey] = pv;
       }
       const result: FormCompletionResult = await client.openFormplayer(
         childFormType,
-        baseValues,
+        openParams,
         {},
         {
           subObservationMode: true,
           skipFinalize: Boolean(config.skipFinalize),
         },
       );
-      if (result?.status === 'form_submitted' && result.formData) {
-        const row = result.formData as Record<string, unknown>;
-        pushSorted([...rows, row]);
-      }
+      mergeSubmittedRow(result);
     } catch (e) {
       setError(
         e instanceof Error ? e.message : 'Unable to add sub-observation',
@@ -278,8 +331,7 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
     parentValuePath,
     parentKey,
     config,
-    rows,
-    pushSorted,
+    mergeSubmittedRow,
   ]);
 
   const handleEdit = useCallback(
@@ -289,21 +341,23 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
       try {
         setBusyId(`edit_${index}`);
         const pv = resolveParentValue(formData, parentValuePath);
-        const openValues = resolveInitialValues(
-          optionalRecordMap(config.subObservationEditInitValues),
+        const openParams = buildSubObservationOpenParams(
           formData,
+          config,
           pv,
+          optionalRecordMap(config.subObservationEditInitValues),
         );
+        const { context: _ctx, ...paramDefaults } = openParams;
         const rowData = isObservationWrappedRow(row)
           ? ((row.data ?? {}) as Record<string, unknown>)
           : row;
         const savedData: Record<string, unknown> = {
           ...rowData,
-          ...openValues,
+          ...paramDefaults,
         };
         const result: FormCompletionResult = await client.openFormplayer(
           childFormType,
-          {},
+          openParams,
           savedData,
           {
             subObservationMode: true,
@@ -316,10 +370,11 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
             result.status === 'form_updated') &&
           result.formData
         ) {
-          const updated = rows.map((r, i) =>
+          const updated = getCurrentRows().map((r, i) =>
             i === index ? (result.formData as Record<string, unknown>) : r,
           );
           pushSorted(updated);
+          refreshSubObservationWindowContext(updated);
         }
       } catch (e) {
         setError(
@@ -336,8 +391,9 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
       formData,
       parentValuePath,
       config,
-      rows,
+      getCurrentRows,
       pushSorted,
+      refreshSubObservationWindowContext,
     ],
   );
 
@@ -360,7 +416,7 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
         return;
       }
       try {
-        pushSorted(rows.filter((_, i) => i !== index));
+        pushSorted(getCurrentRows().filter((_, i) => i !== index));
       } catch (e) {
         setError(
           e instanceof Error ? e.message : 'Unable to delete sub-observation',
@@ -371,7 +427,7 @@ const SubObservationQuestionRendererInner: React.FC<ControlProps> = ({
       enabled,
       allowDelete,
       config.displayField,
-      rows,
+      getCurrentRows,
       pushSorted,
       deleteFallbackLabel,
     ],
diff --git a/formulus-formplayer/src/renderers/SwipeLayoutRenderer.tsx b/formulus-formplayer/src/renderers/SwipeLayoutRenderer.tsx
index 5fa04f105..5cfbb7680 100644
--- a/formulus-formplayer/src/renderers/SwipeLayoutRenderer.tsx
+++ b/formulus-formplayer/src/renderers/SwipeLayoutRenderer.tsx
@@ -18,6 +18,7 @@ import {
   rankWith,
   uiTypeIs,
   RankedTester,
+  JsonSchema7,
 } from '@jsonforms/core';
 import { useSwipeable } from 'react-swipeable';
 import { Box, Typography, useTheme } from '@mui/material';
@@ -36,6 +37,13 @@ import {
   pageIsVisibleInSwipe,
   visiblePageIndicesFromLayouts,
 } from './swipeLayoutVisibility';
+import {
+  findAutoFocusPropertyPath,
+  focusFieldInContainer,
+  focusFirstEnabledTextInput,
+} from '../utils/autofocusHelpers';
+import { navigateToFirstBlockingError } from '../utils/validationNavigation';
+import { formatBlockingErrorSummary } from '../utils/errorPageNavigation';
 
 // ---------------------------------------------------------------------------
 // Testers
@@ -69,20 +77,6 @@ const CONFIRM_CARD_RADIUS = 0.7;
 const CONFIRM_BORDER_WIDTH = 1;
 const CONFIRM_CARD_PADDING = 16;
 
-/** Focus first text-like input on the screen (keeps mobile keyboard open across page changes). */
-function focusFirstEnabledTextInput(container: HTMLElement | null): void {
-  if (!container) return;
-  const sel =
-    'input:not([disabled]):not([type="hidden"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="button"]):not([type="submit"]):not([type="reset"]),textarea:not([disabled])';
-  const el = container.querySelector<HTMLElement>(sel);
-  if (!el || typeof el.focus !== 'function') return;
-  try {
-    el.focus({ preventScroll: true });
-  } catch {
-    el.focus();
-  }
-}
-
 const SwipeLayoutRenderer = ({
   schema,
   uischema,
@@ -137,7 +131,7 @@ const SwipeLayoutRenderer = ({
       };
     }, [uischema]);
 
-  const autoFocusFirstInput = swipeOptions.autoFocusFirstInput !== false;
+  const autoFocusFirstInput = swipeOptions.autoFocusFirstInput === true;
   const labelLayout: LabelLayout =
     swipeOptions.labelLayout === 'stacked' ? 'stacked' : 'inline';
   const showInnerTitle = swipeOptions.showInnerTitle === true;
@@ -148,10 +142,15 @@ const SwipeLayoutRenderer = ({
   const swipeScreenRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (!autoFocusFirstInput) return;
     let cancelled = false;
     const timer = window.setTimeout(() => {
-      if (!cancelled) {
+      if (cancelled || !swipeScreenRef.current) return;
+      const pageUi = layouts[currentPage];
+      const propPath = findAutoFocusPropertyPath(pageUi);
+      if (propPath && focusFieldInContainer(swipeScreenRef.current, propPath)) {
+        return;
+      }
+      if (autoFocusFirstInput) {
         focusFirstEnabledTextInput(swipeScreenRef.current);
       }
     }, 150);
@@ -159,7 +158,7 @@ const SwipeLayoutRenderer = ({
       cancelled = true;
       window.clearTimeout(timer);
     };
-  }, [currentPage, autoFocusFirstInput]);
+  }, [currentPage, autoFocusFirstInput, layouts]);
 
   if (typeof handleChange !== 'function') {
     console.warn(
@@ -409,9 +408,8 @@ const SwipeLayoutRenderer = ({
 
   const { ref: swipeableRef, ...swipeHandlers } = handlers;
 
-  const mergedSwipeScreenRef = useCallback(
+  const mergeScrollRef = useCallback(
     (el: HTMLDivElement | null) => {
-      swipeScreenRef.current = el;
       if (typeof swipeableRef === 'function') {
         swipeableRef(el);
       }
@@ -419,17 +417,35 @@ const SwipeLayoutRenderer = ({
     [swipeableRef],
   );
 
+  const setSwipeScreenRef = useCallback((el: HTMLDivElement | null) => {
+    swipeScreenRef.current = el;
+  }, []);
+
   const isOnFinalizePage = useMemo(() => {
     return layouts[currentPage]?.type === 'Finalize';
   }, [layouts, currentPage]);
 
   const isLastContentPage = nextVisiblePage === null && !isOnFinalizePage;
 
+  const validationErrorCount = core?.errors?.length ?? 0;
+
+  const validationAlertMessage = useMemo(() => {
+    const errors = core?.errors ?? [];
+    if (errors.length === 0) return '';
+    return formatBlockingErrorSummary(
+      errors,
+      (core?.schema ?? schema) as JsonSchema7,
+    );
+  }, [core?.errors, core?.schema, schema]);
+
   const trySubmitForm = useCallback(() => {
     if (!formInitData) return;
+    const errors = core?.errors ?? [];
+    if (errors.length > 0) {
+      navigateToFirstBlockingError(errors);
+      return;
+    }
     window.dispatchEvent(new CustomEvent('formShowValidation'));
-    const errorCount = core?.errors?.length ?? 0;
-    if (errorCount > 0) return;
     window.dispatchEvent(
       new CustomEvent('finalizeForm', {
         detail: { formInitData, data },
@@ -448,7 +464,7 @@ const SwipeLayoutRenderer = ({
     if (skipFinalize && isLastContentPage) {
       return {
         onTrigger: trySubmitForm,
-        disabled: errorCount > 0 || !formInitData || isNavigating,
+        disabled: !formInitData || isNavigating,
       };
     }
     if (nextVisiblePage !== null) {
@@ -487,15 +503,10 @@ const SwipeLayoutRenderer = ({
 
   const formContextForSwipe = useMemo(
     () => ({
-      formInitData: parentFormContext.formInitData,
+      ...parentFormContext,
       keyboardEnterKeyHint,
-      draftSessionKey: parentFormContext.draftSessionKey ?? null,
     }),
-    [
-      parentFormContext.formInitData,
-      parentFormContext.draftSessionKey,
-      keyboardEnterKeyHint,
-    ],
+    [parentFormContext, keyboardEnterKeyHint],
   );
 
   const handleSnackbarClose = useCallback(
@@ -524,7 +535,10 @@ const SwipeLayoutRenderer = ({
     swipeOptions.headerTitle || (schema as any)?.title || undefined;
   const headerFields: string[] = (swipeOptions.headerFields || []).slice(0, 2);
 
-  const densityContextValue = useMemo(() => ({ labelLayout }), [labelLayout]);
+  const densityContextValue = useMemo(
+    () => ({ labelLayout, groupVariant: 'flat' as const }),
+    [labelLayout],
+  );
 
   if (visible === false) {
     return null;
@@ -537,66 +551,10 @@ const SwipeLayoutRenderer = ({
       <FormContext.Provider value={formContextForSwipe}>
         <FormLayout
           keyboardSubmitAction={keyboardSubmitAction}
+          scrollRefMerge={mergeScrollRef}
+          scrollHandlers={swipeHandlers}
           header={
             <>
-              {/* Author-configured form title and sticky fields */}
-              {((showInnerTitle && headerTitle) || headerFields.length > 0) && (
-                <Box sx={{ pb: headerFields.length > 0 ? 0 : 0.25 }}>
-                  {showInnerTitle && headerTitle && (
-                    <Typography
-                      variant="subtitle2"
-                      sx={{
-                        fontWeight: 700,
-                        fontSize: '1.125rem',
-                        lineHeight: 1.3,
-                        color: 'text.primary',
-                        mb: headerFields.length > 0 ? 0.5 : 0,
-                        textAlign: 'left',
-                      }}>
-                      {headerTitle}
-                    </Typography>
-                  )}
-                  {headerFields.length > 0 && (
-                    <Box
-                      sx={{
-                        display: 'flex',
-                        flexWrap: 'wrap',
-                        gap: 0.5,
-                        pb: 0.5,
-                      }}>
-                      {headerFields.map((fieldKey: string) => {
-                        const fieldSchema = (schema as any)?.properties?.[
-                          fieldKey
-                        ];
-                        const label = fieldSchema?.title || fieldKey;
-                        const value = data?.[fieldKey];
-                        const displayValue =
-                          value != null && value !== '' ? String(value) : '—';
-                        return (
-                          <Typography
-                            key={fieldKey}
-                            variant="caption"
-                            sx={{
-                              px: 1,
-                              py: 0.25,
-                              borderRadius: 1,
-                              backgroundColor: 'action.hover',
-                              fontSize: '0.75rem',
-                              color:
-                                displayValue === '—'
-                                  ? 'text.disabled'
-                                  : 'text.primary',
-                              fontWeight: displayValue === '—' ? 400 : 600,
-                              textAlign: 'left',
-                            }}>
-                            {label}: {displayValue}
-                          </Typography>
-                        );
-                      })}
-                    </Box>
-                  )}
-                </Box>
-              )}
               <FormProgressBar
                 currentPage={visiblePosition}
                 totalScreens={totalVisibleScreens}
@@ -605,18 +563,70 @@ const SwipeLayoutRenderer = ({
                 uischema={uischema}
                 mode="screens"
                 isOnFinalizePage={isOnFinalizePage}
-                onNavigatePrevious={
-                  prevVisiblePage !== null
-                    ? () => navigateToPage(prevVisiblePage)
-                    : undefined
-                }
-                onNavigateNext={
-                  nextVisiblePage !== null
-                    ? () => navigateToPage(nextVisiblePage)
-                    : undefined
-                }
+                canNavigatePrevious={prevVisiblePage !== null}
+                canNavigateNext={nextVisiblePage !== null}
+                onNavigatePrevious={() => {
+                  if (prevVisiblePage !== null) navigateToPage(prevVisiblePage);
+                }}
+                onNavigateNext={() => {
+                  if (nextVisiblePage !== null) navigateToPage(nextVisiblePage);
+                }}
                 navigationDisabled={isNavigating}
               />
+              {headerFields.length > 0 && (
+                <Box
+                  sx={theme => ({
+                    display: 'flex',
+                    flexWrap: 'wrap',
+                    gap: 0.5,
+                    py: 0.5,
+                    px: { xs: 0.5, sm: 1 },
+                    borderTop: `1px solid ${theme.palette.divider}`,
+                  })}>
+                  {headerFields.map((fieldKey: string) => {
+                    const fieldSchema = (schema as any)?.properties?.[fieldKey];
+                    const label = fieldSchema?.title || fieldKey;
+                    const value = data?.[fieldKey];
+                    const displayValue =
+                      value != null && value !== '' ? String(value) : '—';
+                    return (
+                      <Typography
+                        key={fieldKey}
+                        variant="caption"
+                        sx={{
+                          px: 1,
+                          py: 0.25,
+                          borderRadius: 1,
+                          backgroundColor: 'action.hover',
+                          fontSize: '0.75rem',
+                          color:
+                            displayValue === '—'
+                              ? 'text.disabled'
+                              : 'text.primary',
+                          fontWeight: displayValue === '—' ? 400 : 600,
+                          textAlign: 'left',
+                        }}>
+                        {label}: {displayValue}
+                      </Typography>
+                    );
+                  })}
+                </Box>
+              )}
+              {showInnerTitle && headerTitle && (
+                <Typography
+                  variant="subtitle2"
+                  sx={{
+                    fontWeight: 700,
+                    fontSize: '1rem',
+                    lineHeight: 1.3,
+                    color: 'text.primary',
+                    px: { xs: 0.5, sm: 1 },
+                    pb: 0.25,
+                    textAlign: 'left',
+                  }}>
+                  {headerTitle}
+                </Typography>
+              )}
             </>
           }
           previousButton={
@@ -631,10 +641,7 @@ const SwipeLayoutRenderer = ({
             skipFinalize && isLastContentPage
               ? {
                   onClick: trySubmitForm,
-                  disabled:
-                    isNavigating ||
-                    !formInitData ||
-                    (core?.errors?.length ?? 0) > 0,
+                  disabled: isNavigating || !formInitData,
                   label: finalizeButtonLabelOption ?? 'Done',
                 }
               : nextVisiblePage !== null
@@ -647,10 +654,7 @@ const SwipeLayoutRenderer = ({
           }
           contentBottomPadding={24}
           showNavigation={true}>
-          <div
-            ref={mergedSwipeScreenRef}
-            {...swipeHandlers}
-            className="swipelayout_screen">
+          <div ref={setSwipeScreenRef} className="swipelayout_screen">
             {(uischema as any)?.label && <h1>{(uischema as any).label}</h1>}
             {layouts.length > 0 && layouts[currentPage] && (
               <JsonFormsDispatch
@@ -664,6 +668,16 @@ const SwipeLayoutRenderer = ({
             )}
           </div>
 
+          {skipFinalize && isLastContentPage && validationErrorCount > 0 && (
+            <Typography
+              variant="body2"
+              color="error"
+              role="alert"
+              sx={{ px: { xs: 1, sm: 1.5 }, pt: 1, pb: 0.5 }}>
+              {validationAlertMessage}
+            </Typography>
+          )}
+
           {snackbarOpen &&
             typeof document !== 'undefined' &&
             createPortal(
@@ -745,12 +759,19 @@ const SwipeLayoutWrapper = (props: ControlProps) => {
   const [currentPage, setCurrentPage] = useState(0);
   const { formInitData, draftSessionKey } = useFormContext();
   const { data } = props;
+  const skipDraftPersistence =
+    formInitData != null &&
+    Boolean(
+      (formInitData as { subObservationMode?: boolean; returnOnly?: boolean })
+        .subObservationMode ||
+      (formInitData as { returnOnly?: boolean }).returnOnly,
+    );
 
   // Save partial data whenever the page changes or data changes
   const handlePageChange = useCallback(
     (page: number) => {
       // Save the current form data before changing the page
-      if (data && formInitData) {
+      if (data && formInitData && !skipDraftPersistence) {
         console.log('Saving draft data on page change:', data);
         draftService.saveDraft(
           formInitData.formType,
@@ -761,13 +782,13 @@ const SwipeLayoutWrapper = (props: ControlProps) => {
       }
       setCurrentPage(page);
     },
-    [data, formInitData, draftSessionKey],
+    [data, formInitData, draftSessionKey, skipDraftPersistence],
   );
 
   useEffect(() => {
     const handleNavigateToPage = (event: CustomEvent) => {
       // Save the current form data before navigating to a specific page
-      if (data && formInitData) {
+      if (data && formInitData && !skipDraftPersistence) {
         console.log('Saving draft data before navigation event:', data);
         draftService.saveDraft(
           formInitData.formType,
@@ -790,27 +811,7 @@ const SwipeLayoutWrapper = (props: ControlProps) => {
         handleNavigateToPage as EventListener,
       );
     };
-  }, [data, formInitData, draftSessionKey]);
-
-  // Also save data when it changes (even without page change)
-  useEffect(() => {
-    if (data) {
-      // Debounce the save to avoid too many calls
-      const debounceTimer = setTimeout(() => {
-        if (formInitData) {
-          console.log('Saving draft data on data change:', data);
-          draftService.saveDraft(
-            formInitData.formType,
-            data,
-            formInitData,
-            draftSessionKey,
-          );
-        }
-      }, 1000); // 1 second debounce
-
-      return () => clearTimeout(debounceTimer);
-    }
-  }, [data, formInitData, draftSessionKey]);
+  }, [data, formInitData, draftSessionKey, skipDraftPersistence]);
 
   return (
     <SwipeLayoutRenderer
diff --git a/formulus-formplayer/src/renderers/subObservationHelpers.test.ts b/formulus-formplayer/src/renderers/subObservationHelpers.test.ts
index 11df2556f..4779fbeed 100644
--- a/formulus-formplayer/src/renderers/subObservationHelpers.test.ts
+++ b/formulus-formplayer/src/renderers/subObservationHelpers.test.ts
@@ -1,6 +1,9 @@
 import { describe, it, expect } from 'vitest';
 import {
+  formDataJsonEqual,
+  mergePreservingSubObsArrays,
   readDataPath,
+  writeDataPath,
   resolveTemplateValue,
   resolveInitialValues,
   buildColumns,
@@ -12,14 +15,80 @@ import {
   resolveAddButtonLabel,
   resolveEmptyLabel,
   resolveDeleteFallbackLabel,
+  mergeSessionIntoSubObservationContext,
 } from './subObservationHelpers';
 
 describe('subObservationHelpers', () => {
+  it('mergePreservingSubObsArrays keeps longer baseline arrays', () => {
+    const baseline = { pessoas: [{ id: 1 }] };
+    const incoming = { validar_cama: '1' };
+    const merged = mergePreservingSubObsArrays(baseline, incoming);
+    expect(merged.pessoas).toEqual([{ id: 1 }]);
+    expect(merged.validar_cama).toBe('1');
+  });
+
+  it('mergePreservingSubObsArrays restores omitted quartos from baseline', () => {
+    const baseline = {
+      comments: 'old',
+      quartos: [{ quarto_num: 1, camas: [] }],
+      person_codigos: [],
+    };
+    const incoming = { comments: 'new', assistant1: 'AB' };
+    const merged = mergePreservingSubObsArrays(baseline, incoming);
+    expect(merged.comments).toBe('new');
+    expect(merged.quartos).toEqual(baseline.quartos);
+    expect(merged.person_codigos).toEqual([]);
+  });
+
+  it('mergePreservingSubObsArrays keeps off-page scalar prefills and autoSequence fields', () => {
+    // SwipeLayout partial payload: only the current page's field is present.
+    const baseline = {
+      obsdate: '2026-06-19',
+      region: 'Bafata',
+      tb: 'TB01',
+      device_role: 'A',
+      num: 7,
+    };
+    const incoming = { nome_chefe: 'Maria' };
+    const merged = mergePreservingSubObsArrays(baseline, incoming);
+    expect(merged.nome_chefe).toBe('Maria');
+    expect(merged.obsdate).toBe('2026-06-19');
+    expect(merged.region).toBe('Bafata');
+    expect(merged.tb).toBe('TB01');
+    expect(merged.device_role).toBe('A');
+    // Critical: a directly-used x-autoSequence value must survive partial
+    // payloads so applyAutoSequences does not re-allocate it.
+    expect(merged.num).toBe(7);
+  });
+
+  it('mergePreservingSubObsArrays lets on-page edits override baseline', () => {
+    const baseline = { nome_chefe: 'Maria', num: 7 };
+    const incoming = { nome_chefe: 'João' };
+    const merged = mergePreservingSubObsArrays(baseline, incoming);
+    expect(merged.nome_chefe).toBe('João');
+    expect(merged.num).toBe(7);
+  });
+
+  it('formDataJsonEqual compares stable JSON snapshots', () => {
+    expect(formDataJsonEqual({ a: 1 }, { a: 1 })).toBe(true);
+    expect(formDataJsonEqual({ a: 1 }, { a: 2 })).toBe(false);
+  });
+
   it('readDataPath resolves dotted paths', () => {
     expect(readDataPath({ a: { b: 3 } }, 'a.b')).toBe(3);
     expect(readDataPath({}, 'x')).toBeUndefined();
   });
 
+  it('writeDataPath sets top-level and nested paths immutably', () => {
+    const root = { a: { b: 1 }, pessoas: [] as unknown[] };
+    const next = writeDataPath(root, 'pessoas', [{ id: 1 }]);
+    expect(next.pessoas).toEqual([{ id: 1 }]);
+    expect(root.pessoas).toEqual([]);
+    const nested = writeDataPath({ a: { b: 1 } }, 'a.b', 9);
+    expect(nested).toEqual({ a: { b: 9 } });
+    expect(root.a).toEqual({ b: 1 });
+  });
+
   it('resolveTemplateValue expands tokens', () => {
     expect(resolveTemplateValue('{{parentValue}}', {}, 'P1')).toBe('P1');
     expect(
@@ -135,4 +204,29 @@ describe('subObservationHelpers', () => {
     expect(resolveDeleteFallbackLabel(null)).toBe('this sub-observation');
     expect(resolveDeleteFallbackLabel('room')).toBe('this room');
   });
+
+  it('mergeSessionIntoSubObservationContext upserts quarto row', () => {
+    const merged = mergeSessionIntoSubObservationContext(
+      { quartos: [] },
+      { quarto_num: 1, camas: [] },
+      { contextKey: 'quartos', matchField: 'quarto_num' },
+    );
+    expect(merged.quartos).toEqual([{ quarto_num: 1, camas: [] }]);
+  });
+
+  it('mergeSessionIntoSubObservationContext patches nested cama row', () => {
+    const merged = mergeSessionIntoSubObservationContext(
+      {
+        quartos: [{ quarto_num: 1, camas: [{ cama_num: 1, pessoas: [] }] }],
+      },
+      { quarto_num: 1, cama_num: 1, pessoas: [{ nopessoa: '1' }] },
+      {
+        contextKey: 'quartos',
+        matchField: 'quarto_num',
+        nestedArrayField: 'camas',
+        nestedMatchField: 'cama_num',
+      },
+    );
+    expect(merged.quartos[0].camas[0].pessoas).toEqual([{ nopessoa: '1' }]);
+  });
 });
diff --git a/formulus-formplayer/src/renderers/subObservationHelpers.ts b/formulus-formplayer/src/renderers/subObservationHelpers.ts
index be39092e5..98e8c465f 100644
--- a/formulus-formplayer/src/renderers/subObservationHelpers.ts
+++ b/formulus-formplayer/src/renderers/subObservationHelpers.ts
@@ -82,6 +82,90 @@ export function readDataPath(data: unknown, dotPath: string): unknown {
   return cur;
 }
 
+/** Immutable shallow clone along `dotPath`, then set the leaf value. */
+export function writeDataPath(
+  data: Record<string, unknown>,
+  dotPath: string,
+  value: unknown,
+): Record<string, unknown> {
+  if (!dotPath) return data;
+  const keys = dotPath.split('.');
+  if (keys.length === 1) {
+    return { ...data, [dotPath]: value };
+  }
+  const root = { ...data };
+  let cur: Record<string, unknown> = root;
+  for (let i = 0; i < keys.length - 1; i++) {
+    const key = keys[i];
+    const next = cur[key];
+    const cloned =
+      next && typeof next === 'object' && !Array.isArray(next)
+        ? { ...(next as Record<string, unknown>) }
+        : Array.isArray(next)
+          ? [...next]
+          : {};
+    cur[key] = cloned;
+    cur = cloned as Record<string, unknown>;
+  }
+  cur[keys[keys.length - 1]] = value;
+  return root;
+}
+
+/** Embedded arrays and derived indexes preserved when JsonForms omits unmounted fields. */
+const PRESERVED_ARRAY_KEYS = [
+  'quartos',
+  'camas',
+  'pessoas',
+  'person_codigos',
+] as const;
+
+/** Stable JSON comparison for form-data equality checks (avoids render loops). */
+export function formDataJsonEqual(
+  a: Record<string, unknown>,
+  b: Record<string, unknown>,
+): boolean {
+  try {
+    return JSON.stringify(a) === JSON.stringify(b);
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Keep baseline values when JsonForms emits partial onChange payloads.
+ * SwipeLayout only mounts the current page, so controls on other pages are
+ * absent from `incoming` even though they still live in our baseline draft
+ * state. Starting from `{ ...baseline, ...incoming }` preserves off-page
+ * scalars (host prefills like cluster stamps / obsdate, and directly-used
+ * `x-autoSequence` fields) so they are not dropped and re-allocated. On-page
+ * edits (including clearing a field) still override baseline via `incoming`.
+ * Sub-observation arrays get extra protection below against shorter/partial
+ * payloads.
+ */
+export function mergePreservingSubObsArrays(
+  baseline: Record<string, unknown>,
+  incoming: Record<string, unknown>,
+): Record<string, unknown> {
+  const merged = { ...baseline, ...incoming };
+  for (const key of PRESERVED_ARRAY_KEYS) {
+    const baseArr = baseline[key];
+    if (!(key in incoming)) {
+      if (Array.isArray(baseArr)) {
+        merged[key] = baseArr;
+      }
+      continue;
+    }
+    if (!Array.isArray(baseArr) || baseArr.length === 0) {
+      continue;
+    }
+    const inArr = incoming[key];
+    if (!Array.isArray(inArr) || inArr.length < baseArr.length) {
+      merged[key] = baseArr;
+    }
+  }
+  return merged;
+}
+
 /** Matches a string that is exactly one `{{ token }}` with no surrounding text. */
 const SINGLE_TOKEN_RE = /^\s*\{\{\s*([^}]+?)\s*\}\}\s*$/;
 
@@ -136,17 +220,242 @@ export function resolveInitialValues(
   return out;
 }
 
+/** Resolve `subObservationContext` templates from the opening form's data. */
+export function resolveSubObservationContext(
+  mapObj: Record<string, unknown> | null | undefined,
+  formData: Record<string, unknown>,
+  parentValue: string | null,
+): Record<string, unknown> {
+  return resolveInitialValues(mapObj, formData, parentValue);
+}
+
+export type SubObservationContextMergeConfig = {
+  contextKey?: string;
+  matchField: string;
+  /** Nested array on matched row (e.g. `camas` under a quarto). */
+  nestedArrayField?: string;
+  nestedMatchField?: string;
+};
+
+function toPosIntForMerge(value: unknown): number | null {
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? Math.floor(n) : null;
+}
+
+/** Upsert the opening session row into an inherited sub-observation context tree. */
+export function mergeSessionIntoSubObservationContext(
+  inherited: Record<string, unknown>,
+  sessionData: Record<string, unknown>,
+  mergeConfig: SubObservationContextMergeConfig | undefined,
+): Record<string, unknown> {
+  if (!mergeConfig || typeof mergeConfig !== 'object') {
+    return inherited;
+  }
+
+  const contextKey = mergeConfig.contextKey ?? 'quartos';
+  const matchField = mergeConfig.matchField;
+  const matchVal = toPosIntForMerge(sessionData[matchField]);
+  if (matchVal == null) return inherited;
+
+  const next = { ...inherited };
+  const snapshot = Array.isArray(next[contextKey])
+    ? [...(next[contextKey] as unknown[])]
+    : [];
+
+  const patch = { ...sessionData };
+  delete patch.household_quartos;
+
+  if (mergeConfig.nestedArrayField && mergeConfig.nestedMatchField) {
+    const nestedField = mergeConfig.nestedArrayField;
+    const nestedMatch = mergeConfig.nestedMatchField;
+    const nestedVal = toPosIntForMerge(sessionData[nestedMatch]);
+    if (nestedVal == null) return inherited;
+
+    let quartoFound = false;
+    const mergedSnapshot = snapshot.map(item => {
+      if (!item || typeof item !== 'object') return item;
+      const row = item as Record<string, unknown>;
+      if (toPosIntForMerge(row[matchField]) !== matchVal) return item;
+      quartoFound = true;
+      const camas = Array.isArray(row[nestedField])
+        ? [...(row[nestedField] as unknown[])]
+        : [];
+      let camaFound = false;
+      const nextCamas = camas.map(cama => {
+        if (!cama || typeof cama !== 'object') return cama;
+        const c = cama as Record<string, unknown>;
+        if (toPosIntForMerge(c[nestedMatch]) !== nestedVal) return cama;
+        camaFound = true;
+        return { ...c, ...patch };
+      });
+      if (!camaFound) {
+        nextCamas.push(patch);
+      }
+      return { ...row, [nestedField]: nextCamas };
+    });
+    if (!quartoFound) {
+      mergedSnapshot.push({
+        [matchField]: matchVal,
+        [nestedField]: [patch],
+      });
+    }
+    next[contextKey] = mergedSnapshot;
+    return next;
+  }
+
+  let found = false;
+  const mergedSnapshot = snapshot.map(item => {
+    if (!item || typeof item !== 'object') return item;
+    const row = item as Record<string, unknown>;
+    if (toPosIntForMerge(row[matchField]) !== matchVal) return item;
+    found = true;
+    return { ...row, ...patch };
+  });
+  if (!found) {
+    mergedSnapshot.push(patch);
+  }
+  next[contextKey] = mergedSnapshot;
+  return next;
+}
+
+export function writeSubObservationContextToWindow(
+  subObservation: Record<string, unknown>,
+): void {
+  if (typeof window === 'undefined') return;
+  const w = window as unknown as {
+    formulusSessionContext?: Record<string, unknown> | null;
+    formulusSubObservationContext?: Record<string, unknown> | null;
+  };
+  const sessionContext =
+    w.formulusSessionContext && typeof w.formulusSessionContext === 'object'
+      ? { ...w.formulusSessionContext }
+      : {};
+  sessionContext.subObservation = subObservation;
+  w.formulusSessionContext = sessionContext;
+  w.formulusSubObservationContext = subObservation;
+}
+
+/** Re-resolve `subObservationContext` templates from live parent form data. */
+export function refreshSubObservationContextFromFormData(
+  formData: Record<string, unknown>,
+  contextTemplate: Record<string, unknown> | null | undefined,
+  parentValue: string | null,
+  mergeConfig?: SubObservationContextMergeConfig,
+): Record<string, unknown> {
+  const w =
+    typeof window !== 'undefined'
+      ? (window as unknown as {
+          formulusSessionContext?: Record<string, unknown> | null;
+        })
+      : null;
+  const inherited =
+    w?.formulusSessionContext &&
+    typeof w.formulusSessionContext === 'object' &&
+    w.formulusSessionContext.subObservation &&
+    typeof w.formulusSessionContext.subObservation === 'object'
+      ? (w.formulusSessionContext.subObservation as Record<string, unknown>)
+      : {};
+
+  const mergedInherited = mergeSessionIntoSubObservationContext(
+    inherited,
+    formData,
+    mergeConfig,
+  );
+
+  const resolved = resolveSubObservationContext(
+    contextTemplate,
+    formData,
+    parentValue,
+  );
+
+  const subObservation: Record<string, unknown> = { ...mergedInherited };
+  for (const [key, value] of Object.entries(resolved)) {
+    if (value !== '' && value != null) {
+      subObservation[key] = value;
+    }
+  }
+  return subObservation;
+}
+
+export function buildSubObservationOpenParams(
+  formData: Record<string, unknown>,
+  config: Record<string, unknown>,
+  parentValue: string | null,
+  initMap?: Record<string, unknown> | null,
+): Record<string, unknown> {
+  const parentSessionContext =
+    typeof window !== 'undefined'
+      ? (
+          window as unknown as {
+            formulusSessionContext?: Record<string, unknown> | null;
+          }
+        ).formulusSessionContext
+      : null;
+
+  const resolved = resolveSubObservationContext(
+    optionalRecordMap(config.subObservationContext),
+    formData,
+    parentValue,
+  );
+  const inheritedSubObservation =
+    parentSessionContext &&
+    typeof parentSessionContext === 'object' &&
+    parentSessionContext.subObservation &&
+    typeof parentSessionContext.subObservation === 'object'
+      ? (parentSessionContext.subObservation as Record<string, unknown>)
+      : {};
+
+  const mergeConfigRaw = config.subObservationContextMerge;
+  const mergeConfig =
+    mergeConfigRaw && typeof mergeConfigRaw === 'object'
+      ? (mergeConfigRaw as SubObservationContextMergeConfig)
+      : undefined;
+
+  const mergedInherited = mergeSessionIntoSubObservationContext(
+    inheritedSubObservation,
+    formData,
+    mergeConfig,
+  );
+
+  const subObservation: Record<string, unknown> = {
+    ...mergedInherited,
+  };
+  for (const [key, value] of Object.entries(resolved)) {
+    if (value !== '' && value != null) {
+      subObservation[key] = value;
+    }
+  }
+
+  const initValues = resolveInitialValues(initMap, formData, parentValue);
+  const { household_quartos: _legacySnapshot, ...restInit } = initValues;
+
+  const context = {
+    ...(parentSessionContext && typeof parentSessionContext === 'object'
+      ? parentSessionContext
+      : {}),
+    ...(Object.keys(subObservation).length > 0 ? { subObservation } : {}),
+  };
+
+  return {
+    ...restInit,
+    ...(Object.keys(context).length > 0 ? { context } : {}),
+  };
+}
+
 export function formatCellValue(value: unknown): string {
   if (value == null) return '';
   if (typeof value === 'object') return JSON.stringify(value);
   return String(value);
 }
 
+/** Stable empty reference — avoid retriggering sub-observation row sync every render. */
+const EMPTY_SUB_OBSERVATION_ROWS: unknown[] = [];
+
 /** Normalizes JsonForms control data into an array of row payloads. */
 export function coerceSubObservationRows(value: unknown): unknown[] {
-  if (value == null) return [];
+  if (value == null) return EMPTY_SUB_OBSERVATION_ROWS;
   if (Array.isArray(value)) return value;
-  return [];
+  return EMPTY_SUB_OBSERVATION_ROWS;
 }
 
 export function readSubObservationField(
@@ -212,7 +521,9 @@ export function sortRows(
     r && typeof r === 'object' ? (r as Record<string, unknown>) : {},
   );
 
-  if (!asRecords.length) return asRecords;
+  if (!asRecords.length) {
+    return EMPTY_SUB_OBSERVATION_ROWS as Record<string, unknown>[];
+  }
 
   let key: string | null = null;
   let direction = 'desc';
diff --git a/formulus-formplayer/src/services/FormulusInterface.ts b/formulus-formplayer/src/services/FormulusInterface.ts
index 1df1707e7..50e48cf4b 100644
--- a/formulus-formplayer/src/services/FormulusInterface.ts
+++ b/formulus-formplayer/src/services/FormulusInterface.ts
@@ -359,6 +359,23 @@ class FormulusClient {
     );
   }
 
+  /**
+   * Allocate the next value in a device-local sequence scope (Formulus prepends device id).
+   */
+  public async allocateSequence(
+    scopeKey: string,
+    options?: { startAt?: number; peek?: boolean },
+  ): Promise<number> {
+    await this.tryEnsureFormulus();
+    if (this.formulus?.allocateSequence) {
+      return this.formulus.allocateSequence(scopeKey, options);
+    }
+    console.warn('Formulus interface not available for allocateSequence');
+    return Promise.reject(
+      new Error('Formulus interface not available for allocateSequence'),
+    );
+  }
+
   /**
    * Open Formplayer from within the formplayer WebView (e.g. sub-observation rows).
    * Forwards to the injected Formulus API.
diff --git a/formulus-formplayer/src/setupTests.ts b/formulus-formplayer/src/setupTests.ts
index 8f2609b7b..bb02c60cd 100644
--- a/formulus-formplayer/src/setupTests.ts
+++ b/formulus-formplayer/src/setupTests.ts
@@ -1,5 +1 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';
+import '@testing-library/jest-dom/vitest';
diff --git a/formulus-formplayer/src/stories/JsonFormsControlWrapper.tsx b/formulus-formplayer/src/stories/JsonFormsControlWrapper.tsx
index e41fc26f9..3923b8744 100644
--- a/formulus-formplayer/src/stories/JsonFormsControlWrapper.tsx
+++ b/formulus-formplayer/src/stories/JsonFormsControlWrapper.tsx
@@ -2,12 +2,16 @@ import React, { useState } from 'react';
 import { JsonForms } from '@jsonforms/react';
 import type { JsonSchema7, UISchemaElement } from '@jsonforms/core';
 import type { JsonFormsRendererRegistryEntry } from '@jsonforms/core';
+import { FormContext } from '../App';
+import type { KeyboardPrimaryEnterKeyHint } from '../utils/keyboardEnterKeyHint';
 
 interface JsonFormsControlWrapperProps {
   schema: JsonSchema7;
   uischema: UISchemaElement;
   initialData?: Record<string, unknown>;
   renderers: JsonFormsRendererRegistryEntry[];
+  keyboardEnterKeyHint?: KeyboardPrimaryEnterKeyHint;
+  validationMode?: 'ValidateAndShow' | 'ValidateAndHide' | 'NoValidation';
 }
 
 /**
@@ -19,16 +23,26 @@ export function JsonFormsControlWrapper({
   uischema,
   initialData = {},
   renderers,
+  keyboardEnterKeyHint = 'next',
+  validationMode = 'ValidateAndShow',
 }: JsonFormsControlWrapperProps) {
   const [data, setData] = useState<Record<string, unknown>>(initialData);
 
   return (
-    <JsonForms
-      schema={schema}
-      uischema={uischema}
-      data={data}
-      renderers={renderers}
-      onChange={({ data: newData }) => setData(newData || {})}
-    />
+    <FormContext.Provider
+      value={{
+        formInitData: null,
+        keyboardEnterKeyHint,
+        draftSessionKey: null,
+      }}>
+      <JsonForms
+        schema={schema}
+        uischema={uischema}
+        data={data}
+        renderers={renderers}
+        validationMode={validationMode}
+        onChange={({ data: newData }) => setData(newData || {})}
+      />
+    </FormContext.Provider>
   );
 }
diff --git a/formulus-formplayer/src/stories/NumberStepperRenderer.stories.tsx b/formulus-formplayer/src/stories/NumberStepperRenderer.stories.tsx
index 93239383f..3f440903e 100644
--- a/formulus-formplayer/src/stories/NumberStepperRenderer.stories.tsx
+++ b/formulus-formplayer/src/stories/NumberStepperRenderer.stories.tsx
@@ -22,6 +22,40 @@ const ageUischema = {
   scope: '#/properties/age',
 };
 
+const hemoglobinSchema = {
+  type: 'object',
+  properties: {
+    hb_resultado: {
+      type: 'number',
+      title: 'Resultado de hemoglobina',
+      minimum: 0,
+      maximum: 25,
+    },
+  },
+};
+
+const hemoglobinUischema = {
+  type: 'Control',
+  scope: '#/properties/hb_resultado',
+  label: 'Resultado de hemoglobina',
+};
+
+const decimalSchema = {
+  type: 'object',
+  properties: {
+    measurement: {
+      type: 'number',
+      title: 'Measurement',
+      multipleOf: 0.1,
+    },
+  },
+};
+
+const decimalUischema = {
+  type: 'Control',
+  scope: '#/properties/measurement',
+};
+
 const renderers = [numberStepperRenderer, ...materialRenderers];
 
 const meta: Meta<typeof JsonFormsControlWrapper> = {
@@ -29,12 +63,22 @@ const meta: Meta<typeof JsonFormsControlWrapper> = {
   component: JsonFormsControlWrapper,
   parameters: {
     layout: 'centered',
+    docs: {
+      description: {
+        component:
+          'Built-in numeric control for `type: integer` and `type: number`. Uses draft-while-focused text input (`inputMode` + `enterKeyHint`); never clamps schema bounds while typing.',
+      },
+    },
   },
   tags: ['autodocs'],
   argTypes: {
     initialData: {
       description: 'Initial value for the number field',
     },
+    keyboardEnterKeyHint: {
+      control: 'select',
+      options: ['next', 'done', 'go'],
+    },
   },
 };
 
@@ -48,6 +92,7 @@ export const Default: Story = {
     uischema: ageUischema,
     initialData: {},
     renderers,
+    keyboardEnterKeyHint: 'next',
   },
 };
 
@@ -77,3 +122,79 @@ export const AtMaximum: Story = {
     renderers,
   },
 };
+
+/** Mirrors GBMIS lab `hb_resultado` — decimal `type: number` with bounds 0–25. */
+export const HemoglobinLab: Story = {
+  args: {
+    schema: hemoglobinSchema,
+    uischema: hemoglobinUischema,
+    initialData: {},
+    renderers,
+    keyboardEnterKeyHint: 'next',
+  },
+};
+
+/** Type 35 to see max validation without value snapping; backspace to clear and enter 16. */
+export const OverMaximumWhileTyping: Story = {
+  args: {
+    schema: hemoglobinSchema,
+    uischema: hemoglobinUischema,
+    initialData: {},
+    renderers,
+    validationMode: 'ValidateAndShow',
+  },
+  parameters: {
+    docs: {
+      description: {
+        story:
+          'Enter 35: inline error for maximum 25, but the field keeps showing 35 until you edit. Backspace to empty, then type 16.',
+      },
+    },
+  },
+};
+
+export const BackspaceAndReplace: Story = {
+  args: {
+    schema: hemoglobinSchema,
+    uischema: hemoglobinUischema,
+    initialData: { hb_resultado: 35 },
+    renderers,
+    validationMode: 'ValidateAndShow',
+  },
+  parameters: {
+    docs: {
+      description: {
+        story:
+          'Starts at 35 (over max). Focus, backspace all digits, type 16 — value must not snap to a bound while editing.',
+      },
+    },
+  },
+};
+
+export const DecimalEntry: Story = {
+  args: {
+    schema: decimalSchema,
+    uischema: decimalUischema,
+    initialData: {},
+    renderers,
+    keyboardEnterKeyHint: 'done',
+  },
+};
+
+export const IntegerWithNextKey: Story = {
+  args: {
+    schema: ageSchema,
+    uischema: ageUischema,
+    initialData: { age: 30 },
+    renderers,
+    keyboardEnterKeyHint: 'next',
+  },
+  parameters: {
+    docs: {
+      description: {
+        story:
+          'Inspect the input in mobile devtools: `inputmode=numeric`, `enterkeyhint=next`.',
+      },
+    },
+  },
+};
diff --git a/formulus-formplayer/src/theme/ChoiceOptionList.tsx b/formulus-formplayer/src/theme/ChoiceOptionList.tsx
new file mode 100644
index 000000000..ea2a3a5d8
--- /dev/null
+++ b/formulus-formplayer/src/theme/ChoiceOptionList.tsx
@@ -0,0 +1,25 @@
+import type { ReactNode } from 'react';
+import { Box, FormGroup } from '@mui/material';
+import { choiceListSx, type ChoiceLayout } from './choiceLayout';
+
+type ChoiceOptionListProps = {
+  layout: ChoiceLayout;
+  role?: 'group' | 'radiogroup';
+  children: ReactNode;
+};
+
+/** FormGroup theme sets flexDirection column; use Box for non-vertical layouts. */
+export function ChoiceOptionList({
+  layout,
+  role = 'group',
+  children,
+}: ChoiceOptionListProps) {
+  if (layout.mode === 'vertical') {
+    return <FormGroup sx={choiceListSx(layout)}>{children}</FormGroup>;
+  }
+  return (
+    <Box role={role} sx={choiceListSx(layout)}>
+      {children}
+    </Box>
+  );
+}
diff --git a/formulus-formplayer/src/theme/choiceLayout.test.ts b/formulus-formplayer/src/theme/choiceLayout.test.ts
new file mode 100644
index 000000000..039b1df1b
--- /dev/null
+++ b/formulus-formplayer/src/theme/choiceLayout.test.ts
@@ -0,0 +1,82 @@
+import { describe, it, expect } from 'vitest';
+import {
+  parseChoiceLayout,
+  choiceListSx,
+  toggleButtonListSx,
+  toggleButtonOrientation,
+} from './choiceLayout';
+
+describe('parseChoiceLayout', () => {
+  it('defaults to vertical when options are missing', () => {
+    expect(parseChoiceLayout()).toEqual({ mode: 'vertical' });
+    expect(parseChoiceLayout({})).toEqual({ mode: 'vertical' });
+  });
+
+  it('parses horizontal and flow', () => {
+    expect(parseChoiceLayout({ orientation: 'horizontal' })).toEqual({
+      mode: 'horizontal',
+    });
+    expect(parseChoiceLayout({ orientation: 'flow' })).toEqual({
+      mode: 'flow',
+    });
+  });
+
+  it('parses cols-2 through cols-5', () => {
+    expect(parseChoiceLayout({ orientation: 'cols-2' })).toEqual({
+      mode: 'columns',
+      columns: 2,
+    });
+    expect(parseChoiceLayout({ orientation: 'cols-3' })).toEqual({
+      mode: 'columns',
+      columns: 3,
+    });
+    expect(parseChoiceLayout({ orientation: 'cols-4' })).toEqual({
+      mode: 'columns',
+      columns: 4,
+    });
+    expect(parseChoiceLayout({ orientation: 'cols-5' })).toEqual({
+      mode: 'columns',
+      columns: 5,
+    });
+  });
+
+  it('falls back to vertical for unknown orientation values', () => {
+    expect(parseChoiceLayout({ orientation: 'cols-1' })).toEqual({
+      mode: 'vertical',
+    });
+    expect(parseChoiceLayout({ orientation: 'cols-6' })).toEqual({
+      mode: 'vertical',
+    });
+    expect(parseChoiceLayout({ orientation: 'grid' })).toEqual({
+      mode: 'vertical',
+    });
+  });
+});
+
+describe('choiceListSx', () => {
+  it('uses flex row wrap for flow', () => {
+    const sx = choiceListSx({ mode: 'flow' }) as Record<string, unknown>;
+    expect(sx.display).toBe('flex');
+    expect(sx.flexDirection).toBe('row');
+    expect(sx.flexWrap).toBe('wrap');
+  });
+
+  it('uses CSS grid for column layouts', () => {
+    const sx = choiceListSx({ mode: 'columns', columns: 3 }) as Record<
+      string,
+      unknown
+    >;
+    expect(sx.display).toBe('grid');
+    expect(sx.gridTemplateColumns).toBe('repeat(3, minmax(0, 1fr))');
+    expect(sx.alignItems).toBe('start');
+  });
+});
+
+describe('toggle button layout helpers', () => {
+  it('maps column mode to horizontal orientation with wrap', () => {
+    const layout = { mode: 'columns' as const, columns: 3 as const };
+    expect(toggleButtonOrientation(layout)).toBe('horizontal');
+    const sx = toggleButtonListSx(layout, false) as Record<string, unknown>;
+    expect(sx.flexWrap).toBe('wrap');
+  });
+});
diff --git a/formulus-formplayer/src/theme/choiceLayout.ts b/formulus-formplayer/src/theme/choiceLayout.ts
new file mode 100644
index 000000000..d924d93a4
--- /dev/null
+++ b/formulus-formplayer/src/theme/choiceLayout.ts
@@ -0,0 +1,84 @@
+import type { SxProps, Theme } from '@mui/material';
+
+export type ColumnCount = 2 | 3 | 4 | 5;
+
+export type ChoiceLayout =
+  | { mode: 'vertical' }
+  | { mode: 'horizontal' }
+  | { mode: 'flow' }
+  | { mode: 'columns'; columns: ColumnCount };
+
+const COLS_PATTERN = /^cols-([2-5])$/;
+
+export function parseChoiceLayout(
+  options?: Record<string, unknown>,
+): ChoiceLayout {
+  const orientation = options?.orientation;
+  if (orientation === 'horizontal' || orientation === 'flow') {
+    return { mode: orientation };
+  }
+  if (typeof orientation === 'string') {
+    const match = COLS_PATTERN.exec(orientation);
+    if (match) {
+      return { mode: 'columns', columns: Number(match[1]) as ColumnCount };
+    }
+  }
+  return { mode: 'vertical' };
+}
+
+const formControlLabelRowSx = {
+  '& .MuiFormControlLabel-root': {
+    width: 'auto',
+    marginRight: 0.5,
+  },
+};
+
+export function choiceListSx(layout: ChoiceLayout): SxProps<Theme> {
+  if (layout.mode === 'columns') {
+    return {
+      display: 'grid',
+      gridTemplateColumns: `repeat(${layout.columns}, minmax(0, 1fr))`,
+      gap: 0.5,
+      alignItems: 'start',
+      ...formControlLabelRowSx,
+    };
+  }
+
+  return {
+    display: 'flex',
+    flexDirection: layout.mode === 'vertical' ? 'column' : 'row',
+    flexWrap: layout.mode === 'flow' ? 'wrap' : 'nowrap',
+    gap: layout.mode === 'vertical' ? 0 : 0.5,
+    alignItems: layout.mode === 'vertical' ? undefined : 'center',
+    ...(layout.mode !== 'vertical' ? formControlLabelRowSx : {}),
+  };
+}
+
+/** ToggleButtonGroup only supports vertical/horizontal; cols-* falls back to flow wrap. */
+export function toggleButtonListSx(
+  layout: ChoiceLayout,
+  separated: boolean,
+): SxProps<Theme> {
+  const wrap =
+    layout.mode === 'flow' || layout.mode === 'columns' ? 'wrap' : 'nowrap';
+  return {
+    flexWrap: wrap,
+    ...(separated
+      ? {
+          gap: 1,
+          '& .MuiToggleButtonGroup-grouped': {
+            border: '1px solid',
+            borderColor: 'divider',
+            borderRadius: 1,
+            '&:not(:first-of-type)': { marginLeft: 0 },
+          },
+        }
+      : {}),
+  };
+}
+
+export function toggleButtonOrientation(
+  layout: ChoiceLayout,
+): 'vertical' | 'horizontal' {
+  return layout.mode === 'vertical' ? 'vertical' : 'horizontal';
+}
diff --git a/formulus-formplayer/src/theme/material-wrappers.tsx b/formulus-formplayer/src/theme/material-wrappers.tsx
index 3971566c8..b9b0df3f5 100644
--- a/formulus-formplayer/src/theme/material-wrappers.tsx
+++ b/formulus-formplayer/src/theme/material-wrappers.tsx
@@ -28,7 +28,6 @@ import {
   useTheme,
   FormControl,
   Select,
-  FormHelperText,
   Radio,
   Checkbox,
   FormControlLabel,
@@ -39,6 +38,13 @@ import {
 import QuestionShell from '../components/QuestionShell';
 import { isControlHidden } from '../jsonforms/visibleGuard';
 import { tokens } from './tokens-adapter';
+import {
+  parseChoiceLayout,
+  choiceListSx,
+  toggleButtonListSx,
+  toggleButtonOrientation,
+} from './choiceLayout';
+import { ChoiceOptionList } from './ChoiceOptionList';
 
 const parsePx = (value: string): number =>
   parseInt(String(value).replace('px', ''), 10) || 1;
@@ -243,7 +249,6 @@ const SelectOneOfEnumControl = (props: ControlProps & OwnPropsOfEnum) => {
             </option>
           ))}
         </Select>
-        {hasError ? <FormHelperText>{errors}</FormHelperText> : null}
       </FormControl>
     </QuestionShell>
   );
@@ -328,7 +333,7 @@ const EnumArrayShellControl = (
       description={description}
       required={required}
       error={errors}>
-      <FormGroup sx={choiceListSx('vertical')}>
+      <FormGroup sx={choiceListSx({ mode: 'vertical' })}>
         {options.map(opt => (
           <FormControlLabel
             key={String(opt.value)}
@@ -353,7 +358,7 @@ const EnumArrayShellControl = (
 //   options.display:
 //     single-select (enum / oneOf): "radio" | "buttons"
 //     multi-select  (array enum):   "checkboxes" | "buttons"
-//   options.orientation: "vertical" (default) | "horizontal" | "flow" (wrap)
+//   options.orientation: "vertical" (default) | "horizontal" | "flow" | "cols-2" … "cols-5"
 //   options.buttonGroup: "segmented" (default) | "separated"
 //
 // Single-select radio/buttons support tap-the-selected-option-to-clear.
@@ -370,40 +375,13 @@ const deriveChoiceOptions = (schema: any): ChoiceOption[] =>
     label: o.title ?? String(o.const ?? o),
   })) || (schema.enum || []).map((v: any) => ({ value: v, label: String(v) }));
 
-type ChoiceOrientation = 'vertical' | 'horizontal' | 'flow';
-
 const readChoiceLayout = (uischema: any) => {
   const o = uischema?.options ?? {};
-  const orientation: ChoiceOrientation =
-    o.orientation === 'horizontal' || o.orientation === 'flow'
-      ? o.orientation
-      : 'vertical';
+  const layout = parseChoiceLayout(o);
   const separated = o.buttonGroup === 'separated';
-  return { orientation, separated };
+  return { layout, separated };
 };
 
-const choiceListSx = (orientation: ChoiceOrientation) => ({
-  display: 'flex',
-  flexDirection: orientation === 'vertical' ? 'column' : 'row',
-  flexWrap: orientation === 'flow' ? 'wrap' : 'nowrap',
-  gap: orientation === 'vertical' ? 0 : 0.5,
-});
-
-const toggleGroupSx = (orientation: ChoiceOrientation, separated: boolean) => ({
-  flexWrap: orientation === 'flow' ? 'wrap' : 'nowrap',
-  ...(separated
-    ? {
-        gap: 1,
-        '& .MuiToggleButtonGroup-grouped': {
-          border: '1px solid',
-          borderColor: 'divider',
-          borderRadius: 1,
-          '&:not(:first-of-type)': { marginLeft: 0 },
-        },
-      }
-    : {}),
-});
-
 export const choiceControlTester: RankedTester = rankWith(
   7,
   and(
@@ -432,7 +410,7 @@ export const ChoiceControl = (props: AnyControlProps) => {
     (uischema as any)?.options?.required ?? (schema as any)?.options?.required,
   );
   const display = (uischema as any)?.options?.display;
-  const { orientation, separated } = readChoiceLayout(uischema);
+  const { layout, separated } = readChoiceLayout(uischema);
   const options = deriveChoiceOptions(schema);
 
   const body =
@@ -440,7 +418,7 @@ export const ChoiceControl = (props: AnyControlProps) => {
       <ToggleButtonGroup
         exclusive
         disabled={!enabled}
-        orientation={orientation === 'vertical' ? 'vertical' : 'horizontal'}
+        orientation={toggleButtonOrientation(layout)}
         value={data ?? null}
         onChange={(_e, val) => {
           if (!enabled) return;
@@ -448,7 +426,7 @@ export const ChoiceControl = (props: AnyControlProps) => {
           // which gives tap-to-clear for free.
           handleChange(path, val == null ? undefined : val);
         }}
-        sx={toggleGroupSx(orientation, separated)}>
+        sx={toggleButtonListSx(layout, separated)}>
         {options.map(opt => (
           <ToggleButton key={String(opt.value)} value={opt.value as any}>
             {opt.label}
@@ -456,7 +434,7 @@ export const ChoiceControl = (props: AnyControlProps) => {
         ))}
       </ToggleButtonGroup>
     ) : (
-      <Box role="radiogroup" sx={choiceListSx(orientation)}>
+      <ChoiceOptionList layout={layout} role="radiogroup">
         {options.map(opt => {
           const selected = data === opt.value;
           return (
@@ -477,7 +455,7 @@ export const ChoiceControl = (props: AnyControlProps) => {
             />
           );
         })}
-      </Box>
+      </ChoiceOptionList>
     );
 
   return (
@@ -485,8 +463,7 @@ export const ChoiceControl = (props: AnyControlProps) => {
       title={label}
       description={description}
       required={required}
-      error={errors}
-      block={orientation === 'flow'}>
+      error={errors}>
       {body}
     </QuestionShell>
   );
@@ -521,7 +498,7 @@ export const MultiChoiceControl = (
   const description = schema.description;
   const required = Boolean((uischema as any)?.options?.required);
   const display = (uischema as any)?.options?.display;
-  const { orientation, separated } = readChoiceLayout(uischema);
+  const { layout, separated } = readChoiceLayout(uischema);
   const selected: unknown[] = Array.isArray(data) ? data : [];
   const isSelected = (v: unknown) => selected.includes(v);
   const toggle = (v: unknown) => {
@@ -534,7 +511,7 @@ export const MultiChoiceControl = (
     display === 'buttons' ? (
       <ToggleButtonGroup
         disabled={!enabled}
-        orientation={orientation === 'vertical' ? 'vertical' : 'horizontal'}
+        orientation={toggleButtonOrientation(layout)}
         value={selected as any}
         onChange={(_e, newVals: unknown[]) => {
           if (!enabled) return;
@@ -545,7 +522,7 @@ export const MultiChoiceControl = (
             .filter(v => !newVals.includes(v))
             .forEach(v => removeItem?.(path, v));
         }}
-        sx={toggleGroupSx(orientation, separated)}>
+        sx={toggleButtonListSx(layout, separated)}>
         {options.map(opt => (
           <ToggleButton key={String(opt.value)} value={opt.value as any}>
             {opt.label}
@@ -553,7 +530,7 @@ export const MultiChoiceControl = (
         ))}
       </ToggleButtonGroup>
     ) : (
-      <FormGroup sx={choiceListSx(orientation)}>
+      <ChoiceOptionList layout={layout}>
         {options.map(opt => (
           <FormControlLabel
             key={String(opt.value)}
@@ -567,7 +544,7 @@ export const MultiChoiceControl = (
             label={opt.label}
           />
         ))}
-      </FormGroup>
+      </ChoiceOptionList>
     );
 
   return (
@@ -575,8 +552,7 @@ export const MultiChoiceControl = (
       title={label}
       description={description}
       required={required}
-      error={errors}
-      block={orientation === 'flow'}>
+      error={errors}>
       {body}
     </QuestionShell>
   );
diff --git a/formulus-formplayer/src/theme/theme.ts b/formulus-formplayer/src/theme/theme.ts
index 77360c5f7..4e46cecf9 100644
--- a/formulus-formplayer/src/theme/theme.ts
+++ b/formulus-formplayer/src/theme/theme.ts
@@ -430,6 +430,7 @@ export const getThemeOptions = (
         styleOverrides: {
           root: {
             fontSize: parsePx(tokens.typography.fontSize.base),
+            scrollMarginBottom: parsePx(tokens.spacing[6]),
             '&.Mui-focused': {
               '& .MuiOutlinedInput-notchedOutline': {
                 borderColor: primaryMain,
@@ -660,6 +661,23 @@ export const getThemeOptions = (
           },
         },
       },
+      MuiCardHeader: {
+        styleOverrides: {
+          root: {
+            paddingBottom: parsePx(tokens.spacing[1]),
+          },
+        },
+      },
+      MuiCardContent: {
+        styleOverrides: {
+          root: {
+            paddingTop: 0,
+            '&:last-child': {
+              paddingBottom: parsePx(tokens.spacing[4]),
+            },
+          },
+        },
+      },
       // IconButton styling
       MuiIconButton: {
         styleOverrides: {
diff --git a/formulus-formplayer/src/types/CustomQuestionTypeContract.ts b/formulus-formplayer/src/types/CustomQuestionTypeContract.ts
index 410c1e596..438eec16a 100644
--- a/formulus-formplayer/src/types/CustomQuestionTypeContract.ts
+++ b/formulus-formplayer/src/types/CustomQuestionTypeContract.ts
@@ -26,14 +26,24 @@ export interface CustomQuestionTypeProps {
    */
   config: Record<string, unknown>;
 
-  /** Callback to update the field value. Call with the new value. */
+  /**
+   * Callback to update the field value. Call with a JSON number/boolean/string/etc. —
+   * never a display string for numeric schema types.
+   *
+   * **Numeric fields:** While focused, keep draft text locally; do not clamp to
+   * `minimum`/`maximum` on each keystroke. Commit typed numbers (including
+   * temporarily out-of-range values) and let AJV show validation errors.
+   */
   onChange: (newValue: unknown) => void;
 
   /** Current validation state for this field */
   validation: {
-    /** Whether the field currently has a validation error */
+    /** Whether the field currently has a validation error (use for red border / `error` prop only) */
     error: boolean;
-    /** The validation error message (empty string if no error) */
+    /**
+     * Always empty when rendered via `CustomQuestionTypeAdapter` — error copy is shown
+     * only in `QuestionShell`. Do not render this string in custom widgets.
+     */
     message: string;
   };
 
diff --git a/formulus-formplayer/src/types/FormulusInterfaceDefinition.ts b/formulus-formplayer/src/types/FormulusInterfaceDefinition.ts
index 7495db379..3be0c2205 100644
--- a/formulus-formplayer/src/types/FormulusInterfaceDefinition.ts
+++ b/formulus-formplayer/src/types/FormulusInterfaceDefinition.ts
@@ -394,6 +394,9 @@ export interface FormulusInterface {
    *   `window.formulusSessionContext`. Draft bypass is not a param key — use
    *   `options.skipDraftSelection` on {@link openFormplayer} (same as `skipFinalize`).
    * @param {Object} savedData - Previously saved form data (for editing)
+   * @param {Object} [options] - Session options (not persisted as observation data)
+   * @param {string|null} [options.observationId] - When set, finalize updates this
+   *   observation instead of creating a new one
    * @returns {Promise<FormCompletionResult>} Promise that resolves when the form is completed/closed with result details
    */
   openFormplayer(
@@ -404,6 +407,7 @@ export interface FormulusInterface {
       subObservationMode?: boolean;
       skipFinalize?: boolean;
       skipDraftSelection?: boolean;
+      observationId?: string | null;
     },
   ): Promise<FormCompletionResult>;
 
@@ -478,6 +482,34 @@ export interface FormulusInterface {
    */
   requestLocation(fieldId: string): Promise<LocationResult>;
 
+  /**
+   * Return the best cached device fix (if any) without forcing a new GPS read.
+   * @param fieldId Optional field id for parity with `requestLocation`
+   */
+  getCachedLocation(fieldId?: string): Promise<LocationResult | null>;
+
+  /**
+   * Allocate the next monotonic integer in a device-local scope.
+   * Formulus prepends `device:{deviceId}:` to the app-authored `scopeKey` suffix.
+   * @param scopeKey App suffix, e.g. `af:A12:person` (no device prefix).
+   * @param options `startAt` default 1; `peek` returns next without consuming.
+   */
+  allocateSequence(
+    scopeKey: string,
+    options?: { startAt?: number; peek?: boolean },
+  ): Promise<number>;
+
+  /**
+   * Subscribe to location updates while the custom app WebView is active.
+   * Updates arrive as `locationWatchUpdate` window messages.
+   */
+  watchLocation(
+    fieldId: string,
+  ): Promise<{ status: 'started' | 'error'; message?: string }>;
+
+  /** Stop a prior `watchLocation` subscription for `fieldId`. */
+  stopWatchLocation(fieldId: string): Promise<void>;
+
   /**
    * Request file selection for a field
    * @param {string} fieldId - The ID of the field
@@ -694,7 +726,7 @@ export interface FormulusCallbacks {
 /**
  * Current version of the interface
  */
-export const FORMULUS_INTERFACE_VERSION = '1.4.0';
+export const FORMULUS_INTERFACE_VERSION = '1.5.0';
 
 /** Parses major.minor.patch from the start of a version string (ignores prerelease after `-`). */
 function semverSegments(version: string): [number, number, number] {
diff --git a/formulus-formplayer/src/utils/autoSequence.test.ts b/formulus-formplayer/src/utils/autoSequence.test.ts
new file mode 100644
index 000000000..cffb3f919
--- /dev/null
+++ b/formulus-formplayer/src/utils/autoSequence.test.ts
@@ -0,0 +1,112 @@
+import { describe, expect, it } from 'vitest';
+import { applyAutoSequences } from './autoSequence';
+
+describe('applyAutoSequences', () => {
+  it('assigns sibling max+1 in an array', async () => {
+    const schema = {
+      properties: {
+        camas: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              cama_num: {
+                type: 'integer',
+                'x-autoSequence': { scope: 'sibling' },
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const data = {
+      camas: [{ cama_num: 1 }, { cama_num: null }, {}],
+    };
+
+    const { data: next, mutated } = await applyAutoSequences(data, schema);
+    expect(mutated).toBe(true);
+    expect(next.camas[1].cama_num).toBe(2);
+    expect(next.camas[2].cama_num).toBe(3);
+  });
+
+  it('does not overwrite existing values when immutable', async () => {
+    const schema = {
+      properties: {
+        quarto_num: {
+          type: 'integer',
+          'x-autoSequence': { scope: 'tree' },
+        },
+      },
+    };
+
+    const data = { quarto_num: 5 };
+    const { data: next, mutated } = await applyAutoSequences(data, schema);
+    expect(mutated).toBe(false);
+    expect(next.quarto_num).toBe(5);
+  });
+
+  it('uses contextTree for household numbering', async () => {
+    const schema = {
+      properties: {
+        nopessoa: {
+          type: 'string',
+          'x-autoSequence': {
+            scope: 'contextTree',
+            contextKey: 'quartos',
+            field: 'nopessoa',
+          },
+        },
+      },
+    };
+
+    const data = { nopessoa: '' };
+    const { data: next } = await applyAutoSequences(data, schema, {
+      subObservationContext: {
+        quartos: [
+          {
+            quarto_num: 1,
+            camas: [{ cama_num: 1, pessoas: [{ nopessoa: '3' }] }],
+          },
+        ],
+      },
+    });
+
+    expect(next.nopessoa).toBe('4');
+  });
+
+  it('matches contextFilter with numeric coercion', async () => {
+    const schema = {
+      properties: {
+        cama_num: {
+          type: 'integer',
+          'x-autoSequence': {
+            scope: 'contextTree',
+            contextKey: 'quartos',
+            field: 'cama_num',
+            contextFilter: { quarto_num: '$data.quarto_num' },
+          },
+        },
+        quarto_num: { type: 'integer' },
+      },
+    };
+
+    const data = { quarto_num: 2, cama_num: null };
+    const { data: next } = await applyAutoSequences(data, schema, {
+      subObservationContext: {
+        quartos: [
+          {
+            quarto_num: 1,
+            camas: [{ cama_num: 1 }, { cama_num: 2 }],
+          },
+          {
+            quarto_num: '2',
+            camas: [{ cama_num: 1 }],
+          },
+        ],
+      },
+    });
+
+    expect(next.cama_num).toBe(2);
+  });
+});
diff --git a/formulus-formplayer/src/utils/autoSequence.ts b/formulus-formplayer/src/utils/autoSequence.ts
new file mode 100644
index 000000000..695ce5f89
--- /dev/null
+++ b/formulus-formplayer/src/utils/autoSequence.ts
@@ -0,0 +1,318 @@
+/**
+ * Platform `x-autoSequence` — assign max+1 sequence integers when blank; optional immutability.
+ */
+
+import type { JsonSchema7 } from '@jsonforms/core';
+import { resolveTemplateValue } from '../renderers/subObservationHelpers';
+import FormulusClient from '../services/FormulusInterface';
+
+export type AutoSequenceConfig = {
+  assign?: 'max+1';
+  allocator?: 'native' | 'declarative';
+  immutable?: boolean;
+  scope?: 'sibling' | 'tree' | 'contextTree';
+  contextKey?: string;
+  contextFilter?: Record<string, string>;
+  field?: string;
+  /** App-authored suffix; Formulus prepends `device:{deviceId}:`. */
+  scopeKey?: string;
+};
+
+export type AutoSequenceRuntimeContext = {
+  subObservationContext?: Record<string, unknown> | null;
+  sessionContext?: Record<string, unknown> | null;
+};
+
+type Binding = {
+  field: string;
+  config: AutoSequenceConfig;
+  /** Path to parent object; `*` = each array index */
+  parentSegments: string[];
+  valueKind: 'string' | 'number';
+};
+
+function isBlankSequenceValue(value: unknown): boolean {
+  if (value === undefined || value === null || value === '') return true;
+  const n = Number(value);
+  return !Number.isFinite(n) || n <= 0;
+}
+
+function toPosInt(value: unknown): number | null {
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? Math.floor(n) : null;
+}
+
+function resolveFilterToken(
+  token: string,
+  data: Record<string, unknown>,
+): unknown {
+  if (token.startsWith('$data.')) {
+    return data[token.slice('$data.'.length)];
+  }
+  return data[token];
+}
+
+function filterValuesEqual(a: unknown, b: unknown): boolean {
+  if (a === b) return true;
+  const aNum = toPosInt(a);
+  const bNum = toPosInt(b);
+  if (aNum != null && bNum != null) return aNum === bNum;
+  return String(a ?? '') === String(b ?? '');
+}
+
+function nodeMatchesFilter(
+  node: Record<string, unknown>,
+  filter: Record<string, string> | undefined,
+  data: Record<string, unknown>,
+): boolean {
+  if (!filter) return true;
+  for (const [nodeKey, token] of Object.entries(filter)) {
+    if (!filterValuesEqual(node[nodeKey], resolveFilterToken(token, data))) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function collectFieldValues(
+  node: unknown,
+  fieldName: string,
+  filter: Record<string, string> | undefined,
+  data: Record<string, unknown>,
+  out: number[],
+): void {
+  if (node == null) return;
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      collectFieldValues(item, fieldName, filter, data, out);
+    }
+    return;
+  }
+  if (typeof node !== 'object') return;
+
+  const obj = node as Record<string, unknown>;
+  if (!nodeMatchesFilter(obj, filter, data)) return;
+
+  if (Object.prototype.hasOwnProperty.call(obj, fieldName)) {
+    const n = toPosInt(obj[fieldName]);
+    if (n != null) out.push(n);
+  }
+
+  for (const value of Object.values(obj)) {
+    if (value && typeof value === 'object') {
+      collectFieldValues(value, fieldName, undefined, data, out);
+    }
+  }
+}
+
+function maxFromValues(values: number[]): number {
+  return values.length === 0 ? 0 : Math.max(...values);
+}
+
+function computeNextValue(
+  binding: Binding,
+  data: Record<string, unknown>,
+  runtime: AutoSequenceRuntimeContext,
+): number {
+  const fieldName = binding.config.field ?? binding.field;
+  const values: number[] = [];
+  const scope = binding.config.scope ?? 'sibling';
+
+  if (scope === 'sibling') {
+    const parent = resolveParentObject(data, binding.parentSegments);
+    if (Array.isArray(parent)) {
+      for (const item of parent) {
+        if (item && typeof item === 'object') {
+          const n = toPosInt((item as Record<string, unknown>)[fieldName]);
+          if (n != null) values.push(n);
+        }
+      }
+    }
+  } else if (scope === 'contextTree') {
+    const contextKey = binding.config.contextKey ?? 'quartos';
+    const subCtx =
+      runtime.subObservationContext ??
+      (runtime.sessionContext?.subObservation as Record<
+        string,
+        unknown
+      > | null);
+    collectFieldValues(
+      subCtx?.[contextKey],
+      fieldName,
+      binding.config.contextFilter,
+      data,
+      values,
+    );
+    collectFieldValues(
+      data,
+      fieldName,
+      binding.config.contextFilter,
+      data,
+      values,
+    );
+  } else {
+    collectFieldValues(
+      data,
+      fieldName,
+      binding.config.contextFilter,
+      data,
+      values,
+    );
+  }
+
+  return maxFromValues(values) + 1;
+}
+
+function collectBindings(
+  schema: JsonSchema7 | undefined,
+  parentSegments: string[] = [],
+): Binding[] {
+  if (!schema || typeof schema !== 'object') return [];
+
+  const bindings: Binding[] = [];
+  const props = schema.properties;
+  if (props) {
+    for (const [name, childSchema] of Object.entries(props)) {
+      const child = childSchema as JsonSchema7;
+      const seq = (child as Record<string, unknown>)['x-autoSequence'] as
+        | AutoSequenceConfig
+        | undefined;
+      if (seq && typeof seq === 'object') {
+        bindings.push({
+          field: name,
+          parentSegments,
+          valueKind: child.type === 'string' ? 'string' : 'number',
+          config: {
+            assign: 'max+1',
+            immutable: true,
+            scope: 'sibling',
+            ...seq,
+            field: seq.field ?? name,
+          },
+        });
+      }
+      bindings.push(...collectBindings(child, [...parentSegments, name]));
+    }
+  }
+
+  if (schema.items && typeof schema.items === 'object') {
+    bindings.push(
+      ...collectBindings(schema.items as JsonSchema7, [...parentSegments, '*']),
+    );
+  }
+
+  return bindings;
+}
+
+function resolveParentObject(
+  data: Record<string, unknown>,
+  segments: string[],
+): unknown {
+  let cur: unknown = data;
+  for (const segment of segments) {
+    if (segment === '*') return cur;
+    if (cur == null || typeof cur !== 'object') return undefined;
+    cur = (cur as Record<string, unknown>)[segment];
+  }
+  return cur;
+}
+
+type ParentRef = { parent: Record<string, unknown> };
+
+function enumerateParents(
+  data: Record<string, unknown>,
+  segments: string[],
+): ParentRef[] {
+  if (segments.length === 0) return [{ parent: data }];
+
+  const [head, ...tail] = segments;
+  if (head === '*') {
+    if (!Array.isArray(data)) return [];
+    const out: ParentRef[] = [];
+    for (const item of data) {
+      if (item && typeof item === 'object') {
+        out.push(...enumerateParents(item as Record<string, unknown>, tail));
+      }
+    }
+    return out;
+  }
+
+  const next = data[head];
+  if (next == null || typeof next !== 'object') return [];
+  if (tail.length === 0) {
+    return [{ parent: next as Record<string, unknown> }];
+  }
+  return enumerateParents(next as Record<string, unknown>, tail);
+}
+
+function usesNativeAllocator(config: AutoSequenceConfig): boolean {
+  return config.allocator === 'native' && Boolean(config.scopeKey?.trim());
+}
+
+function resolveScopeKeyTemplate(
+  template: string,
+  data: Record<string, unknown>,
+): string {
+  const resolved = resolveTemplateValue(template, data, null);
+  return typeof resolved === 'string'
+    ? resolved.trim()
+    : String(resolved ?? '').trim();
+}
+
+async function computeNextValueAsync(
+  binding: Binding,
+  data: Record<string, unknown>,
+  runtime: AutoSequenceRuntimeContext,
+): Promise<number | string> {
+  if (usesNativeAllocator(binding.config)) {
+    const scopeKey = resolveScopeKeyTemplate(
+      binding.config.scopeKey!.trim(),
+      data,
+    );
+    if (!scopeKey) {
+      throw new Error(
+        `x-autoSequence scopeKey resolved empty for field "${binding.field}"`,
+      );
+    }
+    const client = FormulusClient.getInstance();
+    return client.allocateSequence(scopeKey);
+  }
+  const next = computeNextValue(binding, data, runtime);
+  return binding.valueKind === 'string' ? String(next) : next;
+}
+
+/** Apply all `x-autoSequence` rules in `schema` when fields are blank. */
+export async function applyAutoSequences(
+  data: Record<string, unknown>,
+  schema: JsonSchema7 | undefined,
+  runtime: AutoSequenceRuntimeContext = {},
+): Promise<{ data: Record<string, unknown>; mutated: boolean }> {
+  if (!schema) return { data, mutated: false };
+
+  const bindings = collectBindings(schema, []);
+  if (bindings.length === 0) return { data, mutated: false };
+
+  const working = structuredClone(data);
+  let mutated = false;
+
+  for (const binding of bindings) {
+    const immutable = binding.config.immutable !== false;
+    const fieldName = binding.field;
+    const parentRefs = enumerateParents(working, binding.parentSegments);
+
+    for (const { parent } of parentRefs) {
+      const current = parent[fieldName];
+      if (immutable && !isBlankSequenceValue(current)) continue;
+      if (!isBlankSequenceValue(current)) continue;
+
+      parent[fieldName] = await computeNextValueAsync(
+        binding,
+        working,
+        runtime,
+      );
+      mutated = true;
+    }
+  }
+
+  return { data: mutated ? working : data, mutated };
+}
diff --git a/formulus-formplayer/src/utils/autofocusHelpers.test.ts b/formulus-formplayer/src/utils/autofocusHelpers.test.ts
new file mode 100644
index 000000000..3473c3e14
--- /dev/null
+++ b/formulus-formplayer/src/utils/autofocusHelpers.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from 'vitest';
+import {
+  findAutoFocusPropertyPath,
+  controlWantsAutoFocus,
+} from './autofocusHelpers';
+
+describe('controlWantsAutoFocus', () => {
+  it('is false unless options.autoFocus is true', () => {
+    expect(controlWantsAutoFocus({ type: 'Control' })).toBe(false);
+    expect(
+      controlWantsAutoFocus({ type: 'Control', options: { autoFocus: false } }),
+    ).toBe(false);
+    expect(
+      controlWantsAutoFocus({ type: 'Control', options: { autoFocus: true } }),
+    ).toBe(true);
+  });
+});
+
+describe('findAutoFocusPropertyPath', () => {
+  it('returns the first Control with autoFocus on the page', () => {
+    const page = {
+      type: 'VerticalLayout',
+      elements: [
+        { type: 'Control', scope: '#/properties/foo' },
+        {
+          type: 'Control',
+          scope: '#/properties/bar',
+          options: { autoFocus: true },
+        },
+        {
+          type: 'Control',
+          scope: '#/properties/baz',
+          options: { autoFocus: true },
+        },
+      ],
+    };
+    expect(findAutoFocusPropertyPath(page)).toBe('bar');
+  });
+
+  it('walks nested layouts', () => {
+    const page = {
+      type: 'Group',
+      elements: [
+        {
+          type: 'VerticalLayout',
+          elements: [
+            {
+              type: 'Control',
+              scope: '#/properties/nested',
+              options: { autoFocus: true },
+            },
+          ],
+        },
+      ],
+    };
+    expect(findAutoFocusPropertyPath(page)).toBe('nested');
+  });
+});
diff --git a/formulus-formplayer/src/utils/autofocusHelpers.ts b/formulus-formplayer/src/utils/autofocusHelpers.ts
new file mode 100644
index 000000000..1a41324cb
--- /dev/null
+++ b/formulus-formplayer/src/utils/autofocusHelpers.ts
@@ -0,0 +1,94 @@
+/** Whether a Control ui schema opts into autofocus when its page is shown. */
+export function controlWantsAutoFocus(uischema: unknown): boolean {
+  if (!uischema || typeof uischema !== 'object') return false;
+  const options = (uischema as { options?: { autoFocus?: boolean } }).options;
+  return options?.autoFocus === true;
+}
+
+/** First property key on the current page with `options.autoFocus: true`. */
+export function findAutoFocusPropertyPath(
+  uischema: unknown,
+): string | undefined {
+  let found: string | undefined;
+
+  const walk = (node: unknown): void => {
+    if (found || !node || typeof node !== 'object') return;
+    const ui = node as {
+      type?: string;
+      scope?: string;
+      options?: { autoFocus?: boolean };
+      elements?: unknown[];
+    };
+
+    if (
+      ui.type === 'Control' &&
+      controlWantsAutoFocus(ui) &&
+      typeof ui.scope === 'string'
+    ) {
+      const match = /^#\/properties\/(.+)$/.exec(ui.scope);
+      if (match?.[1]) {
+        found = match[1];
+        return;
+      }
+    }
+
+    if (Array.isArray(ui.elements)) {
+      for (const child of ui.elements) {
+        walk(child);
+        if (found) return;
+      }
+    }
+  };
+
+  walk(uischema);
+  return found;
+}
+
+export function focusFieldInContainer(
+  container: HTMLElement,
+  propertyPath?: string,
+): boolean {
+  const marked = container.querySelector<HTMLElement>(
+    '[data-formplayer-autofocus="true"]',
+  );
+  if (marked && typeof marked.focus === 'function') {
+    try {
+      marked.focus({ preventScroll: true });
+    } catch {
+      marked.focus();
+    }
+    return true;
+  }
+
+  if (propertyPath) {
+    const byName = container.querySelector<HTMLElement>(
+      `input[name="${CSS.escape(propertyPath)}"], textarea[name="${CSS.escape(propertyPath)}"]`,
+    );
+    if (byName && typeof byName.focus === 'function') {
+      try {
+        byName.focus({ preventScroll: true });
+      } catch {
+        byName.focus();
+      }
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/** Focus first enabled text-like input on the screen. */
+export function focusFirstEnabledTextInput(
+  container: HTMLElement | null,
+): void {
+  if (!container) return;
+  const sel =
+    'input:not([disabled]):not([type="hidden"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="button"]):not([type="submit"]):not([type="reset"]),textarea:not([disabled])';
+  const el = container.querySelector<HTMLElement>(sel);
+  if (!el || typeof el.focus !== 'function') return;
+  try {
+    el.focus({ preventScroll: true });
+  } catch {
+    el.focus();
+  }
+}
diff --git a/formulus-formplayer/src/utils/errorPageNavigation.test.ts b/formulus-formplayer/src/utils/errorPageNavigation.test.ts
new file mode 100644
index 000000000..2a93b1cc0
--- /dev/null
+++ b/formulus-formplayer/src/utils/errorPageNavigation.test.ts
@@ -0,0 +1,115 @@
+import { describe, expect, it } from 'vitest';
+import {
+  findSwipePageIndexForInstancePath,
+  formatBlockingErrorSummary,
+  instancePathMatchesControlScope,
+  normalizeErrorInstancePath,
+  resolveErrorPageIndex,
+} from './errorPageNavigation';
+
+const nestedGroupLayout = {
+  type: 'SwipeLayout',
+  options: { headerFields: ['cama_num'] },
+  elements: [
+    {
+      type: 'Group',
+      label: 'Page 1',
+      elements: [
+        {
+          type: 'Control',
+          scope: '#/properties/validar_cama',
+          label: 'A cama é válida',
+        },
+      ],
+    },
+    {
+      type: 'Group',
+      label: 'Page 2',
+      elements: [
+        {
+          type: 'Control',
+          scope: '#/properties/viutenda',
+          label: 'Viu/tem tenda?',
+        },
+      ],
+    },
+    { type: 'Finalize' },
+  ],
+};
+
+describe('normalizeErrorInstancePath', () => {
+  it('converts custom validator JSON pointer paths', () => {
+    expect(normalizeErrorInstancePath('#/properties/validar_cama')).toBe(
+      '/validar_cama',
+    );
+  });
+
+  it('leaves AJV instance paths unchanged', () => {
+    expect(normalizeErrorInstancePath('/pessoas/0/sexo')).toBe(
+      '/pessoas/0/sexo',
+    );
+  });
+});
+
+describe('instancePathMatchesControlScope', () => {
+  it('matches root property scopes', () => {
+    expect(
+      instancePathMatchesControlScope(
+        '/validar_cama',
+        '#/properties/validar_cama',
+      ),
+    ).toBe(true);
+  });
+
+  it('matches nested array item scopes', () => {
+    expect(
+      instancePathMatchesControlScope(
+        '/pessoas/0/sexo',
+        '#/properties/pessoas/items/properties/sexo',
+      ),
+    ).toBe(true);
+  });
+});
+
+describe('findSwipePageIndexForInstancePath', () => {
+  const layouts = nestedGroupLayout.elements;
+
+  it('finds controls nested inside Group pages', () => {
+    expect(
+      findSwipePageIndexForInstancePath(layouts, '/validar_cama', []),
+    ).toBe(0);
+    expect(findSwipePageIndexForInstancePath(layouts, '/viutenda', [])).toBe(1);
+  });
+
+  it('routes header-only fields to the first content page', () => {
+    expect(
+      findSwipePageIndexForInstancePath(layouts, '/cama_num', ['cama_num']),
+    ).toBe(0);
+  });
+});
+
+describe('resolveErrorPageIndex', () => {
+  it('resolves page index from SwipeLayout uischema', () => {
+    expect(
+      resolveErrorPageIndex(nestedGroupLayout as never, '/validar_cama'),
+    ).toBe(0);
+  });
+});
+
+describe('formatBlockingErrorSummary', () => {
+  const schema = {
+    properties: {
+      validar_cama: { type: 'string', title: 'A cama é válida' },
+      viutenda: { type: 'string', title: 'Viu/tem tenda?' },
+    },
+  };
+
+  it('includes field titles in the alert copy', () => {
+    const message = formatBlockingErrorSummary(
+      [{ instancePath: '/validar_cama' }],
+      schema,
+    );
+    expect(message).toContain('A cama é válida');
+    expect(message).toContain('Tap Done to review');
+  });
+});
diff --git a/formulus-formplayer/src/utils/errorPageNavigation.ts b/formulus-formplayer/src/utils/errorPageNavigation.ts
new file mode 100644
index 000000000..333b41187
--- /dev/null
+++ b/formulus-formplayer/src/utils/errorPageNavigation.ts
@@ -0,0 +1,225 @@
+/**
+ * Map AJV / custom-validator instance paths to SwipeLayout page indices.
+ */
+
+import {
+  isControl,
+  type JsonSchema7,
+  type UISchemaElement,
+} from '@jsonforms/core';
+import type { BlockingValidationError } from './validationNavigation';
+
+function escapeRegex(segment: string): string {
+  return segment.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+/** `#/properties/a/items/properties/b` → regex matching `/a/0/b`. */
+export function scopeToInstancePathRegex(scope: string): RegExp | null {
+  if (!scope?.startsWith('#/')) return null;
+
+  const parts = scope.replace(/^#\//, '').split('/');
+  const segments: string[] = [];
+
+  for (const part of parts) {
+    if (part === 'properties') continue;
+    if (part === 'items') {
+      segments.push('\\d+');
+      continue;
+    }
+    segments.push(escapeRegex(part));
+  }
+
+  if (segments.length === 0) return null;
+  return new RegExp(`^/${segments.join('/')}(/|$)`);
+}
+
+/** Convert `#/properties/foo` or AJV `/foo` to a comparable instance path. */
+export function normalizeErrorInstancePath(path: string): string {
+  if (!path) return '';
+  if (path.startsWith('#/properties/')) {
+    const tail = path
+      .replace(/^#\/properties\//, '')
+      .replace(/\/items\/properties\//g, '/')
+      .replace(/\/items$/, '');
+    return `/${tail}`;
+  }
+  return path.startsWith('/') ? path : `/${path}`;
+}
+
+export function instancePathMatchesControlScope(
+  instancePath: string,
+  scope: string | undefined,
+): boolean {
+  if (!scope) return false;
+  const normalized = normalizeErrorInstancePath(instancePath);
+  const regex = scopeToInstancePathRegex(scope);
+  if (regex?.test(normalized)) return true;
+
+  const leaf = normalized.split('/').filter(Boolean).pop();
+  if (!leaf || /^\d+$/.test(leaf)) return false;
+  return scope.includes(leaf);
+}
+
+export function collectControlsInSubtree(
+  root: UISchemaElement,
+): Array<{ scope: string }> {
+  const controls: Array<{ scope: string }> = [];
+
+  function walk(el: UISchemaElement) {
+    if (isControl(el)) {
+      const scope = (el as { scope?: string }).scope;
+      if (scope) controls.push({ scope });
+      return;
+    }
+    const children = (el as { elements?: UISchemaElement[] }).elements;
+    if (!Array.isArray(children)) return;
+    for (const child of children) walk(child);
+  }
+
+  walk(root);
+  return controls;
+}
+
+export function getSwipeLayoutPages(
+  uischema: UISchemaElement | null | undefined,
+): { layouts: UISchemaElement[]; headerFields: string[] } {
+  if (!uischema) return { layouts: [], headerFields: [] };
+
+  const typed = uischema as {
+    type?: string;
+    elements?: UISchemaElement[];
+    options?: { headerFields?: string[] };
+  };
+
+  if (typed.type === 'SwipeLayout' && Array.isArray(typed.elements)) {
+    return {
+      layouts: typed.elements,
+      headerFields: (typed.options?.headerFields ?? []).slice(0, 2),
+    };
+  }
+
+  if (typed.type === 'Group') {
+    return { layouts: [uischema], headerFields: [] };
+  }
+
+  return { layouts: [], headerFields: [] };
+}
+
+/**
+ * Shallowest swipe page index containing a control for `instancePath`, or null.
+ */
+export function findSwipePageIndexForInstancePath(
+  layouts: UISchemaElement[],
+  instancePath: string,
+  headerFields: string[] = [],
+): number | null {
+  const normalized = normalizeErrorInstancePath(instancePath);
+  const topLevelField = normalized
+    .replace(/^\//, '')
+    .split('/')
+    .find(segment => segment && !/^\d+$/.test(segment));
+
+  if (topLevelField && headerFields.includes(topLevelField)) {
+    const firstContent = layouts.findIndex(
+      page => (page as { type?: string }).type !== 'Finalize',
+    );
+    return firstContent >= 0 ? firstContent : null;
+  }
+
+  for (let i = 0; i < layouts.length; i++) {
+    const page = layouts[i];
+    if ((page as { type?: string }).type === 'Finalize') continue;
+
+    const controls = collectControlsInSubtree(page);
+    if (
+      controls.some(({ scope }) =>
+        instancePathMatchesControlScope(normalized, scope),
+      )
+    ) {
+      return i;
+    }
+  }
+
+  return null;
+}
+
+export function resolveErrorPageIndex(
+  uischema: UISchemaElement | null | undefined,
+  errorPath: string,
+): number | null {
+  const { layouts, headerFields } = getSwipeLayoutPages(uischema);
+  if (layouts.length === 0) return null;
+  return findSwipePageIndexForInstancePath(layouts, errorPath, headerFields);
+}
+
+function titleAtSchemaPath(
+  schema: JsonSchema7 | undefined,
+  propertyPath: string[],
+): string | null {
+  if (!schema || propertyPath.length === 0) return null;
+
+  let current: JsonSchema7 | undefined = schema;
+  for (const part of propertyPath) {
+    if (!current) return null;
+    if (current.properties?.[part]) {
+      current = current.properties[part] as JsonSchema7;
+      continue;
+    }
+    if (current.items && typeof current.items === 'object') {
+      current = current.items as JsonSchema7;
+      if (current.properties?.[part]) {
+        current = current.properties[part] as JsonSchema7;
+        continue;
+      }
+    }
+    return part;
+  }
+
+  return (
+    (current as { title?: string })?.title ??
+    propertyPath[propertyPath.length - 1] ??
+    null
+  );
+}
+
+export function titleForErrorPath(
+  errorPath: string,
+  schema: JsonSchema7 | undefined,
+): string | null {
+  const normalized = normalizeErrorInstancePath(errorPath);
+  const propertyPath = normalized
+    .split('/')
+    .filter(segment => segment && !/^\d+$/.test(segment));
+  return titleAtSchemaPath(schema, propertyPath);
+}
+
+/** Human-readable summary for skipFinalize Done alert (field titles, not count only). */
+export function formatBlockingErrorSummary(
+  errors: ReadonlyArray<BlockingValidationError & { message?: string }>,
+  schema: JsonSchema7 | undefined,
+  maxTitles = 3,
+): string {
+  if (errors.length === 0) return '';
+
+  const titles: string[] = [];
+  for (const err of errors) {
+    const path =
+      err.instancePath ?? (typeof err.path === 'string' ? err.path : undefined);
+    const title = path ? titleForErrorPath(path, schema) : null;
+    const label = title || err.message;
+    if (label && !titles.includes(label)) titles.push(label);
+    if (titles.length >= maxTitles) break;
+  }
+
+  const remaining = errors.length - titles.length;
+  const joined = titles.join(', ');
+  const suffix = remaining > 0 ? ` (+${remaining} more)` : '';
+  const countPhrase =
+    errors.length === 1 ? '1 field needs' : `${errors.length} fields need`;
+
+  if (joined) {
+    return `${countPhrase} attention: ${joined}${suffix}. Tap Done to review.`;
+  }
+
+  return `${countPhrase} attention. Tap Done to review.`;
+}
diff --git a/formulus-formplayer/src/utils/formObservationData.ts b/formulus-formplayer/src/utils/formObservationData.ts
index 508473b5d..70fdb2cd0 100644
--- a/formulus-formplayer/src/utils/formObservationData.ts
+++ b/formulus-formplayer/src/utils/formObservationData.ts
@@ -167,3 +167,53 @@ export function dataMatchingSchemaRoot(
   }
   return out;
 }
+
+/** Coerce a single value to a JSON integer when schema expects integer / format int. */
+export function coerceSchemaIntegerValue(value: unknown): unknown {
+  if (value === undefined || value === null || value === '') return value;
+  if (typeof value === 'number' && Number.isInteger(value)) return value;
+  if (typeof value === 'string' && /^-?\d+$/.test(value.trim())) {
+    return parseInt(value.trim(), 10);
+  }
+  return value;
+}
+
+/**
+ * Coerce root-level integer fields copied via params / subObservationInitValues
+ * so AJV `type: integer` passes even when no Control runs format:int coercion.
+ */
+export function coerceSchemaRootIntegers(
+  data: FormObservationData,
+  formSchema: unknown,
+): FormObservationData {
+  const props = (formSchema as { properties?: unknown } | null)?.properties;
+  if (!props || typeof props !== 'object' || Array.isArray(props)) {
+    return { ...data };
+  }
+  const out: FormObservationData = { ...data };
+  for (const [key, prop] of Object.entries(props as Record<string, unknown>)) {
+    if (!Object.prototype.hasOwnProperty.call(out, key)) continue;
+    const schemaProp = prop as { type?: string; format?: string };
+    if (schemaProp.type === 'integer' || schemaProp.format === 'int') {
+      const coerced = coerceSchemaIntegerValue(out[key]);
+      if (coerced !== out[key]) {
+        out[key] = coerced;
+      }
+    }
+  }
+  return out;
+}
+
+/**
+ * Align observation JSON with schema root keys, then coerce integer fields.
+ */
+export function prepareRootObservationData(
+  data: FormObservationData,
+  formSchema: unknown,
+  extraRootKeys: string[] = ['locale'],
+): FormObservationData {
+  return coerceSchemaRootIntegers(
+    dataMatchingSchemaRoot(data, formSchema, extraRootKeys),
+    formSchema,
+  );
+}
diff --git a/formulus-formplayer/src/utils/formatControlErrors.test.ts b/formulus-formplayer/src/utils/formatControlErrors.test.ts
new file mode 100644
index 000000000..65513aa21
--- /dev/null
+++ b/formulus-formplayer/src/utils/formatControlErrors.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest';
+import { formatControlErrors } from './formatControlErrors';
+
+describe('formatControlErrors', () => {
+  it('returns null for empty input', () => {
+    expect(formatControlErrors(null)).toBeNull();
+    expect(formatControlErrors(undefined)).toBeNull();
+    expect(formatControlErrors('')).toBeNull();
+    expect(formatControlErrors([])).toBeNull();
+  });
+
+  it('joins string arrays', () => {
+    expect(formatControlErrors(['Required', 'Too short'])).toBe(
+      'Required, Too short',
+    );
+  });
+
+  it('stringifies scalar errors', () => {
+    expect(formatControlErrors('must have required property')).toBe(
+      'must have required property',
+    );
+  });
+});
diff --git a/formulus-formplayer/src/utils/formatControlErrors.ts b/formulus-formplayer/src/utils/formatControlErrors.ts
new file mode 100644
index 000000000..041cd918b
--- /dev/null
+++ b/formulus-formplayer/src/utils/formatControlErrors.ts
@@ -0,0 +1,11 @@
+/** Normalize JSON Forms `errors` for QuestionShell display. */
+export function formatControlErrors(
+  errors: string | string[] | undefined | null,
+): string | null {
+  if (!errors) return null;
+  if (Array.isArray(errors)) {
+    const joined = errors.filter(Boolean).join(', ');
+    return joined || null;
+  }
+  return String(errors) || null;
+}
diff --git a/formulus-formplayer/src/utils/keyboardScroll.test.ts b/formulus-formplayer/src/utils/keyboardScroll.test.ts
new file mode 100644
index 000000000..f06e36ef8
--- /dev/null
+++ b/formulus-formplayer/src/utils/keyboardScroll.test.ts
@@ -0,0 +1,125 @@
+// @vitest-environment jsdom
+import { describe, expect, it } from 'vitest';
+import {
+  clampScrollTop,
+  computeScrollDeltaForField,
+  isFieldObscuredInContainer,
+  revealFieldIfNeeded,
+} from './keyboardScroll';
+
+describe('isFieldObscuredInContainer', () => {
+  it('returns false when field is fully inside visible band', () => {
+    const container = { top: 0, bottom: 400 };
+    const field = { top: 100, bottom: 150 };
+    expect(isFieldObscuredInContainer(container, field)).toBe(false);
+  });
+
+  it('returns true when field bottom is below visible area', () => {
+    const container = { top: 0, bottom: 200 };
+    const field = { top: 150, bottom: 250 };
+    expect(isFieldObscuredInContainer(container, field)).toBe(true);
+  });
+
+  it('returns true when field top is above visible area', () => {
+    const container = { top: 100, bottom: 400 };
+    const field = { top: 50, bottom: 120 };
+    expect(isFieldObscuredInContainer(container, field)).toBe(true);
+  });
+});
+
+describe('computeScrollDeltaForField', () => {
+  it('returns positive delta when field extends below container', () => {
+    const container = { top: 0, bottom: 200 };
+    const field = { top: 150, bottom: 230 };
+    expect(computeScrollDeltaForField(container, field, 8, 16)).toBe(46);
+  });
+
+  it('returns negative delta when field extends above container', () => {
+    const container = { top: 100, bottom: 400 };
+    const field = { top: 90, bottom: 150 };
+    expect(computeScrollDeltaForField(container, field, 8, 16)).toBe(-18);
+  });
+
+  it('returns zero when field is visible', () => {
+    const container = { top: 0, bottom: 300 };
+    const field = { top: 50, bottom: 100 };
+    expect(computeScrollDeltaForField(container, field)).toBe(0);
+  });
+});
+
+describe('revealFieldIfNeeded', () => {
+  it('does not scroll when field is already visible', () => {
+    const container = document.createElement('div');
+    Object.defineProperty(container, 'scrollTop', { value: 0, writable: true });
+    Object.defineProperty(container, 'scrollHeight', { value: 500 });
+    Object.defineProperty(container, 'clientHeight', { value: 300 });
+    container.getBoundingClientRect = () =>
+      ({
+        top: 0,
+        bottom: 300,
+        left: 0,
+        right: 100,
+        width: 100,
+        height: 300,
+      }) as DOMRect;
+
+    const field = document.createElement('input');
+    container.appendChild(field);
+    field.getBoundingClientRect = () =>
+      ({
+        top: 50,
+        bottom: 80,
+        left: 0,
+        right: 100,
+        width: 100,
+        height: 30,
+      }) as DOMRect;
+
+    const changed = revealFieldIfNeeded(container, field);
+    expect(changed).toBe(false);
+    expect(container.scrollTop).toBe(0);
+  });
+
+  it('scrolls down when field bottom is below container', () => {
+    const container = document.createElement('div');
+    let scrollTop = 0;
+    Object.defineProperty(container, 'scrollTop', {
+      get: () => scrollTop,
+      set: (v: number) => {
+        scrollTop = v;
+      },
+    });
+    Object.defineProperty(container, 'scrollHeight', { value: 800 });
+    Object.defineProperty(container, 'clientHeight', { value: 300 });
+    container.getBoundingClientRect = () =>
+      ({
+        top: 0,
+        bottom: 300,
+        left: 0,
+        right: 100,
+        width: 100,
+        height: 300,
+      }) as DOMRect;
+
+    const field = document.createElement('input');
+    container.appendChild(field);
+    field.getBoundingClientRect = () =>
+      ({
+        top: 250,
+        bottom: 320,
+        left: 0,
+        right: 100,
+        width: 100,
+        height: 70,
+      }) as DOMRect;
+
+    const changed = revealFieldIfNeeded(container, field, {
+      marginBottom: 16,
+      marginTop: 8,
+    });
+    expect(changed).toBe(true);
+    expect(scrollTop).toBeGreaterThan(0);
+    clampScrollTop(container);
+    expect(scrollTop).toBeLessThanOrEqual(500);
+  });
+});
diff --git a/formulus-formplayer/src/utils/keyboardScroll.ts b/formulus-formplayer/src/utils/keyboardScroll.ts
new file mode 100644
index 000000000..9da148575
--- /dev/null
+++ b/formulus-formplayer/src/utils/keyboardScroll.ts
@@ -0,0 +1,101 @@
+/** DOM rect subset used for scroll calculations. */
+export interface FieldRect {
+  top: number;
+  bottom: number;
+}
+
+/** Prevent scrolling past the last real content row inside the form scroll area. */
+export function clampScrollTop(el: HTMLElement): void {
+  const max = Math.max(0, el.scrollHeight - el.clientHeight);
+  if (el.scrollTop > max) {
+    el.scrollTop = max;
+  }
+}
+
+/**
+ * True when the field is not fully visible inside the scroll container's client
+ * area (with optional margins for sticky header / nav bar).
+ */
+export function isFieldObscuredInContainer(
+  containerRect: FieldRect & { height?: number },
+  fieldRect: FieldRect,
+  marginTop = 8,
+  marginBottom = 16,
+): boolean {
+  const visibleTop = containerRect.top + marginTop;
+  const visibleBottom =
+    containerRect.bottom !== undefined
+      ? containerRect.bottom - marginBottom
+      : containerRect.top + (containerRect.height ?? 0) - marginBottom;
+
+  return fieldRect.bottom > visibleBottom || fieldRect.top < visibleTop;
+}
+
+/**
+ * Minimal scroll delta (px) to bring `fieldRect` into the container's visible band.
+ * Positive = scroll down, negative = scroll up. Zero when already visible.
+ */
+export function computeScrollDeltaForField(
+  containerRect: FieldRect,
+  fieldRect: FieldRect,
+  marginTop = 8,
+  marginBottom = 16,
+): number {
+  const visibleTop = containerRect.top + marginTop;
+  const visibleBottom = containerRect.bottom - marginBottom;
+
+  if (fieldRect.bottom > visibleBottom) {
+    return fieldRect.bottom - visibleBottom;
+  }
+  if (fieldRect.top < visibleTop) {
+    return fieldRect.top - visibleTop;
+  }
+  return 0;
+}
+
+export interface RevealFieldOptions {
+  marginTop?: number;
+  marginBottom?: number;
+}
+
+/**
+ * Scroll the container only enough to reveal `field` when obscured.
+ * Uses manual scrollTop adjustment (not scrollIntoView) to avoid WebView gaps.
+ * @returns true when scroll position changed
+ */
+export function revealFieldIfNeeded(
+  container: HTMLElement,
+  field: HTMLElement,
+  options: RevealFieldOptions = {},
+): boolean {
+  const marginTop = options.marginTop ?? 8;
+  const marginBottom = options.marginBottom ?? 16;
+
+  const containerRect = container.getBoundingClientRect();
+  const fieldRect = field.getBoundingClientRect();
+
+  if (
+    !isFieldObscuredInContainer(
+      containerRect,
+      fieldRect,
+      marginTop,
+      marginBottom,
+    )
+  ) {
+    return false;
+  }
+
+  const delta = computeScrollDeltaForField(
+    containerRect,
+    fieldRect,
+    marginTop,
+    marginBottom,
+  );
+
+  if (delta !== 0) {
+    container.scrollTop += delta;
+  }
+
+  clampScrollTop(container);
+  return delta !== 0;
+}
diff --git a/formulus-formplayer/src/utils/validationNavigation.test.ts b/formulus-formplayer/src/utils/validationNavigation.test.ts
new file mode 100644
index 000000000..1123decbb
--- /dev/null
+++ b/formulus-formplayer/src/utils/validationNavigation.test.ts
@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest';
+import {
+  coerceSchemaIntegerValue,
+  coerceSchemaRootIntegers,
+  prepareRootObservationData,
+} from './formObservationData';
+import { firstBlockingErrorInstancePath } from './validationNavigation';
+
+describe('coerceSchemaIntegerValue', () => {
+  it('coerces numeric strings to integers', () => {
+    expect(coerceSchemaIntegerValue('5')).toBe(5);
+    expect(coerceSchemaIntegerValue(5)).toBe(5);
+  });
+
+  it('leaves non-integer values unchanged', () => {
+    expect(coerceSchemaIntegerValue('')).toBe('');
+    expect(coerceSchemaIntegerValue('1.5')).toBe('1.5');
+  });
+});
+
+describe('coerceSchemaRootIntegers', () => {
+  it('coerces integer schema properties including format int', () => {
+    const schema = {
+      properties: {
+        quarto_num: { type: 'integer' },
+        cama_num: { type: 'integer', format: 'int' },
+        af: { type: 'string' },
+      },
+    };
+    const data = { quarto_num: '2', cama_num: '3', af: 'A1' };
+    expect(coerceSchemaRootIntegers(data, schema)).toEqual({
+      quarto_num: 2,
+      cama_num: 3,
+      af: 'A1',
+    });
+  });
+});
+
+describe('prepareRootObservationData', () => {
+  it('strips non-schema keys and coerces integers', () => {
+    const schema = {
+      properties: {
+        quarto_num: { type: 'integer' },
+      },
+    };
+    expect(
+      prepareRootObservationData({ quarto_num: '1', theme: 'dark' }, schema),
+    ).toEqual({ quarto_num: 1 });
+  });
+});
+
+describe('firstBlockingErrorInstancePath', () => {
+  it('prefers instancePath from JSON Forms errors', () => {
+    expect(
+      firstBlockingErrorInstancePath([{ instancePath: '/quarto_num' }]),
+    ).toBe('/quarto_num');
+  });
+
+  it('falls back to custom validator path', () => {
+    expect(
+      firstBlockingErrorInstancePath([{ path: '#/properties/validar_cama' }]),
+    ).toBe('#/properties/validar_cama');
+  });
+});
diff --git a/formulus-formplayer/src/utils/validationNavigation.ts b/formulus-formplayer/src/utils/validationNavigation.ts
new file mode 100644
index 000000000..cc482e477
--- /dev/null
+++ b/formulus-formplayer/src/utils/validationNavigation.ts
@@ -0,0 +1,36 @@
+/**
+ * Helpers for surfacing validation errors on SwipeLayout Done / Finalize actions.
+ */
+
+export type BlockingValidationError = {
+  instancePath?: string;
+  schemaPath?: string;
+  path?: string;
+};
+
+export function firstBlockingErrorInstancePath(
+  errors: ReadonlyArray<BlockingValidationError>,
+): string | null {
+  const first = errors[0];
+  if (!first) return null;
+  if (first.instancePath) return first.instancePath;
+  if (typeof first.path === 'string' && first.path.length > 0) {
+    return first.path;
+  }
+  return null;
+}
+
+/** Switch to ValidateAndShow and jump to the first blocking field when possible. */
+export function navigateToFirstBlockingError(
+  errors: ReadonlyArray<BlockingValidationError>,
+): void {
+  window.dispatchEvent(new CustomEvent('formShowValidation'));
+  const instancePath = firstBlockingErrorInstancePath(errors);
+  if (instancePath) {
+    window.dispatchEvent(
+      new CustomEvent('navigateToError', {
+        detail: { path: instancePath },
+      }),
+    );
+  }
+}
diff --git a/formulus-formplayer/vite.config.ts b/formulus-formplayer/vite.config.ts
index 002ceea53..043c3525c 100644
--- a/formulus-formplayer/vite.config.ts
+++ b/formulus-formplayer/vite.config.ts
@@ -75,5 +75,6 @@ export default defineConfig({
 
   test: {
     environment: 'node',
+    setupFiles: ['./src/setupTests.ts'],
   },
 });
diff --git a/formulus/AGENTS.md b/formulus/AGENTS.md
index 1684495ab..f6fee055c 100644
--- a/formulus/AGENTS.md
+++ b/formulus/AGENTS.md
@@ -6,6 +6,8 @@
 
 **User-facing docs:** [Formulus](https://opendataensemble.org/docs/reference/formulus) on [opendataensemble.org](https://opendataensemble.org/).
 
+**Release version bumps:** see [../AGENTS.md#release-version-bump-checklist](../AGENTS.md#release-version-bump-checklist) (Formulus `package.json`, Android `versionCode`, iOS, `pnpm run sync:version`).
+
 ---
 
 ## What this package is
@@ -53,6 +55,8 @@ From **`formulus/`**:
 
 ```bash
 pnpm run lint
+pnpm run format
+pnpm run format:check
 pnpm run test --ci --watchAll=false
 ```
 
diff --git a/formulus/App.tsx b/formulus/App.tsx
index db38f8280..58fdafba2 100644
--- a/formulus/App.tsx
+++ b/formulus/App.tsx
@@ -20,6 +20,7 @@ import FormplayerModal, {
   FormplayerModalHandle,
 } from './src/components/FormplayerModal';
 import QRScannerModal from './src/components/QRScannerModal';
+import { qrcodeRequestCoordinator } from './src/services/QrcodeRequestCoordinator';
 import SignatureCaptureModal from './src/components/SignatureCaptureModal';
 import MainAppNavigator from './src/navigation/MainAppNavigator';
 import { FormInitData } from './src/webview/FormulusInterfaceDefinition.ts';
@@ -286,6 +287,7 @@ function AppInner(): React.JSX.Element {
       <QRScannerModal
         visible={qrScannerVisible}
         onClose={() => {
+          qrcodeRequestCoordinator.cancel(qrScannerData?.fieldId);
           setQrScannerVisible(false);
           setQrScannerData(null);
         }}
diff --git a/formulus/Gemfile b/formulus/Gemfile
index 842b34a9a..e6ce68ea6 100644
--- a/formulus/Gemfile
+++ b/formulus/Gemfile
@@ -7,7 +7,7 @@ ruby ">= 2.6.10"
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
 gem 'xcodeproj', '< 1.26.0'
-gem 'concurrent-ruby', '< 1.3.7'
+gem 'concurrent-ruby', '< 1.3.8'
 
 # Ruby 3.4.0 has removed some libraries from the standard library.
 gem 'bigdecimal'
diff --git a/formulus/android/app/build.gradle b/formulus/android/app/build.gradle
index b4f6cda43..1903aca30 100644
--- a/formulus/android/app/build.gradle
+++ b/formulus/android/app/build.gradle
@@ -103,8 +103,8 @@ android {
         applicationId = "org.opendataensemble.formulus"
         minSdk = rootProject.ext.minSdkVersion
         targetSdk = rootProject.ext.targetSdkVersion
-        versionCode = 4
-        versionName = "1.1.0"
+        versionCode = 14
+        versionName = "1.1.1"
 
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", (findProperty("newArchEnabled") ?: "false").toString()
 
diff --git a/formulus/assets/webview/FormulusInjectionScript.js b/formulus/assets/webview/FormulusInjectionScript.js
index e4453f216..5c071dd1e 100644
--- a/formulus/assets/webview/FormulusInjectionScript.js
+++ b/formulus/assets/webview/FormulusInjectionScript.js
@@ -1,51 +1,38 @@
 // Auto-generated from FormulusInterfaceDefinition.ts
 // Do not edit directly - this file will be overwritten
-// Last generated: 2026-05-16T12:40:22.983Z
+// Last generated: 2026-06-19T16:58:11.324Z
 
-(function () {
+(function() {
   // Enhanced API availability detection and recovery
   function getFormulus() {
     // Check multiple locations where the API might exist
-    return (
-      globalThis.formulus ||
-      (typeof window !== 'undefined' ? window.formulus : undefined)
-    );
+    return globalThis.formulus || (typeof window !== 'undefined' ? window.formulus : undefined);
   }
 
   function isFormulusAvailable() {
     const api = getFormulus();
-    return (
-      api && typeof api === 'object' && typeof api.getVersion === 'function'
-    );
+    return api && typeof api === 'object' && typeof api.getVersion === 'function';
   }
 
   // Idempotent guard to avoid double-initialization when scripts are reinjected
-  if (globalThis.__formulusBridgeInitialized) {
+  if ((globalThis).__formulusBridgeInitialized) {
     if (isFormulusAvailable()) {
-      console.debug(
-        'Formulus bridge already initialized and functional. Skipping duplicate injection.',
-      );
+      console.debug('Formulus bridge already initialized and functional. Skipping duplicate injection.');
       return;
     } else {
-      console.warn(
-        'Formulus bridge flag is set but API is not functional. Proceeding with re-injection...',
-      );
+      console.warn('Formulus bridge flag is set but API is not functional. Proceeding with re-injection...');
     }
   }
 
   // If API already exists and is functional, skip injection
   if (isFormulusAvailable()) {
-    console.debug(
-      'Formulus interface already exists and is functional. Skipping injection.',
-    );
+    console.debug('Formulus interface already exists and is functional. Skipping injection.');
     return;
   }
 
   // If API exists but is not functional, log warning and proceed with re-injection
   if (getFormulus()) {
-    console.warn(
-      'Formulus interface exists but appears non-functional. Re-injecting...',
-    );
+    console.warn('Formulus interface exists but appears non-functional. Re-injecting...');
   }
 
   // Helper function to handle callbacks
@@ -61,7 +48,7 @@
 
   // Initialize callbacks
   const callbacks = {};
-
+  
   // Global function to handle responses from React Native
   function handleMessage(event) {
     try {
@@ -74,1829 +61,1625 @@
         // console.warn('Global handleMessage: Received message with unexpected data type:', typeof event.data, event.data);
         return; // Or handle error, but for now, just return to avoid breaking others.
       }
-
+      
       // Handle callbacks
-      if (
-        data.type === 'callback' &&
-        data.callbackId &&
-        callbacks[data.callbackId]
-      ) {
+      if (data.type === 'callback' && data.callbackId && callbacks[data.callbackId]) {
         handleCallback(callbacks[data.callbackId], data.data);
         delete callbacks[data.callbackId];
       }
-
+      
       // Handle specific callbacks
-
-      if (
-        data.type === 'onFormulusReady' &&
-        globalThis.formulusCallbacks?.onFormulusReady
-      ) {
+      
+      
+      if (data.type === 'onFormulusReady' && globalThis.formulusCallbacks?.onFormulusReady) {
         handleCallback(globalThis.formulusCallbacks.onFormulusReady);
       }
     } catch (e) {
-      console.error(
-        'Global handleMessage: Error processing message:',
-        e,
-        'Raw event.data:',
-        event.data,
-      );
+      console.error('Global handleMessage: Error processing message:', e, 'Raw event.data:', event.data);
     }
   }
-
+  
   // Set up message listener
   document.addEventListener('message', handleMessage);
   window.addEventListener('message', handleMessage);
 
   // Initialize the formulus interface
   globalThis.formulus = {
-    // getVersion:  => Promise<string>
-    getVersion: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getVersion callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getVersion callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getVersion_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+        // getVersion:  => Promise<string>
+        getVersion: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getVersion callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getVersion callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getVersion_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getVersion' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getVersion' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getVersion',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // getAvailableForms:  => Promise<FormInfo[]>
-    getAvailableForms: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getAvailableForms callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getAvailableForms callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getAvailableForms_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // getAvailableForms:  => Promise<FormInfo[]>
+        getAvailableForms: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getAvailableForms callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getAvailableForms callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getAvailableForms_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getAvailableForms' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getAvailableForms' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getAvailableForms',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // openFormplayer: formType: string, params: Record<string, unknown>, savedData: Record<string, unknown>, options: { subObservationMode?: boolean; } => Promise<FormCompletionResult>
-    openFormplayer: function (formType, params, savedData, options) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('openFormplayer callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'openFormplayer callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'openFormplayer_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // openFormplayer: formType: string, params: Record<string, unknown>, savedData: Record<string, unknown>, options: { subObservationMode?: boolean; skipFinalize?: boolean; skipDraftSelection?: boolean; observationId?: string; } => Promise<FormCompletionResult>
+        openFormplayer: function(formType, params, savedData, options) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('openFormplayer callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('openFormplayer callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'openFormplayer_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'openFormplayer' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'openFormplayer' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'openFormplayer',
             messageId,
-            formType: formType,
+                        formType: formType,
             params: params,
             savedData: savedData,
-            options: options,
-          }),
-        );
-      });
-    },
-
-    // getObservations: formType: string, isDraft: boolean, includeDeleted: boolean => Promise<FormObservation[]>
-    getObservations: function (formType, isDraft, includeDeleted) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getObservations callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getObservations callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getObservations_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            options: options
+          }));
+          
+          });
+        },
+
+        // getObservations: formType: string, isDraft: boolean, includeDeleted: boolean => Promise<FormObservation[]>
+        getObservations: function(formType, isDraft, includeDeleted) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getObservations callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getObservations callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'getObservations_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'getObservations' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getObservations' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getObservations',
             messageId,
-            formType: formType,
+                        formType: formType,
             isDraft: isDraft,
-            includeDeleted: includeDeleted,
-          }),
-        );
-      });
-    },
-
-    // getObservationsByQuery: options: { formType: string; isDraft?: boolean; includeDeleted?: boolean; filter?: ObservationFilter; whereClause?: string; } => Promise<FormObservation[]>
-    getObservationsByQuery: function (options) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getObservationsByQuery callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getObservationsByQuery callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getObservationsByQuery_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            includeDeleted: includeDeleted
+          }));
+          
+          });
+        },
+
+        // getObservationsByQuery: options: { formType: string; isDraft?: boolean; includeDeleted?: boolean; filter?: ObservationFilter; whereClause?: string; } => Promise<FormObservation[]>
+        getObservationsByQuery: function(options) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getObservationsByQuery callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getObservationsByQuery callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getObservationsByQuery_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getObservationsByQuery' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getObservationsByQuery' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getObservationsByQuery',
             messageId,
-            options: options,
-          }),
-        );
-      });
-    },
-
-    // submitObservation: formType: string, finalData: Record<string, unknown> => Promise<string>
-    submitObservation: function (formType, finalData) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('submitObservation callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'submitObservation callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'submitObservation_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        options: options
+          }));
+          
+          });
+        },
+
+        // submitObservation: formType: string, finalData: Record<string, unknown> => Promise<string>
+        submitObservation: function(formType, finalData) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('submitObservation callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('submitObservation callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'submitObservation_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'submitObservation' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'submitObservation' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'submitObservation',
             messageId,
-            formType: formType,
-            finalData: finalData,
-          }),
-        );
-      });
-    },
-
-    // updateObservation: observationId: string, formType: string, finalData: Record<string, unknown> => Promise<string>
-    updateObservation: function (observationId, formType, finalData) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('updateObservation callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'updateObservation callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'updateObservation_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        formType: formType,
+            finalData: finalData
+          }));
+          
+          });
+        },
+
+        // updateObservation: observationId: string, formType: string, finalData: Record<string, unknown> => Promise<string>
+        updateObservation: function(observationId, formType, finalData) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('updateObservation callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('updateObservation callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'updateObservation_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'updateObservation' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'updateObservation' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'updateObservation',
             messageId,
-            observationId: observationId,
+                        observationId: observationId,
             formType: formType,
-            finalData: finalData,
-          }),
-        );
-      });
-    },
-
-    // requestCamera: fieldId: string => Promise<CameraResult>
-    requestCamera: function (fieldId) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestCamera callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestCamera callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestCamera_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            finalData: finalData
+          }));
+          
+          });
+        },
+
+        // requestCamera: fieldId: string => Promise<CameraResult>
+        requestCamera: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestCamera callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestCamera callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'requestCamera_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'requestCamera' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestCamera' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestCamera',
             messageId,
-            fieldId: fieldId,
-          }),
-        );
-      });
-    },
-
-    // requestLocation: fieldId: string => Promise<LocationResult>
-    requestLocation: function (fieldId) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestLocation callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestLocation_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // requestLocation: fieldId: string => Promise<LocationResult>
+        requestLocation: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestLocation callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'requestLocation_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'requestLocation' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestLocation' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestLocation',
             messageId,
-            fieldId: fieldId,
-          }),
-        );
-      });
-    },
-
-    // requestFile: fieldId: string => Promise<FileResult>
-    requestFile: function (fieldId) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestFile callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestFile callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // getCachedLocation: fieldId: string => Promise<LocationResult>
+        getCachedLocation: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
+              } else {
+                // console.warn('getCachedLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getCachedLocation callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getCachedLocation_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'getCachedLocation' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-            if (
-              data.type === 'requestFile_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+            type: 'getCachedLocation',
+            messageId,
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // allocateSequence: scopeKey: string, options: { startAt?: number; peek?: boolean; } => Promise<number>
+        allocateSequence: function(scopeKey, options) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('allocateSequence callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('allocateSequence callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'allocateSequence_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'allocateSequence' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestFile' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
-            type: 'requestFile',
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+            type: 'allocateSequence',
             messageId,
-            fieldId: fieldId,
-          }),
-        );
-      });
-    },
-
-    // launchIntent: fieldId: string, intentSpec: Record<string, unknown> => Promise<void>
-    launchIntent: function (fieldId, intentSpec) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('launchIntent callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'launchIntent callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
+                        scopeKey: scopeKey,
+            options: options
+          }));
+          
+          });
+        },
+
+        // watchLocation: fieldId: string => Promise<{ status: "started" | "error"; message?: string; }>
+        watchLocation: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
+              } else {
+                // console.warn('watchLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('watchLocation callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'watchLocation_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'watchLocation' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-            if (
-              data.type === 'launchIntent_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+            type: 'watchLocation',
+            messageId,
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // stopWatchLocation: fieldId: string => Promise<void>
+        stopWatchLocation: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('stopWatchLocation callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('stopWatchLocation callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'stopWatchLocation_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'stopWatchLocation' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'launchIntent' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
-            type: 'launchIntent',
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+            type: 'stopWatchLocation',
             messageId,
-            fieldId: fieldId,
-            intentSpec: intentSpec,
-          }),
-        );
-      });
-    },
-
-    // callSubform: fieldId: string, formType: string, options: Record<string, unknown> => Promise<void>
-    callSubform: function (fieldId, formType, options) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('callSubform callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'callSubform callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // requestFile: fieldId: string => Promise<FileResult>
+        requestFile: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
+              } else {
+                // console.warn('requestFile callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestFile callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'requestFile_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'requestFile' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-            if (
-              data.type === 'callSubform_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+            type: 'requestFile',
+            messageId,
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // launchIntent: fieldId: string, intentSpec: Record<string, unknown> => Promise<void>
+        launchIntent: function(fieldId, intentSpec) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('launchIntent callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('launchIntent callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'launchIntent_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'launchIntent' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'callSubform' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+            type: 'launchIntent',
+            messageId,
+                        fieldId: fieldId,
+            intentSpec: intentSpec
+          }));
+          
+          });
+        },
+
+        // callSubform: fieldId: string, formType: string, options: Record<string, unknown> => Promise<void>
+        callSubform: function(fieldId, formType, options) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
+              } else {
+                // console.warn('callSubform callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('callSubform callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'callSubform_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'callSubform' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
+            }
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'callSubform',
             messageId,
-            fieldId: fieldId,
+                        fieldId: fieldId,
             formType: formType,
-            options: options,
-          }),
-        );
-      });
-    },
-
-    // requestAudio: fieldId: string => Promise<AudioResult>
-    requestAudio: function (fieldId) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestAudio callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestAudio callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestAudio_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            options: options
+          }));
+          
+          });
+        },
+
+        // requestAudio: fieldId: string => Promise<AudioResult>
+        requestAudio: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestAudio callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestAudio callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'requestAudio_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'requestAudio' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestAudio' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestAudio',
             messageId,
-            fieldId: fieldId,
-          }),
-        );
-      });
-    },
-
-    // requestVideo: fieldId: string => Promise<VideoResult>
-    requestVideo: function (fieldId) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestVideo callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestVideo callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestVideo_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // requestVideo: fieldId: string => Promise<VideoResult>
+        requestVideo: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestVideo callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestVideo callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'requestVideo_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'requestVideo' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestVideo' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestVideo',
             messageId,
-            fieldId: fieldId,
-          }),
-        );
-      });
-    },
-
-    // requestQrcode: fieldId: string => Promise<QrcodeResult>
-    requestQrcode: function (fieldId) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestQrcode callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestQrcode callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestQrcode_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // requestQrcode: fieldId: string => Promise<QrcodeResult>
+        requestQrcode: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestQrcode callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestQrcode callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'requestQrcode_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'requestQrcode' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestQrcode' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestQrcode',
             messageId,
-            fieldId: fieldId,
-          }),
-        );
-      });
-    },
-
-    // requestBiometric: fieldId: string => Promise<void>
-    requestBiometric: function (fieldId) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestBiometric callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestBiometric callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestBiometric_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // requestBiometric: fieldId: string => Promise<void>
+        requestBiometric: function(fieldId) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestBiometric callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestBiometric callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'requestBiometric_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'requestBiometric' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestBiometric' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestBiometric',
             messageId,
-            fieldId: fieldId,
-          }),
-        );
-      });
-    },
-
-    // requestConnectivityStatus:  => Promise<void>
-    requestConnectivityStatus: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestConnectivityStatus callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestConnectivityStatus callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestConnectivityStatus_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        fieldId: fieldId
+          }));
+          
+          });
+        },
+
+        // requestConnectivityStatus:  => Promise<void>
+        requestConnectivityStatus: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestConnectivityStatus callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestConnectivityStatus callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'requestConnectivityStatus_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'requestConnectivityStatus' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestConnectivityStatus' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestConnectivityStatus',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // requestSyncStatus:  => Promise<void>
-    requestSyncStatus: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('requestSyncStatus callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'requestSyncStatus callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'requestSyncStatus_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // requestSyncStatus:  => Promise<void>
+        requestSyncStatus: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('requestSyncStatus callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('requestSyncStatus callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'requestSyncStatus_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'requestSyncStatus' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'requestSyncStatus' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'requestSyncStatus',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // runLocalModel: fieldId: string, modelId: string, input: Record<string, unknown> => Promise<void>
-    runLocalModel: function (fieldId, modelId, input) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('runLocalModel callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'runLocalModel callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'runLocalModel_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // runLocalModel: fieldId: string, modelId: string, input: Record<string, unknown> => Promise<void>
+        runLocalModel: function(fieldId, modelId, input) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('runLocalModel callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('runLocalModel callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'runLocalModel_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'runLocalModel' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'runLocalModel' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'runLocalModel',
             messageId,
-            fieldId: fieldId,
+                        fieldId: fieldId,
             modelId: modelId,
-            input: input,
-          }),
-        );
-      });
-    },
-
-    // getCurrentUser:  => Promise<{ username: string; displayName?: string; role?: "read-only" | "read-write" | "admin"; }>
-    getCurrentUser: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getCurrentUser callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getCurrentUser callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getCurrentUser_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            input: input
+          }));
+          
+          });
+        },
+
+        // getCurrentUser:  => Promise<{ username: string; displayName?: string; role?: "read-only" | "read-write" | "admin"; }>
+        getCurrentUser: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getCurrentUser callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getCurrentUser callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'getCurrentUser_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'getCurrentUser' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getCurrentUser' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getCurrentUser',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // getThemeMode:  => Promise<"light" | "dark" | "system">
-    getThemeMode: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getThemeMode callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getThemeMode callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getThemeMode_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // getThemeMode:  => Promise<"light" | "dark" | "system">
+        getThemeMode: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getThemeMode callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getThemeMode callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'getThemeMode_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'getThemeMode' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getThemeMode' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getThemeMode',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // getAttachmentUri: fileName: string | AttachmentDisplayDescriptor => Promise<string>
-    getAttachmentUri: function (fileName) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getAttachmentUri callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getAttachmentUri callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getAttachmentUri_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // getAttachmentUri: fileName: string | AttachmentDisplayDescriptor => Promise<string>
+        getAttachmentUri: function(fileName) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getAttachmentUri callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getAttachmentUri callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getAttachmentUri_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getAttachmentUri' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getAttachmentUri' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getAttachmentUri',
             messageId,
-            fileName: fileName,
-          }),
-        );
-      });
-    },
-
-    // getAttachmentsUri:  => Promise<string>
-    getAttachmentsUri: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getAttachmentsUri callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getAttachmentsUri callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getAttachmentsUri_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        fileName: fileName
+          }));
+          
+          });
+        },
+
+        // getAttachmentsUri:  => Promise<string>
+        getAttachmentsUri: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getAttachmentsUri callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getAttachmentsUri callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getAttachmentsUri_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getAttachmentsUri' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getAttachmentsUri' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getAttachmentsUri',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // getCustomAppUri:  => Promise<string>
-    getCustomAppUri: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getCustomAppUri callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getCustomAppUri callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getCustomAppUri_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // getCustomAppUri:  => Promise<string>
+        getCustomAppUri: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getCustomAppUri callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getCustomAppUri callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getCustomAppUri_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getCustomAppUri' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getCustomAppUri' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getCustomAppUri',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // getFormSpecsUri:  => Promise<string>
-    getFormSpecsUri: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        // Add response handler for methods that return values
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              // console.warn('getFormSpecsUri callback: Received response with unexpected data type:', typeof event.data, event.data);
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getFormSpecsUri callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getFormSpecsUri_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // getFormSpecsUri:  => Promise<string>
+        getFormSpecsUri: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getFormSpecsUri callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getFormSpecsUri callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getFormSpecsUri_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getFormSpecsUri' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getFormSpecsUri' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getFormSpecsUri',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // persistObservation: input: PersistObservationInput => Promise<PersistObservationResult>
-    persistObservation: function (input) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'persistObservation callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'persistObservation_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // persistObservation: input: PersistObservationInput => Promise<PersistObservationResult>
+        persistObservation: function(input) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('persistObservation callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('persistObservation callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'persistObservation_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'persistObservation' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'persistObservation' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'persistObservation',
             messageId,
-            input: input,
-          }),
-        );
-      });
-    },
-
-    // sync: options: { includeAttachments?: boolean } => Promise<SyncResult>
-    sync: function (options) {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'sync callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (data.type === 'sync_response' && data.messageId === messageId) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        input: input
+          }));
+          
+          });
+        },
+
+        // sync: options: { includeAttachments?: boolean; } => Promise<SyncResult>
+        sync: function(options) {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('sync callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('sync callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
               }
+              if (data.type === 'sync_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
+              }
+            } catch (e) {
+              console.error("'sync' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'sync' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'sync',
             messageId,
-            options: options,
-          }),
-        );
-      });
-    },
-
-    // getConnectivityStatus:  => Promise<ConnectivityStatus>
-    getConnectivityStatus: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data; // Already an object
-            } else {
-              window.removeEventListener('message', callback); // Clean up listener
-              reject(
-                new Error(
-                  'getConnectivityStatus callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getConnectivityStatus_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+                        options: options
+          }));
+          
+          });
+        },
+
+        // getConnectivityStatus:  => Promise<ConnectivityStatus>
+        getConnectivityStatus: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getConnectivityStatus callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getConnectivityStatus callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getConnectivityStatus_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getConnectivityStatus' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getConnectivityStatus' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback); // Ensure listener is removed on error too
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        // Send the message to React Native
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getConnectivityStatus',
             messageId,
-          }),
-        );
-      });
-    },
-
-    // getCurrentDataRevisionCount:  => Promise<number>
-    getCurrentDataRevisionCount: function () {
-      return new Promise((resolve, reject) => {
-        const messageId =
-          'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
-
-        const callback = event => {
-          try {
-            let data;
-            if (typeof event.data === 'string') {
-              data = JSON.parse(event.data);
-            } else if (typeof event.data === 'object' && event.data !== null) {
-              data = event.data;
-            } else {
-              window.removeEventListener('message', callback);
-              reject(
-                new Error(
-                  'getCurrentDataRevisionCount callback: Received response with unexpected data type. Raw: ' +
-                    String(event.data),
-                ),
-              );
-              return;
-            }
-            if (
-              data.type === 'getCurrentDataRevisionCount_response' &&
-              data.messageId === messageId
-            ) {
-              window.removeEventListener('message', callback);
-              if (data.error) {
-                reject(new Error(data.error));
+            
+          }));
+          
+          });
+        },
+
+        // getCurrentDataRevisionCount:  => Promise<number>
+        getCurrentDataRevisionCount: function() {
+          return new Promise((resolve, reject) => {
+          const messageId = 'msg_' + Date.now() + '_' + Math.floor(Math.random() * 1000);
+          
+          // Add response handler for methods that return values
+          
+          const callback = (event) => {
+            try {
+              let data;
+              if (typeof event.data === 'string') {
+                data = JSON.parse(event.data);
+              } else if (typeof event.data === 'object' && event.data !== null) {
+                data = event.data; // Already an object
               } else {
-                resolve(data.result);
+                // console.warn('getCurrentDataRevisionCount callback: Received response with unexpected data type:', typeof event.data, event.data);
+                window.removeEventListener('message', callback); // Clean up listener
+                reject(new Error('getCurrentDataRevisionCount callback: Received response with unexpected data type. Raw: ' + String(event.data)));
+                return;
+              }
+              if (data.type === 'getCurrentDataRevisionCount_response' && data.messageId === messageId) {
+                window.removeEventListener('message', callback);
+                if (data.error) {
+                  reject(new Error(data.error));
+                } else {
+                  resolve(data.result);
+                }
               }
+            } catch (e) {
+              console.error("'getCurrentDataRevisionCount' callback: Error processing response:" , e, "Raw event.data:", event.data);
+              window.removeEventListener('message', callback); // Ensure listener is removed on error too
+              reject(e);
             }
-          } catch (e) {
-            console.error(
-              "'getCurrentDataRevisionCount' callback: Error processing response:",
-              e,
-              'Raw event.data:',
-              event.data,
-            );
-            window.removeEventListener('message', callback);
-            reject(e);
-          }
-        };
-        window.addEventListener('message', callback);
-
-        globalThis.ReactNativeWebView.postMessage(
-          JSON.stringify({
+          };
+          window.addEventListener('message', callback);
+          
+          
+          // Send the message to React Native
+          globalThis.ReactNativeWebView.postMessage(JSON.stringify({
             type: 'getCurrentDataRevisionCount',
             messageId,
-          }),
-        );
-      });
-    },
+            
+          }));
+          
+          });
+        },
   };
-
+  
   // Register the callback handler with the window object
   globalThis.formulusCallbacks = {};
-
+  
   // Notify that the interface is ready
   console.log('Formulus interface initialized');
-  globalThis.__formulusBridgeInitialized = true;
+  (globalThis).__formulusBridgeInitialized = true;
 
   // Simple API availability check for internal use
   function requestApiReinjection() {
     console.log('Formulus: Requesting re-injection from host...');
     if (globalThis.ReactNativeWebView) {
-      globalThis.ReactNativeWebView.postMessage(
-        JSON.stringify({
-          type: 'requestApiReinjection',
-          timestamp: Date.now(),
-        }),
-      );
+      globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+        type: 'requestApiReinjection',
+        timestamp: Date.now()
+      }));
     }
   }
   globalThis.__formulusRequestApiReinjection = requestApiReinjection;
 
   // Notify React Native that the interface is ready
   if (globalThis.ReactNativeWebView) {
-    globalThis.ReactNativeWebView.postMessage(
-      JSON.stringify({
-        type: 'onFormulusReady',
-      }),
-    );
+    globalThis.ReactNativeWebView.postMessage(JSON.stringify({
+      type: 'onFormulusReady'
+    }));
   }
-
+  
   // Make the API available globally in browser environments
   if (typeof window !== 'undefined') {
     window.formulus = globalThis.formulus;
   }
+  
 })();
diff --git a/formulus/assets/webview/formulus-api.js b/formulus/assets/webview/formulus-api.js
index 8306c78d3..2aee71918 100644
--- a/formulus/assets/webview/formulus-api.js
+++ b/formulus/assets/webview/formulus-api.js
@@ -1,16 +1,16 @@
 /**
  * Formulus API Interface (JavaScript Version)
- *
+ * 
  * This file provides type information and documentation for the Formulus API
  * that's available in the WebView context as `globalThis.formulus`.
- *
+ * 
  * This file is auto-generated from FormulusInterfaceDefinition.ts
- * Last generated: 2026-05-16T12:40:24.252Z
- *
+ * Last generated: 2026-06-19T16:58:11.756Z
+ * 
  * @example
  * // In your JavaScript file:
  * /// <reference path="./formulus-api.js" />
- *
+ * 
  * // Now you'll get autocompletion and type hints in IDEs that support JSDoc
  * globalThis.formulus.getVersion().then(version => {
  *   console.log('Formulus version:', version);
@@ -29,241 +29,268 @@
  */
 const FormulusAPI = {
   /**
-   * Get the current version of the Formulus API
-   * /
-   * @returns {Promise<string>} The API version
-   */
-  getVersion: function () {},
-
-  /**
-   * Get a list of available forms
-   * /
-   * @returns {Promise<FormInfo[]>} Array of form information objects
-   */
-  getAvailableForms: function () {},
-
-  /**
-   * Open Formplayer with the specified form
-   * /
-   * @param {string} formType - The identifier of the formtype to open
-   * @param {Object} params - Additional parameters for form initialization
-   * @param {Object} savedData - Previously saved form data (for editing)
-   * @returns {Promise<FormCompletionResult>} Promise that resolves when the form is completed/closed with result details
-   */
-  openFormplayer: function (formType, params, savedData, options) {},
-
-  /**
-   * Get observations for a specific form
-   * /
-   * @param {string} formType - The identifier of the formtype
-   * @returns {Promise<FormObservation[]>} Array of form observations
-   */
-  getObservations: function (formType, isDraft, includeDeleted) {},
-
-  /**
-   * Get observations with optional WHERE clause filtering (for dynamic choice lists).
-   * Supports format: data.field = 'value' AND data.other = 'value'
-   * Age filtering via age_from_dob(data.dob) is handled client-side in formplayer.
-   * /
-   * @returns {Promise<FormObservation[]>} Array of filtered observations
-   */
-  getObservationsByQuery: function (options) {},
-
-  /**
-   * Submit a completed form
-   * /
-   * @param {string} formType - The identifier of the formtype
-   * @param {Object} finalData - The final form data to submit
-   * @returns {Promise<string>} The observationId of the submitted form
-   */
-  submitObservation: function (formType, finalData) {},
+ * Get the current version of the Formulus bridge API (the interface contract
+ * version, e.g. for {@link isCompatibleVersion} checks).
+ * @returns {Promise<string>} The API version (semver)
+ */
+  getVersion: function() {},
+
+  /**
+ * Get a list of available forms
+ * @returns {Promise<FormInfo[]>} Array of form information objects
+ */
+  getAvailableForms: function() {},
+
+  /**
+ * Open Formplayer with the specified form
+ * Reserved keys are not treated as observation data:
+ * `defaultData` (prefill), `theme`/`darkMode`/`themeColors` (theming), and
+ * `context` — a read-only **session context** object (device role, selected cluster,
+ * ...) that Formplayer never persists and exposes to extensions as
+ * `window.formulusSessionContext`. Draft bypass is not a param key — use
+ * `options.skipDraftSelection` on {@link openFormplayer} (same as `skipFinalize`).
+ * observation instead of creating a new one
+ * @param {string} formType - The identifier of the formtype to open
+ * @param {Object} params - Additional parameters for form initialization.
+ * @param {Object} savedData - Previously saved form data (for editing)
+ * @returns {Promise<FormCompletionResult>} Promise that resolves when the form is completed/closed with result details
+ */
+  openFormplayer: function(formType, params, savedData, options) {},
+
+  /**
+ * Get observations for a specific form
+ * @param {string} formType - The identifier of the formtype
+ * @returns {Promise<FormObservation[]>} Array of form observations
+ */
+  getObservations: function(formType, isDraft, includeDeleted) {},
+
+  /**
+ * Get observations with optional WHERE clause filtering (for dynamic choice lists).
+ * Supports format: data.field = 'value' AND data.other = 'value'
+ * Age filtering via age_from_dob(data.dob) is handled client-side in formplayer.
+ * @returns {Promise<FormObservation[]>} Array of filtered observations
+ */
+  getObservationsByQuery: function(options) {},
+
+  /**
+ * Submit a completed form
+ * @param {string} formType - The identifier of the formtype
+ * @param {Object} finalData - The final form data to submit
+ * @returns {Promise<string>} The observationId of the submitted form
+ */
+  submitObservation: function(formType, finalData) {},
+
+  /**
+ * Update an existing form
+ * @param {string} observationId - The identifier of the observation
+ * @param {string} formType - The identifier of the formtype
+ * @param {Object} finalData - The final form data to update
+ * @returns {Promise<string>} The observationId of the updated form
+ */
+  updateObservation: function(observationId, formType, finalData) {},
+
+  /**
+ * Request camera access for a field
+ * @param {string} fieldId - The ID of the field
+ * @returns {Promise<CameraResult>} Promise that resolves with camera result or rejects on error/cancellation
+ */
+  requestCamera: function(fieldId) {},
+
+  /**
+ * Request location for a field (captures into the form GPS field).
+ * @param {string} fieldId - The ID of the field
+ * @returns {Promise<LocationResult>} Promise that resolves with location result or rejects on error
+ */
+  requestLocation: function(fieldId) {},
+
+  /**
+ * Return the best cached device fix (if any) without forcing a new GPS read.
+ */
+  getCachedLocation: function(fieldId) {},
+
+  /**
+ * Allocate the next monotonic integer in a device-local scope.
+ * Formulus prepends `device:{deviceId}:` to the app-authored `scopeKey` suffix.
+ */
+  allocateSequence: function(scopeKey, options) {},
+
+  /**
+ * Subscribe to location updates while the custom app WebView is active.
+ * Updates arrive as `locationWatchUpdate` window messages.
+ */
+  watchLocation: function(fieldId) {},
+
+  /**
+ * Stop a prior `watchLocation` subscription for `fieldId`.
+ */
+  stopWatchLocation: function(fieldId) {},
+
+  /**
+ * Request file selection for a field
+ * @param {string} fieldId - The ID of the field
+ * @returns {Promise<FileResult>} Promise that resolves with file result or rejects on error/cancellation
+ */
+  requestFile: function(fieldId) {},
+
+  /**
+ * Launch an external intent
+ * @param {string} fieldId - The ID of the field
+ * @param {Object} intentSpec - The intent specification
+ * @returns {Promise<void>} 
+ */
+  launchIntent: function(fieldId, intentSpec) {},
+
+  /**
+ * Call a subform
+ * @param {string} fieldId - The ID of the field
+ * @param {string} formType - The ID of the subform
+ * @param {Object} options - Additional options for the subform
+ * @returns {Promise<void>} 
+ */
+  callSubform: function(fieldId, formType, options) {},
+
+  /**
+ * Request audio recording for a field
+ * @param {string} fieldId - The ID of the field
+ * @returns {Promise<AudioResult>} Promise that resolves with audio result or rejects on error/cancellation
+ */
+  requestAudio: function(fieldId) {},
+
+  /**
+ * Request video recording for a field (camera / picker — host-defined).
+ * @param {string} fieldId - The ID of the field
+ * @returns {Promise<VideoResult>} Promise that resolves with video result or rejects on error/cancellation
+ */
+  requestVideo: function(fieldId) {},
+
+  /**
+ * Request QR code scanning for a field
+ * @param {string} fieldId - The ID of the field
+ * @returns {Promise<QrcodeResult>} Promise that resolves with QR code result or rejects on error/cancellation
+ */
+  requestQrcode: function(fieldId) {},
+
+  /**
+ * Request biometric authentication
+ * @param {string} fieldId - The ID of the field
+ * @returns {Promise<void>} 
+ */
+  requestBiometric: function(fieldId) {},
+
+  /**
+ * Request the current connectivity status
+ * @returns {Promise<void>} 
+ */
+  requestConnectivityStatus: function() {},
+
+  /**
+ * Request the current sync status
+ * @returns {Promise<void>} 
+ */
+  requestSyncStatus: function() {},
+
+  /**
+ * Run a local ML model
+ * @param {string} fieldId - The ID of the field
+ * @param {string} modelId - The ID of the model to run
+ * @param {Object} input - The input data for the model
+ * @returns {Promise<void>} 
+ */
+  runLocalModel: function(fieldId, modelId, input) {},
+
+  /**
+ * Get information about the currently authenticated user.
+ * When no one is logged in, resolves with `{ username: '' }` (does not reject).
+ * @returns {Promise<{username: string, displayName?: string, role?: 'read-only' | 'read-write' | 'admin'} 
+ */
+  getCurrentUser: function() {},
+
+  /**
+ * Get the current theme mode (System / Light / Dark) so custom apps can match the host app.
+ * @returns {Promise<'light' | 'dark' | 'system'>} Current theme mode; 'system' means follow device preference.
+ */
+  getThemeMode: function() {},
+
+  /**
+ * Resolve an attachment to a WebView-loadable URL (`file://`, `http(s):`, or host-specific).
+ * **String `fileName`:** basename only (e.g. `photo.filename`). Lookup order, first hit wins:
+ * 1. `attachments/draft/<name>`   — unsaved capture (formplayer preview)
+ * 2. `attachments/synced/<name>`  — canonical committed / downloaded copy
+ * 3. `attachments/pending/<name>` — queued for upload (fallback only)
+ * Legacy locations (`attachments/<name>` and `attachments/pending_upload/<name>`) are also checked.
+ * Path segments and ".." are rejected.
+ * **`AttachmentDisplayDescriptor`:** `{ filename }` basename only (same lookup as a string argument).
+ * @returns {Promise<string | null>} Display URL, or `null` if none
+ */
+  getAttachmentUri: function(fileName) {},
+
+  /**
+ * Base `file://` URL for the canonical attachments directory (trailing slash).
+ * Returns the `synced/` subfolder — only committed/downloaded files are
+ * iterable from here. Drafts and the upload queue are excluded by design so
+ * custom apps can safely list this directory.
+ * **Breaking change (v2 layout):** this used to return the `attachments/`
+ * parent directory, which mixed committed files with `draft/` and
+ * `pending_upload/` subfolders. Custom apps that iterate this URL will now
+ * see only fully-committed attachments.
+ * @returns {Promise<string>} e.g. `file:///.../attachments/synced/`
+ */
+  getAttachmentsUri: function() {},
+
+  /**
+ * Base `file://` URL for the custom app bundle root (`DocumentDirectory/app/`, trailing slash).
+ * @returns {Promise<string>} App directory URL for extensions, question_types, etc.
+ */
+  getCustomAppUri: function() {},
+
+  /**
+ * Primary `file://` URL for downloaded form specs (`DocumentDirectory/forms/`, trailing slash).
+ * Some bundles also use files under the custom app `forms/` subdirectory.
+ * @returns {Promise<string>} Forms directory URL
+ */
+  getFormSpecsUri: function() {},
+
+  /**
+ * Persist an observation **without opening Formplayer** (headless write).
+ * Intended for custom apps that create or update records programmatically.
+ * Uses the same persistence path as a Formplayer submit, including promotion
+ * of any referenced draft attachments. Provide `observationId` to update an
+ * existing row; omit it to create a new one.
+ * @since 1.3.0
+ * @param {PersistObservationInput} input - The observation to persist
+ * @returns {Promise<PersistObservationResult>} The stored observation id and data
+ */
+  persistObservation: function(input) {},
+
+  /**
+ * Trigger a synchronization with Synkronus (pull + push).
+ * Resolves when the sync completes; rejects if a sync is already in progress
+ * or the sync fails. Attachments are excluded by default for speed.
+ * @since 1.3.0
+ * @returns {Promise<SyncResult>} The final data version after sync
+ */
+  sync: function(options) {},
+
+  /**
+ * Probe connectivity to the configured Synkronus server (`GET /health`).
+ * Never rejects for an offline device — returns `{ online: false }` so callers
+ * can branch on connectivity without try/catch. Suitable for the
+ * "verify subject details when online, fall back when offline" pattern.
+ * @since 1.3.0
+ * @returns {Promise<ConnectivityStatus>} The current connectivity status
+ */
+  getConnectivityStatus: function() {},
 
   /**
-   * Update an existing form
-   * /
-   * @param {string} observationId - The identifier of the observation
-   * @param {string} formType - The identifier of the formtype
-   * @param {Object} finalData - The final form data to update
-   * @returns {Promise<string>} The observationId of the updated form
-   */
-  updateObservation: function (observationId, formType, finalData) {},
-
-  /**
-   * Request camera access for a field
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @returns {Promise<CameraResult>} Promise that resolves with camera result or rejects on error/cancellation
-   */
-  requestCamera: function (fieldId) {},
-
-  /**
-   * Request location for a field (captures into the form GPS field).
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @returns {Promise<LocationResult>} Promise that resolves with location result or rejects on error
-   */
-  requestLocation: function (fieldId) {},
-
-  /**
-   * Request file selection for a field
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @returns {Promise<FileResult>} Promise that resolves with file result or rejects on error/cancellation
-   */
-  requestFile: function (fieldId) {},
-
-  /**
-   * Launch an external intent
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @param {Object} intentSpec - The intent specification
-   * @returns {Promise<void>}
-   */
-  launchIntent: function (fieldId, intentSpec) {},
-
-  /**
-   * Call a subform
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @param {string} formType - The ID of the subform
-   * @param {Object} options - Additional options for the subform
-   * @returns {Promise<void>}
-   */
-  callSubform: function (fieldId, formType, options) {},
-
-  /**
-   * Request audio recording for a field
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @returns {Promise<AudioResult>} Promise that resolves with audio result or rejects on error/cancellation
-   */
-  requestAudio: function (fieldId) {},
-
-  /**
-   * Request video recording for a field (camera / picker — host-defined).
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @returns {Promise<VideoResult>} Promise that resolves with video result or rejects on error/cancellation
-   */
-  requestVideo: function (fieldId) {},
-
-  /**
-   * Request QR code scanning for a field
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @returns {Promise<QrcodeResult>} Promise that resolves with QR code result or rejects on error/cancellation
-   */
-  requestQrcode: function (fieldId) {},
-
-  /**
-   * Request biometric authentication
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @returns {Promise<void>}
-   */
-  requestBiometric: function (fieldId) {},
-
-  /**
-   * Request the current connectivity status
-   * /
-   * @returns {Promise<void>}
-   */
-  requestConnectivityStatus: function () {},
-
-  /**
-   * Request the current sync status
-   * /
-   * @returns {Promise<void>}
-   */
-  requestSyncStatus: function () {},
-
-  /**
-   * Run a local ML model
-   * /
-   * @param {string} fieldId - The ID of the field
-   * @param {string} modelId - The ID of the model to run
-   * @param {Object} input - The input data for the model
-   * @returns {Promise<void>}
-   */
-  runLocalModel: function (fieldId, modelId, input) {},
-
-  /**
-   * Get information about the currently authenticated user.
-   * When no one is logged in, resolves with `{ username: '' }` (does not reject).
-   * /
-   * @returns {Promise<{username: string, displayName?: string, role?: 'read-only' | 'read-write' | 'admin'}
-   */
-  getCurrentUser: function () {},
-
-  /**
-   * Get the current theme mode (System / Light / Dark) so custom apps can match the host app.
-   * /
-   * @returns {Promise<'light' | 'dark' | 'system'>} Current theme mode; 'system' means follow device preference.
-   */
-  getThemeMode: function () {},
-
-  /**
-   * Resolve an attachment to a WebView-loadable URL (`file://`, `http(s):`, or host-specific).
-   * **String `fileName`:** basename only (e.g. `photo.filename`). Lookup order, first hit wins:
-   * 1. `attachments/draft/<name>`   — unsaved capture (formplayer preview)
-   * 2. `attachments/synced/<name>`  — canonical committed / downloaded copy
-   * 3. `attachments/pending/<name>` — queued for upload (fallback only)
-   * Legacy locations (`attachments/<name>` and `attachments/pending_upload/<name>`) are also checked.
-   * Path segments and ".." are rejected.
-   * **`AttachmentDisplayDescriptor`:** `{ filename }` basename only (same lookup as a string argument).
-   * /
-   * @returns {Promise<string | null>} Display URL, or `null` if none
-   */
-  getAttachmentUri: function (fileName) {},
-
-  /**
-   * Base `file://` URL for the canonical attachments directory (trailing slash).
-   * Returns the `synced/` subfolder — only committed/downloaded files are
-   * iterable from here. Drafts and the upload queue are excluded by design so
-   * custom apps can safely list this directory.
-   * **Breaking change (v2 layout):** this used to return the `attachments/`
-   * parent directory, which mixed committed files with `draft/` and
-   * `pending_upload/` subfolders. Custom apps that iterate this URL will now
-   * see only fully-committed attachments.
-   * /
-   * @returns {Promise<string>} e.g. `file:///.../attachments/synced/`
-   */
-  getAttachmentsUri: function () {},
-
-  /**
-   * Base `file://` URL for the custom app bundle root (`DocumentDirectory/app/`, trailing slash).
-   * /
-   * @returns {Promise<string>} App directory URL for extensions, question_types, etc.
-   */
-  getCustomAppUri: function () {},
-
-  /**
-   * Primary `file://` URL for downloaded form specs (`DocumentDirectory/forms/`, trailing slash).
-   * Some bundles also use files under the custom app `forms/` subdirectory.
-   * /
-   * @returns {Promise<string>} Forms directory URL
-   */
-  getFormSpecsUri: function () {},
-
-  /**
-   * Persist an observation without opening Formplayer (headless write).
-   * @param {PersistObservationInput} input - The observation to persist
-   * @returns {Promise<PersistObservationResult>} The stored observation id and data
-   */
-  persistObservation: function (input) {},
-
-  /**
-   * Trigger a synchronization with Synkronus (pull + push).
-   * @param {{ includeAttachments?: boolean }} options - Sync options
-   * @returns {Promise<SyncResult>} The final data version after sync
-   */
-  sync: function (options) {},
-
-  /**
-   * Probe connectivity to the configured Synkronus server (GET /health).
-   * @returns {Promise<ConnectivityStatus>} The current connectivity status
-   */
-  getConnectivityStatus: function () {},
+ * Read the device's last-known Synkronus data revision (`current_version`
+ * from the most recent successful sync). Reflects server-stream alignment
+ * only — not unsynced local edits. Use with periodic polling or after
+ * {@link sync} to detect when another device has pushed changes.
+ * @since 1.4.0
+ * @returns {Promise<number>} Non-negative revision count (0 if never synced)
+ */
+  getCurrentDataRevisionCount: function() {},
+
 };
 
 // Make the API available globally in browser environments
diff --git a/formulus/custom_app_development.md b/formulus/custom_app_development.md
index 9acae9e67..7562042fb 100644
--- a/formulus/custom_app_development.md
+++ b/formulus/custom_app_development.md
@@ -212,11 +212,11 @@ Use `openFormplayer(formType, params, savedData, options?)`. Reserved `params` k
 
 Common **options** (4th argument):
 
-| Option               | Purpose                                                                      |
-| -------------------- | ---------------------------------------------------------------------------- |
-| `subObservationMode` | Embedded child form; result JSON returns to parent without top-level persist |
+| Option               | Purpose                                                                               |
+| -------------------- | ------------------------------------------------------------------------------------- |
+| `subObservationMode` | Embedded child form; result JSON returns to parent without top-level persist          |
 | `skipFinalize`       | Omit Finalize page; **Done** validates child schema then returns `formData` to parent |
-| `skipDraftSelection` | Skip draft picker when the app orchestrates a new root session               |
+| `skipDraftSelection` | Skip draft picker when the app orchestrates a new root session                        |
 
 **Nested sub-observations:** Each child session has its own schema and validators. `skipFinalize` does not defer validation to the root form. For multi-level embedded trees, put validators on each form where rows are added, or pass parent snapshots via flat `subObservationInitValues` — see [Custom Extensions](https://opendataensemble.org/docs/guides/custom-extensions#nested-sessions-and-custom-validators) on opendataensemble.org.
 
diff --git a/formulus/ios/Formulus.xcodeproj/project.pbxproj b/formulus/ios/Formulus.xcodeproj/project.pbxproj
index 96e384d2b..661d49e0c 100644
--- a/formulus/ios/Formulus.xcodeproj/project.pbxproj
+++ b/formulus/ios/Formulus.xcodeproj/project.pbxproj
@@ -295,7 +295,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = ZZ9482ZVMJ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Formulus/Info.plist;
@@ -304,7 +304,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -329,7 +329,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = ZZ9482ZVMJ;
 				INFOPLIST_FILE = Formulus/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
@@ -337,7 +337,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/formulus/package-lock.json b/formulus/package-lock.json
index 7ca13a21d..b22625e77 100644
--- a/formulus/package-lock.json
+++ b/formulus/package-lock.json
@@ -1,12 +1,13 @@
 {
   "name": "formulus-app",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "formulus-app",
-      "version": "1.0.0",
+      "version": "1.1.1",
+      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@notifee/react-native": "^9.1.8",
@@ -37,7 +38,7 @@
         "react-native-nitro-modules": "^0.35.4",
         "react-native-nitro-sound": "^0.2.10",
         "react-native-permissions": "^5.4.4",
-        "react-native-safe-area-context": "^5.6.2",
+        "react-native-safe-area-context": "^5.8.0",
         "react-native-screens": "^4.19.0",
         "react-native-signature-canvas": "^5.0.2",
         "react-native-svg": "^15.11.2",
@@ -46,21 +47,21 @@
         "react-native-zip-archive": "^7.0.2"
       },
       "devDependencies": {
-        "@babel/core": "^7.28.5",
-        "@babel/plugin-proposal-decorators": "^7.28.0",
-        "@babel/preset-env": "^7.28.5",
-        "@babel/runtime": "^7.28.4",
+        "@babel/core": "^7.29.7",
+        "@babel/plugin-proposal-decorators": "^7.29.7",
+        "@babel/preset-env": "^7.29.7",
+        "@babel/runtime": "^7.29.7",
         "@eslint/compat": "^2.0.0",
         "@eslint/eslintrc": "^3.3.3",
         "@eslint/js": "^9.39.2",
         "@openapitools/openapi-generator-cli": "^2.26.0",
-        "@react-native-community/cli": "20.1.2",
-        "@react-native-community/cli-platform-android": "20.1.2",
-        "@react-native-community/cli-platform-ios": "20.1.2",
+        "@react-native-community/cli": "20.1.3",
+        "@react-native-community/cli-platform-android": "20.1.3",
+        "@react-native-community/cli-platform-ios": "20.1.3",
         "@react-native/babel-preset": "0.84.1",
         "@react-native/eslint-config": "0.84.1",
         "@react-native/metro-config": "0.83.1",
-        "@react-native/typescript-config": "0.83.1",
+        "@react-native/typescript-config": "0.86.0",
         "@types/fs-extra": "^11.0.4",
         "@types/jest": "^30.0.0",
         "@types/node": "^24.10.4",
@@ -131,10 +132,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/helper-validator-identifier": "^7.29.7",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -143,25 +146,29 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.29.3",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
+      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.29.0",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helpers": "^7.28.6",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.29.0",
-        "@babel/types": "^7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
+      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helpers": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -203,11 +210,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
+      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -217,22 +226,26 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.3",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.29.7.tgz",
+      "integrity": "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
+      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.28.6",
-        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -242,16 +255,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.29.3",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.7.tgz",
+      "integrity": "sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-member-expression-to-functions": "^7.28.5",
-        "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/helper-replace-supers": "^7.28.6",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/traverse": "^7.29.0",
+        "@babel/helper-annotate-as-pure": "^7.29.7",
+        "@babel/helper-member-expression-to-functions": "^7.29.7",
+        "@babel/helper-optimise-call-expression": "^7.29.7",
+        "@babel/helper-replace-supers": "^7.29.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -262,11 +277,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.28.5",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.29.7.tgz",
+      "integrity": "sha512-907Uymvqgg1dwUA+7IGwFAOSYzQOuzPXKNJ1yxzwPffzkYFg2q2eHi1fIOs6sXkG9NbIUMunnUlkYsfRFNvomg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-annotate-as-pure": "^7.29.7",
         "regexpu-core": "^6.3.1",
         "semver": "^6.3.1"
       },
@@ -293,42 +310,50 @@
       }
     },
     "node_modules/@babel/helper-globals": {
-      "version": "7.28.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
+      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.28.5",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.29.7.tgz",
+      "integrity": "sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.28.5",
-        "@babel/types": "^7.28.5"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
+      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
+      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.28.6",
-        "@babel/helper-validator-identifier": "^7.28.5",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -338,31 +363,37 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.29.7.tgz",
+      "integrity": "sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz",
+      "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.29.7.tgz",
+      "integrity": "sha512-16AMiW26DbXWBbr3B8wNozKM0ydMLB892vaOaJW/fPJdnT8vJk5sdkQcU/isqUxyCE0cEoa8wZOcbgDuC4b6Og==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-wrap-function": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/helper-annotate-as-pure": "^7.29.7",
+        "@babel/helper-wrap-function": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -372,13 +403,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.29.7.tgz",
+      "integrity": "sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.28.5",
-        "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-member-expression-to-functions": "^7.29.7",
+        "@babel/helper-optimise-call-expression": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -388,67 +421,81 @@
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.29.7.tgz",
+      "integrity": "sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
+      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.29.7.tgz",
+      "integrity": "sha512-iES0Skag9ERIF68aXadpO6dbXa03mNWK3sEqJaMnLNs/eC3l0lkImdfoy6Y09/SfkpawdAB4RjQ7PVA7TcVGdw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.29.2",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
+      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0"
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.3",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
+      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.0"
+        "@babel/types": "^7.29.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -458,12 +505,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.28.5",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.29.7.tgz",
+      "integrity": "sha512-j8SrR0zLZrRsC09DlszEx8FpMiwukKffYXMK0d5LmOglO7vGG6sz/BR/20yHqWH+Lnn31JTt2PE3hIWNgM2J6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.28.5"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -473,11 +522,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.29.7.tgz",
+      "integrity": "sha512-r8j8escF+U2FUHo0KOhPUdMzUO+jp9fInva6+ACVAF3Y97Ev+5iNZwiqTghmzNeWwDkOPlYuTcfb1vDaoZKmAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -487,11 +538,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.29.7.tgz",
+      "integrity": "sha512-GE1TFSiuFeGsCxmYXZl8HwoPrVlwe4rHPFE8weieGKZqnDORK+Ar3vgWMgW+AOxQ6/2TgLSKx9p6W7O4rC6qgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -501,12 +554,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": {
-      "version": "7.29.3",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.7.tgz",
+      "integrity": "sha512-oBNVCvnO5tND+xSopWvV8WNGfpTfgP4Zr/YXXSj8zfmcPktp5Ku/aZlsIowgSD4fjmgHn6sGmB9APVsU5zOdhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -516,13 +571,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.29.7.tgz",
+      "integrity": "sha512-QQt9qKHZ2sg/kivaLr7lnQr8HVrQDdBNSfCsTjiDxRuX/K5ORyKq+Bu8Xr0cDE3Dfkv0cw28Ve0EKyKMvulkOw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/plugin-transform-optional-chaining": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7",
+        "@babel/plugin-transform-optional-chaining": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -532,12 +589,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.29.7.tgz",
+      "integrity": "sha512-pn6QacGLgvCcwc+syUhKE/qSjV2D1IHDB84RNxWYSt1mW3K/SCtjinZ2p0cETJxAWBjPy3K/1lHwG5BjjPxNlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -547,13 +606,15 @@
       }
     },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.29.7.tgz",
+      "integrity": "sha512-EtU0Hi3GvrTqD56xKmZvV/uCXK2ZbwVNPNLAquVItcAZpUhkXwWlo3Fmj0c2LxgSf2I8IDULeAepwNP1OefLXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/plugin-syntax-decorators": "^7.28.6"
+        "@babel/helper-create-class-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/plugin-syntax-decorators": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -631,11 +692,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.29.7.tgz",
+      "integrity": "sha512-9MTTLbF39X6sqM92JPEsoI7++26hjZvzkxKZy64aMhWLH2mPkJ/Q3AV4QLmls3R14FpSpkOwQQfUh962JGQxxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -684,11 +747,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.29.7.tgz",
+      "integrity": "sha512-/An1OCBN93thpBAGyfsK2pcf0jvju1SAtKkL2Ny++B5Sy6sqgzXDQH1cZxWbF96Wuk+bn41MDA9bLd4VVAw6rw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -698,10 +763,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.29.7.tgz",
+      "integrity": "sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -860,11 +927,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.29.7.tgz",
+      "integrity": "sha512-N7zArUXWzAMzm+/N0uPBeVB3Fam5lMxtUwMmDK5f/IBBS7a7p1qeUoxd/6CckXoxUdgsntq1Dh8xNW06maZbDQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -874,13 +943,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.7.tgz",
+      "integrity": "sha512-d98gXZkgswvkyohMBABkhm3GeXhYj8psWfwQ2C7gtfrKGTykQa/iOIi+JJhwMjPlZ6Vm2XN+DCf3Es1EoG4ZLA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-remap-async-to-generator": "^7.27.1",
-        "@babel/traverse": "^7.29.0"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-remap-async-to-generator": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -890,13 +961,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.29.7.tgz",
+      "integrity": "sha512-pcUb2SS+RMo9TWVBwKGI5ShtoG7R+zBsFmCKDa6fe8c+hPr3XJlZgoE5j6i8W7gDjhyvy+85vmYexanvXh3d1w==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-remap-async-to-generator": "^7.27.1"
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-remap-async-to-generator": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -906,11 +979,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.29.7.tgz",
+      "integrity": "sha512-cUSmjh72N+rN4PrkFlN1dJwNCwjVp5d38/CQrEsFggkD10UiFlBFgdH3tv5dNsLuHY+3S8db2xCHjhZcv5WgvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -920,11 +995,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.7.tgz",
+      "integrity": "sha512-ONyr4+AZhKh8yKWInVxU9AXA9EbsyeLcL6V0dJy6M2/62vuvpGm29zzuymbTpdc451GEpDIdAyPLP3r+P61yKQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -934,12 +1011,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.29.7.tgz",
+      "integrity": "sha512-GtcpjFvanPfzNQi3eTitsCqtRRmmqzpy/A+yhTR1HaZo1Ly3EA8ZXxlPyHdR8/IuRMYc3E4wdGBewB2QKQjAaA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-class-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -949,12 +1028,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.29.7.tgz",
+      "integrity": "sha512-kibJgmEdX2iMwsHY2tSZNDgj8PwIlCQz7FK9KuGKO8zsuoUwSEhoNnNVp/emKWrbY4HeO6kkXfdMqRKKKXBm2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-class-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -964,16 +1045,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.29.7.tgz",
+      "integrity": "sha512-qV0OGGBVacduzQHE649JyCneOFI/maT+YKsO+K4Yi3xv2wTPNjM/W2o2gdzMwEAZz7fXNTHAe0NcSg30bIN69g==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-replace-supers": "^7.28.6",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-annotate-as-pure": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-replace-supers": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -983,12 +1066,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.29.7.tgz",
+      "integrity": "sha512-RK7/IyU5phpuCdBAuig5VkzG/EnbDaui5SQGdU9BFrHdV+mV4cUjLMQ9lJDjLNtWHsqtiefpGZUXQP2BiTYMsA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/template": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/template": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -998,12 +1083,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.28.5",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.29.7.tgz",
+      "integrity": "sha512-iPX8aD6H9zV5s7ZsqTdNocPN/MGQ5sSMnElKrktxjJRMnB2jN/1p2+R7GkfD6CAYoVFqy5A4XnSIUeGgJzIWpg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.28.5"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1013,12 +1100,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.29.7.tgz",
+      "integrity": "sha512-3qc18hsD2RdZiyJNDNc7HQpv6xbncwh8FYtxNFFzclSyh/trPD9KkVR9BDECUjDLvb7yJVF15GfYUuC+LMkkiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1028,11 +1117,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.29.7.tgz",
+      "integrity": "sha512-6IvRRriEMqnBwD6chtxdLpMYCHWEzN+oL5cyQtjykya19UgzbmKhxmhZgKC/LHxS2nYr9Q/qYPZ5Lr6jOL9+yQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1042,12 +1133,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.7.tgz",
+      "integrity": "sha512-2wiIyo2BjtgU7HufSeDnL9L2O7zr8jmhFKuSr65VpRkUiRKRNpb0mdlk56+XPPKoIrfHqzbMuglDvZun0RISsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1057,11 +1150,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.29.7.tgz",
+      "integrity": "sha512-giOlEm/EFjfjr+te9NsdjkUo2v4f8rS/SXPumRVHAtbNcyNlvtREkU1dZzaIDclNpnaVhlCqRdFKhJBjBikzLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1071,12 +1166,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-explicit-resource-management": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.29.7.tgz",
+      "integrity": "sha512-Rstj7coNz8sE+7Ju7ihpHLI564lsK5pUpNNlvptCIC/16E/S5hbl6n3kESPKdNRmqEWlpn5xpS5Q2dvXBsySLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/plugin-transform-destructuring": "^7.28.5"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/plugin-transform-destructuring": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1086,11 +1183,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.29.7.tgz",
+      "integrity": "sha512-zFpMOTLZBdW5LfObqcSbL6kefg4R4eLdmvS0wbN9M6D5Mym/sKm9toOoWyVOa+xDjvCnuWcHls2YonXwHvH3CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1100,11 +1199,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.29.7.tgz",
+      "integrity": "sha512-24B2nOy2TeJSMheqwPD4DDQOV/elLSIlKxjZt4i05H5AgdPdWR3n18HnNrcJ+j76WJd9gbwb9jPjNYUy6RautA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1129,12 +1230,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.29.7.tgz",
+      "integrity": "sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1144,13 +1247,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.29.7.tgz",
+      "integrity": "sha512-otRWaHXE6fbAGkePvaj/kvs3HsqXfPhlnzwSOlnFgbqCPMd975dW+4wZ00WFBt+/YlBGcJwNrARQTOJOb4ZrIg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1160,11 +1265,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.29.7.tgz",
+      "integrity": "sha512-RRnE2+eon1rJAq8MnoF1b5kTpY1vU88twHcvcKMrsqP/jxIRqDVs9iJB5fqPuqyeFAW0wJo4MlUIPpQCq/aRsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1174,11 +1281,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.29.7.tgz",
+      "integrity": "sha512-DZ/oLP21ZuWx1vKqnoNv6/tvEK48AQOBRai40CX9dTjGluvT/YZCyY3rryDtyUqCEoyNroy5KKPwX2iQCiRvyw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1188,11 +1297,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.29.7.tgz",
+      "integrity": "sha512-A0H91hh6W8MFRkp5TqJmMr39jzGD1A1E1Ysiv2O06Sfbhkapm+XyIzxWCEh5kqwOZ1/8QZ0dY3SeQ7XBqfJd5Q==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1202,11 +1313,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.29.7.tgz",
+      "integrity": "sha512-hl1kwFZCCiDyfH25Xmco9jTrkPgnS9pmOzSG7W5I4SaGbLeqKv417hcU2RKmaxoPEgsoJh7ZPOrnPGq99bHoUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1216,12 +1329,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.29.7.tgz",
+      "integrity": "sha512-fxtQoH3m5ywUSIfaH0FGCzWu4McsYon5bD3K4XnskC7f+OyQMj7rsOMi4NvvmJ83WwBAg4UCe+ov4VZlqEvyew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1231,12 +1346,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.29.7.tgz",
+      "integrity": "sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1246,14 +1363,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.29.4",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.7.tgz",
+      "integrity": "sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-validator-identifier": "^7.28.5",
-        "@babel/traverse": "^7.29.0"
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1263,12 +1382,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.29.7.tgz",
+      "integrity": "sha512-B4UkaTK3QpgCwJnrxKfMPKdo92CN7OKXAlpAAnM3UPu0Q0lCCk57ylA9AJbRy2v8dDKOPAAWcoR6CMyeoHwRCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1278,12 +1399,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.7.tgz",
+      "integrity": "sha512-vuFoLwr4qnv2xbZ16SQd6uPcH5FNrLHhk/Jzo++0XJFcaDsr4gjJVg6j398oMHiC+83k/GiBzviwF5KBJkPUtQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1293,11 +1416,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.29.7.tgz",
+      "integrity": "sha512-fEo41GmsOUhOBlw8ioo6zvjX5Xc2Lqkzlyfqbpsk3eB6TReV18uhxZ0esfEokVbY2+PVJAQHNKxER6lGrzNd3A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1307,11 +1432,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.29.7.tgz",
+      "integrity": "sha512-idmp1dFaekP9GbcMvG24Kvw2BfhFZjHnNJCkV4WuIY4PskJzwI3f1N5OdgYke38T7rftO6ERulFRn2cFeZwRkg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1321,11 +1448,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.29.7.tgz",
+      "integrity": "sha512-zR7fv/z14OjgHl4AgRtkDBvBMhIzCxqV/qN/2BCRC7LjFwvuzjYe7gDWxC4Wl/SNsLM6SE1IWvRPYMgSJaUvNw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1335,15 +1464,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.29.7.tgz",
+      "integrity": "sha512-Ld98jn4c0smUywL57m7SgsHq3OpThOa6LqZJif3G6jYOovPleoFhVrBJ1WegRApSFB2wu4+RelAj9AC9G08Z4A==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/plugin-transform-destructuring": "^7.28.5",
-        "@babel/plugin-transform-parameters": "^7.27.7",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/plugin-transform-destructuring": "^7.29.7",
+        "@babel/plugin-transform-parameters": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1353,12 +1484,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.29.7.tgz",
+      "integrity": "sha512-Ea/diGcw0twB5IlZPO5sgET6fJsLJqPABqTuFWIR+iMPGPZJkATEIWx0wa+aEQ5UY1CBQyP/gkAiLEqn1vBiQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-replace-supers": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-replace-supers": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1368,11 +1501,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.29.7.tgz",
+      "integrity": "sha512-sLsyndxK2VwX6yNUOakMb7Sh553ZTe/vVM1XJ+9Z5aW1ytsc8xOIwmyk05NNjN60vkc5/KqoTH6hB4V41LJhng==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1382,12 +1517,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.29.7.tgz",
+      "integrity": "sha512-6GM1dhvK3gNODkXcEcMCOLEDCLSoZ/sBbro2Ax8HURyasQ4NshagQixkRFdh5niI6E4gmA/jYI/4aT7rRos3ZQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1397,11 +1534,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.27.7",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.29.7.tgz",
+      "integrity": "sha512-ZDOBqV/qLYJI0YElr8DcENEyARsFQeESqWXH6gZlghYXuPPjvweuDhP4VyEi4BlUBlLRFZVjxoZDMjxhLW766g==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1411,12 +1550,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.29.7.tgz",
+      "integrity": "sha512-/6Rz4DK1ETDEM/bWHsPHcaEe7ZaT1EqSXjtSP/L0DijOYuaUhiRiOKcwpZ8P7zR4xXEHc2ITdiCgBm9Tpyv9ug==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-class-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1426,13 +1567,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.29.7.tgz",
+      "integrity": "sha512-+BNo06dnrzdNNqCm1X6YUaVv0DKk8Q+JYcoZfOkLhYWNCXzlwTSRq8zGWayT1csjcpNXV9CQTBRRbmTLZac5cA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-create-class-features-plugin": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-annotate-as-pure": "^7.29.7",
+        "@babel/helper-create-class-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1442,11 +1585,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.29.7.tgz",
+      "integrity": "sha512-bOMRLQuI0A5ZqHq3OWJ89/rXpJ/NJrbVhXiP4zwPGMs6kpcVsuTUNjwoE30K0Qm3mf48a/TnRYYD6vPNqcg6jA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1516,11 +1661,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.7.tgz",
+      "integrity": "sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1530,12 +1677,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-regexp-modifiers": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.29.7.tgz",
+      "integrity": "sha512-mB5Fs0VWrJ42ZCmc8114v60qetdaUVNkj9PmSZRmanCZM3S9hm0CFRLjRmYIsuXav14l2jvZ+4T8iiCGnhj3nQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1545,11 +1694,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.29.7.tgz",
+      "integrity": "sha512-5+YhdpVgmfSmwZyLMftfaiffLRMHjzIRHFHHLdibcSyJm2pasMrKHrO3Ptrt2DRshjvpgjEJJ1zVW14WPq/6QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1578,11 +1729,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.29.7.tgz",
+      "integrity": "sha512-I+WYbGBAiCn7nA6xBrlgPH+MB7HWb4u8pv5S0Pv7OtwNvIFvCCb24YlttKEeUFVurfBCEaOTnuhlqsb7f0Z5Dg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1592,12 +1745,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.7.tgz",
+      "integrity": "sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1607,11 +1762,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.29.7.tgz",
+      "integrity": "sha512-BCHzNYJGe9l7EpwwDBN/ztlL2NYFFq8hp9ddjtUEM9f2O7S7kKV/lL6Fwo7IF7NSkYhPK2vO+86nIGltA90MsA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1621,11 +1778,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.29.7.tgz",
+      "integrity": "sha512-NCSEJ4sLFU2gqAub45HYh4fus2yQ36rr6ei6vpU7NdoJqCpxvEG8E6eJpscGyXP3VHD2Ny+fSXr04k1hoUrFqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1635,11 +1794,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.29.7.tgz",
+      "integrity": "sha512-223mNGoTkBiTEWFoK+Q6Go3tueMRclO8vxxxxquNCYuNI4jWOofFKJRRDu6SDrB8Sgo1UEGW9T4GAQ8ZyRso1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1667,11 +1828,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.29.7.tgz",
+      "integrity": "sha512-jCfXxSjf94lf4E0hKE0AByxF6F3/pVFqRdUUNkDJhsY0m1ZKjnN6ZYyMeHNpzflxb/0q5b7t3p+BE+SLF1WOtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1681,12 +1844,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.29.7.tgz",
+      "integrity": "sha512-OgZ+zoAJgZLUCunsTRQ5LAjOywDv5zzZ2/hQ5aMw1pGXyY2rtE8/chXYUmu3AlVHKpm10KEdG9aMwbI/K76ZGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1696,12 +1861,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.27.1",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.29.7.tgz",
+      "integrity": "sha512-7D/x/23/d/3VqZ0QA+LGbZMlGwZjztBygSWWWsfTPoQ1oQ6Q1P6Mr3d0kk42XabyUVw+fha3LqdRsFqeKqvCyA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1711,12 +1878,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.29.7.tgz",
+      "integrity": "sha512-BLOhLht9DOJwIxlmp91wHvkXv1lguuHS3/FwUO8HL1H0u8s4hR1gASVFyilu9iGtcTRYqjTZmlsFFeQletntEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
-        "@babel/helper-plugin-utils": "^7.28.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1726,75 +1895,77 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.29.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/compat-data": "^7.29.3",
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-validator-option": "^7.27.1",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5",
-        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
-        "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": "^7.29.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.7.tgz",
+      "integrity": "sha512-GYzX36n1nsciIb0uyH0GHwxwtNwPQIcpxSeiVLDtG/B7jB5xXgchnmL1f/jCX5o+pwnaDBtO60ONSJhEBJfxYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-plugin-utils": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.29.7",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.29.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.29.7",
+        "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": "^7.29.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.29.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.29.7",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-import-assertions": "^7.28.6",
-        "@babel/plugin-syntax-import-attributes": "^7.28.6",
+        "@babel/plugin-syntax-import-assertions": "^7.29.7",
+        "@babel/plugin-syntax-import-attributes": "^7.29.7",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.27.1",
-        "@babel/plugin-transform-async-generator-functions": "^7.29.0",
-        "@babel/plugin-transform-async-to-generator": "^7.28.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
-        "@babel/plugin-transform-block-scoping": "^7.28.6",
-        "@babel/plugin-transform-class-properties": "^7.28.6",
-        "@babel/plugin-transform-class-static-block": "^7.28.6",
-        "@babel/plugin-transform-classes": "^7.28.6",
-        "@babel/plugin-transform-computed-properties": "^7.28.6",
-        "@babel/plugin-transform-destructuring": "^7.28.5",
-        "@babel/plugin-transform-dotall-regex": "^7.28.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
-        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.0",
-        "@babel/plugin-transform-dynamic-import": "^7.27.1",
-        "@babel/plugin-transform-explicit-resource-management": "^7.28.6",
-        "@babel/plugin-transform-exponentiation-operator": "^7.28.6",
-        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
-        "@babel/plugin-transform-for-of": "^7.27.1",
-        "@babel/plugin-transform-function-name": "^7.27.1",
-        "@babel/plugin-transform-json-strings": "^7.28.6",
-        "@babel/plugin-transform-literals": "^7.27.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.28.6",
-        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
-        "@babel/plugin-transform-modules-amd": "^7.27.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.28.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.29.4",
-        "@babel/plugin-transform-modules-umd": "^7.27.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.0",
-        "@babel/plugin-transform-new-target": "^7.27.1",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6",
-        "@babel/plugin-transform-numeric-separator": "^7.28.6",
-        "@babel/plugin-transform-object-rest-spread": "^7.28.6",
-        "@babel/plugin-transform-object-super": "^7.27.1",
-        "@babel/plugin-transform-optional-catch-binding": "^7.28.6",
-        "@babel/plugin-transform-optional-chaining": "^7.28.6",
-        "@babel/plugin-transform-parameters": "^7.27.7",
-        "@babel/plugin-transform-private-methods": "^7.28.6",
-        "@babel/plugin-transform-private-property-in-object": "^7.28.6",
-        "@babel/plugin-transform-property-literals": "^7.27.1",
-        "@babel/plugin-transform-regenerator": "^7.29.0",
-        "@babel/plugin-transform-regexp-modifiers": "^7.28.6",
-        "@babel/plugin-transform-reserved-words": "^7.27.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
-        "@babel/plugin-transform-spread": "^7.28.6",
-        "@babel/plugin-transform-sticky-regex": "^7.27.1",
-        "@babel/plugin-transform-template-literals": "^7.27.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
-        "@babel/plugin-transform-unicode-property-regex": "^7.28.6",
-        "@babel/plugin-transform-unicode-regex": "^7.27.1",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.28.6",
+        "@babel/plugin-transform-arrow-functions": "^7.29.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.29.7",
+        "@babel/plugin-transform-async-to-generator": "^7.29.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.29.7",
+        "@babel/plugin-transform-block-scoping": "^7.29.7",
+        "@babel/plugin-transform-class-properties": "^7.29.7",
+        "@babel/plugin-transform-class-static-block": "^7.29.7",
+        "@babel/plugin-transform-classes": "^7.29.7",
+        "@babel/plugin-transform-computed-properties": "^7.29.7",
+        "@babel/plugin-transform-destructuring": "^7.29.7",
+        "@babel/plugin-transform-dotall-regex": "^7.29.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.29.7",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.7",
+        "@babel/plugin-transform-dynamic-import": "^7.29.7",
+        "@babel/plugin-transform-explicit-resource-management": "^7.29.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.29.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.29.7",
+        "@babel/plugin-transform-for-of": "^7.29.7",
+        "@babel/plugin-transform-function-name": "^7.29.7",
+        "@babel/plugin-transform-json-strings": "^7.29.7",
+        "@babel/plugin-transform-literals": "^7.29.7",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.29.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.29.7",
+        "@babel/plugin-transform-modules-amd": "^7.29.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.29.7",
+        "@babel/plugin-transform-modules-systemjs": "^7.29.7",
+        "@babel/plugin-transform-modules-umd": "^7.29.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.7",
+        "@babel/plugin-transform-new-target": "^7.29.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.29.7",
+        "@babel/plugin-transform-numeric-separator": "^7.29.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.29.7",
+        "@babel/plugin-transform-object-super": "^7.29.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.29.7",
+        "@babel/plugin-transform-optional-chaining": "^7.29.7",
+        "@babel/plugin-transform-parameters": "^7.29.7",
+        "@babel/plugin-transform-private-methods": "^7.29.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.29.7",
+        "@babel/plugin-transform-property-literals": "^7.29.7",
+        "@babel/plugin-transform-regenerator": "^7.29.7",
+        "@babel/plugin-transform-regexp-modifiers": "^7.29.7",
+        "@babel/plugin-transform-reserved-words": "^7.29.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.29.7",
+        "@babel/plugin-transform-spread": "^7.29.7",
+        "@babel/plugin-transform-sticky-regex": "^7.29.7",
+        "@babel/plugin-transform-template-literals": "^7.29.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.29.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.29.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.29.7",
+        "@babel/plugin-transform-unicode-regex": "^7.29.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.29.7",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.15",
         "babel-plugin-polyfill-corejs3": "^0.14.0",
@@ -1835,34 +2006,40 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.29.2",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.28.6",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
+      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/parser": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
+      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -1870,11 +2047,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.29.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
+      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3774,16 +3953,18 @@
       }
     },
     "node_modules/@react-native-community/cli": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-20.1.3.tgz",
+      "integrity": "sha512-sLo8cu9JyFNfuuF1C+8NJ4DHE/PEFaXGd4enkcxi/OJjGG8+sOQrdjNQ4i+cVh/2c+ah1mEMwsYjc3z0+/MqSg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-clean": "20.1.2",
-        "@react-native-community/cli-config": "20.1.2",
-        "@react-native-community/cli-doctor": "20.1.2",
-        "@react-native-community/cli-server-api": "20.1.2",
-        "@react-native-community/cli-tools": "20.1.2",
-        "@react-native-community/cli-types": "20.1.2",
+        "@react-native-community/cli-clean": "20.1.3",
+        "@react-native-community/cli-config": "20.1.3",
+        "@react-native-community/cli-doctor": "20.1.3",
+        "@react-native-community/cli-server-api": "20.1.3",
+        "@react-native-community/cli-tools": "20.1.3",
+        "@react-native-community/cli-types": "20.1.3",
         "commander": "^9.4.1",
         "deepmerge": "^4.3.0",
         "execa": "^5.0.0",
@@ -3802,22 +3983,26 @@
       }
     },
     "node_modules/@react-native-community/cli-clean": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-20.1.3.tgz",
+      "integrity": "sha512-sFLdLzapfC0scjgzBJJWYDY2RhHPjuuPkA5r6q0gc/UQH/izXpMpLrhh1DW84cMDraNACK0U62tU7ebNaQ1LMQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-tools": "20.1.3",
         "execa": "^5.0.0",
         "fast-glob": "^3.3.2",
         "picocolors": "^1.1.1"
       }
     },
     "node_modules/@react-native-community/cli-config": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-20.1.3.tgz",
+      "integrity": "sha512-n73nW0cG92oNF0r994pPqm0DjAShOm3F8LSffDYhJqNAno+h/csmv/37iL4NtSpmKIO8xqsG3uVTXz9X/hzNaQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-tools": "20.1.3",
         "cosmiconfig": "^9.0.0",
         "deepmerge": "^4.3.0",
         "fast-glob": "^3.3.2",
@@ -3826,37 +4011,43 @@
       }
     },
     "node_modules/@react-native-community/cli-config-android": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config-android/-/cli-config-android-20.1.3.tgz",
+      "integrity": "sha512-DNHDP+OWLyhKShGciBqPcxhxfp1Z/7GQcb4F+TGyCeKQAr+JdnUjRXN3X+YCU/v+g2kbYYyRJKlGabzkVvdrAw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-tools": "20.1.3",
         "fast-glob": "^3.3.2",
         "fast-xml-parser": "^5.3.6",
         "picocolors": "^1.1.1"
       }
     },
     "node_modules/@react-native-community/cli-config-apple": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config-apple/-/cli-config-apple-20.1.3.tgz",
+      "integrity": "sha512-QX9B83nAfCPs0KiaYz61kAEHWr9sttooxzRzNdQwvZTwnsIpvWOT9GvMMj/19OeXiQzMJBzZX0Pgt6+spiUsDQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-tools": "20.1.3",
         "execa": "^5.0.0",
         "fast-glob": "^3.3.2",
         "picocolors": "^1.1.1"
       }
     },
     "node_modules/@react-native-community/cli-doctor": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-20.1.3.tgz",
+      "integrity": "sha512-EI+mAPWn255/WZ4CQohy1I049yiaxVr41C3BeQ2BCyhxODIDR8XRsLzYb1t9MfqK/C3ZncUN2mPSRXFeKPPI1w==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-config": "20.1.2",
-        "@react-native-community/cli-platform-android": "20.1.2",
-        "@react-native-community/cli-platform-apple": "20.1.2",
-        "@react-native-community/cli-platform-ios": "20.1.2",
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-config": "20.1.3",
+        "@react-native-community/cli-platform-android": "20.1.3",
+        "@react-native-community/cli-platform-apple": "20.1.3",
+        "@react-native-community/cli-platform-ios": "20.1.3",
+        "@react-native-community/cli-tools": "20.1.3",
         "command-exists": "^1.2.8",
         "deepmerge": "^4.3.0",
         "envinfo": "^7.13.0",
@@ -3881,43 +4072,51 @@
       }
     },
     "node_modules/@react-native-community/cli-platform-android": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-20.1.3.tgz",
+      "integrity": "sha512-bzB9ELPOISuqgtDZXFPQlkuxx1YFkNx3cNgslc5ElCrk+5LeCLQLIBh/dmIuK8rwUrPcrramjeBj++Noc+TaAA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-config-android": "20.1.2",
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-config-android": "20.1.3",
+        "@react-native-community/cli-tools": "20.1.3",
         "execa": "^5.0.0",
         "logkitty": "^0.7.1",
         "picocolors": "^1.1.1"
       }
     },
     "node_modules/@react-native-community/cli-platform-apple": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-apple/-/cli-platform-apple-20.1.3.tgz",
+      "integrity": "sha512-XJ+DqAD4hkplWVXK5AMgN7pP9+4yRSe5KfZ/b42+ofkDBI55ALlUmX+9HWE3fMuRjcotTCoNZqX2ov97cFDXpQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-config-apple": "20.1.2",
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-config-apple": "20.1.3",
+        "@react-native-community/cli-tools": "20.1.3",
         "execa": "^5.0.0",
         "fast-xml-parser": "^5.3.6",
         "picocolors": "^1.1.1"
       }
     },
     "node_modules/@react-native-community/cli-platform-ios": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-20.1.3.tgz",
+      "integrity": "sha512-2qL48SINotuHbZO73cgqSwqd/OWNx0xTbFSdujhpogV4p8BNwYYypfjh4vJY5qJEB5PxuoVkMXT+aCADpg9nBg==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-platform-apple": "20.1.2"
+        "@react-native-community/cli-platform-apple": "20.1.3"
       }
     },
     "node_modules/@react-native-community/cli-server-api": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-20.1.3.tgz",
+      "integrity": "sha512-hsNsdUKZDd2T99OuNuiXz4VuvLa1UN0zcxefmPjXQgI0byrBLzzDr+o7p03sKuODSzKi2h+BMnUxiS07HACQLA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "20.1.2",
+        "@react-native-community/cli-tools": "20.1.3",
         "body-parser": "^2.2.2",
         "compression": "^1.7.1",
         "connect": "^3.6.5",
@@ -3987,7 +4186,9 @@
       }
     },
     "node_modules/@react-native-community/cli-tools": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-20.1.3.tgz",
+      "integrity": "sha512-EAn0vPCMxtHhfWk2UwLmSUfPfLUnFgC7NjiVJVTKJyVk5qGnkPfoT8te/1IUXFTysUB0F0RIi+NgDB4usFOLeA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -4005,6 +4206,8 @@
     },
     "node_modules/@react-native-community/cli-tools/node_modules/mime": {
       "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "devOptional": true,
       "license": "MIT",
       "bin": {
@@ -4015,7 +4218,9 @@
       }
     },
     "node_modules/@react-native-community/cli-tools/node_modules/semver": {
-      "version": "7.8.0",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "devOptional": true,
       "license": "ISC",
       "bin": {
@@ -4026,7 +4231,9 @@
       }
     },
     "node_modules/@react-native-community/cli-types": {
-      "version": "20.1.2",
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-20.1.3.tgz",
+      "integrity": "sha512-IdAcegf0pH1hVraxWTG1ACLkYC0LDQfqtaEf42ESyLIF3Xap70JzL/9tAlxw7lSCPZPFWhrcgU0TBc4SkC/ecw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -4035,6 +4242,8 @@
     },
     "node_modules/@react-native-community/cli/node_modules/commander": {
       "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
       "devOptional": true,
       "license": "MIT",
       "engines": {
@@ -4042,7 +4251,9 @@
       }
     },
     "node_modules/@react-native-community/cli/node_modules/semver": {
-      "version": "7.8.0",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "devOptional": true,
       "license": "ISC",
       "bin": {
@@ -4562,7 +4773,9 @@
       "license": "MIT"
     },
     "node_modules/@react-native/typescript-config": {
-      "version": "0.83.1",
+      "version": "0.86.0",
+      "resolved": "https://registry.npmjs.org/@react-native/typescript-config/-/typescript-config-0.86.0.tgz",
+      "integrity": "sha512-oSuFIEMVAVEXdIvDnrdXsWmIF4fYdgtvAEr2ofn8OY534m7XWm9QAqHHpGUzoK0iwDPlPZ5n2Rb25gqF1SZ0rg==",
       "dev": true,
       "license": "MIT"
     },
@@ -6163,7 +6376,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.30",
+      "version": "2.10.38",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz",
+      "integrity": "sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.cjs"
@@ -12250,7 +12465,9 @@
       }
     },
     "node_modules/react-native-safe-area-context": {
-      "version": "5.7.0",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.8.0.tgz",
+      "integrity": "sha512-t+ZsAVzY/wWzzx34vqGbo3/as9EEESJdbyZNL7Yg5EYX+toYMtMqFoDDCvqZUi35eeGVsXc6pAaEk4edMwbuCQ==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*",
diff --git a/formulus/package.json b/formulus/package.json
index 9ce911323..8eb6fced0 100644
--- a/formulus/package.json
+++ b/formulus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formulus-app",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "packageManager": "pnpm@10.33.2",
   "type": "module",
   "private": true,
@@ -53,7 +53,7 @@
     "react-native-nitro-modules": "^0.35.4",
     "react-native-nitro-sound": "^0.2.10",
     "react-native-permissions": "^5.4.4",
-    "react-native-safe-area-context": "^5.6.2",
+    "react-native-safe-area-context": "^5.8.0",
     "react-native-screens": "^4.19.0",
     "react-native-signature-canvas": "^5.0.2",
     "react-native-svg": "^15.11.2",
@@ -62,21 +62,21 @@
     "react-native-zip-archive": "^7.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.5",
-    "@babel/plugin-proposal-decorators": "^7.28.0",
-    "@babel/preset-env": "^7.28.5",
-    "@babel/runtime": "^7.28.4",
+    "@babel/core": "^7.29.7",
+    "@babel/plugin-proposal-decorators": "^7.29.7",
+    "@babel/preset-env": "^7.29.7",
+    "@babel/runtime": "^7.29.7",
     "@eslint/compat": "^2.0.0",
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.39.2",
     "@openapitools/openapi-generator-cli": "^2.26.0",
-    "@react-native-community/cli": "20.1.2",
-    "@react-native-community/cli-platform-android": "20.1.2",
-    "@react-native-community/cli-platform-ios": "20.1.2",
+    "@react-native-community/cli": "20.1.3",
+    "@react-native-community/cli-platform-android": "20.1.3",
+    "@react-native-community/cli-platform-ios": "20.1.3",
     "@react-native/babel-preset": "0.84.1",
     "@react-native/eslint-config": "0.84.1",
     "@react-native/metro-config": "0.83.1",
-    "@react-native/typescript-config": "0.83.1",
+    "@react-native/typescript-config": "0.86.0",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.10.4",
@@ -99,23 +99,5 @@
   },
   "engines": {
     "node": ">=20"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@nestjs/core",
-      "@openapitools/openapi-generator-cli",
-      "esbuild",
-      "unrs-resolver"
-    ],
-    "overrides": {
-      "jest-environment-node": "^30.4.1",
-      "jest-haste-map": "^30.4.1",
-      "jest-message-util": "^30.4.1",
-      "jest-mock": "^30.4.1",
-      "jest-regex-util": "^30.4.0",
-      "jest-util": "^30.4.1",
-      "jest-validate": "^30.4.1",
-      "jest-worker": "^30.4.1"
-    }
   }
 }
diff --git a/formulus/pnpm-lock.yaml b/formulus/pnpm-lock.yaml
index 1ccc51ef2..775c9ec9b 100644
--- a/formulus/pnpm-lock.yaml
+++ b/formulus/pnpm-lock.yaml
@@ -20,13 +20,13 @@ importers:
     dependencies:
       '@notifee/react-native':
         specifier: ^9.1.8
-        version: 9.1.8(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))
+        version: 9.1.8(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))
       '@nozbe/watermelondb':
         specifier: ^0.28.0
         version: 0.28.0
       '@ode/components':
         specifier: file:../packages/components
-        version: file:../packages/components(@ode/tokens@file:../packages/tokens)(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: file:../packages/components(@ode/tokens@file:../packages/tokens)(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@ode/observation-query':
         specifier: file:../packages/observation-query
         version: file:../packages/observation-query
@@ -35,107 +35,107 @@ importers:
         version: file:../packages/tokens
       '@react-native-async-storage/async-storage':
         specifier: ^2.2.0
-        version: 2.2.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))
+        version: 2.2.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))
       '@react-native-community/blur':
         specifier: ^4.4.1
-        version: 4.4.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 4.4.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-native-community/geolocation':
         specifier: ^3.4.0
-        version: 3.4.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 3.4.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-native-documents/picker':
         specifier: ^12.0.0
-        version: 12.0.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 12.0.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-native-vector-icons/fontawesome6':
         specifier: ^12.3.1
-        version: 12.4.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 12.4.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-native-vector-icons/material-design-icons':
         specifier: ^12.4.0
-        version: 12.5.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 12.5.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-native-vector-icons/material-icons':
         specifier: ^12.4.0
-        version: 12.5.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 12.5.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-navigation/bottom-tabs':
         specifier: ^7.9.0
-        version: 7.16.1(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-screens@4.25.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 7.16.1(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-screens@4.25.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-navigation/native':
         specifier: ^7.1.26
-        version: 7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       '@react-navigation/stack':
         specifier: ^7.6.13
-        version: 7.9.2(9012f47c946c765e465f66c3957358ea)
+        version: 7.9.2(e77e2ee8455471efeec313358832aef4)
       '@testing-library/react-native':
         specifier: ^13.3.3
-        version: 13.3.3(jest@30.4.2(@types/node@24.12.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react-test-renderer@19.2.4(react@19.2.4))(react@19.2.4)
+        version: 13.3.3(jest@30.4.2(@types/node@24.12.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react-test-renderer@19.2.4(react@19.2.4))(react@19.2.4)
       lucide-react-native:
         specifier: ^0.577.0
-        version: 0.577.0(react-native-svg@15.15.5(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 0.577.0(react-native-svg@15.15.5(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react:
         specifier: 19.2.4
         version: 19.2.4
       react-native:
         specifier: 0.83.1
-        version: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+        version: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
       react-native-camera-kit-no-google:
         specifier: ^17.0.1
-        version: 17.0.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 17.0.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-device-info:
         specifier: ^15.0.1
-        version: 15.0.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))
+        version: 15.0.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))
       react-native-fs:
         specifier: ^2.20.0
-        version: 2.20.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))
+        version: 2.20.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))
       react-native-gesture-handler:
         specifier: ^2.30.0
-        version: 2.31.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 2.31.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-image-picker:
         specifier: ^8.2.1
-        version: 8.2.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 8.2.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-keychain:
         specifier: ^10.0.0
         version: 10.0.0
       react-native-nitro-modules:
         specifier: ^0.35.4
-        version: 0.35.7(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 0.35.7(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-nitro-sound:
         specifier: ^0.2.10
-        version: 0.2.14(react-native-nitro-modules@0.35.7(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 0.2.14(react-native-nitro-modules@0.35.7(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-permissions:
         specifier: ^5.4.4
-        version: 5.5.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 5.5.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-safe-area-context:
-        specifier: ^5.6.2
-        version: 5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        specifier: ^5.8.0
+        version: 5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-screens:
         specifier: ^4.19.0
-        version: 4.25.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 4.25.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-signature-canvas:
         specifier: ^5.0.2
-        version: 5.0.2(react-native-webview@13.16.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))
+        version: 5.0.2(react-native-webview@13.16.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))
       react-native-svg:
         specifier: ^15.11.2
-        version: 15.15.5(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 15.15.5(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-url-polyfill:
         specifier: ^3.0.0
-        version: 3.0.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))
+        version: 3.0.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))
       react-native-webview:
         specifier: ^13.16.0
-        version: 13.16.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 13.16.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react-native-zip-archive:
         specifier: ^7.0.2
-        version: 7.1.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+        version: 7.1.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
     devDependencies:
       '@babel/core':
-        specifier: ^7.28.5
-        version: 7.29.0
+        specifier: ^7.29.7
+        version: 7.29.7
       '@babel/plugin-proposal-decorators':
-        specifier: ^7.28.0
-        version: 7.29.0(@babel/core@7.29.0)
+        specifier: ^7.29.7
+        version: 7.29.7(@babel/core@7.29.7)
       '@babel/preset-env':
-        specifier: ^7.28.5
-        version: 7.29.5(@babel/core@7.29.0)
+        specifier: ^7.29.7
+        version: 7.29.7(@babel/core@7.29.7)
       '@babel/runtime':
-        specifier: ^7.28.4
-        version: 7.29.2
+        specifier: ^7.29.7
+        version: 7.29.7
       '@eslint/compat':
         specifier: ^2.0.0
         version: 2.1.0(eslint@9.39.4)
@@ -149,26 +149,26 @@ importers:
         specifier: ^2.26.0
         version: 2.32.0
       '@react-native-community/cli':
-        specifier: 20.1.2
-        version: 20.1.2(typescript@5.9.3)
+        specifier: 20.1.3
+        version: 20.1.3(typescript@5.9.3)
       '@react-native-community/cli-platform-android':
-        specifier: 20.1.2
-        version: 20.1.2
+        specifier: 20.1.3
+        version: 20.1.3
       '@react-native-community/cli-platform-ios':
-        specifier: 20.1.2
-        version: 20.1.2
+        specifier: 20.1.3
+        version: 20.1.3
       '@react-native/babel-preset':
         specifier: 0.84.1
-        version: 0.84.1(@babel/core@7.29.0)
+        version: 0.84.1(@babel/core@7.29.7)
       '@react-native/eslint-config':
         specifier: 0.84.1
         version: 0.84.1(eslint@9.39.4)(jest@30.4.2(@types/node@24.12.4))(prettier@3.8.1)(typescript@5.9.3)
       '@react-native/metro-config':
         specifier: 0.83.1
-        version: 0.83.1(@babel/core@7.29.0)
+        version: 0.83.1(@babel/core@7.29.7)
       '@react-native/typescript-config':
-        specifier: 0.83.1
-        version: 0.83.1
+        specifier: 0.86.0
+        version: 0.86.0
       '@types/fs-extra':
         specifier: ^11.0.4
         version: 11.0.4
@@ -186,7 +186,7 @@ importers:
         version: 19.1.0
       baseline-browser-mapping:
         specifier: ^2.9.11
-        version: 2.10.30
+        version: 2.10.38
       eslint:
         specifier: ^9.39.2
         version: 9.39.4
@@ -233,12 +233,20 @@ packages:
     resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.29.7':
+    resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.29.3':
     resolution: {integrity: sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@7.29.0':
-    resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==}
+  '@babel/compat-data@7.29.7':
+    resolution: {integrity: sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.29.7':
+    resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==}
     engines: {node: '>=6.9.0'}
 
   '@babel/eslint-parser@7.28.6':
@@ -252,26 +260,50 @@ packages:
     resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.29.7':
+    resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-annotate-as-pure@7.27.3':
     resolution: {integrity: sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-annotate-as-pure@7.29.7':
+    resolution: {integrity: sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-compilation-targets@7.28.6':
     resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-compilation-targets@7.29.7':
+    resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-create-class-features-plugin@7.29.3':
     resolution: {integrity: sha512-RpLYy2sb51oNLjuu1iD3bwBqCBWUzjO0ocp+iaCP/lJtb2CPLcnC2Fftw+4sAzaMELGeWTgExSKADbdo0GFVzA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-create-class-features-plugin@7.29.7':
+    resolution: {integrity: sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-create-regexp-features-plugin@7.28.5':
     resolution: {integrity: sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-create-regexp-features-plugin@7.29.7':
+    resolution: {integrity: sha512-907Uymvqgg1dwUA+7IGwFAOSYzQOuzPXKNJ1yxzwPffzkYFg2q2eHi1fIOs6sXkG9NbIUMunnUlkYsfRFNvomg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-define-polyfill-provider@0.6.8':
     resolution: {integrity: sha512-47UwBLPpQi1NoWzLuHNjRoHlYXMwIJoBf7MFou6viC/sIHWYygpvr0B6IAyh5sBdA2nr2LPIRww8lfaUVQINBA==}
     peerDependencies:
@@ -281,62 +313,120 @@ packages:
     resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-globals@7.29.7':
+    resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-member-expression-to-functions@7.28.5':
     resolution: {integrity: sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-member-expression-to-functions@7.29.7':
+    resolution: {integrity: sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-imports@7.28.6':
     resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-module-imports@7.29.7':
+    resolution: {integrity: sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-transforms@7.28.6':
     resolution: {integrity: sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-module-transforms@7.29.7':
+    resolution: {integrity: sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-optimise-call-expression@7.27.1':
     resolution: {integrity: sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-optimise-call-expression@7.29.7':
+    resolution: {integrity: sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-plugin-utils@7.28.6':
     resolution: {integrity: sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-plugin-utils@7.29.7':
+    resolution: {integrity: sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-remap-async-to-generator@7.27.1':
     resolution: {integrity: sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-remap-async-to-generator@7.29.7':
+    resolution: {integrity: sha512-16AMiW26DbXWBbr3B8wNozKM0ydMLB892vaOaJW/fPJdnT8vJk5sdkQcU/isqUxyCE0cEoa8wZOcbgDuC4b6Og==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-replace-supers@7.28.6':
     resolution: {integrity: sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-replace-supers@7.29.7':
+    resolution: {integrity: sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
     resolution: {integrity: sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-skip-transparent-expression-wrappers@7.29.7':
+    resolution: {integrity: sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-string-parser@7.27.1':
     resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-string-parser@7.29.7':
+    resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-identifier@7.28.5':
     resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-identifier@7.29.7':
+    resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-option@7.27.1':
     resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-option@7.29.7':
+    resolution: {integrity: sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-wrap-function@7.28.6':
     resolution: {integrity: sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helpers@7.29.2':
-    resolution: {integrity: sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==}
+  '@babel/helper-wrap-function@7.29.7':
+    resolution: {integrity: sha512-iES0Skag9ERIF68aXadpO6dbXa03mNWK3sEqJaMnLNs/eC3l0lkImdfoy6Y09/SfkpawdAB4RjQ7PVA7TcVGdw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.29.7':
+    resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}
     engines: {node: '>=6.9.0'}
 
   '@babel/parser@7.29.3':
@@ -344,44 +434,49 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.28.5':
-    resolution: {integrity: sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==}
+  '@babel/parser@7.29.7':
+    resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.29.7':
+    resolution: {integrity: sha512-j8SrR0zLZrRsC09DlszEx8FpMiwukKffYXMK0d5LmOglO7vGG6sz/BR/20yHqWH+Lnn31JTt2PE3hIWNgM2J6w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1':
-    resolution: {integrity: sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==}
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.29.7':
+    resolution: {integrity: sha512-r8j8escF+U2FUHo0KOhPUdMzUO+jp9fInva6+ACVAF3Y97Ev+5iNZwiqTghmzNeWwDkOPlYuTcfb1vDaoZKmAQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1':
-    resolution: {integrity: sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==}
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.29.7':
+    resolution: {integrity: sha512-GE1TFSiuFeGsCxmYXZl8HwoPrVlwe4rHPFE8weieGKZqnDORK+Ar3vgWMgW+AOxQ6/2TgLSKx9p6W7O4rC6qgQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@7.29.3':
-    resolution: {integrity: sha512-SRS46DFR4HqzUzCVgi90/xMoL+zeBDBvWdKYXSEzh79kXswNFEglUpMKxR04//dPqwYXWUBJ3mpUd933ru9Kmg==}
+  '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@7.29.7':
+    resolution: {integrity: sha512-oBNVCvnO5tND+xSopWvV8WNGfpTfgP4Zr/YXXSj8zfmcPktp5Ku/aZlsIowgSD4fjmgHn6sGmB9APVsU5zOdhA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1':
-    resolution: {integrity: sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==}
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.29.7':
+    resolution: {integrity: sha512-QQt9qKHZ2sg/kivaLr7lnQr8HVrQDdBNSfCsTjiDxRuX/K5ORyKq+Bu8Xr0cDE3Dfkv0cw28Ve0EKyKMvulkOw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.13.0
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.6':
-    resolution: {integrity: sha512-a0aBScVTlNaiUe35UtfxAN7A/tehvvG4/ByO6+46VPKTRSlfnAFsgKy0FUh+qAkQrDTmhDkT+IBOKlOoMUxQ0g==}
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.29.7':
+    resolution: {integrity: sha512-pn6QacGLgvCcwc+syUhKE/qSjV2D1IHDB84RNxWYSt1mW3K/SCtjinZ2p0cETJxAWBjPy3K/1lHwG5BjjPxNlw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-proposal-decorators@7.29.0':
-    resolution: {integrity: sha512-CVBVv3VY/XRMxRYq5dwr2DS7/MvqPm23cOCjbwNnVrfOqcWlnefua1uUs0sjdKOGjvPUG633o07uWzJq4oI6dA==}
+  '@babel/plugin-proposal-decorators@7.29.7':
+    resolution: {integrity: sha512-EtU0Hi3GvrTqD56xKmZvV/uCXK2ZbwVNPNLAquVItcAZpUhkXwWlo3Fmj0c2LxgSf2I8IDULeAepwNP1OefLXg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -419,8 +514,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-decorators@7.28.6':
-    resolution: {integrity: sha512-71EYI0ONURHJBL4rSFXnITXqXrrY8q4P0q006DPfN+Rk+ASM+++IBXem/ruokgBZR8YNEWZ8R6B+rCb8VcUTqA==}
+  '@babel/plugin-syntax-decorators@7.29.7':
+    resolution: {integrity: sha512-9MTTLbF39X6sqM92JPEsoI7++26hjZvzkxKZy64aMhWLH2mPkJ/Q3AV4QLmls3R14FpSpkOwQQfUh962JGQxxg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -442,8 +537,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-assertions@7.28.6':
-    resolution: {integrity: sha512-pSJUpFHdx9z5nqTSirOCMtYVP2wFgoWhP0p3g8ONK/4IHhLIBd0B9NYqAvIUAhq+OkhO4VM1tENCt0cjlsNShw==}
+  '@babel/plugin-syntax-import-assertions@7.29.7':
+    resolution: {integrity: sha512-/An1OCBN93thpBAGyfsK2pcf0jvju1SAtKkL2Ny++B5Sy6sqgzXDQH1cZxWbF96Wuk+bn41MDA9bLd4VVAw6rw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -454,6 +549,12 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-syntax-import-attributes@7.29.7':
+    resolution: {integrity: sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-syntax-import-meta@7.10.4':
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
@@ -530,20 +631,38 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-arrow-functions@7.29.7':
+    resolution: {integrity: sha512-N7zArUXWzAMzm+/N0uPBeVB3Fam5lMxtUwMmDK5f/IBBS7a7p1qeUoxd/6CckXoxUdgsntq1Dh8xNW06maZbDQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-async-generator-functions@7.29.0':
     resolution: {integrity: sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-async-generator-functions@7.29.7':
+    resolution: {integrity: sha512-d98gXZkgswvkyohMBABkhm3GeXhYj8psWfwQ2C7gtfrKGTykQa/iOIi+JJhwMjPlZ6Vm2XN+DCf3Es1EoG4ZLA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-async-to-generator@7.28.6':
     resolution: {integrity: sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-block-scoped-functions@7.27.1':
-    resolution: {integrity: sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==}
+  '@babel/plugin-transform-async-to-generator@7.29.7':
+    resolution: {integrity: sha512-pcUb2SS+RMo9TWVBwKGI5ShtoG7R+zBsFmCKDa6fe8c+hPr3XJlZgoE5j6i8W7gDjhyvy+85vmYexanvXh3d1w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoped-functions@7.29.7':
+    resolution: {integrity: sha512-cUSmjh72N+rN4PrkFlN1dJwNCwjVp5d38/CQrEsFggkD10UiFlBFgdH3tv5dNsLuHY+3S8db2xCHjhZcv5WgvA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -554,14 +673,26 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-block-scoping@7.29.7':
+    resolution: {integrity: sha512-ONyr4+AZhKh8yKWInVxU9AXA9EbsyeLcL6V0dJy6M2/62vuvpGm29zzuymbTpdc451GEpDIdAyPLP3r+P61yKQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-class-properties@7.28.6':
     resolution: {integrity: sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-class-static-block@7.28.6':
-    resolution: {integrity: sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==}
+  '@babel/plugin-transform-class-properties@7.29.7':
+    resolution: {integrity: sha512-GtcpjFvanPfzNQi3eTitsCqtRRmmqzpy/A+yhTR1HaZo1Ly3EA8ZXxlPyHdR8/IuRMYc3E4wdGBewB2QKQjAaA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-static-block@7.29.7':
+    resolution: {integrity: sha512-kibJgmEdX2iMwsHY2tSZNDgj8PwIlCQz7FK9KuGKO8zsuoUwSEhoNnNVp/emKWrbY4HeO6kkXfdMqRKKKXBm2A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.12.0
@@ -572,56 +703,74 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-classes@7.29.7':
+    resolution: {integrity: sha512-qV0OGGBVacduzQHE649JyCneOFI/maT+YKsO+K4Yi3xv2wTPNjM/W2o2gdzMwEAZz7fXNTHAe0NcSg30bIN69g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-computed-properties@7.28.6':
     resolution: {integrity: sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-computed-properties@7.29.7':
+    resolution: {integrity: sha512-RK7/IyU5phpuCdBAuig5VkzG/EnbDaui5SQGdU9BFrHdV+mV4cUjLMQ9lJDjLNtWHsqtiefpGZUXQP2BiTYMsA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-destructuring@7.28.5':
     resolution: {integrity: sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-dotall-regex@7.28.6':
-    resolution: {integrity: sha512-SljjowuNKB7q5Oayv4FoPzeB74g3QgLt8IVJw9ADvWy3QnUb/01aw8I4AVv8wYnPvQz2GDDZ/g3GhcNyDBI4Bg==}
+  '@babel/plugin-transform-destructuring@7.29.7':
+    resolution: {integrity: sha512-iPX8aD6H9zV5s7ZsqTdNocPN/MGQ5sSMnElKrktxjJRMnB2jN/1p2+R7GkfD6CAYoVFqy5A4XnSIUeGgJzIWpg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-dotall-regex@7.29.7':
+    resolution: {integrity: sha512-3qc18hsD2RdZiyJNDNc7HQpv6xbncwh8FYtxNFFzclSyh/trPD9KkVR9BDECUjDLvb7yJVF15GfYUuC+LMkkiQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-duplicate-keys@7.27.1':
-    resolution: {integrity: sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==}
+  '@babel/plugin-transform-duplicate-keys@7.29.7':
+    resolution: {integrity: sha512-6IvRRriEMqnBwD6chtxdLpMYCHWEzN+oL5cyQtjykya19UgzbmKhxmhZgKC/LHxS2nYr9Q/qYPZ5Lr6jOL9+yQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.0':
-    resolution: {integrity: sha512-zBPcW2lFGxdiD8PUnPwJjag2J9otbcLQzvbiOzDxpYXyCuYX9agOwMPGn1prVH0a4qzhCKu24rlH4c1f7yA8rw==}
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.7':
+    resolution: {integrity: sha512-2wiIyo2BjtgU7HufSeDnL9L2O7zr8jmhFKuSr65VpRkUiRKRNpb0mdlk56+XPPKoIrfHqzbMuglDvZun0RISsA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-transform-dynamic-import@7.27.1':
-    resolution: {integrity: sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==}
+  '@babel/plugin-transform-dynamic-import@7.29.7':
+    resolution: {integrity: sha512-giOlEm/EFjfjr+te9NsdjkUo2v4f8rS/SXPumRVHAtbNcyNlvtREkU1dZzaIDclNpnaVhlCqRdFKhJBjBikzLg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-explicit-resource-management@7.28.6':
-    resolution: {integrity: sha512-Iao5Konzx2b6g7EPqTy40UZbcdXE126tTxVFr/nAIj+WItNxjKSYTEw3RC+A2/ZetmdJsgueL1KhaMCQHkLPIg==}
+  '@babel/plugin-transform-explicit-resource-management@7.29.7':
+    resolution: {integrity: sha512-Rstj7coNz8sE+7Ju7ihpHLI564lsK5pUpNNlvptCIC/16E/S5hbl6n3kESPKdNRmqEWlpn5xpS5Q2dvXBsySLw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-exponentiation-operator@7.28.6':
-    resolution: {integrity: sha512-WitabqiGjV/vJ0aPOLSFfNY1u9U3R7W36B03r5I2KoNix+a3sOhJ3pKFB3R5It9/UiK78NiO0KE9P21cMhlPkw==}
+  '@babel/plugin-transform-exponentiation-operator@7.29.7':
+    resolution: {integrity: sha512-zFpMOTLZBdW5LfObqcSbL6kefg4R4eLdmvS0wbN9M6D5Mym/sKm9toOoWyVOa+xDjvCnuWcHls2YonXwHvH3CQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-export-namespace-from@7.27.1':
-    resolution: {integrity: sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==}
+  '@babel/plugin-transform-export-namespace-from@7.29.7':
+    resolution: {integrity: sha512-24B2nOy2TeJSMheqwPD4DDQOV/elLSIlKxjZt4i05H5AgdPdWR3n18HnNrcJ+j76WJd9gbwb9jPjNYUy6RautA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -638,14 +787,26 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-for-of@7.29.7':
+    resolution: {integrity: sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-function-name@7.27.1':
     resolution: {integrity: sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-json-strings@7.28.6':
-    resolution: {integrity: sha512-Nr+hEN+0geQkzhbdgQVPoqr47lZbm+5fCUmO70722xJZd0Mvb59+33QLImGj6F+DkK3xgDi1YVysP8whD6FQAw==}
+  '@babel/plugin-transform-function-name@7.29.7':
+    resolution: {integrity: sha512-otRWaHXE6fbAGkePvaj/kvs3HsqXfPhlnzwSOlnFgbqCPMd975dW+4wZ00WFBt+/YlBGcJwNrARQTOJOb4ZrIg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-json-strings@7.29.7':
+    resolution: {integrity: sha512-RRnE2+eon1rJAq8MnoF1b5kTpY1vU88twHcvcKMrsqP/jxIRqDVs9iJB5fqPuqyeFAW0wJo4MlUIPpQCq/aRsg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -656,20 +817,32 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-literals@7.29.7':
+    resolution: {integrity: sha512-DZ/oLP21ZuWx1vKqnoNv6/tvEK48AQOBRai40CX9dTjGluvT/YZCyY3rryDtyUqCEoyNroy5KKPwX2iQCiRvyw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-logical-assignment-operators@7.28.6':
     resolution: {integrity: sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-member-expression-literals@7.27.1':
-    resolution: {integrity: sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==}
+  '@babel/plugin-transform-logical-assignment-operators@7.29.7':
+    resolution: {integrity: sha512-A0H91hh6W8MFRkp5TqJmMr39jzGD1A1E1Ysiv2O06Sfbhkapm+XyIzxWCEh5kqwOZ1/8QZ0dY3SeQ7XBqfJd5Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-amd@7.27.1':
-    resolution: {integrity: sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==}
+  '@babel/plugin-transform-member-expression-literals@7.29.7':
+    resolution: {integrity: sha512-hl1kwFZCCiDyfH25Xmco9jTrkPgnS9pmOzSG7W5I4SaGbLeqKv417hcU2RKmaxoPEgsoJh7ZPOrnPGq99bHoUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-amd@7.29.7':
+    resolution: {integrity: sha512-fxtQoH3m5ywUSIfaH0FGCzWu4McsYon5bD3K4XnskC7f+OyQMj7rsOMi4NvvmJ83WwBAg4UCe+ov4VZlqEvyew==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -680,14 +853,20 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-systemjs@7.29.4':
-    resolution: {integrity: sha512-N7QmZ0xRZfjHOfZeQLJjwgX2zS9pdGHSVl/cjSGlo4dXMqvurfxXDMKY4RqEKzPozV78VMcd0lxyG13mlbKc4w==}
+  '@babel/plugin-transform-modules-commonjs@7.29.7':
+    resolution: {integrity: sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-systemjs@7.29.7':
+    resolution: {integrity: sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-umd@7.27.1':
-    resolution: {integrity: sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==}
+  '@babel/plugin-transform-modules-umd@7.29.7':
+    resolution: {integrity: sha512-B4UkaTK3QpgCwJnrxKfMPKdo92CN7OKXAlpAAnM3UPu0Q0lCCk57ylA9AJbRy2v8dDKOPAAWcoR6CMyeoHwRCA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -698,8 +877,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-transform-new-target@7.27.1':
-    resolution: {integrity: sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==}
+  '@babel/plugin-transform-named-capturing-groups-regex@7.29.7':
+    resolution: {integrity: sha512-vuFoLwr4qnv2xbZ16SQd6uPcH5FNrLHhk/Jzo++0XJFcaDsr4gjJVg6j398oMHiC+83k/GiBzviwF5KBJkPUtQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-new-target@7.29.7':
+    resolution: {integrity: sha512-fEo41GmsOUhOBlw8ioo6zvjX5Xc2Lqkzlyfqbpsk3eB6TReV18uhxZ0esfEokVbY2+PVJAQHNKxER6lGrzNd3A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -710,20 +895,38 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-nullish-coalescing-operator@7.29.7':
+    resolution: {integrity: sha512-idmp1dFaekP9GbcMvG24Kvw2BfhFZjHnNJCkV4WuIY4PskJzwI3f1N5OdgYke38T7rftO6ERulFRn2cFeZwRkg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-numeric-separator@7.28.6':
     resolution: {integrity: sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-numeric-separator@7.29.7':
+    resolution: {integrity: sha512-zR7fv/z14OjgHl4AgRtkDBvBMhIzCxqV/qN/2BCRC7LjFwvuzjYe7gDWxC4Wl/SNsLM6SE1IWvRPYMgSJaUvNw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-object-rest-spread@7.28.6':
     resolution: {integrity: sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-object-super@7.27.1':
-    resolution: {integrity: sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==}
+  '@babel/plugin-transform-object-rest-spread@7.29.7':
+    resolution: {integrity: sha512-Ld98jn4c0smUywL57m7SgsHq3OpThOa6LqZJif3G6jYOovPleoFhVrBJ1WegRApSFB2wu4+RelAj9AC9G08Z4A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-super@7.29.7':
+    resolution: {integrity: sha512-Ea/diGcw0twB5IlZPO5sgET6fJsLJqPABqTuFWIR+iMPGPZJkATEIWx0wa+aEQ5UY1CBQyP/gkAiLEqn1vBiQA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -734,32 +937,62 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-optional-catch-binding@7.29.7':
+    resolution: {integrity: sha512-sLsyndxK2VwX6yNUOakMb7Sh553ZTe/vVM1XJ+9Z5aW1ytsc8xOIwmyk05NNjN60vkc5/KqoTH6hB4V41LJhng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-optional-chaining@7.28.6':
     resolution: {integrity: sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-optional-chaining@7.29.7':
+    resolution: {integrity: sha512-6GM1dhvK3gNODkXcEcMCOLEDCLSoZ/sBbro2Ax8HURyasQ4NshagQixkRFdh5niI6E4gmA/jYI/4aT7rRos3ZQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-parameters@7.27.7':
     resolution: {integrity: sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-parameters@7.29.7':
+    resolution: {integrity: sha512-ZDOBqV/qLYJI0YElr8DcENEyARsFQeESqWXH6gZlghYXuPPjvweuDhP4VyEi4BlUBlLRFZVjxoZDMjxhLW766g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-private-methods@7.28.6':
     resolution: {integrity: sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-private-methods@7.29.7':
+    resolution: {integrity: sha512-/6Rz4DK1ETDEM/bWHsPHcaEe7ZaT1EqSXjtSP/L0DijOYuaUhiRiOKcwpZ8P7zR4xXEHc2ITdiCgBm9Tpyv9ug==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-private-property-in-object@7.28.6':
     resolution: {integrity: sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-property-literals@7.27.1':
-    resolution: {integrity: sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==}
+  '@babel/plugin-transform-private-property-in-object@7.29.7':
+    resolution: {integrity: sha512-+BNo06dnrzdNNqCm1X6YUaVv0DKk8Q+JYcoZfOkLhYWNCXzlwTSRq8zGWayT1csjcpNXV9CQTBRRbmTLZac5cA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-literals@7.29.7':
+    resolution: {integrity: sha512-bOMRLQuI0A5ZqHq3OWJ89/rXpJ/NJrbVhXiP4zwPGMs6kpcVsuTUNjwoE30K0Qm3mf48a/TnRYYD6vPNqcg6jA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -794,14 +1027,20 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-regexp-modifiers@7.28.6':
-    resolution: {integrity: sha512-QGWAepm9qxpaIs7UM9FvUSnCGlb8Ua1RhyM4/veAxLwt3gMat/LSGrZixyuj4I6+Kn9iwvqCyPTtbdxanYoWYg==}
+  '@babel/plugin-transform-regenerator@7.29.7':
+    resolution: {integrity: sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regexp-modifiers@7.29.7':
+    resolution: {integrity: sha512-mB5Fs0VWrJ42ZCmc8114v60qetdaUVNkj9PmSZRmanCZM3S9hm0CFRLjRmYIsuXav14l2jvZ+4T8iiCGnhj3nQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-transform-reserved-words@7.27.1':
-    resolution: {integrity: sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==}
+  '@babel/plugin-transform-reserved-words@7.29.7':
+    resolution: {integrity: sha512-5+YhdpVgmfSmwZyLMftfaiffLRMHjzIRHFHHLdibcSyJm2pasMrKHrO3Ptrt2DRshjvpgjEJJ1zVW14WPq/6QA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -818,26 +1057,44 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-shorthand-properties@7.29.7':
+    resolution: {integrity: sha512-I+WYbGBAiCn7nA6xBrlgPH+MB7HWb4u8pv5S0Pv7OtwNvIFvCCb24YlttKEeUFVurfBCEaOTnuhlqsb7f0Z5Dg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-spread@7.28.6':
     resolution: {integrity: sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-transform-spread@7.29.7':
+    resolution: {integrity: sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-transform-sticky-regex@7.27.1':
     resolution: {integrity: sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-template-literals@7.27.1':
-    resolution: {integrity: sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==}
+  '@babel/plugin-transform-sticky-regex@7.29.7':
+    resolution: {integrity: sha512-BCHzNYJGe9l7EpwwDBN/ztlL2NYFFq8hp9ddjtUEM9f2O7S7kKV/lL6Fwo7IF7NSkYhPK2vO+86nIGltA90MsA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-template-literals@7.29.7':
+    resolution: {integrity: sha512-NCSEJ4sLFU2gqAub45HYh4fus2yQ36rr6ei6vpU7NdoJqCpxvEG8E6eJpscGyXP3VHD2Ny+fSXr04k1hoUrFqA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-typeof-symbol@7.27.1':
-    resolution: {integrity: sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==}
+  '@babel/plugin-transform-typeof-symbol@7.29.7':
+    resolution: {integrity: sha512-223mNGoTkBiTEWFoK+Q6Go3tueMRclO8vxxxxquNCYuNI4jWOofFKJRRDu6SDrB8Sgo1UEGW9T4GAQ8ZyRso1A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -848,14 +1105,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-escapes@7.27.1':
-    resolution: {integrity: sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==}
+  '@babel/plugin-transform-unicode-escapes@7.29.7':
+    resolution: {integrity: sha512-jCfXxSjf94lf4E0hKE0AByxF6F3/pVFqRdUUNkDJhsY0m1ZKjnN6ZYyMeHNpzflxb/0q5b7t3p+BE+SLF1WOtA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-property-regex@7.28.6':
-    resolution: {integrity: sha512-4Wlbdl/sIZjzi/8St0evF0gEZrgOswVO6aOzqxh1kDZOl9WmLrHq2HtGhnOJZmHZYKP8WZ1MDLCt5DAWwRo57A==}
+  '@babel/plugin-transform-unicode-property-regex@7.29.7':
+    resolution: {integrity: sha512-OgZ+zoAJgZLUCunsTRQ5LAjOywDv5zzZ2/hQ5aMw1pGXyY2rtE8/chXYUmu3AlVHKpm10KEdG9aMwbI/K76ZGw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -866,14 +1123,20 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-sets-regex@7.28.6':
-    resolution: {integrity: sha512-/wHc/paTUmsDYN7SZkpWxogTOBNnlx7nBQYfy6JJlCT7G3mVhltk3e++N7zV0XfgGsrqBxd4rJQt9H16I21Y1Q==}
+  '@babel/plugin-transform-unicode-regex@7.29.7':
+    resolution: {integrity: sha512-7D/x/23/d/3VqZ0QA+LGbZMlGwZjztBygSWWWsfTPoQ1oQ6Q1P6Mr3d0kk42XabyUVw+fha3LqdRsFqeKqvCyA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-sets-regex@7.29.7':
+    resolution: {integrity: sha512-BLOhLht9DOJwIxlmp91wHvkXv1lguuHS3/FwUO8HL1H0u8s4hR1gASVFyilu9iGtcTRYqjTZmlsFFeQletntEg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/preset-env@7.29.5':
-    resolution: {integrity: sha512-/69t2aEzGKHD76DyLbHysF/QH2LJOB8iFnYO37unDTKBTubzcMRv0f3H5EiN1Q6ajOd/eB7dAInF0qdFVS06kA==}
+  '@babel/preset-env@7.29.7':
+    resolution: {integrity: sha512-GYzX36n1nsciIb0uyH0GHwxwtNwPQIcpxSeiVLDtG/B7jB5xXgchnmL1f/jCX5o+pwnaDBtO60ONSJhEBJfxYA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -887,22 +1150,34 @@ packages:
     resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/runtime@7.29.2':
-    resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}
+  '@babel/runtime@7.29.7':
+    resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==}
     engines: {node: '>=6.9.0'}
 
   '@babel/template@7.28.6':
     resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.29.7':
+    resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@7.29.0':
     resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.29.7':
+    resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@7.29.0':
     resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.29.7':
+    resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==}
+    engines: {node: '>=6.9.0'}
+
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
@@ -1428,41 +1703,41 @@ packages:
       react: '*'
       react-native: '*'
 
-  '@react-native-community/cli-clean@20.1.2':
-    resolution: {integrity: sha512-XcNlmFnYOVDjvHQQn0qreI4FPLEUx8p43EdOmKbtzqwqc9T/EdBdzUnUc5wWQPO1CN7BdMfxW8fyvosz8NIlrg==}
+  '@react-native-community/cli-clean@20.1.3':
+    resolution: {integrity: sha512-sFLdLzapfC0scjgzBJJWYDY2RhHPjuuPkA5r6q0gc/UQH/izXpMpLrhh1DW84cMDraNACK0U62tU7ebNaQ1LMQ==}
 
-  '@react-native-community/cli-config-android@20.1.2':
-    resolution: {integrity: sha512-W0Qx+lW8pbQMz8x3Rlf/H7D2j2u8O+u9HnrZnKzDl1DaXgaOQqL484lTZlMEQofjq7eLXdmzWxuZdqS6K1QfmQ==}
+  '@react-native-community/cli-config-android@20.1.3':
+    resolution: {integrity: sha512-DNHDP+OWLyhKShGciBqPcxhxfp1Z/7GQcb4F+TGyCeKQAr+JdnUjRXN3X+YCU/v+g2kbYYyRJKlGabzkVvdrAw==}
 
-  '@react-native-community/cli-config-apple@20.1.2':
-    resolution: {integrity: sha512-Dhi1N1EoMMmJ4dnDlmNWCrJggfv7X/kl3l8uax72uaxepQI/CfohJP2rBdG2mWis+vzrCIk14z2keY0ixxsN8g==}
+  '@react-native-community/cli-config-apple@20.1.3':
+    resolution: {integrity: sha512-QX9B83nAfCPs0KiaYz61kAEHWr9sttooxzRzNdQwvZTwnsIpvWOT9GvMMj/19OeXiQzMJBzZX0Pgt6+spiUsDQ==}
 
-  '@react-native-community/cli-config@20.1.2':
-    resolution: {integrity: sha512-7aPE14QA8aXpfuQ1jmfiBfjC/N6gdbg6PpBTwb3cl8c/KaeVm+OQYoC2kn2b3XS0NPgw5Ix/VxVaX6AAUQRFuA==}
+  '@react-native-community/cli-config@20.1.3':
+    resolution: {integrity: sha512-n73nW0cG92oNF0r994pPqm0DjAShOm3F8LSffDYhJqNAno+h/csmv/37iL4NtSpmKIO8xqsG3uVTXz9X/hzNaQ==}
 
-  '@react-native-community/cli-doctor@20.1.2':
-    resolution: {integrity: sha512-bbT1EhomvHz5ZtzxY2czA4/JMXhP4aIAxRDsqiW6wfZA9A9/HXqA4uv6CxP0wZUUmovmPNRl3kW/LWXrRmdv3A==}
+  '@react-native-community/cli-doctor@20.1.3':
+    resolution: {integrity: sha512-EI+mAPWn255/WZ4CQohy1I049yiaxVr41C3BeQ2BCyhxODIDR8XRsLzYb1t9MfqK/C3ZncUN2mPSRXFeKPPI1w==}
 
-  '@react-native-community/cli-platform-android@20.1.2':
-    resolution: {integrity: sha512-1iHB8cTTJpMyEKhxWTRYsxhBBsiOq3tVguGX/HtBdHRzhlCeDpanE6U+aKxWfMFetMcFL+HLe5nQPcJXf9EtKg==}
+  '@react-native-community/cli-platform-android@20.1.3':
+    resolution: {integrity: sha512-bzB9ELPOISuqgtDZXFPQlkuxx1YFkNx3cNgslc5ElCrk+5LeCLQLIBh/dmIuK8rwUrPcrramjeBj++Noc+TaAA==}
 
-  '@react-native-community/cli-platform-apple@20.1.2':
-    resolution: {integrity: sha512-UvzjcRGotO3E2xaty8YWE2XMGkkDDaXRtQtNRjzmtcoNY40C+y4iMHxd0o3xbD0bzYM/PO79tXye9MxTWdyVkg==}
+  '@react-native-community/cli-platform-apple@20.1.3':
+    resolution: {integrity: sha512-XJ+DqAD4hkplWVXK5AMgN7pP9+4yRSe5KfZ/b42+ofkDBI55ALlUmX+9HWE3fMuRjcotTCoNZqX2ov97cFDXpQ==}
 
-  '@react-native-community/cli-platform-ios@20.1.2':
-    resolution: {integrity: sha512-ZzdLwJMt7ehjO0iy/rQGPgH6uZqMYXeS5uXzSi1DeLYwurV1wOqFc0SLm4TAz5FKYQmHpwBXlMiI12rUmkZxcg==}
+  '@react-native-community/cli-platform-ios@20.1.3':
+    resolution: {integrity: sha512-2qL48SINotuHbZO73cgqSwqd/OWNx0xTbFSdujhpogV4p8BNwYYypfjh4vJY5qJEB5PxuoVkMXT+aCADpg9nBg==}
 
-  '@react-native-community/cli-server-api@20.1.2':
-    resolution: {integrity: sha512-ZlINtIYoDAwSemwTU9OavI1IixCCmAPPw1s3Mp0cOvrddFSZ0hx1N1IR+imLyo4lhFfM8OO3rUe9oVJj1SHUCA==}
+  '@react-native-community/cli-server-api@20.1.3':
+    resolution: {integrity: sha512-hsNsdUKZDd2T99OuNuiXz4VuvLa1UN0zcxefmPjXQgI0byrBLzzDr+o7p03sKuODSzKi2h+BMnUxiS07HACQLA==}
 
-  '@react-native-community/cli-tools@20.1.2':
-    resolution: {integrity: sha512-on2VUBZb68RlMxvIrEdK6+NiOEYu/z+t/cz746yGtxn49fwW6Wafzmh1QNZj8HPAuZ8+Ds61LiXbwoDDkzNSSA==}
+  '@react-native-community/cli-tools@20.1.3':
+    resolution: {integrity: sha512-EAn0vPCMxtHhfWk2UwLmSUfPfLUnFgC7NjiVJVTKJyVk5qGnkPfoT8te/1IUXFTysUB0F0RIi+NgDB4usFOLeA==}
 
-  '@react-native-community/cli-types@20.1.2':
-    resolution: {integrity: sha512-WYK98VdcJE+lRuyRzigE/GQAbaJZOKkjpaLwhmMMItXVTqMmIccfGu9b4pRoQOVfs1aLq87DuwUOi9sxz6OG1g==}
+  '@react-native-community/cli-types@20.1.3':
+    resolution: {integrity: sha512-IdAcegf0pH1hVraxWTG1ACLkYC0LDQfqtaEf42ESyLIF3Xap70JzL/9tAlxw7lSCPZPFWhrcgU0TBc4SkC/ecw==}
 
-  '@react-native-community/cli@20.1.2':
-    resolution: {integrity: sha512-48GRnGfm1+4ueV8ESNJmKAKW01QdbB8H6qrVxCqpHYvuRkeFBaPpwRY2bEjSwqruw3Pn9ppzGfpAxYQDiUWQxQ==}
+  '@react-native-community/cli@20.1.3':
+    resolution: {integrity: sha512-sLo8cu9JyFNfuuF1C+8NJ4DHE/PEFaXGd4enkcxi/OJjGG8+sOQrdjNQ4i+cVh/2c+ah1mEMwsYjc3z0+/MqSg==}
     engines: {node: '>=20.19.4'}
     hasBin: true
 
@@ -1607,8 +1882,8 @@ packages:
   '@react-native/normalize-colors@0.83.1':
     resolution: {integrity: sha512-84feABbmeWo1kg81726UOlMKAhcQyFXYz2SjRKYkS78QmfhVDhJ2o/ps1VjhFfBz0i/scDwT1XNv9GwmRIghkg==}
 
-  '@react-native/typescript-config@0.83.1':
-    resolution: {integrity: sha512-y83qd7fmlZG+EJoOyKEmAXifdjN1csNhcfpyxDvgaIUNO/pw2ws3MV/wp+ERQ8F6JIuAu1zcfyCy1/pEA7tC9g==}
+  '@react-native/typescript-config@0.86.0':
+    resolution: {integrity: sha512-oSuFIEMVAVEXdIvDnrdXsWmIF4fYdgtvAEr2ofn8OY534m7XWm9QAqHHpGUzoK0iwDPlPZ5n2Rb25gqF1SZ0rg==}
 
   '@react-native/virtualized-lists@0.83.1':
     resolution: {integrity: sha512-MdmoAbQUTOdicCocm5XAFDJWsswxk7hxa6ALnm6Y88p01HFML0W593hAn6qOt9q6IM1KbAcebtH6oOd4gcQy8w==}
@@ -2174,8 +2449,8 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.10.30:
-    resolution: {integrity: sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==}
+  baseline-browser-mapping@2.10.38:
+    resolution: {integrity: sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -4115,6 +4390,9 @@ packages:
   react-is@19.2.6:
     resolution: {integrity: sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==}
 
+  react-is@19.2.7:
+    resolution: {integrity: sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==}
+
   react-native-camera-kit-no-google@17.0.4:
     resolution: {integrity: sha512-G8QjEx6cNYQor7vYX4bEaqE880/vJ4VvldUpB2MQVs2cb8k7mSUiv4X5yiWyvJpXz98W72sX5Evuqo3c1VIy0w==}
     engines: {node: '>=18'}
@@ -4175,8 +4453,8 @@ packages:
       react-native-windows:
         optional: true
 
-  react-native-safe-area-context@5.7.0:
-    resolution: {integrity: sha512-/9/MtQz8ODphjsLdZ+GZAIcC/RtoqW9EeShf7Uvnfgm/pzYrJ75y3PV/J1wuAV1T5Dye5ygq4EAW20RoBq0ABQ==}
+  react-native-safe-area-context@5.8.0:
+    resolution: {integrity: sha512-t+ZsAVzY/wWzzx34vqGbo3/as9EEESJdbyZNL7Yg5EYX+toYMtMqFoDDCvqZUi35eeGVsXc6pAaEk4edMwbuCQ==}
     peerDependencies:
       react: '*'
       react-native: '*'
@@ -4958,19 +5236,27 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
+  '@babel/code-frame@7.29.7':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.29.7
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
   '@babel/compat-data@7.29.3': {}
 
-  '@babel/core@7.29.0':
+  '@babel/compat-data@7.29.7': {}
+
+  '@babel/core@7.29.7':
     dependencies:
-      '@babel/code-frame': 7.29.0
-      '@babel/generator': 7.29.1
-      '@babel/helper-compilation-targets': 7.28.6
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
-      '@babel/helpers': 7.29.2
-      '@babel/parser': 7.29.3
-      '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
-      '@babel/types': 7.29.0
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helpers': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
       debug: 4.4.3
@@ -4980,9 +5266,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/eslint-parser@7.28.6(@babel/core@7.29.0)(eslint@9.39.4)':
+  '@babel/eslint-parser@7.28.6(@babel/core@7.29.7)(eslint@9.39.4)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1
       eslint: 9.39.4
       eslint-visitor-keys: 2.1.0
@@ -4996,10 +5282,22 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
+  '@babel/generator@7.29.7':
+    dependencies:
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
   '@babel/helper-annotate-as-pure@7.27.3':
     dependencies:
       '@babel/types': 7.29.0
 
+  '@babel/helper-annotate-as-pure@7.29.7':
+    dependencies:
+      '@babel/types': 7.29.7
+
   '@babel/helper-compilation-targets@7.28.6':
     dependencies:
       '@babel/compat-data': 7.29.3
@@ -5008,29 +5306,57 @@ snapshots:
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-create-class-features-plugin@7.29.3(@babel/core@7.29.0)':
+  '@babel/helper-compilation-targets@7.29.7':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/compat-data': 7.29.7
+      '@babel/helper-validator-option': 7.29.7
+      browserslist: 4.28.2
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
+  '@babel/helper-create-class-features-plugin@7.29.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-member-expression-to-functions': 7.28.5
       '@babel/helper-optimise-call-expression': 7.27.1
-      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.7)
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
       '@babel/traverse': 7.29.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-create-regexp-features-plugin@7.28.5(@babel/core@7.29.0)':
+  '@babel/helper-create-class-features-plugin@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-member-expression-to-functions': 7.29.7
+      '@babel/helper-optimise-call-expression': 7.29.7
+      '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+      '@babel/traverse': 7.29.7
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-regexp-features-plugin@7.28.5(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-annotate-as-pure': 7.27.3
       regexpu-core: 6.4.0
       semver: 6.3.1
 
-  '@babel/helper-define-polyfill-provider@0.6.8(@babel/core@7.29.0)':
+  '@babel/helper-create-regexp-features-plugin@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-annotate-as-pure': 7.29.7
+      regexpu-core: 6.4.0
+      semver: 6.3.1
+
+  '@babel/helper-define-polyfill-provider@0.6.8(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
       debug: 4.4.3
@@ -5041,6 +5367,8 @@ snapshots:
 
   '@babel/helper-globals@7.28.0': {}
 
+  '@babel/helper-globals@7.29.7': {}
+
   '@babel/helper-member-expression-to-functions@7.28.5':
     dependencies:
       '@babel/traverse': 7.29.0
@@ -5048,6 +5376,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helper-member-expression-to-functions@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-module-imports@7.28.6':
     dependencies:
       '@babel/traverse': 7.29.0
@@ -5055,39 +5390,79 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.0)':
+  '@babel/helper-module-imports@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-module-imports': 7.28.6
       '@babel/helper-validator-identifier': 7.28.5
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-module-imports': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-optimise-call-expression@7.27.1':
     dependencies:
       '@babel/types': 7.29.0
 
+  '@babel/helper-optimise-call-expression@7.29.7':
+    dependencies:
+      '@babel/types': 7.29.7
+
   '@babel/helper-plugin-utils@7.28.6': {}
 
-  '@babel/helper-remap-async-to-generator@7.27.1(@babel/core@7.29.0)':
+  '@babel/helper-plugin-utils@7.29.7': {}
+
+  '@babel/helper-remap-async-to-generator@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-wrap-function': 7.28.6
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.0)':
+  '@babel/helper-remap-async-to-generator@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-wrap-function': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-member-expression-to-functions': 7.28.5
       '@babel/helper-optimise-call-expression': 7.27.1
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helper-replace-supers@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-member-expression-to-functions': 7.29.7
+      '@babel/helper-optimise-call-expression': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
     dependencies:
       '@babel/traverse': 7.29.0
@@ -5095,12 +5470,25 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helper-skip-transparent-expression-wrappers@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-string-parser@7.27.1': {}
 
+  '@babel/helper-string-parser@7.29.7': {}
+
   '@babel/helper-validator-identifier@7.28.5': {}
 
+  '@babel/helper-validator-identifier@7.29.7': {}
+
   '@babel/helper-validator-option@7.27.1': {}
 
+  '@babel/helper-validator-option@7.29.7': {}
+
   '@babel/helper-wrap-function@7.28.6':
     dependencies:
       '@babel/template': 7.28.6
@@ -5109,661 +5497,866 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helpers@7.29.2':
+  '@babel/helper-wrap-function@7.29.7':
     dependencies:
-      '@babel/template': 7.28.6
-      '@babel/types': 7.29.0
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helpers@7.29.7':
+    dependencies:
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
 
   '@babel/parser@7.29.3':
     dependencies:
       '@babel/types': 7.29.0
 
-  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.28.5(@babel/core@7.29.0)':
+  '@babel/parser@7.29.7':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.7
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@7.29.3(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+      '@babel/plugin-transform-optional-chaining': 7.29.7(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-proposal-decorators@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-proposal-decorators@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-syntax-decorators': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/plugin-syntax-decorators': 7.29.7(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-proposal-export-default-from@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-proposal-export-default-from@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0)':
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
 
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-decorators@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-decorators@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-export-default-from@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-export-default-from@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-flow@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-flow@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-assertions@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-import-assertions@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-import-attributes@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-import-attributes@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-import-attributes@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-async-generator-functions@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-arrow-functions@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-async-generator-functions@7.29.0(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0)
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.7)
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-async-to-generator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-async-generator-functions@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-remap-async-to-generator': 7.29.7(@babel/core@7.29.7)
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-async-to-generator@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-module-imports': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0)
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-block-scoped-functions@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-async-to-generator@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-module-imports': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-remap-async-to-generator': 7.29.7(@babel/core@7.29.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-block-scoping@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-block-scoped-functions@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-block-scoping@7.28.6(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-block-scoping@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-class-static-block@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-class-properties@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-class-static-block@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-classes@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-classes@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-globals': 7.28.0
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.7)
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-computed-properties@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-classes@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7)
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-computed-properties@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/template': 7.28.6
 
-  '@babel/plugin-transform-destructuring@7.28.5(@babel/core@7.29.0)':
+  '@babel/plugin-transform-computed-properties@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/template': 7.29.7
+
+  '@babel/plugin-transform-destructuring@7.28.5(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-dotall-regex@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-destructuring@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-duplicate-keys@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-dotall-regex@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-duplicate-keys@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-dynamic-import@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-explicit-resource-management@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-dynamic-import@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-explicit-resource-management@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/plugin-transform-destructuring': 7.29.7(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-exponentiation-operator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-exponentiation-operator@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-export-namespace-from@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-export-namespace-from@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-flow-strip-types@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-flow-strip-types@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.7)
 
-  '@babel/plugin-transform-for-of@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-for-of@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-function-name@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-for-of@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-function-name@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-json-strings@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-function-name@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-json-strings@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-logical-assignment-operators@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-literals@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-member-expression-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-literals@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-modules-amd@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-logical-assignment-operators@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
+
+  '@babel/plugin-transform-logical-assignment-operators@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-member-expression-literals@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-modules-amd@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-commonjs@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-commonjs@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-systemjs@7.29.4(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-commonjs@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-validator-identifier': 7.28.5
-      '@babel/traverse': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-umd@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-systemjs@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-umd@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-new-target@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-named-capturing-groups-regex@7.29.0(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-named-capturing-groups-regex@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-new-target@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.28.6(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-numeric-separator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-nullish-coalescing-operator@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-numeric-separator@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-object-rest-spread@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-numeric-separator@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-object-rest-spread@7.28.6(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.7)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.7)
       '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-object-super@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-object-rest-spread@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/plugin-transform-destructuring': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-parameters': 7.29.7(@babel/core@7.29.7)
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-object-super@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-optional-catch-binding@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-optional-catch-binding@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-optional-chaining@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-optional-catch-binding@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-optional-chaining@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-parameters@7.27.7(@babel/core@7.29.0)':
+  '@babel/plugin-transform-optional-chaining@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-parameters@7.27.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-private-methods@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-parameters@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-private-methods@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-private-property-in-object@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-private-methods@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-private-property-in-object@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-property-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-private-property-in-object@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-property-literals@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-react-display-name@7.28.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-display-name@7.28.0(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-react-jsx@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-jsx@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-module-imports': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.7)
       '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-regenerator@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-regenerator@7.29.0(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-regexp-modifiers@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-regenerator@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-reserved-words@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-regexp-modifiers@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-reserved-words@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-runtime@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-runtime@7.29.0(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-module-imports': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.0)
-      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.29.0)
-      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.0)
+      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.7)
+      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.29.7)
+      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.7)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-spread@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-shorthand-properties@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-spread@7.28.6(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-spread@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-typeof-symbol@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-sticky-regex@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-template-literals@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-typeof-symbol@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-unicode-escapes@7.27.1(@babel/core@7.29.0)':
-    dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
-
-  '@babel/plugin-transform-unicode-property-regex@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-unicode-escapes@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-unicode-property-regex@7.29.7(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-transform-unicode-sets-regex@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.7)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/preset-env@7.29.5(@babel/core@7.29.0)':
-    dependencies:
-      '@babel/compat-data': 7.29.3
-      '@babel/core': 7.29.0
-      '@babel/helper-compilation-targets': 7.28.6
-      '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-validator-option': 7.27.1
-      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array': 7.29.3(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-assertions': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-block-scoped-functions': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-transform-dotall-regex': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-duplicate-keys': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-explicit-resource-management': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-exponentiation-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-json-strings': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-member-expression-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-amd': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-systemjs': 7.29.4(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-umd': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-new-target': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-super': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-property-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-regexp-modifiers': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-reserved-words': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-typeof-symbol': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-escapes': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-property-regex': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-sets-regex': 7.28.6(@babel/core@7.29.0)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.29.0)
-      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.0)
-      babel-plugin-polyfill-corejs3: 0.14.2(@babel/core@7.29.0)
-      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.0)
+  '@babel/plugin-transform-unicode-regex@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-unicode-sets-regex@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/preset-env@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/compat-data': 7.29.7
+      '@babel/core': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-validator-option': 7.29.7
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-assertions': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-attributes': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-arrow-functions': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-generator-functions': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-to-generator': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-block-scoped-functions': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-block-scoping': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-class-properties': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-class-static-block': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-classes': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-computed-properties': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-destructuring': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-dotall-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-duplicate-keys': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-dynamic-import': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-explicit-resource-management': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-exponentiation-operator': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-export-namespace-from': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-for-of': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-function-name': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-json-strings': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-literals': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-logical-assignment-operators': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-member-expression-literals': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-amd': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-systemjs': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-umd': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-new-target': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-numeric-separator': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-object-rest-spread': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-object-super': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-catch-binding': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-chaining': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-parameters': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-methods': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-property-in-object': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-property-literals': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-regenerator': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-regexp-modifiers': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-reserved-words': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-shorthand-properties': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-spread': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-sticky-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-template-literals': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-typeof-symbol': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-unicode-escapes': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-unicode-property-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-unicode-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-unicode-sets-regex': 7.29.7(@babel/core@7.29.7)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.29.7)
+      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.7)
+      babel-plugin-polyfill-corejs3: 0.14.2(@babel/core@7.29.7)
+      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.7)
       core-js-compat: 3.49.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.29.0)':
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
       '@babel/types': 7.29.0
       esutils: 2.0.3
 
@@ -5771,7 +6364,7 @@ snapshots:
     dependencies:
       regenerator-runtime: 0.14.1
 
-  '@babel/runtime@7.29.2': {}
+  '@babel/runtime@7.29.7': {}
 
   '@babel/template@7.28.6':
     dependencies:
@@ -5779,6 +6372,12 @@ snapshots:
       '@babel/parser': 7.29.3
       '@babel/types': 7.29.0
 
+  '@babel/template@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+
   '@babel/traverse@7.29.0':
     dependencies:
       '@babel/code-frame': 7.29.0
@@ -5791,11 +6390,28 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/traverse@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/types@7.29.0':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
+  '@babel/types@7.29.7':
+    dependencies:
+      '@babel/helper-string-parser': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+
   '@bcoe/v8-coverage@0.2.3': {}
 
   '@borewit/text-codec@0.2.2': {}
@@ -6185,7 +6801,7 @@ snapshots:
 
   '@jest/transform@29.7.0':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.31
       babel-plugin-istanbul: 6.1.1
@@ -6205,7 +6821,7 @@ snapshots:
 
   '@jest/transform@30.4.1':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@jest/types': 30.4.1
       '@jridgewell/trace-mapping': 0.3.31
       babel-plugin-istanbul: 7.0.1
@@ -6322,9 +6938,9 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.20.1
 
-  '@notifee/react-native@9.1.8(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))':
+  '@notifee/react-native@9.1.8(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))':
     dependencies:
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
   '@nozbe/lokijs@1.5.12-wmelon6': {}
 
@@ -6354,17 +6970,17 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@ode/components@file:../packages/components(@ode/tokens@file:../packages/tokens)(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@ode/components@file:../packages/components(@ode/tokens@file:../packages/tokens)(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       '@ode/tokens': file:../packages/tokens
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
-      react-native-svg: 15.15.5(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
+      react-native-svg: 15.15.5(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
 
   '@ode/observation-query@file:../packages/observation-query':
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
 
   '@ode/tokens@file:../packages/tokens': {}
 
@@ -6402,40 +7018,40 @@ snapshots:
 
   '@pkgr/core@0.2.9': {}
 
-  '@react-native-async-storage/async-storage@2.2.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))':
+  '@react-native-async-storage/async-storage@2.2.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))':
     dependencies:
       merge-options: 3.0.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  '@react-native-community/blur@4.4.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native-community/blur@4.4.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  '@react-native-community/cli-clean@20.1.2':
+  '@react-native-community/cli-clean@20.1.3':
     dependencies:
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-tools': 20.1.3
       execa: 5.1.1
       fast-glob: 3.3.3
       picocolors: 1.1.1
 
-  '@react-native-community/cli-config-android@20.1.2':
+  '@react-native-community/cli-config-android@20.1.3':
     dependencies:
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-tools': 20.1.3
       fast-glob: 3.3.3
       fast-xml-parser: 5.8.0
       picocolors: 1.1.1
 
-  '@react-native-community/cli-config-apple@20.1.2':
+  '@react-native-community/cli-config-apple@20.1.3':
     dependencies:
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-tools': 20.1.3
       execa: 5.1.1
       fast-glob: 3.3.3
       picocolors: 1.1.1
 
-  '@react-native-community/cli-config@20.1.2(typescript@5.9.3)':
+  '@react-native-community/cli-config@20.1.3(typescript@5.9.3)':
     dependencies:
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-tools': 20.1.3
       cosmiconfig: 9.0.1(typescript@5.9.3)
       deepmerge: 4.3.1
       fast-glob: 3.3.3
@@ -6444,13 +7060,13 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@react-native-community/cli-doctor@20.1.2(typescript@5.9.3)':
+  '@react-native-community/cli-doctor@20.1.3(typescript@5.9.3)':
     dependencies:
-      '@react-native-community/cli-config': 20.1.2(typescript@5.9.3)
-      '@react-native-community/cli-platform-android': 20.1.2
-      '@react-native-community/cli-platform-apple': 20.1.2
-      '@react-native-community/cli-platform-ios': 20.1.2
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-config': 20.1.3(typescript@5.9.3)
+      '@react-native-community/cli-platform-android': 20.1.3
+      '@react-native-community/cli-platform-apple': 20.1.3
+      '@react-native-community/cli-platform-ios': 20.1.3
+      '@react-native-community/cli-tools': 20.1.3
       command-exists: 1.2.9
       deepmerge: 4.3.1
       envinfo: 7.21.0
@@ -6464,29 +7080,29 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@react-native-community/cli-platform-android@20.1.2':
+  '@react-native-community/cli-platform-android@20.1.3':
     dependencies:
-      '@react-native-community/cli-config-android': 20.1.2
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-config-android': 20.1.3
+      '@react-native-community/cli-tools': 20.1.3
       execa: 5.1.1
       logkitty: 0.7.1
       picocolors: 1.1.1
 
-  '@react-native-community/cli-platform-apple@20.1.2':
+  '@react-native-community/cli-platform-apple@20.1.3':
     dependencies:
-      '@react-native-community/cli-config-apple': 20.1.2
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-config-apple': 20.1.3
+      '@react-native-community/cli-tools': 20.1.3
       execa: 5.1.1
       fast-xml-parser: 5.8.0
       picocolors: 1.1.1
 
-  '@react-native-community/cli-platform-ios@20.1.2':
+  '@react-native-community/cli-platform-ios@20.1.3':
     dependencies:
-      '@react-native-community/cli-platform-apple': 20.1.2
+      '@react-native-community/cli-platform-apple': 20.1.3
 
-  '@react-native-community/cli-server-api@20.1.2':
+  '@react-native-community/cli-server-api@20.1.3':
     dependencies:
-      '@react-native-community/cli-tools': 20.1.2
+      '@react-native-community/cli-tools': 20.1.3
       body-parser: 2.2.2
       compression: 1.8.1
       connect: 3.7.0
@@ -6502,7 +7118,7 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@react-native-community/cli-tools@20.1.2':
+  '@react-native-community/cli-tools@20.1.3':
     dependencies:
       '@vscode/sudo-prompt': 9.3.2
       appdirsjs: 1.2.7
@@ -6515,18 +7131,18 @@ snapshots:
       prompts: 2.4.2
       semver: 7.8.0
 
-  '@react-native-community/cli-types@20.1.2':
+  '@react-native-community/cli-types@20.1.3':
     dependencies:
       joi: 17.13.3
 
-  '@react-native-community/cli@20.1.2(typescript@5.9.3)':
+  '@react-native-community/cli@20.1.3(typescript@5.9.3)':
     dependencies:
-      '@react-native-community/cli-clean': 20.1.2
-      '@react-native-community/cli-config': 20.1.2(typescript@5.9.3)
-      '@react-native-community/cli-doctor': 20.1.2(typescript@5.9.3)
-      '@react-native-community/cli-server-api': 20.1.2
-      '@react-native-community/cli-tools': 20.1.2
-      '@react-native-community/cli-types': 20.1.2
+      '@react-native-community/cli-clean': 20.1.3
+      '@react-native-community/cli-config': 20.1.3(typescript@5.9.3)
+      '@react-native-community/cli-doctor': 20.1.3(typescript@5.9.3)
+      '@react-native-community/cli-server-api': 20.1.3
+      '@react-native-community/cli-tools': 20.1.3
+      '@react-native-community/cli-types': 20.1.3
       commander: 9.5.0
       deepmerge: 4.3.1
       execa: 5.1.1
@@ -6542,159 +7158,159 @@ snapshots:
       - typescript
       - utf-8-validate
 
-  '@react-native-community/geolocation@3.4.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native-community/geolocation@3.4.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
   '@react-native-community/slider@5.2.0': {}
 
-  '@react-native-documents/picker@12.0.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native-documents/picker@12.0.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  '@react-native-vector-icons/common@12.4.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native-vector-icons/common@12.4.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
       find-up: 7.0.0
       picocolors: 1.1.1
       plist: 3.1.1
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  '@react-native-vector-icons/fontawesome6@12.4.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native-vector-icons/fontawesome6@12.4.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@react-native-vector-icons/common': 12.4.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-native-vector-icons/common': 12.4.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
     transitivePeerDependencies:
       - '@react-native-vector-icons/get-image'
 
-  '@react-native-vector-icons/material-design-icons@12.5.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native-vector-icons/material-design-icons@12.5.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@react-native-vector-icons/common': 12.4.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-native-vector-icons/common': 12.4.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
     transitivePeerDependencies:
       - '@react-native-vector-icons/get-image'
 
-  '@react-native-vector-icons/material-icons@12.5.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native-vector-icons/material-icons@12.5.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@react-native-vector-icons/common': 12.4.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-native-vector-icons/common': 12.4.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
     transitivePeerDependencies:
       - '@react-native-vector-icons/get-image'
 
   '@react-native/assets-registry@0.83.1': {}
 
-  '@react-native/babel-plugin-codegen@0.83.1(@babel/core@7.29.0)':
+  '@react-native/babel-plugin-codegen@0.83.1(@babel/core@7.29.7)':
     dependencies:
       '@babel/traverse': 7.29.0
-      '@react-native/codegen': 0.83.1(@babel/core@7.29.0)
+      '@react-native/codegen': 0.83.1(@babel/core@7.29.7)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
 
-  '@react-native/babel-plugin-codegen@0.84.1(@babel/core@7.29.0)':
+  '@react-native/babel-plugin-codegen@0.84.1(@babel/core@7.29.7)':
     dependencies:
       '@babel/traverse': 7.29.0
-      '@react-native/codegen': 0.84.1(@babel/core@7.29.0)
+      '@react-native/codegen': 0.84.1(@babel/core@7.29.7)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
 
-  '@react-native/babel-preset@0.83.1(@babel/core@7.29.0)':
-    dependencies:
-      '@babel/core': 7.29.0
-      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0)
+  '@react-native/babel-preset@0.83.1(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.7)
+      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.7)
       '@babel/template': 7.28.6
-      '@react-native/babel-plugin-codegen': 0.83.1(@babel/core@7.29.0)
+      '@react-native/babel-plugin-codegen': 0.83.1(@babel/core@7.29.7)
       babel-plugin-syntax-hermes-parser: 0.32.0
-      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0)
+      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.7)
       react-refresh: 0.14.2
     transitivePeerDependencies:
       - supports-color
 
-  '@react-native/babel-preset@0.84.1(@babel/core@7.29.0)':
-    dependencies:
-      '@babel/core': 7.29.0
-      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0)
-      '@react-native/babel-plugin-codegen': 0.84.1(@babel/core@7.29.0)
+  '@react-native/babel-preset@0.84.1(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.7)
+      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.7)
+      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.7)
+      '@react-native/babel-plugin-codegen': 0.84.1(@babel/core@7.29.7)
       babel-plugin-syntax-hermes-parser: 0.32.0
-      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0)
+      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.7)
       react-refresh: 0.14.2
     transitivePeerDependencies:
       - supports-color
 
-  '@react-native/codegen@0.83.1(@babel/core@7.29.0)':
+  '@react-native/codegen@0.83.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/parser': 7.29.3
       glob: 7.2.3
       hermes-parser: 0.32.0
@@ -6702,9 +7318,9 @@ snapshots:
       nullthrows: 1.1.1
       yargs: 17.7.2
 
-  '@react-native/codegen@0.84.1(@babel/core@7.29.0)':
+  '@react-native/codegen@0.84.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/parser': 7.29.3
       hermes-parser: 0.32.0
       invariant: 2.2.4
@@ -6712,7 +7328,7 @@ snapshots:
       tinyglobby: 0.2.16
       yargs: 17.7.2
 
-  '@react-native/community-cli-plugin@0.83.1(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))':
+  '@react-native/community-cli-plugin@0.83.1(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))':
     dependencies:
       '@react-native/dev-middleware': 0.83.1
       debug: 4.4.3
@@ -6722,8 +7338,8 @@ snapshots:
       metro-core: 0.83.7
       semver: 7.8.0
     optionalDependencies:
-      '@react-native-community/cli': 20.1.2(typescript@5.9.3)
-      '@react-native/metro-config': 0.83.1(@babel/core@7.29.0)
+      '@react-native-community/cli': 20.1.3(typescript@5.9.3)
+      '@react-native/metro-config': 0.83.1(@babel/core@7.29.7)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -6757,15 +7373,15 @@ snapshots:
 
   '@react-native/eslint-config@0.84.1(eslint@9.39.4)(jest@30.4.2(@types/node@24.12.4))(prettier@3.8.1)(typescript@5.9.3)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/eslint-parser': 7.28.6(@babel/core@7.29.0)(eslint@9.39.4)
+      '@babel/core': 7.29.7
+      '@babel/eslint-parser': 7.28.6(@babel/core@7.29.7)(eslint@9.39.4)
       '@react-native/eslint-plugin': 0.84.1
       '@typescript-eslint/eslint-plugin': 8.59.3(@typescript-eslint/parser@8.59.3(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3)
       '@typescript-eslint/parser': 8.59.3(eslint@9.39.4)(typescript@5.9.3)
       eslint: 9.39.4
       eslint-config-prettier: 8.10.2(eslint@9.39.4)
       eslint-plugin-eslint-comments: 3.2.0(eslint@9.39.4)
-      eslint-plugin-ft-flow: 2.0.3(@babel/eslint-parser@7.28.6(@babel/core@7.29.0)(eslint@9.39.4))(eslint@9.39.4)
+      eslint-plugin-ft-flow: 2.0.3(@babel/eslint-parser@7.28.6(@babel/core@7.29.7)(eslint@9.39.4))(eslint@9.39.4)
       eslint-plugin-jest: 29.15.2(@typescript-eslint/eslint-plugin@8.59.3(@typescript-eslint/parser@8.59.3(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(jest@30.4.2(@types/node@24.12.4))(typescript@5.9.3)
       eslint-plugin-react: 7.37.5(eslint@9.39.4)
       eslint-plugin-react-hooks: 7.1.1(eslint@9.39.4)
@@ -6782,19 +7398,19 @@ snapshots:
 
   '@react-native/js-polyfills@0.83.1': {}
 
-  '@react-native/metro-babel-transformer@0.83.1(@babel/core@7.29.0)':
+  '@react-native/metro-babel-transformer@0.83.1(@babel/core@7.29.7)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@react-native/babel-preset': 0.83.1(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@react-native/babel-preset': 0.83.1(@babel/core@7.29.7)
       hermes-parser: 0.32.0
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - supports-color
 
-  '@react-native/metro-config@0.83.1(@babel/core@7.29.0)':
+  '@react-native/metro-config@0.83.1(@babel/core@7.29.7)':
     dependencies:
       '@react-native/js-polyfills': 0.83.1
-      '@react-native/metro-babel-transformer': 0.83.1(@babel/core@7.29.0)
+      '@react-native/metro-babel-transformer': 0.83.1(@babel/core@7.29.7)
       metro-config: 0.83.7
       metro-runtime: 0.83.7
     transitivePeerDependencies:
@@ -6805,26 +7421,26 @@ snapshots:
 
   '@react-native/normalize-colors@0.83.1': {}
 
-  '@react-native/typescript-config@0.83.1': {}
+  '@react-native/typescript-config@0.86.0': {}
 
-  '@react-native/virtualized-lists@0.83.1(@types/react@19.2.14)(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-native/virtualized-lists@0.83.1(@types/react@19.2.14)(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
       invariant: 2.2.4
       nullthrows: 1.1.1
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@react-navigation/bottom-tabs@7.16.1(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-screens@4.25.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-navigation/bottom-tabs@7.16.1(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-screens@4.25.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@react-navigation/elements': 2.9.18(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
-      '@react-navigation/native': 7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-navigation/elements': 2.9.18(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-navigation/native': 7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       color: 4.2.3
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
-      react-native-safe-area-context: 5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
-      react-native-screens: 4.25.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
+      react-native-safe-area-context: 5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native-screens: 4.25.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       sf-symbols-typescript: 2.2.0
     transitivePeerDependencies:
       - '@react-native-masked-view/masked-view'
@@ -6841,40 +7457,40 @@ snapshots:
       use-latest-callback: 0.2.6(react@19.2.4)
       use-sync-external-store: 1.6.0(react@19.2.4)
 
-  '@react-navigation/elements@2.9.18(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-navigation/elements@2.9.18(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@react-navigation/native': 7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-navigation/native': 7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       color: 4.2.3
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
-      react-native-safe-area-context: 5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
+      react-native-safe-area-context: 5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       use-latest-callback: 0.2.6(react@19.2.4)
       use-sync-external-store: 1.6.0(react@19.2.4)
 
-  '@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
+  '@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@react-navigation/core': 7.17.4(react@19.2.4)
       escape-string-regexp: 4.0.0
       fast-deep-equal: 3.1.3
       nanoid: 3.3.12
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
       use-latest-callback: 0.2.6(react@19.2.4)
 
   '@react-navigation/routers@7.5.5':
     dependencies:
       nanoid: 3.3.12
 
-  '@react-navigation/stack@7.9.2(9012f47c946c765e465f66c3957358ea)':
+  '@react-navigation/stack@7.9.2(e77e2ee8455471efeec313358832aef4)':
     dependencies:
-      '@react-navigation/elements': 2.9.18(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
-      '@react-navigation/native': 7.2.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-navigation/elements': 2.9.18(@react-navigation/native@7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native-safe-area-context@5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-navigation/native': 7.2.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       color: 4.2.3
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
-      react-native-gesture-handler: 2.31.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
-      react-native-safe-area-context: 5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
-      react-native-screens: 4.25.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
+      react-native-gesture-handler: 2.31.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native-safe-area-context: 5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native-screens: 4.25.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       use-latest-callback: 0.2.6(react@19.2.4)
     transitivePeerDependencies:
       - '@react-native-masked-view/masked-view'
@@ -6899,13 +7515,13 @@ snapshots:
     dependencies:
       '@sinonjs/commons': 3.0.1
 
-  '@testing-library/react-native@13.3.3(jest@30.4.2(@types/node@24.12.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react-test-renderer@19.2.4(react@19.2.4))(react@19.2.4)':
+  '@testing-library/react-native@13.3.3(jest@30.4.2(@types/node@24.12.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react-test-renderer@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       jest-matcher-utils: 30.4.1
       picocolors: 1.1.1
       pretty-format: 30.4.1
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
       react-test-renderer: 19.2.4(react@19.2.4)
       redent: 3.0.0
     optionalDependencies:
@@ -7327,26 +7943,26 @@ snapshots:
       - debug
       - supports-color
 
-  babel-jest@29.7.0(@babel/core@7.29.0):
+  babel-jest@29.7.0(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@jest/transform': 29.7.0
       '@types/babel__core': 7.20.5
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.6.3(@babel/core@7.29.0)
+      babel-preset-jest: 29.6.3(@babel/core@7.29.7)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-jest@30.4.1(@babel/core@7.29.0):
+  babel-jest@30.4.1(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@jest/transform': 30.4.1
       '@types/babel__core': 7.20.5
       babel-plugin-istanbul: 7.0.1
-      babel-preset-jest: 30.4.0(@babel/core@7.29.0)
+      babel-preset-jest: 30.4.0(@babel/core@7.29.7)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
@@ -7384,35 +8000,35 @@ snapshots:
     dependencies:
       '@types/babel__core': 7.20.5
 
-  babel-plugin-polyfill-corejs2@0.4.17(@babel/core@7.29.0):
+  babel-plugin-polyfill-corejs2@0.4.17(@babel/core@7.29.7):
     dependencies:
       '@babel/compat-data': 7.29.3
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.7)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.29.0):
+  babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.7)
       core-js-compat: 3.49.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-corejs3@0.14.2(@babel/core@7.29.0):
+  babel-plugin-polyfill-corejs3@0.14.2(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.7)
       core-js-compat: 3.49.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-regenerator@0.6.8(@babel/core@7.29.0):
+  babel-plugin-polyfill-regenerator@0.6.8(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.7)
     transitivePeerDependencies:
       - supports-color
 
@@ -7420,42 +8036,42 @@ snapshots:
     dependencies:
       hermes-parser: 0.32.0
 
-  babel-plugin-transform-flow-enums@0.0.2(@babel/core@7.29.0):
+  babel-plugin-transform-flow-enums@0.0.2(@babel/core@7.29.7):
     dependencies:
-      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.7)
     transitivePeerDependencies:
       - '@babel/core'
 
-  babel-preset-current-node-syntax@1.2.0(@babel/core@7.29.0):
-    dependencies:
-      '@babel/core': 7.29.0
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.29.0)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.0)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.0)
-
-  babel-preset-jest@29.6.3(@babel/core@7.29.0):
-    dependencies:
-      '@babel/core': 7.29.0
+  babel-preset-current-node-syntax@1.2.0(@babel/core@7.29.7):
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.29.7)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.7)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.7)
+
+  babel-preset-jest@29.6.3(@babel/core@7.29.7):
+    dependencies:
+      '@babel/core': 7.29.7
       babel-plugin-jest-hoist: 29.6.3
-      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0)
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7)
 
-  babel-preset-jest@30.4.0(@babel/core@7.29.0):
+  babel-preset-jest@30.4.0(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       babel-plugin-jest-hoist: 30.4.0
-      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0)
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7)
 
   balanced-match@1.0.2: {}
 
@@ -7465,7 +8081,7 @@ snapshots:
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.10.30: {}
+  baseline-browser-mapping@2.10.38: {}
 
   basic-ftp@5.3.1: {}
 
@@ -7510,7 +8126,7 @@ snapshots:
 
   browserslist@4.28.2:
     dependencies:
-      baseline-browser-mapping: 2.10.30
+      baseline-browser-mapping: 2.10.38
       caniuse-lite: 1.0.30001792
       electron-to-chromium: 1.5.357
       node-releases: 2.0.44
@@ -8038,9 +8654,9 @@ snapshots:
       eslint: 9.39.4
       ignore: 5.3.2
 
-  eslint-plugin-ft-flow@2.0.3(@babel/eslint-parser@7.28.6(@babel/core@7.29.0)(eslint@9.39.4))(eslint@9.39.4):
+  eslint-plugin-ft-flow@2.0.3(@babel/eslint-parser@7.28.6(@babel/core@7.29.7)(eslint@9.39.4))(eslint@9.39.4):
     dependencies:
-      '@babel/eslint-parser': 7.28.6(@babel/core@7.29.0)(eslint@9.39.4)
+      '@babel/eslint-parser': 7.28.6(@babel/core@7.29.7)(eslint@9.39.4)
       eslint: 9.39.4
       lodash: 4.18.1
       string-natural-compare: 3.0.1
@@ -8067,7 +8683,7 @@ snapshots:
 
   eslint-plugin-react-hooks@7.1.1(eslint@9.39.4):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/parser': 7.29.3
       eslint: 9.39.4
       hermes-parser: 0.25.1
@@ -8724,7 +9340,7 @@ snapshots:
 
   istanbul-lib-instrument@5.2.1:
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/parser': 7.29.3
       '@istanbuljs/schema': 0.1.6
       istanbul-lib-coverage: 3.2.2
@@ -8734,7 +9350,7 @@ snapshots:
 
   istanbul-lib-instrument@6.0.3:
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/parser': 7.29.3
       '@istanbuljs/schema': 0.1.6
       istanbul-lib-coverage: 3.2.2
@@ -8831,12 +9447,12 @@ snapshots:
 
   jest-config@30.4.2(@types/node@24.12.4):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@jest/get-type': 30.1.0
       '@jest/pattern': 30.4.0
       '@jest/test-sequencer': 30.4.1
       '@jest/types': 30.4.1
-      babel-jest: 30.4.1(@babel/core@7.29.0)
+      babel-jest: 30.4.1(@babel/core@7.29.7)
       chalk: 4.1.2
       ci-info: 4.4.0
       deepmerge: 4.3.1
@@ -9015,17 +9631,17 @@ snapshots:
 
   jest-snapshot@30.4.1:
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/generator': 7.29.1
-      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.7)
+      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7)
       '@babel/types': 7.29.0
       '@jest/expect-utils': 30.4.1
       '@jest/get-type': 30.1.0
       '@jest/snapshot-utils': 30.4.1
       '@jest/transform': 30.4.1
       '@jest/types': 30.4.1
-      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0)
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7)
       chalk: 4.1.2
       expect: 30.4.1
       graceful-fs: 4.2.11
@@ -9213,11 +9829,11 @@ snapshots:
 
   lru-cache@7.18.3: {}
 
-  lucide-react-native@0.577.0(react-native-svg@15.15.5(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  lucide-react-native@0.577.0(react-native-svg@15.15.5(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
-      react-native-svg: 15.15.5(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
+      react-native-svg: 15.15.5(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
 
   make-dir@4.0.0:
     dependencies:
@@ -9247,7 +9863,7 @@ snapshots:
 
   metro-babel-transformer@0.83.7:
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       flow-enums-runtime: 0.0.6
       hermes-parser: 0.35.0
       metro-cache-key: 0.83.7
@@ -9314,7 +9930,7 @@ snapshots:
 
   metro-runtime@0.83.7:
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       flow-enums-runtime: 0.0.6
 
   metro-source-map@0.83.7:
@@ -9344,7 +9960,7 @@ snapshots:
 
   metro-transform-plugins@0.83.7:
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/generator': 7.29.1
       '@babel/template': 7.28.6
       '@babel/traverse': 7.29.0
@@ -9355,7 +9971,7 @@ snapshots:
 
   metro-transform-worker@0.83.7:
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.3
       '@babel/types': 7.29.0
@@ -9376,7 +9992,7 @@ snapshots:
   metro@0.83.7:
     dependencies:
       '@babel/code-frame': 7.29.0
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.7
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.3
       '@babel/template': 7.28.6
@@ -9727,7 +10343,7 @@ snapshots:
       '@jest/schemas': 30.4.1
       ansi-styles: 5.2.0
       react-is-18: react-is@18.3.1
-      react-is-19: react-is@19.2.6
+      react-is-19: react-is@19.2.7
 
   promise@8.3.0:
     dependencies:
@@ -9809,108 +10425,110 @@ snapshots:
 
   react-is@19.2.6: {}
 
-  react-native-camera-kit-no-google@17.0.4(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-is@19.2.7: {}
+
+  react-native-camera-kit-no-google@17.0.4(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-device-info@15.0.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)):
+  react-native-device-info@15.0.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)):
     dependencies:
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-fs@2.20.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)):
+  react-native-fs@2.20.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)):
     dependencies:
       base-64: 0.1.0
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
       utf8: 3.0.0
 
-  react-native-gesture-handler@2.31.2(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-gesture-handler@2.31.2(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       '@egjs/hammerjs': 2.0.17
       '@types/react-test-renderer': 19.1.0
       hoist-non-react-statics: 3.3.2
       invariant: 2.2.4
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-image-picker@8.2.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-image-picker@8.2.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
   react-native-keychain@10.0.0: {}
 
-  react-native-nitro-modules@0.35.7(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-nitro-modules@0.35.7(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-nitro-sound@0.2.14(react-native-nitro-modules@0.35.7(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-nitro-sound@0.2.14(react-native-nitro-modules@0.35.7(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4))(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       '@react-native-community/slider': 5.2.0
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
-      react-native-nitro-modules: 0.35.7(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
+      react-native-nitro-modules: 0.35.7(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
 
-  react-native-permissions@5.5.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-permissions@5.5.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-safe-area-context@5.7.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-safe-area-context@5.8.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-screens@4.25.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-screens@4.25.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
       react-freeze: 1.0.4(react@19.2.4)
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
       warn-once: 0.1.1
 
-  react-native-signature-canvas@5.0.2(react-native-webview@13.16.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)):
+  react-native-signature-canvas@5.0.2(react-native-webview@13.16.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)):
     dependencies:
-      react-native-webview: 13.16.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      react-native-webview: 13.16.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
 
-  react-native-svg@15.15.5(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-svg@15.15.5(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       css-select: 5.2.2
       css-tree: 1.1.3
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-url-polyfill@3.0.0(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)):
+  react-native-url-polyfill@3.0.0(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)):
     dependencies:
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
       whatwg-url-without-unicode: 8.0.0-3
 
-  react-native-webview@13.16.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-webview@13.16.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       escape-string-regexp: 4.0.0
       invariant: 2.2.4
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native-zip-archive@7.1.1(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
+  react-native-zip-archive@7.1.1(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4):
     dependencies:
       react: 19.2.4
-      react-native: 0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4)
+      react-native: 0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4)
 
-  react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4):
+  react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4):
     dependencies:
       '@jest/create-cache-key-function': 29.7.0
       '@react-native/assets-registry': 0.83.1
-      '@react-native/codegen': 0.83.1(@babel/core@7.29.0)
-      '@react-native/community-cli-plugin': 0.83.1(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))
+      '@react-native/codegen': 0.83.1(@babel/core@7.29.7)
+      '@react-native/community-cli-plugin': 0.83.1(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))
       '@react-native/gradle-plugin': 0.83.1
       '@react-native/js-polyfills': 0.83.1
       '@react-native/normalize-colors': 0.83.1
-      '@react-native/virtualized-lists': 0.83.1(@types/react@19.2.14)(react-native@0.83.1(@babel/core@7.29.0)(@react-native-community/cli@20.1.2(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.0))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
+      '@react-native/virtualized-lists': 0.83.1(@types/react@19.2.14)(react-native@0.83.1(@babel/core@7.29.7)(@react-native-community/cli@20.1.3(typescript@5.9.3))(@react-native/metro-config@0.83.1(@babel/core@7.29.7))(@types/react@19.2.14)(react@19.2.4))(react@19.2.4)
       abort-controller: 3.0.0
       anser: 1.4.10
       ansi-regex: 5.0.1
-      babel-jest: 29.7.0(@babel/core@7.29.0)
+      babel-jest: 29.7.0(@babel/core@7.29.7)
       babel-plugin-syntax-hermes-parser: 0.32.0
       base64-js: 1.5.1
       commander: 12.1.0
diff --git a/formulus/pnpm-workspace.yaml b/formulus/pnpm-workspace.yaml
new file mode 100644
index 000000000..4535ae0a6
--- /dev/null
+++ b/formulus/pnpm-workspace.yaml
@@ -0,0 +1,17 @@
+# pnpm 10+ reads project settings here (not package.json#pnpm).
+# Allow lifecycle scripts only for these native/tooling deps.
+onlyBuiltDependencies:
+  - '@nestjs/core'
+  - '@openapitools/openapi-generator-cli'
+  - esbuild
+  - unrs-resolver
+
+overrides:
+  jest-environment-node: ^30.4.1
+  jest-haste-map: ^30.4.1
+  jest-message-util: ^30.4.1
+  jest-mock: ^30.4.1
+  jest-regex-util: ^30.4.0
+  jest-util: ^30.4.1
+  jest-validate: ^30.4.1
+  jest-worker: ^30.4.1
diff --git a/formulus/scripts/generateInjectionScript.ts b/formulus/scripts/generateInjectionScript.ts
index c11897b7c..3cc4140e6 100644
--- a/formulus/scripts/generateInjectionScript.ts
+++ b/formulus/scripts/generateInjectionScript.ts
@@ -474,11 +474,22 @@ function extractMethods(sourceFile: ts.SourceFile): MethodInfo[] {
               jsDocText.end,
             );
 
-            // Parse the JSDoc to extract the description and tags
+            // Parse the JSDoc to extract the description and tags.
+            // Strip the comment delimiters up-front so single-line comments
+            // (`/** text */`) and inline closings don't leak into the parsed
+            // description — otherwise we emit nested/duplicated `*/`, producing
+            // malformed (and sometimes unparseable) generated JSDoc.
             const lines = rawJsDoc
+              .replace(/^\s*\/\*\*+/, '') // opening /** (or /***)
+              .replace(/\*+\/\s*$/, '') // closing */
               .split('\n')
-              .map(line => line.trim().replace(/^\* ?/, '').trim())
-              .filter(line => line !== '/**' && line !== '*/');
+              .map(line =>
+                line
+                  .trim()
+                  .replace(/^\*+ ?/, '')
+                  .trim(),
+              )
+              .filter(line => line.length > 0);
 
             const description: string[] = [];
             const tags: JSDocTag[] = [];
diff --git a/formulus/src/components/CustomAppWebView.tsx b/formulus/src/components/CustomAppWebView.tsx
index af2bc2285..02cc3e4fc 100644
--- a/formulus/src/components/CustomAppWebView.tsx
+++ b/formulus/src/components/CustomAppWebView.tsx
@@ -14,6 +14,7 @@ import { useIsFocused } from '@react-navigation/native';
 import { Platform } from 'react-native';
 import { readFileAssets, MainBundlePath, readFile } from 'react-native-fs';
 import { FormulusWebViewMessageManager } from '../webview/FormulusWebViewHandler';
+import { appEvents, Listener } from '../webview/FormulusMessageHandlers';
 import { FormInitData } from '../webview/FormulusInterfaceDefinition';
 import { colors } from '../theme/colors';
 import { loadSettingsHydrationFromStorage } from '../services/SettingsHydrationCache';
@@ -319,6 +320,36 @@ const CustomAppWebView = forwardRef<
       return manager;
     }, [appName]);
 
+    useEffect(() => {
+      const onLocationUpdate = (payload: {
+        fieldId: string;
+        location: Record<string, unknown>;
+      }) => {
+        if (!webViewRef.current) return;
+        webViewRef.current.postMessage(
+          JSON.stringify({
+            type: 'locationWatchUpdate',
+            fieldId: payload.fieldId,
+            result: {
+              fieldId: payload.fieldId,
+              status: 'success',
+              data: payload.location,
+            },
+          }),
+        );
+      };
+      appEvents.addListener(
+        'locationWatchUpdate',
+        onLocationUpdate as Listener,
+      );
+      return () => {
+        appEvents.removeListener(
+          'locationWatchUpdate',
+          onLocationUpdate as Listener,
+        );
+      };
+    }, []);
+
     const handleNavigationStateChange = useCallback(
       (navState: WebViewNavigation) => {
         const newCanGoBack = navState.canGoBack;
@@ -518,10 +549,10 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   webViewTransparent: {
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   webViewContainerTransparent: {
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
     flex: 1,
   },
 });
diff --git a/formulus/src/components/FormplayerModal.tsx b/formulus/src/components/FormplayerModal.tsx
index 06070d970..b92689549 100644
--- a/formulus/src/components/FormplayerModal.tsx
+++ b/formulus/src/components/FormplayerModal.tsx
@@ -701,7 +701,8 @@ const FormplayerModal = forwardRef<FormplayerModalHandle, FormplayerModalProps>(
                   styles.headerTitle,
                   { color: themeColors.onBackground },
                 ]}
-                numberOfLines={1}>
+                numberOfLines={1}
+                ellipsizeMode="tail">
                 {currentFormDisplayName ||
                   (currentObservationId
                     ? 'Edit Observation'
@@ -742,13 +743,14 @@ const styles = StyleSheet.create({
   },
   header: {
     flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'flex-start',
+    justifyContent: 'flex-start',
+    alignItems: 'center',
     width: '100%',
-    padding: odeSpacing.md,
+    paddingLeft: 6,
+    paddingRight: odeSpacing.sm,
+    paddingVertical: 2,
     borderBottomWidth: odeBorderWidth.hairline,
     minHeight: odeFormplayerHeaderHeight,
-    paddingVertical: odeSpacing.sm,
     borderTopWidth: 0,
     borderLeftWidth: 0,
     borderRightWidth: 0,
@@ -756,13 +758,15 @@ const styles = StyleSheet.create({
     overflow: 'visible',
   },
   headerTitle: {
-    fontSize: odeTypography.screenTitle,
-    fontWeight: 'bold',
-    marginLeft: 0,
+    fontSize: odeTypography.bodySm,
+    fontWeight: 'normal',
+    marginLeft: 8,
+    flex: 1,
     flexShrink: 1,
   },
   closeButton: {
-    padding: odeSpacing.xs,
+    paddingVertical: 2,
+    paddingHorizontal: 2,
   },
   disabledButton: {
     opacity: 0.5,
diff --git a/formulus/src/components/MenuDrawer.tsx b/formulus/src/components/MenuDrawer.tsx
index 5f802b431..11a04c129 100644
--- a/formulus/src/components/MenuDrawer.tsx
+++ b/formulus/src/components/MenuDrawer.tsx
@@ -157,7 +157,7 @@ const MenuDrawer: React.FC<MenuDrawerProps> = ({
             styles.backdrop,
             {
               // Fully transparent backdrop: no visual dimming, but still closes on tap
-              backgroundColor: 'transparent',
+              backgroundColor: colors.neutral.transparent,
               marginBottom: bottomPadding,
             },
           ]}
diff --git a/formulus/src/components/QRScannerModalImpl.tsx b/formulus/src/components/QRScannerModalImpl.tsx
index 3e40d9fb7..6ec97166a 100644
--- a/formulus/src/components/QRScannerModalImpl.tsx
+++ b/formulus/src/components/QRScannerModalImpl.tsx
@@ -208,7 +208,11 @@ const QRScannerModalImpl: React.FC<QRScannerModalProps> = ({
   }
 
   return (
-    <Modal visible={visible} animationType="slide" statusBarTranslucent>
+    <Modal
+      visible={visible}
+      animationType="slide"
+      statusBarTranslucent
+      onRequestClose={handleCancel}>
       <StatusBar barStyle="light-content" backgroundColor="black" />
       <View style={styles.container}>
         <Camera
diff --git a/formulus/src/navigation/MainAppNavigator.tsx b/formulus/src/navigation/MainAppNavigator.tsx
index 54beac2a9..2dc7be990 100644
--- a/formulus/src/navigation/MainAppNavigator.tsx
+++ b/formulus/src/navigation/MainAppNavigator.tsx
@@ -17,6 +17,7 @@ import {
   odeTypography,
   odeScreenHeaderHeight,
 } from '../theme/odeDesign';
+import colors from '../theme/colors';
 
 const Stack = createStackNavigator<MainAppStackParamList>();
 
@@ -142,7 +143,7 @@ const MainAppNavigator: React.FC = () => {
         options={{
           title: 'Observation Details',
           headerTransparent: true,
-          headerStyle: { backgroundColor: 'transparent' },
+          headerStyle: { backgroundColor: colors.neutral.transparent },
           header: props => (
             <ObservationDetailHeader
               navigation={props.navigation}
diff --git a/formulus/src/navigation/MainTabNavigator.tsx b/formulus/src/navigation/MainTabNavigator.tsx
index 13ee9128c..5b46c811b 100644
--- a/formulus/src/navigation/MainTabNavigator.tsx
+++ b/formulus/src/navigation/MainTabNavigator.tsx
@@ -325,7 +325,7 @@ const styles = StyleSheet.create({
   },
   customTabBarContainer: {
     width: '100%',
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   customTabBarRow: {
     flexDirection: 'row',
diff --git a/formulus/src/screens/AboutScreen.tsx b/formulus/src/screens/AboutScreen.tsx
index 0cd7431ca..37722564a 100644
--- a/formulus/src/screens/AboutScreen.tsx
+++ b/formulus/src/screens/AboutScreen.tsx
@@ -62,7 +62,10 @@ const AboutScreen: React.FC = () => {
   return (
     <View style={shellStyle}>
       <SafeAreaView
-        style={[styles.container, { backgroundColor: 'transparent' }]}
+        style={[
+          styles.container,
+          { backgroundColor: colors.neutral.transparent },
+        ]}
         edges={['top']}>
         <View
           style={[
@@ -207,7 +210,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   scrollTransparent: {
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   header: {
     padding: odeSpacing.md,
@@ -245,12 +248,12 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginRight: 12,
     overflow: 'hidden',
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   logo: {
     width: 40,
     height: 40,
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   version: {
     marginTop: odeSpacing.xxs,
diff --git a/formulus/src/screens/FormsScreen.tsx b/formulus/src/screens/FormsScreen.tsx
index 6b639d1eb..0bf13b892 100644
--- a/formulus/src/screens/FormsScreen.tsx
+++ b/formulus/src/screens/FormsScreen.tsx
@@ -109,7 +109,10 @@ const FormsScreen: React.FC = () => {
     return (
       <View style={shellStyle}>
         <SafeAreaView
-          style={[styles.container, { backgroundColor: 'transparent' }]}>
+          style={[
+            styles.container,
+            { backgroundColor: colors.neutral.transparent },
+          ]}>
           <View style={styles.loadingContainer}>
             <ActivityIndicator size="large" color={themeColors.primary} />
             <Text
@@ -126,7 +129,10 @@ const FormsScreen: React.FC = () => {
     return (
       <View style={shellStyle}>
         <SafeAreaView
-          style={[styles.container, { backgroundColor: 'transparent' }]}>
+          style={[
+            styles.container,
+            { backgroundColor: colors.neutral.transparent },
+          ]}>
           <EmptyState
             icon="alert-circle-outline"
             title="Error Loading Forms"
@@ -142,7 +148,10 @@ const FormsScreen: React.FC = () => {
   return (
     <View style={shellStyle}>
       <SafeAreaView
-        style={[styles.container, { backgroundColor: 'transparent' }]}
+        style={[
+          styles.container,
+          { backgroundColor: colors.neutral.transparent },
+        ]}
         edges={['top']}>
         <View
           style={[
@@ -258,7 +267,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   listTransparent: {
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   header: {
     flexDirection: 'row',
diff --git a/formulus/src/screens/HelpScreen.tsx b/formulus/src/screens/HelpScreen.tsx
index 23a9c603d..6d2366aaa 100644
--- a/formulus/src/screens/HelpScreen.tsx
+++ b/formulus/src/screens/HelpScreen.tsx
@@ -79,7 +79,10 @@ const HelpScreen: React.FC = () => {
   return (
     <View style={shellStyle}>
       <SafeAreaView
-        style={[styles.container, { backgroundColor: 'transparent' }]}
+        style={[
+          styles.container,
+          { backgroundColor: colors.neutral.transparent },
+        ]}
         edges={['top']}>
         <View
           style={[
@@ -297,7 +300,7 @@ const HelpScreen: React.FC = () => {
 
 const styles = StyleSheet.create({
   container: { flex: 1 },
-  scrollTransparent: { backgroundColor: 'transparent' },
+  scrollTransparent: { backgroundColor: colors.neutral.transparent },
   header: {
     padding: odeSpacing.md,
     borderBottomWidth: odeBorderWidth.hairline,
@@ -330,12 +333,12 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginRight: 12,
     overflow: 'hidden',
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   logo: {
     width: 40,
     height: 40,
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   content: {
     padding: odeSpacing.md,
diff --git a/formulus/src/screens/HomeScreen.tsx b/formulus/src/screens/HomeScreen.tsx
index 4e579aa0e..689e6a9b5 100644
--- a/formulus/src/screens/HomeScreen.tsx
+++ b/formulus/src/screens/HomeScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useRef, useCallback } from 'react';
 import {
   BackHandler,
   StyleSheet,
@@ -65,7 +65,7 @@ const HomeScreen = ({ navigation }: { navigation: any }) => {
     }, [showConfirm]),
   );
 
-  const checkAndSetAppUri = async () => {
+  const checkAndSetAppUri = useCallback(async () => {
     try {
       const filePath = `${RNFS.DocumentDirectoryPath}/app/index.html`;
       const fileExists = await RNFS.exists(filePath);
@@ -85,13 +85,13 @@ const HomeScreen = ({ navigation }: { navigation: any }) => {
     } catch (err) {
       console.warn('[HomeScreen] Failed to setup app URI:', err);
     }
-  };
+  }, [reloadTheme]);
 
   useEffect(() => {
     Promise.resolve().then(() => {
       checkAndSetAppUri();
     });
-  }, []);
+  }, [checkAndSetAppUri]);
 
   useEffect(() => {
     const unsubscribe = navigation.addListener('focus', () => {
@@ -100,7 +100,7 @@ const HomeScreen = ({ navigation }: { navigation: any }) => {
       });
     });
     return unsubscribe;
-  }, [navigation]);
+  }, [navigation, checkAndSetAppUri]);
 
   useEffect(() => {
     const onBundleUpdated: Listener = () => {
@@ -109,7 +109,7 @@ const HomeScreen = ({ navigation }: { navigation: any }) => {
     };
     appEvents.addListener('bundleUpdated', onBundleUpdated);
     return () => appEvents.removeListener('bundleUpdated', onBundleUpdated);
-  }, []);
+  }, [checkAndSetAppUri]);
 
   useEffect(() => {
     if (localUri) {
diff --git a/formulus/src/screens/MoreScreen.tsx b/formulus/src/screens/MoreScreen.tsx
index d69efaa42..9c527718d 100644
--- a/formulus/src/screens/MoreScreen.tsx
+++ b/formulus/src/screens/MoreScreen.tsx
@@ -12,6 +12,7 @@ import { useScreenShellStyle } from '../hooks/useScreenShellStyle';
 import MenuDrawer from '../components/MenuDrawer';
 import { logout } from '../api/synkronus/Auth';
 import { useConfirmModal } from '../contexts/ConfirmModalContext';
+import colors from '../theme/colors';
 
 type MoreScreenNavigationProp = BottomTabNavigationProp<
   MainTabParamList,
@@ -104,7 +105,7 @@ const MoreScreen: React.FC = () => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
 });
 
diff --git a/formulus/src/screens/ObservationDetailScreen.tsx b/formulus/src/screens/ObservationDetailScreen.tsx
index 60cf1ee37..d41e622c0 100644
--- a/formulus/src/screens/ObservationDetailScreen.tsx
+++ b/formulus/src/screens/ObservationDetailScreen.tsx
@@ -237,7 +237,10 @@ const ObservationDetailScreen: React.FC<ObservationDetailScreenProps> = ({
     return (
       <View style={shellStyle}>
         <SafeAreaView
-          style={[styles.container, { backgroundColor: 'transparent' }]}>
+          style={[
+            styles.container,
+            { backgroundColor: colors.neutral.transparent },
+          ]}>
           <View style={styles.loadingContainer}>
             <ActivityIndicator size="large" color={themeColors.primary} />
             <Text
@@ -254,7 +257,10 @@ const ObservationDetailScreen: React.FC<ObservationDetailScreenProps> = ({
     return (
       <View style={shellStyle}>
         <SafeAreaView
-          style={[styles.container, { backgroundColor: 'transparent' }]}>
+          style={[
+            styles.container,
+            { backgroundColor: colors.neutral.transparent },
+          ]}>
           <View style={styles.errorContainer}>
             <Text style={styles.errorText}>Observation not found</Text>
           </View>
@@ -282,7 +288,10 @@ const ObservationDetailScreen: React.FC<ObservationDetailScreenProps> = ({
   return (
     <View style={shellStyle}>
       <SafeAreaView
-        style={[styles.container, { backgroundColor: 'transparent' }]}>
+        style={[
+          styles.container,
+          { backgroundColor: colors.neutral.transparent },
+        ]}>
         <ScrollView
           style={styles.content}
           contentContainerStyle={[
diff --git a/formulus/src/screens/ObservationsScreen.tsx b/formulus/src/screens/ObservationsScreen.tsx
index ed4fa6b88..667aae9d2 100644
--- a/formulus/src/screens/ObservationsScreen.tsx
+++ b/formulus/src/screens/ObservationsScreen.tsx
@@ -212,7 +212,10 @@ const ObservationsScreen: React.FC = () => {
     return (
       <View style={shellStyle}>
         <SafeAreaView
-          style={[styles.container, { backgroundColor: 'transparent' }]}>
+          style={[
+            styles.container,
+            { backgroundColor: colors.neutral.transparent },
+          ]}>
           <View style={styles.loadingContainer}>
             <ActivityIndicator size="large" color={themeColors.primary} />
             <Text
@@ -229,7 +232,10 @@ const ObservationsScreen: React.FC = () => {
     return (
       <View style={shellStyle}>
         <SafeAreaView
-          style={[styles.container, { backgroundColor: 'transparent' }]}>
+          style={[
+            styles.container,
+            { backgroundColor: colors.neutral.transparent },
+          ]}>
           <EmptyState
             icon="alert-circle-outline"
             title="Error Loading Observations"
@@ -245,7 +251,10 @@ const ObservationsScreen: React.FC = () => {
   return (
     <View style={shellStyle}>
       <SafeAreaView
-        style={[styles.container, { backgroundColor: 'transparent' }]}
+        style={[
+          styles.container,
+          { backgroundColor: colors.neutral.transparent },
+        ]}
         edges={['top']}>
         <View
           style={[
@@ -376,7 +385,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   listTransparent: {
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   header: {
     flexDirection: 'row',
diff --git a/formulus/src/screens/SettingsScreen.tsx b/formulus/src/screens/SettingsScreen.tsx
index 53bfee8eb..d82e6ec50 100644
--- a/formulus/src/screens/SettingsScreen.tsx
+++ b/formulus/src/screens/SettingsScreen.tsx
@@ -30,6 +30,7 @@ import {
 import QRScannerModal, {
   ScannerModalResults,
 } from '../components/QRScannerModal';
+import { appVersionService } from '../services/AppVersionService';
 import { QRSettingsService } from '../services/QRSettingsService';
 import { MainTabParamList } from '../types/NavigationTypes';
 import Icon from '@react-native-vector-icons/material-design-icons';
@@ -89,6 +90,7 @@ const SettingsScreen = () => {
   const [isHydrating, setIsHydrating] = useState(() => !initialSnap.ready);
   const [isLoggingIn, setIsLoggingIn] = useState(false);
   const [showQRScanner, setShowQRScanner] = useState(false);
+  const [version, setVersion] = useState('');
   const mountedRef = useRef(true);
 
   useEffect(() => {
@@ -98,6 +100,17 @@ const SettingsScreen = () => {
     };
   }, []);
 
+  useEffect(() => {
+    const load = async () => {
+      try {
+        setVersion(await appVersionService.getFullVersion());
+      } catch {
+        setVersion('');
+      }
+    };
+    load();
+  }, []);
+
   useEffect(() => {
     let cancelled = false;
 
@@ -282,7 +295,7 @@ const SettingsScreen = () => {
         return false;
       }
     },
-    [initialServerUrl],
+    [initialServerUrl, showConfirm],
   );
 
   const handleLogin = useCallback(async () => {
@@ -411,7 +424,10 @@ const SettingsScreen = () => {
   return (
     <View style={shellStyle}>
       <SafeAreaView
-        style={[styles.container, { backgroundColor: 'transparent' }]}
+        style={[
+          styles.container,
+          { backgroundColor: colors.neutral.transparent },
+        ]}
         edges={['top']}>
         <View
           style={[
@@ -436,7 +452,7 @@ const SettingsScreen = () => {
         </View>
 
         <ScrollView
-          style={[styles.card, { backgroundColor: 'transparent' }]}
+          style={[styles.card, { backgroundColor: colors.neutral.transparent }]}
           contentContainerStyle={styles.cardContent}
           keyboardShouldPersistTaps="handled"
           keyboardDismissMode="on-drag">
@@ -571,16 +587,20 @@ const SettingsScreen = () => {
           </View>
 
           <View style={styles.versionContainer}>
-            <Text style={[styles.version, { color: themeColors.onSurface }]}>
-              v1.0.0
-            </Text>
-            <Text
-              style={[
-                styles.versionCodename,
-                { color: themeColors.onSurface },
-              ]}>
-              Young Ossicone
-            </Text>
+            {!!version && (
+              <Text style={[styles.version, { color: themeColors.onSurface }]}>
+                v{version}
+              </Text>
+            )}
+            {!!version && (
+              <Text
+                style={[
+                  styles.versionCodename,
+                  { color: themeColors.onSurface },
+                ]}>
+                Young Ossicone
+              </Text>
+            )}
           </View>
         </ScrollView>
 
@@ -621,12 +641,12 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginRight: 12,
     overflow: 'hidden',
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   logo: {
     width: 40,
     height: 40,
-    backgroundColor: 'transparent',
+    backgroundColor: colors.neutral.transparent,
   },
   brandName: {
     fontSize: odeTypography.screenTitle,
diff --git a/formulus/src/services/GeolocationService.ts b/formulus/src/services/GeolocationService.ts
index 05408338c..2196e0114 100644
--- a/formulus/src/services/GeolocationService.ts
+++ b/formulus/src/services/GeolocationService.ts
@@ -9,6 +9,7 @@ import {
   hasLocationPermission,
 } from './LocationPermissions';
 import { RESULTS } from 'react-native-permissions';
+import { appEvents } from '../webview/FormulusMessageHandlers';
 
 /**
  * Geolocation for observations: one "session" per open form in FormplayerModal.
@@ -37,6 +38,10 @@ export class GeolocationService {
 
   private activeSessionCleanup: (() => void) | null = null;
 
+  /** Custom-app watch (map tab) — separate from formplayer observation session. */
+  private appWatchFieldId: string | null = null;
+  private appWatchCleanup: (() => void) | null = null;
+
   private constructor() {}
 
   public static getInstance(): GeolocationService {
@@ -139,6 +144,77 @@ export class GeolocationService {
     this.cachedAt = 0;
   }
 
+  private emitAppWatchUpdate(
+    fieldId: string,
+    location: ObservationGeolocation,
+  ): void {
+    appEvents.emit('locationWatchUpdate', {
+      fieldId,
+      location: {
+        type: 'location' as const,
+        latitude: location.latitude || 0,
+        longitude: location.longitude || 0,
+        accuracy: location.accuracy,
+        altitude: location.altitude,
+        altitudeAccuracy: location.altitude_accuracy,
+        timestamp: location.timestamp ?? new Date().toISOString(),
+      },
+    });
+  }
+
+  /** Start battery-conscious watch for custom apps; returns cleanup. */
+  public startAppLocationWatch(fieldId: string): () => void {
+    this.stopAppLocationWatch();
+    this.appWatchFieldId = fieldId;
+
+    let cancelled = false;
+    let watchId: number | null = null;
+
+    const push = (loc: ObservationGeolocation | null) => {
+      if (!loc || cancelled || this.appWatchFieldId !== fieldId) return;
+      this.mergeBestCandidate(loc);
+      this.emitAppWatchUpdate(fieldId, loc);
+    };
+
+    void this.getPositionOnce(this.freshConfig).then(push);
+
+    void (async () => {
+      const ok = await hasLocationPermission();
+      if (cancelled || !ok) return;
+      watchId = Geolocation.watchPosition(
+        position => push(this.convertToObservationGeolocation(position)),
+        error => console.warn('App location watch error:', error),
+        { enableHighAccuracy: true, distanceFilter: 20 },
+      );
+    })();
+
+    const cleanup = () => {
+      cancelled = true;
+      if (watchId != null) {
+        Geolocation.clearWatch(watchId);
+        watchId = null;
+      }
+      if (this.appWatchFieldId === fieldId) {
+        this.appWatchFieldId = null;
+      }
+      if (this.appWatchCleanup === cleanup) {
+        this.appWatchCleanup = null;
+      }
+    };
+
+    this.appWatchCleanup = cleanup;
+    return cleanup;
+  }
+
+  public stopAppLocationWatch(fieldId?: string): void {
+    if (!this.appWatchCleanup) return;
+    if (fieldId && this.appWatchFieldId !== fieldId) return;
+    const run = this.appWatchCleanup;
+    this.appWatchCleanup = null;
+    this.appWatchFieldId = null;
+    run();
+  }
+
   private async getPositionOnce(
     config: GeolocationConfig,
   ): Promise<ObservationGeolocation | null> {
diff --git a/formulus/src/services/QrcodeRequestCoordinator.ts b/formulus/src/services/QrcodeRequestCoordinator.ts
new file mode 100644
index 000000000..7f32d015b
--- /dev/null
+++ b/formulus/src/services/QrcodeRequestCoordinator.ts
@@ -0,0 +1,63 @@
+/**
+ * Ensures at most one in-flight `requestQrcode` bridge call; settles on cancel.
+ */
+
+export type QrcodeBridgeResult = {
+  fieldId?: string;
+  status: string;
+  message?: string;
+  data?: unknown;
+};
+
+type ActiveRequest = {
+  fieldId: string;
+  resolve: (result: unknown) => void;
+  settled: boolean;
+};
+
+export class QrcodeRequestCoordinator {
+  private active: ActiveRequest | null = null;
+
+  /** Start a QR request, or reject immediately if the scanner is already open. */
+  request(fieldId: string): Promise<unknown> {
+    if (this.active && !this.active.settled) {
+      return Promise.resolve({
+        fieldId,
+        status: 'error',
+        message: 'QR scanner is already open',
+      } satisfies QrcodeBridgeResult);
+    }
+
+    return new Promise(resolve => {
+      this.active = { fieldId, resolve, settled: false };
+    });
+  }
+
+  /** Resolve the active request (idempotent). */
+  settle(result: unknown): void {
+    if (!this.active || this.active.settled) return;
+    this.active.settled = true;
+    const { resolve } = this.active;
+    this.active = null;
+    resolve(result);
+  }
+
+  /** Cancel the active request if it matches `fieldId` (or any if omitted). */
+  cancel(fieldId?: string): void {
+    if (!this.active || this.active.settled) return;
+    if (fieldId && this.active.fieldId !== fieldId) return;
+
+    this.settle({
+      fieldId: this.active.fieldId,
+      status: 'cancelled',
+      message: 'QR scan cancelled',
+    } satisfies QrcodeBridgeResult);
+  }
+
+  getActiveFieldId(): string | null {
+    if (!this.active || this.active.settled) return null;
+    return this.active.fieldId;
+  }
+}
+
+export const qrcodeRequestCoordinator = new QrcodeRequestCoordinator();
diff --git a/formulus/src/services/SequenceCounterService.ts b/formulus/src/services/SequenceCounterService.ts
new file mode 100644
index 000000000..54887fb84
--- /dev/null
+++ b/formulus/src/services/SequenceCounterService.ts
@@ -0,0 +1,62 @@
+/**
+ * Device-local monotonic sequence counters for scoped auto-numbering.
+ * Keys are fully qualified (including device prefix) before storage.
+ */
+
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import { clientIdService } from './ClientIdService';
+
+const STORAGE_PREFIX = '@ode_sequence:';
+
+export type AllocateSequenceOptions = {
+  startAt?: number;
+  peek?: boolean;
+};
+
+export class SequenceCounterService {
+  private static instance: SequenceCounterService;
+
+  private constructor() {}
+
+  public static getInstance(): SequenceCounterService {
+    if (!SequenceCounterService.instance) {
+      SequenceCounterService.instance = new SequenceCounterService();
+    }
+    return SequenceCounterService.instance;
+  }
+
+  /** Prefix app-authored scope suffix with stable device id. */
+  public async buildFullScopeKey(appScopeKey: string): Promise<string> {
+    const trimmed = appScopeKey.trim();
+    if (!trimmed) {
+      throw new Error('scopeKey is required');
+    }
+    const deviceId = await clientIdService.getClientId();
+    return `device:${deviceId}:${trimmed}`;
+  }
+
+  public async allocate(
+    appScopeKey: string,
+    options: AllocateSequenceOptions = {},
+  ): Promise<number> {
+    const fullKey = await this.buildFullScopeKey(appScopeKey);
+    const startAt = options.startAt ?? 1;
+    const storageKey = STORAGE_PREFIX + fullKey;
+
+    const raw = await AsyncStorage.getItem(storageKey);
+    const current = raw != null ? Number(raw) : startAt - 1;
+    const last =
+      Number.isFinite(current) && current >= startAt - 1
+        ? current
+        : startAt - 1;
+    const next = last + 1;
+
+    if (!options.peek) {
+      await AsyncStorage.setItem(storageKey, String(next));
+    }
+
+    return next;
+  }
+}
+
+export const sequenceCounterService = SequenceCounterService.getInstance();
diff --git a/formulus/src/services/__tests__/QrcodeRequestCoordinator.test.ts b/formulus/src/services/__tests__/QrcodeRequestCoordinator.test.ts
new file mode 100644
index 000000000..6a404ef7c
--- /dev/null
+++ b/formulus/src/services/__tests__/QrcodeRequestCoordinator.test.ts
@@ -0,0 +1,42 @@
+import { QrcodeRequestCoordinator } from '../QrcodeRequestCoordinator';
+
+describe('QrcodeRequestCoordinator', () => {
+  it('rejects a second request while the scanner is open', async () => {
+    const coordinator = new QrcodeRequestCoordinator();
+    void coordinator.request('field-a');
+
+    const second = await coordinator.request('field-b');
+    expect(second).toEqual({
+      fieldId: 'field-b',
+      status: 'error',
+      message: 'QR scanner is already open',
+    });
+  });
+
+  it('settles the active request once', async () => {
+    const coordinator = new QrcodeRequestCoordinator();
+    const promise = coordinator.request('field-a');
+
+    coordinator.settle({ fieldId: 'field-a', status: 'success', data: 'x' });
+    coordinator.settle({ fieldId: 'field-a', status: 'cancelled' });
+
+    await expect(promise).resolves.toEqual({
+      fieldId: 'field-a',
+      status: 'success',
+      data: 'x',
+    });
+  });
+
+  it('cancels with a cancelled status', async () => {
+    const coordinator = new QrcodeRequestCoordinator();
+    const promise = coordinator.request('field-a');
+
+    coordinator.cancel('field-a');
+
+    await expect(promise).resolves.toEqual({
+      fieldId: 'field-a',
+      status: 'cancelled',
+      message: 'QR scan cancelled',
+    });
+  });
+});
diff --git a/formulus/src/theme/odeDesign.ts b/formulus/src/theme/odeDesign.ts
index 0c8ad0dac..1ed8a39c1 100644
--- a/formulus/src/theme/odeDesign.ts
+++ b/formulus/src/theme/odeDesign.ts
@@ -81,6 +81,7 @@ export const odeScreenHeaderHeight = (() => {
 /** Compact single-line header for the Formplayer modal (title + close only). */
 export const odeFormplayerHeaderHeight = (() => {
   const lineHeightFactor = 1.25;
-  const titleLineHeight = odeTypography.screenTitle * lineHeightFactor;
-  return odeSpacing.sm * 2 + titleLineHeight;
+  const titleLineHeight = odeTypography.bodySm * lineHeightFactor;
+  const verticalPadding = 4;
+  return verticalPadding + titleLineHeight;
 })();
diff --git a/formulus/src/webview/FormulusInterfaceDefinition.ts b/formulus/src/webview/FormulusInterfaceDefinition.ts
index 7495db379..3be0c2205 100644
--- a/formulus/src/webview/FormulusInterfaceDefinition.ts
+++ b/formulus/src/webview/FormulusInterfaceDefinition.ts
@@ -394,6 +394,9 @@ export interface FormulusInterface {
    *   `window.formulusSessionContext`. Draft bypass is not a param key — use
    *   `options.skipDraftSelection` on {@link openFormplayer} (same as `skipFinalize`).
    * @param {Object} savedData - Previously saved form data (for editing)
+   * @param {Object} [options] - Session options (not persisted as observation data)
+   * @param {string|null} [options.observationId] - When set, finalize updates this
+   *   observation instead of creating a new one
    * @returns {Promise<FormCompletionResult>} Promise that resolves when the form is completed/closed with result details
    */
   openFormplayer(
@@ -404,6 +407,7 @@ export interface FormulusInterface {
       subObservationMode?: boolean;
       skipFinalize?: boolean;
       skipDraftSelection?: boolean;
+      observationId?: string | null;
     },
   ): Promise<FormCompletionResult>;
 
@@ -478,6 +482,34 @@ export interface FormulusInterface {
    */
   requestLocation(fieldId: string): Promise<LocationResult>;
 
+  /**
+   * Return the best cached device fix (if any) without forcing a new GPS read.
+   * @param fieldId Optional field id for parity with `requestLocation`
+   */
+  getCachedLocation(fieldId?: string): Promise<LocationResult | null>;
+
+  /**
+   * Allocate the next monotonic integer in a device-local scope.
+   * Formulus prepends `device:{deviceId}:` to the app-authored `scopeKey` suffix.
+   * @param scopeKey App suffix, e.g. `af:A12:person` (no device prefix).
+   * @param options `startAt` default 1; `peek` returns next without consuming.
+   */
+  allocateSequence(
+    scopeKey: string,
+    options?: { startAt?: number; peek?: boolean },
+  ): Promise<number>;
+
+  /**
+   * Subscribe to location updates while the custom app WebView is active.
+   * Updates arrive as `locationWatchUpdate` window messages.
+   */
+  watchLocation(
+    fieldId: string,
+  ): Promise<{ status: 'started' | 'error'; message?: string }>;
+
+  /** Stop a prior `watchLocation` subscription for `fieldId`. */
+  stopWatchLocation(fieldId: string): Promise<void>;
+
   /**
    * Request file selection for a field
    * @param {string} fieldId - The ID of the field
@@ -694,7 +726,7 @@ export interface FormulusCallbacks {
 /**
  * Current version of the interface
  */
-export const FORMULUS_INTERFACE_VERSION = '1.4.0';
+export const FORMULUS_INTERFACE_VERSION = '1.5.0';
 
 /** Parses major.minor.patch from the start of a version string (ignores prerelease after `-`). */
 function semverSegments(version: string): [number, number, number] {
diff --git a/formulus/src/webview/FormulusMessageHandlers.ts b/formulus/src/webview/FormulusMessageHandlers.ts
index cffcc592d..72ae442f9 100644
--- a/formulus/src/webview/FormulusMessageHandlers.ts
+++ b/formulus/src/webview/FormulusMessageHandlers.ts
@@ -3,6 +3,8 @@ This is where the actual implementation of the methods happens on the React Nati
 It handles the messages received from the WebView and executes the corresponding native functionality.
 */
 import { GeolocationService } from '../services/GeolocationService';
+import { sequenceCounterService } from '../services/SequenceCounterService';
+import { qrcodeRequestCoordinator } from '../services/QrcodeRequestCoordinator';
 import { WebViewMessageEvent, WebView } from 'react-native-webview';
 import RNFS from 'react-native-fs';
 import * as Keychain from 'react-native-keychain';
@@ -529,27 +531,28 @@ export function createFormulusMessageHandlers(): FormulusMessageHandlers {
     onRequestQrcode: async (fieldId: string): Promise<unknown> => {
       console.log('Request QR code handler called', fieldId);
 
-      return new Promise(resolve => {
-        try {
-          // Emit event to open QR scanner modal
-          appEvents.emit('openQRScanner', {
-            fieldId,
-            onResult: (result: unknown) => {
-              console.log('QR scan result received:', result);
-              resolve(result);
-            },
-          });
-        } catch (error) {
-          console.error('Error in QR code handler:', error);
-          const errorMessage =
-            error instanceof Error ? error.message : 'Unknown error';
-          resolve({
-            fieldId,
-            status: 'error',
-            message: `QR code error: ${errorMessage}`,
-          });
-        }
-      });
+      const promise = qrcodeRequestCoordinator.request(fieldId);
+
+      try {
+        appEvents.emit('openQRScanner', {
+          fieldId,
+          onResult: (result: unknown) => {
+            console.log('QR scan result received:', result);
+            qrcodeRequestCoordinator.settle(result);
+          },
+        });
+      } catch (error) {
+        console.error('Error in QR code handler:', error);
+        const errorMessage =
+          error instanceof Error ? error.message : 'Unknown error';
+        qrcodeRequestCoordinator.settle({
+          fieldId,
+          status: 'error',
+          message: `QR code error: ${errorMessage}`,
+        });
+      }
+
+      return promise;
     },
     onRequestSignature: async (fieldId: string): Promise<unknown> => {
       console.log('Request signature handler called', fieldId);
@@ -686,6 +689,98 @@ export function createFormulusMessageHandlers(): FormulusMessageHandlers {
         }
       });
     },
+
+    onGetCachedLocation: async (
+      payload: string | { fieldId?: string },
+    ): Promise<unknown> => {
+      const fieldId =
+        typeof payload === 'string'
+          ? payload
+          : typeof payload?.fieldId === 'string'
+            ? payload.fieldId
+            : '';
+      const geolocationService = GeolocationService.getInstance();
+      const position = geolocationService.getCachedLocation();
+      if (!position) return null;
+      return {
+        fieldId,
+        status: 'success' as const,
+        data: {
+          type: 'location' as const,
+          latitude: position.latitude || 0,
+          longitude: position.longitude || 0,
+          accuracy: position.accuracy,
+          altitude: position.altitude,
+          altitudeAccuracy: position.altitude_accuracy,
+          timestamp: position.timestamp ?? new Date().toISOString(),
+        },
+      };
+    },
+
+    onAllocateSequence: async (
+      payload:
+        | string
+        | {
+            scopeKey?: string;
+            startAt?: number;
+            peek?: boolean;
+            options?: { startAt?: number; peek?: boolean };
+          },
+    ): Promise<number> => {
+      const scopeKey =
+        typeof payload === 'string'
+          ? payload
+          : typeof payload?.scopeKey === 'string'
+            ? payload.scopeKey
+            : '';
+      // The WebView injection nests options under `options`; fall back to flat
+      // top-level fields for back-compat with older/string callers.
+      const opts =
+        typeof payload === 'object' && payload != null
+          ? (payload.options ?? payload)
+          : undefined;
+      const startAt = opts?.startAt;
+      const peek = opts?.peek;
+      return sequenceCounterService.allocate(scopeKey, { startAt, peek });
+    },
+
+    onWatchLocation: async (
+      payload: string | { fieldId?: string },
+    ): Promise<unknown> => {
+      const fieldId =
+        typeof payload === 'string'
+          ? payload
+          : typeof payload?.fieldId === 'string'
+            ? payload.fieldId
+            : '';
+      if (!fieldId) {
+        return { status: 'error', message: 'fieldId is required' };
+      }
+      try {
+        GeolocationService.getInstance().startAppLocationWatch(fieldId);
+        return { status: 'started' };
+      } catch (error) {
+        const message =
+          error instanceof Error ? error.message : 'watchLocation failed';
+        return { status: 'error', message };
+      }
+    },
+
+    onStopWatchLocation: async (
+      payload: string | { fieldId?: string },
+    ): Promise<unknown> => {
+      const fieldId =
+        typeof payload === 'string'
+          ? payload
+          : typeof payload?.fieldId === 'string'
+            ? payload.fieldId
+            : '';
+      GeolocationService.getInstance().stopAppLocationWatch(
+        fieldId || undefined,
+      );
+      return { status: 'stopped' };
+    },
+
     onRequestVideo: async (fieldId: string): Promise<unknown> => {
       return new Promise((resolve, reject) => {
         try {
@@ -1330,6 +1425,7 @@ export function createFormulusMessageHandlers(): FormulusMessageHandlers {
           subObservationMode?: boolean;
           skipFinalize?: boolean;
           skipDraftSelection?: boolean;
+          observationId?: string | null;
           returnOnly?: boolean;
         };
         /** @deprecated Legacy key; prefer subObservationMode */
@@ -1348,11 +1444,13 @@ export function createFormulusMessageHandlers(): FormulusMessageHandlers {
       const skipDraftSelection = Boolean(
         data.options?.skipDraftSelection || data.skipDraftSelection,
       );
+      const observationId =
+        data.observationId ?? data.options?.observationId ?? null;
       return startFormplayerOperation(
         data.formType,
         data.params,
         data.savedData,
-        data.observationId ?? null,
+        observationId,
         subObservationMode,
         skipFinalize,
         skipDraftSelection,
diff --git a/packages/components/pnpm-lock.yaml b/packages/components/pnpm-lock.yaml
index c02ac6fed..8ecfbeb9a 100644
--- a/packages/components/pnpm-lock.yaml
+++ b/packages/components/pnpm-lock.yaml
@@ -10,7 +10,7 @@ importers:
     dependencies:
       '@babel/runtime':
         specifier: ^7.28.0
-        version: 7.29.2
+        version: 7.29.7
       '@ode/tokens':
         specifier: file:../tokens
         version: file:../tokens
@@ -100,8 +100,8 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/runtime@7.29.2':
-    resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}
+  '@babel/runtime@7.29.7':
+    resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==}
     engines: {node: '>=6.9.0'}
 
   '@babel/template@7.28.6':
@@ -1477,7 +1477,7 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.0
 
-  '@babel/runtime@7.29.2': {}
+  '@babel/runtime@7.29.7': {}
 
   '@babel/template@7.28.6':
     dependencies:
@@ -2421,7 +2421,7 @@ snapshots:
 
   metro-runtime@0.84.4:
     dependencies:
-      '@babel/runtime': 7.29.2
+      '@babel/runtime': 7.29.7
       flow-enums-runtime: 0.0.6
 
   metro-source-map@0.84.4:
diff --git a/packages/observation-query/pnpm-lock.yaml b/packages/observation-query/pnpm-lock.yaml
index 2107f323b..1b356c4a7 100644
--- a/packages/observation-query/pnpm-lock.yaml
+++ b/packages/observation-query/pnpm-lock.yaml
@@ -7,6 +7,10 @@ settings:
 importers:
 
   .:
+    dependencies:
+      '@babel/runtime':
+        specifier: ^7.28.4
+        version: 7.29.7
     devDependencies:
       '@types/jest':
         specifier: ^29.5.0
@@ -173,6 +177,10 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/runtime@7.29.7':
+    resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/template@7.28.6':
     resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
@@ -1341,6 +1349,8 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.28.6
 
+  '@babel/runtime@7.29.7': {}
+
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.29.0
diff --git a/packages/tokens/dist/css/tokens.css b/packages/tokens/dist/css/tokens.css
index 0c64d16f0..fc87db00c 100644
--- a/packages/tokens/dist/css/tokens.css
+++ b/packages/tokens/dist/css/tokens.css
@@ -4,7 +4,7 @@
  * This file is auto-generated by Style Dictionary.
  * Do not edit directly. Edit source files in src/tokens/ instead.
  * 
- * Generated: 2026-05-18T02:14:18.499Z
+ * Generated: 2026-06-18T18:09:49.722Z
  */
 
 :root {
diff --git a/packages/tokens/dist/js/tokens.d.ts b/packages/tokens/dist/js/tokens.d.ts
index d618b9de4..f88df0ae9 100644
--- a/packages/tokens/dist/js/tokens.d.ts
+++ b/packages/tokens/dist/js/tokens.d.ts
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Mon, 18 May 2026 02:14:18 GMT
+ * Generated on Thu, 18 Jun 2026 18:09:49 GMT
  */
 
 export const ContrastAaLarge : string;
diff --git a/packages/tokens/dist/js/tokens.js b/packages/tokens/dist/js/tokens.js
index 1c564e62c..d2fc3287f 100644
--- a/packages/tokens/dist/js/tokens.js
+++ b/packages/tokens/dist/js/tokens.js
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Mon, 18 May 2026 02:14:18 GMT
+ * Generated on Thu, 18 Jun 2026 18:09:49 GMT
  */
 
 export const ContrastAaLarge = "3:1";
diff --git a/packages/tokens/dist/react-native/tokens.d.ts b/packages/tokens/dist/react-native/tokens.d.ts
index e9109fdbd..667a2f162 100644
--- a/packages/tokens/dist/react-native/tokens.d.ts
+++ b/packages/tokens/dist/react-native/tokens.d.ts
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Mon, 18 May 2026 02:14:18 GMT
+ * Generated on Thu, 18 Jun 2026 18:09:49 GMT
  */
 
 export const contrastAaLarge : string;
diff --git a/packages/tokens/dist/react-native/tokens.js b/packages/tokens/dist/react-native/tokens.js
index 932f2ff13..d90395576 100644
--- a/packages/tokens/dist/react-native/tokens.js
+++ b/packages/tokens/dist/react-native/tokens.js
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Mon, 18 May 2026 02:14:18 GMT
+ * Generated on Thu, 18 Jun 2026 18:09:49 GMT
  */
 
 module.exports = {
diff --git a/renovate.json b/renovate.json
index 2c7f4b52a..2219d717f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,6 +4,17 @@
     "config:recommended"
   ],
   "labels": ["dependencies"],
+  "lockFileMaintenance": {
+    "enabled": false
+  },
+  "packageRules": [
+    {
+      "description": "formulus: always bump package.json ranges (pnpm + npm lockfiles must stay aligned)",
+      "matchManagers": ["npm"],
+      "matchFileNames": ["formulus/package.json"],
+      "rangeStrategy": "bump"
+    }
+  ],
   "github-actions": {
     "pinDigests": true
   }
diff --git a/synkronus-cli/AGENTS.md b/synkronus-cli/AGENTS.md
index b56309242..a449ed846 100644
--- a/synkronus-cli/AGENTS.md
+++ b/synkronus-cli/AGENTS.md
@@ -29,4 +29,6 @@ The CLI may be **GPL-2.0-or-later** until the QR dependency cleanup described in
 
 ## Install / build
 
-From [README.md](README.md): `go install`, or build from source. Installation scripts are linked from the root [README.md](../README.md).
+From [README.md](README.md): `go install`, release binaries from GitHub, or `ghcr.io/opendataensemble/synkronus-cli`. Installation scripts: [`scripts/install-synkronus-cli.sh`](../scripts/install-synkronus-cli.sh).
+
+CI login: `synk login -u USER --password "$SYNK_PASSWORD"` (or `SYNK_PASSWORD` env when stdin is not a TTY).
diff --git a/synkronus-cli/README.md b/synkronus-cli/README.md
index f86d682ba..3b33a62c4 100644
--- a/synkronus-cli/README.md
+++ b/synkronus-cli/README.md
@@ -120,9 +120,13 @@ Add-Content -Path $PROFILE -Value "synk completion powershell | Out-String | Inv
 ### Authentication
 
 ```bash
-# Login to the API
+# Login to the API (interactive password prompt)
 synk login --username your-username
 
+# Login for CI/scripts (non-interactive)
+synk login --username your-username --password "$SYNK_PASSWORD"
+# or: SYNK_PASSWORD=secret synk login -u your-username
+
 # Check authentication status
 synk status
 
diff --git a/synkronus-cli/internal/cmd/auth.go b/synkronus-cli/internal/cmd/auth.go
index 4e05e5824..20ca9a1ad 100644
--- a/synkronus-cli/internal/cmd/auth.go
+++ b/synkronus-cli/internal/cmd/auth.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 	"syscall"
 	"time"
 
@@ -17,7 +18,9 @@ func init() {
 	loginCmd := &cobra.Command{
 		Use:   "login",
 		Short: "Login to the Synkronus API",
-		Long:  `Authenticate with the Synkronus API using your username and password.`,
+		Long: `Authenticate with the Synkronus API using your username and password.
+
+For CI and scripting, pass --password or set SYNK_PASSWORD instead of typing interactively.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			username, err := cmd.Flags().GetString("username")
 			if err != nil {
@@ -29,14 +32,10 @@ func init() {
 				fmt.Scanln(&username)
 			}
 
-			fmt.Print("Password: ")
-			passwordBytes, err := term.ReadPassword(int(syscall.Stdin))
+			password, err := resolveLoginPassword(cmd)
 			if err != nil {
-				return fmt.Errorf("error reading password: %w", err)
+				return err
 			}
-			fmt.Println() // Add newline after password input
-
-			password := string(passwordBytes)
 			tokenResp, err := auth.Login(username, password)
 			if err != nil {
 				return fmt.Errorf("login failed: %w", err)
@@ -54,6 +53,7 @@ func init() {
 	}
 
 	loginCmd.Flags().StringP("username", "u", "", "Username for authentication")
+	loginCmd.Flags().String("password", "", "Password for authentication (or set SYNK_PASSWORD)")
 	rootCmd.AddCommand(loginCmd)
 
 	// Logout command
@@ -102,3 +102,24 @@ func init() {
 	}
 	rootCmd.AddCommand(statusCmd)
 }
+
+func resolveLoginPassword(cmd *cobra.Command) (string, error) {
+	password, err := cmd.Flags().GetString("password")
+	if err != nil {
+		return "", err
+	}
+	if password == "" {
+		password = os.Getenv("SYNK_PASSWORD")
+	}
+	if password != "" {
+		return password, nil
+	}
+
+	fmt.Print("Password: ")
+	passwordBytes, err := term.ReadPassword(int(syscall.Stdin))
+	if err != nil {
+		return "", fmt.Errorf("error reading password: %w", err)
+	}
+	fmt.Println()
+	return string(passwordBytes), nil
+}
diff --git a/synkronus-cli/internal/cmd/version.go b/synkronus-cli/internal/cmd/version.go
index 827e09ad3..6a83a0192 100644
--- a/synkronus-cli/internal/cmd/version.go
+++ b/synkronus-cli/internal/cmd/version.go
@@ -11,7 +11,7 @@ import (
 
 var (
 	// Version is the CLI version, set during build
-	Version = "0.2.0"
+	Version = "1.1.2"
 	// BuildDate is the date when the CLI was built
 	BuildDate = "unknown"
 	// CommitHash is the git commit hash
diff --git a/synkronus-cli/versioninfo.json b/synkronus-cli/versioninfo.json
index 4ec950653..6e33b7aa3 100644
--- a/synkronus-cli/versioninfo.json
+++ b/synkronus-cli/versioninfo.json
@@ -2,14 +2,14 @@
   "FixedFileInfo": {
     "FileVersion": {
       "Major": 1,
-      "Minor": 0,
-      "Patch": 0,
+      "Minor": 1,
+      "Patch": 2,
       "Build": 0
     },
     "ProductVersion": {
       "Major": 1,
-      "Minor": 0,
-      "Patch": 0,
+      "Minor": 1,
+      "Patch": 2,
       "Build": 0
     },
     "FileFlagsMask": "3f",
@@ -22,14 +22,14 @@
     "Comments": "Synkronus CLI Tool",
     "CompanyName": "OpenDataEnsemble",
     "FileDescription": "Synkronus CLI - A command-line interface for the Synkronus API",
-    "FileVersion": "1.0.0.0",
+    "FileVersion": "1.1.2.0",
     "InternalName": "synk",
     "LegalCopyright": "© 2025 OpenDataEnsemble",
     "LegalTrademarks": "",
     "OriginalFilename": "synk.exe",
     "PrivateBuild": "",
     "ProductName": "Synkronus CLI",
-    "ProductVersion": "1.0.0.0",
+    "ProductVersion": "1.1.2.0",
     "SpecialBuild": ""
   },
   "VarFileInfo": {
diff --git a/synkronus-portal/AGENTS.md b/synkronus-portal/AGENTS.md
index f034c96df..5faed7038 100644
--- a/synkronus-portal/AGENTS.md
+++ b/synkronus-portal/AGENTS.md
@@ -25,3 +25,11 @@
 ## Quick commands
 
 From `synkronus-portal/`: `pnpm install`, `pnpm run dev`, `pnpm run lint`, `pnpm run format` — align with root [README.md](../README.md) and CI.
+
+**Pre-flight before a PR** (from `synkronus-portal/`):
+
+```bash
+pnpm run lint
+pnpm run format
+pnpm run format:check
+```
diff --git a/synkronus-portal/package.json b/synkronus-portal/package.json
index 543d63694..3057b9986 100644
--- a/synkronus-portal/package.json
+++ b/synkronus-portal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "synkronus-portal",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.1.1",
   "packageManager": "pnpm@10.33.2",
   "license": "MIT",
   "type": "module",