@nuanu-ai/agentbrowse 0.2.46 → 0.2.48

package/dist/commands/observe-inventory.js

@@ -62,7 +62,83 @@ export function inferDirectionalControlFallbackFromEvidence(evidence) {
     }
     return undefined;
 }
+export function inferDisabledStateFromSemanticEvidence(evidence) {
+    const normalize = (value) => (value ?? '').replace(/\s+/g, ' ').trim().toLowerCase();
+    const tagName = normalize(evidence.tagName);
+    const role = normalize(evidence.role);
+    const inputType = normalize(evidence.inputType);
+    const className = normalize(evidence.className);
+    const nonClassBlob = [
+        evidence.datasetText,
+        evidence.dataState,
+        evidence.dataStatus,
+        evidence.ariaLabel,
+    ]
+        .map(normalize)
+        .filter(Boolean)
+        .join(' ');
+    const fullSemanticBlob = [className, nonClassBlob].filter(Boolean).join(' ');
+    const disabledLikeRe = /(?:disabled?|disable|inactive|unselectable)\b/;
+    // Native fields should trust real DOM/ARIA/data-state signals, not styling classes
+    // like Kupibilet's `ym-disable-keys`.
+    if (tagName === 'input' || tagName === 'textarea' || tagName === 'select') {
+        return disabledLikeRe.test(nonClassBlob);
+    }
+    const collectionOrButtonLike = tagName === 'button' ||
+        role === 'button' ||
+        role === 'option' ||
+        role === 'menuitem' ||
+        role === 'listitem' ||
+        role === 'gridcell' ||
+        role === 'tab' ||
+        role === 'radio' ||
+        inputType === 'button' ||
+        inputType === 'submit' ||
+        inputType === 'reset';
+    return disabledLikeRe.test(collectionOrButtonLike ? fullSemanticBlob : nonClassBlob);
+}
 const INFER_STRUCTURED_CELL_VARIANT_HELPER_SCRIPT = `const inferStructuredCellVariantFromEvidence = ${inferStructuredCellVariantFromEvidence.toString()};`;
+const INFER_DISABLED_STATE_FROM_SEMANTIC_EVIDENCE_HELPER_SCRIPT = String.raw `
+    const inferDisabledStateFromSemanticEvidence = (evidence) => {
+      const normalizeDisabledSemanticValue = (value) =>
+        (value || '').replace(/\s+/g, ' ').trim().toLowerCase();
+
+      const tagName = normalizeDisabledSemanticValue(evidence?.tagName);
+      const role = normalizeDisabledSemanticValue(evidence?.role);
+      const inputType = normalizeDisabledSemanticValue(evidence?.inputType);
+      const className = normalizeDisabledSemanticValue(evidence?.className);
+      const nonClassBlob = [
+        evidence?.datasetText,
+        evidence?.dataState,
+        evidence?.dataStatus,
+        evidence?.ariaLabel,
+      ]
+        .map(normalizeDisabledSemanticValue)
+        .filter(Boolean)
+        .join(' ');
+      const fullSemanticBlob = [className, nonClassBlob].filter(Boolean).join(' ');
+      const disabledLikeRe = /(?:disabled?|disable|inactive|unselectable)\b/;
+
+      if (tagName === 'input' || tagName === 'textarea' || tagName === 'select') {
+        return disabledLikeRe.test(nonClassBlob);
+      }
+
+      const collectionOrButtonLike =
+        tagName === 'button' ||
+        role === 'button' ||
+        role === 'option' ||
+        role === 'menuitem' ||
+        role === 'listitem' ||
+        role === 'gridcell' ||
+        role === 'tab' ||
+        role === 'radio' ||
+        inputType === 'button' ||
+        inputType === 'submit' ||
+        inputType === 'reset';
+
+      return disabledLikeRe.test(collectionOrButtonLike ? fullSemanticBlob : nonClassBlob);
+    };
+`;
 const INFER_DIRECTIONAL_CONTROL_FALLBACK_HELPER_SCRIPT = String.raw `
     const inferDirectionalControlFallbackFromEvidence = (evidence) => {
       const normalizeDirectionalControlFallbackValue = (value) => {
@@ -140,6 +216,7 @@ function enrichObservedTargetSemantics(target) {
         inputName: target.inputName,
         inputType: target.inputType,
         autocomplete: target.autocomplete,
+        ariaAutocomplete: target.ariaAutocomplete,
         states: target.states,
     };
     const allowedActions = inferAllowedActionsFromFacts(facts);
@@ -166,6 +243,7 @@ function hasStagehandDomFacts(domFacts) {
         (domFacts.kind ||
             domFacts.role ||
             domFacts.placeholder ||
+            domFacts.ariaAutocomplete ||
             domFacts.value ||
             domFacts.text ||
             domFacts.currentValue ||
@@ -182,6 +260,9 @@ function scoreStagehandLocatorSnapshot(snapshot) {
     if (snapshot.domFacts?.placeholder) {
         score += 1;
     }
+    if (snapshot.domFacts?.ariaAutocomplete) {
+        score += 1;
+    }
     if (snapshot.domFacts?.value) {
         score += 1;
     }
@@ -282,6 +363,7 @@ const STAGEHAND_DOM_FACTS_SCRIPT = String.raw `
     inputName: element.getAttribute('name') || undefined,
     inputType: element.getAttribute('type') || undefined,
     autocomplete: element.getAttribute('autocomplete') || undefined,
+    ariaAutocomplete: element.getAttribute('aria-autocomplete') || undefined,
     value: directValue || undefined,
     text: directText || undefined,
     currentValue: currentValue || undefined,
@@ -421,9 +503,67 @@ async function collectDomTargetsFromDocument(context, options) {
 
       return undefined;
     };
+    const hiddenChoiceSiblingControlOf = (element) => {
+      if (!isHTMLElementNode(element)) return undefined;
+
+      const parent = composedParentElement(element);
+      if (!isHTMLElementNode(parent)) {
+        return undefined;
+      }
+
+      const siblingChoiceControls = Array.from(parent.children).filter((candidate) => {
+        if (candidate === element || !isHTMLInputNode(candidate)) {
+          return false;
+        }
+
+        const type = (candidate.type || '').toLowerCase();
+        if (type !== 'radio' && type !== 'checkbox') {
+          return false;
+        }
+
+        const style = window.getComputedStyle(candidate);
+        const rect = candidate.getBoundingClientRect();
+        return (
+          style.display === 'none' ||
+          style.visibility === 'hidden' ||
+          style.pointerEvents === 'none' ||
+          Number(style.opacity || '1') < 0.05 ||
+          rect.width < 4 ||
+          rect.height < 4
+        );
+      });
+
+      if (siblingChoiceControls.length !== 1) {
+        return undefined;
+      }
+
+      const visibleNonChoiceSiblings = Array.from(parent.children).filter(
+        (candidate) =>
+          candidate !== siblingChoiceControls[0] &&
+          isHTMLElementNode(candidate) &&
+          isVisible(candidate)
+      );
+
+      if (visibleNonChoiceSiblings.length !== 1 || visibleNonChoiceSiblings[0] !== element) {
+        return undefined;
+      }
+
+      return siblingChoiceControls[0];
+    };
+    const associatedChoiceControlOf = (element) => {
+      if (isHTMLInputNode(element)) {
+        const type = (element.type || '').toLowerCase();
+        if (type === 'radio' || type === 'checkbox') {
+          return element;
+        }
+      }
+
+      return labelBackedChoiceControlOf(element) || hiddenChoiceSiblingControlOf(element);
+    };
     ${TRANSPARENT_ACTIONABLE_CONTROL_HELPER_SCRIPT}
     ${OBSERVE_DOM_LABEL_CONTRACT_HELPER_SCRIPT}
     ${INFER_STRUCTURED_CELL_VARIANT_HELPER_SCRIPT}
+    ${INFER_DISABLED_STATE_FROM_SEMANTIC_EVIDENCE_HELPER_SCRIPT}
     ${INFER_DIRECTIONAL_CONTROL_FALLBACK_HELPER_SCRIPT}
 
     const normalizeDescriptorText = (value) => observedNormalizeDescriptorText(value);
@@ -602,8 +742,15 @@ async function collectDomTargetsFromDocument(context, options) {
       }
 
       const matches = Array.from(root.querySelectorAll(selector)).concat(
+        Array.from(root.querySelectorAll('*')).filter(
+          (candidate) =>
+            isHTMLElementNode(candidate) &&
+            !candidate.matches?.(selector) &&
+            !isHTMLLabelNode(candidate) &&
+            Boolean(associatedChoiceControlOf(candidate))
+        ),
         Array.from(root.querySelectorAll('label')).filter((candidate) =>
-          isHTMLElementNode(candidate) && Boolean(labelBackedChoiceControlOf(candidate))
+          isHTMLElementNode(candidate) && Boolean(associatedChoiceControlOf(candidate))
         )
       );
       for (const candidate of matches) {
@@ -761,6 +908,8 @@ async function collectDomTargetsFromDocument(context, options) {
       if (tag === 'input') {
         const inputType = inputTypeOf(element);
         if (isButtonLikeInput(element)) return 'Button';
+        if (inputType === 'checkbox') return 'Checkbox';
+        if (inputType === 'radio') return 'Radio';
         if (inputType === 'tel') return 'Phone input';
         if (inputType === 'email') return 'Email input';
         if (inputType === 'password') return 'Password input';
@@ -783,7 +932,8 @@ async function collectDomTargetsFromDocument(context, options) {
       return undefined;
     };
 
-    const inferRole = (element) => observedInferRole(element) || undefined;
+    const inferRole = (element) =>
+      isHTMLElementNode(element) ? observedInferRole(element) || undefined : undefined;
 
     const kindOf = (element) => {
       const tag = element.tagName.toLowerCase();
@@ -1068,7 +1218,7 @@ async function collectDomTargetsFromDocument(context, options) {
       const tag = element.tagName.toLowerCase();
       const role = element.getAttribute('role')?.trim().toLowerCase() || '';
       if (role) return false;
-      if (labelBackedChoiceControlOf(element)) return false;
+      if (associatedChoiceControlOf(element)) return false;
       if (
         ['body', 'main', 'form', 'button', 'input', 'textarea', 'select', 'a', 'label'].includes(
           tag
@@ -1112,9 +1262,9 @@ async function collectDomTargetsFromDocument(context, options) {
       if (hasSemanticInteractiveAncestor(element)) return false;
 
       const tag = element.tagName.toLowerCase();
-      const labelBackedChoice = labelBackedChoiceControlOf(element);
+      const associatedChoiceControl = associatedChoiceControlOf(element);
       if (['body', 'main', 'form'].includes(tag)) return false;
-      if (tag === 'label' && !labelBackedChoice) return false;
+      if (tag === 'label' && !associatedChoiceControl) return false;
 
       const style = window.getComputedStyle(element);
       if (style.pointerEvents === 'none') return false;
@@ -1144,7 +1294,12 @@ async function collectDomTargetsFromDocument(context, options) {
           clickableSemanticBlobOf(element)
         );
 
-      if (!structuredLike && !explicitClick && !labelBackedChoice && descriptorText.length < 12) {
+      if (
+        !structuredLike &&
+        !explicitClick &&
+        !associatedChoiceControl &&
+        descriptorText.length < 12
+      ) {
         return false;
       }
 
@@ -1685,7 +1840,9 @@ async function collectDomTargetsFromDocument(context, options) {
 
     const stateOf = (element) => {
       const states = {};
-      const labelBackedChoice = labelBackedChoiceControlOf(element);
+      const associatedChoiceControl = associatedChoiceControlOf(element);
+      const role = inferRole(element) || inferRole(associatedChoiceControl);
+      const tag = element.tagName.toLowerCase();
 
       const ariaDisabled = readBooleanState(element, 'aria-disabled');
       if (ariaDisabled !== undefined) states.disabled = ariaDisabled;
@@ -1732,21 +1889,31 @@ async function collectDomTargetsFromDocument(context, options) {
       const dataset = Object.values(element.dataset || {})
         .join(' ')
         .toLowerCase();
-      const semanticBlob =
-        className +
-        ' ' +
-        dataset +
-        ' ' +
-        (element.getAttribute('data-state') || '').toLowerCase() +
-        ' ' +
-        (element.getAttribute('data-status') || '').toLowerCase() +
-        ' ' +
-        (element.getAttribute('aria-label') || '').toLowerCase();
+      const dataState = (element.getAttribute('data-state') || '').toLowerCase();
+      const dataStatus = (element.getAttribute('data-status') || '').toLowerCase();
+      const ariaLabel = (element.getAttribute('aria-label') || '').toLowerCase();
+      const semanticBlob = className + ' ' + dataset + ' ' + dataState + ' ' + dataStatus + ' ' + ariaLabel;
+      const inputType = isHTMLInputNode(element) ? (element.type || '').toLowerCase() : undefined;
 
       if (/(?:selected|active|current)\b/.test(semanticBlob)) {
         if (states.selected === undefined) states.selected = true;
         if (states.current === undefined) states.current = true;
       }
+      if (
+        inferDisabledStateFromSemanticEvidence({
+          tagName: tag,
+          role,
+          inputType,
+          className,
+          datasetText: dataset,
+          dataState,
+          dataStatus,
+          ariaLabel,
+        })
+      ) {
+        states.disabled = true;
+        states.selectable = false;
+      }
       if (/(?:occupied|unavailable|sold|taken|reserved|booked)\b/.test(semanticBlob)) {
         states.occupied = true;
         states.selectable = false;
@@ -1756,8 +1923,6 @@ async function collectDomTargetsFromDocument(context, options) {
         states.premium = true;
       }
       if (states.selectable === undefined && states.disabled !== true && states.occupied !== true) {
-        const role = inferRole(element);
-        const tag = element.tagName.toLowerCase();
         if (role === 'gridcell' || tag === 'button') {
           states.selectable = true;
         }
@@ -1773,15 +1938,17 @@ async function collectDomTargetsFromDocument(context, options) {
         }
       }
 
-      if (isHTMLInputNode(labelBackedChoice)) {
-        const type = (labelBackedChoice.type || 'text').toLowerCase();
+      if (isHTMLInputNode(associatedChoiceControl)) {
+        const type = (associatedChoiceControl.type || 'text').toLowerCase();
         if (type === 'checkbox' || type === 'radio') {
-          states.checked = labelBackedChoice.indeterminate ? 'mixed' : labelBackedChoice.checked;
+          states.checked = associatedChoiceControl.indeterminate
+            ? 'mixed'
+            : associatedChoiceControl.checked;
         }
-        if (labelBackedChoice.disabled) {
+        if (associatedChoiceControl.disabled) {
           states.disabled = true;
         }
-        if (labelBackedChoice.readOnly) {
+        if (associatedChoiceControl.readOnly) {
           states.readonly = true;
         }
       }
@@ -2264,7 +2431,7 @@ async function collectDomTargetsFromDocument(context, options) {
         );
       };
 
-      const isVisualGridSquareElement = (element) => {
+      const isVisualGridTokenElement = (element) => {
         if (!isHTMLElementNode(element) || !isVisible(element)) {
           return false;
         }
@@ -2273,10 +2440,14 @@ async function collectDomTargetsFromDocument(context, options) {
         }
 
         const rect = element.getBoundingClientRect();
-        if (rect.width < 24 || rect.width > 52 || rect.height < 24 || rect.height > 52) {
+        if (rect.width < 24 || rect.height < 16 || rect.width > 88 || rect.height > 56) {
           return false;
         }
-        if (Math.abs(rect.width - rect.height) > Math.max(8, Math.min(rect.width, rect.height) * 0.35)) {
+        const text = compactText(textOf(element));
+        const axisLabelLike = /^\d{1,3}$/.test(text) || /^[a-z]$/i.test(text);
+        const shorterSide = Math.min(rect.width, rect.height);
+        const longerSide = Math.max(rect.width, rect.height);
+        if (shorterSide <= 0 || longerSide / shorterSide > (axisLabelLike ? 4.5 : 2.6)) {
           return false;
         }
         if (rect.width * rect.height < 576) {
@@ -2308,6 +2479,12 @@ async function collectDomTargetsFromDocument(context, options) {
           'svg, path, use, circle, line, polyline, polygon'
         ).length;
         const states = {};
+        const pointerEventsDisabled = style.pointerEvents === 'none';
+
+        if (pointerEventsDisabled) {
+          states.disabled = true;
+          states.selectable = false;
+        }
 
         if (glyphCount > 0 && !hasFilledBackground) {
           states.occupied = true;
@@ -2316,7 +2493,9 @@ async function collectDomTargetsFromDocument(context, options) {
           return states;
         }
 
-        states.selectable = true;
+        if (!pointerEventsDisabled) {
+          states.selectable = true;
+        }
         if (glyphCount > 0 && hasFilledBackground) {
           states.selected = true;
         }
@@ -2382,7 +2561,7 @@ async function collectDomTargetsFromDocument(context, options) {
       };
 
       const isVisualSeatCellElement = (element) => {
-        if (!isVisualGridSquareElement(element)) {
+        if (!isVisualGridTokenElement(element)) {
           return false;
         }
         if (hasSemanticInteractiveAncestor(element)) {
@@ -2395,10 +2574,6 @@ async function collectDomTargetsFromDocument(context, options) {
         }
 
         const style = window.getComputedStyle(element);
-        if (style.pointerEvents === 'none') {
-          return false;
-        }
-
         const background = parseColor(style.backgroundColor);
         const border = parseColor(style.borderColor);
         const glyphCount = element.querySelectorAll(
@@ -2486,15 +2661,66 @@ async function collectDomTargetsFromDocument(context, options) {
         return ranked[0]?.header;
       };
 
+      const groupHeadersByBand = (headers, axis) => {
+        const sorted = [...headers].sort((left, right) => {
+          const leftCenter =
+            axis === 'column'
+              ? left.rect.top + left.rect.height / 2
+              : left.rect.left + left.rect.width / 2;
+          const rightCenter =
+            axis === 'column'
+              ? right.rect.top + right.rect.height / 2
+              : right.rect.left + right.rect.width / 2;
+          return leftCenter - rightCenter;
+        });
+        const bands = [];
+
+        for (const header of sorted) {
+          const center =
+            axis === 'column'
+              ? header.rect.top + header.rect.height / 2
+              : header.rect.left + header.rect.width / 2;
+          const tolerance =
+            axis === 'column'
+              ? Math.max(14, header.rect.height)
+              : Math.max(14, header.rect.width);
+          const band = bands.find((candidate) => Math.abs(candidate.center - center) <= tolerance);
+          if (band) {
+            band.headers.push(header);
+            const centers = band.headers.map((entry) =>
+              axis === 'column'
+                ? entry.rect.top + entry.rect.height / 2
+                : entry.rect.left + entry.rect.width / 2
+            );
+            band.center = centers.reduce((sum, value) => sum + value, 0) / centers.length;
+          } else {
+            bands.push({
+              center,
+              headers: [header],
+            });
+          }
+        }
+
+        return bands
+          .map((band) => ({
+            center: band.center,
+            headers:
+              axis === 'column'
+                ? [...band.headers].sort((left, right) => left.rect.left - right.rect.left)
+                : [...band.headers].sort((left, right) => left.rect.top - right.rect.top),
+          }))
+          .sort((left, right) => left.center - right.center);
+      };
+
       const analyzeVisualSeatGridSurface = (surface) => {
         if (!isPotentialVisualGridSurface(surface)) {
           return null;
         }
 
-        const squareNodes = Array.from(surface.querySelectorAll('*')).filter((candidate) =>
-          isVisualGridSquareElement(candidate)
+        const tokenNodes = Array.from(surface.querySelectorAll('*')).filter((candidate) =>
+          isVisualGridTokenElement(candidate)
         );
-        if (squareNodes.length < 16) {
+        if (tokenNodes.length < 16) {
           return null;
         }
 
@@ -2502,7 +2728,7 @@ async function collectDomTargetsFromDocument(context, options) {
         const columnHeaders = [];
         const seatCells = [];
 
-        for (const candidate of squareNodes) {
+        for (const candidate of tokenNodes) {
           const rect = candidate.getBoundingClientRect();
           const tokenKind = visualSeatGridTokenKindOf(candidate);
           if (tokenKind === 'row') {
@@ -2533,13 +2759,14 @@ async function collectDomTargetsFromDocument(context, options) {
           return null;
         }
 
-        const topMostColumn = Math.min(...columnHeaders.map((header) => header.rect.top));
-        const topColumnHeaders = columnHeaders
-          .filter((header) => Math.abs(header.rect.top - topMostColumn) <= Math.max(14, header.rect.height))
-          .sort((left, right) => left.rect.left - right.rect.left);
-        if (topColumnHeaders.length < 4) {
+        const columnBands = groupHeadersByBand(columnHeaders, 'column').filter(
+          (band) => band.headers.length >= 4
+        );
+        if (columnBands.length === 0) {
           return null;
         }
+        const topColumnHeaders = columnBands[0]?.headers ?? [];
+        const bottomColumnHeaders = columnBands[columnBands.length - 1]?.headers ?? [];
 
         const ownerSurface = visualSeatGridOwnerSurfaceOf(surface);
         const descriptors = [];
@@ -2552,7 +2779,9 @@ async function collectDomTargetsFromDocument(context, options) {
             return Math.abs(headerCenterY - seatCenterY) <= Math.max(12, seatCell.rect.height);
           });
           const preferredRowHeaders = rowHeaderCandidates.filter(
-            (header) => header.rect.right <= seatCell.rect.left + 4
+            (header) =>
+              header.rect.right <= seatCell.rect.left + 4 ||
+              header.rect.left >= seatCell.rect.right - 4
           );
           const rowHeader =
             chooseNearestHeader(
@@ -2560,21 +2789,38 @@ async function collectDomTargetsFromDocument(context, options) {
               seatCell.rect,
               'row'
             ) || undefined;
-          const columnHeaderCandidates = topColumnHeaders.filter(
+          const topColumnHeaderCandidates = topColumnHeaders.filter(
             (header) => header.rect.bottom <= seatCell.rect.top + 12
           );
-          const columnHeader =
-            explicitSeatIdentity?.column ||
-            !topColumnHeaders.length
-              ? undefined
-              : chooseNearestHeader(
-                  columnHeaderCandidates.length > 0 ? columnHeaderCandidates : topColumnHeaders,
+          const bottomColumnHeaderCandidates = bottomColumnHeaders.filter(
+            (header) => header.rect.top >= seatCell.rect.bottom - 12
+          );
+          const topColumnHeader =
+            topColumnHeaders.length > 0
+              ? chooseNearestHeader(
+                  topColumnHeaderCandidates.length > 0 ? topColumnHeaderCandidates : topColumnHeaders,
+                  seatCell.rect,
+                  'column'
+                )
+              : undefined;
+          const bottomColumnHeader =
+            bottomColumnHeaders.length > 0
+              ? chooseNearestHeader(
+                  bottomColumnHeaderCandidates.length > 0
+                    ? bottomColumnHeaderCandidates
+                    : bottomColumnHeaders,
                   seatCell.rect,
                   'column'
-                );
+                )
+              : undefined;
+          const columnHeader =
+            explicitSeatIdentity?.column ||
+            topColumnHeader?.text ||
+            bottomColumnHeader?.text ||
+            undefined;
 
           const row = explicitSeatIdentity?.row || rowHeader?.text;
-          const column = explicitSeatIdentity?.column || columnHeader?.text;
+          const column = explicitSeatIdentity?.column || columnHeader;
           if (!row || !column) {
             continue;
           }
@@ -2615,16 +2861,16 @@ async function collectDomTargetsFromDocument(context, options) {
           return acc;
         }
 
-        const squareNodes = Array.from(root.querySelectorAll('*')).filter((candidate) =>
-          isVisualGridSquareElement(candidate)
+        const tokenNodes = Array.from(root.querySelectorAll('*')).filter((candidate) =>
+          isVisualGridTokenElement(candidate)
         );
-        if (squareNodes.length < 16) {
+        if (tokenNodes.length < 16) {
           return acc;
         }
 
         const candidateSurfaces = new Map();
-        for (const squareNode of squareNodes) {
-          let current = composedParentElement(squareNode);
+        for (const tokenNode of tokenNodes) {
+          let current = composedParentElement(tokenNode);
           let depth = 0;
           while (current && depth < 8) {
             if (isPotentialVisualGridSurface(current)) {
@@ -2748,13 +2994,13 @@ async function collectDomTargetsFromDocument(context, options) {
 
       const targets = elements.map((element, ordinal) => {
         const visualSeatGrid = visualSeatGridMeta.get(element);
-        const labelBackedChoice = labelBackedChoiceControlOf(element);
+        const associatedChoiceControl = associatedChoiceControlOf(element);
         const genericClickable = isGenericClickableElement(element);
         const bareFocusableClickTarget = isBareFocusableClickTarget(element);
         const effectiveElement = element;
         const domSignature = domSignatureOf(effectiveElement);
         const genericCardLike =
-          !labelBackedChoice &&
+          !associatedChoiceControl &&
           genericClickable &&
           (isStructuredContainer(element) ||
             /\b(card|item|result|fare|flight|ticket|offer|row)\b/.test(
@@ -2762,8 +3008,8 @@ async function collectDomTargetsFromDocument(context, options) {
             ));
         const inferredKind =
           visualSeatGrid?.kind ||
-          (labelBackedChoice
-            ? (labelBackedChoice.type || '').toLowerCase() === 'checkbox'
+          (associatedChoiceControl
+            ? (associatedChoiceControl.type || '').toLowerCase() === 'checkbox'
               ? 'checkbox'
               : 'radio'
             : genericCardLike
@@ -2777,7 +3023,9 @@ async function collectDomTargetsFromDocument(context, options) {
         const overlaySurface = composedClosest(element, overlaySurfaceSelector);
         const localSurface = localSurfaceCandidateOf(element);
         const selfSurface =
-          genericClickable && !labelBackedChoice && isStructuredContainer(element) ? element : undefined;
+          genericClickable && !associatedChoiceControl && isStructuredContainer(element)
+            ? element
+            : undefined;
         const surface =
           visualSeatGrid?.surface ||
           (isHTMLElementNode(overlaySurface) ? overlaySurface : localSurface || selfSurface);
@@ -2790,7 +3038,7 @@ async function collectDomTargetsFromDocument(context, options) {
         );
         const fallbackLabel = directionalFallbackLabel || directFallbackLabel;
         const currentValue = popupCurrentValueOf(element);
-        const role = inferRole(element);
+        const role = inferRole(element) || inferRole(associatedChoiceControl);
         const surfaceKind = visualSeatGrid?.surfaceKind || surfaceKindOf(surface);
         const fallbackSurfaceLabel =
           (visualSeatGrid?.hintText ? 'Seat map' : undefined) ||
@@ -2812,9 +3060,16 @@ async function collectDomTargetsFromDocument(context, options) {
           currentValue: currentValue || undefined,
           text: textOf(element),
           placeholder: element.getAttribute('placeholder')?.trim() || undefined,
-          inputName: element.getAttribute('name')?.trim() || undefined,
-          inputType: element.getAttribute('type')?.trim() || undefined,
+          inputName:
+            element.getAttribute('name')?.trim() ||
+            associatedChoiceControl?.getAttribute('name')?.trim() ||
+            undefined,
+          inputType:
+            element.getAttribute('type')?.trim() ||
+            associatedChoiceControl?.getAttribute('type')?.trim() ||
+            undefined,
           autocomplete: element.getAttribute('autocomplete')?.trim() || undefined,
+          ariaAutocomplete: element.getAttribute('aria-autocomplete')?.trim() || undefined,
           validation: validationEvidenceOf(element),
           title: element.getAttribute('title')?.trim() || undefined,
           testId:

package/dist/commands/observe-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observe-persistence.d.ts","sourceRoot":"","sources":["../../src/commands/observe-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AASnD,OAAO,KAAK,EAAoB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQhE,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,iBAAiB,EACzB,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAuF/B;AAED,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,aAAa,CAAC,iBAAiB,CAAC,EAC5C,OAAO,EAAE,gBAAgB,EAAE,GAC1B,IAAI,CAYN;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACzC,OAAO,CAAC,EAAE;IACR,gBAAgB,CAAC,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC;IACjE,kBAAkB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC1C,GACA;IACD,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAkEA;AAED,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,GAC5D,IAAI,CAsBN;AAUD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,aAAa,CAAC,iBAAiB,CAAC,EAC5C,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,CAAC,EACjD,cAAc,EAAE,aAAa,CAAC,iBAAiB,CAAC,EAChD,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,iBAAiB,EAAE,CAyDrB"}
+{"version":3,"file":"observe-persistence.d.ts","sourceRoot":"","sources":["../../src/commands/observe-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AASnD,OAAO,KAAK,EAAoB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQhE,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,iBAAiB,EACzB,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CA0F/B;AAED,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,aAAa,CAAC,iBAAiB,CAAC,EAC5C,OAAO,EAAE,gBAAgB,EAAE,GAC1B,IAAI,CAYN;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACzC,OAAO,CAAC,EAAE;IACR,gBAAgB,CAAC,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC;IACjE,kBAAkB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC1C,GACA;IACD,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAkEA;AAED,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,GAC5D,IAAI,CAsBN;AAUD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,aAAa,CAAC,iBAAiB,CAAC,EAC5C,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,CAAC,EACjD,cAAc,EAAE,aAAa,CAAC,iBAAiB,CAAC,EAChD,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,iBAAiB,EAAE,CAyDrB"}

package/dist/commands/observe-persistence.js

@@ -58,6 +58,9 @@ export function toDomDescriptor(pageRef, target, surfaceRefMap) {
         inputName: target.inputName,
         inputType: target.inputType,
         autocomplete: target.autocomplete,
+        ariaAutocomplete: target.ariaAutocomplete,
+        surfaceKind: target.surfaceKind,
+        controlsSurfaceSelector: target.controlsSurfaceSelector,
         validation: target.validation,
         locatorCandidates,
         semantics: target.role || target.label || target.states

package/dist/commands/observe-projection.d.ts

@@ -82,6 +82,7 @@ export declare function compactFillableForms(forms: ReadonlyArray<PersistedFilla
     fillRef: string;
     scopeRef?: string;
     purpose: string;
+    presence: 'present' | 'unknown';
     fields: Array<{
         fieldKey: string;
         targetRef: string;