neoagent 2.3.1-beta.99 → 2.4.1-beta.10

package/flutter_app/lib/main_integrations.dart

@@ -175,6 +175,12 @@ class OfficialIntegrationsTab extends StatelessWidget {
                           label: '${item.availableToolCount} tools',
                           icon: Icons.build_outlined,
                         ),
+                        _MetaPill(
+                          label: item.memoryCoverage.supported
+                              ? 'Memory ${item.memoryCoverage.statusLabel}'
+                              : 'No memory sync',
+                          icon: Icons.psychology_alt_outlined,
+                        ),
                       ],
                     ),
                     const SizedBox(height: 10),
@@ -255,6 +261,7 @@ Future<void> _showTrelloSetupDialog(
   final apiKeyController = TextEditingController(text: savedApiKey);
   final tokenInputController = TextEditingController();
 
+  if (!context.mounted) return;
   await showDialog<void>(
     context: context,
     barrierDismissible: false,
@@ -426,8 +433,7 @@ Future<void> _showTrelloSetupDialog(
                             }
                             final url = authorizeUrl.isNotEmpty
                                 ? authorizeUrl
-                                : 'https://trello.com/1/authorize?expiration=never&scope=read,write,account&response_type=token&key=' +
-                                      Uri.encodeComponent(effectiveApiKey);
+                                : 'https://trello.com/1/authorize?expiration=never&scope=read,write,account&response_type=token&key=${Uri.encodeComponent(effectiveApiKey)}';
                             final result = await controller._oauthLauncher
                                 .openExternal(url: url, label: 'Trello');
                             if (!result.launched) {
@@ -659,6 +665,12 @@ class _OfficialIntegrationAppCard extends StatelessWidget {
                               label: '${app.availableToolCount} tools',
                               icon: Icons.build_circle_outlined,
                             ),
+                            _MetaPill(
+                              label: app.memoryCoverage.supported
+                                  ? 'Memory ${app.memoryCoverage.statusLabel}'
+                                  : 'No memory sync',
+                              icon: Icons.psychology_alt_outlined,
+                            ),
                           ],
                         ),
                       ],
@@ -715,6 +727,13 @@ class _OfficialIntegrationAppCard extends StatelessWidget {
                         'Access: ${account.accessModeLabel}',
                         style: TextStyle(color: _textSecondary),
                       ),
+                      if (account.memoryCoverage.supported) ...<Widget>[
+                        const SizedBox(height: 4),
+                        Text(
+                          'Memory: ${account.memoryCoverage.statusLabel}',
+                          style: TextStyle(color: _textSecondary),
+                        ),
+                      ],
                       const SizedBox(height: 12),
                       Wrap(
                         spacing: 8,

package/flutter_app/lib/main_models.dart

@@ -2565,6 +2565,7 @@ class OfficialIntegrationAppItem {
     ),
     this.accounts = const <OfficialIntegrationAccountItem>[],
     this.availableToolCount = 0,
+    this.memoryCoverage = const OfficialIntegrationMemoryCoverage(),
   });
 
   factory OfficialIntegrationAppItem.fromJson(Map<dynamic, dynamic> json) {
@@ -2583,6 +2584,9 @@ class OfficialIntegrationAppItem {
                 .toList()
           : const <OfficialIntegrationAccountItem>[],
       availableToolCount: _asInt(json['availableToolCount']),
+      memoryCoverage: OfficialIntegrationMemoryCoverage.fromJson(
+        _jsonMap(json['memoryCoverage']),
+      ),
     );
   }
 
@@ -2592,6 +2596,7 @@ class OfficialIntegrationAppItem {
   final OfficialIntegrationConnectionStatus connection;
   final List<OfficialIntegrationAccountItem> accounts;
   final int availableToolCount;
+  final OfficialIntegrationMemoryCoverage memoryCoverage;
 
   bool get isConnected => connection.connected;
 
@@ -2676,6 +2681,51 @@ class OfficialIntegrationConnectionStatus {
   }
 }
 
+class OfficialIntegrationMemoryCoverage {
+  const OfficialIntegrationMemoryCoverage({
+    this.supported = false,
+    this.contributesToMemory = false,
+    this.contributesToTaskExecution = false,
+    this.status = 'not_supported',
+    this.dataDomains = const <String>[],
+    this.documentCount = 0,
+    this.lastRefreshAt,
+    this.nextRefreshAt,
+    this.error,
+  });
+
+  factory OfficialIntegrationMemoryCoverage.fromJson(
+    Map<dynamic, dynamic> json,
+  ) {
+    final domainsRaw = json['dataDomains'];
+    return OfficialIntegrationMemoryCoverage(
+      supported: json['supported'] == true,
+      contributesToMemory: json['contributesToMemory'] == true,
+      contributesToTaskExecution: json['contributesToTaskExecution'] == true,
+      status: json['status']?.toString() ?? 'not_supported',
+      dataDomains: domainsRaw is List
+          ? domainsRaw.map((item) => item.toString()).toList()
+          : const <String>[],
+      documentCount: _asInt(json['documentCount']),
+      lastRefreshAt: _parseOptionalTimestamp(json['lastRefreshAt']?.toString()),
+      nextRefreshAt: _parseOptionalTimestamp(json['nextRefreshAt']?.toString()),
+      error: json['error']?.toString(),
+    );
+  }
+
+  final bool supported;
+  final bool contributesToMemory;
+  final bool contributesToTaskExecution;
+  final String status;
+  final List<String> dataDomains;
+  final int documentCount;
+  final DateTime? lastRefreshAt;
+  final DateTime? nextRefreshAt;
+  final String? error;
+
+  String get statusLabel => _titleCase(status.replaceAll('_', ' '));
+}
+
 class OfficialIntegrationAccountItem {
   const OfficialIntegrationAccountItem({
     required this.id,
@@ -2684,6 +2734,7 @@ class OfficialIntegrationAccountItem {
     this.accountEmail,
     this.lastConnectedAt,
     this.accessMode = 'read_write',
+    this.memoryCoverage = const OfficialIntegrationMemoryCoverage(),
   });
 
   factory OfficialIntegrationAccountItem.fromJson(Map<dynamic, dynamic> json) {
@@ -2696,6 +2747,9 @@ class OfficialIntegrationAccountItem {
         json['lastConnectedAt']?.toString(),
       ),
       accessMode: json['accessMode']?.toString() ?? 'read_write',
+      memoryCoverage: OfficialIntegrationMemoryCoverage.fromJson(
+        _jsonMap(json['memoryCoverage']),
+      ),
     );
   }
 
@@ -2705,6 +2759,7 @@ class OfficialIntegrationAccountItem {
   final String? accountEmail;
   final DateTime? lastConnectedAt;
   final String accessMode;
+  final OfficialIntegrationMemoryCoverage memoryCoverage;
 
   bool get isExpired => status == 'expired';
 
@@ -2733,6 +2788,7 @@ class OfficialIntegrationItem {
     this.connectPrompt,
     this.supportsMultipleAccounts = true,
     this.connectionMethod = 'oauth',
+    this.memoryCoverage = const OfficialIntegrationMemoryCoverage(),
   });
 
   factory OfficialIntegrationItem.fromJson(Map<dynamic, dynamic> json) {
@@ -2756,6 +2812,9 @@ class OfficialIntegrationItem {
       connectPrompt: json['connectPrompt']?.toString(),
       supportsMultipleAccounts: json['supportsMultipleAccounts'] != false,
       connectionMethod: json['connectionMethod']?.toString() ?? 'oauth',
+      memoryCoverage: OfficialIntegrationMemoryCoverage.fromJson(
+        _jsonMap(json['memoryCoverage']),
+      ),
     );
   }
 
@@ -2770,6 +2829,7 @@ class OfficialIntegrationItem {
   final String? connectPrompt;
   final bool supportsMultipleAccounts;
   final String connectionMethod;
+  final OfficialIntegrationMemoryCoverage memoryCoverage;
 
   bool get isConnected => connection.connected;
 

package/flutter_app/lib/main_settings.dart

@@ -170,7 +170,9 @@ const List<_SettingsSection> _settingsSearchSections = <_SettingsSection>[
 class _SettingsPanelState extends State<SettingsPanel> {
   late final TextEditingController _searchController;
   late String _browserBackend;
+  String? _browserExtensionTokenId;
   late String _cliBackend;
+  String? _cliDesktopDeviceId;
   late bool _smarterSelector;
   late Set<String> _enabledModels;
   late String _defaultChatModel;
@@ -187,6 +189,14 @@ class _SettingsPanelState extends State<SettingsPanel> {
       <String, TextEditingController>{};
   final Set<String> _expandedProviderIds = <String>{};
 
+  // Inline runtime test state — ephemeral, not stored in controller.
+  bool _cliTestRunning = false;
+  Map<String, dynamic>? _cliTestResult;
+  bool _extensionTestRunning = false;
+  Map<String, dynamic>? _extensionTestResult;
+  bool _desktopTestRunning = false;
+  Map<String, dynamic>? _desktopTestResult;
+
   @override
   void initState() {
     super.initState();
@@ -224,7 +234,11 @@ class _SettingsPanelState extends State<SettingsPanel> {
         .map((model) => model.id)
         .toSet();
     _browserBackend = _normalizeBrowserBackend(controller.browserBackend);
+    _browserExtensionTokenId =
+        controller.browserExtensionTokenId ??
+        controller.selectedBrowserExtensionTokenId;
     _cliBackend = _normalizeCliBackend(controller.cliBackend);
+    _cliDesktopDeviceId = controller.cliDesktopDeviceId;
     _smarterSelector = controller.smarterSelector;
     _enabledModels = controller.enabledModelIds
         .where((id) => knownModels.contains(id))
@@ -466,7 +480,11 @@ class _SettingsPanelState extends State<SettingsPanel> {
               browserBackend: _browserBackend == 'extension'
                   ? 'extension'
                   : 'vm',
+              browserExtensionTokenId: _browserBackend == 'extension'
+                  ? _browserExtensionTokenId
+                  : null,
               cliBackend: _cliBackend == 'desktop' ? 'desktop' : 'vm',
+              cliDesktopDeviceId: _cliDesktopDeviceId,
               smarterSelector: _smarterSelector,
               enabledModels: _enabledModels.toList(),
               defaultChatModel: _defaultChatModel,
@@ -631,36 +649,107 @@ class _SettingsPanelState extends State<SettingsPanel> {
               ],
               onChanged: (value) {
                 if (value != null) {
-                  setState(() => _browserBackend = value);
+                  setState(() {
+                    _browserBackend = value;
+                    _browserExtensionTokenId ??=
+                        controller.selectedBrowserExtensionTokenId;
+                  });
                 }
               },
             ),
             const SizedBox(height: 10),
-            Text(
-              _browserBackend == 'extension'
-                  ? (controller.browserExtensionConnected
-                        ? 'Chrome extension connected.'
-                        : 'Chrome extension selected. Download it here, load it unpacked in Chrome on the remote machine, then pair after login.')
-                  : 'Cloud browser runtime is active.',
-              style: TextStyle(color: _textSecondary, height: 1.4),
-            ),
-            const SizedBox(height: 10),
-            Wrap(
-              spacing: 10,
-              runSpacing: 10,
-              children: <Widget>[
-                OutlinedButton.icon(
-                  onPressed: controller.downloadBrowserExtension,
-                  icon: Icon(Icons.download_outlined),
-                  label: Text('Download extension'),
-                ),
-                OutlinedButton.icon(
-                  onPressed: controller.refreshBrowserExtensionStatus,
-                  icon: Icon(Icons.sync),
-                  label: Text('Refresh status'),
+            if (_browserBackend == 'extension') ...<Widget>[
+              if (controller.browserExtensionTokens.isNotEmpty) ...<Widget>[
+                DropdownButtonFormField<String>(
+                  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.',
+                  ),
+                  items: controller.browserExtensionTokens.map((token) {
+                    final tokenId = token['tokenId']?.toString() ?? '';
+                    final label = token['name']?.toString().trim().isNotEmpty == true
+                        ? token['name'].toString()
+                        : tokenId;
+                    final online = token['online'] == true || token['connected'] == true;
+                    return DropdownMenuItem<String>(
+                      value: tokenId,
+                      child: Row(
+                        children: <Widget>[
+                          Icon(
+                            online ? Icons.circle : Icons.circle_outlined,
+                            size: 10,
+                            color: online ? Colors.green : Colors.grey,
+                          ),
+                          const SizedBox(width: 8),
+                          Flexible(
+                            child: Text(
+                              label,
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                        ],
+                      ),
+                    );
+                  }).toList(),
+                  onChanged: (value) {
+                    if (value != null) {
+                      setState(() => _browserExtensionTokenId = value);
+                    }
+                  },
                 ),
+                const SizedBox(height: 10),
               ],
-            ),
+              _buildInlineTestRow(
+                label: 'Chrome extension',
+                running: _extensionTestRunning,
+                result: _extensionTestResult,
+                note: controller.browserExtensionConnected
+                    ? '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; });
+                  try {
+                    final r = await controller.testBrowserExtension();
+                    if (mounted) {
+                      setState(() => _extensionTestResult = r);
+                    }
+                  } catch (e) {
+                    if (mounted) {
+                      setState(() => _extensionTestResult = <String, dynamic>{'passed': false, 'detail': e.toString()});
+                    }
+                  } finally {
+                    if (mounted) {
+                      setState(() => _extensionTestRunning = false);
+                    }
+                  }
+                },
+              ),
+              const SizedBox(height: 10),
+              Wrap(
+                spacing: 10,
+                runSpacing: 10,
+                children: <Widget>[
+                  OutlinedButton.icon(
+                    onPressed: controller.downloadBrowserExtension,
+                    icon: Icon(Icons.download_outlined),
+                    label: Text('Download extension'),
+                  ),
+                  OutlinedButton.icon(
+                    onPressed: controller.refreshBrowserExtensionStatus,
+                    icon: Icon(Icons.sync),
+                    label: Text('Refresh'),
+                  ),
+                ],
+              ),
+            ] else ...<Widget>[
+              Text('Cloud browser runtime is active.', style: TextStyle(color: _textSecondary, height: 1.4)),
+            ],
             const Divider(height: 32),
             Text(
               'CLI Runtime',
@@ -691,14 +780,73 @@ class _SettingsPanelState extends State<SettingsPanel> {
                 }
               },
             ),
+            if (_cliBackend == 'desktop' && controller.desktopDevices.length > 1) ...<Widget>[
+              const SizedBox(height: 12),
+              DropdownButtonFormField<String>(
+                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.',
+                ),
+                items: controller.desktopDevices.map((device) {
+                  final deviceId = device['deviceId']?.toString() ?? '';
+                  final label = device['hostname']?.toString().isNotEmpty == true
+                      ? device['hostname']!.toString()
+                      : deviceId;
+                  final online = device['online'] == true;
+                  return DropdownMenuItem<String>(
+                    value: deviceId,
+                    child: Row(
+                      children: <Widget>[
+                        Icon(
+                          online ? Icons.circle : Icons.circle_outlined,
+                          size: 10,
+                          color: online ? Colors.green : Colors.grey,
+                        ),
+                        const SizedBox(width: 8),
+                        Text(label),
+                      ],
+                    ),
+                  );
+                }).toList(),
+                onChanged: (value) {
+                  if (value != null) {
+                    setState(() => _cliDesktopDeviceId = value);
+                  }
+                },
+              ),
+            ],
             const SizedBox(height: 10),
-            Text(
-              _cliBackend == 'desktop'
+            _buildInlineTestRow(
+              label: 'CLI',
+              running: _cliTestRunning,
+              result: _cliTestResult,
+              note: _cliBackend == 'desktop'
                   ? (controller.desktopCompanionConnected
-                        ? 'Desktop app connected.'
-                        : 'Desktop app selected. Make sure the desktop companion is running and connected on your machine.')
-                  : 'Cloud CLI runtime is active.',
-              style: TextStyle(color: _textSecondary, height: 1.4),
+                      ? '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; });
+                try {
+                  final r = await controller.testCliRuntime();
+                  if (mounted) {
+                    setState(() => _cliTestResult = r);
+                  }
+                } catch (e) {
+                  if (mounted) {
+                    setState(() => _cliTestResult = <String, dynamic>{'passed': false, 'detail': e.toString()});
+                  }
+                } finally {
+                  if (mounted) {
+                    setState(() => _cliTestRunning = false);
+                  }
+                }
+              },
             ),
             const Divider(height: 32),
             Text(
@@ -1344,6 +1492,53 @@ class _SettingsPanelState extends State<SettingsPanel> {
               const SizedBox(height: 12),
               _InlineError(message: message),
             ],
+            const SizedBox(height: 12),
+            _buildInlineTestRow(
+              label: 'Desktop companion',
+              running: _desktopTestRunning,
+              result: _desktopTestResult != null
+                  ? <String, dynamic>{
+                      'passed': _desktopTestResult!['passed'] == true,
+                      'detail': _desktopTestResult!['detail']?.toString() ?? '',
+                    }
+                  : null,
+              note: controller.desktopCompanionConnected
+                  ? '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; });
+                try {
+                  final r = await controller.testDesktopCompanion();
+                  final active = r['activeDevice'];
+                  final multi = r['multipleOnline'] == true;
+                  String detail = r['detail']?.toString() ?? '';
+                  if (r['passed'] == true && active != null) {
+                    final label = active['label']?.toString() ?? 'Device';
+                    final plat = active['platform']?.toString() ?? '';
+                    final sc = active['permissions']?['screenCapture'] == true;
+                    final ic = active['permissions']?['inputControl'] == true;
+                    detail = '$label${plat.isNotEmpty ? " ($plat)" : ""}'
+                        ' — screen: ${sc ? "✓" : "✗"}, input: ${ic ? "✓" : "✗"}';
+                  } else if (multi) {
+                    detail = '${r['onlineCount']} devices online — select one in Desktop › Devices';
+                  }
+                  if (mounted) {
+                    setState(() => _desktopTestResult = <String, dynamic>{
+                      ...r,
+                      'detail': detail,
+                    });
+                  }
+                } catch (e) {
+                  if (mounted) {
+                    setState(() => _desktopTestResult = <String, dynamic>{'passed': false, 'detail': e.toString()});
+                  }
+                } finally {
+                  if (mounted) {
+                    setState(() => _desktopTestRunning = false);
+                  }
+                }
+              },
+            ),
             const SizedBox(height: 14),
             Builder(
               builder: (context) {
@@ -1999,6 +2194,70 @@ class _SettingsPanelState extends State<SettingsPanel> {
         )
         .toList();
   }
+
+  // Shared helper: small "Test" button + inline result row.
+  Widget _buildInlineTestRow({
+    required String label,
+    required bool running,
+    required Map<String, dynamic>? result,
+    required VoidCallback onTest,
+    String? note,
+  }) {
+    final passed = result?['passed'] == true;
+    final detail = result?['detail']?.toString() ?? '';
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              if (result != null)
+                Row(
+                  children: <Widget>[
+                    Icon(
+                      passed ? Icons.check_circle_rounded : Icons.cancel_rounded,
+                      size: 15,
+                      color: passed ? const Color(0xFF22C55E) : const Color(0xFFEF4444),
+                    ),
+                    const SizedBox(width: 6),
+                    Expanded(
+                      child: Text(
+                        passed ? (detail.isNotEmpty ? detail : '$label: OK') : detail,
+                        style: TextStyle(
+                          fontSize: 13,
+                          color: passed ? null : const Color(0xFFEF4444),
+                        ),
+                      ),
+                    ),
+                  ],
+                )
+              else if (note != null)
+                Text(note, style: TextStyle(fontSize: 13, color: _textSecondary, height: 1.4)),
+            ],
+          ),
+        ),
+        const SizedBox(width: 12),
+        SizedBox(
+          width: 80,
+          child: OutlinedButton(
+            onPressed: running ? null : onTest,
+            style: OutlinedButton.styleFrom(
+              padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+              textStyle: const TextStyle(fontSize: 12),
+            ),
+            child: running
+                ? const SizedBox(
+                    width: 13,
+                    height: 13,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Text('Test'),
+          ),
+        ),
+      ],
+    );
+  }
 }
 
 class _AiProviderCard extends StatelessWidget {

package/flutter_app/lib/main_theme.dart

@@ -224,8 +224,8 @@ ThemeData _buildNeoAgentTheme(NeoAgentPalette palette, Brightness brightness) {
     pageTransitionsTheme: const PageTransitionsTheme(
       builders: <TargetPlatform, PageTransitionsBuilder>{
         TargetPlatform.android: FadeForwardsPageTransitionsBuilder(),
-        TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
-        TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
+        TargetPlatform.iOS: _NeoAgentCupertinoPageTransitionsBuilder(),
+        TargetPlatform.macOS: _NeoAgentCupertinoPageTransitionsBuilder(),
         TargetPlatform.windows: FadeForwardsPageTransitionsBuilder(),
         TargetPlatform.linux: FadeForwardsPageTransitionsBuilder(),
       },
@@ -274,3 +274,32 @@ ThemeData _buildNeoAgentTheme(NeoAgentPalette palette, Brightness brightness) {
     ),
   );
 }
+
+class _NeoAgentCupertinoPageTransitionsBuilder extends PageTransitionsBuilder {
+  const _NeoAgentCupertinoPageTransitionsBuilder();
+
+  @override
+  Duration get transitionDuration =>
+      cupertino.CupertinoRouteTransitionMixin.kTransitionDuration;
+
+  @override
+  DelegatedTransitionBuilder? get delegatedTransition =>
+      cupertino.CupertinoPageTransition.delegatedTransition;
+
+  @override
+  Widget buildTransitions<T>(
+    PageRoute<T> route,
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+    Widget child,
+  ) {
+    return cupertino.CupertinoRouteTransitionMixin.buildPageTransitions<T>(
+      route,
+      context,
+      animation,
+      secondaryAnimation,
+      child,
+    );
+  }
+}