fastmcp 4.4.0 → 4.5.0

package/README.md

@@ -1329,6 +1329,23 @@ async load() {
 }
 ```
 
+`load` also receives `auth` (the value returned by your `authenticate` function, if any) and a `context` object as its second and third arguments. `context` mirrors the `client`, `log`, `session`, and `sessionId` fields available to `tool.execute` (see [Session ID and Request ID Tracking](#session-id-and-request-id-tracking)); `reportProgress` and `streamContent` are not included since they are tied to a tool call's progress token:
+
+```ts
+server.addResource({
+  uri: "file:///logs/app.log",
+  name: "Application Logs",
+  mimeType: "text/plain",
+  async load(auth, context) {
+    context.log.info("loading application logs", { requestedBy: auth?.userId });
+
+    return {
+      text: await readLogFile(),
+    };
+  },
+});
+```
+
 ### Resource templates
 
 You can also define resource templates:
@@ -1353,6 +1370,8 @@ server.addResourceTemplate({
 });
 ```
 
+Like plain resources, `load` also receives `auth` and `context` as its second and third arguments (see [Resources](#resources)).
+
 #### Resource template argument auto-completion
 
 Provide `complete` functions for resource template arguments to enable automatic completion:
@@ -1517,6 +1536,27 @@ server.addPrompt({
 });
 ```
 
+Like resources, `load` also receives `auth` and `context` as its second and third arguments (see [Resources](#resources)):
+
+```ts
+server.addPrompt({
+  name: "git-commit",
+  description: "Generate a Git commit message",
+  arguments: [
+    {
+      name: "changes",
+      description: "Git diff or description of changes",
+      required: true,
+    },
+  ],
+  load: async (args, auth, context) => {
+    context.log.debug("generating git commit prompt", { user: auth?.userId });
+
+    return `Generate a concise but descriptive commit message for these changes:\n\n${args.changes}`;
+  },
+});
+```
+
 #### Prompt argument auto-completion
 
 Prompts can provide auto-completion for their arguments:

package/dist/FastMCP.cjs

@@ -7,7 +7,7 @@
 
 
 
-var _chunk3YTRRGCEcjs = require('./chunk-3YTRRGCE.cjs');
+var _chunkBJF2JTTEcjs = require('./chunk-BJF2JTTE.cjs');
 
 
 
@@ -41,5 +41,5 @@ var _chunkIX3HKAX4cjs = require('./chunk-IX3HKAX4.cjs');
 
 
 
-exports.AuthProvider = _chunkIX3HKAX4cjs.AuthProvider; exports.AzureProvider = _chunkIX3HKAX4cjs.AzureProvider; exports.DiscoveryDocumentCache = _chunk3YTRRGCEcjs.DiscoveryDocumentCache; exports.FastMCP = _chunk3YTRRGCEcjs.FastMCP; exports.FastMCPSession = _chunk3YTRRGCEcjs.FastMCPSession; exports.GitHubProvider = _chunkIX3HKAX4cjs.GitHubProvider; exports.GoogleProvider = _chunkIX3HKAX4cjs.GoogleProvider; exports.OAuthProvider = _chunkIX3HKAX4cjs.OAuthProvider; exports.ServerState = _chunk3YTRRGCEcjs.ServerState; exports.UnexpectedStateError = _chunk3YTRRGCEcjs.UnexpectedStateError; exports.UserError = _chunk3YTRRGCEcjs.UserError; exports.audioContent = _chunk3YTRRGCEcjs.audioContent; exports.getAuthSession = _chunkIX3HKAX4cjs.getAuthSession; exports.imageContent = _chunk3YTRRGCEcjs.imageContent; exports.requireAll = _chunkIX3HKAX4cjs.requireAll; exports.requireAny = _chunkIX3HKAX4cjs.requireAny; exports.requireAuth = _chunkIX3HKAX4cjs.requireAuth; exports.requireRole = _chunkIX3HKAX4cjs.requireRole; exports.requireScopes = _chunkIX3HKAX4cjs.requireScopes;
+exports.AuthProvider = _chunkIX3HKAX4cjs.AuthProvider; exports.AzureProvider = _chunkIX3HKAX4cjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkBJF2JTTEcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkBJF2JTTEcjs.FastMCP; exports.FastMCPSession = _chunkBJF2JTTEcjs.FastMCPSession; exports.GitHubProvider = _chunkIX3HKAX4cjs.GitHubProvider; exports.GoogleProvider = _chunkIX3HKAX4cjs.GoogleProvider; exports.OAuthProvider = _chunkIX3HKAX4cjs.OAuthProvider; exports.ServerState = _chunkBJF2JTTEcjs.ServerState; exports.UnexpectedStateError = _chunkBJF2JTTEcjs.UnexpectedStateError; exports.UserError = _chunkBJF2JTTEcjs.UserError; exports.audioContent = _chunkBJF2JTTEcjs.audioContent; exports.getAuthSession = _chunkIX3HKAX4cjs.getAuthSession; exports.imageContent = _chunkBJF2JTTEcjs.imageContent; exports.requireAll = _chunkIX3HKAX4cjs.requireAll; exports.requireAny = _chunkIX3HKAX4cjs.requireAny; exports.requireAuth = _chunkIX3HKAX4cjs.requireAuth; exports.requireRole = _chunkIX3HKAX4cjs.requireRole; exports.requireScopes = _chunkIX3HKAX4cjs.requireScopes;
 //# sourceMappingURL=FastMCP.cjs.map

package/dist/FastMCP.d.cts

@@ -117,6 +117,14 @@ type Context<T extends FastMCPSessionAuth> = {
 type Extra = unknown;
 type Extras = Record<string, Extra>;
 type Literal = boolean | null | number | string | undefined;
+/**
+ * Context passed to `load` for resources, resource templates, and prompts.
+ *
+ * This is a subset of the tool execution {@link Context}. `reportProgress`
+ * and `streamContent` are tied to a tool call's progress token / streaming
+ * notification and are not available outside of `tool.execute`.
+ */
+type LoadContext<T extends FastMCPSessionAuth> = Omit<Context<T>, "reportProgress" | "streamContent">;
 type Progress = {
     /**
      * The progress thus far. This should increase every time progress is made, even if the total is unknown.
@@ -182,7 +190,7 @@ type InputPrompt<T extends FastMCPSessionAuth = FastMCPSessionAuth, Arguments ex
     arguments?: InputPromptArgument<T>[];
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: Args, auth?: T) => Promise<PromptResult>;
+    load: (args: Args, auth?: T, context?: LoadContext<T>) => Promise<PromptResult>;
     name: string;
 };
 type InputPromptArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
@@ -196,7 +204,7 @@ type InputResourceTemplate<T extends FastMCPSessionAuth, Arguments extends Input
     arguments: Arguments;
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T) => Promise<ResourceResult | ResourceResult[]>;
+    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T, context?: LoadContext<T>) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uriTemplate: string;
@@ -212,7 +220,7 @@ type Prompt<T extends FastMCPSessionAuth = FastMCPSessionAuth, Arguments extends
     arguments?: PromptArgument<T>[];
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: Args, auth?: T) => Promise<PromptResult>;
+    load: (args: Args, auth?: T, context?: LoadContext<T>) => Promise<PromptResult>;
     name: string;
 };
 type PromptArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
@@ -234,7 +242,7 @@ type PromptResult = Pick<GetPromptResult, "messages"> | string;
 type Resource<T extends FastMCPSessionAuth> = {
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (auth?: T) => Promise<ResourceResult | ResourceResult[]>;
+    load: (auth?: T, context?: LoadContext<T>) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uri: string;
@@ -252,7 +260,7 @@ type ResourceTemplate<T extends FastMCPSessionAuth, Arguments extends ResourceTe
     arguments: Arguments;
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T) => Promise<ResourceResult | ResourceResult[]>;
+    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T, context?: LoadContext<T>) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uriTemplate: string;
@@ -881,4 +889,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 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 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 };

package/dist/FastMCP.d.ts

@@ -117,6 +117,14 @@ type Context<T extends FastMCPSessionAuth> = {
 type Extra = unknown;
 type Extras = Record<string, Extra>;
 type Literal = boolean | null | number | string | undefined;
+/**
+ * Context passed to `load` for resources, resource templates, and prompts.
+ *
+ * This is a subset of the tool execution {@link Context}. `reportProgress`
+ * and `streamContent` are tied to a tool call's progress token / streaming
+ * notification and are not available outside of `tool.execute`.
+ */
+type LoadContext<T extends FastMCPSessionAuth> = Omit<Context<T>, "reportProgress" | "streamContent">;
 type Progress = {
     /**
      * The progress thus far. This should increase every time progress is made, even if the total is unknown.
@@ -182,7 +190,7 @@ type InputPrompt<T extends FastMCPSessionAuth = FastMCPSessionAuth, Arguments ex
     arguments?: InputPromptArgument<T>[];
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: Args, auth?: T) => Promise<PromptResult>;
+    load: (args: Args, auth?: T, context?: LoadContext<T>) => Promise<PromptResult>;
     name: string;
 };
 type InputPromptArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
@@ -196,7 +204,7 @@ type InputResourceTemplate<T extends FastMCPSessionAuth, Arguments extends Input
     arguments: Arguments;
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T) => Promise<ResourceResult | ResourceResult[]>;
+    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T, context?: LoadContext<T>) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uriTemplate: string;
@@ -212,7 +220,7 @@ type Prompt<T extends FastMCPSessionAuth = FastMCPSessionAuth, Arguments extends
     arguments?: PromptArgument<T>[];
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: Args, auth?: T) => Promise<PromptResult>;
+    load: (args: Args, auth?: T, context?: LoadContext<T>) => Promise<PromptResult>;
     name: string;
 };
 type PromptArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
@@ -234,7 +242,7 @@ type PromptResult = Pick<GetPromptResult, "messages"> | string;
 type Resource<T extends FastMCPSessionAuth> = {
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (auth?: T) => Promise<ResourceResult | ResourceResult[]>;
+    load: (auth?: T, context?: LoadContext<T>) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uri: string;
@@ -252,7 +260,7 @@ type ResourceTemplate<T extends FastMCPSessionAuth, Arguments extends ResourceTe
     arguments: Arguments;
     complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T) => Promise<ResourceResult | ResourceResult[]>;
+    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T, context?: LoadContext<T>) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uriTemplate: string;
@@ -881,4 +889,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 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 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 };

package/dist/FastMCP.js

@@ -7,7 +7,7 @@ import {
   UserError,
   audioContent,
   imageContent
-} from "./chunk-MDIESGNI.js";
+} from "./chunk-BTMLQWIR.js";
 import {
   AuthProvider,
   AzureProvider,

package/dist/{chunk-3YTRRGCE.cjs → chunk-BJF2JTTE.cjs}

@@ -599,9 +599,70 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       });
     });
   }
+  /**
+   * Builds the context object passed as the third argument to
+   * `resource.load` / `resourceTemplate.load` / `prompt.load`.
+   *
+   * This mirrors the `client`, `log`, `requestId`, `session`, and
+   * `sessionId` fields available to `tool.execute` via {@link Context}.
+   * `reportProgress` and `streamContent` are intentionally omitted: they
+   * are tied to a tool call's progress token / streaming notification,
+   * which resource and prompt reads do not have.
+   */
+  #createLoadContext(meta) {
+    return {
+      client: {
+        version: this.#server.getClientVersion()
+      },
+      log: this.#createLog(),
+      requestId: typeof _optionalChain([meta, 'optionalAccess', _12 => _12.requestId]) === "string" ? meta.requestId : void 0,
+      session: this.#auth,
+      sessionId: this.#sessionId
+    };
+  }
+  #createLog() {
+    return {
+      debug: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "debug"
+        });
+      },
+      error: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "error"
+        });
+      },
+      info: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "info"
+        });
+      },
+      warn: (message, context) => {
+        this.#server.sendLoggingMessage({
+          data: {
+            context,
+            message
+          },
+          level: "warning"
+        });
+      }
+    };
+  }
   #formatSchemaIssues(issues) {
-    return _optionalChain([this, 'access', _12 => _12.#utils, 'optionalAccess', _13 => _13.formatInvalidParamsErrorMessage]) ? this.#utils.formatInvalidParamsErrorMessage(issues) : issues.map((issue) => {
-      const path = _optionalChain([issue, 'access', _14 => _14.path, 'optionalAccess', _15 => _15.join, 'call', _16 => _16(".")]) || "root";
+    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 `${path}: ${issue.message}`;
     }).join(", ");
   }
@@ -812,7 +873,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
       try {
         result = await prompt.load(
           args,
-          this.#auth
+          this.#auth,
+          this.#createLoadContext(_optionalChain([request, 'access', _18 => _18.params, 'optionalAccess', _19 => _19._meta]))
         );
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -874,7 +936,11 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
                 continue;
               }
               const uri = uriTemplate.fill(match);
-              const result = await resourceTemplate.load(match, this.#auth);
+              const result = await resourceTemplate.load(
+                match,
+                this.#auth,
+                this.#createLoadContext(_optionalChain([request, 'access', _20 => _20.params, 'optionalAccess', _21 => _21._meta]))
+              );
               const resources = Array.isArray(result) ? result : [result];
               return {
                 contents: resources.map((resource2) => ({
@@ -896,7 +962,10 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           }
           let maybeArrayResult;
           try {
-            maybeArrayResult = await resource.load(this.#auth);
+            maybeArrayResult = await resource.load(
+              this.#auth,
+              this.#createLoadContext(_optionalChain([request, 'access', _22 => _22.params, 'optionalAccess', _23 => _23._meta]))
+            );
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             throw new (0, _typesjs.McpError)(
@@ -948,7 +1017,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     );
   }
   setupRootsHandlers() {
-    if (_optionalChain([this, 'access', _17 => _17.#rootsConfig, 'optionalAccess', _18 => _18.enabled]) === false) {
+    if (_optionalChain([this, 'access', _24 => _24.#rootsConfig, 'optionalAccess', _25 => _25.enabled]) === false) {
       this.#logger.debug(
         "[FastMCP debug] roots capability explicitly disabled via config"
       );
@@ -1040,7 +1109,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
         }
         args = parsed.value;
       }
-      const progressToken = _optionalChain([request, 'access', _19 => _19.params, 'optionalAccess', _20 => _20._meta, 'optionalAccess', _21 => _21.progressToken]);
+      const progressToken = _optionalChain([request, 'access', _26 => _26.params, 'optionalAccess', _27 => _27._meta, 'optionalAccess', _28 => _28.progressToken]);
       let result;
       try {
         const reportProgress = async (progress) => {
@@ -1065,44 +1134,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             );
           }
         };
-        const log = {
-          debug: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "debug"
-            });
-          },
-          error: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "error"
-            });
-          },
-          info: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "info"
-            });
-          },
-          warn: (message, context) => {
-            this.#server.sendLoggingMessage({
-              data: {
-                context,
-                message
-              },
-              level: "warning"
-            });
-          }
-        };
+        const log = this.#createLog();
         const streamContent = async (content) => {
           const contentArray = Array.isArray(content) ? content : [content];
           try {
@@ -1135,7 +1167,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           },
           log,
           reportProgress,
-          requestId: typeof _optionalChain([request, 'access', _22 => _22.params, 'optionalAccess', _23 => _23._meta, 'optionalAccess', _24 => _24.requestId]) === "string" ? request.params._meta.requestId : void 0,
+          requestId: typeof _optionalChain([request, 'access', _29 => _29.params, 'optionalAccess', _30 => _30._meta, 'optionalAccess', _31 => _31.requestId]) === "string" ? request.params._meta.requestId : void 0,
           session: this.#auth,
           sessionId: this.#sessionId,
           streamContent
@@ -1245,7 +1277,7 @@ function normalizePath(path) {
   return path.startsWith("/") ? path : `/${path}`;
 }
 function parseBasicAuthHeader(authHeader) {
-  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _25 => _25.match, 'call', _26 => _26(/^Basic\s+(.+)$/)]);
+  const basicMatch = _optionalChain([authHeader, 'optionalAccess', _32 => _32.match, 'call', _33 => _33(/^Basic\s+(.+)$/)]);
   if (!basicMatch) return null;
   try {
     const credentials = Buffer.from(basicMatch[1], "base64").toString("utf-8");
@@ -1647,7 +1679,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
           host: httpConfig.host,
-          ..._optionalChain([this, 'access', _27 => _27.#options, 'access', _28 => _28.oauth, 'optionalAccess', _29 => _29.enabled]) && _optionalChain([this, 'access', _30 => _30.#options, 'access', _31 => _31.oauth, 'access', _32 => _32.protectedResource, 'optionalAccess', _33 => _33.resource]) ? {
+          ..._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]) ? {
             oauth: {
               protectedResource: {
                 resource: this.#options.oauth.protectedResource.resource
@@ -1694,7 +1726,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', _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]) ? {
             oauth: {
               protectedResource: {
                 resource: this.#options.oauth.protectedResource.resource
@@ -1867,7 +1899,7 @@ var FastMCP = class extends FastMCPEventEmitter {
       }
     }
     const oauthConfig = this.#options.oauth;
-    if (_optionalChain([oauthConfig, 'optionalAccess', _41 => _41.enabled]) && req.method === "GET") {
+    if (_optionalChain([oauthConfig, 'optionalAccess', _48 => _48.enabled]) && req.method === "GET") {
       const url2 = new URL(req.url || "", `http://${host}`);
       const authorizationServerMetadataPath = joinPaths(
         "",
@@ -1901,8 +1933,8 @@ var FastMCP = class extends FastMCPEventEmitter {
         }
       }
     }
-    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _42 => _42.proxy]);
-    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _43 => _43.enabled])) {
+    const oauthProxy = _optionalChain([oauthConfig, 'optionalAccess', _49 => _49.proxy]);
+    if (oauthProxy && _optionalChain([oauthConfig, 'optionalAccess', _50 => _50.enabled])) {
       const url2 = new URL(req.url || "", `http://${host}`);
       const oauthPath = basePathRelativePath;
       try {
@@ -1919,7 +1951,7 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const statusCode = error.statusCode || 400;
                 res.writeHead(statusCode, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _44 => _44.toJSON, 'optionalCall', _45 => _45()]) || {
+                    _optionalChain([error, 'access', _51 => _51.toJSON, 'optionalCall', _52 => _52()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -1946,7 +1978,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _46 => _46.toJSON, 'optionalCall', _47 => _47()]) || {
+                _optionalChain([error, 'access', _53 => _53.toJSON, 'optionalCall', _54 => _54()]) || {
                   error: "invalid_request"
                 }
               )
@@ -1968,7 +2000,7 @@ var FastMCP = class extends FastMCPEventEmitter {
           } catch (error) {
             res.writeHead(400, { "Content-Type": "application/json" }).end(
               JSON.stringify(
-                _optionalChain([error, 'access', _48 => _48.toJSON, 'optionalCall', _49 => _49()]) || {
+                _optionalChain([error, 'access', _55 => _55.toJSON, 'optionalCall', _56 => _56()]) || {
                   error: "server_error"
                 }
               )
@@ -2003,7 +2035,7 @@ var FastMCP = class extends FastMCPEventEmitter {
               } catch (error) {
                 res.writeHead(400, { "Content-Type": "application/json" }).end(
                   JSON.stringify(
-                    _optionalChain([error, 'access', _50 => _50.toJSON, 'optionalCall', _51 => _51()]) || {
+                    _optionalChain([error, 'access', _57 => _57.toJSON, 'optionalCall', _58 => _58()]) || {
                       error: "server_error"
                     }
                   )
@@ -2025,8 +2057,8 @@ var FastMCP = class extends FastMCPEventEmitter {
                 const basicAuth = parseBasicAuthHeader(
                   req.headers.authorization
                 );
-                const clientId = _optionalChain([basicAuth, 'optionalAccess', _52 => _52.clientId]) || params.get("client_id") || "";
-                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _53 => _53.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
+                const clientId = _optionalChain([basicAuth, 'optionalAccess', _59 => _59.clientId]) || params.get("client_id") || "";
+                const clientSecret = _nullishCoalesce(_nullishCoalesce(_optionalChain([basicAuth, 'optionalAccess', _60 => _60.clientSecret]), () => ( params.get("client_secret"))), () => ( void 0));
                 let response;
                 if (grantType === "authorization_code") {
                   response = await oauthProxy.exchangeAuthorizationCode({
@@ -2056,7 +2088,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', _61 => _61.toJSON, 'optionalCall', _62 => _62()]) || {
                       error: "invalid_request"
                     }
                   )
@@ -2127,23 +2159,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', _56 => _56.transportType]) || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
+    const transportType = _optionalChain([overrides, 'optionalAccess', _63 => _63.transportType]) || (transportArg === "http-stream" ? "httpStream" : transportArg) || envTransport || "stdio";
     if (transportType === "httpStream") {
       const port = parseInt(
-        _optionalChain([overrides, 'optionalAccess', _57 => _57.httpStream, 'optionalAccess', _58 => _58.port, 'optionalAccess', _59 => _59.toString, 'call', _60 => _60()]) || portArg || envPort || "8080"
+        _optionalChain([overrides, 'optionalAccess', _64 => _64.httpStream, 'optionalAccess', _65 => _65.port, 'optionalAccess', _66 => _66.toString, 'call', _67 => _67()]) || portArg || envPort || "8080"
       );
-      const host = _optionalChain([overrides, 'optionalAccess', _61 => _61.httpStream, 'optionalAccess', _62 => _62.host]) || hostArg || envHost || "localhost";
-      const endpoint = _optionalChain([overrides, 'optionalAccess', _63 => _63.httpStream, 'optionalAccess', _64 => _64.endpoint]) || endpointArg || envEndpoint || "/mcp";
+      const host = _optionalChain([overrides, 'optionalAccess', _68 => _68.httpStream, 'optionalAccess', _69 => _69.host]) || hostArg || envHost || "localhost";
+      const endpoint = _optionalChain([overrides, 'optionalAccess', _70 => _70.httpStream, 'optionalAccess', _71 => _71.endpoint]) || endpointArg || envEndpoint || "/mcp";
       const basePath = normalizeBasePath(
-        _optionalChain([overrides, 'optionalAccess', _65 => _65.httpStream, 'optionalAccess', _66 => _66.basePath]) || basePathArg || envBasePath
+        _optionalChain([overrides, 'optionalAccess', _72 => _72.httpStream, 'optionalAccess', _73 => _73.basePath]) || basePathArg || envBasePath
       );
-      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _67 => _67.httpStream, 'optionalAccess', _68 => _68.enableJsonResponse]) || false;
-      const stateless = _optionalChain([overrides, 'optionalAccess', _69 => _69.httpStream, 'optionalAccess', _70 => _70.stateless]) || statelessArg === "true" || envStateless === "true" || false;
-      const cors = _optionalChain([overrides, 'optionalAccess', _71 => _71.httpStream, 'optionalAccess', _72 => _72.cors]);
-      const eventStore = _optionalChain([overrides, 'optionalAccess', _73 => _73.httpStream, 'optionalAccess', _74 => _74.eventStore]);
-      const sslCa = _optionalChain([overrides, 'optionalAccess', _75 => _75.httpStream, 'optionalAccess', _76 => _76.sslCa]);
-      const sslCert = _optionalChain([overrides, 'optionalAccess', _77 => _77.httpStream, 'optionalAccess', _78 => _78.sslCert]);
-      const sslKey = _optionalChain([overrides, 'optionalAccess', _79 => _79.httpStream, 'optionalAccess', _80 => _80.sslKey]);
+      const enableJsonResponse = _optionalChain([overrides, 'optionalAccess', _74 => _74.httpStream, 'optionalAccess', _75 => _75.enableJsonResponse]) || false;
+      const stateless = _optionalChain([overrides, 'optionalAccess', _76 => _76.httpStream, 'optionalAccess', _77 => _77.stateless]) || statelessArg === "true" || envStateless === "true" || false;
+      const cors = _optionalChain([overrides, 'optionalAccess', _78 => _78.httpStream, 'optionalAccess', _79 => _79.cors]);
+      const eventStore = _optionalChain([overrides, 'optionalAccess', _80 => _80.httpStream, 'optionalAccess', _81 => _81.eventStore]);
+      const sslCa = _optionalChain([overrides, 'optionalAccess', _82 => _82.httpStream, 'optionalAccess', _83 => _83.sslCa]);
+      const sslCert = _optionalChain([overrides, 'optionalAccess', _84 => _84.httpStream, 'optionalAccess', _85 => _85.sslCert]);
+      const sslKey = _optionalChain([overrides, 'optionalAccess', _86 => _86.httpStream, 'optionalAccess', _87 => _87.sslKey]);
       return {
         httpStream: {
           basePath,
@@ -2216,4 +2248,4 @@ 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-3YTRRGCE.cjs.map
+//# sourceMappingURL=chunk-BJF2JTTE.cjs.map