fastmcp 4.23.9 → 4.23.11

package/dist/{chunk-75ZLE5AS.js → chunk-XUUJOVC7.js}

@@ -985,7 +985,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
     };
   }
   /**
-   * Fetches the client's roots if it advertised `roots.listChanged`.
+   * Fetches the client's roots if it advertised the `roots` capability.
    *
    * Over Streamable HTTP a server-initiated request travels on the client's
    * standalone GET stream, which the client opens only after initialization,
@@ -993,7 +993,7 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
    * is bounded and retried, and the result is announced with `rootsChanged`.
    */
   async #loadRoots(streamableHttp) {
-    if (this.#rootsConfig?.enabled === false || !this.#clientCapabilities?.roots?.listChanged || typeof this.#server.listRoots !== "function") {
+    if (this.#rootsConfig?.enabled === false || !this.#clientCapabilities?.roots || typeof this.#server.listRoots !== "function") {
       return;
     }
     const maxAttempts = streamableHttp ? 5 : 1;
@@ -1451,7 +1451,6 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               if (!match) {
                 continue;
               }
-              const uri = uriTemplate.fill(match);
               const result = await resourceTemplate.load(
                 match,
                 this.#auth,
@@ -1468,7 +1467,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
                   description: resourceTemplate.description,
                   mimeType: resource2.mimeType ?? resourceTemplate.mimeType,
                   name: resourceTemplate.name,
-                  uri: resource2.uri ?? uri
+                  // The URI asked for. Refilling the template from `match` can
+                  // spell it differently: `{path}` refills `a,b` as `a%2Cb`.
+                  uri: resource2.uri ?? request.params.uri
                 }))
               };
             }
@@ -1879,6 +1880,19 @@ function matchUriTemplate(template, uri) {
   if (!match) {
     return void 0;
   }
+  const scalarNames = new Set(template.varNames);
+  for (const [expression] of template.template.matchAll(/\{[^}]*\}/g)) {
+    if (/^\{[?&]/.test(expression) || expression.includes("*")) {
+      for (const name of parseURITemplate(expression).varNames) {
+        scalarNames.delete(name);
+      }
+    }
+  }
+  for (const [name, value] of Object.entries(match)) {
+    if (scalarNames.has(name) && Array.isArray(value)) {
+      match[name] = value.join(",");
+    }
+  }
   const checksQuery = !/\{[?&]/.test(template.template);
   const checksFragment = !template.template.includes("{#");
   const shape = (value) => [
@@ -3341,4 +3355,4 @@ export {
   FastMCPSession,
   FastMCP
 };
-//# sourceMappingURL=chunk-75ZLE5AS.js.map
+//# sourceMappingURL=chunk-XUUJOVC7.js.map