fix(admin): use feature interest composite key

fix(admin): render standalone feature interests
Merge pull request #28 from jjbrunton/staging
2026-10-31 18:19:43 +00:00 · 2026-09-05 17:02:07 +01:00 · 2026-09-05 16:57:57 +01:00 · 2026-09-01 16:16:37 +01:00 · 2026-09-01 16:10:11 +01:00 · 2026-09-01 14:08:05 +01:00
242 changed files with 36015 additions and 34277 deletions
@@ -3,8 +3,8 @@ id: 2026-08-30-ios-extension-version-verification
 date: 2026-08-30
 status: promoted
 scope: iOS release artifact verification
-evidence: build 45 Xcode archive warning plus direct PlistBuddy inspection of the exported IPA
-destination: .codex/skills/release-mobile/SKILL.md
+evidence: v1.0.6 exported IPA inspection and reproduced v1.0.7 Xcode build-setting mismatch
+destination: apps/mobile/scripts/release-preflight.mjs and .codex/skills/release-mobile/SKILL.md
 review_after: 2027-02-28
 ---

@@ -21,19 +21,23 @@ and every packaged extension `Info.plist` with `PlistBuddy`.

 ## Cause

-The archive warning described an intermediate state and was not authoritative
-for the exported package. Direct IPA inspection showed both the app and
-`LiveDrawWidget.appex` at version 1.0.6 build 45.
+The v1.0.6 archive warning described an intermediate state and was not
+authoritative for that exported package. The later v1.0.7 reproduction found a
+separate real hazard: `CURRENT_PROJECT_VERSION` in both LiveDrawWidget
+configurations can override the widget plist and package an older build number.

 ## Remediation

-For every iOS release, inspect version and build values in the exported app and
-all packaged extensions. Reject or rebuild only when the final IPA values differ;
-do not accept or reject a release from archive warnings alone.
+Before every iOS release, require public-version parity across app config, both
+plists, and Xcode marketing settings. Require the widget Debug and Release
+`CURRENT_PROJECT_VERSION` values to equal both plists. Then inspect the exported
+app and all packaged extensions. Reject or rebuild only when the final IPA values
+differ; do not accept or reject a release from archive warnings alone.

 ## Evidence

 `PlistBuddy` read `CFBundleShortVersionString` 1.0.6 and `CFBundleVersion` 45 from
-both packaged plists. `codesign --verify --deep --strict` passed for the app, and
-the verified IPA SHA-256 was
-`9d4779bddac4647911a3a38e4ee37cf794c2b8691e0746a041b629c62b308e7f`.
+both v1.0.6 packaged plists. The v1.0.7 build later proved a stale widget Xcode
+setting can survive plist-only review. `release-preflight.mjs` and its node test
+now reject that mismatch before EAS allocation; exported IPA inspection remains
+the final authority.
@@ -0,0 +1,66 @@
+---
+id: 2026-08-31-expo-prebuild-native-regression
+date: 2026-08-31
+status: promoted
+scope: apps/mobile native projects (ios/, android/) and expo prebuild
+evidence: v1.0.8 SDK 54 to 56 upgrade, commits 604eec3, 7aca39a, 6bd04a6, 79233f5, b8cb2add
+destination: apps/mobile/scripts/release-preflight.mjs, apps/mobile/scripts/release-preflight.test.mjs, and docs/releasing.md
+review_after: 2026-11-30
+---
+
+## Symptom
+
+`expo prebuild --clean` during the SDK 54 to 56 upgrade (and the
+@bacons/apple-targets 0.1 to 5.0 bump) silently regressed four checked-in
+native invariants. Each regression was caught only by a release gate or by
+manual diffing against the last shipped tag (3fc6f8a, v1.0.7), not by
+prebuild itself.
+
+## Reproduction
+
+Run `expo prebuild --clean` in apps/mobile against the upgraded SDK and diff
+the regenerated ios/ and android/ projects against the previously committed
+projects.
+
+## Cause
+
+1. Widget identity: apple-targets 5.x derives PRODUCT_BUNDLE_IDENTIFIER from
+   the target folder name, changing com.sauci.app.LiveDrawWidget to
+   com.sauci.app.widget, and repointed CODE_SIGN_ENTITLEMENTS to the
+   gitignored ios/.targets/LiveDrawWidget/generated.entitlements.
+2. Android manifest lost the tools:node="remove" attributes on
+   READ_MEDIA_IMAGES and READ_MEDIA_VIDEO, so the built AAB regained
+   Play-forbidden permissions (verified via bundletool dump on the rejected
+   build 50 AAB).
+3. iOS Info.plist gained dev-launcher-only keys NSBonjourServices
+   (_expo._tcp), NSLocalNetworkUsageDescription, and RCTMetroPort.
+4. android/gradle.properties reset to stock -Xmx2048m
+   -XX:MaxMetaspaceSize=512m, causing Metaspace OOM in kspReleaseKotlin/CMake
+   under RN 0.85.
+
+Separately, a package absent from the new SDK's bundledNativeModules
+(expo-av) has no compatible release and fails the iOS archive (EXAV.h
+imports removed ExpoModulesCore headers).
+
+## Remediation
+
+Fixed by restoring widget identity and tracking
+targets/widget/generated.entitlements with a pinned bundleIdentifier
+(604eec3); restoring manifest tools:node="remove" attributes (7aca39a);
+removing the dev-launcher-only Info.plist keys (6bd04a6); raising
+gradle.properties memory to 4096m/1024m (79233f5); and migrating expo-av to
+expo-video/expo-audio (b8cb2add).
+
+Extend apps/mobile/scripts/release-preflight.mjs with executable checks for
+items 2 and 3 (item 1 is already covered by the existing LiveDrawWidget
+preflight check; item 4 hard-fails the build by itself). Add an "After
+native regeneration" checklist to docs/releasing.md.
+
+## Evidence
+
+`node apps/mobile/scripts/release-preflight.mjs` fails if the tracked
+AndroidManifest.xml lacks tools:node="remove" on READ_MEDIA_IMAGES or
+READ_MEDIA_VIDEO, or if ios/Sauci/Info.plist contains NSBonjourServices,
+NSLocalNetworkUsageDescription, or RCTMetroPort.
+`node --test apps/mobile/scripts/release-preflight.test.mjs` covers the new
+checks.
@@ -0,0 +1,55 @@
+---
+id: 2026-08-31-local-eas-build-preconditions
+date: 2026-08-31
+status: promoted
+scope: apps/mobile local EAS release builds
+evidence: v1.0.8 local EAS build session, commit d8bedea
+destination: docs/releasing.md
+review_after: 2026-11-30
+---
+
+## Symptom
+
+Local EAS release builds failed before native compilation for environment
+reasons unrelated to the app source, and a successful iOS build left the
+tracked source in a state that fails release-preflight afterward.
+
+## Reproduction
+
+Run `eas build --local` from a non-interactive shell without first exporting
+ANDROID_HOME/ANDROID_SDK_ROOT/JAVA_HOME: fails with "SDK location not
+found" because non-interactive shells do not load the user profile. Run it
+with a non-empty EAS_LOCAL_BUILD_WORKINGDIR: fails with "Workingdir is not
+empty". Run it outside apps/mobile: eas cannot find the project. Pipe the
+build log through `tail`: the full log needed for diagnosis is lost. After a
+successful iOS build, EAS auto-increment updates both Info.plists but not
+the widget target's CURRENT_PROJECT_VERSION in the pbxproj, so
+release-preflight fails until it is synced.
+
+## Cause
+
+`eas` must be installed as a global CLI (scripts call bare `eas`; eas-cli
+23.0.0 verified). Non-interactive shells used for automation do not source
+the profile that normally exports the Android/Java environment variables.
+EAS_LOCAL_BUILD_WORKINGDIR must not exist or be empty. EAS iOS
+auto-increment writes plist versions but does not touch the widget target's
+pbxproj CURRENT_PROJECT_VERSION, so it drifts from the app's build number by
+one increment after every successful build.
+
+## Remediation
+
+Before a local EAS build: verify `eas` is on PATH, explicitly export
+ANDROID_HOME, ANDROID_SDK_ROOT, and JAVA_HOME (JDK 17), ensure
+EAS_LOCAL_BUILD_WORKINGDIR does not exist or is empty, and run from
+apps/mobile. Capture the full build log to a file rather than piping through
+`tail`. After a successful build, sync the widget's CURRENT_PROJECT_VERSION
+to the new build number (commit d8bedea, sed 46 to 47) and sync
+ios/Podfile.lock from the successful build's working directory when
+dependencies changed, since the archive's pod install resolution is
+authoritative and local CocoaPods here is broken.
+
+## Evidence
+
+docs/releasing.md's local-build section documents the environment
+preconditions and the post-build widget CURRENT_PROJECT_VERSION and
+Podfile.lock sync steps; `npm run release:preflight` passes after the sync.
@@ -0,0 +1,49 @@
+---
+id: 2026-08-31-mobile-release-preflight-and-attempts
+date: 2026-08-31
+status: promoted
+scope: mobile production release preparation and local EAS builds
+evidence: v1.0.7 Android and iOS local EAS release investigation and verified artifacts
+destination: apps/mobile/scripts/release-preflight.mjs, apps/mobile/scripts/release-preflight.test.mjs, docs/releasing.md, and release skills
+review_after: 2027-02-28
+---
+
+## Symptom
+
+The v1.0.7 release spent repeated attempts on archive, plugin startup, package
+installation, disk-space, signing, and iOS extension-version failures before
+valid Android and iOS artifacts were accepted.
+
+## Reproduction
+
+Run a local production EAS build with an ignored public OTA certificate, a
+package-directory plugin path, insufficient disk space, or divergent widget
+`CURRENT_PROJECT_VERSION`. Each condition fails or produces an invalid input
+before a valid final artifact can be accepted.
+
+## Cause
+
+Pre-compilation setup failures were treated as rebuild failures. Source parity,
+archive inclusion, local EAS plugin shape, disk capacity, and effective iOS widget
+build settings were not checked together before EAS allocation.
+
+## Remediation
+
+Run the deterministic mobile release preflight before every production build.
+Classify attempts before retrying: archive, plugin, npm, and ENOSPC failures do
+not consume a native build; signing, profile, and capability failures require
+provider read-back before one replacement build. Retain work directories and logs
+at stable ignored paths. Accept only independently inspected artifacts and keep
+rejected artifacts out of the upload path.
+
+The Android native input failure was a Gradle task ordering issue: Prefab inputs
+must be available before dependent native tasks. Preserve the explicit ordering
+fix rather than removing Firebase or changing dependency versions without proof.
+
+## Evidence
+
+The preflight node tests reject an ignored OTA certificate and an effective widget
+build-setting mismatch. The checked-in source invariants pass the preflight. The
+maintained release guide and skills record local EAS path requirements, provider
+read-back, phase-specific status language, artifact inspection, store read-back,
+and scoped upload authorization boundaries.
@@ -0,0 +1,55 @@
+---
+id: 2026-08-31-npm-lockfile-divergence
+date: 2026-08-31
+status: promoted
+scope: root package.json, package-lock.json, apps/web dependencies, CI
+evidence: v1.0.8 lockfile investigation, commits 90cde4a, 9609a90
+destination: docs/development/dependencies.md
+review_after: 2026-11-30
+---
+
+## Symptom
+
+CI and the API Docker image (node 20.19.4/npm 10.8.2, per .nvmrc) broke
+invisibly while a lockfile regenerated on this dev machine (node 26/npm
+11.19) passed local `npm ci`. Pushes to staging bypass required status
+checks, so the red CI ran unnoticed for hours.
+
+## Reproduction
+
+Regenerate package-lock.json with npm 11 on a wildcard-range dependency
+(react-native-worklets depends on `@react-native/metro-config: "*"`), then
+run `npm ci` under node 20.19.4/npm 10.8.2. npm 10 requires 0.85.3 at that
+tree position; npm 11 resolves/hoists 0.87.x there. `npm ci` fails with
+"Invalid: lock file's ... does not satisfy". The reverse direction also
+fails: a lock regenerated by npm 10 fails `npm ci` under npm 11 with missing
+platform-optional binaries (@next/swc-linux-x64-gnu breaking `next build`,
+@rollup/rollup-linux-x64-gnu breaking the API Docker tsup build, lightningcss
+variants breaking local npm ci), matching the npm/cli#4828-style
+optional-dependency resolution gap.
+
+## Cause
+
+Two different npm major versions in active use (CI/Docker on npm 10, this
+dev machine on npm 11) resolve wildcard/range dependencies to different
+versions at the same tree position, and each npm's own platform-optional
+binary selection is not portable to the other npm's lockfile.
+
+## Remediation
+
+Pin the wildcard-range dependency via a root package.json override
+(`"@react-native/metro-config": "0.85.3"`, alongside the existing
+rollup/react-native/expo pins). Pin apps/web `@next/swc` linux/darwin
+binaries as direct optionalDependencies (must be bumped together with any
+`next` version bump). Regenerate the lock and validate it both ways: local
+`npm ci` plus `npm run verify:fast`, and
+`docker run --platform linux/amd64 node:20.19.4 ... npm ci` (the
+`--platform` flag is mandatory; Apple Silicon Docker otherwise runs arm64
+and the platform-binary check is meaningless). After any push that bypassed
+required status checks, check `gh run list --branch staging`.
+
+## Evidence
+
+commits 90cde4a and 9609a90 add the override and optionalDependencies pins
+and record a lockfile that passes both the amd64-emulated `npm ci` under
+node 20.19.4 and local `npm ci` plus `npm run verify:fast`.
@@ -1,6 +1,6 @@
 ---
 name: release-mobile
-description: Prepare and verify Sauci iOS or Android releases and store uploads.
+description: Prepare, verify, and ship Sauci iOS or Android releases end to end, including store uploads, review submission, and rollout.
 ---

 Read `.codex/skills/release-mobile/SKILL.md` completely and follow it.
@@ -9,20 +9,26 @@ Use `scripts/dev-local.sh`; do not manually mix remote and local services.

 | Service | Port |
 |---|---:|
-| web | 3000 |
-| admin | 3001 |
-| MCP | 3002 |
+| PostgreSQL | 54320 |
+| API | 3003 |
+| web | 3000 (overridable with `SAUCI_WEB_PORT`) |
+| admin | 3001 (overridable with `SAUCI_ADMIN_PORT`) |
+| MCP | 3002 (overridable with `SAUCI_MCP_PORT`) |
 | Expo Metro | 8081 |
-| Supabase API / DB / Studio | 54321 / 54322 / 54323 |

-Prerequisites: Node from `.nvmrc`, `npm ci`, tmux, Docker-compatible runtime, and
-the repository Supabase CLI dependency.
+Prerequisites: Node from `.nvmrc`, `npm ci`, tmux, Docker-compatible runtime,
+and the configured hosted Auth credentials where an authenticated client needs them.

- `scripts/dev-local.sh up` — idempotently start infra and services.
- `status`, `logs <service>`, `restart <service>`, `attach` — inspect.
- `reset` — local-only database reset plus deterministic fixtures.
- `ios` / `android` — launch the native app against local Supabase.
- `down`; `down --all` — stop services, optionally infrastructure.
+- `scripts/dev-local.sh up`: idempotently start PostgreSQL and services.
+- `status`, `logs <service>`, `restart <service>`, `attach`: inspect.
+- `reset`: local-only database reset plus deterministic fixtures.
+- `e2e`: start or safely reuse the local stack, validate local endpoints, and
+  run Playwright with launcher-derived URLs and a loopback PostgreSQL fixture.
+- `ios` / `android`: launch the native app against the standalone local API and
+  configured hosted Auth project.
+- `down`; `down --all`: stop services, optionally infrastructure.

-If a port is occupied, use `status` and inspect its owning process before stopping
-anything. If a tmux window exited, read its logs before restarting it.
+Hosted Supabase provides Auth only. Local E2E never starts or writes to a
+Supabase data plane. If a port is occupied, use `status` and inspect its owning
+process before stopping anything. If a tmux window exited, read its logs before
+restarting it.
@@ -13,9 +13,13 @@ drafting notes and [references/artifact-verification.md](references/artifact-ver
 before accepting a build.

 A request to generate or create a release authorizes the scoped version edits,
-release notes, local builds, release commits, and one local annotated tag. It
-does not authorize pushing commits or tags, uploading binaries, submitting a
-store release, changing signing credentials, or regenerating native projects.
+release notes, local builds, release commits, and one local annotated tag. When
+the request also asks to ship, upload, submit, or release to the stores, it
+authorizes the complete store pipeline for the stated platforms after the exact
+artifact has been verified: upload, App Review / Google Play review submission,
+and rollout, including full production rollout (see the `release-mobile` skill).
+It does not authorize pushing commits or tags, changing signing credentials, or
+regenerating native projects unless the request explicitly includes that action.

 ## Defaults

@@ -36,12 +40,19 @@ Require all of the following:
 - a named branch, normally `main` for a production release;
 - a clean starting worktree with `HEAD` equal to its fetched upstream;
 - the previous reachable `v[0-9]*` release tag and no collision for the next tag;
- consistent public versions across `app.json`, Android `versionName`, and every
-  iOS `MARKETING_VERSION` (`scripts/set_version.mjs --check`);
+- consistent public and OTA runtime versions across `app.json`, explicit
+  `app.config.js` runtime, Android, and every iOS target
+  (`scripts/set_version.mjs --check`);
+- `npm run release:preflight -w @sauci/mobile`, which also checks the iOS widget
+  effective build settings and OTA certificate archive inclusion;
 - Node 20, JDK 17 for Android, and Xcode/CocoaPods for iOS;
 - the configured production API/Auth/RevenueCat environment, without printing
  secret values.

+For an OTA release, run `npm run ota:preflight:production -w @sauci/mobile`
+before any publish. This exercises the EOAS-compatible Expo export environment
+without contacting the update server or uploading an update.
+
 Do not switch branches, discard work, repair credentials, push, or weaken branch
 protection merely to pass preflight. Stop with the exact blocker. Never run
 `expo prebuild` as part of this workflow.
@@ -75,6 +86,15 @@ Build from the clean prepared source using the package scripts in
 versioned artifact directory. When building both platforms, build Android first,
 then iOS.

+For local EAS, retain the working directory and logs under a stable ignored path,
+set `EAS_LOCAL_BUILD_ARTIFACTS_DIR`, and preflight available disk space before
+starting. Set `EAS_LOCAL_BUILD_PLUGIN_PATH` only to the matching plugin
+executable `bin/run`, never a package directory or a hardcoded cache location.
+Classify plugin, archive, npm, and ENOSPC failures as pre-compilation failures;
+repair and preflight them without spending another build. Make at most one
+meaningful build for each newly proven input state. After a signing, profile, or
+capability failure, read back and prove the provider correction before rebuilding.
+
 After each build:

 1. Inspect the worktree before doing anything else. Accept only the documented
@@ -83,15 +103,19 @@ After each build:
   dependency, or native-project regeneration as a failed build.
 2. Independently inspect the binary for package/bundle identifier, public
   version, platform build number, production endpoint configuration where
-   inspectable, and signing identity/fingerprint. Require the embedded public
-   version to equal the requested version.
+   inspectable, signing identity/fingerprint, OTA runtime/channel/certificate,
+   and SHA-256. Require the embedded public version to equal the requested
+   version. For Android, also inspect all required ABIs, Worklets/Reanimated/Skia
+   libraries, and the release permissions. For iOS, inspect every packaged
+   extension after export.
 3. Record the verified platform build number in the new release-note entry.
 4. Commit only the expected metadata and release-note update as
   `chore(<platform>): record v<version> build <number>`. The worktree must be
   clean before starting the next platform build.

-Do not accept a successful EAS exit code as proof of a valid artifact. If either
-requested platform fails, do not tag a partial release.
+Do not accept a successful EAS exit code as proof of a valid artifact. Quarantine
+or remove rejected artifacts so only accepted paths can be offered for upload. If
+either requested platform fails, do not tag a partial release.

 ## Tag and prove the result

@@ -8,8 +8,13 @@ const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, "../../../..");
 const files = {
  app: path.join(repoRoot, "apps/mobile/app.json"),
+  appConfig: path.join(repoRoot, "apps/mobile/app.config.js"),
  android: path.join(repoRoot, "apps/mobile/android/app/build.gradle"),
+  androidExpo: path.join(repoRoot, "apps/mobile/android/app/src/main/res/values/strings.xml"),
  ios: path.join(repoRoot, "apps/mobile/ios/Sauci.xcodeproj/project.pbxproj"),
+  iosInfo: path.join(repoRoot, "apps/mobile/ios/Sauci/Info.plist"),
+  iosExpo: path.join(repoRoot, "apps/mobile/ios/Sauci/Supporting/Expo.plist"),
+  widgetInfo: path.join(repoRoot, "apps/mobile/targets/widget/Info.plist"),
 };

 const semverPattern = /^([0-9]+)\.([0-9]+)\.([0-9]+)$/;
@@ -25,10 +30,19 @@ function parseVersion(value, label) {
  return match.slice(1).map(Number);
 }

+function writePreservingFinalNewline(file, contents, previous) {
+  fs.writeFileSync(file, previous.endsWith("\n") ? contents : contents.replace(/\n$/, ""));
+}
+
 function readState() {
  const appRaw = fs.readFileSync(files.app, "utf8");
+  const appConfigRaw = fs.readFileSync(files.appConfig, "utf8");
  const androidRaw = fs.readFileSync(files.android, "utf8");
+  const androidExpoRaw = fs.readFileSync(files.androidExpo, "utf8");
  const iosRaw = fs.readFileSync(files.ios, "utf8");
+  const iosInfoRaw = fs.readFileSync(files.iosInfo, "utf8");
+  const iosExpoRaw = fs.readFileSync(files.iosExpo, "utf8");
+  const widgetInfoRaw = fs.readFileSync(files.widgetInfo, "utf8");
  const appVersion = JSON.parse(appRaw).expo?.version;
  const androidVersions = [...androidRaw.matchAll(/\bversionName\s+["']([^"']+)["']/g)].map(
    (match) => match[1],
@@ -36,18 +50,63 @@ function readState() {
  const iosVersions = [...iosRaw.matchAll(/\bMARKETING_VERSION\s*=\s*([^;]+);/g)].map(
    (match) => match[1].trim(),
  );
+  const plistVersion = (raw, label) => {
+    const versions = [...raw.matchAll(/<key>CFBundleShortVersionString<\/key>\s*<string>([^<]+)<\/string>/g)].map(
+      (match) => match[1],
+    );
+    if (versions.length !== 1) fail(`expected exactly one ${label} CFBundleShortVersionString`);
+    return versions[0];
+  };
+  const iosInfoVersion = plistVersion(iosInfoRaw, "iOS app Info.plist");
+  const widgetInfoVersion = plistVersion(widgetInfoRaw, "iOS widget Info.plist");
+  const expoRuntimeVersion = (raw, label) => {
+    const versions = [...raw.matchAll(/<key>EXUpdatesRuntimeVersion<\/key>\s*<string>([^<]+)<\/string>/g)].map(
+      (match) => match[1],
+    );
+    if (versions.length !== 1) fail(`expected exactly one ${label} Expo runtime version`);
+    return versions[0];
+  };
+  const appConfigRuntimeVersions = [...appConfigRaw.matchAll(/runtimeVersion:\s*['"]([^'"]+)['"]/g)].map(
+    (match) => match[1],
+  );
+  const androidRuntimeVersions = [...androidExpoRaw.matchAll(/<string name="expo_runtime_version">([^<]+)<\/string>/g)].map(
+    (match) => match[1],
+  );
+  if (appConfigRuntimeVersions.length !== 1) fail("expected exactly one explicit app.config.js runtimeVersion");
+  if (androidRuntimeVersions.length !== 1) fail("expected exactly one Android Expo runtime version");
+  const iosExpoVersion = expoRuntimeVersion(iosExpoRaw, "iOS");

  if (typeof appVersion !== "string") fail("apps/mobile/app.json has no expo.version");
  if (androidVersions.length !== 1) fail("expected exactly one Android versionName");
  if (iosVersions.length === 0) fail("found no iOS MARKETING_VERSION values");

-  const versions = [appVersion, ...androidVersions, ...iosVersions];
+  const versions = [
+    appVersion,
+    ...androidVersions,
+    ...iosVersions,
+    iosInfoVersion,
+    widgetInfoVersion,
+    appConfigRuntimeVersions[0],
+    androidRuntimeVersions[0],
+    iosExpoVersion,
+  ];
  versions.forEach((version) => parseVersion(version, `configured version ${version}`));
  if (new Set(versions).size !== 1) {
    fail(`public versions disagree: ${versions.join(", ")}`);
  }

-  return { appRaw, androidRaw, iosRaw, current: appVersion, iosCount: iosVersions.length };
+  return {
+    appRaw,
+    appConfigRaw,
+    androidRaw,
+    androidExpoRaw,
+    iosRaw,
+    iosInfoRaw,
+    iosExpoRaw,
+    widgetInfoRaw,
+    current: appVersion,
+    iosCount: iosVersions.length,
+  };
 }

 function nextVersion(current, bump) {
@@ -69,7 +128,7 @@ if (!check && (bumpIndex === -1) === (versionIndex === -1)) {

 const state = readState();
 if (check) {
-  console.log(`public version ${state.current} is consistent across app.json, Android, and ${state.iosCount} iOS settings`);
+  console.log(`public and OTA runtime version ${state.current} is consistent across app.json, Android, and ${state.iosCount} iOS settings`);
  process.exit(0);
 }

@@ -94,12 +153,37 @@ const androidRaw = state.androidRaw.replace(
  /(\bversionName\s+["'])([^"']+)(["'])/,
  `$1${desired}$3`,
 );
+const appConfigRaw = state.appConfigRaw.replace(
+  /(runtimeVersion:\s*['"])([^'"]+)(['"])/,
+  `$1${desired}$3`,
+);
+const androidExpoRaw = state.androidExpoRaw.replace(
+  /(<string name="expo_runtime_version">)([^<]+)(<\/string>)/,
+  `$1${desired}$3`,
+);
 const iosRaw = state.iosRaw.replace(
  /(\bMARKETING_VERSION\s*=\s*)([^;]+)(;)/g,
  `$1${desired}$3`,
 );
+const iosInfoRaw = state.iosInfoRaw.replace(
+  /(<key>CFBundleShortVersionString<\/key>\s*<string>)([^<]+)(<\/string>)/,
+  `$1${desired}$3`,
+);
+const iosExpoRaw = state.iosExpoRaw.replace(
+  /(<key>EXUpdatesRuntimeVersion<\/key>\s*<string>)([^<]+)(<\/string>)/,
+  `$1${desired}$3`,
+);
+const widgetInfoRaw = state.widgetInfoRaw.replace(
+  /(<key>CFBundleShortVersionString<\/key>\s*<string>)([^<]+)(<\/string>)/,
+  `$1${desired}$3`,
+);

-fs.writeFileSync(files.app, appRaw);
-fs.writeFileSync(files.android, androidRaw);
-fs.writeFileSync(files.ios, iosRaw);
+writePreservingFinalNewline(files.app, appRaw, state.appRaw);
+writePreservingFinalNewline(files.appConfig, appConfigRaw, state.appConfigRaw);
+writePreservingFinalNewline(files.android, androidRaw, state.androidRaw);
+writePreservingFinalNewline(files.androidExpo, androidExpoRaw, state.androidExpoRaw);
+writePreservingFinalNewline(files.ios, iosRaw, state.iosRaw);
+writePreservingFinalNewline(files.iosInfo, iosInfoRaw, state.iosInfoRaw);
+writePreservingFinalNewline(files.iosExpo, iosExpoRaw, state.iosExpoRaw);
+writePreservingFinalNewline(files.widgetInfo, widgetInfoRaw, state.widgetInfoRaw);
 console.log(`updated public version ${state.current} -> ${desired}`);
@@ -1,6 +1,6 @@
 ---
 name: release-mobile
-description: Prepare and verify Sauci iOS or Android releases. Use for versioning, EAS/native builds, Fastlane upload, release notes, or store submission preparation.
+description: Prepare, verify, and ship Sauci iOS or Android releases end to end. Use for versioning, EAS/native builds, store uploads, App Review / Play review submission, and rollout.
 ---

 # Mobile release
@@ -9,6 +9,41 @@ Read `docs/releasing.md`, `apps/mobile/RELEASING.md` when present, and the mobil
 scoped instructions. Confirm target platform and release profile. Run repository
 verification plus a native acceptance pass before starting a release build.

+## OTA update vs full store release
+
+Choose the delivery mechanism before doing anything else; they are different
+pipelines with different blast radii. `docs/mobile-ota.md` is the authority.
+
+- **OTA update** (`npm run ota:publish:<env>` in `apps/mobile`): ships only the
+  JavaScript bundle and assets to builds already installed on devices. No store
+  review, live within minutes, and rolled back by repointing the XPREM channel
+  at a previous update. Valid only when the change touches no native code, no
+  native dependency, no `ios/`/`android/` project files, and no config that
+  alters the native binary. The OTA runtime version equals the public app
+  version, so an OTA update can only reach installs of the current
+  `expo.version`.
+- **Full store release** (this skill): a new signed binary through App Store
+  Connect and Google Play, including review. Required whenever native code,
+  native dependencies, the checked-in native projects, Expo SDK, permissions,
+  entitlements, or `expo.version` change. Rollback is coarser: Play staged
+  rollouts can be halted, iOS phased release can be paused, and a bad release is
+  otherwise superseded by shipping the next version.
+
+When a change qualifies for OTA, prefer OTA unless the user asks for a store
+release. Never present an OTA publish as a store release or vice versa; report
+which mechanism was used.
+
+## Authorization
+
+An explicit request for a mobile release authorizes the complete pipeline for
+the stated platforms: version bump, build, verification, store upload, review
+submission (App Review / Google Play review), and rollout — including full
+production rollout. Rollout is recoverable by design (staged-rollout halt,
+phased-release pause, OTA supersession, or the next store version), so do not
+pause to re-confirm these steps; execute them and report. A request that
+explicitly narrows scope (for example "upload only", "TestFlight only", or a
+named track) still bounds what you do.
+
 Before a build from the current upstream branch, fetch, require a clean worktree,
 and prove `HEAD` matches its upstream. The `generate-release` skill may instead
 build a clean, scoped release-preparation commit that descends directly from that
@@ -17,40 +52,65 @@ verified EAS version metadata. Sauci tracks its native iOS and Android projects,
 so routine release builds must package those checked-in sources. Do not run
 `expo prebuild` first; native regeneration is a separate reviewed change.

-Use the package scripts in `apps/mobile/package.json`; they create artifacts only.
-Never infer upload or submission authority from build authorization. Store upload
-uses a separately authorized command.
+Run `npm run release:preflight -w @sauci/mobile` before allocating an EAS build.
+It rejects inconsistent public/runtime versions, an iOS widget build-setting
+override, and a public OTA certificate that would be omitted from the archive.
+For a local EAS build, also run `npm run release:preflight:local-eas -w
+@sauci/mobile` after setting `EAS_LOCAL_BUILD_PLUGIN_PATH` to the matching
+plugin's executable `bin/run`. Do not point it at the package directory or
+hardcode a machine-local cache path.

-## Upload authorization gate
+Classify a failure before rebuilding. Archive, plugin-spawn, package-install, and
+disk-space failures happen before native compilation and must be repaired and
+preflighted without consuming another build. After a signing, profile, or
+capability failure, read back the provider state and prove only the affected
+input changed before rebuilding. Retain the EAS work directory, command log, and
+stable artifact path for every meaningful attempt. Never retry an ambiguous
+upload.

-After an artifact passes verification, stop immediately before the external
-upload and ask the user for confirmation. The request must identify:
+Report provider progress by phase: packaging, native compilation, submission
+queue, or store processing. Do not describe every failure as a rebuild.
+
+Use the package scripts in `apps/mobile/package.json` to build artifacts and the
+Fastlane lanes in `apps/mobile/fastlane/Fastfile` to upload, submit, and roll
+out.
+
+## Upload and submission execution
+
+Verification before upload is unchanged and mandatory. Independently verify and
+report:

 - the platform, exact artifact path, bundle/package identifier, public version,
  build number, signature identity, and SHA-256 digest;
- the exact destination and resulting state: Google Play internal-track draft or
-  App Store Connect/TestFlight processing;
- that the upload does not authorize a public rollout or App Review submission.
+- the exact destination and resulting state: which Play track and rollout
+  status, or App Store Connect version state and whether App Review submission
+  and automatic release are included.

-For iOS, inspect the current App Store Connect automatic-distribution behavior
-before asking. If the build would be distributed automatically, name the exact
-TestFlight groups or testers in the request and include that effect in the fresh
-authorization. If the effect cannot be established, stop; changing an automatic-
-distribution setting also requires separate authorization.
+Once these details match the request, proceed through upload, review
+submission, and rollout without requesting further confirmation.

-Even when the original request includes building, releasing, uploading, or
-submitting, require this fresh confirmation once the exact verified artifact and
-destination are known. End the request with: `Upload this verified artifact to
-<destination> now?` A clear affirmative response authorizes one upload of that
-artifact to that destination, plus only any automatic TestFlight distribution
-explicitly disclosed in the request. Run `eas submit` with the explicit
-`--platform`, `--profile production`, `--path`, and `--wait` arguments; never
-select `--latest`. If the result is ambiguous, inspect EAS and the store before
-doing anything else, do not retry, and ask again before another upload.
+- **Android**: `bundle exec fastlane android release aab:<absolute path>`
+  commits the release on the production track (pass `track:` to target another
+  track, `rollout:0.1` for a staged rollout). Play review runs automatically;
+  rollout proceeds on approval. Use the `upload` lane only when the request is
+  explicitly upload-only.
+- **iOS**: `bundle exec fastlane ios release ipa:<absolute path>` uploads,
+  creates the App Store version, submits for App Review, and releases
+  automatically on approval (pass `phased_release:true` for a 7-day phased
+  release, `release_notes:"..."` for What's New). Use the `upload` lane for
+  TestFlight-only requests. `eas submit` remains valid for upload-only flows;
+  when used, pass explicit `--platform`, `--profile production`, `--path`, and
+  `--wait` — never `--latest`.

-Apply this gate to every upload method, including EAS, Fastlane, Xcode Organizer,
-and the store consoles. A later public rollout, App Review submission, or
-additional TestFlight distribution requires another fresh authorization.
+App Store Connect API group association does not establish the automatic-
+distribution switch. Verify that switch in an authenticated App Store Connect UI
+session before upload; if that UI verification is unavailable, stop rather
+than inferring the distribution effect from API data.
+
+If an upload or submission command returns an ambiguous result, inspect EAS and
+the store before doing anything else; do not retry blind. After submission, read
+back the store state (Play Console track status / App Store Connect version
+state) and report it.

 Preserve platform signing and local EAS versioning. After a build, verify that
 tracked changes are limited to the expected version metadata, then independently
@@ -58,5 +118,30 @@ read the artifact version and signature. For an iOS IPA, inspect every packaged
 app extension as well as the containing app and require matching
 `CFBundleShortVersionString` and `CFBundleVersion` values. Treat Xcode archive
 warnings as diagnostic evidence, not the final artifact state: decide whether to
-reject or rebuild only after reading the exported IPA itself. Report the artifact,
-version/build number, upload result when authorized, and store read-back state.
+reject or rebuild only after reading the exported IPA itself. Report the
+artifact, version/build number, upload and submission results, rollout state,
+and store read-back state.
+
+For Android, verify the accepted AAB has all four required ABIs, the Worklets,
+Reanimated, and Skia native libraries, no broad `READ_MEDIA_IMAGES` or
+`READ_MEDIA_VIDEO` permissions, and the production OTA runtime, channel, and
+public certificate. For iOS, verify the exported IPA, not archive warnings, and
+check both the containing app and every extension.
+
+For the Android native dependency ordering already tracked in Gradle, preserve
+the explicit task dependency that makes Prefab inputs available before dependent
+native tasks. Fix task validation with ordering, not Firebase removal or
+dependency-version roulette.
+
+After Android upload, EAS Submit `FINISHED`, the exact internal/DRAFT/no-rollout
+submit configuration, and the retained artifact digest are the available
+authoritative read-back when a direct Play track read would require creating an
+edit. Never create an edit merely to claim read-only verification.
+
+For a checked-in iOS entitlement, inspect the real Apple App ID capability state
+before a signing rebuild. The capability sync bug tracked in
+https://github.com/expo/eas-cli/issues/3986 can report success while Apple
+rejects a malformed update. Read back Associated Domains, regenerate only the
+affected profile, and decode that profile to prove the entitlement before
+rebuilding. Noninteractive managed App Store Connect key auth may require
+`EXPO_APPLE_TEAM_ID`; preserve certificates and unrelated target profiles.
@@ -39,3 +39,11 @@ terraform
 .claude
 .codex
 .ralph
+
+# The admin app builds from this same monorepo context (apps/admin/Dockerfile).
+!apps/admin
+!apps/admin/**
+
+# Host build artefacts must never leak into any image context.
+**/node_modules
+**/dist
@@ -24,9 +24,14 @@ jobs:
            echo "master is frozen; target staging or main" >&2
            exit 1
          fi
-          if [ "$BASE_BRANCH" = "main" ] && [ "$HEAD_BRANCH" != "staging" ]; then
-            echo "Only staging may be promoted to main" >&2
-            exit 1
+          if [ "$BASE_BRANCH" = "main" ]; then
+            case "$HEAD_BRANCH" in
+              staging|hotfix/*|release/*) ;;
+              *)
+                echo "main takes staging promotions, or a hotfix/* or release/* branch for direct work" >&2
+                exit 1
+                ;;
+            esac
          fi
          if [ "$BASE_BRANCH" != "staging" ] && [ "$BASE_BRANCH" != "main" ]; then
            echo "Feature pull requests target staging; promotions target main" >&2
@@ -58,8 +58,9 @@ e2e/playwright-report/
 .playwright-mcp/

 # Misc
-*.pem
-.cache/
+*.pem
+!apps/mobile/certs/certificate.pem
+.cache/
 .temp/
 .tmp/
 *.tmp
@@ -76,6 +76,7 @@ environment limitation; do not call it a passing product check.
 |---|---|
 | System boundaries and data flow | `docs/architecture/system.md` |
 | Local services, ports, fixtures | `docs/development/local-stack.md` |
+| Dependency and lockfile discipline | `docs/development/dependencies.md` |
 | Test layers and required gates | `docs/testing/strategy.md` |
 | Database migration safety | `docs/operations/database-migrations.md` |
 | Agent roles and effort routing | `docs/agents/routing.md` |
@@ -11,8 +11,10 @@ import { QuestionAnalyticsPage } from '@/pages/content/QuestionAnalyticsPage';
 import { TagsPage } from '@/pages/content/TagsPage';
 import { DarePacksPage } from '@/pages/content/DarePacksPage';
 import { DaresPage } from '@/pages/content/DaresPage';
+import { QuizQuestionsPage } from '@/pages/content/QuizQuestionsPage';
 import { UsersPage } from '@/pages/users/UsersPage';
 import { UserDetailPage } from '@/pages/users/UserDetailPage';
+import { CouplesPage } from '@/pages/users/CouplesPage';
 import { MatchChatPage } from '@/pages/users/MatchChatPage';
 import { AuditLogsPage } from '@/pages/AuditLogsPage';
 import { AdminsPage } from '@/pages/admins/AdminsPage';
@@ -20,6 +22,8 @@ import { RedemptionCodesPage } from '@/pages/RedemptionCodesPage';
 import { FeedbackPage } from '@/pages/FeedbackPage';
 import { UsageInsightsPage } from '@/pages/UsageInsightsPage';
 import { UserActivityPage } from '@/pages/activity/UserActivityPage';
+import { SentDaresPage } from '@/pages/activity/SentDaresPage';
+import { LiveDrawSessionsPage } from '@/pages/activity/LiveDrawSessionsPage';
 import { AiSettingsPage } from '@/pages/AiSettingsPage';
 import { AppSettingsPage } from '@/pages/AppSettingsPage';
 import { FlaggedMessagesPage } from '@/pages/FlaggedMessagesPage';
@@ -108,6 +112,14 @@ function App() {
                                </ProtectedRoute>
                            }
                        />
+                        <Route
+                            path="/quiz-questions"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.MANAGE_QUESTIONS}>
+                                    <QuizQuestionsPage />
+                                </ProtectedRoute>
+                            }
+                        />

                        {/* User management */}
                        <Route
@@ -142,6 +154,14 @@ function App() {
                                </ProtectedRoute>
                            }
                        />
+                        <Route
+                            path="/couples"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.VIEW_USERS}>
+                                    <CouplesPage />
+                                </ProtectedRoute>
+                            }
+                        />
                        <Route
                            path="/activity"
                            element={
@@ -150,6 +170,22 @@ function App() {
                                </ProtectedRoute>
                            }
                        />
+                        <Route
+                            path="/activity/sent-dares"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.VIEW_ACTIVITY}>
+                                    <SentDaresPage />
+                                </ProtectedRoute>
+                            }
+                        />
+                        <Route
+                            path="/activity/live-draw"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.VIEW_USERS}>
+                                    <LiveDrawSessionsPage />
+                                </ProtectedRoute>
+                            }
+                        />

                        {/* System */}
                        <Route
@@ -0,0 +1,85 @@
+import { useEffect, useRef } from 'react';
+
+export interface StrokePoint {
+    x: number;
+    y: number;
+}
+
+export interface StrokeSegment {
+    id: string;
+    userId: string;
+    points: StrokePoint[];
+    color: string;
+    width: number;
+    timestamp: number;
+    isEraser: boolean;
+}
+
+export const STROKE_CANVAS_BACKGROUND = '#1a1a2e';
+
+/**
+ * Renders a `live_draw_sessions.strokes` array to a canvas. Points are stored
+ * as 0..1 fractions of the drawing surface, so this scales to whatever size
+ * the canvas element is laid out at.
+ */
+export function StrokeCanvas({ strokes }: { strokes: StrokeSegment[] }) {
+    const canvasRef = useRef<HTMLCanvasElement>(null);
+
+    useEffect(() => {
+        const canvas = canvasRef.current;
+        if (!canvas) return;
+        const ctx = canvas.getContext('2d');
+        if (!ctx) return;
+
+        const dpr = window.devicePixelRatio || 1;
+        const w = canvas.clientWidth;
+        const h = canvas.clientHeight;
+        canvas.width = w * dpr;
+        canvas.height = h * dpr;
+        ctx.scale(dpr, dpr);
+
+        ctx.fillStyle = STROKE_CANVAS_BACKGROUND;
+        ctx.fillRect(0, 0, w, h);
+
+        for (const stroke of strokes) {
+            if (stroke.points.length === 0) continue;
+            ctx.strokeStyle = stroke.isEraser ? STROKE_CANVAS_BACKGROUND : stroke.color;
+            ctx.lineWidth = stroke.width;
+            ctx.lineCap = 'round';
+            ctx.lineJoin = 'round';
+            ctx.beginPath();
+
+            const first = stroke.points[0];
+            ctx.moveTo(first.x * w, first.y * h);
+
+            if (stroke.points.length === 1) {
+                ctx.lineTo(first.x * w + 0.1, first.y * h + 0.1);
+            } else {
+                for (let i = 1; i < stroke.points.length; i++) {
+                    const prev = stroke.points[i - 1];
+                    const curr = stroke.points[i];
+                    const midX = ((prev.x + curr.x) / 2) * w;
+                    const midY = ((prev.y + curr.y) / 2) * h;
+
+                    if (i === 1) {
+                        ctx.lineTo(midX, midY);
+                    } else {
+                        ctx.quadraticCurveTo(prev.x * w, prev.y * h, midX, midY);
+                    }
+                }
+                const last = stroke.points[stroke.points.length - 1];
+                ctx.lineTo(last.x * w, last.y * h);
+            }
+            ctx.stroke();
+        }
+    }, [strokes]);
+
+    return (
+        <div className="rounded-xl overflow-hidden border" style={{ background: STROKE_CANVAS_BACKGROUND }}>
+            <canvas
+                ref={canvasRef}
+                style={{ width: '100%', aspectRatio: '4/3', display: 'block' }}
+            />
+        </div>
+    );
+}
@@ -21,6 +21,10 @@ import {
    PieChart,
    Tags,
    Zap,
+    HelpCircle,
+    Heart,
+    Swords,
+    Pencil,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Separator } from '@/components/ui/separator';
@@ -68,6 +72,12 @@ const contentNav: NavItem[] = [
        icon: <Tags className="h-5 w-5" />,
        requiredPermission: PERMISSION_KEYS.MANAGE_PACKS,
    },
+    {
+        label: 'Quiz Questions',
+        href: '/quiz-questions',
+        icon: <HelpCircle className="h-5 w-5" />,
+        requiredPermission: PERMISSION_KEYS.MANAGE_QUESTIONS,
+    },
 ];

 const usersNav: NavItem[] = [
@@ -83,6 +93,24 @@ const usersNav: NavItem[] = [
        icon: <Activity className="h-5 w-5" />,
        requiredPermission: PERMISSION_KEYS.VIEW_ACTIVITY,
    },
+    {
+        label: 'Sent Dares',
+        href: '/activity/sent-dares',
+        icon: <Swords className="h-5 w-5" />,
+        requiredPermission: PERMISSION_KEYS.VIEW_ACTIVITY,
+    },
+    {
+        label: 'Live Draw Sessions',
+        href: '/activity/live-draw',
+        icon: <Pencil className="h-5 w-5" />,
+        requiredPermission: PERMISSION_KEYS.VIEW_USERS,
+    },
+    {
+        label: 'Couples',
+        href: '/couples',
+        icon: <Heart className="h-5 w-5" />,
+        requiredPermission: PERMISSION_KEYS.VIEW_USERS,
+    },
    {
        label: 'Usage Insights',
        href: '/usage-insights',
@@ -7,6 +7,7 @@ const AUDITED_TABLES = [
    'categories',
    'dare_packs',
    'dares',
+    'quiz_questions',
    'profiles',
    'couples',
    'responses',
@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest';
+import { buildCoupleSearchFilter, coupleStatusFromMemberCount } from './couples';
+
+describe('coupleStatusFromMemberCount', () => {
+    it('treats zero or one member as pending', () => {
+        expect(coupleStatusFromMemberCount(0)).toBe('pending');
+        expect(coupleStatusFromMemberCount(1)).toBe('pending');
+    });
+
+    it('treats two or more members as paired', () => {
+        expect(coupleStatusFromMemberCount(2)).toBe('paired');
+        expect(coupleStatusFromMemberCount(3)).toBe('paired');
+    });
+});
+
+describe('buildCoupleSearchFilter', () => {
+    it('returns null for an empty or blank search', () => {
+        expect(buildCoupleSearchFilter('')).toBeNull();
+        expect(buildCoupleSearchFilter('   ')).toBeNull();
+    });
+
+    it('matches a uuid-shaped search as an exact id filter', () => {
+        expect(buildCoupleSearchFilter('a1b2c3d4-1111-1111-1111-111111111111')).toEqual({
+            column: 'id', op: 'eq', value: 'a1b2c3d4-1111-1111-1111-111111111111',
+        });
+    });
+
+    it('treats any other search as a partial invite code match', () => {
+        expect(buildCoupleSearchFilter('SUNSET42')).toEqual({
+            column: 'invite_code', op: 'ilike', value: '%SUNSET42%',
+        });
+    });
+
+    it('trims surrounding whitespace before deciding the filter shape', () => {
+        expect(buildCoupleSearchFilter('  sunset42  ')).toEqual({
+            column: 'invite_code', op: 'ilike', value: '%sunset42%',
+        });
+    });
+});
@@ -0,0 +1,35 @@
+// Couples do not carry an explicit "paired" flag (see apps/api/src/domains/couples/schema.ts).
+// Pairing is inferred from how many profiles currently reference the couple id, the same
+// approach UsersPage already uses inline for the couple badge on a profile row.
+
+export type CoupleStatus = 'paired' | 'pending';
+
+/**
+ * Derive whether a couple is fully paired from the number of profiles that
+ * reference it. A couple starts with one member (the creator) and becomes
+ * paired once a partner joins via invite code.
+ */
+export function coupleStatusFromMemberCount(memberCount: number): CoupleStatus {
+    return memberCount >= 2 ? 'paired' : 'pending';
+}
+
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+export type CoupleSearchFilter =
+    | { column: 'id'; op: 'eq'; value: string }
+    | { column: 'invite_code'; op: 'ilike'; value: string }
+    | null;
+
+/**
+ * Build the admin query filter for the couples search box. A UUID-shaped
+ * search term is treated as an exact id lookup; anything else is matched
+ * against the invite code with a case-insensitive partial match.
+ */
+export function buildCoupleSearchFilter(rawSearch: string): CoupleSearchFilter {
+    const search = rawSearch.trim();
+    if (!search) return null;
+    if (UUID_PATTERN.test(search)) {
+        return { column: 'id', op: 'eq', value: search };
+    }
+    return { column: 'invite_code', op: 'ilike', value: `%${search}%` };
+}
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+import { clampDareIntensity, parseIntensityRange } from './dareIntensity';
+
+describe('clampDareIntensity', () => {
+    it('accepts values within the 1-5 range', () => {
+        expect(clampDareIntensity('1')).toBe(1);
+        expect(clampDareIntensity('3')).toBe(3);
+        expect(clampDareIntensity('5')).toBe(5);
+    });
+
+    it('falls back to 1 for missing, non-numeric, or out-of-range values', () => {
+        expect(clampDareIntensity('')).toBe(1);
+        expect(clampDareIntensity('abc')).toBe(1);
+        expect(clampDareIntensity('0')).toBe(1);
+        expect(clampDareIntensity('6')).toBe(1);
+    });
+
+    it('falls back to a custom default when provided', () => {
+        expect(clampDareIntensity('', 3)).toBe(3);
+        expect(clampDareIntensity('9', 3)).toBe(3);
+    });
+});
+
+describe('parseIntensityRange', () => {
+    it('allows both bounds blank', () => {
+        expect(parseIntensityRange('', '')).toEqual({ range: { min: null, max: null }, error: null });
+    });
+
+    it('parses valid bounds', () => {
+        expect(parseIntensityRange('2', '4')).toEqual({ range: { min: 2, max: 4 }, error: null });
+    });
+
+    it('rejects a minimum outside 1-5', () => {
+        const { error } = parseIntensityRange('0', '');
+        expect(error).toMatch(/Minimum intensity/);
+    });
+
+    it('rejects a maximum outside 1-5', () => {
+        const { error } = parseIntensityRange('', '6');
+        expect(error).toMatch(/Maximum intensity/);
+    });
+
+    it('rejects a minimum greater than the maximum', () => {
+        const { error } = parseIntensityRange('4', '2');
+        expect(error).toMatch(/cannot be greater than/);
+    });
+});
@@ -0,0 +1,44 @@
+// Dares and dare packs both gate on a 1-5 intensity scale (see
+// apps/api/drizzle/0010_admin.sql and 0013_dares_loop.sql). These helpers keep
+// the admin form validation consistent with that range.
+
+export const MIN_DARE_INTENSITY = 1;
+export const MAX_DARE_INTENSITY = 5;
+
+/**
+ * Clamp a raw form value to a valid dare intensity (1-5), falling back to 1
+ * when the value is missing or not a finite number in range.
+ */
+export function clampDareIntensity(rawValue: string, fallback: number = MIN_DARE_INTENSITY): number {
+    const parsed = parseInt(rawValue, 10);
+    if (!Number.isFinite(parsed) || parsed < MIN_DARE_INTENSITY || parsed > MAX_DARE_INTENSITY) {
+        return fallback;
+    }
+    return parsed;
+}
+
+export interface IntensityRange {
+    min: number | null;
+    max: number | null;
+}
+
+/**
+ * Parse and validate an optional min/max intensity pair for a dare pack.
+ * Returns the parsed range, or an error message when the values are invalid.
+ */
+export function parseIntensityRange(rawMin: string, rawMax: string): { range: IntensityRange; error: string | null } {
+    const min = rawMin.trim() ? parseInt(rawMin, 10) : null;
+    const max = rawMax.trim() ? parseInt(rawMax, 10) : null;
+
+    if (min !== null && (!Number.isFinite(min) || min < MIN_DARE_INTENSITY || min > MAX_DARE_INTENSITY)) {
+        return { range: { min: null, max: null }, error: 'Minimum intensity must be between 1 and 5' };
+    }
+    if (max !== null && (!Number.isFinite(max) || max < MIN_DARE_INTENSITY || max > MAX_DARE_INTENSITY)) {
+        return { range: { min: null, max: null }, error: 'Maximum intensity must be between 1 and 5' };
+    }
+    if (min !== null && max !== null && min > max) {
+        return { range: { min: null, max: null }, error: 'Minimum intensity cannot be greater than maximum intensity' };
+    }
+
+    return { range: { min, max }, error: null };
+}
@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest';
+import { featureInterestKey, formatFeatureName, toRecentFeatureInterest } from './featureInterests';
+
+describe('toRecentFeatureInterest', () => {
+    it('preserves the standalone API feature field for dashboard rendering', () => {
+        const interest = toRecentFeatureInterest({
+            user_id: 'user-1',
+            feature: 'better_chat',
+            created_at: '2026-09-05T12:00:00.000Z',
+        });
+
+        expect(interest).toEqual({
+            user_id: 'user-1',
+            feature: 'better_chat',
+            created_at: '2026-09-05T12:00:00.000Z',
+        });
+        expect(formatFeatureName(interest.feature)).toBe('Better Chat');
+        expect(featureInterestKey(interest)).toBe('user-1:better_chat');
+    });
+});
@@ -0,0 +1,34 @@
+export interface FeatureInterestRow {
+    user_id: string;
+    feature: string;
+    created_at: string;
+}
+
+export interface RecentFeatureInterest extends FeatureInterestRow {
+    profile?: {
+        id: string;
+        name: string | null;
+        email: string | null;
+        avatar_url: string | null;
+    };
+}
+
+export function toRecentFeatureInterest(row: FeatureInterestRow): RecentFeatureInterest {
+    return {
+        user_id: row.user_id,
+        feature: row.feature,
+        created_at: row.created_at,
+    };
+}
+
+export function featureInterestKey(row: Pick<FeatureInterestRow, 'user_id' | 'feature'>): string {
+    return `${row.user_id}:${row.feature}`;
+}
+
+export function formatFeatureName(feature: string): string {
+    return feature
+        .split('_')
+        .filter(Boolean)
+        .map(part => part.charAt(0).toUpperCase() + part.slice(1))
+        .join(' ');
+}
@@ -0,0 +1,40 @@
+import { describe, expect, it } from 'vitest';
+import { sanitizeQuizOptions, validateQuizQuestionForm } from './quizQuestions';
+
+describe('sanitizeQuizOptions', () => {
+    it('trims and drops empty options', () => {
+        expect(sanitizeQuizOptions([' A ', '', '  ', 'B'])).toEqual(['A', 'B']);
+    });
+});
+
+describe('validateQuizQuestionForm', () => {
+    const base = {
+        prompt_self: 'What is your favourite season?',
+        prompt_guess: "What is your partner's favourite season?",
+        options: ['Spring', 'Summer'],
+    };
+
+    it('accepts a valid form', () => {
+        expect(validateQuizQuestionForm(base)).toBeNull();
+    });
+
+    it('requires the self prompt', () => {
+        expect(validateQuizQuestionForm({ ...base, prompt_self: '  ' })).toMatch(/about yourself/);
+    });
+
+    it('requires the guess prompt', () => {
+        expect(validateQuizQuestionForm({ ...base, prompt_guess: '' })).toMatch(/about your partner/);
+    });
+
+    it('requires at least two options', () => {
+        expect(validateQuizQuestionForm({ ...base, options: ['Only one'] })).toMatch(/At least 2 options/);
+    });
+
+    it('allows at most four options', () => {
+        expect(validateQuizQuestionForm({ ...base, options: ['A', 'B', 'C', 'D', 'E'] })).toMatch(/At most 4 options/);
+    });
+
+    it('ignores blank options when counting', () => {
+        expect(validateQuizQuestionForm({ ...base, options: ['Spring', 'Summer', '', ''] })).toBeNull();
+    });
+});
@@ -0,0 +1,31 @@
+// Quiz question options are constrained by the database check
+// `array_length(options, 1) between 2 and 4` (see
+// apps/api/drizzle/0019_quiz.sql). These helpers keep the admin form
+// validation consistent with that constraint.
+
+export const MIN_QUIZ_OPTIONS = 2;
+export const MAX_QUIZ_OPTIONS = 4;
+
+export interface QuizQuestionFormValues {
+    prompt_self: string;
+    prompt_guess: string;
+    options: string[];
+}
+
+/** Trim options and drop any that are empty. */
+export function sanitizeQuizOptions(options: string[]): string[] {
+    return options.map((option) => option.trim()).filter(Boolean);
+}
+
+/**
+ * Validate a quiz question form. Returns an error message, or null when the
+ * form is valid.
+ */
+export function validateQuizQuestionForm(form: QuizQuestionFormValues): string | null {
+    if (!form.prompt_self.trim()) return 'The "about yourself" prompt is required';
+    if (!form.prompt_guess.trim()) return 'The "about your partner" prompt is required';
+    const cleanedOptions = sanitizeQuizOptions(form.options);
+    if (cleanedOptions.length < MIN_QUIZ_OPTIONS) return `At least ${MIN_QUIZ_OPTIONS} options are required`;
+    if (cleanedOptions.length > MAX_QUIZ_OPTIONS) return `At most ${MAX_QUIZ_OPTIONS} options are allowed`;
+    return null;
+}
@@ -0,0 +1,33 @@
+import { describe, expect, it } from 'vitest';
+import { isSentDareOverdue, SENT_DARE_STATUS_LABELS } from './sentDares';
+
+describe('SENT_DARE_STATUS_LABELS', () => {
+    it('has a label for every documented status', () => {
+        for (const status of ['pending', 'active', 'submitted', 'completed', 'expired', 'declined', 'cancelled'] as const) {
+            expect(SENT_DARE_STATUS_LABELS[status].label).toBeTruthy();
+        }
+    });
+});
+
+describe('isSentDareOverdue', () => {
+    const now = new Date('2026-08-30T12:00:00Z');
+
+    it('is false when there is no expiry', () => {
+        expect(isSentDareOverdue('pending', null, now)).toBe(false);
+    });
+
+    it('is false for a terminal status even if expiry has passed', () => {
+        expect(isSentDareOverdue('completed', '2026-08-01T00:00:00Z', now)).toBe(false);
+        expect(isSentDareOverdue('expired', '2026-08-01T00:00:00Z', now)).toBe(false);
+    });
+
+    it('is false for an open status whose expiry has not passed', () => {
+        expect(isSentDareOverdue('active', '2026-09-01T00:00:00Z', now)).toBe(false);
+    });
+
+    it('is true for an open status whose expiry has already passed', () => {
+        expect(isSentDareOverdue('pending', '2026-08-01T00:00:00Z', now)).toBe(true);
+        expect(isSentDareOverdue('active', '2026-08-01T00:00:00Z', now)).toBe(true);
+        expect(isSentDareOverdue('submitted', '2026-08-01T00:00:00Z', now)).toBe(true);
+    });
+});
@@ -0,0 +1,38 @@
+// sent_dares status lifecycle mirrors the check constraint added in
+// apps/api/drizzle/0013_dares_loop.sql: pending -> active -> submitted -> completed,
+// with expired/declined/cancelled as terminal side branches.
+
+export const SENT_DARE_STATUSES = [
+    'pending', 'active', 'submitted', 'completed', 'expired', 'declined', 'cancelled',
+] as const;
+
+export type SentDareStatus = typeof SENT_DARE_STATUSES[number];
+
+export type BadgeVariant = 'default' | 'secondary' | 'destructive' | 'outline';
+
+export const SENT_DARE_STATUS_LABELS: Record<SentDareStatus, { label: string; variant: BadgeVariant }> = {
+    pending: { label: 'Pending', variant: 'secondary' },
+    active: { label: 'Active', variant: 'default' },
+    submitted: { label: 'Submitted', variant: 'default' },
+    completed: { label: 'Completed', variant: 'outline' },
+    expired: { label: 'Expired', variant: 'destructive' },
+    declined: { label: 'Declined', variant: 'destructive' },
+    cancelled: { label: 'Cancelled', variant: 'outline' },
+};
+
+const OPEN_STATUSES: ReadonlySet<SentDareStatus> = new Set(['pending', 'active', 'submitted']);
+
+/**
+ * A dare is overdue when it is still in an open state but its expiry has
+ * already passed. The worker sweeps these to `expired` asynchronously, so the
+ * admin view can lag the true status briefly; this flags that gap for support.
+ */
+export function isSentDareOverdue(
+    status: string,
+    expiresAt: string | null,
+    now: Date = new Date(),
+): boolean {
+    if (!expiresAt) return false;
+    if (!OPEN_STATUSES.has(status as SentDareStatus)) return false;
+    return new Date(expiresAt).getTime() < now.getTime();
+}
@@ -10,36 +10,22 @@ import { Bar, BarChart, ResponsiveContainer, XAxis, YAxis, Tooltip } from 'recha
 import { format, subDays, startOfDay, endOfDay, formatDistanceToNow } from 'date-fns';
 import { useRealtimeSubscription } from '@/hooks/useRealtimeSubscription';
 import { RealtimeStatusIndicator } from '@/components/RealtimeStatusIndicator';
+import {
+    formatFeatureName,
+    featureInterestKey,
+    toRecentFeatureInterest,
+    type FeatureInterestRow,
+    type RecentFeatureInterest,
+} from '@/lib/featureInterests';

 type FeatureInterestChartPoint = { date: string; count: number };

-type RecentFeatureInterest = {
-    id: string;
-    user_id: string;
-    feature_name: string;
-    created_at: string;
-    profile?: {
-        id: string;
-        name: string | null;
-        email: string | null;
-        avatar_url: string | null;
-    };
-};
-
 type FeatureInterestCountsRow = {
    feature_name: string;
    opt_in_count: number;
    opt_in_count_last_7_days: number;
 };

-function formatFeatureName(featureName: string) {
-    return featureName
-        .split('_')
-        .filter(Boolean)
-        .map(part => part.charAt(0).toUpperCase() + part.slice(1))
-        .join(' ');
-}
-
 export function DashboardPage() {
    const { hasPermission } = useAuth();
    const canViewUsers = hasPermission(PERMISSION_KEYS.VIEW_USERS);
@@ -95,7 +81,7 @@ export function DashboardPage() {
                    ? adminData.from('feature_interests').select('created_at, user_id').gte('created_at', startDate.toISOString()).lte('created_at', endDate.toISOString())
                    : Promise.resolve({ data: [] }),
                canViewUsers
-                    ? adminData.from('feature_interests').select('id, user_id, feature_name, created_at').order('created_at', { ascending: false }).limit(10)
+                    ? adminData.from<FeatureInterestRow>('feature_interests').select('user_id, feature, created_at').order('created_at', { ascending: false }).limit(10)
                    : Promise.resolve({ data: [] }),
            ]);

@@ -158,12 +144,7 @@ export function DashboardPage() {
                }))
            );

-            let recentActivity: RecentFeatureInterest[] = (recentInterests ?? []).map(item => ({
-                id: item.id,
-                user_id: item.user_id,
-                feature_name: item.feature_name,
-                created_at: item.created_at,
-            }));
+            let recentActivity: RecentFeatureInterest[] = (recentInterests ?? []).map(toRecentFeatureInterest);

            if (canViewUsers && recentActivity.length > 0) {
                const userIds = Array.from(new Set(recentActivity.map(item => item.user_id)));
@@ -579,14 +560,14 @@ export function DashboardPage() {
                                                    if (item.profile?.name && item.profile.email) {
                                                        subtitleParts.push(item.profile.email);
                                                    }
-                                                    subtitleParts.push(formatFeatureName(item.feature_name));
+                                                    subtitleParts.push(formatFeatureName(item.feature));

                                                    const fallbackChar = (item.profile?.name || item.profile?.email || 'U')
                                                        .charAt(0)
                                                        .toUpperCase();

                                                    return (
-                                                        <div key={item.id} className="flex items-center justify-between gap-4 rounded-xl bg-white/5 p-3">
+                                                        <div key={featureInterestKey(item)} className="flex items-center justify-between gap-4 rounded-xl bg-white/5 p-3">
                                                            <div className="flex items-center gap-3 min-w-0">
                                                                <Avatar className="h-8 w-8">
                                                                    <AvatarImage src={item.profile?.avatar_url || undefined} />
@@ -0,0 +1,222 @@
+import { useState, useEffect, useCallback } from 'react';
+import { Link } from 'react-router-dom';
+import { adminData } from '@/lib/adminApi';
+import { Badge } from '@/components/ui/badge';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Skeleton } from '@/components/ui/skeleton';
+import { Button } from '@/components/ui/button';
+import { PaginationControls } from '@/components/ui/pagination';
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from '@/components/ui/table';
+import { Pencil, Eye } from 'lucide-react';
+import { format } from 'date-fns';
+import { toast } from 'sonner';
+import { StrokeCanvas, type StrokeSegment } from '@/components/content/StrokeCanvas';
+
+interface LiveDrawSession {
+    couple_id: string;
+    revision: number;
+    updated_by: string;
+    created_at: string;
+    updated_at: string;
+}
+
+interface Profile {
+    id: string;
+    name: string | null;
+    email: string | null;
+    couple_id: string | null;
+}
+
+export function LiveDrawSessionsPage() {
+    const [sessions, setSessions] = useState<LiveDrawSession[]>([]);
+    const [membersByCouple, setMembersByCouple] = useState<Record<string, Profile[]>>({});
+    const [loading, setLoading] = useState(true);
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
+    const [total, setTotal] = useState(0);
+
+    const [selectedCoupleId, setSelectedCoupleId] = useState<string | null>(null);
+    const [strokes, setStrokes] = useState<StrokeSegment[]>([]);
+    const [strokesLoading, setStrokesLoading] = useState(false);
+
+    const fetchSessions = useCallback(async () => {
+        setLoading(true);
+        try {
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            const { data, error, count } = await adminData
+                .from<LiveDrawSession>('live_draw_sessions')
+                .select('couple_id, revision, updated_by, created_at, updated_at', { count: 'exact' })
+                .order('updated_at', { ascending: false })
+                .range(from, to);
+            if (error) throw error;
+
+            const rows = data || [];
+            setSessions(rows);
+            setTotal(count || 0);
+
+            const coupleIds = rows.map((row) => row.couple_id);
+            if (coupleIds.length > 0) {
+                const { data: profiles } = await adminData
+                    .from<Profile>('profiles')
+                    .select('id, name, email, couple_id')
+                    .in('couple_id', coupleIds);
+                const grouped: Record<string, Profile[]> = {};
+                (profiles || []).forEach((profile) => {
+                    if (!profile.couple_id) return;
+                    (grouped[profile.couple_id] ??= []).push(profile);
+                });
+                setMembersByCouple(grouped);
+            } else {
+                setMembersByCouple({});
+            }
+        } catch (error) {
+            console.error('Failed to load live draw sessions:', error);
+            toast.error('Failed to load live draw sessions');
+        } finally {
+            setLoading(false);
+        }
+    }, [page, pageSize]);
+
+    useEffect(() => { fetchSessions(); }, [fetchSessions]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(total / pageSize));
+        if (page > totalPages) setPage(totalPages);
+    }, [page, pageSize, total]);
+
+    const previewSession = async (coupleId: string) => {
+        setSelectedCoupleId(coupleId);
+        setStrokesLoading(true);
+        setStrokes([]);
+        try {
+            const { data, error } = await adminData
+                .from('live_draw_sessions')
+                .select('strokes')
+                .eq('couple_id', coupleId)
+                .maybeSingle();
+            if (error) throw error;
+            setStrokes((data?.strokes as StrokeSegment[]) || []);
+        } catch (error) {
+            console.error('Failed to load drawing:', error);
+            toast.error('Failed to load drawing');
+        } finally {
+            setStrokesLoading(false);
+        }
+    };
+
+    const renderMembers = (coupleId: string) => {
+        const members = membersByCouple[coupleId] || [];
+        if (members.length === 0) return <span className="text-muted-foreground text-sm">Unknown couple</span>;
+        return (
+            <div className="flex flex-col gap-1">
+                {members.map((member) => (
+                    <Link key={member.id} to={`/users/${member.id}`} className="text-primary hover:underline text-sm">
+                        {member.name || member.email || member.id}
+                    </Link>
+                ))}
+            </div>
+        );
+    };
+
+    return (
+        <div className="space-y-6">
+            <div>
+                <h1 className="text-3xl font-bold tracking-tight flex items-center gap-2">
+                    <Pencil className="h-8 w-8 text-primary" />
+                    Live Draw Sessions
+                </h1>
+                <p className="text-muted-foreground">
+                    Recent live-draw activity across couples, most recently updated first
+                </p>
+            </div>
+
+            <Card>
+                <Table>
+                    <TableHeader>
+                        <TableRow>
+                            <TableHead>Couple</TableHead>
+                            <TableHead>Revision</TableHead>
+                            <TableHead>Created</TableHead>
+                            <TableHead>Last Updated</TableHead>
+                            <TableHead className="text-right">Actions</TableHead>
+                        </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                        {loading ? (
+                            <TableRow>
+                                <TableCell colSpan={5} className="text-center py-8">
+                                    <div className="flex justify-center"><Skeleton className="h-6 w-32" /></div>
+                                </TableCell>
+                            </TableRow>
+                        ) : sessions.length === 0 ? (
+                            <TableRow>
+                                <TableCell colSpan={5} className="text-center py-8 text-muted-foreground">
+                                    No live draw sessions yet.
+                                </TableCell>
+                            </TableRow>
+                        ) : (
+                            sessions.map((session) => (
+                                <TableRow key={session.couple_id}>
+                                    <TableCell>{renderMembers(session.couple_id)}</TableCell>
+                                    <TableCell><Badge variant="outline">{session.revision}</Badge></TableCell>
+                                    <TableCell className="text-sm text-muted-foreground whitespace-nowrap">
+                                        {format(new Date(session.created_at), 'MMM d, yyyy')}
+                                    </TableCell>
+                                    <TableCell className="text-sm text-muted-foreground whitespace-nowrap">
+                                        {format(new Date(session.updated_at), 'MMM d, yyyy HH:mm')}
+                                    </TableCell>
+                                    <TableCell className="text-right">
+                                        <Button variant="ghost" size="sm" onClick={() => previewSession(session.couple_id)}>
+                                            <Eye className="h-4 w-4 mr-2" />
+                                            Preview
+                                        </Button>
+                                    </TableCell>
+                                </TableRow>
+                            ))
+                        )}
+                    </TableBody>
+                </Table>
+            </Card>
+
+            {total > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={total}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => { setPage(1); setPageSize(size); }}
+                />
+            )}
+
+            {selectedCoupleId && (
+                <Card>
+                    <CardHeader className="pb-3">
+                        <CardTitle className="text-lg">Drawing Preview</CardTitle>
+                        <CardDescription>Read-only snapshot of the couple's shared canvas</CardDescription>
+                    </CardHeader>
+                    <CardContent>
+                        {strokesLoading ? (
+                            <Skeleton className="h-64 w-full" />
+                        ) : strokes.length === 0 ? (
+                            <div className="flex flex-col items-center justify-center py-12">
+                                <Pencil className="h-12 w-12 text-muted-foreground mb-4" />
+                                <p className="text-muted-foreground">No strokes to show</p>
+                            </div>
+                        ) : (
+                            <StrokeCanvas strokes={strokes} />
+                        )}
+                    </CardContent>
+                </Card>
+            )}
+        </div>
+    );
+}
@@ -0,0 +1,289 @@
+import { useState, useEffect, useCallback } from 'react';
+import { Link } from 'react-router-dom';
+import { adminData } from '@/lib/adminApi';
+import { Badge } from '@/components/ui/badge';
+import { Card } from '@/components/ui/card';
+import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from '@/components/ui/table';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { Swords, Eye, MessageSquare } from 'lucide-react';
+import { format } from 'date-fns';
+import { toast } from 'sonner';
+import { SENT_DARE_STATUS_LABELS, SENT_DARE_STATUSES, isSentDareOverdue, type SentDareStatus } from '@/lib/sentDares';
+
+interface Profile {
+    id: string;
+    name: string | null;
+    email: string | null;
+}
+
+interface SentDare {
+    id: string;
+    couple_id: string;
+    dare_text_snapshot: string;
+    custom_dare_text: string | null;
+    dare_intensity_snapshot: number;
+    sender_id: string;
+    recipient_id: string;
+    status: string;
+    sent_at: string;
+    expires_at: string | null;
+}
+
+interface DareMessage {
+    id: string;
+    sender_id: string;
+    content: string;
+    created_at: string;
+    read_at: string | null;
+}
+
+const STATUS_FILTER_OPTIONS: Array<'all' | SentDareStatus> = ['all', ...SENT_DARE_STATUSES];
+
+export function SentDaresPage() {
+    const [dares, setDares] = useState<SentDare[]>([]);
+    const [profilesById, setProfilesById] = useState<Record<string, Profile>>({});
+    const [loading, setLoading] = useState(true);
+    const [statusFilter, setStatusFilter] = useState<'all' | SentDareStatus>('all');
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
+    const [total, setTotal] = useState(0);
+
+    const [selectedDare, setSelectedDare] = useState<SentDare | null>(null);
+    const [messages, setMessages] = useState<DareMessage[]>([]);
+    const [messagesLoading, setMessagesLoading] = useState(false);
+
+    const fetchDares = useCallback(async () => {
+        setLoading(true);
+        try {
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            let query = adminData
+                .from<SentDare>('sent_dares')
+                .select('id, couple_id, dare_text_snapshot, custom_dare_text, dare_intensity_snapshot, sender_id, recipient_id, status, sent_at, expires_at', { count: 'exact' })
+                .order('sent_at', { ascending: false })
+                .range(from, to);
+
+            if (statusFilter !== 'all') {
+                query = query.eq('status', statusFilter);
+            }
+
+            const { data, error, count } = await query;
+            if (error) throw error;
+
+            const rows = data || [];
+            setDares(rows);
+            setTotal(count || 0);
+
+            const userIds = [...new Set(rows.flatMap((row) => [row.sender_id, row.recipient_id]))];
+            if (userIds.length > 0) {
+                const { data: profiles } = await adminData
+                    .from<Profile>('profiles')
+                    .select('id, name, email')
+                    .in('id', userIds);
+                setProfilesById((profiles || []).reduce((acc: Record<string, Profile>, profile) => {
+                    acc[profile.id] = profile;
+                    return acc;
+                }, {}));
+            } else {
+                setProfilesById({});
+            }
+        } catch (error) {
+            console.error('Failed to load sent dares:', error);
+            toast.error('Failed to load sent dares');
+        } finally {
+            setLoading(false);
+        }
+    }, [page, pageSize, statusFilter]);
+
+    useEffect(() => { fetchDares(); }, [fetchDares]);
+
+    useEffect(() => { setPage(1); }, [statusFilter]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(total / pageSize));
+        if (page > totalPages) setPage(totalPages);
+    }, [page, pageSize, total]);
+
+    const renderUserLink = (userId: string) => {
+        const profile = profilesById[userId];
+        return (
+            <Link to={`/users/${userId}`} className="text-primary hover:underline">
+                {profile?.name || profile?.email || 'Unknown user'}
+            </Link>
+        );
+    };
+
+    const openDetail = async (dare: SentDare) => {
+        setSelectedDare(dare);
+        setMessagesLoading(true);
+        setMessages([]);
+        try {
+            const { data, error } = await adminData
+                .from<DareMessage>('dare_messages')
+                .select('id, sender_id, content, created_at, read_at')
+                .eq('sent_dare_id', dare.id)
+                .order('created_at', { ascending: true });
+            if (error) throw error;
+            setMessages(data || []);
+        } catch (error) {
+            console.error('Failed to load dare messages:', error);
+            toast.error('Failed to load dare messages');
+        } finally {
+            setMessagesLoading(false);
+        }
+    };
+
+    return (
+        <div className="space-y-6">
+            <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+                <div>
+                    <h1 className="text-3xl font-bold tracking-tight flex items-center gap-2">
+                        <Swords className="h-8 w-8 text-primary" />
+                        Sent Dares
+                    </h1>
+                    <p className="text-muted-foreground">
+                        Review the dares loop between couples for moderation and support
+                    </p>
+                </div>
+                <Select value={statusFilter} onValueChange={(value) => setStatusFilter(value as 'all' | SentDareStatus)}>
+                    <SelectTrigger className="w-full sm:w-48">
+                        <SelectValue placeholder="Status" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        {STATUS_FILTER_OPTIONS.map((status) => (
+                            <SelectItem key={status} value={status} className="capitalize">
+                                {status === 'all' ? 'All statuses' : SENT_DARE_STATUS_LABELS[status].label}
+                            </SelectItem>
+                        ))}
+                    </SelectContent>
+                </Select>
+            </div>
+
+            <Card>
+                <Table>
+                    <TableHeader>
+                        <TableRow>
+                            <TableHead>Dare</TableHead>
+                            <TableHead>Sender</TableHead>
+                            <TableHead>Recipient</TableHead>
+                            <TableHead>Status</TableHead>
+                            <TableHead>Sent</TableHead>
+                            <TableHead>Expires</TableHead>
+                            <TableHead className="text-right">Actions</TableHead>
+                        </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                        {loading ? (
+                            <TableRow>
+                                <TableCell colSpan={7} className="text-center py-8">
+                                    <div className="flex justify-center"><Skeleton className="h-6 w-32" /></div>
+                                </TableCell>
+                            </TableRow>
+                        ) : dares.length === 0 ? (
+                            <TableRow>
+                                <TableCell colSpan={7} className="text-center py-8 text-muted-foreground">
+                                    No sent dares found.
+                                </TableCell>
+                            </TableRow>
+                        ) : (
+                            dares.map((dare) => {
+                                const statusInfo = SENT_DARE_STATUS_LABELS[dare.status as SentDareStatus];
+                                const overdue = isSentDareOverdue(dare.status, dare.expires_at);
+                                return (
+                                    <TableRow key={dare.id}>
+                                        <TableCell className="max-w-[280px]">
+                                            <span className="line-clamp-2 block">{dare.custom_dare_text || dare.dare_text_snapshot}</span>
+                                        </TableCell>
+                                        <TableCell>{renderUserLink(dare.sender_id)}</TableCell>
+                                        <TableCell>{renderUserLink(dare.recipient_id)}</TableCell>
+                                        <TableCell>
+                                            <div className="flex items-center gap-2">
+                                                <Badge variant={statusInfo?.variant ?? 'secondary'} className="capitalize">{statusInfo?.label ?? dare.status}</Badge>
+                                                {overdue && <Badge variant="destructive">Overdue</Badge>}
+                                            </div>
+                                        </TableCell>
+                                        <TableCell className="text-sm text-muted-foreground whitespace-nowrap">
+                                            {format(new Date(dare.sent_at), 'MMM d, yyyy HH:mm')}
+                                        </TableCell>
+                                        <TableCell className="text-sm text-muted-foreground whitespace-nowrap">
+                                            {dare.expires_at ? format(new Date(dare.expires_at), 'MMM d, yyyy HH:mm') : 'No expiry'}
+                                        </TableCell>
+                                        <TableCell className="text-right">
+                                            <Button variant="ghost" size="sm" onClick={() => openDetail(dare)}>
+                                                <Eye className="h-4 w-4 mr-2" />
+                                                Messages
+                                            </Button>
+                                        </TableCell>
+                                    </TableRow>
+                                );
+                            })
+                        )}
+                    </TableBody>
+                </Table>
+            </Card>
+
+            {total > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={total}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => { setPage(1); setPageSize(size); }}
+                />
+            )}
+
+            <Dialog open={!!selectedDare} onOpenChange={(open) => !open && setSelectedDare(null)}>
+                <DialogContent className="max-w-2xl">
+                    <DialogHeader>
+                        <DialogTitle className="flex items-center gap-2">
+                            <MessageSquare className="h-5 w-5" />
+                            Dare Messages
+                        </DialogTitle>
+                        <DialogDescription>
+                            {selectedDare && (selectedDare.custom_dare_text || selectedDare.dare_text_snapshot)}
+                        </DialogDescription>
+                    </DialogHeader>
+                    <div className="min-h-[120px] max-h-[400px] overflow-y-auto space-y-3 bg-muted/30 rounded-md p-4">
+                        {messagesLoading ? (
+                            <Skeleton className="h-24 w-full" />
+                        ) : messages.length === 0 ? (
+                            <p className="text-center text-muted-foreground py-8">No messages for this dare</p>
+                        ) : (
+                            messages.map((message) => (
+                                <div key={message.id} className="bg-background border rounded p-3 text-sm">
+                                    <div className="flex items-center justify-between mb-1">
+                                        <span className="font-medium">
+                                            {selectedDare && (message.sender_id === selectedDare.sender_id ? 'Sender' : 'Recipient')}
+                                        </span>
+                                        <span className="text-xs text-muted-foreground">
+                                            {format(new Date(message.created_at), 'MMM d, yyyy HH:mm')}
+                                        </span>
+                                    </div>
+                                    <p className="whitespace-pre-wrap">{message.content}</p>
+                                </div>
+                            ))
+                        )}
+                    </div>
+                </DialogContent>
+            </Dialog>
+        </div>
+    );
+}
@@ -33,6 +33,7 @@ import { Plus, Zap, Pencil, Trash2, Loader2, Crown, Eye, EyeOff, ChevronUp, Chev
 import { toast } from 'sonner';
 import { ContentReviewControl } from '@/components/content/ContentReviewControl';
 import type { ContentReviewStatus } from '@sauci/shared';
+import { parseIntensityRange } from '@/lib/dareIntensity';

 // =============================================================================
 // Types
@@ -54,6 +55,9 @@ interface DarePack {
    is_explicit: boolean;
    sort_order: number;
    category_id: string | null;
+    min_intensity: number | null;
+    max_intensity: number | null;
+    avg_intensity: number | null;
    created_at: string | null;
    dare_count?: number;
    content_status?: ContentReviewStatus | null;
@@ -68,6 +72,8 @@ interface DarePackFormData {
    is_public: boolean;
    is_explicit: boolean;
    category_id: string;
+    min_intensity: string;
+    max_intensity: string;
 }

 // =============================================================================
@@ -96,6 +102,8 @@ export function DarePacksPage() {
            is_public: false,
            is_explicit: false,
            category_id: categoryId ?? '',
+            min_intensity: '',
+            max_intensity: '',
        },
        (pack) => ({
            name: pack.name,
@@ -105,6 +113,8 @@ export function DarePacksPage() {
            is_public: pack.is_public,
            is_explicit: pack.is_explicit,
            category_id: pack.category_id || '',
+            min_intensity: pack.min_intensity != null ? String(pack.min_intensity) : '',
+            max_intensity: pack.max_intensity != null ? String(pack.max_intensity) : '',
        })
    );

@@ -209,6 +219,14 @@ export function DarePacksPage() {
            return;
        }

+        const { range, error: intensityError } = parseIntensityRange(form.formData.min_intensity, form.formData.max_intensity);
+        if (intensityError) {
+            toast.error(intensityError);
+            return;
+        }
+        const parsedMin = range.min;
+        const parsedMax = range.max;
+
        form.setSaving(true);
        try {
            if (form.editingItem) {
@@ -220,6 +238,8 @@ export function DarePacksPage() {
                    is_public: form.formData.is_public,
                    is_explicit: form.formData.is_explicit,
                    category_id: form.formData.category_id || null,
+                    min_intensity: parsedMin,
+                    max_intensity: parsedMax,
                });
                if (error) throw error;
                toast.success('Dare pack updated');
@@ -232,6 +252,8 @@ export function DarePacksPage() {
                    is_public: form.formData.is_public,
                    is_explicit: form.formData.is_explicit,
                    category_id: form.formData.category_id || null,
+                    min_intensity: parsedMin,
+                    max_intensity: parsedMax,
                    sort_order: totalCount,
                });
                if (error) throw error;
@@ -410,6 +432,36 @@ export function DarePacksPage() {
                                </Select>
                            </div>

+                            <div className="grid grid-cols-2 gap-4">
+                                <div className="space-y-2">
+                                    <Label htmlFor="min_intensity">Min Intensity (optional)</Label>
+                                    <Input
+                                        id="min_intensity"
+                                        type="number"
+                                        min={1}
+                                        max={5}
+                                        value={form.formData.min_intensity}
+                                        onChange={(e) => form.setField('min_intensity', e.target.value)}
+                                        placeholder="1"
+                                    />
+                                </div>
+                                <div className="space-y-2">
+                                    <Label htmlFor="max_intensity">Max Intensity (optional)</Label>
+                                    <Input
+                                        id="max_intensity"
+                                        type="number"
+                                        min={1}
+                                        max={5}
+                                        value={form.formData.max_intensity}
+                                        onChange={(e) => form.setField('max_intensity', e.target.value)}
+                                        placeholder="5"
+                                    />
+                                </div>
+                            </div>
+                            <p className="text-xs text-muted-foreground -mt-2">
+                                Gates whether this pack shows for a couple based on their intensity preference. Leave blank for no gate.
+                            </p>
+
                            <div className="flex items-center justify-between">
                                <div className="space-y-0.5">
                                    <Label>Premium</Label>
@@ -572,6 +624,20 @@ export function DarePacksPage() {
                                </CardDescription>
                            </CardHeader>
                            <CardContent>
+                                {(pack.min_intensity != null || pack.max_intensity != null || pack.avg_intensity != null) && (
+                                    <div className="flex flex-wrap gap-1 mb-2">
+                                        {(pack.min_intensity != null || pack.max_intensity != null) && (
+                                            <Badge variant="outline" className="text-xs">
+                                                Intensity {pack.min_intensity ?? 1}-{pack.max_intensity ?? 5}
+                                            </Badge>
+                                        )}
+                                        {pack.avg_intensity != null && (
+                                            <Badge variant="outline" className="text-xs">
+                                                Avg {pack.avg_intensity}
+                                            </Badge>
+                                        )}
+                                    </div>
+                                )}
                                <div className="flex items-center justify-between">
                                    <span className="text-sm text-muted-foreground">
                                        {pack.dare_count} dare{pack.dare_count !== 1 ? 's' : ''}
@@ -39,6 +39,7 @@ import { toast } from 'sonner';
 import { IconPreview } from '@/components/ui/icon-picker';
 import { ContentReviewControl } from '@/components/content/ContentReviewControl';
 import type { ContentReviewStatus } from '@sauci/shared';
+import { clampDareIntensity, MAX_DARE_INTENSITY, MIN_DARE_INTENSITY } from '@/lib/dareIntensity';

 // =============================================================================
 // Types
@@ -102,9 +103,11 @@ export function DaresPage() {
    // Form state
    const [formData, setFormData] = useState<{
        text: string;
+        intensity: string;
        suggested_duration_hours: string;
    }>({
        text: '',
+        intensity: '1',
        suggested_duration_hours: '',
    });

@@ -166,7 +169,7 @@ export function DaresPage() {

    const openCreateDialog = () => {
        setEditingDare(null);
-        setFormData({ text: '', suggested_duration_hours: '' });
+        setFormData({ text: '', intensity: '1', suggested_duration_hours: '' });
        setDialogOpen(true);
    };

@@ -174,6 +177,7 @@ export function DaresPage() {
        setEditingDare(dare);
        setFormData({
            text: dare.text,
+            intensity: String(dare.intensity ?? 1),
            suggested_duration_hours: dare.suggested_duration_hours?.toString() || '',
        });
        setDialogOpen(true);
@@ -185,10 +189,13 @@ export function DaresPage() {
            return;
        }

+        const intensity = clampDareIntensity(formData.intensity);
+
        setSaving(true);
        try {
            const dareData = {
                text: formData.text,
+                intensity,
                suggested_duration_hours: formData.suggested_duration_hours
                    ? parseInt(formData.suggested_duration_hours, 10)
                    : null,
@@ -338,6 +345,31 @@ export function DaresPage() {
                                />
                            </div>

+                            <div className="space-y-2">
+                                <Label htmlFor="intensity">Intensity</Label>
+                                <Select
+                                    value={formData.intensity}
+                                    onValueChange={(value) => setFormData(d => ({ ...d, intensity: value }))}
+                                >
+                                    <SelectTrigger id="intensity">
+                                        <SelectValue placeholder="Select an intensity" />
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        {Array.from(
+                                            { length: MAX_DARE_INTENSITY - MIN_DARE_INTENSITY + 1 },
+                                            (_, i) => MIN_DARE_INTENSITY + i,
+                                        ).map((level) => (
+                                            <SelectItem key={level} value={String(level)}>
+                                                {level}
+                                            </SelectItem>
+                                        ))}
+                                    </SelectContent>
+                                </Select>
+                                <p className="text-xs text-muted-foreground">
+                                    1 is mild, 5 is the most intense. Used to gate dares against a couple's intensity preference.
+                                </p>
+                            </div>
+
                            <div className="space-y-2">
                                <Label>Suggested Duration</Label>
                                <Select
@@ -444,6 +476,7 @@ export function DaresPage() {
                                <TableHead className="w-12">#</TableHead>
                                <TableHead>Dare</TableHead>
                                <TableHead className="w-40">Catalogue</TableHead>
+                                <TableHead className="w-20">Intensity</TableHead>
                                <TableHead className="w-24">Duration</TableHead>
                                <TableHead className="w-24">Actions</TableHead>
                            </TableRow>
@@ -478,6 +511,11 @@ export function DaresPage() {
                                            compact
                                        />
                                    </TableCell>
+                                    <TableCell>
+                                        <Badge variant="outline" className="text-xs">
+                                            {dare.intensity}
+                                        </Badge>
+                                    </TableCell>
                                    <TableCell>
                                        {dare.suggested_duration_hours ? (
                                            <Badge variant="outline" className="text-xs">
@@ -0,0 +1,487 @@
+import { useState, useEffect, useCallback } from 'react';
+import { adminData } from '@/lib/adminApi';
+import { auditedAdminData } from '@/hooks/useAuditedAdminData';
+import { useEntityForm } from '@/hooks/useEntityForm';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Input } from '@/components/ui/input';
+import { Textarea } from '@/components/ui/textarea';
+import { Badge } from '@/components/ui/badge';
+import { Switch } from '@/components/ui/switch';
+import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from '@/components/ui/table';
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from '@/components/ui/dialog';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select';
+import { Card } from '@/components/ui/card';
+import { Plus, Pencil, Loader2, HelpCircle, X, Eye, EyeOff } from 'lucide-react';
+import { toast } from 'sonner';
+import { MAX_QUIZ_OPTIONS, MIN_QUIZ_OPTIONS, sanitizeQuizOptions, validateQuizQuestionForm } from '@/lib/quizQuestions';
+
+// =============================================================================
+// Types
+// =============================================================================
+
+interface QuizQuestion {
+    id: string;
+    prompt_self: string;
+    prompt_guess: string;
+    options: string[];
+    sort_order: number;
+    is_active: boolean;
+    created_at: string | null;
+}
+
+interface QuizQuestionFormData {
+    prompt_self: string;
+    prompt_guess: string;
+    options: string[];
+    sort_order: string;
+    is_active: boolean;
+}
+
+type ActiveFilter = 'all' | 'active' | 'inactive';
+
+const emptyOptions = () => ['', ''];
+
+// =============================================================================
+// Component
+// =============================================================================
+
+export function QuizQuestionsPage() {
+    const [questions, setQuestions] = useState<QuizQuestion[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
+    const [totalCount, setTotalCount] = useState(0);
+    const [activeFilter, setActiveFilter] = useState<ActiveFilter>('all');
+
+    const form = useEntityForm<QuizQuestionFormData, QuizQuestion>(
+        {
+            prompt_self: '',
+            prompt_guess: '',
+            options: emptyOptions(),
+            sort_order: '0',
+            is_active: true,
+        },
+        (question) => ({
+            prompt_self: question.prompt_self,
+            prompt_guess: question.prompt_guess,
+            options: question.options.length ? [...question.options] : emptyOptions(),
+            sort_order: String(question.sort_order),
+            is_active: question.is_active,
+        })
+    );
+
+    const fetchData = useCallback(async () => {
+        setLoading(true);
+        try {
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            let query = adminData
+                .from('quiz_questions')
+                .select('*', { count: 'exact' })
+                .order('sort_order', { ascending: true })
+                .range(from, to);
+
+            if (activeFilter === 'active') {
+                query = query.eq('is_active', true);
+            } else if (activeFilter === 'inactive') {
+                query = query.eq('is_active', false);
+            }
+
+            const { data, error, count } = await query;
+            if (error) throw error;
+            setTotalCount(count || 0);
+            setQuestions((data as QuizQuestion[]) || []);
+        } catch (error) {
+            toast.error('Failed to load quiz questions');
+            console.error(error);
+        } finally {
+            setLoading(false);
+        }
+    }, [page, pageSize, activeFilter]);
+
+    useEffect(() => {
+        fetchData();
+    }, [fetchData]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
+    useEffect(() => {
+        setPage(1);
+    }, [activeFilter]);
+
+    // =============================================================================
+    // Option helpers
+    // =============================================================================
+
+    const setOption = (index: number, value: string) => {
+        form.setFields({
+            options: form.formData.options.map((opt, i) => (i === index ? value : opt)),
+        });
+    };
+
+    const addOption = () => {
+        if (form.formData.options.length >= MAX_QUIZ_OPTIONS) return;
+        form.setFields({ options: [...form.formData.options, ''] });
+    };
+
+    const removeOption = (index: number) => {
+        if (form.formData.options.length <= MIN_QUIZ_OPTIONS) return;
+        form.setFields({ options: form.formData.options.filter((_, i) => i !== index) });
+    };
+
+    // =============================================================================
+    // Handlers
+    // =============================================================================
+
+    const handleSave = async () => {
+        const validationError = validateQuizQuestionForm(form.formData);
+        if (validationError) {
+            toast.error(validationError);
+            return;
+        }
+
+        const cleanedOptions = sanitizeQuizOptions(form.formData.options);
+        const parsedSortOrder = Number(form.formData.sort_order);
+        const sortOrder = Number.isFinite(parsedSortOrder) ? parsedSortOrder : 0;
+
+        const payload = {
+            prompt_self: form.formData.prompt_self.trim(),
+            prompt_guess: form.formData.prompt_guess.trim(),
+            options: cleanedOptions,
+            sort_order: sortOrder,
+            is_active: form.formData.is_active,
+        };
+
+        form.setSaving(true);
+        try {
+            if (form.editingItem) {
+                const { error } = await auditedAdminData.update('quiz_questions', form.editingItem.id, payload);
+                if (error) throw error;
+                toast.success('Quiz question updated');
+            } else {
+                const { error } = await auditedAdminData.insert('quiz_questions', payload);
+                if (error) throw error;
+                toast.success('Quiz question created');
+            }
+
+            form.close();
+            fetchData();
+        } catch (error) {
+            toast.error('Failed to save quiz question');
+            console.error(error);
+        } finally {
+            form.setSaving(false);
+        }
+    };
+
+    const handleToggleActive = async (question: QuizQuestion) => {
+        try {
+            const { error } = await auditedAdminData.update('quiz_questions', question.id, {
+                is_active: !question.is_active,
+            });
+            if (error) throw error;
+            toast.success(question.is_active ? 'Quiz question deactivated' : 'Quiz question activated');
+            fetchData();
+        } catch (error) {
+            toast.error('Failed to update quiz question');
+            console.error(error);
+        }
+    };
+
+    if (loading) {
+        return (
+            <div className="space-y-6">
+                <div className="flex items-center justify-between">
+                    <Skeleton className="h-9 w-64" />
+                    <Skeleton className="h-10 w-40" />
+                </div>
+                <Skeleton className="h-96" />
+            </div>
+        );
+    }
+
+    return (
+        <div className="space-y-6">
+            {/* Header */}
+            <div className="flex items-center justify-between">
+                <div>
+                    <h1 className="text-3xl font-bold tracking-tight flex items-center gap-2">
+                        <HelpCircle className="h-8 w-8 text-purple-500" />
+                        Quiz Questions
+                    </h1>
+                    <p className="text-muted-foreground">
+                        {totalCount} question{totalCount !== 1 ? 's' : ''} in the couples quiz pool
+                    </p>
+                </div>
+                <Dialog open={form.dialogOpen} onOpenChange={form.setDialogOpen}>
+                    <DialogTrigger asChild>
+                        <Button onClick={form.openCreate}>
+                            <Plus className="mr-2 h-4 w-4" />
+                            Add Question
+                        </Button>
+                    </DialogTrigger>
+                    <DialogContent className="max-w-2xl">
+                        <DialogHeader>
+                            <DialogTitle>
+                                {form.isEditing ? 'Edit Quiz Question' : 'Add Quiz Question'}
+                            </DialogTitle>
+                            <DialogDescription>
+                                {form.isEditing
+                                    ? 'Update the quiz question details below.'
+                                    : 'Add a new question to the couples quiz pool.'}
+                            </DialogDescription>
+                        </DialogHeader>
+
+                        <div className="space-y-4 py-4">
+                            <div className="space-y-2">
+                                <Label htmlFor="prompt_self">Prompt (about yourself)</Label>
+                                <Textarea
+                                    id="prompt_self"
+                                    value={form.formData.prompt_self}
+                                    onChange={(e) => form.setField('prompt_self', e.target.value)}
+                                    placeholder="e.g., What is your idea of a perfect date night?"
+                                    rows={2}
+                                />
+                                <p className="text-xs text-muted-foreground">
+                                    Shown when a partner answers about themselves.
+                                </p>
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label htmlFor="prompt_guess">Prompt (guessing about partner)</Label>
+                                <Textarea
+                                    id="prompt_guess"
+                                    value={form.formData.prompt_guess}
+                                    onChange={(e) => form.setField('prompt_guess', e.target.value)}
+                                    placeholder="e.g., What is your partner's idea of a perfect date night?"
+                                    rows={2}
+                                />
+                                <p className="text-xs text-muted-foreground">
+                                    Shown when a partner guesses the other partner's answer. Same options, different phrasing.
+                                </p>
+                            </div>
+
+                            <div className="space-y-2">
+                                <div className="flex items-center justify-between">
+                                    <Label>Options ({MIN_QUIZ_OPTIONS}-{MAX_QUIZ_OPTIONS})</Label>
+                                    {form.formData.options.length < MAX_QUIZ_OPTIONS && (
+                                        <Button type="button" variant="outline" size="sm" onClick={addOption}>
+                                            <Plus className="mr-1 h-3 w-3" />
+                                            Add Option
+                                        </Button>
+                                    )}
+                                </div>
+                                <div className="space-y-2">
+                                    {form.formData.options.map((option, index) => (
+                                        <div key={index} className="flex items-center gap-2">
+                                            <Input
+                                                value={option}
+                                                onChange={(e) => setOption(index, e.target.value)}
+                                                placeholder={`Option ${index + 1}`}
+                                            />
+                                            {form.formData.options.length > MIN_QUIZ_OPTIONS && (
+                                                <Button
+                                                    type="button"
+                                                    variant="ghost"
+                                                    size="icon"
+                                                    onClick={() => removeOption(index)}
+                                                    aria-label={`Remove option ${index + 1}`}
+                                                >
+                                                    <X className="h-4 w-4" />
+                                                </Button>
+                                            )}
+                                        </div>
+                                    ))}
+                                </div>
+                                <p className="text-xs text-muted-foreground">
+                                    Both partners choose from the same list of options.
+                                </p>
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label htmlFor="sort_order">Sort Order</Label>
+                                <Input
+                                    id="sort_order"
+                                    type="number"
+                                    value={form.formData.sort_order}
+                                    onChange={(e) => form.setField('sort_order', e.target.value)}
+                                    placeholder="0"
+                                />
+                                <p className="text-xs text-muted-foreground">
+                                    Lower numbers are considered before higher numbers when questions have equal usage history.
+                                </p>
+                            </div>
+
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Active</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Inactive questions are never selected for a new quiz session.
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={form.formData.is_active}
+                                    onCheckedChange={(checked) => form.setField('is_active', checked)}
+                                />
+                            </div>
+                        </div>
+
+                        <DialogFooter>
+                            <Button variant="outline" onClick={form.close}>
+                                Cancel
+                            </Button>
+                            <Button onClick={handleSave} disabled={form.saving}>
+                                {form.saving ? (
+                                    <>
+                                        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                                        Saving...
+                                    </>
+                                ) : (
+                                    'Save'
+                                )}
+                            </Button>
+                        </DialogFooter>
+                    </DialogContent>
+                </Dialog>
+            </div>
+
+            <div className="flex flex-wrap items-center gap-3">
+                <Label className="text-sm text-muted-foreground">Status</Label>
+                <Select value={activeFilter} onValueChange={(value) => setActiveFilter(value as ActiveFilter)}>
+                    <SelectTrigger className="w-48">
+                        <SelectValue placeholder="All questions" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="all">All questions</SelectItem>
+                        <SelectItem value="active">Active only</SelectItem>
+                        <SelectItem value="inactive">Inactive only</SelectItem>
+                    </SelectContent>
+                </Select>
+            </div>
+
+            {/* Quiz Questions Table */}
+            {questions.length === 0 ? (
+                <Card className="flex flex-col items-center justify-center py-12">
+                    <HelpCircle className="h-12 w-12 text-muted-foreground mb-4" />
+                    <h3 className="text-lg font-semibold">No quiz questions yet</h3>
+                    <p className="text-muted-foreground mb-4">
+                        Add questions to build the couples quiz pool
+                    </p>
+                    <Button onClick={form.openCreate}>
+                        <Plus className="mr-2 h-4 w-4" />
+                        Add Question
+                    </Button>
+                </Card>
+            ) : (
+                <div className="rounded-md border">
+                    <Table>
+                        <TableHeader>
+                            <TableRow>
+                                <TableHead className="w-16">Order</TableHead>
+                                <TableHead>Prompt</TableHead>
+                                <TableHead>Options</TableHead>
+                                <TableHead className="w-24">Status</TableHead>
+                                <TableHead className="w-32">Actions</TableHead>
+                            </TableRow>
+                        </TableHeader>
+                        <TableBody>
+                            {questions.map((question) => (
+                                <TableRow key={question.id}>
+                                    <TableCell className="font-medium text-muted-foreground">
+                                        {question.sort_order}
+                                    </TableCell>
+                                    <TableCell>
+                                        <p className="line-clamp-2 font-medium">{question.prompt_self}</p>
+                                        <p className="line-clamp-1 text-xs text-muted-foreground">{question.prompt_guess}</p>
+                                    </TableCell>
+                                    <TableCell>
+                                        <div className="flex flex-wrap gap-1">
+                                            {question.options.map((option, i) => (
+                                                <Badge key={i} variant="outline" className="text-xs">
+                                                    {option}
+                                                </Badge>
+                                            ))}
+                                        </div>
+                                    </TableCell>
+                                    <TableCell>
+                                        <Badge variant={question.is_active ? 'default' : 'secondary'}>
+                                            {question.is_active ? 'Active' : 'Inactive'}
+                                        </Badge>
+                                    </TableCell>
+                                    <TableCell>
+                                        <div className="flex gap-1">
+                                            <Button
+                                                variant="ghost"
+                                                size="icon"
+                                                onClick={() => form.openEdit(question)}
+                                                aria-label="Edit question"
+                                            >
+                                                <Pencil className="h-4 w-4" />
+                                            </Button>
+                                            <Button
+                                                variant="ghost"
+                                                size="icon"
+                                                onClick={() => handleToggleActive(question)}
+                                                aria-label={question.is_active ? 'Deactivate question' : 'Activate question'}
+                                                title={question.is_active ? 'Deactivate' : 'Activate'}
+                                            >
+                                                {question.is_active ? (
+                                                    <EyeOff className="h-4 w-4 text-destructive" />
+                                                ) : (
+                                                    <Eye className="h-4 w-4 text-green-500" />
+                                                )}
+                                            </Button>
+                                        </div>
+                                    </TableCell>
+                                </TableRow>
+                            ))}
+                        </TableBody>
+                    </Table>
+                </div>
+            )}
+
+            {questions.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
+        </div>
+    );
+}
@@ -0,0 +1,200 @@
+import { useState, useEffect, useCallback } from 'react';
+import { Link } from 'react-router-dom';
+import { adminData } from '@/lib/adminApi';
+import { Badge } from '@/components/ui/badge';
+import { Card } from '@/components/ui/card';
+import { Input } from '@/components/ui/input';
+import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from '@/components/ui/table';
+import { Heart, Search, Users, Hourglass } from 'lucide-react';
+import { format } from 'date-fns';
+import { toast } from 'sonner';
+import { buildCoupleSearchFilter, coupleStatusFromMemberCount } from '@/lib/couples';
+
+interface Couple {
+    id: string;
+    invite_code: string;
+    created_at: string;
+}
+
+interface Profile {
+    id: string;
+    name: string | null;
+    email: string | null;
+    couple_id: string | null;
+}
+
+export function CouplesPage() {
+    const [couples, setCouples] = useState<Couple[]>([]);
+    const [membersByCouple, setMembersByCouple] = useState<Record<string, Profile[]>>({});
+    const [loading, setLoading] = useState(true);
+    const [search, setSearch] = useState('');
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
+    const [total, setTotal] = useState(0);
+
+    const fetchCouples = useCallback(async () => {
+        setLoading(true);
+        try {
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            let query = adminData
+                .from<Couple>('couples')
+                .select('id, invite_code, created_at', { count: 'exact' })
+                .order('created_at', { ascending: false })
+                .range(from, to);
+
+            const filter = buildCoupleSearchFilter(search);
+            if (filter) {
+                query = filter.op === 'eq' ? query.eq(filter.column, filter.value) : query.ilike(filter.column, filter.value);
+            }
+
+            const { data, error, count } = await query;
+            if (error) throw error;
+
+            const rows = data || [];
+            setCouples(rows);
+            setTotal(count || 0);
+
+            const coupleIds = rows.map((row) => row.id);
+            if (coupleIds.length > 0) {
+                const { data: profiles } = await adminData
+                    .from<Profile>('profiles')
+                    .select('id, name, email, couple_id')
+                    .in('couple_id', coupleIds);
+                const grouped: Record<string, Profile[]> = {};
+                (profiles || []).forEach((profile) => {
+                    if (!profile.couple_id) return;
+                    (grouped[profile.couple_id] ??= []).push(profile);
+                });
+                setMembersByCouple(grouped);
+            } else {
+                setMembersByCouple({});
+            }
+        } catch (error) {
+            console.error('Failed to load couples:', error);
+            toast.error('Failed to load couples');
+        } finally {
+            setLoading(false);
+        }
+    }, [page, pageSize, search]);
+
+    useEffect(() => { fetchCouples(); }, [fetchCouples]);
+    useEffect(() => { setPage(1); }, [search]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(total / pageSize));
+        if (page > totalPages) setPage(totalPages);
+    }, [page, pageSize, total]);
+
+    return (
+        <div className="space-y-6">
+            <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+                <div>
+                    <h1 className="text-3xl font-bold tracking-tight flex items-center gap-2">
+                        <Heart className="h-8 w-8 text-primary" />
+                        Couples
+                    </h1>
+                    <p className="text-muted-foreground">
+                        Look up an invite funnel by invite code or couple id
+                    </p>
+                </div>
+                <div className="relative w-full sm:w-72">
+                    <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+                    <Input
+                        placeholder="Search invite code or couple id..."
+                        value={search}
+                        onChange={(e) => setSearch(e.target.value)}
+                        className="pl-9"
+                    />
+                </div>
+            </div>
+
+            <Card>
+                <Table>
+                    <TableHeader>
+                        <TableRow>
+                            <TableHead>Invite Code</TableHead>
+                            <TableHead>Members</TableHead>
+                            <TableHead>Status</TableHead>
+                            <TableHead>Created</TableHead>
+                        </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                        {loading ? (
+                            <TableRow>
+                                <TableCell colSpan={4} className="text-center py-8">
+                                    <div className="flex justify-center"><Skeleton className="h-6 w-32" /></div>
+                                </TableCell>
+                            </TableRow>
+                        ) : couples.length === 0 ? (
+                            <TableRow>
+                                <TableCell colSpan={4} className="text-center py-8 text-muted-foreground">
+                                    {search ? 'No couples found matching your search.' : 'No couples yet.'}
+                                </TableCell>
+                            </TableRow>
+                        ) : (
+                            couples.map((couple) => {
+                                const members = membersByCouple[couple.id] || [];
+                                const status = coupleStatusFromMemberCount(members.length);
+                                return (
+                                    <TableRow key={couple.id}>
+                                        <TableCell className="font-mono">{couple.invite_code}</TableCell>
+                                        <TableCell>
+                                            {members.length === 0 ? (
+                                                <span className="text-muted-foreground text-sm">No members</span>
+                                            ) : (
+                                                <div className="flex flex-col gap-1">
+                                                    {members.map((member) => (
+                                                        <Link key={member.id} to={`/users/${member.id}`} className="text-primary hover:underline text-sm">
+                                                            {member.name || member.email || member.id}
+                                                        </Link>
+                                                    ))}
+                                                </div>
+                                            )}
+                                        </TableCell>
+                                        <TableCell>
+                                            {status === 'paired' ? (
+                                                <Badge variant="secondary" className="bg-green-100 text-green-700 hover:bg-green-200">
+                                                    <Users className="h-3 w-3 mr-1" />
+                                                    Paired
+                                                </Badge>
+                                            ) : (
+                                                <Badge variant="secondary" className="bg-amber-100 text-amber-700 hover:bg-amber-200">
+                                                    <Hourglass className="h-3 w-3 mr-1" />
+                                                    Pending
+                                                </Badge>
+                                            )}
+                                        </TableCell>
+                                        <TableCell className="text-sm text-muted-foreground">
+                                            {format(new Date(couple.created_at), 'MMM d, yyyy')}
+                                        </TableCell>
+                                    </TableRow>
+                                );
+                            })
+                        )}
+                    </TableBody>
+                </Table>
+            </Card>
+
+            {total > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={total}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => { setPage(1); setPageSize(size); }}
+                />
+            )}
+        </div>
+    );
+}
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback, useRef } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { useParams, Link } from 'react-router-dom';
 import { adminData, adminRequest, adminBinaryRequest } from '@/lib/adminApi';
 import { useRealtimeSubscription } from '@/hooks/useRealtimeSubscription';
@@ -37,12 +37,14 @@ import {
    SelectTrigger,
    SelectValue,
 } from '@/components/ui/select';
-import { Crown, Users, MessageCircle, ChevronRight, Gift, Image, Video as VideoIcon, Target, User, Eye, EyeOff, CheckCircle, Package, Sparkles, Flame, Trophy, Calendar, AlertCircle, Clock, Pencil } from 'lucide-react';
+import { Crown, Users, MessageCircle, ChevronRight, Gift, Image, Video as VideoIcon, Target, User, Eye, EyeOff, CheckCircle, Package, Sparkles, Flame, Trophy, Calendar, AlertCircle, Clock, Pencil, CreditCard, Bell, Globe, BadgeCheck, HelpCircle, Swords } from 'lucide-react';
 import { format } from 'date-fns';
 import { IconPreview } from '@/components/ui/icon-picker';
 import type { AnswerType, QuestionType } from '@sauci/shared';
 import { ResponseAnswer } from '@/components/content/ResponseAnswer';
 import { MATCH_TYPE_LABELS, type AdminResponseData } from '@/lib/questionResponses';
+import { StrokeCanvas, type StrokeSegment } from '@/components/content/StrokeCanvas';
+import { SENT_DARE_STATUS_LABELS, type SentDareStatus } from '@/lib/sentDares';

 type UsageReason = 'improve_communication' | 'spice_up_intimacy' | 'deeper_connection' | 'have_fun' | 'strengthen_relationship';
 type Gender = 'male' | 'female' | 'non-binary' | 'prefer-not-to-say';
@@ -61,6 +63,7 @@ interface Profile {
    usage_reason: UsageReason | null;
    hide_nsfw: boolean | null;
    onboarding_completed: boolean | null;
+    timezone: string | null;
 }

 const usageReasonLabels: Record<UsageReason, { label: string; icon: string }> = {
@@ -158,11 +161,72 @@ interface CoupleStreak {
    current_streak: number;
    longest_streak: number;
    last_active_date: string | null;
+    last_completed_date: string | null;
    last_milestone_celebrated: number | null;
    created_at: string;
    updated_at: string;
 }

+interface NotificationPreferences {
+    matches_enabled: boolean;
+    messages_enabled: boolean;
+    partner_activity_enabled: boolean;
+    nudges_enabled: boolean;
+    pack_changes_enabled: boolean;
+    new_packs_enabled: boolean;
+    streak_milestones_enabled: boolean;
+    streak_reminders_enabled: boolean;
+    weekly_summary_enabled: boolean;
+    unpaired_reminders_enabled: boolean;
+    catchup_reminders_enabled: boolean;
+    dares_enabled: boolean;
+}
+
+const notificationPreferenceLabels: Record<keyof NotificationPreferences, string> = {
+    matches_enabled: 'Matches',
+    messages_enabled: 'Messages',
+    partner_activity_enabled: 'Partner activity',
+    nudges_enabled: 'Nudges',
+    pack_changes_enabled: 'Pack changes',
+    new_packs_enabled: 'New packs',
+    streak_milestones_enabled: 'Streak milestones',
+    streak_reminders_enabled: 'Streak reminders',
+    weekly_summary_enabled: 'Weekly summary',
+    unpaired_reminders_enabled: 'Unpaired reminders',
+    catchup_reminders_enabled: 'Catch-up reminders',
+    dares_enabled: 'Dares',
+};
+
+interface Subscription {
+    id: string;
+    store: string;
+    product_id: string;
+    status: string;
+    entitlement_ids: string[];
+    purchased_at: string;
+    expires_at: string | null;
+    revenuecat_app_user_id: string;
+}
+
+interface QuizSession {
+    id: string;
+    status: string;
+    score_percent: number | null;
+    completed_at: string | null;
+    created_at: string;
+}
+
+interface SentDare {
+    id: string;
+    dare_text_snapshot: string;
+    custom_dare_text: string | null;
+    sender_id: string;
+    recipient_id: string;
+    status: string;
+    sent_at: string;
+    expires_at: string | null;
+}
+
 const matchTypeLabels = {
    yes_yes: 'Both Yes!',
    yes_maybe: 'Yes + Maybe',
@@ -269,25 +333,7 @@ function AdminDecryptedVideo({ messageId }: { messageId: string }) {
    return <video src={url} controls className="w-full h-full object-cover" preload="metadata" />;
 }

-interface StrokePoint {
-    x: number;
-    y: number;
-}
-
-interface StrokeSegment {
-    id: string;
-    userId: string;
-    points: StrokePoint[];
-    color: string;
-    width: number;
-    timestamp: number;
-    isEraser: boolean;
-}
-
-const CANVAS_BACKGROUND = '#1a1a2e';
-
 function LiveDrawCanvas({ coupleId }: { coupleId: string }) {
-    const canvasRef = useRef<HTMLCanvasElement>(null);
    const [strokes, setStrokes] = useState<StrokeSegment[]>([]);
    const [loading, setLoading] = useState(true);
    const [error, setError] = useState<string | null>(null);
@@ -322,56 +368,6 @@ function LiveDrawCanvas({ coupleId }: { coupleId: string }) {
        };
    }, [coupleId]);

-    // Render strokes to canvas
-    useEffect(() => {
-        const canvas = canvasRef.current;
-        if (!canvas) return;
-        const ctx = canvas.getContext('2d');
-        if (!ctx) return;
-
-        const dpr = window.devicePixelRatio || 1;
-        const w = canvas.clientWidth;
-        const h = canvas.clientHeight;
-        canvas.width = w * dpr;
-        canvas.height = h * dpr;
-        ctx.scale(dpr, dpr);
-
-        ctx.fillStyle = CANVAS_BACKGROUND;
-        ctx.fillRect(0, 0, w, h);
-
-        for (const stroke of strokes) {
-            if (stroke.points.length === 0) continue;
-            ctx.strokeStyle = stroke.isEraser ? CANVAS_BACKGROUND : stroke.color;
-            ctx.lineWidth = stroke.width;
-            ctx.lineCap = 'round';
-            ctx.lineJoin = 'round';
-            ctx.beginPath();
-
-            const first = stroke.points[0];
-            ctx.moveTo(first.x * w, first.y * h);
-
-            if (stroke.points.length === 1) {
-                ctx.lineTo(first.x * w + 0.1, first.y * h + 0.1);
-            } else {
-                for (let i = 1; i < stroke.points.length; i++) {
-                    const prev = stroke.points[i - 1];
-                    const curr = stroke.points[i];
-                    const midX = ((prev.x + curr.x) / 2) * w;
-                    const midY = ((prev.y + curr.y) / 2) * h;
-
-                    if (i === 1) {
-                        ctx.lineTo(midX, midY);
-                    } else {
-                        ctx.quadraticCurveTo(prev.x * w, prev.y * h, midX, midY);
-                    }
-                }
-                const last = stroke.points[stroke.points.length - 1];
-                ctx.lineTo(last.x * w, last.y * h);
-            }
-            ctx.stroke();
-        }
-    }, [strokes]);
-
    if (loading) return <Skeleton className="h-64 w-full" />;
    if (error) return <div className="text-sm text-red-500">Failed to load drawing: {error}</div>;

@@ -384,13 +380,8 @@ function LiveDrawCanvas({ coupleId }: { coupleId: string }) {
                </Card>
            ) : (
                <>
-                    <div className="rounded-xl overflow-hidden border" style={{ background: CANVAS_BACKGROUND }}>
-                        <canvas
-                            ref={canvasRef}
-                            style={{ width: '100%', aspectRatio: '4/3', display: 'block' }}
-                        />
-                    </div>
-                    <p className="text-xs text-muted-foreground">{strokes.length} stroke{strokes.length !== 1 ? 's' : ''} — updates in real-time</p>
+                    <StrokeCanvas strokes={strokes} />
+                    <p className="text-xs text-muted-foreground">{strokes.length} stroke{strokes.length !== 1 ? 's' : ''} - updates in real-time</p>
                </>
            )}
        </div>
@@ -424,6 +415,10 @@ export function UserDetailPage() {
    const [mediaPage, setMediaPage] = useState(1);
    const [mediaPageSize, setMediaPageSize] = useState(12);
    const [mediaTotal, setMediaTotal] = useState(0);
+    const [subscriptions, setSubscriptions] = useState<Subscription[]>([]);
+    const [notificationPrefs, setNotificationPrefs] = useState<NotificationPreferences | null>(null);
+    const [quizSessions, setQuizSessions] = useState<QuizSession[]>([]);
+    const [sentDares, setSentDares] = useState<SentDare[]>([]);
    const [loading, setLoading] = useState(true);

    const canViewResponses = hasPermission(PERMISSION_KEYS.VIEW_RESPONSES);
@@ -492,6 +487,39 @@ export function UserDetailPage() {
                .order('created_at', { ascending: false });
            setFeatureInterests((featureInterestsData || []) as FeatureInterest[]);

+            // Fetch purchase history so support can see what was bought and when it lapses,
+            // instead of only the profile's is_premium boolean.
+            const { data: subscriptionsData } = await adminData
+                .from('subscriptions')
+                .select('id, store, product_id, status, entitlement_ids, purchased_at, expires_at, revenuecat_app_user_id')
+                .eq('user_id', userId)
+                .order('purchased_at', { ascending: false });
+            setSubscriptions((subscriptionsData || []) as Subscription[]);
+
+            // Fetch notification preferences (read-only visibility for support).
+            const { data: notificationPrefsData } = await adminData
+                .from('notification_preferences')
+                .select('*')
+                .eq('user_id', userId)
+                .maybeSingle();
+            setNotificationPrefs(notificationPrefsData);
+
+            // Fetch recent dares sent by or to this user (sent_dares has no OR support
+            // in the admin query builder, so this issues two filtered queries and merges).
+            const [sentByUser, sentToUser] = await Promise.all([
+                adminData.from('sent_dares')
+                    .select('id, dare_text_snapshot, custom_dare_text, sender_id, recipient_id, status, sent_at, expires_at')
+                    .eq('sender_id', userId).order('sent_at', { ascending: false }).limit(10),
+                adminData.from('sent_dares')
+                    .select('id, dare_text_snapshot, custom_dare_text, sender_id, recipient_id, status, sent_at, expires_at')
+                    .eq('recipient_id', userId).order('sent_at', { ascending: false }).limit(10),
+            ]);
+            const daresById = new Map<string, SentDare>();
+            for (const row of [...(sentByUser.data || []), ...(sentToUser.data || [])] as SentDare[]) {
+                daresById.set(row.id, row);
+            }
+            setSentDares([...daresById.values()].sort((a, b) => new Date(b.sent_at).getTime() - new Date(a.sent_at).getTime()).slice(0, 10));
+
            if (profileData?.couple_id) {
                const { data: partnerData } = await adminData.from('profiles').select('id, name').eq('couple_id', profileData.couple_id).neq('id', userId).single();
                setPartner(partnerData);
@@ -503,9 +531,20 @@ export function UserDetailPage() {
                    .eq('couple_id', profileData.couple_id)
                    .maybeSingle();
                setStreak(streakData);
+
+                // Fetch recent quiz sessions for the couple (quiz_sessions has no user_id
+                // column; sessions belong to the couple both partners share).
+                const { data: quizSessionsData } = await adminData
+                    .from('quiz_sessions')
+                    .select('id, status, score_percent, completed_at, created_at')
+                    .eq('couple_id', profileData.couple_id)
+                    .order('created_at', { ascending: false })
+                    .limit(10);
+                setQuizSessions((quizSessionsData || []) as QuizSession[]);
            } else {
                setPartner(null);
                setStreak(null);
+                setQuizSessions([]);
            }

            const responsesFrom = (responsesPage - 1) * responsesPageSize;
@@ -789,12 +828,59 @@ export function UserDetailPage() {
                    </div>
                </div>
            </div></CardContent></Card>
+            {/* Subscriptions */}
+            {subscriptions.length > 0 && (
+                <Card>
+                    <CardHeader className="pb-3">
+                        <CardTitle className="text-lg flex items-center gap-2">
+                            <CreditCard className="h-5 w-5 text-primary" />
+                            Subscriptions
+                        </CardTitle>
+                        <CardDescription>Purchase history from the store, independent of the is_premium flag</CardDescription>
+                    </CardHeader>
+                    <CardContent>
+                        <div className="rounded-md border">
+                            <Table>
+                                <TableHeader>
+                                    <TableRow>
+                                        <TableHead>Store</TableHead>
+                                        <TableHead>Product</TableHead>
+                                        <TableHead>Status</TableHead>
+                                        <TableHead>Entitlements</TableHead>
+                                        <TableHead>Purchased</TableHead>
+                                        <TableHead>Expires</TableHead>
+                                        <TableHead>RevenueCat User</TableHead>
+                                    </TableRow>
+                                </TableHeader>
+                                <TableBody>
+                                    {subscriptions.map((subscription) => (
+                                        <TableRow key={subscription.id}>
+                                            <TableCell className="capitalize">{subscription.store.toLowerCase().replace('_', ' ')}</TableCell>
+                                            <TableCell className="font-mono text-xs">{subscription.product_id}</TableCell>
+                                            <TableCell>
+                                                <Badge variant={subscription.status === 'active' ? 'default' : subscription.status === 'billing_issue' ? 'destructive' : 'secondary'} className="capitalize">
+                                                    {subscription.status.replace('_', ' ')}
+                                                </Badge>
+                                            </TableCell>
+                                            <TableCell className="text-xs text-muted-foreground">{subscription.entitlement_ids.join(', ') || '-'}</TableCell>
+                                            <TableCell className="text-sm">{format(new Date(subscription.purchased_at), 'MMM d, yyyy')}</TableCell>
+                                            <TableCell className="text-sm">{subscription.expires_at ? format(new Date(subscription.expires_at), 'MMM d, yyyy') : 'Never'}</TableCell>
+                                            <TableCell className="font-mono text-xs text-muted-foreground">{subscription.revenuecat_app_user_id}</TableCell>
+                                        </TableRow>
+                                    ))}
+                                </TableBody>
+                            </Table>
+                        </div>
+                    </CardContent>
+                </Card>
+            )}
            {/* Onboarding Details */}
            <Card><CardHeader className="pb-3"><CardTitle className="text-lg flex items-center gap-2"><CheckCircle className="h-5 w-5 text-primary" />Onboarding Details</CardTitle><CardDescription>Information collected during user onboarding</CardDescription></CardHeader><CardContent><div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
                <div className="flex items-start gap-3"><div className="p-2 rounded-lg bg-blue-100 dark:bg-blue-900"><User className="h-4 w-4 text-blue-600 dark:text-blue-400" /></div><div><p className="text-sm font-medium text-muted-foreground">Gender</p><p className="font-medium">{profile.gender ? genderLabels[profile.gender] : 'Not set'}</p></div></div>
                <div className="flex items-start gap-3"><div className="p-2 rounded-lg bg-purple-100 dark:bg-purple-900"><Target className="h-4 w-4 text-purple-600 dark:text-purple-400" /></div><div><p className="text-sm font-medium text-muted-foreground">Why using Sauci</p><p className="font-medium">{profile.usage_reason ? usageReasonLabels[profile.usage_reason]?.label : 'Not set'}</p></div></div>
                <div className="flex items-start gap-3"><div className={`p-2 rounded-lg ${profile.hide_nsfw ? 'bg-gray-100 dark:bg-gray-800' : 'bg-amber-100 dark:bg-amber-900'}`}>{profile.hide_nsfw ? <EyeOff className="h-4 w-4 text-gray-500 dark:text-gray-400" /> : <Eye className="h-4 w-4 text-amber-600 dark:text-amber-400" />}</div><div><p className="text-sm font-medium text-muted-foreground">Hide NSFW</p><p className="font-medium">{profile.hide_nsfw === null ? 'Not set' : profile.hide_nsfw ? 'Yes' : 'No'}</p></div></div>
                <div className="flex items-start gap-3"><div className={`p-2 rounded-lg ${profile.onboarding_completed ? 'bg-green-100 dark:bg-green-900' : 'bg-red-100 dark:bg-red-900'}`}><CheckCircle className={`h-4 w-4 ${profile.onboarding_completed ? 'text-green-600 dark:text-green-400' : 'text-red-500 dark:text-red-400'}`} /></div><div><p className="text-sm font-medium text-muted-foreground">Onboarding</p><p className="font-medium">{profile.onboarding_completed ? 'Completed' : 'Not completed'}</p></div></div>
+                <div className="flex items-start gap-3"><div className="p-2 rounded-lg bg-teal-100 dark:bg-teal-900"><Globe className="h-4 w-4 text-teal-600 dark:text-teal-400" /></div><div><p className="text-sm font-medium text-muted-foreground">Timezone</p><p className="font-medium">{profile.timezone || 'Not reported (UTC fallback)'}</p></div></div>
            </div></CardContent></Card>
            {/* Streak Info */}
            {profile.couple_id && streak && (
@@ -835,6 +921,16 @@ export function UserDetailPage() {
                                    <p className="font-medium">{streak.last_active_date ? format(new Date(streak.last_active_date), 'MMM d, yyyy') : 'Never'}</p>
                                </div>
                            </div>
+                            <div className="flex items-start gap-3">
+                                <div className="p-2 rounded-lg bg-green-100 dark:bg-green-900">
+                                    <BadgeCheck className="h-4 w-4 text-green-600 dark:text-green-400" />
+                                </div>
+                                <div>
+                                    <p className="text-sm font-medium text-muted-foreground">Last Completed (both partners)</p>
+                                    <p className="font-medium">{streak.last_completed_date ? format(new Date(streak.last_completed_date), 'MMM d, yyyy') : 'Never'}</p>
+                                    <p className="text-xs text-muted-foreground">Determines whether the streak is alive today or tomorrow</p>
+                                </div>
+                            </div>
                            <div className="flex items-start gap-3">
                                <div className="p-2 rounded-lg bg-purple-100 dark:bg-purple-900">
                                    <Sparkles className="h-4 w-4 text-purple-600 dark:text-purple-400" />
@@ -848,6 +944,28 @@ export function UserDetailPage() {
                    </CardContent>
                </Card>
            )}
+            {/* Notification Preferences */}
+            {notificationPrefs && (
+                <Card>
+                    <CardHeader className="pb-3">
+                        <CardTitle className="text-lg flex items-center gap-2">
+                            <Bell className="h-5 w-5 text-primary" />
+                            Notification Preferences
+                        </CardTitle>
+                        <CardDescription>Read-only. Configured by the user in the mobile app</CardDescription>
+                    </CardHeader>
+                    <CardContent>
+                        <div className="flex flex-wrap gap-2">
+                            {(Object.keys(notificationPreferenceLabels) as Array<keyof NotificationPreferences>).map((key) => (
+                                <Badge key={key} variant={notificationPrefs[key] ? 'default' : 'secondary'} className="gap-1">
+                                    {notificationPrefs[key] ? <CheckCircle className="h-3 w-3" /> : <AlertCircle className="h-3 w-3" />}
+                                    {notificationPreferenceLabels[key]}
+                                </Badge>
+                            ))}
+                        </div>
+                    </CardContent>
+                </Card>
+            )}
            {/* Feature Opt-Ins */}
            {featureInterests.length > 0 && (
                <Card>
@@ -872,6 +990,83 @@ export function UserDetailPage() {
                    </CardContent>
                </Card>
            )}
+            {/* Quiz Sessions */}
+            {quizSessions.length > 0 && (
+                <Card>
+                    <CardHeader className="pb-3">
+                        <CardTitle className="text-lg flex items-center gap-2">
+                            <HelpCircle className="h-5 w-5 text-primary" />
+                            Couples Quiz Sessions
+                        </CardTitle>
+                        <CardDescription>Recent quiz sessions for this couple</CardDescription>
+                    </CardHeader>
+                    <CardContent>
+                        <div className="rounded-md border">
+                            <Table>
+                                <TableHeader>
+                                    <TableRow>
+                                        <TableHead>Status</TableHead>
+                                        <TableHead>Score</TableHead>
+                                        <TableHead>Started</TableHead>
+                                        <TableHead>Completed</TableHead>
+                                    </TableRow>
+                                </TableHeader>
+                                <TableBody>
+                                    {quizSessions.map((session) => (
+                                        <TableRow key={session.id}>
+                                            <TableCell>
+                                                <Badge variant={session.status === 'completed' ? 'default' : 'secondary'} className="capitalize">{session.status}</Badge>
+                                            </TableCell>
+                                            <TableCell>{session.score_percent !== null ? `${session.score_percent}%` : '-'}</TableCell>
+                                            <TableCell className="text-sm text-muted-foreground">{format(new Date(session.created_at), 'MMM d, yyyy')}</TableCell>
+                                            <TableCell className="text-sm text-muted-foreground">{session.completed_at ? format(new Date(session.completed_at), 'MMM d, yyyy') : '-'}</TableCell>
+                                        </TableRow>
+                                    ))}
+                                </TableBody>
+                            </Table>
+                        </div>
+                    </CardContent>
+                </Card>
+            )}
+            {/* Recent Dares */}
+            {sentDares.length > 0 && (
+                <Card>
+                    <CardHeader className="pb-3">
+                        <CardTitle className="text-lg flex items-center gap-2">
+                            <Swords className="h-5 w-5 text-primary" />
+                            Recent Dares
+                        </CardTitle>
+                        <CardDescription>Dares this user sent or received. See the Sent Dares page for the full loop and messages</CardDescription>
+                    </CardHeader>
+                    <CardContent>
+                        <div className="rounded-md border">
+                            <Table>
+                                <TableHeader>
+                                    <TableRow>
+                                        <TableHead>Dare</TableHead>
+                                        <TableHead>Direction</TableHead>
+                                        <TableHead>Status</TableHead>
+                                        <TableHead>Sent</TableHead>
+                                    </TableRow>
+                                </TableHeader>
+                                <TableBody>
+                                    {sentDares.map((dare) => {
+                                        const statusInfo = SENT_DARE_STATUS_LABELS[dare.status as SentDareStatus];
+                                        return (
+                                            <TableRow key={dare.id}>
+                                                <TableCell className="max-w-md line-clamp-2">{dare.custom_dare_text || dare.dare_text_snapshot}</TableCell>
+                                                <TableCell className="text-sm text-muted-foreground">{dare.sender_id === userId ? 'Sent' : 'Received'}</TableCell>
+                                                <TableCell><Badge variant={statusInfo?.variant ?? 'secondary'} className="capitalize">{statusInfo?.label ?? dare.status}</Badge></TableCell>
+                                                <TableCell className="text-sm text-muted-foreground">{format(new Date(dare.sent_at), 'MMM d, yyyy')}</TableCell>
+                                            </TableRow>
+                                        );
+                                    })}
+                                </TableBody>
+                            </Table>
+                        </div>
+                    </CardContent>
+                </Card>
+            )}
            {/* Tabs */}
            <Tabs defaultValue={canViewResponses ? "responses" : canViewMatches ? "matches" : canViewMedia ? "media" : "responses"}>
                <TabsList>
@@ -25,6 +25,14 @@ export default defineConfig({
        host: true,
        port: 3001,
        allowedHosts: ['manage.sauci.app'],
+        // The API has no CORS handling, so local development serves API calls
+        // same-origin and forwards them to the local API process.
+        proxy: {
+            '/v1': {
+                target: process.env.SAUCI_ADMIN_API_PROXY ?? 'http://127.0.0.1:3003',
+                changeOrigin: true,
+            },
+        },
        watch: {
            usePolling: true,
            interval: 100,
@@ -0,0 +1,25 @@
+-- Unpaired users previously hit a waiting room with no way to answer questions,
+-- because responses.couple_id was NOT NULL. This migration relaxes that column so
+-- a solo user can bank "sealed" answers before they have a couple. The foreign key
+-- and ON DELETE CASCADE are unchanged for non-null values: once a couple is deleted,
+-- the responses that belonged to it are still removed with it. Sealed answers keep
+-- couple_id NULL until claimed by the application at pairing time, so couple deletion
+-- has no effect on them; they are not tied to any couple's lifecycle until claimed.
+ALTER TABLE "responses" ALTER COLUMN "couple_id" DROP NOT NULL;
+--> statement-breakpoint
+-- A sealed answer (couple_id IS NULL) has no couple to digest a match notification
+-- for yet; the partner digest only makes sense once claim-on-pair assigns the
+-- response to a couple, at which point the claim path computes matches directly.
+CREATE OR REPLACE FUNCTION queue_response_digest() RETURNS trigger LANGUAGE plpgsql AS $$
+BEGIN
+  IF current_setting('sauci.suppress_operations',true)='on' THEN RETURN NEW; END IF;
+  IF NEW.couple_id IS NULL THEN RETURN NEW; END IF;
+  INSERT INTO pending_match_notifications(couple_id, active_user_id, notify_at)
+  VALUES(NEW.couple_id, NEW.user_id, now() + interval '5 minutes')
+  ON CONFLICT(couple_id) DO UPDATE SET
+    active_user_id=excluded.active_user_id,
+    response_count=pending_match_notifications.response_count+1,
+    notify_at=excluded.notify_at,
+    updated_at=now();
+  RETURN NEW;
+END $$;
@@ -148,6 +148,20 @@
      "when": 1788168060000,
      "tag": "0020_quiz_question_pool",
      "breakpoints": true
+    },
+    {
+      "idx": 21,
+      "version": "7",
+      "when": 1788168090000,
+      "tag": "0021_dare_proof",
+      "breakpoints": true
+    },
+    {
+      "idx": 22,
+      "version": "7",
+      "when": 1788168150000,
+      "tag": "0022_solo_sealed_answers",
+      "breakpoints": true
    }
  ]
-}
+}
@@ -1,5 +1,6 @@
 import type { ApiErrorResponse, MeResponse } from '@sauci/shared';
 import { Hono } from 'hono';
+import { cors } from 'hono/cors';
 import { z } from 'zod';
 import { bearerToken, type AuthIdentity, type AuthVerifier } from './auth.js';
 import type { ApiRepository } from './db/repository.js';
@@ -36,6 +37,7 @@ type Variables = { identity: AuthIdentity };
 export interface AppDependencies {
  auth: AuthVerifier;
  repository: ApiRepository;
+  corsAllowedOrigins?: string[];
  coupleService?: CoupleService;
  packsRepository?: PacksRepository;
  answersRepository?: AnswersRepository;
@@ -61,6 +63,15 @@ function error(code: string, message: string): ApiErrorResponse {
 export function createApp(deps: AppDependencies): Hono<{ Variables: Variables }> {
  const app = new Hono<{ Variables: Variables }>();

+  const corsAllowedOrigins = new Set(deps.corsAllowedOrigins ?? ['https://sauci.app']);
+  // The public web redemption form calls the API from a distinct browser origin.
+  // API authentication remains bearer-token based, so this does not grant cross-origin access to protected data.
+  app.use('*', cors({
+    origin: (origin) => corsAllowedOrigins.has(origin) ? origin : null,
+    allowMethods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
+    allowHeaders: ['Content-Type', 'Authorization'],
+  }));
+
  app.use('*', async (c, next) => {
    const startedAt = performance.now();
    try {
@@ -2,10 +2,30 @@ import { z } from 'zod';

 const optionalString = z.preprocess((value) => value === '' ? undefined : value, z.string().min(1).optional());
 const optionalUuid = z.preprocess((value) => value === '' ? undefined : value, z.string().uuid().optional());
+const corsOrigins = z.string().default('https://sauci.app').transform((value, ctx) => {
+  const origins = value.split(',').map((origin) => origin.trim()).filter(Boolean);
+  if (origins.length === 0) {
+    ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'CORS_ALLOWED_ORIGINS must contain at least one origin' });
+    return z.NEVER;
+  }
+  for (const origin of origins) {
+    try {
+      const parsed = new URL(origin);
+      if (parsed.origin !== origin || parsed.username || parsed.password || parsed.pathname !== '/') {
+        throw new Error('not an origin');
+      }
+    } catch {
+      ctx.addIssue({ code: z.ZodIssueCode.custom, message: `Invalid CORS origin: ${origin}` });
+      return z.NEVER;
+    }
+  }
+  return origins;
+});

 const baseSchema = z.object({
  NODE_ENV: z.enum(['development', 'test', 'production']).default('development'),
  PORT: z.coerce.number().int().min(1).max(65535).default(3003),
+  CORS_ALLOWED_ORIGINS: corsOrigins,
  DATABASE_URL: z.string().url(),
  DATABASE_POOL_MAX: z.coerce.number().int().min(1).max(200).default(10),
  DATABASE_POOL_IDLE_TIMEOUT_MS: z.coerce.number().int().min(0).max(3_600_000).default(30_000),
@@ -30,6 +50,7 @@ const baseSchema = z.object({
 export interface AppConfig {
  nodeEnv: 'development' | 'test' | 'production';
  port: number;
+  corsAllowedOrigins: string[];
  databaseUrl: string;
  databasePool: { max: number; idleTimeoutMillis: number; connectionTimeoutMillis: number };
  authIssuer: string;
@@ -84,6 +105,7 @@ export function loadConfig(env: NodeJS.ProcessEnv = process.env): AppConfig {
  return {
    nodeEnv: parsed.NODE_ENV,
    port: parsed.PORT,
+    corsAllowedOrigins: parsed.CORS_ALLOWED_ORIGINS,
    databaseUrl: parsed.DATABASE_URL,
    databasePool: {
      max: parsed.DATABASE_POOL_MAX,
@@ -32,6 +32,7 @@ function toProfile(row: ProfileRow): MobileCompatibleProfile {
    is_premium: row.isPremium,
    couple_id: row.coupleId,
    gender: row.gender,
+    usage_reason: row.usageReason,
    show_explicit_content: row.showExplicitContent,
    max_intensity: row.maxIntensity as 1 | 2 | 3 | 4 | 5,
    created_at: row.createdAt.toISOString(),
@@ -10,6 +10,9 @@ export const profiles = pgTable('profiles', {
  isPremium: boolean('is_premium').notNull().default(false),
  coupleId: uuid('couple_id'),
  gender: text('gender').$type<'male' | 'female' | 'non-binary' | 'prefer-not-to-say' | null>(),
+  usageReason: text('usage_reason').$type<
+    'improve_communication' | 'reconnect' | 'spice_up_intimacy' | 'deeper_connection' | 'have_fun' | 'strengthen_relationship' | null
+  >(),
  showExplicitContent: boolean('show_explicit_content').notNull().default(true),
  maxIntensity: integer('max_intensity').notNull().default(5),
  publicKeyJwk: jsonb('public_key_jwk').$type<Record<string, unknown> | null>(),
@@ -35,6 +35,12 @@ const resources: Record<string, ResourceRule> = {
  media_objects: { read: 'view_media' },
  dare_packs: { read: 'manage_packs', write: 'manage_packs' },
  dares: { read: 'manage_questions', write: 'manage_questions' },
+  quiz_questions: { read: ['manage_questions', 'view_activity', 'view_users'], write: 'manage_questions' },
+  quiz_sessions: { read: ['view_users', 'view_activity'] },
+  quiz_answers: { read: ['view_users', 'view_activity'] },
+  sent_dares: { read: ['view_users', 'view_activity', 'view_chats'] },
+  dare_messages: { read: ['view_chats', 'view_activity'] },
+  notification_preferences: { read: 'view_users', idColumn: 'user_id' },
 };

 function identifier(value: string): string {
@@ -42,7 +42,7 @@ export interface AnswersRepository {
  pending(userId: string, direction: 'mine' | 'partner', startQuestionId?: string): Promise<Array<{ id: string; question: QuestionRow & { pack: { id: string; name: string; icon: string | null } }; partnerAnsweredAt: string }>>;
  answerGap(userId: string): Promise<{ unanswered_by_partner: number; threshold: number; is_blocked: boolean }>;
  dailyLimit(userId: string): Promise<{ responses_today: number; limit_value: number; remaining: number; reset_at: string | null; is_blocked: boolean }>;
-  submit(userId: string, input: SubmitInput): Promise<{ response: ResponseRow; match: (MatchRow & { question: QuestionRow }) | null }>;
+  submit(userId: string, input: SubmitInput): Promise<{ response: ResponseRow; match: (MatchRow & { question: QuestionRow }) | null; sealed_count?: number }>;
  update(userId: string, input: UpdateInput): Promise<Record<string, unknown>>;
  responses(userId: string, page: number, limit: number): Promise<{ responses: unknown[]; totalCount: number }>;
  matches(userId: string, page: number, limit: number, archived: boolean): Promise<{ matches: unknown[]; totalCount: number | null; hasMore: boolean }>;
@@ -58,10 +58,17 @@ export class PostgresAnswersRepository implements AnswersRepository {
  private zones: Promise<Set<string>> | null = null;
  constructor(connection: DatabaseConnection) { const resolved = resolvePool(connection); this.pool = resolved.pool; this.ownsPool = resolved.owned; }

+  /**
+   * couple_id is nullable here: an unpaired user still has a profile and can answer
+   * questions solo, banking them as sealed answers (couple_id IS NULL on responses)
+   * until a partner joins. Callers that need a couple for their own operation (e.g.
+   * matches, streaks) get an empty/no-op result naturally because every downstream
+   * query is scoped by couple_id, which stays null for a solo caller.
+   */
  private async context(client: Pool | PoolClient, userId: string): Promise<ContextRow> {
    const result = await client.query<ContextRow>('select couple_id, gender, max_intensity, is_premium from profiles where id=$1', [userId]);
    const row = result.rows[0];
-    if (!row?.couple_id) throw new AnswersError('no_couple', 409, 'Join a couple before answering questions');
+    if (!row) throw new AnswersError('no_couple', 409, 'Complete signup before answering questions');
    return row;
  }

@@ -147,15 +154,25 @@ export class PostgresAnswersRepository implements AnswersRepository {
      await this.assertEligible(client,userId,ctx,q);
      const existing = await client.query('select id from responses where user_id=$1 and question_id=$2 for update', [userId,input.questionId]);
      if (!existing.rowCount) {
-        const catchingUp = await client.query('select 1 from responses where couple_id=$1 and question_id=$2 and user_id<>$3 limit 1',[ctx.couple_id,input.questionId,userId]);
+        // A solo answerer has no partner, so the catch-up exemption never applies:
+        // every sealed answer counts against the daily limit like a fresh one.
+        const catchingUp = ctx.couple_id
+          ? await client.query('select 1 from responses where couple_id=$1 and question_id=$2 and user_id<>$3 limit 1',[ctx.couple_id,input.questionId,userId])
+          : { rowCount: 0 };
        if (!catchingUp.rowCount) {
          const limit = await this.dailyLimitWith(client,userId); if (limit.is_blocked) throw new AnswersError('daily_limit',429,'Daily response limit reached',{ daily_limit: limit.limit_value, responses_today: limit.responses_today, remaining: 0, reset_at: limit.reset_at });
        }
      }
      const response = await client.query<ResponseRow>(`insert into responses(id,user_id,question_id,couple_id,answer,response_data) values(gen_random_uuid(),$1,$2,$3,$4,$5)
        on conflict(user_id,question_id) do update set answer=excluded.answer,response_data=excluded.response_data returning *`,[userId,input.questionId,ctx.couple_id,input.answer,input.responseData ?? null]);
-      const match = await this.reconcileMatch(client,userId,ctx.couple_id!,q,input.answer,input.responseData ?? null,true);
-      await this.touchStreak(client,userId,ctx.couple_id!);
+      if (!ctx.couple_id) {
+        // No couple yet: bank the answer as sealed. It is claimed and reconciled
+        // into matches once a partner joins; see couples repository join().
+        const sealed = await client.query<{ count: number }>('select count(*)::int count from responses where user_id=$1 and couple_id is null',[userId]);
+        return { response: this.dates(response.rows[0]), match: null, sealed_count: sealed.rows[0]?.count ?? 0 };
+      }
+      const match = await this.reconcileMatch(client,userId,ctx.couple_id,q,input.answer,input.responseData ?? null,true);
+      await this.touchStreak(client,userId,ctx.couple_id);
      return { response: this.dates(response.rows[0]), match: match ? { ...this.dates(match), question: this.dates(q) } : null };
    });
  }
@@ -172,9 +189,9 @@ export class PostgresAnswersRepository implements AnswersRepository {
        return { success:false,requires_confirmation:true,match_id:existing.rows[0].id,message_count:count.rows[0]?.count ?? 0 };
      }
      const normalized=q.question_type!=='swipe' && input.answer!=='no' ? (typeof input.responseData==='undefined' ? current.rows[0].response_data : input.responseData) : null;
-      const before=existing.rows[0]; const match=await this.reconcileMatch(client,userId,ctx.couple_id!,q,input.answer,normalized,false);
+      const before=existing.rows[0]; const match=ctx.couple_id?await this.reconcileMatch(client,userId,ctx.couple_id,q,input.answer,normalized,false):null;
      await client.query('update responses set answer=$3,response_data=$4 where user_id=$1 and question_id=$2',[userId,input.questionId,input.answer,normalized]);
-      await this.touchStreak(client,userId,ctx.couple_id!);
+      if (ctx.couple_id) await this.touchStreak(client,userId,ctx.couple_id);
      return { success:true, ...(before&&!match?{match_deleted:true}:{ }), ...(!before&&match?{new_match:this.dates(match)}:{}), ...(before&&match?{match_type_updated:true}:{}) };
    });
  }
@@ -1,6 +1,7 @@
 import type { Couple, Profile } from '@sauci/shared';
 import { Pool, type PoolClient, type QueryResultRow } from 'pg';
 import { closeResolvedPool, resolvePool, type DatabaseConnection } from '../../db/pool.js';
+import { calculateMatchType, type Answer } from '../answers/types.js';
 import { CoupleError, type CoupleStateResponse } from './types.js';

 interface ProfileRecord extends QueryResultRow {
@@ -77,6 +78,60 @@ async function profileForUpdate(client: PoolClient, userId: string): Promise<{ c
  return profile;
 }

+/**
+ * A user answering solo banks each answer with couple_id NULL ("sealed"). Once
+ * pairing reaches two members, every sealed answer belonging to either member is
+ * claimed into the couple, and any question both members now have an answer for
+ * gets its match computed and upserted, reusing the same match-type rules the
+ * live answer flow uses. This only runs from join(), the one place membership can
+ * go from one to two, so it only ever fires once per couple.
+ */
+async function claimSealedAnswers(client: PoolClient, coupleId: string): Promise<void> {
+  await client.query(
+    `update responses set couple_id = $1
+       where couple_id is null and user_id in (select id from profiles where couple_id = $1)`,
+    [coupleId],
+  );
+
+  const pairs = await client.query<{
+    question_id: string;
+    question_type: string;
+    a_user: string;
+    a_answer: Answer;
+    a_data: Record<string, unknown> | null;
+    b_user: string;
+    b_answer: Answer;
+    b_data: Record<string, unknown> | null;
+  }>(
+    `select r1.question_id, q.question_type,
+            r1.user_id a_user, r1.answer a_answer, r1.response_data a_data,
+            r2.user_id b_user, r2.answer b_answer, r2.response_data b_data
+       from responses r1
+       join responses r2 on r2.question_id = r1.question_id and r2.couple_id = r1.couple_id and r2.user_id > r1.user_id
+       join questions q on q.id = r1.question_id
+      where r1.couple_id = $1`,
+    [coupleId],
+  );
+
+  for (const pair of pairs.rows) {
+    const matchType = calculateMatchType({ id: pair.question_id, question_type: pair.question_type as never }, pair.a_answer, pair.b_answer);
+    if (!matchType) {
+      await client.query('delete from matches where couple_id = $1 and question_id = $2', [coupleId, pair.question_id]);
+      continue;
+    }
+    const responseSummary = matchType === 'both_answered'
+      ? { [pair.a_user]: pair.a_data, [pair.b_user]: pair.b_data }
+      : null;
+    await client.query(
+      `insert into matches(couple_id, question_id, match_type, is_new, response_summary)
+       values($1, $2, $3, true, $4)
+       on conflict(couple_id, question_id) do update set
+         match_type = excluded.match_type, response_summary = excluded.response_summary, is_new = true`,
+      [coupleId, pair.question_id, matchType, responseSummary],
+    );
+  }
+}
+
 async function transaction<T>(pool: Pool, work: (client: PoolClient) => Promise<T>): Promise<T> {
  const client = await pool.connect();
  try {
@@ -111,7 +166,8 @@ export class PostgresCoupleRepository implements CoupleRepository {
    if (!profile) {
      throw new CoupleError('profile_not_found', 'Profile not found. Please complete signup first.', 404);
    }
-    if (!profile.couple_id) return { couple: null, partner: null };
+    const sealedCount = await this.sealedCount(userId);
+    if (!profile.couple_id) return { couple: null, partner: null, sealed_count: sealedCount };

    const [coupleResult, partnerResult] = await Promise.all([
      this.pool.query<CoupleRecord>(
@@ -129,13 +185,22 @@ export class PostgresCoupleRepository implements CoupleRepository {
      ),
    ]);
    const couple = coupleResult.rows[0];
-    if (!couple) return { couple: null, partner: null };
+    if (!couple) return { couple: null, partner: null, sealed_count: sealedCount };
    return {
      couple: toCouple(couple),
      partner: partnerResult.rows[0] ? toProfile(partnerResult.rows[0]) : null,
+      sealed_count: sealedCount,
    };
  }

+  private async sealedCount(userId: string): Promise<number> {
+    const result = await this.pool.query<{ count: number }>(
+      'select count(*)::int count from responses where user_id = $1 and couple_id is null',
+      [userId],
+    );
+    return result.rows[0]?.count ?? 0;
+  }
+
  async create(userId: string, coupleId: string, inviteCode: string): Promise<Couple> {
    return transaction(this.pool, async (client) => {
      const profile = await profileForUpdate(client, userId);
@@ -183,6 +248,7 @@ export class PostgresCoupleRepository implements CoupleRepository {
      }

      await client.query('update profiles set couple_id = $1, updated_at = now() where id = $2', [couple.id, userId]);
+      await claimSealedAnswers(client, couple.id);
      return toCouple(couple);
    });
  }
@@ -3,6 +3,8 @@ import type { Couple, Profile } from '@sauci/shared';
 export interface CoupleStateResponse {
  couple: Couple | null;
  partner: Profile | null;
+  /** Count of this user's banked answers with no couple yet (couple_id IS NULL). */
+  sealed_count: number;
 }

 export interface CoupleMutationResponse {
@@ -132,9 +132,14 @@ export class PostgresOperationsRepository implements OperationsRepository {
           and exists(select 1 from responses r where r.couple_id=p.couple_id and r.created_at>$1::timestamptz-interval '7 days')
         group by p.id on conflict(dedupe_key) do nothing`, [now]);

+      // Sealed answers are the earned-value hook for the nudge: a solo answerer who
+      // has already banked answers gets told what pairing unlocks for them, instead
+      // of the generic invite copy that applies before they have answered anything.
      const unpaired=await client.query(
        `with eligible as (
-           select p.id,p.couple_id is not null has_invite from profiles p left join notification_preferences np on np.user_id=p.id
+           select p.id,p.couple_id is not null has_invite,
+             (select count(*)::int from responses r where r.user_id=p.id and r.couple_id is null) sealed_count
+           from profiles p left join notification_preferences np on np.user_id=p.id
           where extract(hour from $1::timestamptz)>=18 and p.push_token is not null
             and (p.couple_id is null or (select count(*) from profiles member where member.couple_id=p.couple_id)<2)
             and coalesce(np.unpaired_reminders_enabled,true)
@@ -143,10 +148,11 @@ export class PostgresOperationsRepository implements OperationsRepository {
         ), queued as (
           insert into operations_outbox(kind,dedupe_key,recipient_id,payload)
           select 'expo','unpaired:'||to_char($1::timestamptz,'YYYY-MM-DD')||':'||e.id,e.id,
-             jsonb_build_object('title','Sauci','body',case when e.has_invite
-               then 'Your invite code is waiting! Share it with your partner to start discovering what you have in common.'
+             jsonb_build_object('title','Sauci','body',case
+               when e.sealed_count>0 then 'You have '||e.sealed_count||' sealed answer'||(case when e.sealed_count=1 then '' else 's' end)||' waiting. Invite your partner to unlock what you said about them.'
+               when e.has_invite then 'Your invite code is waiting! Share it with your partner to start discovering what you have in common.'
               else 'Ready to get started? Create an invite code and share it with your partner!' end,
-               'data',jsonb_build_object('type','unpaired_reminder'))
+               'data',jsonb_build_object('type','unpaired_reminder','sealed_count',e.sealed_count))
           from eligible e on conflict(dedupe_key) do nothing returning recipient_id
         ) update profiles p set last_unpaired_reminder_at=$1 from queued q where p.id=q.recipient_id returning p.id`, [now,limit]);

@@ -35,6 +35,8 @@ export const questionPacks = pgTable('question_packs', {
  contentReviewedAt: timestamp('content_reviewed_at', { withTimezone: true }),
  contentReviewedBy: uuid('content_reviewed_by').references(() => profiles.id, { onDelete: 'set null' }),
  createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
+  scheduledReleaseAt: timestamp('scheduled_release_at', { withTimezone: true }),
+  releaseNotified: boolean('release_notified').notNull().default(false),
 }, (table) => [index('question_packs_category_id_idx').on(table.categoryId)]);

 export const questions = pgTable('questions', {
@@ -61,7 +63,9 @@ export const responses = pgTable('responses', {
  id: uuid('id').primaryKey(),
  userId: uuid('user_id').notNull().references(() => profiles.id, { onDelete: 'cascade' }),
  questionId: uuid('question_id').notNull().references(() => questions.id, { onDelete: 'cascade' }),
-  coupleId: uuid('couple_id').notNull().references(() => couples.id, { onDelete: 'cascade' }),
+  // Nullable: an unpaired user's answer is banked as a sealed answer with no couple
+  // yet. It is claimed into the couple at pairing time; see the answers repository.
+  coupleId: uuid('couple_id').references(() => couples.id, { onDelete: 'cascade' }),
  answer: text('answer').notNull(),
  responseData: jsonb('response_data'),
  createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
@@ -65,6 +65,7 @@ const adminRepository = new PostgresAdminRepository(pool, {
 const app = createApp({
  auth: authVerifier,
  repository,
+  corsAllowedOrigins: config.corsAllowedOrigins,
  coupleService: new CoupleService(coupleRepository),
  packsRepository,
  answersRepository,
@@ -21,13 +21,14 @@ describe.skipIf(!databaseUrl || !isLocal)('admin repository authorization + audi
  const responseQuestion = '88888888-8888-4888-8888-888888888888';
  const responseId = '99999999-9999-4999-8999-999999999999';
  const responseMediaId = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';
+  const quizCouple = 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb';
  let pool: Pool; let repository: PostgresAdminRepository;

  beforeAll(async () => {
    await adminPool.query(`create schema "${schema}"`);
    const isolated = new URL(databaseUrl!); isolated.searchParams.set('options', `-c search_path=${schema}`);
    pool = new Pool({ connectionString: isolated.toString() }); repository = new PostgresAdminRepository(isolated.toString());
-    for (const name of ['0000_identity_and_feature_interests.sql','0001_couples.sql','0002_packs_catalog_progress.sql','0003_answers_matches.sql','0004_chat.sql','0005_profile_settings.sql','0006_media_storage.sql','0007_billing_redemption.sql','0008_residual_realtime.sql','0009_operations_workers.sql','0010_admin.sql']) {
+    for (const name of ['0000_identity_and_feature_interests.sql','0001_couples.sql','0002_packs_catalog_progress.sql','0003_answers_matches.sql','0004_chat.sql','0005_profile_settings.sql','0006_media_storage.sql','0007_billing_redemption.sql','0008_residual_realtime.sql','0009_operations_workers.sql','0010_admin.sql','0011_question_pack_average_precision.sql','0012_catalogue_field_parity.sql','0013_dares_loop.sql','0014_daily_limit_local_reset.sql','0015_daily_limit_response_index.sql','0016_couple_streak_locality.sql','0017_streak_reminder_preference.sql','0018_cutover_source_parity.sql','0019_quiz.sql','0020_quiz_question_pool.sql']) {
      const migration = await readFile(new URL(`../drizzle/${name}`, import.meta.url), 'utf8');
      for (const statement of migration.split('--> statement-breakpoint')) if (statement.trim()) await pool.query(statement);
    }
@@ -161,6 +162,55 @@ describe.skipIf(!databaseUrl || !isLocal)('admin repository authorization + audi
    await expect(repository.responseMedia(responseViewer, responseId)).rejects.toMatchObject({ code: 'response_media_not_found' });
  });

+  it('exposes writable quiz content and read-only quiz activity resources', async () => {
+    await pool.query('insert into couples(id,invite_code) values($1,$2)', [quizCouple, 'QUIZADMN']);
+    await pool.query("update admin_users set permissions=array_append(permissions,'manage_questions') where user_id=$1", [creatorUser]);
+    const creator = await repository.principal(creatorUser);
+    const [question] = await repository.insert(creator, 'quiz_questions', [{
+      prompt_self: 'How do you show affection?', prompt_guess: 'How does your partner show affection?', options: ['Touch', 'Words'],
+    }]);
+    expect(question).toMatchObject({ prompt_self: 'How do you show affection?' });
+
+    const principal = await repository.principal(superUser);
+    const listed = await repository.query(principal, 'quiz_questions', { filters: [{ column: 'id', op: 'eq', value: question!.id }] });
+    expect(listed.count).toBe(1);
+    expect((await repository.query(principal, 'quiz_sessions', {})).count).toBe(0);
+    await expect(repository.insert(principal, 'quiz_sessions', [{
+      couple_id: quizCouple, status: 'active', question_ids: [question!.id],
+    }])).rejects.toMatchObject({ code: 'forbidden' });
+  });
+
+  it('reads sent dares for user support visibility without granting write access', async () => {
+    await pool.query(
+      `insert into sent_dares(couple_id,custom_dare_text,dare_text_snapshot,dare_intensity_snapshot,sender_id,recipient_id,status)
+       values($1,'Give a compliment','Give a compliment',2,$2,$3,'pending')`,
+      [quizCouple, creatorUser, moderatorUser],
+    );
+    const principal = await repository.principal(superUser);
+    const result = await repository.query(principal, 'sent_dares', {});
+    expect(result.count).toBe(1);
+    expect(result.rows[0]).toMatchObject({ dare_text_snapshot: 'Give a compliment' });
+    await expect(repository.insert(principal, 'sent_dares', [{
+      couple_id: quizCouple, custom_dare_text: 'x', dare_text_snapshot: 'x',
+      dare_intensity_snapshot: 1, sender_id: creatorUser, recipient_id: moderatorUser, status: 'pending',
+    }])).rejects.toMatchObject({ code: 'forbidden' });
+  });
+
+  it('reads notification preferences for user support visibility without granting write access', async () => {
+    await pool.query(
+      "insert into notification_preferences(user_id,matches_enabled,dares_enabled) values($1,true,false)",
+      [creatorUser],
+    );
+    const principal = await repository.principal(superUser);
+    const result = await repository.query(principal, 'notification_preferences', {
+      filters: [{ column: 'user_id', op: 'eq', value: creatorUser }],
+    });
+    expect(result).toMatchObject({ count: 1, rows: [expect.objectContaining({ matches_enabled: true, dares_enabled: false })] });
+    await expect(repository.insert(principal, 'notification_preferences', [{
+      user_id: moderatorUser,
+    }])).rejects.toMatchObject({ code: 'forbidden' });
+  });
+
  it('creates all legacy admin and dare cutover tables with preserved foreign keys', async () => {
    const tables = await pool.query<{ table_name: string }>(
      `select table_name from information_schema.tables where table_schema=current_schema()
@@ -5,8 +5,8 @@ import { afterAll,beforeAll,describe,expect,it } from 'vitest';
 import { PostgresAnswersRepository } from '../src/domains/answers/repository.js';
 const url=process.env.DATABASE_URL;const local=url?['127.0.0.1','localhost','::1'].includes(new URL(url).hostname):false;if(url&&!local)throw new Error('Answer integration tests only permit localhost');
 describe.skipIf(!url||!local)('answers + PostgreSQL',()=>{const admin=new Pool({connectionString:url});const schema=`answers_${randomUUID().replaceAll('-','')}`;let pool:Pool;let repo:PostgresAnswersRepository;
-const u1='11111111-1111-4111-8111-111111111111',u2='22222222-2222-4222-8222-222222222222',outsider='33333333-3333-4333-8333-333333333333',couple='44444444-4444-4444-8444-444444444444',other='55555555-5555-4555-8555-555555555555',pack='66666666-6666-4666-8666-666666666666',q='77777777-7777-4777-8777-777777777777',concurrentQ='88888888-8888-4888-8888-888888888888',femaleOnlyQ='99999999-9999-4999-8999-999999999999',limitQ1='aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa',limitQ2='bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb',catchUpQ='cccccccc-cccc-4ccc-8ccc-cccccccccccc';
-beforeAll(async()=>{await admin.query(`create schema "${schema}"`);const isolated=new URL(url!);isolated.searchParams.set('options',`-c search_path=${schema}`);pool=new Pool({connectionString:isolated.toString()});repo=new PostgresAnswersRepository(isolated.toString());for(const name of ['0000_identity_and_feature_interests.sql','0001_couples.sql','0002_packs_catalog_progress.sql','0003_answers_matches.sql','0004_chat.sql','0014_daily_limit_local_reset.sql','0015_daily_limit_response_index.sql','0016_couple_streak_locality.sql']){const sql=await readFile(new URL(`../drizzle/${name}`,import.meta.url),'utf8');for(const s of sql.split('--> statement-breakpoint'))if(s.trim())await pool.query(s);}await pool.query('insert into couples(id,invite_code) values($1,$2),($3,$4)',[couple,'ANSWERS1',other,'ANSWERS2']);await pool.query("insert into profiles(id,couple_id,gender,max_intensity) values($1,$4,'female',5),($2,$4,'male',3),($3,$5,'male',5)",[u1,u2,outsider,couple,other]);await pool.query("insert into question_packs(id,name) values($1,'Core')",[pack]);await pool.query("insert into questions(id,pack_id,text,intensity,target_user_genders) values($1,$2,'Question',3,array['female']),($3,$2,'Concurrent',2,null),($4,$2,'Female first',2,array['female']),($5,$2,'Limit one',2,null),($6,$2,'Limit two',2,null),($7,$2,'Catch up',2,null)",[q,pack,concurrentQ,femaleOnlyQ,limitQ1,limitQ2,catchUpQ]);await pool.query('insert into couple_packs(couple_id,pack_id,enabled) values($1,$2,true)',[couple,pack]);});afterAll(async()=>{await repo.close();await pool.end();await admin.query(`drop schema "${schema}" cascade`);await admin.end();});
+const u1='11111111-1111-4111-8111-111111111111',u2='22222222-2222-4222-8222-222222222222',outsider='33333333-3333-4333-8333-333333333333',couple='44444444-4444-4444-8444-444444444444',other='55555555-5555-4555-8555-555555555555',pack='66666666-6666-4666-8666-666666666666',q='77777777-7777-4777-8777-777777777777',concurrentQ='88888888-8888-4888-8888-888888888888',femaleOnlyQ='99999999-9999-4999-8999-999999999999',limitQ1='aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa',limitQ2='bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb',catchUpQ='cccccccc-cccc-4ccc-8ccc-cccccccccccc',solo='dddddddd-dddd-4ddd-8ddd-dddddddddddd',soloQ1='eeeeeeee-eeee-4eee-8eee-eeeeeeeeeeee',soloQ2='ffffffff-ffff-4fff-8fff-ffffffffffff';
+beforeAll(async()=>{await admin.query(`create schema "${schema}"`);const isolated=new URL(url!);isolated.searchParams.set('options',`-c search_path=${schema}`);pool=new Pool({connectionString:isolated.toString()});repo=new PostgresAnswersRepository(isolated.toString());for(const name of ['0000_identity_and_feature_interests.sql','0001_couples.sql','0002_packs_catalog_progress.sql','0003_answers_matches.sql','0004_chat.sql','0014_daily_limit_local_reset.sql','0015_daily_limit_response_index.sql','0016_couple_streak_locality.sql','0022_solo_sealed_answers.sql']){const sql=await readFile(new URL(`../drizzle/${name}`,import.meta.url),'utf8');for(const s of sql.split('--> statement-breakpoint'))if(s.trim())await pool.query(s);}await pool.query('insert into couples(id,invite_code) values($1,$2),($3,$4)',[couple,'ANSWERS1',other,'ANSWERS2']);await pool.query("insert into profiles(id,couple_id,gender,max_intensity) values($1,$4,'female',5),($2,$4,'male',3),($3,$5,'male',5)",[u1,u2,outsider,couple,other]);await pool.query("insert into profiles(id,gender,max_intensity) values($1,null,5)",[solo]);await pool.query("insert into question_packs(id,name) values($1,'Core')",[pack]);await pool.query("insert into questions(id,pack_id,text,intensity,target_user_genders) values($1,$2,'Question',3,array['female']),($3,$2,'Concurrent',2,null),($4,$2,'Female first',2,array['female']),($5,$2,'Limit one',2,null),($6,$2,'Limit two',2,null),($7,$2,'Catch up',2,null),($8,$2,'Solo one',2,null),($9,$2,'Solo two',2,null)",[q,pack,concurrentQ,femaleOnlyQ,limitQ1,limitQ2,catchUpQ,soloQ1,soloQ2]);await pool.query('insert into couple_packs(couple_id,pack_id,enabled) values($1,$2,true)',[couple,pack]);});afterAll(async()=>{await repo.close();await pool.end();await admin.query(`drop schema "${schema}" cascade`);await admin.end();});
 it('targets recommendation by gender and excludes completed responses',async()=>{expect((await repo.recommended(u1)).map(x=>x.id)).toContain(q);expect((await repo.recommended(u2)).map(x=>x.id)).not.toContain(q);await repo.submit(u1,{questionId:q,answer:'yes'});expect((await repo.recommended(u1)).map(x=>x.id)).not.toContain(q);});
 it('rejects direct answers that bypass target-gender eligibility',async()=>{await expect(repo.submit(u2,{questionId:femaleOnlyQ,answer:'yes'})).rejects.toMatchObject({code:'question_not_eligible'});});
 it('serializes concurrent partner submissions and still creates one match',async()=>{await Promise.all([repo.submit(u1,{questionId:concurrentQ,answer:'yes'}),repo.submit(u2,{questionId:concurrentQ,answer:'yes'})]);const counts=await pool.query('select count(*)::int count from matches where question_id=$1',[concurrentQ]);expect(counts.rows[0].count).toBe(1);});
@@ -109,4 +109,25 @@ it('buckets the window on the user local day and falls back to UTC',async()=>{aw
  const utcBoundary=await pool.query<{expected:string}>("select ((date_trunc('day',now() at time zone 'UTC')+interval '1 day') at time zone 'UTC') expected");
  for(const zone of [null,'Not/AZone']){await pool.query('update profiles set timezone=$2 where id=$1',[u1,zone]);expect((await repo.dailyLimit(u1)).reset_at).toBe(new Date(utcBoundary.rows[0].expected).toISOString());}});
 it('blocks pack browsing once the limit is reached',async()=>{await resetLimit(1);expect((await repo.recommended(u1,pack)).length).toBeGreaterThan(0);await repo.submit(u1,{questionId:limitQ1,answer:'yes'});expect(await repo.recommended(u1,pack)).toEqual([]);expect(await repo.recommended(u1)).toEqual([]);await resetLimit(0);});
+
+describe('solo answering before a couple exists',()=>{
+  it('recommends questions to an unpaired user instead of a no_couple error',async()=>{
+    const questions=await repo.recommended(solo);
+    expect(questions.map(x=>x.id)).toContain(soloQ1);
+  });
+  it('banks a solo answer with no couple, skips match reconciliation, and reports the sealed count',async()=>{
+    const first=await repo.submit(solo,{questionId:soloQ1,answer:'yes'});
+    expect(first.match).toBeNull();
+    expect(first.sealed_count).toBe(1);
+    const stored=await pool.query('select couple_id from responses where user_id=$1 and question_id=$2',[solo,soloQ1]);
+    expect(stored.rows[0].couple_id).toBeNull();
+
+    const second=await repo.submit(solo,{questionId:soloQ2,answer:'maybe'});
+    expect(second.match).toBeNull();
+    expect(second.sealed_count).toBe(2);
+  });
+  it('lets a solo answerer edit a sealed answer without a couple to reconcile against',async()=>{
+    await expect(repo.update(solo,{questionId:soloQ1,answer:'no',responseData:undefined,confirmDeleteMatch:false})).resolves.toMatchObject({success:true});
+  });
+});
 });
@@ -28,7 +28,7 @@ describe.skipIf(!databaseUrl || !localDatabase)('API + PostgreSQL integration',
    isolatedUrl.searchParams.set('options', `-c search_path=${schema}`);
    pool = new Pool({ connectionString: isolatedUrl.toString() });
    repository = new PostgresRepository(isolatedUrl.toString());
-    const migration = (await Promise.all(['0000_identity_and_feature_interests.sql','0014_daily_limit_local_reset.sql']
+    const migration = (await Promise.all(['0000_identity_and_feature_interests.sql','0005_profile_settings.sql','0014_daily_limit_local_reset.sql']
      .map((name) => readFile(new URL(`../drizzle/${name}`, import.meta.url), 'utf8')))).join('\n--> statement-breakpoint\n');
    for (const statement of migration.split('--> statement-breakpoint')) {
      if (statement.trim()) await pool.query(statement);
@@ -81,6 +81,35 @@ describe('Sauci API', () => {
    expect(repository.ready).toHaveBeenCalledOnce();
  });

+  it('allows browser preflight requests only from configured web origins', async () => {
+    const app = createApp({
+      auth: verifier(),
+      repository: new MemoryRepository(),
+      corsAllowedOrigins: ['http://127.0.0.1:3010', 'https://sauci.app'],
+    });
+    const response = await app.request('/public/v1/redemptions', {
+      method: 'OPTIONS',
+      headers: {
+        origin: 'http://127.0.0.1:3010',
+        'access-control-request-method': 'POST',
+        'access-control-request-headers': 'content-type',
+      },
+    });
+
+    expect(response.status).toBe(204);
+    expect(response.headers.get('access-control-allow-origin')).toBe('http://127.0.0.1:3010');
+    expect(response.headers.get('access-control-allow-methods')).toContain('POST');
+
+    const rejected = await app.request('/public/v1/redemptions', {
+      method: 'OPTIONS',
+      headers: {
+        origin: 'https://unapproved.example',
+        'access-control-request-method': 'POST',
+      },
+    });
+    expect(rejected.headers.get('access-control-allow-origin')).toBeNull();
+  });
+
  it('fails closed when the bearer token is missing or invalid', async () => {
    const app = createApp({ auth: verifier(), repository: new MemoryRepository() });
    expect((await app.request('/v1/me')).status).toBe(401);
@@ -26,7 +26,13 @@ describe.skipIf(!databaseUrl || !localDatabase)('PostgresCoupleRepository', () =
    pool = new Pool({ connectionString: isolatedUrl.toString() });
    repository = new PostgresCoupleRepository(isolatedUrl.toString());

-    for (const migrationName of ['0000_identity_and_feature_interests.sql', '0001_couples.sql']) {
+    for (const migrationName of [
+      '0000_identity_and_feature_interests.sql',
+      '0001_couples.sql',
+      '0002_packs_catalog_progress.sql',
+      '0003_answers_matches.sql',
+      '0022_solo_sealed_answers.sql',
+    ]) {
      const migration = await readFile(new URL(`../drizzle/${migrationName}`, import.meta.url), 'utf8');
      for (const statement of migration.split('--> statement-breakpoint')) {
        if (statement.trim()) await pool.query(statement);
@@ -57,8 +63,71 @@ describe.skipIf(!databaseUrl || !localDatabase)('PostgresCoupleRepository', () =
    await expect(repository.join(charlie, 'ABCD2345')).rejects.toMatchObject({ code: 'couple_full' });

    await repository.cancel(alice);
-    await expect(repository.getState(alice)).resolves.toEqual({ couple: null, partner: null });
-    await expect(repository.getState(bob)).resolves.toEqual({ couple: null, partner: null });
+    await expect(repository.getState(alice)).resolves.toEqual({ couple: null, partner: null, sealed_count: 0 });
+    await expect(repository.getState(bob)).resolves.toEqual({ couple: null, partner: null, sealed_count: 0 });
    expect((await pool.query('select count(*)::int as count from couples')).rows[0].count).toBe(0);
  });
+
+  it('reports a solo answerer\'s sealed count before any couple exists', async () => {
+    const pack = 'cccccccc-cccc-4ccc-8ccc-cccccccccccc';
+    const solo = 'dddddddd-dddd-4ddd-8ddd-dddddddddddd';
+    const question = 'eeeeeeee-eeee-4eee-8eee-eeeeeeeeeeee';
+    await pool.query(`insert into profiles(id, name) values ($1, 'Solo')`, [solo]);
+    await pool.query(`insert into question_packs(id, name) values ($1, 'Pack')`, [pack]);
+    await pool.query(`insert into questions(id, pack_id, text) values ($1, $2, 'Question')`, [question, pack]);
+    await pool.query(
+      `insert into responses(id, user_id, question_id, couple_id, answer) values ($1, $2, $3, null, 'yes')`,
+      [randomUUID(), solo, question],
+    );
+
+    await expect(repository.getState(solo)).resolves.toEqual({ couple: null, partner: null, sealed_count: 1 });
+  });
+
+  it('claims both members\' sealed answers and computes matches when the second member joins', async () => {
+    const coupleId = 'ffffffff-ffff-4fff-8fff-ffffffffffff';
+    const dana = '44444444-4444-4444-8444-444444444444';
+    const erin = '55555555-5555-4555-8555-555555555555';
+    const pack = '66666666-6666-4666-8666-666666666666';
+    const yesYesQuestion = '77777777-7777-4777-8777-777777777777';
+    const yesNoQuestion = '88888888-8888-4888-8888-888888888888';
+    const soloOnlyQuestion = '99999999-9999-4999-8999-999999999999';
+
+    await pool.query(`insert into profiles(id, name) values ($1, 'Dana'), ($2, 'Erin')`, [dana, erin]);
+    await pool.query(`insert into question_packs(id, name) values ($1, 'Claim pack')`, [pack]);
+    await pool.query(
+      `insert into questions(id, pack_id, text) values ($1, $2, 'Yes yes'), ($3, $2, 'Yes no'), ($4, $2, 'Solo only')`,
+      [yesYesQuestion, pack, yesNoQuestion, soloOnlyQuestion],
+    );
+
+    // Both answer the same question before pairing (sealed, couple_id null). Dana
+    // and Erin agree on one question (yes/yes), disagree on another (yes/no), and
+    // Dana alone answers a third, which has no match to compute.
+    const insertResponse = (userId: string, questionId: string, answer: 'yes' | 'no' | 'maybe') =>
+      pool.query(
+        `insert into responses(id, user_id, question_id, couple_id, answer) values ($1, $2, $3, null, $4)`,
+        [randomUUID(), userId, questionId, answer],
+      );
+    await insertResponse(dana, yesYesQuestion, 'yes');
+    await insertResponse(erin, yesYesQuestion, 'yes');
+    await insertResponse(dana, yesNoQuestion, 'yes');
+    await insertResponse(erin, yesNoQuestion, 'no');
+    await insertResponse(dana, soloOnlyQuestion, 'maybe');
+
+    await repository.create(dana, coupleId, 'CLAIM123');
+    await repository.join(erin, 'CLAIM123');
+
+    const claimed = await pool.query<{ couple_id: string | null; count: number }>(
+      'select couple_id, count(*)::int count from responses where user_id in ($1,$2) group by couple_id',
+      [dana, erin],
+    );
+    expect(claimed.rows).toEqual([{ couple_id: coupleId, count: 5 }]);
+
+    // Yes/yes produces a match; yes/no produces none; the solo-only answer has no
+    // partner response yet, so only one match is computed from the claim.
+    const matches = await pool.query<{ question_id: string; match_type: string }>(
+      'select question_id, match_type from matches where couple_id=$1 order by question_id',
+      [coupleId],
+    );
+    expect(matches.rows).toEqual([{ question_id: yesYesQuestion, match_type: 'yes_yes' }]);
+  });
 });
@@ -14,7 +14,7 @@ const identity: AuthIdentity = {

 function setup() {
  const repository: CoupleRepository = {
-    getState: vi.fn(async () => ({ couple: null, partner: null })),
+    getState: vi.fn(async () => ({ couple: null, partner: null, sealed_count: 0 })),
    create: vi.fn(async (_userId, coupleId, inviteCode) => ({
      id: coupleId,
      invite_code: inviteCode,
@@ -43,7 +43,7 @@ describe('couple routes', () => {
    const response = await app.request('/v1/couple');

    expect(response.status).toBe(200);
-    expect(await response.json()).toEqual({ couple: null, partner: null });
+    expect(await response.json()).toEqual({ couple: null, partner: null, sealed_count: 0 });
    expect(repository.getState).toHaveBeenCalledWith(identity.id);
  });

@@ -12,7 +12,7 @@ const couple: Couple = {

 function repository(overrides: Partial<CoupleRepository> = {}): CoupleRepository {
  return {
-    getState: vi.fn(async () => ({ couple: null, partner: null })),
+    getState: vi.fn(async () => ({ couple: null, partner: null, sealed_count: 0 })),
    create: vi.fn(async () => couple),
    join: vi.fn(async () => couple),
    cancel: vi.fn(async () => undefined),
@@ -12,7 +12,7 @@ describe.skipIf(!databaseUrl||!local)('PostgresOperationsRepository',()=>{
  const pack='44444444-4444-4444-8444-444444444444',question='55555555-5555-4555-8555-555555555555';let pool:Pool;let repo:PostgresOperationsRepository;let repo2:PostgresOperationsRepository;
  beforeAll(async()=>{
    await admin.query(`create schema "${schema}"`);const url=new URL(databaseUrl!);url.searchParams.set('options',`-c search_path=${schema}`);pool=new Pool({connectionString:url.toString()});repo=new PostgresOperationsRepository(url.toString());repo2=new PostgresOperationsRepository(url.toString());
-    for(const name of ['0000_identity_and_feature_interests.sql','0001_couples.sql','0002_packs_catalog_progress.sql','0003_answers_matches.sql','0004_chat.sql','0005_profile_settings.sql','0006_media_storage.sql','0009_operations_workers.sql','0010_admin.sql','0014_daily_limit_local_reset.sql','0016_couple_streak_locality.sql','0017_streak_reminder_preference.sql']){
+    for(const name of ['0000_identity_and_feature_interests.sql','0001_couples.sql','0002_packs_catalog_progress.sql','0003_answers_matches.sql','0004_chat.sql','0005_profile_settings.sql','0006_media_storage.sql','0009_operations_workers.sql','0010_admin.sql','0014_daily_limit_local_reset.sql','0016_couple_streak_locality.sql','0017_streak_reminder_preference.sql','0022_solo_sealed_answers.sql']){
      const sql=await readFile(new URL(`../drizzle/${name}`,import.meta.url),'utf8');for(const statement of sql.split('--> statement-breakpoint'))if(statement.trim())await pool.query(statement);
    }
    await pool.query('insert into couples(id,invite_code) values($1,$2)',[couple,'ABCD2345']);
@@ -59,6 +59,22 @@ describe.skipIf(!databaseUrl||!local)('PostgresOperationsRepository',()=>{
    expect((await pool.query('select count(*)::int count from operations_outbox where dedupe_key=$1',[`discord:couple_paired:${inviteCouple}`])).rows[0].count).toBe(1);
  });

+  it('escalates the unpaired nudge copy with the sealed answer count',async()=>{
+    const solo=randomUUID(),secondQuestion=randomUUID();
+    await pool.query(`insert into profiles(id,name,email,push_token,onboarding_completed) values($1,'Solo','solo@test','token-solo',false)`,[solo]);
+    await pool.query('insert into questions(id,pack_id,text) values($1,$2,$3)',[secondQuestion,pack,'Second question']);
+    await pool.query(`insert into responses(id,user_id,question_id,couple_id,answer) values($1,$2,$3,null,'yes'),($4,$2,$5,null,'maybe')`,
+      [randomUUID(),solo,question,randomUUID(),secondQuestion]);
+
+    await repo.produce(new Date('2026-08-28T18:00:00.000Z'),100);
+    const body=(await pool.query<{body:string;data:{sealed_count:number}}>(
+      `select payload->>'body' body,payload->'data' data from operations_outbox where dedupe_key=$1`,
+      [`unpaired:2026-08-28:${solo}`],
+    )).rows[0];
+    expect(body?.body).toContain('2 sealed answers waiting');
+    expect(body?.data).toMatchObject({sealed_count:2});
+  });
+
  it('atomically releases packs, celebrates milestones, and produces a single digest',async()=>{
    await pool.query(`insert into couple_streaks(couple_id,current_streak,longest_streak,streak_celebrated_at) values($1,7,7,0) on conflict(couple_id) do update set current_streak=7,streak_celebrated_at=0`,[couple]);
    const result=await repo.produce(new Date(Date.now()+10*60*1000),100);
@@ -13,13 +13,19 @@ EXPO_PUBLIC_API_URL=http://127.0.0.1:3003
 # invoking shell. Do not put those credentials in this Expo environment file or
 # commit them. The test user must be disposable, onboarding-complete, and have a
 # matching profile in the standalone non-production PostgreSQL database.
-
-# Sentry error tracking (optional - get DSN from https://sentry.io)
-EXPO_PUBLIC_SENTRY_DSN=
-
-# RevenueCat (for in-app subscriptions)
-# Get your API keys from https://app.revenuecat.com
-EXPO_PUBLIC_REVENUECAT_IOS_API_KEY=
-EXPO_PUBLIC_REVENUECAT_ANDROID_API_KEY=
-# Entitlement ID from RevenueCat dashboard (defaults to "pro" if not set)
-EXPO_PUBLIC_REVENUECAT_ENTITLEMENT_ID=Sauci Pro
+
+# Facebook App ID for Instagram Stories sharing (optional). Instagram requires
+# a registered Facebook App ID for the Stories share flow; without it the
+# Instagram share button falls back to the system share sheet.
+# https://developers.facebook.com/docs/instagram/sharing-to-stories/
+EXPO_PUBLIC_FACEBOOK_APP_ID=
+
+# Sentry error tracking (optional - get DSN from https://sentry.io)
+EXPO_PUBLIC_SENTRY_DSN=
+
+# RevenueCat (for in-app subscriptions)
+# Get your API keys from https://app.revenuecat.com
+EXPO_PUBLIC_REVENUECAT_IOS_API_KEY=
+EXPO_PUBLIC_REVENUECAT_ANDROID_API_KEY=
+# Entitlement ID from RevenueCat dashboard (defaults to "pro" if not set)
+EXPO_PUBLIC_REVENUECAT_ENTITLEMENT_ID=Sauci Pro
@@ -2,6 +2,21 @@
 module.exports = {
  extends: 'expo',
  ignorePatterns: ['/dist/*'],
+  rules: {
+    // eslint-config-expo (SDK 56) pulls eslint-plugin-react-hooks v7, whose
+    // recommended config adds React Compiler era rules as errors. Existing
+    // patterns this codebase relies on deliberately (the "latest value" ref
+    // pattern, effect-driven setState, dynamically created inline
+    // components, and manual memoization) trip these new rules throughout
+    // the app. Adopting the stricter rules is a deliberate follow-up
+    // refactor, not an SDK upgrade side effect, so they are downgraded to
+    // warnings here.
+    'react-hooks/refs': 'warn',
+    'react-hooks/set-state-in-effect': 'warn',
+    'react-hooks/immutability': 'warn',
+    'react-hooks/preserve-manual-memoization': 'warn',
+    'react-hooks/static-components': 'warn',
+  },
  overrides: [
    {
      files: ['plugins/**/*.js'],
@@ -11,5 +11,6 @@ expo-env.d.ts
 *.keystore
 # Fastlane
 fastlane-key.json
+fastlane/.env
 fastlane/report.xml
 fastlane/README.md
@@ -13,3 +13,5 @@ native iOS/Android targets.
 - Add stable accessibility labels or `testID` values for critical interactions.
 - Verify focused Jest tests, typecheck, lint, then native/Expo behavior as risk
  requires. UI work needs observable simulator evidence.
+- Before and after any `expo prebuild`, follow the "After native regeneration"
+  checklist in `docs/releasing.md`.
@@ -12,5 +12,8 @@ local.properties
 *.hprof
 .cxx/

+# generated inline modules
+app/src/main/java/inline/
+
 # Bundle artifacts
 *.jsbundle
@@ -11,7 +11,7 @@ def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
 react {
    entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim())
    reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
-    hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc"
+    hermesCommand = new File(["node", "--print", "require.resolve('hermes-compiler/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/hermesc/%OS-BIN%/hermesc"
    codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()

    enableBundleCompression = (findProperty('android.enableBundleCompression') ?: false).toBoolean()
@@ -64,7 +64,7 @@ react {
 }

 /**
- * Set this to true in release builds to optimize the app using R8.
+ * Set this to true in release builds to optimize the app using [R8](https://developer.android.com/topic/performance/app-optimization/enable-app-optimization).
 */
 def enableMinifyInReleaseBuilds = (findProperty('android.enableMinifyInReleaseBuilds') ?: false).toBoolean()

@@ -92,8 +92,9 @@ android {
        applicationId 'com.sauci.app'
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 48
-        versionName "1.0.6"
+        versionCode 51
+        versionName "1.0.8"
+
        buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
    }
    signingConfigs {
@@ -181,4 +182,4 @@ dependencies {
 }

 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'com.google.firebase.crashlytics'
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:usesCleartextTraffic" />
+</manifest>
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
  <uses-permission android:name="android.permission.INTERNET"/>
  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:replace="android:maxSdkVersion"/>
  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:node="remove"/>
  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove"/>
@@ -12,25 +12,32 @@
  <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
  <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
  <uses-permission android:name="android.permission.VIBRATE"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:replace="android:maxSdkVersion"/>
  <uses-permission android:name="com.android.vending.BILLING"/>
  <queries>
+    <package android:name="com.instagram.android"/>
    <intent>
      <action android:name="android.intent.action.VIEW"/>
      <category android:name="android.intent.category.BROWSABLE"/>
      <data android:scheme="https"/>
    </intent>
  </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true" android:requestLegacyExternalStorage="true" android:fullBackupContent="@xml/secure_store_backup_rules" android:dataExtractionRules="@xml/secure_store_data_extraction_rules" android:enableOnBackInvokedCallback="false">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true" android:enableOnBackInvokedCallback="false" android:requestLegacyExternalStorage="true" android:fullBackupContent="@xml/secure_store_backup_rules" android:dataExtractionRules="@xml/secure_store_data_extraction_rules">
    <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/notification_icon_color"/>
    <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/notification_icon"/>
    <meta-data android:name="expo.modules.notifications.default_notification_color" android:resource="@color/notification_icon_color"/>
    <meta-data android:name="expo.modules.notifications.default_notification_icon" android:resource="@drawable/notification_icon"/>
-    <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
+    <meta-data android:name="expo.modules.updates.CODE_SIGNING_CERTIFICATE" android:value="-----BEGIN CERTIFICATE-----&#xA;MIICzTCCAbWgAwIBAgIJAPrPjxnUOGisMA0GCSqGSIb3DQEBCwUAMBAxDjAMBgNV&#xA;BAMTBVNhdWNpMB4XDTI2MDgzMDE4MTAzMFoXDTM2MDgzMDE4MTAzMFowEDEOMAwG&#xA;A1UEAxMFU2F1Y2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWiUac&#xA;8i9bIbNZjv8iunVr6kqlgb9vea98JHz/A83biyszg0+GpmLYsr4zV2F7A6RitiIx&#xA;SOML+wVedyD0F2quWccBGXinvMAds0TxgIOjQfP+8+VJ/duDjveHvn+OFW4s7XxW&#xA;SY7TK1ufDcPWo/f5XzfqtBveug49zv3/F3MwfmMUbEY/zvH7nayPGJNuSyf3wISn&#xA;JIt0BsHNhWykRXCzjaF2fy3nAebOyezbtbapCjUlxPENVtBCzBQ7C9kaQXCBw5mV&#xA;hxhJlOxHWXpHJgDLHpev8A/CWQRh67tsevjKi6R6SDlf0R0xSbDJTElx8goWOOQW&#xA;VO9aDqI+oH0KpWfnAgMBAAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8E&#xA;DDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAyUc20bIRCxoBTJg84mPl&#xA;2nFDWSaAfzgo0K0b6x2T1suuq4LAOUgzBqJISrQAALd0besK1qUZSAMhjQu1wPZT&#xA;MHuWRMxQHfOkyHMYUfOoPMS4bE+4K0WjzfoVt3y1A+oxhcIAQUUGyNgNmebfEN07&#xA;JlX0B8UI8aIMjyfpsIDgZx1piHKwittGy/V4MPOLbmT2BBwS9BELcmWE4CwWbfeo&#xA;JM4lXY0hk3M/GTstRYaUKiwBWEU+z1PdAmWAgrtxpVnXN+oaToWh0WbVkbF1K6r5&#xA;3oBGFTL7kT+Wogg9GK04XoAREw0jZJ/k77oJx68lGVBNiB+Ue2KqX0H/0cf2CslY&#xA;Ug==&#xA;-----END CERTIFICATE-----&#xA;"/>
+    <meta-data android:name="expo.modules.updates.CODE_SIGNING_METADATA" android:value="{&quot;keyid&quot;:&quot;main&quot;,&quot;alg&quot;:&quot;rsa-v1_5-sha256&quot;}"/>
+    <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
+    <meta-data android:name="expo.modules.updates.ENABLE_BSDIFF_PATCH_SUPPORT" android:value="true"/>
+    <meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="@string/expo_runtime_version"/>
    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
+    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="5000"/>
+    <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://ota.apps.jbrunton.co.uk/manifest"/>
+    <meta-data android:name="expo.modules.updates.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY" android:value="{&quot;expo-channel-name&quot;:&quot;production&quot;,&quot;expo-app-id&quot;:&quot;9a66f3c2-fda7-416f-87e2-6db833b32e9d&quot;,&quot;xprem-branch&quot;:&quot;&quot;}"/>
    <service android:name="com.reactnativeandroidwidget.RNWidgetCollectionService" android:permission="android.permission.BIND_REMOTEVIEWS"/>
-    <activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
+    <activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode|smallestScreenSize|assetsPaths" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
      <intent-filter>
        <action android:name="android.intent.action.MAIN"/>
        <category android:name="android.intent.category.LAUNCHER"/>
@@ -40,11 +47,16 @@
        <category android:name="android.intent.category.DEFAULT"/>
        <category android:name="android.intent.category.BROWSABLE"/>
        <data android:scheme="app.sauci"/>
-        <data android:scheme="com.sauci.app"/>
        <data android:scheme="exp+sauci"/>
      </intent-filter>
+      <intent-filter android:autoVerify="true" data-generated="true">
+        <action android:name="android.intent.action.VIEW"/>
+        <data android:scheme="https" android:host="sauci.app" android:pathPrefix="/join"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
    </activity>
-    <receiver android:name=".widget.LiveDraw" android:exported="true" android:label="Live Draw">
+    <receiver android:name=".widget.LiveDraw" android:exported="false" android:label="Live Draw">
      <intent-filter>
        <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
        <action android:name="com.sauci.app.WIDGET_CLICK"/>
@@ -52,4 +64,4 @@
      <meta-data android:name="android.appwidget.provider" android:resource="@xml/widgetprovider_livedraw"/>
    </receiver>
  </application>
-</manifest>
+</manifest>
@@ -1,4 +1,5 @@
 package com.sauci.app
+import expo.modules.splashscreen.SplashScreenManager

 import android.os.Build
 import android.os.Bundle
@@ -15,7 +16,10 @@ class MainActivity : ReactActivity() {
    // Set the theme to AppTheme BEFORE onCreate to support
    // coloring the background, status bar, and navigation bar.
    // This is required for expo-splash-screen.
-    setTheme(R.style.AppTheme);
+    // setTheme(R.style.AppTheme);
+    // @generated begin expo-splashscreen - expo prebuild (DO NOT MODIFY) sync-f3ff59a738c56c9a6119210cb55f0b613eb8b6af
+    SplashScreenManager.registerOnActivity(this)
+    // @generated end expo-splashscreen
    super.onCreate(null)
  }

@@ -5,40 +5,27 @@ import android.content.res.Configuration

 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
-import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.ReactPackage
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
-import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.common.ReleaseLevel
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint

 import expo.modules.ApplicationLifecycleDispatcher
-import expo.modules.ReactNativeHostWrapper
+import expo.modules.ExpoReactHostFactory

 class MainApplication : Application(), ReactApplication {

-  override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(
-        this,
-        object : DefaultReactNativeHost(this) {
-          override fun getPackages(): List<ReactPackage> {
-            val packages = PackageList(this).packages
-            // Packages that cannot be autolinked yet can be added manually here, for example:
-            // packages.add(new MyReactNativePackage());
-            return packages
-          }
-
-          override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry"
-
-          override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
-
-          override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-          override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-      }
-  )
-
-  override val reactHost: ReactHost
-    get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
+  override val reactHost: ReactHost by lazy {
+    ExpoReactHostFactory.getDefaultReactHost(
+      context = applicationContext,
+      packageList =
+        PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here, for example:
+          // add(MyReactNativePackage())
+        }
+    )
+  }

  override fun onCreate() {
    super.onCreate()
@@ -1,84 +1,6 @@
 package com.sauci.app.widget;

-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.util.Base64;
-import android.util.TypedValue;
-import android.widget.RemoteViews;
+import com.reactnativeandroidwidget.RNWidgetProvider;

-import com.sauci.app.R;
-
-public class LiveDraw extends AppWidgetProvider {
-
-    private static final String PREFS_NAME_SUFFIX = ".widgetdata";
-    private static final String KEY_IMAGE = "LiveDrawImage";
-    private static final int BG_COLOR = 0xFF1A1A2E;
-    private static final int CORNER_RADIUS_DP = 16;
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        for (int widgetId : appWidgetIds) {
-            updateWidget(context, appWidgetManager, widgetId);
-        }
-    }
-
-    private void updateWidget(Context context, AppWidgetManager appWidgetManager, int widgetId) {
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_live_draw);
-
-        String base64 = getStoredImage(context);
-        if (base64 != null && !base64.isEmpty()) {
-            try {
-                byte[] bytes = Base64.decode(base64, Base64.DEFAULT);
-                Bitmap decoded = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-                if (decoded != null) {
-                    Bitmap rounded = addRoundedBackground(context, decoded);
-                    views.setImageViewBitmap(R.id.widget_image, rounded);
-                    decoded.recycle();
-                }
-            } catch (Exception e) {
-                setPlaceholder(views);
-            }
-        } else {
-            setPlaceholder(views);
-        }
-
-        appWidgetManager.updateAppWidget(widgetId, views);
-    }
-
-    private String getStoredImage(Context context) {
-        SharedPreferences prefs = context.getSharedPreferences(
-            context.getPackageName() + PREFS_NAME_SUFFIX, Context.MODE_PRIVATE);
-        return prefs.getString(KEY_IMAGE, null);
-    }
-
-    private void setPlaceholder(RemoteViews views) {
-        views.setImageViewResource(R.id.widget_image, R.drawable.widget_placeholder);
-    }
-
-    private Bitmap addRoundedBackground(Context context, Bitmap drawing) {
-        float radius = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP, CORNER_RADIUS_DP,
-            context.getResources().getDisplayMetrics());
-
-        int w = drawing.getWidth();
-        int h = drawing.getHeight();
-
-        Bitmap output = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(output);
-
-        Paint bgPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        bgPaint.setColor(BG_COLOR);
-        canvas.drawRoundRect(new RectF(0, 0, w, h), radius, radius, bgPaint);
-
-        canvas.drawBitmap(drawing, 0, 0, null);
-
-        return output;
-    }
+public class LiveDraw extends RNWidgetProvider {
 }
@@ -2,6 +2,5 @@
  <color name="splashscreen_background">#1a1a2e</color>
  <color name="iconBackground">#1a1a2e</color>
  <color name="colorPrimary">#023c69</color>
-  <color name="colorPrimaryDark">#1a1a2e</color>
  <color name="notification_icon_color">#e94560</color>
 </resources>
@@ -1,6 +1,7 @@
 <resources>
  <string name="app_name">Sauci</string>
-  <string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
-  <string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
+  <string name="expo_system_ui_user_interface_style" translatable="false">automatic</string>
+  <string name="expo_runtime_version">1.0.8</string>
  <string name="widget_livedraw_description" translatable="false">See your shared drawing with your partner.</string>
+  <string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
 </resources>
@@ -1,18 +1,14 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="android:enforceNavigationBarContrast" tools:targetApi="29">true</item>
-    <item name="android:textColor">@android:color/black</item>
-    <item name="android:editTextStyle">@style/ResetEditText</item>
+  <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
    <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="android:statusBarColor">#1a1a2e</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
  </style>
-  <style name="ResetEditText" parent="@android:style/Widget.EditText">
-    <item name="android:padding">0dp</item>
-    <item name="android:textColorHint">#c8c8c8</item>
-    <item name="android:textColor">@android:color/black</item>
-  </style>
-  <style name="Theme.App.SplashScreen" parent="AppTheme">
-    <item name="android:windowBackground">@drawable/ic_launcher_background</item>
+  <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
+    <item name="windowSplashScreenBackground">@color/splashscreen_background</item>
+    <item name="windowSplashScreenAnimatedIcon">@drawable/splashscreen_logo</item>
+    <item name="postSplashScreenTheme">@style/AppTheme</item>
+    <item name="android:windowSplashScreenBehavior">icon_preferred</item>
  </style>
 </resources>
@@ -4,10 +4,18 @@
    android:minHeight="110dp"
    android:targetCellWidth="4"
    android:targetCellHeight="2"
+
+
+
    android:resizeMode="none"
+
    android:description="@string/widget_livedraw_description"
-    android:initialLayout="@layout/widget_live_draw"
+
+    android:initialLayout="@layout/rn_widget"
    android:previewImage="@drawable/livedraw_preview"
+
+
+
    android:updatePeriodMillis="1800000"
    android:widgetCategory="home_screen">
 </appwidget-provider>
@@ -1,26 +1,26 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
+  repositories {
+    google()
+    mavenCentral()
+  }
+  dependencies {
        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.6'
-        classpath 'com.google.gms:google-services:4.4.1'
-        classpath('com.android.tools.build:gradle')
-        classpath('com.facebook.react:react-native-gradle-plugin')
-        classpath('org.jetbrains.kotlin:kotlin-gradle-plugin')
-    }
+        classpath 'com.google.gms:google-services:4.4.4'
+    classpath('com.android.tools.build:gradle')
+    classpath('com.facebook.react:react-native-gradle-plugin')
+    classpath('org.jetbrains.kotlin:kotlin-gradle-plugin')
+  }
+}
+
+allprojects {
+  repositories {
+    google()
+    mavenCentral()
+    maven { url 'https://www.jitpack.io' }
+  }
 }

 apply plugin: "expo-root-project"
 apply plugin: "com.facebook.react.rootproject"
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://www.jitpack.io' }
-    }
-}
@@ -10,12 +10,12 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m

 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+org.gradle.parallel=true

 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
@@ -41,6 +41,11 @@ newArchEnabled=true
 # If set to false, you will be using JSC instead.
 hermesEnabled=true

+# Use this property to enable edge-to-edge display support.
+# This allows your app to draw behind system bars for an immersive UI.
+# Note: Only works with ReactActivity and should not be used with custom Activity.
+edgeToEdgeEnabled=true
+
 # Enable GIF support in React Native images (~200 B increase)
 expo.gif.enabled=true
 # Enable webp support in React Native images (~85 KB increase)
@@ -55,16 +60,7 @@ EX_DEV_CLIENT_NETWORK_INSPECTOR=true
 # Use legacy packaging to compress native libraries in the resulting APK.
 expo.useLegacyPackaging=false

-android.targetSdkVersion=36
-android.extraMavenRepos=[]
-# Specifies whether the app is configured to use edge-to-edge via the app config or plugin
-# WARNING: This property has been deprecated and will be removed in Expo SDK 55. Use `edgeToEdgeEnabled` or `react.edgeToEdgeEnabled` to determine whether the project is using edge-to-edge.
-expo.edgeToEdgeEnabled=true
-
-# Use this property to enable edge-to-edge display support.
-# This allows your app to draw behind system bars for an immersive UI.
-# Note: Only works with ReactActivity and should not be used with custom Activity.
-edgeToEdgeEnabled=true
-
+expo.inlineModules.watchedDirectories=[]
 android.compileSdkVersion=36
-android.buildToolsVersion=36.0.0
+android.targetSdkVersion=36
+android.buildToolsVersion=36.0.0
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


 # Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

@@ -206,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
        "$@"

 # Stop when "xargs" is not available.
@@ -1,3 +1,8 @@
+@REM Copyright (c) Meta Platforms, Inc. and affiliates.
+@REM
+@REM This source code is licensed under the MIT license found in the
+@REM LICENSE file in the root directory of this source tree.
+
@rem
@rem Copyright 2015 the original author or authors.
@rem
@@ -70,11 +75,10 @@ goto fail
 :execute
@rem Setup the command line

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

 :end
@rem End local scope for the variables with windows NT shell
@@ -6,7 +6,7 @@ pluginManagement {
    }.standardOutput.asText.get().trim()
  ).getParentFile().absolutePath
  includeBuild(reactNativeGradlePlugin)
-
+  
  def expoPluginsPath = new File(
    providers.exec {
      workingDir(rootDir)
@@ -29,10 +29,10 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
    ex.autolinkLibrariesFromCommand(expoAutolinking.rnConfigCommand)
  }
 }
+expoAutolinking.useExpoModules()

 rootProject.name = 'Sauci'

-expoAutolinking.useExpoModules()
 expoAutolinking.useExpoVersionCatalog()

 include ':app'
@@ -0,0 +1,106 @@
+// Dynamic Expo config.
+//
+// `app.json` stays the static source of truth for everything that is stable
+// across environments, including the `version`, `ios.buildNumber`, and
+// `android.versionCode` fields that EAS rewrites during a release build. This
+// file only layers the over-the-air update configuration on top, because the
+// XPREM update server selects a release channel from a build-time request
+// header and that value differs per EAS build profile.
+//
+// See `docs/mobile-ota.md`.
+
+/* global __dirname */
+
+const fs = require('fs');
+const path = require('path');
+
+const appJson = require('./app.json');
+
+/** Base URL of the self-hosted XPREM update server. */
+const OTA_SERVER_URL = 'https://ota.apps.jbrunton.co.uk';
+
+/** XPREM manifest endpoint. XPREM serves the Expo Updates protocol here. */
+const OTA_MANIFEST_URL = `${OTA_SERVER_URL}/manifest`;
+
+/**
+ * XPREM application UUID for Sauci, shown in the XPREM dashboard under App
+ * Info. Not a secret; overridable for pointing a build at another app.
+ */
+const OTA_APP_ID = process.env.XPREM_APP_ID || '9a66f3c2-fda7-416f-87e2-6db833b32e9d';
+
+/** Public code-signing certificate downloaded from the XPREM dashboard. */
+const CODE_SIGNING_CERTIFICATE_PATH = './certs/certificate.pem';
+
+/** Marker string present only in the committed placeholder certificate. */
+const CERTIFICATE_PLACEHOLDER_MARKER = 'XPREM-PLACEHOLDER-CERTIFICATE';
+
+/**
+ * Release channel bound to the build. XPREM maps a channel to a branch server
+ * side, so a channel can be repointed at a different branch without rebuilding.
+ * Set per EAS build profile in `eas.json` and exported before `eoas publish`.
+ */
+const releaseChannel = process.env.RELEASE_CHANNEL || 'development';
+
+/**
+ * Code signing is skipped for local development, where the packager serves the
+ * bundle directly and no signed manifest exists:
+ *   DISABLE_CODE_SIGNING=1 npx expo start --dev-client
+ */
+const codeSigningDisabled = Boolean(process.env.DISABLE_CODE_SIGNING);
+
+if (releaseChannel === 'production' && codeSigningDisabled) {
+  throw new Error(
+    'RELEASE_CHANNEL=production does not permit DISABLE_CODE_SIGNING. ' +
+      'Production builds must embed the XPREM code-signing certificate and metadata.',
+  );
+}
+
+function assertUpdateConfigIsReal() {
+  const certificatePath = path.join(__dirname, CODE_SIGNING_CERTIFICATE_PATH);
+  const certificate = fs.existsSync(certificatePath)
+    ? fs.readFileSync(certificatePath, 'utf8')
+    : '';
+
+  if (!certificate || certificate.includes(CERTIFICATE_PLACEHOLDER_MARKER)) {
+    throw new Error(
+      `RELEASE_CHANNEL=${releaseChannel} requires the real XPREM code-signing ` +
+        `certificate at apps/mobile/${CODE_SIGNING_CERTIFICATE_PATH}. ` +
+        'Download it from the XPREM dashboard App Info page. See docs/mobile-ota.md.',
+    );
+  }
+}
+
+// A build or publish always names its channel explicitly. Fail loudly there
+// rather than shipping a build that can never validate a signed manifest.
+if (process.env.RELEASE_CHANNEL) {
+  assertUpdateConfigIsReal();
+}
+
+module.exports = () => ({
+  ...appJson.expo,
+  // Keep this explicit because EOAS validates a primitive runtime string before
+  // upload. The release version script updates it atomically with app.json and
+  // the checked-in native runtime values.
+  runtimeVersion: '1.0.8',
+  updates: {
+    enabled: true,
+    url: OTA_MANIFEST_URL,
+    checkAutomatically: 'ON_LOAD',
+    fallbackToCacheTimeout: 5000,
+    codeSigningCertificate: codeSigningDisabled
+      ? undefined
+      : CODE_SIGNING_CERTIFICATE_PATH,
+    codeSigningMetadata: codeSigningDisabled
+      ? undefined
+      : { keyid: 'main', alg: 'rsa-v1_5-sha256' },
+    // expo-updates only sends headers that were declared at build time, so
+    // every header XPREM may need has to be present here even when empty.
+    requestHeaders: {
+      'expo-channel-name': releaseChannel,
+      'expo-app-id': OTA_APP_ID,
+      // Branch surfing: lets a non-production build be pointed at another
+      // branch at runtime. Empty means the channel mapping decides.
+      'xprem-branch': '',
+    },
+  },
+});
@@ -2,17 +2,15 @@
  "expo": {
    "name": "Sauci",
    "slug": "sauci",
-    "version": "1.0.6",
+    "version": "1.0.8",
    "orientation": "portrait",
    "icon": "./assets/icon.png",
    "scheme": "app.sauci",
    "userInterfaceStyle": "automatic",
-    "newArchEnabled": true,
-    "splash": {
-      "image": "./assets/splash-icon.png",
-      "resizeMode": "contain",
-      "backgroundColor": "#1a1a2e"
-    },
+    "platforms": [
+      "ios",
+      "android"
+    ],
    "ios": {
      "supportsTablet": false,
      "bundleIdentifier": "com.sauci.app",
@@ -27,7 +25,7 @@
          "group.com.sauci.app"
        ]
      },
-      "buildNumber": "45",
+      "buildNumber": "49",
      "usesAppleSignIn": true,
      "googleServicesFile": "./GoogleService-Info.plist",
      "infoPlist": {
@@ -189,7 +187,7 @@
        "backgroundColor": "#1a1a2e"
      },
      "package": "com.sauci.app",
-      "versionCode": 48,
+      "versionCode": 51,
      "googleServicesFile": "./google-services.json",
      "permissions": [
        "RECEIVE_BOOT_COMPLETED",
@@ -223,6 +221,14 @@
    },
    "plugins": [
      "./plugins/withFixHoisting.js",
+      [
+        "expo-splash-screen",
+        {
+          "image": "./assets/splash-icon.png",
+          "resizeMode": "contain",
+          "backgroundColor": "#1a1a2e"
+        }
+      ],
      "@react-native-firebase/app",
      [
        "expo-build-properties",
@@ -298,7 +304,19 @@
        }
      ],
      "./plugins/withWidgetExported.js",
-      "./plugins/withNativeWidget.js"
+      "./plugins/withNativeWidget.js",
+      [
+        "react-native-share",
+        {
+          "ios": [
+            "instagram",
+            "instagram-stories"
+          ],
+          "android": [
+            "com.instagram.android"
+          ]
+        }
+      ]
    ],
    "experiments": {
      "typedRoutes": true
@@ -308,7 +326,10 @@
        "origin": false
      },
      "eas": {
-        "projectId": "807ca0af-e9bd-40e8-a658-f3382072c724"
+        "projectId": "807ca0af-e9bd-40e8-a658-f3382072c724",
+        "observe": {
+          "endpointUrl": "https://ota.apps.jbrunton.co.uk/observe/9a66f3c2-fda7-416f-87e2-6db833b32e9d"
+        }
      }
    },
    "owner": "jjbrunton-apps"
@@ -13,6 +13,7 @@ import { StreakDisplay } from '../../src/components/StreakDisplay';
 import { Events } from '../../src/lib/analytics';
 import { colors, spacing, typography } from '../../src/theme';
 import type { QuestionPack, Category } from '../../src/types';
+import { pickRecommendedPacks, RECOMMENDED_PACKS_LABEL } from '../../src/features/home/recommendedPacks';

 const MAX_CONTENT_WIDTH = 600;

@@ -112,6 +113,13 @@ export default function DiscoveryScreen() {
    [packs, categories]
  );

+  // A small, cheap personalization: highlight packs that match what the user
+  // said brought them to Sauci during onboarding, ahead of the full catalog.
+  const recommendedPacks = useMemo(
+    () => pickRecommendedPacks(packs, categories, user?.usage_reason ?? null),
+    [packs, categories, user?.usage_reason]
+  );
+
  // Check if user has no packs enabled (empty state)
  const hasNoPacks = packs.length === 0;

@@ -169,6 +177,17 @@ export default function DiscoveryScreen() {
          {/* Quiz */}
          <QuizTile delay={225} />

+          {/* Personalized pick based on the onboarding usage reason */}
+          {recommendedPacks.length > 0 && (
+            <ContentRow
+              title={RECOMMENDED_PACKS_LABEL}
+              packs={recommendedPacks}
+              isPremiumUser={isPremiumUser}
+              delay={240}
+              onShowPaywall={() => setShowPaywall(true)}
+            />
+          )}
+
          {/* Content Rows by Category */}
          {packsByCategory.map((group, index) => (
            <ContentRow
@@ -69,10 +69,12 @@ export default function MatchesScreen() {
        checkNudgeCooldown,
    } = useMatchStore();
    const { user, couple, partner } = useAuthStore();
+    const userId = user?.id;
    const router = useRouter();
    const { width } = useWindowDimensions();
    const isWideScreen = width > MAX_CONTENT_WIDTH;
    const [showTutorial, setShowTutorial] = useState(false);
+    const tutorialDismissedRef = useRef(false);
    const [nudgeFeedback, setNudgeFeedback] = useState<string | null>(null);
    const [headerHeight, setHeaderHeight] = useState(130);

@@ -104,21 +106,30 @@ export default function MatchesScreen() {
    // Check if tutorial should be shown when screen is focused or matches change
    useFocusEffect(
        useCallback(() => {
+            let isActive = true;
+
            const checkTutorial = async () => {
-                if (matches.length > 0) {
-                    const seen = await hasSeenMatchesTutorial();
-                    if (!seen) {
+                if (matches.length > 0 && userId) {
+                    const seen = await hasSeenMatchesTutorial(userId);
+                    if (isActive && !tutorialDismissedRef.current && !seen) {
                        setShowTutorial(true);
                    }
                }
            };
-            checkTutorial();
-        }, [matches.length])
+            void checkTutorial();
+
+            return () => {
+                isActive = false;
+            };
+        }, [matches.length, userId])
    );

    const handleTutorialComplete = async () => {
-        await markMatchesTutorialSeen();
+        if (!userId) return;
+
+        tutorialDismissedRef.current = true;
        setShowTutorial(false);
+        await markMatchesTutorialSeen(userId);
    };

    // Load whichever view is showing, once. Returning to this tab reuses what is
@@ -389,7 +389,7 @@ const styles = StyleSheet.create({
        zIndex: 100,
    },
    navBarBackground: {
-        ...StyleSheet.absoluteFillObject,
+        ...StyleSheet.absoluteFill,
        borderBottomWidth: 1,
        borderBottomColor: colors.border,
        backgroundColor: colors.background,