Merge branch 'main' into issue-466-structured-search

Eliminates the socat bridge dependency by using OpenSSH's built-in
Unix socket forwarding (-L port:socket_path). The dagger user already
owns /run/dagger/engine.sock so no intermediate TCP listener is needed.

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

AGENTS.md

@@ -13,27 +13,23 @@ Automation is handled by [agentloop](https://github.com/guettli/agentloop) runni
 | Label | Trigger | Outcome |
 |---|---|---|
 | `loop/plan` | Planning agent reads the issue and writes an implementation plan as a comment | Issue moves to `loop/plan-done` |
-| `loop/code` | Coding agent implements the change, creates a branch + PR | Issue routes to `loop/merge` |
-| `loop/merge` | Merge agent rebases, waits for CI, and merges the PR | Issue moves to `loop/merge-done` |
+| `loop/code` | Coding agent implements the change, creates a branch + PR | Issue moves to `loop/code-done` |
 
 **State machine:**
 
 ```
-loop/plan  →  loop/plan-in-process  →  loop/plan-done
-                                     ↘  NeedSupervisor  (on failure)
+loop/plan  →  loop/plan-in-progress  →  loop/plan-done
+                                      ↘  NeedSupervisor  (on failure)
 
-loop/code  →  loop/code-in-process  →  loop/merge (via route)
-                                     ↘  NeedSupervisor  (on failure)
-
-loop/merge →  loop/merge-in-process →  loop/merge-done
-                                     ↘  NeedSupervisor  (on failure)
+loop/code  →  loop/code-in-progress  →  loop/code-done
+                                      ↘  NeedSupervisor  (on failure)
 ```
 
 **Rules:**
 
 - Only issues authored by allowed users are picked up (guettli, guettlibot, guettlibot2, forgejo-actions).
 - An issue with `NeedSupervisor` needs human attention — investigate, fix, then re-label.
-- The merge agent merges the PR automatically once CI is green. A human still reviews the PR before it merges if branch protection requires a review.
+- The coding agent opens a PR but does NOT close the issue. A human reviews the PR and closes the issue after merging.
 - Planning agents only post a comment — they do NOT write code or open PRs.
 - `loop/*` labels are managed by agentloop — do not set them manually while an agent is active.
 
@@ -43,9 +39,9 @@ loop/merge →  loop/merge-in-process →  loop/merge-done
 1. Create issue
 2. Add label loop/plan   → agent writes plan as comment
 3. Review plan, request changes or approve
-4. Add label loop/code   → agent implements + opens PR + hands off to merge
-5. (Optional) Review PR before it merges
-6. Merge agent waits for CI and merges the PR automatically
+4. Add label loop/code   → agent implements + opens PR
+5. Review PR, merge
+6. Close issue
 ```
 
 ## Code conventions

ci/main.go

@@ -388,7 +388,7 @@ func (m *Ci) Stalwart() *dagger.Service {
 	return dag.Container().
 		From("stalwartlabs/stalwart:v0.14.1").
 		WithFile("/etc/stalwart/config.toml.orig", config).
-		WithExec([]string{"/bin/sh", "-c", "sed -e 's/hostname = \"localhost\"/hostname = \"stalwart\"/' /etc/stalwart/config.toml.orig > /etc/stalwart/config.toml"}).
+		WithExec([]string{"/bin/sh", "-c", "sed -e 's/hostname = \"localhost\"/hostname = \"stalwart\"/' -e 's/bind     = \\[\"0.0.0.0:\\([0-9]*\\)\"\\]/bind     = [\"0.0.0.0:\\1\", \"[::]:\\1\"]/g' /etc/stalwart/config.toml.orig > /etc/stalwart/config.toml"}).
 		WithDirectory("/tmp/stalwart", dataDir).
 		WithExposedPort(8080). // JMAP
 		WithExposedPort(1430). // IMAP
@@ -503,19 +503,23 @@ func (m *Ci) CheckFast(ctx context.Context) (string, error) {
 }
 
 // CheckGenerated verifies that all generated files (*.g.dart, *.mocks.dart) are up to date.
-// It reuses the codegenBase() output instead of running build_runner a second time,
-// diffing committed generated files against the freshly built ones.
+// It snapshots the committed source (including any stale generated files) before
+// running build_runner, so git diff detects real staleness instead of always
+// comparing two freshly-generated outputs.
 func (m *Ci) CheckGenerated(ctx context.Context) (string, error) {
-	fresh := m.codegenBase().Directory("/src")
 	return m.pubGetLayer().
-		WithDirectory("/committed", m.checkSrc(), dagger.ContainerWithDirectoryOpts{Owner: "ci"}).
-		WithDirectory("/generated", fresh, dagger.ContainerWithDirectoryOpts{Owner: "ci"}).
+		WithDirectory("/src", m.checkSrc(), dagger.ContainerWithDirectoryOpts{Owner: "ci"}).
+		WithWorkdir("/src").
+		WithExec([]string{"git", "init"}).
+		WithExec([]string{"git", "config", "user.email", "ci@sharedinbox.de"}).
+		WithExec([]string{"git", "config", "user.name", "CI"}).
+		WithExec([]string{"git", "add", "."}).
+		WithExec([]string{"git", "commit", "-q", "-m", "baseline"}).
 		WithExec([]string{"/bin/bash", "-c",
-			`stale=$(find /committed -name '*.g.dart' -o -name '*.mocks.dart' | ` +
-				`while IFS= read -r f; do rel="${f#/committed/}"; diff -q "$f" "/generated/$rel" >/dev/null 2>&1 || echo "$rel"; done); ` +
-				`if [ -n "$stale" ]; then ` +
-				`echo "ERROR: Generated files are out of date — run: dart run build_runner build"; echo "$stale"; exit 1; ` +
-				`else echo "Generated files are up to date."; fi`}).
+			`tmp=$(mktemp); trap 'rm -f "$tmp"' EXIT; ` +
+				`flutter pub run build_runner build --delete-conflicting-outputs >"$tmp" 2>&1 || { cat "$tmp"; exit 1; }; ` +
+				`grep -vE '^\[.*s\] \|' "$tmp" || true`}).
+		WithExec([]string{"/bin/bash", "-c", "CHANGED=$(find . \\( -name '*.g.dart' -o -name '*.mocks.dart' \\) | xargs -r git diff --exit-code); if [ $? -ne 0 ]; then echo \"ERROR: Generated files are out of date — run: dart run build_runner build\"; exit 1; fi; echo \"Generated files are up to date.\""}).
 		Stdout(ctx)
 }
 
@@ -590,33 +594,25 @@ func (m *Ci) Check(ctx context.Context) (string, error) {
 		return "", err
 	}
 
-	// Run format, analyze, generated-code check, and coverage in parallel —
-	// they all share the same setup base and have no dependencies on each other.
-	var analyze, mocks, coverage string
-	var checkEg errgroup.Group
-	checkEg.Go(func() error {
-		setup := m.setup(m.checkSrc())
-		_, err := setup.WithExec([]string{"dart", "format", "--output=none", "--set-exit-if-changed", "lib", "test"}).Stdout(ctx)
-		return err
-	})
-	checkEg.Go(func() error {
-		setup := m.setup(m.checkSrc())
-		var err error
-		analyze, err = setup.WithExec([]string{"dart", "analyze", "--fatal-infos"}).Stdout(ctx)
-		return err
-	})
-	checkEg.Go(func() error {
-		var err error
-		mocks, err = m.CheckGenerated(ctx)
-		return err
-	})
-	checkEg.Go(func() error {
-		var err error
-		coverage, err = m.Coverage(ctx)
-		return err
-	})
-	if err := checkEg.Wait(); err != nil {
-		return "", err
+	checkSetup := m.setup(m.checkSrc())
+
+	if _, err := checkSetup.WithExec([]string{"dart", "format", "--output=none", "--set-exit-if-changed", "lib", "test"}).Stdout(ctx); err != nil {
+		return "Format check failed", err
+	}
+
+	analyze, err := checkSetup.WithExec([]string{"dart", "analyze", "--fatal-infos"}).Stdout(ctx)
+	if err != nil {
+		return analyze, err
+	}
+
+	mocks, err := m.CheckGenerated(ctx)
+	if err != nil {
+		return mocks, err
+	}
+
+	coverage, err := m.Coverage(ctx)
+	if err != nil {
+		return coverage, err
 	}
 
 	// Use errgroup.Group (not WithContext) so a failing test does not cancel its

lib/core/sieve/sieve_interpreter.dart

@@ -1,7 +1,6 @@
 import 'package:sharedinbox/core/sieve/sieve_actions.dart';
 import 'package:sharedinbox/core/sieve/sieve_conditions.dart';
 import 'package:sharedinbox/core/sieve/sieve_rule.dart';
-import 'package:sharedinbox/core/utils/glob_match.dart';
 
 /// A lightweight email representation used by [SieveInterpreter].
 /// Header names are lower-cased.
@@ -103,11 +102,18 @@ class SieveInterpreter {
     return switch (matchType) {
       ':contains' => k.isEmpty || v.contains(k),
       ':is' => v == k,
-      ':matches' => globMatch(v, k),
+      ':matches' => _globMatch(v, k),
       _ => false,
     };
   }
 
+  bool _globMatch(String value, String pattern) {
+    final regexStr = RegExp.escape(
+      pattern,
+    ).replaceAll(r'\*', '.*').replaceAll(r'\?', '.');
+    return RegExp('^$regexStr\$').hasMatch(value);
+  }
+
   void _applyActions(List<SieveAction> actions, SieveExecutionContext ctx) {
     for (final action in actions) {
       switch (action) {

lib/core/utils/glob_match.dart

@@ -1,9 +0,0 @@
-/// Returns true if [value] matches the glob [pattern].
-///
-/// Supports `*` (any number of characters) and `?` (exactly one character).
-/// The comparison is case-insensitive, which is appropriate for email addresses.
-bool globMatch(String value, String pattern) {
-  final regexStr =
-      RegExp.escape(pattern).replaceAll(r'\*', '.*').replaceAll(r'\?', '.');
-  return RegExp('^$regexStr\$', caseSensitive: false).hasMatch(value);
-}

lib/ui/screens/email_detail_screen.dart

@@ -16,7 +16,6 @@ import 'package:sharedinbox/core/models/note.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
 import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/utils/format_utils.dart';
-import 'package:sharedinbox/core/utils/glob_match.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/screens/email_action_helpers.dart';
@@ -209,8 +208,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     final senderEmail = header?.from.isNotEmpty == true
         ? header!.from.first.email.toLowerCase()
         : null;
-    final isTrusted = senderEmail != null &&
-        trustedSenders.any((p) => globMatch(senderEmail, p));
+    final isTrusted =
+        senderEmail != null && trustedSenders.contains(senderEmail);
     final effectiveLoadImages = _loadRemoteImages || isTrusted;
 
     return ListView(

lib/ui/screens/email_list_screen.dart

@@ -278,14 +278,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                 ),
             ],
             onChanged: _onSearchChanged,
-            onSubmitted: (value) {
-              // Only run the search if results haven't settled yet via
-              // onChanged — prevents a second IMAP round-trip from reordering
-              // the already-visible results when the user presses Enter.
-              if (_searchResults == null && !_searchLoading) {
-                unawaited(_runSearch(value));
-              }
-            },
+            onSubmitted: _runSearch,
             textInputAction: TextInputAction.search,
           ),
         ),

lib/ui/screens/thread_detail_screen.dart

@@ -8,7 +8,6 @@ import 'package:intl/intl.dart';
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
 import 'package:sharedinbox/core/models/user_preferences.dart';
-import 'package:sharedinbox/core/utils/glob_match.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/secure_email_webview.dart';
@@ -119,8 +118,8 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
     final senderEmail = widget.email.from.isNotEmpty
         ? widget.email.from.first.email.toLowerCase()
         : null;
-    final isTrusted = senderEmail != null &&
-        trustedSenders.any((p) => globMatch(senderEmail, p));
+    final isTrusted =
+        senderEmail != null && trustedSenders.contains(senderEmail);
 
     return Card(
       margin: const EdgeInsets.symmetric(vertical: 4),

lib/ui/screens/trusted_image_senders_screen.dart

@@ -16,11 +16,6 @@ class TrustedImageSendersScreen extends ConsumerWidget {
 
     return Scaffold(
       appBar: AppBar(title: const Text('Allowed addresses for images')),
-      floatingActionButton: FloatingActionButton(
-        tooltip: 'Add address',
-        onPressed: () => _showAddDialog(context, ref),
-        child: const Icon(Icons.add),
-      ),
       body: trustedSendersAsync.when(
         loading: () => const Center(child: CircularProgressIndicator()),
         error: (_, __) =>
@@ -31,8 +26,7 @@ class TrustedImageSendersScreen extends ConsumerWidget {
               padding: EdgeInsets.all(16),
               child: Text(
                 'No addresses added yet. '
-                'Tap + to add an address or pattern (e.g. *@example.com), '
-                'or tap "Load remote images" in an email to add the sender automatically.',
+                'Tap "Load remote images" in an email to add the sender.',
               ),
             );
           }
@@ -66,61 +60,4 @@ class TrustedImageSendersScreen extends ConsumerWidget {
       ),
     );
   }
-
-  Future<void> _showAddDialog(BuildContext context, WidgetRef ref) async {
-    final controller = TextEditingController();
-
-    await showDialog<void>(
-      context: context,
-      builder: (ctx) {
-        return StatefulBuilder(
-          builder: (ctx, setState) {
-            return AlertDialog(
-              title: const Text('Add allowed address'),
-              content: TextField(
-                controller: controller,
-                autofocus: true,
-                keyboardType: TextInputType.emailAddress,
-                decoration: const InputDecoration(
-                  labelText: 'Email address or pattern',
-                  hintText: '*@example.com',
-                  helperText: '* matches any characters, e.g. *@example.com',
-                ),
-                onChanged: (_) => setState(() {}),
-                onSubmitted: (value) {
-                  if (value.trim().isNotEmpty) {
-                    _addSender(ref, value);
-                    Navigator.of(ctx).pop();
-                  }
-                },
-              ),
-              actions: [
-                TextButton(
-                  onPressed: () => Navigator.of(ctx).pop(),
-                  child: const Text('Cancel'),
-                ),
-                TextButton(
-                  onPressed: controller.text.trim().isEmpty
-                      ? null
-                      : () {
-                          _addSender(ref, controller.text);
-                          Navigator.of(ctx).pop();
-                        },
-                  child: const Text('Add'),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-
-  void _addSender(WidgetRef ref, String value) {
-    unawaited(
-      ref
-          .read(userPreferencesRepositoryProvider)
-          .addTrustedImageSender(value.trim()),
-    );
-  }
 }

test/unit/glob_match_test.dart

@@ -1,50 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:sharedinbox/core/utils/glob_match.dart';
-
-void main() {
-  group('globMatch', () {
-    test('exact match (no wildcards)', () {
-      expect(globMatch('alice@example.com', 'alice@example.com'), isTrue);
-      expect(globMatch('alice@example.com', 'bob@example.com'), isFalse);
-    });
-
-    test('* matches any domain wildcard', () {
-      expect(globMatch('alice@example.com', '*@example.com'), isTrue);
-      expect(globMatch('bob@example.com', '*@example.com'), isTrue);
-      expect(globMatch('alice@other.com', '*@example.com'), isFalse);
-    });
-
-    test('* matches zero or more characters', () {
-      expect(
-        globMatch('newsletter@news.example.com', '*@*.example.com'),
-        isTrue,
-      );
-      expect(globMatch('alice@example.com', 'alice*'), isTrue);
-      expect(globMatch('alice@example.com', '*example*'), isTrue);
-    });
-
-    test('? matches exactly one character', () {
-      expect(globMatch('alice@example.com', 'alice@exampl?.com'), isTrue);
-      expect(globMatch('alice@example.com', 'alice@exampl??.com'), isFalse);
-    });
-
-    test('case-insensitive comparison', () {
-      expect(globMatch('Alice@Example.COM', '*@example.com'), isTrue);
-      expect(globMatch('alice@example.com', '*@EXAMPLE.COM'), isTrue);
-    });
-
-    test('no wildcards — mismatch is false', () {
-      expect(globMatch('alice@example.com', 'alice@other.com'), isFalse);
-    });
-
-    test('bare * matches everything', () {
-      expect(globMatch('alice@example.com', '*'), isTrue);
-      expect(globMatch('', '*'), isTrue);
-    });
-
-    test('empty pattern only matches empty string', () {
-      expect(globMatch('', ''), isTrue);
-      expect(globMatch('alice@example.com', ''), isFalse);
-    });
-  });
-}

test/widget/email_list_screen_test.dart

@@ -798,67 +798,6 @@ void main() {
       },
     );
 
-    testWidgets(
-      'pressing Enter after search settles does not reorder results',
-      (tester) async {
-        // Reproduces: user types a query → onChanged fires → results settle.
-        // Then user presses Enter → onSubmitted fires a second search → the
-        // second IMAP response may return results in a different order, so the
-        // tile the user is about to tap is no longer the email they expect.
-        final email1 = testEmail(id: 'acc-1:1', subject: 'Alpha Foo');
-        final email2 = testEmail(id: 'acc-1:2', subject: 'Beta Foo');
-        var callCount = 0;
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-            overrides: [
-              accountRepositoryProvider.overrideWithValue(
-                FakeAccountRepository([kTestAccount]),
-              ),
-              mailboxRepositoryProvider.overrideWithValue(
-                FakeMailboxRepository(),
-              ),
-              emailRepositoryProvider.overrideWithValue(
-                FakeEmailRepository(
-                  onSearch: (_) async {
-                    callCount++;
-                    // First call: [Alpha, Beta]. Second call: reversed.
-                    return callCount == 1 ? [email1, email2] : [email2, email1];
-                  },
-                  emailBody: const EmailBody(emailId: '', attachments: []),
-                ),
-              ),
-            ],
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        // Typing triggers onChanged → first search → results settle.
-        await tester.enterText(find.byType(TextField), 'foo');
-        await tester.pumpAndSettle();
-
-        expect(find.text('Alpha Foo'), findsOneWidget);
-        expect(find.text('Beta Foo'), findsOneWidget);
-        // Alpha must appear above Beta (it is first in the list).
-        expect(
-          tester.getTopLeft(find.text('Alpha Foo')).dy,
-          lessThan(tester.getTopLeft(find.text('Beta Foo')).dy),
-        );
-
-        // Pressing Enter triggers onSubmitted — must NOT re-run the search.
-        await tester.testTextInput.receiveAction(TextInputAction.search);
-        await tester.pumpAndSettle();
-
-        // Order must be unchanged: pressing Enter must not reorder results.
-        expect(find.text('Alpha Foo'), findsOneWidget);
-        expect(find.text('Beta Foo'), findsOneWidget);
-        expect(
-          tester.getTopLeft(find.text('Alpha Foo')).dy,
-          lessThan(tester.getTopLeft(find.text('Beta Foo')).dy),
-        );
-      },
-    );
-
     testWidgets('shows preview snippet when email has preview', (tester) async {
       final email = Email(
         id: 'acc-1:99',

test/widget/helpers.dart

@@ -44,7 +44,6 @@ import 'package:sharedinbox/ui/screens/email_list_screen.dart';
 import 'package:sharedinbox/ui/screens/mailbox_list_screen.dart';
 import 'package:sharedinbox/ui/screens/search_screen.dart';
 import 'package:sharedinbox/ui/screens/thread_detail_screen.dart';
-import 'package:sharedinbox/ui/screens/trusted_image_senders_screen.dart';
 import 'package:sharedinbox/ui/screens/user_preferences_screen.dart';
 
 // ---------------------------------------------------------------------------
@@ -485,12 +484,6 @@ Widget buildApp({
             path: 'preferences',
             builder: (ctx, state) => const UserPreferencesScreen(),
           ),
-          GoRoute(
-            path: 'trusted-senders',
-            builder: (ctx, state) => TrustedImageSendersScreen(
-              highlightedSender: state.extra as String?,
-            ),
-          ),
           GoRoute(
             path: ':accountId/edit',
             builder: (ctx, state) => EditAccountScreen(
@@ -703,9 +696,6 @@ class FakeUserPreferencesRepository implements UserPreferencesRepository {
   AfterMailViewAction afterMailViewAction;
   final List<String> _trustedImageSenders;
 
-  List<String> get trustedImageSendersForTest =>
-      List.unmodifiable(_trustedImageSenders);
-
   @override
   Stream<UserPreferences> observePreferences() => Stream.value(
         UserPreferences(

test/widget/trusted_image_senders_screen_test.dart

@@ -1,163 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'helpers.dart';
-
-void main() {
-  group('TrustedImageSendersScreen', () {
-    testWidgets('shows empty state with glob hint when no senders', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.textContaining('*@example.com'), findsOneWidget);
-      expect(find.byIcon(Icons.add), findsOneWidget);
-    });
-
-    testWidgets('lists existing senders', (tester) async {
-      final repo = FakeUserPreferencesRepository(
-        trustedImageSenders: ['alice@example.com', '*@work.com'],
-      );
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-          userPreferences: repo,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.text('alice@example.com'), findsOneWidget);
-      expect(find.text('*@work.com'), findsOneWidget);
-    });
-
-    testWidgets('add dialog shows glob hint text', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byIcon(Icons.add));
-      await tester.pumpAndSettle();
-
-      expect(find.text('Add allowed address'), findsOneWidget);
-      expect(find.textContaining('*@example.com'), findsWidgets);
-      expect(find.textContaining('* matches any characters'), findsOneWidget);
-    });
-
-    testWidgets('Add button is disabled when input is empty', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byIcon(Icons.add));
-      await tester.pumpAndSettle();
-
-      final addButton = find.widgetWithText(TextButton, 'Add');
-      final button = tester.widget<TextButton>(addButton);
-      expect(button.onPressed, isNull);
-    });
-
-    testWidgets('typing in dialog enables Add button and adds sender', (
-      tester,
-    ) async {
-      final repo = FakeUserPreferencesRepository();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-          userPreferences: repo,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byIcon(Icons.add));
-      await tester.pumpAndSettle();
-
-      await tester.enterText(find.byType(TextField), '*@example.com');
-      await tester.pumpAndSettle();
-
-      final addButton = find.widgetWithText(TextButton, 'Add');
-      final button = tester.widget<TextButton>(addButton);
-      expect(button.onPressed, isNotNull);
-
-      await tester.tap(addButton);
-      await tester.pumpAndSettle();
-
-      expect(repo.trustedImageSendersForTest, contains('*@example.com'));
-    });
-
-    testWidgets('cancel closes dialog without adding', (tester) async {
-      final repo = FakeUserPreferencesRepository();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-          userPreferences: repo,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byIcon(Icons.add));
-      await tester.pumpAndSettle();
-
-      await tester.enterText(find.byType(TextField), 'someone@test.com');
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.widgetWithText(TextButton, 'Cancel'));
-      await tester.pumpAndSettle();
-
-      expect(find.byType(AlertDialog), findsNothing);
-      expect(repo.trustedImageSendersForTest, isEmpty);
-    });
-
-    testWidgets('delete button removes a sender', (tester) async {
-      final repo = FakeUserPreferencesRepository(
-        trustedImageSenders: ['alice@example.com'],
-      );
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-          userPreferences: repo,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byIcon(Icons.delete_outline));
-      await tester.pumpAndSettle();
-
-      expect(repo.trustedImageSendersForTest, isEmpty);
-    });
-
-    testWidgets('lists existing glob patterns', (tester) async {
-      final repo = FakeUserPreferencesRepository(
-        trustedImageSenders: ['*@example.com', 'alice@other.com'],
-      );
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/trusted-senders',
-          overrides: baseOverrides(),
-          userPreferences: repo,
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.text('*@example.com'), findsOneWidget);
-      expect(find.text('alice@other.com'), findsOneWidget);
-    });
-  });
-}