fastmcp 4.23.6 → 4.23.7

package/dist/{chunk-O22SYZMC.cjs → chunk-MPFPOZ2H.cjs}

@@ -1,4 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/strictInputSchema.ts
+var _zod2 = require('zod');
 function strictInputSchema(schema, nested = false) {
   const { additionalProperties, properties } = schema;
   const keepsAdditionalProperties = Object.keys(_nullishCoalesce(properties, () => ( {}))).length === 0 && (typeof additionalProperties === "object" || additionalProperties === true || nested && additionalProperties === void 0 && !properties);
@@ -15,8 +16,21 @@ function strictInputSchema(schema, nested = false) {
     }
   };
 }
+function zodInputSchema(schema, target) {
+  return _zod2.z.toJSONSchema(schema, {
+    io: "input",
+    override: ({ jsonSchema, zodSchema }) => {
+      const def = zodSchema._zod.def;
+      if (def.type === "object" && !def.catchall && jsonSchema.additionalProperties === void 0) {
+        jsonSchema.additionalProperties = false;
+      }
+    },
+    target
+  });
+}
+
 
 
 
-exports.strictInputSchema = strictInputSchema;
-//# sourceMappingURL=chunk-O22SYZMC.cjs.map
+exports.strictInputSchema = strictInputSchema; exports.zodInputSchema = zodInputSchema;
+//# sourceMappingURL=chunk-MPFPOZ2H.cjs.map

package/dist/chunk-MPFPOZ2H.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/home/runner/work/fastmcp/fastmcp/dist/chunk-MPFPOZ2H.cjs","../src/strictInputSchema.ts"],"names":[],"mappings":"AAAA;ACEA,2BAAkB;AAsBX,SAAS,iBAAA,CACd,MAAA,EACA,OAAA,EAAS,KAAA,EACG;AACZ,EAAA,MAAM,EAAE,oBAAA,EAAsB,WAAW,EAAA,EAAI,MAAA;AAC7C,EAAA,MAAM,0BAAA,EACJ,MAAA,CAAO,IAAA,kBAAK,UAAA,UAAc,CAAC,GAAC,CAAA,CAAE,OAAA,IAAW,EAAA,GAAA,CACxC,OAAO,qBAAA,IAAyB,SAAA,GAC/B,qBAAA,IAAyB,KAAA,GACxB,OAAA,GAAU,qBAAA,IAAyB,KAAA,EAAA,GAAa,CAAC,UAAA,CAAA;AAEtD,EAAA,OAAO;AAAA,IACL,GAAG,MAAA;AAAA,IACH,GAAI,0BAAA,EAA4B,CAAC,EAAA,EAAI,EAAE,oBAAA,EAAsB,MAAM,CAAA;AAAA,IACnE,GAAI,WAAA,GAAc;AAAA,MAChB,UAAA,EAAY,MAAA,CAAO,WAAA;AAAA,QACjB,MAAA,CAAO,OAAA,CAAQ,UAAU,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,GAAA,EAAK,KAAK,CAAA,EAAA,GAAM;AAAA,UAC/C,GAAA;AAAA,UACA,OAAO,MAAA,IAAU,SAAA,GAAY,KAAA,CAAM,KAAA,IAAS,SAAA,EACxC,iBAAA,CAAkB,KAAA,EAAO,IAAI,EAAA,EAC7B;AAAA,QACN,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF,CAAA;AACF;AAWO,SAAS,cAAA,CACd,MAAA,EACA,MAAA,EACY;AACZ,EAAA,OAAO,OAAA,CAAE,YAAA,CAAa,MAAA,EAAQ;AAAA,IAC5B,EAAA,EAAI,OAAA;AAAA,IACJ,QAAA,EAAU,CAAC,EAAE,UAAA,EAAY,UAAU,CAAA,EAAA,GAAM;AACvC,MAAA,MAAM,IAAA,EAAM,SAAA,CAAU,IAAA,CAAK,GAAA;AAC3B,MAAA,GAAA,CACE,GAAA,CAAI,KAAA,IAAS,SAAA,GACb,CAAC,GAAA,CAAI,SAAA,GACL,UAAA,CAAW,qBAAA,IAAyB,KAAA,CAAA,EACpC;AACA,QAAA,UAAA,CAAW,qBAAA,EAAuB,KAAA;AAAA,MACpC;AAAA,IACF,CAAA;AAAA,IACA;AAAA,EACF,CAAC,CAAA;AACH;ADhDA;AACA;AACE;AACA;AACF,uFAAC","file":"/home/runner/work/fastmcp/fastmcp/dist/chunk-MPFPOZ2H.cjs","sourcesContent":[null,"import type { JsonSchema } from \"xsschema\";\n\nimport { z } from \"zod\";\n\n/**\n * Closes tool input objects to undeclared keys, like xsschema's\n * `strictJsonSchema`, except for objects made only of additional properties.\n * Closing one of those advertises an object that accepts nothing but `{}`,\n * while the tool's own validation still takes any key, so it keeps whatever\n * `additionalProperties` it declared — or none:\n *\n * - a dictionary, whose `additionalProperties` is a schema (`z.record()`, an\n *   OpenAPI map), keeps its value schema;\n * - a free-form object, which declares `additionalProperties: true`, or, as an\n *   argument, is a bare `{ type: \"object\" }` (OpenAPI's usual spelling), stays\n *   open.\n *\n * An object that declares an empty `properties`, or a bare one at the top of\n * the input, is still closed: that is how a schema says \"no keys\" —\n * `z.object({})`, or a tool without arguments.\n *\n * Shared by both runtimes, so a tool's advertised input schema does not depend\n * on whether it is served by `FastMCP` or `EdgeFastMCP`.\n */\nexport function strictInputSchema(\n  schema: JsonSchema,\n  nested = false,\n): JsonSchema {\n  const { additionalProperties, properties } = schema;\n  const keepsAdditionalProperties =\n    Object.keys(properties ?? {}).length === 0 &&\n    (typeof additionalProperties === \"object\" ||\n      additionalProperties === true ||\n      (nested && additionalProperties === undefined && !properties));\n\n  return {\n    ...schema,\n    ...(keepsAdditionalProperties ? {} : { additionalProperties: false }),\n    ...(properties && {\n      properties: Object.fromEntries(\n        Object.entries(properties).map(([key, value]) => [\n          key,\n          typeof value === \"object\" && value.type === \"object\"\n            ? strictInputSchema(value, true)\n            : value,\n        ]),\n      ),\n    }),\n  };\n}\n\n/**\n * Converts Zod 4 tool parameters by what a call may send (`io: \"input\"`), so a\n * transformed field advertises the type it parses and a defaulted one is\n * optional. Input-side conversion leaves a plain `z.object()` open, since it\n * strips undeclared keys rather than rejecting them; this closes it, as\n * output-side conversion did, at any depth — including inside arrays, unions\n * and record values, which `strictInputSchema` does not reach. Explicit\n * catchalls (`z.looseObject()`, `.catchall()`) keep what they declare.\n */\nexport function zodInputSchema(\n  schema: z.ZodType,\n  target?: \"draft-7\",\n): JsonSchema {\n  return z.toJSONSchema(schema, {\n    io: \"input\",\n    override: ({ jsonSchema, zodSchema }) => {\n      const def = zodSchema._zod.def;\n      if (\n        def.type === \"object\" &&\n        !def.catchall &&\n        jsonSchema.additionalProperties === undefined\n      ) {\n        jsonSchema.additionalProperties = false;\n      }\n    },\n    target,\n  }) as JsonSchema;\n}\n"]}

package/dist/{chunk-2PXF6JQB.cjs → chunk-TBMRFQ6M.cjs}

@@ -3,7 +3,8 @@
 var _chunkC7TBI7A5cjs = require('./chunk-C7TBI7A5.cjs');
 
 
-var _chunkO22SYZMCcjs = require('./chunk-O22SYZMC.cjs');
+
+var _chunkMPFPOZ2Hcjs = require('./chunk-MPFPOZ2H.cjs');
 
 // src/FastMCP.ts
 var _indexjs = require('@modelcontextprotocol/sdk/server/index.js');
@@ -542,6 +543,8 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
   #capabilities = {};
   #clientCapabilities;
   #connectionState = "connecting";
+  // Caller-supplied transports leave the response mode unspecified.
+  #enableJsonResponse;
   #logger;
   /**
    * The minimum level the client asked for with `logging/setLevel`, or
@@ -590,6 +593,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
   constructor({
     auth,
     authRequired = false,
+    enableJsonResponse,
     hasTools,
     icons,
     instructions,
@@ -614,6 +618,7 @@ var FastMCPSession = class extends FastMCPSessionEventEmitter {
     super();
     this.#auth = auth;
     this.#authRequired = authRequired;
+    this.#enableJsonResponse = enableJsonResponse;
     this.#logger = logger;
     this.#onToolCall = onToolCall;
     this.#pingConfig = ping;
@@ -875,6 +880,19 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     }
     return false;
   }
+  /**
+   * When `start()` streams responses, an elicitation goes out on its request's
+   * own SSE stream, as the SDK's `extra.sendRequest` does, so it reaches a
+   * client that never opened the optional standalone GET stream. A JSON
+   * response cannot carry it, and a transport passed to `connect()` does not
+   * say which mode it uses, so those keep the session's standalone stream.
+   */
+  #createElicit(requestId) {
+    return (params, options) => this.#server.elicitInput(
+      params,
+      this.#enableJsonResponse === false ? { ...options, relatedRequestId: requestId } : options
+    );
+  }
   /**
    * Builds the context object passed as the third argument to
    * `resource.load` / `resourceTemplate.load` / `prompt.load`.
@@ -885,12 +903,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 _optionalChain([meta, 'optionalAccess', _21 => _21.requestId]) === "string" ? meta.requestId : void 0,
       session: this.#auth,
@@ -1328,7 +1346,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
             this.#auth,
             this.#createLoadContext(
               _optionalChain([request, 'access', _39 => _39.params, 'optionalAccess', _40 => _40._meta]),
-              extra.sendNotification
+              extra.sendNotification,
+              extra.requestId
             )
           );
         } catch (error) {
@@ -1397,7 +1416,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
                 this.#auth,
                 this.#createLoadContext(
                   _optionalChain([request, 'access', _41 => _41.params, 'optionalAccess', _42 => _42._meta]),
-                  extra.sendNotification
+                  extra.sendNotification,
+                  extra.requestId
                 )
               );
               const resources = Array.isArray(result) ? result : [result];
@@ -1426,7 +1446,8 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               this.#auth,
               this.#createLoadContext(
                 _optionalChain([request, 'access', _43 => _43.params, 'optionalAccess', _44 => _44._meta]),
-                extra.sendNotification
+                extra.sendNotification,
+                extra.requestId
               )
             );
           } catch (error) {
@@ -1541,7 +1562,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
           return {
             annotations: tool.annotations,
             description: tool.description,
-            inputSchema: tool.parameters ? _chunkO22SYZMCcjs.strictInputSchema.call(void 0, await _xsschema.toJsonSchema.call(void 0, tool.parameters)) : {
+            inputSchema: tool.parameters ? _chunkMPFPOZ2Hcjs.strictInputSchema.call(void 0, 
+              tool.parameters["~standard"].vendor === "zod" && "_zod" in tool.parameters ? _chunkMPFPOZ2Hcjs.zodInputSchema.call(void 0, tool.parameters, "draft-7") : await _xsschema.toJsonSchema.call(void 0, tool.parameters)
+            ) : {
               additionalProperties: false,
               properties: {},
               type: "object"
@@ -1650,7 +1673,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               client: {
                 version: this.#server.getClientVersion()
               },
-              elicit: (params, options) => this.#server.elicitInput(params, options),
+              elicit: this.#createElicit(extra.requestId),
               log,
               reportProgress,
               requestId: typeof _optionalChain([request, 'access', _50 => _50.params, 'optionalAccess', _51 => _51._meta, 'optionalAccess', _52 => _52.requestId]) === "string" ? request.params._meta.requestId : void 0,
@@ -2330,7 +2353,12 @@ var FastMCP = class extends FastMCPEventEmitter {
               auth = this.#requireAuthenticated(await authenticate(request));
             }
             const sessionId = Array.isArray(request.headers["mcp-session-id"]) ? request.headers["mcp-session-id"][0] : request.headers["mcp-session-id"];
-            return this.#createSession(auth, sessionId, true);
+            return this.#createSession(
+              auth,
+              sessionId,
+              true,
+              httpConfig.enableJsonResponse
+            );
           },
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
@@ -2372,7 +2400,12 @@ var FastMCP = class extends FastMCPEventEmitter {
               auth = this.#requireAuthenticated(await authenticate(request));
             }
             const sessionId = Array.isArray(request.headers["mcp-session-id"]) ? request.headers["mcp-session-id"][0] : request.headers["mcp-session-id"];
-            return this.#createSession(auth, sessionId);
+            return this.#createSession(
+              auth,
+              sessionId,
+              false,
+              httpConfig.enableJsonResponse
+            );
           },
           enableJsonResponse: httpConfig.enableJsonResponse,
           eventStore: httpConfig.eventStore,
@@ -2461,7 +2494,7 @@ var FastMCP = class extends FastMCPEventEmitter {
    * Creates a new FastMCPSession instance with the current configuration.
    * Used both for regular sessions and stateless requests.
    */
-  #createSession(auth, sessionId, stateless = false) {
+  #createSession(auth, sessionId, stateless = false, enableJsonResponse) {
     if (auth && typeof auth === "object" && "authenticated" in auth && !auth.authenticated) {
       const errorMessage = "error" in auth && typeof auth.error === "string" ? auth.error : "Authentication failed";
       throw this.#createUnauthorizedResponse(errorMessage);
@@ -2470,6 +2503,7 @@ var FastMCP = class extends FastMCPEventEmitter {
     return new FastMCPSession({
       auth,
       authRequired,
+      enableJsonResponse,
       hasTools: this.#tools.length > 0,
       icons: this.#options.icons,
       instructions: this.#options.instructions,
@@ -3213,4 +3247,4 @@ var FastMCP = class extends FastMCPEventEmitter {
 
 
 exports.DiscoveryDocumentCache = DiscoveryDocumentCache; exports.jsonSchemaAdapter = jsonSchemaAdapter; exports.MEDIA_FETCH_TIMEOUT_MS = MEDIA_FETCH_TIMEOUT_MS; exports.imageContent = imageContent; exports.audioContent = audioContent; exports.FastMCPError = FastMCPError; exports.SessionError = SessionError; exports.UnexpectedStateError = UnexpectedStateError; exports.UserError = UserError; exports.ServerState = ServerState; exports.FastMCPSession = FastMCPSession; exports.FastMCP = FastMCP;
-//# sourceMappingURL=chunk-2PXF6JQB.cjs.map
+//# sourceMappingURL=chunk-TBMRFQ6M.cjs.map