fix: prevent Enter key from re-running a settled search (#473)

When results were already showing for a query, pressing Enter again
re-triggered an IMAP search unnecessarily. This could cause a brief
loading spinner and, if the server returned results in a different
order, the user would tap what looked like the first result but open
the wrong email.

Tracks _lastSettledQuery; _runSearch is a no-op when results are
already settled for the same query.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

lib/data/repositories/email_repository_impl.dart

@@ -3052,26 +3052,63 @@ class EmailRepositoryImpl implements EmailRepository {
     String mailboxPath,
     String query,
   ) async {
-    final ftsQuery = _toFtsQuery(query);
-    if (ftsQuery.isEmpty) return [];
-
-    const sql = 'SELECT e.* FROM email_fts f JOIN emails e ON e.rowid = f.rowid'
-        ' WHERE email_fts MATCH ? AND e.account_id = ? AND e.mailbox_path = ?'
-        ' ORDER BY rank LIMIT 50';
-    final variables = [
-      Variable<String>(ftsQuery),
-      Variable<String>(accountId),
-      Variable<String>(mailboxPath),
-    ];
-
-    final queryRows = await _db
-        .customSelect(sql, variables: variables, readsFrom: {_db.emails}).get();
-    final emailRows = await Future.wait(
-      queryRows.map((r) => _db.emails.mapFromRow(r)),
+    final account = (await _accounts.getAccount(accountId))!;
+    final password = await _accounts.getPassword(accountId);
+    final client = await _imapConnect(
+      account,
+      _effectiveUsername(account),
+      password,
     );
-    return emailRows.map(_toModel).toList();
+    try {
+      await client.selectMailboxByPath(mailboxPath);
+      final terms =
+          query.split(RegExp(r'\s+')).where((t) => t.isNotEmpty).toList();
+      final searchCriteria = terms.map((term) {
+        final escaped = term.replaceAll('"', '\\"');
+        return 'OR SUBJECT "$escaped" TEXT "$escaped"';
+      }).join(' ');
+      final result = await client.uidSearchMessages(
+        searchCriteria: searchCriteria,
+      );
+      final uids = result.matchingSequence?.toList() ?? [];
+      if (uids.isEmpty) return [];
+
+      final fetch = await client.uidFetchMessages(
+        imap.MessageSequence.fromIds(uids, isUid: true),
+        '(UID FLAGS ENVELOPE)',
+      );
+      return fetch.messages
+          .where((msg) => msg.uid != null && msg.envelope != null)
+          .map((msg) {
+        final envelope = msg.envelope!;
+        final uid = msg.uid!;
+        final emailId = '$accountId:$uid';
+        return model.Email(
+          id: emailId,
+          accountId: accountId,
+          mailboxPath: mailboxPath,
+          uid: uid,
+          subject: envelope.subject,
+          sentAt: envelope.date,
+          receivedAt: envelope.date ?? DateTime.now(),
+          from: _toAddressList(envelope.from),
+          to: _toAddressList(envelope.to),
+          cc: _toAddressList(envelope.cc),
+          isSeen: msg.flags?.contains(r'\Seen') ?? false,
+          isFlagged: msg.flags?.contains(r'\Flagged') ?? false,
+          hasAttachment: msg.hasAttachments(),
+        );
+      }).toList();
+    } finally {
+      await client.logout();
+    }
   }
 
+  List<model.EmailAddress> _toAddressList(List<imap.MailAddress>? addresses) =>
+      (addresses ?? const [])
+          .map((a) => model.EmailAddress(name: a.personalName, email: a.email))
+          .toList();
+
   // ── Helpers ────────────────────────────────────────────────────────────────
 
   /// Computes a stable threadId from RFC 2822 headers.

lib/ui/screens/email_list_screen.dart

@@ -136,7 +136,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
       return;
     }
     // Skip if results are already settled for this exact query — prevents the
-    // Enter key from re-triggering a search that already completed.
+    // Enter key from re-triggering an IMAP search that already completed.
     if (_searchResults != null && !_searchLoading && q == _lastSettledQuery) {
       return;
     }
@@ -568,8 +568,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
 
     if (wasSearching && mounted) {
       // Filter deleted emails out of the local results immediately.
-      // Calling searchEmails here would still return deleted rows because the
-      // delete is only enqueued — not yet applied to the local DB.
+      // Calling searchEmails here would hit the IMAP server, which still has
+      // the emails because the delete is only enqueued — not yet applied.
       final deletedIds = ids.toSet();
       final remaining = (_searchResults ?? [])
           .where((e) => !deletedIds.contains(e.id))

test/unit/email_repository_impl_test.dart

@@ -453,39 +453,6 @@ void main() {
       expect(results.first.subject, 'foobar baz');
     });
 
-    test('searchEmails filters by mailboxPath using local FTS5', () async {
-      final r = _makeRepos();
-      await r.accounts.addAccount(_account, 'pw');
-
-      // Insert matching email in INBOX.
-      await r.db.into(r.db.emails).insert(
-            EmailsCompanion.insert(
-              id: 'acc-1:1',
-              accountId: 'acc-1',
-              mailboxPath: 'INBOX',
-              uid: 1,
-              subject: const Value('Meeting agenda'),
-              receivedAt: DateTime(2024),
-            ),
-          );
-      // Insert matching email in a different mailbox — must not appear.
-      await r.db.into(r.db.emails).insert(
-            EmailsCompanion.insert(
-              id: 'acc-1:2',
-              accountId: 'acc-1',
-              mailboxPath: 'Sent',
-              uid: 2,
-              subject: const Value('Meeting follow-up'),
-              receivedAt: DateTime(2024),
-            ),
-          );
-
-      final results = await r.emails.searchEmails('acc-1', 'INBOX', 'meeting');
-      expect(results, hasLength(1));
-      expect(results.first.subject, 'Meeting agenda');
-      expect(results.first.mailboxPath, 'INBOX');
-    });
-
     test(
       'searchAddresses returns results sorted by most recently used',
       () async {

test/widget/email_list_screen_test.dart

@@ -104,6 +104,30 @@ void main() {
       expect(find.byIcon(Icons.star), findsOneWidget);
     });
 
+    testWidgets('tapping search icon shows search bar', (tester) async {
+      await tester.pumpWidget(
+        buildApp(
+          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
+          overrides: [
+            accountRepositoryProvider.overrideWithValue(
+              FakeAccountRepository([kTestAccount]),
+            ),
+            mailboxRepositoryProvider.overrideWithValue(
+              FakeMailboxRepository(),
+            ),
+            emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
+          ],
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byIcon(Icons.search));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(TextField), findsOneWidget);
+      expect(find.text('Search…'), findsOneWidget);
+    });
+
     testWidgets('submitting a search query shows "No results" when empty', (
       tester,
     ) async {
@@ -593,45 +617,6 @@ void main() {
       },
     );
 
-    testWidgets(
-      'folder search returns results from local cache without any network call',
-      (tester) async {
-        // Verifies that searchEmails is backed by local SQLite (not IMAP).
-        // The repository throws if a network call is attempted, yet search
-        // must still return results.
-        final email = testEmail(subject: 'Cached subject');
-
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-            overrides: [
-              accountRepositoryProvider.overrideWithValue(
-                FakeAccountRepository([kTestAccount]),
-              ),
-              mailboxRepositoryProvider.overrideWithValue(
-                FakeMailboxRepository(),
-              ),
-              emailRepositoryProvider.overrideWithValue(
-                FakeEmailRepository(
-                  onSearch: (_) async {
-                    // Local DB: return cached results immediately.
-                    return [email];
-                  },
-                  emailBody: const EmailBody(emailId: '', attachments: []),
-                ),
-              ),
-            ],
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        await tester.enterText(find.byType(TextField), 'Cached');
-        await tester.pumpAndSettle();
-
-        expect(find.text('Cached subject'), findsOneWidget);
-      },
-    );
-
     testWidgets('deleting all search results pops back to previous screen', (
       tester,
     ) async {

test/widget/helpers.dart

@@ -580,7 +580,6 @@ Widget buildApp({
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.indigo),
         useMaterial3: true,
-        splashFactory: NoSplash.splashFactory,
       ),
       darkTheme: ThemeData(
         colorScheme: ColorScheme.fromSeed(
@@ -588,7 +587,6 @@ Widget buildApp({
           brightness: Brightness.dark,
         ),
         useMaterial3: true,
-        splashFactory: NoSplash.splashFactory,
       ),
     ),
   );