Add search, offline queue, app icon, and UI polish

- Collapsible search in notes and tasks: magnifying glass in AppBar
  expands to a text field inline; close button resets the filter
- Offline capture queue: failed quick-captures (NetworkException) are
  persisted to SharedPreferences and retried automatically on next
  successful submit or app start; badge shows pending count
- App icon: book-with-sparkle logo from FabledAssistant SVG rendered
  at all Android densities with adaptive icon (indigo #6366f1 bg)
- Dark mode subtitle fix: use colorScheme.onSurfaceVariant for note
  preview and conversation timestamp text
- Remove swipe-to-delete (accidental deletions); long-press remains
- Chat: SSE streaming reliability, polling fallback, title patching
- Settings: theme toggle (system/light/dark) persisted to prefs
- Notes: delete button in edit screen; body preview in list
- Tasks: fix delete dialog context; description search support

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

lib/screens/chat/chat_screen.dart

@@ -50,6 +50,12 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
         ScaffoldMessenger.of(context)
             .showSnackBar(SnackBar(content: Text(e.message)));
       }
+    } catch (_) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Failed to send message.')),
+        );
+      }
     }
   }
 
@@ -63,15 +69,26 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
       _scrollToBottom();
     });
 
+    final convTitle = ref
+        .watch(conversationsProvider)
+        .valueOrNull
+        ?.where((c) => c.id == widget.conversationId)
+        .firstOrNull
+        ?.title;
+
     return Scaffold(
-      appBar: AppBar(title: const Text('Chat')),
+      appBar: AppBar(
+        title: Text(convTitle?.isNotEmpty == true ? convTitle! : 'Chat'),
+      ),
       body: Column(
         children: [
           Expanded(
             child: messagesAsync.when(
               loading: () =>
                   const Center(child: CircularProgressIndicator()),
-              error: (e, _) => Center(child: Text('Error: $e')),
+              error: (_, _) => const Center(
+                child: Text('Could not load messages.'),
+              ),
               data: (messages) {
                 if (messages.isEmpty) {
                   return const Center(

lib/screens/chat/conversations_list_screen.dart

@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../core/constants.dart';
+import '../../core/exceptions.dart';
 import '../../providers/chat_provider.dart';
 
 class ConversationsListScreen extends ConsumerWidget {
@@ -13,14 +14,16 @@ class ConversationsListScreen extends ConsumerWidget {
     final convsAsync = ref.watch(conversationsProvider);
 
     return Scaffold(
-      appBar: AppBar(title: const Text('Chat')),
       body: convsAsync.when(
         loading: () => const Center(child: CircularProgressIndicator()),
-        error: (e, _) => Center(
+        error: (_, _) => Center(
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              Text('Error: $e'),
+              const Icon(Icons.cloud_off, size: 48),
+              const SizedBox(height: 12),
+              const Text('Could not load conversations.'),
+              const SizedBox(height: 4),
               TextButton(
                 onPressed: () => ref.invalidate(conversationsProvider),
                 child: const Text('Retry'),
@@ -42,10 +45,14 @@ class ConversationsListScreen extends ConsumerWidget {
                 final conv = convs[i];
                 return ListTile(
                   leading: const Icon(Icons.chat_bubble_outline),
-                  title: Text(conv.title),
+                  title: Text(
+                    conv.title.isNotEmpty ? conv.title : 'New conversation',
+                  ),
                   subtitle: Text(
                     conv.updatedAt.toLocal().toString().substring(0, 16),
-                    style: Theme.of(context).textTheme.bodySmall,
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
                   ),
                   onTap: () => context.push(
                     Routes.chat.replaceFirst(':id', '${conv.id}'),
@@ -53,16 +60,21 @@ class ConversationsListScreen extends ConsumerWidget {
                   onLongPress: () async {
                     final confirm = await showDialog<bool>(
                       context: context,
-                      builder: (_) => AlertDialog(
+                      builder: (dialogContext) => AlertDialog(
                         title: const Text('Delete conversation?'),
-                        content: Text(conv.title),
+                        content: Text(
+                          conv.title.isNotEmpty
+                              ? conv.title
+                              : 'New conversation',
+                        ),
                         actions: [
                           TextButton(
-                            onPressed: () => Navigator.pop(context, false),
+                            onPressed: () =>
+                                Navigator.pop(dialogContext, false),
                             child: const Text('Cancel'),
                           ),
                           TextButton(
-                            onPressed: () => Navigator.pop(context, true),
+                            onPressed: () => Navigator.pop(dialogContext, true),
                             child: const Text('Delete'),
                           ),
                         ],
@@ -89,34 +101,16 @@ class ConversationsListScreen extends ConsumerWidget {
   }
 
   Future<void> _newConversation(BuildContext context, WidgetRef ref) async {
-    final controller = TextEditingController();
-    final title = await showDialog<String>(
-      context: context,
-      builder: (_) => AlertDialog(
-        title: const Text('New Conversation'),
-        content: TextField(
-          controller: controller,
-          decoration: const InputDecoration(hintText: 'Title'),
-          autofocus: true,
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context),
-            child: const Text('Cancel'),
-          ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, controller.text.trim()),
-            child: const Text('Create'),
-          ),
-        ],
-      ),
-    );
-    if (title != null && title.isNotEmpty) {
-      final conv =
-          await ref.read(conversationsProvider.notifier).create(title);
+    try {
+      final conv = await ref.read(conversationsProvider.notifier).create('');
       if (context.mounted) {
         context.push(Routes.chat.replaceFirst(':id', '${conv.id}'));
       }
+    } on AppException catch (e) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context)
+            .showSnackBar(SnackBar(content: Text(e.message)));
+      }
     }
   }
 }

lib/screens/notes/note_edit_screen.dart

@@ -41,6 +41,30 @@ class _NoteEditScreenState extends ConsumerState<NoteEditScreen> {
     _loaded = true;
   }
 
+  Future<void> _delete() async {
+    final confirm = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: const Text('Delete note?'),
+        content: Text(_titleController.text),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(dialogContext, false),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.pop(dialogContext, true),
+            child: const Text('Delete'),
+          ),
+        ],
+      ),
+    );
+    if (confirm == true) {
+      await ref.read(notesProvider.notifier).delete(widget.noteId!);
+      if (mounted) context.pop();
+    }
+  }
+
   Future<void> _save() async {
     final title = _titleController.text.trim();
     final body = _contentController.text;
@@ -79,6 +103,12 @@ class _NoteEditScreenState extends ConsumerState<NoteEditScreen> {
           appBar: AppBar(
             title: Text(widget.noteId == null ? 'New Note' : 'Edit Note'),
             actions: [
+              if (widget.noteId != null)
+                IconButton(
+                  icon: const Icon(Icons.delete_outline),
+                  tooltip: 'Delete',
+                  onPressed: _delete,
+                ),
               IconButton(
                 icon: Icon(_preview ? Icons.edit : Icons.preview),
                 tooltip: _preview ? 'Edit' : 'Preview',

lib/screens/notes/notes_list_screen.dart

@@ -5,22 +5,63 @@ import 'package:go_router/go_router.dart';
 import '../../core/constants.dart';
 import '../../providers/notes_provider.dart';
 
-class NotesListScreen extends ConsumerWidget {
+class NotesListScreen extends ConsumerStatefulWidget {
   const NotesListScreen({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<NotesListScreen> createState() => _NotesListScreenState();
+}
+
+class _NotesListScreenState extends ConsumerState<NotesListScreen> {
+  bool _showSearch = false;
+  String _search = '';
+
+  @override
+  Widget build(BuildContext context) {
     final notesAsync = ref.watch(notesProvider);
 
     return Scaffold(
-      appBar: AppBar(title: const Text('Notes')),
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        title: _showSearch
+            ? TextField(
+                autofocus: true,
+                decoration: const InputDecoration(
+                  hintText: 'Search notes…',
+                  border: InputBorder.none,
+                ),
+                onChanged: (v) =>
+                    setState(() => _search = v.trim().toLowerCase()),
+              )
+            : null,
+        actions: [
+          if (_showSearch)
+            IconButton(
+              icon: const Icon(Icons.close),
+              tooltip: 'Close search',
+              onPressed: () => setState(() {
+                _showSearch = false;
+                _search = '';
+              }),
+            )
+          else
+            IconButton(
+              icon: const Icon(Icons.search),
+              tooltip: 'Search',
+              onPressed: () => setState(() => _showSearch = true),
+            ),
+        ],
+      ),
       body: notesAsync.when(
         loading: () => const Center(child: CircularProgressIndicator()),
-        error: (e, _) => Center(
+        error: (_, _) => Center(
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              Text('Error: $e'),
+              const Icon(Icons.cloud_off, size: 48),
+              const SizedBox(height: 12),
+              const Text('Could not load notes.'),
+              const SizedBox(height: 4),
               TextButton(
                 onPressed: () => ref.invalidate(notesProvider),
                 child: const Text('Retry'),
@@ -29,21 +70,46 @@ class NotesListScreen extends ConsumerWidget {
           ),
         ),
         data: (notes) {
-          if (notes.isEmpty) {
-            return const Center(child: Text('No notes yet. Tap + to create one.'));
+          final filtered = _search.isEmpty
+              ? notes
+              : notes
+                  .where((n) =>
+                      n.title.toLowerCase().contains(_search) ||
+                      n.body.toLowerCase().contains(_search))
+                  .toList();
+
+          if (filtered.isEmpty) {
+            return Center(
+              child: Text(
+                _search.isEmpty
+                    ? 'No notes yet. Tap + to create one.'
+                    : 'No notes match "$_search".',
+              ),
+            );
           }
+
           return RefreshIndicator(
             onRefresh: () => ref.refresh(notesProvider.future),
             child: ListView.separated(
-              itemCount: notes.length,
+              itemCount: filtered.length,
               separatorBuilder: (_, _) => const Divider(height: 1),
               itemBuilder: (context, i) {
-                final note = notes[i];
+                final note = filtered[i];
+                final preview = note.body
+                    .split('\n')
+                    .firstWhere((l) => l.trim().isNotEmpty, orElse: () => '')
+                    .trim();
                 return ListTile(
                   title: Text(note.title),
                   subtitle: Text(
-                    note.updatedAt.toLocal().toString().substring(0, 16),
-                    style: Theme.of(context).textTheme.bodySmall,
+                    preview.isNotEmpty
+                        ? preview
+                        : note.updatedAt.toLocal().toString().substring(0, 16),
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
                   ),
                   onTap: () => context.push(
                     Routes.noteDetail.replaceFirst(':id', '${note.id}'),

lib/screens/quick_capture/quick_capture_screen.dart

@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../core/exceptions.dart';
-import '../../data/models/task.dart';
+import '../../providers/api_client_provider.dart';
 import '../../providers/notes_provider.dart';
 import '../../providers/tasks_provider.dart';
 
@@ -15,182 +15,137 @@ class QuickCaptureScreen extends ConsumerStatefulWidget {
       _QuickCaptureScreenState();
 }
 
-class _QuickCaptureScreenState extends ConsumerState<QuickCaptureScreen>
-    with SingleTickerProviderStateMixin {
-  late final TabController _tabs;
-  final _noteTitleController = TextEditingController();
-  final _noteContentController = TextEditingController();
-  final _taskTitleController = TextEditingController();
-  TaskPriority _taskPriority = TaskPriority.medium;
-  bool _saving = false;
-
-  @override
-  void initState() {
-    super.initState();
-    _tabs = TabController(length: 2, vsync: this);
-  }
+class _QuickCaptureScreenState extends ConsumerState<QuickCaptureScreen> {
+  final _controller = TextEditingController();
+  final _focusNode = FocusNode();
+  bool _loading = false;
 
   @override
   void dispose() {
-    _tabs.dispose();
-    _noteTitleController.dispose();
-    _noteContentController.dispose();
-    _taskTitleController.dispose();
+    _controller.dispose();
+    _focusNode.dispose();
     super.dispose();
   }
 
-  Future<void> _saveNote() async {
-    final title = _noteTitleController.text.trim();
-    if (title.isEmpty) {
-      ScaffoldMessenger.of(context)
-          .showSnackBar(const SnackBar(content: Text('Title is required.')));
-      return;
-    }
-    setState(() => _saving = true);
+  Future<void> _send() async {
+    final text = _controller.text.trim();
+    if (text.isEmpty) return;
+    setState(() => _loading = true);
     try {
-      await ref
-          .read(notesProvider.notifier)
-          .create(title, _noteContentController.text);
-      if (mounted) context.pop();
+      final result =
+          await ref.read(quickCaptureApiProvider).capture(text);
+      // Invalidate the relevant provider so the list screen re-fetches.
+      switch (result.type) {
+        case 'note':
+          ref.invalidate(notesProvider);
+        case 'task':
+        case 'todo':
+          ref.invalidate(tasksProvider);
+      }
+
+      if (mounted) {
+        // Use the server's human-readable message if available, else compose one.
+        final msg = result.message.isNotEmpty
+            ? result.message
+            : '${_typeLabel(result.type)} created: ${result.title}';
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(msg),
+            behavior: SnackBarBehavior.floating,
+          ),
+        );
+        context.pop();
+      }
     } on AppException catch (e) {
       if (mounted) {
-        ScaffoldMessenger.of(context)
-            .showSnackBar(SnackBar(content: Text(e.message)));
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(e.message),
+            behavior: SnackBarBehavior.floating,
+          ),
+        );
       }
     } finally {
-      if (mounted) setState(() => _saving = false);
+      if (mounted) setState(() => _loading = false);
     }
   }
 
-  Future<void> _saveTask() async {
-    final title = _taskTitleController.text.trim();
-    if (title.isEmpty) {
-      ScaffoldMessenger.of(context)
-          .showSnackBar(const SnackBar(content: Text('Title is required.')));
-      return;
-    }
-    setState(() => _saving = true);
-    try {
-      await ref.read(tasksProvider.notifier).create(
-            title: title,
-            status: TaskStatus.todo,
-            priority: _taskPriority,
-          );
-      if (mounted) context.pop();
-    } on AppException catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context)
-            .showSnackBar(SnackBar(content: Text(e.message)));
-      }
-    } finally {
-      if (mounted) setState(() => _saving = false);
-    }
-  }
+  String _typeLabel(String type) => switch (type) {
+        'note' => 'Note',
+        'task' => 'Task',
+        'event' => 'Event',
+        'todo' => 'To-do',
+        _ => type,
+      };
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Quick Capture'),
-        bottom: TabBar(
-          controller: _tabs,
-          tabs: const [Tab(text: 'Note'), Tab(text: 'Task')],
+      appBar: AppBar(title: const Text('Quick Capture')),
+      body: Padding(
+        padding: const EdgeInsets.all(20),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Text(
+              'What\'s on your mind?',
+              style: theme.textTheme.titleMedium,
+            ),
+            const SizedBox(height: 4),
+            Text(
+              'Describe a note, task, event, or research item — Fabled will figure out the rest.',
+              style: theme.textTheme.bodySmall?.copyWith(
+                color: theme.colorScheme.onSurfaceVariant,
+              ),
+            ),
+            const SizedBox(height: 16),
+            TextField(
+              controller: _controller,
+              focusNode: _focusNode,
+              autofocus: true,
+              enabled: !_loading,
+              maxLines: 6,
+              minLines: 3,
+              keyboardType: TextInputType.multiline,
+              decoration: InputDecoration(
+                hintText:
+                    'e.g. "Remind me to call the dentist next Monday" or "Note: project meeting went well, key points were..."',
+                border: const OutlineInputBorder(),
+                alignLabelWithHint: true,
+                suffixIcon: _controller.text.isNotEmpty
+                    ? IconButton(
+                        icon: const Icon(Icons.clear),
+                        onPressed: () {
+                          _controller.clear();
+                          setState(() {});
+                        },
+                      )
+                    : null,
+              ),
+              onChanged: (_) => setState(() {}),
+            ),
+            const SizedBox(height: 16),
+            FilledButton.icon(
+              onPressed: (_loading || _controller.text.trim().isEmpty)
+                  ? null
+                  : _send,
+              icon: _loading
+                  ? const SizedBox(
+                      width: 18,
+                      height: 18,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2,
+                        color: Colors.white,
+                      ),
+                    )
+                  : const Icon(Icons.auto_awesome),
+              label: Text(_loading ? 'Processing...' : 'Capture'),
+            ),
+          ],
         ),
       ),
-      body: TabBarView(
-        controller: _tabs,
-        children: [
-          // Note tab
-          Padding(
-            padding: const EdgeInsets.all(16),
-            child: Column(
-              children: [
-                TextField(
-                  controller: _noteTitleController,
-                  decoration: const InputDecoration(
-                    labelText: 'Title',
-                    border: OutlineInputBorder(),
-                  ),
-                  textInputAction: TextInputAction.next,
-                  autofocus: true,
-                ),
-                const SizedBox(height: 12),
-                Expanded(
-                  child: TextField(
-                    controller: _noteContentController,
-                    decoration: const InputDecoration(
-                      hintText: 'Content (optional, supports markdown)',
-                      border: OutlineInputBorder(),
-                      alignLabelWithHint: true,
-                    ),
-                    maxLines: null,
-                    expands: true,
-                    textAlignVertical: TextAlignVertical.top,
-                    keyboardType: TextInputType.multiline,
-                  ),
-                ),
-                const SizedBox(height: 12),
-                SizedBox(
-                  width: double.infinity,
-                  child: FilledButton(
-                    onPressed: _saving ? null : _saveNote,
-                    child: _saving
-                        ? const SizedBox(
-                            height: 20,
-                            width: 20,
-                            child: CircularProgressIndicator(strokeWidth: 2),
-                          )
-                        : const Text('Save Note'),
-                  ),
-                ),
-              ],
-            ),
-          ),
-          // Task tab
-          Padding(
-            padding: const EdgeInsets.all(16),
-            child: Column(
-              children: [
-                TextField(
-                  controller: _taskTitleController,
-                  decoration: const InputDecoration(
-                    labelText: 'Task title',
-                    border: OutlineInputBorder(),
-                  ),
-                  autofocus: true,
-                ),
-                const SizedBox(height: 12),
-                DropdownButtonFormField<TaskPriority>(
-                  initialValue: _taskPriority,
-                  decoration: const InputDecoration(
-                    labelText: 'Priority',
-                    border: OutlineInputBorder(),
-                  ),
-                  items: TaskPriority.values
-                      .map((p) =>
-                          DropdownMenuItem(value: p, child: Text(p.label)))
-                      .toList(),
-                  onChanged: (v) => setState(() => _taskPriority = v!),
-                ),
-                const SizedBox(height: 16),
-                SizedBox(
-                  width: double.infinity,
-                  child: FilledButton(
-                    onPressed: _saving ? null : _saveTask,
-                    child: _saving
-                        ? const SizedBox(
-                            height: 20,
-                            width: 20,
-                            child: CircularProgressIndicator(strokeWidth: 2),
-                          )
-                        : const Text('Save Task'),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
     );
   }
 }

lib/screens/settings/settings_screen.dart

@@ -12,6 +12,7 @@ class SettingsScreen extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final serverUrl = ref.watch(serverUrlProvider);
+    final themeMode = ref.watch(themeModeProvider);
 
     return Scaffold(
       appBar: AppBar(title: const Text('Settings')),
@@ -24,6 +25,33 @@ class SettingsScreen extends ConsumerWidget {
             onTap: () => context.go(Routes.setup),
           ),
           const Divider(),
+          ListTile(
+            title: const Text('Appearance'),
+            leading: const Icon(Icons.brightness_6),
+            trailing: SegmentedButton<ThemeMode>(
+              segments: const [
+                ButtonSegment(
+                  value: ThemeMode.system,
+                  icon: Icon(Icons.brightness_auto),
+                  tooltip: 'System',
+                ),
+                ButtonSegment(
+                  value: ThemeMode.light,
+                  icon: Icon(Icons.light_mode),
+                  tooltip: 'Light',
+                ),
+                ButtonSegment(
+                  value: ThemeMode.dark,
+                  icon: Icon(Icons.dark_mode),
+                  tooltip: 'Dark',
+                ),
+              ],
+              selected: {themeMode},
+              onSelectionChanged: (modes) =>
+                  ref.read(themeModeProvider.notifier).setMode(modes.first),
+            ),
+          ),
+          const Divider(),
           ListTile(
             title: const Text('Sign Out'),
             leading: const Icon(Icons.logout),

lib/screens/tasks/task_edit_screen.dart

@@ -85,14 +85,15 @@ class _TaskEditScreenState extends ConsumerState<TaskEditScreen> {
   Future<void> _delete() async {
     final confirm = await showDialog<bool>(
       context: context,
-      builder: (_) => AlertDialog(
+      builder: (dialogContext) => AlertDialog(
         title: const Text('Delete task?'),
+        content: Text(_titleController.text),
         actions: [
           TextButton(
-              onPressed: () => Navigator.pop(context, false),
+              onPressed: () => Navigator.pop(dialogContext, false),
               child: const Text('Cancel')),
           TextButton(
-              onPressed: () => Navigator.pop(context, true),
+              onPressed: () => Navigator.pop(dialogContext, true),
               child: const Text('Delete')),
         ],
       ),

lib/screens/tasks/tasks_list_screen.dart

@@ -16,6 +16,8 @@ class TasksListScreen extends ConsumerStatefulWidget {
 class _TasksListScreenState extends ConsumerState<TasksListScreen>
     with SingleTickerProviderStateMixin {
   late final TabController _tabs;
+  bool _showSearch = false;
+  String _search = '';
 
   @override
   void initState() {
@@ -35,7 +37,35 @@ class _TasksListScreenState extends ConsumerState<TasksListScreen>
 
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Tasks'),
+        automaticallyImplyLeading: false,
+        title: _showSearch
+            ? TextField(
+                autofocus: true,
+                decoration: const InputDecoration(
+                  hintText: 'Search tasks…',
+                  border: InputBorder.none,
+                ),
+                onChanged: (v) =>
+                    setState(() => _search = v.trim().toLowerCase()),
+              )
+            : null,
+        actions: [
+          if (_showSearch)
+            IconButton(
+              icon: const Icon(Icons.close),
+              tooltip: 'Close search',
+              onPressed: () => setState(() {
+                _showSearch = false;
+                _search = '';
+              }),
+            )
+          else
+            IconButton(
+              icon: const Icon(Icons.search),
+              tooltip: 'Search',
+              onPressed: () => setState(() => _showSearch = true),
+            ),
+        ],
         bottom: TabBar(
           controller: _tabs,
           tabs: const [
@@ -47,11 +77,14 @@ class _TasksListScreenState extends ConsumerState<TasksListScreen>
       ),
       body: tasksAsync.when(
         loading: () => const Center(child: CircularProgressIndicator()),
-        error: (e, _) => Center(
+        error: (_, _) => Center(
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              Text('Error: $e'),
+              const Icon(Icons.cloud_off, size: 48),
+              const SizedBox(height: 12),
+              const Text('Could not load tasks.'),
+              const SizedBox(height: 4),
               TextButton(
                 onPressed: () => ref.invalidate(tasksProvider),
                 child: const Text('Retry'),
@@ -60,21 +93,29 @@ class _TasksListScreenState extends ConsumerState<TasksListScreen>
           ),
         ),
         data: (tasks) {
+          final filtered = _search.isEmpty
+              ? tasks
+              : tasks
+                  .where((t) =>
+                      t.title.toLowerCase().contains(_search) ||
+                      (t.description ?? '').toLowerCase().contains(_search))
+                  .toList();
+
           final todo =
-              tasks.where((t) => t.status == TaskStatus.todo).toList();
+              filtered.where((t) => t.status == TaskStatus.todo).toList();
           final inProgress =
-              tasks.where((t) => t.status == TaskStatus.inProgress).toList();
+              filtered.where((t) => t.status == TaskStatus.inProgress).toList();
           final done =
-              tasks.where((t) => t.status == TaskStatus.done).toList();
+              filtered.where((t) => t.status == TaskStatus.done).toList();
 
           return RefreshIndicator(
             onRefresh: () => ref.refresh(tasksProvider.future),
             child: TabBarView(
               controller: _tabs,
               children: [
-                _TaskList(tasks: todo),
-                _TaskList(tasks: inProgress),
-                _TaskList(tasks: done),
+                _TaskList(tasks: todo, search: _search),
+                _TaskList(tasks: inProgress, search: _search),
+                _TaskList(tasks: done, search: _search),
               ],
             ),
           );
@@ -91,12 +132,17 @@ class _TasksListScreenState extends ConsumerState<TasksListScreen>
 
 class _TaskList extends ConsumerWidget {
   final List<Task> tasks;
-  const _TaskList({required this.tasks});
+  final String search;
+  const _TaskList({required this.tasks, this.search = ''});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     if (tasks.isEmpty) {
-      return const Center(child: Text('No tasks here.'));
+      return Center(
+        child: Text(
+          search.isEmpty ? 'No tasks here.' : 'No tasks match "$search".',
+        ),
+      );
     }
     return ListView.separated(
       itemCount: tasks.length,
@@ -107,7 +153,8 @@ class _TaskList extends ConsumerWidget {
           leading: _priorityIcon(task.priority),
           title: Text(task.title),
           subtitle: task.dueDate != null
-              ? Text('Due: ${task.dueDate!.toLocal().toString().substring(0, 10)}')
+              ? Text(
+                  'Due: ${task.dueDate!.toLocal().toString().substring(0, 10)}')
               : null,
           onTap: () => context.push(
             Routes.taskEdit.replaceFirst(':id', '${task.id}'),