@mercuryo-ai/agentbrowse 0.2.60 → 0.2.63

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,CA4F/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;AAmDhE,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,CA6F/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,CAsErB"}

package/dist/commands/observe-persistence.js

@@ -1,5 +1,37 @@
 import { ensureRuntimeState, markSurfaceLifecycle, markTargetLifecycle, replaceSurfacesForPage, setSurfaceAvailability, setTargetAvailability, } from '../runtime-state.js';
-import { buildSyntheticFormSurfaceId, collectSurfaceDescriptors, pushUniqueLocatorCandidate, surfaceReplacementKey, } from './observe-surfaces.js';
+import { buildExplicitSurfaceRef, buildSyntheticFormSurfaceId, collectSurfaceDescriptors, pushUniqueLocatorCandidate, surfaceReplacementKey, } from './observe-surfaces.js';
+function shouldAddProxyOwnerLocatorCandidates(target) {
+    const isSelectionLikeControl = target.controlFamily === 'select' ||
+        target.controlFamily === 'datepicker' ||
+        target.acceptancePolicy === 'selection' ||
+        target.acceptancePolicy === 'date-selection';
+    if (!isSelectionLikeControl) {
+        return false;
+    }
+    return target.states?.disabled === true || target.states?.readonly === true;
+}
+function pushProxyOwnerLocatorCandidates(locatorCandidates, target) {
+    if (!shouldAddProxyOwnerLocatorCandidates(target)) {
+        return;
+    }
+    for (const node of [
+        target.context?.item,
+        target.context?.group,
+        target.context?.container,
+        target.context?.landmark,
+    ]) {
+        const selector = node?.selector?.trim();
+        if (!selector || selector === target.selector) {
+            continue;
+        }
+        pushUniqueLocatorCandidate(locatorCandidates, {
+            strategy: 'css',
+            value: selector,
+            scope: 'root',
+            activationOwner: true,
+        });
+    }
+}
 export function toDomDescriptor(pageRef, target, surfaceRefMap) {
     const locatorCandidates = [];
     if (target.role && target.label) {
@@ -47,6 +79,7 @@ export function toDomDescriptor(pageRef, target, surfaceRefMap) {
             scope: 'root',
         });
     }
+    pushProxyOwnerLocatorCandidates(locatorCandidates, target);
     return {
         pageRef,
         framePath: target.framePath,
@@ -207,17 +240,27 @@ export function linkObservedSurfaceGraph(session, pageRef, domTargets, persisted
         if (!domTarget) {
             continue;
         }
+        const explicitSurfaceId = buildExplicitSurfaceRef(domTarget);
+        const explicitSurfaceRef = explicitSurfaceId ? surfaceRefMap.get(explicitSurfaceId) : undefined;
         const syntheticFormSurfaceId = buildSyntheticFormSurfaceId(domTarget);
         const formSurfaceRef = syntheticFormSurfaceId
             ? surfaceRefMap.get(syntheticFormSurfaceId)
             : undefined;
-        if (!formSurfaceRef ||
-            !persistedTarget.surfaceRef ||
-            persistedTarget.surfaceRef === formSurfaceRef) {
+        if (explicitSurfaceRef &&
+            persistedTarget.surfaceRef &&
+            persistedTarget.surfaceRef !== explicitSurfaceRef) {
+            parentBySurface.set(persistedTarget.surfaceRef, explicitSurfaceRef);
+            pushUniqueRef(childRefsByParent, explicitSurfaceRef, persistedTarget.surfaceRef);
+        }
+        const surfaceRefNeedingParent = explicitSurfaceRef ?? persistedTarget.surfaceRef;
+        if (!formSurfaceRef || !surfaceRefNeedingParent || surfaceRefNeedingParent === formSurfaceRef) {
+            continue;
+        }
+        if (parentBySurface.get(surfaceRefNeedingParent) === formSurfaceRef) {
             continue;
         }
-        parentBySurface.set(persistedTarget.surfaceRef, formSurfaceRef);
-        pushUniqueRef(childRefsByParent, formSurfaceRef, persistedTarget.surfaceRef);
+        parentBySurface.set(surfaceRefNeedingParent, formSurfaceRef);
+        pushUniqueRef(childRefsByParent, formSurfaceRef, surfaceRefNeedingParent);
     }
     for (const surface of Object.values(runtime.surfaces)) {
         if (surface.pageRef !== pageRef) {

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

@@ -22,12 +22,14 @@ export type GoalObserveTargetCandidate = DomObservedTarget & {
 };
 export type GoalObserveInventoryCandidate = GoalObserveTargetCandidate | GoalObserveScopeCandidate;
 type AgentFacingTargetValidationEvidence = Omit<TargetValidationEvidence, 'required'>;
+export declare function materializeObserveOutputTargets(domTargets: ReadonlyArray<DomObservedTarget>, allPersistedTargets: ReadonlyArray<TargetDescriptor>, outputTargets?: ReadonlyArray<TargetDescriptor>): TargetDescriptor[];
 type ExpandWorkflowGraphTargetOptions = {
     selectedSurfaceIds?: ReadonlySet<string>;
 };
 export declare function expandWorkflowGraphTargets(allTargets: ReadonlyArray<DomObservedTarget>, selectedTargets: ReadonlyArray<DomObservedTarget>, options?: ExpandWorkflowGraphTargetOptions): DomObservedTarget[];
-export declare function compactTargets(targets: ReadonlyArray<Pick<TargetDescriptor, 'ref' | 'kind' | 'label' | 'displayLabel' | 'placeholder' | 'inputName' | 'inputType' | 'autocomplete' | 'selection' | 'validation' | 'context' | 'semantics' | 'structure' | 'capability' | 'availability' | 'surfaceRef'>>): Array<{
+export declare function compactTargets(targets: ReadonlyArray<Pick<TargetDescriptor, 'ref' | 'pageRef' | 'kind' | 'label' | 'displayLabel' | 'placeholder' | 'inputName' | 'inputType' | 'autocomplete' | 'selection' | 'validation' | 'context' | 'semantics' | 'structure' | 'capability' | 'availability' | 'surfaceRef'>>): Array<{
     ref: string;
+    pageRef: string;
     kind?: string;
     label?: string;
     displayLabel?: string;
@@ -77,7 +79,9 @@ type BuildGroupedObserveScopesOptions = {
     pageRef: string;
     title?: string;
     scopes: ReadonlyArray<Pick<SurfaceDescriptor, 'ref' | 'kind' | 'label' | 'availability' | 'parentSurfaceRef' | 'childSurfaceRefs' | 'extractScopeLifetime'>>;
-    targets: ReadonlyArray<Pick<TargetDescriptor, 'ref' | 'kind' | 'label' | 'displayLabel' | 'placeholder' | 'inputName' | 'inputType' | 'autocomplete' | 'selection' | 'validation' | 'context' | 'semantics' | 'structure' | 'capability' | 'availability' | 'surfaceRef'>>;
+    targets: ReadonlyArray<Pick<TargetDescriptor, 'ref' | 'kind' | 'label' | 'displayLabel' | 'placeholder' | 'inputName' | 'inputType' | 'autocomplete' | 'selection' | 'validation' | 'context' | 'semantics' | 'structure' | 'capability' | 'availability' | 'surfaceRef'> & {
+        pageRef?: string;
+    }>;
 };
 export declare function buildGroupedObserveScopes(options: BuildGroupedObserveScopesOptions): CompactObservedScope[];
 export declare function compactFillableForms(forms: ReadonlyArray<PersistedFillableForm>): Array<{

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

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

package/dist/commands/observe-projection.js

@@ -1,5 +1,6 @@
+import { buildObserveDisplayLabel } from './observe-display-label.js';
 import { formGroupingKeyOf, isPrimaryFormControlTarget, normalizeSemanticDuplicateLabel, observedTargetKey, } from './observe-semantics.js';
-import { buildSyntheticFormSurfaceId, OUTPUT_LEADING_TARGET_LIMIT, summarizeContext, } from './observe-surfaces.js';
+import { buildExplicitSurfaceRef, buildSyntheticFormSurfaceId, OUTPUT_LEADING_TARGET_LIMIT, summarizeContext, } from './observe-surfaces.js';
 const WORKFLOW_ROOT_KINDS = new Set([
     'dialog',
     'form',
@@ -78,10 +79,140 @@ function compactValidationEvidence(validation) {
     };
     return Object.values(compacted).some((value) => value !== undefined) ? compacted : undefined;
 }
-function selectedSurfaceRefsOf(selectedTargets) {
-    return new Set(selectedTargets
-        .map((target) => target.surfaceRef?.trim())
-        .filter((value) => Boolean(value)));
+function normalizeOutputText(value) {
+    const normalized = value?.replace(/\s+/g, ' ').trim();
+    return normalized ? normalized : undefined;
+}
+const ACTION_STYLE_PLACEHOLDER_RE = /^(?:select|choose|pick|enter|set|search|find|click|tap|open)\b/i;
+function workflowStateBaseLabelOf(target) {
+    const label = normalizeOutputText(target.label);
+    const placeholder = normalizeOutputText(target.placeholder);
+    const shouldUseContextLabel = (target.controlFamily === 'datepicker' || target.acceptancePolicy === 'date-selection') &&
+        Boolean(label) &&
+        Boolean(placeholder) &&
+        label === placeholder &&
+        ACTION_STYLE_PLACEHOLDER_RE.test(label ?? '');
+    if (!shouldUseContextLabel) {
+        return target.label;
+    }
+    for (const node of [
+        target.context?.item,
+        target.context?.group,
+        target.context?.container,
+        target.context?.landmark,
+    ]) {
+        const contextLabel = normalizeOutputText(node?.label ?? node?.text);
+        if (!contextLabel || contextLabel === label) {
+            continue;
+        }
+        return contextLabel;
+    }
+    return target.label;
+}
+function workflowStateSignalOf(target) {
+    const displayLabel = normalizeOutputText(target.displayLabel);
+    if (displayLabel) {
+        return displayLabel;
+    }
+    if (target.controlFamily !== 'text-input' &&
+        target.controlFamily !== 'select' &&
+        target.controlFamily !== 'datepicker' &&
+        target.acceptancePolicy !== 'value-change' &&
+        target.acceptancePolicy !== 'selection' &&
+        target.acceptancePolicy !== 'date-selection') {
+        return undefined;
+    }
+    return buildObserveDisplayLabel(workflowStateBaseLabelOf(target), target.currentValue);
+}
+function workflowStateRootSelectorsOf(target) {
+    const selectors = new Set();
+    const push = (value) => {
+        const normalized = normalizeOutputText(value);
+        if (normalized) {
+            selectors.add(normalized);
+        }
+    };
+    push(target.context?.container?.selector);
+    for (const candidate of target.context?.ownerCandidates ?? []) {
+        push(candidate.selector);
+    }
+    return [...selectors];
+}
+function buildWorkflowStateSummaryByRootSelector(domTargets) {
+    const summaryPartsBySelector = new Map();
+    for (const target of domTargets) {
+        if ((target.acceptancePolicy ?? '').trim().toLowerCase() === 'submit') {
+            continue;
+        }
+        const signal = workflowStateSignalOf(target);
+        if (!signal) {
+            continue;
+        }
+        for (const selector of workflowStateRootSelectorsOf(target)) {
+            const parts = summaryPartsBySelector.get(selector) ?? [];
+            if (!parts.includes(signal)) {
+                parts.push(signal);
+                summaryPartsBySelector.set(selector, parts);
+            }
+        }
+    }
+    const summaries = new Map();
+    for (const [selector, parts] of summaryPartsBySelector.entries()) {
+        if (parts.length === 0) {
+            continue;
+        }
+        summaries.set(selector, parts.slice(0, 4).join(' / '));
+    }
+    return summaries;
+}
+function mergeWorkflowStateContext(context, summary) {
+    return {
+        ...context,
+        container: {
+            ...context?.container,
+            kind: context?.container?.kind ?? 'form',
+            label: summary,
+            text: summary,
+        },
+        hintText: summary,
+    };
+}
+export function materializeObserveOutputTargets(domTargets, allPersistedTargets, outputTargets = allPersistedTargets) {
+    const domTargetByRef = new Map();
+    allPersistedTargets.forEach((target, index) => {
+        const domTarget = domTargets[index];
+        if (target.ref && domTarget) {
+            domTargetByRef.set(target.ref, domTarget);
+        }
+    });
+    const workflowStateSummaryByRootSelector = buildWorkflowStateSummaryByRootSelector(domTargets);
+    return outputTargets.map((target) => {
+        const domTarget = domTargetByRef.get(target.ref);
+        if (!domTarget) {
+            return target;
+        }
+        let nextTarget = target;
+        const displayLabel = workflowStateSignalOf(domTarget);
+        if (displayLabel && displayLabel !== target.displayLabel) {
+            nextTarget = {
+                ...nextTarget,
+                displayLabel,
+            };
+        }
+        if ((domTarget.acceptancePolicy ?? '').trim().toLowerCase() !== 'submit') {
+            return nextTarget;
+        }
+        const summary = workflowStateRootSelectorsOf(domTarget)
+            .map((selector) => workflowStateSummaryByRootSelector.get(selector))
+            .find((value) => Boolean(value));
+        if (!summary) {
+            return nextTarget;
+        }
+        return {
+            ...nextTarget,
+            context: mergeWorkflowStateContext(nextTarget.context, summary),
+        };
+    });
 }
 function matchesSelectedSurfaceSeed(target, selectedSurfaceIds) {
     if (selectedSurfaceIds.size === 0) {
@@ -94,6 +225,79 @@ function matchesSelectedSurfaceSeed(target, selectedSurfaceIds) {
     const syntheticFormSurfaceId = buildSyntheticFormSurfaceId(target);
     return syntheticFormSurfaceId ? selectedSurfaceIds.has(syntheticFormSurfaceId) : false;
 }
+function formRootKeysOf(target) {
+    const keys = new Set();
+    const formKey = formGroupingKeyOf(target);
+    if (formKey) {
+        keys.add(formKey);
+    }
+    const surfaceKind = normalizeClusterText(target.surfaceKind);
+    const surfaceSelector = normalizeWorkflowSurfaceSelector(target.surfaceSelector);
+    if (surfaceKind === 'form' && surfaceSelector) {
+        keys.add(`selector:${surfaceSelector}`);
+    }
+    const explicitSurfaceKind = normalizeClusterText(target.explicitSurfaceKind);
+    const explicitSurfaceSelector = normalizeWorkflowSurfaceSelector(target.explicitSurfaceSelector);
+    if (explicitSurfaceKind === 'form' && explicitSurfaceSelector) {
+        keys.add(`selector:${explicitSurfaceSelector}`);
+    }
+    const formLabel = normalizeClusterText(target.context?.landmark?.kind === 'form'
+        ? (target.context.landmark.label ?? target.context.landmark.text)
+        : target.context?.group?.kind === 'form'
+            ? (target.context.group.label ?? target.context.group.text)
+            : undefined);
+    if (formLabel) {
+        keys.add(`label:${formLabel}`);
+    }
+    return [...keys];
+}
+function matchesSelectedFormSurfaceSeed(target, selectedSurfaceIds) {
+    const surfaceKind = normalizeClusterText(target.surfaceKind);
+    const surfaceRef = target.surfaceRef?.trim();
+    if (surfaceKind === 'form' && surfaceRef && selectedSurfaceIds.has(surfaceRef)) {
+        return true;
+    }
+    const explicitSurfaceKind = normalizeClusterText(target.explicitSurfaceKind);
+    if (explicitSurfaceKind === 'form') {
+        const explicitSurfaceRef = buildExplicitSurfaceRef(target);
+        if (explicitSurfaceRef && selectedSurfaceIds.has(explicitSurfaceRef)) {
+            return true;
+        }
+    }
+    const syntheticFormSurfaceId = buildSyntheticFormSurfaceId(target);
+    return syntheticFormSurfaceId ? selectedSurfaceIds.has(syntheticFormSurfaceId) : false;
+}
+function selectedFormRootKeysOf(allTargets, seededTargets, selectedSurfaceIds) {
+    const selectedFormRootKeys = new Set();
+    const seededFormRootCounts = new Map();
+    for (const target of seededTargets) {
+        for (const formRootKey of formRootKeysOf(target)) {
+            seededFormRootCounts.set(formRootKey, (seededFormRootCounts.get(formRootKey) ?? 0) + 1);
+        }
+    }
+    for (const [formRootKey, count] of seededFormRootCounts.entries()) {
+        if (count >= 2) {
+            selectedFormRootKeys.add(formRootKey);
+        }
+    }
+    for (const target of allTargets) {
+        if (!matchesSelectedFormSurfaceSeed(target, selectedSurfaceIds)) {
+            continue;
+        }
+        for (const formRootKey of formRootKeysOf(target)) {
+            selectedFormRootKeys.add(formRootKey);
+        }
+    }
+    return selectedFormRootKeys;
+}
+function matchingSelectedFormRootKey(target, selectedFormRootKeys) {
+    for (const formRootKey of formRootKeysOf(target)) {
+        if (selectedFormRootKeys.has(formRootKey)) {
+            return formRootKey;
+        }
+    }
+    return undefined;
+}
 function workflowClusterKeyOf(target) {
     const formKey = formGroupingKeyOf(target);
     if (formKey) {
@@ -103,8 +307,7 @@ function workflowClusterKeyOf(target) {
     if (surfaceRef) {
         return `surface:${surfaceRef}`;
     }
-    const surfaceSelector = normalizeWorkflowSurfaceSelector(target.surfaceSelector);
-    return surfaceSelector ? `selector:${surfaceSelector}` : undefined;
+    return undefined;
 }
 function matchesWorkflowCluster(target, clusterKey) {
     return workflowClusterKeyOf(target) === clusterKey;
@@ -137,26 +340,16 @@ function isTerminalWorkflowActionTarget(target) {
     const inputType = (target.inputType ?? '').trim().toLowerCase();
     return acceptancePolicy === 'submit' || inputType === 'submit';
 }
-function canJoinSelectedWorkflowRoot(target, selectedSurfaceRefs, selectedSurfaceSelectors) {
+function canJoinSelectedWorkflowRoot(target) {
     if (!isPrimaryFormControlTarget(target)) {
         return false;
     }
-    const surfaceRef = target.surfaceRef?.trim();
-    if (surfaceRef && selectedSurfaceRefs.has(surfaceRef)) {
-        return true;
-    }
-    const surfaceSelector = normalizeWorkflowSurfaceSelector(target.surfaceSelector);
-    if (surfaceSelector && selectedSurfaceSelectors.has(surfaceSelector)) {
-        return true;
-    }
-    const surfaceKind = normalizeClusterText(target.surfaceKind);
-    return surfaceKind === 'dialog' || surfaceKind === 'form' || (!surfaceRef && !surfaceSelector);
+    return Boolean(target.surfaceRef?.trim() || formGroupingKeyOf(target));
 }
-function shouldExpandAcrossWorkflowRoots(selectedPrimaryTargets, selectedSurfaceSelectors) {
-    if (selectedSurfaceSelectors.size > 0) {
-        return true;
-    }
-    return selectedPrimaryTargets.some((target) => Boolean(target.framePath?.length));
+function shouldExpandAcrossWorkflowRoots(selectedPrimaryTargets) {
+    return selectedPrimaryTargets.some((target) => Boolean(target.framePath?.length) ||
+        Boolean(target.surfaceRef?.trim()) ||
+        Boolean(formGroupingKeyOf(target)));
 }
 export function expandWorkflowGraphTargets(allTargets, selectedTargets, options = {}) {
     const selectedSurfaceIds = options.selectedSurfaceIds ?? new Set();
@@ -176,9 +369,9 @@ export function expandWorkflowGraphTargets(allTargets, selectedTargets, options
     }
     const seededTargets = [...expanded.values()];
     const selectedSurfaceSelectors = selectedSurfaceSelectorsOf(seededTargets);
-    const selectedSurfaceRefs = selectedSurfaceRefsOf(seededTargets);
     const selectedPrimaryTargets = seededTargets.filter(isPrimaryFormControlTarget);
     const selectedClusterCounts = new Map();
+    const selectedFormRootKeys = selectedFormRootKeysOf(allTargets, seededTargets, selectedSurfaceIds);
     for (const target of selectedPrimaryTargets) {
         const clusterKey = workflowClusterKeyOf(target);
         if (!clusterKey) {
@@ -197,6 +390,33 @@ export function expandWorkflowGraphTargets(allTargets, selectedTargets, options
         }
         expanded.set(key, target);
     }
+    const formClosureCandidates = [];
+    const formTerminalCandidateCounts = new Map();
+    for (const target of allTargets) {
+        const key = observedTargetKey(target);
+        if (expanded.has(key) || !isPrimaryFormControlTarget(target)) {
+            continue;
+        }
+        const matchedFormRootKey = matchingSelectedFormRootKey(target, selectedFormRootKeys);
+        if (!matchedFormRootKey) {
+            continue;
+        }
+        formClosureCandidates.push({
+            key,
+            target,
+            closureKey: matchedFormRootKey,
+        });
+        if (isTerminalWorkflowActionTarget(target)) {
+            formTerminalCandidateCounts.set(matchedFormRootKey, (formTerminalCandidateCounts.get(matchedFormRootKey) ?? 0) + 1);
+        }
+    }
+    for (const candidate of formClosureCandidates) {
+        if (isTerminalWorkflowActionTarget(candidate.target) &&
+            (formTerminalCandidateCounts.get(candidate.closureKey) ?? 0) > 1) {
+            continue;
+        }
+        expanded.set(candidate.key, candidate.target);
+    }
     const expandableClusterKeys = new Set([...selectedClusterCounts.entries()]
         .filter(([, count]) => count >= 2)
         .map(([clusterKey]) => clusterKey));
@@ -226,7 +446,7 @@ export function expandWorkflowGraphTargets(allTargets, selectedTargets, options
         .filter(([, count]) => count >= 2)
         .map(([workflowRootKey]) => workflowRootKey));
     if (selectedWorkflowRoots.size === 0 ||
-        !shouldExpandAcrossWorkflowRoots(expandedPrimaryTargets, selectedSurfaceSelectors)) {
+        !shouldExpandAcrossWorkflowRoots(expandedPrimaryTargets)) {
         return sortObservedTargets([...expanded.values()]);
     }
     const rootClosureCandidates = [];
@@ -240,7 +460,7 @@ export function expandWorkflowGraphTargets(allTargets, selectedTargets, options
         if (!workflowRootKey || !selectedWorkflowRoots.has(workflowRootKey)) {
             continue;
         }
-        if (!canJoinSelectedWorkflowRoot(target, selectedSurfaceRefs, selectedSurfaceSelectors)) {
+        if (!canJoinSelectedWorkflowRoot(target)) {
             continue;
         }
         rootClosureCandidates.push({ key, target, workflowRootKey });
@@ -410,6 +630,7 @@ function sanitizeGoalTargetContext(target, siblingLabelsByCluster, transientAuto
 export function compactTargets(targets) {
     return targets.map((target) => ({
         ref: target.ref,
+        pageRef: target.pageRef,
         kind: target.kind,
         label: target.label,
         displayLabel: target.displayLabel,
@@ -448,7 +669,10 @@ function compactScopeSource(targets) {
     return targets.find((target) => typeof target.source === 'string')?.source ?? 'dom';
 }
 export function buildGroupedObserveScopes(options) {
-    const compactedTargets = compactTargets(options.targets);
+    const compactedTargets = compactTargets(options.targets.map((target) => ({
+        ...target,
+        pageRef: target.pageRef ?? options.pageRef,
+    })));
     const scopeRefs = new Set(options.scopes.map((scope) => scope.ref));
     const compactedTargetsByScope = new Map();
     const leadingPageTargetRefs = new Set(compactedTargets

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

@@ -7,4 +7,5 @@ export declare function prioritizeGoalActionTargets(instruction: string, selecte
 export declare function compressSemanticallyDuplicateTargets(targets: ReadonlyArray<DomObservedTarget>): DomObservedTarget[];
 export declare function annotateDomTargets(targets: ReadonlyArray<DomObservedTarget>): DomObservedTarget[];
 export declare function orderBySurfaceCompetition(targets: ReadonlyArray<DomObservedTarget>): DomObservedTarget[];
+export declare function normalizePostEnrichmentDomTargets(targets: ReadonlyArray<DomObservedTarget>): DomObservedTarget[];
 //# sourceMappingURL=observe-semantics.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"observe-semantics.d.ts","sourceRoot":"","sources":["../../src/commands/observe-semantics.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAGhE,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAYjF;AAgED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CA6B7E;AAgBD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAQ/E;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAMnE;AA6OD,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,GAChD,iBAAiB,EAAE,CA+BrB;AAqBD,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GACxC,iBAAiB,EAAE,CAuBrB;AAqGD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,EAAE,CAmHjG;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GACxC,iBAAiB,EAAE,CAsFrB"}
+{"version":3,"file":"observe-semantics.d.ts","sourceRoot":"","sources":["../../src/commands/observe-semantics.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAA6B,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3F,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAYjF;AAgED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CA6B7E;AAgBD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAQ/E;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAMnE;AAyvBD,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,aAAa,CAAC,iBAAiB,CAAC,GAChD,iBAAiB,EAAE,CA+BrB;AAqBD,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GACxC,iBAAiB,EAAE,CAuBrB;AA4OD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,EAAE,CAQjG;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GACxC,iBAAiB,EAAE,CAsFrB;AAED,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GACxC,iBAAiB,EAAE,CAIrB"}