Add search escaping, chat fixes, and theme boot

Multiple robustness and UX improvements:

- New utils: escapeIlikePattern to safely escape ILIKE patterns and pendingBootstrapThemeMode for bootstrapping ThemeMode from SharedPreferences.
- Main now reads saved theme into pendingBootstrapThemeMode to avoid light->dark flash; ThemeNotifier boots from that value and reconciles with prefs.
- SearchRepository now escapes queries, clamps length, and uses safe ilike filters; updated select projection for posts.
- Chat: added logging, safer realtime payload parsing, fetchThreadById for deep links, ThreadMessagesNotifier clears previous state on thread switch and guards against races, and ChatController.ensureThreadLoaded to merge single thread when list is stale.
- Chat UI: improved init flow to refresh/ensure thread, added error/retry UI and back navigation handling, and adjusted header details.
- Misc: added developer logging on various repository/controller failures, bounded list limits for marketplace/pets/orders, null-safe dental log getters, minor lifecycle checks (ref.mounted), and other small fixes.

Author: syed-reza98

lib/controllers/auth_controller.dart

@@ -48,15 +48,14 @@ class AuthNotifier extends Notifier<AuthState> {
   // Guard: prevent auth listener from overwriting state during active operations
   bool _isPerformingAuthAction = false;
 
+  /// Supabase auth stream uses the SDK type named `AuthState` (same name as our
+  /// widget layer state class); keep this untyped to avoid import clashes.
+  StreamSubscription<dynamic>? _authSubscription;
+
   @override
   AuthState build() {
-    _init();
-    return AuthState();
-  }
-
-  void _init() {
-    // Listen to Supabase auth state changes continuously
-    authRepository.authStateChanges.listen((event) async {
+    ref.onDispose(() => _authSubscription?.cancel());
+    _authSubscription ??= authRepository.authStateChanges.listen((event) async {
       // Skip if we're in the middle of login/register — those set state directly
       if (_isPerformingAuthAction) return;
 
@@ -95,6 +94,8 @@ class AuthNotifier extends Notifier<AuthState> {
 
     // Check current session immediately
     _checkCurrentSession();
+
+    return AuthState();
   }
 
   Future<void> _checkCurrentSession() async {

lib/controllers/chat_controller.dart

@@ -1,3 +1,5 @@
+import 'dart:developer' as developer;
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import '../models/chat_thread_model.dart';
@@ -25,19 +27,31 @@ class ThreadMessagesNotifier extends Notifier<List<MessageModel>> {
   Future<void> init(String threadId) async {
     _threadId = threadId;
 
+    // Clear immediately so a fast thread switch never shows the prior thread.
+    state = [];
+    _channel?.unsubscribe();
+    _channel = null;
+
     // Load initial messages
     try {
       final messages = await chatRepository.fetchMessages(threadId);
+      if (_threadId != threadId) return;
       state = messages;
-    } catch (_) {
-      state = [];
+    } catch (e, st) {
+      developer.log(
+        'fetchMessages failed',
+        name: 'ThreadMessagesNotifier',
+        error: e,
+        stackTrace: st,
+      );
+      if (_threadId == threadId) state = [];
     }
 
     // Subscribe to real-time updates
-    _channel?.unsubscribe();
     _channel = chatRepository.subscribeToMessages(
       threadId: threadId,
       onMessage: (message) {
+        if (_threadId != threadId) return;
         if (!state.any((m) => m.id == message.id)) {
           state = [...state, message];
         }
@@ -73,7 +87,13 @@ class ThreadMessagesNotifier extends Notifier<List<MessageModel>> {
 
       // Message notifications are handled by the DB trigger
       // (notify_on_new_message) to avoid duplicates.
-    } catch (_) {
+    } catch (e, st) {
+      developer.log(
+        'sendMessage failed',
+        name: 'ThreadMessagesNotifier',
+        error: e,
+        stackTrace: st,
+      );
       // Rollback optimistic message
       state = state.where((m) => m.id != tempId).toList();
     }
@@ -197,6 +217,42 @@ class ChatController extends Notifier<ChatState> {
     }
   }
 
+  /// When navigating directly to `/chat/:id`, the thread may not yet appear in
+  /// [state.threads]. Fetch that row (with participant pets) and merge it in.
+  Future<void> ensureThreadLoaded(String threadId) async {
+    if (state.threads.any((t) => t.id == threadId)) return;
+
+    final activePet = ref.read(activePetProvider);
+    if (activePet == null) return;
+
+    try {
+      final thread =
+          await chatRepository.fetchThreadById(threadId, activePet.id);
+      if (thread == null) return;
+
+      final unreadCounts = await chatRepository.fetchUnreadCountsForThreads(
+        [threadId],
+        activePet.id,
+      );
+      final merged = thread.copyWith(
+        unreadCount: unreadCounts[threadId] ?? thread.unreadCount,
+      );
+
+      if (state.threads.any((t) => t.id == threadId)) return;
+      state = state.copyWith(
+        threads: [merged, ...state.threads],
+      );
+    } catch (e, st) {
+      developer.log(
+        'ensureThreadLoaded failed',
+        name: 'ChatController',
+        error: e,
+        stackTrace: st,
+      );
+      state = state.copyWith(error: 'Could not load conversation header.');
+    }
+  }
+
   Future<void> markThreadAsRead(String threadId) async {
     final activePet = ref.read(activePetProvider);
     if (activePet == null) return;

lib/controllers/feed_controller.dart

@@ -1,3 +1,5 @@
+import 'dart:developer' as developer;
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:supabase_flutter/supabase_flutter.dart' hide AuthState;
 import '../models/post_model.dart';
@@ -115,7 +117,14 @@ class FeedNotifier extends Notifier<FeedState> {
           return post.copyWith(comments: [...post.comments, comment]);
         }).toList(),
       );
-    } catch (_) {}
+    } catch (e, st) {
+      developer.log(
+        'Realtime comment fetch failed',
+        name: 'FeedNotifier',
+        error: e,
+        stackTrace: st,
+      );
+    }
   }
 
   Future<void> _fetchPosts() async {

lib/controllers/health_controller.dart

@@ -55,25 +55,20 @@ class HealthState {
     return result;
   }
 
-  DentalLog? get lastHomeBrushing => dentalLogs.firstWhere(
-        (d) => d.cleaningType == 'home_brushing',
-        orElse: () => DentalLog(
-          id: '',
-          petId: '',
-          logDate: DateTime(2000),
-          cleaningType: 'home_brushing',
-        ),
-      );
+  DentalLog? get lastHomeBrushing {
+    final matches = dentalLogs.where((d) => d.cleaningType == 'home_brushing').toList();
+    if (matches.isEmpty) return null;
+    matches.sort((a, b) => b.logDate.compareTo(a.logDate));
+    return matches.first;
+  }
 
-  DentalLog? get lastProfessionalCleaning => dentalLogs.firstWhere(
-        (d) => d.cleaningType == 'professional_cleaning',
-        orElse: () => DentalLog(
-          id: '',
-          petId: '',
-          logDate: DateTime(2000),
-          cleaningType: 'professional_cleaning',
-        ),
-      );
+  DentalLog? get lastProfessionalCleaning {
+    final matches =
+        dentalLogs.where((d) => d.cleaningType == 'professional_cleaning').toList();
+    if (matches.isEmpty) return null;
+    matches.sort((a, b) => b.logDate.compareTo(a.logDate));
+    return matches.first;
+  }
 
   /// Number of active health alerts (overdue medications, parasite, etc.)
   int get alertCount {

lib/controllers/match_controller.dart

@@ -69,17 +69,26 @@ class MatchState {
 // ---------------------------------------------------------------------------
 class MatchController extends Notifier<MatchState> {
   int _loadGeneration = 0; // cancel stale async loads
+  String? _lastLoadedPetId;
 
   @override
   MatchState build() {
     final activePet = ref.watch(activePetProvider);
-    debugPrint('[MatchController] build: activePet=${activePet?.name}');
-    if (activePet != null) {
-      // Initial load — state already has filterAnimal/filterBreed as null
-      _load(activePet.id);
+    if (activePet == null) {
+      _lastLoadedPetId = null;
+      return MatchState();
+    }
+
+    // Do not return a fresh [MatchState(isLoading: true)] on every rebuild —
+    // that wipes discovery data whenever [activePetProvider] notifies with the
+    // same pet id (new model instance). Only reset loading when the pet id changes.
+    if (_lastLoadedPetId != activePet.id) {
+      _lastLoadedPetId = activePet.id;
+      Future.microtask(() => _load(activePet.id));
       return MatchState(isLoading: true);
     }
-    return MatchState();
+
+    return state;
   }
 
   Future<void> _load(String myPetId) async {

lib/controllers/pet_care_controller.dart

@@ -429,6 +429,7 @@ class PetCareNotifier extends Notifier<PetCareState> {
     if (today == null) return;
     try {
       final saved = await petCareRepository.upsertLog(today);
+      if (!ref.mounted) return;
       // Keep the server-assigned id but otherwise prefer the local copy
       // (the user may have toggled more between save & response).
       final logs = state.recentLogs;

lib/controllers/search_controller.dart

@@ -28,13 +28,14 @@ class SearchState {
     bool? isLoading,
     String? error,
     String? query,
+    bool clearError = false,
   }) {
     return SearchState(
       posts: posts ?? this.posts,
       pets: pets ?? this.pets,
       products: products ?? this.products,
       isLoading: isLoading ?? this.isLoading,
-      error: error,
+      error: clearError ? null : (error ?? this.error),
       query: query ?? this.query,
     );
   }
@@ -52,7 +53,7 @@ class SearchNotifier extends Notifier<SearchState> {
       return;
     }
 
-    state = state.copyWith(isLoading: true, query: query, error: null);
+    state = state.copyWith(isLoading: true, query: query, clearError: true);
 
     try {
       final results = await Future.wait([

lib/controllers/theme_controller.dart

@@ -2,23 +2,25 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+import '../utils/theme_bootstrap.dart';
+
 const _kThemeModeKey = 'theme_mode';
 
 class ThemeNotifier extends Notifier<ThemeMode> {
   @override
   ThemeMode build() {
-    _loadSavedTheme();
-    return ThemeMode.light;
+    final boot = pendingBootstrapThemeMode ?? ThemeMode.light;
+    pendingBootstrapThemeMode = null;
+    Future.microtask(_reconcileWithPrefs);
+    return boot;
   }
 
-  Future<void> _loadSavedTheme() async {
+  Future<void> _reconcileWithPrefs() async {
     final prefs = await SharedPreferences.getInstance();
     final saved = prefs.getString(_kThemeModeKey);
-    if (saved == 'dark') {
-      state = ThemeMode.dark;
-    } else {
-      state = ThemeMode.light;
-    }
+    final mode =
+        saved == 'dark' ? ThemeMode.dark : ThemeMode.light;
+    if (state != mode) state = mode;
   }
 
   Future<void> toggle() async {

lib/main.dart

@@ -1,13 +1,15 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:marionette_flutter/marionette_flutter.dart';
 import 'controllers/auth_controller.dart';
 import 'controllers/bootstrap_controller.dart';
 import 'controllers/theme_controller.dart';
 import 'utils/routes.dart';
 import 'utils/supabase_config.dart';
+import 'utils/theme_bootstrap.dart';
 import 'theme/app_theme_v2_material3.dart';
 
 /// Set via `flutter test integration_test/... --dart-define=INTEGRATION_TEST=true`
@@ -38,6 +40,10 @@ Future<void> main() async {
     anonKey: supabaseInitAnonKey,
   );
 
+  final prefs = await SharedPreferences.getInstance();
+  pendingBootstrapThemeMode =
+      prefs.getString('theme_mode') == 'dark' ? ThemeMode.dark : ThemeMode.light;
+
   runApp(const ProviderScope(child: PetSphereApp()));
 }
 

lib/repositories/chat_repository.dart

@@ -1,3 +1,5 @@
+import 'dart:developer' as developer;
+
 import 'package:supabase_flutter/supabase_flutter.dart';
 import '../models/chat_thread_model.dart';
 import '../models/message_model.dart';
@@ -33,6 +35,30 @@ class ChatRepository {
     ];
   }
 
+  /// Single thread row for deep links / chat screen when the list cache is stale.
+  /// Enforces that [myPetId] participates in the thread (RLS should also enforce).
+  Future<ChatThreadModel?> fetchThreadById(
+    String threadId,
+    String myPetId,
+  ) async {
+    final data = await supabase
+        .from('chat_threads')
+        .select(
+          'id, pet_id_1, pet_id_2, created_at, '
+          'pet1:pets!pet_id_1(id, name, breed, animal_type, age, bio, profile_image_url, images, is_public_owner, user_id), '
+          'pet2:pets!pet_id_2(id, name, breed, animal_type, age, bio, profile_image_url, images, is_public_owner, user_id)',
+        )
+        .eq('id', threadId)
+        .or('pet_id_1.eq.$myPetId,pet_id_2.eq.$myPetId')
+        .maybeSingle();
+
+    if (data == null) return null;
+
+    final thread = ChatThreadModel.fromJson(data);
+    final last = await _fetchLastMessage(threadId);
+    return thread.copyWith(lastMessage: last);
+  }
+
   // -------------------------------------------------------------------------
   // Fetch all messages for a thread (oldest first)
   // -------------------------------------------------------------------------
@@ -120,7 +146,9 @@ class ChatRepository {
   }
 
   // -------------------------------------------------------------------------
-  // Subscribe to ALL new messages (filtered client-side) for thread list updates
+  // Subscribe to ALL new message INSERT events for thread-list previews.
+  // Payloads must be filtered by Supabase Realtime RLS to rows the user may read.
+  // Client-side we ignore threads not in the known set (see [ChatController]).
   // -------------------------------------------------------------------------
   RealtimeChannel subscribeToAllMessages({
     required void Function(MessageModel message) onMessage,
@@ -135,7 +163,14 @@ class ChatRepository {
             try {
               final msg = MessageModel.fromJson(payload.newRecord);
               onMessage(msg);
-            } catch (_) {}
+            } catch (e, st) {
+              developer.log(
+                'Realtime message parse failed',
+                name: 'ChatRepository',
+                error: e,
+                stackTrace: st,
+              );
+            }
           },
         )
         .subscribe();