@geometra/mcp 1.19.11 → 1.19.13

package/dist/server.js

@@ -1,7 +1,7 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 import { formatConnectFailureMessage, isHttpUrl, normalizeConnectTarget } from './connect-utils.js';
-import { connect, connectThroughProxy, disconnect, getSession, sendClick, sendType, sendKey, sendFileUpload, sendFieldText, sendFieldChoice, sendListboxPick, sendSelectOption, sendSetChecked, sendWheel, buildA11yTree, buildCompactUiIndex, buildPageModel, expandPageSection, buildUiDelta, hasUiDelta, nodeIdForPath, summarizeCompactIndex, summarizePageModel, summarizeUiDelta, waitForUiCondition, } from './session.js';
+import { connect, connectThroughProxy, disconnect, getSession, sendClick, sendType, sendKey, sendFileUpload, sendFieldText, sendFieldChoice, sendListboxPick, sendSelectOption, sendSetChecked, sendWheel, buildA11yTree, buildCompactUiIndex, buildPageModel, buildFormSchemas, expandPageSection, buildUiDelta, hasUiDelta, nodeIdForPath, summarizeCompactIndex, summarizePageModel, summarizeUiDelta, waitForUiCondition, } from './session.js';
 function checkedStateInput() {
     return z
         .union([z.boolean(), z.literal('mixed')])
@@ -21,6 +21,7 @@ function nodeFilterShape() {
         role: z.string().optional().describe('ARIA role to match'),
         name: z.string().optional().describe('Accessible name to match (exact or substring)'),
         text: z.string().optional().describe('Text content to search for (substring match)'),
+        contextText: z.string().optional().describe('Ancestor / prompt text to disambiguate repeated controls with the same visible name'),
         value: z.string().optional().describe('Displayed / current field value to match (substring match)'),
         checked: checkedStateInput(),
         disabled: z.boolean().optional().describe('Match disabled state'),
@@ -65,6 +66,12 @@ const fillFieldSchema = z.discriminatedUnion('kind', [
         timeoutMs: timeoutMsInput.describe('Optional action wait timeout'),
     }),
 ]);
+const formValueSchema = z.union([
+    z.string(),
+    z.boolean(),
+    z.array(z.string()).min(1),
+]);
+const formValuesRecordSchema = z.record(z.string(), formValueSchema);
 const batchActionSchema = z.discriminatedUnion('type', [
     z.object({
         type: z.literal('click'),
@@ -145,7 +152,7 @@ const batchActionSchema = z.discriminatedUnion('type', [
     }),
 ]);
 export function createServer() {
-    const server = new McpServer({ name: 'geometra', version: '1.19.11' }, { capabilities: { tools: {} } });
+    const server = new McpServer({ name: 'geometra', version: '1.19.13' }, { capabilities: { tools: {} } });
     // ── connect ──────────────────────────────────────────────────
     server.tool('geometra_connect', `Connect to a Geometra WebSocket peer, or start \`geometra-proxy\` automatically for a normal web page.
 
@@ -183,6 +190,7 @@ Chromium opens **visible** by default unless \`headless: true\`. File upload / w
             .nonnegative()
             .optional()
             .describe('Playwright slowMo (ms) on spawned proxy for easier visual following.'),
+        detail: detailInput(),
     }, async (input) => {
         const normalized = normalizeConnectTarget({ url: input.url, pageUrl: input.pageUrl });
         if (!normalized.ok)
@@ -198,13 +206,20 @@ Chromium opens **visible** by default unless \`headless: true\`. File upload / w
                     height: input.height,
                     slowMo: input.slowMo,
                 });
-                const summary = compactSessionSummary(session);
-                const inferred = target.autoCoercedFromUrl ? ' inferred from url input' : '';
-                return ok(`Started geometra-proxy and connected at ${session.url} (page: ${target.pageUrl}${inferred}). UI state:\n${summary}`);
+                return ok(JSON.stringify(connectPayload(session, {
+                    transport: 'proxy',
+                    requestedPageUrl: target.pageUrl,
+                    autoCoercedFromUrl: target.autoCoercedFromUrl,
+                    detail: input.detail,
+                }), null, input.detail === 'verbose' ? 2 : undefined));
             }
             const session = await connect(target.wsUrl);
-            const summary = compactSessionSummary(session);
-            return ok(`Connected to ${target.wsUrl}. UI state:\n${summary}`);
+            return ok(JSON.stringify(connectPayload(session, {
+                transport: 'ws',
+                requestedWsUrl: target.wsUrl,
+                autoCoercedFromUrl: false,
+                detail: input.detail,
+            }), null, input.detail === 'verbose' ? 2 : undefined));
         }
         catch (e) {
             return err(`Failed to connect: ${formatConnectFailureMessage(e, target)}`);
@@ -213,7 +228,7 @@ Chromium opens **visible** by default unless \`headless: true\`. File upload / w
     // ── query ────────────────────────────────────────────────────
     server.tool('geometra_query', `Find elements in the current Geometra UI by stable id, role, name, text content, current value, or semantic state. Returns matching elements with their exact pixel bounds {x, y, width, height}, visible in-viewport bounds, an on-screen center point, visibility / scroll-reveal hints, role, name, value, state, and tree path.
 
-This is the Geometra equivalent of Playwright's locator — but instant, structured, and with no browser. Use the returned bounds to click elements or assert on layout.`, nodeFilterShape(), async ({ id, role, name, text, value, checked, disabled, focused, selected, expanded, invalid, required, busy }) => {
+This is the Geometra equivalent of Playwright's locator — but instant, structured, and with no browser. Use the returned bounds to click elements or assert on layout.`, nodeFilterShape(), async ({ id, role, name, text, contextText, value, checked, disabled, focused, selected, expanded, invalid, required, busy }) => {
         const session = getSession();
         if (!session?.tree || !session?.layout)
             return err('Not connected. Call geometra_connect first.');
@@ -223,6 +238,7 @@ This is the Geometra equivalent of Playwright's locator — but instant, structu
             role,
             name,
             text,
+            contextText,
             value,
             checked,
             disabled,
@@ -234,12 +250,12 @@ This is the Geometra equivalent of Playwright's locator — but instant, structu
             busy,
         };
         if (!hasNodeFilter(filter))
-            return err('Provide at least one query filter (id, role, name, text, value, or state)');
+            return err('Provide at least one query filter (id, role, name, text, contextText, value, or state)');
         const matches = findNodes(a11y, filter);
         if (matches.length === 0) {
             return ok(`No elements found matching ${JSON.stringify(filter)}`);
         }
-        const result = matches.map(node => formatNode(node, a11y.bounds));
+        const result = sortA11yNodes(matches).map(node => formatNode(node, a11y, a11y.bounds));
         return ok(JSON.stringify(result, null, 2));
     });
     server.tool('geometra_wait_for', `Wait for a semantic UI condition without guessing sleep durations. Use this for slow SPA transitions, resume parsing, custom validation alerts, disabled submit buttons, and value/state confirmation before submit.
@@ -255,7 +271,7 @@ The filter matches the same fields as geometra_query. Set \`present: false\` to
             .optional()
             .default(10_000)
             .describe('Maximum time to wait before returning an error (default 10000ms)'),
-    }, async ({ id, role, name, text, value, checked, disabled, focused, selected, expanded, invalid, required, busy, present, timeoutMs }) => {
+    }, async ({ id, role, name, text, contextText, value, checked, disabled, focused, selected, expanded, invalid, required, busy, present, timeoutMs }) => {
         const session = getSession();
         if (!session?.tree || !session?.layout)
             return err('Not connected. Call geometra_connect first.');
@@ -264,6 +280,7 @@ The filter matches the same fields as geometra_query. Set \`present: false\` to
             role,
             name,
             text,
+            contextText,
             value,
             checked,
             disabled,
@@ -275,7 +292,7 @@ The filter matches the same fields as geometra_query. Set \`present: false\` to
             busy,
         };
         if (!hasNodeFilter(filter))
-            return err('Provide at least one wait filter (id, role, name, text, value, or state)');
+            return err('Provide at least one wait filter (id, role, name, text, contextText, value, or state)');
         const matchesCondition = () => {
             if (!session.tree || !session.layout)
                 return false;
@@ -296,7 +313,7 @@ The filter matches the same fields as geometra_query. Set \`present: false\` to
         if (!after)
             return ok(`Condition satisfied after ${elapsedMs}ms for ${JSON.stringify(filter)}.`);
         const matches = findNodes(after, filter);
-        const result = matches.slice(0, 8).map(node => formatNode(node, after.bounds));
+        const result = sortA11yNodes(matches).slice(0, 8).map(node => formatNode(node, after, after.bounds));
         return ok(JSON.stringify(result, null, 2));
     });
     server.tool('geometra_fill_fields', `Fill several labeled form fields in one MCP call. This is the preferred high-level primitive for long forms.
@@ -357,6 +374,85 @@ Use \`kind: "text"\` for textboxes / textareas, \`"choice"\` for selects / combo
         }
         return ok(JSON.stringify(payload, null, detail === 'verbose' ? 2 : undefined));
     });
+    server.tool('geometra_fill_form', `Fill a form from a compact values object instead of expanding sections first. This is the lowest-token happy path for standard application flows.
+
+Pass \`valuesById\` with field ids from \`geometra_form_schema\` for the most stable matching, or \`valuesByLabel\` when labels are unique enough. MCP resolves the form schema, executes the semantic field operations server-side, and returns one consolidated result.`, {
+        formId: z.string().optional().describe('Optional form id from geometra_form_schema or geometra_page_model'),
+        valuesById: formValuesRecordSchema.optional().describe('Form values keyed by stable field id from geometra_form_schema'),
+        valuesByLabel: formValuesRecordSchema.optional().describe('Form values keyed by schema field label'),
+        stopOnError: z.boolean().optional().default(true).describe('Stop at the first failing field (default true)'),
+        failOnInvalid: z
+            .boolean()
+            .optional()
+            .default(false)
+            .describe('Return an error if invalid fields remain after filling'),
+        includeSteps: z
+            .boolean()
+            .optional()
+            .default(false)
+            .describe('Include per-field step results in the JSON payload (default false for the smallest response)'),
+        detail: detailInput(),
+    }, async ({ formId, valuesById, valuesByLabel, stopOnError, failOnInvalid, includeSteps, detail }) => {
+        const session = getSession();
+        if (!session)
+            return err('Not connected. Call geometra_connect first.');
+        const entryCount = Object.keys(valuesById ?? {}).length + Object.keys(valuesByLabel ?? {}).length;
+        if (entryCount === 0) {
+            return err('Provide at least one value in valuesById or valuesByLabel');
+        }
+        const afterConnect = sessionA11y(session);
+        if (!afterConnect)
+            return err('No UI tree available for form filling');
+        const schemas = buildFormSchemas(afterConnect);
+        if (schemas.length === 0)
+            return err('No forms found in the current UI');
+        const resolution = resolveTargetFormSchema(schemas, { formId, valuesById, valuesByLabel });
+        if (!resolution.ok)
+            return err(resolution.error);
+        const schema = resolution.schema;
+        const planned = planFormFill(schema, { valuesById, valuesByLabel });
+        if (!planned.ok)
+            return err(planned.error);
+        const steps = [];
+        let stoppedAt;
+        for (let index = 0; index < planned.fields.length; index++) {
+            const field = planned.fields[index];
+            try {
+                const result = await executeFillField(session, field, detail);
+                steps.push(detail === 'verbose'
+                    ? { index, kind: field.kind, ok: true, summary: result.summary }
+                    : { index, kind: field.kind, ok: true, ...result.compact });
+            }
+            catch (e) {
+                const message = e instanceof Error ? e.message : String(e);
+                steps.push({ index, kind: field.kind, ok: false, error: message });
+                if (stopOnError) {
+                    stoppedAt = index;
+                    break;
+                }
+            }
+        }
+        const after = sessionA11y(session);
+        const signals = after ? collectSessionSignals(after) : undefined;
+        const invalidRemaining = signals?.invalidFields.length ?? 0;
+        const successCount = steps.filter(step => step.ok === true).length;
+        const errorCount = steps.length - successCount;
+        const payload = {
+            completed: stoppedAt === undefined && steps.length === planned.fields.length,
+            formId: schema.formId,
+            requestedValueCount: entryCount,
+            fieldCount: planned.fields.length,
+            successCount,
+            errorCount,
+            ...(includeSteps ? { steps } : {}),
+            ...(stoppedAt !== undefined ? { stoppedAt } : {}),
+            ...(signals ? { final: sessionSignalsPayload(signals, detail) } : {}),
+        };
+        if (failOnInvalid && invalidRemaining > 0) {
+            return err(JSON.stringify(payload, null, detail === 'verbose' ? 2 : undefined));
+        }
+        return ok(JSON.stringify(payload, null, detail === 'verbose' ? 2 : undefined));
+    });
     server.tool('geometra_run_actions', `Execute several Geometra actions in one MCP round trip and return one consolidated result. This is the preferred path for long, multi-step form fills where one-tool-per-field would otherwise create too much chatter.
 
 Supported step types: \`click\`, \`type\`, \`key\`, \`upload_files\`, \`pick_listbox_option\`, \`select_option\`, \`set_checked\`, \`wheel\`, \`wait_for\`, and \`fill_fields\`.`, {
@@ -433,18 +529,47 @@ Use this first on normal HTML pages when you want to understand the page shape w
         const model = buildPageModel(a11y, { maxPrimaryActions, maxSectionsPerKind });
         return ok(JSON.stringify(model));
     });
+    server.tool('geometra_form_schema', `Get a compact, fill-oriented schema for forms on the page. This is the preferred discovery step before geometra_fill_form.
+
+Unlike geometra_expand_section, this collapses repeated radio/button groups into single logical fields, keeps output compact, and omits layout-heavy detail by default.`, {
+        formId: z.string().optional().describe('Optional form id from geometra_page_model. If omitted, returns every form schema on the page.'),
+        maxFields: z.number().int().min(1).max(120).optional().default(80).describe('Cap returned fields per form'),
+        onlyRequiredFields: z.boolean().optional().default(false).describe('Only include required fields'),
+        onlyInvalidFields: z.boolean().optional().default(false).describe('Only include invalid fields'),
+    }, async ({ formId, maxFields, onlyRequiredFields, onlyInvalidFields }) => {
+        const session = getSession();
+        if (!session?.tree || !session?.layout)
+            return err('Not connected. Call geometra_connect first.');
+        const a11y = buildA11yTree(session.tree, session.layout);
+        const forms = buildFormSchemas(a11y, {
+            formId,
+            maxFields,
+            onlyRequiredFields,
+            onlyInvalidFields,
+        });
+        if (forms.length === 0) {
+            return err(formId ? `No form schema found for id ${formId}` : 'No forms found in the current UI');
+        }
+        return ok(JSON.stringify({ forms }));
+    });
     server.tool('geometra_expand_section', `Expand one section from geometra_page_model by stable id. Returns richer on-demand details such as headings, fields, actions, nested lists, list items, and text preview.
 
 Use this after geometra_page_model when you know which form/dialog/list/landmark you want to inspect more closely. Per-item bounds are omitted by default to save tokens; set includeBounds=true if you need them immediately.`, {
         id: z.string().describe('Section id from geometra_page_model, e.g. fm:1.0 or ls:2.1'),
         maxHeadings: z.number().int().min(1).max(20).optional().default(6).describe('Cap heading rows'),
         maxFields: z.number().int().min(1).max(40).optional().default(18).describe('Cap field rows'),
+        fieldOffset: z.number().int().min(0).optional().default(0).describe('Field row offset for long forms'),
+        onlyRequiredFields: z.boolean().optional().default(false).describe('Only include required fields'),
+        onlyInvalidFields: z.boolean().optional().default(false).describe('Only include invalid fields'),
         maxActions: z.number().int().min(1).max(30).optional().default(12).describe('Cap action rows'),
+        actionOffset: z.number().int().min(0).optional().default(0).describe('Action row offset'),
         maxLists: z.number().int().min(0).max(20).optional().default(8).describe('Cap nested lists'),
+        listOffset: z.number().int().min(0).optional().default(0).describe('Nested-list offset'),
         maxItems: z.number().int().min(0).max(50).optional().default(20).describe('Cap list items'),
+        itemOffset: z.number().int().min(0).optional().default(0).describe('List-item offset'),
         maxTextPreview: z.number().int().min(0).max(20).optional().default(6).describe('Cap text preview lines'),
         includeBounds: z.boolean().optional().default(false).describe('Include bounds for fields/actions/headings/items'),
-    }, async ({ id, maxHeadings, maxFields, maxActions, maxLists, maxItems, maxTextPreview, includeBounds }) => {
+    }, async ({ id, maxHeadings, maxFields, fieldOffset, onlyRequiredFields, onlyInvalidFields, maxActions, actionOffset, maxLists, listOffset, maxItems, itemOffset, maxTextPreview, includeBounds, }) => {
         const session = getSession();
         if (!session?.tree || !session?.layout)
             return err('Not connected. Call geometra_connect first.');
@@ -452,9 +577,15 @@ Use this after geometra_page_model when you know which form/dialog/list/landmark
         const detail = expandPageSection(a11y, id, {
             maxHeadings,
             maxFields,
+            fieldOffset,
+            onlyRequiredFields,
+            onlyInvalidFields,
             maxActions,
+            actionOffset,
             maxLists,
+            listOffset,
             maxItems,
+            itemOffset,
             maxTextPreview,
             includeBounds,
         });
@@ -462,6 +593,90 @@ Use this after geometra_page_model when you know which form/dialog/list/landmark
             return err(`No expandable section found for id ${id}`);
         return ok(JSON.stringify(detail));
     });
+    server.tool('geometra_reveal', `Scroll until a matching node is revealed. This is the generic alternative to trial-and-error wheel calls on long forms.
+
+Use the same filters as geometra_query, plus an optional match index when repeated controls share the same visible label.`, {
+        ...nodeFilterShape(),
+        index: z.number().int().min(0).optional().default(0).describe('Which matching node to reveal after sorting top-to-bottom'),
+        fullyVisible: z.boolean().optional().default(true).describe('Require the target to become fully visible (default true)'),
+        maxSteps: z.number().int().min(1).max(12).optional().default(6).describe('Maximum reveal attempts before returning an error'),
+        timeoutMs: z
+            .number()
+            .int()
+            .min(50)
+            .max(60_000)
+            .optional()
+            .default(2_500)
+            .describe('Per-scroll wait timeout (default 2500ms)'),
+    }, async ({ id, role, name, text, contextText, value, checked, disabled, focused, selected, expanded, invalid, required, busy, index, fullyVisible, maxSteps, timeoutMs }) => {
+        const session = getSession();
+        if (!session)
+            return err('Not connected. Call geometra_connect first.');
+        const matchIndex = index ?? 0;
+        const requireFullyVisible = fullyVisible ?? true;
+        const revealSteps = maxSteps ?? 6;
+        const waitTimeout = timeoutMs ?? 2_500;
+        const filter = {
+            id,
+            role,
+            name,
+            text,
+            contextText,
+            value,
+            checked,
+            disabled,
+            focused,
+            selected,
+            expanded,
+            invalid,
+            required,
+            busy,
+        };
+        if (!hasNodeFilter(filter))
+            return err('Provide at least one reveal filter (id, role, name, text, contextText, value, or state)');
+        let attempts = 0;
+        while (attempts <= revealSteps) {
+            const a11y = sessionA11y(session);
+            if (!a11y)
+                return err('No UI tree available to reveal from');
+            const matches = sortA11yNodes(findNodes(a11y, filter));
+            if (matches.length === 0) {
+                return err(`No elements found matching ${JSON.stringify(filter)}`);
+            }
+            if (matchIndex >= matches.length) {
+                return err(`Requested reveal index ${matchIndex} but only ${matches.length} matching element(s) were found`);
+            }
+            const target = matches[matchIndex];
+            const formatted = formatNode(target, a11y, a11y.bounds);
+            const visible = requireFullyVisible ? formatted.visibility.fullyVisible : formatted.visibility.intersectsViewport;
+            if (visible) {
+                return ok(JSON.stringify({
+                    revealed: true,
+                    attempts,
+                    target: formatted,
+                }, null, 2));
+            }
+            if (attempts === revealSteps) {
+                return err(JSON.stringify({
+                    revealed: false,
+                    attempts,
+                    target: formatted,
+                }, null, 2));
+            }
+            const deltaX = clamp(formatted.scrollHint.revealDeltaX, -Math.round(a11y.bounds.width * 0.75), Math.round(a11y.bounds.width * 0.75));
+            let deltaY = clamp(formatted.scrollHint.revealDeltaY, -Math.round(a11y.bounds.height * 0.85), Math.round(a11y.bounds.height * 0.85));
+            if (deltaY === 0 && !formatted.visibility.fullyVisible) {
+                deltaY = formatted.visibility.offscreenAbove ? -Math.round(a11y.bounds.height * 0.4) : Math.round(a11y.bounds.height * 0.4);
+            }
+            await sendWheel(session, deltaY, {
+                deltaX,
+                x: formatted.center.x,
+                y: formatted.center.y,
+            }, waitTimeout);
+            attempts++;
+        }
+        return err(`Failed to reveal ${JSON.stringify(filter)}`);
+    });
     // ── click ────────────────────────────────────────────────────
     server.tool('geometra_click', `Click an element in the Geometra UI. Provide either the element's bounds (from geometra_query) or raw x,y coordinates. The click is dispatched server-side via the geometry protocol — no browser, no simulated DOM events.
 
@@ -764,6 +979,18 @@ function compactSessionSummary(session) {
         return 'No UI update received';
     return sessionOverviewFromA11y(a11y);
 }
+function connectPayload(session, opts) {
+    const a11y = sessionA11y(session);
+    return {
+        connected: true,
+        transport: opts.transport,
+        wsUrl: session.url,
+        ...(a11y?.meta?.pageUrl || opts.requestedPageUrl ? { pageUrl: a11y?.meta?.pageUrl ?? opts.requestedPageUrl } : {}),
+        ...(opts.requestedWsUrl ? { requestedWsUrl: opts.requestedWsUrl } : {}),
+        ...(opts.autoCoercedFromUrl ? { autoCoercedFromUrl: true } : {}),
+        ...(opts.detail === 'verbose' && a11y ? { currentUi: sessionOverviewFromA11y(a11y) } : {}),
+    };
+}
 function sessionA11y(session) {
     if (!session.tree || !session.layout)
         return null;
@@ -973,6 +1200,120 @@ function waitStatusPayload(wait) {
 function compactFilterPayload(filter) {
     return Object.fromEntries(Object.entries(filter).filter(([, value]) => value !== undefined));
 }
+function normalizeLookupKey(value) {
+    return value.replace(/\s+/g, ' ').trim().toLowerCase();
+}
+function resolveTargetFormSchema(schemas, opts) {
+    if (opts.formId) {
+        const matched = schemas.find(schema => schema.formId === opts.formId);
+        return matched
+            ? { ok: true, schema: matched }
+            : { ok: false, error: `No form schema found for id ${opts.formId}` };
+    }
+    if (schemas.length === 1)
+        return { ok: true, schema: schemas[0] };
+    const idKeys = Object.keys(opts.valuesById ?? {});
+    const labelKeys = Object.keys(opts.valuesByLabel ?? {}).map(normalizeLookupKey);
+    const matches = schemas.filter(schema => {
+        const ids = new Set(schema.fields.map(field => field.id));
+        const labels = new Set(schema.fields.map(field => normalizeLookupKey(field.label)));
+        return idKeys.every(id => ids.has(id)) && labelKeys.every(label => labels.has(label));
+    });
+    if (matches.length === 1)
+        return { ok: true, schema: matches[0] };
+    if (matches.length === 0) {
+        return {
+            ok: false,
+            error: 'Could not infer which form to fill from the provided field ids/labels. Pass formId from geometra_form_schema.',
+        };
+    }
+    return {
+        ok: false,
+        error: 'Multiple forms match the provided field ids/labels. Pass formId from geometra_form_schema.',
+    };
+}
+function coerceChoiceValue(field, value) {
+    if (typeof value === 'string')
+        return value;
+    if (typeof value !== 'boolean')
+        return null;
+    const desired = value ? 'yes' : 'no';
+    const option = field.options?.find(option => normalizeLookupKey(option) === desired);
+    return option ?? (value ? 'Yes' : 'No');
+}
+function plannedFillInputsForField(field, value) {
+    if (field.kind === 'text') {
+        if (typeof value !== 'string')
+            return { error: `Field "${field.label}" expects a string value` };
+        return [{ kind: 'text', fieldLabel: field.label, value }];
+    }
+    if (field.kind === 'choice') {
+        const coerced = coerceChoiceValue(field, value);
+        if (!coerced)
+            return { error: `Field "${field.label}" expects a string value` };
+        return [{ kind: 'choice', fieldLabel: field.label, value: coerced }];
+    }
+    if (field.kind === 'toggle') {
+        if (typeof value !== 'boolean')
+            return { error: `Field "${field.label}" expects a boolean value` };
+        return [{ kind: 'toggle', label: field.label, checked: value, controlType: field.controlType }];
+    }
+    const selected = Array.isArray(value) ? value : typeof value === 'string' ? [value] : null;
+    if (!selected || selected.length === 0)
+        return { error: `Field "${field.label}" expects a string array value` };
+    if (!field.options || field.options.length === 0) {
+        return { error: `Field "${field.label}" does not expose checkbox options; use geometra_fill_fields for this field` };
+    }
+    const selectedKeys = new Set(selected.map(normalizeLookupKey));
+    return field.options.map(option => ({
+        kind: 'toggle',
+        label: option,
+        checked: selectedKeys.has(normalizeLookupKey(option)),
+        controlType: 'checkbox',
+    }));
+}
+function planFormFill(schema, opts) {
+    const fieldById = new Map(schema.fields.map(field => [field.id, field]));
+    const fieldsByLabel = new Map();
+    for (const field of schema.fields) {
+        const key = normalizeLookupKey(field.label);
+        const existing = fieldsByLabel.get(key);
+        if (existing)
+            existing.push(field);
+        else
+            fieldsByLabel.set(key, [field]);
+    }
+    const planned = [];
+    const seenFieldIds = new Set();
+    for (const [fieldId, value] of Object.entries(opts.valuesById ?? {})) {
+        const field = fieldById.get(fieldId);
+        if (!field)
+            return { ok: false, error: `Unknown form field id ${fieldId}. Refresh geometra_form_schema and try again.` };
+        const next = plannedFillInputsForField(field, value);
+        if ('error' in next)
+            return { ok: false, error: next.error };
+        planned.push(...next);
+        seenFieldIds.add(field.id);
+    }
+    for (const [label, value] of Object.entries(opts.valuesByLabel ?? {})) {
+        const matches = fieldsByLabel.get(normalizeLookupKey(label)) ?? [];
+        if (matches.length === 0)
+            return { ok: false, error: `Unknown form field label "${label}". Refresh geometra_form_schema and try again.` };
+        if (matches.length > 1) {
+            return { ok: false, error: `Label "${label}" is ambiguous in form ${schema.formId}. Use valuesById for this field.` };
+        }
+        const field = matches[0];
+        if (seenFieldIds.has(field.id)) {
+            return { ok: false, error: `Field "${label}" was provided in both valuesById and valuesByLabel` };
+        }
+        const next = plannedFillInputsForField(field, value);
+        if ('error' in next)
+            return { ok: false, error: next.error };
+        planned.push(...next);
+        seenFieldIds.add(field.id);
+    }
+    return { ok: true, fields: planned };
+}
 async function executeBatchAction(session, action, detail, includeSteps) {
     switch (action.type) {
         case 'click': {
@@ -1111,6 +1452,7 @@ async function executeBatchAction(session, action, detail, includeSteps) {
                 role: action.role,
                 name: action.name,
                 text: action.text,
+                contextText: action.contextText,
                 value: action.value,
                 checked: action.checked,
                 disabled: action.disabled,
@@ -1162,7 +1504,7 @@ async function executeBatchAction(session, action, detail, includeSteps) {
             const matches = findNodes(after, filter);
             if (detail === 'verbose') {
                 return {
-                    summary: JSON.stringify(matches.slice(0, 8).map(node => formatNode(node, after.bounds)), null, 2),
+                    summary: JSON.stringify(sortA11yNodes(matches).slice(0, 8).map(node => formatNode(node, after, after.bounds)), null, 2),
                     compact: {
                         present,
                         elapsedMs,
@@ -1287,7 +1629,96 @@ function textMatches(haystack, needle) {
         return false;
     return haystack.toLowerCase().includes(needle.toLowerCase());
 }
-function nodeMatchesFilter(node, filter) {
+function sortA11yNodes(nodes) {
+    return [...nodes].sort((a, b) => {
+        if (a.bounds.y !== b.bounds.y)
+            return a.bounds.y - b.bounds.y;
+        if (a.bounds.x !== b.bounds.x)
+            return a.bounds.x - b.bounds.x;
+        return a.path.length - b.path.length;
+    });
+}
+function clamp(value, min, max) {
+    return Math.min(Math.max(value, min), max);
+}
+function pathStartsWith(path, prefix) {
+    if (prefix.length > path.length)
+        return false;
+    for (let index = 0; index < prefix.length; index++) {
+        if (path[index] !== prefix[index])
+            return false;
+    }
+    return true;
+}
+function namedAncestors(root, path) {
+    const out = [];
+    let current = root;
+    for (const index of path) {
+        out.push(current);
+        if (!current.children[index])
+            break;
+        current = current.children[index];
+    }
+    return out;
+}
+function collectDescendants(node, predicate) {
+    const out = [];
+    function walk(current) {
+        for (const child of current.children) {
+            if (predicate(child))
+                out.push(child);
+            walk(child);
+        }
+    }
+    walk(node);
+    return out;
+}
+function promptContext(root, node) {
+    const ancestors = namedAncestors(root, node.path);
+    const normalizedName = (node.name ?? '').replace(/\s+/g, ' ').trim().toLowerCase();
+    for (let index = ancestors.length - 1; index >= 0; index--) {
+        const ancestor = ancestors[index];
+        const grouped = collectDescendants(ancestor, candidate => candidate.role === 'button' || candidate.role === 'radio' || candidate.role === 'checkbox').length >= 2;
+        if (!grouped && ancestor.role !== 'group' && ancestor.role !== 'form' && ancestor.role !== 'dialog')
+            continue;
+        const best = collectDescendants(ancestor, candidate => (candidate.role === 'heading' || candidate.role === 'text') &&
+            !!truncateInlineText(candidate.name, 120) &&
+            !pathStartsWith(candidate.path, node.path))
+            .filter(candidate => candidate.bounds.y <= node.bounds.y + 8)
+            .map(candidate => {
+            const text = truncateInlineText(candidate.name, 120);
+            if (!text)
+                return null;
+            if (text.toLowerCase() === normalizedName)
+                return null;
+            const dy = Math.max(0, node.bounds.y - candidate.bounds.y);
+            const dx = Math.abs(node.bounds.x - candidate.bounds.x);
+            const headingBonus = candidate.role === 'heading' ? -32 : 0;
+            return { text, score: dy * 4 + dx + headingBonus };
+        })
+            .filter((candidate) => !!candidate)
+            .sort((a, b) => a.score - b.score)[0];
+        if (best?.text)
+            return best.text;
+    }
+    return undefined;
+}
+function sectionContext(root, node) {
+    const ancestors = namedAncestors(root, node.path);
+    for (let index = ancestors.length - 1; index >= 0; index--) {
+        const ancestor = ancestors[index];
+        if (ancestor.role === 'form' || ancestor.role === 'dialog' || ancestor.role === 'main' || ancestor.role === 'navigation' || ancestor.role === 'region') {
+            const name = truncateInlineText(ancestor.name, 80);
+            if (name)
+                return name;
+        }
+    }
+    return undefined;
+}
+function nodeContextText(root, node) {
+    return [promptContext(root, node), sectionContext(root, node)].filter(Boolean).join(' | ') || undefined;
+}
+function nodeMatchesFilter(node, filter, contextText) {
     if (filter.id && nodeIdForPath(node.path) !== filter.id)
         return false;
     if (filter.role && node.role !== filter.role)
@@ -1299,6 +1730,8 @@ function nodeMatchesFilter(node, filter) {
     if (filter.text &&
         !textMatches(`${node.name ?? ''} ${node.value ?? ''} ${node.validation?.error ?? ''} ${node.validation?.description ?? ''}`.trim(), filter.text))
         return false;
+    if (!textMatches(contextText, filter.contextText))
+        return false;
     if (filter.checked !== undefined && node.state?.checked !== filter.checked)
         return false;
     if (filter.disabled !== undefined && (node.state?.disabled ?? false) !== filter.disabled)
@@ -1320,7 +1753,8 @@ function nodeMatchesFilter(node, filter) {
 export function findNodes(node, filter) {
     const matches = [];
     function walk(n) {
-        if (nodeMatchesFilter(n, filter) && hasNodeFilter(filter))
+        const contextText = filter.contextText ? nodeContextText(node, n) : undefined;
+        if (nodeMatchesFilter(n, filter, contextText) && hasNodeFilter(filter))
             matches.push(n);
         for (const child of n.children)
             walk(child);
@@ -1345,7 +1779,7 @@ function summarizeFieldLabelState(session, fieldLabel) {
         parts.push(`error=${JSON.stringify(payload.error)}`);
     return parts.join(' ');
 }
-function formatNode(node, viewport) {
+function formatNode(node, root, viewport) {
     const visibleLeft = Math.max(0, node.bounds.x);
     const visibleTop = Math.max(0, node.bounds.y);
     const visibleRight = Math.min(viewport.width, node.bounds.x + node.bounds.width);
@@ -1363,11 +1797,14 @@ function formatNode(node, viewport) {
         : Math.round(Math.min(Math.max(node.bounds.y + node.bounds.height / 2, 0), viewport.height));
     const revealDeltaX = Math.round(node.bounds.x + node.bounds.width / 2 - viewport.width / 2);
     const revealDeltaY = Math.round(node.bounds.y + node.bounds.height / 2 - viewport.height / 2);
+    const prompt = promptContext(root, node);
+    const section = sectionContext(root, node);
     return {
         id: nodeIdForPath(node.path),
         role: node.role,
         name: node.name,
         ...(node.value ? { value: node.value } : {}),
+        ...(prompt || section ? { context: { ...(prompt ? { prompt } : {}), ...(section ? { section } : {}) } } : {}),
         bounds: node.bounds,
         visibleBounds: {
             x: visibleLeft,