fastmcp 4.9.2 → 4.10.0

package/README.md

@@ -594,6 +594,48 @@ server.addTool({
 });
 ```
 
+**Plain JSON Schema Example:**
+
+If you already have a JSON Schema — from an OpenAPI document, a config file, or
+another server — `jsonSchemaAdapter` wraps it so it can be used directly, with
+no schema library in between.
+
+It requires the peer dependency `ajv`, which does the validation, plus
+`ajv-formats` if your schema uses `format` keywords such as `email` or `uri`.
+Both are imported the first time a tool is called, so servers that don't use
+this pay nothing for it.
+
+```bash
+npm install ajv ajv-formats
+```
+
+```typescript
+import { jsonSchemaAdapter } from "fastmcp";
+
+server.addTool({
+  name: "fetch-json-schema",
+  description: "Fetch the content of a url (using plain JSON Schema)",
+  parameters: jsonSchemaAdapter({
+    type: "object",
+    properties: {
+      url: { type: "string", format: "uri" },
+    },
+    required: ["url"],
+  }),
+  execute: async (args) => {
+    const { url } = args as { url: string };
+    return await fetchWebpageContent(url);
+  },
+});
+```
+
+Works for `outputSchema` too. Note that FastMCP advertises every tool schema
+with `additionalProperties: false`, whatever your schema said — the same
+treatment Zod and Valibot schemas get.
+
+Unlike the schema libraries above, a plain JSON Schema carries no TypeScript
+types, so `execute` receives `unknown` arguments. Cast or narrow them yourself.
+
 #### Tools Without Parameters
 
 When creating tools that don't require parameters, you have two options:

package/dist/FastMCP.cjs

@@ -7,7 +7,8 @@
 
 
 
-var _chunkENLYR3QMcjs = require('./chunk-ENLYR3QM.cjs');
+
+var _chunkGF4ORBWZcjs = require('./chunk-GF4ORBWZ.cjs');
 
 
 
@@ -41,5 +42,6 @@ var _chunkDZYT6QAHcjs = require('./chunk-DZYT6QAH.cjs');
 
 
 
-exports.AuthProvider = _chunkDZYT6QAHcjs.AuthProvider; exports.AzureProvider = _chunkDZYT6QAHcjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkENLYR3QMcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkENLYR3QMcjs.FastMCP; exports.FastMCPSession = _chunkENLYR3QMcjs.FastMCPSession; exports.GitHubProvider = _chunkDZYT6QAHcjs.GitHubProvider; exports.GoogleProvider = _chunkDZYT6QAHcjs.GoogleProvider; exports.OAuthProvider = _chunkDZYT6QAHcjs.OAuthProvider; exports.ServerState = _chunkENLYR3QMcjs.ServerState; exports.UnexpectedStateError = _chunkENLYR3QMcjs.UnexpectedStateError; exports.UserError = _chunkENLYR3QMcjs.UserError; exports.audioContent = _chunkENLYR3QMcjs.audioContent; exports.getAuthSession = _chunkDZYT6QAHcjs.getAuthSession; exports.imageContent = _chunkENLYR3QMcjs.imageContent; exports.requireAll = _chunkDZYT6QAHcjs.requireAll; exports.requireAny = _chunkDZYT6QAHcjs.requireAny; exports.requireAuth = _chunkDZYT6QAHcjs.requireAuth; exports.requireRole = _chunkDZYT6QAHcjs.requireRole; exports.requireScopes = _chunkDZYT6QAHcjs.requireScopes;
+
+exports.AuthProvider = _chunkDZYT6QAHcjs.AuthProvider; exports.AzureProvider = _chunkDZYT6QAHcjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkGF4ORBWZcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkGF4ORBWZcjs.FastMCP; exports.FastMCPSession = _chunkGF4ORBWZcjs.FastMCPSession; exports.GitHubProvider = _chunkDZYT6QAHcjs.GitHubProvider; exports.GoogleProvider = _chunkDZYT6QAHcjs.GoogleProvider; exports.OAuthProvider = _chunkDZYT6QAHcjs.OAuthProvider; exports.ServerState = _chunkGF4ORBWZcjs.ServerState; exports.UnexpectedStateError = _chunkGF4ORBWZcjs.UnexpectedStateError; exports.UserError = _chunkGF4ORBWZcjs.UserError; exports.audioContent = _chunkGF4ORBWZcjs.audioContent; exports.getAuthSession = _chunkDZYT6QAHcjs.getAuthSession; exports.imageContent = _chunkGF4ORBWZcjs.imageContent; exports.jsonSchemaAdapter = _chunkGF4ORBWZcjs.jsonSchemaAdapter; exports.requireAll = _chunkDZYT6QAHcjs.requireAll; exports.requireAny = _chunkDZYT6QAHcjs.requireAny; exports.requireAuth = _chunkDZYT6QAHcjs.requireAuth; exports.requireRole = _chunkDZYT6QAHcjs.requireRole; exports.requireScopes = _chunkDZYT6QAHcjs.requireScopes;
 //# sourceMappingURL=FastMCP.cjs.map

package/dist/FastMCP.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/home/runner/work/fastmcp/fastmcp/dist/FastMCP.cjs"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,wDAA6B;AAC7B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,wDAA6B;AAC7B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,gjCAAC","file":"/home/runner/work/fastmcp/fastmcp/dist/FastMCP.cjs"}
+{"version":3,"sources":["/home/runner/work/fastmcp/fastmcp/dist/FastMCP.cjs"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,wDAA6B;AAC7B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,wDAA6B;AAC7B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,inCAAC","file":"/home/runner/work/fastmcp/fastmcp/dist/FastMCP.cjs"}

package/dist/FastMCP.d.cts

@@ -47,6 +47,71 @@ declare class DiscoveryDocumentCache {
     has(url: string): boolean;
 }
 
+/**
+ * A plain JSON Schema object descriptor.
+ */
+type JsonSchemaObject = {
+    [key: string]: unknown;
+    $schema?: string;
+    additionalProperties?: boolean;
+    properties?: Record<string, unknown>;
+    required?: string[];
+    type: string;
+};
+/**
+ * A Standard Schema that also carries the JSON Schema it was built from.
+ *
+ * `~standard.jsonSchema` is the Standard JSON Schema extension. Anything that
+ * knows about it — including the `xsschema` conversion FastMCP uses to build
+ * `tools/list` — reads the schema straight off the object instead of trying to
+ * derive one from a validation library it does not recognise.
+ */
+interface JsonSchemaStandardSchema extends StandardSchemaV1 {
+    readonly "~standard": {
+        readonly jsonSchema: {
+            readonly input: () => JsonSchemaObject;
+            readonly output: () => JsonSchemaObject;
+        };
+    } & StandardSchemaV1.Props;
+}
+/**
+ * Wraps a plain JSON Schema object so it can be used as a tool's `parameters`
+ * or `outputSchema`, without pulling in Zod, Valibot, or another validation
+ * library.
+ *
+ * Validation uses AJV, which is an optional peer dependency — install `ajv`
+ * (and `ajv-formats` if you use `format` keywords) to use this. It is imported
+ * on first validation, so servers that never call this pay nothing for it.
+ *
+ * Note that FastMCP applies the same strictness to every tool schema: objects
+ * are advertised with `additionalProperties: false`, whatever the input schema
+ * said.
+ *
+ * @example
+ * ```ts
+ * import { FastMCP, jsonSchemaAdapter } from "fastmcp";
+ *
+ * const server = new FastMCP({ name: "Example", version: "1.0.0" });
+ *
+ * server.addTool({
+ *   name: "greet",
+ *   description: "Greet a user",
+ *   parameters: jsonSchemaAdapter({
+ *     type: "object",
+ *     properties: {
+ *       name: { type: "string" },
+ *     },
+ *     required: ["name"],
+ *   }),
+ *   execute: async ({ name }) => `Hello, ${name}!`,
+ * });
+ * ```
+ *
+ * @param schema - A plain JSON Schema object
+ * @returns A Standard Schema that validates against `schema`
+ */
+declare function jsonSchemaAdapter(schema: JsonSchemaObject): JsonSchemaStandardSchema;
+
 interface Logger {
     debug(...args: unknown[]): void;
     error(...args: unknown[]): void;
@@ -920,4 +985,4 @@ declare class FastMCP<T extends FastMCPSessionAuth = FastMCPSessionAuth> extends
     stop(): Promise<void>;
 }
 
-export { type AudioContent, AuthProvider, type Content, type ContentResult, type Context, DiscoveryDocumentCache, FastMCP, type FastMCPEvents, type FastMCPRequest, type FastMCPResponse, FastMCPSession, type FastMCPSessionAuth, type FastMCPSessionEvents, type HTTPMethod, type ImageContent, type InputPrompt, type InputPromptArgument, type LoadContext, type Logger, type LoggingLevel, OAuthSession, type Progress, type Prompt, type PromptArgument, type Resource, type ResourceContent, type ResourceResult, type ResourceTemplate, type ResourceTemplateArgument, type RouteHandler, type RouteOptions, type SSEServer, type SerializableValue, type ServerOptions, ServerState, type TextContent, type Tool, type ToolParameters, UnexpectedStateError, UserError, audioContent, imageContent };
+export { type AudioContent, AuthProvider, type Content, type ContentResult, type Context, DiscoveryDocumentCache, FastMCP, type FastMCPEvents, type FastMCPRequest, type FastMCPResponse, FastMCPSession, type FastMCPSessionAuth, type FastMCPSessionEvents, type HTTPMethod, type ImageContent, type InputPrompt, type InputPromptArgument, type JsonSchemaObject, type JsonSchemaStandardSchema, type LoadContext, type Logger, type LoggingLevel, OAuthSession, type Progress, type Prompt, type PromptArgument, type Resource, type ResourceContent, type ResourceResult, type ResourceTemplate, type ResourceTemplateArgument, type RouteHandler, type RouteOptions, type SSEServer, type SerializableValue, type ServerOptions, ServerState, type TextContent, type Tool, type ToolParameters, UnexpectedStateError, UserError, audioContent, imageContent, jsonSchemaAdapter };

package/dist/FastMCP.d.ts

@@ -47,6 +47,71 @@ declare class DiscoveryDocumentCache {
     has(url: string): boolean;
 }
 
+/**
+ * A plain JSON Schema object descriptor.
+ */
+type JsonSchemaObject = {
+    [key: string]: unknown;
+    $schema?: string;
+    additionalProperties?: boolean;
+    properties?: Record<string, unknown>;
+    required?: string[];
+    type: string;
+};
+/**
+ * A Standard Schema that also carries the JSON Schema it was built from.
+ *
+ * `~standard.jsonSchema` is the Standard JSON Schema extension. Anything that
+ * knows about it — including the `xsschema` conversion FastMCP uses to build
+ * `tools/list` — reads the schema straight off the object instead of trying to
+ * derive one from a validation library it does not recognise.
+ */
+interface JsonSchemaStandardSchema extends StandardSchemaV1 {
+    readonly "~standard": {
+        readonly jsonSchema: {
+            readonly input: () => JsonSchemaObject;
+            readonly output: () => JsonSchemaObject;
+        };
+    } & StandardSchemaV1.Props;
+}
+/**
+ * Wraps a plain JSON Schema object so it can be used as a tool's `parameters`
+ * or `outputSchema`, without pulling in Zod, Valibot, or another validation
+ * library.
+ *
+ * Validation uses AJV, which is an optional peer dependency — install `ajv`
+ * (and `ajv-formats` if you use `format` keywords) to use this. It is imported
+ * on first validation, so servers that never call this pay nothing for it.
+ *
+ * Note that FastMCP applies the same strictness to every tool schema: objects
+ * are advertised with `additionalProperties: false`, whatever the input schema
+ * said.
+ *
+ * @example
+ * ```ts
+ * import { FastMCP, jsonSchemaAdapter } from "fastmcp";
+ *
+ * const server = new FastMCP({ name: "Example", version: "1.0.0" });
+ *
+ * server.addTool({
+ *   name: "greet",
+ *   description: "Greet a user",
+ *   parameters: jsonSchemaAdapter({
+ *     type: "object",
+ *     properties: {
+ *       name: { type: "string" },
+ *     },
+ *     required: ["name"],
+ *   }),
+ *   execute: async ({ name }) => `Hello, ${name}!`,
+ * });
+ * ```
+ *
+ * @param schema - A plain JSON Schema object
+ * @returns A Standard Schema that validates against `schema`
+ */
+declare function jsonSchemaAdapter(schema: JsonSchemaObject): JsonSchemaStandardSchema;
+
 interface Logger {
     debug(...args: unknown[]): void;
     error(...args: unknown[]): void;
@@ -920,4 +985,4 @@ declare class FastMCP<T extends FastMCPSessionAuth = FastMCPSessionAuth> extends
     stop(): Promise<void>;
 }
 
-export { type AudioContent, AuthProvider, type Content, type ContentResult, type Context, DiscoveryDocumentCache, FastMCP, type FastMCPEvents, type FastMCPRequest, type FastMCPResponse, FastMCPSession, type FastMCPSessionAuth, type FastMCPSessionEvents, type HTTPMethod, type ImageContent, type InputPrompt, type InputPromptArgument, type LoadContext, type Logger, type LoggingLevel, OAuthSession, type Progress, type Prompt, type PromptArgument, type Resource, type ResourceContent, type ResourceResult, type ResourceTemplate, type ResourceTemplateArgument, type RouteHandler, type RouteOptions, type SSEServer, type SerializableValue, type ServerOptions, ServerState, type TextContent, type Tool, type ToolParameters, UnexpectedStateError, UserError, audioContent, imageContent };
+export { type AudioContent, AuthProvider, type Content, type ContentResult, type Context, DiscoveryDocumentCache, FastMCP, type FastMCPEvents, type FastMCPRequest, type FastMCPResponse, FastMCPSession, type FastMCPSessionAuth, type FastMCPSessionEvents, type HTTPMethod, type ImageContent, type InputPrompt, type InputPromptArgument, type JsonSchemaObject, type JsonSchemaStandardSchema, type LoadContext, type Logger, type LoggingLevel, OAuthSession, type Progress, type Prompt, type PromptArgument, type Resource, type ResourceContent, type ResourceResult, type ResourceTemplate, type ResourceTemplateArgument, type RouteHandler, type RouteOptions, type SSEServer, type SerializableValue, type ServerOptions, ServerState, type TextContent, type Tool, type ToolParameters, UnexpectedStateError, UserError, audioContent, imageContent, jsonSchemaAdapter };

package/dist/FastMCP.js

@@ -6,8 +6,9 @@ import {
   UnexpectedStateError,
   UserError,
   audioContent,
-  imageContent
-} from "./chunk-JIPRWP6F.js";
+  imageContent,
+  jsonSchemaAdapter
+} from "./chunk-MGP2FVUH.js";
 import {
   AuthProvider,
   AzureProvider,
@@ -36,6 +37,7 @@ export {
   audioContent,
   getAuthSession,
   imageContent,
+  jsonSchemaAdapter,
   requireAll,
   requireAny,
   requireAuth,

package/dist/{chunk-ENLYR3QM.cjs → chunk-GF4ORBWZ.cjs}

@@ -114,6 +114,73 @@ var DiscoveryDocumentCache = class {
   }
 };
 
+// src/jsonSchemaAdapter.ts
+function jsonSchemaAdapter(schema) {
+  let compiled;
+  const getValidator = () => {
+    compiled ??= compileSchema(schema).catch((error) => {
+      compiled = void 0;
+      throw error;
+    });
+    return compiled;
+  };
+  return {
+    "~standard": {
+      jsonSchema: {
+        input: () => schema,
+        output: () => schema
+      },
+      validate: async (data) => {
+        const validate = await getValidator();
+        if (validate(data)) {
+          return { value: data };
+        }
+        return { issues: (_nullishCoalesce(validate.errors, () => ( []))).map(toIssue) };
+      },
+      vendor: "json-schema",
+      version: 1
+    }
+  };
+}
+async function compileSchema(schema) {
+  let ajvModule;
+  try {
+    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'
+    );
+  }
+  const Ajv = unwrapDefault(unwrapDefault(ajvModule));
+  const ajv = new Ajv({ allErrors: true, strict: false });
+  try {
+    const formatsModule = await Promise.resolve().then(() => _interopRequireWildcard(require("ajv-formats")));
+    const addFormats = unwrapDefault(
+      unwrapDefault(formatsModule)
+    );
+    addFormats(ajv);
+  } catch (e3) {
+  }
+  return ajv.compile(schema);
+}
+function toIssue(error) {
+  const path = error.instancePath.split("/").filter(Boolean).map((segment) => segment.replaceAll("~1", "/").replaceAll("~0", "~")).map((segment) => {
+    const index = Number(segment);
+    return Number.isInteger(index) && segment !== "" ? index : segment;
+  });
+  const missingProperty = _optionalChain([error, 'access', _2 => _2.params, 'optionalAccess', _3 => _3.missingProperty]);
+  if (error.keyword === "required" && typeof missingProperty === "string") {
+    path.push(missingProperty);
+  }
+  return {
+    message: error.message || "Validation error",
+    path
+  };
+}
+function unwrapDefault(value) {
+  return typeof value === "object" && value !== null && "default" in value ? value.default : value;
+}
+
 // src/FastMCP.ts
 var imageContent = async (input) => {
   let rawData;
@@ -151,13 +218,13 @@ var imageContent = async (input) => {
     const mimeType = await fileTypeFromBuffer(rawData);
     if (!mimeType || !mimeType.mime.startsWith("image/")) {
       console.warn(
-        `Warning: Content may not be a valid image. Detected MIME: ${_optionalChain([mimeType, 'optionalAccess', _2 => _2.mime]) || "unknown"}`
+        `Warning: Content may not be a valid image. Detected MIME: ${_optionalChain([mimeType, 'optionalAccess', _4 => _4.mime]) || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: _nullishCoalesce(_optionalChain([mimeType, 'optionalAccess', _3 => _3.mime]), () => ( "image/png")),
+      mimeType: _nullishCoalesce(_optionalChain([mimeType, 'optionalAccess', _5 => _5.mime]), () => ( "image/png")),
       type: "image"
     };
   } catch (error) {
@@ -204,13 +271,13 @@ var audioContent = async (input) => {
     const mimeType = await fileTypeFromBuffer(rawData);
     if (!mimeType || !mimeType.mime.startsWith("audio/")) {
       console.warn(
-        `Warning: Content may not be a valid audio file. Detected MIME: ${_optionalChain([mimeType, 'optionalAccess', _4 => _4.mime]) || "unknown"}`
+        `Warning: Content may not be a valid audio file. Detected MIME: ${_optionalChain([mimeType, 'optionalAccess', _6 => _6.mime]) || "unknown"}`
       );
     }
     const base64Data = rawData.toString("base64");
     return {
       data: base64Data,
-      mimeType: _nullishCoalesce(_optionalChain([mimeType, 'optionalAccess', _5 => _5.mime]), () => ( "audio/mpeg")),
+      mimeType: _nullishCoalesce(_optionalChain([mimeType, 'optionalAccess', _7 => _7.mime]), () => ( "audio/mpeg")),
       type: "audio"
     };
   } catch (error) {
@@ -484,10 +551,10 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
           );
         }
       }
-      if (_optionalChain([this, 'access', _6 => _6.#rootsConfig, 'optionalAccess', _7 => _7.enabled]) !== false && _optionalChain([this, 'access', _8 => _8.#clientCapabilities, 'optionalAccess', _9 => _9.roots, 'optionalAccess', _10 => _10.listChanged]) && typeof this.#server.listRoots === "function") {
+      if (_optionalChain([this, 'access', _8 => _8.#rootsConfig, 'optionalAccess', _9 => _9.enabled]) !== false && _optionalChain([this, 'access', _10 => _10.#clientCapabilities, 'optionalAccess', _11 => _11.roots, 'optionalAccess', _12 => _12.listChanged]) && typeof this.#server.listRoots === "function") {
         try {
           const roots = await this.#server.listRoots();
-          this.#roots = _optionalChain([roots, 'optionalAccess', _11 => _11.roots]) || [];
+          this.#roots = _optionalChain([roots, 'optionalAccess', _13 => _13.roots]) || [];
         } catch (e) {
           if (e instanceof _typesjs.McpError && e.code === _typesjs.ErrorCode.MethodNotFound) {
             this.#logger.debug(
@@ -508,7 +575,7 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
           this.#pingInterval = setInterval(async () => {
             try {
               await this.#server.ping();
-            } catch (e2) {
+            } catch (e4) {
               const logLevel = pingConfig.logLevel;
               if (logLevel === "debug") {
                 this.#logger.debug("[FastMCP debug] server ping failed");
@@ -660,7 +727,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       },
       elicit: (params, options) => this.#server.elicitInput(params, options),
       log: this.#createLog(),
-      requestId: typeof _optionalChain([meta, 'optionalAccess', _12 => _12.requestId]) === "string" ? meta.requestId : void 0,
+      requestId: typeof _optionalChain([meta, 'optionalAccess', _14 => _14.requestId]) === "string" ? meta.requestId : void 0,
       session: this.#auth,
       sessionId: this.#sessionId
     };
@@ -706,8 +773,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     };
   }
   #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', _15 => _15.#utils, 'optionalAccess', _16 => _16.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
+      const path = _optionalChain([issue, 'access', _17 => _17.path, 'optionalAccess', _18 => _18.join, 'call', _19 => _19(".")]) || "root";
       return `${path}: ${issue.message}`;
     }).join(", ");
   }
@@ -919,7 +986,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         result = await prompt.load(
           args,
           this.#auth,
-          this.#createLoadContext(_optionalChain([request, 'access', _18 => _18.params, 'optionalAccess', _19 => _19._meta]))
+          this.#createLoadContext(_optionalChain([request, 'access', _20 => _20.params, 'optionalAccess', _21 => _21._meta]))
         );
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -984,7 +1051,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               const result = await resourceTemplate.load(
                 match,
                 this.#auth,
-                this.#createLoadContext(_optionalChain([request, 'access', _20 => _20.params, 'optionalAccess', _21 => _21._meta]))
+                this.#createLoadContext(_optionalChain([request, 'access', _22 => _22.params, 'optionalAccess', _23 => _23._meta]))
               );
               const resources = Array.isArray(result) ? result : [result];
               return {
@@ -1009,7 +1076,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           try {
             maybeArrayResult = await resource.load(
               this.#auth,
-              this.#createLoadContext(_optionalChain([request, 'access', _22 => _22.params, 'optionalAccess', _23 => _23._meta]))
+              this.#createLoadContext(_optionalChain([request, 'access', _24 => _24.params, 'optionalAccess', _25 => _25._meta]))
             );
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1072,7 +1139,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     );
   }
   setupRootsHandlers() {
-    if (_optionalChain([this, 'access', _24 => _24.#rootsConfig, 'optionalAccess', _25 => _25.enabled]) === false) {
+    if (_optionalChain([this, 'access', _26 => _26.#rootsConfig, 'optionalAccess', _27 => _27.enabled]) === false) {
       this.#logger.debug(
         "[FastMCP debug] roots capability explicitly disabled via config"
       );
@@ -1164,7 +1231,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         }
         args = parsed.value;
       }
-      const progressToken = _optionalChain([request, 'access', _26 => _26.params, 'optionalAccess', _27 => _27._meta, 'optionalAccess', _28 => _28.progressToken]);
+      const progressToken = _optionalChain([request, 'access', _28 => _28.params, 'optionalAccess', _29 => _29._meta, 'optionalAccess', _30 => _30.progressToken]);
       let result;
       try {
         const reportProgress = async (progress) => {
@@ -1223,7 +1290,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           elicit: (params, options) => this.#server.elicitInput(params, options),
           log,
           reportProgress,
-          requestId: typeof _optionalChain([request, 'access', _29 => _29.params, 'optionalAccess', _30 => _30._meta, 'optionalAccess', _31 => _31.requestId]) === "string" ? request.params._meta.requestId : void 0,
+          requestId: typeof _optionalChain([request, 'access', _31 => _31.params, 'optionalAccess', _32 => _32._meta, 'optionalAccess', _33 => _33.requestId]) === "string" ? request.params._meta.requestId : void 0,
           session: this.#auth,
           sessionId: this.#sessionId,
           streamContent
@@ -1333,14 +1400,14 @@ function normalizePath(path) {
   return path.startsWith("/") ? path : `/${path}`;
 }
 function parseBasicAuthHeader(authHeader) {
-  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _32 => _32.match, 'call', _33 => _33(/^Basic\s+(.+)$/)]);
+  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _34 => _34.match, 'call', _35 => _35(/^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 (e3) {
+  } catch (e5) {
     return null;
   }
 }
@@ -1767,7 +1834,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
           host: httpConfig.host,
-          ..._optionalChain([this, 'access', _34 => _34.#options, 'access', _35 => _35.oauth, 'optionalAccess', _36 => _36.enabled]) && _optionalChain([this, 'access', _37 => _37.#options, 'access', _38 => _38.oauth, 'access', _39 => _39.protectedResource, 'optionalAccess', _40 => _40.resource]) ? {
+          ..._optionalChain([this, 'access', _36 => _36.#options, 'access', _37 => _37.oauth, 'optionalAccess', _38 => _38.enabled]) && _optionalChain([this, 'access', _39 => _39.#options, 'access', _40 => _40.oauth, 'access', _41 => _41.protectedResource, 'optionalAccess', _42 => _42.resource]) ? {
             oauth: {
               protectedResource: {
                 resource: this.#options.oauth.protectedResource.resource
@@ -1814,7 +1881,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
           host: httpConfig.host,
-          ..._optionalChain([this, 'access', _41 => _41.#options, 'access', _42 => _42.oauth, 'optionalAccess', _43 => _43.enabled]) && _optionalChain([this, 'access', _44 => _44.#options, 'access', _45 => _45.oauth, 'access', _46 => _46.protectedResource, 'optionalAccess', _47 => _47.resource]) ? {
+          ..._optionalChain([this, 'access', _43 => _43.#options, 'access', _44 => _44.oauth, 'optionalAccess', _45 => _45.enabled]) && _optionalChain([this, 'access', _46 => _46.#options, 'access', _47 => _47.oauth, 'access', _48 => _48.protectedResource, 'optionalAccess', _49 => _49.resource]) ? {
             oauth: {
               protectedResource: {
                 resource: this.#options.oauth.protectedResource.resource
@@ -1916,7 +1983,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', _50 => _50.enabled]) ? _optionalChain([oauth, 'access', _51 => _51.protectedResource, 'optionalAccess', _52 => _52.resource]) : void 0;
     const wwwAuthenticateParts = [
       'error="invalid_token"',
       `error_description="${message.replace(/"/g, '\\"')}"`
@@ -2028,7 +2095,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', _53 => _53.enabled]) && req.method === "GET") {
       const url2 = new URL(req.url || "", `http://${host}`);
       const authorizationServerMetadataPath = joinPaths(
         "",
@@ -2062,8 +2129,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', _54 => _54.proxy]);
+    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _55 => _55.enabled])) {
       const url2 = new URL(req.url || "", `http://${host}`);
       const oauthPath = basePathRelativePath;
       try {
@@ -2080,7 +2147,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _54 => _54.toJSON, 'optionalCall', _55 => _55()]) || {
+                    _optionalChain([error, 'access', _56 => _56.toJSON, 'optionalCall', _57 => _57()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2107,7 +2174,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', _58 => _58.toJSON, 'optionalCall', _59 => _59()]) || {
                   error: "invalid_request"
                 }
               )
@@ -2129,7 +2196,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', _60 => _60.toJSON, 'optionalCall', _61 => _61()]) || {
                   error: "server_error"
                 }
               )
@@ -2164,7 +2231,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', _62 => _62.toJSON, 'optionalCall', _63 => _63()]) || {
                       error: "server_error"
                     }
                   )
@@ -2186,8 +2253,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', _64 => _64.clientId]) || params.get("client_id") || "";
+                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _65 => _65.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
                 let response;
                 if (grantType === "authorization_code") {
                   response = await oauthProxy.exchangeAuthorizationCode({
@@ -2217,7 +2284,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _64 => _64.toJSON, 'optionalCall', _65 => _65()]) || {
+                    _optionalChain([error, 'access', _66 => _66.toJSON, 'optionalCall', _67 => _67()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2288,23 +2355,23 @@ 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', _66 => _66.transportType]) || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
+    const transportType = _optionalChain([overrides, 'optionalAccess', _68 => _68.transportType]) || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
     if (transportType === "httpStream") {
       const port = parseInt(
-        _optionalChain([overrides, 'optionalAccess', _67 => _67.httpStream, 'optionalAccess', _68 => _68.port, 'optionalAccess', _69 => _69.toString, 'call', _70 => _70()]) || portArg || envPort || "8080"
+        _optionalChain([overrides, 'optionalAccess', _69 => _69.httpStream, 'optionalAccess', _70 => _70.port, 'optionalAccess', _71 => _71.toString, 'call', _72 => _72()]) || portArg || envPort || "8080"
       );
-      const host = _optionalChain([overrides, 'optionalAccess', _71 => _71.httpStream, 'optionalAccess', _72 => _72.host]) || hostArg || envHost || "localhost";
-      const endpoint = _optionalChain([overrides, 'optionalAccess', _73 => _73.httpStream, 'optionalAccess', _74 => _74.endpoint]) || endpointArg || envEndpoint || "/mcp";
+      const host = _optionalChain([overrides, 'optionalAccess', _73 => _73.httpStream, 'optionalAccess', _74 => _74.host]) || hostArg || envHost || "localhost";
+      const endpoint = _optionalChain([overrides, 'optionalAccess', _75 => _75.httpStream, 'optionalAccess', _76 => _76.endpoint]) || endpointArg || envEndpoint || "/mcp";
       const basePath = normalizeBasePath(
-        _optionalChain([overrides, 'optionalAccess', _75 => _75.httpStream, 'optionalAccess', _76 => _76.basePath]) || basePathArg || envBasePath
+        _optionalChain([overrides, 'optionalAccess', _77 => _77.httpStream, 'optionalAccess', _78 => _78.basePath]) || basePathArg || envBasePath
       );
-      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _77 => _77.httpStream, 'optionalAccess', _78 => _78.enableJsonResponse]) || false;
-      const stateless = _optionalChain([overrides, 'optionalAccess', _79 => _79.httpStream, 'optionalAccess', _80 => _80.stateless]) || statelessArg === "true" || envStateless === "true" || false;
-      const cors = _optionalChain([overrides, 'optionalAccess', _81 => _81.httpStream, 'optionalAccess', _82 => _82.cors]);
-      const eventStore = _optionalChain([overrides, 'optionalAccess', _83 => _83.httpStream, 'optionalAccess', _84 => _84.eventStore]);
-      const sslCa = _optionalChain([overrides, 'optionalAccess', _85 => _85.httpStream, 'optionalAccess', _86 => _86.sslCa]);
-      const sslCert = _optionalChain([overrides, 'optionalAccess', _87 => _87.httpStream, 'optionalAccess', _88 => _88.sslCert]);
-      const sslKey = _optionalChain([overrides, 'optionalAccess', _89 => _89.httpStream, 'optionalAccess', _90 => _90.sslKey]);
+      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _79 => _79.httpStream, 'optionalAccess', _80 => _80.enableJsonResponse]) || false;
+      const stateless = _optionalChain([overrides, 'optionalAccess', _81 => _81.httpStream, 'optionalAccess', _82 => _82.stateless]) || statelessArg === "true" || envStateless === "true" || false;
+      const cors = _optionalChain([overrides, 'optionalAccess', _83 => _83.httpStream, 'optionalAccess', _84 => _84.cors]);
+      const eventStore = _optionalChain([overrides, 'optionalAccess', _85 => _85.httpStream, 'optionalAccess', _86 => _86.eventStore]);
+      const sslCa = _optionalChain([overrides, 'optionalAccess', _87 => _87.httpStream, 'optionalAccess', _88 => _88.sslCa]);
+      const sslCert = _optionalChain([overrides, 'optionalAccess', _89 => _89.httpStream, 'optionalAccess', _90 => _90.sslCert]);
+      const sslKey = _optionalChain([overrides, 'optionalAccess', _91 => _91.httpStream, 'optionalAccess', _92 => _92.sslKey]);
       return {
         httpStream: {
           basePath,
@@ -2376,5 +2443,6 @@ var FastMCP = class extends FastMCPEventEmitter {
 
 
 
-exports.DiscoveryDocumentCache = DiscoveryDocumentCache; exports.imageContent = imageContent; exports.audioContent = audioContent; exports.UnexpectedStateError = UnexpectedStateError; exports.UserError = UserError; exports.ServerState = ServerState; exports.FastMCPSession = FastMCPSession; exports.FastMCP = FastMCP;
-//# sourceMappingURL=chunk-ENLYR3QM.cjs.map
+
+exports.DiscoveryDocumentCache = DiscoveryDocumentCache; exports.jsonSchemaAdapter = jsonSchemaAdapter; exports.imageContent = imageContent; exports.audioContent = audioContent; exports.UnexpectedStateError = UnexpectedStateError; exports.UserError = UserError; exports.ServerState = ServerState; exports.FastMCPSession = FastMCPSession; exports.FastMCP = FastMCP;
+//# sourceMappingURL=chunk-GF4ORBWZ.cjs.map