fastmcp 4.23.5 → 4.23.7

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

@@ -3,7 +3,8 @@
 var _chunkC7TBI7A5cjs = require('./chunk-C7TBI7A5.cjs');
 
 
-var _chunkO22SYZMCcjs = require('./chunk-O22SYZMC.cjs');
+
+var _chunkMPFPOZ2Hcjs = require('./chunk-MPFPOZ2H.cjs');
 
 // src/FastMCP.ts
 var _indexjs = require('@modelcontextprotocol/sdk/server/index.js');
@@ -225,6 +226,16 @@ function unwrapDefault(value) {
 
 // src/FastMCP.ts
 var MEDIA_FETCH_TIMEOUT_MS = 3e4;
+var isSvg = (buffer) => {
+  let text = buffer.toString("utf8").trimStart();
+  const preamble = /^(?:<\?[\s\S]*?\?>|<!--[\s\S]*?-->|<!DOCTYPE\s[^[>]*(?:\[[\s\S]*?\]\s*)?>)/;
+  let match = preamble.exec(text);
+  while (match) {
+    text = text.slice(match[0].length).trimStart();
+    match = preamble.exec(text);
+  }
+  return /^<svg(?:\s|\/?>)/.test(text);
+};
 var imageContent = async (input) => {
   let rawData;
   try {
@@ -267,16 +278,17 @@ var imageContent = async (input) => {
       );
     }
     const { fileTypeFromBuffer } = await Promise.resolve().then(() => _interopRequireWildcard(require("file-type")));
-    const mimeType = await fileTypeFromBuffer(rawData);
-    if (!mimeType || !mimeType.mime.startsWith("image/")) {
+    const fileType = await fileTypeFromBuffer(rawData);
+    const mimeType = (!fileType || fileType.mime === "application/xml") && isSvg(rawData) ? "image/svg+xml" : _optionalChain([fileType, 'optionalAccess', _4 => _4.mime]);
+    if (!mimeType || !mimeType.startsWith("image/")) {
       console.warn(
-        `Warning: Content may not be a valid image. Detected MIME: ${_optionalChain([mimeType, 'optionalAccess', _4 => _4.mime]) || "unknown"}`
+        `Warning: Content may not be a valid image. Detected MIME: ${mimeType || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: _nullishCoalesce(_optionalChain([mimeType, 'optionalAccess', _5 => _5.mime]), () => ( "image/png")),
+      mimeType: _nullishCoalesce(mimeType, () => ( "image/png")),
       type: "image"
     };
   } catch (error) {
@@ -287,8 +299,27 @@ var imageContent = async (input) => {
     }
   }
 };
+var AUDIO_CONTAINER_TYPES = /* @__PURE__ */ new Map([
+  ["video/3gpp", "audio/3gpp"],
+  ["video/3gpp2", "audio/3gpp2"],
+  ["video/matroska", "audio/matroska"],
+  ["video/mp4", "audio/mp4"],
+  ["video/ogg", "audio/ogg"],
+  ["video/webm", "audio/webm"]
+]);
+var resolveAudioMimeType = (detected, declared) => {
+  if (_optionalChain([detected, 'optionalAccess', _5 => _5.startsWith, 'call', _6 => _6("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/")])) {
+    return declaredMime;
+  }
+  return _nullishCoalesce((detected && AUDIO_CONTAINER_TYPES.get(detected)), () => ( detected));
+};
 var audioContent = async (input) => {
   let rawData;
+  let declaredMimeType = null;
   try {
     if ("url" in input) {
       const timeoutMs = _nullishCoalesce(input.timeoutMs, () => ( MEDIA_FETCH_TIMEOUT_MS));
@@ -302,6 +333,7 @@ var audioContent = async (input) => {
             `Server responded with status: ${response.status} - ${response.statusText}`
           );
         }
+        declaredMimeType = response.headers.get("content-type");
         rawData = Buffer.from(await response.arrayBuffer());
       } catch (error) {
         if (error instanceof Error && (error.name === "AbortError" || error.name === "TimeoutError")) {
@@ -329,16 +361,17 @@ var audioContent = async (input) => {
       );
     }
     const { fileTypeFromBuffer } = await Promise.resolve().then(() => _interopRequireWildcard(require("file-type")));
-    const mimeType = await fileTypeFromBuffer(rawData);
-    if (!mimeType || !mimeType.mime.startsWith("audio/")) {
+    const detected = await fileTypeFromBuffer(rawData);
+    const mimeType = resolveAudioMimeType(_optionalChain([detected, 'optionalAccess', _16 => _16.mime]), declaredMimeType);
+    if (!mimeType || !mimeType.startsWith("audio/")) {
       console.warn(
-        `Warning: Content may not be a valid audio file. Detected MIME: ${_optionalChain([mimeType, 'optionalAccess', _6 => _6.mime]) || "unknown"}`
+        `Warning: Content may not be a valid audio file. Detected MIME: ${mimeType || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: _nullishCoalesce(_optionalChain([mimeType, 'optionalAccess', _7 => _7.mime]), () => ( "audio/mpeg")),
+      mimeType: _nullishCoalesce(mimeType, () => ( "audio/mpeg")),
       type: "audio"
     };
   } catch (error) {
@@ -369,7 +402,7 @@ var UserError = class extends UnexpectedStateError {
 };
 function assertStandardSchema(toolName, schemaName, schema) {
   const standard = schema["~standard"];
-  if (typeof _optionalChain([standard, 'optionalAccess', _8 => _8.validate]) === "function") {
+  if (typeof _optionalChain([standard, 'optionalAccess', _17 => _17.validate]) === "function") {
     return;
   }
   throw new UserError(
@@ -486,7 +519,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
    */
   get sessionId() {
     if (this.#sessionId === void 0) {
-      const transportSessionId = _optionalChain([this, 'access', _9 => _9.#server, 'access', _10 => _10.transport, 'optionalAccess', _11 => _11.sessionId]);
+      const transportSessionId = _optionalChain([this, 'access', _18 => _18.#server, 'access', _19 => _19.transport, 'optionalAccess', _20 => _20.sessionId]);
       if (typeof transportSessionId === "string") {
         this.#sessionId = transportSessionId;
       }
@@ -510,6 +543,8 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
   #capabilities = {};
   #clientCapabilities;
   #connectionState = "connecting";
+  // Caller-supplied transports leave the response mode unspecified.
+  #enableJsonResponse;
   #logger;
   /**
    * The minimum level the client asked for with `logging/setLevel`, or
@@ -545,6 +580,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
    * to interested clients only.
    */
   #subscriptions = /* @__PURE__ */ new Set();
+  #tools;
   #transportType;
   /**
    * Capabilities this session has already warned about in `#canRefresh`, so a
@@ -553,9 +589,11 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
    */
   #unnegotiatedWarnings = /* @__PURE__ */ new Set();
   #utils;
+  #visibleTools = [];
   constructor({
     auth,
     authRequired = false,
+    enableJsonResponse,
     hasTools,
     icons,
     instructions,
@@ -580,6 +618,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     super();
     this.#auth = auth;
     this.#authRequired = authRequired;
+    this.#enableJsonResponse = enableJsonResponse;
     this.#logger = logger;
     this.#onToolCall = onToolCall;
     this.#pingConfig = ping;
@@ -587,6 +626,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     this.#sessionId = sessionId;
     this.#stateless = stateless;
     this.#streamKeepaliveConfig = streamKeepalive;
+    this.#tools = tools;
     this.#transportType = transportType;
     this.#needsEventLoopFlush = transportType === "httpStream";
     const supportsTools = _nullishCoalesce(hasTools, () => ( tools.length > 0));
@@ -620,7 +660,9 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     this.setupRootsHandlers();
     this.setupCompleteHandlers();
     if (supportsTools) {
-      this.setupToolHandlers(tools);
+      this.setupToolHandlers(
+        toolsVisibleTo(tools, this.#auth, this.#authRequired)
+      );
     }
     if (resources.length || resourcesTemplates.length) {
       for (const resource of resources) {
@@ -741,6 +783,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     if (!this.#canRefresh("tools")) {
       return;
     }
+    this.#tools = tools;
     this.setupToolHandlers(
       toolsVisibleTo(tools, this.#auth, this.#authRequired)
     );
@@ -765,6 +808,11 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    */
   updateAuth(auth) {
     this.#auth = auth;
+    const tools = toolsVisibleTo(this.#tools, auth, this.#authRequired);
+    if (tools.length !== this.#visibleTools.length || tools.some((tool, index) => tool !== this.#visibleTools[index])) {
+      this.setupToolHandlers(tools);
+      this.triggerListChangedNotification("notifications/tools/list_changed");
+    }
   }
   waitForReady() {
     if (this.isReady) {
@@ -832,6 +880,19 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     }
     return false;
   }
+  /**
+   * When `start()` streams responses, an elicitation goes out on its request's
+   * own SSE stream, as the SDK's `extra.sendRequest` does, so it reaches a
+   * client that never opened the optional standalone GET stream. A JSON
+   * response cannot carry it, and a transport passed to `connect()` does not
+   * say which mode it uses, so those keep the session's standalone stream.
+   */
+  #createElicit(requestId) {
+    return (params, options) => this.#server.elicitInput(
+      params,
+      this.#enableJsonResponse === false ? { ...options, relatedRequestId: requestId } : options
+    );
+  }
   /**
    * Builds the context object passed as the third argument to
    * `resource.load` / `resourceTemplate.load` / `prompt.load`.
@@ -842,37 +903,37 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    * are tied to a tool call's progress token / streaming notification,
    * which resource and prompt reads do not have.
    */
-  #createLoadContext(meta) {
+  #createLoadContext(meta, sendNotification, requestId) {
     return {
       client: {
         version: this.#server.getClientVersion()
       },
-      elicit: (params, options) => this.#server.elicitInput(params, options),
-      log: this.#createLog(),
-      requestId: typeof _optionalChain([meta, 'optionalAccess', _12 => _12.requestId]) === "string" ? meta.requestId : void 0,
+      elicit: this.#createElicit(requestId),
+      log: this.#createLog(sendNotification),
+      requestId: typeof _optionalChain([meta, 'optionalAccess', _21 => _21.requestId]) === "string" ? meta.requestId : void 0,
       session: this.#auth,
       sessionId: this.sessionId
     };
   }
-  #createLog() {
+  #createLog(sendNotification) {
     return {
       debug: (message, context) => {
-        this.#sendLog("debug", message, context);
+        this.#sendLog(sendNotification, "debug", message, context);
       },
       error: (message, context) => {
-        this.#sendLog("error", message, context);
+        this.#sendLog(sendNotification, "error", message, context);
       },
       info: (message, context) => {
-        this.#sendLog("info", message, context);
+        this.#sendLog(sendNotification, "info", message, context);
       },
       warn: (message, context) => {
-        this.#sendLog("warning", message, context);
+        this.#sendLog(sendNotification, "warning", message, context);
       }
     };
   }
   #formatSchemaIssues(issues) {
-    return _optionalChain([this, 'access', _13 => _13.#utils, 'optionalAccess', _14 => _14.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
-      const path = _optionalChain([issue, 'access', _15 => _15.path, 'optionalAccess', _16 => _16.join, 'call', _17 => _17(".")]) || "root";
+    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 `${path}: ${issue.message}`;
     }).join(", ");
   }
@@ -894,7 +955,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', _18 => _18.#rootsConfig, 'optionalAccess', _19 => _19.enabled]) === false || !_optionalChain([this, 'access', _20 => _20.#clientCapabilities, 'optionalAccess', _21 => _21.roots, 'optionalAccess', _22 => _22.listChanged]) || typeof this.#server.listRoots !== "function") {
+    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") {
       return;
     }
     const maxAttempts = streamableHttp ? 5 : 1;
@@ -904,7 +965,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           void 0,
           streamableHttp ? { timeout: 1e3 } : void 0
         );
-        this.#roots = _optionalChain([roots, 'optionalAccess', _23 => _23.roots]) || [];
+        this.#roots = _optionalChain([roots, 'optionalAccess', _32 => _32.roots]) || [];
         if (streamableHttp) {
           this.emit("rootsChanged", { roots: this.#roots });
         }
@@ -932,22 +993,23 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
     }
   }
   /**
-   * `sendLoggingMessage` rejects once the client has hung up, and these four
+   * Sending rejects once the client has hung up, and these four
    * callers are synchronous, so the rejection has nowhere to go. Swallow it the
    * way every other notification sender in this class does, or a client that
    * disconnects mid-tool takes the server process down with it.
    */
-  #sendLog(level, message, context) {
+  #sendLog(sendNotification, level, message, context) {
     if (this.#loggingLevel && LOGGING_LEVEL_SEVERITY[level] < LOGGING_LEVEL_SEVERITY[this.#loggingLevel]) {
       return;
     }
-    this.#server.sendLoggingMessage({
+    const params = {
       data: {
         context,
         message
       },
       level
-    }).catch((error) => {
+    };
+    sendNotification({ method: "notifications/message", params }).catch(() => this.#server.sendLoggingMessage(params)).catch((error) => {
       this.#logger.error(
         `[FastMCP error] failed to send ${level} log notification.
 
@@ -1041,7 +1103,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    */
   #startStreamKeepalive(extra, toolName) {
     const config = this.#streamKeepaliveConfig;
-    if (!_optionalChain([config, 'optionalAccess', _24 => _24.enabled])) {
+    if (!_optionalChain([config, 'optionalAccess', _33 => _33.enabled])) {
       return () => {
       };
     }
@@ -1061,9 +1123,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         );
       });
     }, intervalMs);
-    _optionalChain([timer, 'access', _25 => _25.unref, 'optionalCall', _26 => _26()]);
+    _optionalChain([timer, 'access', _34 => _34.unref, 'optionalCall', _35 => _35()]);
     const stop = () => clearInterval(timer);
-    _optionalChain([extra, 'access', _27 => _27.signal, 'optionalAccess', _28 => _28.addEventListener, 'call', _29 => _29("abort", stop, { once: true })]);
+    _optionalChain([extra, 'access', _36 => _36.signal, 'optionalAccess', _37 => _37.addEventListener, 'call', _38 => _38("abort", stop, { once: true })]);
     return stop;
   }
   async #validateStructuredContent(tool, value, toolName) {
@@ -1258,54 +1320,61 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         prompts: cachedPromptsList
       };
     });
-    this.#server.setRequestHandler(_typesjs.GetPromptRequestSchema, async (request) => {
-      const prompt = this.#prompts.get(request.params.name);
-      if (!prompt) {
-        throw new (0, _typesjs.McpError)(
-          _typesjs.ErrorCode.InvalidParams,
-          `Unknown prompt: ${request.params.name}`
-        );
-      }
-      const args = request.params.arguments;
-      for (const arg of _nullishCoalesce(prompt.arguments, () => ( []))) {
-        if (arg.required && !(args && Object.hasOwn(args, arg.name))) {
+    this.#server.setRequestHandler(
+      _typesjs.GetPromptRequestSchema,
+      async (request, extra) => {
+        const prompt = this.#prompts.get(request.params.name);
+        if (!prompt) {
           throw new (0, _typesjs.McpError)(
             _typesjs.ErrorCode.InvalidParams,
-            `Prompt '${request.params.name}' requires argument '${arg.name}': ${arg.description || "No description provided"}`
+            `Unknown prompt: ${request.params.name}`
           );
         }
+        const args = request.params.arguments;
+        for (const arg of _nullishCoalesce(prompt.arguments, () => ( []))) {
+          if (arg.required && !(args && Object.hasOwn(args, arg.name))) {
+            throw new (0, _typesjs.McpError)(
+              _typesjs.ErrorCode.InvalidParams,
+              `Prompt '${request.params.name}' requires argument '${arg.name}': ${arg.description || "No description provided"}`
+            );
+          }
+        }
+        let result;
+        try {
+          result = await prompt.load(
+            _nullishCoalesce(args, () => ( {})),
+            this.#auth,
+            this.#createLoadContext(
+              _optionalChain([request, 'access', _39 => _39.params, 'optionalAccess', _40 => _40._meta]),
+              extra.sendNotification,
+              extra.requestId
+            )
+          );
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          throw new (0, _typesjs.McpError)(
+            _typesjs.ErrorCode.InternalError,
+            `Failed to load prompt '${request.params.name}': ${errorMessage}`
+          );
+        }
+        if (typeof result === "string") {
+          return {
+            description: prompt.description,
+            messages: [
+              {
+                content: { text: result, type: "text" },
+                role: "user"
+              }
+            ]
+          };
+        } else {
+          return {
+            description: prompt.description,
+            messages: result.messages
+          };
+        }
       }
-      let result;
-      try {
-        result = await prompt.load(
-          _nullishCoalesce(args, () => ( {})),
-          this.#auth,
-          this.#createLoadContext(_optionalChain([request, 'access', _30 => _30.params, 'optionalAccess', _31 => _31._meta]))
-        );
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        throw new (0, _typesjs.McpError)(
-          _typesjs.ErrorCode.InternalError,
-          `Failed to load prompt '${request.params.name}': ${errorMessage}`
-        );
-      }
-      if (typeof result === "string") {
-        return {
-          description: prompt.description,
-          messages: [
-            {
-              content: { text: result, type: "text" },
-              role: "user"
-            }
-          ]
-        };
-      } else {
-        return {
-          description: prompt.description,
-          messages: result.messages
-        };
-      }
-    });
+    );
   }
   setupResourceHandlers() {
     let cachedResourcesList = null;
@@ -1329,7 +1398,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     });
     this.#server.setRequestHandler(
       _typesjs.ReadResourceRequestSchema,
-      async (request) => {
+      async (request, extra) => {
         if ("uri" in request.params) {
           const resource = this.#resources.get(request.params.uri);
           if (!resource) {
@@ -1345,7 +1414,11 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               const result = await resourceTemplate.load(
                 match,
                 this.#auth,
-                this.#createLoadContext(_optionalChain([request, 'access', _32 => _32.params, 'optionalAccess', _33 => _33._meta]))
+                this.#createLoadContext(
+                  _optionalChain([request, 'access', _41 => _41.params, 'optionalAccess', _42 => _42._meta]),
+                  extra.sendNotification,
+                  extra.requestId
+                )
               );
               const resources = Array.isArray(result) ? result : [result];
               return {
@@ -1371,7 +1444,11 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           try {
             maybeArrayResult = await resource.load(
               this.#auth,
-              this.#createLoadContext(_optionalChain([request, 'access', _34 => _34.params, 'optionalAccess', _35 => _35._meta]))
+              this.#createLoadContext(
+                _optionalChain([request, 'access', _43 => _43.params, 'optionalAccess', _44 => _44._meta]),
+                extra.sendNotification,
+                extra.requestId
+              )
             );
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1434,7 +1511,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     );
   }
   setupRootsHandlers() {
-    if (_optionalChain([this, 'access', _36 => _36.#rootsConfig, 'optionalAccess', _37 => _37.enabled]) === false) {
+    if (_optionalChain([this, 'access', _45 => _45.#rootsConfig, 'optionalAccess', _46 => _46.enabled]) === false) {
       this.#logger.debug(
         "[FastMCP debug] roots capability explicitly disabled via config"
       );
@@ -1471,6 +1548,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     }
   }
   setupToolHandlers(tools) {
+    this.#visibleTools = tools;
     const toolsMap = new Map(tools.map((tool) => [tool.name, tool]));
     let cachedToolsList = null;
     this.#server.setRequestHandler(_typesjs.ListToolsRequestSchema, async () => {
@@ -1484,7 +1562,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           return {
             annotations: tool.annotations,
             description: tool.description,
-            inputSchema: tool.parameters ? _chunkO22SYZMCcjs.strictInputSchema.call(void 0, await _xsschema.toJsonSchema.call(void 0, tool.parameters)) : {
+            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)
+            ) : {
               additionalProperties: false,
               properties: {},
               type: "object"
@@ -1528,7 +1608,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           }
           args = parsed.value;
         }
-        const progressToken = _optionalChain([request, 'access', _38 => _38.params, 'optionalAccess', _39 => _39._meta, 'optionalAccess', _40 => _40.progressToken]);
+        const progressToken = _optionalChain([request, 'access', _47 => _47.params, 'optionalAccess', _48 => _48._meta, 'optionalAccess', _49 => _49.progressToken]);
         let result;
         try {
           const reportProgress = async (progress) => {
@@ -1553,7 +1633,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               );
             }
           };
-          const log = this.#createLog();
+          const log = this.#createLog(extra.sendNotification);
           const streamContent = async (content) => {
             const contentArray = Array.isArray(content) ? content : [content];
             try {
@@ -1593,10 +1673,10 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               client: {
                 version: this.#server.getClientVersion()
               },
-              elicit: (params, options) => this.#server.elicitInput(params, options),
+              elicit: this.#createElicit(extra.requestId),
               log,
               reportProgress,
-              requestId: typeof _optionalChain([request, 'access', _41 => _41.params, 'optionalAccess', _42 => _42._meta, 'optionalAccess', _43 => _43.requestId]) === "string" ? request.params._meta.requestId : void 0,
+              requestId: typeof _optionalChain([request, 'access', _50 => _50.params, 'optionalAccess', _51 => _51._meta, 'optionalAccess', _52 => _52.requestId]) === "string" ? request.params._meta.requestId : void 0,
               session: this.#auth,
               sessionId: this.sessionId,
               signal,
@@ -1738,7 +1818,7 @@ function normalizePath(path) {
   return path.startsWith("/") ? path : `/${path}`;
 }
 function parseBasicAuthHeader(authHeader) {
-  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _44 => _44.match, 'call', _45 => _45(/^Basic\s+(.+)$/)]);
+  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _53 => _53.match, 'call', _54 => _54(/^Basic\s+(.+)$/)]);
   if (!basicMatch) return null;
   try {
     const credentials = Buffer.from(basicMatch[1], "base64").toString("utf-8");
@@ -2217,7 +2297,7 @@ var FastMCP = class extends FastMCPEventEmitter {
         roots: this.#options.roots,
         streamKeepalive: this.#options.streamKeepalive,
         title: this.#options.title,
-        tools: toolsVisibleTo(this.#tools, auth, authRequired),
+        tools: this.#tools,
         transportType: "stdio",
         utils: this.#options.utils,
         version: this.#options.version,
@@ -2273,7 +2353,12 @@ var FastMCP = class extends FastMCPEventEmitter {
               auth = this.#requireAuthenticated(await authenticate(request));
             }
             const sessionId = Array.isArray(request.headers["mcp-session-id"]) ? request.headers["mcp-session-id"][0] : request.headers["mcp-session-id"];
-            return this.#createSession(auth, sessionId, true);
+            return this.#createSession(
+              auth,
+              sessionId,
+              true,
+              httpConfig.enableJsonResponse
+            );
           },
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
@@ -2315,7 +2400,12 @@ var FastMCP = class extends FastMCPEventEmitter {
               auth = this.#requireAuthenticated(await authenticate(request));
             }
             const sessionId = Array.isArray(request.headers["mcp-session-id"]) ? request.headers["mcp-session-id"][0] : request.headers["mcp-session-id"];
-            return this.#createSession(auth, sessionId);
+            return this.#createSession(
+              auth,
+              sessionId,
+              false,
+              httpConfig.enableJsonResponse
+            );
           },
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
@@ -2384,9 +2474,9 @@ var FastMCP = class extends FastMCPEventEmitter {
     const originalOnClose = transport.onclose;
     transport.onclose = () => {
       closed = true;
-      _optionalChain([onClose, 'optionalCall', _46 => _46()]);
+      _optionalChain([onClose, 'optionalCall', _55 => _55()]);
       this.#removeSession(session);
-      _optionalChain([originalOnClose, 'optionalCall', _47 => _47()]);
+      _optionalChain([originalOnClose, 'optionalCall', _56 => _56()]);
     };
     await session.connect(transport);
     if (closed) {
@@ -2404,7 +2494,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Creates a new FastMCPSession instance with the current configuration.
    * Used both for regular sessions and stateless requests.
    */
-  #createSession(auth, sessionId, stateless = false) {
+  #createSession(auth, sessionId, stateless = false, enableJsonResponse) {
     if (auth && typeof auth === "object" && "authenticated" in auth && !auth.authenticated) {
       const errorMessage = "error" in auth && typeof auth.error === "string" ? auth.error : "Authentication failed";
       throw this.#createUnauthorizedResponse(errorMessage);
@@ -2413,6 +2503,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     return new FastMCPSession({
       auth,
       authRequired,
+      enableJsonResponse,
       hasTools: this.#tools.length > 0,
       icons: this.#options.icons,
       instructions: this.#options.instructions,
@@ -2428,7 +2519,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       stateless,
       streamKeepalive: this.#options.streamKeepalive,
       title: this.#options.title,
-      tools: toolsVisibleTo(this.#tools, auth, authRequired),
+      tools: this.#tools,
       transportType: "httpStream",
       utils: this.#options.utils,
       version: this.#options.version,
@@ -2450,7 +2541,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   #createUnauthorizedResponse(message) {
     const oauth = this.#options.oauth;
-    const resource = _optionalChain([oauth, 'optionalAccess', _48 => _48.enabled]) ? _optionalChain([oauth, 'access', _49 => _49.protectedResource, 'optionalAccess', _50 => _50.resource]) : void 0;
+    const resource = _optionalChain([oauth, 'optionalAccess', _57 => _57.enabled]) ? _optionalChain([oauth, 'access', _58 => _58.protectedResource, 'optionalAccess', _59 => _59.resource]) : void 0;
     const wwwAuthenticateParts = [
       'error="invalid_token"',
       `error_description="${message.replace(/"/g, '\\"')}"`
@@ -2589,7 +2680,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       }
     }
     const oauthConfig = this.#options.oauth;
-    if (_optionalChain([oauthConfig, 'optionalAccess', _51 => _51.enabled]) && req.method === "GET") {
+    if (_optionalChain([oauthConfig, 'optionalAccess', _60 => _60.enabled]) && req.method === "GET") {
       const url2 = new URL(req.url || "", `http://${host}`);
       const authorizationServerMetadataPath = joinPaths(
         "",
@@ -2623,8 +2714,8 @@ var FastMCP = class extends FastMCPEventEmitter {
         }
       }
     }
-    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _52 => _52.proxy]);
-    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _53 => _53.enabled])) {
+    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _61 => _61.proxy]);
+    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _62 => _62.enabled])) {
       const url2 = new URL(req.url || "", `http://${host}`);
       const oauthPath = basePathRelativePath;
       try {
@@ -2677,7 +2768,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, OAUTH_CREDENTIAL_RESPONSE_HEADERS).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _54 => _54.toJSON, 'optionalCall', _55 => _55()]) || {
+                    _optionalChain([error, 'access', _63 => _63.toJSON, 'optionalCall', _64 => _64()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2704,7 +2795,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _56 => _56.toJSON, 'optionalCall', _57 => _57()]) || {
+                _optionalChain([error, 'access', _65 => _65.toJSON, 'optionalCall', _66 => _66()]) || {
                   error: "invalid_request"
                 }
               )
@@ -2726,7 +2817,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _58 => _58.toJSON, 'optionalCall', _59 => _59()]) || {
+                _optionalChain([error, 'access', _67 => _67.toJSON, 'optionalCall', _68 => _68()]) || {
                   error: "server_error"
                 }
               )
@@ -2795,7 +2886,7 @@ var FastMCP = class extends FastMCPEventEmitter {
               } catch (error) {
                 res.writeHead(400, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _60 => _60.toJSON, 'optionalCall', _61 => _61()]) || {
+                    _optionalChain([error, 'access', _69 => _69.toJSON, 'optionalCall', _70 => _70()]) || {
                       error: "server_error"
                     }
                   )
@@ -2853,8 +2944,8 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const basicAuth = parseBasicAuthHeader(
                   req.headers.authorization
                 );
-                const clientId = _optionalChain([basicAuth, 'optionalAccess', _62 => _62.clientId]) || params.get("client_id") || "";
-                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _63 => _63.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
+                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));
                 let response;
                 if (grantType === "authorization_code") {
                   response = await oauthProxy.exchangeAuthorizationCode({
@@ -2884,7 +2975,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, OAUTH_CREDENTIAL_RESPONSE_HEADERS).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _64 => _64.toJSON, 'optionalCall', _65 => _65()]) || {
+                    _optionalChain([error, 'access', _73 => _73.toJSON, 'optionalCall', _74 => _74()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2910,7 +3001,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', _66 => _66.#options, 'access', _67 => _67.oauth, 'optionalAccess', _68 => _68.enabled]) ? _optionalChain([this, 'access', _69 => _69.#options, 'access', _70 => _70.oauth, 'access', _71 => _71.protectedResource, 'optionalAccess', _72 => _72.resource]) : void 0;
+    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;
     if (!resource) {
       return {};
     }
@@ -3018,24 +3109,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', _73 => _73.transportType]) || parseTransportSetting(transportArg, "--transport") || parseTransportSetting(envTransport, "FASTMCP_TRANSPORT") || "stdio";
+    const transportType = _optionalChain([overrides, 'optionalAccess', _82 => _82.transportType]) || parseTransportSetting(transportArg, "--transport") || parseTransportSetting(envTransport, "FASTMCP_TRANSPORT") || "stdio";
     if (transportType === "httpStream") {
       const port = parseInt(
-        _optionalChain([overrides, 'optionalAccess', _74 => _74.httpStream, 'optionalAccess', _75 => _75.port, 'optionalAccess', _76 => _76.toString, 'call', _77 => _77()]) || portArg || envPort || "8080"
+        _optionalChain([overrides, 'optionalAccess', _83 => _83.httpStream, 'optionalAccess', _84 => _84.port, 'optionalAccess', _85 => _85.toString, 'call', _86 => _86()]) || portArg || envPort || "8080"
       );
-      const host = _optionalChain([overrides, 'optionalAccess', _78 => _78.httpStream, 'optionalAccess', _79 => _79.host]) || hostArg || envHost || "localhost";
-      const endpoint = _optionalChain([overrides, 'optionalAccess', _80 => _80.httpStream, 'optionalAccess', _81 => _81.endpoint]) || endpointArg || envEndpoint || "/mcp";
+      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 basePath = normalizeBasePath(
-        _optionalChain([overrides, 'optionalAccess', _82 => _82.httpStream, 'optionalAccess', _83 => _83.basePath]) || basePathArg || envBasePath
+        _optionalChain([overrides, 'optionalAccess', _91 => _91.httpStream, 'optionalAccess', _92 => _92.basePath]) || basePathArg || envBasePath
       );
-      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _84 => _84.httpStream, 'optionalAccess', _85 => _85.enableJsonResponse]) || false;
-      const stateless = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _86 => _86.httpStream, 'optionalAccess', _87 => _87.stateless]), () => ( // A bare `--stateless` means `--stateless true`.
+      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`.
       (statelessArg === "" ? true : parseBooleanSetting(statelessArg, "--stateless")))), () => ( parseBooleanSetting(envStateless, "FASTMCP_STATELESS"))), () => ( false));
-      const cors = _optionalChain([overrides, 'optionalAccess', _88 => _88.httpStream, 'optionalAccess', _89 => _89.cors]);
-      const eventStore = _optionalChain([overrides, 'optionalAccess', _90 => _90.httpStream, 'optionalAccess', _91 => _91.eventStore]);
-      const sslCa = _optionalChain([overrides, 'optionalAccess', _92 => _92.httpStream, 'optionalAccess', _93 => _93.sslCa]);
-      const sslCert = _optionalChain([overrides, 'optionalAccess', _94 => _94.httpStream, 'optionalAccess', _95 => _95.sslCert]);
-      const sslKey = _optionalChain([overrides, 'optionalAccess', _96 => _96.httpStream, 'optionalAccess', _97 => _97.sslKey]);
+      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]);
       return {
         httpStream: {
           basePath,
@@ -3127,7 +3218,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   #useEndpointAsResource(endpoint) {
     const oauth = this.#options.oauth;
-    if (this.#providerResourceBase === void 0 || !_optionalChain([oauth, 'optionalAccess', _98 => _98.protectedResource]))
+    if (this.#providerResourceBase === void 0 || !_optionalChain([oauth, 'optionalAccess', _107 => _107.protectedResource]))
       return;
     this.#options = {
       ...this.#options,
@@ -3156,4 +3247,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-MI6R72UA.cjs.map
+//# sourceMappingURL=chunk-TBMRFQ6M.cjs.map