From 8d86ce49585584e98c702d64ba6c41f5b8b1cbf9 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Wed, 3 Sep 2025 07:58:36 -0700 Subject: [PATCH] chore: use mcp sdk via playwright (#973) --- package-lock.json | 145 +++++++++++++++++++++++++++++++------- package.json | 10 +-- src/loop/main.ts | 9 ++- src/loopTools/context.ts | 5 +- src/loopTools/perform.ts | 2 +- src/loopTools/snapshot.ts | 2 +- src/mcp/bundle.ts | 48 +++++++++++++ src/mcp/http.ts | 9 +-- src/mcp/mdb.ts | 23 +++--- src/mcp/proxyBackend.ts | 13 ++-- src/mcp/server.ts | 13 ++-- src/mcp/tool.ts | 2 +- src/tools/DEPS.list | 1 + src/tools/common.ts | 2 +- src/tools/console.ts | 2 +- src/tools/dialogs.ts | 2 +- src/tools/evaluate.ts | 3 +- src/tools/files.ts | 2 +- src/tools/form.ts | 3 +- src/tools/install.ts | 8 +-- src/tools/keyboard.ts | 3 +- src/tools/mouse.ts | 2 +- src/tools/navigate.ts | 2 +- src/tools/network.ts | 2 +- src/tools/pdf.ts | 3 +- src/tools/screenshot.ts | 3 +- src/tools/snapshot.ts | 3 +- src/tools/tabs.ts | 2 +- src/tools/verify.ts | 3 +- src/tools/wait.ts | 2 +- src/utils/fileUtils.ts | 4 +- src/vscode/host.ts | 26 +++---- src/vscode/main.ts | 5 +- utils/check-deps.js | 58 ++++++++++++++- 34 files changed, 305 insertions(+), 117 deletions(-) create mode 100644 src/mcp/bundle.ts diff --git a/package-lock.json b/package-lock.json index 50706b8..d0a05c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,16 +9,13 @@ "version": "0.0.36", "license": "Apache-2.0", "dependencies": { - "@modelcontextprotocol/sdk": "^1.16.0", "commander": "^13.1.0", "debug": "^4.4.1", "dotenv": "^17.2.0", "mime": "^4.0.7", "playwright": "1.56.0-alpha-1756505518000", "playwright-core": "1.56.0-alpha-1756505518000", - "ws": "^8.18.1", - "zod": "^3.24.1", - "zod-to-json-schema": "^3.24.4" + "ws": "^8.18.1" }, "bin": { "mcp-server-playwright": "cli.js" @@ -27,6 +24,7 @@ "@anthropic-ai/sdk": "^0.57.0", "@eslint/eslintrc": "^3.2.0", "@eslint/js": "^9.19.0", + "@modelcontextprotocol/sdk": "^1.16.0", "@playwright/test": "1.56.0-alpha-1756505518000", "@stylistic/eslint-plugin": "^3.0.1", "@types/debug": "^4.1.12", @@ -40,7 +38,9 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-notice": "^1.0.0", "openai": "^5.10.2", - "typescript": "^5.8.2" + "typescript": "^5.8.2", + "zod": "^3.24.1", + "zod-to-json-schema": "^3.24.4" }, "engines": { "node": ">=18" @@ -642,9 +642,10 @@ } }, "node_modules/@modelcontextprotocol/sdk": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.16.0.tgz", - "integrity": "sha512-8ofX7gkZcLj9H9rSd50mCgm3SSF8C7XoclxJuLoV0Cz3rEQ1tv9MZRYYvJtm9n1BiEQQMzSmE/w2AEkNacLYfg==", + "version": "1.17.4", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.17.4.tgz", + "integrity": "sha512-zq24hfuAmmlNZvik0FLI58uE5sriN0WWsQzIlYnzSuKDAHFqJtBFrl/LfB1NLgJT5Y7dEBzaX4yAKqOPrcetaw==", + "dev": true, "license": "MIT", "dependencies": { "ajv": "^6.12.6", @@ -1052,6 +1053,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "dev": true, "license": "MIT", "dependencies": { "mime-types": "^3.0.0", @@ -1088,6 +1090,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -1280,6 +1283,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", + "dev": true, "license": "MIT", "dependencies": { "bytes": "^3.1.2", @@ -1324,6 +1328,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -1352,6 +1357,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -1365,6 +1371,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -1444,6 +1451,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", + "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" @@ -1456,15 +1464,17 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -1474,6 +1484,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.6.0" @@ -1483,6 +1494,7 @@ "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dev": true, "license": "MIT", "dependencies": { "object-assign": "^4", @@ -1496,6 +1508,7 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -1624,6 +1637,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -1658,6 +1672,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -1672,12 +1687,14 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true, "license": "MIT" }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -1753,6 +1770,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -1762,6 +1780,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -1771,6 +1790,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -1869,6 +1889,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "dev": true, "license": "MIT" }, "node_modules/escape-string-regexp": { @@ -2188,27 +2209,30 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/eventsource": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.5.tgz", - "integrity": "sha512-LT/5J605bx5SNyE+ITBDiM3FxffBiq9un7Vx0EwMDM3vg8sWKx/tO2zC+LMqZ+smAM0F2hblaDZUVZF0te2pSw==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz", + "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==", + "dev": true, "license": "MIT", "dependencies": { - "eventsource-parser": "^3.0.0" + "eventsource-parser": "^3.0.1" }, "engines": { "node": ">=18.0.0" } }, "node_modules/eventsource-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.0.tgz", - "integrity": "sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz", + "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==", + "dev": true, "license": "MIT", "engines": { "node": ">=18.0.0" @@ -2218,6 +2242,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", + "dev": true, "license": "MIT", "dependencies": { "accepts": "^2.0.0", @@ -2257,9 +2282,10 @@ } }, "node_modules/express-rate-limit": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", - "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz", + "integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==", + "dev": true, "license": "MIT", "engines": { "node": ">= 16" @@ -2268,13 +2294,14 @@ "url": "https://github.com/sponsors/express-rate-limit" }, "peerDependencies": { - "express": "^4.11 || 5 || ^5.0.0-beta.1" + "express": ">= 4.11" } }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, "license": "MIT" }, "node_modules/fast-glob": { @@ -2311,6 +2338,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, "license": "MIT" }, "node_modules/fast-levenshtein": { @@ -2360,6 +2388,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "dev": true, "license": "MIT", "dependencies": { "debug": "^4.4.0", @@ -2438,6 +2467,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -2447,6 +2477,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -2470,6 +2501,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2510,6 +2542,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -2534,6 +2567,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -2608,6 +2642,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2679,6 +2714,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -2707,6 +2743,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -2719,6 +2756,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dev": true, "license": "MIT", "dependencies": { "depd": "2.0.0", @@ -2731,10 +2769,21 @@ "node": ">= 0.8" } }, + "node_modules/http-errors/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -2784,6 +2833,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, "license": "ISC" }, "node_modules/internal-slot": { @@ -2805,6 +2855,7 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.10" @@ -3047,6 +3098,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "dev": true, "license": "MIT" }, "node_modules/is-regex": { @@ -3205,6 +3257,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, "license": "ISC" }, "node_modules/js-yaml": { @@ -3231,6 +3284,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { @@ -3311,6 +3365,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3320,6 +3375,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -3329,6 +3385,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -3387,6 +3444,7 @@ "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -3396,6 +3454,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "dev": true, "license": "MIT", "dependencies": { "mime-db": "^1.54.0" @@ -3444,6 +3503,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -3453,6 +3513,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -3462,6 +3523,7 @@ "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3558,6 +3620,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, "license": "MIT", "dependencies": { "ee-first": "1.1.1" @@ -3570,6 +3633,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, "license": "ISC", "dependencies": { "wrappy": "1" @@ -3682,6 +3746,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -3701,6 +3766,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3717,6 +3783,7 @@ "version": "8.2.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=16" @@ -3739,6 +3806,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=16.20.0" @@ -3798,6 +3866,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dev": true, "license": "MIT", "dependencies": { "forwarded": "0.2.0", @@ -3811,6 +3880,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -3820,6 +3890,7 @@ "version": "6.14.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" @@ -3856,6 +3927,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -3865,6 +3937,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", + "dev": true, "license": "MIT", "dependencies": { "bytes": "3.1.2", @@ -3966,6 +4039,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "dev": true, "license": "MIT", "dependencies": { "debug": "^4.4.0", @@ -4026,6 +4100,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, "funding": [ { "type": "github", @@ -4081,6 +4156,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true, "license": "MIT" }, "node_modules/semver": { @@ -4100,6 +4176,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "dev": true, "license": "MIT", "dependencies": { "debug": "^4.3.5", @@ -4122,6 +4199,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "dev": true, "license": "MIT", "dependencies": { "encodeurl": "^2.0.0", @@ -4186,12 +4264,14 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true, "license": "ISC" }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" @@ -4204,6 +4284,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4213,6 +4294,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -4232,6 +4314,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -4248,6 +4331,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -4266,6 +4350,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -4282,9 +4367,10 @@ } }, "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -4415,6 +4501,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.6" @@ -4463,6 +4550,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "dev": true, "license": "MIT", "dependencies": { "content-type": "^1.0.5", @@ -4595,6 +4683,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -4604,6 +4693,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" @@ -4613,6 +4703,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -4622,6 +4713,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -4736,6 +4828,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, "license": "ISC" }, "node_modules/ws": { @@ -4776,6 +4869,7 @@ "version": "3.24.2", "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" @@ -4785,6 +4879,7 @@ "version": "3.24.4", "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.4.tgz", "integrity": "sha512-0uNlcvgabyrni9Ag8Vghj21drk7+7tp7VTwwR7KxxXXc/3pbXz2PHlDgj3cICahgF1kHm4dExBFj7BXrZJXzig==", + "dev": true, "license": "ISC", "peerDependencies": { "zod": "^3.24.1" diff --git a/package.json b/package.json index babe5f7..b3f739d 100644 --- a/package.json +++ b/package.json @@ -38,21 +38,19 @@ } }, "dependencies": { - "@modelcontextprotocol/sdk": "^1.16.0", "commander": "^13.1.0", "debug": "^4.4.1", "dotenv": "^17.2.0", "mime": "^4.0.7", "playwright": "1.56.0-alpha-1756505518000", "playwright-core": "1.56.0-alpha-1756505518000", - "ws": "^8.18.1", - "zod": "^3.24.1", - "zod-to-json-schema": "^3.24.4" + "ws": "^8.18.1" }, "devDependencies": { "@anthropic-ai/sdk": "^0.57.0", "@eslint/eslintrc": "^3.2.0", "@eslint/js": "^9.19.0", + "@modelcontextprotocol/sdk": "^1.16.0", "@playwright/test": "1.56.0-alpha-1756505518000", "@stylistic/eslint-plugin": "^3.0.1", "@types/debug": "^4.1.12", @@ -66,7 +64,9 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-notice": "^1.0.0", "openai": "^5.10.2", - "typescript": "^5.8.2" + "typescript": "^5.8.2", + "zod": "^3.24.1", + "zod-to-json-schema": "^3.24.4" }, "bin": { "mcp-server-playwright": "cli.js" diff --git a/src/loop/main.ts b/src/loop/main.ts index b909d4b..d1d7c3e 100644 --- a/src/loop/main.ts +++ b/src/loop/main.ts @@ -19,10 +19,9 @@ import path from 'path'; import url from 'url'; import dotenv from 'dotenv'; - -import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; -import { Client } from '@modelcontextprotocol/sdk/client/index.js'; import { program } from 'commander'; + +import * as mcpBundle from '../mcp/bundle.js'; import { OpenAIDelegate } from './loopOpenAI.js'; import { ClaudeDelegate } from './loopClaude.js'; import { runTask } from './loop.js'; @@ -34,7 +33,7 @@ dotenv.config(); const __filename = url.fileURLToPath(import.meta.url); async function run(delegate: LLMDelegate) { - const transport = new StdioClientTransport({ + const transport = new mcpBundle.StdioClientTransport({ command: 'node', args: [ path.resolve(__filename, '../../../cli.js'), @@ -45,7 +44,7 @@ async function run(delegate: LLMDelegate) { env: process.env as Record, }); - const client = new Client({ name: 'test', version: '1.0.0' }); + const client = new mcpBundle.Client({ name: 'test', version: '1.0.0' }); await client.connect(transport); await client.ping(); diff --git a/src/loopTools/context.ts b/src/loopTools/context.ts index dadb6b9..c34d290 100644 --- a/src/loopTools/context.ts +++ b/src/loopTools/context.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import { Client } from '@modelcontextprotocol/sdk/client/index.js'; import { contextFactory } from '../browserContextFactory.js'; import { BrowserServerBackend } from '../browserServerBackend.js'; import { Context as BrowserContext } from '../context.js'; @@ -24,7 +23,9 @@ import { ClaudeDelegate } from '../loop/loopClaude.js'; import { InProcessTransport } from '../mcp/inProcessTransport.js'; import * as mcpServer from '../mcp/server.js'; import { packageJSON } from '../utils/package.js'; +import * as mcpBundle from '../mcp/bundle.js'; +import type { Client } from '@modelcontextprotocol/sdk/client/index.js'; import type { LLMDelegate } from '../loop/loop.js'; import type { FullConfig } from '../config.js'; @@ -45,7 +46,7 @@ export class Context { } static async create(config: FullConfig) { - const client = new Client({ name: 'Playwright Proxy', version: packageJSON.version }); + const client = new mcpBundle.Client({ name: 'Playwright Proxy', version: packageJSON.version }); const browserContextFactory = contextFactory(config); const server = mcpServer.createServer('Playwright Subagent', packageJSON.version, new BrowserServerBackend(config, browserContextFactory), false); await client.connect(new InProcessTransport(server)); diff --git a/src/loopTools/perform.ts b/src/loopTools/perform.ts index 29df7b4..7a1fc7f 100644 --- a/src/loopTools/perform.ts +++ b/src/loopTools/perform.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTool } from './tool.js'; const performSchema = z.object({ diff --git a/src/loopTools/snapshot.ts b/src/loopTools/snapshot.ts index 1b0f227..97dea6a 100644 --- a/src/loopTools/snapshot.ts +++ b/src/loopTools/snapshot.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTool } from './tool.js'; export const snapshot = defineTool({ diff --git a/src/mcp/bundle.ts b/src/mcp/bundle.ts new file mode 100644 index 0000000..4def9bf --- /dev/null +++ b/src/mcp/bundle.ts @@ -0,0 +1,48 @@ +/** + * Copyright (c) Microsoft Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-ignore +import * as bundle from 'playwright/lib/mcpBundleImpl'; + +const zodToJsonSchema: typeof import('zod-to-json-schema').zodToJsonSchema = bundle.zodToJsonSchema; +const Client: typeof import('@modelcontextprotocol/sdk/client/index.js').Client = bundle.Client; +const Server: typeof import('@modelcontextprotocol/sdk/server/index.js').Server = bundle.Server; +const SSEServerTransport: typeof import('@modelcontextprotocol/sdk/server/sse.js').SSEServerTransport = bundle.SSEServerTransport; +const StdioClientTransport: typeof import('@modelcontextprotocol/sdk/client/stdio.js').StdioClientTransport = bundle.StdioClientTransport; +const StdioServerTransport: typeof import('@modelcontextprotocol/sdk/server/stdio.js').StdioServerTransport = bundle.StdioServerTransport; +const StreamableHTTPServerTransport: typeof import('@modelcontextprotocol/sdk/server/streamableHttp.js').StreamableHTTPServerTransport = bundle.StreamableHTTPServerTransport; +const StreamableHTTPClientTransport: typeof import('@modelcontextprotocol/sdk/client/streamableHttp.js').StreamableHTTPClientTransport = bundle.StreamableHTTPClientTransport; +const CallToolRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').CallToolRequestSchema = bundle.CallToolRequestSchema; +const ListRootsRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').ListRootsRequestSchema = bundle.ListRootsRequestSchema; +const ListToolsRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').ListToolsRequestSchema = bundle.ListToolsRequestSchema; +const PingRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').PingRequestSchema = bundle.PingRequestSchema; +const z: typeof import('zod') = bundle.z; + +export { + zodToJsonSchema, + Client, + Server, + SSEServerTransport, + StdioClientTransport, + StdioServerTransport, + StreamableHTTPClientTransport, + StreamableHTTPServerTransport, + CallToolRequestSchema, + ListRootsRequestSchema, + ListToolsRequestSchema, + PingRequestSchema, + z, +}; diff --git a/src/mcp/http.ts b/src/mcp/http.ts index 7cebc07..e8ca580 100644 --- a/src/mcp/http.ts +++ b/src/mcp/http.ts @@ -21,11 +21,12 @@ import crypto from 'crypto'; import debug from 'debug'; -import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js'; -import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'; +import * as mcpBundle from './bundle.js'; import * as mcpServer from './server.js'; import type { ServerBackendFactory } from './server.js'; +import type { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js'; +import type { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'; const testDebug = debug('pw:mcp:test'); @@ -86,7 +87,7 @@ async function handleSSE(serverBackendFactory: ServerBackendFactory, req: http.I return await transport.handlePostMessage(req, res); } else if (req.method === 'GET') { - const transport = new SSEServerTransport('/sse', res); + const transport = new mcpBundle.SSEServerTransport('/sse', res); sessions.set(transport.sessionId, transport); testDebug(`create SSE session: ${transport.sessionId}`); await mcpServer.connect(serverBackendFactory, transport, false); @@ -114,7 +115,7 @@ async function handleStreamable(serverBackendFactory: ServerBackendFactory, req: } if (req.method === 'POST') { - const transport = new StreamableHTTPServerTransport({ + const transport = new mcpBundle.StreamableHTTPServerTransport({ sessionIdGenerator: () => crypto.randomUUID(), onsessioninitialized: async sessionId => { testDebug(`create http session: ${transport.sessionId}`); diff --git a/src/mcp/mdb.ts b/src/mcp/mdb.ts index f5082a3..2db2699 100644 --- a/src/mcp/mdb.ts +++ b/src/mcp/mdb.ts @@ -15,23 +15,20 @@ */ import debug from 'debug'; -import { z } from 'zod'; - -import { Client } from '@modelcontextprotocol/sdk/client/index.js'; -import { PingRequestSchema } from '@modelcontextprotocol/sdk/types.js'; -import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'; -import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'; import { defineToolSchema } from './tool.js'; +import * as mcpBundle from './bundle.js'; import * as mcpServer from './server.js'; import * as mcpHttp from './http.js'; import { wrapInProcess } from './server.js'; import { ManualPromise } from './manualPromise.js'; import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'; +import type { Client } from '@modelcontextprotocol/sdk/client/index.js'; const mdbDebug = debug('pw:mcp:mdb'); const errorsDebug = debug('pw:mcp:errors'); +const z = mcpBundle.z; export class MDBBackend implements mcpServer.ServerBackend { private _stack: { client: Client, toolNames: string[], resultPromise: ManualPromise | undefined }[] = []; @@ -107,15 +104,15 @@ export class MDBBackend implements mcpServer.ServerBackend { private async _pushTools(params: { mcpUrl: string, introMessage?: string }): Promise { mdbDebug('pushing tools to the stack', params.mcpUrl); - const transport = new StreamableHTTPClientTransport(new URL(params.mcpUrl)); + const transport = new mcpBundle.StreamableHTTPClientTransport(new URL(params.mcpUrl)); await this._pushClient(transport, params.introMessage); return { content: [{ type: 'text', text: 'Tools pushed' }] }; } private async _pushClient(transport: Transport, introMessage?: string): Promise { mdbDebug('pushing client to the stack'); - const client = new Client({ name: 'Internal client', version: '0.0.0' }); - client.setRequestHandler(PingRequestSchema, () => ({})); + const client = new mcpBundle.Client({ name: 'Internal client', version: '0.0.0' }); + client.setRequestHandler(mcpBundle.PingRequestSchema, () => ({})); await client.connect(transport); mdbDebug('connected to the new client'); const { tools } = await client.listTools(); @@ -162,7 +159,7 @@ export async function runMainBackend(backendFactory: mcpServer.ServerBackendFact return url; // Start stdio conditionally. - await mcpServer.connect(factory, new StdioServerTransport(), false); + await mcpServer.connect(factory, new mcpBundle.StdioServerTransport(), false); } export async function runOnPauseBackendLoop(mdbUrl: string, backend: ServerBackendOnPause, introMessage: string) { @@ -179,9 +176,9 @@ export async function runOnPauseBackendLoop(mdbUrl: string, backend: ServerBacke await mcpHttp.installHttpTransport(httpServer, factory); const url = mcpHttp.httpAddressToString(httpServer.address()); - const client = new Client({ name: 'Internal client', version: '0.0.0' }); - client.setRequestHandler(PingRequestSchema, () => ({})); - const transport = new StreamableHTTPClientTransport(new URL(mdbUrl)); + const client = new mcpBundle.Client({ name: 'Internal client', version: '0.0.0' }); + client.setRequestHandler(mcpBundle.PingRequestSchema, () => ({})); + const transport = new mcpBundle.StreamableHTTPClientTransport(new URL(mdbUrl)); await client.connect(transport); const pushToolsResult = await client.callTool({ diff --git a/src/mcp/proxyBackend.ts b/src/mcp/proxyBackend.ts index 89e6868..b151ad6 100644 --- a/src/mcp/proxyBackend.ts +++ b/src/mcp/proxyBackend.ts @@ -15,15 +15,13 @@ */ import debug from 'debug'; -import { z } from 'zod'; -import { zodToJsonSchema } from 'zod-to-json-schema'; -import { Client } from '@modelcontextprotocol/sdk/client/index.js'; -import { ListRootsRequestSchema, PingRequestSchema } from '@modelcontextprotocol/sdk/types.js'; +import * as mcpBundle from './bundle.js'; import type { ServerBackend, ClientVersion, Root, Server } from './server.js'; import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'; import type { Tool, CallToolResult, CallToolRequest } from '@modelcontextprotocol/sdk/types.js'; +import type { Client } from '@modelcontextprotocol/sdk/client/index.js'; export type MCPProvider = { name: string; @@ -32,6 +30,7 @@ export type MCPProvider = { }; const errorsDebug = debug('pw:mcp:errors'); +const { z, zodToJsonSchema } = mcpBundle; export class ProxyBackend implements ServerBackend { private _mcpProviders: MCPProvider[]; @@ -112,14 +111,14 @@ export class ProxyBackend implements ServerBackend { await this._currentClient?.close(); this._currentClient = undefined; - const client = new Client({ name: 'Playwright MCP Proxy', version: '0.0.0' }); + const client = new mcpBundle.Client({ name: 'Playwright MCP Proxy', version: '0.0.0' }); client.registerCapabilities({ roots: { listRoots: true, }, }); - client.setRequestHandler(ListRootsRequestSchema, () => ({ roots: this._roots })); - client.setRequestHandler(PingRequestSchema, () => ({})); + client.setRequestHandler(mcpBundle.ListRootsRequestSchema, () => ({ roots: this._roots })); + client.setRequestHandler(mcpBundle.PingRequestSchema, () => ({})); const transport = await factory.connect(); await client.connect(transport); diff --git a/src/mcp/server.ts b/src/mcp/server.ts index 5d60edb..082c9fc 100644 --- a/src/mcp/server.ts +++ b/src/mcp/server.ts @@ -16,9 +16,7 @@ import debug from 'debug'; -import { Server } from '@modelcontextprotocol/sdk/server/index.js'; -import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'; -import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'; +import * as mcpBundle from './bundle.js'; import { httpAddressToString, installHttpTransport, startHttpServer } from './http.js'; import { InProcessTransport } from './inProcessTransport.js'; @@ -26,6 +24,7 @@ import type { Tool, CallToolResult, CallToolRequest, Root } from '@modelcontextp import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'; export type { Server } from '@modelcontextprotocol/sdk/server/index.js'; export type { Tool, CallToolResult, CallToolRequest, Root } from '@modelcontextprotocol/sdk/types.js'; +import type { Server } from '@modelcontextprotocol/sdk/server/index.js'; const serverDebug = debug('pw:mcp:server'); const errorsDebug = debug('pw:mcp:errors'); @@ -59,13 +58,13 @@ export async function wrapInProcess(backend: ServerBackend): Promise export function createServer(name: string, version: string, backend: ServerBackend, runHeartbeat: boolean): Server { let initializedPromiseResolve = () => {}; const initializedPromise = new Promise(resolve => initializedPromiseResolve = resolve); - const server = new Server({ name, version }, { + const server = new mcpBundle.Server({ name, version }, { capabilities: { tools: {}, } }); - server.setRequestHandler(ListToolsRequestSchema, async () => { + server.setRequestHandler(mcpBundle.ListToolsRequestSchema, async () => { serverDebug('listTools'); await initializedPromise; const tools = await backend.listTools(); @@ -73,7 +72,7 @@ export function createServer(name: string, version: string, backend: ServerBacke }); let heartbeatRunning = false; - server.setRequestHandler(CallToolRequestSchema, async request => { + server.setRequestHandler(mcpBundle.CallToolRequestSchema, async request => { serverDebug('callTool', request); await initializedPromise; @@ -135,7 +134,7 @@ function addServerListener(server: Server, event: 'close' | 'initialized', liste export async function start(serverBackendFactory: ServerBackendFactory, options: { host?: string; port?: number }) { if (options.port === undefined) { - await connect(serverBackendFactory, new StdioServerTransport(), false); + await connect(serverBackendFactory, new mcpBundle.StdioServerTransport(), false); return; } diff --git a/src/mcp/tool.ts b/src/mcp/tool.ts index 3d86745..97fb334 100644 --- a/src/mcp/tool.ts +++ b/src/mcp/tool.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { zodToJsonSchema } from 'zod-to-json-schema'; +import { zodToJsonSchema } from '../mcp/bundle.js'; import type { z } from 'zod'; import type * as mcpServer from './server.js'; diff --git a/src/tools/DEPS.list b/src/tools/DEPS.list index 5870e2d..b179738 100644 --- a/src/tools/DEPS.list +++ b/src/tools/DEPS.list @@ -1,2 +1,3 @@ [*] ../utils/ +../mcp/ \ No newline at end of file diff --git a/src/tools/common.ts b/src/tools/common.ts index 00f950b..a652bc4 100644 --- a/src/tools/common.ts +++ b/src/tools/common.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTabTool, defineTool } from './tool.js'; const close = defineTool({ diff --git a/src/tools/console.ts b/src/tools/console.ts index cfed3ab..53cecde 100644 --- a/src/tools/console.ts +++ b/src/tools/console.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; const console = defineTabTool({ diff --git a/src/tools/dialogs.ts b/src/tools/dialogs.ts index c8eb57b..70b1d98 100644 --- a/src/tools/dialogs.ts +++ b/src/tools/dialogs.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; const handleDialog = defineTabTool({ diff --git a/src/tools/evaluate.ts b/src/tools/evaluate.ts index 9e4adff..e214f12 100644 --- a/src/tools/evaluate.ts +++ b/src/tools/evaluate.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; - +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; import * as javascript from '../utils/codegen.js'; import { generateLocator } from './utils.js'; diff --git a/src/tools/files.ts b/src/tools/files.ts index 2097b7b..1e2d687 100644 --- a/src/tools/files.ts +++ b/src/tools/files.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; const uploadFile = defineTabTool({ diff --git a/src/tools/form.ts b/src/tools/form.ts index 28ffc0b..f59266c 100644 --- a/src/tools/form.ts +++ b/src/tools/form.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; - +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; import { generateLocator } from './utils.js'; import * as javascript from '../utils/codegen.js'; diff --git a/src/tools/install.ts b/src/tools/install.ts index 3e4efcd..6ab263a 100644 --- a/src/tools/install.ts +++ b/src/tools/install.ts @@ -16,10 +16,10 @@ import { fork } from 'child_process'; import path from 'path'; -import { fileURLToPath } from 'url'; -import { z } from 'zod'; -import { defineTool } from './tool.js'; +import url from 'url'; +import { z } from '../mcp/bundle.js'; +import { defineTool } from './tool.js'; const install = defineTool({ capability: 'core-install', @@ -34,7 +34,7 @@ const install = defineTool({ handle: async (context, params, response) => { const channel = context.config.browser?.launchOptions?.channel ?? context.config.browser?.browserName ?? 'chrome'; const cliUrl = import.meta.resolve('playwright/package.json'); - const cliPath = path.join(fileURLToPath(cliUrl), '..', 'cli.js'); + const cliPath = path.join(url.fileURLToPath(cliUrl), '..', 'cli.js'); const child = fork(cliPath, ['install', channel], { stdio: 'pipe', }); diff --git a/src/tools/keyboard.ts b/src/tools/keyboard.ts index 35d0016..8857d92 100644 --- a/src/tools/keyboard.ts +++ b/src/tools/keyboard.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; - +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; import { elementSchema } from './snapshot.js'; import { generateLocator } from './utils.js'; diff --git a/src/tools/mouse.ts b/src/tools/mouse.ts index 3889df2..1e2e027 100644 --- a/src/tools/mouse.ts +++ b/src/tools/mouse.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; const elementSchema = z.object({ diff --git a/src/tools/navigate.ts b/src/tools/navigate.ts index 28bd022..2558d45 100644 --- a/src/tools/navigate.ts +++ b/src/tools/navigate.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTool, defineTabTool } from './tool.js'; const navigate = defineTool({ diff --git a/src/tools/network.ts b/src/tools/network.ts index 7352153..c2b4284 100644 --- a/src/tools/network.ts +++ b/src/tools/network.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; import type * as playwright from 'playwright'; diff --git a/src/tools/pdf.ts b/src/tools/pdf.ts index d57aac6..72bee47 100644 --- a/src/tools/pdf.ts +++ b/src/tools/pdf.ts @@ -14,9 +14,8 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; - import * as javascript from '../utils/codegen.js'; const pdfSchema = z.object({ diff --git a/src/tools/screenshot.ts b/src/tools/screenshot.ts index e7297ae..08d7cf1 100644 --- a/src/tools/screenshot.ts +++ b/src/tools/screenshot.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; - +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; import * as javascript from '../utils/codegen.js'; import { generateLocator } from './utils.js'; diff --git a/src/tools/snapshot.ts b/src/tools/snapshot.ts index 0a8717d..523d69e 100644 --- a/src/tools/snapshot.ts +++ b/src/tools/snapshot.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; - +import { z } from '../mcp/bundle.js'; import { defineTabTool, defineTool } from './tool.js'; import * as javascript from '../utils/codegen.js'; import { generateLocator } from './utils.js'; diff --git a/src/tools/tabs.ts b/src/tools/tabs.ts index 7332f9f..4cfe7d5 100644 --- a/src/tools/tabs.ts +++ b/src/tools/tabs.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTool } from './tool.js'; const browserTabs = defineTool({ diff --git a/src/tools/verify.ts b/src/tools/verify.ts index 93f4f1a..3414f97 100644 --- a/src/tools/verify.ts +++ b/src/tools/verify.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; - +import { z } from '../mcp/bundle.js'; import { defineTabTool } from './tool.js'; import * as javascript from '../utils/codegen.js'; import { generateLocator } from './utils.js'; diff --git a/src/tools/wait.ts b/src/tools/wait.ts index 32a7306..95c5ab6 100644 --- a/src/tools/wait.ts +++ b/src/tools/wait.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from '../mcp/bundle.js'; import { defineTool } from './tool.js'; const wait = defineTool({ diff --git a/src/utils/fileUtils.ts b/src/utils/fileUtils.ts index 587db96..b30e5ca 100644 --- a/src/utils/fileUtils.ts +++ b/src/utils/fileUtils.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import os from 'node:os'; -import path from 'node:path'; +import os from 'os'; +import path from 'path'; export function cacheDir() { let cacheDirectory: string; diff --git a/src/vscode/host.ts b/src/vscode/host.ts index 5795d7b..f6d3077 100644 --- a/src/vscode/host.ts +++ b/src/vscode/host.ts @@ -14,15 +14,10 @@ * limitations under the License. */ -import { fileURLToPath } from 'url'; +import url from 'url'; import path from 'path'; -import { z } from 'zod'; -import { zodToJsonSchema } from 'zod-to-json-schema'; - -import { Client } from '@modelcontextprotocol/sdk/client/index.js'; -import { ListRootsRequestSchema, PingRequestSchema } from '@modelcontextprotocol/sdk/types.js'; -import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; +import * as mcpBundle from '../mcp/bundle.js'; import * as mcpServer from '../mcp/server.js'; import { logUnhandledError } from '../utils/log.js'; import { packageJSON } from '../utils/package.js'; @@ -30,10 +25,15 @@ import { packageJSON } from '../utils/package.js'; import { FullConfig } from '../config.js'; import { BrowserServerBackend } from '../browserServerBackend.js'; import { contextFactory } from '../browserContextFactory.js'; + +import type { z as zod } from 'zod'; import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'; import type { ClientVersion, ServerBackend } from '../mcp/server.js'; import type { Root, Tool, CallToolResult, CallToolRequest } from '@modelcontextprotocol/sdk/types.js'; import type { Browser, BrowserContext, BrowserServer } from 'playwright'; +import type { Client } from '@modelcontextprotocol/sdk/client/index.js'; + +const { z, zodToJsonSchema } = mcpBundle; const contextSwitchOptions = z.object({ connectionString: z.string().optional().describe('The connection string to use to connect to the browser'), @@ -111,7 +111,7 @@ class VSCodeProxyBackend implements ServerBackend { return url.toString(); } - private async _callContextSwitchTool(params: z.infer): Promise { + private async _callContextSwitchTool(params: zod.infer): Promise { if (params.debugController) { const url = await this._getDebugControllerURL(); const lines = [`### Result`]; @@ -133,11 +133,11 @@ class VSCodeProxyBackend implements ServerBackend { } await this._setCurrentClient( - new StdioClientTransport({ + new mcpBundle.StdioClientTransport({ command: process.execPath, cwd: process.cwd(), args: [ - path.join(fileURLToPath(import.meta.url), '..', 'main.js'), + path.join(url.fileURLToPath(import.meta.url), '..', 'main.js'), JSON.stringify(this._config), params.connectionString, params.lib, @@ -166,14 +166,14 @@ class VSCodeProxyBackend implements ServerBackend { await this._currentClient?.close(); this._currentClient = undefined; - const client = new Client(this._clientVersion!); + const client = new mcpBundle.Client(this._clientVersion!); client.registerCapabilities({ roots: { listRoots: true, }, }); - client.setRequestHandler(ListRootsRequestSchema, () => ({ roots: this._roots })); - client.setRequestHandler(PingRequestSchema, () => ({})); + client.setRequestHandler(mcpBundle.ListRootsRequestSchema, () => ({ roots: this._roots })); + client.setRequestHandler(mcpBundle.PingRequestSchema, () => ({})); await client.connect(transport); this._currentClient = client; diff --git a/src/vscode/main.ts b/src/vscode/main.ts index 4ed6751..e0e73e2 100644 --- a/src/vscode/main.ts +++ b/src/vscode/main.ts @@ -14,10 +14,11 @@ * limitations under the License. */ -import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'; +import * as mcpBundle from '../mcp/bundle.js'; import * as mcpServer from '../mcp/server.js'; import { BrowserServerBackend } from '../browserServerBackend.js'; import { BrowserContextFactory, ClientInfo } from '../browserContextFactory.js'; + import type { FullConfig } from '../config.js'; import type { BrowserContext } from 'playwright-core'; @@ -63,7 +64,7 @@ async function main(config: FullConfig, connectionString: string, lib: string) { create: () => new BrowserServerBackend(config, factory), version: 'unused' }, - new StdioServerTransport(), + new mcpBundle.StdioServerTransport(), false ); } diff --git a/utils/check-deps.js b/utils/check-deps.js index 884f660..60d545c 100644 --- a/utils/check-deps.js +++ b/utils/check-deps.js @@ -21,8 +21,12 @@ import fs from 'fs'; import ts from 'typescript'; import path from 'path'; +import Module from 'module'; const __dirname = path.dirname(new URL(import.meta.url).pathname); +const require = Module.createRequire(import.meta.url); + +const builtins = new Set(Module.builtinModules); const depsCache = {}; const packageRoot = path.resolve(__dirname, '..'); @@ -31,6 +35,13 @@ async function checkDeps() { const deps = new Set(); const src = path.join(packageRoot, 'src'); + + let packageJSON; + try { + packageJSON = require(path.resolve(path.join(packageRoot, 'package.json'))); + } catch { + } + const program = ts.createProgram({ options: { allowJs: true, @@ -53,6 +64,25 @@ async function checkDeps() { process.exit(1); } + if (packageJSON) { + for (const dep of deps) { + const resolved = require.resolve(dep, { paths: [packageRoot] }); + if (dep === resolved || !resolved.includes('node_modules')) + deps.delete(dep); + } + for (const dep of Object.keys(packageJSON.dependencies || {})) + deps.delete(dep); + + if (deps.size) { + console.log('Dependencies are not declared in package.json:'); + for (const dep of deps) + console.log(` ${dep}`); + process.exit(1); + } + } + + return packageJSON; + function visit(node, fileName, text) { if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier)) { if (node.importClause) { @@ -94,10 +124,21 @@ async function checkDeps() { return; } + let depName; if (importName.startsWith('@')) - deps.add(importName.split('/').slice(0, 2).join('/')); + depName = importName.split('/').slice(0, 2).join('/'); else - deps.add(importName.split('/')[0]); + depName = importName.split('/')[0]; + deps.add(depName); + try { + require.resolve(depName, { paths: [packageRoot] }) + } catch (e) { + console.log(`Invalid dependency ${depName} in ${fileName}`); + process.exit(1); + } + + if (!allowExternalImport(importName, packageJSON)) + errors.push(`Disallowed external dependency ${importName} from ${path.relative(packageRoot, fileName)}`); } ts.forEachChild(node, x => visit(x, fileName, text)); } @@ -154,6 +195,19 @@ async function checkDeps() { } return false; } + + function allowExternalImport(importName, packageJSON) { + // Only external imports are relevant. Files in src/web are bundled via webpack. + if (importName.startsWith('.') || (importName.startsWith('@') && !importName.startsWith('@playwright/'))) + return true; + if (!packageJSON) + return false; + const match = importName.match(/(@[\w-]+\/)?([^/]+)/); + const dependency = match[1] ? match[1] + match[2] : match[2]; + if (builtins.has(dependency)) + return true; + return !!(packageJSON.dependencies || {})[dependency]; + } } function listAllFiles(dir) {