@geometra/mcp 1.26.0 → 1.28.0

package/dist/__tests__/server-batch-results.test.js

@@ -967,7 +967,7 @@ describe('query and reveal tools', () => {
         });
     });
     it('reveals an offscreen target with semantic scrolling instead of requiring manual wheels', async () => {
-        const handler = getToolHandler('geometra_reveal');
+        const handler = getToolHandler('geometra_scroll_to');
         mockState.currentA11yRoot = node('group', undefined, {
             bounds: { x: 0, y: 0, width: 1280, height: 800 },
             meta: { pageUrl: 'https://jobs.example.com/application', scrollX: 0, scrollY: 0 },
@@ -1024,7 +1024,7 @@ describe('query and reveal tools', () => {
         });
     });
     it('auto-scales reveal steps for tall forms when maxSteps is omitted', async () => {
-        const handler = getToolHandler('geometra_reveal');
+        const handler = getToolHandler('geometra_scroll_to');
         let scrollY = 0;
         const setTree = () => {
             mockState.currentA11yRoot = node('group', undefined, {

package/dist/index.js

@@ -8,7 +8,7 @@ function cleanupActiveSession() {
         return;
     cleanedUp = true;
     try {
-        disconnect();
+        disconnect({ closeProxy: true });
     }
     catch {
         /* ignore */

package/dist/server.js

@@ -329,8 +329,8 @@ Chromium opens **visible** by default unless \`headless: true\`. File upload / w
         returnForms: z
             .boolean()
             .optional()
-            .default(false)
-            .describe('Include compact form schema discovery in the connect response so form flows can start in one turn.'),
+            .default(true)
+            .describe('Include compact form schema discovery in the connect response (default true). Set false to skip form discovery for non-form workflows.'),
         returnPageModel: z
             .boolean()
             .optional()
@@ -753,6 +753,17 @@ Use \`kind: "text"\` for textboxes / textareas, \`"choice"\` for selects / combo
             }
             catch (e) {
                 const message = e instanceof Error ? e.message : String(e);
+                // Retry once for transient selection failures
+                if (message.includes('selection_not_confirmed')) {
+                    try {
+                        const retryResult = await executeFillField(session, field, detail);
+                        steps.push(detail === 'verbose'
+                            ? { index, kind: field.kind, ok: true, summary: retryResult.summary, retried: true }
+                            : { index, kind: field.kind, ok: true, ...retryResult.compact, retried: true });
+                        continue;
+                    }
+                    catch { /* fall through to error handling */ }
+                }
                 const suggestion = isResolvedFillFieldInput(field) ? suggestRecovery(field, message) : undefined;
                 steps.push({ index, kind: field.kind, ok: false, error: message, ...(suggestion ? { suggestion } : {}) });
                 if (stopOnError) {
@@ -901,6 +912,7 @@ Pass \`valuesById\` with field ids from \`geometra_form_schema\` for the most st
         });
         if (schemas.length === 0)
             return err('No forms found in the current UI');
+        const entryUrl = afterConnect?.meta?.pageUrl;
         const resolution = resolveTargetFormSchema(schemas, { formId, valuesById, valuesByLabel });
         if (!resolution.ok)
             return err(resolution.error);
@@ -1053,6 +1065,22 @@ Pass \`valuesById\` with field ids from \`geometra_form_schema\` for the most st
             ...(verification ? { verification } : {}),
             ...(signals ? { final: sessionSignalsPayload(signals, detail) } : {}),
         };
+        // Detect page navigation after fill (e.g. multi-page form submission)
+        const afterUrl = after?.meta?.pageUrl;
+        if (afterUrl && entryUrl && afterUrl !== entryUrl) {
+            ;
+            payload.navigated = true;
+            payload.afterUrl = afterUrl;
+            const model = after ? buildPageModel(after) : undefined;
+            if (model) {
+                ;
+                payload.pageModel = summarizePageModel(model);
+                if (model.captcha)
+                    payload.captcha = model.captcha;
+                if (model.verification)
+                    payload.verification = model.verification;
+            }
+        }
         recordWorkflowFill(session, schema.formId, schema.name, valuesById, valuesByLabel, invalidRemaining, planned.fields.length);
         if (failOnInvalid && invalidRemaining > 0) {
             return err(JSON.stringify(payload, null, detail === 'verbose' ? 2 : undefined));
@@ -1307,9 +1335,9 @@ 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.
+    server.tool('geometra_scroll_to', `Scroll the page until a matching element is visible. Use this to reach off-screen elements like Submit buttons at the bottom of long forms, or fields below the fold.
 
-Use the same filters as geometra_query, plus an optional match index when repeated controls share the same visible label.`, {
+This is the preferred approach for scrolling — no need to guess pixel offsets or wheel deltas. Accepts the same filters as geometra_query, plus an optional match index when repeated controls share the same visible label. Auto-scales scroll steps based on distance.`, {
         ...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)'),

package/dist/session.d.ts

@@ -130,6 +130,11 @@ export interface CaptchaDetection {
     type?: 'recaptcha' | 'hcaptcha' | 'turnstile' | 'cloudflare-challenge' | 'unknown';
     hint?: string;
 }
+export interface VerificationDetection {
+    detected: boolean;
+    type?: 'email_code' | 'sms_code' | 'security_question' | 'unknown';
+    hint?: string;
+}
 export interface PageModel {
     viewport: {
         width: number;
@@ -144,6 +149,7 @@ export interface PageModel {
         focusableCount: number;
     };
     captcha?: CaptchaDetection;
+    verification?: VerificationDetection;
     primaryActions: PagePrimaryAction[];
     landmarks: PageLandmark[];
     forms: PageFormModel[];

package/dist/session.js

@@ -8,6 +8,9 @@ let nextSessionId = 0;
 function generateSessionId() { return `s${++nextSessionId}`; }
 let reusableProxies = [];
 const REUSABLE_PROXY_POOL_LIMIT = 6;
+/** Close idle reusable proxies after 5 minutes of inactivity. */
+const REUSABLE_PROXY_IDLE_TTL_MS = 5 * 60 * 1000;
+let idleProxyTimer = null;
 const trackedReusableProxyChildren = new WeakSet();
 const ACTION_UPDATE_TIMEOUT_MS = 2000;
 const LISTBOX_UPDATE_TIMEOUT_MS = 4500;
@@ -66,9 +69,11 @@ function closeReusableProxy(entry) {
         catch {
             /* ignore */
         }
+        ensureIdleProxyTimer();
         return;
     }
     void entry.runtime?.close().catch(() => { });
+    ensureIdleProxyTimer();
 }
 function closeReusableProxies() {
     clearReusableProxiesIfExited();
@@ -87,6 +92,25 @@ function closeReusableProxies() {
         void entry.runtime?.close().catch(() => { });
     }
 }
+function evictIdleReusableProxies() {
+    clearReusableProxiesIfExited();
+    const now = Date.now();
+    const stale = reusableProxies.filter(entry => !reusableProxyEntryIsActive(entry) && (now - entry.lastUsedAt) > REUSABLE_PROXY_IDLE_TTL_MS);
+    for (const entry of stale) {
+        closeReusableProxy(entry);
+    }
+    ensureIdleProxyTimer();
+}
+function ensureIdleProxyTimer() {
+    if (reusableProxies.length > 0 && !idleProxyTimer) {
+        idleProxyTimer = setInterval(evictIdleReusableProxies, 60_000);
+        idleProxyTimer.unref();
+    }
+    else if (reusableProxies.length === 0 && idleProxyTimer) {
+        clearInterval(idleProxyTimer);
+        idleProxyTimer = null;
+    }
+}
 function enforceReusableProxyPoolLimit() {
     clearReusableProxiesIfExited();
     if (reusableProxies.length <= REUSABLE_PROXY_POOL_LIMIT)
@@ -139,6 +163,7 @@ function setReusableProxy(proxy, wsUrl, opts) {
             child.once('error', clear);
         }
         enforceReusableProxyPoolLimit();
+        ensureIdleProxyTimer();
         return;
     }
     reusableProxies.push({
@@ -153,6 +178,7 @@ function setReusableProxy(proxy, wsUrl, opts) {
         lastUsedAt: now,
     });
     enforceReusableProxyPoolLimit();
+    ensureIdleProxyTimer();
 }
 function rememberReusableProxyPageUrl(session) {
     const entry = reusableProxyEntryForSession(session);
@@ -552,6 +578,21 @@ export function connect(url, opts) {
             cachedFormSchemas: new Map(),
         };
         let resolved = false;
+        let lastMessageAt = Date.now();
+        let heartbeatInterval = null;
+        function startHeartbeat() {
+            if (heartbeatInterval)
+                return;
+            heartbeatInterval = setInterval(() => {
+                if (Date.now() - lastMessageAt > 30_000) {
+                    try {
+                        ws.close();
+                    }
+                    catch { /* ignore */ }
+                }
+            }, 30_000);
+            heartbeatInterval.unref();
+        }
         const timeout = setTimeout(() => {
             if (!resolved) {
                 resolved = true;
@@ -577,10 +618,12 @@ export function connect(url, opts) {
                 }
                 activeSessions.set(session.id, session);
                 defaultSessionId = session.id;
+                startHeartbeat();
                 resolve(session);
             }
         });
         ws.on('message', (data) => {
+            lastMessageAt = Date.now();
             try {
                 const msg = JSON.parse(String(data));
                 if (msg.type === 'frame') {
@@ -600,6 +643,7 @@ export function connect(url, opts) {
                         }
                         activeSessions.set(session.id, session);
                         defaultSessionId = session.id;
+                        startHeartbeat();
                         resolve(session);
                     }
                 }
@@ -619,6 +663,10 @@ export function connect(url, opts) {
             }
         });
         ws.on('close', () => {
+            if (heartbeatInterval) {
+                clearInterval(heartbeatInterval);
+                heartbeatInterval = null;
+            }
             if (activeSessions.get(session.id) === session) {
                 activeSessions.delete(session.id);
                 if (defaultSessionId === session.id)
@@ -1963,6 +2011,36 @@ function detectCaptcha(root) {
     }
     return found ?? { detected: false };
 }
+const VERIFICATION_FIELD_PATTERN = /verif|security.?code|confirm.*(code|email)|one.?time|otp|2fa|mfa|passcode/i;
+const VERIFICATION_CONTEXT_PATTERN = /sent.*(code|email|sms|text)|enter.*code|check.your.(email|phone|inbox)|we.sent|verification/i;
+function detectVerification(root) {
+    let found;
+    function walk(node) {
+        if (found)
+            return;
+        const name = node.name ?? '';
+        if (node.role === 'textbox' && VERIFICATION_FIELD_PATTERN.test(name)) {
+            const type = /email|inbox/i.test(name) ? 'email_code'
+                : /sms|phone|text/i.test(name) ? 'sms_code'
+                    : /security.?question/i.test(name) ? 'security_question'
+                        : 'unknown';
+            found = { detected: true, type, hint: `Verification field: "${name}"` };
+            return;
+        }
+        const text = [name, node.value].filter(Boolean).join(' ');
+        if (VERIFICATION_CONTEXT_PATTERN.test(text)) {
+            const type = /email|inbox/i.test(text) ? 'email_code'
+                : /sms|phone|text.message/i.test(text) ? 'sms_code'
+                    : 'unknown';
+            found = { detected: true, type, hint: text.slice(0, 120) };
+            return;
+        }
+        for (const child of node.children)
+            walk(child);
+    }
+    walk(root);
+    return found ?? { detected: false };
+}
 export function buildPageModel(root, options) {
     const maxPrimaryActions = options?.maxPrimaryActions ?? 6;
     const maxSectionsPerKind = options?.maxSectionsPerKind ?? 8;
@@ -2047,9 +2125,11 @@ export function buildPageModel(root, options) {
         lists: sortByBounds(lists).slice(0, maxSectionsPerKind),
     };
     const captcha = detectCaptcha(root);
+    const verification = detectVerification(root);
     return {
         ...baseModel,
         ...(captcha.detected ? { captcha } : {}),
+        ...(verification.detected ? { verification } : {}),
         archetypes: inferPageArchetypes(baseModel),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geometra/mcp",
-  "version": "1.26.0",
+  "version": "1.28.0",
   "description": "MCP server for Geometra — interact with running Geometra apps via the geometry protocol, no browser needed",
   "license": "MIT",
   "type": "module",