neoagent 2.4.0 → 2.4.1-beta.11

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/src/backend_client.dart

@@ -476,6 +476,18 @@ class BackendClient {
     return getMap(baseUrl, '/api/runtime/config', allowUnauthorized: true);
   }
 
+  Future<Map<String, dynamic>> testCli(String baseUrl) async {
+    return getMap(baseUrl, '/api/system/test/cli');
+  }
+
+  Future<Map<String, dynamic>> testExtension(String baseUrl) async {
+    return getMap(baseUrl, '/api/system/test/extension');
+  }
+
+  Future<Map<String, dynamic>> testDesktop(String baseUrl) async {
+    return getMap(baseUrl, '/api/system/test/desktop');
+  }
+
   Future<Map<String, dynamic>> fetchBrowserStatus(String baseUrl) async {
     return getMap(baseUrl, '/api/browser/status');
   }
@@ -486,6 +498,15 @@ class BackendClient {
     return getMap(baseUrl, '/api/browser-extension/status');
   }
 
+  Future<Map<String, dynamic>> selectBrowserExtensionToken(
+    String baseUrl, {
+    required String tokenId,
+  }) async {
+    return postMap(baseUrl, '/api/browser-extension/select-token', <String, dynamic>{
+      'tokenId': tokenId,
+    });
+  }
+
   Future<Map<String, dynamic>> launchBrowser(
     String baseUrl, {
     Map<String, dynamic>? payload,
@@ -534,6 +555,17 @@ class BackendClient {
     });
   }
 
+  Future<Map<String, dynamic>> hoverBrowserPoint(
+    String baseUrl, {
+    required int x,
+    required int y,
+  }) async {
+    return postMap(baseUrl, '/api/browser/mouse-move', <String, dynamic>{
+      'x': x,
+      'y': y,
+    });
+  }
+
   Future<Map<String, dynamic>> fillBrowser(
     String baseUrl, {
     required String selector,
@@ -603,6 +635,50 @@ class BackendClient {
     return _postEmpty(baseUrl, '/api/browser/close');
   }
 
+  Future<Map<String, dynamic>> startStream(
+    String baseUrl, {
+    required String platform,
+    required String deviceId,
+    int fps = 15,
+    int quality = 80,
+    String? displayId,
+  }) async {
+    return postMap(baseUrl, '/api/stream/start', <String, dynamic>{
+      'platform': platform,
+      'deviceId': deviceId,
+      'fps': fps,
+      'quality': quality,
+      if (displayId != null && displayId.isNotEmpty) 'displayId': displayId,
+    });
+  }
+
+  Future<Map<String, dynamic>> stopStream(
+    String baseUrl, {
+    required String platform,
+    required String deviceId,
+  }) async {
+    return postMap(baseUrl, '/api/stream/stop', <String, dynamic>{
+      'platform': platform,
+      'deviceId': deviceId,
+    });
+  }
+
+  Future<Map<String, dynamic>> fetchStreamStatus(
+    String baseUrl, {
+    String? platform,
+    String? deviceId,
+  }) async {
+    final query = <String>[];
+    if (platform != null && platform.isNotEmpty) {
+      query.add('platform=${Uri.encodeQueryComponent(platform)}');
+    }
+    if (deviceId != null && deviceId.isNotEmpty) {
+      query.add('deviceId=${Uri.encodeQueryComponent(deviceId)}');
+    }
+    final suffix = query.isEmpty ? '' : '?${query.join('&')}';
+    return getMap(baseUrl, '/api/stream/status$suffix');
+  }
+
   Future<Map<String, dynamic>> fetchAndroidStatus(String baseUrl) async {
     return getMap(baseUrl, '/api/android/status');
   }
@@ -663,6 +739,19 @@ class BackendClient {
     });
   }
 
+  Future<Map<String, dynamic>> hoverDesktop(
+    String baseUrl, {
+    String? deviceId,
+    required int x,
+    required int y,
+  }) async {
+    return postMap(baseUrl, '/api/desktop/mouse-move', <String, dynamic>{
+      if (deviceId != null && deviceId.isNotEmpty) 'deviceId': deviceId,
+      'x': x,
+      'y': y,
+    });
+  }
+
   Future<Map<String, dynamic>> dragDesktop(
     String baseUrl, {
     String? deviceId,