@geometra/proxy 1.19.20 → 1.19.23

package/dist/dom-actions.js

@@ -4,7 +4,26 @@ function delay(ms) {
     return new Promise(r => setTimeout(r, ms));
 }
 const LABELED_CONTROL_SELECTOR = 'input, select, textarea, button, [role="combobox"], [role="textbox"], [aria-haspopup="listbox"], [contenteditable="true"]';
-const OPTION_PICKER_SELECTOR = '[role="option"], [role="menuitem"], [role="treeitem"], button, li, [data-value], [aria-selected], [aria-checked]';
+const POPUP_CONTAINER_SELECTOR = '[role="listbox"], [role="menu"], [role="dialog"], [aria-modal="true"], [data-radix-popper-content-wrapper], [class*="menu"], [class*="option"], [class*="select"], [class*="dropdown"]';
+const POPUP_ROOT_SELECTOR = '[role="listbox"], [role="menu"], [role="dialog"], [aria-modal="true"], [data-radix-popper-content-wrapper], [class*="menu"], [class*="dropdown"], [class*="popover"], [class*="listbox"], [class*="options"]';
+const OPTION_PICKER_SELECTOR = [
+    '[role="option"]',
+    '[role="menuitem"]',
+    '[role="treeitem"]',
+    'button',
+    'li',
+    '[data-value]',
+    '[aria-selected]',
+    '[aria-checked]',
+    '[role="listbox"] > *',
+    '[role="menu"] > *',
+    '[class*="option"]',
+    '[class*="menu-item"]',
+    '[class*="dropdown-item"]',
+    '[class*="listbox-option"]',
+].join(', ');
+const MAX_VISIBLE_OPTION_HINTS = 12;
+const LISTBOX_KEYBOARD_FALLBACK_STEPS = 40;
 export function createFillLookupCache() {
     return {
         control: new Map(),
@@ -52,7 +71,18 @@ function writeCachedLocator(cache, kind, label, exact, fieldId, locator) {
     }
 }
 function normalizedOptionLabel(value) {
-    return value.replace(/\s+/g, ' ').trim().toLowerCase();
+    return value
+        .normalize('NFKD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .replace(/[＋﹢∔]/g, '+')
+        .replace(/[‐‑‒–—―]/g, '-')
+        .replace(/&/g, ' and ')
+        .replace(/\bplus\b/g, '+')
+        .replace(/[,/()]+/g, ' ')
+        .replace(/\s*\+\s*/g, '+')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .toLowerCase();
 }
 function prefersGroupedChoiceValue(value) {
     const normalized = normalizedOptionLabel(value);
@@ -82,6 +112,30 @@ function semanticSelectionAliases(value) {
             aliases.add(alias);
         }
     }
+    if (normalized === 'atx' || normalized.includes('austin')) {
+        for (const alias of ['atx', 'austin', 'austin tx', 'austin texas'])
+            aliases.add(alias);
+    }
+    if (normalized === 'nyc' || normalized.includes('new york')) {
+        for (const alias of ['nyc', 'new york', 'new york ny'])
+            aliases.add(alias);
+    }
+    if (normalized === 'sf' || normalized.includes('san francisco')) {
+        for (const alias of ['sf', 'san francisco', 'san francisco ca'])
+            aliases.add(alias);
+    }
+    if (normalized === 'la' || normalized.includes('los angeles')) {
+        for (const alias of ['la', 'los angeles', 'los angeles ca'])
+            aliases.add(alias);
+    }
+    if (normalized === 'dc' || normalized.includes('washington dc')) {
+        for (const alias of ['dc', 'washington dc', 'washington d c'])
+            aliases.add(alias);
+    }
+    if (normalized === 'us' || normalized === 'usa' || normalized.includes('united states')) {
+        for (const alias of ['us', 'usa', 'united states'])
+            aliases.add(alias);
+    }
     return [...aliases];
 }
 function hasNegativeSelectionCue(value) {
@@ -290,6 +344,7 @@ async function resolveMeaningfulClickTarget(locator) {
 async function findLabeledControl(frame, fieldLabel, exact, opts) {
     const directCandidates = [
         frame.getByLabel(fieldLabel, { exact }),
+        frame.getByPlaceholder(fieldLabel, { exact }),
         frame.getByRole('combobox', { name: fieldLabel, exact }),
         frame.getByRole('textbox', { name: fieldLabel, exact }),
         frame.getByRole('button', { name: fieldLabel, exact }),
@@ -354,6 +409,25 @@ async function findLabeledControl(frame, fieldLabel, exact, opts) {
                 if (text)
                     return text;
             }
+            if (el.parentElement?.tagName.toLowerCase() === 'label') {
+                const text = el.parentElement.textContent?.trim();
+                if (text)
+                    return text;
+            }
+            if ((el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) &&
+                !['checkbox', 'radio', 'file', 'button', 'submit', 'reset', 'hidden'].includes(el instanceof HTMLInputElement ? el.type : '')) {
+                const placeholder = el.getAttribute('aria-placeholder')?.trim() || el.getAttribute('placeholder')?.trim();
+                if (placeholder)
+                    return placeholder;
+            }
+            if (el instanceof HTMLInputElement && ['button', 'submit', 'reset'].includes(el.type)) {
+                const value = el.value?.trim();
+                if (value)
+                    return value;
+            }
+            const title = el.getAttribute('title')?.trim();
+            if (title)
+                return title;
             return undefined;
         }
         function controlPriority(el) {
@@ -512,6 +586,362 @@ async function typeIntoActiveEditableElement(page, text) {
     }
     return false;
 }
+async function clearEditableLocator(locator) {
+    try {
+        await locator.fill('');
+        return true;
+    }
+    catch {
+        /* fall through */
+    }
+    try {
+        await locator.click();
+        await locator.press('ControlOrMeta+A');
+        await locator.press('Backspace');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function clearActiveEditableElement(page) {
+    for (const frame of page.frames()) {
+        const cleared = await frame.evaluate(() => {
+            const active = document.activeElement;
+            if (active instanceof HTMLInputElement || active instanceof HTMLTextAreaElement) {
+                active.value = '';
+                active.dispatchEvent(new Event('input', { bubbles: true }));
+                return true;
+            }
+            if (active instanceof HTMLElement && active.isContentEditable) {
+                active.textContent = '';
+                active.dispatchEvent(new Event('input', { bubbles: true }));
+                return true;
+            }
+            return false;
+        });
+        if (cleared)
+            return true;
+    }
+    return false;
+}
+async function resetTypedListboxQuery(page, locator) {
+    if (locator && await clearEditableLocator(locator))
+        return true;
+    return clearActiveEditableElement(page);
+}
+async function resolveMeaningfulOptionClickTarget(locator) {
+    const baseHandle = await locator.elementHandle();
+    if (!baseHandle)
+        return null;
+    const targetHandle = (await baseHandle.evaluateHandle((el, payload) => {
+        function visible(node) {
+            if (!(node instanceof HTMLElement))
+                return false;
+            const rect = node.getBoundingClientRect();
+            if (rect.width <= 0 || rect.height <= 0)
+                return false;
+            const style = getComputedStyle(node);
+            return style.display !== 'none' && style.visibility !== 'hidden' && style.opacity !== '0';
+        }
+        function textFor(node) {
+            return node.getAttribute('aria-label')?.trim() || node.textContent?.trim() || '';
+        }
+        if (!(el instanceof HTMLElement))
+            return el;
+        const baseText = textFor(el);
+        const popup = el.closest(payload.popupSelector);
+        let best = el;
+        let bestScore = Number.POSITIVE_INFINITY;
+        let current = el;
+        let depth = 0;
+        while (current && depth < 6) {
+            if (visible(current)) {
+                const rect = current.getBoundingClientRect();
+                const className = typeof current.className === 'string' ? current.className.toLowerCase() : '';
+                const role = current.getAttribute('role');
+                const tag = current.tagName.toLowerCase();
+                const currentText = textFor(current);
+                const rowLike = role === 'option' ||
+                    role === 'menuitem' ||
+                    role === 'treeitem' ||
+                    tag === 'button' ||
+                    tag === 'li' ||
+                    tag === 'label' ||
+                    current.hasAttribute('data-value') ||
+                    current.hasAttribute('aria-selected') ||
+                    current.hasAttribute('aria-checked') ||
+                    className.includes('option') ||
+                    className.includes('item') ||
+                    className.includes('row') ||
+                    className.includes('menu');
+                const textAligned = !!baseText && !!currentText && (currentText === baseText || currentText.includes(baseText));
+                const insidePopup = popup ? popup.contains(current) : !!current.closest(payload.popupSelector);
+                if ((rowLike || textAligned) && insidePopup) {
+                    const score = rect.width * rect.height +
+                        depth * 600 -
+                        (rowLike ? 20_000 : 0) -
+                        (textAligned ? 8_000 : 0);
+                    if (score < bestScore) {
+                        best = current;
+                        bestScore = score;
+                    }
+                }
+            }
+            current = current.parentElement;
+            depth++;
+        }
+        return best;
+    }, { popupSelector: POPUP_CONTAINER_SELECTOR }));
+    return targetHandle;
+}
+async function collectVisibleOptionHints(page, anchor) {
+    const merged = new Map();
+    let hasPopup = false;
+    for (const frame of page.frames()) {
+        const snapshot = await frame.evaluate((payload) => {
+            function normalize(value) {
+                return value
+                    .normalize('NFKD')
+                    .replace(/[\u0300-\u036f]/g, '')
+                    .replace(/[＋﹢∔]/g, '+')
+                    .replace(/[‐‑‒–—―]/g, '-')
+                    .replace(/&/g, ' and ')
+                    .replace(/\bplus\b/g, '+')
+                    .replace(/[,/()]+/g, ' ')
+                    .replace(/\s*\+\s*/g, '+')
+                    .replace(/\s+/g, ' ')
+                    .trim()
+                    .toLowerCase();
+            }
+            function visible(el) {
+                if (!(el instanceof HTMLElement))
+                    return false;
+                const rect = el.getBoundingClientRect();
+                if (rect.width <= 0 || rect.height <= 0)
+                    return false;
+                const style = getComputedStyle(el);
+                return style.display !== 'none' && style.visibility !== 'hidden';
+            }
+            function labelFor(el) {
+                return el.getAttribute('aria-label')?.trim() || el.textContent?.trim() || '';
+            }
+            function selected(el) {
+                return (el.getAttribute('aria-selected') === 'true' ||
+                    el.getAttribute('aria-checked') === 'true' ||
+                    el.getAttribute('data-selected') === 'true' ||
+                    el.getAttribute('data-state') === 'checked' ||
+                    el.getAttribute('data-state') === 'on');
+            }
+            function highlighted(el) {
+                return (el === document.activeElement ||
+                    el.getAttribute('data-highlighted') === 'true' ||
+                    el.getAttribute('data-focus') === 'true' ||
+                    el.getAttribute('data-focused') === 'true' ||
+                    el.getAttribute('data-hovered') === 'true' ||
+                    el.getAttribute('data-state') === 'active' ||
+                    el.getAttribute('aria-current') === 'true');
+            }
+            const popupRoots = Array.from(document.querySelectorAll(payload.popupSelector)).filter((el) => visible(el));
+            const rows = [];
+            const seen = new Set();
+            for (const popup of popupRoots) {
+                const candidates = [popup, ...Array.from(popup.querySelectorAll(payload.optionSelector))];
+                for (const el of candidates) {
+                    if (!(el instanceof Element) || !visible(el))
+                        continue;
+                    const className = typeof el.className === 'string' ? el.className.toLowerCase() : '';
+                    const role = el.getAttribute('role');
+                    const tag = el.tagName.toLowerCase();
+                    const optionLike = role === 'option' ||
+                        role === 'menuitem' ||
+                        role === 'treeitem' ||
+                        tag === 'button' ||
+                        tag === 'li' ||
+                        tag === 'label' ||
+                        el.hasAttribute('data-value') ||
+                        el.hasAttribute('aria-selected') ||
+                        el.hasAttribute('aria-checked') ||
+                        className.includes('option') ||
+                        className.includes('item') ||
+                        className.includes('row') ||
+                        className.includes('menu');
+                    const label = labelFor(el);
+                    if (!label || label.length > 180)
+                        continue;
+                    if (!optionLike && !popup.contains(el.parentElement))
+                        continue;
+                    const key = normalize(label);
+                    if (!key || seen.has(key))
+                        continue;
+                    const rect = el.getBoundingClientRect();
+                    const centerX = rect.left + rect.width / 2;
+                    const centerY = rect.top + rect.height / 2;
+                    const distance = payload.anchorX === null && payload.anchorY === null
+                        ? rect.top
+                        : Math.abs(centerX - (payload.anchorX ?? centerX)) + Math.abs(centerY - (payload.anchorY ?? centerY));
+                    rows.push({
+                        label,
+                        selected: selected(el),
+                        highlighted: highlighted(el),
+                        rank: (selected(el) ? -4_000 : 0) + (highlighted(el) ? -2_000 : 0) + distance,
+                    });
+                    seen.add(key);
+                    if (rows.length >= payload.maxOptions * 3)
+                        break;
+                }
+            }
+            rows.sort((a, b) => a.rank - b.rank || a.label.localeCompare(b.label));
+            return {
+                hasPopup: popupRoots.length > 0,
+                options: rows.slice(0, payload.maxOptions),
+            };
+        }, {
+            popupSelector: POPUP_ROOT_SELECTOR,
+            optionSelector: OPTION_PICKER_SELECTOR,
+            anchorX: anchor?.x ?? null,
+            anchorY: anchor?.y ?? null,
+            maxOptions: MAX_VISIBLE_OPTION_HINTS,
+        });
+        hasPopup ||= snapshot.hasPopup;
+        for (const option of snapshot.options) {
+            const key = normalizedOptionLabel(option.label);
+            const existing = merged.get(key);
+            const rank = (option.selected ? 0 : 10) + (option.highlighted ? 0 : 5) + merged.size;
+            if (!existing || rank < existing.rank) {
+                merged.set(key, { ...option, rank });
+            }
+        }
+    }
+    const options = [...merged.values()]
+        .sort((a, b) => a.rank - b.rank || a.label.localeCompare(b.label))
+        .slice(0, MAX_VISIBLE_OPTION_HINTS)
+        .map(({ label, selected, highlighted }) => ({ label, selected, highlighted }));
+    return { hasPopup, options };
+}
+async function activeListboxOptionLabel(page, anchor) {
+    for (const frame of page.frames()) {
+        const label = await frame.evaluate((payload) => {
+            function visible(el) {
+                if (!(el instanceof HTMLElement))
+                    return false;
+                const rect = el.getBoundingClientRect();
+                if (rect.width <= 0 || rect.height <= 0)
+                    return false;
+                const style = getComputedStyle(el);
+                return style.display !== 'none' && style.visibility !== 'hidden';
+            }
+            function labelFor(el) {
+                const text = el?.getAttribute('aria-label')?.trim() || el?.textContent?.trim() || '';
+                return text || null;
+            }
+            function highlighted(el) {
+                return (el === document.activeElement ||
+                    el.getAttribute('data-highlighted') === 'true' ||
+                    el.getAttribute('data-focus') === 'true' ||
+                    el.getAttribute('data-focused') === 'true' ||
+                    el.getAttribute('data-hovered') === 'true' ||
+                    el.getAttribute('data-state') === 'active' ||
+                    el.getAttribute('aria-current') === 'true' ||
+                    el.getAttribute('aria-selected') === 'true');
+            }
+            const active = document.activeElement;
+            const activeDescendantId = active?.getAttribute('aria-activedescendant');
+            const referenced = activeDescendantId ? document.getElementById(activeDescendantId) : null;
+            if (referenced && visible(referenced))
+                return labelFor(referenced);
+            const candidates = Array.from(document.querySelectorAll(payload.optionSelector)).filter(el => visible(el) && highlighted(el));
+            let best = null;
+            for (const el of candidates) {
+                const label = labelFor(el);
+                if (!label)
+                    continue;
+                const rect = el.getBoundingClientRect();
+                const centerX = rect.left + rect.width / 2;
+                const centerY = rect.top + rect.height / 2;
+                const distance = payload.anchorX === null && payload.anchorY === null
+                    ? rect.top
+                    : Math.abs(centerX - (payload.anchorX ?? centerX)) + Math.abs(centerY - (payload.anchorY ?? centerY));
+                if (!best || distance < best.score)
+                    best = { label, score: distance };
+            }
+            return best?.label ?? null;
+        }, {
+            optionSelector: OPTION_PICKER_SELECTOR,
+            anchorX: anchor?.x ?? null,
+            anchorY: anchor?.y ?? null,
+        });
+        if (label)
+            return label;
+    }
+    return null;
+}
+async function tryKeyboardSelectVisibleOption(page, label, exact, anchor, focusLocator) {
+    if (focusLocator) {
+        try {
+            await focusLocator.click();
+        }
+        catch {
+            /* ignore */
+        }
+        try {
+            await focusLocator.focus();
+        }
+        catch {
+            /* ignore */
+        }
+        await delay(40);
+    }
+    const visible = await collectVisibleOptionHints(page, anchor);
+    if (!visible.options.some(option => selectionMatchScore(option.label, label, exact) !== null)) {
+        return null;
+    }
+    for (const key of ['ArrowDown', 'ArrowUp']) {
+        const seen = new Set();
+        for (let step = 0; step < LISTBOX_KEYBOARD_FALLBACK_STEPS; step++) {
+            await page.keyboard.press(key);
+            await delay(50);
+            const active = await activeListboxOptionLabel(page, anchor);
+            if (!active)
+                continue;
+            if (selectionMatchScore(active, label, exact) !== null) {
+                await page.keyboard.press('Enter');
+                return active;
+            }
+            const normalized = normalizedOptionLabel(active);
+            if (seen.has(normalized))
+                break;
+            seen.add(normalized);
+        }
+    }
+    return null;
+}
+function listboxErrorMessage(opts) {
+    const visibleOptions = (opts.visibleOptions ?? []).map(option => option.label).slice(0, MAX_VISIBLE_OPTION_HINTS);
+    const payload = {
+        error: 'listboxPick',
+        reason: opts.reason,
+        message: opts.reason === 'field_not_found'
+            ? `listboxPick: no visible combobox/dropdown matching field "${opts.fieldLabel ?? 'unknown'}"`
+            : opts.reason === 'selection_not_confirmed'
+                ? `listboxPick: selected "${opts.requestedLabel}" but could not confirm it on field "${opts.fieldLabel ?? 'unknown'}"`
+                : `listboxPick: no visible option matching "${opts.requestedLabel}"`,
+        requestedLabel: opts.requestedLabel,
+        ...(opts.fieldLabel ? { fieldLabel: opts.fieldLabel } : {}),
+        ...(opts.query ? { query: opts.query } : {}),
+        exact: opts.exact,
+        ...(opts.listEmpty !== undefined ? { listEmpty: opts.listEmpty } : {}),
+        ...(opts.queryReset ? { queryReset: true } : {}),
+        visibleOptionCount: visibleOptions.length,
+        visibleOptions,
+        suggestedAction: visibleOptions.length > 0
+            ? 'Retry with one of visibleOptions, or pass a shorter query/alias for searchable comboboxes.'
+            : opts.listEmpty
+                ? 'The list appears empty. Retry after clearing the search query or reopening the dropdown.'
+                : 'Open the dropdown first, or retry with fieldLabel so Geometra can anchor to the correct combobox.',
+    };
+    return JSON.stringify(payload, null, 2);
+}
 async function clickVisibleOptionCandidate(page, label, exact, anchor) {
     for (const frame of page.frames()) {
         const candidates = frame.locator(OPTION_PICKER_SELECTOR);
@@ -520,7 +950,18 @@ async function clickVisibleOptionCandidate(page, label, exact, anchor) {
             continue;
         const bestIndex = await candidates.evaluateAll((elements, payload) => {
             function normalize(value) {
-                return value.replace(/\s+/g, ' ').trim().toLowerCase();
+                return value
+                    .normalize('NFKD')
+                    .replace(/[\u0300-\u036f]/g, '')
+                    .replace(/[＋﹢∔]/g, '+')
+                    .replace(/[‐‑‒–—―]/g, '-')
+                    .replace(/&/g, ' and ')
+                    .replace(/\bplus\b/g, '+')
+                    .replace(/[,/()]+/g, ' ')
+                    .replace(/\s*\+\s*/g, '+')
+                    .replace(/\s+/g, ' ')
+                    .trim()
+                    .toLowerCase();
             }
             function aliases(value) {
                 const out = new Set([value]);
@@ -539,6 +980,30 @@ async function clickVisibleOptionCandidate(page, label, exact, anchor) {
                         out.add(alias);
                     }
                 }
+                if (value === 'atx' || value.includes('austin')) {
+                    for (const alias of ['atx', 'austin', 'austin tx', 'austin texas'])
+                        out.add(alias);
+                }
+                if (value === 'nyc' || value.includes('new york')) {
+                    for (const alias of ['nyc', 'new york', 'new york ny'])
+                        out.add(alias);
+                }
+                if (value === 'sf' || value.includes('san francisco')) {
+                    for (const alias of ['sf', 'san francisco', 'san francisco ca'])
+                        out.add(alias);
+                }
+                if (value === 'la' || value.includes('los angeles')) {
+                    for (const alias of ['la', 'los angeles', 'los angeles ca'])
+                        out.add(alias);
+                }
+                if (value === 'dc' || value.includes('washington dc')) {
+                    for (const alias of ['dc', 'washington dc', 'washington d c'])
+                        out.add(alias);
+                }
+                if (value === 'us' || value === 'usa' || value.includes('united states')) {
+                    for (const alias of ['us', 'usa', 'united states'])
+                        out.add(alias);
+                }
                 return [...out];
             }
             function hasNegativeCue(value) {
@@ -590,7 +1055,7 @@ async function clickVisibleOptionCandidate(page, label, exact, anchor) {
                 return style.display !== 'none' && style.visibility !== 'hidden';
             }
             function popupWeight(el) {
-                return el.closest('[role="listbox"], [role="menu"], [role="dialog"], [aria-modal="true"], [data-radix-popper-content-wrapper], [class*="menu"], [class*="option"], [class*="select"], [class*="dropdown"]')
+                return el.closest(payload.popupSelector)
                     ? 0
                     : 220;
             }
@@ -618,13 +1083,24 @@ async function clickVisibleOptionCandidate(page, label, exact, anchor) {
                     best = { index: i, score };
             }
             return best?.index ?? -1;
-        }, { label, exact, anchorX: anchor?.x ?? null, anchorY: anchor?.y ?? null });
+        }, {
+            label,
+            exact,
+            anchorX: anchor?.x ?? null,
+            anchorY: anchor?.y ?? null,
+            popupSelector: POPUP_CONTAINER_SELECTOR,
+        });
         if (bestIndex >= 0) {
-            const selectedText = (await candidates
-                .nth(bestIndex)
-                .evaluate(el => el.getAttribute('aria-label')?.trim() || el.textContent?.trim() || '')
-                .catch(() => '')) || null;
-            await candidates.nth(bestIndex).click();
+            const candidate = candidates.nth(bestIndex);
+            const selectedText = (await candidate.evaluate(el => el.getAttribute('aria-label')?.trim() || el.textContent?.trim() || '').catch(() => '')) || null;
+            const clickTarget = await resolveMeaningfulOptionClickTarget(candidate);
+            if (clickTarget) {
+                await clickTarget.scrollIntoViewIfNeeded();
+                await clickTarget.click();
+            }
+            else {
+                await candidate.click();
+            }
             return selectedText;
         }
     }
@@ -654,7 +1130,18 @@ async function visibleOptionIsSelected(page, label, exact, anchor) {
             continue;
         const selected = await candidates.evaluateAll((elements, payload) => {
             function normalize(value) {
-                return value.replace(/\s+/g, ' ').trim().toLowerCase();
+                return value
+                    .normalize('NFKD')
+                    .replace(/[\u0300-\u036f]/g, '')
+                    .replace(/[＋﹢∔]/g, '+')
+                    .replace(/[‐‑‒–—―]/g, '-')
+                    .replace(/&/g, ' and ')
+                    .replace(/\bplus\b/g, '+')
+                    .replace(/[,/()]+/g, ' ')
+                    .replace(/\s*\+\s*/g, '+')
+                    .replace(/\s+/g, ' ')
+                    .trim()
+                    .toLowerCase();
             }
             function aliases(value) {
                 const out = new Set([value]);
@@ -673,6 +1160,30 @@ async function visibleOptionIsSelected(page, label, exact, anchor) {
                         out.add(alias);
                     }
                 }
+                if (value === 'atx' || value.includes('austin')) {
+                    for (const alias of ['atx', 'austin', 'austin tx', 'austin texas'])
+                        out.add(alias);
+                }
+                if (value === 'nyc' || value.includes('new york')) {
+                    for (const alias of ['nyc', 'new york', 'new york ny'])
+                        out.add(alias);
+                }
+                if (value === 'sf' || value.includes('san francisco')) {
+                    for (const alias of ['sf', 'san francisco', 'san francisco ca'])
+                        out.add(alias);
+                }
+                if (value === 'la' || value.includes('los angeles')) {
+                    for (const alias of ['la', 'los angeles', 'los angeles ca'])
+                        out.add(alias);
+                }
+                if (value === 'dc' || value.includes('washington dc')) {
+                    for (const alias of ['dc', 'washington dc', 'washington d c'])
+                        out.add(alias);
+                }
+                if (value === 'us' || value === 'usa' || value.includes('united states')) {
+                    for (const alias of ['us', 'usa', 'united states'])
+                        out.add(alias);
+                }
                 return [...out];
             }
             function hasNegativeCue(value) {
@@ -750,10 +1261,19 @@ async function visibleOptionIsSelected(page, label, exact, anchor) {
     }
     return false;
 }
-async function confirmListboxSelection(page, fieldLabel, label, exact, anchor, currentHandle, selectedOptionText) {
+async function confirmListboxSelection(page, fieldLabel, label, exact, anchor, currentHandle, selectedOptionText, opts) {
+    const canTrustEditableDisplayMatch = async () => {
+        if (!opts?.editable)
+            return true;
+        if (await visibleOptionIsSelected(page, label, exact, anchor))
+            return true;
+        const popupState = await collectVisibleOptionHints(page, anchor);
+        return !popupState.hasPopup;
+    };
     if (currentHandle) {
         const immediateValues = await elementHandleDisplayedValues(currentHandle);
-        if (immediateValues.some(value => displayedValueMatchesSelection(value, label, exact, selectedOptionText))) {
+        if (immediateValues.some(value => displayedValueMatchesSelection(value, label, exact, selectedOptionText)) &&
+            await canTrustEditableDisplayMatch()) {
             return true;
         }
     }
@@ -764,8 +1284,10 @@ async function confirmListboxSelection(page, fieldLabel, label, exact, anchor, c
             if (!locator)
                 continue;
             const values = await locatorDisplayedValues(locator);
-            if (values.some(value => displayedValueMatchesSelection(value, label, exact, selectedOptionText)))
+            if (values.some(value => displayedValueMatchesSelection(value, label, exact, selectedOptionText)) &&
+                await canTrustEditableDisplayMatch()) {
                 return true;
+            }
         }
         if (await visibleOptionIsSelected(page, label, exact, anchor))
             return true;
@@ -847,6 +1369,14 @@ async function findLabeledFileInput(frame, fieldLabel, exact) {
                 if (text)
                     return text;
             }
+            if (el.parentElement?.tagName.toLowerCase() === 'label') {
+                const text = el.parentElement.textContent?.trim();
+                if (text)
+                    return text;
+            }
+            const title = el.getAttribute('title')?.trim();
+            if (title)
+                return title;
             return undefined;
         }
         for (let i = 0; i < elements.length; i++) {
@@ -998,6 +1528,7 @@ async function findLabeledEditableField(page, fieldLabel, exact, cache, fieldId)
     for (const frame of page.frames()) {
         const candidates = [
             frame.getByLabel(fieldLabel, { exact }),
+            frame.getByPlaceholder(fieldLabel, { exact }),
             frame.getByRole('textbox', { name: fieldLabel, exact }),
             frame.getByRole('combobox', { name: fieldLabel, exact }),
         ];
@@ -1205,6 +1736,20 @@ async function attemptNativeBatchFill(page, fields) {
                 if (el.parentElement?.tagName.toLowerCase() === 'label') {
                     return el.parentElement.textContent?.trim() || undefined;
                 }
+                if ((el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) &&
+                    !['checkbox', 'radio', 'file', 'button', 'submit', 'reset', 'hidden'].includes(el instanceof HTMLInputElement ? el.type : '')) {
+                    const placeholder = el.getAttribute('aria-placeholder')?.trim() || el.getAttribute('placeholder')?.trim();
+                    if (placeholder)
+                        return placeholder;
+                }
+                if (el instanceof HTMLInputElement && ['button', 'submit', 'reset'].includes(el.type)) {
+                    const value = el.value?.trim();
+                    if (value)
+                        return value;
+                }
+                const title = el.getAttribute('title')?.trim();
+                if (title)
+                    return title;
                 return undefined;
             }
             function dispatch(target) {
@@ -1524,6 +2069,23 @@ async function chooseValueFromLabeledGroup(page, fieldLabel, value, exact) {
                 if (el instanceof HTMLInputElement && el.labels && el.labels.length > 0) {
                     return el.labels[0]?.textContent?.trim() || undefined;
                 }
+                if (el.parentElement?.tagName.toLowerCase() === 'label') {
+                    return el.parentElement.textContent?.trim() || undefined;
+                }
+                if ((el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement) &&
+                    !['checkbox', 'radio', 'file', 'button', 'submit', 'reset', 'hidden'].includes(el instanceof HTMLInputElement ? el.type : '')) {
+                    const placeholder = el.getAttribute('aria-placeholder')?.trim() || el.getAttribute('placeholder')?.trim();
+                    if (placeholder)
+                        return placeholder;
+                }
+                if (el instanceof HTMLInputElement && ['button', 'submit', 'reset'].includes(el.type)) {
+                    const value = el.value?.trim();
+                    if (value)
+                        return value;
+                }
+                const title = el.getAttribute('title')?.trim();
+                if (title)
+                    return title;
                 return undefined;
             }
             function choiceLabel(el) {
@@ -1806,16 +2368,34 @@ export async function pickListboxOption(page, label, opts) {
     let attemptedSelection = false;
     let selectedOptionText;
     let openedHandle;
+    let openedLocator;
+    let openedEditable = false;
+    let queryUsed;
+    let queryReset = false;
     if (opts?.fieldLabel) {
-        const opened = await openDropdownControl(page, opts.fieldLabel, exact, opts.cache, opts.fieldId);
+        let opened;
+        try {
+            opened = await openDropdownControl(page, opts.fieldLabel, exact, opts.cache, opts.fieldId);
+        }
+        catch {
+            throw new Error(listboxErrorMessage({
+                reason: 'field_not_found',
+                requestedLabel: label,
+                fieldLabel: opts.fieldLabel,
+                query: opts?.query,
+                exact,
+            }));
+        }
         anchor = { x: opened.anchorX, y: opened.anchorY };
         openedHandle = opened.handle;
-        const query = opts.query ?? label;
-        if (query && opened.editable) {
-            await typeIntoEditableLocator(page, opened.locator, query);
+        openedLocator = opened.locator;
+        openedEditable = opened.editable;
+        queryUsed = opts.query ?? label;
+        if (queryUsed && opened.editable) {
+            await typeIntoEditableLocator(page, opened.locator, queryUsed);
             await delay(80);
         }
-        else if (query && await typeIntoActiveEditableElement(page, query)) {
+        else if (queryUsed && await typeIntoActiveEditableElement(page, queryUsed)) {
             await delay(80);
         }
     }
@@ -1824,22 +2404,66 @@ export async function pickListboxOption(page, label, opts) {
         anchor = { x: opts.openX, y: opts.openY };
         await delay(120);
     }
-    const deadline = Date.now() + 3000;
-    while (Date.now() < deadline) {
+    const attemptClickSelection = async () => {
         selectedOptionText = (await clickVisibleOptionCandidate(page, label, exact, anchor)) ?? undefined;
-        if (selectedOptionText) {
-            attemptedSelection = true;
-            if (!opts?.fieldLabel ||
-                await confirmListboxSelection(page, opts.fieldLabel, label, exact, anchor, openedHandle, selectedOptionText)) {
+        if (!selectedOptionText)
+            return false;
+        attemptedSelection = true;
+        if (!opts?.fieldLabel ||
+            await confirmListboxSelection(page, opts.fieldLabel, label, exact, anchor, openedHandle, selectedOptionText, {
+                editable: openedEditable,
+            })) {
+            return true;
+        }
+        return false;
+    };
+    if (await attemptClickSelection())
+        return;
+    let visibleHints = await collectVisibleOptionHints(page, anchor);
+    const visibleMatchExists = visibleHints.options.some(option => selectionMatchScore(option.label, label, exact) !== null);
+    if (queryUsed && !visibleMatchExists) {
+        queryReset = await resetTypedListboxQuery(page, openedLocator);
+        if (queryReset) {
+            await delay(80);
+            if (await attemptClickSelection())
                 return;
-            }
+            visibleHints = await collectVisibleOptionHints(page, anchor);
         }
-        await delay(120);
     }
-    if (opts?.fieldLabel && attemptedSelection) {
-        throw new Error(`listboxPick: selected "${label}" but could not confirm it on field "${opts.fieldLabel}"`);
+    const keyboardSelection = await tryKeyboardSelectVisibleOption(page, label, exact, anchor, openedLocator);
+    if (keyboardSelection) {
+        selectedOptionText = keyboardSelection;
+        attemptedSelection = true;
+        if (!opts?.fieldLabel ||
+            await confirmListboxSelection(page, opts.fieldLabel, label, exact, anchor, openedHandle, selectedOptionText, {
+                editable: openedEditable,
+            })) {
+            return;
+        }
     }
-    throw new Error(`listboxPick: no visible option matching "${label}"`);
+    visibleHints = await collectVisibleOptionHints(page, anchor);
+    if (opts?.fieldLabel && attemptedSelection) {
+        throw new Error(listboxErrorMessage({
+            reason: 'selection_not_confirmed',
+            requestedLabel: label,
+            fieldLabel: opts.fieldLabel,
+            query: queryUsed,
+            exact,
+            visibleOptions: visibleHints.options,
+            listEmpty: visibleHints.hasPopup && visibleHints.options.length === 0,
+            queryReset,
+        }));
+    }
+    throw new Error(listboxErrorMessage({
+        reason: 'no_visible_option_match',
+        requestedLabel: label,
+        fieldLabel: opts?.fieldLabel,
+        query: queryUsed,
+        exact,
+        visibleOptions: visibleHints.options,
+        listEmpty: visibleHints.hasPopup && visibleHints.options.length === 0,
+        queryReset,
+    }));
 }
 /**
  * Set a checkbox/radio by accessible label instead of brittle coordinate clicks.