@agent-native/core 0.154.3 → 0.154.5

package/dist/mcp-client/remote-store.js

@@ -23,7 +23,7 @@ import { createHash } from "node:crypto";
 import { writeAppSecret, readAppSecret, deleteAppSecret, } from "../secrets/storage.js";
 import { getOrgSetting, putOrgSetting, deleteOrgSetting, } from "../settings/org-settings.js";
 import { getUserSetting, putUserSetting, deleteUserSetting, } from "../settings/user-settings.js";
-import { deleteMcpOAuthCredentials, getMcpOAuthAccessToken, saveMcpOAuthCredentials, } from "./oauth-client.js";
+import { getMcpOAuthAccessToken, revokeMcpOAuthCredentials, saveMcpOAuthCredentials, } from "./oauth-client.js";
 import { validateRemoteUrl } from "./remote-url.js";
 export { validateRemoteUrl } from "./remote-url.js";
 const SETTINGS_KEY = "mcp-servers-remote";
@@ -140,35 +140,53 @@ export async function addRemoteServer(scope, scopeId, input) {
  * stored separately from the settings row and never returned to clients.
  */
 export async function addOAuthRemoteServer(scope, scopeId, input) {
+    const serverUrl = validateRemoteUrl(input.url);
+    const credentialResource = validateRemoteUrl(input.credentials.serverUrl);
+    if (!serverUrl.ok ||
+        !serverUrl.url ||
+        !credentialResource.ok ||
+        !credentialResource.url ||
+        serverUrl.url.toString() !== credentialResource.url.toString()) {
+        return {
+            ok: false,
+            error: "MCP server URL must match the OAuth credential resource URL",
+        };
+    }
+    const credentials = {
+        ...input.credentials,
+        serverUrl: credentialResource.url.toString(),
+    };
     const oauthSecretKey = `mcp_oauth:${shortId()}`;
     try {
         await saveMcpOAuthCredentials({
             key: oauthSecretKey,
             scope,
             scopeId,
-            credentials: input.credentials,
+            credentials,
         });
         const result = await addRemoteServerInternal(scope, scopeId, {
             name: input.name,
-            url: input.url,
+            url: credentials.serverUrl,
             description: input.description,
             oauthSecretKey,
         });
         if (!result.ok) {
-            await deleteMcpOAuthCredentials({
+            await revokeMcpOAuthCredentials({
                 key: oauthSecretKey,
                 scope,
                 scopeId,
-            });
+                serverUrl: credentials.serverUrl,
+            }).catch(() => undefined);
         }
         return result;
     }
     catch (err) {
-        await deleteMcpOAuthCredentials({
+        await revokeMcpOAuthCredentials({
             key: oauthSecretKey,
             scope,
             scopeId,
-        }).catch(() => { });
+            serverUrl: credentials.serverUrl,
+        }).catch(() => undefined);
         return {
             ok: false,
             error: `Failed to save MCP OAuth credentials: ${err?.message ?? err}`,
@@ -311,6 +329,27 @@ export async function removeRemoteServer(scope, scopeId, id) {
     const next = existing.filter((s) => s.id !== id);
     if (next.length === existing.length)
         return false;
+    if (removed?.oauthSecretKey) {
+        try {
+            const result = await revokeMcpOAuthCredentials({
+                key: removed.oauthSecretKey,
+                scope,
+                scopeId,
+                serverUrl: removed.url,
+            });
+            if (result.local === "replaced") {
+                console.warn(`[mcp-client] MCP OAuth credentials changed while removing ${removed.name}; the server was kept so the newer connection remains manageable.`);
+                return false;
+            }
+            if (result.remote === "failed") {
+                console.warn(`[mcp-client] MCP OAuth revocation failed for ${removed.name}; local credentials were removed.`);
+            }
+        }
+        catch (err) {
+            // eslint-disable-next-line no-console
+            console.warn(`[mcp-client] Failed to delete MCP OAuth credentials ${removed.oauthSecretKey}: ${err?.message ?? err}`);
+        }
+    }
     if (next.length === 0) {
         if (scope === "user") {
             await deleteUserSetting(scopeId, SETTINGS_KEY);
@@ -338,19 +377,6 @@ export async function removeRemoteServer(scope, scopeId, id) {
             console.warn(`[mcp-client] Failed to delete MCP header secret ${removed.headerSecretKey}: ${err?.message ?? err}`);
         }
     }
-    if (removed?.oauthSecretKey) {
-        try {
-            await deleteMcpOAuthCredentials({
-                key: removed.oauthSecretKey,
-                scope,
-                scopeId,
-            });
-        }
-        catch (err) {
-            // eslint-disable-next-line no-console
-            console.warn(`[mcp-client] Failed to delete MCP OAuth credentials ${removed.oauthSecretKey}: ${err?.message ?? err}`);
-        }
-    }
     return true;
 }
 /**

package/dist/notifications/routes.d.ts

@@ -28,6 +28,6 @@ export declare function createNotificationsHandler(): import("h3").EventHandlerW
 } | {
     count?: undefined;
     updated?: undefined;
-    error?: undefined;
     ok: boolean;
+    error?: undefined;
 }>>;

package/dist/oauth-tokens/index.d.ts

@@ -1,2 +1,3 @@
-export { getOAuthTokens, OAuthAccountOwnedByOtherUserError, saveOAuthTokens, deleteOAuthTokens, listOAuthAccounts, listOAuthAccountsByOwner, hasOAuthTokens, setOAuthDisplayName, } from "./store.js";
+export { getOAuthTokens, getOAuthTokenSnapshot, OAuthAccountOwnedByOtherUserError, saveOAuthTokens, replaceOAuthTokensIfRevision, deleteOAuthTokens, deleteOAuthTokensIfRevision, listOAuthAccounts, listOAuthAccountsByOwner, hasOAuthTokens, setOAuthDisplayName, } from "./store.js";
+export { readOAuthCredentialState, resolveOAuthCredentialAccess, revokeOAuthCredential, saveOAuthCredential, type OAuthCredential, type OAuthCredentialIdentity, type OAuthCredentialOwner, type OAuthCredentialState, type OAuthRevocationResult, } from "./lifecycle.js";
 export { refreshExpiringGoogleTokens, startGoogleTokenRefreshLoop, } from "./google-refresh.js";

package/dist/oauth-tokens/index.js

@@ -1,2 +1,3 @@
-export { getOAuthTokens, OAuthAccountOwnedByOtherUserError, saveOAuthTokens, deleteOAuthTokens, listOAuthAccounts, listOAuthAccountsByOwner, hasOAuthTokens, setOAuthDisplayName, } from "./store.js";
+export { getOAuthTokens, getOAuthTokenSnapshot, OAuthAccountOwnedByOtherUserError, saveOAuthTokens, replaceOAuthTokensIfRevision, deleteOAuthTokens, deleteOAuthTokensIfRevision, listOAuthAccounts, listOAuthAccountsByOwner, hasOAuthTokens, setOAuthDisplayName, } from "./store.js";
+export { readOAuthCredentialState, resolveOAuthCredentialAccess, revokeOAuthCredential, saveOAuthCredential, } from "./lifecycle.js";
 export { refreshExpiringGoogleTokens, startGoogleTokenRefreshLoop, } from "./google-refresh.js";

package/dist/oauth-tokens/lifecycle.d.ts

@@ -0,0 +1,87 @@
+export interface OAuthCredentialOwner {
+    scope: "user" | "org";
+    id: string;
+}
+export interface OAuthCredentialIdentity {
+    provider: string;
+    accountId: string;
+    resource: string;
+    owner: OAuthCredentialOwner;
+}
+export interface OAuthCredentialTokens {
+    access_token: string;
+    refresh_token?: string;
+    [key: string]: unknown;
+}
+interface OAuthLifecycleMetadata {
+    version: 1;
+    provider: string;
+    resource: string;
+    owner: string;
+    reconnectReason?: "refresh_failed";
+}
+export interface OAuthCredential {
+    tokens: OAuthCredentialTokens;
+    tokenExpiresAt?: number;
+    oauthLifecycle?: OAuthLifecycleMetadata;
+    [key: string]: unknown;
+}
+interface CredentialSnapshot<T extends OAuthCredential> {
+    credential: T;
+    revision: number;
+    legacyRevision: number;
+}
+export type OAuthCredentialState<T extends OAuthCredential = OAuthCredential> = {
+    kind: "missing";
+} | {
+    kind: "malformed";
+    revision: number;
+    legacyRevision: number;
+    reason: "structure" | "identity" | "validation";
+} | ({
+    kind: "connected" | "expired" | "reconnect_required";
+} & CredentialSnapshot<T>);
+export interface OAuthCredentialAccessResult<T extends OAuthCredential = OAuthCredential> {
+    state: OAuthCredentialState<T>;
+    accessToken: string | null;
+}
+export interface OAuthRefreshContext<T extends OAuthCredential> {
+    identity: OAuthCredentialIdentity;
+    credential: T;
+}
+export interface OAuthRevocationResult {
+    remote: "succeeded" | "failed" | "unsupported" | "not_attempted";
+    local: "deleted" | "missing" | "replaced";
+}
+interface LifecycleDependencies {
+    now: () => number;
+    sleep: (ms: number) => Promise<void>;
+    holderId: () => string;
+}
+export declare function saveOAuthCredential<T extends OAuthCredential>(identity: OAuthCredentialIdentity, credential: T, options?: {
+    legacyAccountKey?: boolean;
+}): Promise<void>;
+export declare function readOAuthCredentialState<T extends OAuthCredential = OAuthCredential>(identity: OAuthCredentialIdentity, options?: {
+    allowLegacy?: boolean;
+    legacyAccountKey?: boolean;
+    now?: number;
+    validateCredential?: (credential: T) => boolean;
+}): Promise<OAuthCredentialState<T>>;
+export declare function resolveOAuthCredentialAccess<T extends OAuthCredential = OAuthCredential>(identity: OAuthCredentialIdentity, options: {
+    refresh: (context: OAuthRefreshContext<T>) => Promise<T>;
+    allowLegacy?: boolean;
+    legacyAccountKey?: boolean;
+    validateCredential?: (credential: T) => boolean;
+    expirySkewMs?: number;
+    leaseMs?: number;
+    waitMs?: number;
+    maxWaitMs?: number;
+    dependencies?: Partial<LifecycleDependencies>;
+}): Promise<OAuthCredentialAccessResult<T>>;
+export declare function revokeOAuthCredential<T extends OAuthCredential>(identity: OAuthCredentialIdentity, options?: {
+    revoke?: (context: OAuthRefreshContext<T>) => Promise<"succeeded" | "unsupported">;
+    allowLegacy?: boolean;
+    legacyAccountKey?: boolean;
+    validateCredential?: (credential: T) => boolean;
+}): Promise<OAuthRevocationResult>;
+export {};

package/dist/oauth-tokens/lifecycle.js

@@ -0,0 +1,434 @@
+import { createHash, randomUUID } from "node:crypto";
+import { mutateSetting } from "../settings/store.js";
+import { deleteOAuthTokensIfRevision, getOAuthTokenSnapshot, getOAuthTokenSnapshotForUserOwner, replaceOAuthTokensIfRevision, saveOAuthTokens, } from "./store.js";
+const DEFAULT_EXPIRY_SKEW_MS = 60_000;
+const DEFAULT_LEASE_MS = 15_000;
+const DEFAULT_WAIT_MS = 50;
+const DEFAULT_MAX_WAIT_MS = 20_000;
+const LIFECYCLE_VERSION = 1;
+const defaultDependencies = {
+    now: () => Date.now(),
+    sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+    holderId: () => randomUUID(),
+};
+function ownerKey(owner) {
+    const id = owner.id.trim();
+    if (!id)
+        throw new Error("OAuth credential owner is required.");
+    return `${owner.scope}:${owner.scope === "user" ? id.toLowerCase() : id}`;
+}
+function legacyOwnerKey(owner) {
+    const id = owner.id.trim();
+    if (!id)
+        throw new Error("OAuth credential owner is required.");
+    return `${owner.scope}:${id}`;
+}
+function assertIdentity(identity) {
+    if (!identity.provider.trim())
+        throw new Error("OAuth provider is required.");
+    if (!identity.accountId.trim()) {
+        throw new Error("OAuth account id is required.");
+    }
+    if (!identity.resource.trim())
+        throw new Error("OAuth resource is required.");
+    ownerKey(identity.owner);
+}
+function lifecycleMetadata(identity, reconnectReason) {
+    return {
+        version: LIFECYCLE_VERSION,
+        provider: identity.provider,
+        resource: identity.resource,
+        owner: ownerKey(identity.owner),
+        ...(reconnectReason ? { reconnectReason } : {}),
+    };
+}
+function withLifecycle(identity, credential, reconnectReason) {
+    return {
+        ...credential,
+        oauthLifecycle: lifecycleMetadata(identity, reconnectReason),
+    };
+}
+function metadataMatches(identity, metadata) {
+    return Boolean(metadata &&
+        metadata.version === LIFECYCLE_VERSION &&
+        metadata.provider === identity.provider &&
+        metadata.resource === identity.resource &&
+        metadata.owner === ownerKey(identity.owner));
+}
+function leaseKey(identity) {
+    const digest = createHash("sha256")
+        .update(JSON.stringify([
+        identity.provider,
+        identity.accountId,
+        identity.resource,
+        ownerKey(identity.owner),
+    ]))
+        .digest("hex");
+    return `oauth-refresh-lease:${digest}`;
+}
+function storageAccountId(identity, legacyAccountKey = false) {
+    if (legacyAccountKey)
+        return identity.accountId;
+    const resourceHash = createHash("sha256")
+        .update(identity.resource)
+        .digest("hex");
+    return `${identity.accountId}:resource:${resourceHash}`;
+}
+async function acquireLease(identity, holder, revision, legacyCredential, leaseMs, now) {
+    const next = await mutateSetting(leaseKey(identity), (current) => {
+        const currentHolder = typeof current?.holder === "string" ? current.holder : "";
+        const expiresAt = typeof current?.expiresAt === "number" ? current.expiresAt : 0;
+        const currentRevision = typeof current?.revision === "number" ? current.revision : -1;
+        if (currentHolder && currentHolder !== holder) {
+            if (expiresAt > now ||
+                // A crashed holder may already have redeemed this revision's rotating
+                // refresh token. Treat an expired same-revision lease as abandoned so
+                // the caller reconnects instead of risking a second redemption.
+                currentRevision === revision ||
+                (currentRevision === -1 && legacyCredential)) {
+                return current;
+            }
+        }
+        return { holder, revision, expiresAt: now + leaseMs };
+    });
+    if (next.holder === holder && next.revision === revision)
+        return "acquired";
+    if ((next.revision === revision || typeof next.revision !== "number") &&
+        typeof next.expiresAt === "number" &&
+        next.expiresAt <= now) {
+        return "abandoned";
+    }
+    return "held";
+}
+async function releaseLease(identity, holder) {
+    await mutateSetting(leaseKey(identity), (current) => current?.holder === holder ? { holder: "", expiresAt: 0 } : (current ?? {})).catch(() => undefined);
+}
+function startLeaseHeartbeat(identity, holder, revision, legacyCredential, leaseMs, dependencies) {
+    let renewal;
+    const timer = setInterval(() => {
+        if (renewal)
+            return;
+        renewal = acquireLease(identity, holder, revision, legacyCredential, leaseMs, dependencies.now())
+            .then(() => undefined)
+            .catch(() => undefined)
+            .finally(() => {
+            renewal = undefined;
+        });
+    }, Math.max(1, Math.floor(leaseMs / 3)));
+    timer.unref?.();
+    return async () => {
+        clearInterval(timer);
+        await renewal;
+    };
+}
+export async function saveOAuthCredential(identity, credential, options = {}) {
+    assertIdentity(identity);
+    await saveOAuthTokens(identity.provider, storageAccountId(identity, options.legacyAccountKey), withLifecycle(identity, credential), ownerKey(identity.owner));
+}
+async function readStoredOAuthCredentialState(identity, options = {}) {
+    assertIdentity(identity);
+    const accountId = storageAccountId(identity, options.legacyAccountKey);
+    const canonicalOwner = ownerKey(identity.owner);
+    let storageOwner = canonicalOwner;
+    let stored = await getOAuthTokenSnapshot(identity.provider, accountId, storageOwner);
+    const legacyOwner = legacyOwnerKey(identity.owner);
+    if (!stored && options.allowLegacy && legacyOwner !== canonicalOwner) {
+        storageOwner = legacyOwner;
+        stored = await getOAuthTokenSnapshot(identity.provider, accountId, storageOwner);
+    }
+    if (!stored && options.allowLegacy && identity.owner.scope === "user") {
+        stored = await getOAuthTokenSnapshotForUserOwner(identity.provider, accountId, canonicalOwner);
+        if (stored?.owner)
+            storageOwner = stored.owner;
+    }
+    if (!stored)
+        return { kind: "missing" };
+    const parsed = stored.tokens;
+    if (!parsed.tokens || typeof parsed.tokens.access_token !== "string") {
+        return {
+            kind: "malformed",
+            revision: stored.revision,
+            legacyRevision: stored.legacyRevision,
+            storageOwner,
+            storageVersion: stored.storageVersion,
+            reason: "structure",
+        };
+    }
+    if ((!options.allowLegacy &&
+        !metadataMatches(identity, parsed.oauthLifecycle)) ||
+        (parsed.oauthLifecycle && !metadataMatches(identity, parsed.oauthLifecycle))) {
+        return {
+            kind: "malformed",
+            revision: stored.revision,
+            legacyRevision: stored.legacyRevision,
+            storageOwner,
+            storageVersion: stored.storageVersion,
+            reason: "identity",
+        };
+    }
+    const credential = parsed;
+    if (options.validateCredential && !options.validateCredential(credential)) {
+        return {
+            kind: "malformed",
+            revision: stored.revision,
+            legacyRevision: stored.legacyRevision,
+            storageOwner,
+            storageVersion: stored.storageVersion,
+            reason: "validation",
+        };
+    }
+    if (credential.oauthLifecycle?.reconnectReason) {
+        return {
+            kind: "reconnect_required",
+            credential,
+            revision: stored.revision,
+            legacyRevision: stored.legacyRevision,
+            storageOwner,
+            storageVersion: stored.storageVersion,
+        };
+    }
+    const now = options.now ?? Date.now();
+    if (typeof credential.tokenExpiresAt === "number" &&
+        credential.tokenExpiresAt <= now) {
+        return {
+            kind: "expired",
+            credential,
+            revision: stored.revision,
+            legacyRevision: stored.legacyRevision,
+            storageOwner,
+            storageVersion: stored.storageVersion,
+        };
+    }
+    return {
+        kind: "connected",
+        credential,
+        revision: stored.revision,
+        legacyRevision: stored.legacyRevision,
+        storageOwner,
+        storageVersion: stored.storageVersion,
+    };
+}
+function publicCredentialState(state) {
+    if (state.kind === "missing")
+        return state;
+    if (state.kind === "malformed") {
+        return {
+            kind: state.kind,
+            revision: state.revision,
+            legacyRevision: state.legacyRevision,
+            reason: state.reason,
+        };
+    }
+    return {
+        kind: state.kind,
+        credential: state.credential,
+        revision: state.revision,
+        legacyRevision: state.legacyRevision,
+    };
+}
+export async function readOAuthCredentialState(identity, options = {}) {
+    return publicCredentialState(await readStoredOAuthCredentialState(identity, options));
+}
+async function markReconnectRequired(identity, snapshot, legacyAccountKey) {
+    await replaceOAuthTokensIfRevision(identity.provider, storageAccountId(identity, legacyAccountKey), snapshot.storageOwner, snapshot.revision, snapshot.legacyRevision, snapshot.storageVersion, withLifecycle(identity, snapshot.credential, "refresh_failed"));
+}
+export async function resolveOAuthCredentialAccess(identity, options) {
+    assertIdentity(identity);
+    const dependencies = { ...defaultDependencies, ...options.dependencies };
+    const expirySkewMs = options.expirySkewMs ?? DEFAULT_EXPIRY_SKEW_MS;
+    const leaseMs = options.leaseMs ?? DEFAULT_LEASE_MS;
+    const waitMs = options.waitMs ?? DEFAULT_WAIT_MS;
+    const maxWaitMs = options.maxWaitMs ?? DEFAULT_MAX_WAIT_MS;
+    const startedAt = dependencies.now();
+    let state = await readStoredOAuthCredentialState(identity, {
+        allowLegacy: options.allowLegacy,
+        legacyAccountKey: options.legacyAccountKey,
+        now: startedAt,
+        validateCredential: options.validateCredential,
+    });
+    if (state.kind === "connected" &&
+        (typeof state.credential.tokenExpiresAt !== "number" ||
+            state.credential.tokenExpiresAt - startedAt > expirySkewMs)) {
+        return { state, accessToken: state.credential.tokens.access_token };
+    }
+    if (state.kind === "missing" ||
+        state.kind === "malformed" ||
+        state.kind === "reconnect_required") {
+        return { state, accessToken: null };
+    }
+    if (!state.credential.tokens.refresh_token) {
+        return {
+            state,
+            accessToken: state.kind === "connected"
+                ? state.credential.tokens.access_token
+                : null,
+        };
+    }
+    const baselineRevision = state.revision;
+    const holder = dependencies.holderId();
+    while (dependencies.now() - startedAt <= maxWaitMs) {
+        const lease = await acquireLease(identity, holder, state.revision, !state.credential.oauthLifecycle, leaseMs, dependencies.now());
+        if (lease === "abandoned") {
+            await markReconnectRequired(identity, state, options.legacyAccountKey === true);
+            const reconnect = await readStoredOAuthCredentialState(identity, {
+                allowLegacy: options.allowLegacy,
+                legacyAccountKey: options.legacyAccountKey,
+                now: dependencies.now(),
+                validateCredential: options.validateCredential,
+            });
+            return {
+                state: reconnect,
+                accessToken: reconnect.kind === "connected"
+                    ? reconnect.credential.tokens.access_token
+                    : null,
+            };
+        }
+        if (lease === "held") {
+            await dependencies.sleep(waitMs);
+            state = await readStoredOAuthCredentialState(identity, {
+                allowLegacy: options.allowLegacy,
+                legacyAccountKey: options.legacyAccountKey,
+                now: dependencies.now(),
+                validateCredential: options.validateCredential,
+            });
+            if (state.kind === "connected" &&
+                (state.revision !== baselineRevision ||
+                    typeof state.credential.tokenExpiresAt !== "number" ||
+                    state.credential.tokenExpiresAt - dependencies.now() > expirySkewMs)) {
+                return { state, accessToken: state.credential.tokens.access_token };
+            }
+            if (state.kind === "missing" ||
+                state.kind === "malformed" ||
+                state.kind === "reconnect_required") {
+                return { state, accessToken: null };
+            }
+            continue;
+        }
+        try {
+            state = await readStoredOAuthCredentialState(identity, {
+                allowLegacy: options.allowLegacy,
+                legacyAccountKey: options.legacyAccountKey,
+                now: dependencies.now(),
+                validateCredential: options.validateCredential,
+            });
+            if (state.kind === "missing" ||
+                state.kind === "malformed" ||
+                state.kind === "reconnect_required") {
+                return { state, accessToken: null };
+            }
+            if (state.kind === "connected" &&
+                (typeof state.credential.tokenExpiresAt !== "number" ||
+                    state.credential.tokenExpiresAt - dependencies.now() > expirySkewMs)) {
+                return {
+                    state,
+                    accessToken: state.credential.tokens.access_token,
+                };
+            }
+            try {
+                const stopHeartbeat = startLeaseHeartbeat(identity, holder, state.revision, !state.credential.oauthLifecycle, leaseMs, dependencies);
+                const refreshed = withLifecycle(identity, await options
+                    .refresh({ identity, credential: state.credential })
+                    .finally(stopHeartbeat));
+                const stillOwnsLease = await acquireLease(identity, holder, state.revision, !state.credential.oauthLifecycle, leaseMs, dependencies.now());
+                if (stillOwnsLease !== "acquired") {
+                    await dependencies.sleep(waitMs);
+                    continue;
+                }
+                const saved = await replaceOAuthTokensIfRevision(identity.provider, storageAccountId(identity, options.legacyAccountKey), state.storageOwner, state.revision, state.legacyRevision, state.storageVersion, refreshed);
+                const latest = await readStoredOAuthCredentialState(identity, {
+                    allowLegacy: options.allowLegacy,
+                    legacyAccountKey: options.legacyAccountKey,
+                    now: dependencies.now(),
+                    validateCredential: options.validateCredential,
+                });
+                if (!saved && latest.kind === "connected") {
+                    return {
+                        state: latest,
+                        accessToken: latest.credential.tokens.access_token,
+                    };
+                }
+                return {
+                    state: latest,
+                    accessToken: latest.kind === "connected"
+                        ? latest.credential.tokens.access_token
+                        : null,
+                };
+            }
+            catch {
+                const stillOwnsLease = await acquireLease(identity, holder, state.revision, !state.credential.oauthLifecycle, leaseMs, dependencies.now());
+                if (stillOwnsLease !== "acquired") {
+                    await dependencies.sleep(waitMs);
+                    continue;
+                }
+                const latest = await readStoredOAuthCredentialState(identity, {
+                    allowLegacy: options.allowLegacy,
+                    legacyAccountKey: options.legacyAccountKey,
+                    now: dependencies.now(),
+                    validateCredential: options.validateCredential,
+                });
+                if (latest.kind === "connected") {
+                    return {
+                        state: latest,
+                        accessToken: latest.credential.tokens.access_token,
+                    };
+                }
+                if (latest.kind === "expired") {
+                    await markReconnectRequired(identity, latest, options.legacyAccountKey === true);
+                    const reconnect = await readStoredOAuthCredentialState(identity, {
+                        allowLegacy: options.allowLegacy,
+                        legacyAccountKey: options.legacyAccountKey,
+                        now: dependencies.now(),
+                        validateCredential: options.validateCredential,
+                    });
+                    return { state: reconnect, accessToken: null };
+                }
+                return { state: latest, accessToken: null };
+            }
+        }
+        finally {
+            await releaseLease(identity, holder);
+        }
+    }
+    state = await readStoredOAuthCredentialState(identity, {
+        allowLegacy: options.allowLegacy,
+        legacyAccountKey: options.legacyAccountKey,
+        now: dependencies.now(),
+        validateCredential: options.validateCredential,
+    });
+    return {
+        state,
+        accessToken: state.kind === "connected" ? state.credential.tokens.access_token : null,
+    };
+}
+export async function revokeOAuthCredential(identity, options = {}) {
+    const state = await readStoredOAuthCredentialState(identity, {
+        allowLegacy: options.allowLegacy,
+        legacyAccountKey: options.legacyAccountKey,
+        validateCredential: options.validateCredential,
+    });
+    if (state.kind === "missing") {
+        return { remote: "not_attempted", local: "missing" };
+    }
+    let remote = options.revoke
+        ? "failed"
+        : "unsupported";
+    if (options.revoke && state.kind !== "malformed") {
+        try {
+            remote = await options.revoke({
+                identity,
+                credential: state.credential,
+            });
+        }
+        catch {
+            remote = "failed";
+        }
+    }
+    else if (state.kind === "malformed") {
+        remote = "not_attempted";
+    }
+    if (state.kind === "malformed" && state.reason !== "structure") {
+        return { remote, local: "replaced" };
+    }
+    const deleted = await deleteOAuthTokensIfRevision(identity.provider, storageAccountId(identity, options.legacyAccountKey), state.storageOwner, state.revision, state.legacyRevision, state.storageVersion);
+    return { remote, local: deleted ? "deleted" : "replaced" };
+}

package/dist/oauth-tokens/migrations.js

@@ -33,4 +33,14 @@ export const OAUTH_TOKEN_MIGRATIONS = [
         name: "oauth-tokens-owner-backfill",
         sql: "UPDATE oauth_tokens SET owner = account_id WHERE owner IS NULL",
     },
+    {
+        version: 5,
+        name: "oauth-tokens-revision-column",
+        sql: "ALTER TABLE oauth_tokens ADD COLUMN IF NOT EXISTS revision BIGINT",
+    },
+    {
+        version: 6,
+        name: "oauth-tokens-revision-backfill",
+        sql: "UPDATE oauth_tokens SET revision = updated_at WHERE revision IS NULL",
+    },
 ];