Skip to content

fix(cu): bind Electron text to clicked element #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hqhq1025 wants to merge 1 commit into from
Closed

fix(cu): bind Electron text to clicked element #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions packages/computer-use/src/__tests__/cua-driver-backend.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ function handle(msg) {
: PAGE_FIELD_VALUE,
tagName: 'textarea',
inputType: '',
elementToken: 'element-1',
})
: PAGE_EXEC_RESULT
: 'inserted through CDP';
Expand Down Expand Up @@ -2055,6 +2056,7 @@ describe('cua-driver backend', () => {
kind: 'left_click',
editable: true,
tagName: 'textarea',
elementToken: 'element-1',
clickEvents: 1,
},
});
Expand Down Expand Up @@ -2240,6 +2242,7 @@ describe('cua-driver backend', () => {
kind: 'left_click',
editable: true,
tagName: 'textarea',
elementToken: 'element-1',
clickEvents: 1,
},
});
Expand All @@ -2265,6 +2268,7 @@ describe('cua-driver backend', () => {
kind: 'left_click',
editable: true,
tagName: 'textarea',
elementToken: 'element-1',
clickEvents: 1,
},
});
Expand All @@ -2284,6 +2288,32 @@ describe('cua-driver backend', () => {
]);
});

it('refuses Electron text ownership when the semantic click has no DOM element token', async () => {
const { backend, logPath } = makeBackend({
processKind: 'electron',
pageTarget: testPageTarget(),
emptyAx: true,
semanticPointerResult: {
supported: true,
ok: true,
kind: 'left_click',
editable: true,
tagName: 'textarea',
clickEvents: 1,
},
});
const signal = new AbortController().signal;
const click = await backend.run(
{ type: 'left_click', coordinate: { x: 600, y: 400 } } as CuAction,
signal,
);
assert.equal(click.outcome.ok, true);

const typed = await backend.run({ type: 'type', text: 'must-not-land' } as CuAction, signal);
assert.equal(typed.outcome.ok, false);
assert.equal(businessPageCalls(await readRecords(logPath)).length, 1);
});

it('native AX text readback mismatch preserves outcome_unknown', async () => {
const { backend, logPath } = makeBackend({
nativeReadbackValue: 'wrong',
Expand Down
10 changes: 7 additions & 3 deletions packages/computer-use/src/__tests__/cua-driver-page-target.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
import { describe, it } from 'node:test';

import {
CUA_INSPECT_PREPARED_ELEMENT_SCRIPT,
buildCuaInspectElementTokenScript,
buildCuaPrepareElementAtScreenPointScript,
buildCuaSemanticPointerActionScript,
parseCuaFocusedPageElement,
Expand Down Expand Up @@ -112,19 +112,23 @@ describe('semantic pointer action script', () => {
it('builds read-only element scripts and parses their JSON result', () => {
const prepare = buildCuaPrepareElementAtScreenPointScript({ x: 10, y: 20 });
assert.match(prepare, /elementFromPoint/);
assert.match(prepare, /__makaComputerUseTarget/);
assert.match(prepare, /__makaComputerUseElements/);
assert.doesNotMatch(prepare, /\.focus\s*\(/);
assert.match(CUA_INSPECT_PREPARED_ELEMENT_SCRIPT, /__makaComputerUseReadElement/);
const inspect = buildCuaInspectElementTokenScript('element-1');
assert.match(inspect, /__makaComputerUseReadElement/);
assert.match(inspect, /document\.activeElement !== element/);
assert.deepEqual(
parseCuaFocusedPageElement(JSON.stringify({
editable: true,
value: 'ready',
tagName: 'textarea',
elementToken: 'element-1',
})),
{
editable: true,
value: 'ready',
tagName: 'textarea',
elementToken: 'element-1',
},
);
});
Expand Down
21 changes: 15 additions & 6 deletions packages/computer-use/src/cua-driver-backend.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ import {
type CuaDriverJsonRpcResponse,
} from './cua-driver-service.js';
import {
CUA_INSPECT_PREPARED_ELEMENT_SCRIPT,
buildCuaPrepareElementAtScreenPointScript,
buildCuaInspectElementTokenScript,
buildCuaSemanticPointerActionScript,
parseCuaFocusedPageElement,
parseCuaSemanticPointerResult,
Expand Down Expand Up @@ -298,6 +297,7 @@ export function createCuaDriverBackend(opts: CuaDriverBackendOptions): CuDispatc
interface KeyboardTarget {
window: CuaResolvedWindow;
editable: boolean;
pageElementToken?: string;
pageTarget?: CuaResolvedPageTextTarget;
}
const targetsBySession = new Map<string, { turnId: string; target: KeyboardTarget }>();
Expand Down Expand Up @@ -1575,6 +1575,14 @@ export function createCuaDriverBackend(opts: CuaDriverBackendOptions): CuDispatc
message: 'background Electron text requires a verified text-editable click target',
};
}
const pageElementToken = target.pageElementToken;
if (!pageElementToken) {
return {
ok: false,
error: 'unsupported_action',
message: 'background Electron text requires the clicked DOM element identity',
};
}
const pageTarget = target.pageTarget ?? await (
opts.resolvePageTextTarget ?? ((input) => resolveCuaPageTextTarget(input))
)({
Expand Down Expand Up @@ -1608,9 +1616,7 @@ export function createCuaDriverBackend(opts: CuaDriverBackendOptions): CuDispatc
)?.text;
return { response, element: parseCuaFocusedPageElement(text) };
};
const prepared = await executePageScript(
buildCuaPrepareElementAtScreenPointScript(target.window.screenPoint),
);
const prepared = await executePageScript(buildCuaInspectElementTokenScript(pageElementToken));
if (prepared.response?.isError) return normalizeCuaDriverOutcome(prepared.response);
const before = prepared.element;
if (!before?.editable) {
Expand Down Expand Up @@ -1650,7 +1656,7 @@ export function createCuaDriverBackend(opts: CuaDriverBackendOptions): CuDispatc
signal,
);
if (result?.isError) return normalizeCuaDriverOutcome(result);
const inspected = await executePageScript(CUA_INSPECT_PREPARED_ELEMENT_SCRIPT);
const inspected = await executePageScript(buildCuaInspectElementTokenScript(pageElementToken));
if (inspected.response?.isError) return normalizeCuaDriverOutcome(inspected.response);
const after = inspected.element;
return after?.editable === true && after.value === text
Expand Down Expand Up @@ -2124,6 +2130,9 @@ export function createCuaDriverBackend(opts: CuaDriverBackendOptions): CuDispatc
target: {
window: win,
editable: semantic.result?.editable === true,
...(semantic.result?.elementToken
? { pageElementToken: semantic.result.elementToken }
: {}),
...(semantic.pageTarget ? { pageTarget: semantic.pageTarget } : {}),
},
});
Expand Down
45 changes: 37 additions & 8 deletions packages/computer-use/src/cua-driver-page-target.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface CuaFocusedPageElement {
value: string;
tagName: string;
inputType?: string;
elementToken?: string;
}

export interface CuaResolvedPageTextTarget {
Expand Down Expand Up @@ -41,6 +42,7 @@ export interface CuaSemanticPointerResult {
editable?: boolean;
tagName?: string;
inputType?: string;
elementToken?: string;
clickEvents?: number;
doubleClickEvents?: number;
contextMenuEvents?: number;
Expand All @@ -58,11 +60,19 @@ export interface CuaPageTargetResolverDeps {
fetchTargets?: (port: number, signal: AbortSignal) => Promise<CuaCdpPageTarget[]>;
}

export const CUA_INSPECT_PREPARED_ELEMENT_SCRIPT = `(() => {
const element = globalThis.__makaComputerUseTarget;
if (!element) return JSON.stringify({ editable: false, value: '', tagName: '' });
return JSON.stringify(globalThis.__makaComputerUseReadElement(element));
})()`;
export function buildCuaInspectElementTokenScript(elementToken: string): string {
return `(() => {
const token = ${JSON.stringify(elementToken)};
const element = globalThis.__makaComputerUseElements?.get(token);
if (!element || !element.isConnected || document.activeElement !== element) {
return JSON.stringify({ editable: false, value: '', tagName: '', elementToken: token });
}
return JSON.stringify({
...globalThis.__makaComputerUseReadElement(element),
elementToken: token
});
})()`;
}

const TEXT_INPUT_TYPES = [
'email',
Expand Down Expand Up @@ -175,11 +185,18 @@ export function buildCuaPrepareElementAtScreenPointScript(screenPoint: CuPoint):
element = element.parentElement;
}
if (!element) {
globalThis.__makaComputerUseTarget = undefined;
return JSON.stringify({ editable: false, value: '', tagName: '' });
}
globalThis.__makaComputerUseTarget = element;
return JSON.stringify(globalThis.__makaComputerUseReadElement(element));
globalThis.__makaComputerUseElements ||= new Map();
globalThis.__makaComputerUseElements.clear();
globalThis.__makaComputerUseElementSequence =
(globalThis.__makaComputerUseElementSequence || 0) + 1;
const elementToken = String(globalThis.__makaComputerUseElementSequence);
globalThis.__makaComputerUseElements.set(elementToken, element);
return JSON.stringify({
...globalThis.__makaComputerUseReadElement(element),
elementToken
});
})()`;
}

Expand Down Expand Up @@ -243,6 +260,15 @@ export function buildCuaSemanticPointerActionScript(
const checkedChanged = beforeChecked !== undefined && element.checked !== beforeChecked;
const valueChanged = beforeValue !== undefined && String(element.value ?? '') !== beforeValue;
const focusedEditable = editable && document.activeElement === element;
let elementToken;
if (focusedEditable) {
globalThis.__makaComputerUseElements ||= new Map();
globalThis.__makaComputerUseElements.clear();
globalThis.__makaComputerUseElementSequence =
(globalThis.__makaComputerUseElementSequence || 0) + 1;
elementToken = String(globalThis.__makaComputerUseElementSequence);
globalThis.__makaComputerUseElements.set(elementToken, element);
}
const ok = focusedEditable || checkedChanged || valueChanged || mutations > 0;
return JSON.stringify({
supported: true,
Expand All @@ -260,6 +286,7 @@ export function buildCuaSemanticPointerActionScript(
editable,
tagName,
inputType,
...(elementToken ? { elementToken } : {}),
clickEvents,
mutations,
...(typeof element.checked === 'boolean' ? { checked: element.checked } : {}),
Expand Down Expand Up @@ -431,6 +458,7 @@ export function parseCuaSemanticPointerResult(
...(typeof result.editable === 'boolean' ? { editable: result.editable } : {}),
...(typeof result.tagName === 'string' ? { tagName: result.tagName } : {}),
...(typeof result.inputType === 'string' ? { inputType: result.inputType } : {}),
...(typeof result.elementToken === 'string' ? { elementToken: result.elementToken } : {}),
...(typeof result.clickEvents === 'number' ? { clickEvents: result.clickEvents } : {}),
...(typeof result.doubleClickEvents === 'number' ? { doubleClickEvents: result.doubleClickEvents } : {}),
...(typeof result.contextMenuEvents === 'number' ? { contextMenuEvents: result.contextMenuEvents } : {}),
Expand Down Expand Up @@ -531,5 +559,6 @@ function focusedPageElement(value: unknown): CuaFocusedPageElement {
value: typeof result.value === 'string' ? result.value : '',
tagName: typeof result.tagName === 'string' ? result.tagName : '',
...(typeof result.inputType === 'string' ? { inputType: result.inputType } : {}),
...(typeof result.elementToken === 'string' ? { elementToken: result.elementToken } : {}),
};
}
2 changes: 1 addition & 1 deletion packages/computer-use/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export type {
CuaSemanticPointerResult,
} from './cua-driver-page-target.js';
export {
CUA_INSPECT_PREPARED_ELEMENT_SCRIPT,
buildCuaInspectElementTokenScript,
buildCuaPrepareElementAtScreenPointScript,
buildCuaSemanticPointerActionScript,
parseCuaFocusedPageElement,
Expand Down
Loading