@mcp-z/client 1.2.0 → 1.3.0

package/dist/cjs/dcr/dcr-authenticator.js

@@ -17,8 +17,62 @@ var _keyv = /*#__PURE__*/ _interop_require_default(require("keyv"));
 var _keyvfile = require("keyv-file");
 var _discoveryfetchts = require("../auth/discovery-fetch.js");
 var _interactiveoauthflowts = require("../auth/interactive-oauth-flow.js");
+var _urlutilsts = require("../lib/url-utils.js");
 var _loggerts = require("../utils/logger.js");
 var _dynamicclientregistrarts = require("./dynamic-client-registrar.js");
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _assert_this_initialized(self) {
+    if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return self;
+}
+function _async_iterator(iterable) {
+    var method, async, sync, retry = 2;
+    for("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;){
+        if (async && null != (method = iterable[async])) return method.call(iterable);
+        if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable));
+        async = "@@asyncIterator", sync = "@@iterator";
+    }
+    throw new TypeError("Object is not async iterable");
+}
+function AsyncFromSyncIterator(s) {
+    function AsyncFromSyncIteratorContinuation(r) {
+        if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object."));
+        var done = r.done;
+        return Promise.resolve(r.value).then(function(value) {
+            return {
+                value: value,
+                done: done
+            };
+        });
+    }
+    return AsyncFromSyncIterator = function(s) {
+        this.s = s, this.n = s.next;
+    }, AsyncFromSyncIterator.prototype = {
+        s: null,
+        n: null,
+        next: function() {
+            return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments));
+        },
+        return: function(value) {
+            var ret = this.s.return;
+            return void 0 === ret ? Promise.resolve({
+                value: value,
+                done: !0
+            }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments));
+        },
+        throw: function(value) {
+            var thr = this.s.return;
+            return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments));
+        }
+    }, new AsyncFromSyncIterator(s);
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -45,9 +99,59 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
+function _construct(Parent, args, Class) {
+    if (_is_native_reflect_construct()) _construct = Reflect.construct;
+    else {
+        _construct = function construct(Parent, args, Class) {
+            var a = [
+                null
+            ];
+            a.push.apply(a, args);
+            var Constructor = Function.bind.apply(Parent, a);
+            var instance = new Constructor();
+            if (Class) _set_prototype_of(instance, Class.prototype);
+            return instance;
+        };
+    }
+    return _construct.apply(null, arguments);
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else obj[key] = value;
+    return obj;
+}
+function _get_prototype_of(o) {
+    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
+        return o.__proto__ || Object.getPrototypeOf(o);
+    };
+    return _get_prototype_of(o);
+}
+function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+        throw new TypeError("Super expression must either be null or a function");
+    }
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+        constructor: {
+            value: subClass,
+            writable: true,
+            configurable: true
+        }
+    });
+    if (superClass) _set_prototype_of(subClass, superClass);
+}
 function _instanceof(left, right) {
     "@swc/helpers - instanceof";
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
@@ -89,6 +193,96 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache) cache.set(obj, newObj);
     return newObj;
 }
+function _is_native_function(fn) {
+    return Function.toString.call(fn).indexOf("[native code]") !== -1;
+}
+function _is_native_reflect_construct() {
+    try {
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _possible_constructor_return(self, call) {
+    if (call && (_type_of(call) === "object" || typeof call === "function")) return call;
+    return _assert_this_initialized(self);
+}
+function _set_prototype_of(o, p) {
+    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
+        o.__proto__ = p;
+        return o;
+    };
+    return _set_prototype_of(o, p);
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
         label: 0,
@@ -188,9 +382,68 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+function _wrap_native_super(Class) {
+    var _cache = typeof Map === "function" ? new Map() : undefined;
+    _wrap_native_super = function(Class) {
+        if (Class === null || !_is_native_function(Class)) return Class;
+        if (typeof Class !== "function") throw new TypeError("Super expression must either be null or a function");
+        if (typeof _cache !== "undefined") {
+            if (_cache.has(Class)) return _cache.get(Class);
+            _cache.set(Class, Wrapper);
+        }
+        function Wrapper() {
+            return _construct(Class, arguments, _get_prototype_of(this).constructor);
+        }
+        Wrapper.prototype = Object.create(Class.prototype, {
+            constructor: {
+                value: Wrapper,
+                enumerable: false,
+                writable: true,
+                configurable: true
+            }
+        });
+        return _set_prototype_of(Wrapper, Class);
+    };
+    return _wrap_native_super(Class);
+}
 /**
  * Buffer time before token expiry to trigger proactive refresh (5 minutes)
  */ var REFRESH_BUFFER_MS = 5 * 60 * 1000;
+/** Raised when a credential cannot be bound to, or looked up by, an issuer. */ var CredentialBindingError = /*#__PURE__*/ function(Error1) {
+    "use strict";
+    _inherits(CredentialBindingError, Error1);
+    function CredentialBindingError(message) {
+        _class_call_check(this, CredentialBindingError);
+        var _this;
+        _this = _call_super(this, CredentialBindingError, [
+            message
+        ]);
+        _this.name = 'CredentialBindingError';
+        return _this;
+    }
+    return CredentialBindingError;
+}(_wrap_native_super(Error));
+/**
+ * The issuer credentials are keyed by, so they can never be presented to a
+ * different authorization server even when the resource keeps its URL (SEP-2352).
+ */ function requireIssuer(capabilities) {
+    if (!capabilities.issuer) {
+        throw new CredentialBindingError('Authorization server metadata has no issuer - credentials cannot be bound to an authorization server (RFC 8414 requires issuer)');
+    }
+    return capabilities.issuer;
+}
 var DcrAuthenticator = /*#__PURE__*/ function() {
     "use strict";
     function DcrAuthenticator(options) {
@@ -221,17 +474,17 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
     /**
    * Detect if server is self-hosted DCR (vs external OAuth provider)
    * Self-hosted servers have their own OAuth endpoints and manage token storage
-   */ _proto.detectSelfHostedMode = function detectSelfHostedMode(baseUrl) {
+   */ _proto.detectSelfHostedMode = function detectSelfHostedMode(mcpServerUrl) {
         return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 try {
                     // Self-hosted DCR servers typically run their own OAuth server
                     // Check if this is a self-hosted instance by testing OAuth metadata
-                    // For now, assume self-hosted if baseUrl matches common localhost patterns
+                    // For now, assume self-hosted if the URL matches common localhost patterns
                     // TODO: Implement proper self-hosted detection logic
                     return [
                         2,
-                        baseUrl.includes('localhost') || baseUrl.includes('127.0.0.1')
+                        mcpServerUrl.includes('localhost') || mcpServerUrl.includes('127.0.0.1')
                     ];
                 } catch (_error) {
                     return [
@@ -249,7 +502,9 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
    * Ensure server is authenticated, performing DCR and OAuth if needed
    * Proactively refreshes tokens if they're within 5 minutes of expiry
    *
-   * @param baseUrl - Base URL of the server (e.g., https://example.com)
+   * @param mcpServerUrl - The MCP server's canonical URL, exactly as configured,
+   *   with its path intact (`https://example.com/mcp`). Not a deployment root:
+   *   the path is what identifies the resource an issued token is bound to.
    * @param capabilities - Auth capabilities from .well-known endpoint
    * @returns Valid token set ready to use
    *
@@ -258,10 +513,10 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
    * @example
    * const authenticator = new DcrAuthenticator({ redirectUri: 'http://localhost:3000/callback' });
    * const tokens = await authenticator.ensureAuthenticated(
-   *   'https://example.com',
+   *   'https://example.com/mcp',
    *   capabilities
    * );
-   */ _proto.ensureAuthenticated = function ensureAuthenticated(baseUrl, capabilities) {
+   */ _proto.ensureAuthenticated = function ensureAuthenticated(mcpServerUrl, capabilities) {
         return _async_to_generator(function() {
             var isSelfHosted;
             return _ts_generator(this, function(_state) {
@@ -269,40 +524,68 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                     case 0:
                         return [
                             4,
-                            this.detectSelfHostedMode(baseUrl)
+                            this.detectSelfHostedMode(mcpServerUrl)
                         ];
                     case 1:
                         isSelfHosted = _state.sent();
                         if (isSelfHosted) {
                             return [
                                 2,
-                                this.ensureAuthenticatedSelfHosted(baseUrl, capabilities)
+                                this.ensureAuthenticatedSelfHosted(mcpServerUrl, capabilities)
                             ];
                         }
                         return [
                             2,
-                            this.ensureAuthenticatedExternal(baseUrl, capabilities)
+                            this.ensureAuthenticatedExternal(mcpServerUrl, capabilities)
                         ];
                 }
             });
         }).call(this);
     };
     /**
+   * The three things a server URL is used for here, kept apart on purpose.
+   *
+   * They were one value once, and collapsing them is what sent an authorization
+   * server the wrong audience: `resource` was derived from the deployment root,
+   * so a server at `https://host/mcp` was asked to mint a token for
+   * `https://host`, and any server that validates the indicator answered
+   * `invalid_target`.
+   *
+   * - `serverBaseUrl` builds the server's own endpoints (`/oauth/verify`), so a
+   *   trailing `/mcp` comes off.
+   * - `resource` is the RFC 8707 audience. The resource server names itself in
+   *   its RFC 9728 metadata; that name wins. Only when no such document exists
+   *   do we fall back to the URL we were configured with.
+   * - `storeKey` identifies the credential locally. It stays the configured URL
+   *   rather than the discovered `resource`, so it can be computed without a
+   *   network round trip - `deleteTokens` has only the URL to work from.
+   */ _proto.resolveUrls = function resolveUrls(mcpServerUrl, capabilities) {
+        var _capabilities_resource;
+        var storeKey = (0, _urlutilsts.normalizeUrl)(mcpServerUrl);
+        return {
+            serverBaseUrl: (0, _urlutilsts.extractBaseUrl)(mcpServerUrl),
+            resource: (_capabilities_resource = capabilities.resource) !== null && _capabilities_resource !== void 0 ? _capabilities_resource : storeKey,
+            storeKey: storeKey
+        };
+    };
+    /**
    * Handle authentication for self-hosted DCR servers
    * Self-hosted servers manage their own token storage via /oauth/verify
-   */ _proto.ensureAuthenticatedSelfHosted = function ensureAuthenticatedSelfHosted(baseUrl, capabilities) {
+   */ _proto.ensureAuthenticatedSelfHosted = function ensureAuthenticatedSelfHosted(mcpServerUrl, capabilities) {
         return _async_to_generator(function() {
-            var allowLoopback, dcrTokenKey, tokens, verifyUrl, verifyResponse, verifyData, _error, port, client, flowOptions, verifyUrl1, verifyResponse1, verifyData1, error;
+            var allowLoopback, issuer, _this_resolveUrls, serverBaseUrl, resource, storeKey, dcrTokenKey, tokens, verifyUrl, verifyResponse, verifyData, _error, port, client, flowOptions, verifyUrl1, verifyResponse1, verifyData1, error;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         // Loopback trust for every discovery-derived fetch below, computed from
                         // the server we're talking to, never from capabilities' endpoints (see discovery-fetch.ts).
-                        allowLoopback = (0, _discoveryfetchts.isLoopbackUrl)(baseUrl);
-                        dcrTokenKey = "dcr-tokens:".concat(baseUrl);
+                        allowLoopback = (0, _discoveryfetchts.isLoopbackUrl)(mcpServerUrl);
+                        issuer = requireIssuer(capabilities);
+                        _this_resolveUrls = this.resolveUrls(mcpServerUrl, capabilities), serverBaseUrl = _this_resolveUrls.serverBaseUrl, resource = _this_resolveUrls.resource, storeKey = _this_resolveUrls.storeKey;
+                        dcrTokenKey = "dcr-tokens:".concat(issuer, ":").concat(storeKey);
                         return [
                             4,
-                            this.tokenStore.get(dcrTokenKey)
+                            this.loadTokens(dcrTokenKey, issuer)
                         ];
                     case 1:
                         tokens = _state.sent();
@@ -318,7 +601,7 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                             ,
                             7
                         ]);
-                        verifyUrl = "".concat(baseUrl, "/oauth/verify");
+                        verifyUrl = "".concat(serverBaseUrl, "/oauth/verify");
                         return [
                             4,
                             fetch(verifyUrl, {
@@ -389,17 +672,7 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                     case 10:
                         client = _state.sent();
                         // Perform OAuth authorization flow with PKCE (RFC 7636)
-                        flowOptions = {
-                            port: port,
-                            headless: this.headless,
-                            redirectUri: this.redirectUri,
-                            pkce: true,
-                            logger: this.logger,
-                            allowLoopback: allowLoopback
-                        };
-                        if (capabilities.scopes) {
-                            flowOptions.scopes = capabilities.scopes;
-                        }
+                        flowOptions = this.buildFlowOptions(port, capabilities, issuer, resource, allowLoopback);
                         return [
                             4,
                             this.oauthFlow.performAuthFlow(capabilities.authorizationEndpoint, capabilities.tokenEndpoint, client.clientId, client.clientSecret, flowOptions)
@@ -414,7 +687,7 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                             ,
                             16
                         ]);
-                        verifyUrl1 = "".concat(baseUrl, "/oauth/verify");
+                        verifyUrl1 = "".concat(serverBaseUrl, "/oauth/verify");
                         return [
                             4,
                             fetch(verifyUrl1, {
@@ -451,7 +724,9 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                         // Save tokens for future use
                         return [
                             4,
-                            this.tokenStore.set(dcrTokenKey, tokens)
+                            this.tokenStore.set(dcrTokenKey, _object_spread_props(_object_spread({}, tokens), {
+                                issuer: issuer
+                            }))
                         ];
                     case 17:
                         _state.sent();
@@ -464,18 +739,20 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
             });
         }).call(this);
     };
-    /** Handles authentication for external (non-self-hosted) OAuth providers. */ _proto.ensureAuthenticatedExternal = function ensureAuthenticatedExternal(baseUrl, capabilities) {
+    /** Handles authentication for external (non-self-hosted) OAuth providers. */ _proto.ensureAuthenticatedExternal = function ensureAuthenticatedExternal(mcpServerUrl, capabilities) {
         return _async_to_generator(function() {
-            var allowLoopback, tokenKey, tokens, _error, port, client, flowOptions;
+            var allowLoopback, issuer, _this_resolveUrls, resource, storeKey, tokenKey, tokens, _error, port, client, flowOptions;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         // See ensureAuthenticatedSelfHosted - same loopback trust rule.
-                        allowLoopback = (0, _discoveryfetchts.isLoopbackUrl)(baseUrl);
-                        tokenKey = "tokens:".concat(baseUrl);
+                        allowLoopback = (0, _discoveryfetchts.isLoopbackUrl)(mcpServerUrl);
+                        issuer = requireIssuer(capabilities);
+                        _this_resolveUrls = this.resolveUrls(mcpServerUrl, capabilities), resource = _this_resolveUrls.resource, storeKey = _this_resolveUrls.storeKey;
+                        tokenKey = "tokens:".concat(issuer, ":").concat(storeKey);
                         return [
                             4,
-                            this.tokenStore.get(tokenKey)
+                            this.loadTokens(tokenKey, issuer)
                         ];
                     case 1:
                         tokens = _state.sent();
@@ -498,13 +775,15 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                         ]);
                         return [
                             4,
-                            this.refreshTokens(tokens, capabilities.tokenEndpoint, allowLoopback)
+                            this.refreshTokens(tokens, capabilities.tokenEndpoint, resource, allowLoopback)
                         ];
                     case 3:
                         tokens = _state.sent();
                         return [
                             4,
-                            this.tokenStore.set(tokenKey, tokens)
+                            this.tokenStore.set(tokenKey, _object_spread_props(_object_spread({}, tokens), {
+                                issuer: issuer
+                            }))
                         ];
                     case 4:
                         _state.sent();
@@ -556,17 +835,7 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                     case 9:
                         client = _state.sent();
                         // Perform OAuth authorization flow with PKCE (RFC 7636)
-                        flowOptions = {
-                            port: port,
-                            headless: this.headless,
-                            redirectUri: this.redirectUri,
-                            pkce: true,
-                            logger: this.logger,
-                            allowLoopback: allowLoopback
-                        };
-                        if (capabilities.scopes) {
-                            flowOptions.scopes = capabilities.scopes;
-                        }
+                        flowOptions = this.buildFlowOptions(port, capabilities, issuer, resource, allowLoopback);
                         return [
                             4,
                             this.oauthFlow.performAuthFlow(capabilities.authorizationEndpoint, capabilities.tokenEndpoint, client.clientId, client.clientSecret, flowOptions)
@@ -576,7 +845,9 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                         // Save tokens for future use
                         return [
                             4,
-                            this.tokenStore.set(tokenKey, tokens)
+                            this.tokenStore.set(tokenKey, _object_spread_props(_object_spread({}, tokens), {
+                                issuer: issuer
+                            }))
                         ];
                     case 11:
                         _state.sent();
@@ -591,9 +862,10 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
     };
     /**
    * Refreshes an access token using a refresh token.
+   * @param resource - Canonical resource server URI, audience-binding the token (RFC 8707).
    * @param allowLoopback - Loopback trust grant computed from the server actually being talked to (SSRF mitigation, see discovery-fetch.ts). Defaults to `false`.
-   */ _proto.refreshTokens = function refreshTokens(tokens, tokenEndpoint) {
-        var allowLoopback = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+   */ _proto.refreshTokens = function refreshTokens(tokens, tokenEndpoint, resource) {
+        var allowLoopback = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
         return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -609,7 +881,7 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
                         }
                         return [
                             4,
-                            this.oauthFlow.refreshTokens(tokenEndpoint, tokens.refreshToken, tokens.clientId, tokens.clientSecret, allowLoopback)
+                            this.oauthFlow.refreshTokens(tokenEndpoint, tokens.refreshToken, tokens.clientId, tokens.clientSecret, resource, allowLoopback)
                         ];
                     case 1:
                         return [
@@ -621,21 +893,112 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
         }).call(this);
     };
     /**
-   * Delete stored tokens for a server
-   */ _proto.deleteTokens = function deleteTokens(baseUrl) {
+   * Deletes both stored token families for a server, across every issuer they were bound to.
+   *
+   * Takes the same `mcpServerUrl` that {@link DcrAuthenticator.ensureAuthenticated}
+   * was given - keys are built from the configured URL, never from the discovered
+   * RFC 8707 resource, precisely so this can find them without doing discovery.
+   *
+   * @throws CredentialBindingError if the configured store cannot enumerate keys.
+   */ _proto.deleteTokens = function deleteTokens(mcpServerUrl) {
         return _async_to_generator(function() {
-            var tokenKey;
+            var suffix, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, _value1, key, err;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        tokenKey = "tokens:".concat(baseUrl);
+                        suffix = ":".concat((0, _urlutilsts.normalizeUrl)(mcpServerUrl));
+                        if (!this.tokenStore.iterator) {
+                            throw new CredentialBindingError('Token store does not support key enumeration, which issuer-keyed credentials require');
+                        }
+                        _iteratorAbruptCompletion = false, _didIteratorError = false;
+                        _state.label = 1;
+                    case 1:
+                        _state.trys.push([
+                            1,
+                            7,
+                            8,
+                            13
+                        ]);
+                        _iterator = _async_iterator(this.tokenStore.iterator(this.tokenStore.namespace));
+                        _state.label = 2;
+                    case 2:
                         return [
                             4,
-                            this.tokenStore.delete(tokenKey)
+                            _iterator.next()
                         ];
-                    case 1:
+                    case 3:
+                        if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
+                            3,
+                            6
+                        ];
+                        _value = _step.value;
+                        _value1 = _sliced_to_array(_value, 1), key = _value1[0];
+                        if (!(typeof key === 'string' && (key.startsWith('tokens:') || key.startsWith('dcr-tokens:')) && key.endsWith(suffix))) return [
+                            3,
+                            5
+                        ];
+                        return [
+                            4,
+                            this.tokenStore.delete(key)
+                        ];
+                    case 4:
                         _state.sent();
-                        this.logger.debug("\uD83D\uDDD1️  Deleted tokens for ".concat(baseUrl));
+                        _state.label = 5;
+                    case 5:
+                        _iteratorAbruptCompletion = false;
+                        return [
+                            3,
+                            2
+                        ];
+                    case 6:
+                        return [
+                            3,
+                            13
+                        ];
+                    case 7:
+                        err = _state.sent();
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                        return [
+                            3,
+                            13
+                        ];
+                    case 8:
+                        _state.trys.push([
+                            8,
+                            ,
+                            11,
+                            12
+                        ]);
+                        if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
+                            3,
+                            10
+                        ];
+                        return [
+                            4,
+                            _iterator.return()
+                        ];
+                    case 9:
+                        _state.sent();
+                        _state.label = 10;
+                    case 10:
+                        return [
+                            3,
+                            12
+                        ];
+                    case 11:
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                        return [
+                            7
+                        ];
+                    case 12:
+                        return [
+                            7
+                        ];
+                    case 13:
+                        this.logger.debug("\uD83D\uDDD1️  Deleted tokens for ".concat(mcpServerUrl));
                         return [
                             2
                         ];
@@ -643,6 +1006,59 @@ var DcrAuthenticator = /*#__PURE__*/ function() {
             });
         }).call(this);
     };
+    /** Discards a stored credential that is not bound to `issuer` (SEP-2352), including one stored before issuer binding existed. */ _proto.loadTokens = function loadTokens(key, issuer) {
+        return _async_to_generator(function() {
+            var tokens;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            this.tokenStore.get(key)
+                        ];
+                    case 1:
+                        tokens = _state.sent();
+                        if (!tokens) return [
+                            2,
+                            undefined
+                        ];
+                        if (tokens.issuer === issuer) return [
+                            2,
+                            tokens
+                        ];
+                        this.logger.debug('🔑 Stored credential is not bound to the discovered issuer, re-authorizing');
+                        return [
+                            4,
+                            this.tokenStore.delete(key)
+                        ];
+                    case 2:
+                        _state.sent();
+                        return [
+                            2,
+                            undefined
+                        ];
+                }
+            });
+        }).call(this);
+    };
+    _proto.buildFlowOptions = function buildFlowOptions(port, capabilities, issuer, resource, allowLoopback) {
+        var _capabilities_authorizationResponseIssSupported;
+        var flowOptions = {
+            port: port,
+            issuer: issuer,
+            resource: resource,
+            headless: this.headless,
+            redirectUri: this.redirectUri,
+            pkce: true,
+            logger: this.logger,
+            allowLoopback: allowLoopback,
+            authorizationResponseIssSupported: (_capabilities_authorizationResponseIssSupported = capabilities.authorizationResponseIssSupported) !== null && _capabilities_authorizationResponseIssSupported !== void 0 ? _capabilities_authorizationResponseIssSupported : false
+        };
+        if (capabilities.scopes) {
+            flowOptions.scopes = capabilities.scopes;
+        }
+        return flowOptions;
+    };
     return DcrAuthenticator;
 }();
 /* CJS INTEROP */ if (exports.__esModule && exports.default) { try { Object.defineProperty(exports.default, '__esModule', { value: true }); for (var key in exports) { exports.default[key] = exports[key]; } } catch (_) {}; module.exports = exports.default; }