react-native-ai-debugger 1.4.21 → 1.4.33

package/build/core/executor.js

@@ -158,11 +158,21 @@ async function executeExpressionCore(expression, awaitPromise, timeoutMs = 10000
         return { success: false, error: validation.error };
     }
     const cleanedExpression = validation.expression;
+    // Hermes CDP does not support awaitPromise — it serializes the Promise's
+    // internal fields (_A, _x, _y, _z) instead of waiting for resolution.
+    // When the caller wants awaitPromise, we handle it ourselves: wrap the
+    // expression to store the resolved value in a temp global, then poll.
+    if (awaitPromise) {
+        return executeWithManualAwait(app, cleanedExpression, timeoutMs);
+    }
+    return executeCDP(app, cleanedExpression, false, timeoutMs);
+}
+/**
+ * Execute a CDP Runtime.evaluate call (no promise awaiting).
+ */
+function executeCDP(app, cleanedExpression, awaitPromise, timeoutMs) {
     const TIMEOUT_MS = timeoutMs;
     const currentMessageId = getNextMessageId();
-    // Prepend global polyfill for Hermes compatibility
-    // Runtime.evaluate returns the completion value of the last expression naturally,
-    // so no IIFE wrapping is needed (similar to browser console behavior)
     const wrappedExpression = `${GLOBAL_POLYFILL} ${cleanedExpression}`;
     return new Promise((resolve) => {
         const timeoutId = setTimeout(() => {
@@ -217,6 +227,63 @@ async function executeExpressionCore(expression, awaitPromise, timeoutMs = 10000
         }
     });
 }
+/**
+ * Hermes workaround for awaitPromise: execute the expression, and if it
+ * returns a Promise, store the resolved/rejected value in a temp global
+ * and read it back with a small number of spaced-out retries.
+ */
+async function executeWithManualAwait(app, cleanedExpression, timeoutMs) {
+    const slotId = `__rn_dbg_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+    // Wrap: run the expression, if result is thenable store resolved value in
+    // a temp global slot; otherwise store the sync value immediately.
+    const wrapperExpr = `(function(){
+var __v=(${cleanedExpression});
+if(__v&&typeof __v==='object'&&typeof __v.then==='function'){
+globalThis['${slotId}']={s:'pending'};
+__v.then(function(r){globalThis['${slotId}']={s:'ok',v:r}},function(e){globalThis['${slotId}']={s:'err',v:String(e)}});
+return '__awaiting__'}
+else{return __v}})()`;
+    const initial = await executeCDP(app, wrapperExpr, false, timeoutMs);
+    // If the expression didn't return a Promise, return the result directly
+    if (!initial.success || initial.result !== "__awaiting__") {
+        return initial;
+    }
+    // Read the settled value with a few spaced-out retries (not aggressive polling).
+    // Most Promises resolve within a microtask or a single event loop tick.
+    const RETRY_DELAYS_MS = [100, 300, 600, 1000, 2000, 3000];
+    const readExpr = `(function(){var s=globalThis['${slotId}'];if(!s||s.s==='pending')return '__pending__';delete globalThis['${slotId}'];return{status:s.s,value:s.v}})()`;
+    for (const delayMs of RETRY_DELAYS_MS) {
+        await new Promise((r) => setTimeout(r, delayMs));
+        const poll = await executeCDP(app, readExpr, false, 5000);
+        if (!poll.success)
+            return poll;
+        if (poll.result === "__pending__")
+            continue;
+        // The poll result comes through formatRemoteObject — objects are
+        // JSON.stringified, so we need to parse it back.
+        try {
+            const parsed = typeof poll.result === "string" ? JSON.parse(poll.result) : poll.result;
+            if (parsed?.status === "err") {
+                return { success: false, error: parsed.value || "Promise rejected" };
+            }
+            const value = parsed?.value;
+            return {
+                success: true,
+                result: value === undefined || value === null
+                    ? String(value)
+                    : typeof value === "object"
+                        ? JSON.stringify(value, null, 2)
+                        : String(value)
+            };
+        }
+        catch {
+            return poll;
+        }
+    }
+    // Cleanup on timeout
+    await executeCDP(app, `delete globalThis['${slotId}']`, false, 2000).catch(() => { });
+    return { success: false, error: "Timeout: Promise did not resolve within the time limit." };
+}
 // Execute JavaScript in the connected React Native app with retry logic
 export async function executeInApp(expression, awaitPromise = true, options = {}, device) {
     const { maxRetries = 2, retryDelayMs = 1000, autoReconnect = true, timeoutMs = 10000 } = options;
@@ -798,29 +865,34 @@ export async function getComponentTree(options = {}) {
             }
 
             function extractLayoutStyles(style) {
-                if (!style) return null;
-                const merged = Array.isArray(style)
-                    ? Object.assign({}, ...style.filter(Boolean).map(s => typeof s === 'object' ? s : {}))
-                    : (typeof style === 'object' ? style : {});
-
-                const layout = {};
-                const layoutKeys = [
-                    'padding', 'paddingTop', 'paddingBottom', 'paddingLeft', 'paddingRight',
-                    'paddingHorizontal', 'paddingVertical',
-                    'margin', 'marginTop', 'marginBottom', 'marginLeft', 'marginRight',
-                    'marginHorizontal', 'marginVertical',
-                    'width', 'height', 'minWidth', 'minHeight', 'maxWidth', 'maxHeight',
-                    'flex', 'flexDirection', 'flexWrap', 'flexGrow', 'flexShrink',
-                    'justifyContent', 'alignItems', 'alignSelf', 'alignContent',
-                    'position', 'top', 'bottom', 'left', 'right',
-                    'gap', 'rowGap', 'columnGap',
-                    'borderWidth', 'borderTopWidth', 'borderBottomWidth', 'borderLeftWidth', 'borderRightWidth'
-                ];
-
-                for (const key of layoutKeys) {
-                    if (merged[key] !== undefined) layout[key] = merged[key];
-                }
-                return Object.keys(layout).length > 0 ? layout : null;
+                try {
+                    if (!style) return null;
+                    const merged = Array.isArray(style)
+                        ? Object.assign({}, ...style.filter(Boolean).map(s => {
+                            try { return typeof s === 'object' ? s : {}; }
+                            catch { return {}; }
+                        }))
+                        : (typeof style === 'object' ? style : {});
+
+                    const layout = {};
+                    const layoutKeys = [
+                        'padding', 'paddingTop', 'paddingBottom', 'paddingLeft', 'paddingRight',
+                        'paddingHorizontal', 'paddingVertical',
+                        'margin', 'marginTop', 'marginBottom', 'marginLeft', 'marginRight',
+                        'marginHorizontal', 'marginVertical',
+                        'width', 'height', 'minWidth', 'minHeight', 'maxWidth', 'maxHeight',
+                        'flex', 'flexDirection', 'flexWrap', 'flexGrow', 'flexShrink',
+                        'justifyContent', 'alignItems', 'alignSelf', 'alignContent',
+                        'position', 'top', 'bottom', 'left', 'right',
+                        'gap', 'rowGap', 'columnGap',
+                        'borderWidth', 'borderTopWidth', 'borderBottomWidth', 'borderLeftWidth', 'borderRightWidth'
+                    ];
+
+                    for (const key of layoutKeys) {
+                        if (merged[key] !== undefined) layout[key] = merged[key];
+                    }
+                    return Object.keys(layout).length > 0 ? layout : null;
+                } catch { return null; }
             }
 
             function walkFiber(fiber, depth) {
@@ -849,23 +921,29 @@ export async function getComponentTree(options = {}) {
                     const props = {};
                     for (const key of Object.keys(fiber.memoizedProps)) {
                         if (key === 'children' || key === 'style') continue;
-                        const val = fiber.memoizedProps[key];
-                        if (typeof val === 'function') {
-                            props[key] = '[Function]';
-                        } else if (typeof val === 'object' && val !== null) {
-                            props[key] = Array.isArray(val) ? '[Array]' : '[Object]';
-                        } else {
-                            props[key] = val;
+                        try {
+                            const val = fiber.memoizedProps[key];
+                            if (typeof val === 'function') {
+                                props[key] = '[Function]';
+                            } else if (typeof val === 'object' && val !== null) {
+                                props[key] = Array.isArray(val) ? '[Array]' : '[Object]';
+                            } else {
+                                props[key] = val;
+                            }
+                        } catch {
+                            props[key] = '[Animated Value]';
                         }
                     }
                     if (Object.keys(props).length > 0) node.props = props;
                 }
 
                 // Include layout styles if requested
-                if (includeStyles && fiber.memoizedProps?.style) {
-                    const layout = extractLayoutStyles(fiber.memoizedProps.style);
-                    if (layout) node.layout = layout;
-                }
+                try {
+                    if (includeStyles && fiber.memoizedProps?.style) {
+                        const layout = extractLayoutStyles(fiber.memoizedProps.style);
+                        if (layout) node.layout = layout;
+                    }
+                } catch { /* animated style — skip */ }
 
                 // Traverse children
                 let child = fiber.child;
@@ -1232,31 +1310,36 @@ export async function getScreenLayout(options = {}) {
             }
 
             function extractLayoutStyles(style) {
-                if (!style) return null;
-                var merged = Array.isArray(style)
-                    ? Object.assign.apply(null, [{}].concat(style.filter(Boolean).map(function(s) { return typeof s === 'object' ? s : {}; })))
-                    : (typeof style === 'object' ? style : {});
-
-                var layout = {};
-                var layoutKeys = [
-                    'padding', 'paddingTop', 'paddingBottom', 'paddingLeft', 'paddingRight',
-                    'paddingHorizontal', 'paddingVertical',
-                    'margin', 'marginTop', 'marginBottom', 'marginLeft', 'marginRight',
-                    'marginHorizontal', 'marginVertical',
-                    'width', 'height', 'minWidth', 'minHeight', 'maxWidth', 'maxHeight',
-                    'flex', 'flexDirection', 'flexWrap', 'flexGrow', 'flexShrink',
-                    'justifyContent', 'alignItems', 'alignSelf', 'alignContent',
-                    'position', 'top', 'bottom', 'left', 'right',
-                    'gap', 'rowGap', 'columnGap',
-                    'borderWidth', 'borderTopWidth', 'borderBottomWidth', 'borderLeftWidth', 'borderRightWidth',
-                    'backgroundColor', 'borderColor', 'borderRadius',
-                    'zIndex', 'elevation'
-                ];
-
-                for (var k = 0; k < layoutKeys.length; k++) {
-                    if (merged[layoutKeys[k]] !== undefined) layout[layoutKeys[k]] = merged[layoutKeys[k]];
-                }
-                return Object.keys(layout).length > 0 ? layout : null;
+                try {
+                    if (!style) return null;
+                    var merged = Array.isArray(style)
+                        ? Object.assign.apply(null, [{}].concat(style.filter(Boolean).map(function(s) {
+                            try { return typeof s === 'object' ? s : {}; }
+                            catch(e) { return {}; }
+                        })))
+                        : (typeof style === 'object' ? style : {});
+
+                    var layout = {};
+                    var layoutKeys = [
+                        'padding', 'paddingTop', 'paddingBottom', 'paddingLeft', 'paddingRight',
+                        'paddingHorizontal', 'paddingVertical',
+                        'margin', 'marginTop', 'marginBottom', 'marginLeft', 'marginRight',
+                        'marginHorizontal', 'marginVertical',
+                        'width', 'height', 'minWidth', 'minHeight', 'maxWidth', 'maxHeight',
+                        'flex', 'flexDirection', 'flexWrap', 'flexGrow', 'flexShrink',
+                        'justifyContent', 'alignItems', 'alignSelf', 'alignContent',
+                        'position', 'top', 'bottom', 'left', 'right',
+                        'gap', 'rowGap', 'columnGap',
+                        'borderWidth', 'borderTopWidth', 'borderBottomWidth', 'borderLeftWidth', 'borderRightWidth',
+                        'backgroundColor', 'borderColor', 'borderRadius',
+                        'zIndex', 'elevation'
+                    ];
+
+                    for (var k = 0; k < layoutKeys.length; k++) {
+                        if (merged[layoutKeys[k]] !== undefined) layout[layoutKeys[k]] = merged[layoutKeys[k]];
+                    }
+                    return Object.keys(layout).length > 0 ? layout : null;
+                } catch(e) { return null; }
             }
 
             var elements = [];
@@ -1277,13 +1360,15 @@ export async function getScreenLayout(options = {}) {
                 if (!displayName) continue;
                 if (componentsOnly && !info.customName) continue;
 
-                var style = fiber.memoizedProps ? fiber.memoizedProps.style : null;
+                var style = null;
+                try { style = fiber.memoizedProps ? fiber.memoizedProps.style : null; } catch {}
                 var layout = extractLayoutStyles(style);
 
                 // Get text content — use pre-collected text from step 1, or fall back to host fiber
                 var textContent = info.text || null;
                 if (!textContent && (info.hostName === 'RCTText' || info.hostName === 'Text')) {
-                    var children = fiber.memoizedProps ? fiber.memoizedProps.children : null;
+                    var children = null;
+                    try { children = fiber.memoizedProps ? fiber.memoizedProps.children : null; } catch {}
                     if (typeof children === 'string') textContent = children;
                     else if (typeof children === 'number') textContent = String(children);
                 }
@@ -1395,6 +1480,436 @@ export async function getScreenLayout(options = {}) {
     }
     return result;
 }
+export async function getPressableElements(options = {}) {
+    const { device } = options;
+    // --- Step 1: walk fiber tree, find pressable/input elements, dispatch measureInWindow ---
+    const dispatchExpression = `
+        (function() {
+            var hook = globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+            if (!hook) return { error: 'React DevTools hook not found.' };
+
+            var roots = [];
+            if (hook.getFiberRoots) {
+                roots = Array.from(hook.getFiberRoots(1) || []);
+            }
+            if (roots.length === 0 && hook.renderers) {
+                for (var entry of hook.renderers) {
+                    var r = Array.from(hook.getFiberRoots ? (hook.getFiberRoots(entry[0]) || []) : []);
+                    if (r.length > 0) { roots = r; break; }
+                }
+            }
+            if (roots.length === 0) return { error: 'No fiber roots found.' };
+
+            function getMeasurable(fiber) {
+                var sn = fiber.stateNode;
+                if (!sn) return null;
+                if (typeof sn.measureInWindow === 'function') return sn;
+                if (sn.canonical && sn.canonical.publicInstance &&
+                    typeof sn.canonical.publicInstance.measureInWindow === 'function') {
+                    return sn.canonical.publicInstance;
+                }
+                return null;
+            }
+
+            function findFirstHost(fiber, depth) {
+                if (!fiber || depth > 20) return null;
+                if (typeof fiber.type === 'string' && getMeasurable(fiber)) return fiber;
+                var child = fiber.child;
+                while (child) {
+                    var found = findFirstHost(child, depth + 1);
+                    if (found) return found;
+                    child = child.sibling;
+                }
+                return null;
+            }
+
+            function findHostsInSubtree(fiber, depth, hosts, limit) {
+                if (!fiber || depth > 20 || hosts.length >= limit) return;
+                if (typeof fiber.type === 'string' && getMeasurable(fiber)) {
+                    hosts.push(fiber);
+                    return;
+                }
+                var child = fiber.child;
+                while (child && hosts.length < limit) {
+                    findHostsInSubtree(child, depth + 1, hosts, limit);
+                    child = child.sibling;
+                }
+            }
+
+            function collectText(fiber, d, isRoot) {
+                if (!fiber || d > 30) return '';
+                var props = fiber.memoizedProps;
+                // Stop descent at nested pressable/input boundaries — their text belongs to them, not to the outer wrapper.
+                if (!isRoot && props && (typeof props.onPress === 'function' ||
+                                          typeof props.onChangeText === 'function' ||
+                                          typeof props.onFocus === 'function')) {
+                    return '';
+                }
+                if (props) {
+                    var ch = props.children;
+                    if (typeof ch === 'string') return ch;
+                    if (typeof ch === 'number') return String(ch);
+                    if (Array.isArray(ch)) {
+                        var inline = [];
+                        for (var ci = 0; ci < ch.length; ci++) {
+                            if (typeof ch[ci] === 'string') inline.push(ch[ci]);
+                            else if (typeof ch[ci] === 'number') inline.push(String(ch[ci]));
+                        }
+                        if (inline.length > 0) return inline.join('');
+                    }
+                }
+                var parts = [];
+                var child = fiber.child;
+                while (child) {
+                    var t = collectText(child, d + 1, false);
+                    if (t) parts.push(t);
+                    child = child.sibling;
+                }
+                return parts.join(' ').trim();
+            }
+
+            function getComponentName(fiber) {
+                if (!fiber || !fiber.type) return null;
+                if (typeof fiber.type === 'string') return fiber.type;
+                return fiber.type.displayName || fiber.type.name || null;
+            }
+
+            var RN_PRIMITIVES = /^(Animated\\(.*|withAnimated.*|AnimatedComponent.*|ForwardRef.*|memo\\(.*|Context\\.Consumer|Context\\.Provider|RCT.*|RNS.*|RNC.*|ViewManagerAdapter_.*|VirtualizedList.*|CellRenderer.*|FrameSizeProvider.*|MaybeScreenContainer|MaybeScreen|Navigation.*|Screen$|ScreenStack|ScreenContainer|ScreenContentWrapper|SceneView|DelayedFreeze|Freeze|Suspender|DebugContainer|StaticContainer|SafeAreaProvider.*|SafeAreaFrameContext|SafeAreaInsetsContext|ExpoRoot|ExpoRootComponent|GestureHandler.*|NativeViewGestureHandler|GestureDetector|PanGestureHandler|Reanimated.*|BottomTabNavigator|TabLayout|RouteNode|Route$|KeyboardProvider|PortalProviderComponent|BottomSheetModalProviderWrapper|ThemeContext|ThemeProvider|TextAncestorContext|PressabilityDebugView|TouchableHighlightImpl|StatusBarOverlay|BottomSheetHostingContainerComponent|BottomSheetGestureHandlersProvider|BottomSheetBackdropContainerComponent|BottomSheetContainerComponent|BottomSheetDraggableViewComponent|BottomSheetHandleContainerComponent|BottomSheetBackgroundContainerComponent|DebuggingOverlay|InspectorDeferred|Inspector|InspectorOverlay|InspectorPanel|StyleInspector|BoxInspector|BoxContainer|ElementBox|BorderBox|InspectorPanelButton)$/;
+
+            var hostFibers = [];
+            var fiberMeta = [];
+
+            function findMeaningfulAncestorName(fiber) {
+                var cur = fiber.return;
+                var depth = 0;
+                var fallbackName = null;
+                while (cur && depth < 20) {
+                    var name = getComponentName(cur);
+                    if (name && typeof cur.type !== 'string') {
+                        if (!fallbackName) fallbackName = name;
+                        if (!RN_PRIMITIVES.test(name)) return name;
+                    }
+                    cur = cur.return;
+                    depth++;
+                }
+                return fallbackName;
+            }
+
+            function buildPath(fiber) {
+                var parts = [];
+                var cur = fiber;
+                var depth = 0;
+                while (cur && depth < 30) {
+                    var name = getComponentName(cur);
+                    if (name && typeof cur.type !== 'string' && !RN_PRIMITIVES.test(name)) {
+                        parts.unshift(name);
+                    }
+                    cur = cur.return;
+                    depth++;
+                }
+                // Keep last 3 segments
+                if (parts.length > 3) {
+                    parts = parts.slice(-3);
+                    return '... > ' + parts.join(' > ');
+                }
+                return parts.join(' > ');
+            }
+
+            function walkPressables(fiber, depth) {
+                if (!fiber || depth > 5000) return;
+                var name = getComponentName(fiber);
+                var props = fiber.memoizedProps;
+
+                // Skip inactive/unfocused screens
+                if (name === 'MaybeScreen' && props && props.active === 0) return;
+                if (name === 'SceneView' && props && props.focused === false) return;
+                if (name === 'RNSScreen' && props && props['aria-hidden'] === true) return;
+
+                var isPressable = props && typeof props.onPress === 'function';
+                var isInput = !isPressable && props && (typeof props.onChangeText === 'function' || typeof props.onFocus === 'function');
+
+                if (isPressable || isInput) {
+                    var hostsForThis = [];
+                    findHostsInSubtree(fiber, 0, hostsForThis, 16);
+                    if (hostsForThis.length > 0) {
+                        var text = collectText(fiber, 0, true);
+                        var componentName = findMeaningfulAncestorName(fiber) || name || 'Unknown';
+                        var path = buildPath(fiber);
+                        var testID = (props && (props.testID || props.nativeID)) || null;
+                        var accessibilityLabel = (props && props.accessibilityLabel) || null;
+
+                        var hostIndices = [];
+                        for (var hi = 0; hi < hostsForThis.length; hi++) {
+                            hostIndices.push(hostFibers.length);
+                            hostFibers.push(hostsForThis[hi]);
+                        }
+                        fiberMeta.push({
+                            component: componentName,
+                            path: path,
+                            text: text ? text.slice(0, 100) : '',
+                            testID: testID,
+                            accessibilityLabel: accessibilityLabel,
+                            isInput: !!isInput,
+                            hostIndices: hostIndices
+                        });
+                    }
+                }
+
+                var child = fiber.child;
+                while (child) {
+                    walkPressables(child, depth + 1);
+                    child = child.sibling;
+                }
+            }
+
+            walkPressables(roots[0].current, 0);
+
+            if (hostFibers.length === 0) return { error: 'No pressable elements found on screen.' };
+
+            // Also measure the root view for viewport detection (appended; tracked by explicit index to preserve hostIndices)
+            var rootHost = findFirstHost(roots[0].current, 0);
+            var rootIdx = -1;
+            if (rootHost) {
+                rootIdx = hostFibers.length;
+                hostFibers.push(rootHost);
+            }
+
+            globalThis.__pressableFibers = hostFibers;
+            globalThis.__pressableMeta = fiberMeta;
+            globalThis.__pressableMeasurements = new Array(hostFibers.length).fill(null);
+            globalThis.__pressableRootIdx = rootIdx;
+
+            for (var i = 0; i < hostFibers.length; i++) {
+                try {
+                    (function(idx) {
+                        getMeasurable(hostFibers[idx]).measureInWindow(function(fx, fy, fw, fh) {
+                            globalThis.__pressableMeasurements[idx] = { x: fx, y: fy, width: fw, height: fh };
+                        });
+                    })(i);
+                } catch(e) {}
+            }
+
+            return { count: hostFibers.length };
+        })()
+    `;
+    const dispatchResult = await executeInApp(dispatchExpression, false, { timeoutMs: 30000 }, device);
+    if (!dispatchResult.success)
+        return dispatchResult;
+    try {
+        const parsed = JSON.parse(dispatchResult.result || "{}");
+        if (parsed.error)
+            return { success: false, error: parsed.error };
+    }
+    catch {
+        /* ignore */
+    }
+    // Wait for measureInWindow callbacks
+    await delay(300);
+    // --- Step 2: read measurements, filter visible, build results ---
+    const resolveExpression = `
+        (function() {
+            var fibers = globalThis.__pressableFibers;
+            var meta = globalThis.__pressableMeta;
+            var measurements = globalThis.__pressableMeasurements;
+            var rootIdx = globalThis.__pressableRootIdx;
+            globalThis.__pressableFibers = null;
+            globalThis.__pressableMeta = null;
+            globalThis.__pressableMeasurements = null;
+            globalThis.__pressableRootIdx = null;
+
+            if (!fibers || !measurements || !meta) {
+                return { error: 'No measurement data. Run get_pressable_elements again.' };
+            }
+
+            // Get viewport dimensions from the explicit root measurement (fallback to scanning)
+            var viewportW = 9999, viewportH = 9999;
+            var rootM = (rootIdx != null && rootIdx >= 0) ? measurements[rootIdx] : null;
+            if (rootM && rootM.width > 0 && rootM.height > 0) {
+                viewportW = rootM.width;
+                viewportH = rootM.height + (rootM.y > 0 ? rootM.y : 0);
+            } else {
+                for (var v = 0; v < measurements.length; v++) {
+                    if (measurements[v] && measurements[v].x === 0 && measurements[v].y <= 0 &&
+                        measurements[v].width > 0 && measurements[v].height > 0) {
+                        viewportW = measurements[v].width;
+                        viewportH = measurements[v].height + measurements[v].y;
+                        break;
+                    }
+                }
+            }
+
+            var elements = [];
+
+            for (var i = 0; i < meta.length; i++) {
+                var info = meta[i];
+
+                // Union all host measurements for this pressable to get its true bounds
+                var uMinX = Infinity, uMinY = Infinity, uMaxX = -Infinity, uMaxY = -Infinity;
+                var hasValid = false;
+                var indices = info.hostIndices || [];
+                for (var hi2 = 0; hi2 < indices.length; hi2++) {
+                    var mm = measurements[indices[hi2]];
+                    if (!mm || mm.width <= 0 || mm.height <= 0) continue;
+                    hasValid = true;
+                    if (mm.x < uMinX) uMinX = mm.x;
+                    if (mm.y < uMinY) uMinY = mm.y;
+                    if (mm.x + mm.width > uMaxX) uMaxX = mm.x + mm.width;
+                    if (mm.y + mm.height > uMaxY) uMaxY = mm.y + mm.height;
+                }
+                if (!hasValid) continue;
+                var m = { x: uMinX, y: uMinY, width: uMaxX - uMinX, height: uMaxY - uMinY };
+
+                // Filter: only visible within viewport
+                if (m.width <= 0 || m.height <= 0) continue;
+                if (m.x + m.width < 0 || m.y + m.height < 0) continue;
+                if (m.x > viewportW || m.y > viewportH) continue;
+
+                var text = info.text || '';
+
+                elements.push({
+                    component: info.component,
+                    path: info.path,
+                    center: {
+                        x: Math.round(m.x + m.width / 2),
+                        y: Math.round(m.y + m.height / 2)
+                    },
+                    frame: {
+                        x: Math.round(m.x),
+                        y: Math.round(m.y),
+                        width: Math.round(m.width),
+                        height: Math.round(m.height)
+                    },
+                    text: text,
+                    testID: info.testID,
+                    accessibilityLabel: info.accessibilityLabel,
+                    hasLabel: text.length > 0,
+                    isInput: info.isInput
+                });
+            }
+
+            // Deduplicate: multiple nested pressables (View > TouchableOpacity > TouchableOpacity)
+            // often share the same frame. Keep the one with the most meaningful component name,
+            // but merge text/testID/accessibilityLabel from the loser so stopping collectText
+            // at nested-pressable boundaries does not drop labels across the merge.
+            var HOST_NAMES = /^(View|TouchableOpacity|TouchableHighlight|TouchableWithoutFeedback|Pressable|TouchableNativeFeedback|Text|RCTView|RCTText)$/;
+            function mergeFields(winner, loser) {
+                if (!winner.text && loser.text) {
+                    winner.text = loser.text;
+                    winner.hasLabel = winner.text.length > 0;
+                }
+                if (!winner.testID && loser.testID) winner.testID = loser.testID;
+                if (!winner.accessibilityLabel && loser.accessibilityLabel) winner.accessibilityLabel = loser.accessibilityLabel;
+                return winner;
+            }
+            var deduped = {};
+            for (var di = 0; di < elements.length; di++) {
+                var el = elements[di];
+                var key = el.frame.x + ',' + el.frame.y + ',' + el.frame.width + ',' + el.frame.height;
+                var existing = deduped[key];
+                if (!existing) {
+                    deduped[key] = el;
+                } else {
+                    var existingIsGeneric = HOST_NAMES.test(existing.component);
+                    var newIsGeneric = HOST_NAMES.test(el.component);
+                    var winner, loser;
+                    if (existingIsGeneric && !newIsGeneric) {
+                        winner = el; loser = existing;
+                    } else if (!existingIsGeneric && newIsGeneric) {
+                        winner = existing; loser = el;
+                    } else {
+                        // Both generic or both meaningful — prefer the one with more identifiers.
+                        if (!existing.testID && el.testID) { winner = el; loser = existing; }
+                        else if (!existing.accessibilityLabel && el.accessibilityLabel) { winner = el; loser = existing; }
+                        else { winner = existing; loser = el; }
+                    }
+                    deduped[key] = mergeFields(winner, loser);
+                }
+            }
+            elements = [];
+            for (var dk in deduped) {
+                elements.push(deduped[dk]);
+            }
+
+            // Tag wrappers: pressables that cover >=50% of viewport AND geometrically contain another pressable.
+            // These are typically keyboard-dismiss/full-screen Touchable wrappers — agents should skip them.
+            var viewportArea = (viewportW > 0 && viewportH > 0 && viewportW < 9999 && viewportH < 9999)
+                ? viewportW * viewportH : 0;
+            if (viewportArea > 0) {
+                for (var wi = 0; wi < elements.length; wi++) {
+                    var we = elements[wi];
+                    var weArea = we.frame.width * we.frame.height;
+                    if (weArea < viewportArea * 0.5) continue;
+                    for (var wj = 0; wj < elements.length; wj++) {
+                        if (wj === wi) continue;
+                        var other = elements[wj];
+                        if (other.frame.x >= we.frame.x &&
+                            other.frame.y >= we.frame.y &&
+                            other.frame.x + other.frame.width <= we.frame.x + we.frame.width &&
+                            other.frame.y + other.frame.height <= we.frame.y + we.frame.height &&
+                            other.frame.width * other.frame.height < weArea) {
+                            we.isWrapper = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // Sort top-to-bottom, left-to-right
+            elements.sort(function(a, b) {
+                if (a.center.y !== b.center.y) return a.center.y - b.center.y;
+                return a.center.x - b.center.x;
+            });
+
+            var iconCount = 0;
+            var labeledCount = 0;
+            for (var j = 0; j < elements.length; j++) {
+                if (elements[j].hasLabel) labeledCount++;
+                else iconCount++;
+            }
+
+            return {
+                pressableElements: elements,
+                summary: 'Found ' + elements.length + ' pressable elements (' + iconCount + ' icon-only, ' + labeledCount + ' with text labels)'
+            };
+        })()
+    `;
+    const result = await executeInApp(resolveExpression, false, { timeoutMs: 30000 }, device);
+    if (result.success && result.result) {
+        try {
+            const parsed = JSON.parse(result.result);
+            if (parsed.error)
+                return { success: false, error: parsed.error };
+            const pressableElements = parsed.pressableElements || [];
+            // Format as readable text
+            const lines = [parsed.summary, ""];
+            for (let i = 0; i < pressableElements.length; i++) {
+                const el = pressableElements[i];
+                const num = i + 1;
+                const label = el.hasLabel ? `"${el.text}"` : "(icon/image)";
+                const ids = [];
+                if (el.testID)
+                    ids.push(`testID="${el.testID}"`);
+                if (el.accessibilityLabel)
+                    ids.push(`a11y="${el.accessibilityLabel}"`);
+                const idStr = ids.length > 0 ? ` [${ids.join(", ")}]` : "";
+                const inputStr = el.isInput ? " (input)" : "";
+                const wrapperStr = el.isWrapper ? " [wrapper — skip unless dismissing keyboard]" : "";
+                lines.push(`${num}. ${el.component} ${label} — center:(${el.center.x},${el.center.y}) frame:(${el.frame.x},${el.frame.y} ${el.frame.width}x${el.frame.height})${idStr}${inputStr}${wrapperStr}`);
+                if (el.path)
+                    lines.push(`   path: ${el.path}`);
+            }
+            return {
+                success: true,
+                result: lines.join("\n"),
+                parsedElements: pressableElements
+            };
+        }
+        catch {
+            // If parsing fails, return original result
+        }
+    }
+    return result;
+}
 /**
  * Format enriched elements as an indented tree with tap coordinates in pixels.
  * Same tree structure as get_screen_layout but with tap:(x,y) per node.
@@ -1506,11 +2021,16 @@ export async function inspectComponent(componentName, options = {}) {
             }
 
             function extractStyles(style) {
-                if (!style) return null;
-                const merged = Array.isArray(style)
-                    ? Object.assign({}, ...style.filter(Boolean).map(s => typeof s === 'object' ? s : {}))
-                    : (typeof style === 'object' ? style : {});
-                return Object.keys(merged).length > 0 ? merged : null;
+                try {
+                    if (!style) return null;
+                    const merged = Array.isArray(style)
+                        ? Object.assign({}, ...style.filter(Boolean).map(s => {
+                            try { return typeof s === 'object' ? s : {}; }
+                            catch { return {}; }
+                        }))
+                        : (typeof style === 'object' ? style : {});
+                    return Object.keys(merged).length > 0 ? merged : null;
+                } catch { return { _note: '[Contains animated styles]' }; }
             }
 
             function serializeValue(val, depth = 0) {
@@ -1528,7 +2048,11 @@ export async function inspectComponent(componentName, options = {}) {
                 if (keys.length > 20) return '[Object(' + keys.length + ' keys)]';
                 const result = {};
                 for (const k of keys) {
-                    result[k] = serializeValue(val[k], depth + 1);
+                    try {
+                        result[k] = serializeValue(val[k], depth + 1);
+                    } catch {
+                        result[k] = '[Animated Value]';
+                    }
                 }
                 return result;
             }
@@ -1596,42 +2120,56 @@ export async function inspectComponent(componentName, options = {}) {
                 const props = {};
                 for (const key of Object.keys(fiber.memoizedProps)) {
                     if (key === 'children') continue;
-                    props[key] = serializeValue(fiber.memoizedProps[key]);
+                    try {
+                        props[key] = serializeValue(fiber.memoizedProps[key]);
+                    } catch {
+                        props[key] = '[Animated Value]';
+                    }
                 }
                 result.props = props;
             }
 
             // Style separately for clarity
-            if (fiber.memoizedProps?.style) {
-                result.style = extractStyles(fiber.memoizedProps.style);
+            try {
+                if (fiber.memoizedProps?.style) {
+                    result.style = extractStyles(fiber.memoizedProps.style);
+                }
+            } catch {
+                result.style = { _note: '[Contains animated styles]' };
             }
 
             // State (for hooks, this is a linked list)
             if (includeState && fiber.memoizedState) {
                 // Simplified hook value serialization
                 function serializeHookValue(val, depth = 0) {
-                    if (depth > 2) return '[...]';
-                    if (val === null || val === undefined) return val;
-                    if (typeof val === 'function') return '[Function]';
-                    if (typeof val !== 'object') return val;
-                    // Skip React internal structures (effects, refs with destroy/create)
-                    if (val.create && val.destroy !== undefined) return '[Effect]';
-                    if (val.inst && val.deps) return '[Effect]';
-                    if (val.current !== undefined && Object.keys(val).length === 1) {
-                        // Ref object - just show current value
-                        return { current: serializeHookValue(val.current, depth + 1) };
-                    }
-                    if (Array.isArray(val)) {
-                        if (val.length > 5) return '[Array(' + val.length + ')]';
-                        return val.slice(0, 5).map(v => serializeHookValue(v, depth + 1));
-                    }
-                    const keys = Object.keys(val);
-                    if (keys.length > 10) return '[Object(' + keys.length + ' keys)]';
-                    const result = {};
-                    for (const k of keys.slice(0, 10)) {
-                        result[k] = serializeHookValue(val[k], depth + 1);
-                    }
-                    return result;
+                    try {
+                        if (depth > 2) return '[...]';
+                        if (val === null || val === undefined) return val;
+                        if (typeof val === 'function') return '[Function]';
+                        if (typeof val !== 'object') return val;
+                        // Skip React internal structures (effects, refs with destroy/create)
+                        if (val.create && val.destroy !== undefined) return '[Effect]';
+                        if (val.inst && val.deps) return '[Effect]';
+                        if (val.current !== undefined && Object.keys(val).length === 1) {
+                            // Ref object - just show current value
+                            return { current: serializeHookValue(val.current, depth + 1) };
+                        }
+                        if (Array.isArray(val)) {
+                            if (val.length > 5) return '[Array(' + val.length + ')]';
+                            return val.slice(0, 5).map(v => serializeHookValue(v, depth + 1));
+                        }
+                        const keys = Object.keys(val);
+                        if (keys.length > 10) return '[Object(' + keys.length + ' keys)]';
+                        const result = {};
+                        for (const k of keys.slice(0, 10)) {
+                            try {
+                                result[k] = serializeHookValue(val[k], depth + 1);
+                            } catch {
+                                result[k] = '[Animated Value]';
+                            }
+                        }
+                        return result;
+                    } catch { return '[Animated Value]'; }
                 }
 
                 // For function components with hooks
@@ -1717,20 +2255,25 @@ export async function findComponents(pattern, options = {}) {
             }
 
             function extractLayoutStyles(style) {
-                if (!style) return null;
-                const merged = Array.isArray(style)
-                    ? Object.assign({}, ...style.filter(Boolean).map(s => typeof s === 'object' ? s : {}))
-                    : (typeof style === 'object' ? style : {});
-
-                const layout = {};
-                const keys = ['padding', 'paddingTop', 'paddingBottom', 'paddingLeft', 'paddingRight',
-                    'paddingHorizontal', 'paddingVertical', 'margin', 'marginTop', 'marginBottom',
-                    'marginLeft', 'marginRight', 'marginHorizontal', 'marginVertical',
-                    'width', 'height', 'flex', 'flexDirection', 'justifyContent', 'alignItems'];
-                for (const k of keys) {
-                    if (merged[k] !== undefined) layout[k] = merged[k];
-                }
-                return Object.keys(layout).length > 0 ? layout : null;
+                try {
+                    if (!style) return null;
+                    const merged = Array.isArray(style)
+                        ? Object.assign({}, ...style.filter(Boolean).map(s => {
+                            try { return typeof s === 'object' ? s : {}; }
+                            catch { return {}; }
+                        }))
+                        : (typeof style === 'object' ? style : {});
+
+                    const layout = {};
+                    const keys = ['padding', 'paddingTop', 'paddingBottom', 'paddingLeft', 'paddingRight',
+                        'paddingHorizontal', 'paddingVertical', 'margin', 'marginTop', 'marginBottom',
+                        'marginLeft', 'marginRight', 'marginHorizontal', 'marginVertical',
+                        'width', 'height', 'flex', 'flexDirection', 'justifyContent', 'alignItems'];
+                    for (const k of keys) {
+                        if (merged[k] !== undefined) layout[k] = merged[k];
+                    }
+                    return Object.keys(layout).length > 0 ? layout : null;
+                } catch { return null; }
             }
 
             const results = [];
@@ -1839,19 +2382,20 @@ export async function pressElement(options) {
     const textParam = text ? `'${esc(text)}'` : "null";
     const testIDParam = testID ? `'${esc(testID)}'` : "null";
     const componentParam = component ? `'${esc(component)}'` : "null";
-    const expression = `
+    // --- Step 1: Walk fiber tree, collect pressable/input elements, dispatch measureInWindow ---
+    const dispatchExpression = `
         (function() {
             var hook = globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__;
             if (!hook) return { error: 'React DevTools hook not found. Ensure app is running in __DEV__ mode.' };
 
             var roots = [];
             if (hook.getFiberRoots) {
-                var renderers = hook.renderers;
-                if (renderers) {
-                    for (var entry of renderers) {
-                        var r = Array.from(hook.getFiberRoots(entry[0]) || []);
-                        if (r.length > 0) { roots = r; break; }
-                    }
+                roots = Array.from(hook.getFiberRoots(1) || []);
+            }
+            if (roots.length === 0 && hook.renderers) {
+                for (var entry of hook.renderers) {
+                    var r = Array.from(hook.getFiberRoots ? (hook.getFiberRoots(entry[0]) || []) : []);
+                    if (r.length > 0) { roots = r; break; }
                 }
             }
             if (roots.length === 0) return { error: 'No fiber roots found. Is a React Native app mounted?' };
@@ -1860,6 +2404,7 @@ export async function pressElement(options) {
             var searchTestID = ${testIDParam};
             var searchComponent = ${componentParam};
             var targetIndex = ${index};
+            var maxTraversalUp = ${maxTraversalDepth};
 
             function getComponentName(fiber) {
                 if (!fiber || !fiber.type) return null;
@@ -1890,15 +2435,105 @@ export async function pressElement(options) {
                 return parts.join('');
             }
 
-            var matches = [];
+            function getMeasurable(fiber) {
+                var sn = fiber.stateNode;
+                if (!sn) return null;
+                if (typeof sn.measureInWindow === 'function') return sn;
+                if (sn.canonical && sn.canonical.publicInstance &&
+                    typeof sn.canonical.publicInstance.measureInWindow === 'function') {
+                    return sn.canonical.publicInstance;
+                }
+                return null;
+            }
 
-            function walkFiber(fiber, path) {
-                if (!fiber) return;
+            var RN_PRIMITIVES = /^(Animated\\(.*|withAnimated.*|AnimatedComponent.*|ForwardRef.*|memo\\(.*|Context\\.Consumer|Context\\.Provider|RCT.*|RNS.*|RNC.*|ViewManagerAdapter_.*|VirtualizedList.*|CellRenderer.*|FrameSizeProvider.*|MaybeScreenContainer|MaybeScreen|Navigation.*|Screen$|ScreenStack|ScreenContainer|ScreenContentWrapper|SceneView|DelayedFreeze|Freeze|Suspender|DebugContainer|StaticContainer|SafeAreaProvider.*|SafeAreaFrameContext|SafeAreaInsetsContext|ExpoRoot|ExpoRootComponent|GestureHandler.*|NativeViewGestureHandler|GestureDetector|PanGestureHandler|Reanimated.*|BottomTabNavigator|TabLayout|RouteNode|Route$|KeyboardProvider|PortalProviderComponent|BottomSheetModalProviderWrapper|ThemeContext|ThemeProvider|TextAncestorContext|PressabilityDebugView|TouchableHighlightImpl|StatusBarOverlay|BottomSheetHostingContainerComponent|BottomSheetGestureHandlersProvider|BottomSheetBackdropContainerComponent|BottomSheetContainerComponent|BottomSheetDraggableViewComponent|BottomSheetHandleContainerComponent|BottomSheetBackgroundContainerComponent|DebuggingOverlay|InspectorDeferred|Inspector|InspectorOverlay|InspectorPanel|StyleInspector|BoxInspector|BoxContainer|ElementBox|BorderBox|InspectorPanelButton)$/;
+
+            function isScreenHidden(name, props) {
+                if (!props) return false;
+                if (name === 'RNSScreen' && props['aria-hidden'] === true) return true;
+                if (name === 'MaybeScreen' && props.active === 0) return true;
+                if (name === 'SceneView' && props.focused === false) return true;
+                return false;
+            }
+
+            function findMeaningfulAncestorName(fiber) {
+                var cur = fiber.return;
+                var depth = 0;
+                var fallbackName = null;
+                while (cur && depth < 20) {
+                    var aname = getComponentName(cur);
+                    if (aname && typeof cur.type !== 'string') {
+                        if (!fallbackName) fallbackName = aname;
+                        if (!RN_PRIMITIVES.test(aname)) return aname;
+                    }
+                    cur = cur.return;
+                    depth++;
+                }
+                return fallbackName;
+            }
+
+            // Walk UP collecting testID/nativeID from ancestors. Stop at screen boundaries.
+            function collectAncestorTestIDs(fiber, maxUp) {
+                var ids = [];
+                var cur = fiber.return;
+                var d = 0;
+                while (cur && d < maxUp) {
+                    var cname = getComponentName(cur);
+                    if (cname === 'RNSScreen' || cname === 'MaybeScreen' || cname === 'SceneView') break;
+                    var cp = cur.memoizedProps;
+                    if (cp) {
+                        if (typeof cp.testID === 'string' && cp.testID) ids.push(cp.testID);
+                        if (typeof cp.nativeID === 'string' && cp.nativeID) ids.push(cp.nativeID);
+                    }
+                    cur = cur.return;
+                    d++;
+                }
+                return ids;
+            }
+
+            // Find the first measurable host descendant of a fiber.
+            // For inputs, prefer TextInput-specific hosts over generic RCTView.
+            function findFirstHost(fiber, depth, isInput) {
+                if (!fiber || depth > 20) return null;
+                if (typeof fiber.type === 'string' && getMeasurable(fiber)) {
+                    if (isInput) {
+                        var hostType = typeof fiber.type === 'string' ? fiber.type : '';
+                        if (hostType.indexOf('TextInput') !== -1 || hostType.indexOf('textinput') !== -1) {
+                            return fiber;
+                        }
+                    }
+                    return fiber;
+                }
+                var child = fiber.child;
+                var fallback = null;
+                while (child) {
+                    var found = findFirstHost(child, depth + 1, isInput);
+                    if (found) {
+                        if (isInput) {
+                            var ft = typeof found.type === 'string' ? found.type : '';
+                            if (ft.indexOf('TextInput') !== -1 || ft.indexOf('textinput') !== -1) {
+                                return found;
+                            }
+                            if (!fallback) fallback = found;
+                        } else {
+                            return found;
+                        }
+                    }
+                    child = child.sibling;
+                }
+                return fallback;
+            }
+
+            var hostFibers = [];
+            var tapMeta = [];
+
+            // Phase 1: Walk the entire tree, collect all pressable/input elements
+            function walkFiber(fiber, depth, path) {
+                if (!fiber || depth > 5000) return;
                 var name = getComponentName(fiber);
                 var props = fiber.memoizedProps;
 
-                // Skip off-screen subtrees — React Navigation marks hidden screens with aria-hidden
-                if (name === 'RNSScreen' && props && props['aria-hidden'] === true) return;
+                if (isScreenHidden(name, props)) return;
 
                 var isPressable = props && typeof props.onPress === 'function';
                 var isInput = !isPressable && props && (typeof props.onChangeText === 'function' || typeof props.onFocus === 'function');
@@ -1908,33 +2543,28 @@ export async function pressElement(options) {
                     if (isPressable) {
                         text = extractText(fiber, 0);
                     } else {
-                        // For inputs: use child text, value, defaultValue, or placeholder
                         var val = typeof props.value === 'string' ? props.value : '';
                         var defVal = typeof props.defaultValue === 'string' ? props.defaultValue : '';
                         var ph = typeof props.placeholder === 'string' ? props.placeholder : '';
                         text = extractText(fiber, 0) || val || defVal || ph;
                     }
                     var tid = props.testID || props.nativeID || null;
-                    var matched = true;
+                    var meaningful = findMeaningfulAncestorName(fiber);
+                    var ancestorIDs = collectAncestorTestIDs(fiber, maxTraversalUp);
 
-                    if (searchText !== null) {
-                        matched = matched && text.toLowerCase().indexOf(searchText.toLowerCase()) !== -1;
-                    }
-                    if (searchTestID !== null) {
-                        matched = matched && (tid === searchTestID);
-                    }
-                    if (searchComponent !== null) {
-                        matched = matched && (name || '').toLowerCase().indexOf(searchComponent.toLowerCase()) !== -1;
-                    }
-
-                    if (matched) {
-                        matches.push({
-                            fiber: fiber,
+                    var host = findFirstHost(fiber, 0, isInput);
+                    if (host) {
+                        hostFibers.push(host);
+                        tapMeta.push({
                             name: name || '(anonymous)',
+                            meaningfulComponentName: meaningful || null,
                             text: text.substring(0, 100),
                             testID: tid,
+                            ancestorTestIDs: ancestorIDs,
                             path: path.join(' > '),
-                            isInput: isInput
+                            isInput: isInput,
+                            isPressable: isPressable,
+                            source: 'direct'
                         });
                     }
                 }
@@ -1942,151 +2572,353 @@ export async function pressElement(options) {
                 var child = fiber.child;
                 while (child) {
                     var childName = getComponentName(child);
-                    walkFiber(child, childName ? path.concat([childName]) : path);
+                    walkFiber(child, depth + 1, childName ? path.concat([childName]) : path);
                     child = child.sibling;
                 }
             }
 
             for (var ri = 0; ri < roots.length; ri++) {
-                walkFiber(roots[ri].current, []);
-            }
-
-            // Phase 2a: If searching by testID and no match found,
-            // the testID may be on a non-pressable/non-input wrapper — search ALL nodes
-            // for the testID and walk UP to find nearest pressable or input ancestor
-            if (matches.length === 0 && searchTestID !== null) {
-                var testIDCandidates = [];
+                walkFiber(roots[ri].current, 0, []);
+            }
+
+            // Phase 2a: testID on non-pressable wrapper — walk UP or DOWN to pressable/input.
+            // Skipped if Phase 1 already matched via own testID or ancestor testID.
+            if (searchTestID !== null) {
+                var hasEnrichedTestIDMatch = false;
+                for (var di = 0; di < tapMeta.length; di++) {
+                    if (tapMeta[di].testID === searchTestID) { hasEnrichedTestIDMatch = true; break; }
+                    var aids = tapMeta[di].ancestorTestIDs || [];
+                    for (var ai = 0; ai < aids.length; ai++) {
+                        if (aids[ai] === searchTestID) { hasEnrichedTestIDMatch = true; break; }
+                    }
+                    if (hasEnrichedTestIDMatch) break;
+                }
+
+                if (!hasEnrichedTestIDMatch) {
+                    function findDescendantPressable(fiber, d) {
+                        if (!fiber || d > 10) return null;
+                        var fp = fiber.memoizedProps;
+                        var dIsPressable = fp && typeof fp.onPress === 'function';
+                        var dIsInput = !dIsPressable && fp && (typeof fp.onChangeText === 'function' || typeof fp.onFocus === 'function');
+                        if (dIsPressable || dIsInput) return { fiber: fiber, isPressable: dIsPressable, isInput: dIsInput };
+                        var c = fiber.child;
+                        while (c) {
+                            var r = findDescendantPressable(c, d + 1);
+                            if (r) return r;
+                            c = c.sibling;
+                        }
+                        return null;
+                    }
 
-                function findByTestID(fiber, path) {
-                    if (!fiber) return;
-                    var name = getComponentName(fiber);
-                    var props = fiber.memoizedProps;
-                    if (name === 'RNSScreen' && props && props['aria-hidden'] === true) return;
+                    function findByTestID2a(fiber, path) {
+                        if (!fiber) return;
+                        var name = getComponentName(fiber);
+                        var props = fiber.memoizedProps;
+                        if (isScreenHidden(name, props)) return;
+
+                        var tid = props && (props.testID || props.nativeID || null);
+                        if (tid === searchTestID) {
+                            var nIsPressable = props && typeof props.onPress === 'function';
+                            var nIsInput = !nIsPressable && props && (typeof props.onChangeText === 'function' || typeof props.onFocus === 'function');
+
+                            if (nIsPressable || nIsInput) {
+                                var text = nIsPressable ? extractText(fiber, 0) : (extractText(fiber, 0) || (typeof props.value === 'string' ? props.value : '') || (typeof props.defaultValue === 'string' ? props.defaultValue : '') || (typeof props.placeholder === 'string' ? props.placeholder : ''));
+                                var host = findFirstHost(fiber, 0, nIsInput);
+                                if (host) {
+                                    hostFibers.push(host);
+                                    tapMeta.push({
+                                        name: name || '(anonymous)',
+                                        meaningfulComponentName: findMeaningfulAncestorName(fiber) || null,
+                                        text: text.substring(0, 100),
+                                        testID: searchTestID,
+                                        ancestorTestIDs: [],
+                                        path: path.join(' > '),
+                                        isInput: nIsInput,
+                                        isPressable: nIsPressable,
+                                        source: 'testID-direct'
+                                    });
+                                }
+                            } else {
+                                var foundAncestor = false;
+                                var parent = fiber.return;
+                                var d = 0;
+                                while (parent && d < maxTraversalUp) {
+                                    var pp = parent.memoizedProps;
+                                    var pIsPressable = pp && typeof pp.onPress === 'function';
+                                    var pIsInput = !pIsPressable && pp && (typeof pp.onChangeText === 'function' || typeof pp.onFocus === 'function');
+                                    if (pIsPressable || pIsInput) {
+                                        var pText = pIsPressable ? extractText(parent, 0) : (extractText(parent, 0) || (typeof pp.value === 'string' ? pp.value : '') || (typeof pp.defaultValue === 'string' ? pp.defaultValue : '') || (typeof pp.placeholder === 'string' ? pp.placeholder : ''));
+                                        var host = findFirstHost(parent, 0, pIsInput);
+                                        if (host) {
+                                            hostFibers.push(host);
+                                            tapMeta.push({
+                                                name: name || '(anonymous)',
+                                                meaningfulComponentName: findMeaningfulAncestorName(parent) || null,
+                                                text: pText.substring(0, 100),
+                                                testID: pp.testID || pp.nativeID || searchTestID,
+                                                ancestorTestIDs: [],
+                                                path: path.join(' > '),
+                                                isInput: pIsInput,
+                                                isPressable: pIsPressable,
+                                                source: 'testID-ancestor'
+                                            });
+                                            foundAncestor = true;
+                                        }
+                                        break;
+                                    }
+                                    parent = parent.return;
+                                    d++;
+                                }
 
-                    var tid = props && (props.testID || props.nativeID || null);
-                    if (tid === searchTestID) {
-                        testIDCandidates.push({ fiber: fiber, name: name || '(anonymous)', path: path.join(' > ') });
+                                if (!foundAncestor) {
+                                    var desc = findDescendantPressable(fiber, 0);
+                                    if (desc) {
+                                        var dp = desc.fiber.memoizedProps;
+                                        var dText = desc.isPressable ? extractText(desc.fiber, 0) : (extractText(desc.fiber, 0) || (typeof dp.value === 'string' ? dp.value : '') || (typeof dp.defaultValue === 'string' ? dp.defaultValue : '') || (typeof dp.placeholder === 'string' ? dp.placeholder : ''));
+                                        var dhost = findFirstHost(desc.fiber, 0, desc.isInput);
+                                        if (dhost) {
+                                            hostFibers.push(dhost);
+                                            tapMeta.push({
+                                                name: getComponentName(desc.fiber) || '(anonymous)',
+                                                meaningfulComponentName: findMeaningfulAncestorName(desc.fiber) || null,
+                                                text: dText.substring(0, 100),
+                                                testID: dp.testID || dp.nativeID || searchTestID,
+                                                ancestorTestIDs: [searchTestID],
+                                                path: path.join(' > '),
+                                                isInput: desc.isInput,
+                                                isPressable: desc.isPressable,
+                                                source: 'testID-descendant'
+                                            });
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        var child = fiber.child;
+                        while (child) {
+                            var childName = getComponentName(child);
+                            findByTestID2a(child, childName ? path.concat([childName]) : path);
+                            child = child.sibling;
+                        }
                     }
-                    var child = fiber.child;
-                    while (child) {
-                        var childName = getComponentName(child);
-                        findByTestID(child, childName ? path.concat([childName]) : path);
-                        child = child.sibling;
+                    for (var ri2a = 0; ri2a < roots.length; ri2a++) {
+                        findByTestID2a(roots[ri2a].current, []);
                     }
                 }
+            }
 
-                for (var ri3 = 0; ri3 < roots.length; ri3++) {
-                    findByTestID(roots[ri3].current, []);
+            // Phase 2b: component name on non-pressable node — walk UP or DOWN to pressable parent.
+            // Skipped if Phase 1 already matched via own name or meaningfulComponentName.
+            if (searchComponent !== null) {
+                var scLower = searchComponent.toLowerCase();
+                var hasEnrichedComponentMatch = false;
+                for (var ci = 0; ci < tapMeta.length; ci++) {
+                    var cn = (tapMeta[ci].name || '').toLowerCase();
+                    var cm = (tapMeta[ci].meaningfulComponentName || '').toLowerCase();
+                    if (cn.indexOf(scLower) !== -1 || cm.indexOf(scLower) !== -1) {
+                        hasEnrichedComponentMatch = true; break;
+                    }
                 }
 
-                // For each candidate, first check if the node itself is pressable/input,
-                // then walk UP to find nearest pressable/input ancestor
-                var maxDepthTID = ${maxTraversalDepth};
-                for (var ti = 0; ti < testIDCandidates.length; ti++) {
-                    var tCandidate = testIDCandidates[ti];
-                    var tProps = tCandidate.fiber.memoizedProps;
-                    var tIsPressable = tProps && typeof tProps.onPress === 'function';
-                    var tIsInput = !tIsPressable && tProps && (typeof tProps.onChangeText === 'function' || typeof tProps.onFocus === 'function');
-
-                    if (tIsPressable || tIsInput) {
-                        var text = extractText(tCandidate.fiber, 0);
-                        if (tIsInput) {
-                            var val = typeof tProps.value === 'string' ? tProps.value : '';
-                            var defVal = typeof tProps.defaultValue === 'string' ? tProps.defaultValue : '';
-                            var ph = typeof tProps.placeholder === 'string' ? tProps.placeholder : '';
-                            text = text || val || defVal || ph;
+                if (!hasEnrichedComponentMatch) {
+                    function findDescendantPressableOnly(fiber, d) {
+                        if (!fiber || d > 10) return null;
+                        var fp = fiber.memoizedProps;
+                        if (fp && typeof fp.onPress === 'function') return fiber;
+                        var c = fiber.child;
+                        while (c) {
+                            var r = findDescendantPressableOnly(c, d + 1);
+                            if (r) return r;
+                            c = c.sibling;
                         }
-                        matches.push({
-                            fiber: tCandidate.fiber,
-                            name: tCandidate.name,
-                            text: text.substring(0, 100),
-                            testID: searchTestID,
-                            path: tCandidate.path,
-                            isInput: tIsInput
-                        });
-                        continue;
+                        return null;
                     }
 
-                    // Walk up to find pressable/input ancestor
-                    var tParent = tCandidate.fiber.return;
-                    var tDepth = 0;
-                    while (tParent && tDepth < maxDepthTID) {
-                        var tParentProps = tParent.memoizedProps;
-                        var parentIsPressable = tParentProps && typeof tParentProps.onPress === 'function';
-                        var parentIsInput = !parentIsPressable && tParentProps && (typeof tParentProps.onChangeText === 'function' || typeof tParentProps.onFocus === 'function');
-
-                        if (parentIsPressable || parentIsInput) {
-                            var text = extractText(tParent, 0);
-                            if (parentIsInput) {
-                                var val = typeof tParentProps.value === 'string' ? tParentProps.value : '';
-                                var defVal = typeof tParentProps.defaultValue === 'string' ? tParentProps.defaultValue : '';
-                                var ph = typeof tParentProps.placeholder === 'string' ? tParentProps.placeholder : '';
-                                text = text || val || defVal || ph;
+                    function findByName2b(fiber, path) {
+                        if (!fiber) return;
+                        var name = getComponentName(fiber);
+                        var props = fiber.memoizedProps;
+                        if (isScreenHidden(name, props)) return;
+
+                        if (name && name.toLowerCase().indexOf(scLower) !== -1) {
+                            var foundAncestor = false;
+                            var parent = fiber.return;
+                            var d = 0;
+                            while (parent && d < maxTraversalUp) {
+                                var pp = parent.memoizedProps;
+                                if (pp && typeof pp.onPress === 'function') {
+                                    var text = extractText(parent, 0);
+                                    var host = findFirstHost(parent, 0, false);
+                                    if (host) {
+                                        hostFibers.push(host);
+                                        tapMeta.push({
+                                            name: name,
+                                            meaningfulComponentName: findMeaningfulAncestorName(parent) || null,
+                                            text: text.substring(0, 100),
+                                            testID: pp.testID || pp.nativeID || null,
+                                            ancestorTestIDs: [],
+                                            path: path.join(' > '),
+                                            isInput: false,
+                                            isPressable: true,
+                                            source: 'component-ancestor'
+                                        });
+                                        foundAncestor = true;
+                                    }
+                                    break;
+                                }
+                                parent = parent.return;
+                                d++;
                             }
-                            matches.push({
-                                fiber: tParent,
-                                name: tCandidate.name,
-                                text: text.substring(0, 100),
-                                testID: tParentProps.testID || tParentProps.nativeID || searchTestID,
-                                path: tCandidate.path,
-                                isInput: parentIsInput
-                            });
-                            break;
+
+                            if (!foundAncestor) {
+                                var descFiber = findDescendantPressableOnly(fiber, 0);
+                                if (descFiber) {
+                                    var dp = descFiber.memoizedProps;
+                                    var dText = extractText(descFiber, 0);
+                                    var dhost = findFirstHost(descFiber, 0, false);
+                                    if (dhost) {
+                                        hostFibers.push(dhost);
+                                        tapMeta.push({
+                                            name: getComponentName(descFiber) || '(anonymous)',
+                                            meaningfulComponentName: name,
+                                            text: dText.substring(0, 100),
+                                            testID: dp.testID || dp.nativeID || null,
+                                            ancestorTestIDs: [],
+                                            path: path.join(' > '),
+                                            isInput: false,
+                                            isPressable: true,
+                                            source: 'component-descendant'
+                                        });
+                                    }
+                                }
+                            }
+                        }
+                        var child = fiber.child;
+                        while (child) {
+                            var childName = getComponentName(child);
+                            findByName2b(child, childName ? path.concat([childName]) : path);
+                            child = child.sibling;
                         }
-                        tParent = tParent.return;
-                        tDepth++;
+                    }
+                    for (var ri2b = 0; ri2b < roots.length; ri2b++) {
+                        findByName2b(roots[ri2b].current, []);
                     }
                 }
             }
 
-            // Phase 2b: If searching by component and no match found,
-            // look for the component by name and walk UP to find nearest pressable ancestor
-            if (matches.length === 0 && searchComponent !== null) {
-                var componentCandidates = [];
+            if (hostFibers.length === 0) {
+                var criteria = [];
+                if (searchText !== null) criteria.push('text="' + searchText + '"');
+                if (searchTestID !== null) criteria.push('testID="' + searchTestID + '"');
+                if (searchComponent !== null) criteria.push('component="' + searchComponent + '"');
+                return { error: 'No pressable or focusable elements found. Searched for: ' + criteria.join(', ') };
+            }
 
-                function findByName(fiber, path) {
-                    if (!fiber) return;
-                    var name = getComponentName(fiber);
-                    var props = fiber.memoizedProps;
-                    if (name === 'RNSScreen' && props && props['aria-hidden'] === true) return;
+            // Store host fibers and metadata globally for step 2, dispatch measureInWindow
+            globalThis.__tapHostFibers = hostFibers;
+            globalThis.__tapMeta = tapMeta;
+            globalThis.__tapMeasurements = new Array(hostFibers.length).fill(null);
 
-                    if (name && name.toLowerCase().indexOf(searchComponent.toLowerCase()) !== -1) {
-                        componentCandidates.push({ fiber: fiber, name: name, path: path.join(' > ') });
-                    }
-                    var child = fiber.child;
-                    while (child) {
-                        var childName = getComponentName(child);
-                        findByName(child, childName ? path.concat([childName]) : path);
-                        child = child.sibling;
-                    }
+            for (var mi = 0; mi < hostFibers.length; mi++) {
+                try {
+                    (function(idx) {
+                        getMeasurable(hostFibers[idx]).measureInWindow(function(fx, fy, fw, fh) {
+                            globalThis.__tapMeasurements[idx] = { x: fx, y: fy, width: fw, height: fh };
+                        });
+                    })(mi);
+                } catch(e) {}
+            }
+
+            return { count: hostFibers.length };
+        })()
+    `;
+    const dispatchResult = await executeInApp(dispatchExpression, false, { timeoutMs: 30000 }, options.device);
+    if (!dispatchResult.success)
+        return dispatchResult;
+    try {
+        const parsed = JSON.parse(dispatchResult.result || "{}");
+        if (parsed.error)
+            return { success: false, error: parsed.error };
+    }
+    catch {
+        /* ignore */
+    }
+    // Wait for measureInWindow callbacks
+    await delay(300);
+    // --- Step 2: Read measurements, filter visible, match by query ---
+    const resolveExpression = `
+        (function() {
+            var hostFibers = globalThis.__tapHostFibers;
+            var meta = globalThis.__tapMeta;
+            var measurements = globalThis.__tapMeasurements;
+            globalThis.__tapHostFibers = null;
+            globalThis.__tapMeta = null;
+            globalThis.__tapMeasurements = null;
+
+            if (!hostFibers || !measurements || !meta) {
+                return { error: 'No measurement data. Dispatch step may have failed.' };
+            }
+
+            var searchText = ${textParam};
+            var searchTestID = ${testIDParam};
+            var searchComponent = ${componentParam};
+            var targetIndex = ${index};
+
+            // Determine viewport bounds
+            var viewportW = 9999, viewportH = 9999;
+            for (var v = 0; v < measurements.length; v++) {
+                if (measurements[v] && measurements[v].x === 0 && measurements[v].y <= 0 &&
+                    measurements[v].width > 0 && measurements[v].height > 0) {
+                    viewportW = measurements[v].width;
+                    viewportH = measurements[v].height + measurements[v].y;
+                    break;
                 }
+            }
 
-                for (var ri2 = 0; ri2 < roots.length; ri2++) {
-                    findByName(roots[ri2].current, []);
-                }
-
-                // For each candidate, walk up to find pressable ancestor
-                var maxDepth = ${maxTraversalDepth};
-                for (var ci = 0; ci < componentCandidates.length; ci++) {
-                    var candidate = componentCandidates[ci];
-                    var parent = candidate.fiber.return;
-                    var depth = 0;
-                    while (parent && depth < maxDepth) {
-                        var parentProps = parent.memoizedProps;
-                        if (parentProps && typeof parentProps.onPress === 'function') {
-                            var text = extractText(parent, 0);
-                            matches.push({
-                                fiber: parent,
-                                name: candidate.name,
-                                text: text.substring(0, 100),
-                                testID: parentProps.testID || parentProps.nativeID || null,
-                                path: candidate.path
-                            });
-                            break;
-                        }
-                        parent = parent.return;
-                        depth++;
+            // Filter visible and match
+            var matches = [];
+            for (var i = 0; i < measurements.length; i++) {
+                var m = measurements[i];
+                if (!m) continue;
+
+                // Visibility filter: positive dimensions, within viewport
+                if (m.width <= 0 || m.height <= 0) continue;
+                if (m.x + m.width < 0 || m.y + m.height < 0) continue;
+                if (m.x > viewportW || m.y > viewportH) continue;
+
+                var info = meta[i];
+
+                // Match by query — OR across own and enriched identifiers
+                var matched = true;
+                if (searchText !== null) {
+                    matched = matched && info.text.toLowerCase().indexOf(searchText.toLowerCase()) !== -1;
+                }
+                if (searchTestID !== null) {
+                    var ownTidMatch = info.testID === searchTestID;
+                    var aTids = info.ancestorTestIDs || [];
+                    var ancestorTidMatch = false;
+                    for (var ti = 0; ti < aTids.length; ti++) {
+                        if (aTids[ti] === searchTestID) { ancestorTidMatch = true; break; }
                     }
+                    matched = matched && (ownTidMatch || ancestorTidMatch);
+                }
+                if (searchComponent !== null) {
+                    var scq = searchComponent.toLowerCase();
+                    var ownNameMatch = (info.name || '').toLowerCase().indexOf(scq) !== -1;
+                    var meaningfulMatch = (info.meaningfulComponentName || '').toLowerCase().indexOf(scq) !== -1;
+                    matched = matched && (ownNameMatch || meaningfulMatch);
+                }
+
+                if (matched) {
+                    matches.push({
+                        name: info.name,
+                        text: info.text,
+                        testID: info.testID,
+                        path: info.path,
+                        isInput: info.isInput,
+                        x: Math.round(m.x + m.width / 2),
+                        y: Math.round(m.y + m.height / 2)
+                    });
                 }
             }
 
@@ -2095,12 +2927,12 @@ export async function pressElement(options) {
                 if (searchText !== null) criteria.push('text="' + searchText + '"');
                 if (searchTestID !== null) criteria.push('testID="' + searchTestID + '"');
                 if (searchComponent !== null) criteria.push('component="' + searchComponent + '"');
-                return { error: 'No pressable or focusable elements found matching: ' + criteria.join(', ') };
+                return { error: 'No visible pressable or focusable elements found matching: ' + criteria.join(', ') };
             }
 
             if (targetIndex >= matches.length) {
                 return {
-                    error: 'Found ' + matches.length + ' match(es) but index ' + targetIndex + ' requested (0-based). Use index 0-' + (matches.length - 1) + '.',
+                    error: 'Found ' + matches.length + ' visible match(es) but index ' + targetIndex + ' requested (0-based). Use index 0-' + (matches.length - 1) + '.',
                     matches: matches.map(function(m, i) {
                         return { index: i, component: m.name, text: m.text, testID: m.testID };
                     })
@@ -2108,137 +2940,28 @@ export async function pressElement(options) {
             }
 
             var target = matches[targetIndex];
-            try {
-                // Both pressable and input elements use native tap via measured coordinates.
-                // This ensures onPress wrappers, analytics, debouncing, and state tracking
-                // logic inside components is executed through React's event pipeline,
-                // rather than directly invoking the parent-supplied onPress prop.
-                var baseResult = {
-                    success: true,
-                    pressed: target.name,
-                    matchIndex: targetIndex,
-                    totalMatches: matches.length,
-                    text: target.text,
-                    testID: target.testID,
-                    path: target.path,
-                    isInput: !!target.isInput,
-                    needsNativeTap: true,
-                    nativeTapTarget: null
-                };
-                if (matches.length > 1) {
-                    baseResult.allMatches = matches.map(function(m, i) {
-                        return { index: i, component: m.name, text: m.text, testID: m.testID };
-                    });
-                }
-
-                // Walk down from the matched fiber to find a host component (tag === 5)
-                // whose screen position can be measured for a native tap.
-                // For inputs, prefer TextInput-specific hosts over generic RCTView.
-                var hostFiber = null;
-                var fallbackHost = null;
-                function findHostChild(fiber, depth) {
-                    if (!fiber || depth > 5000 || hostFiber) return;
-                    if (fiber.tag === 5 && fiber.stateNode) {
-                        var hostType = typeof fiber.type === 'string' ? fiber.type : '';
-                        if (target.isInput && (hostType.indexOf('TextInput') !== -1 || hostType.indexOf('textinput') !== -1)) {
-                            hostFiber = fiber;
-                            return;
-                        }
-                        if (!fallbackHost) fallbackHost = fiber;
-                    }
-                    var child = fiber.child;
-                    while (child) { findHostChild(child, depth + 1); child = child.sibling; }
-                }
-                if (target.fiber.tag === 5 && target.fiber.stateNode) {
-                    hostFiber = target.fiber;
-                } else {
-                    findHostChild(target.fiber, 0);
-                    if (!hostFiber) hostFiber = fallbackHost;
-                }
-
-                if (hostFiber && hostFiber.stateNode) {
-                    var sn = hostFiber.stateNode;
-
-                    // Fabric (New Architecture): stateNode.node is the shadow node.
-                    // nativeFabricUIManager.measure callback fires synchronously.
-                    var fabricUI = globalThis.nativeFabricUIManager;
-                    if (sn.node && fabricUI && typeof fabricUI.measure === 'function') {
-                        try {
-                            fabricUI.measure(sn.node, function(x, y, width, height, pageX, pageY) {
-                                if (width > 0 && height > 0) {
-                                    baseResult.nativeTapTarget = {
-                                        x: Math.round(pageX + width / 2),
-                                        y: Math.round(pageY + height / 2),
-                                        unit: 'points'
-                                    };
-                                }
-                            });
-
-                            // Modal offset correction: if the element is inside a native modal
-                            // (RNSModalScreen), measureInWindow returns coordinates relative to
-                            // the modal's window, not the screen. Detect and add the offset.
-                            if (baseResult.nativeTapTarget) {
-                                var modalNode = null;
-                                var screenStackNode = null;
-                                var ancestor = target.fiber.return;
-                                var walkCount = 0;
-                                while (ancestor && walkCount < 200) {
-                                    var aType = typeof ancestor.type === 'string' ? ancestor.type : '';
-                                    if (ancestor.tag === 5 && ancestor.stateNode && ancestor.stateNode.node) {
-                                        if (aType === 'RNSModalScreen' && !modalNode) modalNode = ancestor.stateNode.node;
-                                        if (aType === 'RNSScreenStack') screenStackNode = ancestor.stateNode.node;
-                                    }
-                                    ancestor = ancestor.return;
-                                    walkCount++;
-                                }
-                                if (modalNode && screenStackNode) {
-                                    var modalH = 0, stackH = 0;
-                                    fabricUI.measureInWindow(modalNode, function(mx, my, mw, mh) { modalH = mh; });
-                                    fabricUI.measureInWindow(screenStackNode, function(sx, sy, sw, sh) { stackH = sh; });
-                                    if (stackH > modalH && modalH > 0) {
-                                        baseResult.nativeTapTarget.y += (stackH - modalH);
-                                    }
-                                }
-                            }
-                        } catch (e) {
-                            // Measurement failed — fall through without coordinates
-                        }
-                    }
-
-                    // Old Architecture (Bridge): stateNode._nativeTag
-                    if (!baseResult.nativeTapTarget) {
-                        var nativeTag = sn._nativeTag || sn.__nativeTag;
-                        if (!nativeTag && typeof sn.getNativeTag === 'function') {
-                            nativeTag = sn.getNativeTag();
-                        }
-                        if (nativeTag) {
-                            var UIManager = globalThis.nativeModuleProxy && globalThis.nativeModuleProxy.UIManager;
-                            if (UIManager && typeof UIManager.measureInWindow === 'function') {
-                                try {
-                                    UIManager.measureInWindow(nativeTag, function(x, y, width, height) {
-                                        if (width > 0 && height > 0) {
-                                            baseResult.nativeTapTarget = {
-                                                x: Math.round(x + width / 2),
-                                                y: Math.round(y + height / 2),
-                                                unit: 'points'
-                                            };
-                                        }
-                                    });
-                                } catch (e) {
-                                    // Measurement failed
-                                }
-                            }
-                        }
-                    }
-                }
-
-                return baseResult;
-            } catch (e) {
-                return { error: 'Handler threw: ' + (e.message || String(e)), component: target.name };
+            var result = {
+                success: true,
+                pressed: target.name,
+                matchIndex: targetIndex,
+                totalMatches: matches.length,
+                text: target.text,
+                testID: target.testID,
+                path: target.path,
+                isInput: target.isInput,
+                x: target.x,
+                y: target.y,
+                unit: 'points'
+            };
+            if (matches.length > 1) {
+                result.allMatches = matches.map(function(m, i) {
+                    return { index: i, component: m.name, text: m.text, testID: m.testID };
+                });
             }
+            return result;
         })()
     `;
-    return executeInApp(expression, false, {}, options.device);
+    return executeInApp(resolveExpression, false, { timeoutMs: 10000 }, options.device);
 }
 // ============================================================================
 // Coordinate-Based Element Inspection (via DevTools Inspector API)