@geometra/mcp 1.19.1 → 1.19.3

package/dist/__tests__/connect-utils.test.js

@@ -1,6 +1,10 @@
+import { existsSync, mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
 import { describe, expect, it } from 'vitest';
 import { formatConnectFailureMessage, normalizeConnectTarget } from '../connect-utils.js';
-import { formatProxyStartupFailure, parseProxyReadySignalLine } from '../proxy-spawn.js';
+import { formatProxyStartupFailure, parseProxyReadySignalLine, resolveProxyScriptPath, resolveProxyScriptPathWith, } from '../proxy-spawn.js';
 describe('normalizeConnectTarget', () => {
     it('accepts explicit pageUrl for http(s) pages', () => {
         const result = normalizeConnectTarget({ pageUrl: 'https://example.com/jobs/123' });
@@ -61,6 +65,58 @@ describe('formatConnectFailureMessage', () => {
     });
 });
 describe('proxy ready helpers', () => {
+    it('resolves the bundled proxy CLI entry in the source tree', () => {
+        const scriptPath = resolveProxyScriptPath();
+        expect(existsSync(scriptPath)).toBe(true);
+        expect(path.basename(scriptPath)).toBe('index.js');
+        expect(scriptPath.includes(`${path.sep}proxy${path.sep}`)).toBe(true);
+    });
+    it('resolves the bundled proxy CLI entry from a packaged dependency layout', () => {
+        const tempRoot = mkdtempSync(path.join(tmpdir(), 'geometra-proxy-resolve-'));
+        try {
+            const scopeDir = path.join(tempRoot, 'node_modules', '@geometra');
+            const packageDir = path.join(scopeDir, 'proxy');
+            const probePath = path.join(tempRoot, 'probe.cjs');
+            mkdirSync(scopeDir, { recursive: true });
+            symlinkSync(path.resolve(process.cwd(), 'packages/proxy'), packageDir, 'dir');
+            writeFileSync(probePath, 'module.exports = {}');
+            const customRequire = createRequire(probePath);
+            const scriptPath = resolveProxyScriptPathWith(customRequire);
+            expect(existsSync(scriptPath)).toBe(true);
+            expect(path.basename(scriptPath)).toBe('index.js');
+        }
+        finally {
+            rmSync(tempRoot, { recursive: true, force: true });
+        }
+    });
+    it('falls back to the packaged sibling proxy dist when package exports are stale', () => {
+        const tempRoot = mkdtempSync(path.join(tmpdir(), 'geometra-proxy-stale-exports-'));
+        try {
+            const proxyDir = path.join(tempRoot, 'node_modules', '@geometra', 'proxy');
+            const mcpDistDir = path.join(tempRoot, 'node_modules', '@geometra', 'mcp', 'dist');
+            const proxyDistDir = path.join(proxyDir, 'dist');
+            const probePath = path.join(mcpDistDir, 'proxy-spawn.cjs');
+            mkdirSync(proxyDistDir, { recursive: true });
+            mkdirSync(mcpDistDir, { recursive: true });
+            writeFileSync(path.join(proxyDir, 'package.json'), JSON.stringify({
+                name: '@geometra/proxy',
+                type: 'module',
+                exports: {
+                    '.': {
+                        import: './dist/index.js',
+                    },
+                },
+            }, null, 2));
+            writeFileSync(path.join(proxyDistDir, 'index.js'), 'export {};\n');
+            writeFileSync(probePath, 'module.exports = {};\n');
+            const customRequire = createRequire(probePath);
+            const scriptPath = resolveProxyScriptPathWith(customRequire, mcpDistDir);
+            expect(scriptPath).toBe(path.join(proxyDistDir, 'index.js'));
+        }
+        finally {
+            rmSync(tempRoot, { recursive: true, force: true });
+        }
+    });
     it('parses structured proxy ready JSON', () => {
         const wsUrl = parseProxyReadySignalLine('{"type":"geometra-proxy-ready","wsUrl":"ws://127.0.0.1:41237","pageUrl":"https://example.com"}');
         expect(wsUrl).toBe('ws://127.0.0.1:41237');

package/dist/proxy-spawn.d.ts

@@ -1,6 +1,7 @@
 import { type ChildProcess } from 'node:child_process';
 /** Resolve bundled @geometra/proxy CLI entry (dist/index.js). */
 export declare function resolveProxyScriptPath(): string;
+export declare function resolveProxyScriptPathWith(customRequire: NodeRequire, moduleDir?: string): string;
 export interface SpawnProxyParams {
     pageUrl: string;
     port: number;

package/dist/proxy-spawn.js

@@ -1,18 +1,42 @@
 import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 const require = createRequire(import.meta.url);
 const READY_SIGNAL_TYPE = 'geometra-proxy-ready';
 const READY_TIMEOUT_MS = 45_000;
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 /** Resolve bundled @geometra/proxy CLI entry (dist/index.js). */
 export function resolveProxyScriptPath() {
+    return resolveProxyScriptPathWith(require);
+}
+export function resolveProxyScriptPathWith(customRequire, moduleDir = MODULE_DIR) {
+    const errors = [];
     try {
-        const pkgJson = require.resolve('@geometra/proxy/package.json');
+        const pkgJson = customRequire.resolve('@geometra/proxy/package.json');
         return path.join(path.dirname(pkgJson), 'dist/index.js');
     }
-    catch {
-        throw new Error('Could not resolve @geometra/proxy. Install it with the MCP package: npm install @geometra/proxy');
+    catch (err) {
+        errors.push(err instanceof Error ? err.message : String(err));
+    }
+    try {
+        return customRequire.resolve('@geometra/proxy');
+    }
+    catch (err) {
+        errors.push(err instanceof Error ? err.message : String(err));
+    }
+    const packagedSiblingDist = path.resolve(moduleDir, '../../proxy/dist/index.js');
+    if (existsSync(packagedSiblingDist)) {
+        return packagedSiblingDist;
+    }
+    errors.push(`Packaged sibling fallback not found at ${packagedSiblingDist}`);
+    const workspaceDist = path.resolve(moduleDir, '../../packages/proxy/dist/index.js');
+    if (existsSync(workspaceDist)) {
+        return workspaceDist;
     }
+    errors.push(`Workspace fallback not found at ${workspaceDist}`);
+    throw new Error(`Could not resolve @geometra/proxy. Install it with the MCP package: npm install @geometra/proxy. Resolution errors: ${errors.join(' | ')}`);
 }
 export function parseProxyReadySignalLine(line) {
     const trimmed = line.trim();

package/dist/server.js

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { formatConnectFailureMessage, isHttpUrl, normalizeConnectTarget } from './connect-utils.js';
 import { connect, connectThroughProxy, disconnect, getSession, sendClick, sendType, sendKey, sendFileUpload, sendListboxPick, sendSelectOption, sendWheel, buildA11yTree, buildCompactUiIndex, buildPageModel, expandPageSection, buildUiDelta, hasUiDelta, nodeIdForPath, summarizeCompactIndex, summarizePageModel, summarizeUiDelta, } from './session.js';
 export function createServer() {
-    const server = new McpServer({ name: 'geometra', version: '1.19.1' }, { capabilities: { tools: {} } });
+    const server = new McpServer({ name: 'geometra', version: '1.19.3' }, { capabilities: { tools: {} } });
     // ── connect ──────────────────────────────────────────────────
     server.tool('geometra_connect', `Connect to a Geometra WebSocket peer, or start \`geometra-proxy\` automatically for a normal web page.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geometra/mcp",
-  "version": "1.19.1",
+  "version": "1.19.3",
   "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.1",
+    "@geometra/proxy": "1.19.3",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "ws": "^8.18.0",
     "zod": "^3.23.0"