fix: bridge tools missing from MCP server + Tauri eval fix

- Add press_key, scroll, find_element, get_text to bridge handlers
- Screenshot fallback to native when bridge returns _needs_native
- Tauri: fix get_registered_tools/call_tool to use eval_js_with_result
- reset_app: graceful fallback for non-Flutter bridge platforms
- .NET MAUI test app: Thread.Sleep instead of Console.ReadLine

Author: GitLab CI

lib/src/cli/tool_handlers/bf_interaction.dart

@@ -176,6 +176,64 @@ extension _BfInteraction on FlutterMcpServer {
             key: args['key'], text: args['text'], timeout: timeout);
         return {"gone": gone};
 
+      case 'press_key':
+        final key = args['key'] as String? ?? '';
+        if (key.isEmpty) {
+          return {"success": false, "error": "Missing 'key' argument"};
+        }
+        if (client is BridgeDriver) {
+          await client.callMethod('press_key', {'key': key});
+          return {"success": true, "message": "Key pressed: $key"};
+        }
+        return {"success": false, "error": "press_key not supported on this platform. Use CDP mode or a bridge SDK."};
+
+      case 'scroll':
+        final direction = args['direction'] as String? ?? 'down';
+        final amount = (args['amount'] as num?)?.toDouble() ?? 300;
+        if (client is BridgeDriver) {
+          await client.callMethod('scroll', {
+            'direction': direction,
+            'amount': amount,
+          });
+          return {"success": true, "message": "Scrolled $direction by $amount"};
+        }
+        // Flutter: use scrollTo with key/text if provided
+        if (args['key'] != null || args['text'] != null) {
+          final fc = _asFlutterClient(client!, 'scroll');
+          await fc.scrollTo(key: args['key'] as String?, text: args['text'] as String?);
+          return {"success": true, "message": "Scrolled to element"};
+        }
+        return {"success": false, "error": "scroll on Flutter requires 'key' or 'text' argument"};
+
+      case 'find_element':
+        final text = args['text'] as String?;
+        final key = args['key'] as String?;
+        if (text == null && key == null) {
+          return {"success": false, "error": "Provide 'text' or 'key'"};
+        }
+        if (client is BridgeDriver) {
+          final result = await client.callMethod('find_element', {
+            if (text != null) 'text': text,
+            if (key != null) 'key': key,
+          });
+          return result;
+        }
+        final fc2 = _asFlutterClient(client!, 'find_element');
+        final elements = await fc2.findByType(text ?? key ?? '');
+        return {"found": elements.isNotEmpty, "count": elements.length};
+
+      case 'get_text':
+        if (client is BridgeDriver) {
+          final result = await client.callMethod('get_text', {
+            if (args['ref'] != null) 'ref': args['ref'],
+            if (args['key'] != null) 'key': args['key'],
+          });
+          return result;
+        }
+        final fc3 = _asFlutterClient(client!, 'get_text');
+        final textContent = await fc3.getTextContent();
+        return {"text": textContent};
+
       // Screenshot
       default:
         return null;

lib/src/cli/tool_handlers/bf_screenshot.dart

@@ -11,14 +11,29 @@ extension _BfScreenshot on FlutterMcpServer {
         final saveToFile =
             args['save_to_file'] ?? false; // Return base64 by default for speed
 
-        final imageBase64 =
+        var imageBase64 =
             await client!.takeScreenshot(quality: quality, maxWidth: maxWidth);
 
+        // Fallback to native screenshot if bridge returns null
+        // (e.g. React Native returns _needs_native flag)
+        if (imageBase64 == null) {
+          try {
+            final nDriver = await _getNativeDriver(args);
+            if (nDriver != null) {
+              final nResult = await nDriver.screenshot(saveToFile: false);
+              imageBase64 = nResult.base64Image;
+            }
+          } catch (_) {
+            // Native fallback failed, continue to error
+          }
+        }
+
         if (imageBase64 == null) {
           return {
             "success": false,
             "error": "Failed to capture screenshot",
-            "message": "Screenshot returned null"
+            "message":
+                "Screenshot returned null. Try 'native_screenshot' tool instead."
           };
         }
 

lib/src/cli/tool_handlers/dev_tool_handlers.dart

@@ -114,17 +114,20 @@ extension _DevToolHandlers on FlutterMcpServer {
           });
           return {'success': true, 'platform': 'bridge', 'result': result};
         } catch (_) {
-          // Fallback: hot restart if bridge doesn't support reset
+          // Fallback: try go_back to home, then re-initialize
           try {
-            await client.callMethod('hot_restart');
-            return {
-              'success': true,
-              'platform': 'bridge',
-              'fallback': 'hot_restart'
-            };
-          } catch (e) {
-            return {'success': false, 'error': e.toString()};
-          }
+            await client.callMethod('go_back');
+          } catch (_) {}
+          try {
+            await client.callMethod('initialize', {'client_name': 'reset'});
+          } catch (_) {}
+          return {
+            'success': true,
+            'platform': 'bridge',
+            'fallback': 'go_back+reinitialize',
+            'note':
+                'Full reset not supported on this platform; navigated back and re-initialized',
+          };
         }
       }
 

lib/src/drivers/bridge_driver.dart

@@ -159,6 +159,10 @@ class BridgeDriver implements AppDriver {
       'quality': quality,
       if (maxWidth != null) 'maxWidth': maxWidth,
     });
+    // Some SDKs (e.g. React Native) return _needs_native flag when
+    // in-app screenshot is not available; caller should fall back to
+    // native_screenshot in that case.
+    if (result['_needs_native'] == true) return null;
     return result['image'] as String?;
   }
 

sdks/tauri/src/lib.rs

@@ -793,11 +793,10 @@ async fn handle_method<R: Runtime>(
                     var tools = (window.__flutter_skill_tools__ || []).map(function(t) {
                         return { name: t.name, description: t.description || '', params: t.params || {}, source: t.source || 'js-registered' };
                     });
-                    return JSON.stringify({ tools: tools, count: tools.length });
+                    return { tools: tools, count: tools.length };
                 })()
             "#;
-            let res = window.eval(js).map_err(|e| e.to_string())?;
-            Ok(serde_json::from_str(&res.to_string()).unwrap_or(json!({"tools": [], "count": 0})))
+            eval_js_with_result(window, js, 5000, result_tx).await
         }
 
         "call_tool" => {
@@ -807,14 +806,13 @@ async fn handle_method<R: Runtime>(
                 (function() {{
                     var tools = window.__flutter_skill_tools__ || [];
                     var tool = tools.find(function(t) {{ return t.name === '{}'; }});
-                    if (!tool) return JSON.stringify({{ error: 'Tool not found: {}' }});
-                    if (!tool.handler) return JSON.stringify({{ error: 'Tool has no handler' }});
+                    if (!tool) return {{ error: 'Tool not found: {}' }};
+                    if (!tool.handler) return {{ error: 'Tool has no handler' }};
                     var result = tool.handler({});
-                    return JSON.stringify({{ success: true, tool: '{}', result: result }});
+                    return {{ success: true, tool: '{}', result: result }};
                 }})()
             "#, name, name, serde_json::to_string(&args).unwrap_or_default(), name);
-            let res = window.eval(&js).map_err(|e| e.to_string())?;
-            Ok(serde_json::from_str(&res.to_string()).unwrap_or(json!({"error": "parse error"})))
+            eval_js_with_result(window, &js, 5000, result_tx).await
         }
 
         _ => Err(format!("Unknown method: {method}")),

test/e2e/dotnet_test_app/Program.cs

@@ -466,7 +466,7 @@ static async Task Main(string[] args)
         var bridge = new TestBridge(port);
         bridge.Start();
         Console.WriteLine($"[flutter-skill-dotnet] Test bridge on port {port}. Press Enter to stop.");
-        Console.ReadLine();
+        System.Threading.Thread.Sleep(System.Threading.Timeout.Infinite);
         bridge.Stop();
     }
 }