@nuanu-ai/agentbrowse 0.2.21 → 0.2.23

package/dist/commands/observe-inventory.js

@@ -1,9 +1,9 @@
 import { inferAcceptancePolicyFromFacts, inferAllowedActionsFromFacts, inferAvailabilityFromFacts, inferControlFamilyFromFacts, } from '../control-semantics.js';
 import { LOCATOR_DOM_SIGNATURE_SCRIPT, normalizePageSignature, readLocatorDomSignature, } from './descriptor-validation.js';
+import { OBSERVE_DOM_LABEL_CONTRACT_HELPER_SCRIPT } from './observe-dom-label-contract.js';
 import { TRANSPARENT_ACTIONABLE_CONTROL_HELPER_SCRIPT } from './user-actionable.js';
 const DOM_TARGET_COLLECTION_LIMIT = 640;
 const DOM_TARGET_OUTPUT_LIMIT = 480;
-const DOM_SIGNAL_COLLECTION_LIMIT = 24;
 export function inferStructuredCellVariantFromEvidence(evidence) {
     const role = (evidence.role ?? '').toLowerCase();
     const surfaceKind = (evidence.surfaceKind ?? '').toLowerCase();
@@ -14,8 +14,7 @@ export function inferStructuredCellVariantFromEvidence(evidence) {
     const hasSeatMetadata = Boolean(evidence.hasSeatAttribute || evidence.hasSeatRowAttribute || evidence.hasSeatColumnAttribute);
     const seatIdentityLike = /(?:\bseat\s*\d{1,3}[a-z]?\b|место\s*\d{1,3}[a-z]?\b|\b\d{1,3}[a-z]\b|\b[a-z]\d{1,3}\b)/i.test(normalizedLabel);
     const seatClassLike = /seat|cabin|fare|row/.test(className);
-    const compactDateCellLabel = /^(?:\d{1,2}|january|february|march|april|may|june|july|august|september|october|november|december|январ|феврал|март|апрел|ма[йя]|июн|июл|август|сентябр|октябр|ноябр|декабр)$/i.test(normalizedLabel) ||
-        /^(?:\d{1,2}[./-]\d{1,2}(?:[./-]\d{2,4})?)$/.test(normalizedLabel);
+    const compactDateCellLabel = /^(?:\d{1,2}|january|february|march|april|may|june|july|august|september|october|november|december|январ|феврал|март|апрел|ма[йя]|июн|июл|август|сентябр|октябр|ноябр|декабр)$/i.test(normalizedLabel) || /^(?:\d{1,2}[./-]\d{1,2}(?:[./-]\d{2,4})?)$/.test(normalizedLabel);
     const dateLike = surfaceKind === 'datepicker' ||
         ((role === 'gridcell' || structuredSurface || hasDateMetadata) && compactDateCellLabel);
     if (dateLike) {
@@ -48,7 +47,8 @@ function normalizeInheritedPageSignature(pageSignature) {
         : undefined;
 }
 function applyInheritedDomTargetMetadata(target, options) {
-    const normalizedFramePath = normalizeInheritedFramePath(options?.framePath) ?? normalizeInheritedFramePath(target.framePath);
+    const normalizedFramePath = normalizeInheritedFramePath(options?.framePath) ??
+        normalizeInheritedFramePath(target.framePath);
     const normalizedFrameUrl = normalizeInheritedFrameUrl(options?.frameUrl) ?? target.frameUrl;
     const normalizedPageSignature = normalizeInheritedPageSignature(options?.pageSignature) ?? target.pageSignature;
     return {
@@ -84,19 +84,11 @@ function enrichObservedTargetSemantics(target) {
         ...target,
         capability,
         availability,
+        controlFamily,
         allowedActions,
         acceptancePolicy,
     };
 }
-function applyInheritedSignalMetadata(signal, options) {
-    const normalizedFramePath = normalizeInheritedFramePath(options?.framePath) ?? normalizeInheritedFramePath(signal.framePath);
-    const normalizedFrameUrl = normalizeInheritedFrameUrl(options?.frameUrl) ?? signal.frameUrl;
-    return {
-        ...signal,
-        framePath: normalizedFramePath,
-        frameUrl: normalizedFrameUrl,
-    };
-}
 function hasStagehandDomFacts(domFacts) {
     return Boolean(domFacts &&
         (domFacts.kind ||
@@ -163,23 +155,11 @@ export async function readStagehandLocatorSnapshot(locator) {
     return best;
 }
 const STAGEHAND_DOM_FACTS_SCRIPT = String.raw `
+  ${OBSERVE_DOM_LABEL_CONTRACT_HELPER_SCRIPT}
   if (!(element instanceof HTMLElement)) {
     return null;
   }
 
-  const normalizeText = (value) => (value ?? '').replace(/\s+/g, ' ').trim();
-  const isVisible = (candidate) => {
-    if (!(candidate instanceof HTMLElement)) {
-      return false;
-    }
-    const style = candidate.ownerDocument?.defaultView?.getComputedStyle(candidate);
-    if (!style || style.display === 'none' || style.visibility === 'hidden') {
-      return false;
-    }
-    const rect = candidate.getBoundingClientRect();
-    return rect.width > 0 && rect.height > 0;
-  };
-
   const inputLike = element;
   const disabledProperty =
     typeof inputLike.disabled === 'boolean' ? inputLike.disabled : false;
@@ -209,47 +189,10 @@ const STAGEHAND_DOM_FACTS_SCRIPT = String.raw `
   const states = {};
   const directValue =
     'value' in inputLike && typeof inputLike.value === 'string'
-      ? normalizeText(inputLike.value)
+      ? observedNormalizeDescriptorText(inputLike.value)
       : undefined;
-  const directText = normalizeText(element.innerText || element.textContent || '');
-  let currentValue =
-    directValue ||
-    (element.tagName.toLowerCase() === 'input' || element.tagName.toLowerCase() === 'textarea'
-      ? undefined
-      : directText || undefined);
-
-  const popupBacked =
-    element.getAttribute('role') === 'combobox' ||
-    element.hasAttribute('aria-haspopup') ||
-    element.hasAttribute('aria-controls') ||
-    readonly;
-  if (!currentValue && popupBacked && element.parentElement) {
-    const siblingValues = Array.from(element.parentElement.children)
-      .filter((candidate) => candidate !== element)
-      .filter((candidate) => isVisible(candidate))
-      .filter((candidate) => {
-        const tag = candidate.tagName.toLowerCase();
-        if (tag === 'label' || tag === 'legend') {
-          return false;
-        }
-        const role = candidate.getAttribute('role') || '';
-        return (
-          role === 'listbox' ||
-          role === 'button' ||
-          role === 'option' ||
-          candidate.hasAttribute('aria-selected') ||
-          candidate.hasAttribute('aria-current')
-        );
-      })
-      .map((candidate) => normalizeText(candidate.innerText || candidate.textContent || ''))
-      .filter(
-        (value, index, all) =>
-          Boolean(value) && value.length <= 40 && all.indexOf(value) === index
-      );
-    if (siblingValues.length === 1) {
-      currentValue = siblingValues[0];
-    }
-  }
+  const directText = observedNormalizeDescriptorText(element.innerText || element.textContent || '');
+  const currentValue = observedPopupCurrentValueOf(element);
 
   if (expanded !== undefined) states.expanded = expanded;
   if (selected !== undefined) states.selected = selected;
@@ -407,9 +350,10 @@ async function collectDomTargetsFromDocument(context, options) {
       return undefined;
     };
     ${TRANSPARENT_ACTIONABLE_CONTROL_HELPER_SCRIPT}
+    ${OBSERVE_DOM_LABEL_CONTRACT_HELPER_SCRIPT}
     ${INFER_STRUCTURED_CELL_VARIANT_HELPER_SCRIPT}
 
-    const normalizeDescriptorText = (value) => (value || '').replace(/\s+/g, ' ').trim();
+    const normalizeDescriptorText = (value) => observedNormalizeDescriptorText(value);
 
     const isVisible = (element) => {
       const style = window.getComputedStyle(element);
@@ -636,38 +580,12 @@ async function collectDomTargetsFromDocument(context, options) {
       return values.length > 0 ? values.join(' ') : undefined;
     };
 
-    const MACHINE_DESCRIPTOR_TEXT_RE =
-      /(?:window\.[a-z0-9_$]+|apiary(?:sleepingqueue|markerportal)|document\.getelementbyid\(|addeventlistener\(|push\(\[|["']widgets["']\s*:|["']meta["']\s*:)/i;
-
-    const looksLikeMachineDescriptorText = (value) => {
-      const normalized = normalizeDescriptorText(value || '');
-      if (!normalized) {
-        return false;
-      }
-
-      if (MACHINE_DESCRIPTOR_TEXT_RE.test(normalized)) {
-        return true;
-      }
-
-      if (normalized.length < 160) {
-        return false;
-      }
-
-      const syntaxCount =
-        (normalized.match(/[{}[\]();=]/g) || []).length +
-        (normalized.match(/["']/g) || []).length;
-      return syntaxCount >= 24 && syntaxCount / normalized.length >= 0.08;
-    };
-
-    const safeVisibleDescriptorTextOf = (element) => {
+    const visibleDescriptorTextOf = (element) => {
       const text = normalizeDescriptorText(element?.innerText || '');
-      if (!text || looksLikeMachineDescriptorText(text)) {
-        return undefined;
-      }
-      return text;
+      return text || undefined;
     };
 
-    const directVisibleChildDescriptorTextOf = (element) => {
+    const visibleChildDescriptorTextOf = (element) => {
       if (!isHTMLElementNode(element)) {
         return undefined;
       }
@@ -676,7 +594,7 @@ async function collectDomTargetsFromDocument(context, options) {
       const seen = new Set();
       const pushValue = (value) => {
         const normalized = normalizeDescriptorText(value || '');
-        if (!normalized || looksLikeMachineDescriptorText(normalized) || seen.has(normalized)) {
+        if (!normalized || seen.has(normalized)) {
           return;
         }
         seen.add(normalized);
@@ -712,18 +630,9 @@ async function collectDomTargetsFromDocument(context, options) {
         return buttonLikeText;
       }
       const altValue = imageAltTextOf(element);
-      const visibleText = safeVisibleDescriptorTextOf(element);
-      const childText = container ? directVisibleChildDescriptorTextOf(element) : undefined;
-      const rawTextContent = normalizeDescriptorText(element?.textContent || '');
-      const textContentFallback =
-        !container &&
-        rawTextContent &&
-        rawTextContent !== visibleText &&
-        rawTextContent !== childText &&
-        !looksLikeMachineDescriptorText(rawTextContent)
-          ? rawTextContent
-          : undefined;
-      const textValue = visibleText || childText || textContentFallback;
+      const visibleText = visibleDescriptorTextOf(element);
+      const childText = container ? visibleChildDescriptorTextOf(element) : undefined;
+      const textValue = visibleText || childText;
 
       if (!textValue && !altValue) {
         return undefined;
@@ -737,139 +646,13 @@ async function collectDomTargetsFromDocument(context, options) {
       return (altValue + ' ' + textValue).trim();
     };
 
-    const isMeaningfulLabel = (value) => {
-      const normalized = (value || '').replace(/\s+/g, ' ').trim();
-      return Boolean(normalized) && normalized !== '[object Object]';
-    };
-
-    const inputTypeOf = (element) => {
-      if (!isHTMLInputNode(element)) {
-        return '';
-      }
-      return (element.getAttribute('type') || 'text').trim().toLowerCase();
-    };
-
-    const isButtonLikeInput = (element) => {
-      return isHTMLInputNode(element) && ['button', 'submit', 'reset'].includes(inputTypeOf(element));
-    };
-
-    const LOOSE_ACTION_TEXT_RE =
-      /^(?:pay|buy|continue|submit|search|book|reserve|checkout|next|done|оплат|куп|продолж|дальше|поиск|заброни)/i;
-
-    const tokenizeSemanticText = (value) => {
-      const normalized = (value || '')
-        .replace(/([a-z])([A-Z])/g, '$1 $2')
-        .replace(/[^a-zA-Z0-9\u0400-\u04FF]+/g, ' ')
-        .toLowerCase()
-        .trim();
-      if (!normalized) return [];
-      return normalized
-        .split(/\s+/)
-        .filter((token) => token.length >= 2 && token !== 'input' && token !== 'field');
-    };
-
-    const fieldSemanticTokensOf = (element) => {
-      const tokens = new Set();
-      const pushValue = (value) => {
-        for (const token of tokenizeSemanticText(value)) {
-          tokens.add(token);
-        }
-      };
-
-      const inputType = inputTypeOf(element);
-      const autocomplete = (element.getAttribute('autocomplete') || '').trim().toLowerCase();
-
-      if (isButtonLikeInput(element)) {
-        return tokens;
-      }
-
-      pushValue(element.getAttribute('placeholder'));
-      pushValue(element.getAttribute('name'));
-      pushValue(element.getAttribute('id'));
-      pushValue(autocomplete);
-      pushValue(inputType);
-
-      if (inputType === 'email' || autocomplete.includes('email')) {
-        pushValue('email mail e-mail');
-      }
-      if (
-        inputType === 'tel' ||
-        autocomplete.startsWith('tel') ||
-        autocomplete.includes('phone')
-      ) {
-        pushValue('phone telephone mobile tel номер телефон');
-      }
-      if (inputType === 'password' || autocomplete.includes('password')) {
-        pushValue('password pass пароль');
-      }
-      if (inputType === 'search' || autocomplete.includes('search')) {
-        pushValue('search find поиск найти');
-      }
-      if (
-        inputType === 'date' ||
-        autocomplete.includes('bday') ||
-        autocomplete.includes('birth') ||
-        autocomplete.includes('dob')
-      ) {
-        pushValue('date birth birthday dob дата рождения');
-      }
-
-      return tokens;
-    };
-
-    const isLooseFieldLabelCompatible = (element, candidateText) => {
-      const normalizedCandidate = normalizeDescriptorText(candidateText || '');
-      if (!normalizedCandidate) return false;
-      if (LOOSE_ACTION_TEXT_RE.test(normalizedCandidate)) {
-        return false;
-      }
-
-      const semanticTokens = fieldSemanticTokensOf(element);
-      if (semanticTokens.size === 0) {
-        return true;
-      }
-
-      const candidateTokens = tokenizeSemanticText(normalizedCandidate);
-      if (candidateTokens.length === 0) {
-        return false;
-      }
-
-      return candidateTokens.some((token) => semanticTokens.has(token));
-    };
-
-    const isFieldLikeControl = (element) => {
-      const tag = element.tagName.toLowerCase();
-      const explicitRole = (element.getAttribute('role') || '').trim().toLowerCase();
-      if (tag === 'input') {
-        return !isButtonLikeInput(element);
-      }
-      return (
-        tag === 'textarea' ||
-        tag === 'select' ||
-        explicitRole === 'textbox' ||
-        explicitRole === 'combobox' ||
-        explicitRole === 'searchbox' ||
-        explicitRole === 'spinbutton'
-      );
-    };
-
-    const precedesElementInDocument = (candidate, element) => {
-      return Boolean(candidate.compareDocumentPosition(element) & Node.DOCUMENT_POSITION_FOLLOWING);
-    };
+    const isMeaningfulLabel = (value) => observedIsMeaningfulLabel(value);
 
-    const ariaLabelledbyTextOf = (element) => {
-      const labelledBy = element.getAttribute('aria-labelledby')?.trim();
-      if (!labelledBy) return undefined;
+    const inputTypeOf = (element) => observedInputTypeOf(element);
 
-      const text = labelledBy
-        .split(/\s+/)
-        .map((id) => textOf(document.getElementById(id)))
-        .filter(Boolean)
-        .join(' ')
-        .trim();
+    const isButtonLikeInput = (element) => observedIsButtonLikeInput(element);
 
-      return isMeaningfulLabel(text) ? text : undefined;
-    };
+    const popupCurrentValueOf = (element) => observedPopupCurrentValueOf(element);
 
     const describedByTextOf = (element) => {
       const describedBy = element.getAttribute('aria-describedby')?.trim();
@@ -885,105 +668,9 @@ async function collectDomTargetsFromDocument(context, options) {
       return isMeaningfulLabel(text) ? text : undefined;
     };
 
-    const nearestFieldLabelOf = (element) => {
-      const restrictLooseCandidatesToPreceding = isFieldLikeControl(element);
-      const anchors = [
-        composedParentElement(element),
-        composedParentElement(composedParentElement(element)),
-        composedParentElement(composedParentElement(composedParentElement(element))),
-      ].filter(Boolean);
-
-      for (const anchor of anchors) {
-        if (!isHTMLElementNode(anchor)) continue;
-
-        const explicitLabels = Array.from(
-          anchor.querySelectorAll('label, legend, [class*="label"], [data-testid*="label"]')
-        ).filter((candidate) => {
-          return (
-            isHTMLElementNode(candidate) &&
-            candidate !== element &&
-            !candidate.contains(element) &&
-            !element.contains(candidate)
-          );
-        });
-
-        for (const candidate of explicitLabels) {
-          if (
-            restrictLooseCandidatesToPreceding &&
-            !candidate.matches('label, legend') &&
-            !precedesElementInDocument(candidate, element)
-          ) {
-            continue;
-          }
-          const candidateText = textOf(candidate);
-          if (isMeaningfulLabel(candidateText)) {
-            return candidateText;
-          }
-        }
-
-        for (const child of Array.from(anchor.children).slice(0, 8)) {
-          if (!isHTMLElementNode(child)) continue;
-          if (child === element || child.contains(element) || element.contains(child)) continue;
-          if (restrictLooseCandidatesToPreceding && !precedesElementInDocument(child, element)) {
-            continue;
-          }
-
-          const candidateText = textOf(child);
-          if (isMeaningfulLabel(candidateText)) {
-            return candidateText;
-          }
-        }
-      }
-
-      return undefined;
-    };
-
-    const labelOf = (element) => {
-      const ariaLabel = element.getAttribute('aria-label')?.trim();
-      if (isMeaningfulLabel(ariaLabel)) return ariaLabel;
-
-      const customLabel = element.getAttribute('label')?.trim();
-      if (isMeaningfulLabel(customLabel)) return customLabel;
-
-      const ariaLabelledbyText = ariaLabelledbyTextOf(element);
-      if (isMeaningfulLabel(ariaLabelledbyText)) return ariaLabelledbyText;
-
-      const labels = element.labels;
-      if (labels && labels.length > 0) {
-        const labelText = textOf(labels[0]);
-        if (isMeaningfulLabel(labelText)) return labelText;
-      }
-
-      const title = element.getAttribute('title')?.trim();
-      if (isMeaningfulLabel(title)) return title;
-
-      const skipNearestFieldLabel = isButtonLikeInput(element);
-      const preferFieldLabelBeforeVisibleText = isFieldLikeControl(element);
-      const text = textOf(element);
-      if (!preferFieldLabelBeforeVisibleText && isMeaningfulLabel(text)) return text;
-
-      const placeholder = element.getAttribute('placeholder')?.trim();
-      const nearestFieldLabel = nearestFieldLabelOf(element);
-      if (
-        !skipNearestFieldLabel &&
-        isMeaningfulLabel(nearestFieldLabel) &&
-        (!preferFieldLabelBeforeVisibleText ||
-          isLooseFieldLabelCompatible(element, nearestFieldLabel))
-      ) {
-        return nearestFieldLabel;
-      }
-
-      if (isMeaningfulLabel(placeholder)) return placeholder;
-
-      if (!skipNearestFieldLabel && isMeaningfulLabel(nearestFieldLabel)) return nearestFieldLabel;
-
-      if (isMeaningfulLabel(text)) return text;
+    const explicitLabelOf = (element) => observedExplicitLabelOf(element);
 
-      const syntheticLabel = stableLabelOf(element);
-      if (isMeaningfulLabel(syntheticLabel)) return syntheticLabel;
-
-      return undefined;
-    };
+    const looseFieldLabelOf = (element) => observedLooseFieldLabelOf(element);
 
     const VALIDATION_TEXT_RE =
       /(?:required|invalid|incorrect|too\s+(?:short|long)|must|error|format|please\s+(?:enter|select|choose|fill)|невер|ошиб|обязател|заполн|введите|укажите|выберите|долж|нужно|формат|цифр|символ)/i;
@@ -1023,58 +710,7 @@ async function collectDomTargetsFromDocument(context, options) {
       return undefined;
     };
 
-    const stableLabelOf = (element) => {
-      const ariaLabel = element.getAttribute('aria-label')?.trim();
-      if (isMeaningfulLabel(ariaLabel)) return ariaLabel;
-
-      const customLabel = element.getAttribute('label')?.trim();
-      if (isMeaningfulLabel(customLabel)) return customLabel;
-
-      const title = element.getAttribute('title')?.trim();
-      if (isMeaningfulLabel(title)) return title;
-
-      const ariaLabelledbyText = ariaLabelledbyTextOf(element);
-      if (isMeaningfulLabel(ariaLabelledbyText)) return ariaLabelledbyText;
-
-      const labels = element.labels;
-      if (labels && labels.length > 0) {
-        const labelText = textOf(labels[0]);
-        if (isMeaningfulLabel(labelText)) return labelText;
-      }
-
-      const text = textOf(element);
-      if (isMeaningfulLabel(text)) return text;
-
-      const skipNearestFieldLabel = isButtonLikeInput(element);
-      const nearestFieldLabel = nearestFieldLabelOf(element);
-      if (!skipNearestFieldLabel && isMeaningfulLabel(nearestFieldLabel)) return nearestFieldLabel;
-
-      return syntheticLabelOf(element);
-    };
-
-    const inferRole = (element) => {
-      const explicitRole = element.getAttribute('role')?.trim();
-      if (explicitRole) return explicitRole;
-
-      const labelBackedChoice = labelBackedChoiceControlOf(element);
-      if (isHTMLInputNode(labelBackedChoice)) {
-        const inputType = (labelBackedChoice.type || '').toLowerCase();
-        if (inputType === 'radio') return 'radio';
-        if (inputType === 'checkbox') return 'checkbox';
-      }
-
-      const tag = element.tagName.toLowerCase();
-      if (tag === 'button') return 'button';
-      if (tag === 'a' && element.getAttribute('href')) return 'link';
-      if (tag === 'select') return 'combobox';
-      if (tag === 'textarea') return 'textbox';
-      if (tag === 'input') {
-        const inputType = (element.getAttribute('type') || 'text').toLowerCase();
-        if (['button', 'submit', 'reset'].includes(inputType)) return 'button';
-        return 'textbox';
-      }
-      return undefined;
-    };
+    const inferRole = (element) => observedInferRole(element) || undefined;
 
     const kindOf = (element) => {
       const tag = element.tagName.toLowerCase();
@@ -1299,22 +935,6 @@ async function collectDomTargetsFromDocument(context, options) {
       };
     };
 
-    const landmarkLabelOf = (container) => {
-      if (!container) return undefined;
-
-      const ariaLabel = container.getAttribute?.('aria-label')?.trim();
-      if (ariaLabel) return ariaLabel;
-
-      const heading = container.querySelector?.(headingSelector);
-      const headingText = textOf(heading);
-      if (headingText) return headingText;
-
-      const text = textOf(container, { container: true });
-      if (text && text.length <= 140) return text;
-      if (text) return text.slice(0, 140);
-      return undefined;
-    };
-
     const isStructuredContainer = (element) => {
       if (!isHTMLElementNode(element)) return false;
 
@@ -1389,7 +1009,7 @@ async function collectDomTargetsFromDocument(context, options) {
       const cursorClick = style.cursor === 'pointer';
       if (!explicitClick && !cursorClick) return false;
 
-      const descriptorText = stableLabelOf(element) || textOf(element);
+      const descriptorText = explicitLabelOf(element) || textOf(element) || syntheticLabelOf(element);
       if (!descriptorText) return false;
 
       const interactiveDescendants = visibleInteractiveDescendantCountOf(element);
@@ -1458,12 +1078,6 @@ async function collectDomTargetsFromDocument(context, options) {
       return undefined;
     };
 
-    const containerTextOf = (container) => {
-      const text = textOf(container, { container: true });
-      if (!text) return undefined;
-      return text.length <= 240 ? text : text.slice(0, 240);
-    };
-
     const groupOf = (element) => {
       if (element.matches?.(collectionSelector)) {
         return element;
@@ -1532,70 +1146,6 @@ async function collectDomTargetsFromDocument(context, options) {
 
     const normalizeText = (value) => (value || '').replace(/\s+/g, ' ').trim().toLowerCase();
 
-    const contextualHintOf = (element) => {
-      const excluded = new Set(
-        [labelOf(element), textOf(element)]
-          .map((value) => normalizeText(value))
-          .filter(Boolean)
-      );
-
-      const seen = new Set();
-      const pushCandidate = (candidates, value) => {
-        const text = (value || '').replace(/\s+/g, ' ').trim();
-        const normalized = normalizeText(text);
-        if (!normalized || excluded.has(normalized) || seen.has(normalized)) {
-          return;
-        }
-        if (text.length < 4 || text.length > 120) {
-          return;
-        }
-        seen.add(normalized);
-        candidates.push(text);
-      };
-
-      const describeNode = (node, candidates) => {
-        if (!isHTMLElementNode(node)) return;
-
-        const heading = node.querySelector?.(headingSelector);
-        if (isHTMLElementNode(heading) && heading !== element && !heading.contains(element)) {
-          pushCandidate(candidates, textOf(heading));
-        }
-
-        for (const child of Array.from(node.children).slice(0, 8)) {
-          if (!isHTMLElementNode(child)) continue;
-          if (child === element || child.contains(element) || element.contains(child)) continue;
-          pushCandidate(candidates, textOf(child));
-        }
-
-        pushCandidate(candidates, landmarkLabelOf(node));
-        pushCandidate(candidates, textOf(node, { container: true }));
-      };
-
-      const anchors = [
-        itemOf(element),
-        groupOf(element),
-        containerOf(element),
-        composedParentElement(element),
-        composedParentElement(composedParentElement(element)),
-      ].filter(Boolean);
-
-      for (const anchor of anchors) {
-        const candidates = [];
-        pushCandidate(candidates, describedByTextOf(element));
-        describeNode(anchor, candidates);
-        if (candidates.length > 0) {
-          return candidates[0];
-        }
-      }
-
-      const describedBy = describedByTextOf(element);
-      if (describedBy) {
-        return describedBy;
-      }
-
-      return undefined;
-    };
-
     const VALIDATION_CLASS_RE = /\b(?:error|invalid|warning|danger|alert|failed)\b/i;
     const validationFieldSelectors =
       'input, textarea, select, [role="textbox"], [contenteditable="true"], [aria-invalid="true"]';
@@ -1825,7 +1375,7 @@ async function collectDomTargetsFromDocument(context, options) {
       const role = inferRole(element) || '';
       const className = (element.getAttribute('class') || '').toLowerCase();
       const surfaceKind = inferSurfaceKind(surface);
-      const label = labelOf(element) || textOf(element) || '';
+      const label = explicitLabelOf(element) || textOf(element) || syntheticLabelOf(element) || '';
       const normalizedLabel = label.replace(/\s+/g, ' ').trim();
       const explicitDateCellMetadata =
         element.hasAttribute('data-day') ||
@@ -1909,6 +1459,49 @@ async function collectDomTargetsFromDocument(context, options) {
       return undefined;
     };
 
+    const siblingModalBackdropOf = (surface) => {
+      let current = surface;
+      let depth = 0;
+      while (current && depth < 16) {
+        const parent = composedParentElement(current);
+        if (isHTMLElementNode(parent)) {
+          const siblings = Array.from(parent.children).filter(
+            (candidate) => candidate !== current && isHTMLElementNode(candidate)
+          );
+          for (const sibling of siblings) {
+            if (!isVisible(sibling)) {
+              continue;
+            }
+
+            const style = window.getComputedStyle(sibling);
+            const position = (style.position || '').toLowerCase();
+            const rect = sibling.getBoundingClientRect();
+            const viewportArea = Math.max(window.innerWidth * window.innerHeight, 1);
+            const coverage = (rect.width * rect.height) / viewportArea;
+            const backgroundVisible =
+              style.backgroundColor &&
+              style.backgroundColor !== 'transparent' &&
+              style.backgroundColor !== 'rgba(0, 0, 0, 0)';
+            const opacity = parseFloat(style.opacity || '1');
+
+            if (
+              position === 'fixed' &&
+              coverage > 0.45 &&
+              backgroundVisible &&
+              opacity >= 0.05
+            ) {
+              return sibling;
+            }
+          }
+        }
+
+        current = parent;
+        depth += 1;
+      }
+
+      return undefined;
+    };
+
     const surfacePositionTraitsOf = (surface) => {
       if (!isHTMLElementNode(surface) || !isVisible(surface)) return undefined;
 
@@ -1949,7 +1542,7 @@ async function collectDomTargetsFromDocument(context, options) {
         hasCardChrome &&
         coverage <= 0.35 &&
         interactiveCount >= 1 &&
-        modalBackdropAncestorOf(surface)
+        (modalBackdropAncestorOf(surface) || siblingModalBackdropOf(surface))
       ) {
         return { kind: 'floating-panel', priority: 90 };
       }
@@ -1980,15 +1573,97 @@ async function collectDomTargetsFromDocument(context, options) {
       return role || surface.tagName.toLowerCase();
     };
 
+    const surfaceFallbackLabelOf = (surface, surfaceKind) => {
+      if (!isHTMLElementNode(surface)) {
+        return undefined;
+      }
+
+      const kind = (surfaceKind || '').toLowerCase();
+      const overlayLike =
+        kind === 'dialog' ||
+        kind === 'floating-panel' ||
+        kind === 'sticky-panel' ||
+        kind === 'listbox' ||
+        kind === 'menu' ||
+        kind === 'grid' ||
+        kind === 'tabpanel' ||
+        kind === 'popover' ||
+        kind === 'dropdown' ||
+        kind === 'datepicker' ||
+        kind === 'form';
+      if (!overlayLike) {
+        return undefined;
+      }
+
+      const directLabel = normalizeDescriptorText(
+        surface.getAttribute('aria-label') || surface.getAttribute('title') || ''
+      );
+      if (directLabel) {
+        return directLabel;
+      }
+
+      const heading = surface.querySelector(
+        'h1, h2, h3, h4, h5, h6, [role="heading"], legend, strong'
+      );
+      if (!isHTMLElementNode(heading) || !isVisible(heading)) {
+        return undefined;
+      }
+
+      return normalizeDescriptorText(heading.innerText || heading.textContent || '') || undefined;
+    };
+
+    const contextLabelOf = (element) => {
+      if (!isHTMLElementNode(element)) {
+        return undefined;
+      }
+
+      const ariaLabel = normalizeDescriptorText(element.getAttribute('aria-label') || '');
+      if (ariaLabel) {
+        return ariaLabel;
+      }
+
+      const ariaLabelledby = element.getAttribute('aria-labelledby')?.trim();
+      if (ariaLabelledby) {
+        const labelledByText = normalizeDescriptorText(
+          ariaLabelledby
+            .split(/\s+/)
+            .map((id) => textOf(document.getElementById(id)))
+            .filter(Boolean)
+            .join(' ')
+        );
+        if (labelledByText) {
+          return labelledByText;
+        }
+      }
+
+      const heading = element.querySelector(headingSelector);
+      if (isHTMLElementNode(heading) && heading !== element && !heading.contains(element)) {
+        const headingText = normalizeDescriptorText(heading.innerText || heading.textContent || '');
+        if (headingText) {
+          return headingText;
+        }
+      }
+
+      const text = textOf(element, { container: true });
+      if (!text) {
+        return undefined;
+      }
+      return text.length <= 140 ? text : text.slice(0, 140);
+    };
+
     const contextNodeOf = (element) => {
       if (!element) return undefined;
 
       const kind = element.getAttribute?.('role')?.trim() || element.tagName?.toLowerCase?.();
-      const label = landmarkLabelOf(element);
-      const text = containerTextOf(element);
-
-      if (!kind && !label && !text) return undefined;
-      return { kind: kind || undefined, label, text };
+      const label = contextLabelOf(element);
+      const selector = buildSelector(element);
+      if (!kind && !label && !selector) return undefined;
+      return {
+        kind: kind || undefined,
+        label,
+        text: undefined,
+        selector,
+      };
     };
 
     const pageSignature =
@@ -2328,7 +2003,6 @@ async function collectDomTargetsFromDocument(context, options) {
                 variant: 'seat-cell',
                 row,
                 column,
-                zone: landmarkLabelOf(ownerSurface) || landmarkLabelOf(surface) || undefined,
                 cellLabel: label,
               },
               surface: ownerSurface,
@@ -2442,7 +2116,7 @@ async function collectDomTargetsFromDocument(context, options) {
 
         let current = composedParentElement(element);
         let depth = 0;
-        while (current && depth < 8) {
+        while (current && depth < 16) {
           pushCandidate(current, depth + 2);
           current = composedParentElement(current);
           depth += 1;
@@ -2518,9 +2192,13 @@ async function collectDomTargetsFromDocument(context, options) {
           (isHTMLElementNode(overlaySurface) ? overlaySurface : localSurface || selfSurface);
         const surfaceSelectors = surfaceSelectorsOf(element, localSurface || selfSurface);
         const structure = visualSeatGrid?.structure || inferStructuredCell(element, surface);
-        const stableLabel = visualSeatGrid?.label || stableLabelOf(element);
+        const fallbackLabel = explicitLabelOf(element) || looseFieldLabelOf(element);
+        const currentValue = popupCurrentValueOf(element);
         const role = inferRole(element);
         const surfaceKind = visualSeatGrid?.surfaceKind || surfaceKindOf(surface);
+        const fallbackSurfaceLabel =
+          (visualSeatGrid?.hintText ? 'Seat map' : undefined) ||
+          surfaceFallbackLabelOf(surface, surfaceKind);
         const form = composedClosest(element, 'form');
         const testIdAttribute = element.hasAttribute('data-testid')
           ? 'data-testid'
@@ -2529,9 +2207,11 @@ async function collectDomTargetsFromDocument(context, options) {
             : undefined;
         return {
           kind: inferredKind,
-          label: visualSeatGrid?.label || labelOf(element) || stableLabel,
+          label: undefined,
+          fallbackLabel: visualSeatGrid?.label || fallbackLabel,
           interactionHint: visualSeatGrid?.interactionHint || (genericClickable ? 'click' : undefined),
           role,
+          currentValue: currentValue || undefined,
           text: textOf(element),
           placeholder: element.getAttribute('placeholder')?.trim() || undefined,
           inputName: element.getAttribute('name')?.trim() || undefined,
@@ -2554,7 +2234,8 @@ async function collectDomTargetsFromDocument(context, options) {
               ? { ...(stateOf(element) || {}), ...(visualSeatGrid?.states || {}) }
               : undefined,
           surfaceKind,
-          surfaceLabel: landmarkLabelOf(surface),
+          surfaceLabel: undefined,
+          fallbackSurfaceLabel,
           surfaceSelector: surface ? buildSelector(surface) : undefined,
           surfaceSelectors,
           surfacePriority: surfacePriorityOf(surface),
@@ -2576,7 +2257,8 @@ async function collectDomTargetsFromDocument(context, options) {
               lane: laneOf(rect),
               band: bandOf(rect),
             },
-            hintText: visualSeatGrid?.hintText || contextualHintOf(element),
+            hintText: undefined,
+            fallbackHintText: visualSeatGrid?.hintText,
             visual: visualOf(element),
           },
         };
@@ -2727,188 +2409,6 @@ async function collectDomTargetsFromDocument(context, options) {
         pageSignature: options?.pageSignature,
     })));
 }
-async function collectPageSignalsFromDocument(context, options) {
-    const inheritedFramePath = JSON.stringify(options?.framePath ?? []);
-    const inheritedFrameUrl = JSON.stringify(options?.frameUrl ?? '');
-    const observedSignals = await context.evaluate(String.raw `(() => {
-    const inheritedFramePath = ${inheritedFramePath};
-    const inheritedFrameUrl = ${inheritedFrameUrl};
-    const limit = ${DOM_SIGNAL_COLLECTION_LIMIT};
-    const interactiveSelector =
-      'button, a[href], input:not([type="hidden"]), textarea, select, [role="button"], [role="link"], [role="textbox"], [role="combobox"], [role="option"], [role="gridcell"], [contenteditable="true"], [tabindex]:not([tabindex="-1"])';
-    const explicitSelector = [
-      '[role="alert"]',
-      '[role="status"]',
-      '[aria-live="assertive"]',
-      '[aria-live="polite"]',
-      '[role="dialog"]',
-      '[aria-modal="true"]',
-      '[class*="toast"]',
-      '[class*="snackbar"]',
-      '[class*="banner"]',
-      '[class*="notice"]',
-      '[class*="success"]',
-      '[class*="error"]',
-      '[class*="warning"]',
-      '[data-testid*="toast"]',
-      '[data-testid*="banner"]',
-      '[data-testid*="alert"]',
-      '[data-testid*="success"]',
-      '[data-testid*="error"]',
-      '[aria-busy="true"]',
-      '[role="progressbar"]',
-      'button[disabled]',
-    ].join(', ');
-    const candidateSelector = 'h1, h2, h3, p, section, article, div, [role="region"]';
-    const outcomeTextRe =
-      /(?:thanks|thank you|success(?:ful|fully)?|receipt|order|confirmed|complete(?:d)?|declin(?:e|ed)|fail(?:ed|ure)|error|unable|try again|verification|verify|challenge|captcha|processing|pending|approved|denied)/i;
-
-    const normalizeText = (value) => (value ?? '').replace(/\s+/g, ' ').trim();
-    const sampleText = (value, maxLength) => {
-      const normalized = normalizeText(value);
-      if (!normalized) {
-        return '';
-      }
-      if (normalized.length <= maxLength) {
-        return normalized;
-      }
-      return normalized.slice(0, maxLength - 1).trimEnd() + '…';
-    };
-    const isVisible = (element) => {
-      if (!(element instanceof HTMLElement)) {
-        return false;
-      }
-      const style = element.ownerDocument?.defaultView?.getComputedStyle(element);
-      if (!style || style.display === 'none' || style.visibility === 'hidden') {
-        return false;
-      }
-      const rect = element.getBoundingClientRect();
-      return rect.width > 0 && rect.height > 0;
-    };
-    const textOf = (element) => {
-      if (!(element instanceof HTMLElement)) {
-        return '';
-      }
-      return sampleText(element.innerText || element.textContent || '', 240);
-    };
-    const hasVisibleInteractiveDescendant = (element) => {
-      if (!(element instanceof HTMLElement)) {
-        return false;
-      }
-      return Array.from(element.querySelectorAll(interactiveSelector)).some(
-        (candidate) => candidate !== element && candidate instanceof HTMLElement && isVisible(candidate)
-      );
-    };
-    const hasNestedOutcomeCandidate = (element) => {
-      if (!(element instanceof HTMLElement)) {
-        return false;
-      }
-      return Array.from(
-        element.querySelectorAll(
-          'h1, h2, h3, p, [role="alert"], [role="status"], [aria-live="assertive"], [aria-live="polite"]'
-        )
-      ).some((candidate) => {
-        if (!(candidate instanceof HTMLElement) || candidate === element || !isVisible(candidate)) {
-          return false;
-        }
-        return outcomeTextRe.test(normalizeText(candidate.innerText || candidate.textContent || ''));
-      });
-    };
-    const signalKindOf = (element, text) => {
-      const role = element.getAttribute('role') || '';
-      const ariaLive = element.getAttribute('aria-live') || '';
-      const classBlob =
-        ((element.getAttribute('class') || '') + ' ' + Object.values(element.dataset || {}).join(' ')).toLowerCase();
-
-      if (role === 'dialog' || element.getAttribute('aria-modal') === 'true') {
-        return 'dialog';
-      }
-      if (role === 'alert' || ariaLive === 'assertive') {
-        return 'alert';
-      }
-      if (
-        role === 'status' ||
-        ariaLive === 'polite' ||
-        element.hasAttribute('aria-busy') ||
-        element.matches('button[disabled], [role="progressbar"]')
-      ) {
-        return 'status';
-      }
-      if (/toast|snackbar|banner|notice|warning|error|success/.test(classBlob)) {
-        return 'notice';
-      }
-      return 'notice';
-    };
-
-    const seen = new Set();
-    const signals = [];
-    const pushSignal = (kind, text) => {
-      const normalized = sampleText(text, 240);
-      if (!normalized) {
-        return;
-      }
-      const key = kind + '|' + normalized.toLowerCase();
-      if (seen.has(key)) {
-        return;
-      }
-      seen.add(key);
-      signals.push({
-        kind,
-        text: normalized,
-        framePath: inheritedFramePath.length > 0 ? inheritedFramePath : undefined,
-        frameUrl: inheritedFrameUrl || undefined,
-        source: 'dom',
-      });
-      if (signals.length > limit) {
-        signals.length = limit;
-      }
-    };
-
-    for (const element of Array.from(document.querySelectorAll(explicitSelector))) {
-      if (!(element instanceof HTMLElement) || !isVisible(element)) {
-        continue;
-      }
-      const text = textOf(element);
-      if (!text) {
-        continue;
-      }
-      pushSignal(signalKindOf(element, text), text);
-      if (signals.length >= limit) {
-        return signals;
-      }
-    }
-
-    for (const element of Array.from(document.querySelectorAll(candidateSelector))) {
-      if (!(element instanceof HTMLElement) || !isVisible(element)) {
-        continue;
-      }
-      const text = textOf(element);
-      if (text.length < 12 || text.length > 240 || !outcomeTextRe.test(text)) {
-        continue;
-      }
-      if (hasVisibleInteractiveDescendant(element) || hasNestedOutcomeCandidate(element)) {
-        continue;
-      }
-      pushSignal(signalKindOf(element, text), text);
-      if (signals.length >= limit) {
-        break;
-      }
-    }
-
-    return signals;
-  })()`);
-    if (!Array.isArray(observedSignals)) {
-        return [];
-    }
-    return observedSignals.filter((signal) => Boolean(signal &&
-        typeof signal === 'object' &&
-        typeof signal.kind === 'string' &&
-        typeof signal.text === 'string' &&
-        signal.text.length > 0)).map((signal) => applyInheritedSignalMetadata(signal, {
-        framePath: options?.framePath,
-        frameUrl: options?.frameUrl,
-    }));
-}
 const FRAME_HOST_DESCRIPTOR_SCRIPT = String.raw `
   const ownerWindowOf = (node) => node?.ownerDocument?.defaultView || window;
   const isHTMLElementNode = (value) => {
@@ -3111,7 +2611,7 @@ const FRAME_HOST_DESCRIPTOR_SCRIPT = String.raw `
   const selector = isSelectorUniqueFor(element, structuralSelector) ? structuralSelector : null;
   return descriptorOf(selector);
 `;
-async function readFrameHostDescriptor(frame) {
+export async function readFrameHostDescriptor(frame) {
     const frameElement = await frame.frameElement().catch(() => null);
     if (!frameElement) {
         return null;
@@ -3178,55 +2678,8 @@ export async function collectDomTargets(page, options) {
     await walk(page.mainFrame());
     return collected;
 }
-export async function collectPageSignals(page) {
-    if (typeof page.mainFrame !== 'function') {
-        return collectPageSignalsFromDocument(page);
-    }
-    const collected = [];
-    const seen = new Set();
-    const pushSignals = (signals) => {
-        for (const signal of signals) {
-            const key = [signal.kind, signal.text.toLowerCase(), signal.framePath?.join('>') ?? 'top'].join('|');
-            if (seen.has(key)) {
-                continue;
-            }
-            seen.add(key);
-            collected.push(signal);
-            if (collected.length >= DOM_SIGNAL_COLLECTION_LIMIT) {
-                break;
-            }
-        }
-    };
-    const walk = async (frame, framePath) => {
-        if (collected.length >= DOM_SIGNAL_COLLECTION_LIMIT) {
-            return;
-        }
-        const frameUrl = frame.url().trim() || undefined;
-        const signals = await collectPageSignalsFromDocument(frame, {
-            framePath,
-            frameUrl,
-        }).catch(() => []);
-        pushSignals(signals);
-        if (collected.length >= DOM_SIGNAL_COLLECTION_LIMIT) {
-            return;
-        }
-        for (const childFrame of frame.childFrames().slice(0, 20)) {
-            if (collected.length >= DOM_SIGNAL_COLLECTION_LIMIT) {
-                break;
-            }
-            const frameHost = await readFrameHostDescriptor(childFrame);
-            if (!frameHost?.selector || !frameHost.userVisible) {
-                continue;
-            }
-            await walk(childFrame, [...(framePath ?? []), frameHost.selector]);
-        }
-    };
-    await walk(page.mainFrame());
-    return collected;
-}
 export const __testDomTargetCollection = {
     collectDomTargetsFromDocument,
-    collectPageSignalsFromDocument,
     inferStructuredCellVariantFromEvidence,
     locatorDomSignatureScript: LOCATOR_DOM_SIGNATURE_SCRIPT,
 };