fastmcp 4.23.6 → 4.23.8

package/dist/{chunk-5QKBH7JC.js → chunk-PLUAEIWE.js}

@@ -1,9 +1,11 @@
 import {
   cancelResponseBody
-} from "./chunk-CA2EPNZF.js";
+} from "./chunk-UY253ACS.js";
 import {
-  strictInputSchema
-} from "./chunk-UMDUIBFW.js";
+  objectRootSchema,
+  strictInputSchema,
+  zodInputSchema
+} from "./chunk-F76U45MT.js";
 
 // src/FastMCP.ts
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -185,9 +187,11 @@ function jsonSchemaAdapter(schema) {
   };
 }
 async function compileSchema(schema) {
+  const dialect = schema.$schema?.replace(/^http:\/\//, "https://").replace(/#$/, "");
+  const isDraft2020 = dialect === "https://json-schema.org/draft/2020-12/schema";
   let ajvModule;
   try {
-    ajvModule = await import("ajv");
+    ajvModule = isDraft2020 ? await import("ajv/dist/2020.js") : await import("ajv");
   } catch {
     throw new Error(
       'The "ajv" package is required to validate JSON Schema tool parameters. Install it with: npm install ajv'
@@ -203,7 +207,7 @@ async function compileSchema(schema) {
     addFormats(ajv);
   } catch {
   }
-  return ajv.compile(schema);
+  return ajv.compile(isDraft2020 ? { ...schema, $schema: dialect } : schema);
 }
 function toIssue(error) {
   const path = error.instancePath.split("/").slice(1).map((segment) => segment.replaceAll("~1", "/").replaceAll("~0", "~")).map((segment) => {
@@ -542,6 +546,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
@@ -590,6 +596,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
   constructor({
     auth,
     authRequired = false,
+    enableJsonResponse,
     hasTools,
     icons,
     instructions,
@@ -614,6 +621,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;
@@ -875,6 +883,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`.
@@ -885,12 +906,12 @@ ${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, sendNotification) {
+  #createLoadContext(meta, sendNotification, requestId) {
     return {
       client: {
         version: this.#server.getClientVersion()
       },
-      elicit: (params, options) => this.#server.elicitInput(params, options),
+      elicit: this.#createElicit(requestId),
       log: this.#createLog(sendNotification),
       requestId: typeof meta?.requestId === "string" ? meta.requestId : void 0,
       session: this.#auth,
@@ -1328,7 +1349,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             this.#auth,
             this.#createLoadContext(
               request.params?._meta,
-              extra.sendNotification
+              extra.sendNotification,
+              extra.requestId
             )
           );
         } catch (error) {
@@ -1397,7 +1419,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
                 this.#auth,
                 this.#createLoadContext(
                   request.params?._meta,
-                  extra.sendNotification
+                  extra.sendNotification,
+                  extra.requestId
                 )
               );
               const resources = Array.isArray(result) ? result : [result];
@@ -1426,7 +1449,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               this.#auth,
               this.#createLoadContext(
                 request.params?._meta,
-                extra.sendNotification
+                extra.sendNotification,
+                extra.requestId
               )
             );
           } catch (error) {
@@ -1541,15 +1565,17 @@ ${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"
             },
             name: tool.name,
             ...tool.outputSchema && {
-              outputSchema: await toJsonSchema(
-                tool.outputSchema
+              outputSchema: objectRootSchema(
+                await toJsonSchema(tool.outputSchema)
               )
             },
             // Pass through _meta for MCP ext-apps UI support (issue #229)
@@ -1650,7 +1676,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,
@@ -1722,10 +1748,22 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           }
         } catch (error) {
           if (error instanceof UserError) {
+            let structuredContent = error.extras;
+            if (structuredContent && tool.outputSchema) {
+              try {
+                structuredContent = await this.#validateStructuredContent(
+                  tool,
+                  structuredContent,
+                  request.params.name
+                );
+              } catch {
+                structuredContent = void 0;
+              }
+            }
             return {
               content: [{ text: error.message, type: "text" }],
               isError: true,
-              ...error.extras ? { structuredContent: error.extras } : {}
+              ...structuredContent ? { structuredContent } : {}
             };
           }
           const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1941,7 +1979,9 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Adds a resource to the server.
    */
   addResource(resource) {
-    this.#resources = this.#resources.filter((r) => r.name !== resource.name);
+    this.#resources = this.#resources.filter(
+      (r) => r.name !== resource.name && r.uri !== resource.uri
+    );
     this.#resources.push(resource);
     if (this.#serverState === "running" /* Running */) {
       this.#resourcesListChanged(this.#resources);
@@ -1951,13 +1991,12 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Adds resources to the server.
    */
   addResources(resources) {
-    const newResourceNames = new Set(
-      resources.map((resource) => resource.name)
-    );
-    this.#resources = this.#resources.filter(
-      (r) => !newResourceNames.has(r.name)
-    );
-    this.#resources.push(...resources);
+    for (const resource of resources) {
+      this.#resources = this.#resources.filter(
+        (r) => r.name !== resource.name && r.uri !== resource.uri
+      );
+      this.#resources.push(resource);
+    }
     if (this.#serverState === "running" /* Running */) {
       this.#resourcesListChanged(this.#resources);
     }
@@ -2005,9 +2044,12 @@ var FastMCP = class extends FastMCPEventEmitter {
    */
   addTools(tools) {
     tools.forEach(assertToolSchemas);
-    const newToolNames = new Set(tools.map((tool) => tool.name));
-    this.#tools = this.#tools.filter((t) => !newToolNames.has(t.name));
-    this.#tools.push(...tools);
+    const toolsByName = new Map(this.#tools.map((tool) => [tool.name, tool]));
+    for (const tool of tools) {
+      toolsByName.delete(tool.name);
+      toolsByName.set(tool.name, tool);
+    }
+    this.#tools = Array.from(toolsByName.values());
     if (this.#serverState === "running" /* Running */) {
       this.#toolsListChanged(this.#tools);
     }
@@ -2309,6 +2351,9 @@ var FastMCP = class extends FastMCPEventEmitter {
         this.#serverState = "running" /* Running */;
       }
     } else if (config.transportType === "httpStream") {
+      if (this.#httpStreamServer) {
+        throw new Error("HTTP server is already running");
+      }
       const httpConfig = config.httpStream;
       const protocol = httpConfig.sslCert || httpConfig.sslKey ? "https" : "http";
       const streamEndpoint = joinPaths(
@@ -2330,7 +2375,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,
@@ -2372,7 +2422,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,
@@ -2428,6 +2483,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     );
     if (this.#httpStreamServer) {
       await this.#httpStreamServer.close();
+      this.#httpStreamServer = null;
     }
     this.#serverState = "stopped" /* Stopped */;
   }
@@ -2461,7 +2517,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);
@@ -2470,6 +2526,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,
@@ -3213,4 +3270,4 @@ export {
   FastMCPSession,
   FastMCP
 };
-//# sourceMappingURL=chunk-5QKBH7JC.js.map
+//# sourceMappingURL=chunk-PLUAEIWE.js.map