Add couple comfort zone gate toggle and bump version

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

apps/admin/src/hooks/useAppConfig.ts

@@ -5,6 +5,7 @@ export interface AppConfig {
     id: string;
     answer_gap_threshold: number;
     daily_response_limit: number;
+    couple_intensity_gate_enabled: boolean | null;
     updated_at: string | null;
     updated_by: string | null;
 }

apps/admin/src/pages/AppSettingsPage.tsx

@@ -4,6 +4,7 @@ import { useAuth, PERMISSION_KEYS } from '@/contexts/AuthContext';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { Switch } from '@/components/ui/switch';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
@@ -29,6 +30,7 @@ export function AppSettingsPage() {
             setFormData({
                 answer_gap_threshold: config.answer_gap_threshold ?? 10,
                 daily_response_limit: config.daily_response_limit ?? 0,
+                couple_intensity_gate_enabled: config.couple_intensity_gate_enabled ?? false,
             });
             setHasChanges(false);
         }
@@ -61,6 +63,7 @@ export function AppSettingsPage() {
             setFormData({
                 answer_gap_threshold: config.answer_gap_threshold ?? 10,
                 daily_response_limit: config.daily_response_limit ?? 0,
+                couple_intensity_gate_enabled: config.couple_intensity_gate_enabled ?? false,
             });
             setHasChanges(false);
         }
@@ -157,6 +160,19 @@ export function AppSettingsPage() {
                     </CardDescription>
                 </CardHeader>
                 <CardContent className="space-y-4">
+                    <div className="flex items-center justify-between">
+                        <div className="space-y-0.5">
+                            <Label>Couple Comfort Zone Gate</Label>
+                            <p className="text-sm text-muted-foreground">
+                                When enabled, both recommended questions and answer-gap blocking use the lower of the two partners' comfort zones.
+                            </p>
+                        </div>
+                        <Switch
+                            checked={Boolean(formData.couple_intensity_gate_enabled)}
+                            onCheckedChange={(checked) => handleChange('couple_intensity_gate_enabled', checked)}
+                        />
+                    </div>
+
                     <div className="space-y-2">
                         <Label htmlFor="threshold">Answer Gap Threshold</Label>
                         <Input

apps/admin/src/pages/users/UserDetailPage.tsx

@@ -1,7 +1,6 @@
 import { useState, useEffect, useCallback } from 'react';
 import { useParams, Link } from 'react-router-dom';
 import { supabase, supabaseConfig } from '@/config';
-import { auditedSupabase } from '@/hooks/useAuditedSupabase';
 import { useRealtimeSubscription } from '@/hooks/useRealtimeSubscription';
 import { RealtimeStatusIndicator } from '@/components/RealtimeStatusIndicator';
 import { useAuth, PERMISSION_KEYS } from '@/contexts/AuthContext';
@@ -339,7 +338,7 @@ export function UserDetailPage() {
                 expires_at_param: expiresAt,
             });
             if (error) throw error;
-            const { data: updatedProfile } = await supabase.rpc('get_profile_with_auth_info', { user_id: userId }).single();
+            const { data: updatedProfile } = await supabase.rpc('get_profile_with_auth_info', { user_id: userId }).single<Profile>();
             if (updatedProfile) setProfile(updatedProfile);
             setUpgradeOpen(false);
             alert('User upgraded to premium successfully!');
@@ -355,7 +354,7 @@ export function UserDetailPage() {
         if (!userId) return;
         setLoading(true);
         try {
-            const { data: profileData } = await supabase.rpc('get_profile_with_auth_info', { user_id: userId }).single();
+            const { data: profileData } = await supabase.rpc('get_profile_with_auth_info', { user_id: userId }).single<Profile>();
             setProfile(profileData);
 
             // Fetch feature interests for the user

apps/mobile/android/app/build.gradle

@@ -93,7 +93,7 @@ android {
         applicationId 'com.sauci.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 30
+        versionCode 31
         versionName "1.0.2"
     }
     signingConfigs {

apps/mobile/app.json

@@ -177,7 +177,7 @@
         "backgroundColor": "#1a1a2e"
       },
       "package": "com.sauci.app",
-      "versionCode": 30,
+      "versionCode": 31,
       "googleServicesFile": "./google-services.json",
       "permissions": [
         "RECEIVE_BOOT_COMPLETED",

apps/supabase/migrations/20260117000004_add_couple_intensity_gate.sql

@@ -0,0 +1,368 @@
+-- Couple comfort-zone gate rollout toggle
+--
+-- When enabled, both recommended question selection and answer-gap blocking
+-- use the couple-effective max_intensity (min of both partners).
+--
+-- Backwards compatible:
+-- - RPC names/args/return shapes unchanged
+-- - Toggle defaults to false
+
+-- Add toggle to app_config
+ALTER TABLE app_config
+ADD COLUMN IF NOT EXISTS couple_intensity_gate_enabled BOOLEAN DEFAULT FALSE;
+
+COMMENT ON COLUMN app_config.couple_intensity_gate_enabled IS 'When true, recommended questions and answer-gap blocking use couple-effective max_intensity (min of both partners). Used for backwards-compatible rollout.';
+
+-- ============================================================================
+-- RPC FUNCTION: get_answer_gap_status
+-- Add optional couple-intensity filtering (behind toggle)
+-- ============================================================================
+
+CREATE OR REPLACE FUNCTION get_answer_gap_status()
+RETURNS TABLE(
+    unanswered_by_partner integer,
+    threshold integer,
+    is_blocked boolean
+)
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $$
+DECLARE
+    v_user_id UUID;
+    v_couple_id UUID;
+    v_partner_id UUID;
+    v_my_unanswered integer;
+    v_partner_unanswered integer;
+    v_net_gap integer;
+    v_threshold integer;
+    v_use_couple_intensity_gate boolean;
+    v_user_max_intensity integer;
+    v_partner_max_intensity integer;
+    v_effective_max_intensity integer;
+BEGIN
+    v_user_id := auth.uid();
+
+    -- Get user's couple_id + max_intensity
+    SELECT p.couple_id, COALESCE(p.max_intensity, 5)
+    INTO v_couple_id, v_user_max_intensity
+    FROM profiles p
+    WHERE p.id = v_user_id;
+
+    -- No couple = no blocking needed
+    IF v_couple_id IS NULL THEN
+        RETURN QUERY SELECT 0, 0, false;
+        RETURN;
+    END IF;
+
+    -- Get partner's ID + max_intensity
+    SELECT p.id, COALESCE(p.max_intensity, 5)
+    INTO v_partner_id, v_partner_max_intensity
+    FROM profiles p
+    WHERE p.couple_id = v_couple_id AND p.id != v_user_id
+    LIMIT 1;
+
+    -- No partner = no blocking needed
+    IF v_partner_id IS NULL THEN
+        RETURN QUERY SELECT 0, 0, false;
+        RETURN;
+    END IF;
+
+    -- Get threshold + toggle from app_config
+    SELECT
+        COALESCE(ac.answer_gap_threshold, 10),
+        COALESCE(ac.couple_intensity_gate_enabled, FALSE)
+    INTO v_threshold, v_use_couple_intensity_gate
+    FROM app_config ac
+    LIMIT 1;
+
+    -- Safety: if config row is missing, default to disabled
+    v_threshold := COALESCE(v_threshold, 10);
+    v_use_couple_intensity_gate := COALESCE(v_use_couple_intensity_gate, FALSE);
+
+    -- If threshold is 0, feature is disabled
+    IF v_threshold = 0 THEN
+        RETURN QUERY SELECT 0, 0, false;
+        RETURN;
+    END IF;
+
+    v_effective_max_intensity := LEAST(v_user_max_intensity, v_partner_max_intensity);
+
+    -- Calculate NET gap to prevent deadlocks
+    WITH enabled_packs AS (
+        SELECT cp.pack_id
+        FROM couple_packs cp
+        WHERE cp.couple_id = v_couple_id AND cp.enabled = true
+    )
+    SELECT
+        -- Questions I answered that partner hasn't
+        COALESCE(SUM(CASE WHEN r.user_id = v_user_id AND NOT EXISTS (
+            SELECT 1 FROM responses pr
+            WHERE pr.question_id = r.question_id
+            AND pr.user_id = v_partner_id
+        ) THEN 1 ELSE 0 END), 0)::integer,
+        -- Questions partner answered that I haven't
+        COALESCE(SUM(CASE WHEN r.user_id = v_partner_id AND NOT EXISTS (
+            SELECT 1 FROM responses pr
+            WHERE pr.question_id = r.question_id
+            AND pr.user_id = v_user_id
+        ) THEN 1 ELSE 0 END), 0)::integer
+    INTO v_my_unanswered, v_partner_unanswered
+    FROM responses r
+    INNER JOIN questions q ON q.id = r.question_id
+    WHERE r.couple_id = v_couple_id
+    AND r.user_id IN (v_user_id, v_partner_id)
+    AND EXISTS (SELECT 1 FROM enabled_packs)
+    AND q.pack_id IN (SELECT pack_id FROM enabled_packs)
+    AND (
+        NOT v_use_couple_intensity_gate
+        OR q.intensity IS NULL
+        OR q.intensity <= v_effective_max_intensity
+    );
+
+    -- Net gap: only positive values mean user is truly ahead
+    v_net_gap := GREATEST(0, v_my_unanswered - v_partner_unanswered);
+
+    RETURN QUERY SELECT v_net_gap, v_threshold, (v_net_gap >= v_threshold);
+END;
+$$;
+
+COMMENT ON FUNCTION get_answer_gap_status() IS 'Returns answer gap status using NET gap calculation. When enabled, applies couple-effective max_intensity to prevent comfort-zone soft-locks.';
+
+-- ============================================================================
+-- RPC FUNCTION: get_recommended_questions
+-- Add optional couple-intensity filtering (behind toggle)
+-- ============================================================================
+
+CREATE OR REPLACE FUNCTION get_recommended_questions(target_pack_id UUID DEFAULT NULL)
+RETURNS TABLE(
+  id UUID,
+  text TEXT,
+  partner_text TEXT,
+  is_two_part BOOLEAN,
+  pack_id UUID,
+  intensity INTEGER,
+  partner_answered BOOLEAN,
+  allowed_couple_genders TEXT[],
+  target_user_genders TEXT[]
+)
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $$
+DECLARE
+  v_user_id UUID;
+  v_couple_id UUID;
+  v_partner_id UUID;
+  v_user_gender TEXT;
+  v_partner_gender TEXT;
+  v_couple_type TEXT;
+  v_has_premium BOOLEAN;
+  v_gap_threshold INTEGER;
+  v_my_unanswered INTEGER;
+  v_partner_unanswered INTEGER;
+  v_net_gap INTEGER;
+  v_user_max_intensity INTEGER;
+  v_partner_max_intensity INTEGER;
+  v_effective_max_intensity INTEGER;
+  v_use_couple_intensity_gate BOOLEAN;
+  v_daily_limit INTEGER;
+  v_daily_count INTEGER;
+  v_today_start TIMESTAMPTZ;
+  v_tomorrow_start TIMESTAMPTZ;
+BEGIN
+  v_user_id := auth.uid();
+
+  SELECT p.couple_id, p.gender, COALESCE(p.max_intensity, 5)
+  INTO v_couple_id, v_user_gender, v_user_max_intensity
+  FROM public.profiles p
+  WHERE p.id = v_user_id;
+
+  IF v_couple_id IS NULL THEN
+    RETURN;
+  END IF;
+
+  SELECT p.id, p.gender, COALESCE(p.max_intensity, 5)
+  INTO v_partner_id, v_partner_gender, v_partner_max_intensity
+  FROM public.profiles p
+  WHERE p.couple_id = v_couple_id AND p.id != v_user_id
+  LIMIT 1;
+
+  -- Toggle: gate questions by couple-effective intensity
+  SELECT COALESCE(ac.couple_intensity_gate_enabled, FALSE)
+  INTO v_use_couple_intensity_gate
+  FROM app_config ac
+  LIMIT 1;
+
+  v_use_couple_intensity_gate := COALESCE(v_use_couple_intensity_gate, FALSE);
+
+  v_effective_max_intensity := CASE
+    WHEN v_use_couple_intensity_gate AND v_partner_id IS NOT NULL THEN LEAST(v_user_max_intensity, v_partner_max_intensity)
+    ELSE v_user_max_intensity
+  END;
+
+  -- Check premium access (used for both answer gap and daily limit)
+  v_has_premium := public.has_premium_access(v_user_id);
+
+  -- Check daily response limit (only when not browsing a specific pack and user is non-premium)
+  IF v_partner_id IS NOT NULL AND target_pack_id IS NULL AND NOT v_has_premium THEN
+    SELECT COALESCE(ac.daily_response_limit, 0) INTO v_daily_limit
+    FROM app_config ac
+    LIMIT 1;
+
+    IF v_daily_limit > 0 THEN
+      v_today_start := date_trunc('day', NOW() AT TIME ZONE 'UTC') AT TIME ZONE 'UTC';
+      v_tomorrow_start := v_today_start + INTERVAL '1 day';
+
+      SELECT COUNT(*)::INTEGER INTO v_daily_count
+      FROM responses r
+      WHERE r.user_id = v_user_id
+      AND r.created_at >= v_today_start
+      AND r.created_at < v_tomorrow_start;
+
+      IF v_daily_count >= v_daily_limit THEN
+        RETURN;
+      END IF;
+    END IF;
+  END IF;
+
+  -- Check answer gap threshold using NET gap (only when not browsing a specific pack)
+  IF v_partner_id IS NOT NULL AND target_pack_id IS NULL THEN
+    SELECT COALESCE(ac.answer_gap_threshold, 10) INTO v_gap_threshold
+    FROM app_config ac
+    LIMIT 1;
+
+    IF v_gap_threshold > 0 THEN
+      WITH enabled_packs AS (
+        SELECT cp.pack_id
+        FROM couple_packs cp
+        WHERE cp.couple_id = v_couple_id AND cp.enabled = true
+      )
+      SELECT
+        COALESCE(SUM(CASE WHEN r.user_id = v_user_id AND NOT EXISTS (
+            SELECT 1 FROM responses pr
+            WHERE pr.question_id = r.question_id
+            AND pr.user_id = v_partner_id
+        ) THEN 1 ELSE 0 END), 0)::integer,
+        COALESCE(SUM(CASE WHEN r.user_id = v_partner_id AND NOT EXISTS (
+            SELECT 1 FROM responses pr
+            WHERE pr.question_id = r.question_id
+            AND pr.user_id = v_user_id
+        ) THEN 1 ELSE 0 END), 0)::integer
+      INTO v_my_unanswered, v_partner_unanswered
+      FROM responses r
+      INNER JOIN questions q ON q.id = r.question_id
+      WHERE r.couple_id = v_couple_id
+      AND r.user_id IN (v_user_id, v_partner_id)
+      AND EXISTS (SELECT 1 FROM enabled_packs)
+      AND q.pack_id IN (SELECT ep.pack_id FROM enabled_packs ep)
+      AND (
+        NOT v_use_couple_intensity_gate
+        OR q.intensity IS NULL
+        OR q.intensity <= v_effective_max_intensity
+      );
+
+      v_net_gap := GREATEST(0, v_my_unanswered - v_partner_unanswered);
+
+      IF v_net_gap >= v_gap_threshold THEN
+        RETURN;
+      END IF;
+    END IF;
+  END IF;
+
+  IF v_user_gender IS NOT NULL AND v_partner_gender IS NOT NULL THEN
+      IF v_user_gender < v_partner_gender THEN
+        v_couple_type := v_user_gender || '+' || v_partner_gender;
+      ELSE
+        v_couple_type := v_partner_gender || '+' || v_user_gender;
+      END IF;
+  END IF;
+
+  RETURN QUERY
+  WITH user_config_exists AS (
+    SELECT 1 FROM public.couple_packs WHERE couple_id = v_couple_id LIMIT 1
+  ),
+  active_packs AS (
+    SELECT target_pack_id AS pack_id
+    WHERE target_pack_id IS NOT NULL
+    AND EXISTS (
+      SELECT 1 FROM public.question_packs qp
+      WHERE qp.id = target_pack_id
+      AND (qp.is_premium = FALSE OR v_has_premium = TRUE)
+    )
+    UNION ALL
+    SELECT cp.pack_id FROM public.couple_packs cp
+    INNER JOIN public.question_packs qp ON qp.id = cp.pack_id
+    WHERE target_pack_id IS NULL
+    AND cp.couple_id = v_couple_id
+    AND cp.enabled = TRUE
+    AND (qp.is_premium = FALSE OR v_has_premium = TRUE)
+    AND EXISTS (SELECT 1 FROM user_config_exists)
+    UNION ALL
+    SELECT p.id AS pack_id FROM public.question_packs p
+    WHERE target_pack_id IS NULL
+    AND p.is_public = TRUE
+    AND (p.is_premium = FALSE OR v_has_premium = TRUE)
+    AND NOT EXISTS (SELECT 1 FROM user_config_exists)
+  )
+  SELECT
+    q.id,
+    CASE
+      WHEN q.partner_text IS NOT NULL AND EXISTS (
+        SELECT 1 FROM public.responses r
+        WHERE r.question_id = q.id
+        AND r.couple_id = v_couple_id
+        AND r.user_id != v_user_id
+      ) THEN q.partner_text
+      ELSE q.text
+    END as text,
+    q.partner_text,
+    q.partner_text IS NOT NULL as is_two_part,
+    q.pack_id,
+    q.intensity,
+    EXISTS (
+      SELECT 1 FROM public.responses r
+      WHERE r.question_id = q.id
+      AND r.couple_id = v_couple_id
+      AND r.user_id != v_user_id
+    ) AS partner_answered,
+    q.allowed_couple_genders,
+    q.target_user_genders
+  FROM public.questions q
+  WHERE q.pack_id IN (SELECT ap.pack_id FROM active_packs ap)
+  AND NOT EXISTS (
+    SELECT 1 FROM public.responses r
+    WHERE r.question_id = q.id
+    AND r.user_id = v_user_id
+  )
+  AND (
+    q.allowed_couple_genders IS NULL
+    OR v_couple_type IS NULL
+    OR v_couple_type = ANY(q.allowed_couple_genders)
+  )
+  AND (
+    q.target_user_genders IS NULL
+    OR v_user_gender = ANY(q.target_user_genders)
+    OR EXISTS (
+      SELECT 1 FROM public.responses r
+      WHERE r.question_id = q.id
+      AND r.couple_id = v_couple_id
+      AND r.user_id != v_user_id
+    )
+  )
+  AND (
+    q.intensity IS NULL
+    OR q.intensity <= v_effective_max_intensity
+  )
+  ORDER BY
+    EXISTS (
+      SELECT 1 FROM public.responses r
+      WHERE r.question_id = q.id
+      AND r.couple_id = v_couple_id
+      AND r.user_id != v_user_id
+    ) DESC,
+    q.intensity ASC;
+END;
+$$;
+
+COMMENT ON FUNCTION get_recommended_questions(UUID) IS 'Returns recommended questions prioritizing partner-answered questions first. When enabled, applies couple-effective max_intensity to keep pools aligned and avoid comfort-zone soft-locks.';