From c0b1fed794502574255d6bd4f2e8fda4e69f3838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Mu=C5=A1tar?= Date: Thu, 2 Oct 2025 17:06:35 +0200 Subject: [PATCH 01/22] Add MCP tool support and related components Introduces Model Context Protocol (MCP) tool support by adding new server modules (httpClient, registry, tools), a ToolUpdate Svelte component, and Tool type definitions. Updates chat message handling and message update logic to integrate tool updates, and adds the @modelcontextprotocol/sdk dependency. --- package-lock.json | 758 ++++++++++++++++++++- package.json | 3 +- src/hooks.server.ts | 7 +- src/lib/components/chat/ChatMessage.svelte | 34 +- src/lib/components/chat/ToolUpdate.svelte | 159 +++++ src/lib/server/mcp/httpClient.ts | 101 +++ src/lib/server/mcp/registry.ts | 73 ++ src/lib/server/mcp/tools.ts | 109 +++ src/lib/server/textGeneration/generate.ts | 445 ++++++++++++ src/lib/types/MessageUpdate.ts | 44 ++ src/lib/types/Tool.ts | 40 ++ src/lib/utils/messageUpdates.ts | 24 + 12 files changed, 1773 insertions(+), 24 deletions(-) create mode 100644 src/lib/components/chat/ToolUpdate.svelte create mode 100644 src/lib/server/mcp/httpClient.ts create mode 100644 src/lib/server/mcp/registry.ts create mode 100644 src/lib/server/mcp/tools.ts create mode 100644 src/lib/types/Tool.ts diff --git a/package-lock.json b/package-lock.json index 31640d7e6ae..b1c43747edf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@huggingface/hub": "^2.2.0", "@huggingface/inference": "^3.12.1", "@iconify-json/bi": "^1.1.21", + "@modelcontextprotocol/sdk": "^1.17.5", "@resvg/resvg-js": "^2.6.2", "autoprefixer": "^10.4.14", "date-fns": "^2.29.3", @@ -1904,6 +1905,41 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@modelcontextprotocol/sdk": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.18.2.tgz", + "integrity": "sha512-beedclIvFcCnPrYgHsylqiYJVJ/CI47Vyc4tY8no1/Li/O8U4BTlJfy6ZwxkYwx+Mx10nrgwSVrA7VBbhh4slg==", + "license": "MIT", + "dependencies": { + "ajv": "^6.12.6", + "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.0.1", + "express-rate-limit": "^7.5.0", + "pkce-challenge": "^5.0.0", + "raw-body": "^3.0.0", + "zod": "^3.23.8", + "zod-to-json-schema": "^3.24.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@modelcontextprotocol/sdk/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/@mongodb-js/saslprep": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz", @@ -3433,6 +3469,40 @@ "node": ">=6.5" } }, + "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/accepts/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/accepts/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/acorn": { "version": "8.14.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", @@ -3481,7 +3551,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -3737,6 +3806,26 @@ "license": "MIT", "optional": true }, + "node_modules/body-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", + "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", + "license": "MIT", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.0", + "http-errors": "^2.0.0", + "iconv-lite": "^0.6.3", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.0", + "type-is": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/brace-expansion": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", @@ -3862,6 +3951,15 @@ "node": ">=6.14.2" } }, + "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", @@ -3884,6 +3982,22 @@ "node": ">= 0.4" } }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -4200,6 +4314,27 @@ "dev": true, "license": "MIT" }, + "node_modules/content-disposition": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", + "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "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.6.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", @@ -4210,6 +4345,15 @@ "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/copy-anything": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz", @@ -4226,6 +4370,19 @@ "url": "https://github.com/sponsors/mesqueeb" } }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -4368,6 +4525,15 @@ "node": ">=0.4.0" } }, + "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/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -4481,6 +4647,12 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "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/electron-to-chromium": { "version": "1.5.165", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.165.tgz", @@ -4524,6 +4696,15 @@ "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "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/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -4952,6 +5133,15 @@ "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/event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", @@ -4985,6 +5175,15 @@ "node": ">=12.0.0" } }, + "node_modules/eventsource-parser": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz", + "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==", + "license": "MIT", + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/exact-mirror": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exact-mirror/-/exact-mirror-0.1.2.tgz", @@ -5043,6 +5242,93 @@ "node": ">=12.0.0" } }, + "node_modules/express": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", + "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", + "license": "MIT", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.0", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.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": "7.5.1", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz", + "integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==", + "license": "MIT", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/express-rate-limit" + }, + "peerDependencies": { + "express": ">= 4.11" + } + }, + "node_modules/express/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/express/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/express/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/exsolve": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz", @@ -5066,7 +5352,6 @@ "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-fifo": { @@ -5108,7 +5393,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, "license": "MIT" }, "node_modules/fast-levenshtein": { @@ -5211,6 +5495,23 @@ "node": ">=8" } }, + "node_modules/finalhandler": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", + "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "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": ">= 0.8" + } + }, "node_modules/find-cache-dir": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", @@ -5340,6 +5641,15 @@ "node": ">= 12.20" } }, + "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/fraction.js": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", @@ -5353,6 +5663,15 @@ "url": "https://github.com/sponsors/rawify" } }, + "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/fs-extra": { "version": "11.3.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", @@ -5706,6 +6025,22 @@ "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==", "license": "MIT" }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/https-proxy-agent": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", @@ -5753,6 +6088,18 @@ "url": "https://github.com/sponsors/typicode" } }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -5826,7 +6173,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, "license": "ISC" }, "node_modules/int53": { @@ -5848,6 +6194,15 @@ "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-arrayish": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", @@ -5953,6 +6308,12 @@ "dev": true, "license": "MIT" }, + "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-reference": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", @@ -6064,19 +6425,6 @@ "node": ">= 14" } }, - "node_modules/isomorphic-dompurify/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/isomorphic-dompurify/node_modules/jsdom": { "version": "26.1.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz", @@ -6280,7 +6628,6 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { @@ -6721,6 +7068,15 @@ "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/memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", @@ -6728,6 +7084,18 @@ "devOptional": true, "license": "MIT" }, + "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/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -7219,6 +7587,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/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", @@ -7393,6 +7770,18 @@ "node": ">= 6" } }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/object-stream": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/object-stream/-/object-stream-0.0.1.tgz", @@ -7419,6 +7808,18 @@ "node": ">=14.0.0" } }, + "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", @@ -7669,6 +8070,15 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, + "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", @@ -7726,6 +8136,16 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, + "node_modules/path-to-regexp": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", + "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -7881,6 +8301,15 @@ "node": ">= 6" } }, + "node_modules/pkce-challenge": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", + "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", + "license": "MIT", + "engines": { + "node": ">=16.20.0" + } + }, "node_modules/pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -8404,6 +8833,19 @@ ], "license": "MIT" }, + "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/psl": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", @@ -8446,6 +8888,21 @@ "teleport": ">=0.2.0" } }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/quansync": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz", @@ -8495,6 +8952,46 @@ "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==", "license": "MIT" }, + "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.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz", + "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.7.0", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "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/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -8704,6 +9201,22 @@ "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, + "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/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -8773,7 +9286,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, "license": "MIT" }, "node_modules/satori": { @@ -8846,6 +9358,64 @@ "node": ">=10" } }, + "node_modules/send": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/send/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/send/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-static": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "license": "MIT", + "dependencies": { + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/set-cookie-parser": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", @@ -8853,6 +9423,12 @@ "dev": true, "license": "MIT" }, + "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/sharp": { "version": "0.33.5", "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz", @@ -8913,6 +9489,78 @@ "node": ">=8" } }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "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==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "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" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/siginfo": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", @@ -9838,6 +10486,15 @@ "node": ">=8.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/token-types": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.0.0.tgz", @@ -9940,6 +10597,41 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "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/type-is/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/type-is/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/typescript": { "version": "5.8.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", @@ -10017,6 +10709,15 @@ "node": ">= 10.0.0" } }, + "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/unplugin": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.16.1.tgz", @@ -10108,7 +10809,6 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" @@ -10149,6 +10849,15 @@ "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==", "license": "MIT" }, + "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": "6.3.5", "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", @@ -10759,6 +11468,15 @@ "funding": { "url": "https://github.com/sponsors/colinhacks" } + }, + "node_modules/zod-to-json-schema": { + "version": "3.24.6", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz", + "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==", + "license": "ISC", + "peerDependencies": { + "zod": "^3.24.1" + } } } } diff --git a/package.json b/package.json index f9f2c8bbd61..73f835747bc 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,8 @@ "tailwindcss": "^3.4.0", "uuid": "^10.0.0", "vitest-browser-svelte": "^0.1.0", - "zod": "^3.22.3" + "zod": "^3.22.3", + "@modelcontextprotocol/sdk": "^1.17.5" }, "overrides": { "@reflink/reflink": "file:stub/@reflink/reflink" diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 87a61195905..384c76bbc8d 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -18,6 +18,7 @@ import { initExitHandler } from "$lib/server/exitHandler"; import { refreshConversationStats } from "$lib/jobs/refresh-conversation-stats"; import { adminTokenManager } from "$lib/server/adminToken"; import { isHostLocalhost } from "$lib/server/isURLLocal"; +import { loadMcpServersOnStartup, refreshMcpServersIfChanged } from "$lib/server/mcp/registry"; export const init: ServerInit = async () => { // Wait for config to be fully loaded @@ -38,8 +39,9 @@ export const init: ServerInit = async () => { ); } - logger.info("Starting server..."); - initExitHandler(); + logger.info("Starting server..."); + initExitHandler(); + loadMcpServersOnStartup(); checkAndRunMigrations(); refreshConversationStats(); @@ -93,6 +95,7 @@ export const handleError: HandleServerError = async ({ error, event, status, mes export const handle: Handle = async ({ event, resolve }) => { await ready.then(() => { config.checkForUpdates(); + refreshMcpServersIfChanged(); }); logger.debug({ diff --git a/src/lib/components/chat/ChatMessage.svelte b/src/lib/components/chat/ChatMessage.svelte index 99dcef512da..70acb97e6d8 100644 --- a/src/lib/components/chat/ChatMessage.svelte +++ b/src/lib/components/chat/ChatMessage.svelte @@ -16,11 +16,18 @@ MessageUpdateType, type MessageReasoningUpdate, MessageReasoningUpdateType, + type MessageToolUpdate, } from "$lib/types/MessageUpdate"; import MarkdownRenderer from "./MarkdownRenderer.svelte"; import OpenReasoningResults from "./OpenReasoningResults.svelte"; import Alternatives from "./Alternatives.svelte"; import MessageAvatar from "./MessageAvatar.svelte"; +import ToolUpdate from "./ToolUpdate.svelte"; +import { + isMessageToolCallUpdate, + isMessageToolErrorUpdate, + isMessageToolResultUpdate, +} from "$lib/utils/messageUpdates"; interface Props { message: Message; @@ -76,6 +83,21 @@ []) as MessageReasoningUpdate[] ); + let toolUpdateGroups = $derived(() => { + const updates = message.updates?.filter((update) => update.type === MessageUpdateType.Tool) as + | MessageToolUpdate[] + | undefined; + if (!updates || updates.length === 0) return {} as Record; + return updates.reduce((acc, update) => { + (acc[update.uuid] ??= []).push(update); + return acc; + }, {} as Record); + }); + + let hasToolUpdates = $derived( + Object.values(toolUpdateGroups).some((group) => group.length > 0) + ); + // const messageFinalAnswer = $derived( // message.updates?.find( // ({ type }) => type === MessageUpdateType.FinalAnswer @@ -155,6 +177,16 @@ /> {/if} + {#if hasToolUpdates} + {#each Object.values(toolUpdateGroups) as group} + {#if group.length} + {#key group[0].uuid} + + {/key} + {/if} + {/each} + {/if} +
{#if isLast && loading && message.content.length === 0} @@ -192,7 +224,7 @@
- {#if message.routerMetadata || (!loading && message.content)} + {#if message.routerMetadata || (!loading && (message.content || hasToolUpdates))}
+ import { + MessageToolUpdateType, + type MessageToolUpdate, + } from "$lib/types/MessageUpdate"; + import { + isMessageToolCallUpdate, + isMessageToolErrorUpdate, + isMessageToolResultUpdate, + } from "$lib/utils/messageUpdates"; + import CarbonTools from "~icons/carbon/tools"; + import { ToolResultStatus, type ToolFront } from "$lib/types/Tool"; + import { page } from "$app/state"; + import { onDestroy } from "svelte"; + import { browser } from "$app/environment"; + + interface Props { + tool: MessageToolUpdate[]; + loading?: boolean; + } + + let { tool, loading = false }: Props = $props(); + + const toolFnName = tool.find(isMessageToolCallUpdate)?.call.name; + let toolError = $derived(tool.some(isMessageToolErrorUpdate)); + let toolDone = $derived(tool.some(isMessageToolResultUpdate)); + let eta = $derived(tool.find((update) => update.subtype === MessageToolUpdateType.ETA)?.eta); + + const availableTools: ToolFront[] = (page.data as any)?.tools ?? []; + + let loadingBarEl: HTMLDivElement | undefined = $state(); + let animation: Animation | undefined = $state(); + let showingLoadingBar = $state(false); + + $effect(() => { + if (!toolError && !toolDone && loading && loadingBarEl && eta) { + loadingBarEl.classList.remove("hidden"); + showingLoadingBar = true; + animation = loadingBarEl.animate([{ width: "0%" }, { width: "calc(100%+1rem)" }], { + duration: eta * 1000, + fill: "forwards", + }); + } + }); + + onDestroy(() => { + animation?.cancel(); + }); + + $effect(() => { + if ((!loading || toolDone || toolError) && browser && loadingBarEl && showingLoadingBar) { + showingLoadingBar = false; + loadingBarEl.classList.remove("hidden"); + animation?.cancel(); + animation = loadingBarEl.animate( + [{ width: loadingBarEl.style.width }, { width: "calc(100%+1rem)" }], + { duration: 300, fill: "forwards" } + ); + setTimeout(() => loadingBarEl?.classList.add("hidden"), 300); + } + }); + + +{#if toolFnName} +
+ + + +
+ + + + +
+ + + {toolError ? "Error calling" : toolDone ? "Called" : "Calling"} tool + + {availableTools.find((entry) => entry.name === toolFnName)?.displayName ?? toolFnName} + + + + + {#each tool as update} + {#if update.subtype === MessageToolUpdateType.Call} +
+

Parameters

+
+
+
    + {#each Object.entries(update.call.parameters ?? {}) as [key, value]} + {#if value !== null} +
  • + {key}: + {value} +
    • + {/if} + {/each} +
+ {:else if update.subtype === MessageToolUpdateType.Error} +
+

Error

+
+
+

{update.message}

+ {:else if isMessageToolResultUpdate(update) && update.result.status === ToolResultStatus.Success && update.result.display} +
+

Result

+
+
+
    + {#each update.result.outputs as output} + {#each Object.entries(output) as [key, value]} + {#if value !== null} +
  • + {key}: + {value} +
    • + {/if} + {/each} + {/each} +
+ {/if} + {/each} +
+{/if} + + diff --git a/src/lib/server/mcp/httpClient.ts b/src/lib/server/mcp/httpClient.ts new file mode 100644 index 00000000000..132c7f205c4 --- /dev/null +++ b/src/lib/server/mcp/httpClient.ts @@ -0,0 +1,101 @@ +import { Client } from "@modelcontextprotocol/sdk/client"; +import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"; +import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"; + +export interface McpServerConfig { + name: string; + url: string; + headers?: Record; +} + +const DEFAULT_TIMEOUT_MS = 30_000; + +function toUrl(value: string): URL { + try { + return new URL(value); + } catch (error) { + throw new Error(`Invalid MCP server URL: ${value}`, { cause: error }); + } +} + +export async function callMcpTool( + server: McpServerConfig, + tool: string, + args: unknown = {}, + { timeoutMs = DEFAULT_TIMEOUT_MS }: { timeoutMs?: number } = {} +): Promise { + const controller = new AbortController(); + const timeout = setTimeout(() => controller.abort(), timeoutMs); + + const client = new Client({ name: "chat-ui-mcp", version: "0.1.0" }); + const url = toUrl(server.url); + + async function connectStreamable() { + const transport = new StreamableHTTPClientTransport(url, { + requestInit: { headers: server.headers }, + }); + await client.connect(transport); + } + + async function connectSse() { + const transport = new SSEClientTransport(url, { + requestInit: { headers: server.headers }, + }); + await client.connect(transport); + } + + try { + let usingSse = false; + try { + await connectStreamable(); + } catch { + await connectSse(); + usingSse = true; + } + + const runTool = async () => client.callTool({ name: tool, arguments: args }); + + const raceWithTimeout = (promise: Promise) => + Promise.race([ + promise, + new Promise((_, reject) => { + controller.signal.addEventListener("abort", () => reject(new Error("MCP tool call timed out")), { + once: true, + }); + }), + ]); + + let response: Awaited>; + try { + response = await raceWithTimeout(runTool()); + } catch (error) { + if (usingSse) throw error; + try { + await client.close?.(); + } catch { + // ignore close errors + } + await connectSse(); + usingSse = true; + response = await raceWithTimeout(runTool()); + } + + const parts = Array.isArray(response?.content) ? response.content : []; + const textParts = parts + .filter((part: any) => part?.type === "text" && typeof part.text === "string") + .map((part: any) => part.text as string); + + if (textParts.length > 0) { + return textParts.join("\n"); + } + + return JSON.stringify(response); + } finally { + clearTimeout(timeout); + try { + await client.close?.(); + } catch { + // ignore close errors + } + } +} diff --git a/src/lib/server/mcp/registry.ts b/src/lib/server/mcp/registry.ts new file mode 100644 index 00000000000..bcb33bceaf3 --- /dev/null +++ b/src/lib/server/mcp/registry.ts @@ -0,0 +1,73 @@ +import { config } from "$lib/server/config"; +import { logger } from "$lib/server/logger"; +import type { McpServerConfig } from "./httpClient"; +import { resetMcpToolsCache } from "./tools"; + +let cachedRaw: string | null = null; +let cachedServers: McpServerConfig[] = []; + +function parseServers(raw: string): McpServerConfig[] { + if (!raw) return []; + + try { + const parsed = JSON.parse(raw); + if (!Array.isArray(parsed)) return []; + + return parsed + .map((entry) => { + if (!entry || typeof entry !== "object") return undefined; + const name = (entry as Record).name; + const url = (entry as Record).url; + if (typeof name !== "string" || !name.trim()) return undefined; + if (typeof url !== "string" || !url.trim()) return undefined; + + const headersRaw = (entry as Record).headers; + let headers: Record | undefined; + if (headersRaw && typeof headersRaw === "object" && !Array.isArray(headersRaw)) { + headers = Object.fromEntries( + Object.entries(headersRaw as Record).filter( + ([, value]): value is string => typeof value === "string" + ) + ); + } + + return headers ? { name, url, headers } : { name, url }; + }) + .filter((server): server is McpServerConfig => Boolean(server)); + } catch (error) { + logger.warn({ err: error }, "[mcp] failed to parse MCP_SERVERS env"); + return []; + } +} + +function setServers(raw: string) { + cachedServers = parseServers(raw); + cachedRaw = raw; + resetMcpToolsCache(); + logger.debug({ count: cachedServers.length }, "[mcp] loaded server configuration"); +} + +export function loadMcpServersOnStartup(): McpServerConfig[] { + const raw = config.MCP_SERVERS || "[]"; + setServers(raw); + return cachedServers; +} + +export function refreshMcpServersIfChanged(): void { + const currentRaw = config.MCP_SERVERS || "[]"; + if (cachedRaw === null) { + setServers(currentRaw); + return; + } + + if (currentRaw !== cachedRaw) { + setServers(currentRaw); + } +} + +export function getMcpServers(): McpServerConfig[] { + if (cachedRaw === null) { + loadMcpServersOnStartup(); + } + return cachedServers; +} diff --git a/src/lib/server/mcp/tools.ts b/src/lib/server/mcp/tools.ts new file mode 100644 index 00000000000..b7752283419 --- /dev/null +++ b/src/lib/server/mcp/tools.ts @@ -0,0 +1,109 @@ +import { Client } from "@modelcontextprotocol/sdk/client"; +import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"; +import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"; +import type { McpServerConfig } from "./httpClient"; + +export interface OpenAiTool { + type: "function"; + function: { + name: string; + description?: string; + parameters?: Record; + }; +} + +export interface McpToolMapping { + fnName: string; + server: string; + tool: string; +} + +interface CacheEntry { + fetchedAt: number; + ttlMs: number; + tools: OpenAiTool[]; + mapping: Record; +} + +const DEFAULT_TTL_MS = 60_000; +let cache: CacheEntry | null = null; + +function sanitizeName(name: string) { + return name.replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, 64); +} + +async function listServerTools(server: McpServerConfig) { + const url = new URL(server.url); + const client = new Client({ name: "chat-ui-mcp", version: "0.1.0" }); + try { + try { + const transport = new StreamableHTTPClientTransport(url, { + requestInit: { headers: server.headers }, + }); + await client.connect(transport); + } catch { + const transport = new SSEClientTransport(url, { + requestInit: { headers: server.headers }, + }); + await client.connect(transport); + } + + const response = await client.listTools({}); + return Array.isArray(response?.tools) ? response.tools : []; + } finally { + try { + await client.close?.(); + } catch { + // ignore close errors + } + } +} + +export async function getOpenAiToolsForMcp( + servers: McpServerConfig[], + { ttlMs = DEFAULT_TTL_MS }: { ttlMs?: number } = {} +): Promise<{ tools: OpenAiTool[]; mapping: Record }> { + const now = Date.now(); + if (cache && now - cache.fetchedAt < cache.ttlMs) { + return { tools: cache.tools, mapping: cache.mapping }; + } + + const tools: OpenAiTool[] = []; + const mapping: Record = {}; + + for (const server of servers) { + try { + const serverTools = await listServerTools(server); + for (const tool of serverTools as any[]) { + const fnName = sanitizeName(`${server.name}.${tool.name}`); + const parameters = tool.inputSchema && typeof tool.inputSchema === "object" ? tool.inputSchema : undefined; + const description = tool.description ?? tool?.annotations?.title; + + tools.push({ + type: "function", + function: { + name: fnName, + description, + parameters, + }, + }); + + mapping[fnName] = { + fnName, + server: server.name, + tool: tool.name, + }; + } + } catch { + // Ignore individual server failures + continue; + } + } + + cache = { fetchedAt: now, ttlMs, tools, mapping }; + return { tools, mapping }; +} + +export function resetMcpToolsCache() { + cache = null; +} diff --git a/src/lib/server/textGeneration/generate.ts b/src/lib/server/textGeneration/generate.ts index 8b39c180117..da519eb95f0 100644 --- a/src/lib/server/textGeneration/generate.ts +++ b/src/lib/server/textGeneration/generate.ts @@ -1,6 +1,7 @@ import { config } from "$lib/server/config"; import { MessageReasoningUpdateType, + MessageToolUpdateType, MessageUpdateType, type MessageUpdate, } from "$lib/types/MessageUpdate"; @@ -10,9 +11,440 @@ import type { EndpointMessage } from "../endpoints/endpoints"; import { generateFromDefaultEndpoint } from "../generateFromDefaultEndpoint"; import { generateSummaryOfReasoning } from "./reasoning"; import { logger } from "../logger"; +import { getMcpServers } from "$lib/server/mcp/registry"; +import { getOpenAiToolsForMcp } from "$lib/server/mcp/tools"; +import { callMcpTool } from "$lib/server/mcp/httpClient"; +import { archSelectRoute } from "$lib/server/router/arch"; +import { getRoutes, resolveRouteModels } from "$lib/server/router/policy"; +import { randomUUID } from "crypto"; +import { ToolResultStatus } from "$lib/types/Tool"; + +const ROUTER_REASONING_REGEX = /[\s\S]*?(?:<\/think>|$)/g; + +function stripReasoningBlocks(text: string): string { + const stripped = text.replace(ROUTER_REASONING_REGEX, ""); + return stripped === text ? text : stripped.trim(); +} + +function stripReasoningFromMessageForRouting(message: EndpointMessage): EndpointMessage { + const clone = { ...message } as EndpointMessage & { reasoning?: string }; + if ("reasoning" in clone) { + delete clone.reasoning; + } + const content = + typeof message.content === "string" ? stripReasoningBlocks(message.content) : message.content; + return { + ...clone, + content, + }; +} + +type ToolRun = { + name: string; + parameters: Record; + output: string; +}; type GenerateContext = Omit & { messages: EndpointMessage[] }; +async function* runMcpFlow( + { + model, + conv, + messages, + assistant, + forceMultimodal, + preprompt, + }: GenerateContext & { preprompt?: string } +): AsyncGenerator { + const servers = getMcpServers(); + if (servers.length === 0) { + return false; + } + + let runMcp = true; + let targetModel = model; + let candidateModelId: string | undefined; + let resolvedRoute: string | undefined; + + if ((model as any)?.isRouter) { + try { + const routes = await getRoutes(); + const sanitized = messages.map(stripReasoningFromMessageForRouting); + const { routeName } = await archSelectRoute(sanitized); + resolvedRoute = routeName; + const fallbackModel = config.LLM_ROUTER_FALLBACK_MODEL || model.id; + const { candidates } = resolveRouteModels(routeName, routes, fallbackModel); + const primaryCandidateId = candidates[0]; + if (!primaryCandidateId || primaryCandidateId === fallbackModel) { + runMcp = false; + } else { + try { + const mod = await import("../models"); + const allModels = (mod as any).models as typeof model[]; + const found = allModels?.find( + (candidate) => candidate.id === primaryCandidateId || candidate.name === primaryCandidateId + ); + if (found) { + targetModel = found; + candidateModelId = primaryCandidateId; + } else { + runMcp = false; + } + } catch (error) { + logger.warn({ err: String(error) }, "[mcp] failed to resolve router candidate"); + runMcp = false; + } + } + } catch (error) { + logger.warn({ err: String(error) }, "[mcp] routing preflight failed"); + runMcp = false; + } + } + + if (!runMcp) { + return false; + } + + const { tools: oaTools, mapping } = await getOpenAiToolsForMcp(servers); + if (oaTools.length === 0) { + return false; + } + + try { + const { OpenAI } = await import("openai"); + const openai = new OpenAI({ + apiKey: config.OPENAI_API_KEY || config.HF_TOKEN || "sk-", + baseURL: config.OPENAI_BASE_URL || "https://api.openai.com/v1", + }); + + const mmEnabled = (forceMultimodal ?? false) || targetModel.multimodal; + const toOpenAiMessage = (msg: EndpointMessage): any => { + if (msg.from === "user" && mmEnabled) { + const parts: any[] = [{ type: "text", text: msg.content }]; + for (const file of msg.files ?? []) { + if (typeof file?.mime === "string" && file.mime.startsWith("image/")) { + const encoded = + typeof file.value === "string" + ? file.value + : Buffer.isBuffer(file.value) + ? file.value.toString("base64") + : String(file.value ?? ""); + const url = encoded.startsWith("data:") + ? encoded + : `data:${file.mime};base64,${encoded}`; + parts.push({ + type: "image_url", + image_url: { url, detail: "auto" }, + }); + } + } + return { role: msg.from, content: parts }; + } + return { role: msg.from, content: msg.content }; + }; + + let messagesOpenAI = messages.map(toOpenAiMessage); + const hasSystemMessage = messagesOpenAI.length > 0 && messagesOpenAI[0]?.role === "system"; + if (hasSystemMessage) { + if (preprompt !== undefined) { + const existing = messagesOpenAI[0].content || ""; + messagesOpenAI[0].content = preprompt + (existing ? "\n\n" + existing : ""); + } + } else { + messagesOpenAI = [{ role: "system", content: preprompt ?? "" }, ...messagesOpenAI]; + } + + if (!targetModel.systemRoleSupported && messagesOpenAI.length > 0 && messagesOpenAI[0]?.role === "system") { + messagesOpenAI[0] = { ...messagesOpenAI[0], role: "user" }; + } + + const parameters = { ...targetModel.parameters, ...assistant?.generateSettings } as Record; + const maxTokens = + (parameters?.max_tokens as number | undefined) ?? + (parameters?.max_new_tokens as number | undefined) ?? + (parameters?.max_completion_tokens as number | undefined); + + const requestBase: Record = { + model: targetModel.id ?? targetModel.name, + stream: true, + temperature: parameters?.temperature, + top_p: parameters?.top_p, + frequency_penalty: parameters?.frequency_penalty ?? parameters?.repetition_penalty, + presence_penalty: parameters?.presence_penalty, + stop: parameters?.stop, + }; + if (maxTokens !== undefined) { + requestBase.max_tokens = maxTokens; + } + + const toPrimitive = (value: unknown): string | number | boolean | undefined => { + if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") { + return value; + } + return undefined; + }; + + const parseArgs = (raw: unknown): Record => { + if (typeof raw !== "string" || raw.trim().length === 0) return {}; + try { + return JSON.parse(raw); + } catch { + return {}; + } + }; + + const toolRuns: ToolRun[] = []; + let lastAssistantContent = ""; + let streamedContent = false; + + if (resolvedRoute && candidateModelId) { + yield { + type: MessageUpdateType.RouterMetadata, + route: resolvedRoute, + model: candidateModelId, + }; + } + + for (let loop = 0; loop < 5; loop += 1) { + lastAssistantContent = ""; + streamedContent = false; + + const body = { + ...requestBase, + messages: messagesOpenAI, + tools: oaTools, + tool_choice: "auto", + }; + + const completionStream = await openai.chat.completions.create(body as any, { + body, + headers: { + "ChatUI-Conversation-ID": conv._id.toString(), + "X-use-cache": "false", + }, + }); + + const toolCallState: Record = {}; + let sawToolCall = false; + + for await (const chunk of completionStream) { + const choice = chunk.choices?.[0]; + const delta = choice?.delta as any; + if (!delta) continue; + + const chunkToolCalls = Array.isArray(delta.tool_calls) ? delta.tool_calls : []; + if (chunkToolCalls.length > 0) { + sawToolCall = true; + for (const call of chunkToolCalls) { + const index = call.index ?? 0; + const current = toolCallState[index] ?? { arguments: "" }; + if (call.id) current.id = call.id; + if (call.function?.name) current.name = call.function.name; + if (call.function?.arguments) current.arguments += call.function.arguments; + toolCallState[index] = current; + } + } + + const deltaContent = (() => { + if (typeof delta.content === "string") return delta.content; + if (Array.isArray(delta.content)) { + return delta.content + .map((part: any) => (typeof part?.text === "string" ? part.text : "")) + .join(""); + } + return ""; + })(); + + if (deltaContent) { + lastAssistantContent += deltaContent; + if (!sawToolCall) { + streamedContent = true; + yield { + type: MessageUpdateType.Stream, + token: deltaContent, + }; + } + } + } + + const normalizedCalls = Object.values(toolCallState) + .map((call, index) => ({ + id: call.id ?? `call_${index}`, + name: call.name, + arguments: call.arguments, + })) + .filter((call) => typeof call.name === "string"); + + if (!normalizedCalls.length) { + break; + } + + const assistantToolMessage: any = { + role: "assistant", + content: lastAssistantContent, + tool_calls: normalizedCalls.map((call) => ({ + id: call.id, + type: "function", + function: { name: call.name, arguments: call.arguments }, + })), + }; + + const toolMessages: any[] = []; + + for (const call of normalizedCalls) { + const fnName = call.name as string; + const mappingEntry = mapping[fnName]; + const uuid = randomUUID(); + const argsObj = parseArgs(call.arguments); + const parametersClean: Record = {}; + for (const [key, value] of Object.entries(argsObj ?? {})) { + const primitive = toPrimitive(value); + if (primitive !== undefined) { + parametersClean[key] = primitive; + } + } + + yield { + type: MessageUpdateType.Tool, + subtype: MessageToolUpdateType.Call, + uuid, + call: { name: fnName, parameters: parametersClean }, + }; + + yield { + type: MessageUpdateType.Tool, + subtype: MessageToolUpdateType.ETA, + uuid, + eta: 10, + }; + + if (!mappingEntry) { + yield { + type: MessageUpdateType.Tool, + subtype: MessageToolUpdateType.Error, + uuid, + message: `Unknown MCP function: ${fnName}`, + }; + yield { + type: MessageUpdateType.FinalAnswer, + text: `Unknown MCP function: ${fnName}`, + interrupted: false, + }; + return true; + } + + const serverConfig = servers.find((server) => server.name === mappingEntry.server); + if (!serverConfig) { + yield { + type: MessageUpdateType.Tool, + subtype: MessageToolUpdateType.Error, + uuid, + message: `Unknown MCP server: ${mappingEntry.server}`, + }; + yield { + type: MessageUpdateType.FinalAnswer, + text: `Unknown MCP server: ${mappingEntry.server}`, + interrupted: false, + }; + return true; + } + + try { + const output = await callMcpTool(serverConfig, mappingEntry.tool, argsObj); + + yield { + type: MessageUpdateType.Tool, + subtype: MessageToolUpdateType.Result, + uuid, + result: { + status: ToolResultStatus.Success, + call: { name: fnName, parameters: parametersClean }, + outputs: [{ content: output }], + display: true, + }, + }; + + toolRuns.push({ name: fnName, parameters: parametersClean, output }); + toolMessages.push({ role: "tool", tool_call_id: call.id, content: output }); + } catch (error) { + const message = error instanceof Error ? error.message : String(error); + yield { + type: MessageUpdateType.Tool, + subtype: MessageToolUpdateType.Error, + uuid, + message, + }; + yield { + type: MessageUpdateType.FinalAnswer, + text: `MCP error: ${message}`, + interrupted: false, + }; + return true; + } + } + + messagesOpenAI = [...messagesOpenAI, assistantToolMessage, ...toolMessages]; + } + + if (toolRuns.length > 0) { + const question = messages[messages.length - 1]?.content ?? ""; + const formattedResults = toolRuns + .map((run, index) => { + const argsEntries = Object.entries(run.parameters); + const argsString = argsEntries.length + ? `Arguments: ${JSON.stringify(Object.fromEntries(argsEntries), null, 2)}\n` + : ""; + return `Tool ${index + 1}: ${run.name}\n${argsString}Output:\n${run.output}`; + }) + .join("\n\n"); + + const synthesis = yield* generateFromDefaultEndpoint({ + messages: [ + { + from: "user", + content: `Question: ${question}\n\nTool results:\n${formattedResults}\n\nUsing only the tool results above, answer the question concisely. If uncertain, say you don't know.${ + lastAssistantContent ? `\n\nModel notes: ${lastAssistantContent}` : "" + }`, + }, + ], + preprompt: "You are a helpful assistant. Use the provided tool results as the sole source of truth.", + generateSettings: { temperature: 0.2, max_tokens: 512 }, + modelId: candidateModelId ?? targetModel.id, + }); + + yield { + type: MessageUpdateType.FinalAnswer, + text: synthesis, + interrupted: false, + }; + + return true; + } + + if (lastAssistantContent) { + if (!streamedContent) { + yield { + type: MessageUpdateType.Stream, + token: lastAssistantContent, + }; + } + yield { + type: MessageUpdateType.FinalAnswer, + text: lastAssistantContent, + interrupted: false, + }; + return true; + } + + return false; + } catch (error) { + logger.warn({ err: String(error) }, "[mcp] tool flow failed; falling back to default generation"); + } + + return false; +} + export async function* generate( { model, @@ -27,6 +459,19 @@ export async function* generate( }: GenerateContext, preprompt?: string ): AsyncIterable { + const handledByMcp = yield* runMcpFlow({ + model, + conv, + messages, + assistant, + forceMultimodal, + preprompt, + }); + + if (handledByMcp) { + return; + } + // reasoning mode is false by default let reasoning = false; let reasoningBuffer = ""; diff --git a/src/lib/types/MessageUpdate.ts b/src/lib/types/MessageUpdate.ts index 7759e1b99f3..8a470be1663 100644 --- a/src/lib/types/MessageUpdate.ts +++ b/src/lib/types/MessageUpdate.ts @@ -1,6 +1,9 @@ +import type { ToolCall, ToolResult } from "$lib/types/Tool"; + export type MessageUpdate = | MessageStatusUpdate | MessageTitleUpdate + | MessageToolUpdate | MessageStreamUpdate | MessageFileUpdate | MessageFinalAnswerUpdate @@ -10,6 +13,7 @@ export type MessageUpdate = export enum MessageUpdateType { Status = "status", Title = "title", + Tool = "tool", Stream = "stream", File = "file", FinalAnswer = "finalAnswer", @@ -40,6 +44,46 @@ export interface MessageStreamUpdate { token: string; } +// Tool updates +export enum MessageToolUpdateType { + Call = "call", + Result = "result", + Error = "error", + ETA = "eta", +} + +interface MessageToolUpdateBase { + type: MessageUpdateType.Tool; + subtype: TSubtype; + uuid: string; +} + +export interface MessageToolCallUpdate + extends MessageToolUpdateBase { + call: ToolCall; +} + +export interface MessageToolResultUpdate + extends MessageToolUpdateBase { + result: ToolResult; +} + +export interface MessageToolErrorUpdate + extends MessageToolUpdateBase { + message: string; +} + +export interface MessageToolEtaUpdate + extends MessageToolUpdateBase { + eta: number; +} + +export type MessageToolUpdate = + | MessageToolCallUpdate + | MessageToolResultUpdate + | MessageToolErrorUpdate + | MessageToolEtaUpdate; + export enum MessageReasoningUpdateType { Stream = "stream", Status = "status", diff --git a/src/lib/types/Tool.ts b/src/lib/types/Tool.ts new file mode 100644 index 00000000000..84a82647463 --- /dev/null +++ b/src/lib/types/Tool.ts @@ -0,0 +1,40 @@ +export enum ToolResultStatus { + Success = "success", + Error = "error", +} + +export interface ToolCall { + name: string; + parameters: Record; + toolId?: string; +} + +export interface ToolResultSuccess { + status: ToolResultStatus.Success; + call: ToolCall; + outputs: Record[]; + display?: boolean; +} + +export interface ToolResultError { + status: ToolResultStatus.Error; + call: ToolCall; + message: string; + display?: boolean; +} + +export type ToolResult = ToolResultSuccess | ToolResultError; + +export interface ToolFront { + _id: string; + name: string; + displayName?: string; + description?: string; + color?: string; + icon?: string; + type?: "config" | "community"; + isOnByDefault?: boolean; + isLocked?: boolean; + mimeTypes?: string[]; + timeToUseMS?: number; +} diff --git a/src/lib/utils/messageUpdates.ts b/src/lib/utils/messageUpdates.ts index c847dfbc5ef..f5ffba10fee 100644 --- a/src/lib/utils/messageUpdates.ts +++ b/src/lib/utils/messageUpdates.ts @@ -2,7 +2,12 @@ import type { MessageFile } from "$lib/types/Message"; import { type MessageUpdate, type MessageStreamUpdate, + type MessageToolUpdate, + type MessageToolCallUpdate, + type MessageToolResultUpdate, + type MessageToolErrorUpdate, MessageUpdateType, + MessageToolUpdateType, } from "$lib/types/MessageUpdate"; import { page } from "$app/state"; @@ -66,6 +71,25 @@ export async function fetchMessageUpdates( ); } +// Tool update type guards for UI rendering +export const isMessageToolUpdate = (update: MessageUpdate): update is MessageToolUpdate => + update.type === MessageUpdateType.Tool; + +export const isMessageToolCallUpdate = ( + update: MessageUpdate +): update is MessageToolCallUpdate => + isMessageToolUpdate(update) && update.subtype === MessageToolUpdateType.Call; + +export const isMessageToolResultUpdate = ( + update: MessageUpdate +): update is MessageToolResultUpdate => + isMessageToolUpdate(update) && update.subtype === MessageToolUpdateType.Result; + +export const isMessageToolErrorUpdate = ( + update: MessageUpdate +): update is MessageToolErrorUpdate => + isMessageToolUpdate(update) && update.subtype === MessageToolUpdateType.Error; + async function* endpointStreamToIterator( response: Response, abortController: AbortController From 0a644839d5041fdbc524c60c4bb26e1a2997d046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Mu=C5=A1tar?= Date: Thu, 2 Oct 2025 17:47:03 +0200 Subject: [PATCH 02/22] Add logging for MCP tool invocation and results Introduces debug and warning logs around MCP tool calls in generate.ts to improve traceability of tool invocation, completion, and errors. Minor formatting adjustments in ChatMessage.svelte for derived store usage. --- src/lib/components/chat/ChatMessage.svelte | 30 +++++++++++----------- src/lib/server/textGeneration/generate.ts | 12 +++++++++ 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/lib/components/chat/ChatMessage.svelte b/src/lib/components/chat/ChatMessage.svelte index 70acb97e6d8..5c184bb1527 100644 --- a/src/lib/components/chat/ChatMessage.svelte +++ b/src/lib/components/chat/ChatMessage.svelte @@ -22,12 +22,12 @@ import OpenReasoningResults from "./OpenReasoningResults.svelte"; import Alternatives from "./Alternatives.svelte"; import MessageAvatar from "./MessageAvatar.svelte"; -import ToolUpdate from "./ToolUpdate.svelte"; -import { - isMessageToolCallUpdate, - isMessageToolErrorUpdate, - isMessageToolResultUpdate, -} from "$lib/utils/messageUpdates"; + import ToolUpdate from "./ToolUpdate.svelte"; + import { + isMessageToolCallUpdate, + isMessageToolErrorUpdate, + isMessageToolResultUpdate, + } from "$lib/utils/messageUpdates"; interface Props { message: Message; @@ -83,20 +83,21 @@ import { []) as MessageReasoningUpdate[] ); - let toolUpdateGroups = $derived(() => { + let toolUpdateGroups = $derived.by(() => { const updates = message.updates?.filter((update) => update.type === MessageUpdateType.Tool) as | MessageToolUpdate[] | undefined; if (!updates || updates.length === 0) return {} as Record; - return updates.reduce((acc, update) => { - (acc[update.uuid] ??= []).push(update); - return acc; - }, {} as Record); + return updates.reduce( + (acc, update) => { + (acc[update.uuid] ??= []).push(update); + return acc; + }, + {} as Record + ); }); - let hasToolUpdates = $derived( - Object.values(toolUpdateGroups).some((group) => group.length > 0) - ); + let hasToolUpdates = $derived(Object.values(toolUpdateGroups).some((group) => group.length > 0)); // const messageFinalAnswer = $derived( // message.updates?.find( @@ -176,7 +177,6 @@ import { loading={loading && message.content.length === 0} /> {/if} - {#if hasToolUpdates} {#each Object.values(toolUpdateGroups) as group} {#if group.length} diff --git a/src/lib/server/textGeneration/generate.ts b/src/lib/server/textGeneration/generate.ts index da519eb95f0..49c4477e5be 100644 --- a/src/lib/server/textGeneration/generate.ts +++ b/src/lib/server/textGeneration/generate.ts @@ -351,7 +351,15 @@ async function* runMcpFlow( } try { + logger.debug( + { server: mappingEntry.server, tool: mappingEntry.tool, parameters: parametersClean }, + "[mcp] invoking tool" + ); const output = await callMcpTool(serverConfig, mappingEntry.tool, argsObj); + logger.debug( + { server: mappingEntry.server, tool: mappingEntry.tool }, + "[mcp] tool call completed" + ); yield { type: MessageUpdateType.Tool, @@ -369,6 +377,10 @@ async function* runMcpFlow( toolMessages.push({ role: "tool", tool_call_id: call.id, content: output }); } catch (error) { const message = error instanceof Error ? error.message : String(error); + logger.warn( + { server: mappingEntry.server, tool: mappingEntry.tool, err: message }, + "[mcp] tool call failed" + ); yield { type: MessageUpdateType.Tool, subtype: MessageToolUpdateType.Error, From b67ac9f3e54e7b8270403708597dde8e077945c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Mu=C5=A1tar?= Date: Thu, 2 Oct 2025 18:52:02 +0200 Subject: [PATCH 03/22] Enhance tool mapping and multimodal routing support Improves tool mapping in getOpenAiToolsForMcp by adding plain tool names and preventing duplicates. Updates MCP flow routing to select multimodal models when image input is detected, improving support for multimodal requests. --- src/lib/components/chat/ChatMessage.svelte | 5 -- src/lib/components/chat/ToolUpdate.svelte | 11 ++- src/lib/server/mcp/tools.ts | 82 ++++++++++++++-------- src/lib/server/textGeneration/generate.ts | 43 ++++++++---- 4 files changed, 85 insertions(+), 56 deletions(-) diff --git a/src/lib/components/chat/ChatMessage.svelte b/src/lib/components/chat/ChatMessage.svelte index 5c184bb1527..c15e661b8d1 100644 --- a/src/lib/components/chat/ChatMessage.svelte +++ b/src/lib/components/chat/ChatMessage.svelte @@ -23,11 +23,6 @@ import Alternatives from "./Alternatives.svelte"; import MessageAvatar from "./MessageAvatar.svelte"; import ToolUpdate from "./ToolUpdate.svelte"; - import { - isMessageToolCallUpdate, - isMessageToolErrorUpdate, - isMessageToolResultUpdate, - } from "$lib/utils/messageUpdates"; interface Props { message: Message; diff --git a/src/lib/components/chat/ToolUpdate.svelte b/src/lib/components/chat/ToolUpdate.svelte index 64efd16be7d..22bb71a97eb 100644 --- a/src/lib/components/chat/ToolUpdate.svelte +++ b/src/lib/components/chat/ToolUpdate.svelte @@ -1,8 +1,5 @@