@adcp/sdk 14.4.0 → 15.0.0

package/bin/adcp.js

@@ -6659,7 +6659,12 @@ credential material — never sync or commit.
     }
 
     const agentConfig = getAgent(alias);
-    if (!agentConfig.oauth_tokens) {
+    if (
+      !agentConfig.oauth_tokens &&
+      !agentConfig.oauth_client &&
+      !agentConfig.oauth_code_verifier &&
+      !agentConfig.oauth_discovery_state
+    ) {
       console.log(`\nAgent '${alias}' has no OAuth tokens to clear.\n`);
       process.exit(0);
     }

package/dist/lib/auth/oauth/ClientCredentialsFlow.js

@@ -247,7 +247,10 @@ async function ensureClientCredentialsTokens(agent, options = {}) {
       });
       agent.oauth_tokens = tokens;
       if (options.storage) {
-        await options.storage.saveAgent(agent);
+        const refreshedAgent = { ...agent };
+        delete refreshedAgent.oauth_code_verifier;
+        delete refreshedAgent.oauth_discovery_state;
+        await options.storage.saveAgent(refreshedAgent);
       }
       return tokens;
     } finally {

package/dist/lib/auth/oauth/ClientCredentialsFlow.mjs

@@ -222,7 +222,10 @@ async function ensureClientCredentialsTokens(agent, options = {}) {
       });
       agent.oauth_tokens = tokens;
       if (options.storage) {
-        await options.storage.saveAgent(agent);
+        const refreshedAgent = { ...agent };
+        delete refreshedAgent.oauth_code_verifier;
+        delete refreshedAgent.oauth_discovery_state;
+        await options.storage.saveAgent(refreshedAgent);
       }
       return tokens;
     } finally {

package/dist/lib/auth/oauth/MCPOAuthProvider.d.mts

@@ -20,13 +20,15 @@ export declare function assertLegacyOAuthSdk(): void;
  *   name: 'My Agent',
  *   agent_uri: 'https://agent.example.com/mcp',
  *   protocol: 'mcp',
- *   // OAuth tokens stored here after auth flow
- *   oauth_tokens: { access_token: '...', refresh_token: '...' }
+ *   // A fresh interactive flow saves issuer-bound credentials afterward.
  * };
  *
+ * const flowHandler = new CLIFlowHandler();
  * const provider = new MCPOAuthProvider({
  *   agent,
- *   flowHandler: new CLIFlowHandler(),
+ *   flowHandler,
+ *   clientMetadata: { ...DEFAULT_CLIENT_METADATA, redirect_uris: [flowHandler.getRedirectUrl().toString()] },
+ *   allowInteractiveAuthorization: true,
  *   storage: myConfigStorage  // Optional: persists tokens
  * });
  *
@@ -42,6 +44,8 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     private readonly _clientMetadata;
     private readonly allowHttp;
     private readonly configuredResourceOverride?;
+    private readonly allowInteractiveAuthorization;
+    private pendingDiscoveryState?;
     constructor(config: OAuthProviderConfig);
     /**
      * Create a provider for CLI usage
@@ -73,7 +77,9 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     /**
      * Load client information from agent config
      */
-    clientInformation(): Promise<OAuthClientInformation | undefined>;
+    clientInformation(ctx?: {
+        issuer: string;
+    }): Promise<OAuthClientInformation | undefined>;
     /**
      * Save client information after dynamic registration
      */
@@ -81,7 +87,9 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     /**
      * Load existing tokens from agent config
      */
-    tokens(): Promise<OAuthTokens | undefined>;
+    tokens(ctx?: {
+        issuer: string;
+    }): Promise<OAuthTokens | undefined>;
     /**
      * Save tokens after authorization
      * Also cleans up the temporary code verifier
@@ -94,6 +102,9 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     /** Persist the authorization-server identity across the callback leg. */
     saveDiscoveryState(state: OAuthDiscoveryState): Promise<void>;
     discoveryState(): Promise<OAuthDiscoveryState | undefined>;
+    private validateDiscoveryState;
+    private checkIssuerContext;
+    private ownerReauthorizationRequired;
     /**
      * Save PKCE code verifier
      */
@@ -108,9 +119,11 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
      * Invalidate credentials when server indicates they're invalid
      */
     invalidateCredentials(scope: Parameters<NonNullable<OAuthClientProvider['invalidateCredentials']>>[0]): Promise<void>;
+    private clearCredentials;
     /**
-     * Persist agent config to storage if configured
+     * Persist a credential update without modifying independent browser state.
      */
+    private persistCredentials;
     private persistAgent;
     /**
      * Wait for the OAuth callback

package/dist/lib/auth/oauth/MCPOAuthProvider.d.ts

@@ -20,13 +20,15 @@ export declare function assertLegacyOAuthSdk(): void;
  *   name: 'My Agent',
  *   agent_uri: 'https://agent.example.com/mcp',
  *   protocol: 'mcp',
- *   // OAuth tokens stored here after auth flow
- *   oauth_tokens: { access_token: '...', refresh_token: '...' }
+ *   // A fresh interactive flow saves issuer-bound credentials afterward.
  * };
  *
+ * const flowHandler = new CLIFlowHandler();
  * const provider = new MCPOAuthProvider({
  *   agent,
- *   flowHandler: new CLIFlowHandler(),
+ *   flowHandler,
+ *   clientMetadata: { ...DEFAULT_CLIENT_METADATA, redirect_uris: [flowHandler.getRedirectUrl().toString()] },
+ *   allowInteractiveAuthorization: true,
  *   storage: myConfigStorage  // Optional: persists tokens
  * });
  *
@@ -42,6 +44,8 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     private readonly _clientMetadata;
     private readonly allowHttp;
     private readonly configuredResourceOverride?;
+    private readonly allowInteractiveAuthorization;
+    private pendingDiscoveryState?;
     constructor(config: OAuthProviderConfig);
     /**
      * Create a provider for CLI usage
@@ -73,7 +77,9 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     /**
      * Load client information from agent config
      */
-    clientInformation(): Promise<OAuthClientInformation | undefined>;
+    clientInformation(ctx?: {
+        issuer: string;
+    }): Promise<OAuthClientInformation | undefined>;
     /**
      * Save client information after dynamic registration
      */
@@ -81,7 +87,9 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     /**
      * Load existing tokens from agent config
      */
-    tokens(): Promise<OAuthTokens | undefined>;
+    tokens(ctx?: {
+        issuer: string;
+    }): Promise<OAuthTokens | undefined>;
     /**
      * Save tokens after authorization
      * Also cleans up the temporary code verifier
@@ -94,6 +102,9 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
     /** Persist the authorization-server identity across the callback leg. */
     saveDiscoveryState(state: OAuthDiscoveryState): Promise<void>;
     discoveryState(): Promise<OAuthDiscoveryState | undefined>;
+    private validateDiscoveryState;
+    private checkIssuerContext;
+    private ownerReauthorizationRequired;
     /**
      * Save PKCE code verifier
      */
@@ -108,9 +119,11 @@ export declare class MCPOAuthProvider implements OAuthClientProvider {
      * Invalidate credentials when server indicates they're invalid
      */
     invalidateCredentials(scope: Parameters<NonNullable<OAuthClientProvider['invalidateCredentials']>>[0]): Promise<void>;
+    private clearCredentials;
     /**
-     * Persist agent config to storage if configured
+     * Persist a credential update without modifying independent browser state.
      */
+    private persistCredentials;
     private persistAgent;
     /**
      * Wait for the OAuth callback

package/dist/lib/auth/oauth/MCPOAuthProvider.js

@@ -59,6 +59,8 @@ class MCPOAuthProvider {
   _clientMetadata;
   allowHttp;
   configuredResourceOverride;
+  allowInteractiveAuthorization;
+  pendingDiscoveryState;
   constructor(config) {
     this.agent = config.agent;
     this.storage = config.storage;
@@ -66,6 +68,7 @@ class MCPOAuthProvider {
     this._clientMetadata = config.clientMetadata;
     this.allowHttp = config.allowHttp === true;
     this.configuredResourceOverride = config.resourceOverride;
+    this.allowInteractiveAuthorization = config.allowInteractiveAuthorization === true;
   }
   /**
    * Create a provider for CLI usage
@@ -82,7 +85,8 @@ class MCPOAuthProvider {
       storage,
       clientMetadata,
       allowHttp: options?.allowHttp,
-      resourceOverride: options?.resourceOverride
+      resourceOverride: options?.resourceOverride,
+      allowInteractiveAuthorization: true
     });
   }
   // ========================================
@@ -123,7 +127,11 @@ class MCPOAuthProvider {
   /**
    * Load client information from agent config
    */
-  async clientInformation() {
+  async clientInformation(ctx) {
+    const issuer = this.checkIssuerContext(ctx);
+    if (issuer && !this.agent.oauth_client && !this.allowInteractiveAuthorization) {
+      throw this.ownerReauthorizationRequired();
+    }
     if (this.agent.oauth_client) {
       if (this.agent.oauth_client.client_secret) assertLegacyOAuthSdk();
       (0, import_types.assertOAuthCredentialIssuer)(this.agent.oauth_client, void 0, !!this.agent.oauth_client.client_secret);
@@ -136,12 +144,13 @@ class MCPOAuthProvider {
    */
   async saveClientInformation(clientInfo) {
     this.agent.oauth_client = (0, import_types.fromMCPClientInfo)(clientInfo);
-    await this.persistAgent();
+    await this.persistCredentials();
   }
   /**
    * Load existing tokens from agent config
    */
-  async tokens() {
+  async tokens(ctx) {
+    this.checkIssuerContext(ctx);
     if (this.agent.oauth_tokens) {
       if (this.agent.oauth_tokens.refresh_token) assertLegacyOAuthSdk();
       (0, import_types.assertOAuthCredentialIssuer)(this.agent.oauth_tokens, void 0, !!this.agent.oauth_tokens.refresh_token);
@@ -155,14 +164,18 @@ class MCPOAuthProvider {
    */
   async saveTokens(tokens) {
     this.agent.oauth_tokens = (0, import_types.fromMCPTokens)(tokens);
-    delete this.agent.oauth_code_verifier;
-    delete this.agent.oauth_discovery_state;
-    await this.persistAgent();
+    if (this.allowInteractiveAuthorization) {
+      this.agent.oauth_code_verifier = void 0;
+      this.agent.oauth_discovery_state = void 0;
+    }
+    this.pendingDiscoveryState = void 0;
+    await this.persistCredentials();
   }
   /**
    * Redirect user to authorization URL
    */
   async redirectToAuthorization(authorizationUrl) {
+    if (!this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired("interactive_required");
     try {
       await this.flowHandler.redirectToAuthorization(authorizationUrl);
     } catch (error) {
@@ -172,23 +185,51 @@ class MCPOAuthProvider {
   }
   /** Persist the authorization-server identity across the callback leg. */
   async saveDiscoveryState(state) {
-    const issuer = String(state.authorizationServerUrl);
-    if (this.agent.oauth_tokens?.refresh_token) {
-      (0, import_types.assertOAuthCredentialIssuer)(this.agent.oauth_tokens, issuer, true);
-    }
-    if (this.agent.oauth_client?.client_secret) {
-      (0, import_types.assertOAuthCredentialIssuer)(this.agent.oauth_client, issuer, true);
+    this.validateDiscoveryState(state);
+    if (!this.agent.oauth_client && !this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired();
+    this.pendingDiscoveryState = structuredClone(state);
+    if (this.allowInteractiveAuthorization) {
+      this.agent.oauth_discovery_state = structuredClone(state);
+      await this.persistAgent();
     }
-    this.agent.oauth_discovery_state = state;
-    await this.persistAgent();
   }
   async discoveryState() {
-    return this.agent.oauth_code_verifier ? this.agent.oauth_discovery_state : void 0;
+    if (!this.allowInteractiveAuthorization) return void 0;
+    if (!this.agent.oauth_code_verifier) return void 0;
+    const state = this.pendingDiscoveryState ?? this.agent.oauth_discovery_state;
+    if (!state) return void 0;
+    this.validateDiscoveryState(state);
+    this.pendingDiscoveryState = structuredClone(state);
+    return structuredClone(state);
+  }
+  validateDiscoveryState(state) {
+    (0, import_types.assertOAuthServerIssuer)(state.authorizationServerMetadata, String(state.authorizationServerUrl));
+    this.checkIssuerContext({ issuer: String(state.authorizationServerUrl) });
+  }
+  checkIssuerContext(ctx) {
+    const issuer = ctx?.issuer ?? this.pendingDiscoveryState?.authorizationServerUrl;
+    if (issuer !== void 0) {
+      if (this.agent.oauth_tokens) {
+        (0, import_types.assertOAuthCredentialIssuer)(this.agent.oauth_tokens, issuer, !!this.agent.oauth_tokens.refresh_token);
+      }
+      if (this.agent.oauth_client) {
+        (0, import_types.assertOAuthCredentialIssuer)(this.agent.oauth_client, issuer, !!this.agent.oauth_client.client_secret);
+      }
+    }
+    return issuer;
+  }
+  ownerReauthorizationRequired(code = "owner_reauthorization_required") {
+    return new import_types.OAuthError(
+      "OAuth owner reauthorization is required; this provider will not automatically clear credentials or register a new client. CLI: adcp <alias> --clear-oauth, then adcp <alias> --oauth.",
+      code,
+      this.agent.id
+    );
   }
   /**
    * Save PKCE code verifier
    */
   async saveCodeVerifier(codeVerifier) {
+    if (!this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired();
     this.agent.oauth_code_verifier = codeVerifier;
     await this.persistAgent();
   }
@@ -198,6 +239,7 @@ class MCPOAuthProvider {
    * retrieves it here during token exchange.
    */
   async codeVerifier() {
+    if (!this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired();
     if (!this.agent.oauth_code_verifier) {
       throw new Error(
         "No PKCE code verifier found. The OAuth flow may have been interrupted or the agent config was modified. Please try authenticating again."
@@ -209,26 +251,40 @@ class MCPOAuthProvider {
    * Invalidate credentials when server indicates they're invalid
    */
   async invalidateCredentials(scope) {
+    if (!this.allowInteractiveAuthorization && (scope === "discovery" || scope === "verifier")) {
+      this.pendingDiscoveryState = void 0;
+      return;
+    }
+    if (!this.allowInteractiveAuthorization && (scope === "all" || scope === "client" || scope === "tokens")) {
+      throw this.ownerReauthorizationRequired();
+    }
+    await this.clearCredentials(scope);
+  }
+  async clearCredentials(scope) {
     switch (scope) {
       case "all":
-        delete this.agent.oauth_discovery_state;
-        delete this.agent.oauth_tokens;
-        delete this.agent.oauth_client;
-        delete this.agent.oauth_code_verifier;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
+        this.agent.oauth_tokens = void 0;
+        this.agent.oauth_client = void 0;
+        this.agent.oauth_code_verifier = void 0;
         break;
       case "tokens":
-        delete this.agent.oauth_tokens;
+        this.agent.oauth_tokens = void 0;
         break;
       case "client":
-        delete this.agent.oauth_discovery_state;
-        delete this.agent.oauth_client;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
+        this.agent.oauth_client = void 0;
         break;
       case "discovery":
-        delete this.agent.oauth_discovery_state;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
         break;
       case "verifier":
-        delete this.agent.oauth_discovery_state;
-        delete this.agent.oauth_code_verifier;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
+        this.agent.oauth_code_verifier = void 0;
         break;
     }
     await this.persistAgent();
@@ -237,11 +293,20 @@ class MCPOAuthProvider {
   // Additional methods
   // ========================================
   /**
-   * Persist agent config to storage if configured
+   * Persist a credential update without modifying independent browser state.
    */
-  async persistAgent() {
+  async persistCredentials() {
+    let savedAgent = this.agent;
+    if (!this.allowInteractiveAuthorization) {
+      savedAgent = { ...this.agent };
+      delete savedAgent.oauth_code_verifier;
+      delete savedAgent.oauth_discovery_state;
+    }
+    await this.persistAgent(savedAgent);
+  }
+  async persistAgent(agent = this.agent) {
     if (this.storage) {
-      await this.storage.saveAgent(this.agent);
+      await this.storage.saveAgent(agent);
     }
   }
   /**
@@ -283,7 +348,7 @@ class MCPOAuthProvider {
    * Clear all OAuth data for this agent
    */
   async clearAuth() {
-    await this.invalidateCredentials("all");
+    await this.clearCredentials("all");
   }
   /**
    * Get the agent config this provider manages

package/dist/lib/auth/oauth/MCPOAuthProvider.mjs

@@ -10,6 +10,7 @@ import {
   toMCPClientInfo,
   fromMCPClientInfo,
   assertOAuthCredentialIssuer,
+  assertOAuthServerIssuer,
   OAuthError
 } from "./types.mjs";
 import { randomBytes } from "crypto";
@@ -48,6 +49,8 @@ class MCPOAuthProvider {
   _clientMetadata;
   allowHttp;
   configuredResourceOverride;
+  allowInteractiveAuthorization;
+  pendingDiscoveryState;
   constructor(config) {
     this.agent = config.agent;
     this.storage = config.storage;
@@ -55,6 +58,7 @@ class MCPOAuthProvider {
     this._clientMetadata = config.clientMetadata;
     this.allowHttp = config.allowHttp === true;
     this.configuredResourceOverride = config.resourceOverride;
+    this.allowInteractiveAuthorization = config.allowInteractiveAuthorization === true;
   }
   /**
    * Create a provider for CLI usage
@@ -71,7 +75,8 @@ class MCPOAuthProvider {
       storage,
       clientMetadata,
       allowHttp: options?.allowHttp,
-      resourceOverride: options?.resourceOverride
+      resourceOverride: options?.resourceOverride,
+      allowInteractiveAuthorization: true
     });
   }
   // ========================================
@@ -112,7 +117,11 @@ class MCPOAuthProvider {
   /**
    * Load client information from agent config
    */
-  async clientInformation() {
+  async clientInformation(ctx) {
+    const issuer = this.checkIssuerContext(ctx);
+    if (issuer && !this.agent.oauth_client && !this.allowInteractiveAuthorization) {
+      throw this.ownerReauthorizationRequired();
+    }
     if (this.agent.oauth_client) {
       if (this.agent.oauth_client.client_secret) assertLegacyOAuthSdk();
       assertOAuthCredentialIssuer(this.agent.oauth_client, void 0, !!this.agent.oauth_client.client_secret);
@@ -125,12 +134,13 @@ class MCPOAuthProvider {
    */
   async saveClientInformation(clientInfo) {
     this.agent.oauth_client = fromMCPClientInfo(clientInfo);
-    await this.persistAgent();
+    await this.persistCredentials();
   }
   /**
    * Load existing tokens from agent config
    */
-  async tokens() {
+  async tokens(ctx) {
+    this.checkIssuerContext(ctx);
     if (this.agent.oauth_tokens) {
       if (this.agent.oauth_tokens.refresh_token) assertLegacyOAuthSdk();
       assertOAuthCredentialIssuer(this.agent.oauth_tokens, void 0, !!this.agent.oauth_tokens.refresh_token);
@@ -144,14 +154,18 @@ class MCPOAuthProvider {
    */
   async saveTokens(tokens) {
     this.agent.oauth_tokens = fromMCPTokens(tokens);
-    delete this.agent.oauth_code_verifier;
-    delete this.agent.oauth_discovery_state;
-    await this.persistAgent();
+    if (this.allowInteractiveAuthorization) {
+      this.agent.oauth_code_verifier = void 0;
+      this.agent.oauth_discovery_state = void 0;
+    }
+    this.pendingDiscoveryState = void 0;
+    await this.persistCredentials();
   }
   /**
    * Redirect user to authorization URL
    */
   async redirectToAuthorization(authorizationUrl) {
+    if (!this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired("interactive_required");
     try {
       await this.flowHandler.redirectToAuthorization(authorizationUrl);
     } catch (error) {
@@ -161,23 +175,51 @@ class MCPOAuthProvider {
   }
   /** Persist the authorization-server identity across the callback leg. */
   async saveDiscoveryState(state) {
-    const issuer = String(state.authorizationServerUrl);
-    if (this.agent.oauth_tokens?.refresh_token) {
-      assertOAuthCredentialIssuer(this.agent.oauth_tokens, issuer, true);
-    }
-    if (this.agent.oauth_client?.client_secret) {
-      assertOAuthCredentialIssuer(this.agent.oauth_client, issuer, true);
+    this.validateDiscoveryState(state);
+    if (!this.agent.oauth_client && !this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired();
+    this.pendingDiscoveryState = structuredClone(state);
+    if (this.allowInteractiveAuthorization) {
+      this.agent.oauth_discovery_state = structuredClone(state);
+      await this.persistAgent();
     }
-    this.agent.oauth_discovery_state = state;
-    await this.persistAgent();
   }
   async discoveryState() {
-    return this.agent.oauth_code_verifier ? this.agent.oauth_discovery_state : void 0;
+    if (!this.allowInteractiveAuthorization) return void 0;
+    if (!this.agent.oauth_code_verifier) return void 0;
+    const state = this.pendingDiscoveryState ?? this.agent.oauth_discovery_state;
+    if (!state) return void 0;
+    this.validateDiscoveryState(state);
+    this.pendingDiscoveryState = structuredClone(state);
+    return structuredClone(state);
+  }
+  validateDiscoveryState(state) {
+    assertOAuthServerIssuer(state.authorizationServerMetadata, String(state.authorizationServerUrl));
+    this.checkIssuerContext({ issuer: String(state.authorizationServerUrl) });
+  }
+  checkIssuerContext(ctx) {
+    const issuer = ctx?.issuer ?? this.pendingDiscoveryState?.authorizationServerUrl;
+    if (issuer !== void 0) {
+      if (this.agent.oauth_tokens) {
+        assertOAuthCredentialIssuer(this.agent.oauth_tokens, issuer, !!this.agent.oauth_tokens.refresh_token);
+      }
+      if (this.agent.oauth_client) {
+        assertOAuthCredentialIssuer(this.agent.oauth_client, issuer, !!this.agent.oauth_client.client_secret);
+      }
+    }
+    return issuer;
+  }
+  ownerReauthorizationRequired(code = "owner_reauthorization_required") {
+    return new OAuthError(
+      "OAuth owner reauthorization is required; this provider will not automatically clear credentials or register a new client. CLI: adcp <alias> --clear-oauth, then adcp <alias> --oauth.",
+      code,
+      this.agent.id
+    );
   }
   /**
    * Save PKCE code verifier
    */
   async saveCodeVerifier(codeVerifier) {
+    if (!this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired();
     this.agent.oauth_code_verifier = codeVerifier;
     await this.persistAgent();
   }
@@ -187,6 +229,7 @@ class MCPOAuthProvider {
    * retrieves it here during token exchange.
    */
   async codeVerifier() {
+    if (!this.allowInteractiveAuthorization) throw this.ownerReauthorizationRequired();
     if (!this.agent.oauth_code_verifier) {
       throw new Error(
         "No PKCE code verifier found. The OAuth flow may have been interrupted or the agent config was modified. Please try authenticating again."
@@ -198,26 +241,40 @@ class MCPOAuthProvider {
    * Invalidate credentials when server indicates they're invalid
    */
   async invalidateCredentials(scope) {
+    if (!this.allowInteractiveAuthorization && (scope === "discovery" || scope === "verifier")) {
+      this.pendingDiscoveryState = void 0;
+      return;
+    }
+    if (!this.allowInteractiveAuthorization && (scope === "all" || scope === "client" || scope === "tokens")) {
+      throw this.ownerReauthorizationRequired();
+    }
+    await this.clearCredentials(scope);
+  }
+  async clearCredentials(scope) {
     switch (scope) {
       case "all":
-        delete this.agent.oauth_discovery_state;
-        delete this.agent.oauth_tokens;
-        delete this.agent.oauth_client;
-        delete this.agent.oauth_code_verifier;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
+        this.agent.oauth_tokens = void 0;
+        this.agent.oauth_client = void 0;
+        this.agent.oauth_code_verifier = void 0;
         break;
       case "tokens":
-        delete this.agent.oauth_tokens;
+        this.agent.oauth_tokens = void 0;
         break;
       case "client":
-        delete this.agent.oauth_discovery_state;
-        delete this.agent.oauth_client;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
+        this.agent.oauth_client = void 0;
         break;
       case "discovery":
-        delete this.agent.oauth_discovery_state;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
         break;
       case "verifier":
-        delete this.agent.oauth_discovery_state;
-        delete this.agent.oauth_code_verifier;
+        this.pendingDiscoveryState = void 0;
+        this.agent.oauth_discovery_state = void 0;
+        this.agent.oauth_code_verifier = void 0;
         break;
     }
     await this.persistAgent();
@@ -226,11 +283,20 @@ class MCPOAuthProvider {
   // Additional methods
   // ========================================
   /**
-   * Persist agent config to storage if configured
+   * Persist a credential update without modifying independent browser state.
    */
-  async persistAgent() {
+  async persistCredentials() {
+    let savedAgent = this.agent;
+    if (!this.allowInteractiveAuthorization) {
+      savedAgent = { ...this.agent };
+      delete savedAgent.oauth_code_verifier;
+      delete savedAgent.oauth_discovery_state;
+    }
+    await this.persistAgent(savedAgent);
+  }
+  async persistAgent(agent = this.agent) {
     if (this.storage) {
-      await this.storage.saveAgent(this.agent);
+      await this.storage.saveAgent(agent);
     }
   }
   /**
@@ -272,7 +338,7 @@ class MCPOAuthProvider {
    * Clear all OAuth data for this agent
    */
   async clearAuth() {
-    await this.invalidateCredentials("all");
+    await this.clearCredentials("all");
   }
   /**
    * Get the agent config this provider manages

package/dist/lib/auth/oauth/NonInteractiveFlowHandler.d.mts

@@ -21,7 +21,7 @@ export interface NonInteractiveFlowHandlerConfig {
     redirectUrl?: string | URL;
     /**
      * Optional hint shown in the error message when a browser flow is
-     * attempted — e.g., the alias name to pass to `adcp --save-auth`.
+     * attempted — e.g., the saved alias for `adcp <alias> --oauth`.
      */
     agentHint?: string;
 }

package/dist/lib/auth/oauth/NonInteractiveFlowHandler.d.ts

@@ -21,7 +21,7 @@ export interface NonInteractiveFlowHandlerConfig {
     redirectUrl?: string | URL;
     /**
      * Optional hint shown in the error message when a browser flow is
-     * attempted — e.g., the alias name to pass to `adcp --save-auth`.
+     * attempted — e.g., the saved alias for `adcp <alias> --oauth`.
      */
     agentHint?: string;
 }