fastmcp 4.23.7 → 4.23.9

package/dist/{chunk-TBMRFQ6M.cjs → chunk-PV5VLW7R.cjs}

@@ -1,10 +1,11 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkC7TBI7A5cjs = require('./chunk-C7TBI7A5.cjs');
+var _chunk4OWHPJELcjs = require('./chunk-4OWHPJEL.cjs');
 
 
 
-var _chunkMPFPOZ2Hcjs = require('./chunk-MPFPOZ2H.cjs');
+
+var _chunk6TDYSPLCcjs = require('./chunk-6TDYSPLC.cjs');
 
 // src/FastMCP.ts
 var _indexjs = require('@modelcontextprotocol/sdk/server/index.js');
@@ -140,7 +141,7 @@ var DiscoveryDocumentCache = class {
       throw error;
     }
     if (!res.ok) {
-      await _chunkC7TBI7A5cjs.cancelResponseBody.call(void 0, res);
+      await _chunk4OWHPJELcjs.cancelResponseBody.call(void 0, res);
       throw new Error(
         `Failed to fetch discovery document from ${url}: ${res.status} ${res.statusText}`
       );
@@ -186,9 +187,18 @@ function jsonSchemaAdapter(schema) {
   };
 }
 async function compileSchema(schema) {
+  const dialect = _optionalChain([schema, 'access', _2 => _2.$schema, 'optionalAccess', _3 => _3.replace, 'call', _4 => _4(/^http:\/\//, "https://"), 'access', _5 => _5.replace, 'call', _6 => _6(/#$/, "")]);
+  const isDraft2020 = dialect === "https://json-schema.org/draft/2020-12/schema";
+  const isDraft2019 = dialect === "https://json-schema.org/draft/2019-09/schema";
   let ajvModule;
   try {
-    ajvModule = await Promise.resolve().then(() => _interopRequireWildcard(require("ajv")));
+    if (isDraft2020) {
+      ajvModule = await Promise.resolve().then(() => _interopRequireWildcard(require("ajv/dist/2020.js")));
+    } else if (isDraft2019) {
+      ajvModule = await Promise.resolve().then(() => _interopRequireWildcard(require("ajv/dist/2019.js")));
+    } else {
+      ajvModule = await Promise.resolve().then(() => _interopRequireWildcard(require("ajv")));
+    }
   } catch (e2) {
     throw new Error(
       'The "ajv" package is required to validate JSON Schema tool parameters. Install it with: npm install ajv'
@@ -204,14 +214,16 @@ async function compileSchema(schema) {
     addFormats(ajv);
   } catch (e3) {
   }
-  return ajv.compile(schema);
+  return ajv.compile(
+    isDraft2020 || isDraft2019 ? { ...schema, $schema: dialect } : schema
+  );
 }
 function toIssue(error) {
   const path = error.instancePath.split("/").slice(1).map((segment) => segment.replaceAll("~1", "/").replaceAll("~0", "~")).map((segment) => {
     const index = Number(segment);
     return /^(?:0|[1-9]\d*)$/.test(segment) && Number.isSafeInteger(index) ? index : segment;
   });
-  const missingProperty = _optionalChain([error, 'access', _2 => _2.params, 'optionalAccess', _3 => _3.missingProperty]);
+  const missingProperty = _optionalChain([error, 'access', _7 => _7.params, 'optionalAccess', _8 => _8.missingProperty]);
   if (error.keyword === "required" && typeof missingProperty === "string") {
     path.push(missingProperty);
   }
@@ -246,7 +258,7 @@ var imageContent = async (input) => {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
-          await _chunkC7TBI7A5cjs.cancelResponseBody.call(void 0, response);
+          await _chunk4OWHPJELcjs.cancelResponseBody.call(void 0, response);
           throw new Error(
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
@@ -279,7 +291,7 @@ var imageContent = async (input) => {
     }
     const { fileTypeFromBuffer } = await Promise.resolve().then(() => _interopRequireWildcard(require("file-type")));
     const fileType = await fileTypeFromBuffer(rawData);
-    const mimeType = (!fileType || fileType.mime === "application/xml") && isSvg(rawData) ? "image/svg+xml" : _optionalChain([fileType, 'optionalAccess', _4 => _4.mime]);
+    const mimeType = (!fileType || fileType.mime === "application/xml") && isSvg(rawData) ? "image/svg+xml" : _optionalChain([fileType, 'optionalAccess', _9 => _9.mime]);
     if (!mimeType || !mimeType.startsWith("image/")) {
       console.warn(
         `Warning: Content may not be a valid image. Detected MIME: ${mimeType || "unknown"}`
@@ -308,11 +320,11 @@ var AUDIO_CONTAINER_TYPES = /* @__PURE__ */ new Map([
   ["video/webm", "audio/webm"]
 ]);
 var resolveAudioMimeType = (detected, declared) => {
-  if (_optionalChain([detected, 'optionalAccess', _5 => _5.startsWith, 'call', _6 => _6("audio/")])) {
+  if (_optionalChain([detected, 'optionalAccess', _10 => _10.startsWith, 'call', _11 => _11("audio/")])) {
     return detected;
   }
-  const declaredMime = _optionalChain([declared, 'optionalAccess', _7 => _7.split, 'call', _8 => _8(";", 1), 'access', _9 => _9[0], 'access', _10 => _10.trim, 'call', _11 => _11(), 'access', _12 => _12.toLowerCase, 'call', _13 => _13()]);
-  if (_optionalChain([declaredMime, 'optionalAccess', _14 => _14.startsWith, 'call', _15 => _15("audio/")])) {
+  const declaredMime = _optionalChain([declared, 'optionalAccess', _12 => _12.split, 'call', _13 => _13(";", 1), 'access', _14 => _14[0], 'access', _15 => _15.trim, 'call', _16 => _16(), 'access', _17 => _17.toLowerCase, 'call', _18 => _18()]);
+  if (_optionalChain([declaredMime, 'optionalAccess', _19 => _19.startsWith, 'call', _20 => _20("audio/")])) {
     return declaredMime;
   }
   return _nullishCoalesce((detected && AUDIO_CONTAINER_TYPES.get(detected)), () => ( detected));
@@ -328,7 +340,7 @@ var audioContent = async (input) => {
           signal: AbortSignal.timeout(timeoutMs)
         });
         if (!response.ok) {
-          await _chunkC7TBI7A5cjs.cancelResponseBody.call(void 0, response);
+          await _chunk4OWHPJELcjs.cancelResponseBody.call(void 0, response);
           throw new Error(
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
@@ -362,7 +374,7 @@ var audioContent = async (input) => {
     }
     const { fileTypeFromBuffer } = await Promise.resolve().then(() => _interopRequireWildcard(require("file-type")));
     const detected = await fileTypeFromBuffer(rawData);
-    const mimeType = resolveAudioMimeType(_optionalChain([detected, 'optionalAccess', _16 => _16.mime]), declaredMimeType);
+    const mimeType = resolveAudioMimeType(_optionalChain([detected, 'optionalAccess', _21 => _21.mime]), declaredMimeType);
     if (!mimeType || !mimeType.startsWith("audio/")) {
       console.warn(
         `Warning: Content may not be a valid audio file. Detected MIME: ${mimeType || "unknown"}`
@@ -402,7 +414,7 @@ var UserError = class extends UnexpectedStateError {
 };
 function assertStandardSchema(toolName, schemaName, schema) {
   const standard = schema["~standard"];
-  if (typeof _optionalChain([standard, 'optionalAccess', _17 => _17.validate]) === "function") {
+  if (typeof _optionalChain([standard, 'optionalAccess', _22 => _22.validate]) === "function") {
     return;
   }
   throw new UserError(
@@ -487,6 +499,28 @@ var ServerState = /* @__PURE__ */ ((ServerState2) => {
 })(ServerState || {});
 var FastMCPSessionEventEmitter = class extends FastMCPSessionEventEmitterBase {
 };
+var lazyRequestBody = (req) => {
+  let iterator;
+  return new ReadableStream(
+    {
+      async cancel(reason) {
+        await _optionalChain([iterator, 'optionalAccess', _23 => _23.return, 'optionalCall', _24 => _24(reason)]);
+      },
+      async pull(controller) {
+        iterator ??= req[Symbol.asyncIterator]();
+        const { done, value } = await iterator.next();
+        if (done) {
+          controller.close();
+          return;
+        }
+        controller.enqueue(
+          typeof value === "string" ? Buffer.from(value) : new Uint8Array(value)
+        );
+      }
+    },
+    { highWaterMark: 0 }
+  );
+};
 var FastMCPSession = class extends FastMCPSessionEventEmitter {
   get clientCapabilities() {
     return _nullishCoalesce(this.#clientCapabilities, () => ( null));
@@ -519,7 +553,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
    */
   get sessionId() {
     if (this.#sessionId === void 0) {
-      const transportSessionId = _optionalChain([this, 'access', _18 => _18.#server, 'access', _19 => _19.transport, 'optionalAccess', _20 => _20.sessionId]);
+      const transportSessionId = _optionalChain([this, 'access', _25 => _25.#server, 'access', _26 => _26.transport, 'optionalAccess', _27 => _27.sessionId]);
       if (typeof transportSessionId === "string") {
         this.#sessionId = transportSessionId;
       }
@@ -910,7 +944,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       },
       elicit: this.#createElicit(requestId),
       log: this.#createLog(sendNotification),
-      requestId: typeof _optionalChain([meta, 'optionalAccess', _21 => _21.requestId]) === "string" ? meta.requestId : void 0,
+      requestId: typeof _optionalChain([meta, 'optionalAccess', _28 => _28.requestId]) === "string" ? meta.requestId : void 0,
       session: this.#auth,
       sessionId: this.sessionId
     };
@@ -932,8 +966,12 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     };
   }
   #formatSchemaIssues(issues) {
-    return _optionalChain([this, 'access', _22 => _22.#utils, 'optionalAccess', _23 => _23.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
-      const path = _optionalChain([issue, 'access', _24 => _24.path, 'optionalAccess', _25 => _25.join, 'call', _26 => _26(".")]) || "root";
+    return _optionalChain([this, 'access', _29 => _29.#utils, 'optionalAccess', _30 => _30.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
+      const path = _optionalChain([issue, 'access', _31 => _31.path, 'optionalAccess', _32 => _32.map, 'call', _33 => _33(
+        (segment) => String(
+          typeof segment === "object" && segment !== null ? segment.key : segment
+        )
+      ), 'access', _34 => _34.join, 'call', _35 => _35(".")]) || "root";
       return `${path}: ${issue.message}`;
     }).join(", ");
   }
@@ -955,7 +993,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    * is bounded and retried, and the result is announced with `rootsChanged`.
    */
   async #loadRoots(streamableHttp) {
-    if (_optionalChain([this, 'access', _27 => _27.#rootsConfig, 'optionalAccess', _28 => _28.enabled]) === false || !_optionalChain([this, 'access', _29 => _29.#clientCapabilities, 'optionalAccess', _30 => _30.roots, 'optionalAccess', _31 => _31.listChanged]) || typeof this.#server.listRoots !== "function") {
+    if (_optionalChain([this, 'access', _36 => _36.#rootsConfig, 'optionalAccess', _37 => _37.enabled]) === false || !_optionalChain([this, 'access', _38 => _38.#clientCapabilities, 'optionalAccess', _39 => _39.roots, 'optionalAccess', _40 => _40.listChanged]) || typeof this.#server.listRoots !== "function") {
       return;
     }
     const maxAttempts = streamableHttp ? 5 : 1;
@@ -965,7 +1003,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           void 0,
           streamableHttp ? { timeout: 1e3 } : void 0
         );
-        this.#roots = _optionalChain([roots, 'optionalAccess', _32 => _32.roots]) || [];
+        this.#roots = _optionalChain([roots, 'optionalAccess', _41 => _41.roots]) || [];
         if (streamableHttp) {
           this.emit("rootsChanged", { roots: this.#roots });
         }
@@ -1103,7 +1141,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    */
   #startStreamKeepalive(extra, toolName) {
     const config = this.#streamKeepaliveConfig;
-    if (!_optionalChain([config, 'optionalAccess', _33 => _33.enabled])) {
+    if (!_optionalChain([config, 'optionalAccess', _42 => _42.enabled]) || _optionalChain([extra, 'access', _43 => _43.signal, 'optionalAccess', _44 => _44.aborted])) {
       return () => {
       };
     }
@@ -1123,9 +1161,12 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         );
       });
     }, intervalMs);
-    _optionalChain([timer, 'access', _34 => _34.unref, 'optionalCall', _35 => _35()]);
-    const stop = () => clearInterval(timer);
-    _optionalChain([extra, 'access', _36 => _36.signal, 'optionalAccess', _37 => _37.addEventListener, 'call', _38 => _38("abort", stop, { once: true })]);
+    _optionalChain([timer, 'access', _45 => _45.unref, 'optionalCall', _46 => _46()]);
+    const stop = () => {
+      clearInterval(timer);
+      _optionalChain([extra, 'access', _47 => _47.signal, 'optionalAccess', _48 => _48.removeEventListener, 'call', _49 => _49("abort", stop)]);
+    };
+    _optionalChain([extra, 'access', _50 => _50.signal, 'optionalAccess', _51 => _51.addEventListener, 'call', _52 => _52("abort", stop, { once: true })]);
     return stop;
   }
   async #validateStructuredContent(tool, value, toolName) {
@@ -1345,7 +1386,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             _nullishCoalesce(args, () => ( {})),
             this.#auth,
             this.#createLoadContext(
-              _optionalChain([request, 'access', _39 => _39.params, 'optionalAccess', _40 => _40._meta]),
+              _optionalChain([request, 'access', _53 => _53.params, 'optionalAccess', _54 => _54._meta]),
               extra.sendNotification,
               extra.requestId
             )
@@ -1415,7 +1456,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
                 match,
                 this.#auth,
                 this.#createLoadContext(
-                  _optionalChain([request, 'access', _41 => _41.params, 'optionalAccess', _42 => _42._meta]),
+                  _optionalChain([request, 'access', _55 => _55.params, 'optionalAccess', _56 => _56._meta]),
                   extra.sendNotification,
                   extra.requestId
                 )
@@ -1445,7 +1486,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             maybeArrayResult = await resource.load(
               this.#auth,
               this.#createLoadContext(
-                _optionalChain([request, 'access', _43 => _43.params, 'optionalAccess', _44 => _44._meta]),
+                _optionalChain([request, 'access', _57 => _57.params, 'optionalAccess', _58 => _58._meta]),
                 extra.sendNotification,
                 extra.requestId
               )
@@ -1511,7 +1552,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     );
   }
   setupRootsHandlers() {
-    if (_optionalChain([this, 'access', _45 => _45.#rootsConfig, 'optionalAccess', _46 => _46.enabled]) === false) {
+    if (_optionalChain([this, 'access', _59 => _59.#rootsConfig, 'optionalAccess', _60 => _60.enabled]) === false) {
       this.#logger.debug(
         "[FastMCP debug] roots capability explicitly disabled via config"
       );
@@ -1562,8 +1603,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           return {
             annotations: tool.annotations,
             description: tool.description,
-            inputSchema: tool.parameters ? _chunkMPFPOZ2Hcjs.strictInputSchema.call(void 0, 
-              tool.parameters["~standard"].vendor === "zod" && "_zod" in tool.parameters ? _chunkMPFPOZ2Hcjs.zodInputSchema.call(void 0, tool.parameters, "draft-7") : await _xsschema.toJsonSchema.call(void 0, tool.parameters)
+            inputSchema: tool.parameters ? _chunk6TDYSPLCcjs.strictInputSchema.call(void 0, 
+              tool.parameters["~standard"].vendor === "zod" && "_zod" in tool.parameters ? _chunk6TDYSPLCcjs.zodInputSchema.call(void 0, tool.parameters, "draft-7") : await _xsschema.toJsonSchema.call(void 0, tool.parameters)
             ) : {
               additionalProperties: false,
               properties: {},
@@ -1571,8 +1612,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             },
             name: tool.name,
             ...tool.outputSchema && {
-              outputSchema: await _xsschema.toJsonSchema.call(void 0, 
-                tool.outputSchema
+              outputSchema: _chunk6TDYSPLCcjs.objectRootSchema.call(void 0, 
+                await _xsschema.toJsonSchema.call(void 0, tool.outputSchema)
               )
             },
             // Pass through _meta for MCP ext-apps UI support (issue #229)
@@ -1608,15 +1649,35 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           }
           args = parsed.value;
         }
-        const progressToken = _optionalChain([request, 'access', _47 => _47.params, 'optionalAccess', _48 => _48._meta, 'optionalAccess', _49 => _49.progressToken]);
+        const progressToken = _optionalChain([request, 'access', _61 => _61.params, 'optionalAccess', _62 => _62._meta, 'optionalAccess', _63 => _63.progressToken]);
         let result;
+        const timeoutAbort = new AbortController();
+        const signal = AbortSignal.any([
+          timeoutAbort.signal,
+          this.#abortController.signal,
+          // Only ever aborted for an explicit `notifications/cancelled`; the
+          // session signal above is what covers a client that simply left.
+          ...extra.signal ? [extra.signal] : []
+        ]);
+        const sendNotification = async (notification) => {
+          if (signal.aborted) {
+            return;
+          }
+          try {
+            await extra.sendNotification(notification);
+          } catch (error) {
+            if (!signal.aborted) {
+              throw error;
+            }
+          }
+        };
         try {
           const reportProgress = async (progress) => {
             if (progressToken === void 0) {
               return;
             }
             try {
-              await extra.sendNotification({
+              await sendNotification({
                 method: "notifications/progress",
                 params: {
                   ...progress,
@@ -1633,11 +1694,11 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               );
             }
           };
-          const log = this.#createLog(extra.sendNotification);
+          const log = this.#createLog(sendNotification);
           const streamContent = async (content) => {
             const contentArray = Array.isArray(content) ? content : [content];
             try {
-              await extra.sendNotification({
+              await sendNotification({
                 method: "notifications/tool/streamContent",
                 params: {
                   content: contentArray,
@@ -1660,14 +1721,6 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               toolName: request.params.name
             });
           }
-          const timeoutAbort = new AbortController();
-          const signal = AbortSignal.any([
-            timeoutAbort.signal,
-            this.#abortController.signal,
-            // Only ever aborted for an explicit `notifications/cancelled`; the
-            // session signal above is what covers a client that simply left.
-            ...extra.signal ? [extra.signal] : []
-          ]);
           const executeToolPromise = Promise.resolve(
             tool.execute(args, {
               client: {
@@ -1676,7 +1729,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               elicit: this.#createElicit(extra.requestId),
               log,
               reportProgress,
-              requestId: typeof _optionalChain([request, 'access', _50 => _50.params, 'optionalAccess', _51 => _51._meta, 'optionalAccess', _52 => _52.requestId]) === "string" ? request.params._meta.requestId : void 0,
+              requestId: typeof _optionalChain([request, 'access', _64 => _64.params, 'optionalAccess', _65 => _65._meta, 'optionalAccess', _66 => _66.requestId]) === "string" ? request.params._meta.requestId : void 0,
               session: this.#auth,
               sessionId: this.sessionId,
               signal,
@@ -1684,25 +1737,37 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             })
           );
           const stopStreamKeepalive = this.#startStreamKeepalive(
-            extra,
+            { sendNotification, signal },
             request.params.name
           );
-          const maybeStringResult = await (tool.timeoutMs ? Promise.race([
-            executeToolPromise,
-            new Promise((_, reject) => {
-              const timeoutId = setTimeout(() => {
-                const timedOut = new UserError(
+          let timeoutId;
+          let stopWaitingForAbort = () => {
+          };
+          const aborted = new Promise((_, reject) => {
+            const onAbort = () => reject(signal.reason);
+            stopWaitingForAbort = () => signal.removeEventListener("abort", onAbort);
+            signal.addEventListener("abort", onAbort, { once: true });
+            if (signal.aborted) {
+              onAbort();
+            }
+          });
+          if (tool.timeoutMs && !signal.aborted) {
+            timeoutId = setTimeout(() => {
+              timeoutAbort.abort(
+                new UserError(
                   `Tool '${request.params.name}' timed out after ${tool.timeoutMs}ms. Consider increasing timeoutMs or optimizing the tool implementation.`
-                );
-                timeoutAbort.abort(timedOut);
-                reject(timedOut);
-              }, tool.timeoutMs);
-              executeToolPromise.then(
-                () => clearTimeout(timeoutId),
-                () => clearTimeout(timeoutId)
+                )
               );
-            })
-          ]) : executeToolPromise).finally(stopStreamKeepalive);
+            }, tool.timeoutMs);
+          }
+          const maybeStringResult = await Promise.race([
+            executeToolPromise,
+            aborted
+          ]).finally(() => {
+            clearTimeout(timeoutId);
+            stopWaitingForAbort();
+            stopStreamKeepalive();
+          });
           await _promises3.setTimeout.call(void 0, 1);
           if (maybeStringResult === void 0 || maybeStringResult === null) {
             result = ContentResultZodSchema.parse({
@@ -1743,12 +1808,29 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           } else {
             result = ContentResultZodSchema.parse(maybeStringResult);
           }
+          if (tool.outputSchema && result.structuredContent === void 0 && !result.isError) {
+            throw new UserError(
+              `Tool '${request.params.name}' returned no structured content. Please return a value that matches the tool's outputSchema.`
+            );
+          }
         } catch (error) {
           if (error instanceof UserError) {
+            let structuredContent = error.extras;
+            if (structuredContent && tool.outputSchema) {
+              try {
+                structuredContent = await this.#validateStructuredContent(
+                  tool,
+                  structuredContent,
+                  request.params.name
+                );
+              } catch (e5) {
+                structuredContent = void 0;
+              }
+            }
             return {
               content: [{ text: error.message, type: "text" }],
               isError: true,
-              ...error.extras ? { structuredContent: error.extras } : {}
+              ...structuredContent ? { structuredContent } : {}
             };
           }
           const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1818,14 +1900,14 @@ function normalizePath(path) {
   return path.startsWith("/") ? path : `/${path}`;
 }
 function parseBasicAuthHeader(authHeader) {
-  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _53 => _53.match, 'call', _54 => _54(/^Basic\s+(.+)$/)]);
+  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _67 => _67.match, 'call', _68 => _68(/^Basic\s+(.+)$/)]);
   if (!basicMatch) return null;
   try {
     const credentials = Buffer.from(basicMatch[1], "base64").toString("utf-8");
     const credMatch = credentials.match(/^([^:]+):(.*)$/);
     if (!credMatch) return null;
     return { clientId: credMatch[1], clientSecret: credMatch[2] };
-  } catch (e5) {
+  } catch (e6) {
     return null;
   }
 }
@@ -1862,7 +1944,7 @@ function protectedResourceMetadataUrl(resource) {
   let url;
   try {
     url = new URL(resource);
-  } catch (e6) {
+  } catch (e7) {
     return `${resource}/.well-known/oauth-protected-resource`;
   }
   const path = url.pathname === "/" ? "" : url.pathname;
@@ -1964,7 +2046,9 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Adds a resource to the server.
    */
   addResource(resource) {
-    this.#resources = this.#resources.filter((r) => r.name !== resource.name);
+    this.#resources = this.#resources.filter(
+      (r) => r.name !== resource.name && r.uri !== resource.uri
+    );
     this.#resources.push(resource);
     if (this.#serverState === "running" /* Running */) {
       this.#resourcesListChanged(this.#resources);
@@ -1974,13 +2058,12 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Adds resources to the server.
    */
   addResources(resources) {
-    const newResourceNames = new Set(
-      resources.map((resource) => resource.name)
-    );
-    this.#resources = this.#resources.filter(
-      (r) => !newResourceNames.has(r.name)
-    );
-    this.#resources.push(...resources);
+    for (const resource of resources) {
+      this.#resources = this.#resources.filter(
+        (r) => r.name !== resource.name && r.uri !== resource.uri
+      );
+      this.#resources.push(resource);
+    }
     if (this.#serverState === "running" /* Running */) {
       this.#resourcesListChanged(this.#resources);
     }
@@ -2001,13 +2084,12 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Adds resource templates to the server.
    */
   addResourceTemplates(resources) {
-    const newResourceTemplateNames = new Set(
-      resources.map((resource) => resource.name)
-    );
-    this.#resourcesTemplates = this.#resourcesTemplates.filter(
-      (t) => !newResourceTemplateNames.has(t.name)
-    );
-    this.#resourcesTemplates.push(...resources);
+    for (const resource of resources) {
+      this.#resourcesTemplates = this.#resourcesTemplates.filter(
+        (template) => template.name !== resource.name
+      );
+      this.#resourcesTemplates.push(resource);
+    }
     if (this.#serverState === "running" /* Running */) {
       this.#resourceTemplatesListChanged(this.#resourcesTemplates);
     }
@@ -2028,9 +2110,12 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   addTools(tools) {
     tools.forEach(assertToolSchemas);
-    const newToolNames = new Set(tools.map((tool) => tool.name));
-    this.#tools = this.#tools.filter((t) => !newToolNames.has(t.name));
-    this.#tools.push(...tools);
+    const toolsByName = new Map(this.#tools.map((tool) => [tool.name, tool]));
+    for (const tool of tools) {
+      toolsByName.delete(tool.name);
+      toolsByName.set(tool.name, tool);
+    }
+    this.#tools = Array.from(toolsByName.values());
     if (this.#serverState === "running" /* Running */) {
       this.#toolsListChanged(this.#tools);
     }
@@ -2261,6 +2346,13 @@ var FastMCP = class extends FastMCPEventEmitter {
   async start(options) {
     const config = this.#parseRuntimeConfig(options);
     if (config.transportType === "stdio") {
+      const logger = _nullishCoalesce(this.#options.logger, () => ( {
+        debug: (...args) => console.error(...args),
+        error: (...args) => console.error(...args),
+        info: (...args) => console.error(...args),
+        log: (...args) => console.error(...args),
+        warn: (...args) => console.warn(...args)
+      }));
       const transport = new (0, _stdiojs.StdioServerTransport)();
       let auth;
       const authRequired = this.#authenticate !== void 0;
@@ -2287,7 +2379,7 @@ var FastMCP = class extends FastMCPEventEmitter {
         hasTools: this.#tools.length > 0,
         icons: this.#options.icons,
         instructions: this.#options.instructions,
-        logger: this.#logger,
+        logger,
         name: this.#options.name,
         onToolCall: this.#options.onToolCall,
         ping: this.#options.ping,
@@ -2332,6 +2424,9 @@ var FastMCP = class extends FastMCPEventEmitter {
         this.#serverState = "running" /* Running */;
       }
     } else if (config.transportType === "httpStream") {
+      if (this.#httpStreamServer) {
+        throw new Error("HTTP server is already running");
+      }
       const httpConfig = config.httpStream;
       const protocol = httpConfig.sslCert || httpConfig.sslKey ? "https" : "http";
       const streamEndpoint = joinPaths(
@@ -2461,6 +2556,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     );
     if (this.#httpStreamServer) {
       await this.#httpStreamServer.close();
+      this.#httpStreamServer = null;
     }
     this.#serverState = "stopped" /* Stopped */;
   }
@@ -2474,9 +2570,9 @@ var FastMCP = class extends FastMCPEventEmitter {
     const originalOnClose = transport.onclose;
     transport.onclose = () => {
       closed = true;
-      _optionalChain([onClose, 'optionalCall', _55 => _55()]);
+      _optionalChain([onClose, 'optionalCall', _69 => _69()]);
       this.#removeSession(session);
-      _optionalChain([originalOnClose, 'optionalCall', _56 => _56()]);
+      _optionalChain([originalOnClose, 'optionalCall', _70 => _70()]);
     };
     await session.connect(transport);
     if (closed) {
@@ -2541,7 +2637,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   #createUnauthorizedResponse(message) {
     const oauth = this.#options.oauth;
-    const resource = _optionalChain([oauth, 'optionalAccess', _57 => _57.enabled]) ? _optionalChain([oauth, 'access', _58 => _58.protectedResource, 'optionalAccess', _59 => _59.resource]) : void 0;
+    const resource = _optionalChain([oauth, 'optionalAccess', _71 => _71.enabled]) ? _optionalChain([oauth, 'access', _72 => _72.protectedResource, 'optionalAccess', _73 => _73.resource]) : void 0;
     const wwwAuthenticateParts = [
       'error="invalid_token"',
       `error_description="${message.replace(/"/g, '\\"')}"`
@@ -2680,7 +2776,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       }
     }
     const oauthConfig = this.#options.oauth;
-    if (_optionalChain([oauthConfig, 'optionalAccess', _60 => _60.enabled]) && req.method === "GET") {
+    if (_optionalChain([oauthConfig, 'optionalAccess', _74 => _74.enabled]) && req.method === "GET") {
       const url2 = new URL(req.url || "", `http://${host}`);
       const authorizationServerMetadataPath = joinPaths(
         "",
@@ -2714,8 +2810,8 @@ var FastMCP = class extends FastMCPEventEmitter {
         }
       }
     }
-    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _61 => _61.proxy]);
-    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _62 => _62.enabled])) {
+    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _75 => _75.proxy]);
+    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _76 => _76.enabled])) {
       const url2 = new URL(req.url || "", `http://${host}`);
       const oauthPath = basePathRelativePath;
       try {
@@ -2768,7 +2864,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, OAUTH_CREDENTIAL_RESPONSE_HEADERS).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _63 => _63.toJSON, 'optionalCall', _64 => _64()]) || {
+                    _optionalChain([error, 'access', _77 => _77.toJSON, 'optionalCall', _78 => _78()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2795,7 +2891,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _65 => _65.toJSON, 'optionalCall', _66 => _66()]) || {
+                _optionalChain([error, 'access', _79 => _79.toJSON, 'optionalCall', _80 => _80()]) || {
                   error: "invalid_request"
                 }
               )
@@ -2817,7 +2913,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _67 => _67.toJSON, 'optionalCall', _68 => _68()]) || {
+                _optionalChain([error, 'access', _81 => _81.toJSON, 'optionalCall', _82 => _82()]) || {
                   error: "server_error"
                 }
               )
@@ -2886,7 +2982,7 @@ var FastMCP = class extends FastMCPEventEmitter {
               } catch (error) {
                 res.writeHead(400, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _69 => _69.toJSON, 'optionalCall', _70 => _70()]) || {
+                    _optionalChain([error, 'access', _83 => _83.toJSON, 'optionalCall', _84 => _84()]) || {
                       error: "server_error"
                     }
                   )
@@ -2944,8 +3040,8 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const basicAuth = parseBasicAuthHeader(
                   req.headers.authorization
                 );
-                const clientId = _optionalChain([basicAuth, 'optionalAccess', _71 => _71.clientId]) || params.get("client_id") || "";
-                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _72 => _72.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
+                const clientId = _optionalChain([basicAuth, 'optionalAccess', _85 => _85.clientId]) || params.get("client_id") || "";
+                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _86 => _86.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
                 let response;
                 if (grantType === "authorization_code") {
                   response = await oauthProxy.exchangeAuthorizationCode({
@@ -2975,7 +3071,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, OAUTH_CREDENTIAL_RESPONSE_HEADERS).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _73 => _73.toJSON, 'optionalCall', _74 => _74()]) || {
+                    _optionalChain([error, 'access', _87 => _87.toJSON, 'optionalCall', _88 => _88()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -3001,7 +3097,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    * regardless (RFC 7235), so no config is needed just to get the header.
    */
   #httpStreamOAuthConfig() {
-    const resource = _optionalChain([this, 'access', _75 => _75.#options, 'access', _76 => _76.oauth, 'optionalAccess', _77 => _77.enabled]) ? _optionalChain([this, 'access', _78 => _78.#options, 'access', _79 => _79.oauth, 'access', _80 => _80.protectedResource, 'optionalAccess', _81 => _81.resource]) : void 0;
+    const resource = _optionalChain([this, 'access', _89 => _89.#options, 'access', _90 => _90.oauth, 'optionalAccess', _91 => _91.enabled]) ? _optionalChain([this, 'access', _92 => _92.#options, 'access', _93 => _93.oauth, 'access', _94 => _94.protectedResource, 'optionalAccess', _95 => _95.resource]) : void 0;
     if (!resource) {
       return {};
     }
@@ -3067,9 +3163,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     const hasBody = method !== "GET" && method !== "HEAD";
     if (hasBody) {
       return new Request(url.toString(), {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        body: req,
-        // Node.js IncomingMessage is readable stream
+        body: lazyRequestBody(req),
         duplex: "half",
         // Required for streaming bodies
         headers,
@@ -3109,24 +3203,24 @@ var FastMCP = class extends FastMCPEventEmitter {
     const envBasePath = process.env.FASTMCP_BASE_PATH;
     const envStateless = process.env.FASTMCP_STATELESS;
     const envHost = process.env.FASTMCP_HOST;
-    const transportType = _optionalChain([overrides, 'optionalAccess', _82 => _82.transportType]) || parseTransportSetting(transportArg, "--transport") || parseTransportSetting(envTransport, "FASTMCP_TRANSPORT") || "stdio";
+    const transportType = _optionalChain([overrides, 'optionalAccess', _96 => _96.transportType]) || parseTransportSetting(transportArg, "--transport") || parseTransportSetting(envTransport, "FASTMCP_TRANSPORT") || "stdio";
     if (transportType === "httpStream") {
       const port = parseInt(
-        _optionalChain([overrides, 'optionalAccess', _83 => _83.httpStream, 'optionalAccess', _84 => _84.port, 'optionalAccess', _85 => _85.toString, 'call', _86 => _86()]) || portArg || envPort || "8080"
+        _optionalChain([overrides, 'optionalAccess', _97 => _97.httpStream, 'optionalAccess', _98 => _98.port, 'optionalAccess', _99 => _99.toString, 'call', _100 => _100()]) || portArg || envPort || "8080"
       );
-      const host = _optionalChain([overrides, 'optionalAccess', _87 => _87.httpStream, 'optionalAccess', _88 => _88.host]) || hostArg || envHost || "localhost";
-      const endpoint = _optionalChain([overrides, 'optionalAccess', _89 => _89.httpStream, 'optionalAccess', _90 => _90.endpoint]) || endpointArg || envEndpoint || "/mcp";
+      const host = _optionalChain([overrides, 'optionalAccess', _101 => _101.httpStream, 'optionalAccess', _102 => _102.host]) || hostArg || envHost || "localhost";
+      const endpoint = _optionalChain([overrides, 'optionalAccess', _103 => _103.httpStream, 'optionalAccess', _104 => _104.endpoint]) || endpointArg || envEndpoint || "/mcp";
       const basePath = normalizeBasePath(
-        _optionalChain([overrides, 'optionalAccess', _91 => _91.httpStream, 'optionalAccess', _92 => _92.basePath]) || basePathArg || envBasePath
+        _optionalChain([overrides, 'optionalAccess', _105 => _105.httpStream, 'optionalAccess', _106 => _106.basePath]) || basePathArg || envBasePath
       );
-      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _93 => _93.httpStream, 'optionalAccess', _94 => _94.enableJsonResponse]) || false;
-      const stateless = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _95 => _95.httpStream, 'optionalAccess', _96 => _96.stateless]), () => ( // A bare `--stateless` means `--stateless true`.
+      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _107 => _107.httpStream, 'optionalAccess', _108 => _108.enableJsonResponse]) || false;
+      const stateless = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _109 => _109.httpStream, 'optionalAccess', _110 => _110.stateless]), () => ( // A bare `--stateless` means `--stateless true`.
       (statelessArg === "" ? true : parseBooleanSetting(statelessArg, "--stateless")))), () => ( parseBooleanSetting(envStateless, "FASTMCP_STATELESS"))), () => ( false));
-      const cors = _optionalChain([overrides, 'optionalAccess', _97 => _97.httpStream, 'optionalAccess', _98 => _98.cors]);
-      const eventStore = _optionalChain([overrides, 'optionalAccess', _99 => _99.httpStream, 'optionalAccess', _100 => _100.eventStore]);
-      const sslCa = _optionalChain([overrides, 'optionalAccess', _101 => _101.httpStream, 'optionalAccess', _102 => _102.sslCa]);
-      const sslCert = _optionalChain([overrides, 'optionalAccess', _103 => _103.httpStream, 'optionalAccess', _104 => _104.sslCert]);
-      const sslKey = _optionalChain([overrides, 'optionalAccess', _105 => _105.httpStream, 'optionalAccess', _106 => _106.sslKey]);
+      const cors = _optionalChain([overrides, 'optionalAccess', _111 => _111.httpStream, 'optionalAccess', _112 => _112.cors]);
+      const eventStore = _optionalChain([overrides, 'optionalAccess', _113 => _113.httpStream, 'optionalAccess', _114 => _114.eventStore]);
+      const sslCa = _optionalChain([overrides, 'optionalAccess', _115 => _115.httpStream, 'optionalAccess', _116 => _116.sslCa]);
+      const sslCert = _optionalChain([overrides, 'optionalAccess', _117 => _117.httpStream, 'optionalAccess', _118 => _118.sslCert]);
+      const sslKey = _optionalChain([overrides, 'optionalAccess', _119 => _119.httpStream, 'optionalAccess', _120 => _120.sslKey]);
       return {
         httpStream: {
           basePath,
@@ -3218,7 +3312,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   #useEndpointAsResource(endpoint) {
     const oauth = this.#options.oauth;
-    if (this.#providerResourceBase === void 0 || !_optionalChain([oauth, 'optionalAccess', _107 => _107.protectedResource]))
+    if (this.#providerResourceBase === void 0 || !_optionalChain([oauth, 'optionalAccess', _121 => _121.protectedResource]))
       return;
     this.#options = {
       ...this.#options,
@@ -3247,4 +3341,4 @@ var FastMCP = class extends FastMCPEventEmitter {
 
 
 exports.DiscoveryDocumentCache = DiscoveryDocumentCache; exports.jsonSchemaAdapter = jsonSchemaAdapter; exports.MEDIA_FETCH_TIMEOUT_MS = MEDIA_FETCH_TIMEOUT_MS; exports.imageContent = imageContent; exports.audioContent = audioContent; exports.FastMCPError = FastMCPError; exports.SessionError = SessionError; exports.UnexpectedStateError = UnexpectedStateError; exports.UserError = UserError; exports.ServerState = ServerState; exports.FastMCPSession = FastMCPSession; exports.FastMCP = FastMCP;
-//# sourceMappingURL=chunk-TBMRFQ6M.cjs.map
+//# sourceMappingURL=chunk-PV5VLW7R.cjs.map