@geometra/mcp 1.19.14 → 1.19.15

package/dist/__tests__/proxy-session-actions.test.js

@@ -97,7 +97,7 @@ describe('proxy-backed MCP actions', () => {
             await new Promise((resolve, reject) => wss.close(err => (err ? reject(err) : resolve())));
         }
     });
-    it('sends batched fillFields messages and resolves from the resulting update', async () => {
+    it('waits for the post-batch update before resolving fillFields acks', async () => {
         const wss = new WebSocketServer({ port: 0 });
         let seenMessage;
         wss.on('connection', ws => {
@@ -113,6 +113,16 @@ describe('proxy-backed MCP actions', () => {
                 }
                 if (msg.type === 'fillFields') {
                     seenMessage = msg;
+                    ws.send(JSON.stringify({
+                        type: 'frame',
+                        layout: { x: 0, y: 0, width: 1024, height: 768, children: [] },
+                        tree: {
+                            kind: 'box',
+                            props: {},
+                            semantic: { tag: 'body', role: 'group', ariaLabel: 'Filled' },
+                            children: [],
+                        },
+                    }));
                     ws.send(JSON.stringify({
                         type: 'ack',
                         requestId: msg.requestId,
@@ -124,16 +134,6 @@ describe('proxy-backed MCP actions', () => {
                             busyCount: 0,
                         },
                     }));
-                    ws.send(JSON.stringify({
-                        type: 'frame',
-                        layout: { x: 0, y: 0, width: 1024, height: 768, children: [] },
-                        tree: {
-                            kind: 'box',
-                            props: {},
-                            semantic: { tag: 'body', role: 'group', ariaLabel: 'Filled' },
-                            children: [],
-                        },
-                    }));
                 }
             });
         });
@@ -153,7 +153,7 @@ describe('proxy-backed MCP actions', () => {
                 { kind: 'text', fieldLabel: 'Full name', value: 'Taylor Applicant' },
                 { kind: 'choice', fieldLabel: 'Country', value: 'Germany' },
             ], 80)).resolves.toMatchObject({
-                status: 'acknowledged',
+                status: 'updated',
                 timeoutMs: 80,
                 result: {
                     pageUrl: 'https://jobs.example.com/application',

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

@@ -445,6 +445,63 @@ describe('query and reveal tools', () => {
             },
         });
     });
+    it('falls back to sequential fill when a batched fill ends without a clean ack and invalid fields remain', async () => {
+        const handler = getToolHandler('geometra_fill_form');
+        mockState.sendFillFields.mockResolvedValueOnce({
+            status: 'updated',
+            timeoutMs: 6000,
+            result: undefined,
+        });
+        mockState.formSchemas = [
+            {
+                formId: 'fm:0',
+                name: 'Application',
+                fieldCount: 2,
+                requiredCount: 2,
+                invalidCount: 2,
+                fields: [
+                    { id: 'ff:0.0', kind: 'text', label: 'Full name', required: true, invalid: true },
+                    { id: 'ff:0.1', kind: 'choice', label: 'Preferred location', required: true, invalid: true },
+                ],
+            },
+        ];
+        mockState.currentA11yRoot = node('group', undefined, {
+            meta: { pageUrl: 'https://jobs.example.com/application', scrollX: 0, scrollY: 640 },
+            children: [
+                node('textbox', 'Full name', {
+                    path: [0],
+                    state: { required: true, invalid: true },
+                }),
+                node('combobox', 'Preferred location', {
+                    path: [1],
+                    value: 'Select',
+                    state: { required: true, invalid: true },
+                }),
+            ],
+        });
+        const result = await handler({
+            valuesById: {
+                'ff:0.0': 'Taylor Applicant',
+                'ff:0.1': 'Berlin, Germany',
+            },
+            includeSteps: false,
+            detail: 'minimal',
+            failOnInvalid: false,
+        });
+        const payload = JSON.parse(result.content[0].text);
+        expect(mockState.sendFillFields).toHaveBeenCalledTimes(1);
+        expect(mockState.sendFieldText).toHaveBeenCalledWith(mockState.session, 'Full name', 'Taylor Applicant', { exact: undefined }, undefined);
+        expect(mockState.sendFieldChoice).toHaveBeenCalledWith(mockState.session, 'Preferred location', 'Berlin, Germany', { exact: undefined, query: undefined }, undefined);
+        expect(payload).toMatchObject({
+            completed: true,
+            execution: 'sequential',
+            formId: 'fm:0',
+            requestedValueCount: 2,
+            fieldCount: 2,
+            successCount: 2,
+            errorCount: 0,
+        });
+    });
     it('reveals an offscreen target with semantic scrolling instead of requiring manual wheels', async () => {
         const handler = getToolHandler('geometra_reveal');
         mockState.currentA11yRoot = node('group', undefined, {

package/dist/server.js

@@ -418,10 +418,12 @@ Pass \`valuesById\` with field ids from \`geometra_form_schema\` for the most st
             return err(planned.error);
         if (!includeSteps) {
             let usedBatch = false;
+            let batchAckResult;
             try {
                 const startRevision = session.updateRevision;
                 const wait = await sendFillFields(session, planned.fields);
                 const ackResult = parseProxyFillAckResult(wait.result);
+                batchAckResult = ackResult;
                 if (ackResult && ackResult.invalidCount === 0) {
                     usedBatch = true;
                     const payload = {
@@ -447,6 +449,14 @@ Pass \`valuesById\` with field ids from \`geometra_form_schema\` for the most st
                     return err(message);
                 }
             }
+            if (usedBatch) {
+                const after = sessionA11y(session);
+                const signals = after ? collectSessionSignals(after) : undefined;
+                const invalidRemaining = signals?.invalidFields.length ?? 0;
+                if ((!batchAckResult || batchAckResult.invalidCount > 0) && invalidRemaining > 0) {
+                    usedBatch = false;
+                }
+            }
             if (usedBatch) {
                 const after = sessionA11y(session);
                 const signals = after ? collectSessionSignals(after) : undefined;

package/dist/session.js

@@ -4,11 +4,13 @@ let activeSession = null;
 const ACTION_UPDATE_TIMEOUT_MS = 2000;
 const LISTBOX_UPDATE_TIMEOUT_MS = 4500;
 const FILL_BATCH_BASE_TIMEOUT_MS = 2500;
-const FILL_BATCH_TEXT_FIELD_TIMEOUT_MS = 250;
-const FILL_BATCH_CHOICE_FIELD_TIMEOUT_MS = 450;
-const FILL_BATCH_TOGGLE_FIELD_TIMEOUT_MS = 200;
+const FILL_BATCH_TEXT_FIELD_TIMEOUT_MS = 275;
+const FILL_BATCH_TEXT_LENGTH_TIMEOUT_MS = 120;
+const FILL_BATCH_TEXT_LENGTH_SLICE = 80;
+const FILL_BATCH_CHOICE_FIELD_TIMEOUT_MS = 500;
+const FILL_BATCH_TOGGLE_FIELD_TIMEOUT_MS = 225;
 const FILL_BATCH_FILE_FIELD_TIMEOUT_MS = 5000;
-const FILL_BATCH_MAX_TIMEOUT_MS = 30_000;
+const FILL_BATCH_MAX_TIMEOUT_MS = 60_000;
 let nextRequestSequence = 0;
 function shutdownPreviousSession() {
     const prev = activeSession;
@@ -138,10 +140,13 @@ export function disconnect() {
 }
 function estimateFillBatchTimeout(fields) {
     let total = FILL_BATCH_BASE_TIMEOUT_MS;
+    let totalTextLength = 0;
     for (const field of fields) {
         switch (field.kind) {
             case 'text':
+                totalTextLength += field.value.length;
                 total += FILL_BATCH_TEXT_FIELD_TIMEOUT_MS;
+                total += Math.ceil(Math.max(1, field.value.length) / FILL_BATCH_TEXT_LENGTH_SLICE) * FILL_BATCH_TEXT_LENGTH_TIMEOUT_MS;
                 break;
             case 'choice':
                 total += FILL_BATCH_CHOICE_FIELD_TIMEOUT_MS;
@@ -154,6 +159,9 @@ function estimateFillBatchTimeout(fields) {
                 break;
         }
     }
+    if (fields.length >= 20 || totalTextLength >= 1500) {
+        total = Math.max(total, 30_000);
+    }
     return Math.min(total, FILL_BATCH_MAX_TIMEOUT_MS);
 }
 export function waitForUiCondition(session, predicate, timeoutMs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geometra/mcp",
-  "version": "1.19.14",
+  "version": "1.19.15",
   "description": "MCP server for Geometra — interact with running Geometra apps via the geometry protocol, no browser needed",
   "license": "MIT",
   "type": "module",
@@ -30,7 +30,7 @@
     "ui-testing"
   ],
   "dependencies": {
-    "@geometra/proxy": "^1.19.14",
+    "@geometra/proxy": "^1.19.15",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "ws": "^8.18.0",
     "zod": "^3.23.0"