fastmcp 3.7.0 → 3.8.1

package/dist/FastMCP.d.ts

@@ -1,4 +1,5 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { EventStore } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import { ResourceLink, Root, ClientCapabilities, GetPromptResult, CreateMessageRequestSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -116,44 +117,44 @@ type Completion = {
     total?: number;
     values: string[];
 };
-type ArgumentValueCompleter = (value: string) => Promise<Completion>;
-type InputPrompt<Arguments extends InputPromptArgument[] = InputPromptArgument[], Args = PromptArgumentsToObject<Arguments>> = {
-    arguments?: InputPromptArgument[];
+type ArgumentValueCompleter<T extends FastMCPSessionAuth = FastMCPSessionAuth> = (value: string, auth?: T) => Promise<Completion>;
+type InputPrompt<T extends FastMCPSessionAuth = FastMCPSessionAuth, Arguments extends InputPromptArgument<T>[] = InputPromptArgument<T>[], Args = PromptArgumentsToObject<Arguments>> = {
+    arguments?: InputPromptArgument<T>[];
     description?: string;
-    load: (args: Args) => Promise<PromptResult>;
+    load: (args: Args, auth?: T) => Promise<PromptResult>;
     name: string;
 };
-type InputPromptArgument = Readonly<{
-    complete?: ArgumentValueCompleter;
+type InputPromptArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
+    complete?: ArgumentValueCompleter<T>;
     description?: string;
     enum?: string[];
     name: string;
     required?: boolean;
 }>;
-type InputResourceTemplate<Arguments extends ResourceTemplateArgument[] = ResourceTemplateArgument[]> = {
+type InputResourceTemplate<T extends FastMCPSessionAuth, Arguments extends InputResourceTemplateArgument<T>[] = InputResourceTemplateArgument<T>[]> = {
     arguments: Arguments;
     description?: string;
-    load: (args: ResourceTemplateArgumentsToObject<Arguments>) => Promise<ResourceResult | ResourceResult[]>;
+    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uriTemplate: string;
 };
-type InputResourceTemplateArgument = Readonly<{
-    complete?: ArgumentValueCompleter;
+type InputResourceTemplateArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
+    complete?: ArgumentValueCompleter<T>;
     description?: string;
     name: string;
     required?: boolean;
 }>;
 type LoggingLevel = "alert" | "critical" | "debug" | "emergency" | "error" | "info" | "notice" | "warning";
-type Prompt<Arguments extends PromptArgument[] = PromptArgument[], Args = PromptArgumentsToObject<Arguments>> = {
-    arguments?: PromptArgument[];
-    complete?: (name: string, value: string) => Promise<Completion>;
+type Prompt<T extends FastMCPSessionAuth = FastMCPSessionAuth, Arguments extends PromptArgument<T>[] = PromptArgument<T>[], Args = PromptArgumentsToObject<Arguments>> = {
+    arguments?: PromptArgument<T>[];
+    complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: Args) => Promise<PromptResult>;
+    load: (args: Args, auth?: T) => Promise<PromptResult>;
     name: string;
 };
-type PromptArgument = Readonly<{
-    complete?: ArgumentValueCompleter;
+type PromptArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
+    complete?: ArgumentValueCompleter<T>;
     description?: string;
     enum?: string[];
     name: string;
@@ -168,10 +169,10 @@ type PromptArgumentsToObject<T extends {
     }>["required"] extends true ? string : string | undefined;
 };
 type PromptResult = Pick<GetPromptResult, "messages"> | string;
-type Resource = {
-    complete?: (name: string, value: string) => Promise<Completion>;
+type Resource<T extends FastMCPSessionAuth> = {
+    complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: () => Promise<ResourceResult | ResourceResult[]>;
+    load: (auth?: T) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uri: string;
@@ -185,17 +186,17 @@ type ResourceResult = {
     text: string;
     uri?: string;
 };
-type ResourceTemplate<Arguments extends ResourceTemplateArgument[] = ResourceTemplateArgument[]> = {
+type ResourceTemplate<T extends FastMCPSessionAuth, Arguments extends ResourceTemplateArgument<T>[] = ResourceTemplateArgument<T>[]> = {
     arguments: Arguments;
-    complete?: (name: string, value: string) => Promise<Completion>;
+    complete?: (name: string, value: string, auth?: T) => Promise<Completion>;
     description?: string;
-    load: (args: ResourceTemplateArgumentsToObject<Arguments>) => Promise<ResourceResult | ResourceResult[]>;
+    load: (args: ResourceTemplateArgumentsToObject<Arguments>, auth?: T) => Promise<ResourceResult | ResourceResult[]>;
     mimeType?: string;
     name: string;
     uriTemplate: string;
 };
-type ResourceTemplateArgument = Readonly<{
-    complete?: ArgumentValueCompleter;
+type ResourceTemplateArgument<T extends FastMCPSessionAuth = FastMCPSessionAuth> = Readonly<{
+    complete?: ArgumentValueCompleter<T>;
     description?: string;
     name: string;
     required?: boolean;
@@ -388,6 +389,7 @@ type ToolAnnotations = {
 declare const FastMCPSessionEventEmitterBase: {
     new (): StrictEventEmitter<EventEmitter, FastMCPSessionEvents>;
 };
+type Authenticate<T> = (request: http.IncomingMessage) => Promise<T>;
 type FastMCPSessionAuth = Record<string, unknown> | undefined;
 declare class FastMCPSessionEventEmitter extends FastMCPSessionEventEmitterBase {
 }
@@ -403,9 +405,9 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
         instructions?: string;
         name: string;
         ping?: ServerOptions<T>["ping"];
-        prompts: Prompt[];
-        resources: Resource[];
-        resourcesTemplates: InputResourceTemplate[];
+        prompts: Prompt<T>[];
+        resources: Resource<T>[];
+        resourcesTemplates: InputResourceTemplate<T>[];
         roots?: ServerOptions<T>["roots"];
         tools: Tool<T>[];
         transportType?: "httpStream" | "stdio";
@@ -430,10 +432,9 @@ declare class FastMCPSession<T extends FastMCPSessionAuth = FastMCPSessionAuth>
 declare const FastMCPEventEmitterBase: {
     new (): StrictEventEmitter<EventEmitter, FastMCPEvents<FastMCPSessionAuth>>;
 };
-type Authenticate<T> = (request: http.IncomingMessage) => Promise<T>;
 declare class FastMCPEventEmitter extends FastMCPEventEmitterBase {
 }
-declare class FastMCP<T extends Record<string, unknown> | undefined = undefined> extends FastMCPEventEmitter {
+declare class FastMCP<T extends FastMCPSessionAuth = FastMCPSessionAuth> extends FastMCPEventEmitter {
     #private;
     options: ServerOptions<T>;
     get sessions(): FastMCPSession<T>[];
@@ -441,15 +442,15 @@ declare class FastMCP<T extends Record<string, unknown> | undefined = undefined>
     /**
      * Adds a prompt to the server.
      */
-    addPrompt<const Args extends InputPromptArgument[]>(prompt: InputPrompt<Args>): void;
+    addPrompt<const Args extends InputPromptArgument<T>[]>(prompt: InputPrompt<T, Args>): void;
     /**
      * Adds a resource to the server.
      */
-    addResource(resource: Resource): void;
+    addResource(resource: Resource<T>): void;
     /**
      * Adds a resource template to the server.
      */
-    addResourceTemplate<const Args extends InputResourceTemplateArgument[]>(resource: InputResourceTemplate<Args>): void;
+    addResourceTemplate<const Args extends InputResourceTemplateArgument[]>(resource: InputResourceTemplate<T, Args>): void;
     /**
      * Adds a tool to the server.
      */
@@ -467,6 +468,7 @@ declare class FastMCP<T extends Record<string, unknown> | undefined = undefined>
     start(options?: Partial<{
         httpStream: {
             endpoint?: `/${string}`;
+            eventStore?: EventStore;
             port: number;
         };
         transportType: "httpStream" | "stdio";

package/dist/FastMCP.js

@@ -456,9 +456,9 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
     }
     const prompt = {
       ...inputPrompt,
-      complete: async (name, value) => {
+      complete: async (name, value, auth) => {
         if (completers[name]) {
-          return await completers[name](value);
+          return await completers[name](value, auth);
         }
         if (fuseInstances[name]) {
           const result = fuseInstances[name].search(value);
@@ -486,9 +486,9 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
     }
     const resourceTemplate = {
       ...inputResourceTemplate,
-      complete: async (name, value) => {
+      complete: async (name, value, auth) => {
         if (completers[name]) {
-          return await completers[name](value);
+          return await completers[name](value, auth);
         }
         return {
           values: []
@@ -516,7 +516,8 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
         const completion = CompletionZodSchema.parse(
           await prompt.complete(
             request.params.argument.name,
-            request.params.argument.value
+            request.params.argument.value,
+            this.#auth
           )
         );
         return {
@@ -546,7 +547,8 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
         const completion = CompletionZodSchema.parse(
           await resource.complete(
             request.params.argument.name,
-            request.params.argument.value
+            request.params.argument.value,
+            this.#auth
           )
         );
         return {
@@ -603,7 +605,10 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
       }
       let result;
       try {
-        result = await prompt.load(args);
+        result = await prompt.load(
+          args,
+          this.#auth
+        );
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         throw new McpError(
@@ -657,7 +662,7 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
                 continue;
               }
               const uri = uriTemplate.fill(match);
-              const result = await resourceTemplate.load(match);
+              const result = await resourceTemplate.load(match, this.#auth);
               const resources2 = Array.isArray(result) ? result : [result];
               return {
                 contents: resources2.map((resource2) => ({
@@ -679,7 +684,7 @@ ${e instanceof Error ? e.stack : JSON.stringify(e)}`
           }
           let maybeArrayResult;
           try {
-            maybeArrayResult = await resource.load();
+            maybeArrayResult = await resource.load(this.#auth);
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             throw new McpError(
@@ -1096,6 +1101,7 @@ var FastMCP = class extends FastMCPEventEmitter {
             version: this.#options.version
           });
         },
+        eventStore: httpConfig.eventStore,
         onClose: async (session) => {
           this.emit("disconnect", {
             session