@adcp/sdk 14.4.0 → 15.0.0

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

@@ -33,7 +33,7 @@ class NonInteractiveFlowHandler {
     return this._redirectUrl;
   }
   async redirectToAuthorization() {
-    const target = this.agentHint ? `adcp --save-auth ${this.agentHint} --oauth` : "adcp --save-auth <alias> <url> --oauth";
+    const target = this.agentHint ? `adcp ${this.agentHint} --oauth` : "adcp --save-auth <alias> <url> --oauth";
     throw new import_types.OAuthError(
       `OAuth authorization required but this context is non-interactive. Run \`${target}\` from a terminal with a browser, then retry.`,
       "interactive_required"

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

@@ -10,7 +10,7 @@ class NonInteractiveFlowHandler {
     return this._redirectUrl;
   }
   async redirectToAuthorization() {
-    const target = this.agentHint ? `adcp --save-auth ${this.agentHint} --oauth` : "adcp --save-auth <alias> <url> --oauth";
+    const target = this.agentHint ? `adcp ${this.agentHint} --oauth` : "adcp --save-auth <alias> <url> --oauth";
     throw new OAuthError(
       `OAuth authorization required but this context is non-interactive. Run \`${target}\` from a terminal with a browser, then retry.`,
       "interactive_required"

package/dist/lib/auth/oauth/client-credentials-schema.d.mts

@@ -0,0 +1,17 @@
+import { z } from 'zod';
+/**
+ * OAuth client credentials configuration shape. Secret references remain
+ * unresolved; endpoint transport and SSRF checks run during token exchange.
+ */
+export declare const AgentOAuthClientCredentialsSchema: z.ZodObject<{
+    token_endpoint: z.ZodString;
+    client_id: z.ZodString;
+    client_secret: z.ZodString;
+    scope: z.ZodOptional<z.ZodString>;
+    resource: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>;
+    audience: z.ZodOptional<z.ZodString>;
+    auth_method: z.ZodOptional<z.ZodEnum<{
+        basic: "basic";
+        body: "body";
+    }>>;
+}, z.core.$strip>;

package/dist/lib/auth/oauth/client-credentials-schema.d.ts

@@ -0,0 +1,17 @@
+import { z } from 'zod';
+/**
+ * OAuth client credentials configuration shape. Secret references remain
+ * unresolved; endpoint transport and SSRF checks run during token exchange.
+ */
+export declare const AgentOAuthClientCredentialsSchema: z.ZodObject<{
+    token_endpoint: z.ZodString;
+    client_id: z.ZodString;
+    client_secret: z.ZodString;
+    scope: z.ZodOptional<z.ZodString>;
+    resource: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>;
+    audience: z.ZodOptional<z.ZodString>;
+    auth_method: z.ZodOptional<z.ZodEnum<{
+        basic: "basic";
+        body: "body";
+    }>>;
+}, z.core.$strip>;

package/dist/lib/auth/oauth/client-credentials-schema.js

@@ -0,0 +1,37 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var client_credentials_schema_exports = {};
+__export(client_credentials_schema_exports, {
+  AgentOAuthClientCredentialsSchema: () => AgentOAuthClientCredentialsSchema
+});
+module.exports = __toCommonJS(client_credentials_schema_exports);
+var import_zod = require("zod");
+const AgentOAuthClientCredentialsSchema = import_zod.z.object({
+  token_endpoint: import_zod.z.string().url(),
+  client_id: import_zod.z.string().min(1),
+  client_secret: import_zod.z.string().min(1),
+  scope: import_zod.z.string().optional(),
+  resource: import_zod.z.union([import_zod.z.string(), import_zod.z.array(import_zod.z.string())]).optional(),
+  audience: import_zod.z.string().optional(),
+  auth_method: import_zod.z.enum(["basic", "body"]).optional()
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AgentOAuthClientCredentialsSchema
+});

package/dist/lib/auth/oauth/client-credentials-schema.mjs

@@ -0,0 +1,13 @@
+import { z } from "zod";
+const AgentOAuthClientCredentialsSchema = z.object({
+  token_endpoint: z.string().url(),
+  client_id: z.string().min(1),
+  client_secret: z.string().min(1),
+  scope: z.string().optional(),
+  resource: z.union([z.string(), z.array(z.string())]).optional(),
+  audience: z.string().optional(),
+  auth_method: z.enum(["basic", "body"]).optional()
+});
+export {
+  AgentOAuthClientCredentialsSchema
+};

package/dist/lib/auth/oauth/file-storage.d.mts

@@ -29,9 +29,9 @@ export interface FileOAuthStorageOptions {
  * Does NOT touch fields outside the OAuth envelope (`auth_token`, custom
  * fields) when saving — the MCP provider only mutates `oauth_tokens`,
  * `oauth_client`, `oauth_resource`, `oauth_code_verifier`, and `oauth_discovery_state`.
- * Those fields are authoritative: an absent value deletes the stored value.
- * Load the complete agent before constructing a provider; partial snapshots
- * cannot preserve omitted OAuth fields. Other fields keep merge semantics.
+ * An own property explicitly set to undefined clears tokens, client, verifier
+ * or discovery state. Omitted properties preserve stored values for partial
+ * callers. Other fields keep their existing merge semantics.
  *
  * @example
  * ```ts

package/dist/lib/auth/oauth/file-storage.d.ts

@@ -29,9 +29,9 @@ export interface FileOAuthStorageOptions {
  * Does NOT touch fields outside the OAuth envelope (`auth_token`, custom
  * fields) when saving — the MCP provider only mutates `oauth_tokens`,
  * `oauth_client`, `oauth_resource`, `oauth_code_verifier`, and `oauth_discovery_state`.
- * Those fields are authoritative: an absent value deletes the stored value.
- * Load the complete agent before constructing a provider; partial snapshots
- * cannot preserve omitted OAuth fields. Other fields keep merge semantics.
+ * An own property explicitly set to undefined clears tokens, client, verifier
+ * or discovery state. Omitted properties preserve stored values for partial
+ * callers. Other fields keep their existing merge semantics.
  *
  * @example
  * ```ts

package/dist/lib/auth/oauth/file-storage.js

@@ -94,11 +94,18 @@ function createFileOAuthStorage(options) {
         ...agent.oauth_client_credentials !== void 0 ? { oauth_client_credentials: agent.oauth_client_credentials } : {},
         ...agent.oauth_code_verifier !== void 0 ? { oauth_code_verifier: agent.oauth_code_verifier } : {}
       };
-      if (agent.oauth_tokens === void 0) delete next.oauth_tokens;
-      if (agent.oauth_client === void 0) delete next.oauth_client;
-      if (agent.oauth_code_verifier === void 0) delete next.oauth_code_verifier;
-      if (agent.oauth_discovery_state === void 0) delete next.oauth_discovery_state;
-      else next.oauth_discovery_state = agent.oauth_discovery_state;
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_tokens") && agent.oauth_tokens === void 0) {
+        delete next.oauth_tokens;
+      }
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_client") && agent.oauth_client === void 0) {
+        delete next.oauth_client;
+      }
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_code_verifier") && agent.oauth_code_verifier === void 0) {
+        delete next.oauth_code_verifier;
+      }
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_discovery_state") && agent.oauth_discovery_state === void 0) {
+        delete next.oauth_discovery_state;
+      } else if (agent.oauth_discovery_state !== void 0) next.oauth_discovery_state = agent.oauth_discovery_state;
       if (agent.oauth_resource === void 0) delete next.oauth_resource;
       config.agents[key] = next;
       await writeConfig(config);

package/dist/lib/auth/oauth/file-storage.mjs

@@ -61,11 +61,18 @@ function createFileOAuthStorage(options) {
         ...agent.oauth_client_credentials !== void 0 ? { oauth_client_credentials: agent.oauth_client_credentials } : {},
         ...agent.oauth_code_verifier !== void 0 ? { oauth_code_verifier: agent.oauth_code_verifier } : {}
       };
-      if (agent.oauth_tokens === void 0) delete next.oauth_tokens;
-      if (agent.oauth_client === void 0) delete next.oauth_client;
-      if (agent.oauth_code_verifier === void 0) delete next.oauth_code_verifier;
-      if (agent.oauth_discovery_state === void 0) delete next.oauth_discovery_state;
-      else next.oauth_discovery_state = agent.oauth_discovery_state;
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_tokens") && agent.oauth_tokens === void 0) {
+        delete next.oauth_tokens;
+      }
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_client") && agent.oauth_client === void 0) {
+        delete next.oauth_client;
+      }
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_code_verifier") && agent.oauth_code_verifier === void 0) {
+        delete next.oauth_code_verifier;
+      }
+      if (Object.prototype.hasOwnProperty.call(agent, "oauth_discovery_state") && agent.oauth_discovery_state === void 0) {
+        delete next.oauth_discovery_state;
+      } else if (agent.oauth_discovery_state !== void 0) next.oauth_discovery_state = agent.oauth_discovery_state;
       if (agent.oauth_resource === void 0) delete next.oauth_resource;
       config.agents[key] = next;
       await writeConfig(config);

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

@@ -5,7 +5,8 @@
  *
  * @example
  * ```typescript
- * import { MCPOAuthProvider, CLIFlowHandler } from '@adcp/sdk';
+ * import { MCPOAuthProvider, CLIFlowHandler, DEFAULT_CLIENT_METADATA } from '@adcp/sdk/auth';
+ * import type { AgentConfig } from '@adcp/sdk';
  *
  * // Agent config - tokens will be stored here
  * const agent: AgentConfig = {
@@ -13,14 +14,15 @@
  *   name: 'My Agent',
  *   agent_uri: 'https://agent.example.com/mcp',
  *   protocol: 'mcp',
- *   // After OAuth flow completes:
- *   // oauth_tokens: { access_token: '...', refresh_token: '...' }
+ *   // A fresh interactive flow saves issuer-bound tokens here.
  * };
  *
  * // Create provider with CLI flow handler
  * const provider = new MCPOAuthProvider({
+ *   allowInteractiveAuthorization: true,
  *   agent,
  *   flowHandler: new CLIFlowHandler(),
+ *   clientMetadata: DEFAULT_CLIENT_METADATA,
  *   storage: myConfigStorage  // Optional: persists tokens to file/db
  * });
  *
@@ -99,9 +101,10 @@ export declare function createCLIOAuthProvider(agent: AgentConfig, options?: {
  * runs, scheduled jobs, and other non-interactive contexts where you've
  * already saved tokens via `createCLIOAuthProvider`.
  *
- * If refresh fails (e.g., the refresh_token is revoked or expired), the
- * MCP SDK will throw `UnauthorizedError` at call time — the caller should
- * treat that as a signal to run `adcp --save-auth <alias> --oauth` and retry.
+ * A failed grant can throw `OAuthError` with `owner_reauthorization_required`;
+ * missing or mismatched issuer bindings throw `oauth_issuer_required` or `oauth_issuer_mismatch`.
+ * The owner can run `adcp <alias> --clear-oauth`, then
+ * `adcp <alias> --oauth` to start a fresh browser sign-in.
  */
 export declare function createNonInteractiveOAuthProvider(agent: AgentConfig, options?: {
     /** Hint shown in error messages if an interactive flow is attempted. */
@@ -143,5 +146,6 @@ export { createFileOAuthStorage, type FileOAuthStorageOptions } from './file-sto
 export { exchangeClientCredentials, ensureClientCredentialsTokens, ClientCredentialsExchangeError, type ExchangeClientCredentialsOptions, type EnsureClientCredentialsOptions, } from './ClientCredentialsFlow.mjs';
 export { resolveSecret, isEnvSecretReference, toEnvSecretReference, extractEnvSecretName, MissingEnvSecretError, } from './secret-resolver.mjs';
 export type { AgentOAuthClientCredentials } from '../../types/adcp.mjs';
+export { AgentOAuthClientCredentialsSchema } from './client-credentials-schema.mjs';
 export { bindAgentStorage, getAgentStorage, unbindAgentStorage } from './storage-registry.mjs';
 export { InvalidTokenError, InsufficientScopeError } from '@modelcontextprotocol/sdk/server/auth/errors.js';

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

@@ -5,7 +5,8 @@
  *
  * @example
  * ```typescript
- * import { MCPOAuthProvider, CLIFlowHandler } from '@adcp/sdk';
+ * import { MCPOAuthProvider, CLIFlowHandler, DEFAULT_CLIENT_METADATA } from '@adcp/sdk/auth';
+ * import type { AgentConfig } from '@adcp/sdk';
  *
  * // Agent config - tokens will be stored here
  * const agent: AgentConfig = {
@@ -13,14 +14,15 @@
  *   name: 'My Agent',
  *   agent_uri: 'https://agent.example.com/mcp',
  *   protocol: 'mcp',
- *   // After OAuth flow completes:
- *   // oauth_tokens: { access_token: '...', refresh_token: '...' }
+ *   // A fresh interactive flow saves issuer-bound tokens here.
  * };
  *
  * // Create provider with CLI flow handler
  * const provider = new MCPOAuthProvider({
+ *   allowInteractiveAuthorization: true,
  *   agent,
  *   flowHandler: new CLIFlowHandler(),
+ *   clientMetadata: DEFAULT_CLIENT_METADATA,
  *   storage: myConfigStorage  // Optional: persists tokens to file/db
  * });
  *
@@ -99,9 +101,10 @@ export declare function createCLIOAuthProvider(agent: AgentConfig, options?: {
  * runs, scheduled jobs, and other non-interactive contexts where you've
  * already saved tokens via `createCLIOAuthProvider`.
  *
- * If refresh fails (e.g., the refresh_token is revoked or expired), the
- * MCP SDK will throw `UnauthorizedError` at call time — the caller should
- * treat that as a signal to run `adcp --save-auth <alias> --oauth` and retry.
+ * A failed grant can throw `OAuthError` with `owner_reauthorization_required`;
+ * missing or mismatched issuer bindings throw `oauth_issuer_required` or `oauth_issuer_mismatch`.
+ * The owner can run `adcp <alias> --clear-oauth`, then
+ * `adcp <alias> --oauth` to start a fresh browser sign-in.
  */
 export declare function createNonInteractiveOAuthProvider(agent: AgentConfig, options?: {
     /** Hint shown in error messages if an interactive flow is attempted. */
@@ -143,5 +146,6 @@ export { createFileOAuthStorage, type FileOAuthStorageOptions } from './file-sto
 export { exchangeClientCredentials, ensureClientCredentialsTokens, ClientCredentialsExchangeError, type ExchangeClientCredentialsOptions, type EnsureClientCredentialsOptions, } from './ClientCredentialsFlow';
 export { resolveSecret, isEnvSecretReference, toEnvSecretReference, extractEnvSecretName, MissingEnvSecretError, } from './secret-resolver';
 export type { AgentOAuthClientCredentials } from '../../types/adcp';
+export { AgentOAuthClientCredentialsSchema } from './client-credentials-schema';
 export { bindAgentStorage, getAgentStorage, unbindAgentStorage } from './storage-registry';
 export { InvalidTokenError, InsufficientScopeError } from '@modelcontextprotocol/sdk/server/auth/errors.js';

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

@@ -20,6 +20,7 @@ var oauth_exports = {};
 __export(oauth_exports, {
   AUTH_DIAGNOSIS_SCHEMA_VERSION: () => import_diagnose.AUTH_DIAGNOSIS_SCHEMA_VERSION,
   AgentChangedDuringFlowError: () => import_web_flow.AgentChangedDuringFlowError,
+  AgentOAuthClientCredentialsSchema: () => import_client_credentials_schema.AgentOAuthClientCredentialsSchema,
   AgentVanishedDuringFlowError: () => import_web_flow.AgentVanishedDuringFlowError,
   BrowserBindingRequiredError: () => import_web_flow.BrowserBindingRequiredError,
   CLIFlowHandler: () => import_CLIFlowHandler.CLIFlowHandler,
@@ -92,6 +93,7 @@ var import_authorization_required = require('./authorization-required.js');
 var import_file_storage = require('./file-storage.js');
 var import_ClientCredentialsFlow = require('./ClientCredentialsFlow.js');
 var import_secret_resolver = require('./secret-resolver.js');
+var import_client_credentials_schema = require('./client-credentials-schema.js');
 var import_storage_registry = require('./storage-registry.js');
 var import_errors = require("@modelcontextprotocol/sdk/server/auth/errors.js");
 function createCLIOAuthProvider(agent, options) {
@@ -107,6 +109,7 @@ function createCLIOAuthProvider(agent, options) {
     ...options?.clientMetadata
   };
   return new import_MCPOAuthProvider2.MCPOAuthProvider({
+    allowInteractiveAuthorization: true,
     agent,
     flowHandler,
     storage: options?.storage,
@@ -123,6 +126,7 @@ function createNonInteractiveOAuthProvider(agent, options) {
     ...options?.clientMetadata
   };
   return new import_MCPOAuthProvider2.MCPOAuthProvider({
+    allowInteractiveAuthorization: false,
     agent,
     flowHandler,
     storage: options?.storage,
@@ -153,9 +157,10 @@ function hasValidOAuthTokens(agent) {
   return true;
 }
 function clearOAuthTokens(agent) {
-  delete agent.oauth_tokens;
-  delete agent.oauth_client;
-  delete agent.oauth_code_verifier;
+  agent.oauth_tokens = void 0;
+  agent.oauth_client = void 0;
+  agent.oauth_code_verifier = void 0;
+  agent.oauth_discovery_state = void 0;
 }
 function getEffectiveAuthToken(agent) {
   if (hasValidOAuthTokens(agent)) {
@@ -167,6 +172,7 @@ function getEffectiveAuthToken(agent) {
 0 && (module.exports = {
   AUTH_DIAGNOSIS_SCHEMA_VERSION,
   AgentChangedDuringFlowError,
+  AgentOAuthClientCredentialsSchema,
   AgentVanishedDuringFlowError,
   BrowserBindingRequiredError,
   CLIFlowHandler,

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

@@ -43,6 +43,7 @@ function createCLIOAuthProvider(agent, options) {
     ...options?.clientMetadata
   };
   return new MCPOAuthProvider2({
+    allowInteractiveAuthorization: true,
     agent,
     flowHandler,
     storage: options?.storage,
@@ -59,6 +60,7 @@ function createNonInteractiveOAuthProvider(agent, options) {
     ...options?.clientMetadata
   };
   return new MCPOAuthProvider2({
+    allowInteractiveAuthorization: false,
     agent,
     flowHandler,
     storage: options?.storage,
@@ -89,9 +91,10 @@ function hasValidOAuthTokens(agent) {
   return true;
 }
 function clearOAuthTokens(agent) {
-  delete agent.oauth_tokens;
-  delete agent.oauth_client;
-  delete agent.oauth_code_verifier;
+  agent.oauth_tokens = void 0;
+  agent.oauth_client = void 0;
+  agent.oauth_code_verifier = void 0;
+  agent.oauth_discovery_state = void 0;
 }
 function getEffectiveAuthToken(agent) {
   if (hasValidOAuthTokens(agent)) {
@@ -132,11 +135,13 @@ import {
   extractEnvSecretName,
   MissingEnvSecretError
 } from "./secret-resolver.mjs";
+import { AgentOAuthClientCredentialsSchema } from "./client-credentials-schema.mjs";
 import { bindAgentStorage, getAgentStorage, unbindAgentStorage } from "./storage-registry.mjs";
 import { InvalidTokenError, InsufficientScopeError } from "@modelcontextprotocol/sdk/server/auth/errors.js";
 export {
   AUTH_DIAGNOSIS_SCHEMA_VERSION,
   AgentChangedDuringFlowError,
+  AgentOAuthClientCredentialsSchema,
   AgentVanishedDuringFlowError,
   BrowserBindingRequiredError,
   CLIFlowHandler,

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

@@ -13,8 +13,10 @@ export type { AgentConfig, AgentOAuthTokens, AgentOAuthClient };
  * Agent config storage interface
  *
  * Implement this to persist OAuth tokens back to agent configuration.
- * Round-trip pending `oauth_code_verifier` and `oauth_discovery_state` verbatim,
- * and remove OAuth fields absent from the authoritative agent snapshot.
+ * Round-trip pending `oauth_code_verifier` and `oauth_discovery_state` verbatim.
+ * For oauth_tokens, oauth_client, oauth_code_verifier and oauth_discovery_state,
+ * an own undefined property clears; omission preserves the saved field.
+ * Resource overrides and other fields retain the storage backend's semantics.
  * This allows different storage backends (file, database, memory)
  * while keeping tokens in the agent config structure.
  */
@@ -76,6 +78,11 @@ export interface OAuthProviderConfig {
     storage?: OAuthConfigStorage;
     /** Authorization flow handler */
     flowHandler: OAuthFlowHandler;
+    /**
+     * Explicitly allow fresh registration, PKCE work, redirects and automatic
+     * credential invalidation. Defaults to false; CLI factories opt in.
+     */
+    allowInteractiveAuthorization?: boolean;
     /** OAuth client metadata (required - use DEFAULT_CLIENT_METADATA as base) */
     clientMetadata: OAuthClientMetadata;
     /**

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

@@ -13,8 +13,10 @@ export type { AgentConfig, AgentOAuthTokens, AgentOAuthClient };
  * Agent config storage interface
  *
  * Implement this to persist OAuth tokens back to agent configuration.
- * Round-trip pending `oauth_code_verifier` and `oauth_discovery_state` verbatim,
- * and remove OAuth fields absent from the authoritative agent snapshot.
+ * Round-trip pending `oauth_code_verifier` and `oauth_discovery_state` verbatim.
+ * For oauth_tokens, oauth_client, oauth_code_verifier and oauth_discovery_state,
+ * an own undefined property clears; omission preserves the saved field.
+ * Resource overrides and other fields retain the storage backend's semantics.
  * This allows different storage backends (file, database, memory)
  * while keeping tokens in the agent config structure.
  */
@@ -76,6 +78,11 @@ export interface OAuthProviderConfig {
     storage?: OAuthConfigStorage;
     /** Authorization flow handler */
     flowHandler: OAuthFlowHandler;
+    /**
+     * Explicitly allow fresh registration, PKCE work, redirects and automatic
+     * credential invalidation. Defaults to false; CLI factories opt in.
+     */
+    allowInteractiveAuthorization?: boolean;
     /** OAuth client metadata (required - use DEFAULT_CLIENT_METADATA as base) */
     clientMetadata: OAuthClientMetadata;
     /**

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

@@ -103,10 +103,11 @@ function fromMCPClientInfo(info) {
   };
 }
 function isOAuthIssuer(value) {
-  if (typeof value !== "string" || value.length === 0) return false;
+  if (typeof value !== "string" || !value || /[\u0000-\u0020\u007f\\]/.test(value)) return false;
   try {
     const url = new URL(value);
-    return (url.protocol === "https:" || url.protocol === "http:") && !url.username && !url.password && !url.search && !url.hash;
+    const rawAuthority = value.match(/^[a-z][a-z0-9+.-]*:\/\/([^/?#]*)/i)?.[1];
+    return (url.protocol === "https:" || url.protocol === "http:") && !rawAuthority?.includes("@") && !url.username && !url.password && !url.search && !url.hash;
   } catch {
     return false;
   }

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

@@ -71,10 +71,11 @@ function fromMCPClientInfo(info) {
   };
 }
 function isOAuthIssuer(value) {
-  if (typeof value !== "string" || value.length === 0) return false;
+  if (typeof value !== "string" || !value || /[\u0000-\u0020\u007f\\]/.test(value)) return false;
   try {
     const url = new URL(value);
-    return (url.protocol === "https:" || url.protocol === "http:") && !url.username && !url.password && !url.search && !url.hash;
+    const rawAuthority = value.match(/^[a-z][a-z0-9+.-]*:\/\/([^/?#]*)/i)?.[1];
+    return (url.protocol === "https:" || url.protocol === "http:") && !rawAuthority?.includes("@") && !url.username && !url.password && !url.search && !url.hash;
   } catch {
     return false;
   }

package/dist/lib/auth/oauth/web-flow.d.mts

@@ -66,6 +66,8 @@ export interface PendingWebFlow {
     resourceOverrideSnapshot?: string | null;
     scope?: string;
     authorizationServerUrl: string;
+    /** Validated AS issuer frozen at start. Legacy rows without it cannot spend credentials. */
+    authorizationServerIssuer?: string;
     /** Persist as JSON (e.g. Postgres `jsonb`); contents are MCP SDK-typed. */
     clientInformation: OAuthClientInformation;
     createdAt: Date;

package/dist/lib/auth/oauth/web-flow.d.ts

@@ -66,6 +66,8 @@ export interface PendingWebFlow {
     resourceOverrideSnapshot?: string | null;
     scope?: string;
     authorizationServerUrl: string;
+    /** Validated AS issuer frozen at start. Legacy rows without it cannot spend credentials. */
+    authorizationServerIssuer?: string;
     /** Persist as JSON (e.g. Postgres `jsonb`); contents are MCP SDK-typed. */
     clientInformation: OAuthClientInformation;
     createdAt: Date;

package/dist/lib/auth/oauth/web-flow.js

@@ -145,6 +145,8 @@ async function startWebOAuthFlow(opts) {
     throw new import_types.OAuthError(`No OAuth metadata at ${asUrl.toString()}`, "no_authorization_server_metadata", agent.id);
   }
   (0, import_types.assertOAuthServerIssuer)(asMetadata, asUrl.toString());
+  const authorizationServerIssuer = asUrl.toString();
+  assertSavedCredentialIssuers(agent, authorizationServerIssuer);
   const resource = resourceOverride ? new URL(resourceOverride) : prm?.resource ? new URL(prm.resource) : (0, import_auth_utils.resourceUrlFromServerUrl)(new URL(agent.agent_uri));
   const baseClientMetadata = {
     ...import_types.DEFAULT_CLIENT_METADATA,
@@ -159,7 +161,8 @@ async function startWebOAuthFlow(opts) {
     asMetadata,
     clientMetadata: baseClientMetadata,
     fetchFn: guardedFetch,
-    allowConfidentialClient
+    allowConfidentialClient,
+    issuer: authorizationServerIssuer
   });
   const state = (generateState ?? defaultGenerateState)();
   const { authorizationUrl, codeVerifier } = await (0, import_auth.startAuthorization)(asUrl.toString(), {
@@ -187,6 +190,7 @@ async function startWebOAuthFlow(opts) {
     resourceOverrideSnapshot: agent.oauth_resource ?? null,
     scope,
     authorizationServerUrl: asUrl.toString(),
+    authorizationServerIssuer,
     clientInformation,
     createdAt: now,
     expiresAt,
@@ -232,11 +236,16 @@ async function completeWebOAuthFlow(opts) {
     fetchFn: guardedFetch
   });
   (0, import_types.assertOAuthServerIssuer)(asMetadata, flow.authorizationServerUrl);
+  assertFrozenIssuer(flow);
   (0, import_types.assertOAuthCredentialIssuer)(
     flow.clientInformation,
-    flow.authorizationServerUrl,
+    flow.authorizationServerIssuer,
     !!flow.clientInformation.client_secret
   );
+  if (agentStorage) {
+    agentForPersistence = await agentStorage.loadAgent(flow.agentId);
+    assertAgentUnchangedForFlow(agentForPersistence, flow);
+  }
   let tokens;
   try {
     tokens = await (0, import_auth.exchangeAuthorization)(flow.authorizationServerUrl, {
@@ -248,7 +257,7 @@ async function completeWebOAuthFlow(opts) {
       resource: flow.resource ? new URL(flow.resource) : void 0,
       fetchFn: guardedFetch
     });
-    tokens = { ...tokens, issuer: flow.authorizationServerUrl };
+    tokens = { ...tokens, issuer: flow.authorizationServerIssuer };
   } catch (err) {
     throw wrapTokenExchangeError(err);
   }
@@ -262,7 +271,8 @@ async function completeWebOAuthFlow(opts) {
     } else if (flow.resourceOverrideAction === "clear") {
       delete agentForPersistence.oauth_resource;
     }
-    delete agentForPersistence.oauth_code_verifier;
+    agentForPersistence.oauth_code_verifier = void 0;
+    agentForPersistence.oauth_discovery_state = void 0;
     await agentStorage.saveAgent(agentForPersistence);
     persisted = true;
   }
@@ -274,6 +284,20 @@ async function completeWebOAuthFlow(opts) {
     persisted
   };
 }
+function assertSavedCredentialIssuers(agent, issuer) {
+  if (agent.oauth_tokens) (0, import_types.assertOAuthCredentialIssuer)(agent.oauth_tokens, issuer, !!agent.oauth_tokens.refresh_token);
+  if (agent.oauth_client) (0, import_types.assertOAuthCredentialIssuer)(agent.oauth_client, issuer, !!agent.oauth_client.client_secret);
+}
+function assertFrozenIssuer(flow) {
+  if (!flow.authorizationServerIssuer) {
+    throw new import_types.OAuthError(
+      "Pending OAuth flow lacks a validated authorization-server issuer. Start a new owner sign-in.",
+      "oauth_issuer_required",
+      flow.agentId
+    );
+  }
+  (0, import_types.assertOAuthServerIssuer)({ issuer: flow.authorizationServerIssuer }, flow.authorizationServerUrl);
+}
 function assertAgentUnchangedForFlow(agent, flow) {
   if (!agent) {
     throw new AgentVanishedDuringFlowError(flow.agentId);
@@ -281,6 +305,13 @@ function assertAgentUnchangedForFlow(agent, flow) {
   if (agent.agent_uri !== flow.agentUrl) {
     throw new AgentChangedDuringFlowError(flow.agentId);
   }
+  if (!agent.oauth_client) throw new AgentChangedDuringFlowError(flow.agentId);
+  const currentClient = (0, import_types.toMCPClientInfo)(agent.oauth_client);
+  for (const key of ["client_id", "client_secret", "client_secret_expires_at", "issuer"]) {
+    if (currentClient[key] !== flow.clientInformation[key]) throw new AgentChangedDuringFlowError(flow.agentId);
+  }
+  assertFrozenIssuer(flow);
+  assertSavedCredentialIssuers(agent, flow.authorizationServerIssuer);
   if (Object.prototype.hasOwnProperty.call(flow, "resourceOverrideSnapshot") && (agent.oauth_resource ?? null) !== flow.resourceOverrideSnapshot) {
     throw new AgentChangedDuringFlowError(flow.agentId);
   }
@@ -416,9 +447,8 @@ function createSsrfSafeOAuthFetch(trustedFetchFn, allowHttp) {
   });
 }
 async function resolveClientInformation(args) {
-  const { agent, agentStorage, asUrl, asMetadata, clientMetadata, fetchFn, allowConfidentialClient } = args;
+  const { agent, agentStorage, asUrl, asMetadata, clientMetadata, fetchFn, allowConfidentialClient, issuer } = args;
   if (agent.oauth_client) {
-    (0, import_types.assertOAuthCredentialIssuer)(agent.oauth_client, asUrl.toString(), !!agent.oauth_client.client_secret);
     return (0, import_types.toMCPClientInfo)(agent.oauth_client);
   }
   if (!asMetadata.registration_endpoint) {
@@ -428,17 +458,20 @@ async function resolveClientInformation(args) {
       agent.id
     );
   }
-  const registration = await (0, import_auth.registerClient)(asUrl.toString(), {
+  const response = await (0, import_auth.registerClient)(asUrl.toString(), {
     metadata: asMetadata,
     clientMetadata,
     fetchFn
   });
-  const registered = { ...registration, issuer: asUrl.toString() };
+  const registered = { ...response, issuer };
   if (registered.client_secret && !allowConfidentialClient) {
     throw new ConfidentialClientNotAllowedError(agent.id);
   }
   if (agentStorage) {
-    const fresh = await agentStorage.loadAgent(agent.id) ?? agent;
+    const fresh = await agentStorage.loadAgent(agent.id);
+    if (!fresh) throw new AgentVanishedDuringFlowError(agent.id);
+    if (fresh.agent_uri !== agent.agent_uri || fresh.oauth_client) throw new AgentChangedDuringFlowError(agent.id);
+    assertSavedCredentialIssuers(fresh, issuer);
     fresh.oauth_client = (0, import_types.fromMCPClientInfo)(registered);
     await agentStorage.saveAgent(fresh);
   }