@weavetab/mcp 2.5.0 → 2.5.1

package/dist/cdp/walker.js

@@ -3,9 +3,9 @@ import { SessionSecretTracker } from "../security/secrets.js";
 import { getStoredRef, getStoredProps } from "../state/delta.js";
 import { getRawCachedActionMap } from "../state/cache.js";
 // ─── Public types ─────────────────────────────────────────────────────────────
-export const WT_REGISTRY_INIT_EXPR = `
-  window.__weavetab = window.__weavetab || {};
-  window.__weavetab.registry = window.__weavetab.registry || new WeakMap();
+export const WT_REGISTRY_INIT_EXPR = `
+  window.__weavetab = window.__weavetab || {};
+  window.__weavetab.registry = window.__weavetab.registry || new WeakMap();
 `;
 const viewportCache = new Map();
 export function clearViewportCache(targetId) {
@@ -101,7 +101,23 @@ export async function buildActionMap(session, options = {}, targetId = "default"
     // ── Begin a new walk pass — resets per-pass dedup registry ─────────────────
     const passCounterBase = beginWalkPass();
     const url = options.url ?? (await session.Page.getFrameTree()).frameTree.frame.url;
-    const title = options.title ?? "";
+    let title = options.title;
+    if (!title) {
+        try {
+            const evalRes = await session.Runtime.evaluate({
+                expression: "document.title",
+                returnByValue: true
+            });
+            if (evalRes?.result?.value) {
+                title = String(evalRes.result.value);
+            }
+        }
+        catch { /* ignore */ }
+    }
+    if (!title) {
+        const { sessionRegistry } = await import("../state/session.js");
+        title = sessionRegistry.getAll().find(c => c.targetId === targetId)?.title || "";
+    }
     // Inherit sticky pruning state from session if not explicitly set in options
     if (options.prune === undefined) {
         const { sessionRegistry } = await import("../state/session.js");
@@ -129,10 +145,10 @@ export async function buildActionMap(session, options = {}, targetId = "default"
         if (sampleIds.length > 0) {
             try {
                 const { result: domVerify } = await session.Runtime.evaluate({
-                    expression: `(function(ids) {
-            return ids.filter(function(id) {
-              return !document.querySelector('[data-wt-id="' + id + '"]');
-            }).length;
+                    expression: `(function(ids) {
+            return ids.filter(function(id) {
+              return !document.querySelector('[data-wt-id="' + id + '"]');
+            }).length;
           })(${JSON.stringify(sampleIds)})`,
                     returnByValue: true
                 });
@@ -149,14 +165,14 @@ export async function buildActionMap(session, options = {}, targetId = "default"
         // Architecture change: Try to read from extension's live index first
         // The extension now maintains window.__wt_liveIndex via continuous MutationObserver
         const { result: liveIndexResult } = await session.Runtime.evaluate({
-            expression: `(function() {
-        if (typeof window.__wt_liveIndex !== 'undefined' && Array.isArray(window.__wt_liveIndex)) {
-          return JSON.stringify({ 
-            elements: window.__wt_liveIndex,
-            source: 'live-index'
-          });
-        }
-        return JSON.stringify({ elements: null, source: 'unavailable' });
+            expression: `(function() {
+        if (typeof window.__wt_liveIndex !== 'undefined' && Array.isArray(window.__wt_liveIndex)) {
+          return JSON.stringify({ 
+            elements: window.__wt_liveIndex,
+            source: 'live-index'
+          });
+        }
+        return JSON.stringify({ elements: null, source: 'unavailable' });
       })()`,
             returnByValue: true
         });
@@ -178,256 +194,257 @@ export async function buildActionMap(session, options = {}, targetId = "default"
         // Hardened with per-element try-catch — one bad node no longer kills the entire map
         // Deep shadow DOM traversal — falls back to recursive shadow-penetrating query when flat query is sparse
         const { result } = await session.Runtime.evaluate({
-            expression: `(function() {
-        var INTERACTIVE_SEL = 'a, button, input, textarea, select, [role="button"], [role="link"], [role="textbox"], [role="checkbox"], [role="radio"], [role="combobox"], [role="searchbox"], [role="menuitem"], [role="tab"], [tabindex]:not([tabindex="-1"])';
-
-        // deepQuery has a hard depth limit and a visited-set guard so circular
-        // shadow root references can't cause a stack overflow.
-        function deepQuery(root, selector, visited, depth) {
-          if (!visited) visited = new Set();
-          if (depth === undefined) depth = 0;
-          if (depth > 10) return [];  // hard depth limit
-          if (visited.has(root)) return [];  // break cycles
-          visited.add(root);
-          var all = [];
-          try {
-            var direct = root.querySelectorAll(selector);
-            for (var i = 0; i < direct.length; i++) all.push(direct[i]);
-          } catch (e) {}
-          // TreeWalker — lazy DOM traversal, avoids building a static NodeList of every element
-          try {
-            var walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);
-            while (walker.nextNode()) {
-              try {
-                var el = walker.currentNode;
-                if (el.shadowRoot && !visited.has(el.shadowRoot)) {
-                  var inner = deepQuery(el.shadowRoot, selector, visited, depth + 1);
-                  for (var k = 0; k < inner.length; k++) all.push(inner[k]);
-                }
-              } catch (e) {}
-            }
-          } catch (e) {}
-          return all;
-        }
-
-        var hasShadowCache = ${JSON.stringify(!!shadowDomCache.get(targetId))};
-        var useDeep = ${JSON.stringify(!!options.deep)} || hasShadowCache;
-        var els = [];
-
-        // Phase 1: flat query (skip when cache confirms shadow DOM exists — deepQuery covers root too)
-        if (!hasShadowCache) {
-          try {
-            var flatEls = document.querySelectorAll(INTERACTIVE_SEL);
-            for (var fi = 0; fi < flatEls.length; fi++) els.push(flatEls[fi]);
-          } catch (e) {}
-        }
-
-        // Phase 2: deep query if cache hit OR flat results are sparse
-        if (useDeep || els.length < 3) {
-          try {
-            var deepEls = deepQuery(document, INTERACTIVE_SEL);
-            // Deduplicate by comparing tagName + label + position fingerprint
-            var seen = new Set();
-            for (var di = 0; di < els.length; di++) {
-              try {
-                var r = els[di].getBoundingClientRect();
-                seen.add(els[di].tagName + '|' + Math.round(r.left) + '|' + Math.round(r.top));
-              } catch (e) {}
-            }
-            for (var di2 = 0; di2 < deepEls.length; di2++) {
-              try {
-                var el2 = deepEls[di2];
-                var r2 = el2.getBoundingClientRect();
-                var key = el2.tagName + '|' + Math.round(r2.left) + '|' + Math.round(r2.top);
-                if (!seen.has(key)) {
-                  els.push(el2);
-                  seen.add(key);
-                }
-              } catch (e) {}
-            }
-          } catch (e) {}
-        }
-
-        // ── Content-addressable IDs — stable across re-renders ────────────────
-        // djb2 hash of (tagName + role + trimmed text/label + sibling-index + parent context).
-        // Same element always gets the same ID even if the walker runs multiple
-        // times. Sequential counter only used as collision fallback.
-        function wtHashId(el) {
-          var tag = el.tagName || '';
-          var role = el.getAttribute('role') || '';
-          var text = (el.getAttribute('aria-label') || el.textContent || el.value || el.placeholder || '').slice(0, 60).trim();
-          var rect = el.getBoundingClientRect();
-          var absX = Math.round(rect.left + (window.scrollX || 0));
-          var absY = Math.round(rect.top + (window.scrollY || 0));
-          var path = '';
-          try {
-            var curr = el;
-            for(var level = 0; level < 3 && curr; level++) {
-                var p = curr.parentElement;
-                if (!p) break;
-                var idx = 0;
-                var siblings = p.children;
-                for (var si = 0; si < siblings.length; si++) {
-                  if (siblings[si] === curr) { idx = si; break; }
-                }
-                path += '|' + (curr.tagName||'') + '[' + idx + ']';
-                curr = p;
-            }
-          } catch(e) {}
-          var raw = tag + '|' + role + '|' + text + '|' + absX + '|' + absY + path;
-          var h = 5381;
-          for (var ci = 0; ci < raw.length; ci++) {
-            h = ((h << 5) + h) ^ raw.charCodeAt(ci);
-            h = h >>> 0; // keep unsigned 32-bit
-          }
-          return 'wt' + h.toString(36);
-        }
-        var usedHashes = {};
-        // Bug #5 fix: seed collision counter from the global walk-pass base so that
-        // elements in different iframes processed in the same pass never share a
-        // numeric suffix.  passCounterBase is injected by the TypeScript host.
-        var collisionCounter = ${JSON.stringify(passCounterBase)};
-        var _coIdx = 0;
-        var results = [];
-        for (var i2 = 0; i2 < els.length; i2++) {
-          try {
-            var el = els[i2];
-            if (el.closest('[data-wt-ignore]') !== null) continue;
-            var rect = el.getBoundingClientRect();
-            if (rect.width === 0 || rect.height === 0 || rect.bottom < 0 || rect.top > window.innerHeight) continue;
-            var id = el.getAttribute('data-wt-id');
-            if (!id) {
-              var hid = wtHashId(el);
-              // Resolve collision: if same hash already used, append counter
-              if (usedHashes[hid]) {
-                hid = hid + '_' + (collisionCounter++);
-              }
-              usedHashes[hid] = true;
-              id = hid;
-              el.setAttribute('data-wt-id', id);
-            }
-            var role = el.tagName.toLowerCase();
-            if (role === 'a') role = 'link';
-            else if (role === 'input' && (el.type === 'text' || el.type === 'search')) role = 'textbox';
-            var frameUrl = '';
-            try { if (el.ownerDocument !== document) frameUrl = el.ownerDocument.defaultView.location.href; } catch(e) { frameUrl = 'cross-origin-' + (_coIdx++); }
-            var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
-            var isSecret = el.hasAttribute('data-wt-secret') ||
-              (el.tagName === 'INPUT' && (
-                el.type === 'password' ||
-                secretRegex.test(el.getAttribute('autocomplete') || '') ||
-                secretRegex.test(el.getAttribute('name') || '') ||
-                secretRegex.test(el.getAttribute('id') || '') ||
-                secretRegex.test(el.getAttribute('aria-label') || '')
-              ));
-            var labelStr = el.getAttribute('aria-label') || el.innerText || (isSecret ? '' : el.value) || el.placeholder || '';
-            // For radio/checkbox, serialize checked state as 'true'/'false' so the agent
-            // can see which option is selected without having to scrape the DOM separately.
-            var elType = (el.type || '').toLowerCase();
-            var elRole = (el.getAttribute('role') || el.tagName.toLowerCase());
-            var isCheckable = elType === 'radio' || elType === 'checkbox' ||
-                              elRole === 'radio' || elRole === 'checkbox';
-            var isOption   = el.tagName === 'OPTION';
-            var valStr;
-            if (isCheckable) {
-              valStr = el.checked ? 'true' : 'false';
-            } else if (isOption) {
-              valStr = el.selected ? 'true' : 'false';
-            } else {
-              valStr = el.value !== undefined ? String(el.value) : undefined;
-            }
-            var txtContent = (el.textContent || '').slice(0, 200);
-
-            if (isSecret) {
-              var rawAria = el.getAttribute('aria-label') || '';
-              var rawPlaceholder = el.placeholder || '';
-              labelStr = rawAria || rawPlaceholder || '[REDACTED SECRET FIELD]';
-              if (valStr !== undefined) valStr = '[REDACTED]';
-              txtContent = '[REDACTED]';
-            }
-
-            // Capture structural idiom (e.g. aria-controls, aria-owns, etc.)
-            var idiom = '';
-            var CONTROLS_ATTRS = ['aria-controls', 'aria-owns', 'data-target', 'data-bs-target'];
-            for (var ca = 0; ca < CONTROLS_ATTRS.length; ca++) {
-              if (el.hasAttribute(CONTROLS_ATTRS[ca])) {
-                idiom = CONTROLS_ATTRS[ca];
-                break;
-              }
-            }
-
-            // ── Container context binding ─────────────────────────────────────
-            // Walk up the DOM to find a meaningful card/row/list-item heading that
-            // describes this element's entity context, e.g. "Pro Plan ($29/mo)".
-            var containerCtx = '';
-            try {
-              var CARD_SEL = '[class*="card"],[class*="row"],[class*="item"],[class*="product"],[class*="plan"],[class*="entry"],[class*="result"],[class*="tile"],[class*="option"],[data-entity]';
-              var ancestor = el.parentElement;
-              var depth3 = 0;
-              while (ancestor && depth3 < 8) {
-                if (ancestor.matches && ancestor.matches(CARD_SEL)) {
-                  var heading = ancestor.querySelector('h1,h2,h3,h4,h5,h6,[class*="title"],[class*="name"],[class*="heading"],[class*="label"]');
-                  if (heading) {
-                    var hText = (heading.innerText || heading.textContent || '').trim().slice(0, 60);
-                    if (hText && hText !== labelStr) { containerCtx = hText; break; }
-                  }
-                  var allText = (ancestor.innerText || ancestor.textContent || '').replace(/\s+/g, ' ').trim().slice(0, 60);
-                  if (allText && allText !== labelStr) { containerCtx = allText; break; }
-                }
-                ancestor = ancestor.parentElement;
-                depth3++;
-              }
-            } catch(e) {}
-
-            // ── Modal detection ───────────────────────────────────────────────
-            var inModal = false;
-            var modalTitleStr = '';
-            try {
-              var MODAL_SEL = 'dialog[open],[role="dialog"],[aria-modal="true"],[class*="modal"],[class*="overlay"],[class*="drawer"]';
-              var modalAnc = el.parentElement;
-              var md = 0;
-              while (modalAnc && md < 15) {
-                if (modalAnc.matches && modalAnc.matches(MODAL_SEL)) {
-                  inModal = true;
-                  var mh = modalAnc.querySelector('h1,h2,h3,h4,[class*="title"]');
-                  if (mh) {
-                    var lbId = modalAnc.getAttribute('aria-labelledby');
-                    var lbEl = lbId ? document.getElementById(lbId) : null;
-                    modalTitleStr = ((lbEl || mh).innerText || (lbEl || mh).textContent || '').trim().slice(0, 60);
-                  }
-                  break;
-                }
-                modalAnc = modalAnc.parentElement;
-                md++;
-              }
-            } catch(e) {}
-
-            results.push({
-              id: String(id),
-              role: el.getAttribute('role') || role,
-              type: elType || undefined,
-              label: labelStr,
-              placeholder: el.placeholder || undefined,
-              value: valStr,
-              x: Math.round(rect.left + rect.width / 2),
-              y: Math.round(rect.top + rect.height / 2),
-              selector: '[data-wt-id="' + id + '"]',
-              href: el.href,
-              textContent: txtContent,
-              className: el.className || '',
-              frameUrl: frameUrl,
-              structuralIdiom: idiom || undefined,
-              containerContext: containerCtx || undefined,
-              isModal: inModal || undefined,
-              modalTitle: modalTitleStr || undefined,
-              disabled: (el.disabled || el.getAttribute('aria-disabled') === 'true') || undefined,
-              checked: isCheckable ? el.checked : undefined,
-            });
-          } catch (e) {
-            // Silently skip elements that cause errors (cross-origin SVG, detached nodes, etc.)
-          }
-        }
-        return JSON.stringify({ elements: results, shadowFound: results.length > 0 && typeof flatEls !== 'undefined' && els.length > flatEls.length });
+            expression: `(function() {
+        var INTERACTIVE_SEL = 'a, button, input, textarea, select, [role="button"], [role="link"], [role="textbox"], [role="checkbox"], [role="radio"], [role="combobox"], [role="searchbox"], [role="menuitem"], [role="tab"], [tabindex]:not([tabindex="-1"])';
+
+        // deepQuery has a hard depth limit and a visited-set guard so circular
+        // shadow root references can't cause a stack overflow.
+        function deepQuery(root, selector, visited, depth) {
+          if (!visited) visited = new Set();
+          if (depth === undefined) depth = 0;
+          if (depth > 10) return [];  // hard depth limit
+          if (visited.has(root)) return [];  // break cycles
+          visited.add(root);
+          var all = [];
+          try {
+            var direct = root.querySelectorAll(selector);
+            for (var i = 0; i < direct.length; i++) all.push(direct[i]);
+          } catch (e) {}
+          // TreeWalker — lazy DOM traversal, avoids building a static NodeList of every element
+          try {
+            var walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);
+            while (walker.nextNode()) {
+              try {
+                var el = walker.currentNode;
+                if (el.shadowRoot && !visited.has(el.shadowRoot)) {
+                  var inner = deepQuery(el.shadowRoot, selector, visited, depth + 1);
+                  for (var k = 0; k < inner.length; k++) all.push(inner[k]);
+                }
+              } catch (e) {}
+            }
+          } catch (e) {}
+          return all;
+        }
+
+        var hasShadowCache = ${JSON.stringify(!!shadowDomCache.get(targetId))};
+        var useDeep = ${JSON.stringify(!!options.deep)} || hasShadowCache;
+        var els = [];
+
+        // Phase 1: flat query (skip when cache confirms shadow DOM exists — deepQuery covers root too)
+        if (!hasShadowCache) {
+          try {
+            var flatEls = document.querySelectorAll(INTERACTIVE_SEL);
+            for (var fi = 0; fi < flatEls.length; fi++) els.push(flatEls[fi]);
+          } catch (e) {}
+        }
+
+        // Phase 2: deep query if cache hit OR flat results are sparse
+        if (useDeep || els.length < 3) {
+          try {
+            var deepEls = deepQuery(document, INTERACTIVE_SEL);
+            // Deduplicate by comparing tagName + label + position fingerprint
+            var seen = new Set();
+            for (var di = 0; di < els.length; di++) {
+              try {
+                var r = els[di].getBoundingClientRect();
+                seen.add(els[di].tagName + '|' + Math.round(r.left) + '|' + Math.round(r.top));
+              } catch (e) {}
+            }
+            for (var di2 = 0; di2 < deepEls.length; di2++) {
+              try {
+                var el2 = deepEls[di2];
+                var r2 = el2.getBoundingClientRect();
+                var key = el2.tagName + '|' + Math.round(r2.left) + '|' + Math.round(r2.top);
+                if (!seen.has(key)) {
+                  els.push(el2);
+                  seen.add(key);
+                }
+              } catch (e) {}
+            }
+          } catch (e) {}
+        }
+
+        // ── Content-addressable IDs — stable across re-renders ────────────────
+        // djb2 hash of (tagName + role + trimmed text/label + sibling-index + parent context).
+        // Same element always gets the same ID even if the walker runs multiple
+        // times. Sequential counter only used as collision fallback.
+        function wtHashId(el) {
+          var tag = el.tagName || '';
+          var role = el.getAttribute('role') || '';
+          var text = (el.getAttribute('aria-label') || el.textContent || el.value || el.placeholder || '').slice(0, 60).trim();
+          var rect = el.getBoundingClientRect();
+          var absX = Math.round(rect.left + (window.scrollX || 0));
+          var absY = Math.round(rect.top + (window.scrollY || 0));
+          var path = '';
+          try {
+            var curr = el;
+            for(var level = 0; level < 3 && curr; level++) {
+                var p = curr.parentElement;
+                if (!p) break;
+                var idx = 0;
+                var siblings = p.children;
+                for (var si = 0; si < siblings.length; si++) {
+                  if (siblings[si] === curr) { idx = si; break; }
+                }
+                path += '|' + (curr.tagName||'') + '[' + idx + ']';
+                curr = p;
+            }
+          } catch(e) {}
+          var raw = tag + '|' + role + '|' + text + '|' + absX + '|' + absY + path;
+          var h = 5381;
+          for (var ci = 0; ci < raw.length; ci++) {
+            h = ((h << 5) + h) ^ raw.charCodeAt(ci);
+            h = h >>> 0; // keep unsigned 32-bit
+          }
+          return 'wt' + h.toString(36);
+        }
+        var usedHashes = {};
+        // Bug #5 fix: seed collision counter from the global walk-pass base so that
+        // elements in different iframes processed in the same pass never share a
+        // numeric suffix.  passCounterBase is injected by the TypeScript host.
+        var collisionCounter = ${JSON.stringify(passCounterBase)};
+        var _coIdx = 0;
+        var results = [];
+        for (var i2 = 0; i2 < els.length; i2++) {
+          try {
+            var el = els[i2];
+            if (el.closest('[data-wt-ignore]') !== null) continue;
+            var rect = el.getBoundingClientRect();
+            if (rect.width === 0 || rect.height === 0 || rect.bottom < 0 || rect.top > window.innerHeight) continue;
+            var id = el.getAttribute('data-wt-id');
+            if (!id) {
+              var hid = wtHashId(el);
+              // Resolve collision: if same hash already used, append counter
+              if (usedHashes[hid]) {
+                hid = hid + '_' + (collisionCounter++);
+              }
+              usedHashes[hid] = true;
+              id = hid;
+              el.setAttribute('data-wt-id', id);
+            }
+            var role = el.tagName.toLowerCase();
+            if (role === 'a') role = 'link';
+            else if (role === 'input' && (el.type === 'text' || el.type === 'search')) role = 'textbox';
+            var frameUrl = '';
+            try { if (el.ownerDocument !== document) frameUrl = el.ownerDocument.defaultView.location.href; } catch(e) { frameUrl = 'cross-origin-' + (_coIdx++); }
+            var secretRegex = /password|passcode|pin|passphrase|secret|token|auth.?key|access.?code|mot.?de.?passe|contrase[nñ]a|kennwort|senha/i;
+            var isSecret = el.hasAttribute('data-wt-secret') ||
+              (el.tagName === 'INPUT' && (
+                el.type === 'password' ||
+                secretRegex.test(el.getAttribute('autocomplete') || '') ||
+                secretRegex.test(el.getAttribute('name') || '') ||
+                secretRegex.test(el.getAttribute('id') || '') ||
+                secretRegex.test(el.getAttribute('aria-label') || '')
+              ));
+            var richPh = el.getAttribute('placeholder') || el.getAttribute('data-placeholder') || el.getAttribute('aria-placeholder') || (el.querySelector ? (el.querySelector('[data-slate-placeholder]')?.textContent || '') : '') || '';
+            var labelStr = el.getAttribute('aria-label') || el.innerText || (isSecret ? '' : el.value) || richPh || '';
+            // For radio/checkbox, serialize checked state as 'true'/'false' so the agent
+            // can see which option is selected without having to scrape the DOM separately.
+            var elType = (el.type || '').toLowerCase();
+            var elRole = (el.getAttribute('role') || el.tagName.toLowerCase());
+            var isCheckable = elType === 'radio' || elType === 'checkbox' ||
+                              elRole === 'radio' || elRole === 'checkbox';
+            var isOption   = el.tagName === 'OPTION';
+            var valStr;
+            if (isCheckable) {
+              valStr = el.checked ? 'true' : 'false';
+            } else if (isOption) {
+              valStr = el.selected ? 'true' : 'false';
+            } else {
+              valStr = el.value !== undefined ? String(el.value) : undefined;
+            }
+            var txtContent = (el.textContent || '').slice(0, 200);
+
+            if (isSecret) {
+              var rawAria = el.getAttribute('aria-label') || '';
+              var rawPlaceholder = el.placeholder || '';
+              labelStr = rawAria || rawPlaceholder || '[REDACTED SECRET FIELD]';
+              if (valStr !== undefined) valStr = '[REDACTED]';
+              txtContent = '[REDACTED]';
+            }
+
+            // Capture structural idiom (e.g. aria-controls, aria-owns, etc.)
+            var idiom = '';
+            var CONTROLS_ATTRS = ['aria-controls', 'aria-owns', 'data-target', 'data-bs-target'];
+            for (var ca = 0; ca < CONTROLS_ATTRS.length; ca++) {
+              if (el.hasAttribute(CONTROLS_ATTRS[ca])) {
+                idiom = CONTROLS_ATTRS[ca];
+                break;
+              }
+            }
+
+            // ── Container context binding ─────────────────────────────────────
+            // Walk up the DOM to find a meaningful card/row/list-item heading that
+            // describes this element's entity context, e.g. "Pro Plan ($29/mo)".
+            var containerCtx = '';
+            try {
+              var CARD_SEL = '[class*="card"],[class*="row"],[class*="item"],[class*="product"],[class*="plan"],[class*="entry"],[class*="result"],[class*="tile"],[class*="option"],[data-entity]';
+              var ancestor = el.parentElement;
+              var depth3 = 0;
+              while (ancestor && depth3 < 8) {
+                if (ancestor.matches && ancestor.matches(CARD_SEL)) {
+                  var heading = ancestor.querySelector('h1,h2,h3,h4,h5,h6,[class*="title"],[class*="name"],[class*="heading"],[class*="label"]');
+                  if (heading) {
+                    var hText = (heading.innerText || heading.textContent || '').trim().slice(0, 60);
+                    if (hText && hText !== labelStr) { containerCtx = hText; break; }
+                  }
+                  var allText = (ancestor.innerText || ancestor.textContent || '').replace(/\s+/g, ' ').trim().slice(0, 60);
+                  if (allText && allText !== labelStr) { containerCtx = allText; break; }
+                }
+                ancestor = ancestor.parentElement;
+                depth3++;
+              }
+            } catch(e) {}
+
+            // ── Modal detection ───────────────────────────────────────────────
+            var inModal = false;
+            var modalTitleStr = '';
+            try {
+              var MODAL_SEL = 'dialog[open],[role="dialog"],[aria-modal="true"],[class*="modal"],[class*="overlay"],[class*="drawer"]';
+              var modalAnc = el.parentElement;
+              var md = 0;
+              while (modalAnc && md < 15) {
+                if (modalAnc.matches && modalAnc.matches(MODAL_SEL)) {
+                  inModal = true;
+                  var mh = modalAnc.querySelector('h1,h2,h3,h4,[class*="title"]');
+                  if (mh) {
+                    var lbId = modalAnc.getAttribute('aria-labelledby');
+                    var lbEl = lbId ? document.getElementById(lbId) : null;
+                    modalTitleStr = ((lbEl || mh).innerText || (lbEl || mh).textContent || '').trim().slice(0, 60);
+                  }
+                  break;
+                }
+                modalAnc = modalAnc.parentElement;
+                md++;
+              }
+            } catch(e) {}
+
+            results.push({
+              id: String(id),
+              role: el.getAttribute('role') || role,
+              type: elType || undefined,
+              label: labelStr,
+              placeholder: el.placeholder || richPh || undefined,
+              value: valStr,
+              x: Math.round(rect.left + rect.width / 2),
+              y: Math.round(rect.top + rect.height / 2),
+              selector: '[data-wt-id="' + id + '"]',
+              href: el.href,
+              textContent: txtContent,
+              className: el.className || '',
+              frameUrl: frameUrl,
+              structuralIdiom: idiom || undefined,
+              containerContext: containerCtx || undefined,
+              isModal: inModal || undefined,
+              modalTitle: modalTitleStr || undefined,
+              disabled: (el.disabled || el.getAttribute('aria-disabled') === 'true') || undefined,
+              checked: isCheckable ? el.checked : undefined,
+            });
+          } catch (e) {
+            // Silently skip elements that cause errors (cross-origin SVG, detached nodes, etc.)
+          }
+        }
+        return JSON.stringify({ elements: results, shadowFound: results.length > 0 && typeof flatEls !== 'undefined' && els.length > flatEls.length });
       })()`,
             returnByValue: true
         });
@@ -459,31 +476,31 @@ export async function buildActionMap(session, options = {}, targetId = "default"
             for (const [, childSession] of childSessions.entries()) {
                 try {
                     const { result: childResult } = await childSession.Runtime.evaluate({
-                        expression: `(function() {
-              var INTERACTIVE_SEL = 'a, button, input, textarea, select, [role="button"], [role="link"], [role="textbox"], [role="checkbox"], [role="radio"], [role="combobox"], [role="searchbox"], [role="menuitem"], [role="tab"], [contenteditable="true"], [tabindex]:not([tabindex="-1"])';
-              var els = document.querySelectorAll(INTERACTIVE_SEL);
-              var results = [];
-              for (var i = 0; i < els.length; i++) {
-                var el = els[i];
-                var rect = el.getBoundingClientRect();
-                if (rect.width === 0 || rect.height === 0 || rect.bottom < 0 || rect.top > window.innerHeight) continue;
-                var id = el.getAttribute('data-wt-id');
-                if (!id) {
-                  id = 'wv_' + Math.random().toString(36).slice(2, 9);
-                  el.setAttribute('data-wt-id', id);
-                }
-                results.push({
-                  id: id,
-                  role: el.getAttribute('role') || el.tagName.toLowerCase(),
-                  label: el.getAttribute('aria-label') || el.innerText || el.value || el.placeholder || '',
-                  value: el.value,
-                  x: Math.round(rect.left + rect.width / 2),
-                  y: Math.round(rect.top + rect.height / 2),
-                  selector: '[data-wt-id="' + id + '"]',
-                  frameUrl: window.location.href,
-                });
-              }
-              return JSON.stringify(results);
+                        expression: `(function() {
+              var INTERACTIVE_SEL = 'a, button, input, textarea, select, [role="button"], [role="link"], [role="textbox"], [role="checkbox"], [role="radio"], [role="combobox"], [role="searchbox"], [role="menuitem"], [role="tab"], [contenteditable="true"], [tabindex]:not([tabindex="-1"])';
+              var els = document.querySelectorAll(INTERACTIVE_SEL);
+              var results = [];
+              for (var i = 0; i < els.length; i++) {
+                var el = els[i];
+                var rect = el.getBoundingClientRect();
+                if (rect.width === 0 || rect.height === 0 || rect.bottom < 0 || rect.top > window.innerHeight) continue;
+                var id = el.getAttribute('data-wt-id');
+                if (!id) {
+                  id = 'wv_' + Math.random().toString(36).slice(2, 9);
+                  el.setAttribute('data-wt-id', id);
+                }
+                results.push({
+                  id: id,
+                  role: el.getAttribute('role') || el.tagName.toLowerCase(),
+                  label: el.getAttribute('aria-label') || el.innerText || el.value || el.placeholder || '',
+                  value: el.value,
+                  x: Math.round(rect.left + rect.width / 2),
+                  y: Math.round(rect.top + rect.height / 2),
+                  selector: '[data-wt-id="' + id + '"]',
+                  frameUrl: window.location.href,
+                });
+              }
+              return JSON.stringify(results);
             })()`,
                         returnByValue: true,
                     });
@@ -624,12 +641,12 @@ export async function buildActionMap(session, options = {}, targetId = "default"
     let scopedElements = prunedElements;
     if (options.scope) {
         const { result: scopeResult } = await session.Runtime.evaluate({
-            expression: `(function(sel) {
-        const el = document.querySelector(sel);
-        if (!el) return null;
-        const r = el.getBoundingClientRect();
-        const ids = [...el.querySelectorAll('[data-wt-id]')].map(e => e.getAttribute('data-wt-id')).filter(Boolean);
-        return { left: r.left, top: r.top, right: r.right, bottom: r.bottom, ids: ids };
+            expression: `(function(sel) {
+        const el = document.querySelector(sel);
+        if (!el) return null;
+        const r = el.getBoundingClientRect();
+        const ids = [...el.querySelectorAll('[data-wt-id]')].map(e => e.getAttribute('data-wt-id')).filter(Boolean);
+        return { left: r.left, top: r.top, right: r.right, bottom: r.bottom, ids: ids };
       })(${JSON.stringify(options.scope)})`,
             returnByValue: true,
         }).catch(() => ({ result: { value: null } }));
@@ -697,15 +714,27 @@ export function findAllMatches(elements, query) {
     // 1. Exact match (highest priority)
     elements.forEach(el => { if (n(el.label) === q)
         addMatch(el); });
+    // 1.5 Prefix stripped exact match (e.g. searching "general" for "#general" or vice versa)
+    const qStripped = q.replace(/^[#@]/, '');
+    if (qStripped !== q) {
+        elements.forEach(el => {
+            const elLabelClean = n(el.label).replace(/^[#@]/, '');
+            if (elLabelClean === qStripped)
+                addMatch(el);
+        });
+    }
     // 2. placeholder text
-    elements.forEach(el => { if (n(el.placeholder) === q)
+    elements.forEach(el => { if (n(el.placeholder) === q || n(el.placeholder) === qStripped)
         addMatch(el); });
     // 3. data-testid
     elements.forEach(el => { if (n(el.testId) === q)
         addMatch(el); });
     // 4. visible text content / partial label match
-    elements.forEach(el => { if (n(el.label).includes(q))
-        addMatch(el); });
+    elements.forEach(el => {
+        const lbl = n(el.label);
+        if (lbl.includes(q) || (qStripped.length >= 3 && lbl.includes(qStripped)))
+            addMatch(el);
+    });
     // 4.5 fuzzy partial match (split words)
     const words = q.split(/\s+/);
     if (words.length > 1) {
@@ -766,99 +795,108 @@ export async function resolveByAria(session, query) {
     if (!query || !query.trim())
         return null;
     const resp = await session.Runtime.evaluate({
-        expression: `(function(q) {
-      var INTERACTIVE = 'a[href], button, input:not([type="hidden"]), textarea, select,' +
-        '[role="button"],[role="link"],[role="textbox"],[role="checkbox"],' +
-        '[role="radio"],[role="combobox"],[role="searchbox"],[role="menuitem"],' +
-        '[role="tab"],[role="option"],[tabindex]:not([tabindex="-1"])';
-      
-      function norm(s) { return (s || '').toLowerCase().replace(/[.\\u2026\\s]+/g, ' ').trim(); }
-      var qLow = norm(q);
-
-      // Score: prefer leaf elements (no interactive child = score 0, has child = score 10)
-      function score(el) {
-        try { return el.querySelector(INTERACTIVE) !== null ? 10 : 0; } catch(e) { return 0; }
-      }
-      function best(list) {
-        if (!list || !list.length) return null;
-        var arr = Array.prototype.slice.call(list);
-        arr.sort(function(a,b){ return score(a)-score(b); });
-        return arr[0];
-      }
-      function makeResult(el) {
-        if (!el) return null;
-        var r = el.getBoundingClientRect();
-        if (!r || r.width === 0 || r.height === 0) return null;
-        if (r.bottom < 0 || r.top > window.innerHeight) return null;
-        var sel = '';
-        var wtId = el.getAttribute('data-wt-id');
-        if (wtId) {
-          sel = '[data-wt-id="' + wtId.replace(/"/g, '\\\\"') + '"]';
-        } else if (el.id) {
-          try { sel = '#' + CSS.escape(el.id); } catch(e) { sel = '#' + el.id; }
-        } else {
-          var aria = el.getAttribute('aria-label');
-          if (aria) sel = el.tagName.toLowerCase() + '[aria-label="' + aria.replace(/"/g, '\\\\"') + '"]';
-        }
-        if (!sel) {
-          var tmp = 'wt-tmp-' + Math.random().toString(36).slice(2,8);
-          el.setAttribute('data-wt-id', tmp);
-          sel = '[data-wt-id="' + tmp + '"]';
-        }
-        return {
-          label: el.getAttribute('aria-label') || (el.textContent||'').trim().slice(0,80) || q,
-          x: Math.round(r.left + r.width/2),
-          y: Math.round(r.top + r.height/2),
-          selector: sel
-        };
-      }
-
-      var all, found, i, hit;
-
-      // 1. Exact aria-label
-      all = document.querySelectorAll('[aria-label]');
-      found = [];
-      for (i=0;i<all.length;i++) {
-        if (norm(all[i].getAttribute('aria-label'))===qLow) found.push(all[i]);
-      }
-      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
-
-      // 2. Exact innerText on interactive elements
-      all = document.querySelectorAll(INTERACTIVE);
-      found = [];
-      for (i=0;i<all.length;i++) {
-        var t = norm(all[i].innerText||all[i].textContent);
-        if (t===qLow) found.push(all[i]);
-      }
-      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
-
-      // 3. Placeholder
-      all = document.querySelectorAll('[placeholder]');
-      found = [];
-      for (i=0;i<all.length;i++) {
-        if (norm(all[i].getAttribute('placeholder'))===qLow) found.push(all[i]);
-      }
-      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
-
-      // 4. title / alt
-      all = document.querySelectorAll('[title],[alt]');
-      found = [];
-      for (i=0;i<all.length;i++) {
-        var v = norm(all[i].getAttribute('title')||all[i].getAttribute('alt'));
-        if (v===qLow) found.push(all[i]);
-      }
-      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
-
-      // 5. Fuzzy partial innerText
-      all = document.querySelectorAll(INTERACTIVE);
-      found = [];
-      for (i=0;i<all.length;i++) {
-        var t5 = norm(all[i].innerText||all[i].textContent);
-        if (t5.indexOf(qLow)>=0 && t5.length < qLow.length*4) found.push(all[i]);
-      }
-      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
-
-      return null;
+        expression: `(function(q) {
+      var INTERACTIVE = 'a[href], button, input:not([type="hidden"]), textarea, select,' +
+        '[role="button"],[role="link"],[role="textbox"],[role="checkbox"],' +
+        '[role="radio"],[role="combobox"],[role="searchbox"],[role="menuitem"],' +
+        '[role="tab"],[role="option"],[tabindex]:not([tabindex="-1"])';
+      
+      function norm(s) { return (s || '').toLowerCase().replace(/[.\\u2026\\s]+/g, ' ').trim(); }
+      var qLow = norm(q);
+
+      // Score: prefer leaf elements (no interactive child = score 0, has child = score 10)
+      function score(el) {
+        try { return el.querySelector(INTERACTIVE) !== null ? 10 : 0; } catch(e) { return 0; }
+      }
+      function best(list) {
+        if (!list || !list.length) return null;
+        var arr = Array.prototype.slice.call(list);
+        arr.sort(function(a,b){ return score(a)-score(b); });
+        return arr[0];
+      }
+      function makeResult(el) {
+        if (!el) return null;
+        var r = el.getBoundingClientRect();
+        if (!r || r.width === 0 || r.height === 0) return null;
+        if (r.bottom < 0 || r.top > window.innerHeight) return null;
+        var sel = '';
+        var wtId = el.getAttribute('data-wt-id');
+        if (wtId) {
+          sel = '[data-wt-id="' + wtId.replace(/"/g, '\\\\"') + '"]';
+        } else if (el.id) {
+          try { sel = '#' + CSS.escape(el.id); } catch(e) { sel = '#' + el.id; }
+        } else {
+          var aria = el.getAttribute('aria-label');
+          if (aria) sel = el.tagName.toLowerCase() + '[aria-label="' + aria.replace(/"/g, '\\\\"') + '"]';
+        }
+        if (!sel) {
+          var tmp = 'wt-tmp-' + Math.random().toString(36).slice(2,8);
+          el.setAttribute('data-wt-id', tmp);
+          sel = '[data-wt-id="' + tmp + '"]';
+        }
+        return {
+          label: el.getAttribute('aria-label') || (el.textContent||'').trim().slice(0,80) || q,
+          x: Math.round(r.left + r.width/2),
+          y: Math.round(r.top + r.height/2),
+          selector: sel
+        };
+      }
+
+      var all, found, i, hit;
+
+      // 1. Exact aria-label
+      all = document.querySelectorAll('[aria-label]');
+      found = [];
+      for (i=0;i<all.length;i++) {
+        if (norm(all[i].getAttribute('aria-label'))===qLow) found.push(all[i]);
+      }
+      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
+
+      // 1.5 Partial aria-label match (e.g. "general" in "general (text channel)")
+      found = [];
+      for (i=0;i<all.length;i++) {
+        var aVal = norm(all[i].getAttribute('aria-label'));
+        if (aVal.indexOf(qLow)>=0 && aVal.length < qLow.length*4) found.push(all[i]);
+      }
+      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
+
+      // 2. Exact innerText on interactive elements
+      all = document.querySelectorAll(INTERACTIVE);
+      found = [];
+      for (i=0;i<all.length;i++) {
+        var t = norm(all[i].innerText||all[i].textContent);
+        if (t===qLow) found.push(all[i]);
+      }
+      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
+
+      // 3. Placeholder and rich placeholders (data-placeholder, aria-placeholder, data-slate-placeholder)
+      all = document.querySelectorAll('[placeholder],[data-placeholder],[aria-placeholder],[data-slate-placeholder]');
+      found = [];
+      for (i=0;i<all.length;i++) {
+        var phVal = norm(all[i].getAttribute('placeholder') || all[i].getAttribute('data-placeholder') || all[i].getAttribute('aria-placeholder') || all[i].textContent);
+        if (phVal===qLow || phVal.indexOf(qLow)>=0) found.push(all[i]);
+      }
+      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
+
+      // 4. title / alt
+      all = document.querySelectorAll('[title],[alt]');
+      found = [];
+      for (i=0;i<all.length;i++) {
+        var v = norm(all[i].getAttribute('title')||all[i].getAttribute('alt'));
+        if (v===qLow) found.push(all[i]);
+      }
+      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
+
+      // 5. Fuzzy partial innerText
+      all = document.querySelectorAll(INTERACTIVE);
+      found = [];
+      for (i=0;i<all.length;i++) {
+        var t5 = norm(all[i].innerText||all[i].textContent);
+        if (t5.indexOf(qLow)>=0 && t5.length < qLow.length*4) found.push(all[i]);
+      }
+      if (found.length) { hit=makeResult(best(found)); if(hit) return hit; }
+
+      return null;
     })(${JSON.stringify(query)})`,
         returnByValue: true,
     }).catch(() => null);
@@ -1070,138 +1108,138 @@ export async function recoverDetachedRef(session, targetId, ref, preferredCandid
     };
     try {
         const { result } = await session.Runtime.evaluate({
-            expression: `(function(refId, meta) {
-        // 1. Check if node with data-wt-id=refId is already in DOM, connected, and visible
-        const existing = document.querySelector('[data-wt-id="' + refId + '"]');
-        if (existing && existing.isConnected) {
-          const r = existing.getBoundingClientRect();
-          if (r.width > 0 && r.height > 0) {
-            return {
-              success: true,
-              strategy: 'connected_existing',
-              x: Math.round(r.left + r.width / 2),
-              y: Math.round(r.top + r.height / 2),
-              label: existing.getAttribute('aria-label') || (existing.innerText || existing.textContent || '').trim() || existing.placeholder || '',
-              role: existing.getAttribute('role') || existing.tagName.toLowerCase()
-            };
-          }
-        }
-
-        function isValidCandidate(el) {
-          if (!el || !el.isConnected) return false;
-          const r = el.getBoundingClientRect();
-          if (r.width <= 0 || r.height <= 0) return false;
-          try {
-            const style = window.getComputedStyle(el);
-            if (style.visibility === 'hidden' || style.display === 'none') return false;
-          } catch(e) {}
-          return true;
-        }
-
-        // 2. Strategy: Stored Selector (if stable CSS selector recorded)
-        if (meta.selector && !meta.selector.startsWith('[data-wt-id')) {
-          try {
-            const el = document.querySelector(meta.selector);
-            if (isValidCandidate(el)) {
-              el.setAttribute('data-wt-id', refId);
-              const r = el.getBoundingClientRect();
-              return {
-                success: true,
-                strategy: 'stored_selector',
-                x: Math.round(r.left + r.width / 2),
-                y: Math.round(r.top + r.height / 2),
-                label: el.getAttribute('aria-label') || (el.innerText || el.textContent || '').trim() || el.placeholder || '',
-                role: el.getAttribute('role') || el.tagName.toLowerCase()
-              };
-            }
-          } catch(e) {}
-        }
-
-        const normLabel = (meta.label || '').toLowerCase().trim();
-        const normPlaceholder = (meta.placeholder || '').toLowerCase().trim();
-
-        const candidates = Array.from(document.querySelectorAll(
-          'button, a, input, select, textarea, [role="button"], [role="link"], [role="textbox"], [role="checkbox"], [role="tab"], [tabindex="0"]'
-        ));
-
-        // 3. Strategy: Exact Label / Text / Aria match
-        if (normLabel) {
-          for (const c of candidates) {
-            if (!isValidCandidate(c)) continue;
-            const aria = (c.getAttribute('aria-label') || '').toLowerCase().trim();
-            const text = ((c.innerText || c.textContent || '')).toLowerCase().trim();
-            const val = (c.value || '').toLowerCase().trim();
-            const placeholder = (c.placeholder || '').toLowerCase().trim();
-            const name = (c.getAttribute('name') || '').toLowerCase().trim();
-
-            if (aria === normLabel || text === normLabel || placeholder === normLabel || name === normLabel || (val && val === normLabel)) {
-              c.setAttribute('data-wt-id', refId);
-              const r = c.getBoundingClientRect();
-              return {
-                success: true,
-                strategy: 'exact_label',
-                x: Math.round(r.left + r.width / 2),
-                y: Math.round(r.top + r.height / 2),
-                label: c.getAttribute('aria-label') || (c.innerText || c.textContent || '').trim() || c.placeholder || '',
-                role: c.getAttribute('role') || c.tagName.toLowerCase()
-              };
-            }
-          }
-        }
-
-        // 4. Strategy: Placeholder or Name match
-        if (normPlaceholder) {
-          for (const c of candidates) {
-            if (!isValidCandidate(c)) continue;
-            const placeholder = (c.placeholder || '').toLowerCase().trim();
-            const name = (c.getAttribute('name') || '').toLowerCase().trim();
-            if (placeholder === normPlaceholder || name === normPlaceholder) {
-              c.setAttribute('data-wt-id', refId);
-              const r = c.getBoundingClientRect();
-              return {
-                success: true,
-                strategy: 'placeholder_or_name',
-                x: Math.round(r.left + r.width / 2),
-                y: Math.round(r.top + r.height / 2),
-                label: c.placeholder || c.getAttribute('name') || '',
-                role: c.getAttribute('role') || c.tagName.toLowerCase()
-              };
-            }
-          }
-        }
-
-        // 5. Strategy: Fuzzy Substring Match (if label length >= 3)
-        if (normLabel && normLabel.length >= 3) {
-          let bestMatch = null;
-          let minDiff = Infinity;
-          for (const c of candidates) {
-            if (!isValidCandidate(c)) continue;
-            const text = ((c.innerText || c.textContent || '')).toLowerCase().trim();
-            const aria = (c.getAttribute('aria-label') || '').toLowerCase().trim();
-            const candStr = aria || text;
-            if (candStr && candStr.includes(normLabel)) {
-              const diff = candStr.length - normLabel.length;
-              if (diff >= 0 && diff < minDiff) {
-                minDiff = diff;
-                bestMatch = c;
-              }
-            }
-          }
-          if (bestMatch) {
-            bestMatch.setAttribute('data-wt-id', refId);
-            const r = bestMatch.getBoundingClientRect();
-            return {
-              success: true,
-              strategy: 'fuzzy_label',
-              x: Math.round(r.left + r.width / 2),
-              y: Math.round(r.top + r.height / 2),
-              label: bestMatch.getAttribute('aria-label') || (bestMatch.innerText || bestMatch.textContent || '').trim() || bestMatch.placeholder || '',
-              role: bestMatch.getAttribute('role') || bestMatch.tagName.toLowerCase()
-            };
-          }
-        }
-
-        return { success: false };
+            expression: `(function(refId, meta) {
+        // 1. Check if node with data-wt-id=refId is already in DOM, connected, and visible
+        const existing = document.querySelector('[data-wt-id="' + refId + '"]');
+        if (existing && existing.isConnected) {
+          const r = existing.getBoundingClientRect();
+          if (r.width > 0 && r.height > 0) {
+            return {
+              success: true,
+              strategy: 'connected_existing',
+              x: Math.round(r.left + r.width / 2),
+              y: Math.round(r.top + r.height / 2),
+              label: existing.getAttribute('aria-label') || (existing.innerText || existing.textContent || '').trim() || existing.placeholder || '',
+              role: existing.getAttribute('role') || existing.tagName.toLowerCase()
+            };
+          }
+        }
+
+        function isValidCandidate(el) {
+          if (!el || !el.isConnected) return false;
+          const r = el.getBoundingClientRect();
+          if (r.width <= 0 || r.height <= 0) return false;
+          try {
+            const style = window.getComputedStyle(el);
+            if (style.visibility === 'hidden' || style.display === 'none') return false;
+          } catch(e) {}
+          return true;
+        }
+
+        // 2. Strategy: Stored Selector (if stable CSS selector recorded)
+        if (meta.selector && !meta.selector.startsWith('[data-wt-id')) {
+          try {
+            const el = document.querySelector(meta.selector);
+            if (isValidCandidate(el)) {
+              el.setAttribute('data-wt-id', refId);
+              const r = el.getBoundingClientRect();
+              return {
+                success: true,
+                strategy: 'stored_selector',
+                x: Math.round(r.left + r.width / 2),
+                y: Math.round(r.top + r.height / 2),
+                label: el.getAttribute('aria-label') || (el.innerText || el.textContent || '').trim() || el.placeholder || '',
+                role: el.getAttribute('role') || el.tagName.toLowerCase()
+              };
+            }
+          } catch(e) {}
+        }
+
+        const normLabel = (meta.label || '').toLowerCase().trim();
+        const normPlaceholder = (meta.placeholder || '').toLowerCase().trim();
+
+        const candidates = Array.from(document.querySelectorAll(
+          'button, a, input, select, textarea, [role="button"], [role="link"], [role="textbox"], [role="checkbox"], [role="tab"], [tabindex="0"]'
+        ));
+
+        // 3. Strategy: Exact Label / Text / Aria match
+        if (normLabel) {
+          for (const c of candidates) {
+            if (!isValidCandidate(c)) continue;
+            const aria = (c.getAttribute('aria-label') || '').toLowerCase().trim();
+            const text = ((c.innerText || c.textContent || '')).toLowerCase().trim();
+            const val = (c.value || '').toLowerCase().trim();
+            const placeholder = (c.placeholder || '').toLowerCase().trim();
+            const name = (c.getAttribute('name') || '').toLowerCase().trim();
+
+            if (aria === normLabel || text === normLabel || placeholder === normLabel || name === normLabel || (val && val === normLabel)) {
+              c.setAttribute('data-wt-id', refId);
+              const r = c.getBoundingClientRect();
+              return {
+                success: true,
+                strategy: 'exact_label',
+                x: Math.round(r.left + r.width / 2),
+                y: Math.round(r.top + r.height / 2),
+                label: c.getAttribute('aria-label') || (c.innerText || c.textContent || '').trim() || c.placeholder || '',
+                role: c.getAttribute('role') || c.tagName.toLowerCase()
+              };
+            }
+          }
+        }
+
+        // 4. Strategy: Placeholder or Name match
+        if (normPlaceholder) {
+          for (const c of candidates) {
+            if (!isValidCandidate(c)) continue;
+            const placeholder = (c.placeholder || '').toLowerCase().trim();
+            const name = (c.getAttribute('name') || '').toLowerCase().trim();
+            if (placeholder === normPlaceholder || name === normPlaceholder) {
+              c.setAttribute('data-wt-id', refId);
+              const r = c.getBoundingClientRect();
+              return {
+                success: true,
+                strategy: 'placeholder_or_name',
+                x: Math.round(r.left + r.width / 2),
+                y: Math.round(r.top + r.height / 2),
+                label: c.placeholder || c.getAttribute('name') || '',
+                role: c.getAttribute('role') || c.tagName.toLowerCase()
+              };
+            }
+          }
+        }
+
+        // 5. Strategy: Fuzzy Substring Match (if label length >= 3)
+        if (normLabel && normLabel.length >= 3) {
+          let bestMatch = null;
+          let minDiff = Infinity;
+          for (const c of candidates) {
+            if (!isValidCandidate(c)) continue;
+            const text = ((c.innerText || c.textContent || '')).toLowerCase().trim();
+            const aria = (c.getAttribute('aria-label') || '').toLowerCase().trim();
+            const candStr = aria || text;
+            if (candStr && candStr.includes(normLabel)) {
+              const diff = candStr.length - normLabel.length;
+              if (diff >= 0 && diff < minDiff) {
+                minDiff = diff;
+                bestMatch = c;
+              }
+            }
+          }
+          if (bestMatch) {
+            bestMatch.setAttribute('data-wt-id', refId);
+            const r = bestMatch.getBoundingClientRect();
+            return {
+              success: true,
+              strategy: 'fuzzy_label',
+              x: Math.round(r.left + r.width / 2),
+              y: Math.round(r.top + r.height / 2),
+              label: bestMatch.getAttribute('aria-label') || (bestMatch.innerText || bestMatch.textContent || '').trim() || bestMatch.placeholder || '',
+              role: bestMatch.getAttribute('role') || bestMatch.tagName.toLowerCase()
+            };
+          }
+        }
+
+        return { success: false };
       })(${JSON.stringify(refNumericId)}, ${JSON.stringify(meta)})`,
             returnByValue: true,
         });