fix: wrap bottom bar menu button in Builder to get Scaffold context

Scaffold.of() requires a descendant context of the Scaffold widget.
Using the State's build context (which is the Scaffold's parent) caused
an assertion failure when tapping the 'Open folders' button.

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

.forgejo/workflows/website.yml

@@ -1,4 +1,4 @@
-name: Update Website
+name: Deploy Website
 
 on:
   push:
@@ -11,7 +11,7 @@ on:
 
 jobs:
   deploy:
-    name: Build & Update Website
+    name: Build & Deploy Website
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -34,7 +34,7 @@ jobs:
           DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
-      - name: Build & Update Website
+      - name: Build & Deploy Website
         if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
@@ -45,7 +45,6 @@ jobs:
         run: task publish-website
 
       - name: Verify Website
-        if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
         env:
           SSH_HOST: ${{ secrets.WEBSITE_SSH_HOST }}
         run: scripts/website-verify.sh

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.44.0"
+  "flutter": "3.41.6"
 }

android/app/build.gradle.kts

@@ -67,7 +67,7 @@ flutter {
 
 dependencies {
     // Required for flutter_local_notifications and other plugins that need Java 8+ APIs on API < 26.
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
     // integration_test is a dev dependency; the Flutter plugin loader adds it as
     // debugImplementation only, but GeneratedPluginRegistrant.java (in src/main)
     // references its class in all variants. Make it available for release compilation

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

ci/go.mod

@@ -44,10 +44,10 @@ require (
 	google.golang.org/protobuf v1.36.11 // indirect
 )
 
-replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.19.0
+replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0
 
-replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0
+replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0
 
-replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.19.0
+replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.16.0
 
-replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.19.0
+replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.16.0

lib/core/db_schema_version.dart

@@ -1 +1 @@
-const int dbSchemaVersion = 36;
+const int dbSchemaVersion = 34;

lib/core/models/user_preferences.dart

@@ -1,14 +1,6 @@
 enum MenuPosition { bottom, top }
 
-enum AfterMailViewAction { nextMessage, showMailbox }
-
 class UserPreferences {
-  const UserPreferences({
-    this.menuPosition = MenuPosition.bottom,
-    this.mailViewButtonPosition = MenuPosition.bottom,
-    this.afterMailViewAction = AfterMailViewAction.nextMessage,
-  });
+  const UserPreferences({this.menuPosition = MenuPosition.bottom});
   final MenuPosition menuPosition;
-  final MenuPosition mailViewButtonPosition;
-  final AfterMailViewAction afterMailViewAction;
 }

lib/core/repositories/user_preferences_repository.dart

@@ -3,6 +3,4 @@ import 'package:sharedinbox/core/models/user_preferences.dart';
 abstract class UserPreferencesRepository {
   Stream<UserPreferences> observePreferences();
   Future<void> updateMenuPosition(MenuPosition position);
-  Future<void> updateMailViewButtonPosition(MenuPosition position);
-  Future<void> updateAfterMailViewAction(AfterMailViewAction action);
 }

lib/data/db/database.dart

@@ -313,12 +313,6 @@ class UserPreferences extends Table {
   IntColumn get id => integer()();
   // 'bottom' (default) | 'top'
   TextColumn get menuPosition => text().withDefault(const Constant('bottom'))();
-  // Added in schema v35: 'bottom' (default) | 'top'
-  TextColumn get mailViewButtonPosition =>
-      text().withDefault(const Constant('bottom'))();
-  // Added in schema v36: 'nextMessage' (default) | 'showMailbox'
-  TextColumn get afterMailViewAction =>
-      text().withDefault(const Constant('nextMessage'))();
 
   @override
   Set<Column> get primaryKey => {id};
@@ -599,18 +593,6 @@ class AppDatabase extends _$AppDatabase {
           if (from < 34) {
             await m.createTable(userPreferences);
           }
-          if (from >= 34 && from < 35) {
-            await m.addColumn(
-              userPreferences,
-              userPreferences.mailViewButtonPosition,
-            );
-          }
-          if (from >= 34 && from < 36) {
-            await m.addColumn(
-              userPreferences,
-              userPreferences.afterMailViewAction,
-            );
-          }
         },
       );
 }

lib/data/repositories/user_preferences_repository_impl.dart

@@ -26,28 +26,6 @@ class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
         );
   }
 
-  @override
-  Future<void> updateMailViewButtonPosition(pref.MenuPosition position) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            mailViewButtonPosition: Value(position.name),
-          ),
-        );
-  }
-
-  @override
-  Future<void> updateAfterMailViewAction(
-    pref.AfterMailViewAction action,
-  ) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            afterMailViewAction: Value(action.name),
-          ),
-        );
-  }
-
   static pref.UserPreferences _rowToModel(UserPreferencesRow? row) {
     if (row == null) return const pref.UserPreferences();
     return pref.UserPreferences(
@@ -55,14 +33,6 @@ class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
         (e) => e.name == row.menuPosition,
         orElse: () => pref.MenuPosition.bottom,
       ),
-      mailViewButtonPosition: pref.MenuPosition.values.firstWhere(
-        (e) => e.name == row.mailViewButtonPosition,
-        orElse: () => pref.MenuPosition.bottom,
-      ),
-      afterMailViewAction: pref.AfterMailViewAction.values.firstWhere(
-        (e) => e.name == row.afterMailViewAction,
-        orElse: () => pref.AfterMailViewAction.nextMessage,
-      ),
     );
   }
 }

lib/ui/screens/account_list_screen.dart

@@ -120,76 +120,15 @@ class _AccountTile extends ConsumerWidget {
     final health = ref.watch(syncHealthProvider(account.id));
     final typeLabel = account.type == AccountType.jmap ? 'JMAP' : 'IMAP';
 
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        ListTile(
-          leading: const Icon(Icons.account_circle),
-          title: Text(account.displayName),
-          subtitle: Text('${account.email}\n$typeLabel'),
-          isThreeLine: true,
-          trailing: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              status.when(
-                loading: () => const SizedBox(
-                  width: 20,
-                  height: 20,
-                  child: CircularProgressIndicator(strokeWidth: 2),
-                ),
-                data: (_) =>
-                    const Icon(Icons.check_circle, color: Colors.green),
-                error: (e, _) => Tooltip(
-                  message: e.toString(),
-                  child: const Icon(Icons.error_outline, color: Colors.red),
-                ),
-              ),
-              PopupMenuButton<_AccountAction>(
-                onSelected: (action) => _onAction(context, action),
-                itemBuilder: (_) => [
-                  const PopupMenuItem(
-                    value: _AccountAction.syncLog,
-                    child: Text('Sync log'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.verifySync,
-                    child: Text('Verify sync health'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.forceSync,
-                    child: Text('Force full sync'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.edit,
-                    child: Text('Edit'),
-                  ),
-                  if (_sieveSupported(account))
-                    const PopupMenuItem(
-                      value: _AccountAction.emailFiltersRemote,
-                      child: Text('Server email filters'),
-                    ),
-                  const PopupMenuItem(
-                    value: _AccountAction.emailFiltersLocal,
-                    child: Text('Local email filters'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.send,
-                    child: Text('Send accounts'),
-                  ),
-                  const PopupMenuDivider(),
-                  const PopupMenuItem(
-                    value: _AccountAction.delete,
-                    child: Text('Delete'),
-                  ),
-                ],
-              ),
-            ],
-          ),
-          onTap: () => context.push('/accounts/${account.id}/mailboxes'),
-        ),
-        Padding(
-          padding: const EdgeInsets.fromLTRB(72, 0, 16, 8),
-          child: health.when(
+    return ListTile(
+      leading: const Icon(Icons.account_circle),
+      title: Text(account.displayName),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text('${account.email}\n$typeLabel'),
+          const SizedBox(height: 4),
+          health.when(
             data: (h) {
               if (h == null) return const Text('Sync health: Not verified yet');
               final date = h.lastVerifiedAt.toLocal().toString().split('.')[0];
@@ -202,7 +141,7 @@ class _AccountTile extends ConsumerWidget {
                     color: h.isHealthy ? Colors.green : Colors.orange,
                   ),
                   const SizedBox(width: 4),
-                  Expanded(
+                  Flexible(
                     child: Text(
                       h.isHealthy
                           ? 'Healthy'
@@ -216,8 +155,66 @@ class _AccountTile extends ConsumerWidget {
             loading: () => const Text('Sync health: checking...'),
             error: (e, _) => Text('Sync health error: $e'),
           ),
-        ),
-      ],
+        ],
+      ),
+      isThreeLine: true,
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          status.when(
+            loading: () => const SizedBox(
+              width: 20,
+              height: 20,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+            data: (_) => const Icon(Icons.check_circle, color: Colors.green),
+            error: (e, _) => Tooltip(
+              message: e.toString(),
+              child: const Icon(Icons.error_outline, color: Colors.red),
+            ),
+          ),
+          PopupMenuButton<_AccountAction>(
+            onSelected: (action) => _onAction(context, action),
+            itemBuilder: (_) => [
+              const PopupMenuItem(
+                value: _AccountAction.syncLog,
+                child: Text('Sync log'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.verifySync,
+                child: Text('Verify sync health'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.forceSync,
+                child: Text('Force full sync'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.edit,
+                child: Text('Edit'),
+              ),
+              if (_sieveSupported(account))
+                const PopupMenuItem(
+                  value: _AccountAction.emailFiltersRemote,
+                  child: Text('Server email filters'),
+                ),
+              const PopupMenuItem(
+                value: _AccountAction.emailFiltersLocal,
+                child: Text('Local email filters'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.send,
+                child: Text('Send accounts'),
+              ),
+              const PopupMenuDivider(),
+              const PopupMenuItem(
+                value: _AccountAction.delete,
+                child: Text('Delete'),
+              ),
+            ],
+          ),
+        ],
+      ),
+      onTap: () => context.push('/accounts/${account.id}/mailboxes'),
     );
   }
 

lib/ui/screens/email_detail_screen.dart

@@ -13,7 +13,6 @@ import 'package:share_plus/share_plus.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/format_utils.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
@@ -77,6 +76,15 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                     );
                   },
           ),
+          IconButton(
+            icon: const Icon(Icons.forward),
+            tooltip: 'Forward',
+            onPressed: header == null
+                ? null
+                : () {
+                    unawaited(_forward(context, header, body));
+                  },
+          ),
           IconButton(
             icon: const Icon(Icons.archive),
             tooltip: 'Archive',
@@ -90,7 +98,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             icon: const Icon(Icons.delete),
             tooltip: 'Delete',
             onPressed: () async {
-              final nextEmailId = await _getNextEmailIdIfNeeded(header);
               final destPath = await repo.deleteEmail(widget.emailId);
 
               if (header != null) {
@@ -109,9 +116,28 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                 );
               }
 
-              if (context.mounted) _navigateTo(context, header, nextEmailId);
+              if (context.mounted) context.pop();
             },
           ),
+          IconButton(
+            icon: const Icon(Icons.report_outlined),
+            tooltip: 'Mark as spam',
+            onPressed: header == null
+                ? null
+                : () {
+                    unawaited(_markAsSpam(context, header));
+                  },
+          ),
+          IconButton(
+            icon: const Icon(Icons.drive_file_move_outline),
+            tooltip: 'Move to folder',
+            onPressed: header == null ? null : () => _moveTo(context, header),
+          ),
+          IconButton(
+            icon: const Icon(Icons.access_time),
+            tooltip: 'Snooze',
+            onPressed: header == null ? null : () => _snooze(context, header),
+          ),
           IconButton(
             icon: Icon(
               _isFlagged ? Icons.star : Icons.star_border,
@@ -126,27 +152,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
           PopupMenuButton<String>(
             itemBuilder: (ctx) => [
-              const PopupMenuItem(
-                value: 'forward',
-                child: Text('Forward'),
-              ),
-              const PopupMenuItem(
-                value: 'move',
-                child: Text('Move to folder'),
-              ),
-              const PopupMenuItem(
-                value: 'snooze',
-                child: Text('Snooze'),
-              ),
-              const PopupMenuItem(
-                value: 'spam',
-                child: Text('Mark as spam'),
-              ),
               const PopupMenuItem(
                 value: 'mark_unread',
                 child: Text('Mark as unread'),
               ),
-              const PopupMenuDivider(),
               const PopupMenuItem(
                 value: 'headers',
                 child: Text('Show Mail Headers'),
@@ -161,18 +170,9 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
               ),
             ],
             onSelected: (value) async {
-              if (value == 'forward' && header != null) {
-                unawaited(_forward(context, header, body));
-              } else if (value == 'move' && header != null) {
-                unawaited(_moveTo(context, header));
-              } else if (value == 'snooze' && header != null) {
-                unawaited(_snooze(context, header));
-              } else if (value == 'spam' && header != null) {
-                unawaited(_markAsSpam(context, header));
-              } else if (value == 'mark_unread') {
-                final nextEmailId = await _getNextEmailIdIfNeeded(header);
+              if (value == 'mark_unread') {
                 await repo.setFlag(widget.emailId, seen: false);
-                if (context.mounted) _navigateTo(context, header, nextEmailId);
+                if (context.mounted) context.pop();
               } else if (value == 'headers' && body != null) {
                 _showHeaders(context, body);
               } else if (value == 'structure' && body != null) {
@@ -252,39 +252,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     );
   }
 
-  Future<String?> _getNextEmailIdIfNeeded(Email? header) async {
-    if (header == null) return null;
-    final prefs = ref.read(userPreferencesProvider).value;
-    final action =
-        prefs?.afterMailViewAction ?? AfterMailViewAction.nextMessage;
-    if (action != AfterMailViewAction.nextMessage) return null;
-
-    final threads = await ref
-        .read(emailRepositoryProvider)
-        .observeThreads(header.accountId, header.mailboxPath)
-        .first;
-
-    final currentIndex =
-        threads.indexWhere((t) => t.emailIds.contains(widget.emailId));
-    if (currentIndex >= 0 && currentIndex + 1 < threads.length) {
-      return threads[currentIndex + 1].latestEmailId;
-    }
-    return null;
-  }
-
-  void _navigateTo(BuildContext context, Email? header, String? nextEmailId) {
-    if (!context.mounted) return;
-    if (nextEmailId != null && header != null) {
-      context.go(
-        '/accounts/${header.accountId}'
-        '/mailboxes/${Uri.encodeComponent(header.mailboxPath)}'
-        '/emails/${Uri.encodeComponent(nextEmailId)}',
-      );
-    } else {
-      context.pop();
-    }
-  }
-
   Future<void> _downloadAndOpen(EmailAttachment att) async {
     setState(() => _downloading.add(att.filename));
     try {
@@ -436,9 +403,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
   }
 
   Future<void> _archive(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final mailbox = await resolveMailboxByRole(
       context,
       ref.read(mailboxRepositoryProvider),
@@ -468,13 +432,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _markAsSpam(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final mailbox = await resolveMailboxByRole(
       context,
       ref.read(mailboxRepositoryProvider),
@@ -504,7 +465,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _forward(
@@ -529,8 +490,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
   }
 
   Future<void> _moveTo(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-
     final mailboxRepo = ref.read(mailboxRepositoryProvider);
     final mailboxes =
         await mailboxRepo.observeMailboxes(header.accountId).first;
@@ -579,13 +538,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _snooze(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final until = await showModalBottomSheet<DateTime>(
       context: context,
       builder: (ctx) => const SnoozePicker(),
@@ -613,7 +569,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
         ),
       );
-      _navigateTo(context, header, nextEmailId);
+      context.pop();
     }
   }
 

lib/ui/screens/thread_detail_screen.dart

@@ -7,7 +7,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/html_utils.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/secure_email_webview.dart';
@@ -29,16 +28,9 @@ class ThreadDetailScreen extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final repo = ref.watch(emailRepositoryProvider);
-    final prefs =
-        ref.watch(userPreferencesProvider).value ?? const UserPreferences();
-    final buttonAtBottom = prefs.mailViewButtonPosition == MenuPosition.bottom;
 
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Thread'),
-        automaticallyImplyLeading: !buttonAtBottom,
-      ),
-      bottomNavigationBar: buttonAtBottom ? _buildBackButtonBar(context) : null,
+      appBar: AppBar(title: const Text('Thread')),
       body: StreamBuilder<List<Email>>(
         stream: repo.observeEmailsInThread(accountId, mailboxPath, threadId),
         builder: (context, snapshot) {
@@ -68,20 +60,6 @@ class ThreadDetailScreen extends ConsumerWidget {
       ),
     );
   }
-
-  Widget _buildBackButtonBar(BuildContext context) {
-    return BottomAppBar(
-      child: Row(
-        children: [
-          IconButton(
-            icon: const Icon(Icons.arrow_back),
-            tooltip: 'Back',
-            onPressed: () => context.pop(),
-          ),
-        ],
-      ),
-    );
-  }
 }
 
 class _EmailMessageCard extends ConsumerStatefulWidget {

lib/ui/screens/user_preferences_screen.dart

@@ -59,84 +59,6 @@ class UserPreferencesScreen extends ConsumerWidget {
                 ],
               ),
             ),
-            const Divider(),
-            ListTile(
-              title: Text(
-                'Single mail view button position',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'Where the back button is shown in the single mail view.',
-              ),
-            ),
-            RadioGroup<MenuPosition>(
-              groupValue: prefs.mailViewButtonPosition,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateMailViewButtonPosition(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<MenuPosition>(
-                    title: Text('Bottom (default)'),
-                    subtitle: Text(
-                      'Show the back button at the bottom of the screen.',
-                    ),
-                    value: MenuPosition.bottom,
-                  ),
-                  RadioListTile<MenuPosition>(
-                    title: Text('Top'),
-                    subtitle: Text(
-                      'Show the back button in the top bar.',
-                    ),
-                    value: MenuPosition.top,
-                  ),
-                ],
-              ),
-            ),
-            const Divider(),
-            ListTile(
-              title: Text(
-                'After mail action',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'What to show after deleting, archiving, or otherwise handling a message.',
-              ),
-            ),
-            RadioGroup<AfterMailViewAction>(
-              groupValue: prefs.afterMailViewAction,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateAfterMailViewAction(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<AfterMailViewAction>(
-                    title: Text('Next message (default)'),
-                    subtitle: Text(
-                      'Show the next message in the mailbox.',
-                    ),
-                    value: AfterMailViewAction.nextMessage,
-                  ),
-                  RadioListTile<AfterMailViewAction>(
-                    title: Text('Return to mailbox'),
-                    subtitle: Text(
-                      'Return to the message list.',
-                    ),
-                    value: AfterMailViewAction.showMailbox,
-                  ),
-                ],
-              ),
-            ),
           ],
         ),
       ),

pubspec.lock

@@ -659,10 +659,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   mime:
     dependency: "direct main"
     description:
@@ -1088,26 +1088,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20"
+      sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.31.0"
+    version: "1.30.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.10"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34"
+      sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.17"
+    version: "0.6.16"
   timezone:
     dependency: transitive
     description:

renovate.json

@@ -5,7 +5,7 @@
   ],
   "labels": ["dependencies"],
   "github-actions": {
-    "enabled": false
+    "fileMatch": ["^\\.forgejo/workflows/[^/]+\\.ya?ml$"]
   },
   "packageRules": [
     {

scripts/agent_loop.py

@@ -11,18 +11,15 @@ Flow
    a. pending_issue type=="plan" → post resume comment, set State/Planned, exit 0
    b. pending_issue + open PR → check PR branch CI, merge/fix/wait as needed
    c. Catch-up: orphaned issue-N-fix PRs with passing CI → merge them
-   d. Catch-up: close issues for PRs already merged (e.g., merged manually after
-                State/Question was set because CI path filter didn't trigger) → exit 0
-   e. Catch-up: Renovate PRs with passing CI → merge them
-   f. Main CI running         → save pending-ci state, exit 0
-   g. Main CI failed          → start fix-CI agent (pushes fix to main), exit 0
-   h. Main CI ok + pending_issue → close the issue, exit 0  (dead code path —
+   d. Main CI running         → save pending-ci state, exit 0
+   e. Main CI failed          → start fix-CI agent (pushes fix to main), exit 0
+   f. Main CI ok + pending_issue → close the issue, exit 0  (dead code path —
                                    section 2b always returns first)
-   i. Main CI ok (or no run yet) → find oldest ToPlan issue, start plan agent,
+   g. Main CI ok (or no run yet) → find oldest ToPlan issue, start plan agent,
                                    save state, exit 0
-   j. No ToPlan issues        → find oldest Ready issue, start issue agent,
+   h. No ToPlan issues        → find oldest Ready issue, start issue agent,
                                    save state, exit 0
-   k. No Ready issues         → print "nothing to do", exit 0
+   i. No Ready issues         → print "nothing to do", exit 0
 
 Issue agents must NOT close the issue themselves; the loop closes it after CI passes.
 Plan agents must NOT write any code or create PRs; they only post a plan comment.
@@ -35,7 +32,7 @@ Output is written to ~/.sharedinbox-agent-logs/<session>-<timestamp>.log.
 To resume the Claude conversation, look up the session UUID first:
 
   scripts/agent_loop.py list          # shows NAME and UUID columns
-  claude --resume <uuid> --dangerously-skip-permissions   # use the UUID, NOT the session name
+  claude --resume <uuid>              # use the UUID, NOT the session name
 """
 
 import argparse
@@ -46,8 +43,6 @@ import shlex
 import subprocess
 import sys
 import time
-import urllib.error
-import urllib.request
 from datetime import datetime, timezone
 from pathlib import Path
 
@@ -125,30 +120,6 @@ def _fgj_run_list(limit: int = 20) -> list[dict]:
     return data if isinstance(data, list) else []
 
 
-def _tea_get(path: str) -> dict:
-    """Make an authenticated GET request to the Codeberg API and return parsed JSON.
-
-    Tries FORGEJO_TOKEN env var first, then ``fgj auth token`` for the token.
-    """
-    token = os.environ.get("FORGEJO_TOKEN", "")
-    if not token:
-        r = subprocess.run(
-            ["fgj", "--hostname", "codeberg.org", "auth", "token"],
-            capture_output=True, text=True,
-        )
-        if r.returncode == 0:
-            token = r.stdout.strip()
-    url = f"https://codeberg.org/api/v1{path}"
-    req = urllib.request.Request(url)
-    if token:
-        req.add_header("Authorization", f"token {token}")
-    try:
-        with urllib.request.urlopen(req, timeout=30) as resp:
-            return json.loads(resp.read())
-    except urllib.error.HTTPError as e:
-        raise RuntimeError(f"GET {path}: HTTP {e.code} {e.reason}") from e
-
-
 def _set_labels(issue: int, add: list[str], remove: list[str]) -> None:
     """Add/remove labels on an issue via fgj."""
     cmd = ["issue", "edit", str(issue), "--repo", REPO]
@@ -215,8 +186,7 @@ def _latest_main_ci_run() -> dict | None:
     event=push and prettyref=main, so filtering by event alone is not enough.
     We also require workflow_id == "ci.yml".
     """
-    data = _tea_get(f"/repos/{REPO}/actions/runs?limit=20")
-    for run in data.get("workflow_runs", []):
+    for run in _fgj_run_list(limit=20):
         if (run.get("event") == "push"
                 and run.get("prettyref") == "main"
                 and run.get("workflow_id") == "ci.yml"):
@@ -227,22 +197,19 @@ def _latest_main_ci_run() -> dict | None:
 def _latest_ci_run_for_branch(branch: str) -> dict | None:
     """Return the latest CI run for a specific branch, or None.
 
-    For pull_request events the branch is embedded in the JSON ``event_payload``
-    field; for push events it appears directly in ``prettyref``.
+    For push events fgj reports the branch in ``prettyref``; for pull_request
+    events ``prettyref`` is ``#N``, so we resolve the PR number first.
     """
-    data = _tea_get(f"/repos/{REPO}/actions/runs?limit=20")
-    for run in data.get("workflow_runs", []):
+    runs = _fgj_run_list(limit=20)
+    pr_data = _find_pr_for_branch(branch)
+    pr_ref = f"#{pr_data['number']}" if pr_data else None
+    for run in runs:
         if run.get("event") == "pull_request":
-            payload_str = run.get("event_payload", "")
-            if payload_str:
-                try:
-                    payload = json.loads(payload_str)
-                    if payload.get("pull_request", {}).get("head", {}).get("ref") == branch:
-                        return run
-                except (json.JSONDecodeError, AttributeError):
-                    pass
-        elif run.get("event") == "push" and run.get("prettyref") == branch:
-            return run
+            if pr_ref and run.get("prettyref") == pr_ref:
+                return run
+        elif run.get("event") == "push":
+            if run.get("prettyref") == branch:
+                return run
     return None
 
 
@@ -284,53 +251,6 @@ def _open_issue_prs() -> list[dict]:
     return issue_prs
 
 
-def _open_renovate_prs() -> list[dict]:
-    """Return all open PRs from Renovate (renovate/* branches), oldest-first."""
-    result = subprocess.run(
-        ["fgj", "--hostname", "codeberg.org", "pr", "list",
-         "--repo", REPO, "--state", "open", "--json"],
-        capture_output=True, text=True,
-    )
-    if result.returncode != 0 or not result.stdout.strip():
-        return []
-    prs = json.loads(result.stdout)
-    renovate_prs = [
-        pr for pr in prs
-        if (pr.get("head", {}).get("ref") or "").startswith("renovate/")
-    ]
-    renovate_prs.sort(key=lambda p: p["number"])
-    return renovate_prs
-
-
-def _merged_issue_prs() -> list[dict]:
-    """Return recently merged PRs with issue-{N}-fix branches, oldest-first.
-
-    Used for catch-up: if the loop set State/Question (e.g., no CI run detected)
-    but the PR was later merged manually, we still want to close the issue.
-    """
-    result = subprocess.run(
-        ["fgj", "--hostname", "codeberg.org", "pr", "list",
-         "--repo", REPO, "--state", "closed", "--json"],
-        capture_output=True, text=True,
-    )
-    if result.returncode != 0 or not result.stdout.strip():
-        return []
-    try:
-        prs = json.loads(result.stdout)
-    except json.JSONDecodeError:
-        return []
-    merged = []
-    for pr in prs:
-        if not pr.get("merged"):
-            continue
-        head = pr.get("head", {})
-        ref = head.get("ref") or head.get("label", "").split(":")[-1]
-        if re.match(r"^issue-\d+-fix$", ref or ""):
-            merged.append(pr)
-    merged.sort(key=lambda p: p["number"])
-    return merged
-
-
 def _latest_ci_run_for_pr(pr_number: int) -> dict | None:
     """Return the latest CI run triggered by a pull_request event for the given PR number."""
     pr_ref = f"#{pr_number}"
@@ -369,10 +289,17 @@ def _handle_pr_still_open_after_merge(pr_number: int, branch: str, issue_num: in
       "merged"         — PR closed after a retry
       "fallback"       — all options exhausted; caller should set State/Question
     """
-    try:
-        pr_data = _tea_get(f"/repos/{REPO}/pulls/{pr_number}")
-    except RuntimeError:
-        pr_data = {}
+    result = subprocess.run(
+        ["fgj", "--hostname", "codeberg.org", "pr", "view", str(pr_number),
+         "--repo", REPO, "--json"],
+        capture_output=True, text=True,
+    )
+    pr_data: dict = {}
+    if result.returncode == 0 and result.stdout.strip():
+        try:
+            pr_data = json.loads(result.stdout)
+        except json.JSONDecodeError:
+            pass
     mergeable = pr_data.get("mergeable")
 
     if mergeable is False:
@@ -597,7 +524,7 @@ def cmd_list() -> int:
 
     sessions.sort(reverse=True)
     total = len(sessions)
-    print(f"  {'DATE':<16}  {'NAME':<20}  UUID  (use with: claude --resume <uuid> --dangerously-skip-permissions)")
+    print(f"  {'DATE':<16}  {'NAME':<20}  UUID  (use with: claude --resume <uuid>)")
     print(f"  {'-'*16}  {'-'*20}  {'-'*36}")
     for mtime, name, sid in sessions[:20]:
         ts = datetime.fromtimestamp(mtime).strftime("%Y-%m-%d %H:%M")
@@ -681,9 +608,9 @@ def _run_loop() -> int:
         session_name = state.get("session_name")
         uuid = _find_session_uuid(session_name) if session_name else None
         if uuid:
-            resume_cmd = f"claude --resume {shlex.quote(uuid)} --dangerously-skip-permissions"
+            resume_cmd = f"claude --resume {shlex.quote(uuid)}"
         elif session_name:
-            resume_cmd = f"claude --resume <uuid> --dangerously-skip-permissions  # run: scripts/agent_loop.py list"
+            resume_cmd = f"claude --resume <uuid>  # run: scripts/agent_loop.py list"
         else:
             resume_cmd = ""
         git_info = _git_summary()
@@ -712,7 +639,7 @@ def _run_loop() -> int:
         session_name = f"plan-issue-{pending_issue}"
         uuid = _find_session_uuid(session_name)
         if uuid:
-            resume_cmd = f"claude --resume {shlex.quote(uuid)} --dangerously-skip-permissions"
+            resume_cmd = f"claude --resume {shlex.quote(uuid)}"
             _comment_issue(
                 pending_issue,
                 f"Planning complete. To resume this session:\n\n```\n{resume_cmd}\n```",
@@ -901,66 +828,6 @@ def _run_loop() -> int:
                 print(f"Merged PR #{pr_number}.")
             return 0
 
-    # ── 2c. Catch-up: close issues whose PRs were already merged ─────────────
-    # Handles the case where State/Question was set (e.g., no CI run appeared
-    # because the changed paths didn't match ci.yml's path filter) but the PR
-    # was merged manually afterward. The next loop tick closes the issue.
-    for pr in _merged_issue_prs():
-        head = pr.get("head", {})
-        branch = head.get("ref") or head.get("label", "").split(":")[-1]
-        m = re.match(r"^issue-(\d+)-fix$", branch or "")
-        if not m:
-            continue
-        issue_num = int(m.group(1))
-        try:
-            issue_data = _tea_get(f"/repos/{REPO}/issues/{issue_num}")
-        except RuntimeError:
-            continue
-        if issue_data.get("state") != "open":
-            continue
-        pr_number = pr["number"]
-        print(f"Catch-up (merged PR): PR #{pr_number} for issue #{issue_num} was merged — closing.")
-        try:
-            _close_issue(issue_num)
-        except RuntimeError as e:
-            print(f"Catch-up (merged PR): could not close issue #{issue_num}: {e}")
-            continue
-        return 0
-
-    # ── 2d. Catch-up: merge Renovate PRs with passing CI ─────────────────────
-    # The merge-renovate CI job only fires on pull_request events. If a Renovate
-    # PR had CI run before that job was added (or the automerge label was absent),
-    # it stays open forever. Detect and merge those here.
-    for pr in _open_renovate_prs():
-        pr_number = pr["number"]
-        pr_url = f"{REPO_URL}/pulls/{pr_number}"
-        pr_run = _latest_ci_run_for_pr(pr_number)
-
-        if pr_run and pr_run.get("status") == "running":
-            print(f"Catch-up (Renovate): CI {_ci_run_url(pr_run['id'])} on PR #{pr_number} still running. Waiting.")
-            return 0
-
-        if pr_run and pr_run.get("status") in ("failure", "error"):
-            print(f"Catch-up (Renovate): CI {_ci_run_url(pr_run['id'])} on PR #{pr_number} failed — skipping.")
-            continue
-
-        if pr_run and pr_run.get("status") == "success":
-            print(f"Catch-up (Renovate): CI passed on PR #{pr_number} ({pr_url}) — merging.")
-            try:
-                _merge_pr(pr_number)
-            except RuntimeError as e:
-                print(f"Catch-up (Renovate): merge of PR #{pr_number} failed: {e} — skipping.")
-                continue
-            branch = pr.get("head", {}).get("ref", "")
-            if _find_pr_for_branch(branch):
-                print(f"Catch-up (Renovate): PR #{pr_number} still open after merge — skipping.")
-                continue
-            print(f"Catch-up (Renovate): merged PR #{pr_number}.")
-            return 0
-
-        if pr_run is None:
-            print(f"Catch-up (Renovate): no CI run for PR #{pr_number} ({pr_url}) — skipping (needs manual review).")
-
     # ── 3. Global CI check (main branch only) ────────────────────────────────
     run = _latest_main_ci_run()
 

scripts/test_agent_loop.py

@@ -202,7 +202,6 @@ class TestMain(unittest.TestCase):
 
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[self._make_issue(10)]), \
              patch("agent_loop._set_labels", side_effect=fake_set_labels), \
@@ -230,7 +229,6 @@ class TestMain(unittest.TestCase):
 
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[self._make_issue(7)]), \
              patch("agent_loop._set_labels", side_effect=fake_set_labels), \
@@ -245,7 +243,6 @@ class TestMain(unittest.TestCase):
         """main() exits cleanly with 0 when there are no ready issues."""
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[]), \
              patch("agent_loop._set_labels") as mock_labels, \
@@ -266,7 +263,6 @@ class TestMain(unittest.TestCase):
 
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[self._make_issue(42)]), \
              patch("agent_loop._set_labels"), \
@@ -446,7 +442,6 @@ class TestPendingCi(unittest.TestCase):
             "type": "ci-fix",
         }), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value={"id": 1, "status": "success"}), \
              patch("agent_loop._close_issue") as mock_close, \
              patch("agent_loop._ready_issues", return_value=[]), \
@@ -464,7 +459,6 @@ class TestOutputFormat(unittest.TestCase):
         buf = io.StringIO()
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[]), \
              contextlib.redirect_stdout(buf):
@@ -477,7 +471,6 @@ class TestOutputFormat(unittest.TestCase):
         buf = io.StringIO()
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[]), \
              contextlib.redirect_stdout(buf):
@@ -489,7 +482,6 @@ class TestOutputFormat(unittest.TestCase):
         buf = io.StringIO()
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=run), \
              contextlib.redirect_stdout(buf):
             agent_loop._run_loop()
@@ -501,7 +493,6 @@ class TestOutputFormat(unittest.TestCase):
         buf = io.StringIO()
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[issue]), \
              patch("agent_loop._set_labels"), \
@@ -723,7 +714,7 @@ class TestRunLoopResumeCommand(unittest.TestCase):
              contextlib.redirect_stdout(buf):
             agent_loop._run_loop()
         output = buf.getvalue()
-        self.assertIn(f"claude --resume {fake_uuid} --dangerously-skip-permissions", output)
+        self.assertIn(f"claude --resume {fake_uuid}", output)
 
     def test_resume_shows_list_hint_when_uuid_not_found(self):
         buf = io.StringIO()
@@ -766,7 +757,6 @@ class TestCatchupSkipsQuestionIssues(unittest.TestCase):
         ci_run = {"id": 999, "status": "success"}
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[pr]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_ci_run_for_pr", return_value=ci_run), \
              patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_QUESTION]), \
              patch("agent_loop._merge_pr") as mock_merge, \
@@ -795,71 +785,6 @@ class TestCatchupSkipsQuestionIssues(unittest.TestCase):
         mock_merge.assert_called_once_with(50)
 
 
-class TestMergedPrCatchup(unittest.TestCase):
-    """Catch-up closes issues whose PRs were already merged outside the normal flow."""
-
-    def _make_merged_pr(self, pr_number=283, branch="issue-282-fix"):
-        return {"number": pr_number, "merged": True, "head": {"ref": branch}}
-
-    def test_closes_issue_when_pr_was_merged(self):
-        """When a merged issue-N-fix PR exists and the issue still has labels, close it."""
-        pr = self._make_merged_pr()
-        with patch("agent_loop._read_state", return_value=None), \
-             patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[pr]), \
-             patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_QUESTION]), \
-             patch("agent_loop._close_issue") as mock_close, \
-             patch("agent_loop._latest_main_ci_run", return_value=None), \
-             patch("agent_loop._ready_issues", return_value=[]):
-            result = agent_loop._run_loop()
-        self.assertEqual(result, 0)
-        mock_close.assert_called_once_with(282)
-
-    def test_skips_when_issue_has_no_labels(self):
-        """When _get_issue_labels returns [] (likely already closed), skip the issue."""
-        pr = self._make_merged_pr()
-        with patch("agent_loop._read_state", return_value=None), \
-             patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[pr]), \
-             patch("agent_loop._get_issue_labels", return_value=[]), \
-             patch("agent_loop._close_issue") as mock_close, \
-             patch("agent_loop._latest_main_ci_run", return_value=None), \
-             patch("agent_loop._ready_issues", return_value=[]):
-            result = agent_loop._run_loop()
-        self.assertEqual(result, 0)
-        mock_close.assert_not_called()
-
-    def test_output_mentions_merged_pr_and_issue(self):
-        """The catch-up log line names the PR number and issue number."""
-        pr = self._make_merged_pr(pr_number=283, branch="issue-282-fix")
-        buf = io.StringIO()
-        with patch("agent_loop._read_state", return_value=None), \
-             patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[pr]), \
-             patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_QUESTION]), \
-             patch("agent_loop._close_issue"), \
-             patch("agent_loop._latest_main_ci_run", return_value=None), \
-             patch("agent_loop._ready_issues", return_value=[]), \
-             contextlib.redirect_stdout(buf):
-            agent_loop._run_loop()
-        output = buf.getvalue()
-        self.assertIn("283", output)
-        self.assertIn("282", output)
-
-    def test_continues_on_close_error(self):
-        """If _close_issue raises, the loop continues instead of crashing."""
-        pr = self._make_merged_pr()
-        with patch("agent_loop._read_state", return_value=None), \
-             patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[pr]), \
-             patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_QUESTION]), \
-             patch("agent_loop._close_issue", side_effect=RuntimeError("already closed")), \
-             patch("agent_loop._latest_main_ci_run", return_value=None), \
-             patch("agent_loop._ready_issues", return_value=[]):
-            result = agent_loop._run_loop()
-        self.assertEqual(result, 0)
-
-
 class TestMergeFailsOpen(unittest.TestCase):
     """Tests for auto-resolution when a PR is still open after the merge command."""
 
@@ -1003,7 +928,6 @@ class TestHeartbeat(unittest.TestCase):
         self.assertFalse(Path(self._tmp.name).exists())
         with patch("agent_loop._read_state", return_value=None), \
              patch("agent_loop._open_issue_prs", return_value=[]), \
-             patch("agent_loop._merged_issue_prs", return_value=[]), \
              patch("agent_loop._latest_main_ci_run", return_value=None), \
              patch("agent_loop._ready_issues", return_value=[]):
             agent_loop._run_loop()

test/unit/migration_test.dart

@@ -14,7 +14,7 @@ void main() {
   group('Migration', () {
     test('schemaVersion matches expected value', () async {
       final db = AppDatabase(NativeDatabase.memory());
-      expect(db.schemaVersion, 36);
+      expect(db.schemaVersion, 34);
       await db.close();
     });
 
@@ -202,13 +202,6 @@ void main() {
       // v34: user_preferences table.
       await db.customSelect('SELECT count(*) FROM user_preferences').get();
 
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
@@ -404,18 +397,11 @@ void main() {
       // v34: user_preferences table.
       await db.customSelect('SELECT count(*) FROM user_preferences').get();
 
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
 
-    test('fresh install creates all tables at schemaVersion 36', () async {
+    test('fresh install creates all tables at schemaVersion 34', () async {
       final db = AppDatabase(NativeDatabase.memory());
       await db.select(db.accounts).get();
 
@@ -462,13 +448,6 @@ void main() {
       expect(syncLogColumns, contains('error_stack_trace'));
       expect(syncLogColumns, contains('is_permanent'));
 
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
     });
   });

test/widget/account_list_screen_test.dart

@@ -252,29 +252,5 @@ void main() {
         expect(find.textContaining('flag mismatches: 1'), findsOneWidget);
       },
     );
-
-    testWidgets(
-      'sync health row is positioned below the account name row',
-      (tester) async {
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts',
-            overrides: baseOverrides(
-              accounts: [kTestAccount],
-              syncHealth: SyncHealthRow(
-                accountId: kTestAccount.id,
-                lastVerifiedAt: DateTime(2024, 6),
-                isHealthy: true,
-              ),
-            ),
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        final namePos = tester.getTopLeft(find.text('Alice')).dy;
-        final healthPos = tester.getTopLeft(find.textContaining('Healthy')).dy;
-        expect(healthPos, greaterThan(namePos));
-      },
-    );
   });
 }

test/widget/email_detail_screen_test.dart

@@ -271,8 +271,7 @@ void main() {
       expect(find.textContaining('carol@example.com'), findsAtLeastNWidgets(1));
     });
 
-    testWidgets('Mark as spam is in popup menu, not a standalone button',
-        (tester) async {
+    testWidgets('Mark as spam button is present in app bar', (tester) async {
       await tester.pumpWidget(
         buildApp(
           initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
@@ -283,19 +282,12 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      // No standalone icon button for mark as spam.
       expect(
         find.byWidgetPredicate(
           (w) => w is Tooltip && w.message == 'Mark as spam',
         ),
-        findsNothing,
+        findsOneWidget,
       );
-
-      // It appears in the popup menu.
-      await tester.tap(find.byType(PopupMenuButton<String>));
-      await tester.pumpAndSettle();
-
-      expect(find.text('Mark as spam'), findsOneWidget);
     });
 
     testWidgets('Mark as spam shows dialog when no junk folder',
@@ -312,11 +304,11 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      // Open the popup menu first, then tap Mark as spam.
-      await tester.tap(find.byType(PopupMenuButton<String>));
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Mark as spam'));
+      await tester.tap(
+        find.byWidgetPredicate(
+          (w) => w is Tooltip && w.message == 'Mark as spam',
+        ),
+      );
       await tester.pumpAndSettle();
 
       expect(find.text('No spam folder found'), findsOneWidget);

test/widget/helpers.dart

@@ -414,7 +414,6 @@ class _NoOpManageSieveProbeService implements ManageSieveProbeService {
 Widget buildApp({
   required String initialLocation,
   required List<Override> overrides,
-  UserPreferencesRepository? userPreferences,
 }) {
   final testRouter = GoRouter(
     initialLocation: initialLocation,
@@ -524,7 +523,7 @@ Widget buildApp({
         const NoOpSyncLogRepository(),
       ),
       userPreferencesRepositoryProvider.overrideWithValue(
-        userPreferences ?? FakeUserPreferencesRepository(),
+        FakeUserPreferencesRepository(),
       ),
       ...overrides,
       manageSieveProbeServiceProvider.overrideWith(
@@ -625,37 +624,18 @@ Email testEmail({
 class FakeUserPreferencesRepository implements UserPreferencesRepository {
   FakeUserPreferencesRepository({
     this.menuPosition = MenuPosition.bottom,
-    this.mailViewButtonPosition = MenuPosition.bottom,
-    this.afterMailViewAction = AfterMailViewAction.nextMessage,
   });
 
   MenuPosition menuPosition;
-  MenuPosition mailViewButtonPosition;
-  AfterMailViewAction afterMailViewAction;
 
   @override
-  Stream<UserPreferences> observePreferences() => Stream.value(
-        UserPreferences(
-          menuPosition: menuPosition,
-          mailViewButtonPosition: mailViewButtonPosition,
-          afterMailViewAction: afterMailViewAction,
-        ),
-      );
+  Stream<UserPreferences> observePreferences() =>
+      Stream.value(UserPreferences(menuPosition: menuPosition));
 
   @override
   Future<void> updateMenuPosition(MenuPosition position) async {
     menuPosition = position;
   }
-
-  @override
-  Future<void> updateMailViewButtonPosition(MenuPosition position) async {
-    mailViewButtonPosition = position;
-  }
-
-  @override
-  Future<void> updateAfterMailViewAction(AfterMailViewAction action) async {
-    afterMailViewAction = action;
-  }
 }
 
 class FakeSearchHistoryRepository implements SearchHistoryRepository {

test/widget/thread_detail_screen_test.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/di.dart';
 
 import 'helpers.dart';
@@ -143,60 +142,6 @@ void main() {
       expect(find.byIcon(Icons.expand_more), findsOneWidget);
     });
 
-    testWidgets('shows bottom app bar with back button by default', (
-      tester,
-    ) async {
-      final email = _threadEmail();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/threads/thread-1',
-          overrides: [
-            accountRepositoryProvider.overrideWithValue(
-              FakeAccountRepository([kTestAccount]),
-            ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
-            emailRepositoryProvider.overrideWithValue(
-              FakeEmailRepository(emails: [email]),
-            ),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.byType(BottomAppBar), findsOneWidget);
-      expect(find.byIcon(Icons.arrow_back), findsOneWidget);
-    });
-
-    testWidgets('hides bottom app bar when button position is top', (
-      tester,
-    ) async {
-      final email = _threadEmail();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/threads/thread-1',
-          userPreferences: FakeUserPreferencesRepository(
-            mailViewButtonPosition: MenuPosition.top,
-          ),
-          overrides: [
-            accountRepositoryProvider.overrideWithValue(
-              FakeAccountRepository([kTestAccount]),
-            ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
-            emailRepositoryProvider.overrideWithValue(
-              FakeEmailRepository(emails: [email]),
-            ),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.byType(BottomAppBar), findsNothing);
-    });
-
     testWidgets('flagged email shows star icon', (tester) async {
       final email = _threadEmail(isFlagged: true);
       await tester.pumpWidget(

test/widget/user_preferences_screen_test.dart

@@ -20,13 +20,11 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(find.text('Menu bar position'), findsOneWidget);
-      expect(find.text('Bottom (default)'), findsNWidgets(2));
-      expect(find.text('Top'), findsNWidgets(2));
+      expect(find.text('Bottom (default)'), findsOneWidget);
+      expect(find.text('Top'), findsOneWidget);
     });
 
-    testWidgets('shows single mail view button position section', (
-      tester,
-    ) async {
+    testWidgets('bottom option is selected by default', (tester) async {
       await tester.pumpWidget(
         buildApp(
           initialLocation: '/accounts/preferences',
@@ -35,15 +33,12 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      expect(
-        find.text('Single mail view button position'),
-        findsOneWidget,
-      );
+      final radioGroup = find.byType(RadioGroup<MenuPosition>);
+      final widget = tester.widget<RadioGroup<MenuPosition>>(radioGroup);
+      expect(widget.groupValue, MenuPosition.bottom);
     });
 
-    testWidgets('menu position bottom option is selected by default', (
-      tester,
-    ) async {
+    testWidgets('tapping Top option updates the repo', (tester) async {
       await tester.pumpWidget(
         buildApp(
           initialLocation: '/accounts/preferences',
@@ -52,41 +47,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      final radioGroups = find.byType(RadioGroup<MenuPosition>);
-      final menuGroup =
-          tester.widget<RadioGroup<MenuPosition>>(radioGroups.first);
-      expect(menuGroup.groupValue, MenuPosition.bottom);
-    });
-
-    testWidgets('mail view button position bottom is selected by default', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      final radioGroups = find.byType(RadioGroup<MenuPosition>);
-      final mailViewGroup =
-          tester.widget<RadioGroup<MenuPosition>>(radioGroups.last);
-      expect(mailViewGroup.groupValue, MenuPosition.bottom);
-    });
-
-    testWidgets('tapping Top in menu position section updates the repo', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Top').first);
+      await tester.tap(find.text('Top'));
       await tester.pumpAndSettle();
 
       final repo = ProviderScope.containerOf(
@@ -96,91 +57,5 @@ void main() {
 
       expect(repo.menuPosition, MenuPosition.top);
     });
-
-    testWidgets(
-        'tapping Top in mail view button position section updates the repo', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Top').last);
-      await tester.pumpAndSettle();
-
-      final repo = ProviderScope.containerOf(
-        tester.element(find.byType(UserPreferencesScreen)),
-      ).read(userPreferencesRepositoryProvider)
-          as FakeUserPreferencesRepository;
-
-      expect(repo.mailViewButtonPosition, MenuPosition.top);
-    });
-
-    testWidgets('shows after mail action section', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      // Scroll down to reveal the new section below the fold.
-      await tester.drag(find.byType(ListView), const Offset(0, -500));
-      await tester.pumpAndSettle();
-
-      expect(find.text('After mail action'), findsOneWidget);
-      expect(find.text('Next message (default)'), findsOneWidget);
-      expect(find.text('Return to mailbox'), findsOneWidget);
-    });
-
-    testWidgets('after mail action next message is selected by default', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.drag(find.byType(ListView), const Offset(0, -500));
-      await tester.pumpAndSettle();
-
-      final radioGroups = find.byType(RadioGroup<AfterMailViewAction>);
-      final group =
-          tester.widget<RadioGroup<AfterMailViewAction>>(radioGroups.first);
-      expect(group.groupValue, AfterMailViewAction.nextMessage);
-    });
-
-    testWidgets('tapping Return to mailbox updates the repo', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.drag(find.byType(ListView), const Offset(0, -500));
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Return to mailbox'));
-      await tester.pumpAndSettle();
-
-      final repo = ProviderScope.containerOf(
-        tester.element(find.byType(UserPreferencesScreen)),
-      ).read(userPreferencesRepositoryProvider)
-          as FakeUserPreferencesRepository;
-
-      expect(repo.afterMailViewAction, AfterMailViewAction.showMailbox);
-    });
   });
 }