@qduc/term2 0.24.1 → 0.25.0

package/dist/services/mcp/mcp-oauth-login.js

@@ -0,0 +1,126 @@
+/**
+ * The interactive half of MCP OAuth: bind a loopback redirect, drive the SDK's
+ * `auth()` through both legs, and persist the result via {@linkcode McpOAuthProvider}.
+ *
+ * This module owns the *mechanics* of a login, never the *policy* of when one
+ * may start. Plan decision D1 (2026-09-18) puts the trigger behind an explicit
+ * `/mcp-login <server>`: nothing here runs on its own, so a server returning 401
+ * mid-session can never pop a browser window. The connection manager only ever
+ * refreshes silently (see {@linkcode McpInteractiveLoginRequiredError}).
+ *
+ * Redirect ports follow D3: an ephemeral port first (RFC 8252), falling back to
+ * the server's configured `redirectPorts` for authorization servers that match
+ * the redirect against a registered allow-list.
+ */
+import { auth as sdkAuth } from '@modelcontextprotocol/client';
+import { awaitLoopbackCallback, bindLoopbackRedirect, closeLoopbackServer, openInBrowser, } from '../../lib/oauth-loopback.js';
+import { McpOAuthProvider } from './mcp-oauth-provider.js';
+const CALLBACK_PATH = '/mcp-oauth-callback';
+/**
+ * Thrown by a refresh-only provider when the SDK concludes the user must visit
+ * an authorization server. The connection manager turns this into the
+ * `needs-auth` state rather than a browser window.
+ */
+export class McpInteractiveLoginRequiredError extends Error {
+    serverName;
+    constructor(serverName) {
+        super(`MCP server "${serverName}" requires an interactive OAuth login`);
+        this.serverName = serverName;
+        this.name = 'McpInteractiveLoginRequiredError';
+    }
+}
+/** The exact text a user acts on when a server is waiting for a login. */
+export const mcpNeedsAuthMessage = (serverName) => `run /mcp-login ${serverName} to authenticate`;
+/**
+ * Runs a full OAuth login for one MCP server and stores the tokens.
+ *
+ * Resolves without opening a browser when the stored refresh token still works,
+ * so re-running `/mcp-login` on a healthy server is cheap and safe.
+ */
+export async function runMcpOAuthLogin(options) {
+    const auth = options.auth ?? sdkAuth;
+    const open = options.openBrowser ?? openInBrowser;
+    // Port 0 first (RFC 8252); the configured list only exists so a server that
+    // pins its redirect URI still works, not to find a free port.
+    const ports = [0, ...(options.redirectPorts ?? [])];
+    const { server, port } = await bindLoopbackRedirect({
+        ports,
+        label: `MCP server "${options.serverName}"`,
+        portConflictHint: 'another login may be in progress',
+    });
+    const redirectUri = `http://127.0.0.1:${port}${CALLBACK_PATH}`;
+    const flow = {
+        label: `MCP server "${options.serverName}"`,
+        callbackPath: CALLBACK_PATH,
+        redirectUri,
+        exampleCallbackUrl: `${redirectUri}?code=...&state=...`,
+    };
+    let authorizationUrl;
+    const provider = new McpOAuthProvider({
+        store: options.store,
+        serverUrl: options.serverUrl,
+        redirectUrl: redirectUri,
+        ...(options.clientMetadataUrl !== undefined ? { clientMetadataUrl: options.clientMetadataUrl } : {}),
+        ...(options.clientId !== undefined ? { clientId: options.clientId } : {}),
+        onAuthorizationRedirect: (url) => {
+            authorizationUrl = url;
+        },
+    });
+    try {
+        const first = await auth(provider, { serverUrl: options.serverUrl });
+        if (first === 'AUTHORIZED') {
+            // A stored refresh token still works; no browser round trip needed.
+            return { interactive: false, ...issuerOf(provider) };
+        }
+        if (authorizationUrl === undefined) {
+            throw new Error(`OAuth login for "${options.serverName}" produced no authorization URL`);
+        }
+        options.onAuthorizationUrl?.(authorizationUrl.toString());
+        open(authorizationUrl.toString());
+        // `state` is bound by the provider when the SDK built the URL; the listener
+        // rejects any callback that does not carry it back.
+        const expectedState = provider.authorizationState;
+        if (expectedState === undefined) {
+            throw new Error(`OAuth login for "${options.serverName}" started without a state parameter`);
+        }
+        const code = await awaitLoopbackCallback(server, flow, expectedState, {
+            ...(options.signal ? { signal: options.signal } : {}),
+        });
+        const second = await auth(provider, { serverUrl: options.serverUrl, authorizationCode: code });
+        if (second !== 'AUTHORIZED') {
+            throw new Error(`OAuth login for "${options.serverName}" ended in state ${second} instead of AUTHORIZED`);
+        }
+        return { interactive: true, ...issuerOf(provider) };
+    }
+    finally {
+        // The browser holds a keep-alive socket on the callback port; without this
+        // the next login on a configured (non-ephemeral) port would fail to bind.
+        closeLoopbackServer(server);
+    }
+}
+const issuerOf = (provider) => {
+    const issuer = provider.tokens()?.issuer;
+    return issuer !== undefined ? { issuer } : {};
+};
+/**
+ * A provider that persists and refreshes but refuses to send the user anywhere.
+ *
+ * Handed to HTTP transports so an expired access token is renewed silently
+ * mid-session, while a genuinely unauthenticated server surfaces as `needs-auth`
+ * instead of hijacking the terminal with a browser launch.
+ */
+export function createRefreshOnlyProvider(options) {
+    return new McpOAuthProvider({
+        store: options.store,
+        serverUrl: options.serverUrl,
+        // No listener is bound on this path. The value is only read when the SDK
+        // builds an authorization URL, which the throw below always preempts.
+        redirectUrl: `http://127.0.0.1:0${CALLBACK_PATH}`,
+        ...(options.clientMetadataUrl !== undefined ? { clientMetadataUrl: options.clientMetadataUrl } : {}),
+        ...(options.clientId !== undefined ? { clientId: options.clientId } : {}),
+        onAuthorizationRedirect: () => {
+            throw new McpInteractiveLoginRequiredError(options.serverName);
+        },
+    });
+}
+//# sourceMappingURL=mcp-oauth-login.js.map

package/dist/services/mcp/mcp-oauth-login.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-oauth-login.js","sourceRoot":"","sources":["../../../source/services/mcp/mcp-oauth-login.ts"],"names":[],"mappings":"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"}

package/dist/services/mcp/mcp-oauth-provider.d.ts

@@ -0,0 +1,77 @@
+import { type OAuthClientInformationContext, type OAuthClientMetadata, type OAuthClientProvider, type OAuthDiscoveryState, type StoredOAuthClientInformation, type StoredOAuthTokens } from '@modelcontextprotocol/client';
+import type { McpOAuthCredentialScope, McpOAuthStore } from './mcp-oauth-store.js';
+/** The client name authorization servers (and the user) see in consent screens. */
+export declare const MCP_OAUTH_CLIENT_NAME = "term2-mcp";
+export type McpOAuthProviderOptions = {
+    /** Credential storage, keyed by server URL and issuer. */
+    store: McpOAuthStore;
+    /** The MCP server URL from the config; the credential storage key. */
+    serverUrl: string;
+    /**
+     * The loopback redirect URI. A thunk when the port is only known after the
+     * listener is bound — the SDK reads `redirectUrl` before the redirect is
+     * built, so the bound port must be in place by then.
+     */
+    redirectUrl: string | (() => string);
+    /**
+     * CIMD: an HTTPS URL the authorization server fetches client metadata from,
+     * replacing dynamic client registration.
+     */
+    clientMetadataUrl?: string;
+    /**
+     * A pre-registered client id from config. When set, the SDK never attempts
+     * dynamic registration, which is the only way to reach an authorization
+     * server that offers neither DCR nor CIMD.
+     */
+    clientId?: string;
+    /**
+     * Receives the authorization URL. Opening a browser, prompting the user, or
+     * refusing (non-interactive, project server) is the caller's policy; this
+     * adapter only reports what the SDK asked for.
+     */
+    onAuthorizationRedirect: (authorizationUrl: URL) => void | Promise<void>;
+    /** PKCE state factory, injectable for deterministic tests. */
+    createState?: () => string;
+};
+/**
+ * The `OAuthClientProvider` the MCP SDK's `auth()` drives, backed by
+ * `McpOAuthStore`.
+ *
+ * Everything policy-shaped is injected: this class decides nothing about when a
+ * login may start, which authorization server is acceptable, or how the user is
+ * sent there. It persists what the SDK hands it and returns what the SDK asks
+ * for, keyed by the server URL — never by the config entry's name, so renaming a
+ * server in `.mcp.json` cannot reach another server's token.
+ */
+export declare class McpOAuthProvider implements OAuthClientProvider {
+    /** CIMD URL, when the server publishes one; `undefined` falls back to DCR. */
+    readonly clientMetadataUrl?: string;
+    private readonly options;
+    /** The state most recently handed to the SDK, for callback validation. */
+    private pendingState?;
+    constructor(options: McpOAuthProviderOptions);
+    get redirectUrl(): string;
+    get clientMetadata(): OAuthClientMetadata;
+    /**
+     * The `state` the SDK puts in the authorization URL, recorded so the loopback
+     * listener can reject a callback that did not come from this request.
+     */
+    state(): string;
+    get authorizationState(): string | undefined;
+    /**
+     * With no issuer there is no way to tell an unregistered client from another
+     * authorization server's, and the SDK's contract for that call is "undefined
+     * means not registered" — never another server's credential.
+     */
+    clientInformation(ctx?: OAuthClientInformationContext): StoredOAuthClientInformation | undefined;
+    saveClientInformation(clientInformation: StoredOAuthClientInformation, ctx?: OAuthClientInformationContext): void;
+    tokens(ctx?: OAuthClientInformationContext): StoredOAuthTokens | undefined;
+    saveTokens(tokens: StoredOAuthTokens, ctx?: OAuthClientInformationContext): void;
+    redirectToAuthorization(authorizationUrl: URL): void | Promise<void>;
+    saveCodeVerifier(codeVerifier: string): void;
+    codeVerifier(): string;
+    saveDiscoveryState(state: OAuthDiscoveryState): void;
+    discoveryState(): OAuthDiscoveryState | undefined;
+    invalidateCredentials(scope: McpOAuthCredentialScope): void;
+}
+//# sourceMappingURL=mcp-oauth-provider.d.ts.map

package/dist/services/mcp/mcp-oauth-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-oauth-provider.d.ts","sourceRoot":"","sources":["../../../source/services/mcp/mcp-oauth-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,iBAAiB,EACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEnF,mFAAmF;AACnF,eAAO,MAAM,qBAAqB,cAAc,CAAC;AAEjD,MAAM,MAAM,uBAAuB,GAAG;IACpC,0DAA0D;IAC1D,KAAK,EAAE,aAAa,CAAC;IACrB,sEAAsE;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,WAAW,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACrC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,uBAAuB,EAAE,CAAC,gBAAgB,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE,8DAA8D;IAC9D,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B,CAAC;AAoBF;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,YAAW,mBAAmB;IAC1D,8EAA8E;IAC9E,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,0EAA0E;IAC1E,OAAO,CAAC,YAAY,CAAC,CAAS;IAE9B,YAAY,OAAO,EAAE,uBAAuB,EAI3C;IAED,IAAI,WAAW,IAAI,MAAM,CAGxB;IAED,IAAI,cAAc,IAAI,mBAAmB,CAUxC;IAED;;;OAGG;IACH,KAAK,IAAI,MAAM,CAGd;IAED,IAAI,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAE3C;IAED;;;;OAIG;IACH,iBAAiB,CAAC,GAAG,CAAC,EAAE,6BAA6B,GAAG,4BAA4B,GAAG,SAAS,CAW/F;IAED,qBAAqB,CAAC,iBAAiB,EAAE,4BAA4B,EAAE,GAAG,CAAC,EAAE,6BAA6B,GAAG,IAAI,CAMhH;IAED,MAAM,CAAC,GAAG,CAAC,EAAE,6BAA6B,GAAG,iBAAiB,GAAG,SAAS,CAEzE;IAED,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,6BAA6B,GAAG,IAAI,CAG/E;IAED,uBAAuB,CAAC,gBAAgB,EAAE,GAAG,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;IAED,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAE3C;IAED,YAAY,IAAI,MAAM,CAQrB;IAED,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,CAEnD;IAED,cAAc,IAAI,mBAAmB,GAAG,SAAS,CAEhD;IAED,qBAAqB,CAAC,KAAK,EAAE,uBAAuB,GAAG,IAAI,CAE1D;CACF"}

package/dist/services/mcp/mcp-oauth-provider.js

@@ -0,0 +1,121 @@
+import crypto from 'node:crypto';
+import { validateClientMetadataUrl, } from '@modelcontextprotocol/client';
+/** The client name authorization servers (and the user) see in consent screens. */
+export const MCP_OAUTH_CLIENT_NAME = 'term2-mcp';
+function defaultState() {
+    return crypto.randomBytes(16).toString('base64url');
+}
+function requireIssuer(ctx, stampedIssuer, method) {
+    const issuer = ctx?.issuer ?? stampedIssuer;
+    if (!issuer) {
+        // Guessing would risk filing one authorization server's credential under
+        // another's. The SDK always passes a context when it saves.
+        throw new Error(`McpOAuthProvider.${method} requires the authorization server issuer`);
+    }
+    return issuer;
+}
+/**
+ * The `OAuthClientProvider` the MCP SDK's `auth()` drives, backed by
+ * `McpOAuthStore`.
+ *
+ * Everything policy-shaped is injected: this class decides nothing about when a
+ * login may start, which authorization server is acceptable, or how the user is
+ * sent there. It persists what the SDK hands it and returns what the SDK asks
+ * for, keyed by the server URL — never by the config entry's name, so renaming a
+ * server in `.mcp.json` cannot reach another server's token.
+ */
+export class McpOAuthProvider {
+    /** CIMD URL, when the server publishes one; `undefined` falls back to DCR. */
+    clientMetadataUrl;
+    options;
+    /** The state most recently handed to the SDK, for callback validation. */
+    pendingState;
+    constructor(options) {
+        validateClientMetadataUrl(options.clientMetadataUrl);
+        this.options = options;
+        this.clientMetadataUrl = options.clientMetadataUrl;
+    }
+    get redirectUrl() {
+        const { redirectUrl } = this.options;
+        return typeof redirectUrl === 'function' ? redirectUrl() : redirectUrl;
+    }
+    get clientMetadata() {
+        return {
+            client_name: MCP_OAUTH_CLIENT_NAME,
+            redirect_uris: [this.redirectUrl],
+            // `refresh_token` is declared because term2 does refresh: the SDK only
+            // appends the `offline_access` scope when the client metadata says so.
+            grant_types: ['authorization_code', 'refresh_token'],
+            response_types: ['code'],
+            token_endpoint_auth_method: 'none',
+        };
+    }
+    /**
+     * The `state` the SDK puts in the authorization URL, recorded so the loopback
+     * listener can reject a callback that did not come from this request.
+     */
+    state() {
+        this.pendingState = (this.options.createState ?? defaultState)();
+        return this.pendingState;
+    }
+    get authorizationState() {
+        return this.pendingState;
+    }
+    /**
+     * With no issuer there is no way to tell an unregistered client from another
+     * authorization server's, and the SDK's contract for that call is "undefined
+     * means not registered" — never another server's credential.
+     */
+    clientInformation(ctx) {
+        const stored = ctx?.issuer
+            ? this.options.store.getClientInformation(this.options.serverUrl, ctx.issuer)
+            : undefined;
+        if (stored)
+            return stored;
+        // A configured client id is not bound to an issuer the way a dynamically
+        // registered one is: the user registered this app themselves, for this
+        // server, so it is returned even when the SDK asks without a context.
+        // Returning it here is what stops `auth()` from attempting registration.
+        if (this.options.clientId)
+            return { client_id: this.options.clientId };
+        return undefined;
+    }
+    saveClientInformation(clientInformation, ctx) {
+        // A configured client id is owned by config, not by the store; persisting a
+        // copy would leave a stale credential behind if the user later changes it.
+        if (this.options.clientId)
+            return;
+        const issuer = requireIssuer(ctx, clientInformation.issuer, 'saveClientInformation');
+        this.options.store.saveClientInformation(this.options.serverUrl, issuer, clientInformation);
+    }
+    tokens(ctx) {
+        return this.options.store.getTokens(this.options.serverUrl, ctx?.issuer);
+    }
+    saveTokens(tokens, ctx) {
+        const issuer = requireIssuer(ctx, tokens.issuer, 'saveTokens');
+        this.options.store.saveTokens(this.options.serverUrl, issuer, tokens);
+    }
+    redirectToAuthorization(authorizationUrl) {
+        return this.options.onAuthorizationRedirect(authorizationUrl);
+    }
+    saveCodeVerifier(codeVerifier) {
+        this.options.store.saveCodeVerifier(this.options.serverUrl, codeVerifier);
+    }
+    codeVerifier() {
+        const verifier = this.options.store.getCodeVerifier(this.options.serverUrl);
+        if (!verifier) {
+            throw new Error(`No PKCE code verifier is stored for ${this.options.serverUrl}; the authorization flow must save one before the token exchange`);
+        }
+        return verifier;
+    }
+    saveDiscoveryState(state) {
+        this.options.store.saveDiscoveryState(this.options.serverUrl, state);
+    }
+    discoveryState() {
+        return this.options.store.getDiscoveryState(this.options.serverUrl);
+    }
+    invalidateCredentials(scope) {
+        this.options.store.invalidateCredentials(this.options.serverUrl, scope);
+    }
+}
+//# sourceMappingURL=mcp-oauth-provider.js.map

package/dist/services/mcp/mcp-oauth-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-oauth-provider.js","sourceRoot":"","sources":["../../../source/services/mcp/mcp-oauth-provider.ts"],"names":[],"mappings":"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"}

package/dist/services/mcp/mcp-oauth-store.d.ts

@@ -0,0 +1,106 @@
+import fs from 'node:fs';
+import type { OAuthDiscoveryState, StoredOAuthClientInformation, StoredOAuthTokens } from '@modelcontextprotocol/client';
+/**
+ * Credential storage for MCP servers that authenticate with OAuth.
+ *
+ * One file holds every server's credentials, keyed by the server URL from the
+ * config rather than by the config entry's name: renaming `"linear"` to
+ * `"linear-remote"` in `.mcp.json` must not lose the login, and pointing a
+ * different entry at another URL must never reach a token issued for this one.
+ *
+ * Within a server, client information and tokens are sub-keyed by the
+ * authorization server's `issuer` (stamped by the SDK on every save), because a
+ * client id is only meaningful to the authorization server that issued it. The
+ * PKCE code verifier and the discovery state have no issuer — the SDK passes no
+ * context for them — so they belong to the server entry itself.
+ *
+ * This is the persistence half of `OAuthClientProvider`; the policy half (when
+ * to log in, whether to open a browser) lives in `mcp-oauth-provider.ts` and its
+ * caller.
+ */
+export declare const MCP_OAUTH_STORE_VERSION = 1;
+export type McpOAuthCredentialScope = 'all' | 'client' | 'tokens' | 'verifier' | 'discovery';
+export type McpOAuthIssuerEntry = {
+    client?: StoredOAuthClientInformation;
+    tokens?: StoredOAuthTokens;
+};
+export type McpOAuthServerEntry = {
+    byIssuer: Record<string, McpOAuthIssuerEntry>;
+    /**
+     * The issuer whose tokens were saved most recently. The transport reads
+     * `tokens()` with no context on every request, and a server has one usable
+     * token set at a time, so that read must be unambiguous.
+     */
+    lastIssuer?: string;
+    /** Survives the redirect round-trip; the token exchange needs it back. */
+    codeVerifier?: string;
+    /** Cached RFC 9728/RFC 8414 discovery, so re-auth skips the HTTP probes. */
+    discovery?: OAuthDiscoveryState;
+};
+export type McpOAuthStoreFile = {
+    version: number;
+    servers: Record<string, McpOAuthServerEntry>;
+};
+export type McpOAuthStoreOptions = {
+    /** Absolute path to the credential file. Defaults to `defaultMcpOAuthStorePath()`. */
+    filePath?: string;
+    /** Injectable filesystem seam for failure/cleanup tests. */
+    filesystem?: typeof fs;
+};
+/** term2's own MCP credential file, beside `grok-auth.json` and `codex-auth.json`. */
+export declare function defaultMcpOAuthStorePath(): string;
+/**
+ * The storage key for a server URL: lowercase scheme and host, no default port,
+ * no trailing slash, no query or fragment.
+ *
+ * The path keeps its case — URLs are only case-insensitive before the path — and
+ * a URL that cannot be parsed is keyed by its trimmed text, which keeps the
+ * function total while still giving two spellings of one bad string the same key.
+ */
+export declare function normalizeMcpServerUrl(raw: string): string;
+export declare class McpOAuthStore {
+    private readonly filesystem;
+    private readonly filePath;
+    constructor(options?: McpOAuthStoreOptions);
+    get path(): string;
+    /**
+     * Reads the store. A missing, unreadable, or corrupt file is an empty store:
+     * a credential file is not worth crashing a session over, and the next write
+     * replaces the damaged body.
+     */
+    read(): McpOAuthStoreFile;
+    getClientInformation(serverUrl: string, issuer: string): StoredOAuthClientInformation | undefined;
+    saveClientInformation(serverUrl: string, issuer: string, client: StoredOAuthClientInformation): void;
+    /**
+     * Reads stored tokens. With no issuer, returns the most recently saved set —
+     * the transport's per-request read, which must not come back empty just
+     * because it has no context.
+     */
+    getTokens(serverUrl: string, issuer?: string): StoredOAuthTokens | undefined;
+    saveTokens(serverUrl: string, issuer: string, tokens: StoredOAuthTokens): void;
+    getCodeVerifier(serverUrl: string): string | undefined;
+    saveCodeVerifier(serverUrl: string, codeVerifier: string): void;
+    getDiscoveryState(serverUrl: string): OAuthDiscoveryState | undefined;
+    saveDiscoveryState(serverUrl: string, discovery: OAuthDiscoveryState): void;
+    /**
+     * Forgets one class of credential for a server. Scopes are the SDK's: the
+     * transport calls `'client'` and `'tokens'` when the server rejects them,
+     * and hosts call `'discovery'` after repeated 401s so a changed
+     * `authorization_servers` list is picked up.
+     *
+     * `'client'` and `'tokens'` clear every issuer's entry, because the call
+     * carries no issuer and the rejected credential may be any of them.
+     */
+    invalidateCredentials(serverUrl: string, scope: McpOAuthCredentialScope): void;
+    private serverEntry;
+    /** Applies one mutation and writes the whole store back atomically. */
+    private update;
+    /**
+     * Writes through a temporary file in the same directory, fsynced before the
+     * rename, so a reader — including another term2 instance — sees either the old
+     * file or the complete new one, never a half-written credential file.
+     */
+    private write;
+    private sweepTemporaryFiles;
+}
+//# sourceMappingURL=mcp-oauth-store.d.ts.map

package/dist/services/mcp/mcp-oauth-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-oauth-store.d.ts","sourceRoot":"","sources":["../../../source/services/mcp/mcp-oauth-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,OAAO,KAAK,EACV,mBAAmB,EACnB,4BAA4B,EAC5B,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AAEtC;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,MAAM,MAAM,uBAAuB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;AAE7F,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,4BAA4B,CAAC;IACtC,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC9C;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4EAA4E;IAC5E,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,sFAAsF;IACtF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;CACxB,CAAC;AAEF,sFAAsF;AACtF,wBAAgB,wBAAwB,IAAI,MAAM,CAGjD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAuBzD;AAcD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAElC,YAAY,OAAO,GAAE,oBAAyB,EAI7C;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACH,IAAI,IAAI,iBAAiB,CA4BxB;IAED,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,4BAA4B,GAAG,SAAS,CAEhG;IAED,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAKnG;IAED;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAM3E;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAM7E;IAED,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErD;IAED,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAK9D;IAED,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAEpE;IAED,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,mBAAmB,GAAG,IAAI,CAK1E;IAED;;;;;;;;OAQG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB,GAAG,IAAI,CAqB7E;IAED,OAAO,CAAC,WAAW;IAInB,uEAAuE;IACvE,OAAO,CAAC,MAAM;IASd;;;;OAIG;IACH,OAAO,CAAC,KAAK;IA+Bb,OAAO,CAAC,mBAAmB;CAkB5B"}