@code-yeongyu/senpi 2026.7.4 → 2026.7.9-2

package/dist/core/extensions/builtin/mcp/auth/oauth-provider.js

@@ -0,0 +1,163 @@
+import { randomBytes } from "node:crypto";
+import { fingerprintSecret } from "../log.js";
+import { OAuthFlowError } from "./oauth-errors.js";
+// Buffer before absolute token expiry at which a refresh is considered due.
+export const REFRESH_LEEWAY_MS = 5 * 60 * 1000;
+export function tokenExpiresAt(tokens, now = Date.now()) {
+    if (tokens.expires_in === undefined)
+        return undefined;
+    return now + tokens.expires_in * 1000;
+}
+export function storedAuthToTokens(record, now = Date.now()) {
+    if (record?.accessToken === undefined || record.accessToken.length === 0)
+        return undefined;
+    const expiresIn = record.expiresAt === undefined ? undefined : Math.max(0, Math.ceil((record.expiresAt - now) / 1000));
+    return {
+        access_token: record.accessToken,
+        refresh_token: record.refreshToken,
+        token_type: "Bearer",
+        ...(expiresIn === undefined ? {} : { expires_in: expiresIn }),
+    };
+}
+export function mergeTokensIntoStoredAuth(current, tokens, serverUrl) {
+    const next = {
+        ...(current ?? {}),
+        accessToken: tokens.access_token,
+        resource: current?.resource ?? serverUrl,
+    };
+    const refreshToken = tokens.refresh_token ?? current?.refreshToken;
+    if (refreshToken !== undefined)
+        next.refreshToken = refreshToken;
+    const expiresAt = tokenExpiresAt(tokens);
+    if (expiresAt !== undefined)
+        next.expiresAt = expiresAt;
+    else
+        delete next.expiresAt;
+    return next;
+}
+// Implements the SDK OAuthClientProvider backed by the URL-bound token store.
+// All persistence goes through the store so tokens survive process restarts and
+// stay lockable across processes.
+export class McpOAuthProvider {
+    #options;
+    #expectedState;
+    #lastAuthorizationUrl;
+    constructor(options) {
+        this.#options = options;
+    }
+    get lastAuthorizationUrl() {
+        return this.#lastAuthorizationUrl;
+    }
+    get redirectUrl() {
+        return this.#options.redirectUrl;
+    }
+    get clientMetadataUrl() {
+        return this.#options.clientMetadataUrl;
+    }
+    get clientMetadata() {
+        const redirect = this.#options.redirectUrl;
+        return {
+            redirect_uris: redirect === undefined ? [] : [String(redirect)],
+            grant_types: ["authorization_code", "refresh_token"],
+            response_types: ["code"],
+            token_endpoint_auth_method: "none",
+            client_name: "senpi",
+            scope: this.#options.scopes?.join(" "),
+        };
+    }
+    state() {
+        this.#expectedState = randomBytes(16).toString("base64url");
+        return this.#expectedState;
+    }
+    // Single-use CSRF check: a state is valid at most once.
+    consumeState(candidate) {
+        const expected = this.#expectedState;
+        this.#expectedState = undefined;
+        return expected !== undefined && candidate === expected;
+    }
+    clientInformation() {
+        if (this.#options.clientId !== undefined)
+            return { client_id: this.#options.clientId };
+        if (this.#options.clientMetadataUrl !== undefined)
+            return { client_id: this.#options.clientMetadataUrl };
+        return this.#store.read()?.clientInfo;
+    }
+    async saveClientInformation(info) {
+        await this.#store.update((current) => ({ ...(current ?? {}), clientInfo: info }));
+    }
+    async saveDiscoveryState(state) {
+        await this.#store.update((current) => ({ ...(current ?? {}), discoveryState: state }));
+    }
+    discoveryState() {
+        return this.#store.read()?.discoveryState;
+    }
+    tokens() {
+        return storedAuthToTokens(this.#store.read());
+    }
+    async saveTokens(tokens) {
+        await this.#store.update((current) => mergeTokensIntoStoredAuth(current, tokens, this.serverUrl));
+        this.#logFingerprint("saveTokens", tokens.access_token);
+    }
+    async saveCodeVerifier(codeVerifier) {
+        await this.#store.update((current) => ({ ...(current ?? {}), codeVerifier }));
+    }
+    codeVerifier() {
+        const verifier = this.#store.read()?.codeVerifier;
+        if (verifier === undefined || verifier.length === 0) {
+            throw new OAuthFlowError("no_verifier", `Missing PKCE code verifier for MCP server ${this.serverName}`, {
+                serverName: this.serverName,
+            });
+        }
+        return verifier;
+    }
+    async redirectToAuthorization(authorizationUrl) {
+        this.#lastAuthorizationUrl = authorizationUrl;
+        await this.#options.onRedirect?.(authorizationUrl);
+    }
+    // RFC 8707: bind the token to this MCP resource.
+    validateResourceURL(serverUrl, resource) {
+        return Promise.resolve(new URL(resource ?? String(serverUrl)));
+    }
+    async invalidateCredentials(scope) {
+        if (scope === "all") {
+            await this.#store.clear();
+            return;
+        }
+        await this.#store.update((current) => {
+            if (current === undefined)
+                return current;
+            const next = { ...current };
+            if (scope === "tokens") {
+                delete next.accessToken;
+                delete next.refreshToken;
+                delete next.expiresAt;
+            }
+            if (scope === "verifier")
+                next.codeVerifier = undefined;
+            if (scope === "client")
+                next.clientInfo = undefined;
+            if (scope === "discovery")
+                next.discoveryState = undefined;
+            return next;
+        });
+    }
+    get serverName() {
+        return this.#options.serverName;
+    }
+    get serverUrl() {
+        return this.#options.serverUrl;
+    }
+    get store() {
+        return this.#options.store;
+    }
+    get scopes() {
+        return this.#options.scopes;
+    }
+    get #store() {
+        return this.#options.store;
+    }
+    #logFingerprint(event, secret) {
+        this.#options.logger?.info(`oauth ${event}`, { token_fp: fingerprintSecret(secret) });
+    }
+}
+//# sourceMappingURL=oauth-provider.js.map

package/dist/core/extensions/builtin/mcp/auth/oauth-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/auth/oauth-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,4EAA4E;AAC5E,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAc/C,MAAM,UAAU,cAAc,CAAC,MAAmB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACnE,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACtD,OAAO,GAAG,GAAG,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAiC,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACrF,IAAI,MAAM,EAAE,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3F,MAAM,SAAS,GACd,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACtG,OAAO;QACN,YAAY,EAAE,MAAM,CAAC,WAAW;QAChC,aAAa,EAAE,MAAM,CAAC,YAAY;QAClC,UAAU,EAAE,QAAQ;QACpB,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;KAC7D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACxC,OAAkC,EAClC,MAAmB,EACnB,SAAiB;IAEjB,MAAM,IAAI,GAAkB;QAC3B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC,YAAY;QAChC,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,SAAS;KACxC,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,IAAI,OAAO,EAAE,YAAY,CAAC;IACnE,IAAI,YAAY,KAAK,SAAS;QAAE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACjE,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,SAAS,KAAK,SAAS;QAAE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;;QACnD,OAAO,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,IAAI,CAAC;AACb,CAAC;AAED,8EAA8E;AAC9E,gFAAgF;AAChF,kCAAkC;AAClC,MAAM,OAAO,gBAAgB;IACnB,QAAQ,CAA0B;IAC3C,cAAc,CAAqB;IACnC,qBAAqB,CAAkB;IAEvC,YAAY,OAAgC;QAC3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAI,oBAAoB;QACvB,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IAClC,CAAC;IAED,IAAI,iBAAiB;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACxC,CAAC;IAED,IAAI,cAAc;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;QAC3C,OAAO;YACN,aAAa,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC/D,WAAW,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;YACpD,cAAc,EAAE,CAAC,MAAM,CAAC;YACxB,0BAA0B,EAAE,MAAM;YAClC,WAAW,EAAE,OAAO;YACpB,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC;SACtC,CAAC;IACH,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,wDAAwD;IACxD,YAAY,CAAC,SAA6B;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,OAAO,QAAQ,KAAK,SAAS,IAAI,SAAS,KAAK,QAAQ,CAAC;IACzD,CAAC;IAED,iBAAiB;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACvF,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,KAAK,SAAS;YAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QACzG,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,UAAU,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,IAAgC;QAC3D,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAA0B;QAClD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,cAAc,CAAC;IAC3C,CAAC;IAED,MAAM;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAmB;QACnC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,YAAoB;QAC1C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,YAAY;QACX,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,YAAY,CAAC;QAClD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,cAAc,CAAC,aAAa,EAAE,6CAA6C,IAAI,CAAC,UAAU,EAAE,EAAE;gBACvG,UAAU,EAAE,IAAI,CAAC,UAAU;aAC3B,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,gBAAqB;QAClD,IAAI,CAAC,qBAAqB,GAAG,gBAAgB,CAAC;QAC9C,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAC;IACpD,CAAC;IAED,iDAAiD;IACjD,mBAAmB,CAAC,SAAuB,EAAE,QAAiB;QAC7D,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,KAA6D;QACxF,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,IAAI,OAAO,KAAK,SAAS;gBAAE,OAAO,OAAO,CAAC;YAC1C,MAAM,IAAI,GAAkB,EAAE,GAAG,OAAO,EAAE,CAAC;YAC3C,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC,WAAW,CAAC;gBACxB,OAAO,IAAI,CAAC,YAAY,CAAC;gBACzB,OAAO,IAAI,CAAC,SAAS,CAAC;YACvB,CAAC;YACD,IAAI,KAAK,KAAK,UAAU;gBAAE,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YACxD,IAAI,KAAK,KAAK,QAAQ;gBAAE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YACpD,IAAI,KAAK,KAAK,WAAW;gBAAE,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;YAC3D,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IACjC,CAAC;IACD,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IAChC,CAAC;IACD,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC5B,CAAC;IACD,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,KAAa,EAAE,MAAc;QAC5C,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;CACD","sourcesContent":["import { randomBytes } from \"node:crypto\";\nimport type { OAuthClientProvider, OAuthDiscoveryState } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n\tOAuthClientInformationFull,\n\tOAuthClientInformationMixed,\n\tOAuthClientMetadata,\n\tOAuthTokens,\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport type { McpLogger } from \"../log.ts\";\nimport { fingerprintSecret } from \"../log.ts\";\nimport { OAuthFlowError } from \"./oauth-errors.ts\";\nimport type { McpStoredAuth, McpTokenStore } from \"./token-store.ts\";\n\n// Buffer before absolute token expiry at which a refresh is considered due.\nexport const REFRESH_LEEWAY_MS = 5 * 60 * 1000;\n\nexport interface McpOAuthProviderOptions {\n\tserverName: string;\n\tserverUrl: string;\n\tstore: McpTokenStore;\n\tredirectUrl?: string | URL;\n\tscopes?: string[];\n\tclientId?: string;\n\tclientMetadataUrl?: string;\n\tlogger?: McpLogger;\n\tonRedirect?: (url: URL) => void | Promise<void>;\n}\n\nexport function tokenExpiresAt(tokens: OAuthTokens, now = Date.now()): number | undefined {\n\tif (tokens.expires_in === undefined) return undefined;\n\treturn now + tokens.expires_in * 1000;\n}\n\nexport function storedAuthToTokens(record: McpStoredAuth | undefined, now = Date.now()): OAuthTokens | undefined {\n\tif (record?.accessToken === undefined || record.accessToken.length === 0) return undefined;\n\tconst expiresIn =\n\t\trecord.expiresAt === undefined ? undefined : Math.max(0, Math.ceil((record.expiresAt - now) / 1000));\n\treturn {\n\t\taccess_token: record.accessToken,\n\t\trefresh_token: record.refreshToken,\n\t\ttoken_type: \"Bearer\",\n\t\t...(expiresIn === undefined ? {} : { expires_in: expiresIn }),\n\t};\n}\n\nexport function mergeTokensIntoStoredAuth(\n\tcurrent: McpStoredAuth | undefined,\n\ttokens: OAuthTokens,\n\tserverUrl: string,\n): McpStoredAuth {\n\tconst next: McpStoredAuth = {\n\t\t...(current ?? {}),\n\t\taccessToken: tokens.access_token,\n\t\tresource: current?.resource ?? serverUrl,\n\t};\n\tconst refreshToken = tokens.refresh_token ?? current?.refreshToken;\n\tif (refreshToken !== undefined) next.refreshToken = refreshToken;\n\tconst expiresAt = tokenExpiresAt(tokens);\n\tif (expiresAt !== undefined) next.expiresAt = expiresAt;\n\telse delete next.expiresAt;\n\treturn next;\n}\n\n// Implements the SDK OAuthClientProvider backed by the URL-bound token store.\n// All persistence goes through the store so tokens survive process restarts and\n// stay lockable across processes.\nexport class McpOAuthProvider implements OAuthClientProvider {\n\treadonly #options: McpOAuthProviderOptions;\n\t#expectedState: string | undefined;\n\t#lastAuthorizationUrl: URL | undefined;\n\n\tconstructor(options: McpOAuthProviderOptions) {\n\t\tthis.#options = options;\n\t}\n\n\tget lastAuthorizationUrl(): URL | undefined {\n\t\treturn this.#lastAuthorizationUrl;\n\t}\n\n\tget redirectUrl(): string | URL | undefined {\n\t\treturn this.#options.redirectUrl;\n\t}\n\n\tget clientMetadataUrl(): string | undefined {\n\t\treturn this.#options.clientMetadataUrl;\n\t}\n\n\tget clientMetadata(): OAuthClientMetadata {\n\t\tconst redirect = this.#options.redirectUrl;\n\t\treturn {\n\t\t\tredirect_uris: redirect === undefined ? [] : [String(redirect)],\n\t\t\tgrant_types: [\"authorization_code\", \"refresh_token\"],\n\t\t\tresponse_types: [\"code\"],\n\t\t\ttoken_endpoint_auth_method: \"none\",\n\t\t\tclient_name: \"senpi\",\n\t\t\tscope: this.#options.scopes?.join(\" \"),\n\t\t};\n\t}\n\n\tstate(): string {\n\t\tthis.#expectedState = randomBytes(16).toString(\"base64url\");\n\t\treturn this.#expectedState;\n\t}\n\n\t// Single-use CSRF check: a state is valid at most once.\n\tconsumeState(candidate: string | undefined): boolean {\n\t\tconst expected = this.#expectedState;\n\t\tthis.#expectedState = undefined;\n\t\treturn expected !== undefined && candidate === expected;\n\t}\n\n\tclientInformation(): OAuthClientInformationMixed | undefined {\n\t\tif (this.#options.clientId !== undefined) return { client_id: this.#options.clientId };\n\t\tif (this.#options.clientMetadataUrl !== undefined) return { client_id: this.#options.clientMetadataUrl };\n\t\treturn this.#store.read()?.clientInfo;\n\t}\n\n\tasync saveClientInformation(info: OAuthClientInformationFull): Promise<void> {\n\t\tawait this.#store.update((current) => ({ ...(current ?? {}), clientInfo: info }));\n\t}\n\n\tasync saveDiscoveryState(state: OAuthDiscoveryState): Promise<void> {\n\t\tawait this.#store.update((current) => ({ ...(current ?? {}), discoveryState: state }));\n\t}\n\n\tdiscoveryState(): OAuthDiscoveryState | undefined {\n\t\treturn this.#store.read()?.discoveryState;\n\t}\n\n\ttokens(): OAuthTokens | undefined {\n\t\treturn storedAuthToTokens(this.#store.read());\n\t}\n\n\tasync saveTokens(tokens: OAuthTokens): Promise<void> {\n\t\tawait this.#store.update((current) => mergeTokensIntoStoredAuth(current, tokens, this.serverUrl));\n\t\tthis.#logFingerprint(\"saveTokens\", tokens.access_token);\n\t}\n\n\tasync saveCodeVerifier(codeVerifier: string): Promise<void> {\n\t\tawait this.#store.update((current) => ({ ...(current ?? {}), codeVerifier }));\n\t}\n\n\tcodeVerifier(): string {\n\t\tconst verifier = this.#store.read()?.codeVerifier;\n\t\tif (verifier === undefined || verifier.length === 0) {\n\t\t\tthrow new OAuthFlowError(\"no_verifier\", `Missing PKCE code verifier for MCP server ${this.serverName}`, {\n\t\t\t\tserverName: this.serverName,\n\t\t\t});\n\t\t}\n\t\treturn verifier;\n\t}\n\n\tasync redirectToAuthorization(authorizationUrl: URL): Promise<void> {\n\t\tthis.#lastAuthorizationUrl = authorizationUrl;\n\t\tawait this.#options.onRedirect?.(authorizationUrl);\n\t}\n\n\t// RFC 8707: bind the token to this MCP resource.\n\tvalidateResourceURL(serverUrl: string | URL, resource?: string): Promise<URL | undefined> {\n\t\treturn Promise.resolve(new URL(resource ?? String(serverUrl)));\n\t}\n\n\tasync invalidateCredentials(scope: \"all\" | \"client\" | \"tokens\" | \"verifier\" | \"discovery\"): Promise<void> {\n\t\tif (scope === \"all\") {\n\t\t\tawait this.#store.clear();\n\t\t\treturn;\n\t\t}\n\t\tawait this.#store.update((current) => {\n\t\t\tif (current === undefined) return current;\n\t\t\tconst next: McpStoredAuth = { ...current };\n\t\t\tif (scope === \"tokens\") {\n\t\t\t\tdelete next.accessToken;\n\t\t\t\tdelete next.refreshToken;\n\t\t\t\tdelete next.expiresAt;\n\t\t\t}\n\t\t\tif (scope === \"verifier\") next.codeVerifier = undefined;\n\t\t\tif (scope === \"client\") next.clientInfo = undefined;\n\t\t\tif (scope === \"discovery\") next.discoveryState = undefined;\n\t\t\treturn next;\n\t\t});\n\t}\n\n\tget serverName(): string {\n\t\treturn this.#options.serverName;\n\t}\n\tget serverUrl(): string {\n\t\treturn this.#options.serverUrl;\n\t}\n\tget store(): McpTokenStore {\n\t\treturn this.#options.store;\n\t}\n\tget scopes(): string[] | undefined {\n\t\treturn this.#options.scopes;\n\t}\n\n\tget #store(): McpTokenStore {\n\t\treturn this.#options.store;\n\t}\n\n\t#logFingerprint(event: string, secret: string): void {\n\t\tthis.#options.logger?.info(`oauth ${event}`, { token_fp: fingerprintSecret(secret) });\n\t}\n}\n"]}

package/dist/core/extensions/builtin/mcp/auth/oauth-refresh.d.ts

@@ -0,0 +1,20 @@
+import { type OAuthServerInfo } from "@modelcontextprotocol/sdk/client/auth.js";
+import type { AuthorizationServerMetadata, OAuthTokens } from "@modelcontextprotocol/sdk/shared/auth.js";
+import type { FetchLike } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { type McpOAuthProvider } from "./oauth-provider.ts";
+import type { McpStoredAuth } from "./token-store.ts";
+export interface RefreshManagerOptions {
+    fetchFn?: FetchLike;
+    maxRetries?: number;
+    retryDelayMs?: number;
+    discover?: (serverUrl: string) => Promise<OAuthServerInfo>;
+}
+export declare function isTokenStale(record: McpStoredAuth | undefined, now: number): boolean;
+export declare function assertS256Supported(metadata: AuthorizationServerMetadata | undefined, serverName: string): void;
+export declare class McpRefreshManager {
+    #private;
+    constructor(provider: McpOAuthProvider, options?: RefreshManagerOptions);
+    ensureFresh(): Promise<OAuthTokens | undefined>;
+    refresh(): Promise<OAuthTokens>;
+}
+//# sourceMappingURL=oauth-refresh.d.ts.map

package/dist/core/extensions/builtin/mcp/auth/oauth-refresh.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-refresh.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/auth/oauth-refresh.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,eAAe,EAEpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACzG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAG/E,OAAO,EACN,KAAK,gBAAgB,EAIrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;CAC3D;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAKpF;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,2BAA2B,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAS/G;AAID,qBAAa,iBAAiB;;IAK7B,YAAY,QAAQ,EAAE,gBAAgB,EAAE,OAAO,GAAE,qBAA0B,EAG1E;IAEK,WAAW,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAKpD;IAED,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAO9B;CA2ED"}

package/dist/core/extensions/builtin/mcp/auth/oauth-refresh.js

@@ -0,0 +1,113 @@
+import { discoverOAuthServerInfo, refreshAuthorization, } from "@modelcontextprotocol/sdk/client/auth.js";
+import { safeDelay } from "../wrap.js";
+import { isInvalidGrant, isTransientTokenError, OAuthFlowError } from "./oauth-errors.js";
+import { mergeTokensIntoStoredAuth, REFRESH_LEEWAY_MS, storedAuthToTokens, } from "./oauth-provider.js";
+export function isTokenStale(record, now) {
+    const token = record?.accessToken;
+    if (token === undefined || token.length === 0)
+        return true;
+    if (record?.expiresAt === undefined)
+        return false;
+    return record.expiresAt - now <= REFRESH_LEEWAY_MS;
+}
+export function assertS256Supported(metadata, serverName) {
+    const methods = metadata?.code_challenge_methods_supported;
+    if (methods === undefined || !methods.includes("S256")) {
+        throw new OAuthFlowError("s256_unsupported", `MCP server ${serverName} authorization server does not advertise PKCE S256 (code_challenge_methods_supported); refusing to authorize without proof-key protection.`, { serverName });
+    }
+}
+// Coalesces refresh across in-process callers (single promise) and across
+// processes (token-store lock). Preemptive at expiry - 5min.
+export class McpRefreshManager {
+    #provider;
+    #options;
+    #inflight;
+    constructor(provider, options = {}) {
+        this.#provider = provider;
+        this.#options = options;
+    }
+    async ensureFresh() {
+        const record = this.#provider.store.read();
+        if (record?.accessToken === undefined)
+            return undefined;
+        if (!isTokenStale(record, Date.now()))
+            return storedAuthToTokens(record);
+        return this.refresh();
+    }
+    refresh() {
+        if (this.#inflight !== undefined)
+            return this.#inflight;
+        const run = this.#refreshLocked().finally(() => {
+            this.#inflight = undefined;
+        });
+        this.#inflight = run;
+        return run;
+    }
+    #refreshLocked() {
+        return this.#provider.store.withLock(async () => {
+            const current = this.#provider.store.readUnlocked();
+            if (current?.accessToken !== undefined && !isTokenStale(current, Date.now())) {
+                const tokens = storedAuthToTokens(current);
+                if (tokens !== undefined)
+                    return tokens;
+            }
+            const refreshToken = current?.refreshToken;
+            if (current === undefined || refreshToken === undefined) {
+                throw new OAuthFlowError("needs_auth", `MCP server ${this.#provider.serverName} has no refresh token`, {
+                    serverName: this.#provider.serverName,
+                });
+            }
+            return this.#doRefresh(current, refreshToken);
+        });
+    }
+    async #doRefresh(current, refreshToken) {
+        const info = await this.#discover();
+        const clientInformation = this.#provider.clientInformation();
+        if (clientInformation === undefined) {
+            throw new OAuthFlowError("needs_auth", `MCP server ${this.#provider.serverName} is not registered`, {
+                serverName: this.#provider.serverName,
+            });
+        }
+        const resource = new URL(current.resource ?? this.#provider.serverUrl);
+        const maxRetries = this.#options.maxRetries ?? 2;
+        for (let attempt = 0;; attempt++) {
+            try {
+                const tokens = await refreshAuthorization(info.authorizationServerUrl, {
+                    metadata: info.authorizationServerMetadata,
+                    clientInformation,
+                    refreshToken,
+                    resource,
+                    fetchFn: this.#options.fetchFn,
+                });
+                this.#provider.store.writeUnlocked(mergeTokensIntoStoredAuth(current, tokens, this.#provider.serverUrl));
+                return tokens;
+            }
+            catch (error) {
+                if (isInvalidGrant(error)) {
+                    // Terminal: drop credentials so the next use forces a clean re-auth.
+                    this.#provider.store.writeUnlocked(undefined);
+                    throw new OAuthFlowError("invalid_grant", `MCP server ${this.#provider.serverName} refresh rejected (invalid_grant); credentials cleared, re-authentication required.`, {
+                        cause: error,
+                        serverName: this.#provider.serverName,
+                    });
+                }
+                if (isTransientTokenError(error) && attempt < maxRetries) {
+                    await safeDelay(this.#options.retryDelayMs ?? 50);
+                    continue;
+                }
+                // Transient but exhausted: surface without clearing credentials (needs_auth NOT set).
+                throw new OAuthFlowError("transient", `MCP server ${this.#provider.serverName} token refresh failed transiently; will retry on next use.`, {
+                    cause: error,
+                    retriable: true,
+                    serverName: this.#provider.serverName,
+                });
+            }
+        }
+    }
+    #discover() {
+        if (this.#options.discover !== undefined)
+            return this.#options.discover(this.#provider.serverUrl);
+        return discoverOAuthServerInfo(this.#provider.serverUrl, { fetchFn: this.#options.fetchFn });
+    }
+}
+//# sourceMappingURL=oauth-refresh.js.map

package/dist/core/extensions/builtin/mcp/auth/oauth-refresh.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-refresh.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/auth/oauth-refresh.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tdiscoverOAuthServerInfo,\n\ttype OAuthServerInfo,\n\trefreshAuthorization,\n} from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type { AuthorizationServerMetadata, OAuthTokens } from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport type { FetchLike } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport { safeDelay } from \"../wrap.ts\";\nimport { isInvalidGrant, isTransientTokenError, OAuthFlowError } from \"./oauth-errors.ts\";\nimport {\n\ttype McpOAuthProvider,\n\tmergeTokensIntoStoredAuth,\n\tREFRESH_LEEWAY_MS,\n\tstoredAuthToTokens,\n} from \"./oauth-provider.ts\";\nimport type { McpStoredAuth } from \"./token-store.ts\";\n\nexport interface RefreshManagerOptions {\n\tfetchFn?: FetchLike;\n\tmaxRetries?: number;\n\tretryDelayMs?: number;\n\tdiscover?: (serverUrl: string) => Promise<OAuthServerInfo>;\n}\n\nexport function isTokenStale(record: McpStoredAuth | undefined, now: number): boolean {\n\tconst token = record?.accessToken;\n\tif (token === undefined || token.length === 0) return true;\n\tif (record?.expiresAt === undefined) return false;\n\treturn record.expiresAt - now <= REFRESH_LEEWAY_MS;\n}\n\nexport function assertS256Supported(metadata: AuthorizationServerMetadata | undefined, serverName: string): void {\n\tconst methods = metadata?.code_challenge_methods_supported;\n\tif (methods === undefined || !methods.includes(\"S256\")) {\n\t\tthrow new OAuthFlowError(\n\t\t\t\"s256_unsupported\",\n\t\t\t`MCP server ${serverName} authorization server does not advertise PKCE S256 (code_challenge_methods_supported); refusing to authorize without proof-key protection.`,\n\t\t\t{ serverName },\n\t\t);\n\t}\n}\n\n// Coalesces refresh across in-process callers (single promise) and across\n// processes (token-store lock). Preemptive at expiry - 5min.\nexport class McpRefreshManager {\n\treadonly #provider: McpOAuthProvider;\n\treadonly #options: RefreshManagerOptions;\n\t#inflight: Promise<OAuthTokens> | undefined;\n\n\tconstructor(provider: McpOAuthProvider, options: RefreshManagerOptions = {}) {\n\t\tthis.#provider = provider;\n\t\tthis.#options = options;\n\t}\n\n\tasync ensureFresh(): Promise<OAuthTokens | undefined> {\n\t\tconst record = this.#provider.store.read();\n\t\tif (record?.accessToken === undefined) return undefined;\n\t\tif (!isTokenStale(record, Date.now())) return storedAuthToTokens(record);\n\t\treturn this.refresh();\n\t}\n\n\trefresh(): Promise<OAuthTokens> {\n\t\tif (this.#inflight !== undefined) return this.#inflight;\n\t\tconst run = this.#refreshLocked().finally(() => {\n\t\t\tthis.#inflight = undefined;\n\t\t});\n\t\tthis.#inflight = run;\n\t\treturn run;\n\t}\n\n\t#refreshLocked(): Promise<OAuthTokens> {\n\t\treturn this.#provider.store.withLock(async () => {\n\t\t\tconst current = this.#provider.store.readUnlocked();\n\t\t\tif (current?.accessToken !== undefined && !isTokenStale(current, Date.now())) {\n\t\t\t\tconst tokens = storedAuthToTokens(current);\n\t\t\t\tif (tokens !== undefined) return tokens;\n\t\t\t}\n\t\t\tconst refreshToken = current?.refreshToken;\n\t\t\tif (current === undefined || refreshToken === undefined) {\n\t\t\t\tthrow new OAuthFlowError(\"needs_auth\", `MCP server ${this.#provider.serverName} has no refresh token`, {\n\t\t\t\t\tserverName: this.#provider.serverName,\n\t\t\t\t});\n\t\t\t}\n\t\t\treturn this.#doRefresh(current, refreshToken);\n\t\t});\n\t}\n\n\tasync #doRefresh(current: McpStoredAuth, refreshToken: string): Promise<OAuthTokens> {\n\t\tconst info = await this.#discover();\n\t\tconst clientInformation = this.#provider.clientInformation();\n\t\tif (clientInformation === undefined) {\n\t\t\tthrow new OAuthFlowError(\"needs_auth\", `MCP server ${this.#provider.serverName} is not registered`, {\n\t\t\t\tserverName: this.#provider.serverName,\n\t\t\t});\n\t\t}\n\t\tconst resource = new URL(current.resource ?? this.#provider.serverUrl);\n\t\tconst maxRetries = this.#options.maxRetries ?? 2;\n\t\tfor (let attempt = 0; ; attempt++) {\n\t\t\ttry {\n\t\t\t\tconst tokens = await refreshAuthorization(info.authorizationServerUrl, {\n\t\t\t\t\tmetadata: info.authorizationServerMetadata,\n\t\t\t\t\tclientInformation,\n\t\t\t\t\trefreshToken,\n\t\t\t\t\tresource,\n\t\t\t\t\tfetchFn: this.#options.fetchFn,\n\t\t\t\t});\n\t\t\t\tthis.#provider.store.writeUnlocked(mergeTokensIntoStoredAuth(current, tokens, this.#provider.serverUrl));\n\t\t\t\treturn tokens;\n\t\t\t} catch (error) {\n\t\t\t\tif (isInvalidGrant(error)) {\n\t\t\t\t\t// Terminal: drop credentials so the next use forces a clean re-auth.\n\t\t\t\t\tthis.#provider.store.writeUnlocked(undefined);\n\t\t\t\t\tthrow new OAuthFlowError(\n\t\t\t\t\t\t\"invalid_grant\",\n\t\t\t\t\t\t`MCP server ${this.#provider.serverName} refresh rejected (invalid_grant); credentials cleared, re-authentication required.`,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tcause: error,\n\t\t\t\t\t\t\tserverName: this.#provider.serverName,\n\t\t\t\t\t\t},\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\tif (isTransientTokenError(error) && attempt < maxRetries) {\n\t\t\t\t\tawait safeDelay(this.#options.retryDelayMs ?? 50);\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\t// Transient but exhausted: surface without clearing credentials (needs_auth NOT set).\n\t\t\t\tthrow new OAuthFlowError(\n\t\t\t\t\t\"transient\",\n\t\t\t\t\t`MCP server ${this.#provider.serverName} token refresh failed transiently; will retry on next use.`,\n\t\t\t\t\t{\n\t\t\t\t\t\tcause: error,\n\t\t\t\t\t\tretriable: true,\n\t\t\t\t\t\tserverName: this.#provider.serverName,\n\t\t\t\t\t},\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t}\n\n\t#discover(): Promise<OAuthServerInfo> {\n\t\tif (this.#options.discover !== undefined) return this.#options.discover(this.#provider.serverUrl);\n\t\treturn discoverOAuthServerInfo(this.#provider.serverUrl, { fetchFn: this.#options.fetchFn });\n\t}\n}\n"]}

package/dist/core/extensions/builtin/mcp/auth/oauth.d.ts

@@ -0,0 +1,18 @@
+import { type OAuthServerInfo } from "@modelcontextprotocol/sdk/client/auth.js";
+import type { FetchLike } from "@modelcontextprotocol/sdk/shared/transport.js";
+import type { McpOAuthProvider } from "./oauth-provider.ts";
+export interface OAuthFlowOptions {
+    fetchFn?: FetchLike;
+    discover?: (serverUrl: string) => Promise<OAuthServerInfo>;
+}
+export interface BeginAuthResult {
+    status: "redirect" | "authorized";
+    authorizationUrl: URL | undefined;
+}
+export declare function assertAuthorizable(provider: McpOAuthProvider, options?: OAuthFlowOptions): Promise<OAuthServerInfo>;
+export declare function beginAuthorization(provider: McpOAuthProvider, options?: OAuthFlowOptions): Promise<BeginAuthResult>;
+export declare function completeAuthorization(provider: McpOAuthProvider, redirectInput: string, options?: OAuthFlowOptions): Promise<void>;
+export declare function finishAuthorization(provider: McpOAuthProvider, code: string, options?: OAuthFlowOptions): Promise<void>;
+export declare function clientCredentialsGrant(provider: McpOAuthProvider, options?: OAuthFlowOptions): Promise<void>;
+export declare function logout(provider: McpOAuthProvider): Promise<void>;
+//# sourceMappingURL=oauth.d.ts.map

package/dist/core/extensions/builtin/mcp/auth/oauth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/auth/oauth.ts"],"names":[],"mappings":"AACA,OAAO,EAIN,KAAK,eAAe,EAEpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAG5D,MAAM,WAAW,gBAAgB;IAChC,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;CAC3D;AAED,MAAM,WAAW,eAAe;IAC/B,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC;IAClC,gBAAgB,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC;AAID,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE,gBAAqB,GAC5B,OAAO,CAAC,eAAe,CAAC,CAI1B;AAED,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE,gBAAqB,GAC5B,OAAO,CAAC,eAAe,CAAC,CAO1B;AAGD,wBAAsB,qBAAqB,CAC1C,QAAQ,EAAE,gBAAgB,EAC1B,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,gBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAUf;AAID,wBAAsB,mBAAmB,CACxC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,gBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,wBAAsB,sBAAsB,CAC3C,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE,gBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA4Cf;AAED,wBAAsB,MAAM,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE"}

package/dist/core/extensions/builtin/mcp/auth/oauth.js

@@ -0,0 +1,138 @@
+import { discoverOAuthServerInfo, fetchToken, auth as sdkAuth, } from "@modelcontextprotocol/sdk/client/auth.js";
+import { isInvalidGrant, OAuthFlowError } from "./oauth-errors.js";
+import { assertS256Supported } from "./oauth-refresh.js";
+// Pre-flight: discover the authorization server and REFUSE (typed) if it does
+// not advertise PKCE S256. Runs before any authorize redirect.
+export async function assertAuthorizable(provider, options = {}) {
+    const info = await discover(provider, options);
+    assertS256Supported(info.authorizationServerMetadata, provider.serverName);
+    return info;
+}
+export async function beginAuthorization(provider, options = {}) {
+    await assertAuthorizable(provider, options);
+    const result = await sdkAuth(provider, { serverUrl: provider.serverUrl, fetchFn: options.fetchFn });
+    return {
+        status: result === "AUTHORIZED" ? "authorized" : "redirect",
+        authorizationUrl: provider.lastAuthorizationUrl,
+    };
+}
+// Paste flow: validates single-use state itself, then exchanges the code.
+export async function completeAuthorization(provider, redirectInput, options = {}) {
+    const { code, state } = parseRedirect(redirectInput, provider.serverName);
+    if (!provider.consumeState(state)) {
+        throw new OAuthFlowError("state_mismatch", `MCP server ${provider.serverName} authorization state did not match (possible CSRF or a stale/replayed link); restart with /mcp auth-start.`, { serverName: provider.serverName });
+    }
+    await finishAuthorization(provider, code, options);
+}
+// Exchange an already-validated authorization code (state was checked by the
+// loopback callback server). Uses the provider's stored PKCE verifier.
+export async function finishAuthorization(provider, code, options = {}) {
+    let result;
+    try {
+        result = await sdkAuth(provider, {
+            serverUrl: provider.serverUrl,
+            authorizationCode: code,
+            fetchFn: options.fetchFn,
+        });
+    }
+    catch (error) {
+        if (isInvalidGrant(error) || isRejectedAuthorizationCode(error)) {
+            await provider.invalidateCredentials("tokens");
+            await provider.invalidateCredentials("verifier");
+            throw new OAuthFlowError("expired_code", `MCP server ${provider.serverName} authorization code was rejected or expired; restart with /mcp auth-start ${provider.serverName}.`, { cause: error, serverName: provider.serverName });
+        }
+        throw error;
+    }
+    if (result !== "AUTHORIZED") {
+        throw new OAuthFlowError("needs_auth", `MCP server ${provider.serverName} did not complete authorization.`, {
+            serverName: provider.serverName,
+        });
+    }
+}
+export async function clientCredentialsGrant(provider, options = {}) {
+    const info = await discover(provider, options);
+    const clientInformation = provider.clientInformation();
+    if (clientInformation === undefined) {
+        throw new OAuthFlowError("needs_auth", `MCP server ${provider.serverName} client_credentials requires a clientId.`, {
+            serverName: provider.serverName,
+        });
+    }
+    const requestedScope = provider.scopes?.join(" ");
+    // Explicit delegate: spreading the class instance would drop its getters.
+    const credentialsProvider = {
+        get redirectUrl() {
+            return undefined;
+        },
+        get clientMetadata() {
+            return { ...provider.clientMetadata, scope: requestedScope };
+        },
+        clientInformation: () => clientInformation,
+        tokens: () => undefined,
+        saveTokens: () => undefined,
+        redirectToAuthorization: () => undefined,
+        saveCodeVerifier: () => undefined,
+        codeVerifier: () => {
+            throw new OAuthFlowError("no_verifier", "client_credentials has no PKCE verifier", {
+                serverName: provider.serverName,
+            });
+        },
+        prepareTokenRequest(scope) {
+            const params = new URLSearchParams({ grant_type: "client_credentials" });
+            const requested = scope ?? requestedScope;
+            if (requested !== undefined && requested.length > 0)
+                params.set("scope", requested);
+            return params;
+        },
+    };
+    const tokens = await fetchToken(credentialsProvider, info.authorizationServerUrl, {
+        metadata: info.authorizationServerMetadata,
+        resource: new URL(provider.serverUrl),
+        fetchFn: options.fetchFn,
+    });
+    await provider.saveTokens(tokens);
+}
+export async function logout(provider) {
+    await provider.store.clear();
+}
+async function discover(provider, options) {
+    if (options.discover !== undefined)
+        return options.discover(provider.serverUrl);
+    const cached = provider.discoveryState();
+    if (cached !== undefined)
+        return cached;
+    const info = await discoverOAuthServerInfo(provider.serverUrl, { fetchFn: options.fetchFn });
+    await provider.saveDiscoveryState(toDiscoveryState(info));
+    return info;
+}
+function toDiscoveryState(info) {
+    return {
+        authorizationServerUrl: info.authorizationServerUrl,
+        authorizationServerMetadata: info.authorizationServerMetadata,
+        resourceMetadata: info.resourceMetadata,
+    };
+}
+function parseRedirect(input, serverName) {
+    let url;
+    try {
+        url = new URL(input.trim());
+    }
+    catch {
+        throw new OAuthFlowError("needs_auth", `MCP server ${serverName} received a malformed redirect URL; paste the full http://127.0.0.1/... address from your browser.`, { serverName });
+    }
+    const error = url.searchParams.get("error");
+    if (error !== null) {
+        throw new OAuthFlowError("needs_auth", `MCP server ${serverName} authorization failed: ${error}`, { serverName });
+    }
+    const code = url.searchParams.get("code");
+    if (code === null || code.length === 0) {
+        throw new OAuthFlowError("needs_auth", `MCP server ${serverName} redirect URL has no authorization code; ensure you copied the entire address.`, { serverName });
+    }
+    return { code, state: url.searchParams.get("state") ?? undefined };
+}
+function isRejectedAuthorizationCode(error) {
+    const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+    return (message.includes("authorization code invalid") ||
+        (message.includes("authorization code") && message.includes("used")) ||
+        message.includes("pkce verification failed"));
+}
+//# sourceMappingURL=oauth.js.map

package/dist/core/extensions/builtin/mcp/auth/oauth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/auth/oauth.ts"],"names":[],"mappings":"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","sourcesContent":["import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport {\n\tdiscoverOAuthServerInfo,\n\tfetchToken,\n\ttype OAuthDiscoveryState,\n\ttype OAuthServerInfo,\n\tauth as sdkAuth,\n} from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type { FetchLike } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport { isInvalidGrant, OAuthFlowError } from \"./oauth-errors.ts\";\nimport type { McpOAuthProvider } from \"./oauth-provider.ts\";\nimport { assertS256Supported } from \"./oauth-refresh.ts\";\n\nexport interface OAuthFlowOptions {\n\tfetchFn?: FetchLike;\n\tdiscover?: (serverUrl: string) => Promise<OAuthServerInfo>;\n}\n\nexport interface BeginAuthResult {\n\tstatus: \"redirect\" | \"authorized\";\n\tauthorizationUrl: URL | undefined;\n}\n\n// Pre-flight: discover the authorization server and REFUSE (typed) if it does\n// not advertise PKCE S256. Runs before any authorize redirect.\nexport async function assertAuthorizable(\n\tprovider: McpOAuthProvider,\n\toptions: OAuthFlowOptions = {},\n): Promise<OAuthServerInfo> {\n\tconst info = await discover(provider, options);\n\tassertS256Supported(info.authorizationServerMetadata, provider.serverName);\n\treturn info;\n}\n\nexport async function beginAuthorization(\n\tprovider: McpOAuthProvider,\n\toptions: OAuthFlowOptions = {},\n): Promise<BeginAuthResult> {\n\tawait assertAuthorizable(provider, options);\n\tconst result = await sdkAuth(provider, { serverUrl: provider.serverUrl, fetchFn: options.fetchFn });\n\treturn {\n\t\tstatus: result === \"AUTHORIZED\" ? \"authorized\" : \"redirect\",\n\t\tauthorizationUrl: provider.lastAuthorizationUrl,\n\t};\n}\n\n// Paste flow: validates single-use state itself, then exchanges the code.\nexport async function completeAuthorization(\n\tprovider: McpOAuthProvider,\n\tredirectInput: string,\n\toptions: OAuthFlowOptions = {},\n): Promise<void> {\n\tconst { code, state } = parseRedirect(redirectInput, provider.serverName);\n\tif (!provider.consumeState(state)) {\n\t\tthrow new OAuthFlowError(\n\t\t\t\"state_mismatch\",\n\t\t\t`MCP server ${provider.serverName} authorization state did not match (possible CSRF or a stale/replayed link); restart with /mcp auth-start.`,\n\t\t\t{ serverName: provider.serverName },\n\t\t);\n\t}\n\tawait finishAuthorization(provider, code, options);\n}\n\n// Exchange an already-validated authorization code (state was checked by the\n// loopback callback server). Uses the provider's stored PKCE verifier.\nexport async function finishAuthorization(\n\tprovider: McpOAuthProvider,\n\tcode: string,\n\toptions: OAuthFlowOptions = {},\n): Promise<void> {\n\tlet result: Awaited<ReturnType<typeof sdkAuth>>;\n\ttry {\n\t\tresult = await sdkAuth(provider, {\n\t\t\tserverUrl: provider.serverUrl,\n\t\t\tauthorizationCode: code,\n\t\t\tfetchFn: options.fetchFn,\n\t\t});\n\t} catch (error) {\n\t\tif (isInvalidGrant(error) || isRejectedAuthorizationCode(error)) {\n\t\t\tawait provider.invalidateCredentials(\"tokens\");\n\t\t\tawait provider.invalidateCredentials(\"verifier\");\n\t\t\tthrow new OAuthFlowError(\n\t\t\t\t\"expired_code\",\n\t\t\t\t`MCP server ${provider.serverName} authorization code was rejected or expired; restart with /mcp auth-start ${provider.serverName}.`,\n\t\t\t\t{ cause: error, serverName: provider.serverName },\n\t\t\t);\n\t\t}\n\t\tthrow error;\n\t}\n\tif (result !== \"AUTHORIZED\") {\n\t\tthrow new OAuthFlowError(\"needs_auth\", `MCP server ${provider.serverName} did not complete authorization.`, {\n\t\t\tserverName: provider.serverName,\n\t\t});\n\t}\n}\n\nexport async function clientCredentialsGrant(\n\tprovider: McpOAuthProvider,\n\toptions: OAuthFlowOptions = {},\n): Promise<void> {\n\tconst info = await discover(provider, options);\n\tconst clientInformation = provider.clientInformation();\n\tif (clientInformation === undefined) {\n\t\tthrow new OAuthFlowError(\n\t\t\t\"needs_auth\",\n\t\t\t`MCP server ${provider.serverName} client_credentials requires a clientId.`,\n\t\t\t{\n\t\t\t\tserverName: provider.serverName,\n\t\t\t},\n\t\t);\n\t}\n\tconst requestedScope = provider.scopes?.join(\" \");\n\t// Explicit delegate: spreading the class instance would drop its getters.\n\tconst credentialsProvider: OAuthClientProvider = {\n\t\tget redirectUrl() {\n\t\t\treturn undefined;\n\t\t},\n\t\tget clientMetadata() {\n\t\t\treturn { ...provider.clientMetadata, scope: requestedScope };\n\t\t},\n\t\tclientInformation: () => clientInformation,\n\t\ttokens: () => undefined,\n\t\tsaveTokens: () => undefined,\n\t\tredirectToAuthorization: () => undefined,\n\t\tsaveCodeVerifier: () => undefined,\n\t\tcodeVerifier: () => {\n\t\t\tthrow new OAuthFlowError(\"no_verifier\", \"client_credentials has no PKCE verifier\", {\n\t\t\t\tserverName: provider.serverName,\n\t\t\t});\n\t\t},\n\t\tprepareTokenRequest(scope?: string) {\n\t\t\tconst params = new URLSearchParams({ grant_type: \"client_credentials\" });\n\t\t\tconst requested = scope ?? requestedScope;\n\t\t\tif (requested !== undefined && requested.length > 0) params.set(\"scope\", requested);\n\t\t\treturn params;\n\t\t},\n\t};\n\tconst tokens = await fetchToken(credentialsProvider, info.authorizationServerUrl, {\n\t\tmetadata: info.authorizationServerMetadata,\n\t\tresource: new URL(provider.serverUrl),\n\t\tfetchFn: options.fetchFn,\n\t});\n\tawait provider.saveTokens(tokens);\n}\n\nexport async function logout(provider: McpOAuthProvider): Promise<void> {\n\tawait provider.store.clear();\n}\n\nasync function discover(provider: McpOAuthProvider, options: OAuthFlowOptions): Promise<OAuthServerInfo> {\n\tif (options.discover !== undefined) return options.discover(provider.serverUrl);\n\tconst cached = provider.discoveryState();\n\tif (cached !== undefined) return cached;\n\tconst info = await discoverOAuthServerInfo(provider.serverUrl, { fetchFn: options.fetchFn });\n\tawait provider.saveDiscoveryState(toDiscoveryState(info));\n\treturn info;\n}\n\nfunction toDiscoveryState(info: OAuthServerInfo): OAuthDiscoveryState {\n\treturn {\n\t\tauthorizationServerUrl: info.authorizationServerUrl,\n\t\tauthorizationServerMetadata: info.authorizationServerMetadata,\n\t\tresourceMetadata: info.resourceMetadata,\n\t};\n}\n\nfunction parseRedirect(input: string, serverName: string): { code: string; state: string | undefined } {\n\tlet url: URL;\n\ttry {\n\t\turl = new URL(input.trim());\n\t} catch {\n\t\tthrow new OAuthFlowError(\n\t\t\t\"needs_auth\",\n\t\t\t`MCP server ${serverName} received a malformed redirect URL; paste the full http://127.0.0.1/... address from your browser.`,\n\t\t\t{ serverName },\n\t\t);\n\t}\n\tconst error = url.searchParams.get(\"error\");\n\tif (error !== null) {\n\t\tthrow new OAuthFlowError(\"needs_auth\", `MCP server ${serverName} authorization failed: ${error}`, { serverName });\n\t}\n\tconst code = url.searchParams.get(\"code\");\n\tif (code === null || code.length === 0) {\n\t\tthrow new OAuthFlowError(\n\t\t\t\"needs_auth\",\n\t\t\t`MCP server ${serverName} redirect URL has no authorization code; ensure you copied the entire address.`,\n\t\t\t{ serverName },\n\t\t);\n\t}\n\treturn { code, state: url.searchParams.get(\"state\") ?? undefined };\n}\n\nfunction isRejectedAuthorizationCode(error: unknown): boolean {\n\tconst message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();\n\treturn (\n\t\tmessage.includes(\"authorization code invalid\") ||\n\t\t(message.includes(\"authorization code\") && message.includes(\"used\")) ||\n\t\tmessage.includes(\"pkce verification failed\")\n\t);\n}\n"]}

package/dist/core/extensions/builtin/mcp/auth/token-store.d.ts

@@ -0,0 +1,45 @@
+import type { OAuthDiscoveryState } from "@modelcontextprotocol/sdk/client/auth.js";
+import type { OAuthClientInformationFull } from "@modelcontextprotocol/sdk/shared/auth.js";
+export interface McpStoredAuth {
+    accessToken?: string;
+    refreshToken?: string;
+    clientInfo?: OAuthClientInformationFull;
+    codeVerifier?: string;
+    discoveryState?: OAuthDiscoveryState;
+    resource?: string;
+    expiresAt?: number;
+}
+export interface TokenStoreLockOptions {
+    retries?: number;
+    stale?: number;
+}
+export interface TokenStoreOptions {
+    serverName: string;
+    serverUrl: string;
+    agentDir?: string;
+    lock?: TokenStoreLockOptions;
+    disableLock?: boolean;
+}
+export declare class LockAcquireError extends Error {
+    readonly lockPath: string;
+    constructor(lockPath: string, cause: unknown);
+}
+export declare function hashServerUrl(serverUrl: string): string;
+export declare class McpTokenStore<TRecord extends McpStoredAuth = McpStoredAuth> {
+    #private;
+    readonly serverName: string;
+    readonly serverUrl: string;
+    constructor(options: TokenStoreOptions);
+    get rootDir(): string;
+    get dir(): string;
+    get tokensPath(): string;
+    get lockPath(): string;
+    read(): TRecord | undefined;
+    update(mutate: (current: TRecord | undefined) => TRecord | undefined): Promise<TRecord | undefined>;
+    write(record: TRecord): Promise<void>;
+    withLock<T>(fn: () => Promise<T> | T): Promise<T>;
+    readUnlocked(): TRecord | undefined;
+    writeUnlocked(record: TRecord | undefined): void;
+    clear(): Promise<void>;
+}
+//# sourceMappingURL=token-store.d.ts.map

package/dist/core/extensions/builtin/mcp/auth/token-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token-store.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/auth/token-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAM3F,MAAM,WAAW,aAAa;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,0BAA0B,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,qBAAqB,CAAC;IAG7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB;AAOD,qBAAa,gBAAiB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,YAAY,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAM3C;CACD;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,qBAAa,aAAa,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa;;IACvE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAM3B,YAAY,OAAO,EAAE,iBAAiB,EAOrC;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IACD,IAAI,GAAG,IAAI,MAAM,CAEhB;IACD,IAAI,UAAU,IAAI,MAAM,CAEvB;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,IAAI,OAAO,GAAG,SAAS,CAE1B;IAEK,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,KAAK,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAcxG;IAEK,KAAK,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1C;IAKK,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAOtD;IAED,YAAY,IAAI,OAAO,GAAG,SAAS,CAElC;IAED,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAO/C;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ3B;CA2CD"}