execbro 1.10.12 → 1.10.13

package/build/core/screenState.d.ts

@@ -25,10 +25,41 @@ export interface ScreenStatePressable {
     /** What pressing triggers: "onPress=handleSubmit()", "onBack=goBack()", or "onPress→onBack" (prop route when the fn is anonymous). Absent when nothing meaningful survives Hermes. */
     onPressHint?: string | null;
 }
+export interface ScreenStateText {
+    text: string;
+    center: {
+        x: number;
+        y: number;
+    };
+    bounds: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    blockedByOverlay?: boolean;
+}
+export interface ScreenStateImage {
+    src?: string | null;
+    alt?: string | null;
+    center: {
+        x: number;
+        y: number;
+    };
+    bounds: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    blockedByOverlay?: boolean;
+}
 export interface ScreenStateOverlay {
     type: "BottomSheet" | "Modal" | "Alert" | "ActionSheet" | "Unknown";
     title: string | null;
     pressables: ScreenStatePressable[];
+    texts?: ScreenStateText[];
+    images?: ScreenStateImage[];
 }
 export interface ScreenStateRoute {
     name: string;
@@ -39,6 +70,8 @@ export interface ScreenState {
     route: ScreenStateRoute | null;
     overlays: ScreenStateOverlay[];
     pressables: ScreenStatePressable[];
+    texts: ScreenStateText[];
+    images: ScreenStateImage[];
 }
 export declare function markPressablesCoveredByOverlay(pressables: ScreenStatePressable[], overlayBounds: {
     x: number;
@@ -51,14 +84,30 @@ export declare function markPressablesCoveredByOverlay(pressables: ScreenStatePr
  * pressable's icon child name carries recognizable semantics:
  *   { label: "[FloatingHeader]", icon: "SvgChevronBackward" }
  *     → label "[SvgChevronBackward — possibly back button]"
+ * An icon button whose only text is a count badge (cart with "1") keeps that
+ * count as nearby context while the label is upgraded to the icon's meaning:
+ *   { label: "1", icon: "SvgCartNew" } → label "[SvgCartNew — possibly cart button]", nearbyText "1"
  * Labels from text/a11y are never touched (icon is null for those).
  */
 export declare function applyIconHintToLabel(p: ScreenStatePressable): ScreenStatePressable;
 /**
- * Per-pressable coordinate converter — lets screenshot tools map points/dp into
- * screenshot pixels (including conditional shifts like the iOS safe-area band).
+ * Coordinate converter for any positioned item (pressable, text, image) — lets
+ * screenshot tools map points/dp into screenshot pixels (including conditional
+ * shifts like the iOS safe-area band). Reads only center/bounds, so it applies
+ * uniformly across item types.
  */
-export type PressableCoordConverter = (p: ScreenStatePressable) => {
+export type ItemCoordConverter = (item: {
+    center: {
+        x: number;
+        y: number;
+    };
+    bounds: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+}) => {
     center: {
         x: number;
         y: number;
@@ -70,21 +119,40 @@ export type PressableCoordConverter = (p: ScreenStatePressable) => {
         height: number;
     };
 };
+/** Alias kept for existing call sites; prefer ItemCoordConverter. */
+export type PressableCoordConverter = ItemCoordConverter;
+/** One merged-list line for a static text node — coordinates match pressable lines. */
+export declare function formatTextEntry(t: ScreenStateText, convert?: ItemCoordConverter, opts?: {
+    fullText?: boolean;
+}): string;
+/** One merged-list line for an image node — coordinates match pressable lines. */
+export declare function formatImageEntry(img: ScreenStateImage, convert?: ItemCoordConverter): string;
 /**
- * Render a ScreenState as the compact orientation summary used by
- * get_screen_state and the screenshot tools:
- *   📍 Checkout  [Tabs > Cart > Checkout]
+ * Render a ScreenState as the orientation summary used by get_screen_state and the
+ * screenshot tools. By default it merges pressables, static text (📝), and images
+ * (🖼) into one spatially-ordered list per reachability group — enough to read and
+ * navigate the screen without a screenshot:
+ *   📍 Detail  [Detail]
  *   🎯 Pressables:
- *     (40, 100) <FloatingHeader /> "[SvgChevronBackward — possibly back button]" frame:(16,76 48x48)
+ *     (210, 175) 🖼 Image 420x350 src="…"
+ *     (146, 394) 📝 "Valya product" frame:(20,382 251x24)
+ *     (210, 838) <Button /> "In cart" frame:(20,810 380x56)
+ * pressablesOnly restores the lean pressable-only snapshot; fullText disables the
+ * 80-char text truncation.
  */
-export declare function formatScreenStateSummary(ss: ScreenState, convert?: PressableCoordConverter): string;
+export declare function formatScreenStateSummary(ss: ScreenState, convert?: ItemCoordConverter, opts?: {
+    pressablesOnly?: boolean;
+    fullText?: boolean;
+}): string;
 export declare function describePressHandler(raw: unknown): string | null;
 /**
  * Fallback handler context from the custom component's on* props, for when the
  * direct onPress is anonymous (Hermes discards source even in dev bundles, and
  * names like navigation.goBack are lost to computed assignment):
- * - prefer the prop whose value IS the touchable's onPress (pass-through), else
- *   the only on* function prop; ambiguity (several candidates) yields null
+ * - only trust the prop whose value IS the touchable's onPress (pass-through);
+ *   a non-matched candidate is an unverifiable guess that mislabels every button
+ *   in a multi-button container (FloatingHeader exposes only onBack, but its menu
+ *   and cart buttons run internal handlers) — so it yields null
  * - named fn → "onBack=goBack()"; nameless → "onPress→onBack" (the prop name
  *   alone is greppable context); a bare nameless "onPress" prop adds nothing → null
  */

package/build/core/screenState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screenState.d.ts","sourceRoot":"","sources":["../../src/core/screenState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"screenState.d.ts","sourceRoot":"","sources":["../../src/core/screenState.ts"],"names":[],"mappings":"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"}

package/build/core/screenState.js

@@ -15,32 +15,68 @@ export function markPressablesCoveredByOverlay(pressables, overlayBounds) {
     }
     return pressables;
 }
+/** A count badge such as "1" or "99+" — the only "label" an icon button like a cart carries. */
+const COUNT_BADGE_LABEL = /^\d{1,3}\+?$/;
 /**
  * Replace component-name fallback labels with semantic icon labels when the
  * pressable's icon child name carries recognizable semantics:
  *   { label: "[FloatingHeader]", icon: "SvgChevronBackward" }
  *     → label "[SvgChevronBackward — possibly back button]"
+ * An icon button whose only text is a count badge (cart with "1") keeps that
+ * count as nearby context while the label is upgraded to the icon's meaning:
+ *   { label: "1", icon: "SvgCartNew" } → label "[SvgCartNew — possibly cart button]", nearbyText "1"
  * Labels from text/a11y are never touched (icon is null for those).
  */
 export function applyIconHintToLabel(p) {
     if (!p.icon)
         return p;
     const hint = iconSemanticHint(p.icon);
-    if (hint)
+    if (hint) {
+        if (p.label && COUNT_BADGE_LABEL.test(p.label.trim()) && !p.nearbyText) {
+            p.nearbyText = p.label;
+        }
         p.label = `[${p.icon} — ${hint}]`;
-    else if (!p.label)
+    }
+    else if (!p.label) {
         p.label = `[${p.icon}]`;
+    }
     return p;
 }
-const identityCoords = (p) => ({ center: p.center, frame: p.bounds });
+const identityCoords = (item) => ({ center: item.center, frame: item.bounds });
+const TEXT_DISPLAY_MAX = 80;
+const IMAGE_SRC_DISPLAY_MAX = 60;
+function truncate(s, max) {
+    return s.length > max ? s.slice(0, max) + "…" : s;
+}
+/** One merged-list line for a static text node — coordinates match pressable lines. */
+export function formatTextEntry(t, convert = identityCoords, opts = {}) {
+    const { center, frame } = convert(t);
+    const body = opts.fullText ? t.text : truncate(t.text, TEXT_DISPLAY_MAX);
+    return `  (${center.x}, ${center.y}) 📝 "${body}" frame:(${frame.x},${frame.y} ${frame.width}x${frame.height})`;
+}
+/** One merged-list line for an image node — coordinates match pressable lines. */
+export function formatImageEntry(img, convert = identityCoords) {
+    const { center, frame } = convert(img);
+    const src = img.src ? ` src="${truncate(img.src, IMAGE_SRC_DISPLAY_MAX)}"` : "";
+    const alt = img.alt ? ` alt="${img.alt}"` : "";
+    return `  (${center.x}, ${center.y}) 🖼 Image ${frame.width}x${frame.height}${src}${alt} frame:(${frame.x},${frame.y} ${frame.width}x${frame.height})`;
+}
+const TEXT_CAP = 60;
+const IMAGE_CAP = 40;
 /**
- * Render a ScreenState as the compact orientation summary used by
- * get_screen_state and the screenshot tools:
- *   📍 Checkout  [Tabs > Cart > Checkout]
+ * Render a ScreenState as the orientation summary used by get_screen_state and the
+ * screenshot tools. By default it merges pressables, static text (📝), and images
+ * (🖼) into one spatially-ordered list per reachability group — enough to read and
+ * navigate the screen without a screenshot:
+ *   📍 Detail  [Detail]
  *   🎯 Pressables:
- *     (40, 100) <FloatingHeader /> "[SvgChevronBackward — possibly back button]" frame:(16,76 48x48)
+ *     (210, 175) 🖼 Image 420x350 src="…"
+ *     (146, 394) 📝 "Valya product" frame:(20,382 251x24)
+ *     (210, 838) <Button /> "In cart" frame:(20,810 380x56)
+ * pressablesOnly restores the lean pressable-only snapshot; fullText disables the
+ * 80-char text truncation.
  */
-export function formatScreenStateSummary(ss, convert = identityCoords) {
+export function formatScreenStateSummary(ss, convert = identityCoords, opts = {}) {
     const lines = [];
     if (ss.route) {
         lines.push(`📍 Currently focused screen: "${ss.route.name}"  [navigation stack: ${ss.route.stack.join(" > ")}]`);
@@ -54,38 +90,75 @@ export function formatScreenStateSummary(ss, convert = identityCoords) {
     }
     const formatPressable = (p) => {
         const { center, frame } = convert(p);
-        return `  (${center.x}, ${center.y})${p.component ? ` <${p.component} />` : ""} ${p.label ? `"${p.label}"` : "(unlabeled)"}` +
+        // 🔘 marks tap targets in the enriched view (where 📝 text / 🖼 images also
+        // appear); omitted under pressablesOnly to keep the lean legacy lines.
+        const marker = opts.pressablesOnly ? "" : " 🔘";
+        return `  (${center.x}, ${center.y})${marker}${p.component ? ` <${p.component} />` : ""} ${p.label ? `"${p.label}"` : "(unlabeled)"}` +
             `${p.nearbyText ? ` near "${p.nearbyText}"` : ""}${p.onPressHint ? ` ${p.onPressHint}` : ""}` +
             `${p.testID ? ` testID="${p.testID}"` : ""}${p.isInput ? " [input]" : ""}` +
             ` frame:(${frame.x},${frame.y} ${frame.width}x${frame.height})`;
     };
+    // Merge pressables + (unless pressablesOnly) texts + images for one reachability
+    // group, sorted spatially (top→bottom, then left→right). A text duplicating a
+    // pressable's nearbyText is dropped; texts/images cap with an explicit marker.
+    const renderGroup = (pressables, texts, images) => {
+        const out = [];
+        const nearby = new Set(pressables.map((p) => (p.nearbyText || "").trim()).filter(Boolean));
+        const freshTexts = opts.pressablesOnly ? [] : texts.filter((t) => !nearby.has(t.text.trim()));
+        const useTexts = freshTexts.slice(0, TEXT_CAP);
+        const useImages = opts.pressablesOnly ? [] : images.slice(0, IMAGE_CAP);
+        const rows = [
+            ...pressables.map((p) => ({ y: p.center.y, x: p.center.x, line: formatPressable(p) })),
+            ...useTexts.map((t) => ({ y: t.center.y, x: t.center.x, line: formatTextEntry(t, convert, opts) })),
+            ...useImages.map((img) => ({ y: img.center.y, x: img.center.x, line: formatImageEntry(img, convert) })),
+        ];
+        rows.sort((a, b) => (a.y !== b.y ? a.y - b.y : a.x - b.x));
+        rows.forEach((r) => out.push(r.line));
+        if (!opts.pressablesOnly) {
+            const droppedT = freshTexts.length - useTexts.length;
+            const droppedI = images.length - useImages.length;
+            if (droppedT > 0)
+                out.push(`  … +${droppedT} more text`);
+            if (droppedI > 0)
+                out.push(`  … +${droppedI} more images`);
+        }
+        return out;
+    };
     if (ss.overlays.length > 0) {
         for (const overlay of ss.overlays) {
             lines.push(`\n🔲 ${overlay.type}${overlay.title ? ` — "${overlay.title}"` : ""}:`);
-            if (overlay.pressables.length > 0) {
-                overlay.pressables.forEach((p) => lines.push(formatPressable(p)));
-            }
-            else {
+            const body = renderGroup(overlay.pressables, overlay.texts ?? [], overlay.images ?? []);
+            if (body.length > 0)
+                body.forEach((l) => lines.push(l));
+            else
                 lines.push("  (no pressables)");
-            }
         }
-        const reachable = ss.pressables.filter((p) => !p.blockedByOverlay);
-        const blocked = ss.pressables.filter((p) => p.blockedByOverlay);
-        lines.push(`\n🎯 Root pressables: ${reachable.length > 0 ? "" : "(none reachable)"}`);
-        reachable.forEach((p) => lines.push(formatPressable(p)));
-        if (blocked.length > 0) {
+        const reachableP = ss.pressables.filter((p) => !p.blockedByOverlay);
+        const blockedP = ss.pressables.filter((p) => p.blockedByOverlay);
+        const reachableT = ss.texts.filter((t) => !t.blockedByOverlay);
+        const blockedT = ss.texts.filter((t) => t.blockedByOverlay);
+        const reachableI = ss.images.filter((i) => !i.blockedByOverlay);
+        const blockedI = ss.images.filter((i) => i.blockedByOverlay);
+        const rootBody = renderGroup(reachableP, reachableT, reachableI);
+        if (opts.pressablesOnly) {
+            lines.push(`\n🎯 Root pressables: ${reachableP.length > 0 ? "" : "(none reachable)"}`);
+        }
+        else {
+            lines.push(`\n🎯 Reachable (outside any overlay):${rootBody.length > 0 ? "" : " (nothing reachable)"}`);
+        }
+        rootBody.forEach((l) => lines.push(l));
+        if (blockedP.length > 0 || blockedT.length > 0 || blockedI.length > 0) {
             lines.push(`\n🚫 Blocked by overlay (visible on the underlying screen but taps will NOT reach them until the overlay closes):`);
-            blocked.forEach((p) => lines.push(formatPressable(p)));
+            renderGroup(blockedP, blockedT, blockedI).forEach((l) => lines.push(l));
         }
     }
     else {
-        lines.push("\n🎯 Pressables:");
-        if (ss.pressables.length > 0) {
-            ss.pressables.forEach((p) => lines.push(formatPressable(p)));
-        }
-        else {
+        lines.push(opts.pressablesOnly ? "\n🎯 Pressables:" : "\n🎯 On screen:");
+        const body = renderGroup(ss.pressables, ss.texts, ss.images);
+        if (body.length > 0)
+            body.forEach((l) => lines.push(l));
+        else
             lines.push("  (none)");
-        }
     }
     return lines.join("\n");
 }
@@ -124,8 +197,10 @@ export function describePressHandler(raw) {
  * Fallback handler context from the custom component's on* props, for when the
  * direct onPress is anonymous (Hermes discards source even in dev bundles, and
  * names like navigation.goBack are lost to computed assignment):
- * - prefer the prop whose value IS the touchable's onPress (pass-through), else
- *   the only on* function prop; ambiguity (several candidates) yields null
+ * - only trust the prop whose value IS the touchable's onPress (pass-through);
+ *   a non-matched candidate is an unverifiable guess that mislabels every button
+ *   in a multi-button container (FloatingHeader exposes only onBack, but its menu
+ *   and cart buttons run internal handlers) — so it yields null
  * - named fn → "onBack=goBack()"; nameless → "onPress→onBack" (the prop name
  *   alone is greppable context); a bare nameless "onPress" prop adds nothing → null
  */
@@ -133,7 +208,7 @@ export function describePropHandlers(raw) {
     if (!Array.isArray(raw) || raw.length === 0)
         return null;
     const entries = raw.filter((e) => !!e && typeof e === "object" && typeof e.p === "string");
-    const pick = entries.find((e) => e.same) ?? (entries.length === 1 ? entries[0] : null);
+    const pick = entries.find((e) => e.same) ?? null;
     if (!pick)
         return null;
     const name = meaningfulHandlerName(pick.n);
@@ -153,6 +228,8 @@ export function parseScreenStateResponse(raw) {
         route: r.route ?? null,
         overlays: r.overlays ?? [],
         pressables: r.pressables ?? [],
+        texts: r.texts ?? [],
+        images: r.images ?? [],
     };
 }
 // ============================================================================
@@ -488,6 +565,9 @@ export async function getScreenState(options = {}) {
 
     var hostFibers = [];
     var fiberMeta = [];
+    // A count badge ("1", "99+") is the only text on icon buttons like a cart — treat it
+    // as no-own-label so the icon child still surfaces (the count is kept as nearby text).
+    var COUNT_BADGE = /^\\d{1,3}\\+?$/;
 
     var RN_PRIMITIVES = /^(Animated\\(.*|withAnimated.*|AnimatedComponent.*|ForwardRef.*|memo\\(.*|Context\\.Consumer|Context\\.Provider|ScrollViewContext(Base)?|VirtualizedListContext(Resetter)?|TextInputContext|KeyboardAvoidingViewContext|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 GENERIC_COMPONENT = /^(View|TouchableOpacity|TouchableHighlight|TouchableWithoutFeedback|Pressable|TouchableNativeFeedback|Text|RCTView|RCTText|Unknown)$/;
@@ -663,7 +743,8 @@ export async function getScreenState(options = {}) {
                 var a11y = hProps.accessibilityLabel || pProps.accessibilityLabel || null;
                 var baseLabel = a11y || (text && text.length > 0 ? text.slice(0, 80) : null) || null;
                 var label = resolveLabel(pressableFiber, hostFiber, baseLabel, testID);
-                var icon = baseLabel ? null : findMeaningfulChildName(pressableFiber);
+                var badgeOnly = baseLabel ? COUNT_BADGE.test(baseLabel.trim()) : false;
+                var icon = (baseLabel && !badgeOnly) ? null : findMeaningfulChildName(pressableFiber);
                 if (!baseLabel && !icon) {
                     var ownName = getComponentName(pressableFiber);
                     if (ownName && !GENERIC_COMPONENT.test(ownName) && !RN_PRIMITIVES.test(ownName)) icon = ownName;
@@ -687,7 +768,8 @@ export async function getScreenState(options = {}) {
                 var testID2 = p2.testID || p2.nativeID || null;
                 var baseLabel2 = a11y2 || (text2 && text2.length > 0 ? text2.slice(0, 80) : null) || null;
                 var label2 = resolveLabel(fiber, hosts3[0], baseLabel2, testID2);
-                var icon2 = baseLabel2 ? null : findMeaningfulChildName(fiber);
+                var badgeOnly2 = baseLabel2 ? COUNT_BADGE.test(baseLabel2.trim()) : false;
+                var icon2 = (baseLabel2 && !badgeOnly2) ? null : findMeaningfulChildName(fiber);
                 if (!baseLabel2 && !icon2) {
                     var ownName2 = getComponentName(fiber);
                     if (ownName2 && !GENERIC_COMPONENT.test(ownName2) && !RN_PRIMITIVES.test(ownName2)) icon2 = ownName2;
@@ -733,6 +815,7 @@ export async function getScreenState(options = {}) {
 
     var textFibers = [];
     var textContents = [];
+    var textOverlayIdx = [];
 
     function extractTextString(fiber) {
         var p = fiber.memoizedProps;
@@ -751,12 +834,20 @@ export async function getScreenState(options = {}) {
         return '';
     }
 
-    function walkTexts(fiber, depth, insidePressable, inHidden) {
+    function walkTexts(fiber, depth, insidePressable, inHidden, ovIdx) {
         if (!fiber || depth > 5000) return;
         var name = getComponentName(fiber);
         var props = fiber.memoizedProps;
         var nextHidden = inHidden || isScreenHidden(name, props);
 
+        // Overlay membership by ancestry (same as the pressable walk) so a sheet's
+        // text is grouped with the sheet, not flagged as blocked behind it.
+        if (ovIdx == null) {
+            for (var ofiT = 0; ofiT < overlayFiberMeta.length; ofiT++) {
+                if (overlayFiberMeta[ofiT].fiber === fiber) { ovIdx = ofiT; break; }
+            }
+        }
+
         var hasOnPress = props && typeof props.onPress === 'function';
         var isInputHere = props && (typeof props.onChangeText === 'function' || typeof props.onFocus === 'function');
         var nextInside = insidePressable || !!hasOnPress || !!isInputHere;
@@ -766,7 +857,7 @@ export async function getScreenState(options = {}) {
         // for proxy bounds (Fabric RCTText has no publicInstance).
         if (!insidePressable && !nextHidden && name !== 'RCTText' && typeof fiber.type !== 'string') {
             var str = extractTextString(fiber);
-            if (str && str.length > 0 && str.length <= 120) {
+            if (str && str.length > 0 && str.length <= 300) {
                 var up = fiber;
                 var upDepth = 0;
                 var measurableT = null;
@@ -781,17 +872,73 @@ export async function getScreenState(options = {}) {
                 if (measurableT) {
                     textFibers.push(measurableT);
                     textContents.push(str);
+                    textOverlayIdx.push(ovIdx);
                 }
             }
         }
 
         var child = fiber.child;
         while (child) {
-            walkTexts(child, depth + 1, nextInside, nextHidden);
+            walkTexts(child, depth + 1, nextInside, nextHidden, ovIdx);
             child = child.sibling;
         }
     }
-    walkTexts(roots[0].current, 0, false, false);
+    walkTexts(roots[0].current, 0, false, false, null);
+
+    // ------------------------------------------------------------------
+    // 3c. Images — host image components, with source + a11y label. Climb to
+    //     the nearest measurable host (same proxy-bounds trick as text).
+    // ------------------------------------------------------------------
+
+    var imageFibers = [];
+    var imageMeta = [];   // { src, alt }
+    var IMG_NAME = /^(Image|RCTImageView|ExpoImage|FastImage|ImageBackground)$/;
+
+    function imageSource(props) {
+        if (!props) return null;
+        var s = props.source;
+        if (s == null) return null;
+        if (Array.isArray(s)) s = s[0];
+        if (typeof s === 'number') return 'asset#' + s;
+        if (s && typeof s === 'object' && typeof s.uri === 'string') {
+            return s.uri.length > 200 ? s.uri.slice(0, 200) : s.uri;
+        }
+        if (typeof s === 'string') return s.length > 200 ? s.slice(0, 200) : s;
+        return null;
+    }
+
+    function walkImages(fiber, depth, inHidden, ovIdx) {
+        if (!fiber || depth > 5000) return;
+        var name = getComponentName(fiber);
+        var props = fiber.memoizedProps;
+        var nextHidden = inHidden || isScreenHidden(name, props);
+        if (ovIdx == null) {
+            for (var ofiI = 0; ofiI < overlayFiberMeta.length; ofiI++) {
+                if (overlayFiberMeta[ofiI].fiber === fiber) { ovIdx = ofiI; break; }
+            }
+        }
+        if (!nextHidden && name && IMG_NAME.test(name) && typeof fiber.type !== 'string') {
+            var up = fiber;
+            var upD = 0;
+            var measurableI = null;
+            while (up && upD < 20) {
+                if (typeof up.type === 'string' && getMeasurable(up)) { measurableI = up; break; }
+                up = up.return;
+                upD++;
+            }
+            if (measurableI) {
+                imageFibers.push(measurableI);
+                imageMeta.push({
+                    src: imageSource(props),
+                    alt: (props && typeof props.accessibilityLabel === 'string') ? props.accessibilityLabel.slice(0, 80) : null,
+                    overlayIdx: ovIdx
+                });
+            }
+        }
+        var child = fiber.child;
+        while (child) { walkImages(child, depth + 1, nextHidden, ovIdx); child = child.sibling; }
+    }
+    walkImages(roots[0].current, 0, false, null);
 
     // ------------------------------------------------------------------
     // 4. Store everything in globalThis for the resolve call
@@ -830,6 +977,9 @@ export async function getScreenState(options = {}) {
     globalThis.__screenStateOverlayMeasurements = new Array(overlayHostFibers.length).fill(null);
     globalThis.__screenStateTextContents = textContents;
     globalThis.__screenStateTextMeasurements = new Array(textFibers.length).fill(null);
+    globalThis.__screenStateTextOverlayIdx = textOverlayIdx;
+    globalThis.__screenStateImageMeta = imageMeta;
+    globalThis.__screenStateImageMeasurements = new Array(imageFibers.length).fill(null);
 
     // Dispatch all measureInWindow calls (pressables + root + overlay hosts)
     for (var i = 0; i < hostFibers.length; i++) {
@@ -859,6 +1009,15 @@ export async function getScreenState(options = {}) {
             })(txi);
         } catch(e) {}
     }
+    for (var imi = 0; imi < imageFibers.length; imi++) {
+        try {
+            (function(idx) {
+                getMeasurable(imageFibers[idx]).measureInWindow(function(fx, fy, fw, fh) {
+                    globalThis.__screenStateImageMeasurements[idx] = { x: fx, y: fy, width: fw, height: fh };
+                });
+            })(imi);
+        } catch(e) {}
+    }
 
     return { count: hostFibers.length, overlayCount: overlayFiberMeta.length };
 })()
@@ -884,8 +1043,14 @@ export async function getScreenState(options = {}) {
     var overlayMeasurements = globalThis.__screenStateOverlayMeasurements || [];
     var textContents = globalThis.__screenStateTextContents || [];
     var textMeasurements = globalThis.__screenStateTextMeasurements || [];
+    var textOverlayIdx = globalThis.__screenStateTextOverlayIdx || [];
+    var imageMeta = globalThis.__screenStateImageMeta || [];
+    var imageMeasurements = globalThis.__screenStateImageMeasurements || [];
     globalThis.__screenStateTextContents = null;
     globalThis.__screenStateTextMeasurements = null;
+    globalThis.__screenStateTextOverlayIdx = null;
+    globalThis.__screenStateImageMeta = null;
+    globalThis.__screenStateImageMeasurements = null;
     globalThis.__screenStateFibers = null;
     globalThis.__screenStateMeta = null;
     globalThis.__screenStateMeasurements = null;
@@ -1043,6 +1208,46 @@ export async function getScreenState(options = {}) {
         delete allPressables[si].hasOwnLabel;
     }
 
+    // Build typed text/image lists (pair each measurement with its meta by index,
+    // viewport-filter) and assign each to a reachability group via the same overlay
+    // logic used for pressables (content containment vs blocking backdrop).
+    var rootTexts = [], rootImages = [];
+    for (var ov = 0; ov < overlays.length; ov++) { overlays[ov].texts = []; overlays[ov].images = []; }
+    // Group an item: by fiber ancestry (overlayIdx) first — a sheet's own text/image
+    // belongs to the sheet; else geometric containment in an overlay's content; else
+    // root, flagged blocked when it sits under a blocking overlay (the screen behind).
+    function pushClassified(entry, kind, ovIdx) {
+        for (var a = 0; a < overlays.length; a++) {
+            if (ovIdx != null && ovIdx === overlays[a].origIdx) { overlays[a][kind].push(entry); return; }
+        }
+        for (var c = 0; c < overlays.length; c++) {
+            if (overlays[c].hasContent && inside(entry.bounds, overlays[c].contentBounds)) { overlays[c][kind].push(entry); return; }
+        }
+        var blk = false;
+        for (var b = 0; b < overlays.length; b++) { if (inside(entry.bounds, overlays[b].blockBounds)) { blk = true; break; } }
+        if (blk) entry.blockedByOverlay = true;
+        (kind === 'texts' ? rootTexts : rootImages).push(entry);
+    }
+
+    for (var ti = 0; ti < textContents.length; ti++) {
+        var tm = textMeasurements[ti];
+        if (!tm || tm.width <= 0 || tm.height <= 0) continue;
+        if (tm.x + tm.width < 0 || tm.y + tm.height < 0) continue;
+        if (tm.x > viewportW || tm.y > viewportH) continue;
+        pushClassified({ text: textContents[ti],
+            center: { x: Math.round(tm.x + tm.width/2), y: Math.round(tm.y + tm.height/2) },
+            bounds: { x: Math.round(tm.x), y: Math.round(tm.y), width: Math.round(tm.width), height: Math.round(tm.height) } }, 'texts', textOverlayIdx[ti]);
+    }
+    for (var ii = 0; ii < imageMeta.length; ii++) {
+        var im = imageMeasurements[ii];
+        if (!im || im.width <= 0 || im.height <= 0) continue;
+        if (im.x + im.width < 0 || im.y + im.height < 0) continue;
+        if (im.x > viewportW || im.y > viewportH) continue;
+        pushClassified({ src: imageMeta[ii].src, alt: imageMeta[ii].alt,
+            center: { x: Math.round(im.x + im.width/2), y: Math.round(im.y + im.height/2) },
+            bounds: { x: Math.round(im.x), y: Math.round(im.y), width: Math.round(im.width), height: Math.round(im.height) } }, 'images', imageMeta[ii].overlayIdx);
+    }
+
     // Sort visually (top-to-bottom, left-to-right) — walk order is mount order,
     // which puts late-mounted overlays like floating headers at the end.
     function byPosition(a, b) {
@@ -1050,14 +1255,20 @@ export async function getScreenState(options = {}) {
         return a.center.x - b.center.x;
     }
     rootPressables.sort(byPosition);
-    for (var so = 0; so < overlays.length; so++) overlays[so].pressables.sort(byPosition);
+    rootTexts.sort(byPosition);
+    rootImages.sort(byPosition);
+    for (var so = 0; so < overlays.length; so++) {
+        overlays[so].pressables.sort(byPosition);
+        overlays[so].texts.sort(byPosition);
+        overlays[so].images.sort(byPosition);
+    }
 
     // Strip bounds from overlay objects (not in public interface)
     var cleanOverlays = overlays.map(function(o) {
-        return { type: o.type, title: o.title, pressables: o.pressables };
+        return { type: o.type, title: o.title, pressables: o.pressables, texts: o.texts, images: o.images };
     });
 
-    return { route: route, overlays: cleanOverlays, pressables: rootPressables };
+    return { route: route, overlays: cleanOverlays, pressables: rootPressables, texts: rootTexts, images: rootImages };
 })()
     `;
     const resolveResult = await executeInApp(resolveExpression, false, { timeoutMs: 15000, originatingToolName: "get_screen_state" }, device);
@@ -1090,6 +1301,26 @@ export async function getScreenState(options = {}) {
     for (const overlay of screenState.overlays) {
         overlay.pressables = dedupPressables(overlay.pressables);
     }
+    // Dedup texts/images: a single visual element often maps to nested host nodes
+    // (Image > ExpoImage) or repeated text spans that all measure to the same box.
+    const dedupBy = (list, keyExtra) => {
+        const seen = new Set();
+        return list.filter((item) => {
+            const key = `${item.center.x},${item.center.y}|${keyExtra(item)}`;
+            if (seen.has(key))
+                return false;
+            seen.add(key);
+            return true;
+        });
+    };
+    screenState.texts = dedupBy(screenState.texts, (t) => t.text);
+    screenState.images = dedupBy(screenState.images, (i) => i.src ?? "");
+    for (const overlay of screenState.overlays) {
+        if (overlay.texts)
+            overlay.texts = dedupBy(overlay.texts, (t) => t.text);
+        if (overlay.images)
+            overlay.images = dedupBy(overlay.images, (i) => i.src ?? "");
+    }
     // Semantic icon hints + onPress handler hints
     const decorate = (p) => {
         applyIconHintToLabel(p);