neoagent 3.0.1-beta.9 → 3.1.0

package/flutter_app/lib/main_settings.dart

@@ -1,5 +1,7 @@
 part of 'main.dart';
 
+enum _LeaveAction { save, discard, cancel }
+
 class SettingsPanel extends StatefulWidget {
   const SettingsPanel({
     super.key,
@@ -190,6 +192,8 @@ class _SettingsPanelState extends State<SettingsPanel> {
   final Map<String, TextEditingController> _providerBaseUrlControllers =
       <String, TextEditingController>{};
 
+  bool _hasUnsavedChanges = false;
+
   // Inline runtime test state — ephemeral, not stored in controller.
   bool _cliTestRunning = false;
   Map<String, dynamic>? _cliTestResult;
@@ -314,8 +318,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
     final routingModels = availableModels.isEmpty
         ? controller.supportedModels
         : availableModels;
-    final List<_ModelPickerOption> modelChoices =
-        _modelPickerOptions(routingModels, allowAuto: true);
+    final List<_ModelPickerOption> modelChoices = _modelPickerOptions(
+      routingModels,
+      allowAuto: true,
+    );
     final enabledSmartModels = _enabledModels
         .where((id) => routingModels.any((model) => model.id == id))
         .length;
@@ -323,113 +329,131 @@ class _SettingsPanelState extends State<SettingsPanel> {
         .where((section) => !section.requiresDesktop || _supportsDesktopShell)
         .toSet();
 
-    return ListView(
-      padding: widget.embedded ? EdgeInsets.zero : _pagePadding(context),
-      children: <Widget>[
-        if (!widget.embedded)
-          _PageTitle(
-            title: 'Settings',
-            subtitle:
-                'Workspace, models, recording, and diagnostics controls.',
-            trailing: _settingsSaveButton(controller),
-          )
-        else
-          Align(
-            alignment: Alignment.centerRight,
-            child: Padding(
-              padding: const EdgeInsets.only(bottom: 12),
-              child: _settingsSaveButton(controller),
+    return PopScope(
+      canPop: !_hasUnsavedChanges,
+      onPopInvokedWithResult: (didPop, result) async {
+        if (didPop) return;
+        final action = await _showLeaveDialog(context);
+        if (action == _LeaveAction.save && mounted) {
+          await _doSave();
+          if (mounted) Navigator.of(context).pop();
+        } else if (action == _LeaveAction.discard && mounted) {
+          _hydrate();
+          setState(() => _hasUnsavedChanges = false);
+          Navigator.of(context).pop();
+        }
+        // cancel: do nothing
+      },
+      child: ListView(
+        padding: widget.embedded ? EdgeInsets.zero : _pagePadding(context),
+        children: <Widget>[
+          if (!widget.embedded)
+            _PageTitle(
+              title: 'Settings',
+              subtitle:
+                  'Workspace, models, recording, and diagnostics controls.',
+              trailing: _settingsSaveButton(controller),
+            )
+          else
+            Align(
+              alignment: Alignment.centerRight,
+              child: Padding(
+                padding: const EdgeInsets.only(bottom: 12),
+                child: _settingsSaveButton(controller),
+              ),
+            ),
+          if (controller.errorMessage != null) ...<Widget>[
+            _InlineError(message: controller.errorMessage!),
+            const SizedBox(height: 16),
+          ],
+          TextField(
+            controller: _searchController,
+            onChanged: (_) => setState(() {}),
+            decoration: InputDecoration(
+              labelText: 'Search settings',
+              hintText: 'Models, browser, voice, diagnostics...',
+              prefixIcon: const Icon(Icons.search),
+              suffixIcon: searchQuery.isEmpty
+                  ? null
+                  : IconButton(
+                      onPressed: () {
+                        _searchController.clear();
+                        setState(() {});
+                      },
+                      icon: const Icon(Icons.close),
+                    ),
             ),
           ),
-        if (controller.errorMessage != null) ...<Widget>[
-          _InlineError(message: controller.errorMessage!),
-          const SizedBox(height: 16),
-        ],
-        TextField(
-          controller: _searchController,
-          onChanged: (_) => setState(() {}),
-          decoration: InputDecoration(
-            labelText: 'Search settings',
-            hintText: 'Models, browser, voice, diagnostics...',
-            prefixIcon: const Icon(Icons.search),
-            suffixIcon: searchQuery.isEmpty
-                ? null
-                : IconButton(
-                    onPressed: () {
-                      _searchController.clear();
-                      setState(() {});
-                    },
-                    icon: const Icon(Icons.close),
-                  ),
-          ),
-        ),
-        const SizedBox(height: 16),
-        if (_matchesSettingsSection(
-          searchQuery,
-          _overviewSettingsSection,
-        )) ...<Widget>[
-          _buildSettingsOverview(controller, availableModels.length),
-          const SizedBox(height: 16),
-        ],
-        if (_matchesSettingsSection(
-          searchQuery,
-          _workspaceSettingsSection,
-        )) ...<Widget>[
-          _buildWorkspaceSection(controller),
-          const SizedBox(height: 16),
-        ],
-        if (_matchesSettingsSection(
-          searchQuery,
-          _modelsSettingsSection,
-        )) ...<Widget>[
-          _buildModelsSection(
-            context: context,
-            controller: controller,
-            modelChoices: modelChoices,
-            routingModels: routingModels,
-            availableModels: availableModels,
-            enabledSmartModels: enabledSmartModels,
-          ),
-          const SizedBox(height: 16),
-        ],
-        if (_matchesSettingsSection(
-          searchQuery,
-          _voiceRecordingSettingsSection,
-        )) ...<Widget>[
-          _buildVoiceAndRecordingSection(
-            controller: controller,
-            modelChoices: modelChoices,
-            routingModels: routingModels,
-          ),
-          const SizedBox(height: 16),
-        ],
-        if (visibleSearchSections.contains(_desktopSettingsSection) &&
-            _matchesSettingsSection(
-              searchQuery,
-              _desktopSettingsSection,
-            )) ...<Widget>[
-          _buildDesktopSection(controller),
-          const SizedBox(height: 16),
-        ],
-        if (_matchesSettingsSection(
-          searchQuery,
-          _securitySettingsSection,
-        )) ...<Widget>[
-          _buildSecuritySection(context, controller),
           const SizedBox(height: 16),
+          if (_matchesSettingsSection(
+            searchQuery,
+            _overviewSettingsSection,
+          )) ...<Widget>[
+            _buildSettingsOverview(controller, availableModels.length),
+            const SizedBox(height: 16),
+          ],
+          if (_matchesSettingsSection(
+            searchQuery,
+            _workspaceSettingsSection,
+          )) ...<Widget>[
+            _buildWorkspaceSection(controller),
+            const SizedBox(height: 16),
+          ],
+          if (_matchesSettingsSection(
+            searchQuery,
+            _modelsSettingsSection,
+          )) ...<Widget>[
+            _buildModelsSection(
+              context: context,
+              controller: controller,
+              modelChoices: modelChoices,
+              routingModels: routingModels,
+              availableModels: availableModels,
+              enabledSmartModels: enabledSmartModels,
+            ),
+            const SizedBox(height: 16),
+          ],
+          if (_matchesSettingsSection(
+            searchQuery,
+            _voiceRecordingSettingsSection,
+          )) ...<Widget>[
+            _buildVoiceAndRecordingSection(
+              controller: controller,
+              modelChoices: modelChoices,
+              routingModels: routingModels,
+            ),
+            const SizedBox(height: 16),
+          ],
+          if (visibleSearchSections.contains(_desktopSettingsSection) &&
+              _matchesSettingsSection(
+                searchQuery,
+                _desktopSettingsSection,
+              )) ...<Widget>[
+            _buildDesktopSection(controller),
+            const SizedBox(height: 16),
+          ],
+          if (_matchesSettingsSection(
+            searchQuery,
+            _securitySettingsSection,
+          )) ...<Widget>[
+            _buildSecuritySection(context, controller),
+            const SizedBox(height: 16),
+          ],
+          if (_matchesSettingsSection(
+            searchQuery,
+            _diagnosticsSettingsSection,
+          )) ...<Widget>[_buildDiagnosticsSection(controller)],
+          if (_noSettingsMatches(
+            searchQuery,
+            visibleSearchSections,
+          )) ...<Widget>[
+            const _EmptyCard(
+              title: 'No matching settings',
+              subtitle: 'Try a broader search like models, browser, or voice.',
+            ),
+          ],
         ],
-        if (_matchesSettingsSection(
-          searchQuery,
-          _diagnosticsSettingsSection,
-        )) ...<Widget>[_buildDiagnosticsSection(controller)],
-        if (_noSettingsMatches(searchQuery, visibleSearchSections)) ...<Widget>[
-          const _EmptyCard(
-            title: 'No matching settings',
-            subtitle:
-                'Try a broader search like models, browser, or voice.',
-          ),
-        ],
-      ],
+      ),
     );
   }
 
@@ -456,44 +480,45 @@ class _SettingsPanelState extends State<SettingsPanel> {
     );
   }
 
+  Future<void> _doSave() async {
+    final controller = widget.controller;
+    await controller.saveSettings(
+      browserBackend: _browserBackend == 'extension' ? 'extension' : 'vm',
+      browserExtensionTokenId: _browserBackend == 'extension'
+          ? _browserExtensionTokenId
+          : null,
+      cliBackend: _cliBackend == 'desktop' ? 'desktop' : 'vm',
+      cliDesktopDeviceId: _cliDesktopDeviceId,
+      smarterSelector: _smarterSelector,
+      enabledModels: _enabledModels.toList(),
+      defaultChatModel: _defaultChatModel,
+      defaultSubagentModel: _defaultSubagentModel,
+      defaultRecordingTranscriptionProvider: 'deepgram',
+      defaultRecordingTranscriptionModel: _defaultRecordingTranscriptionModel,
+      defaultRecordingSummaryProvider: _providerForSelectedModel(
+        _defaultRecordingSummaryModel,
+        controller.supportedModels,
+      ),
+      defaultRecordingSummaryModel: _defaultRecordingSummaryModel,
+      fallbackModel: _fallbackModel,
+      defaultSpeechModel: _defaultSpeechModel,
+      voiceSttProvider: controller.voiceSttProvider,
+      voiceSttModel: controller.voiceSttModel,
+      voiceTtsProvider: controller.voiceTtsProvider,
+      voiceTtsModel: controller.voiceTtsModel,
+      voiceTtsVoice: controller.voiceTtsVoice,
+      voiceRuntimeMode: 'live',
+      voiceLiveProvider: _voiceLiveProvider,
+      voiceLiveModel: _voiceLiveModel,
+      voiceLiveVoice: _voiceLiveVoice,
+      aiProviderConfigs: _buildProviderPayload(),
+    );
+    if (mounted) setState(() => _hasUnsavedChanges = false);
+  }
+
   Widget _settingsSaveButton(NeoAgentController controller) {
-    return FilledButton.icon(
-      onPressed: controller.isSavingSettings
-          ? null
-          : () => controller.saveSettings(
-              browserBackend: _browserBackend == 'extension'
-                  ? 'extension'
-                  : 'vm',
-              browserExtensionTokenId: _browserBackend == 'extension'
-                  ? _browserExtensionTokenId
-                  : null,
-              cliBackend: _cliBackend == 'desktop' ? 'desktop' : 'vm',
-              cliDesktopDeviceId: _cliDesktopDeviceId,
-              smarterSelector: _smarterSelector,
-              enabledModels: _enabledModels.toList(),
-              defaultChatModel: _defaultChatModel,
-              defaultSubagentModel: _defaultSubagentModel,
-              defaultRecordingTranscriptionProvider: 'deepgram',
-              defaultRecordingTranscriptionModel:
-                  _defaultRecordingTranscriptionModel,
-              defaultRecordingSummaryProvider: _providerForSelectedModel(
-                _defaultRecordingSummaryModel,
-                controller.supportedModels,
-              ),
-              defaultRecordingSummaryModel: _defaultRecordingSummaryModel,
-              fallbackModel: _fallbackModel,
-              defaultSpeechModel: _defaultSpeechModel,
-              voiceSttProvider: controller.voiceSttProvider,
-              voiceSttModel: controller.voiceSttModel,
-              voiceTtsProvider: controller.voiceTtsProvider,
-              voiceTtsModel: controller.voiceTtsModel,
-              voiceTtsVoice: controller.voiceTtsVoice,
-              voiceRuntimeMode: 'live',
-              voiceLiveProvider: _voiceLiveProvider,
-              voiceLiveModel: _voiceLiveModel,
-              voiceLiveVoice: _voiceLiveVoice,
-              aiProviderConfigs: _buildProviderPayload(),
-            ),
+    final button = FilledButton.icon(
+      onPressed: controller.isSavingSettings ? null : _doSave,
       style: FilledButton.styleFrom(backgroundColor: _accent),
       icon: controller.isSavingSettings
           ? const SizedBox.square(
@@ -506,6 +531,19 @@ class _SettingsPanelState extends State<SettingsPanel> {
           : Icon(Icons.save_outlined),
       label: Text('Save'),
     );
+    if (!_hasUnsavedChanges) return button;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        Text(
+          'Unsaved changes',
+          style: TextStyle(color: Colors.orange, fontSize: 12),
+        ),
+        const SizedBox(height: 4),
+        button,
+      ],
+    );
   }
 
   Widget _buildSettingsOverview(
@@ -623,6 +661,7 @@ class _SettingsPanelState extends State<SettingsPanel> {
                     _browserBackend = value;
                     _browserExtensionTokenId ??=
                         controller.selectedBrowserExtensionTokenId;
+                    _hasUnsavedChanges = true;
                   });
                 }
               },
@@ -631,21 +670,27 @@ class _SettingsPanelState extends State<SettingsPanel> {
             if (_browserBackend == 'extension') ...<Widget>[
               if (controller.browserExtensionTokens.isNotEmpty) ...<Widget>[
                 DropdownButtonFormField<String>(
-                  initialValue: controller.browserExtensionTokens.any(
-                    (token) => token['tokenId']?.toString() == _browserExtensionTokenId,
-                  )
+                  initialValue:
+                      controller.browserExtensionTokens.any(
+                        (token) =>
+                            token['tokenId']?.toString() ==
+                            _browserExtensionTokenId,
+                      )
                       ? _browserExtensionTokenId
                       : null,
                   decoration: const InputDecoration(
                     labelText: 'Default extension',
-                    helperText: 'Choose which paired Chrome extension controls browser actions.',
+                    helperText:
+                        'Choose which paired Chrome extension controls browser actions.',
                   ),
                   items: controller.browserExtensionTokens.map((token) {
                     final tokenId = token['tokenId']?.toString() ?? '';
-                    final label = token['name']?.toString().trim().isNotEmpty == true
+                    final label =
+                        token['name']?.toString().trim().isNotEmpty == true
                         ? token['name'].toString()
                         : tokenId;
-                    final online = token['online'] == true || token['connected'] == true;
+                    final online =
+                        token['online'] == true || token['connected'] == true;
                     return DropdownMenuItem<String>(
                       value: tokenId,
                       child: Row(
@@ -669,7 +714,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                   }).toList(),
                   onChanged: (value) {
                     if (value != null) {
-                      setState(() => _browserExtensionTokenId = value);
+                      setState(() {
+                        _browserExtensionTokenId = value;
+                        _hasUnsavedChanges = true;
+                      });
                     }
                   },
                 ),
@@ -683,7 +731,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                     ? 'Connected — tap Test to verify the live link.'
                     : 'Not connected — download the extension, load it in Chrome, then pair after login.',
                 onTest: () async {
-                  setState(() { _extensionTestRunning = true; _extensionTestResult = null; });
+                  setState(() {
+                    _extensionTestRunning = true;
+                    _extensionTestResult = null;
+                  });
                   try {
                     final r = await controller.testBrowserExtension();
                     if (mounted) {
@@ -691,7 +742,12 @@ class _SettingsPanelState extends State<SettingsPanel> {
                     }
                   } catch (e) {
                     if (mounted) {
-                      setState(() => _extensionTestResult = <String, dynamic>{'passed': false, 'detail': e.toString()});
+                      setState(
+                        () => _extensionTestResult = <String, dynamic>{
+                          'passed': false,
+                          'detail': e.toString(),
+                        },
+                      );
                     }
                   } finally {
                     if (mounted) {
@@ -718,7 +774,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                 ],
               ),
             ] else ...<Widget>[
-              Text('Cloud browser runtime is active.', style: TextStyle(color: _textSecondary, height: 1.4)),
+              Text(
+                'Cloud browser runtime is active.',
+                style: TextStyle(color: _textSecondary, height: 1.4),
+              ),
             ],
             const Divider(height: 32),
             Text(
@@ -746,25 +805,32 @@ class _SettingsPanelState extends State<SettingsPanel> {
               ],
               onChanged: (value) {
                 if (value != null) {
-                  setState(() => _cliBackend = value);
+                  setState(() {
+                    _cliBackend = value;
+                    _hasUnsavedChanges = true;
+                  });
                 }
               },
             ),
-            if (_cliBackend == 'desktop' && controller.desktopDevices.length > 1) ...<Widget>[
+            if (_cliBackend == 'desktop' &&
+                controller.desktopDevices.length > 1) ...<Widget>[
               const SizedBox(height: 12),
               DropdownButtonFormField<String>(
-                initialValue: controller.desktopDevices.any(
-                  (d) => d['deviceId']?.toString() == _cliDesktopDeviceId,
-                )
+                initialValue:
+                    controller.desktopDevices.any(
+                      (d) => d['deviceId']?.toString() == _cliDesktopDeviceId,
+                    )
                     ? _cliDesktopDeviceId
                     : null,
                 decoration: const InputDecoration(
                   labelText: 'Desktop device',
-                  helperText: 'Choose which desktop companion runs CLI commands.',
+                  helperText:
+                      'Choose which desktop companion runs CLI commands.',
                 ),
                 items: controller.desktopDevices.map((device) {
                   final deviceId = device['deviceId']?.toString() ?? '';
-                  final label = device['hostname']?.toString().isNotEmpty == true
+                  final label =
+                      device['hostname']?.toString().isNotEmpty == true
                       ? device['hostname']!.toString()
                       : deviceId;
                   final online = device['online'] == true;
@@ -785,7 +851,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                 }).toList(),
                 onChanged: (value) {
                   if (value != null) {
-                    setState(() => _cliDesktopDeviceId = value);
+                    setState(() {
+                      _cliDesktopDeviceId = value;
+                      _hasUnsavedChanges = true;
+                    });
                   }
                 },
               ),
@@ -797,11 +866,14 @@ class _SettingsPanelState extends State<SettingsPanel> {
               result: _cliTestResult,
               note: _cliBackend == 'desktop'
                   ? (controller.desktopCompanionConnected
-                      ? 'Desktop app connected — commands route locally through the companion.'
-                      : 'Desktop app selected but not connected. Commands fall back to cloud VM until the companion is online.')
+                        ? 'Desktop app connected — commands route locally through the companion.'
+                        : 'Desktop app selected but not connected. Commands fall back to cloud VM until the companion is online.')
                   : 'Cloud VM — commands run in an isolated container.',
               onTest: () async {
-                setState(() { _cliTestRunning = true; _cliTestResult = null; });
+                setState(() {
+                  _cliTestRunning = true;
+                  _cliTestResult = null;
+                });
                 try {
                   final r = await controller.testCliRuntime();
                   if (mounted) {
@@ -809,7 +881,12 @@ class _SettingsPanelState extends State<SettingsPanel> {
                   }
                 } catch (e) {
                   if (mounted) {
-                    setState(() => _cliTestResult = <String, dynamic>{'passed': false, 'detail': e.toString()});
+                    setState(
+                      () => _cliTestResult = <String, dynamic>{
+                        'passed': false,
+                        'detail': e.toString(),
+                      },
+                    );
                   }
                 } finally {
                   if (mounted) {
@@ -832,7 +909,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
               subtitle:
                   'Automatically choose the best enabled model for each task type.',
               value: _smarterSelector,
-              onChanged: (value) => setState(() => _smarterSelector = value),
+              onChanged: (value) => setState(() {
+                _smarterSelector = value;
+                _hasUnsavedChanges = true;
+              }),
             ),
           ],
         ),
@@ -893,7 +973,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                           options: modelChoices,
                           onChanged: (value) {
                             if (value != null) {
-                              setState(() => _defaultChatModel = value);
+                              setState(() {
+                                _defaultChatModel = value;
+                                _hasUnsavedChanges = true;
+                              });
                             }
                           },
                         ),
@@ -911,7 +994,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                           options: modelChoices,
                           onChanged: (value) {
                             if (value != null) {
-                              setState(() => _defaultSubagentModel = value);
+                              setState(() {
+                                _defaultSubagentModel = value;
+                                _hasUnsavedChanges = true;
+                              });
                             }
                           },
                         ),
@@ -929,7 +1015,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                           options: _modelPickerOptions(routingModels),
                           onChanged: (value) {
                             if (value != null) {
-                              setState(() => _fallbackModel = value);
+                              setState(() {
+                                _fallbackModel = value;
+                                _hasUnsavedChanges = true;
+                              });
                             }
                           },
                         ),
@@ -963,12 +1052,21 @@ class _SettingsPanelState extends State<SettingsPanel> {
                   barrierColor: Colors.black.withValues(alpha: 0.55),
                   transitionDuration: const Duration(milliseconds: 220),
                   transitionBuilder: (ctx, anim, _, child) => FadeTransition(
-                    opacity: CurvedAnimation(parent: anim, curve: Curves.easeOut),
+                    opacity: CurvedAnimation(
+                      parent: anim,
+                      curve: Curves.easeOut,
+                    ),
                     child: SlideTransition(
-                      position: Tween<Offset>(
-                        begin: const Offset(0, 0.04),
-                        end: Offset.zero,
-                      ).animate(CurvedAnimation(parent: anim, curve: Curves.easeOutCubic)),
+                      position:
+                          Tween<Offset>(
+                            begin: const Offset(0, 0.04),
+                            end: Offset.zero,
+                          ).animate(
+                            CurvedAnimation(
+                              parent: anim,
+                              curve: Curves.easeOutCubic,
+                            ),
+                          ),
                       child: child,
                     ),
                   ),
@@ -977,7 +1075,11 @@ class _SettingsPanelState extends State<SettingsPanel> {
                     selectedIds: _enabledModels,
                   ),
                 );
-                if (result != null) setState(() => _enabledModels = result);
+                if (result != null)
+                  setState(() {
+                    _enabledModels = result;
+                    _hasUnsavedChanges = true;
+                  });
               },
             ),
           ],
@@ -1037,9 +1139,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                         options: modelChoices,
                         onChanged: (value) {
                           if (value != null) {
-                            setState(
-                              () => _defaultRecordingSummaryModel = value,
-                            );
+                            setState(() {
+                              _defaultRecordingSummaryModel = value;
+                              _hasUnsavedChanges = true;
+                            });
                           }
                         },
                       ),
@@ -1057,6 +1160,7 @@ class _SettingsPanelState extends State<SettingsPanel> {
                           if (value != null) {
                             setState(() {
                               _defaultRecordingTranscriptionModel = value;
+                              _hasUnsavedChanges = true;
                             });
                           }
                         },
@@ -1098,7 +1202,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                         options: modelChoices,
                         onChanged: (value) {
                           if (value != null) {
-                            setState(() => _defaultSpeechModel = value);
+                            setState(() {
+                              _defaultSpeechModel = value;
+                              _hasUnsavedChanges = true;
+                            });
                           }
                         },
                       ),
@@ -1137,9 +1244,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                         label: 'Live Provider',
                         icon: Icons.call_outlined,
                         value: _voiceLiveProvider,
-                        options: _simplePickerOptions(
-                          const <String>['openai', 'gemini'],
-                        ),
+                        options: _simplePickerOptions(const <String>[
+                          'openai',
+                          'gemini',
+                        ]),
                         onChanged: (value) {
                           if (value == null) return;
                           setState(() {
@@ -1158,6 +1266,7 @@ class _SettingsPanelState extends State<SettingsPanel> {
                                 !voiceOptions.contains(_voiceLiveVoice)) {
                               _voiceLiveVoice = voiceOptions.first;
                             }
+                            _hasUnsavedChanges = true;
                           });
                         },
                       ),
@@ -1174,7 +1283,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                         ),
                         onChanged: (value) {
                           if (value != null) {
-                            setState(() => _voiceLiveModel = value);
+                            setState(() {
+                              _voiceLiveModel = value;
+                              _hasUnsavedChanges = true;
+                            });
                           }
                         },
                       ),
@@ -1189,7 +1301,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                           options: _simplePickerOptions(liveVoiceOptions),
                           onChanged: (value) {
                             if (value != null) {
-                              setState(() => _voiceLiveVoice = value);
+                              setState(() {
+                                _voiceLiveVoice = value;
+                                _hasUnsavedChanges = true;
+                              });
                             }
                           },
                         ),
@@ -1307,6 +1422,18 @@ class _SettingsPanelState extends State<SettingsPanel> {
                   ? controller.setDesktopCompanionPaused
                   : null,
             ),
+            SwitchListTile.adaptive(
+              value: controller.desktopPassiveHistoryEnabled,
+              contentPadding: EdgeInsets.zero,
+              title: Text('Passive screen history on this computer'),
+              subtitle: Text(
+                'Capture OCR text plus app/window context locally for the user-wide Timeline. Screenshots stay transient and are not uploaded.',
+                style: TextStyle(color: _textSecondary),
+              ),
+              onChanged: controller.desktopCompanionEnabled
+                  ? controller.setDesktopPassiveHistoryEnabled
+                  : null,
+            ),
             const SizedBox(height: 12),
             TextFormField(
               initialValue: controller.desktopCompanionLabel,
@@ -1341,8 +1468,49 @@ class _SettingsPanelState extends State<SettingsPanel> {
                       ? _warning
                       : _success,
                 ),
+                _DotStatus(
+                  label: controller.desktopPassiveHistoryEnabled
+                      ? 'History enabled'
+                      : 'History disabled',
+                  color: controller.desktopPassiveHistoryEnabled
+                      ? _accent
+                      : _textMuted,
+                ),
               ],
             ),
+            if (controller.desktopPassiveHistoryLastUploadedAt != null ||
+                controller.desktopPassiveHistoryLastError != null) ...<Widget>[
+              const SizedBox(height: 12),
+              Container(
+                width: double.infinity,
+                padding: const EdgeInsets.all(12),
+                decoration: BoxDecoration(
+                  color: _bgSecondary.withValues(alpha: 0.66),
+                  borderRadius: BorderRadius.circular(16),
+                  border: Border.all(color: _borderLight),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    if (controller.desktopPassiveHistoryLastUploadedAt
+                        case final uploadedAt?)
+                      Text(
+                        'Last upload: ${_formatTimestamp(DateTime.parse(uploadedAt))}',
+                        style: TextStyle(color: _textSecondary),
+                      ),
+                    if (controller.desktopPassiveHistoryLastError
+                        case final passiveError?)
+                      Padding(
+                        padding: const EdgeInsets.only(top: 6),
+                        child: Text(
+                          'Last error: $passiveError',
+                          style: TextStyle(color: _danger),
+                        ),
+                      ),
+                  ],
+                ),
+              ),
+            ],
             if (controller.desktopCompanionErrorMessage
                 case final message?) ...<Widget>[
               const SizedBox(height: 12),
@@ -1362,7 +1530,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
                   ? 'Connected — tap Test to fetch live device status from the server.'
                   : 'Not connected. Make sure the desktop app is running on the target machine.',
               onTest: () async {
-                setState(() { _desktopTestRunning = true; _desktopTestResult = null; });
+                setState(() {
+                  _desktopTestRunning = true;
+                  _desktopTestResult = null;
+                });
                 try {
                   final r = await controller.testDesktopCompanion();
                   final active = r['activeDevice'];
@@ -1373,20 +1544,29 @@ class _SettingsPanelState extends State<SettingsPanel> {
                     final plat = active['platform']?.toString() ?? '';
                     final sc = active['permissions']?['screenCapture'] == true;
                     final ic = active['permissions']?['inputControl'] == true;
-                    detail = '$label${plat.isNotEmpty ? " ($plat)" : ""}'
+                    detail =
+                        '$label${plat.isNotEmpty ? " ($plat)" : ""}'
                         ' — screen: ${sc ? "✓" : "✗"}, input: ${ic ? "✓" : "✗"}';
                   } else if (multi) {
-                    detail = '${r['onlineCount']} devices online — select one in Desktop › Devices';
+                    detail =
+                        '${r['onlineCount']} devices online — select one in Desktop › Devices';
                   }
                   if (mounted) {
-                    setState(() => _desktopTestResult = <String, dynamic>{
-                      ...r,
-                      'detail': detail,
-                    });
+                    setState(
+                      () => _desktopTestResult = <String, dynamic>{
+                        ...r,
+                        'detail': detail,
+                      },
+                    );
                   }
                 } catch (e) {
                   if (mounted) {
-                    setState(() => _desktopTestResult = <String, dynamic>{'passed': false, 'detail': e.toString()});
+                    setState(
+                      () => _desktopTestResult = <String, dynamic>{
+                        'passed': false,
+                        'detail': e.toString(),
+                      },
+                    );
                   }
                 } finally {
                   if (mounted) {
@@ -1511,7 +1691,10 @@ class _SettingsPanelState extends State<SettingsPanel> {
     );
   }
 
-  Widget _buildSecuritySection(BuildContext context, NeoAgentController controller) {
+  Widget _buildSecuritySection(
+    BuildContext context,
+    NeoAgentController controller,
+  ) {
     return Card(
       child: Padding(
         padding: const EdgeInsets.all(20),
@@ -1661,6 +1844,32 @@ class _SettingsPanelState extends State<SettingsPanel> {
     }
   }
 
+  Future<_LeaveAction?> _showLeaveDialog(BuildContext context) {
+    return showDialog<_LeaveAction>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Unsaved changes'),
+        content: const Text(
+          'You have unsaved settings. What would you like to do?',
+        ),
+        actions: <Widget>[
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, _LeaveAction.cancel),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, _LeaveAction.discard),
+            child: const Text('Discard'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.pop(ctx, _LeaveAction.save),
+            child: const Text('Save'),
+          ),
+        ],
+      ),
+    );
+  }
+
   List<_ModelPickerOption> _recordingTranscriptionOptions(String current) {
     const List<String> defaults = <String>['nova-3', 'nova-2-general'];
     final String normalizedCurrent = current.trim();
@@ -1690,14 +1899,20 @@ class _SettingsPanelState extends State<SettingsPanel> {
                 Row(
                   children: <Widget>[
                     Icon(
-                      passed ? Icons.check_circle_rounded : Icons.cancel_rounded,
+                      passed
+                          ? Icons.check_circle_rounded
+                          : Icons.cancel_rounded,
                       size: 15,
-                      color: passed ? const Color(0xFF22C55E) : const Color(0xFFEF4444),
+                      color: passed
+                          ? const Color(0xFF22C55E)
+                          : const Color(0xFFEF4444),
                     ),
                     const SizedBox(width: 6),
                     Expanded(
                       child: Text(
-                        passed ? (detail.isNotEmpty ? detail : '$label: OK') : detail,
+                        passed
+                            ? (detail.isNotEmpty ? detail : '$label: OK')
+                            : detail,
                         style: TextStyle(
                           fontSize: 13,
                           color: passed ? null : const Color(0xFFEF4444),
@@ -1707,7 +1922,14 @@ class _SettingsPanelState extends State<SettingsPanel> {
                   ],
                 )
               else if (note != null)
-                Text(note, style: TextStyle(fontSize: 13, color: _textSecondary, height: 1.4)),
+                Text(
+                  note,
+                  style: TextStyle(
+                    fontSize: 13,
+                    color: _textSecondary,
+                    height: 1.4,
+                  ),
+                ),
             ],
           ),
         ),
@@ -1844,7 +2066,9 @@ class _SmartPoolSummary extends StatelessWidget {
                         style: TextStyle(fontSize: 12, color: _textMuted),
                       )
                     else
-                      ...providers.take(12).map(
+                      ...providers
+                          .take(12)
+                          .map(
                             (p) => Container(
                               width: 8,
                               height: 8,
@@ -1866,8 +2090,7 @@ class _SmartPoolSummary extends StatelessWidget {
             icon: const Icon(Icons.tune_rounded, size: 14),
             label: const Text('Manage'),
             style: OutlinedButton.styleFrom(
-              padding:
-                  const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
               textStyle: const TextStyle(fontSize: 13),
             ),
           ),
@@ -1882,10 +2105,7 @@ class _SmartPoolSummary extends StatelessWidget {
 // ─────────────────────────────────────────────────────────────────────────────
 
 class _SmartPoolDialog extends StatefulWidget {
-  const _SmartPoolDialog({
-    required this.models,
-    required this.selectedIds,
-  });
+  const _SmartPoolDialog({required this.models, required this.selectedIds});
 
   final List<ModelMeta> models;
   final Set<String> selectedIds;
@@ -1919,10 +2139,12 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
     if (_query.isNotEmpty) {
       final q = _query.toLowerCase();
       list = list
-          .where((m) =>
-              m.label.toLowerCase().contains(q) ||
-              m.id.toLowerCase().contains(q) ||
-              m.provider.toLowerCase().contains(q))
+          .where(
+            (m) =>
+                m.label.toLowerCase().contains(q) ||
+                m.id.toLowerCase().contains(q) ||
+                m.provider.toLowerCase().contains(q),
+          )
           .toList();
     }
     return list;
@@ -1940,9 +2162,7 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
     setState(() {
       final toRemove = filtered.map((m) => m.id).toSet();
       final remaining = _selected.difference(toRemove);
-      _selected = remaining.isNotEmpty
-          ? remaining
-          : <String>{_selected.first};
+      _selected = remaining.isNotEmpty ? remaining : <String>{_selected.first};
     });
   }
 
@@ -1967,79 +2187,82 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
       final models = grouped[provider]!;
       final providerColor = _providerPickerColor(provider);
       final available = models.where((m) => m.available).toList();
-      final allGroupSelected = available.isNotEmpty &&
+      final allGroupSelected =
+          available.isNotEmpty &&
           available.every((m) => _selected.contains(m.id));
 
-      rows.add(Padding(
-        padding: const EdgeInsets.fromLTRB(16, 14, 16, 4),
-        child: Row(
-          children: <Widget>[
-            Container(
-              width: 6,
-              height: 6,
-              decoration: BoxDecoration(
-                color: providerColor,
-                shape: BoxShape.circle,
+      rows.add(
+        Padding(
+          padding: const EdgeInsets.fromLTRB(16, 14, 16, 4),
+          child: Row(
+            children: <Widget>[
+              Container(
+                width: 6,
+                height: 6,
+                decoration: BoxDecoration(
+                  color: providerColor,
+                  shape: BoxShape.circle,
+                ),
               ),
-            ),
-            const SizedBox(width: 8),
-            Expanded(
-              child: Text(
-                _providerPickerLabel(provider).toUpperCase(),
-                style: TextStyle(
-                  fontSize: 10.5,
-                  fontWeight: FontWeight.w700,
-                  color: _textMuted,
-                  letterSpacing: 0.8,
+              const SizedBox(width: 8),
+              Expanded(
+                child: Text(
+                  _providerPickerLabel(provider).toUpperCase(),
+                  style: TextStyle(
+                    fontSize: 10.5,
+                    fontWeight: FontWeight.w700,
+                    color: _textMuted,
+                    letterSpacing: 0.8,
+                  ),
                 ),
               ),
-            ),
-            const SizedBox(width: 8),
-            GestureDetector(
-              onTap: available.isEmpty
-                  ? null
-                  : () {
-                      setState(() {
-                        if (allGroupSelected) {
-                          final toRemove =
-                              available.map((m) => m.id).toSet();
-                          final remaining =
-                              _selected.difference(toRemove);
-                          _selected = remaining.isNotEmpty
-                              ? remaining
-                              : <String>{_selected.first};
-                        } else {
-                          for (final m in available) {
-                            _selected.add(m.id);
+              const SizedBox(width: 8),
+              GestureDetector(
+                onTap: available.isEmpty
+                    ? null
+                    : () {
+                        setState(() {
+                          if (allGroupSelected) {
+                            final toRemove = available.map((m) => m.id).toSet();
+                            final remaining = _selected.difference(toRemove);
+                            _selected = remaining.isNotEmpty
+                                ? remaining
+                                : <String>{_selected.first};
+                          } else {
+                            for (final m in available) {
+                              _selected.add(m.id);
+                            }
                           }
-                        }
-                      });
-                    },
-              child: Text(
-                allGroupSelected ? 'None' : 'All',
-                style: TextStyle(
-                  fontSize: 11,
-                  fontWeight: FontWeight.w600,
-                  color: available.isEmpty ? _textMuted : _accent,
+                        });
+                      },
+                child: Text(
+                  allGroupSelected ? 'None' : 'All',
+                  style: TextStyle(
+                    fontSize: 11,
+                    fontWeight: FontWeight.w600,
+                    color: available.isEmpty ? _textMuted : _accent,
+                  ),
                 ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
-      ));
+      );
 
       for (final model in models) {
-        rows.add(_SmartPoolRow(
-          model: model,
-          selected: _selected.contains(model.id),
-          onToggle: (val) => setState(() {
-            if (val) {
-              _selected.add(model.id);
-            } else if (_selected.length > 1) {
-              _selected.remove(model.id);
-            }
-          }),
-        ));
+        rows.add(
+          _SmartPoolRow(
+            model: model,
+            selected: _selected.contains(model.id),
+            onToggle: (val) => setState(() {
+              if (val) {
+                _selected.add(model.id);
+              } else if (_selected.length > 1) {
+                _selected.remove(model.id);
+              }
+            }),
+          ),
+        );
       }
     }
 
@@ -2093,8 +2316,7 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
                             style: IconButton.styleFrom(
                               minimumSize: const Size(36, 36),
                               padding: EdgeInsets.zero,
-                              tapTargetSize:
-                                  MaterialTapTargetSize.shrinkWrap,
+                              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                             ),
                           ),
                         ],
@@ -2144,18 +2366,17 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
                                     : null,
                                 isDense: true,
                                 contentPadding: const EdgeInsets.symmetric(
-                                    vertical: 10),
+                                  vertical: 10,
+                                ),
                                 filled: true,
                                 fillColor: _bgSecondary,
                                 border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(12),
-                                  borderSide:
-                                      BorderSide(color: _border),
+                                  borderSide: BorderSide(color: _border),
                                 ),
                                 enabledBorder: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(12),
-                                  borderSide:
-                                      BorderSide(color: _border),
+                                  borderSide: BorderSide(color: _border),
                                 ),
                                 focusedBorder: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(12),
@@ -2170,7 +2391,8 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
                           const SizedBox(width: 8),
                           GestureDetector(
                             onTap: () => setState(
-                                () => _onlyAvailable = !_onlyAvailable),
+                              () => _onlyAvailable = !_onlyAvailable,
+                            ),
                             child: AnimatedContainer(
                               duration: const Duration(milliseconds: 150),
                               padding: const EdgeInsets.symmetric(
@@ -2220,10 +2442,7 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
                           const Spacer(),
                           Text(
                             '$selectedAvailableCount selected',
-                            style: TextStyle(
-                              fontSize: 12,
-                              color: _textMuted,
-                            ),
+                            style: TextStyle(fontSize: 12, color: _textMuted),
                           ),
                         ],
                       ),
@@ -2254,8 +2473,7 @@ class _SmartPoolDialogState extends State<_SmartPoolDialog> {
                               ),
                             )
                           : ListView(
-                              padding:
-                                  const EdgeInsets.only(top: 4, bottom: 8),
+                              padding: const EdgeInsets.only(top: 4, bottom: 8),
                               shrinkWrap: true,
                               children: rows,
                             ),
@@ -2298,8 +2516,7 @@ class _SmartPoolRow extends StatelessWidget {
         child: InkWell(
           onTap: model.available ? () => onToggle(!selected) : null,
           child: Padding(
-            padding:
-                const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
+            padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
             child: Row(
               children: <Widget>[
                 // Thin provider accent bar on the left
@@ -2307,8 +2524,7 @@ class _SmartPoolRow extends StatelessWidget {
                   width: 3,
                   height: 30,
                   decoration: BoxDecoration(
-                    color: color.withValues(
-                        alpha: selected ? 0.85 : 0.28),
+                    color: color.withValues(alpha: selected ? 0.85 : 0.28),
                     borderRadius: BorderRadius.circular(2),
                   ),
                 ),
@@ -2323,8 +2539,7 @@ class _SmartPoolRow extends StatelessWidget {
                         : null,
                     activeColor: _accent,
                     side: BorderSide(color: _textMuted, width: 1.5),
-                    materialTapTargetSize:
-                        MaterialTapTargetSize.shrinkWrap,
+                    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
                     visualDensity: VisualDensity.compact,
                   ),
                 ),
@@ -2338,8 +2553,7 @@ class _SmartPoolRow extends StatelessWidget {
                         style: TextStyle(
                           fontSize: 13,
                           fontWeight: FontWeight.w500,
-                          color:
-                              selected ? _accentHover : _textPrimary,
+                          color: selected ? _accentHover : _textPrimary,
                         ),
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
@@ -2347,10 +2561,7 @@ class _SmartPoolRow extends StatelessWidget {
                       if (model.purpose.isNotEmpty)
                         Text(
                           model.purpose,
-                          style: TextStyle(
-                            fontSize: 11,
-                            color: _textMuted,
-                          ),
+                          style: TextStyle(fontSize: 11, color: _textMuted),
                         ),
                     ],
                   ),
@@ -2379,8 +2590,7 @@ class _PoolActionChip extends StatelessWidget {
     return GestureDetector(
       onTap: onTap,
       child: Container(
-        padding:
-            const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
         decoration: BoxDecoration(
           color: _bgSecondary,
           borderRadius: BorderRadius.circular(8),