From 5e9dafdd4fe0a504cced71050630899df752cc56 Mon Sep 17 00:00:00 2001 From: User Date: Tue, 5 May 2026 12:08:11 -0700 Subject: [PATCH 1/3] feat: support SDK-backed MCP tools Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com> --- examples/sdk-mcp-tool.ts | 38 ++ package-lock.json | 814 +++++++++++++++++++++++++++++++++++++-- package.json | 1 + src/helpers.ts | 9 +- src/index.ts | 8 + src/mcp.ts | 290 ++++++++++++++ src/query.ts | 36 +- src/session.ts | 49 ++- tests/mcp.test.ts | 61 +++ 9 files changed, 1254 insertions(+), 52 deletions(-) create mode 100644 examples/sdk-mcp-tool.ts create mode 100644 src/mcp.ts create mode 100644 tests/mcp.test.ts diff --git a/examples/sdk-mcp-tool.ts b/examples/sdk-mcp-tool.ts new file mode 100644 index 0000000..7f7fce5 --- /dev/null +++ b/examples/sdk-mcp-tool.ts @@ -0,0 +1,38 @@ +import { z } from 'zod'; + +import { + ToolConfirmationOutcome, + createSession, + createSdkMcpServer, + tool, +} from '../src/index.js'; + +const execPath = process.env['DROID_EXEC_PATH'] ?? 'droid'; + +const sdkTools = createSdkMcpServer({ + name: 'sdk-tools', + tools: [ + tool( + 'favorite_number', + 'Returns a favorite number for a person', + { name: z.string() }, + ({ name }) => `${name}'s favorite number is 42.` + ), + ], +}); + +const session = await createSession({ + execPath, + mcpServers: [sdkTools], + cwd: process.cwd(), + permissionHandler: () => ToolConfirmationOutcome.ProceedOnce, +}); + +try { + const result = await session.send( + 'Use the favorite_number tool for Ada and tell me the answer.' + ); + console.log(result.text); +} finally { + await session.close(); +} diff --git a/package-lock.json b/package-lock.json index 3d70ba4..4728d1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.4", "license": "Apache-2.0", "dependencies": { + "@modelcontextprotocol/sdk": "^1.29.0", "uuid": "^11.1.0", "zod": "^3.24.0" }, @@ -725,6 +726,18 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@hono/node-server": { + "version": "1.19.14", + "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz", + "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==", + "license": "MIT", + "engines": { + "node": ">=18.14.1" + }, + "peerDependencies": { + "hono": "^4" + } + }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -844,6 +857,68 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@modelcontextprotocol/sdk": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz", + "integrity": "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==", + "license": "MIT", + "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" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@cfworker/json-schema": "^4.1.1", + "zod": "^3.25 || ^4.0" + }, + "peerDependenciesMeta": { + "@cfworker/json-schema": { + "optional": true + }, + "zod": { + "optional": false + } + } + }, + "node_modules/@modelcontextprotocol/sdk/node_modules/ajv": { + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@modelcontextprotocol/sdk/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "license": "MIT" + }, "node_modules/@napi-rs/wasm-runtime": { "version": "0.2.12", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", @@ -1992,6 +2067,19 @@ "url": "https://opencollective.com/vitest" } }, + "node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "license": "MIT", + "dependencies": { + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/acorn": { "version": "8.16.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", @@ -2032,6 +2120,45 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv-formats": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "license": "MIT", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-formats/node_modules/ajv": { + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "license": "MIT" + }, "node_modules/ansi-regex": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", @@ -2252,6 +2379,30 @@ "dev": true, "license": "MIT" }, + "node_modules/body-parser": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", + "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "license": "MIT", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.3", + "http-errors": "^2.0.0", + "iconv-lite": "^0.7.0", + "on-finished": "^2.4.1", + "qs": "^6.14.1", + "raw-body": "^3.0.1", + "type-is": "^2.0.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/brace-expansion": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", @@ -2279,6 +2430,15 @@ "esbuild": ">=0.18" } }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/cac": { "version": "6.7.14", "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", @@ -2312,7 +2472,6 @@ "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", @@ -2326,7 +2485,6 @@ "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", @@ -2463,11 +2621,67 @@ "node": "^14.18.0 || >=16.10.0" } }, + "node_modules/content-disposition": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz", + "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "license": "MIT", + "engines": { + "node": ">=6.6.0" + } + }, + "node_modules/cors": { + "version": "2.8.6", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz", + "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/cross-spawn": { "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", @@ -2536,7 +2750,6 @@ "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2603,6 +2816,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -2620,7 +2842,6 @@ "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", @@ -2638,6 +2859,12 @@ "dev": true, "license": "MIT" }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -2645,6 +2872,15 @@ "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==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/es-abstract": { "version": "1.24.2", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.2.tgz", @@ -2718,7 +2954,6 @@ "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" @@ -2728,7 +2963,6 @@ "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" @@ -2745,7 +2979,6 @@ "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" @@ -2843,6 +3076,12 @@ "@esbuild/win32-x64": "0.27.4" } }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" + }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -3200,6 +3439,36 @@ "node": ">=0.10.0" } }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/eventsource": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz", + "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==", + "license": "MIT", + "dependencies": { + "eventsource-parser": "^3.0.1" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/eventsource-parser": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.8.tgz", + "integrity": "sha512-70QWGkr4snxr0OXLRWsFLeRBIRPuQOvt4s8QYjmUlmlkyTZkRqS7EDVRZtzU3TiyDbXSzaOeF0XUKy8PchzukQ==", + "license": "MIT", + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/expect-type": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz", @@ -3210,11 +3479,71 @@ "node": ">=12.0.0" } }, + "node_modules/express": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", + "license": "MIT", + "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" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express-rate-limit": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.0.tgz", + "integrity": "sha512-XKhFohWaSBdVJNTi5TaHziqnPkv04I9UQV6q1Wy7Ui6GGQZVW12ojDFwqer14EvCXxjvPG0CyWXx7cAXpALB4Q==", + "license": "MIT", + "dependencies": { + "ip-address": "10.1.0" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/express-rate-limit" + }, + "peerDependencies": { + "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-json-stable-stringify": { @@ -3231,6 +3560,22 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", + "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -3262,6 +3607,27 @@ "node": ">=16.0.0" } }, + "node_modules/finalhandler": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", + "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", + "license": "MIT", + "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" + }, + "engines": { + "node": ">= 18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -3345,6 +3711,24 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -3364,7 +3748,6 @@ "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" @@ -3415,7 +3798,6 @@ "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", @@ -3440,7 +3822,6 @@ "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", @@ -3576,7 +3957,6 @@ "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" @@ -3641,7 +4021,6 @@ "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" @@ -3670,7 +4049,6 @@ "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" @@ -3679,6 +4057,15 @@ "node": ">= 0.4" } }, + "node_modules/hono": { + "version": "4.12.17", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.17.tgz", + "integrity": "sha512-FbJJNb/XgX7YW0hX/V8w5oYLztKEsRLykCMZWt1WdLtsfjzMvmoqWBA4H4t5norinq8/rh20oiZYr+WSl4UzAQ==", + "license": "MIT", + "engines": { + "node": ">=16.9.0" + } + }, "node_modules/html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", @@ -3686,6 +4073,42 @@ "dev": true, "license": "MIT" }, + "node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/iconv-lite": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -3723,6 +4146,12 @@ "node": ">=0.8.19" } }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, "node_modules/internal-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", @@ -3738,6 +4167,24 @@ "node": ">= 0.4" } }, + "node_modules/ip-address": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", + "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, + "node_modules/ipaddr.js": { + "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==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/is-array-buffer": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", @@ -3995,6 +4442,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "license": "MIT" + }, "node_modules/is-regex": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", @@ -4151,7 +4604,6 @@ "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/istanbul-lib-coverage": { @@ -4224,6 +4676,15 @@ "@pkgjs/parseargs": "^0.11.0" } }, + "node_modules/jose": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz", + "integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, "node_modules/joycon": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz", @@ -4268,6 +4729,12 @@ "dev": true, "license": "MIT" }, + "node_modules/json-schema-typed": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz", + "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==", + "license": "BSD-2-Clause" + }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -4421,12 +4888,57 @@ "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" } }, + "node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/merge-descriptors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/minimatch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", @@ -4477,7 +4989,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, "license": "MIT" }, "node_modules/mz": { @@ -4534,6 +5045,15 @@ "dev": true, "license": "MIT" }, + "node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/node-exports-info": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.0.tgz", @@ -4567,7 +5087,6 @@ "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" @@ -4577,7 +5096,6 @@ "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" @@ -4686,6 +5204,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -4774,6 +5313,15 @@ "node": ">=6" } }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4788,7 +5336,6 @@ "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" @@ -4818,6 +5365,16 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/path-to-regexp": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/pathe": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", @@ -4865,6 +5422,15 @@ "node": ">= 6" } }, + "node_modules/pkce-challenge": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.1.tgz", + "integrity": "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==", + "license": "MIT", + "engines": { + "node": ">=16.20.0" + } + }, "node_modules/pkg-types": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz", @@ -4985,6 +5551,19 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/proxy-addr": { + "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==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -4995,6 +5574,45 @@ "node": ">=6" } }, + "node_modules/qs": { + "version": "6.15.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.1.tgz", + "integrity": "sha512-6YHEFRL9mfgcAvql/XhwTvf5jKcOiiupt2FiJxHkiX1z4j7WL8J/jRHYLluORvc1XxB5rV20KoeK00gVJamspg==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/readdirp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", @@ -5053,6 +5671,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/resolve": { "version": "2.0.0-next.6", "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.6.tgz", @@ -5142,6 +5769,22 @@ "fsevents": "~2.3.2" } }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/safe-array-concat": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", @@ -5197,6 +5840,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, "node_modules/semver": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", @@ -5210,6 +5859,51 @@ "node": ">=10" } }, + "node_modules/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", + "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", + "license": "MIT", + "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" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/serve-static": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", + "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", + "license": "MIT", + "dependencies": { + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -5259,11 +5953,16 @@ "node": ">= 0.4" } }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "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" @@ -5276,7 +5975,6 @@ "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" @@ -5286,7 +5984,6 @@ "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", @@ -5306,7 +6003,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -5323,7 +6019,6 @@ "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", @@ -5342,7 +6037,6 @@ "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", @@ -5415,6 +6109,15 @@ "dev": true, "license": "MIT" }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/std-env": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz", @@ -5829,6 +6532,15 @@ "node": ">=14.0.0" } }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, "node_modules/tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -5956,6 +6668,20 @@ "node": ">= 0.8.0" } }, + "node_modules/type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "license": "MIT", + "dependencies": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/typed-array-buffer": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", @@ -6105,6 +6831,15 @@ "dev": true, "license": "MIT" }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/unrs-resolver": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz", @@ -6163,6 +6898,15 @@ "uuid": "dist/esm/bin/uuid" } }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/vite": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz", @@ -6338,7 +7082,6 @@ "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" @@ -6561,6 +7304,12 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -6582,6 +7331,15 @@ "funding": { "url": "https://github.com/sponsors/colinhacks" } + }, + "node_modules/zod-to-json-schema": { + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz", + "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==", + "license": "ISC", + "peerDependencies": { + "zod": "^3.25.28 || ^4" + } } } } diff --git a/package.json b/package.json index 6c2d974..f908dc5 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "node": ">=18.0.0" }, "dependencies": { + "@modelcontextprotocol/sdk": "^1.29.0", "uuid": "^11.1.0", "zod": "^3.24.0" }, diff --git a/src/helpers.ts b/src/helpers.ts index 96c8c50..f847a42 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -4,6 +4,7 @@ import type { ClientPermissionHandler, } from './client.js'; import { SDK_TAG } from './constants.js'; +import type { DroidMcpServerConfig } from './mcp.js'; import type { InitializeSessionRequestParams, McpServerConfig, @@ -208,12 +209,16 @@ export interface SessionInitOptions extends ToolSelectionOverrides { reasoningEffort?: ReasoningEffort; specModeModelId?: string; specModeReasoningEffort?: ReasoningEffort; - mcpServers?: McpServerConfig[]; + mcpServers?: DroidMcpServerConfig[]; tags?: SessionTag[]; } +type ResolvedSessionInitOptions = Omit & { + mcpServers?: McpServerConfig[]; +}; + export function buildInitParams( - options: SessionInitOptions + options: ResolvedSessionInitOptions ): InitializeSessionRequestParams { return { machineId: options.machineId ?? 'default', diff --git a/src/index.ts b/src/index.ts index 95a357f..7df626b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -59,6 +59,14 @@ export type { QueryOptions, DroidQuery } from './query.js'; export { run } from './run.js'; export type { RunOptions } from './run.js'; +export { createSdkMcpServer, tool, SdkMcpServer } from './mcp.js'; +export type { + DroidMcpServerConfig, + DroidTool, + DroidToolResult, + SdkMcpServerOptions, +} from './mcp.js'; + export { createSession, resumeSession, DroidSession } from './session.js'; export type { CreateSessionOptions, diff --git a/src/mcp.ts b/src/mcp.ts new file mode 100644 index 0000000..91dbe6f --- /dev/null +++ b/src/mcp.ts @@ -0,0 +1,290 @@ +import { once } from 'node:events'; +import http, { type IncomingMessage, type ServerResponse } from 'node:http'; + +import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; +import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'; +import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js'; +import { z } from 'zod'; + +import type { McpServerConfig } from './schemas/client.js'; +import { JSONRPC_VERSION } from './schemas/constants.js'; +import { JsonRpcErrorCode, McpServerType } from './schemas/enums.js'; + +type ToolInputShape = Record; + +export type DroidToolResult = string | CallToolResult; + +export interface DroidTool { + name: string; + description?: string; + inputSchema?: ToolInputShape; + handler: ( + input: Record + ) => DroidToolResult | Promise; +} + +export interface SdkMcpServerOptions { + name: string; + version?: string; + tools: DroidTool[]; +} + +export type DroidMcpServerConfig = McpServerConfig | SdkMcpServer; + +export function tool( + name: string, + description: string, + inputSchema: InputShape, + handler: ( + input: z.infer> + ) => DroidToolResult | Promise +): DroidTool; +export function tool( + name: string, + description: string, + handler: DroidTool['handler'] +): DroidTool; +export function tool( + name: string, + description: string, + inputSchemaOrHandler: + | InputShape + | (( + input: Record + ) => DroidToolResult | Promise), + handler?: ( + input: z.infer> + ) => DroidToolResult | Promise +): DroidTool { + if (typeof inputSchemaOrHandler === 'function') { + const actualHandler = inputSchemaOrHandler; + return { + name, + description, + handler: (input) => actualHandler(input), + }; + } + + if (!handler) { + throw new Error(`Missing handler for SDK MCP tool "${name}"`); + } + + const inputObjectSchema = z.object(inputSchemaOrHandler); + + return { + name, + description, + inputSchema: inputSchemaOrHandler, + handler: (input) => handler(inputObjectSchema.parse(input)), + }; +} + +function isSdkMcpServer(server: DroidMcpServerConfig): server is SdkMcpServer { + return server instanceof SdkMcpServer; +} + +function toCallToolResult(result: DroidToolResult): CallToolResult { + if (typeof result === 'string') { + return { + content: [{ type: 'text', text: result }], + }; + } + + return result; +} + +async function readJsonBody(req: IncomingMessage): Promise { + const chunks: Buffer[] = []; + for await (const chunk of req) { + chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)); + } + + if (chunks.length === 0) { + return undefined; + } + + return JSON.parse(Buffer.concat(chunks).toString('utf8')); +} + +function writeJsonError( + res: ServerResponse, + statusCode: number, + message: string +): void { + if (res.headersSent) { + return; + } + + res.writeHead(statusCode, { 'content-type': 'application/json' }); + res.end( + JSON.stringify({ + jsonrpc: JSONRPC_VERSION, + error: { code: JsonRpcErrorCode.INTERNAL_ERROR, message }, + id: null, + }) + ); +} + +export class SdkMcpServer { + readonly name: string; + readonly version: string; + readonly tools: DroidTool[]; + + private _httpServer: http.Server | null = null; + private _url: string | null = null; + + constructor(options: SdkMcpServerOptions) { + this.name = options.name; + this.version = options.version ?? '1.0.0'; + this.tools = options.tools; + } + + get config(): McpServerConfig | null { + if (!this._url) { + return null; + } + + return { + type: McpServerType.Http, + name: this.name, + url: this._url, + headers: [], + }; + } + + async start(): Promise { + if (this.config) { + return this.config; + } + + this._httpServer = http.createServer((req, res) => { + void this.handleRequest(req, res); + }); + this._httpServer.listen(0, '127.0.0.1'); + await once(this._httpServer, 'listening'); + + const address = this._httpServer.address(); + if (!address || typeof address === 'string') { + throw new Error('Unable to determine SDK MCP server address'); + } + + this._url = `http://127.0.0.1:${address.port}/mcp`; + const config = this.config; + if (!config) { + throw new Error('Unable to start SDK MCP server'); + } + return config; + } + + async close(): Promise { + const server = this._httpServer; + this._httpServer = null; + this._url = null; + + if (!server) { + return; + } + + server.closeAllConnections?.(); + server.close(); + await once(server, 'close'); + } + + private createMcpServer(): McpServer { + const server = new McpServer({ + name: this.name, + version: this.version, + }); + + for (const sdkTool of this.tools) { + server.registerTool( + sdkTool.name, + { + description: sdkTool.description, + ...(sdkTool.inputSchema && { + inputSchema: sdkTool.inputSchema, + }), + }, + async (input: Record) => + toCallToolResult(await sdkTool.handler(input)) + ); + } + + return server; + } + + private async handleRequest( + req: IncomingMessage, + res: ServerResponse + ): Promise { + if (req.url !== '/mcp') { + res.writeHead(404).end(); + return; + } + + if (req.method !== 'POST') { + res.writeHead(405).end(); + return; + } + + const server = this.createMcpServer(); + const transport = new StreamableHTTPServerTransport({ + sessionIdGenerator: undefined, + }); + + res.on('close', () => { + void transport.close(); + void server.close(); + }); + + try { + const body = await readJsonBody(req); + await server.connect(transport); + await transport.handleRequest(req, res, body); + } catch (error) { + writeJsonError( + res, + 500, + error instanceof Error ? error.message : 'Internal server error' + ); + await transport.close(); + await server.close(); + } + } +} + +export function createSdkMcpServer(options: SdkMcpServerOptions): SdkMcpServer { + return new SdkMcpServer(options); +} + +export async function startSdkMcpServers( + servers: DroidMcpServerConfig[] | undefined +): Promise<{ mcpServers?: McpServerConfig[]; cleanup: () => Promise }> { + if (!servers) { + return { cleanup: async () => {} }; + } + + const startedServers: SdkMcpServer[] = []; + const mcpServers: McpServerConfig[] = []; + + try { + for (const server of servers) { + if (isSdkMcpServer(server)) { + mcpServers.push(await server.start()); + startedServers.push(server); + } else { + mcpServers.push(server); + } + } + } catch (error) { + await Promise.all(startedServers.map((server) => server.close())); + throw error; + } + + return { + mcpServers, + cleanup: async () => { + await Promise.all(startedServers.map((server) => server.close())); + }, + }; +} diff --git a/src/query.ts b/src/query.ts index 6c6be2f..6cb62d5 100644 --- a/src/query.ts +++ b/src/query.ts @@ -6,6 +6,7 @@ import { createConfiguredClient, wireAbortSignal, } from './helpers.js'; +import { startSdkMcpServers } from './mcp.js'; import type { InitializeSessionResult } from './schemas/client.js'; import type { CreateSessionOptions } from './session.js'; import type { DroidMessage } from './stream.js'; @@ -105,9 +106,19 @@ export function query(options: QueryOptions): DroidQuery { let initializationPromise: Promise | null = null; let promptPromise: Promise | null = null; let cleanupAbortSignal: () => void = () => {}; + let cleanupSdkMcpServers: (() => Promise) | null = null; const bridge = new MessageBridge(); + const closeActiveResources = async (): Promise => { + const closer = client ?? transport; + const cleanupMcp = cleanupSdkMcpServers; + client = null; + transport = null; + cleanupSdkMcpServers = null; + await Promise.all([closeQuietly(closer), cleanupMcp?.()]); + }; + const ensureInitialized = (): Promise => { if (initResult) { return Promise.resolve(initResult); @@ -131,15 +142,20 @@ export function query(options: QueryOptions): DroidQuery { throw new Error('Query aborted before initialization'); } - const result = await client.initializeSession(buildInitParams(options)); + const sdkMcpServers = await startSdkMcpServers(options.mcpServers); + cleanupSdkMcpServers = sdkMcpServers.cleanup; + + const result = await client.initializeSession( + buildInitParams({ + ...options, + mcpServers: sdkMcpServers.mcpServers, + }) + ); sessionId = result.sessionId; initResult = result; return result; } catch (error) { - const closer = client ?? transport; - client = null; - transport = null; - await closeQuietly(closer); + await closeActiveResources(); throw error; } })(); @@ -191,10 +207,7 @@ export function query(options: QueryOptions): DroidQuery { yield* generator; } finally { cleanupAbortSignal(); - const closer = client ?? transport; - client = null; - transport = null; - await closeQuietly(closer); + await closeActiveResources(); } } @@ -212,10 +225,7 @@ export function query(options: QueryOptions): DroidQuery { aborted = true; bridge.signalDone(); cleanupAbortSignal(); - const closer = client ?? transport; - client = null; - transport = null; - void closeQuietly(closer); + void closeActiveResources(); } ); diff --git a/src/session.ts b/src/session.ts index b92d987..947fb30 100644 --- a/src/session.ts +++ b/src/session.ts @@ -12,6 +12,8 @@ import type { SessionInitOptions, TransportCreationOptions, } from './helpers.js'; +import { startSdkMcpServers } from './mcp.js'; +import type { DroidMcpServerConfig } from './mcp.js'; import type { NotificationCallback, NotificationFilter } from './protocol.js'; import type { AddMcpServerRequestParams, @@ -36,7 +38,6 @@ import type { ListSkillsResult, LoadSessionRequestParams, LoadSessionResult, - McpServerConfig, OutputFormat, RemoveMcpServerRequestParams, RemoveMcpServerResult, @@ -90,7 +91,7 @@ export interface ResumeSessionOptions extends Pick< | 'transport' | 'abortSignal' > { - mcpServers?: McpServerConfig[]; + mcpServers?: DroidMcpServerConfig[]; } export interface MessageOptions { @@ -148,6 +149,7 @@ export class DroidSession { private _initResult: InitializeSessionResult | LoadSessionResult; private _closed = false; private _cleanupAbortSignal: (() => void) | null = null; + private _cleanupCallbacks: Array<() => Promise | void> = []; /** @internal */ constructor( @@ -173,6 +175,11 @@ export class DroidSession { this._cleanupAbortSignal = cleanup; } + /** @internal */ + addCleanup(cleanup: () => Promise | void): void { + this._cleanupCallbacks.push(cleanup); + } + /** Yields {@link DroidMessage} events until `turn_complete`. */ async *stream( text: string, @@ -293,7 +300,13 @@ export class DroidSession { this._closed = true; this._cleanupAbortSignal?.(); this._cleanupAbortSignal = null; - await this._client.close(); + + try { + await this._client.close(); + } finally { + const cleanups = this._cleanupCallbacks.splice(0); + await Promise.all(cleanups.map((cleanup) => cleanup())); + } } async updateSettings( @@ -424,17 +437,32 @@ export async function createSession( options: CreateSessionOptions = {} ): Promise { const { client } = await createConfiguredClient(options); - const initParams = buildInitParams(options); + let cleanupInitAbortSignal = options.abortSignal?.aborted + ? () => {} + : wireAbortSignal(options.abortSignal, () => { + void closeQuietly(client); + }); + let sdkMcpServers: Awaited> | undefined; try { + sdkMcpServers = await startSdkMcpServers(options.mcpServers); + const initParams = buildInitParams({ + ...options, + mcpServers: sdkMcpServers.mcpServers, + }); const initResult = await client.initializeSession(initParams); const session = new DroidSession(client, initResult.sessionId, initResult); + session.addCleanup(sdkMcpServers.cleanup); + cleanupInitAbortSignal(); + cleanupInitAbortSignal = () => {}; session.setAbortSignalCleanup( wireAbortSignal(options.abortSignal, () => void session.close()) ); return session; } catch (error) { + cleanupInitAbortSignal(); + await sdkMcpServers?.cleanup(); await closeQuietly(client); throw error; } @@ -446,21 +474,24 @@ export async function resumeSession( options: ResumeSessionOptions = {} ): Promise { const { client } = await createConfiguredClient(options); - - const loadParams: LoadSessionRequestParams = { - sessionId, - mcpServers: options.mcpServers, - }; + let sdkMcpServers: Awaited> | undefined; try { + sdkMcpServers = await startSdkMcpServers(options.mcpServers); + const loadParams: LoadSessionRequestParams = { + sessionId, + mcpServers: sdkMcpServers.mcpServers, + }; const loadResult = await client.loadSession(loadParams); const session = new DroidSession(client, sessionId, loadResult); + session.addCleanup(sdkMcpServers.cleanup); session.setAbortSignalCleanup( wireAbortSignal(options.abortSignal, () => void session.close()) ); return session; } catch (error) { + await sdkMcpServers?.cleanup(); await closeQuietly(client); throw error; } diff --git a/tests/mcp.test.ts b/tests/mcp.test.ts new file mode 100644 index 0000000..ced85ff --- /dev/null +++ b/tests/mcp.test.ts @@ -0,0 +1,61 @@ +import { Client } from '@modelcontextprotocol/sdk/client/index.js'; +import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'; +import { describe, expect, it } from 'vitest'; +import { z } from 'zod'; + +import { createSdkMcpServer, startSdkMcpServers, tool } from '../src/mcp.js'; +import { McpServerType } from '../src/schemas/index.js'; + +describe('SDK MCP helpers', () => { + it('serves SDK tools over a loopback MCP HTTP server', async () => { + const sdkServer = createSdkMcpServer({ + name: 'test-sdk-tools', + tools: [ + tool( + 'greet', + 'Greets a person', + { name: z.string() }, + async ({ name }) => `Hello, ${name}!` + ), + ], + }); + + const { mcpServers, cleanup } = await startSdkMcpServers([sdkServer]); + const client = new Client({ name: 'test-client', version: '1.0.0' }); + + try { + expect(mcpServers).toHaveLength(1); + expect(mcpServers?.[0]).toMatchObject({ + type: McpServerType.Http, + name: 'test-sdk-tools', + }); + + const serverConfig = mcpServers?.[0]; + if ( + !serverConfig || + !('type' in serverConfig) || + serverConfig.type !== McpServerType.Http + ) { + throw new Error('Expected HTTP MCP server config'); + } + const url = serverConfig.url; + expect(url).toMatch(/^http:\/\/127\.0\.0\.1:\d+\/mcp$/); + + await client.connect(new StreamableHTTPClientTransport(new URL(url))); + + const tools = await client.listTools(); + expect(tools.tools.map((listedTool) => listedTool.name)).toContain( + 'greet' + ); + + const result = await client.callTool({ + name: 'greet', + arguments: { name: 'Ada' }, + }); + expect(result.content).toEqual([{ type: 'text', text: 'Hello, Ada!' }]); + } finally { + await client.close(); + await cleanup(); + } + }); +}); From 83d54b31000416aa35a8786148d27cd95e83d5da Mon Sep 17 00:00:00 2001 From: User Date: Tue, 5 May 2026 12:10:20 -0700 Subject: [PATCH 2/3] docs: document MCP tool support Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com> --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 04603d9..823f458 100644 --- a/README.md +++ b/README.md @@ -280,7 +280,8 @@ Returned by `createSession()` and `resumeSession()`. Key methods: - **`updateSettings(params)`** — update model, autonomy level, etc. - **`enterSpecMode(params?)`** — switch the current session into spec mode - **`forkSession()`** — create a forked server-side session and return its new session ID -- **`addMcpServer(params)`** / **`removeMcpServer(params)`** — manage MCP servers +- **`addMcpServer(params)`** / **`removeMcpServer(params)`** / **`toggleMcpServer(params)`** — manage MCP servers +- **`listMcpServers()`** / **`listMcpTools()`** / **`authenticateMcpServer(params)`** — inspect and authenticate MCP servers - **`listTools(params?)`** — inspect the exec tool catalog and current allow/deny state - **`renameSession(params)`** — rename the current session - **`sessionId`** — the session ID @@ -318,6 +319,9 @@ if (msg.type === DroidMessageType.AssistantTextDelta) { | `create_message` | Full assistant message created | | `turn_complete` | Sentinel: agent turn finished | | `session_title_updated` | Session title changed | +| `mcp_status_changed` | MCP server status changed | +| `mcp_auth_required` | MCP authentication required | +| `mcp_auth_completed` | MCP authentication completed | | `error` | Error event from the process | ### Options @@ -332,6 +336,7 @@ if (msg.type === DroidMessageType.AssistantTextDelta) { - **`reasoningEffort`** — `ReasoningEffort` enum value - **`specModeModelId`** — override model used in spec mode - **`specModeReasoningEffort`** — override reasoning level used in spec mode +- **`mcpServers`** — initial MCP server configurations, including SDK-backed MCP servers from `createSdkMcpServer()` - **`enabledToolIds`** — explicit exec tool allowlist - **`disabledToolIds`** — explicit exec tool denylist - **`permissionHandler`** — callback for tool confirmations @@ -367,6 +372,7 @@ See the [`examples/`](./examples) directory for runnable examples: - **[`spec-mode-same-session.ts`](./examples/spec-mode-same-session.ts)** — approve a spec and continue in the same session - **[`spec-mode-new-session.ts`](./examples/spec-mode-new-session.ts)** — approve a spec and hand off implementation to a new session - **[`tool-controls.ts`](./examples/tool-controls.ts)** — configure allow/deny lists and inspect tool availability +- **[`sdk-mcp-tool.ts`](./examples/sdk-mcp-tool.ts)** — expose SDK-defined tools to Droid through MCP - **[`fork-session.ts`](./examples/fork-session.ts)** — fork a session and continue from the new session ID - **[`list-sessions.ts`](./examples/list-sessions.ts)** — discover droid sessions saved on disk From a6575dde3ecb72302823090a6800a0291f01b8ed Mon Sep 17 00:00:00 2001 From: User Date: Tue, 5 May 2026 16:59:28 -0700 Subject: [PATCH 3/3] feat: support system prompt option Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com> --- docs/system-prompt-sdk-plan.md | 123 +++++++++++++++++++++++++++++++++ examples/system-prompt.ts | 22 ++++++ src/helpers.ts | 9 ++- src/session.ts | 1 + src/transport.ts | 42 ++++++++++- src/types.ts | 2 + tests/helpers.test.ts | 12 ++++ tests/transport.test.ts | 43 ++++++++++++ 8 files changed, 250 insertions(+), 4 deletions(-) create mode 100644 docs/system-prompt-sdk-plan.md create mode 100644 examples/system-prompt.ts diff --git a/docs/system-prompt-sdk-plan.md b/docs/system-prompt-sdk-plan.md new file mode 100644 index 0000000..3bbb5a5 --- /dev/null +++ b/docs/system-prompt-sdk-plan.md @@ -0,0 +1,123 @@ +## Goal + +Add a Claude Agent SDK-style `systemPrompt?: string` option to the TypeScript SDK, where `systemPrompt` means **replace Droid's configurable main system prompt** for SDK-spawned Droid processes. The SDK must not map this to append behavior. + +## Proposed public SDK API + +```ts +await run('Hello', { + systemPrompt: 'You are a helpful support assistant. Be concise.', +}); + +const session = await createSession({ + systemPrompt: 'You are a strict TypeScript reviewer.', +}); + +const stream = query({ + prompt: 'Review this diff', + systemPrompt: 'You are a senior security reviewer.', +}); +``` + +Add `systemPrompt?: string` to the shared process/session option path so it is available through: + +- `createSession(options)` +- `resumeSession(sessionId, options)` +- `query(options)` +- `run(text, options)` +- direct `ProcessTransport` construction, if applicable + +## Intended behavior + +- `systemPrompt` maps to the new Droid CLI startup flag `--system-prompt `. +- It does **not** use `--append-system-prompt`. +- It is process-level startup configuration, not a JSON-RPC request field. +- It only applies when the SDK spawns Droid itself. +- If a caller passes a custom `transport`, `systemPrompt` should throw because the SDK cannot modify an already-provided transport. +- If a caller passes custom `execArgs` that already include `--system-prompt`, and also passes `systemPrompt`, throw a clear conflict error. +- Empty or whitespace-only `systemPrompt` should throw. + +```mermaid +flowchart TD + A[SDK caller] --> B{transport?} + B -->|yes + systemPrompt| E[throw conflict] + B -->|no| C[build exec args] + C --> D[append --system-prompt] + D --> F[spawn Droid] + F --> G[stream JSON-RPC] +``` + +## Implementation plan + +### 1. Update SDK option types + +In `src/types.ts` / shared transport option types: + +- Add `systemPrompt?: string` to process/spawn options. + +In session/query/run types: + +- Ensure `CreateSessionOptions`, `ResumeSessionOptions`, `QueryOptions`, and `RunOptions` inherit it through existing option composition. + +### 2. Add exec arg construction helper + +Add a small internal helper, for example: + +```ts +function buildExecArgs(options: ProcessTransportOptions): string[]; +``` + +Behavior: + +- Start from default `['exec', '--input-format', 'stream-jsonrpc', '--output-format', 'stream-jsonrpc']` unless `execArgs` is provided. +- If `systemPrompt` is present: + - validate non-empty string + - reject if args already contain `--system-prompt` + - append `--system-prompt`, `systemPrompt` + +### 3. Validate custom transport conflict + +In `createTransport()`: + +- If `options.transport && options.systemPrompt`, throw a clear `ConnectionError` or `Error` explaining that `systemPrompt` only works when the SDK spawns Droid. + +### 4. Add tests + +Add focused tests around argument construction / transport spawning: + +- `ProcessTransport` includes `--system-prompt ` when `systemPrompt` is passed. +- Empty `systemPrompt` throws. +- Passing `systemPrompt` with custom `execArgs` already containing `--system-prompt` throws. +- Passing `systemPrompt` with supplied `transport` throws. +- Existing behavior without `systemPrompt` remains unchanged. + +### 5. Add or update example + +Update or add a user-facing example that imports from the package entrypoint style and demonstrates: + +```ts +await run('Say hello', { + systemPrompt: 'You are a concise assistant.', +}); +``` + +Examples should not mock transport or use offline behavior. + +### 6. Run validators + +Run: + +- `npm run typecheck` +- `npm run typecheck:examples` +- `npm run format:check` +- `npm run lint` +- `npm test` +- `npm run build` + +## Dependency on Droid CLI + +This SDK change assumes Droid CLI has or will have a true replacement flag: + +- `--system-prompt ` + +The SDK should only expose `systemPrompt` for now and should not expose append behavior. diff --git a/examples/system-prompt.ts b/examples/system-prompt.ts new file mode 100644 index 0000000..5613da0 --- /dev/null +++ b/examples/system-prompt.ts @@ -0,0 +1,22 @@ +/** + * Manual smoke test for replacing Droid's system prompt through the SDK. + * + * Usage: + * npx tsx examples/system-prompt.ts + */ + +import { run } from '../src/index.js'; + +async function main(): Promise { + const result = await run('Say hello in one sentence.', { + cwd: process.cwd(), + systemPrompt: 'You are a concise assistant.', + }); + + console.log(result.text); +} + +main().catch((err: unknown) => { + console.error('Error:', err); + process.exit(1); +}); diff --git a/src/helpers.ts b/src/helpers.ts index f847a42..15b8cfc 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -4,6 +4,7 @@ import type { ClientPermissionHandler, } from './client.js'; import { SDK_TAG } from './constants.js'; +import { ConnectionError } from './errors.js'; import type { DroidMcpServerConfig } from './mcp.js'; import type { InitializeSessionRequestParams, @@ -127,7 +128,7 @@ export class MessageBridge { export interface TransportCreationOptions extends Pick< ProcessTransportOptions, - 'execPath' | 'execArgs' | 'cwd' | 'env' + 'execPath' | 'execArgs' | 'systemPrompt' | 'cwd' | 'env' > { transport?: DroidClientTransport; } @@ -136,12 +137,18 @@ export async function createTransport( options: TransportCreationOptions ): Promise { if (options.transport) { + if (options.systemPrompt !== undefined) { + throw new ConnectionError( + 'systemPrompt only works when the SDK creates the Droid process; omit transport or configure the custom transport directly' + ); + } return options.transport; } const transportOptions: ProcessTransportOptions = { execPath: options.execPath, execArgs: options.execArgs, + systemPrompt: options.systemPrompt, cwd: options.cwd, env: options.env, }; diff --git a/src/session.ts b/src/session.ts index 947fb30..a5a9186 100644 --- a/src/session.ts +++ b/src/session.ts @@ -84,6 +84,7 @@ export interface ResumeSessionOptions extends Pick< CreateSessionOptions, | 'execPath' | 'execArgs' + | 'systemPrompt' | 'cwd' | 'env' | 'permissionHandler' diff --git a/src/transport.ts b/src/transport.ts index f3b9443..890e506 100644 --- a/src/transport.ts +++ b/src/transport.ts @@ -20,6 +20,44 @@ const DEFAULT_EXEC_ARGS = [ const DEFAULT_GRACE_PERIOD_MS = 5_000; +function hasSystemPromptArg(args: string[]): boolean { + return args.some( + (arg) => arg === '--system-prompt' || arg.startsWith('--system-prompt=') + ); +} + +function buildExecArgs(options: ProcessTransportOptions): string[] { + const args = options.execArgs + ? [...options.execArgs] + : [...DEFAULT_EXEC_ARGS]; + + if (options.systemPrompt !== undefined) { + if ( + typeof options.systemPrompt !== 'string' || + options.systemPrompt.trim() === '' + ) { + throw new ConnectionError('systemPrompt must be a non-empty string', { + execPath: options.execPath, + cwd: options.cwd, + }); + } + + if (hasSystemPromptArg(args)) { + throw new ConnectionError( + 'systemPrompt cannot be used with execArgs that already include --system-prompt', + { + execPath: options.execPath, + cwd: options.cwd, + } + ); + } + + args.push('--system-prompt', options.systemPrompt); + } + + return args; +} + export class ProcessTransport implements DroidClientTransport { private readonly execPath: string; private readonly execArgs: string[]; @@ -43,9 +81,7 @@ export class ProcessTransport implements DroidClientTransport { constructor(options: ProcessTransportOptions = {}) { this.execPath = options.execPath ?? 'droid'; - this.execArgs = options.execArgs - ? [...options.execArgs] - : [...DEFAULT_EXEC_ARGS]; + this.execArgs = buildExecArgs(options); this.cwd = options.cwd; this.env = options.env; this.gracePeriodMs = diff --git a/src/types.ts b/src/types.ts index d74b1f0..83e25b2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -21,6 +21,8 @@ export interface ProcessTransportOptions { execArgs?: string[]; + systemPrompt?: string; + cwd?: string; env?: Record; diff --git a/tests/helpers.test.ts b/tests/helpers.test.ts index 28f0baa..491db7a 100644 --- a/tests/helpers.test.ts +++ b/tests/helpers.test.ts @@ -9,6 +9,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { DroidClient } from '../src/client.js'; import { SDK_TAG } from '../src/constants.js'; +import { ConnectionError } from '../src/errors.js'; import { buildInitParams, closeQuietly, @@ -252,6 +253,17 @@ describe('createTransport', () => { expect(result).toStrictEqual(customTransport); }); + + it('throws when systemPrompt is used with a custom transport', async () => { + const customTransport = new InMemoryTransport(); + + await expect( + createTransport({ + transport: customTransport, + systemPrompt: 'You are concise.', + }) + ).rejects.toThrow(ConnectionError); + }); }); describe('setupClientHandlers', () => { diff --git a/tests/transport.test.ts b/tests/transport.test.ts index 06745be..a24b85b 100644 --- a/tests/transport.test.ts +++ b/tests/transport.test.ts @@ -113,6 +113,49 @@ describe('ProcessTransport', () => { }); }); + describe('systemPrompt startup option', () => { + it('appends --system-prompt when systemPrompt is provided', async () => { + const script = ` + process.stdout.write(JSON.stringify({ argv: process.argv.slice(1) }) + '\\n'); + setTimeout(() => process.exit(0), 200); + `; + const transport = new ProcessTransport({ + execPath: 'node', + execArgs: ['-e', script, '--'], + systemPrompt: 'You are concise.', + }); + + const messagePromise = collectMessages(transport, 1); + await transport.connect!(); + + const messages = await messagePromise; + expect(messages[0]).toEqual({ + argv: ['--system-prompt', 'You are concise.'], + }); + + await transport.close(); + }); + + it('throws when systemPrompt is empty', () => { + expect(() => new ProcessTransport({ systemPrompt: ' ' })).toThrowError( + ConnectionError + ); + }); + + it.each([['--system-prompt'], ['--system-prompt=Existing prompt']])( + 'throws when execArgs already include %s', + (arg) => { + expect( + () => + new ProcessTransport({ + execArgs: ['exec', arg], + systemPrompt: 'Replacement prompt', + }) + ).toThrowError(ConnectionError); + } + ); + }); + describe('JSONL stdin (send)', () => { it('sends JSONL via stdin — one JSON object per newline', async () => { const script = `