fastmcp 4.23.5 → 4.23.7

package/README.md

@@ -1286,6 +1286,11 @@ after `logging/setLevel` with `error`, `log.debug` and `log.info` reach nobody.
 Until a client asks, every level is sent. The level in force is readable as
 [`session.loggingLevel`](#logginglevel).
 
+Each message travels on the stream of the request that logged it, so logging
+works in `stateless` mode too. With `httpStream.enableJsonResponse`, which
+answers each request with a single JSON body, messages logged while a request
+runs are dropped.
+
 #### Errors
 
 The errors that are meant to be shown to the user should be thrown as `UserError` instances:

package/dist/FastMCP.cjs

@@ -11,7 +11,7 @@
 
 
 
-var _chunkMI6R72UAcjs = require('./chunk-MI6R72UA.cjs');
+var _chunkTBMRFQ6Mcjs = require('./chunk-TBMRFQ6M.cjs');
 
 
 
@@ -25,7 +25,7 @@ var _chunkMI6R72UAcjs = require('./chunk-MI6R72UA.cjs');
 
 
 var _chunkC7TBI7A5cjs = require('./chunk-C7TBI7A5.cjs');
-require('./chunk-O22SYZMC.cjs');
+require('./chunk-MPFPOZ2H.cjs');
 
 
 
@@ -50,5 +50,5 @@ require('./chunk-O22SYZMC.cjs');
 
 
 
-exports.AuthProvider = _chunkC7TBI7A5cjs.AuthProvider; exports.AzureProvider = _chunkC7TBI7A5cjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkMI6R72UAcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkMI6R72UAcjs.FastMCP; exports.FastMCPError = _chunkMI6R72UAcjs.FastMCPError; exports.FastMCPSession = _chunkMI6R72UAcjs.FastMCPSession; exports.GitHubProvider = _chunkC7TBI7A5cjs.GitHubProvider; exports.GoogleProvider = _chunkC7TBI7A5cjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunkMI6R72UAcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunkC7TBI7A5cjs.OAuthProvider; exports.ServerState = _chunkMI6R72UAcjs.ServerState; exports.SessionError = _chunkMI6R72UAcjs.SessionError; exports.UnexpectedStateError = _chunkMI6R72UAcjs.UnexpectedStateError; exports.UserError = _chunkMI6R72UAcjs.UserError; exports.audioContent = _chunkMI6R72UAcjs.audioContent; exports.getAuthSession = _chunkC7TBI7A5cjs.getAuthSession; exports.imageContent = _chunkMI6R72UAcjs.imageContent; exports.jsonSchemaAdapter = _chunkMI6R72UAcjs.jsonSchemaAdapter; exports.requireAll = _chunkC7TBI7A5cjs.requireAll; exports.requireAny = _chunkC7TBI7A5cjs.requireAny; exports.requireAuth = _chunkC7TBI7A5cjs.requireAuth; exports.requireRole = _chunkC7TBI7A5cjs.requireRole; exports.requireScopes = _chunkC7TBI7A5cjs.requireScopes;
+exports.AuthProvider = _chunkC7TBI7A5cjs.AuthProvider; exports.AzureProvider = _chunkC7TBI7A5cjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkTBMRFQ6Mcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkTBMRFQ6Mcjs.FastMCP; exports.FastMCPError = _chunkTBMRFQ6Mcjs.FastMCPError; exports.FastMCPSession = _chunkTBMRFQ6Mcjs.FastMCPSession; exports.GitHubProvider = _chunkC7TBI7A5cjs.GitHubProvider; exports.GoogleProvider = _chunkC7TBI7A5cjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunkTBMRFQ6Mcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunkC7TBI7A5cjs.OAuthProvider; exports.ServerState = _chunkTBMRFQ6Mcjs.ServerState; exports.SessionError = _chunkTBMRFQ6Mcjs.SessionError; exports.UnexpectedStateError = _chunkTBMRFQ6Mcjs.UnexpectedStateError; exports.UserError = _chunkTBMRFQ6Mcjs.UserError; exports.audioContent = _chunkTBMRFQ6Mcjs.audioContent; exports.getAuthSession = _chunkC7TBI7A5cjs.getAuthSession; exports.imageContent = _chunkTBMRFQ6Mcjs.imageContent; exports.jsonSchemaAdapter = _chunkTBMRFQ6Mcjs.jsonSchemaAdapter; exports.requireAll = _chunkC7TBI7A5cjs.requireAll; exports.requireAny = _chunkC7TBI7A5cjs.requireAny; exports.requireAuth = _chunkC7TBI7A5cjs.requireAuth; exports.requireRole = _chunkC7TBI7A5cjs.requireRole; exports.requireScopes = _chunkC7TBI7A5cjs.requireScopes;
 //# sourceMappingURL=FastMCP.cjs.map

package/dist/FastMCP.d.cts

@@ -925,7 +925,7 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
      */
     get sessionId(): string | undefined;
     set sessionId(value: string | undefined);
-    constructor({ auth, authRequired, hasTools, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
+    constructor({ auth, authRequired, enableJsonResponse, hasTools, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
         auth?: T;
         /**
          * Whether the server authenticates its sessions (`authenticate` is
@@ -933,6 +933,7 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
          * gated by `canAccess` (see `toolsVisibleTo`).
          */
         authRequired?: boolean;
+        enableJsonResponse?: boolean;
         /**
          * Whether the server has any tools at all, including ones this session's
          * `canAccess` filtering removed from `tools`. Defaults to `tools.length > 0`.

package/dist/FastMCP.d.ts

@@ -925,7 +925,7 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
      */
     get sessionId(): string | undefined;
     set sessionId(value: string | undefined);
-    constructor({ auth, authRequired, hasTools, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
+    constructor({ auth, authRequired, enableJsonResponse, hasTools, icons, instructions, logger, name, onToolCall, ping, prompts, resources, resourcesTemplates, roots, sessionId, stateless, streamKeepalive, title, tools, transportType, utils, version, websiteUrl, }: {
         auth?: T;
         /**
          * Whether the server authenticates its sessions (`authenticate` is
@@ -933,6 +933,7 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
          * gated by `canAccess` (see `toolsVisibleTo`).
          */
         authRequired?: boolean;
+        enableJsonResponse?: boolean;
         /**
          * Whether the server has any tools at all, including ones this session's
          * `canAccess` filtering removed from `tools`. Defaults to `tools.length > 0`.

package/dist/FastMCP.js

@@ -11,7 +11,7 @@ import {
   audioContent,
   imageContent,
   jsonSchemaAdapter
-} from "./chunk-OUD755CE.js";
+} from "./chunk-7WNI6AGD.js";
 import {
   AuthProvider,
   AzureProvider,
@@ -25,7 +25,7 @@ import {
   requireRole,
   requireScopes
 } from "./chunk-CA2EPNZF.js";
-import "./chunk-UMDUIBFW.js";
+import "./chunk-YZ5QEHBX.js";
 export {
   AuthProvider,
   AzureProvider,

package/dist/{chunk-OUD755CE.js → chunk-7WNI6AGD.js}

@@ -2,8 +2,9 @@ import {
   cancelResponseBody
 } from "./chunk-CA2EPNZF.js";
 import {
-  strictInputSchema
-} from "./chunk-UMDUIBFW.js";
+  strictInputSchema,
+  zodInputSchema
+} from "./chunk-YZ5QEHBX.js";
 
 // src/FastMCP.ts
 import { Server } from "@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 import("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" : fileType?.mime;
+    if (!mimeType || !mimeType.startsWith("image/")) {
       console.warn(
-        `Warning: Content may not be a valid image. Detected MIME: ${mimeType?.mime || "unknown"}`
+        `Warning: Content may not be a valid image. Detected MIME: ${mimeType || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: mimeType?.mime ?? "image/png",
+      mimeType: 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 (detected?.startsWith("audio/")) {
+    return detected;
+  }
+  const declaredMime = declared?.split(";", 1)[0].trim().toLowerCase();
+  if (declaredMime?.startsWith("audio/")) {
+    return declaredMime;
+  }
+  return (detected && AUDIO_CONTAINER_TYPES.get(detected)) ?? detected;
+};
 var audioContent = async (input) => {
   let rawData;
+  let declaredMimeType = null;
   try {
     if ("url" in input) {
       const timeoutMs = 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 import("file-type");
-    const mimeType = await fileTypeFromBuffer(rawData);
-    if (!mimeType || !mimeType.mime.startsWith("audio/")) {
+    const detected = await fileTypeFromBuffer(rawData);
+    const mimeType = resolveAudioMimeType(detected?.mime, declaredMimeType);
+    if (!mimeType || !mimeType.startsWith("audio/")) {
       console.warn(
-        `Warning: Content may not be a valid audio file. Detected MIME: ${mimeType?.mime || "unknown"}`
+        `Warning: Content may not be a valid audio file. Detected MIME: ${mimeType || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: mimeType?.mime ?? "audio/mpeg",
+      mimeType: mimeType ?? "audio/mpeg",
       type: "audio"
     };
   } catch (error) {
@@ -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 = 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,31 +903,31 @@ ${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(),
+      elicit: this.#createElicit(requestId),
+      log: this.#createLog(sendNotification),
       requestId: typeof meta?.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);
       }
     };
   }
@@ -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.
 
@@ -1258,54 +1320,61 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         prompts: cachedPromptsList
       };
     });
-    this.#server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-      const prompt = this.#prompts.get(request.params.name);
-      if (!prompt) {
-        throw new McpError(
-          ErrorCode.InvalidParams,
-          `Unknown prompt: ${request.params.name}`
-        );
-      }
-      const args = request.params.arguments;
-      for (const arg of prompt.arguments ?? []) {
-        if (arg.required && !(args && Object.hasOwn(args, arg.name))) {
+    this.#server.setRequestHandler(
+      GetPromptRequestSchema,
+      async (request, extra) => {
+        const prompt = this.#prompts.get(request.params.name);
+        if (!prompt) {
           throw new McpError(
             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 prompt.arguments ?? []) {
+          if (arg.required && !(args && Object.hasOwn(args, arg.name))) {
+            throw new McpError(
+              ErrorCode.InvalidParams,
+              `Prompt '${request.params.name}' requires argument '${arg.name}': ${arg.description || "No description provided"}`
+            );
+          }
+        }
+        let result;
+        try {
+          result = await prompt.load(
+            args ?? {},
+            this.#auth,
+            this.#createLoadContext(
+              request.params?._meta,
+              extra.sendNotification,
+              extra.requestId
+            )
+          );
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          throw new McpError(
+            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(
-          args ?? {},
-          this.#auth,
-          this.#createLoadContext(request.params?._meta)
-        );
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        throw new McpError(
-          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(
       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(request.params?._meta)
+                this.#createLoadContext(
+                  request.params?._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(request.params?._meta)
+              this.#createLoadContext(
+                request.params?._meta,
+                extra.sendNotification,
+                extra.requestId
+              )
             );
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
@@ -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(ListToolsRequestSchema, async () => {
@@ -1484,7 +1562,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           return {
             annotations: tool.annotations,
             description: tool.description,
-            inputSchema: tool.parameters ? strictInputSchema(await toJsonSchema(tool.parameters)) : {
+            inputSchema: tool.parameters ? strictInputSchema(
+              tool.parameters["~standard"].vendor === "zod" && "_zod" in tool.parameters ? zodInputSchema(tool.parameters, "draft-7") : await toJsonSchema(tool.parameters)
+            ) : {
               additionalProperties: false,
               properties: {},
               type: "object"
@@ -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,7 +1673,7 @@ ${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 request.params?._meta?.requestId === "string" ? request.params._meta.requestId : void 0,
@@ -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,
@@ -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,
@@ -3156,4 +3247,4 @@ export {
   FastMCPSession,
   FastMCP
 };
-//# sourceMappingURL=chunk-OUD755CE.js.map
+//# sourceMappingURL=chunk-7WNI6AGD.js.map