neoagent 3.1.1-beta.9 → 3.2.1-beta.0

package/flutter_app/lib/main_integrations.dart

@@ -233,8 +233,11 @@ void _openOfficialIntegrationSetupDialog(
     case 'home_assistant':
       _showHomeAssistantSetupDialog(context, controller);
       return;
-    case 'neomail':
-      _showNeoMailSetupDialog(context, controller);
+    case 'neoarchive':
+      _showNeoArchiveSetupDialog(context, controller);
+      return;
+    case 'neorecall':
+      _showNeoRecallSetupDialog(context, controller);
       return;
     case 'trello':
       _showTrelloSetupDialog(context, controller);
@@ -242,13 +245,13 @@ void _openOfficialIntegrationSetupDialog(
   }
 }
 
-Future<void> _showNeoMailSetupDialog(
+Future<void> _showNeoRecallSetupDialog(
   BuildContext context,
   NeoAgentController controller,
 ) async {
   Map<String, dynamic> existing;
   try {
-    existing = await controller.getOfficialIntegrationConfig('neomail');
+    existing = await controller.getOfficialIntegrationConfig('neorecall');
   } catch (error) {
     if (context.mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
@@ -257,57 +260,241 @@ Future<void> _showNeoMailSetupDialog(
     }
     return;
   }
-
   final savedBaseUrl = existing['baseUrl']?.toString() ?? '';
   final accountCount = (existing['accountCount'] as num?)?.toInt() ?? 0;
-  final hasConnectedAccount =
-      existing['hasConnectedAccount'] == true || accountCount > 0;
-  var formError = '';
+  final connected = existing['hasConnectedAccount'] == true || accountCount > 0;
+  final baseUrlController = TextEditingController(text: savedBaseUrl);
+  var errorText = '';
   var busy = false;
 
+  Future<void> save(
+    StateSetter setState,
+    BuildContext dialogContext, {
+    required bool connect,
+  }) async {
+    setState(() {
+      errorText = '';
+      busy = true;
+    });
+    try {
+      final baseUrl = baseUrlController.text.trim();
+      if (baseUrl.isEmpty) {
+        setState(() {
+          errorText = 'NeoRecall backend URL is required.';
+          busy = false;
+        });
+        return;
+      }
+      await controller.saveOfficialIntegrationConfig(
+        'neorecall',
+        config: <String, dynamic>{'baseUrl': baseUrl},
+      );
+      if (connect) {
+        await controller.connectOfficialIntegration(
+          'neorecall',
+          appId: 'recall',
+        );
+        if ((controller.errorMessage ?? '').trim().isNotEmpty) {
+          setState(() {
+            errorText = controller.errorMessage!;
+            busy = false;
+          });
+          return;
+        }
+      }
+      if (dialogContext.mounted) Navigator.of(dialogContext).pop();
+    } catch (_) {
+      setState(() {
+        errorText = controller.errorMessage ?? 'Could not save NeoRecall setup.';
+        busy = false;
+      });
+    }
+  }
+
+  if (!context.mounted) return;
+  await showDialog<void>(
+    context: context,
+    barrierDismissible: false,
+    builder: (dialogContext) => StatefulBuilder(
+      builder: (dialogContext, setState) => AlertDialog(
+        title: const Text('NeoRecall Setup'),
+        content: SizedBox(
+          width: 540,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(
+                'Connect your self-hosted NeoRecall server. NeoAgent receives read-only access to local search, memories, and transcript evidence after you approve the OAuth screen.',
+                style: TextStyle(color: _textSecondary),
+              ),
+              const SizedBox(height: 16),
+              const _IntegrationSetupStatusItem(
+                label: 'Connection Method',
+                status: 'OAuth with PKCE',
+                isConnected: true,
+              ),
+              const SizedBox(height: 12),
+              _IntegrationSetupStatusItem(
+                label: 'Connected NeoRecall User',
+                status: connected
+                    ? '$accountCount ${accountCount == 1 ? 'connected user' : 'connected users'}'
+                    : 'Not connected',
+                isConnected: connected,
+              ),
+              const SizedBox(height: 12),
+              TextField(
+                controller: baseUrlController,
+                keyboardType: TextInputType.url,
+                decoration: const InputDecoration(
+                  labelText: 'NeoRecall Backend URL',
+                  hintText: 'https://recall.example.com',
+                  border: OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 8),
+              Text(
+                'Local and private-network URLs are supported when the NeoAgent server can reach them. Audio is never exposed to NeoAgent.',
+                style: TextStyle(color: _textSecondary, fontSize: 12),
+              ),
+              if (errorText.isNotEmpty) ...<Widget>[
+                const SizedBox(height: 12),
+                Text(errorText, style: TextStyle(color: _danger, fontSize: 12)),
+              ],
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          if (savedBaseUrl.isNotEmpty)
+            TextButton(
+              onPressed: busy
+                  ? null
+                  : () async {
+                      final confirm =
+                          await showDialog<bool>(
+                            context: dialogContext,
+                            builder: (context) => AlertDialog(
+                              title: const Text('Disconnect NeoRecall?'),
+                              content: const Text(
+                                'This removes the NeoRecall backend URL and all connected NeoRecall accounts for this agent.',
+                              ),
+                              actions: <Widget>[
+                                TextButton(
+                                  onPressed: () => Navigator.of(context).pop(false),
+                                  child: const Text('Cancel'),
+                                ),
+                                FilledButton(
+                                  onPressed: () => Navigator.of(context).pop(true),
+                                  child: const Text('Disconnect'),
+                                ),
+                              ],
+                            ),
+                          ) ??
+                          false;
+                      if (!confirm) return;
+                      setState(() {
+                        busy = true;
+                        errorText = '';
+                      });
+                      try {
+                        await controller.clearOfficialIntegrationConfig('neorecall');
+                        if (dialogContext.mounted) Navigator.of(dialogContext).pop();
+                      } catch (_) {
+                        setState(() {
+                          errorText = controller.errorMessage ?? 'Could not disconnect NeoRecall.';
+                          busy = false;
+                        });
+                      }
+                    },
+              child: const Text('Disconnect'),
+            ),
+          TextButton(
+            onPressed: busy ? null : () => Navigator.of(dialogContext).pop(),
+            child: const Text('Close'),
+          ),
+          TextButton(
+            onPressed: busy ? null : () => save(setState, dialogContext, connect: false),
+            child: const Text('Save Only'),
+          ),
+          FilledButton(
+            onPressed: busy ? null : () => save(setState, dialogContext, connect: true),
+            child: Text(
+              busy
+                  ? 'Working...'
+                  : connected
+                  ? 'Connect Another Account'
+                  : 'Save & Connect',
+            ),
+          ),
+        ],
+      ),
+    ),
+  );
+  baseUrlController.dispose();
+}
+
+Future<void> _showNeoArchiveSetupDialog(
+  BuildContext context,
+  NeoAgentController controller,
+) async {
+  Map<String, dynamic> existing;
+  try {
+    existing = await controller.getOfficialIntegrationConfig('neoarchive');
+  } catch (error) {
+    if (context.mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(controller.errorMessage ?? error.toString())),
+      );
+    }
+    return;
+  }
+  final savedBaseUrl = existing['baseUrl']?.toString() ?? '';
+  final accountCount = (existing['accountCount'] as num?)?.toInt() ?? 0;
+  final connected = existing['hasConnectedAccount'] == true || accountCount > 0;
   final baseUrlController = TextEditingController(text: savedBaseUrl);
+  var errorText = '';
+  var busy = false;
 
-  Future<void> saveConfig(
-    StateSetter setState, {
-    required BuildContext dialogContext,
-    required bool connectAfterSave,
+  Future<void> save(
+    StateSetter setState,
+    BuildContext dialogContext, {
+    required bool connect,
   }) async {
     setState(() {
-      formError = '';
+      errorText = '';
       busy = true;
     });
     try {
       final baseUrl = baseUrlController.text.trim();
       if (baseUrl.isEmpty) {
         setState(() {
-          formError = 'NeoMail backend URL is required.';
+          errorText = 'NeoArchive backend URL is required.';
           busy = false;
         });
         return;
       }
       await controller.saveOfficialIntegrationConfig(
-        'neomail',
+        'neoarchive',
         config: <String, dynamic>{'baseUrl': baseUrl},
       );
-      if (connectAfterSave) {
+      if (connect) {
         await controller.connectOfficialIntegration(
-          'neomail',
-          appId: 'mailbox',
+          'neoarchive',
+          appId: 'archive',
         );
         if ((controller.errorMessage ?? '').trim().isNotEmpty) {
           setState(() {
-            formError = controller.errorMessage!;
+            errorText = controller.errorMessage!;
             busy = false;
           });
           return;
         }
       }
-      if (dialogContext.mounted) {
-        Navigator.of(dialogContext).pop();
-      }
+      if (dialogContext.mounted) Navigator.of(dialogContext).pop();
     } catch (_) {
       setState(() {
-        formError = controller.errorMessage ?? 'Could not save NeoMail setup.';
+        errorText =
+            controller.errorMessage ?? 'Could not save NeoArchive setup.';
         busy = false;
       });
     }
@@ -317,175 +504,134 @@ Future<void> _showNeoMailSetupDialog(
   await showDialog<void>(
     context: context,
     barrierDismissible: false,
-    builder: (dialogContext) {
-      return StatefulBuilder(
-        builder: (dialogContext, setState) {
-          return AlertDialog(
-            title: const Text('NeoMail Setup'),
-            content: SizedBox(
-              width: 540,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Text(
-                    'Add the NeoMail backend URL once. NeoAgent will then open NeoMail OAuth so the user can sign in and approve mailbox access without API keys.',
-                    style: TextStyle(color: _textSecondary),
-                  ),
-                  const SizedBox(height: 16),
-                  const _IntegrationSetupStatusItem(
-                    label: 'Connection Method',
-                    status: 'OAuth companion flow',
-                    isConnected: true,
-                  ),
-                  const SizedBox(height: 12),
-                  _IntegrationSetupStatusItem(
-                    label: 'Backend URL',
-                    status: savedBaseUrl.trim().isNotEmpty
-                        ? 'Configured'
-                        : 'Not configured',
-                    isConnected: savedBaseUrl.trim().isNotEmpty,
-                  ),
-                  const SizedBox(height: 12),
-                  _IntegrationSetupStatusItem(
-                    label: 'Connected NeoMail User',
-                    status: hasConnectedAccount
-                        ? '$accountCount ${accountCount == 1 ? 'connected user' : 'connected users'}'
-                        : 'Not connected',
-                    isConnected: hasConnectedAccount,
-                  ),
-                  const SizedBox(height: 12),
-                  TextField(
-                    controller: baseUrlController,
-                    onChanged: (_) => setState(() {}),
-                    keyboardType: TextInputType.url,
-                    decoration: const InputDecoration(
-                      labelText: 'NeoMail Backend URL',
-                      hintText: 'https://mail.example.com',
-                      border: OutlineInputBorder(),
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    'Use the public base URL of the NeoMail server. Local self-hosted URLs are also supported when NeoAgent can reach them.',
-                    style: TextStyle(color: _textSecondary, fontSize: 12),
-                  ),
-                  if (formError.isNotEmpty) ...<Widget>[
-                    const SizedBox(height: 12),
-                    Container(
-                      padding: const EdgeInsets.all(8),
-                      decoration: BoxDecoration(
-                        color: _danger.withValues(alpha: 0.1),
-                        borderRadius: BorderRadius.circular(4),
-                        border: Border.all(
-                          color: _danger.withValues(alpha: 0.3),
-                        ),
-                      ),
-                      child: Text(
-                        formError,
-                        style: TextStyle(color: _danger, fontSize: 12),
-                      ),
-                    ),
-                  ],
-                ],
+    builder: (dialogContext) => StatefulBuilder(
+      builder: (dialogContext, setState) => AlertDialog(
+        title: const Text('NeoArchive Setup'),
+        content: SizedBox(
+          width: 540,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(
+                'Add the NeoArchive backend URL once. NeoAgent will open NeoArchive OAuth so the user can sign in and approve archive access without API keys.',
+                style: TextStyle(color: _textSecondary),
               ),
-            ),
-            actions: <Widget>[
-              if (savedBaseUrl.trim().isNotEmpty)
-                TextButton(
-                  onPressed: busy
-                      ? null
-                      : () async {
-                          final shouldClear =
-                              await showDialog<bool>(
-                                context: dialogContext,
-                                builder: (context) {
-                                  return AlertDialog(
-                                    title: const Text('Disconnect NeoMail?'),
-                                    content: const Text(
-                                      'This removes the NeoMail backend URL and all connected NeoMail accounts for this agent.',
-                                    ),
-                                    actions: [
-                                      TextButton(
-                                        onPressed: () =>
-                                            Navigator.of(context).pop(false),
-                                        child: const Text('Cancel'),
-                                      ),
-                                      FilledButton(
-                                        onPressed: () =>
-                                            Navigator.of(context).pop(true),
-                                        child: const Text('Disconnect'),
-                                      ),
-                                    ],
-                                  );
-                                },
-                              ) ??
-                              false;
-                          if (!shouldClear) {
-                            return;
-                          }
-                          setState(() {
-                            formError = '';
-                            busy = true;
-                          });
-                          try {
-                            await controller.clearOfficialIntegrationConfig(
-                              'neomail',
-                            );
-                            if (dialogContext.mounted) {
-                              Navigator.of(dialogContext).pop();
-                            }
-                          } catch (_) {
-                            setState(() {
-                              formError =
-                                  controller.errorMessage ??
-                                  'Could not disconnect NeoMail.';
-                              busy = false;
-                            });
-                          }
-                        },
-                  child: const Text('Disconnect'),
-                ),
-              TextButton(
-                onPressed: busy
-                    ? null
-                    : () => Navigator.of(dialogContext).pop(),
-                child: const Text('Close'),
+              const SizedBox(height: 16),
+              const _IntegrationSetupStatusItem(
+                label: 'Connection Method',
+                status: 'OAuth companion flow',
+                isConnected: true,
               ),
-              if (!hasConnectedAccount)
-                TextButton(
-                  onPressed: busy
-                      ? null
-                      : () => saveConfig(
-                          setState,
-                          dialogContext: dialogContext,
-                          connectAfterSave: false,
-                        ),
-                  child: const Text('Save Only'),
-                ),
-              FilledButton(
-                onPressed: busy
-                    ? null
-                    : () => saveConfig(
-                        setState,
-                        dialogContext: dialogContext,
-                        connectAfterSave: !hasConnectedAccount,
-                      ),
-                child: Text(
-                  busy
-                      ? 'Working...'
-                      : hasConnectedAccount
-                      ? 'Update Setup'
-                      : 'Save & Connect',
+              const SizedBox(height: 12),
+              _IntegrationSetupStatusItem(
+                label: 'Connected NeoArchive User',
+                status: connected
+                    ? '$accountCount ${accountCount == 1 ? 'connected user' : 'connected users'}'
+                    : 'Not connected',
+                isConnected: connected,
+              ),
+              const SizedBox(height: 12),
+              TextField(
+                controller: baseUrlController,
+                keyboardType: TextInputType.url,
+                decoration: const InputDecoration(
+                  labelText: 'NeoArchive Backend URL',
+                  hintText: 'https://archive.example.com',
+                  border: OutlineInputBorder(),
                 ),
               ),
+              const SizedBox(height: 8),
+              Text(
+                'Use the public base URL of the NeoArchive server. Local self-hosted URLs are supported when NeoAgent can reach them.',
+                style: TextStyle(color: _textSecondary, fontSize: 12),
+              ),
+              if (errorText.isNotEmpty) ...<Widget>[
+                const SizedBox(height: 12),
+                Text(errorText, style: TextStyle(color: _danger, fontSize: 12)),
+              ],
             ],
-          );
-        },
-      );
-    },
+          ),
+        ),
+        actions: <Widget>[
+          if (savedBaseUrl.isNotEmpty)
+            TextButton(
+              onPressed: busy
+                  ? null
+                  : () async {
+                      final confirm =
+                          await showDialog<bool>(
+                            context: dialogContext,
+                            builder: (context) => AlertDialog(
+                              title: const Text('Disconnect NeoArchive?'),
+                              content: const Text(
+                                'This removes the NeoArchive backend URL and all connected NeoArchive accounts for this agent.',
+                              ),
+                              actions: <Widget>[
+                                TextButton(
+                                  onPressed: () =>
+                                      Navigator.of(context).pop(false),
+                                  child: const Text('Cancel'),
+                                ),
+                                FilledButton(
+                                  onPressed: () =>
+                                      Navigator.of(context).pop(true),
+                                  child: const Text('Disconnect'),
+                                ),
+                              ],
+                            ),
+                          ) ??
+                          false;
+                      if (!confirm) return;
+                      setState(() {
+                        busy = true;
+                        errorText = '';
+                      });
+                      try {
+                        await controller.clearOfficialIntegrationConfig(
+                          'neoarchive',
+                        );
+                        if (dialogContext.mounted) {
+                          Navigator.of(dialogContext).pop();
+                        }
+                      } catch (_) {
+                        setState(() {
+                          errorText =
+                              controller.errorMessage ??
+                              'Could not disconnect NeoArchive.';
+                          busy = false;
+                        });
+                      }
+                    },
+              child: const Text('Disconnect'),
+            ),
+          TextButton(
+            onPressed: busy ? null : () => Navigator.of(dialogContext).pop(),
+            child: const Text('Close'),
+          ),
+          if (!connected)
+            TextButton(
+              onPressed: busy
+                  ? null
+                  : () => save(setState, dialogContext, connect: false),
+              child: const Text('Save Only'),
+            ),
+          FilledButton(
+            onPressed: busy
+                ? null
+                : () => save(setState, dialogContext, connect: !connected),
+            child: Text(
+              busy
+                  ? 'Working...'
+                  : connected
+                  ? 'Update Setup'
+                  : 'Save & Connect',
+            ),
+          ),
+        ],
+      ),
+    ),
   );
-
   baseUrlController.dispose();
 }
 
@@ -1394,12 +1540,16 @@ class _OfficialIntegrationIcon extends StatelessWidget {
       );
     }
     final color = switch (item.icon) {
+      'neoarchive' => const Color(0xFFE3B655),
+      'neorecall' => const Color(0xFFD98AA6),
       'google' => const Color(0xFF4285F4),
       'home_assistant' => const Color(0xFF41BDF5),
       'trello' => const Color(0xFF0C66E4),
       _ => _accent,
     };
     final label = switch (item.icon) {
+      'neoarchive' => 'A',
+      'neorecall' => 'R',
       'google' => 'G',
       'home_assistant' => 'H',
       'trello' => 'T',
@@ -1439,8 +1589,10 @@ int _compareOfficialIntegrationItems(
 
 int _officialIntegrationRank(OfficialIntegrationItem item) {
   return switch (item.id) {
+    'neoarchive' => 1,
     'neomail' => 0,
-    'google_workspace' => 1,
+    'neorecall' => 2,
+    'google_workspace' => 3,
     _ => 10,
   };
 }