diff --git a/.gitleaksignore b/.gitleaksignore index c2ace1f..cf5b8f2 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -1,4 +1,5 @@ # Synthetic secret fixtures retained in Git history; tracked in pickforge/picklab#60. +01c7e60369b9e3a415218a6b23a397c2eeb9abd4:crates/pickforge-cli/tests/evidence.rs:generic-api-key:184 de467fbd14d00d4afa4946f610d05d724a6fa777:packages/browser/test/evidence-integration.test.ts:jwt:27 d3e4353d8fbd470deaaab30c61c7fdb0c5b14727:packages/browser/test/evidence-integration.test.ts:jwt:27 596c7c21cd5472c99db0f516988b5483354e2fe7:packages/core/test/redact.test.ts:jwt:258 diff --git a/README.md b/README.md index b3dd1fa..39c7fdd 100644 --- a/README.md +++ b/README.md @@ -175,8 +175,9 @@ tool (`desktop_click`/`move`/`scroll`/`drag`/`double_click`/`type`/`key`), `desktop_launch` (a newly launched client could otherwise grab input focus), and every DevTools relay request fail closed with a stable busy error — `takeover_status` (MCP) / `picklab takeover status` (CLI) let an agent check -before retrying, and `request_user_input` is the recommended way to ask a -human to run it. `desktop_screenshot` is the only desktop tool left ungated +before retrying. Use `request_user_input` to ask a human to run it: legacy +clients use MCP elicitation when supported, while modern clients receive guidance +to relay the question in conversation and retry afterward. `desktop_screenshot` is the only desktop tool left ungated (read-only). The lease is a 30-second TTL, heartbeat-renewed-every-5-seconds record in the @@ -302,7 +303,7 @@ reported as suppressed for an explicitly writable `--vnc-control` session. - Android: `android_start`, `android_install_apk`, `android_launch_app`, `android_screenshot`, `android_tap`, `android_type`, `android_back`, `android_home`, `android_get_ui_tree`, `android_logcat`, `android_run_adb` - Artifacts: `artifact_list`, `artifact_report` - Takeover: `takeover_status` — check whether a session is under human control (see [Supervised pause and human takeover](#supervised-pause-and-human-takeover)); read-only, always safe to call -- User: `request_user_input` — ask the human a question (via MCP elicitation when the client supports it) and wait for the answer; never used for secrets +- User: `request_user_input` — ask the human a question; supported legacy clients use MCP elicitation, while modern clients receive relay-and-retry guidance; never used for secrets Resources, addressable as `picklab://` URIs: diff --git a/bun.lock b/bun.lock index 0dc3c5c..8cf758a 100644 --- a/bun.lock +++ b/bun.lock @@ -45,13 +45,14 @@ "picklab-mcp": "dist/picklab-mcp.js", }, "dependencies": { - "@modelcontextprotocol/sdk": "^1.17.0", + "@modelcontextprotocol/server": "^2.0.0", "@sentry/node": "^10.64.0", "chrome-devtools-mcp": "1.5.0", "commander": "^14.0.0", - "zod": "^4.0.0", + "zod": "^4.2.0", }, "devDependencies": { + "@modelcontextprotocol/client": "^2.0.0", "@pickforge/picklab-agent-installers": "*", "@pickforge/picklab-android": "*", "@pickforge/picklab-browser": "*", @@ -75,19 +76,19 @@ "name": "@pickforge/picklab-mcp-server", "version": "0.3.0", "dependencies": { - "@modelcontextprotocol/sdk": "^1.17.0", + "@modelcontextprotocol/server": "^2.0.0", "@pickforge/picklab-android": "*", "@pickforge/picklab-browser": "*", "@pickforge/picklab-core": "*", "@pickforge/picklab-desktop-linux": "*", - "zod": "^4.0.0", + "zod": "^4.2.0", + }, + "devDependencies": { + "@modelcontextprotocol/client": "^2.0.0", }, }, }, "overrides": { - "body-parser": "2.3.0", - "fast-uri": "3.1.5", - "hono": "4.12.34", "postcss": "^8.5.18", }, "packages": { @@ -175,8 +176,6 @@ "@eslint/plugin-kit": ["@eslint/plugin-kit@0.7.2", "", { "dependencies": { "@eslint/core": "^1.2.1", "levn": "^0.4.1" } }, "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A=="], - "@hono/node-server": ["@hono/node-server@1.19.14", "", { "peerDependencies": { "hono": "^4" } }, "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw=="], - "@humanfs/core": ["@humanfs/core@0.19.2", "", { "dependencies": { "@humanfs/types": "^0.15.0" } }, "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA=="], "@humanfs/node": ["@humanfs/node@0.16.8", "", { "dependencies": { "@humanfs/core": "^0.19.2", "@humanfs/types": "^0.15.0", "@humanwhocodes/retry": "^0.4.0" } }, "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ=="], @@ -199,7 +198,11 @@ "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="], - "@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.29.0", "", { "dependencies": { "@hono/node-server": "^1.19.9", "ajv": "^8.17.1", "ajv-formats": "^3.0.1", "content-type": "^1.0.5", "cors": "^2.8.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "express": "^5.2.1", "express-rate-limit": "^8.2.1", "hono": "^4.11.4", "jose": "^6.1.3", "json-schema-typed": "^8.0.2", "pkce-challenge": "^5.0.0", "raw-body": "^3.0.0", "zod": "^3.25 || ^4.0", "zod-to-json-schema": "^3.25.1" }, "peerDependencies": { "@cfworker/json-schema": "^4.1.1" }, "optionalPeers": ["@cfworker/json-schema"] }, "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ=="], + "@modelcontextprotocol/client": ["@modelcontextprotocol/client@2.0.0", "", { "dependencies": { "@modelcontextprotocol/core": "2.0.0", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "jose": "^6.1.3", "pkce-challenge": "^5.0.0", "zod": "^4.2.0" } }, "sha512-8f1OghQ2rjzIOfqgUCP+8GiUWqRs89njoWLNqAe8kWmDePv3s1fZXseej+QXemssEuuOvLLmLO/kqM3IQHtISw=="], + + "@modelcontextprotocol/core": ["@modelcontextprotocol/core@2.0.0", "", { "dependencies": { "zod": "^4.2.0" } }, "sha512-pJCEwGG7Lfr/+PQp9ZTwKXNeO5wzbfKL7H3MYpCorM4oFBoQrdjnBgEoqG+RjhsvS1FKrDbKux+M1HhlnGWqcA=="], + + "@modelcontextprotocol/server": ["@modelcontextprotocol/server@2.0.0", "", { "dependencies": { "@modelcontextprotocol/core": "2.0.0", "zod": "^4.2.0" } }, "sha512-YhHWdHfpFMQfd0prsEnxKeS3Qz3ytIGmsS0sth4KDjnacIT7hxk6hXHkJ9KysxlkvTM+WZAtQbbcUhdoP4Hvtw=="], "@opentelemetry/api": ["@opentelemetry/api@1.9.1", "", {}, "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q=="], @@ -343,16 +346,12 @@ "@vitest/utils": ["@vitest/utils@3.2.6", "", { "dependencies": { "@vitest/pretty-format": "3.2.6", "loupe": "^3.1.4", "tinyrainbow": "^2.0.0" } }, "sha512-lI23nIs4bnT3T8NIoh+vFaz5s2/DdP0Jgt2jxwgWljvwn82cLJtyi/If+fjFyoLMGIOz0U/fKvWE0d4jsNQEfg=="], - "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="], - "acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="], "acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="], "ajv": ["ajv@6.15.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="], - "ajv-formats": ["ajv-formats@3.0.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="], - "ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="], "ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="], @@ -367,20 +366,12 @@ "balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "body-parser": ["body-parser@2.3.0", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^2.0.0", "debug": "^4.4.3", "http-errors": "^2.0.1", "iconv-lite": "^0.7.2", "on-finished": "^2.4.1", "qs": "^6.15.2", "raw-body": "^3.0.2", "type-is": "^2.1.0" } }, "sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw=="], - "brace-expansion": ["brace-expansion@5.0.9", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg=="], "bundle-require": ["bundle-require@5.1.0", "", { "dependencies": { "load-tsconfig": "^0.2.3" }, "peerDependencies": { "esbuild": ">=0.18" } }, "sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA=="], - "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="], - "cac": ["cac@6.7.14", "", {}, "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="], - "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="], - - "call-bound": ["call-bound@1.0.4", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" } }, "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg=="], - "chai": ["chai@5.3.3", "", { "dependencies": { "assertion-error": "^2.0.1", "check-error": "^2.1.1", "deep-eql": "^5.0.1", "loupe": "^3.1.0", "pathval": "^2.0.0" } }, "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw=="], "check-error": ["check-error@2.1.3", "", {}, "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA=="], @@ -401,16 +392,6 @@ "consola": ["consola@3.4.2", "", {}, "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA=="], - "content-disposition": ["content-disposition@1.1.0", "", {}, "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g=="], - - "content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="], - - "cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="], - - "cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="], - - "cors": ["cors@2.8.6", "", { "dependencies": { "object-assign": "^4", "vary": "^1" } }, "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw=="], - "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="], "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="], @@ -419,30 +400,14 @@ "deep-is": ["deep-is@0.1.4", "", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="], - "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="], - - "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="], - "eastasianwidth": ["eastasianwidth@0.2.0", "", {}, "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="], - "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="], - "emoji-regex": ["emoji-regex@9.2.2", "", {}, "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="], - "encodeurl": ["encodeurl@2.0.0", "", {}, "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="], - - "es-define-property": ["es-define-property@1.0.1", "", {}, "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="], - - "es-errors": ["es-errors@1.3.0", "", {}, "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="], - "es-module-lexer": ["es-module-lexer@1.7.0", "", {}, "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="], - "es-object-atoms": ["es-object-atoms@1.1.2", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw=="], - "esbuild": ["esbuild@0.27.7", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.27.7", "@esbuild/android-arm": "0.27.7", "@esbuild/android-arm64": "0.27.7", "@esbuild/android-x64": "0.27.7", "@esbuild/darwin-arm64": "0.27.7", "@esbuild/darwin-x64": "0.27.7", "@esbuild/freebsd-arm64": "0.27.7", "@esbuild/freebsd-x64": "0.27.7", "@esbuild/linux-arm": "0.27.7", "@esbuild/linux-arm64": "0.27.7", "@esbuild/linux-ia32": "0.27.7", "@esbuild/linux-loong64": "0.27.7", "@esbuild/linux-mips64el": "0.27.7", "@esbuild/linux-ppc64": "0.27.7", "@esbuild/linux-riscv64": "0.27.7", "@esbuild/linux-s390x": "0.27.7", "@esbuild/linux-x64": "0.27.7", "@esbuild/netbsd-arm64": "0.27.7", "@esbuild/netbsd-x64": "0.27.7", "@esbuild/openbsd-arm64": "0.27.7", "@esbuild/openbsd-x64": "0.27.7", "@esbuild/openharmony-arm64": "0.27.7", "@esbuild/sunos-x64": "0.27.7", "@esbuild/win32-arm64": "0.27.7", "@esbuild/win32-ia32": "0.27.7", "@esbuild/win32-x64": "0.27.7" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w=="], - "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="], - "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="], "eslint": ["eslint@10.7.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", "@eslint/config-array": "^0.23.5", "@eslint/config-helpers": "^0.6.0", "@eslint/core": "^1.2.1", "@eslint/plugin-kit": "^0.7.2", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.14.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^9.1.2", "eslint-visitor-keys": "^5.0.1", "espree": "^11.2.0", "esquery": "^1.7.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "minimatch": "^10.2.4", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-GVTD7s1vdIl6UYvAfriOPeY1Df8LIZjfofLvHwde+erDHGGuHyuM6xoxRxmHiebhYuD2p1vN4wWh0XzPARSGDQ=="], @@ -463,32 +428,22 @@ "esutils": ["esutils@2.0.3", "", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="], - "etag": ["etag@1.8.1", "", {}, "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="], - "eventsource": ["eventsource@3.0.7", "", { "dependencies": { "eventsource-parser": "^3.0.1" } }, "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA=="], "eventsource-parser": ["eventsource-parser@3.1.0", "", {}, "sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg=="], "expect-type": ["expect-type@1.3.0", "", {}, "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA=="], - "express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="], - - "express-rate-limit": ["express-rate-limit@8.5.2", "", { "dependencies": { "ip-address": "^10.2.0" }, "peerDependencies": { "express": ">= 4.11" } }, "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A=="], - "fast-deep-equal": ["fast-deep-equal@3.1.3", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="], "fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="], "fast-levenshtein": ["fast-levenshtein@2.0.6", "", {}, "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="], - "fast-uri": ["fast-uri@3.1.5", "", {}, "sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw=="], - "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], "file-entry-cache": ["file-entry-cache@8.0.0", "", { "dependencies": { "flat-cache": "^4.0.0" } }, "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ=="], - "finalhandler": ["finalhandler@2.1.1", "", { "dependencies": { "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "on-finished": "^2.4.1", "parseurl": "^1.3.3", "statuses": "^2.0.1" } }, "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA=="], - "find-up": ["find-up@5.0.0", "", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="], "fix-dts-default-cjs-exports": ["fix-dts-default-cjs-exports@1.0.1", "", { "dependencies": { "magic-string": "^0.30.17", "mlly": "^1.7.4", "rollup": "^4.34.8" } }, "sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg=="], @@ -499,58 +454,28 @@ "foreground-child": ["foreground-child@3.3.1", "", { "dependencies": { "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" } }, "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw=="], - "forwarded": ["forwarded@0.2.0", "", {}, "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="], - - "fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="], - "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], - "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="], - - "get-intrinsic": ["get-intrinsic@1.3.0", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="], - - "get-proto": ["get-proto@1.0.1", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" } }, "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="], - "glob": ["glob@10.5.0", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg=="], "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="], - "gopd": ["gopd@1.2.0", "", {}, "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="], - "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="], - "has-symbols": ["has-symbols@1.1.0", "", {}, "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="], - - "hasown": ["hasown@2.0.4", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A=="], - - "hono": ["hono@4.12.34", "", {}, "sha512-GqXJqY/xJkJmuloTrnV1ZEXG3fqte+VjkUqoRNZXcrUidiUOP4fMSIHHY4tsqZBK++kVyWmt/AAfSUuy57/eSA=="], - "html-escaper": ["html-escaper@2.0.2", "", {}, "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="], - "http-errors": ["http-errors@2.0.1", "", { "dependencies": { "depd": "~2.0.0", "inherits": "~2.0.4", "setprototypeof": "~1.2.0", "statuses": "~2.0.2", "toidentifier": "~1.0.1" } }, "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ=="], - - "iconv-lite": ["iconv-lite@0.7.2", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw=="], - "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="], "import-in-the-middle": ["import-in-the-middle@3.3.1", "", { "dependencies": { "cjs-module-lexer": "^2.2.0", "es-module-lexer": "^2.2.0", "module-details-from-path": "^1.0.4" } }, "sha512-0rymlHSFLwZ0ixx8DaQkoIyZojJPY2a0K2nEYslhKJ6jIYO/m0IcCb7iQsFPmS7WmKwISZiIrv5Icstrw/CmqA=="], "imurmurhash": ["imurmurhash@0.1.4", "", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="], - "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="], - - "ip-address": ["ip-address@10.3.1", "", {}, "sha512-1e9d3kb97NHJTIJDZW9rKqW2h6+dFa50Dy0fpPSMQp2ADje5gvKsXmdiK6dwY5t76TaTt5+P5N1Y/LoToIxP6g=="], - - "ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="], - "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="], "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], "is-glob": ["is-glob@4.0.3", "", { "dependencies": { "is-extglob": "^2.1.1" } }, "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="], - "is-promise": ["is-promise@4.0.0", "", {}, "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="], - "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], "istanbul-lib-coverage": ["istanbul-lib-coverage@3.2.2", "", {}, "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="], @@ -573,8 +498,6 @@ "json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="], - "json-schema-typed": ["json-schema-typed@8.0.2", "", {}, "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA=="], - "json-stable-stringify-without-jsonify": ["json-stable-stringify-without-jsonify@1.0.1", "", {}, "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="], "keyv": ["keyv@4.5.4", "", { "dependencies": { "json-buffer": "3.0.1" } }, "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="], @@ -599,18 +522,8 @@ "make-dir": ["make-dir@4.0.0", "", { "dependencies": { "semver": "^7.5.3" } }, "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw=="], - "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="], - - "media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="], - - "merge-descriptors": ["merge-descriptors@2.0.0", "", {}, "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="], - "meriyah": ["meriyah@6.1.4", "", {}, "sha512-Sz8FzjzI0kN13GK/6MVEsVzMZEPvOhnmmI1lU5+/1cGOiK3QUahntrNNtdVeihrO7t9JpoH75iMNXg6R6uWflQ=="], - "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], - - "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="], - "minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], "minipass": ["minipass@7.1.3", "", {}, "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="], @@ -627,16 +540,8 @@ "natural-compare": ["natural-compare@1.4.0", "", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="], - "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], - "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], - "object-inspect": ["object-inspect@1.13.4", "", {}, "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew=="], - - "on-finished": ["on-finished@2.4.1", "", { "dependencies": { "ee-first": "1.1.1" } }, "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="], - - "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="], - "optionator": ["optionator@0.9.4", "", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="], "p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="], @@ -645,16 +550,12 @@ "package-json-from-dist": ["package-json-from-dist@1.0.1", "", {}, "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="], - "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="], - "path-exists": ["path-exists@4.0.0", "", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="], "path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="], "path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="], - "path-to-regexp": ["path-to-regexp@8.4.2", "", {}, "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA=="], - "pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="], "pathval": ["pathval@2.0.1", "", {}, "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ=="], @@ -675,52 +576,24 @@ "prelude-ls": ["prelude-ls@1.2.1", "", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="], - "proxy-addr": ["proxy-addr@2.0.7", "", { "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="], - "punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="], - "qs": ["qs@6.15.2", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw=="], - - "range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="], - - "raw-body": ["raw-body@3.0.2", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.7.0", "unpipe": "~1.0.0" } }, "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA=="], - "readdirp": ["readdirp@4.1.2", "", {}, "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg=="], - "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="], - "require-in-the-middle": ["require-in-the-middle@8.0.1", "", { "dependencies": { "debug": "^4.3.5", "module-details-from-path": "^1.0.3" } }, "sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ=="], "resolve-from": ["resolve-from@5.0.0", "", {}, "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="], "rollup": ["rollup@4.61.1", "", { "dependencies": { "@types/estree": "1.0.9" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.61.1", "@rollup/rollup-android-arm64": "4.61.1", "@rollup/rollup-darwin-arm64": "4.61.1", "@rollup/rollup-darwin-x64": "4.61.1", "@rollup/rollup-freebsd-arm64": "4.61.1", "@rollup/rollup-freebsd-x64": "4.61.1", "@rollup/rollup-linux-arm-gnueabihf": "4.61.1", "@rollup/rollup-linux-arm-musleabihf": "4.61.1", "@rollup/rollup-linux-arm64-gnu": "4.61.1", "@rollup/rollup-linux-arm64-musl": "4.61.1", "@rollup/rollup-linux-loong64-gnu": "4.61.1", "@rollup/rollup-linux-loong64-musl": "4.61.1", "@rollup/rollup-linux-ppc64-gnu": "4.61.1", "@rollup/rollup-linux-ppc64-musl": "4.61.1", "@rollup/rollup-linux-riscv64-gnu": "4.61.1", "@rollup/rollup-linux-riscv64-musl": "4.61.1", "@rollup/rollup-linux-s390x-gnu": "4.61.1", "@rollup/rollup-linux-x64-gnu": "4.61.1", "@rollup/rollup-linux-x64-musl": "4.61.1", "@rollup/rollup-openbsd-x64": "4.61.1", "@rollup/rollup-openharmony-arm64": "4.61.1", "@rollup/rollup-win32-arm64-msvc": "4.61.1", "@rollup/rollup-win32-ia32-msvc": "4.61.1", "@rollup/rollup-win32-x64-gnu": "4.61.1", "@rollup/rollup-win32-x64-msvc": "4.61.1", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-I4KW6iuRpuu2uHBLraZ1wNZe0DP7lnRha+VJ9tNaYVaVgKhW0aI3h4RYnoRPeql0flHm/Co55b7snEDcOfOJrA=="], - "router": ["router@2.2.0", "", { "dependencies": { "debug": "^4.4.0", "depd": "^2.0.0", "is-promise": "^4.0.0", "parseurl": "^1.3.3", "path-to-regexp": "^8.0.0" } }, "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ=="], - - "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], - "semifies": ["semifies@1.0.0", "", {}, "sha512-xXR3KGeoxTNWPD4aBvL5NUpMTT7WMANr3EWnaS190QVkY52lqqcVRD7Q05UVbBhiWDGWMlJEUam9m7uFFGVScw=="], "semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="], - "send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="], - - "serve-static": ["serve-static@2.2.1", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw=="], - - "setprototypeof": ["setprototypeof@1.2.0", "", {}, "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="], - "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="], "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], - "side-channel": ["side-channel@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.4", "side-channel-list": "^1.0.1", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ=="], - - "side-channel-list": ["side-channel-list@1.0.1", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.4" } }, "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w=="], - - "side-channel-map": ["side-channel-map@1.0.1", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3" } }, "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA=="], - - "side-channel-weakmap": ["side-channel-weakmap@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } }, "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A=="], - "siginfo": ["siginfo@2.0.0", "", {}, "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="], "signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], @@ -731,8 +604,6 @@ "stackback": ["stackback@0.0.2", "", {}, "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="], - "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="], - "std-env": ["std-env@3.10.0", "", {}, "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg=="], "string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="], @@ -767,8 +638,6 @@ "tinyspy": ["tinyspy@4.0.4", "", {}, "sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q=="], - "toidentifier": ["toidentifier@1.0.1", "", {}, "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="], - "tree-kill": ["tree-kill@1.2.2", "", { "bin": { "tree-kill": "cli.js" } }, "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="], "ts-api-utils": ["ts-api-utils@2.5.0", "", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA=="], @@ -779,8 +648,6 @@ "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="], - "type-is": ["type-is@2.1.0", "", { "dependencies": { "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA=="], - "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], "typescript-eslint": ["typescript-eslint@8.65.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.65.0", "@typescript-eslint/parser": "8.65.0", "@typescript-eslint/typescript-estree": "8.65.0", "@typescript-eslint/utils": "8.65.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-/ggrHAwyjENDusvyxbuqxAC2dTnZg/Z8F+fgQtYIz+L6n/9HfSlEZcFGV/NsMNa6CkGk0xUjUAFwC0vHOflvIA=="], @@ -789,12 +656,8 @@ "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="], - "unpipe": ["unpipe@1.0.0", "", {}, "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="], - "uri-js": ["uri-js@4.4.1", "", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="], - "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="], - "vite": ["vite@7.3.5", "", { "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww=="], "vite-node": ["vite-node@3.2.4", "", { "dependencies": { "cac": "^6.7.14", "debug": "^4.4.1", "es-module-lexer": "^1.7.0", "pathe": "^2.0.3", "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0" }, "bin": { "vite-node": "vite-node.mjs" } }, "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg=="], @@ -811,28 +674,18 @@ "wrap-ansi-cjs": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], - "wrappy": ["wrappy@1.0.2", "", {}, "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="], - "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], "zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], - "zod-to-json-schema": ["zod-to-json-schema@3.25.2", "", { "peerDependencies": { "zod": "^3.25.28 || ^4" } }, "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA=="], - "@apm-js-collab/code-transformer/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], "@apm-js-collab/code-transformer-bundler-plugins/es-module-lexer": ["es-module-lexer@2.3.0", "", {}, "sha512-KLdwQm2NvGLDkQDCGvmiQrhkd0JbMzXthwQAUgWjQuQdBLFa3eiBP5arXZyA+f8x+x7OXgud6bq2rxjGtHV2tw=="], "@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="], - "@modelcontextprotocol/sdk/ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="], - "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.6", "", {}, "sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw=="], - "ajv-formats/ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="], - - "body-parser/content-type": ["content-type@2.0.0", "", {}, "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ=="], - "glob/minimatch": ["minimatch@9.0.9", "", { "dependencies": { "brace-expansion": "^2.0.2" } }, "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="], "import-in-the-middle/es-module-lexer": ["es-module-lexer@2.3.0", "", {}, "sha512-KLdwQm2NvGLDkQDCGvmiQrhkd0JbMzXthwQAUgWjQuQdBLFa3eiBP5arXZyA+f8x+x7OXgud6bq2rxjGtHV2tw=="], @@ -847,18 +700,12 @@ "sucrase/commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="], - "type-is/content-type": ["content-type@2.0.0", "", {}, "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ=="], - "wrap-ansi-cjs/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "wrap-ansi-cjs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], "wrap-ansi-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - "@modelcontextprotocol/sdk/ajv/json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="], - - "ajv-formats/ajv/json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="], - "glob/minimatch/brace-expansion": ["brace-expansion@2.1.4", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg=="], "string-width-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], diff --git a/docs/releases/UNRELEASED.md b/docs/releases/UNRELEASED.md index 837a42a..0075b2d 100644 --- a/docs/releases/UNRELEASED.md +++ b/docs/releases/UNRELEASED.md @@ -25,6 +25,13 @@ GitHub release description, then reset it after the release is published. completed writes while retaining backups. There is deliberately no durable journal or daemon: a process interruption can leave a partially applied set; owned temporary/backup artifacts are recognized so a later rerun converges it. +- Migrated the stdio MCP server to SDK v2 with stable dual-era handling: + supported 2024/2025 protocol revisions keep the legacy tool, resource, prompt, + and elicitation behavior, while modern MCP uses discovery and per-request + metadata. Modern clients cannot use interactive push elicitation here; + `request_user_input` returns relay-and-retry guidance instead. Tasks and MRTR + are intentionally not adopted; `tasks/list` remains method-not-found. + ## Internal/release changes - Added an unpublished, default-off Flutter integration alpha for `pickforge @@ -33,9 +40,10 @@ GitHub release description, then reset it after the release is published. Flutter workflow skill into Claude's skill root and/or the shared Codex/Pi agent-skill root. It requires discoverable `dart` but never executes it; the default base pack and every release surface remain unchanged. -- Raised the vulnerable `fast-uri` and `hono` overrides, plus lockfile - resolutions for both `brace-expansion` majors, `fast-uri`, `hono`, - `ip-address`, and `nanoid`, to patched releases. +- Raised lockfile resolutions for both `brace-expansion` majors, + `ip-address`, and `nanoid` to patched releases. The SDK v2 migration removes + the former Express/Hono dependency stack, so the obsolete `body-parser`, + `fast-uri`, and `hono` overrides and Hono advisory suppression are gone. - Added a Cargo workspace (`crates/pickforge-cli`, `Cargo.lock` committed) and a `rust` CI matrix for `ubuntu-latest` and `windows-latest` (fmt, clippy `-D warnings`, tests). The Bun job, its pinned Bun version, and all release @@ -46,6 +54,9 @@ GitHub release description, then reset it after the release is published. ### Tested +- MCP v2 focused validation passes: frozen install, root typecheck/lint/build, + protocol wire fixtures (including real transport self-close), CLI close-once, + user-input, evidence, and server tests. - Pinned Bun 1.3.12 CI: frozen install, typecheck, lint, 1,133 tests pass, one skips, coverage passes at 82.48% lines, and build passes. - The pinned OSV Scanner v2.3.8 image reports no unfiltered advisories. @@ -64,6 +75,10 @@ GitHub release description, then reset it after the release is published. ### Not tested yet +- MCP v2 validation uses protocol fixtures, not proprietary client binaries. + The full normal suite reached 1,097 passing tests with 44 skipped, but eight + desktop CLI tests could not start Xvfb in this environment; coverage has the + same Xvfb limitation and did not complete. - macOS for the Rust binary. - No packaging, installer, or distribution path for `pickforge` yet. diff --git a/osv-scanner.toml b/osv-scanner.toml index 657dd41..82cab5a 100644 --- a/osv-scanner.toml +++ b/osv-scanner.toml @@ -1,7 +1,3 @@ -[[IgnoredVulns]] -id = "GHSA-frvp-7c67-39w9" -reason = "Below the high/critical gate; the fixed @hono/node-server release requires an upstream major-version update. Tracked in pickforge/picklab#60." - [[IgnoredVulns]] id = "GHSA-g7r4-m6w7-qqqr" reason = "Below the high/critical gate; the fixed esbuild release is outside current direct dependency ranges. Tracked in pickforge/picklab#60." diff --git a/package.json b/package.json index 3092dd0..285fbac 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,6 @@ "node": "^20.19.0 || ^22.12.0 || >=23.0.0" }, "overrides": { - "body-parser": "2.3.0", - "fast-uri": "3.1.5", - "hono": "4.12.34", "postcss": "^8.5.18" }, "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 0a564eb..5099516 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,13 +40,14 @@ "prepack": "node -e \"const fs=require('node:fs');fs.copyFileSync('../../README.md','README.md');fs.copyFileSync('../../LICENSE','LICENSE')\"" }, "dependencies": { - "@modelcontextprotocol/sdk": "^1.17.0", + "@modelcontextprotocol/server": "^2.0.0", "@sentry/node": "^10.64.0", "commander": "^14.0.0", "chrome-devtools-mcp": "1.5.0", - "zod": "^4.0.0" + "zod": "^4.2.0" }, "devDependencies": { + "@modelcontextprotocol/client": "^2.0.0", "@pickforge/picklab-agent-installers": "*", "@pickforge/picklab-android": "*", "@pickforge/picklab-browser": "*", diff --git a/packages/cli/src/commands/mcp.ts b/packages/cli/src/commands/mcp.ts index 2a67296..a15ca0a 100644 --- a/packages/cli/src/commands/mcp.ts +++ b/packages/cli/src/commands/mcp.ts @@ -1,25 +1,45 @@ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; +import { + serveStdio, + StdioServerTransport, + type StdioServerHandle, +} from "@modelcontextprotocol/server/stdio"; import { createMcpServer } from "@pickforge/picklab-mcp-server"; +// serveStdio owns `onclose`, so observe shutdown by wrapping close instead. +class ClosingStdioServerTransport extends StdioServerTransport { + constructor(private readonly onClosed: () => void) { + super(); + } + + override async close(): Promise { + await super.close(); + this.onClosed(); + } +} + export async function runMcpServe(): Promise { - const server = createMcpServer(); - const transport = new StdioServerTransport(); - await server.connect(transport); - console.error("picklab mcp server: listening on stdio"); return new Promise((resolve) => { let settled = false; + let handle: StdioServerHandle | undefined; const finish = (): void => { - if (settled) { - return; - } + if (settled) return; settled = true; - void server - .close() - .catch(() => {}) - .then(() => resolve(0)); + process.stdin.off("end", finish); + process.stdin.off("close", finish); + void (handle?.close() ?? Promise.resolve()).catch(() => {}).then(() => resolve(0)); }; - server.server.onclose = finish; + const transport = new ClosingStdioServerTransport(finish); process.stdin.on("end", finish); process.stdin.on("close", finish); + handle = serveStdio( + ({ era }) => createMcpServer({ era }), + { + legacy: "serve", + transport, + onerror: (error) => console.error("picklab mcp server:", error), + }, + ); + if (settled) void handle.close().catch(() => {}); + console.error("picklab mcp server: listening on stdio"); }); } diff --git a/packages/cli/test/browser-session.test.ts b/packages/cli/test/browser-session.test.ts index f502fc8..d82a97b 100644 --- a/packages/cli/test/browser-session.test.ts +++ b/packages/cli/test/browser-session.test.ts @@ -1,5 +1,5 @@ -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"; +import { Client } from "@modelcontextprotocol/client"; +import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { spawnSync } from "node:child_process"; import fs from "node:fs"; import os from "node:os"; diff --git a/packages/cli/test/devtools-real.test.ts b/packages/cli/test/devtools-real.test.ts index 40063fa..9ed203f 100644 --- a/packages/cli/test/devtools-real.test.ts +++ b/packages/cli/test/devtools-real.test.ts @@ -4,8 +4,8 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; import { fileURLToPath } from "node:url"; -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"; +import { Client } from "@modelcontextprotocol/client"; +import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { afterEach, beforeAll, describe, expect, it } from "vitest"; import { findOnPath } from "@pickforge/picklab-desktop-linux"; import { diff --git a/packages/cli/test/mcp-command.test.ts b/packages/cli/test/mcp-command.test.ts new file mode 100644 index 0000000..5f89151 --- /dev/null +++ b/packages/cli/test/mcp-command.test.ts @@ -0,0 +1,75 @@ +import { EventEmitter } from "node:events"; +import { afterEach, expect, it, vi } from "vitest"; + +const { close, closeDuringStartup, serveStdio, StdioServerTransport } = vi.hoisted(() => { + const closeHandle = vi.fn(async () => {}); + const closeSynchronously = { value: false }; + class FakeTransport { + constructor(private readonly onClosed: () => void) {} + async close(): Promise { + this.onClosed(); + } + } + return { + close: closeHandle, + closeDuringStartup: closeSynchronously, + serveStdio: vi.fn( + (_factory: unknown, options: { transport: FakeTransport }) => { + if (closeSynchronously.value) void options.transport.close(); + return { close: closeHandle }; + }, + ), + StdioServerTransport: FakeTransport, + }; +}); + +vi.mock("@modelcontextprotocol/server/stdio", () => ({ + serveStdio, + StdioServerTransport, +})); +vi.mock("@pickforge/picklab-mcp-server", () => ({ + createMcpServer: vi.fn(), +})); + +import { runMcpServe } from "../src/commands/mcp.js"; + +afterEach(() => { + vi.restoreAllMocks(); + close.mockClear(); + closeDuringStartup.value = false; + serveStdio.mockClear(); +}); + +it("closes the stdio serve handle once and logs readiness to stderr", async () => { + const stderr = vi.spyOn(console, "error").mockImplementation(() => {}); + const stdin = process.stdin as EventEmitter; + const result = runMcpServe(); + const transport = serveStdio.mock.calls[0]?.[1]?.transport as InstanceType< + typeof StdioServerTransport + >; + await transport.close(); + stdin.emit("end"); + stdin.emit("close"); + + await expect(result).resolves.toBe(0); + expect(close).toHaveBeenCalledTimes(1); + expect(serveStdio).toHaveBeenCalledWith(expect.any(Function), { + legacy: "serve", + transport: expect.any(StdioServerTransport), + onerror: expect.any(Function), + }); + expect(stderr).toHaveBeenCalledWith("picklab mcp server: listening on stdio"); +}); + +it("closes the handle when the transport closes synchronously during startup", async () => { + vi.spyOn(console, "error").mockImplementation(() => {}); + closeDuringStartup.value = true; + const endListeners = process.stdin.listenerCount("end"); + const closeListeners = process.stdin.listenerCount("close"); + + await expect(runMcpServe()).resolves.toBe(0); + + expect(close).toHaveBeenCalledTimes(1); + expect(process.stdin.listenerCount("end")).toBe(endListeners); + expect(process.stdin.listenerCount("close")).toBe(closeListeners); +}); diff --git a/packages/cli/test/mcp-stdio-conformance.test.ts b/packages/cli/test/mcp-stdio-conformance.test.ts new file mode 100644 index 0000000..7b65b6b --- /dev/null +++ b/packages/cli/test/mcp-stdio-conformance.test.ts @@ -0,0 +1,279 @@ +import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process"; +import { EventEmitter } from "node:events"; +import path from "node:path"; +import readline from "node:readline"; +import { fileURLToPath } from "node:url"; +import { beforeAll, describe, expect, it } from "vitest"; +import { ensureCliBuilt } from "./build-once.js"; + +const repoRoot = fileURLToPath(new URL("../../..", import.meta.url)); +const entry = path.join(repoRoot, "packages", "cli", "dist", "picklab-mcp.js"); +const TIMEOUT_MS = 5_000; + +interface RpcResponse { + id: number; + result?: Record; + error?: { code?: number; message?: string; data?: unknown }; +} + +function waitForExit(child: ChildProcessWithoutNullStreams): Promise { + if (child.exitCode !== null || child.signalCode !== null) { + return Promise.resolve(child.exitCode); + } + return new Promise((resolve) => child.once("exit", resolve)); +} + +async function terminate(child: ChildProcessWithoutNullStreams): Promise { + if (child.exitCode !== null || child.signalCode !== null) return; + child.kill("SIGTERM"); + let timer: ReturnType | undefined; + const exited = await Promise.race([ + waitForExit(child).then(() => true), + new Promise((resolve) => { + timer = setTimeout(() => resolve(false), 250); + }), + ]); + if (timer !== undefined) clearTimeout(timer); + if (!exited && child.exitCode === null && child.signalCode === null) { + child.kill("SIGKILL"); + await waitForExit(child); + } +} + +async function runWire(messages: readonly Record[]): Promise<{ + responses: RpcResponse[]; + stderr: string; + elapsedMs: number; +}> { + const started = Date.now(); + const child = spawn(process.execPath, [entry], { cwd: repoRoot }); + const lines = readline.createInterface({ input: child.stdout }); + const pending = new Map< + number, + { resolve: (response: RpcResponse) => void; reject: (error: Error) => void } + >(); + let stderr = ""; + let stdoutError: Error | undefined; + child.stderr.on("data", (chunk: Buffer) => { + stderr += chunk.toString(); + }); + lines.on("line", (line) => { + try { + const response = JSON.parse(line) as RpcResponse; + pending.get(response.id)?.resolve(response); + } catch (error) { + stdoutError = error instanceof Error ? error : new Error(String(error)); + for (const waiter of pending.values()) waiter.reject(stdoutError); + } + }); + + const withTimeout = async (promise: Promise, message: string): Promise => { + let timer: ReturnType | undefined; + try { + return await Promise.race([ + promise, + new Promise((_, reject) => { + timer = setTimeout(() => reject(new Error(message)), TIMEOUT_MS); + }), + ]); + } finally { + if (timer !== undefined) clearTimeout(timer); + } + }; + + try { + const responses: RpcResponse[] = []; + for (const message of messages) { + const responsePromise = + typeof message.id === "number" + ? new Promise((resolve, reject) => + pending.set(message.id as number, { resolve, reject }), + ) + : undefined; + child.stdin.write(`${JSON.stringify(message)}\n`); + if (responsePromise !== undefined) { + const response = await withTimeout( + responsePromise, + `MCP response ${message.id} timed out`, + ); + pending.delete(message.id as number); + responses.push(response); + } + } + child.stdin.end(); + const status = await withTimeout( + waitForExit(child), + "MCP process did not exit after EOF", + ); + expect(status).toBe(0); + if (stdoutError !== undefined) throw stdoutError; + return { responses, stderr, elapsedMs: Date.now() - started }; + } catch (error) { + await terminate(child); + throw error; + } finally { + pending.clear(); + lines.close(); + await terminate(child); + } +} + +function request(id: number, method: string, params: Record) { + return { jsonrpc: "2.0", id, method, params }; +} + +function legacyMessages(protocolVersion: string): Record[] { + return [ + request(1, "initialize", { + protocolVersion, + capabilities: {}, + clientInfo: { name: "protocol-fixture", version: protocolVersion }, + }), + { jsonrpc: "2.0", method: "notifications/initialized", params: {} }, + request(2, "tools/list", {}), + request(3, "resources/list", {}), + request(4, "prompts/list", {}), + request(5, "tools/call", { name: "artifact_list", arguments: {} }), + ]; +} + +const modernMeta = { + "io.modelcontextprotocol/protocolVersion": "2026-07-28", + "io.modelcontextprotocol/clientInfo": { name: "modern-fixture", version: "1" }, + "io.modelcontextprotocol/clientCapabilities": { elicitation: {} }, +}; + +const clientApproximationFixtures = [ + { + label: "Claude Code representative approximation", + protocolVersion: "2025-11-25", + clientInfo: { name: "claude-code-representative", version: "config-era" }, + capabilities: { sampling: {}, elicitation: {} }, + }, + { + label: "Codex representative approximation", + protocolVersion: "2025-03-26", + clientInfo: { name: "codex-representative", version: "config-era" }, + capabilities: { roots: { listChanged: true }, sampling: {} }, + }, + { + label: "Pi/pi-mcp-adapter approximation", + protocolVersion: "2025-06-18", + clientInfo: { name: "pi-mcp-adapter-approximation", version: "config-era" }, + capabilities: {}, + }, +] as const; + +beforeAll(ensureCliBuilt); + +it("waitForExit returns after an already-emitted signaled exit", async () => { + const child = Object.assign(new EventEmitter(), { + exitCode: null, + signalCode: "SIGTERM", + }) as ChildProcessWithoutNullStreams; + + await expect(waitForExit(child)).resolves.toBeNull(); +}); + +describe("MCP stdio protocol fixtures (not proprietary client binaries)", () => { + it.each([ + "2025-11-25", + "2025-06-18", + "2025-03-26", + "2024-11-05", + "2024-10-07", + ])("serves supported legacy revision %s", async (protocolVersion) => { + const { responses, stderr, elapsedMs } = await runWire( + legacyMessages(protocolVersion), + ); + expect(responses).toHaveLength(5); + expect(responses.every((response) => response.error === undefined)).toBe(true); + expect(responses[0]?.result?.protocolVersion).toBe(protocolVersion); + expect(responses[1]?.result?.tools).toEqual( + expect.arrayContaining([expect.objectContaining({ name: "request_user_input" })]), + ); + expect(responses[2]?.result?.resources.length).toBeGreaterThan(0); + expect(responses[3]?.result?.prompts.length).toBeGreaterThan(0); + expect(responses[4]?.result?.content).toBeDefined(); + expect(stderr).toContain("listening on stdio"); + expect(elapsedMs).toBeLessThan(TIMEOUT_MS); + }); + + it.each(clientApproximationFixtures)( + "$label raw-wire contract smoke (proprietary binary not run)", + async ({ protocolVersion, clientInfo, capabilities }) => { + const { responses } = await runWire([ + request(1, "initialize", { protocolVersion, clientInfo, capabilities }), + { jsonrpc: "2.0", method: "notifications/initialized", params: {} }, + request(2, "tools/list", {}), + ]); + + expect(responses).toHaveLength(2); + expect(responses[0]?.error).toBeUndefined(); + expect(responses[0]?.result?.protocolVersion).toBe(protocolVersion); + expect(responses[1]?.result?.tools).toEqual( + expect.arrayContaining([expect.objectContaining({ name: "artifact_list" })]), + ); + }, + ); + + it("counter-offers the latest legacy revision for an unsupported version", async () => { + const { responses } = await runWire([ + request(1, "initialize", { + protocolVersion: "2023-01-01", + capabilities: {}, + clientInfo: { name: "unsupported-protocol-fixture", version: "1" }, + }), + ]); + expect(responses[0]?.error).toBeUndefined(); + expect(responses[0]?.result?.protocolVersion).toBe("2025-11-25"); + }); + + it("serves modern discovery while keeping elicitation and Tasks boundaries explicit", async () => { + const withMeta = (params: Record) => ({ ...params, _meta: modernMeta }); + const { responses, stderr } = await runWire([ + request(1, "server/discover", withMeta({})), + request(2, "tools/list", withMeta({})), + request(3, "resources/list", withMeta({})), + request(4, "prompts/list", withMeta({})), + request(5, "tools/call", withMeta({ + name: "request_user_input", + arguments: { question: "Which AVD should I use?" }, + })), + request(6, "tasks/list", withMeta({})), + ]); + expect(responses).toHaveLength(6); + expect(responses[0]?.result?.supportedVersions).toContain("2026-07-28"); + expect(responses[1]?.result?.tools).toEqual( + expect.arrayContaining([expect.objectContaining({ name: "request_user_input" })]), + ); + expect(responses[2]?.result?.resources.length).toBeGreaterThan(0); + expect(responses[3]?.result?.prompts.length).toBeGreaterThan(0); + expect(responses[4]?.result?.isError).toBe(true); + expect(JSON.stringify(responses[4]?.result)).toMatch(/Modern MCP.*Relay.*retry/s); + expect(responses[5]?.error).toMatchObject({ code: -32601 }); + expect(stderr).toContain("listening on stdio"); + }); + + it("exits cleanly when the real transport self-closes with stdin still open", async () => { + const child = spawn(process.execPath, [entry], { cwd: repoRoot }); + child.stdin.on("error", () => {}); + let timer: ReturnType | undefined; + try { + child.stdin.write(Buffer.alloc(11 * 1024 * 1024, "x")); + const status = await Promise.race([ + waitForExit(child), + new Promise((_, reject) => { + timer = setTimeout( + () => reject(new Error("MCP process did not exit after transport self-close")), + TIMEOUT_MS, + ); + }), + ]); + expect(status).toBe(0); + } finally { + if (timer !== undefined) clearTimeout(timer); + await terminate(child); + } + }); +}); diff --git a/packages/mcp-server/package.json b/packages/mcp-server/package.json index 98894db..1eceab3 100644 --- a/packages/mcp-server/package.json +++ b/packages/mcp-server/package.json @@ -17,11 +17,14 @@ "build": "tsup src/index.ts --format esm --dts --clean" }, "dependencies": { - "@modelcontextprotocol/sdk": "^1.17.0", + "@modelcontextprotocol/server": "^2.0.0", "@pickforge/picklab-android": "*", "@pickforge/picklab-browser": "*", "@pickforge/picklab-core": "*", "@pickforge/picklab-desktop-linux": "*", - "zod": "^4.0.0" + "zod": "^4.2.0" + }, + "devDependencies": { + "@modelcontextprotocol/client": "^2.0.0" } } diff --git a/packages/mcp-server/src/context.ts b/packages/mcp-server/src/context.ts index 5ce452b..bf964a5 100644 --- a/packages/mcp-server/src/context.ts +++ b/packages/mcp-server/src/context.ts @@ -1,6 +1,6 @@ import fs from "node:fs"; import path from "node:path"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/server"; import { resolveRunnableSession, resolveScreenshotTarget as resolveTarget, @@ -19,14 +19,18 @@ export { const MAX_INLINE_IMAGE_BYTES = 2 * 1024 * 1024; +export type McpEra = "legacy" | "modern"; + export interface CreateMcpServerOptions { projectDir?: string; env?: EnvLike; + era?: McpEra; } export interface ServerContext { projectDir: string; env: EnvLike; + era: McpEra; } export function resolveContext( @@ -36,7 +40,7 @@ export function resolveContext( const projectDir = path.resolve( opts.projectDir ?? env.PICKLAB_PROJECT_DIR ?? process.cwd(), ); - return { projectDir, env }; + return { projectDir, env, era: opts.era ?? "legacy" }; } export interface ToolReport { diff --git a/packages/mcp-server/src/evidence.ts b/packages/mcp-server/src/evidence.ts index 62dd5ab..c5dbbc4 100644 --- a/packages/mcp-server/src/evidence.ts +++ b/packages/mcp-server/src/evidence.ts @@ -18,6 +18,8 @@ import { } from "@pickforge/picklab-core"; import type { ServerContext, ToolReport } from "./context.js"; +type EvidenceServerContext = Pick; + export interface EvidenceOperationContext { actionId: string; run?: RunHandle; @@ -48,7 +50,7 @@ function reportEvidenceFailure(tool: string, error: unknown): void { } async function evidenceRun( - ctx: ServerContext, + ctx: EvidenceServerContext, sessionId: string, ): Promise { const config = await loadConfig(ctx.projectDir, ctx.env); @@ -126,7 +128,7 @@ function sanitizedTarget( // eslint-disable-next-line complexity -- Legacy gate debt: pickforge/picklab#60 export async function withMcpEvidence( - ctx: ServerContext, + ctx: EvidenceServerContext, options: McpEvidenceOptions, operation: (evidence: EvidenceOperationContext) => Promise, ): Promise { diff --git a/packages/mcp-server/src/index.ts b/packages/mcp-server/src/index.ts index 6edfff7..a81761b 100644 --- a/packages/mcp-server/src/index.ts +++ b/packages/mcp-server/src/index.ts @@ -1,5 +1,5 @@ import { createRequire } from "node:module"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer } from "@modelcontextprotocol/server"; import { resolveContext, type CreateMcpServerOptions } from "./context.js"; import { registerPrompts } from "./prompts.js"; import { registerResources } from "./resources.js"; @@ -15,7 +15,11 @@ const { version } = require("../package.json") as { version: string }; export const packageName = "@pickforge/picklab-mcp-server"; -export type { CreateMcpServerOptions, ServerContext } from "./context.js"; +export type { + CreateMcpServerOptions, + McpEra, + ServerContext, +} from "./context.js"; export function createMcpServer( opts: CreateMcpServerOptions = {}, @@ -27,7 +31,7 @@ export function createMcpServer( registerAndroidTools(server, ctx); registerArtifactTools(server, ctx); registerTakeoverTools(server, ctx); - registerUserTools(server); + registerUserTools(server, ctx); registerResources(server, ctx); registerPrompts(server); return server; diff --git a/packages/mcp-server/src/prompts.ts b/packages/mcp-server/src/prompts.ts index 112e58b..d36f240 100644 --- a/packages/mcp-server/src/prompts.ts +++ b/packages/mcp-server/src/prompts.ts @@ -1,4 +1,4 @@ -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { McpServer } from "@modelcontextprotocol/server"; import { z } from "zod"; function userMessage(text: string): { diff --git a/packages/mcp-server/src/resources.ts b/packages/mcp-server/src/resources.ts index f9a0ed1..43256b3 100644 --- a/packages/mcp-server/src/resources.ts +++ b/packages/mcp-server/src/resources.ts @@ -3,8 +3,8 @@ import path from "node:path"; import { ResourceTemplate, type McpServer, -} from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { Variables } from "@modelcontextprotocol/sdk/shared/uriTemplate.js"; +} from "@modelcontextprotocol/server"; +import type { Variables } from "@modelcontextprotocol/server"; import { EVIDENCE_ACTION_LOG, EVIDENCE_REPORT, diff --git a/packages/mcp-server/src/tools/android.ts b/packages/mcp-server/src/tools/android.ts index 5630311..20d5d0c 100644 --- a/packages/mcp-server/src/tools/android.ts +++ b/packages/mcp-server/src/tools/android.ts @@ -1,5 +1,5 @@ import path from "node:path"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { McpServer } from "@modelcontextprotocol/server"; import { z } from "zod"; import { back, @@ -94,7 +94,10 @@ export function registerAndroidTools( const sessions = await createSessions( ctx, { type: "android", avdName: args.avdName }, - { onProgress: progressReporter(extra), signal: extra.signal }, + { + onProgress: progressReporter(extra), + signal: extra.mcpReq.signal, + }, ); await recordCreatedSessionsEvidence(ctx, sessions, "android_start"); return { data: { sessions } }; diff --git a/packages/mcp-server/src/tools/artifacts.ts b/packages/mcp-server/src/tools/artifacts.ts index 7f32be0..e569f2e 100644 --- a/packages/mcp-server/src/tools/artifacts.ts +++ b/packages/mcp-server/src/tools/artifacts.ts @@ -1,4 +1,4 @@ -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { McpServer } from "@modelcontextprotocol/server"; import { z } from "zod"; import { EVIDENCE_ACTION_LOG, diff --git a/packages/mcp-server/src/tools/desktop.ts b/packages/mcp-server/src/tools/desktop.ts index 8a4f042..40719c4 100644 --- a/packages/mcp-server/src/tools/desktop.ts +++ b/packages/mcp-server/src/tools/desktop.ts @@ -1,5 +1,5 @@ import path from "node:path"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { McpServer } from "@modelcontextprotocol/server"; import { z } from "zod"; import { withAgentPermit } from "@pickforge/picklab-core"; import { diff --git a/packages/mcp-server/src/tools/session.ts b/packages/mcp-server/src/tools/session.ts index 5204473..094be3b 100644 --- a/packages/mcp-server/src/tools/session.ts +++ b/packages/mcp-server/src/tools/session.ts @@ -1,9 +1,7 @@ -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js"; import type { - ServerNotification, - ServerRequest, -} from "@modelcontextprotocol/sdk/types.js"; + McpServer, + ServerContext as SdkToolContext, +} from "@modelcontextprotocol/server"; import { z } from "zod"; import { createAndroidSession, @@ -48,17 +46,17 @@ export interface SessionLifecycle extends LocalSessionLifecycle { } export function progressReporter( - extra: RequestHandlerExtra, + extra: SdkToolContext, ): ((message: string) => void) | undefined { - const progressToken = extra._meta?.progressToken; + const progressToken = extra.mcpReq._meta?.progressToken; if (progressToken === undefined) { return undefined; } let progress = 0; return (message: string) => { progress += 1; - void extra - .sendNotification({ + void extra.mcpReq + .notify({ method: "notifications/progress", params: { progressToken, progress, message }, }) @@ -251,7 +249,7 @@ export function registerSessionTools( runTool(async () => { const sessions = await createSessions(ctx, args, { onProgress: progressReporter(extra), - signal: extra.signal, + signal: extra.mcpReq.signal, }); await recordCreatedSessionsEvidence(ctx, sessions, "session_create"); return { data: { sessions } }; diff --git a/packages/mcp-server/src/tools/takeover.ts b/packages/mcp-server/src/tools/takeover.ts index 32fd663..b3b8888 100644 --- a/packages/mcp-server/src/tools/takeover.ts +++ b/packages/mcp-server/src/tools/takeover.ts @@ -1,4 +1,4 @@ -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { McpServer } from "@modelcontextprotocol/server"; import { z } from "zod"; import { getTakeoverStatus } from "@pickforge/picklab-core"; import { resolveSessionRecord, runTool, type ServerContext } from "../context.js"; diff --git a/packages/mcp-server/src/tools/user.ts b/packages/mcp-server/src/tools/user.ts index 88a8a3f..42a923a 100644 --- a/packages/mcp-server/src/tools/user.ts +++ b/packages/mcp-server/src/tools/user.ts @@ -1,7 +1,9 @@ -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { ElicitRequestFormParams } from "@modelcontextprotocol/sdk/types.js"; +import type { + ElicitRequestFormParams, + McpServer, +} from "@modelcontextprotocol/server"; import { z } from "zod"; -import { runTool } from "../context.js"; +import { runTool, type ServerContext } from "../context.js"; const SECRET_QUESTION_PATTERN = /password|api[_ -]?key|token|secret|2fa|otp|credential/i; @@ -21,25 +23,38 @@ const NO_ELICITATION_GUIDANCE = "This client does not support elicitation. Relay the question to the " + "user in your conversation and wait for their answer before continuing."; -export function registerUserTools(server: McpServer): void { +const MODERN_RELAY_GUIDANCE = + "Modern MCP does not support interactive push elicitation here. Relay " + + "the question to the user in your conversation, then retry this tool " + + "after receiving the answer."; + +function toolDescription(era: ServerContext["era"]): string { + return ( + (era === "modern" + ? "Prepare a question for the human user. This modern MCP path " + + "returns relay-and-retry guidance instead of waiting for an answer. " + : "Ask the human user a question and wait for the answer. ") + + "Use this when you are blocked on something only a human can provide: " + + "a judgment call, a license acceptance, a click you cannot perform, " + + "or confirmation that an out-of-band step is done. SECURITY: never " + + "request passwords, API keys, or tokens through this tool — ask " + + "the user to enter them directly through an explicit writable VNC " + + "control session, or into the environment, then confirm with kind " + + '"confirm".' + ); +} + +export function registerUserTools( + server: McpServer, + serverContext: ServerContext, +): void { server.registerTool( "request_user_input", { title: "Ask the user", - description: - "Ask the human user a question and wait for the answer. Use this " + - "when you are blocked on something only a human can provide: a " + - "judgment call, a license acceptance, a click you cannot perform, " + - "or confirmation that an out-of-band step is done. SECURITY: never " + - "request passwords, API keys, or tokens through this tool — ask " + - "the user to enter them directly through an explicit writable VNC " + - "control session, or into the environment, then confirm with kind " + - '"confirm".', + description: toolDescription(serverContext.era), inputSchema: { - question: z - .string() - .min(1) - .describe("The question to put to the user"), + question: z.string().min(1).describe("The question to put to the user"), kind: z .enum(["text", "confirm"]) .optional() @@ -54,12 +69,15 @@ export function registerUserTools(server: McpServer): void { .describe("Why this input is needed, shown alongside the question"), }, }, - (args) => + (args, ctx) => runTool(async () => { const kind = args.kind ?? "text"; if (kind === "text" && SECRET_QUESTION_PATTERN.test(args.question)) { return { errors: [SECRET_GUIDANCE] }; } + if (serverContext.era === "modern") { + return { errors: [MODERN_RELAY_GUIDANCE] }; + } if (server.server.getClientCapabilities()?.elicitation === undefined) { return { errors: [NO_ELICITATION_GUIDANCE] }; } @@ -86,7 +104,7 @@ export function registerUserTools(server: McpServer): void { }, required: [fieldName], }; - const result = await server.server.elicitInput({ + const result = await ctx.mcpReq.elicitInput({ message, requestedSchema, }); diff --git a/packages/mcp-server/test/android.test.ts b/packages/mcp-server/test/android.test.ts index c854b80..b25b2e1 100644 --- a/packages/mcp-server/test/android.test.ts +++ b/packages/mcp-server/test/android.test.ts @@ -426,7 +426,6 @@ describe("android_start (fake sdk)", () => { const started = parseToolJson( await startLab.client.callTool( { name: "android_start", arguments: {} }, - undefined, { timeout: 9_000, resetTimeoutOnProgress: true, diff --git a/packages/mcp-server/test/helpers.ts b/packages/mcp-server/test/helpers.ts index 79b40c1..37c8d6f 100644 --- a/packages/mcp-server/test/helpers.ts +++ b/packages/mcp-server/test/helpers.ts @@ -1,9 +1,9 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { Client } from "@modelcontextprotocol/client"; +import { InMemoryTransport } from "@modelcontextprotocol/client"; +import type { McpServer } from "@modelcontextprotocol/server"; import { createMcpServer } from "../src/index.js"; export const FAKE_SERIAL = "emulator-5554"; @@ -43,13 +43,16 @@ export interface ConnectedLab { export async function connectLab(opts: { projectDir: string; env: Record; + era?: "legacy" | "modern"; }): Promise { // Default new runs to the pre-#34 project-local layout so existing // fixtures (`writeSyntheticRun`, hardcoded `.picklab/runs` assertions) // keep working; individual tests can still override PICKLAB_STORAGE_MODE // via opts.env to exercise the new "home" default explicitly. + const era = opts.era ?? "legacy"; const server = createMcpServer({ ...opts, + era, env: { PICKLAB_STORAGE_MODE: "project-local", ...opts.env }, }); const client = new Client({ name: "picklab-test", version: "0.0.0" }); diff --git a/packages/mcp-server/test/index.test.ts b/packages/mcp-server/test/index.test.ts index d695eee..eca7816 100644 --- a/packages/mcp-server/test/index.test.ts +++ b/packages/mcp-server/test/index.test.ts @@ -1,4 +1,4 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer } from "@modelcontextprotocol/server"; import { describe, expect, it } from "vitest"; import { createMcpServer, packageName } from "../src/index.js"; diff --git a/packages/mcp-server/test/tools.test.ts b/packages/mcp-server/test/tools.test.ts index d8b42b5..78700c2 100644 --- a/packages/mcp-server/test/tools.test.ts +++ b/packages/mcp-server/test/tools.test.ts @@ -1,8 +1,8 @@ import fs from "node:fs"; import path from "node:path"; import { afterEach, beforeEach, describe, expect, it } from "vitest"; -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; +import { Client } from "@modelcontextprotocol/client"; +import { InMemoryTransport } from "@modelcontextprotocol/client"; import { imageContent } from "../src/context.js"; import { createMcpServer } from "../src/index.js"; import { diff --git a/packages/mcp-server/test/user.test.ts b/packages/mcp-server/test/user.test.ts index 81e6b69..04a33eb 100644 --- a/packages/mcp-server/test/user.test.ts +++ b/packages/mcp-server/test/user.test.ts @@ -1,10 +1,7 @@ import { afterEach, beforeEach, describe, expect, it } from "vitest"; -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; -import { - ElicitRequestSchema, - type ElicitResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { Client } from "@modelcontextprotocol/client"; +import { InMemoryTransport } from "@modelcontextprotocol/client"; +import type { ElicitResult } from "@modelcontextprotocol/server"; import { createMcpServer } from "../src/index.js"; import { connectLab, @@ -24,6 +21,7 @@ interface ElicitingLab { async function connectElicitingLab(dirs: LabDirs): Promise { const server = createMcpServer({ + era: "legacy", projectDir: dirs.projectDir, env: { PICKLAB_HOME: dirs.home, PATH: dirs.binDir }, }); @@ -33,7 +31,7 @@ async function connectElicitingLab(dirs: LabDirs): Promise { ); const requests: Array<{ message: string; requestedSchema: unknown }> = []; let nextResult: ElicitResult = { action: "cancel" }; - client.setRequestHandler(ElicitRequestSchema, async (request) => { + client.setRequestHandler("elicitation/create", async (request) => { const params = request.params as { message: string; requestedSchema: unknown; @@ -177,6 +175,7 @@ describe("request_user_input without elicitation support", () => { beforeEach(async () => { dirs = makeLabDirs(); lab = await connectLab({ + era: "legacy", projectDir: dirs.projectDir, env: { PICKLAB_HOME: dirs.home, PATH: dirs.binDir }, }); @@ -208,3 +207,28 @@ describe("request_user_input without elicitation support", () => { expect(report.errors[0]).toMatch(/vnc/i); }); }); + +describe("request_user_input in the modern era", () => { + it("returns deterministic relay guidance without push elicitation", async () => { + const dirs = makeLabDirs(); + const lab = await connectLab({ + era: "modern", + projectDir: dirs.projectDir, + env: { PICKLAB_HOME: dirs.home, PATH: dirs.binDir }, + }); + try { + const result = await lab.client.callTool({ + name: "request_user_input", + arguments: { question: "Which AVD should I use?" }, + }); + const report = parseToolJson(result); + expect(report.ok).toBe(false); + expect(report.errors[0]).toContain("Modern MCP"); + expect(report.errors[0]).toContain("Relay the question"); + expect(report.errors[0]).toContain("retry this tool"); + } finally { + await lab.close(); + removeLabDirs(dirs); + } + }); +});