agents 0.13.3 → 0.14.1

package/dist/{internal_context-BZrMS0B5.d.ts → internal_context-Dg4Cgjcu.d.ts}

@@ -34,4 +34,4 @@ export {
   __DO_NOT_USE_WILL_BREAK__agentContext as r,
   AgentContextStore as t
 };
-//# sourceMappingURL=internal_context-BZrMS0B5.d.ts.map
+//# sourceMappingURL=internal_context-Dg4Cgjcu.d.ts.map

package/dist/internal_context.d.ts

@@ -2,5 +2,5 @@ import {
   n as AgentEmail,
   r as __DO_NOT_USE_WILL_BREAK__agentContext,
   t as AgentContextStore
-} from "./internal_context-BZrMS0B5.js";
+} from "./internal_context-Dg4Cgjcu.js";
 export { AgentContextStore, AgentEmail, __DO_NOT_USE_WILL_BREAK__agentContext };

package/dist/mcp/client.d.ts

@@ -1,16 +1,18 @@
 import {
-  _t as getNamespacedData,
-  ct as MCPClientManagerOptions,
-  dt as MCPConnectionResult,
-  ft as MCPDiscoverResult,
-  gt as RegisterServerOptions,
-  ht as MCPServerOptions,
-  lt as MCPClientOAuthCallbackConfig,
-  mt as MCPServerFilter,
-  pt as MCPOAuthCallbackResult,
-  st as MCPClientManager,
-  ut as MCPClientOAuthResult
-} from "../agent-tool-types-l98LCbBl.js";
+  _t as MCP_SERVER_ID_MAX_LENGTH,
+  bt as normalizeServerId,
+  ct as MCPClientManager,
+  dt as MCPClientOAuthResult,
+  ft as MCPConnectionResult,
+  gt as MCPServerOptions,
+  ht as MCPServerFilter,
+  lt as MCPClientManagerOptions,
+  mt as MCPOAuthCallbackResult,
+  pt as MCPDiscoverResult,
+  ut as MCPClientOAuthCallbackConfig,
+  vt as RegisterServerOptions,
+  yt as getNamespacedData
+} from "../agent-tool-types-BAJWu8s4.js";
 export {
   MCPClientManager,
   MCPClientManagerOptions,
@@ -21,6 +23,8 @@ export {
   MCPOAuthCallbackResult,
   MCPServerFilter,
   MCPServerOptions,
+  MCP_SERVER_ID_MAX_LENGTH,
   RegisterServerOptions,
-  getNamespacedData
+  getNamespacedData,
+  normalizeServerId
 };

package/dist/mcp/client.js

@@ -1,2 +1,2 @@
-import { n as getNamespacedData, t as MCPClientManager } from "../client-D1kFXo80.js";
-export { MCPClientManager, getNamespacedData };
+import { i as normalizeServerId, n as MCP_SERVER_ID_MAX_LENGTH, r as getNamespacedData, t as MCPClientManager } from "../client-FUizKzj2.js";
+export { MCPClientManager, MCP_SERVER_ID_MAX_LENGTH, getNamespacedData, normalizeServerId };

package/dist/mcp/do-oauth-client-provider.d.ts

@@ -2,7 +2,7 @@ import {
   n as AgentsOAuthProvider,
   r as DurableObjectOAuthClientProvider,
   t as AgentMcpOAuthProvider
-} from "../do-oauth-client-provider-4OKQU9rT.js";
+} from "../do-oauth-client-provider-D4ZwyBDu.js";
 export {
   AgentMcpOAuthProvider,
   AgentsOAuthProvider,

package/dist/mcp/do-oauth-client-provider.js

@@ -1,6 +1,30 @@
+import { AsyncLocalStorage } from "node:async_hooks";
 import { nanoid } from "nanoid";
 //#region src/mcp/do-oauth-client-provider.ts
 const STATE_EXPIRATION_MS = 600 * 1e3;
+const codeVerifierStateStorage = new AsyncLocalStorage();
+function parseOAuthState(state) {
+	const parts = state.split(".");
+	if (parts.length !== 2) return;
+	const [nonce, serverId] = parts;
+	if (!nonce || !serverId) return;
+	return {
+		nonce,
+		serverId
+	};
+}
+function base64UrlEncode(bytes) {
+	let binary = "";
+	for (const byte of bytes) binary += String.fromCharCode(byte);
+	return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+async function createCodeChallenge(verifier) {
+	const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(verifier));
+	return base64UrlEncode(new Uint8Array(digest));
+}
+function isExpired(createdAt) {
+	return Date.now() - createdAt > STATE_EXPIRATION_MS;
+}
 var DurableObjectOAuthClientProvider = class {
 	constructor(storage, clientName, baseRedirectUrl) {
 		this.storage = storage;
@@ -80,12 +104,12 @@ var DurableObjectOAuthClientProvider = class {
 		return state;
 	}
 	async checkState(state) {
-		const parts = state.split(".");
-		if (parts.length !== 2) return {
+		const parsed = parseOAuthState(state);
+		if (!parsed) return {
 			valid: false,
 			error: "Invalid state format"
 		};
-		const [nonce, serverId] = parts;
+		const { nonce, serverId } = parsed;
 		const key = this.stateKey(nonce);
 		const storedState = await this.storage.get(key);
 		if (!storedState) return {
@@ -99,8 +123,10 @@ var DurableObjectOAuthClientProvider = class {
 				error: "State serverId mismatch"
 			};
 		}
-		if (Date.now() - storedState.createdAt > STATE_EXPIRATION_MS) {
-			await this.storage.delete(key);
+		if (isExpired(storedState.createdAt)) {
+			const deleteKeys = [key];
+			if (this._clientId_) deleteKeys.push(this.stateCodeVerifierKey(this.clientId, nonce));
+			await this.storage.delete(deleteKeys);
 			return {
 				valid: false,
 				error: "State expired"
@@ -112,40 +138,140 @@ var DurableObjectOAuthClientProvider = class {
 		};
 	}
 	async consumeState(state) {
-		const parts = state.split(".");
-		if (parts.length !== 2) {
+		const parsed = parseOAuthState(state);
+		if (!parsed) {
 			console.warn(`[OAuth] consumeState called with invalid state format`);
 			return;
 		}
-		const [nonce] = parts;
-		await this.storage.delete(this.stateKey(nonce));
+		await this.storage.delete(this.stateKey(parsed.nonce));
 	}
 	async redirectToAuthorization(authUrl) {
 		this._authUrl_ = authUrl.toString();
+		const clientId = this._clientId_;
+		const serverId = this._serverId_;
+		if (!clientId || !serverId) return;
+		const state = authUrl.searchParams.get("state");
+		const codeChallenge = authUrl.searchParams.get("code_challenge");
+		if (!state || !codeChallenge) return;
+		const parsed = parseOAuthState(state);
+		if (!parsed || parsed.serverId !== serverId) return;
+		const challengeKey = this.challengeCodeVerifierKey(clientId, codeChallenge);
+		const pendingVerifier = await this.storage.get(challengeKey);
+		if (!pendingVerifier) return;
+		if (isExpired(pendingVerifier.createdAt)) {
+			await this.storage.delete(challengeKey);
+			return;
+		}
+		await this.storage.put(this.stateCodeVerifierKey(clientId, parsed.nonce), pendingVerifier);
+		await this.storage.delete(challengeKey);
 	}
 	async invalidateCredentials(scope) {
 		if (!this._clientId_) return;
 		const deleteKeys = [];
 		if (scope === "all" || scope === "client") deleteKeys.push(this.clientInfoKey(this.clientId));
 		if (scope === "all" || scope === "tokens") deleteKeys.push(this.tokenKey(this.clientId));
-		if (scope === "all" || scope === "verifier") deleteKeys.push(this.codeVerifierKey(this.clientId));
+		if (scope === "all" || scope === "verifier") deleteKeys.push(...await this.codeVerifierKeys(this.clientId, { includeChallengeKeys: true }));
 		if (deleteKeys.length > 0) await this.storage.delete(deleteKeys);
 	}
 	codeVerifierKey(clientId) {
 		return `${this.keyPrefix(clientId)}/code_verifier`;
 	}
+	stateCodeVerifierPrefix(clientId) {
+		return `${this.keyPrefix(clientId)}/code_verifier/`;
+	}
+	stateCodeVerifierKey(clientId, nonce) {
+		return `${this.stateCodeVerifierPrefix(clientId)}${nonce}`;
+	}
+	challengeCodeVerifierPrefix(clientId) {
+		return `${this.keyPrefix(clientId)}/code_verifier_challenge/`;
+	}
+	challengeCodeVerifierKey(clientId, codeChallenge) {
+		return `${this.challengeCodeVerifierPrefix(clientId)}${codeChallenge}`;
+	}
+	async codeVerifierKeys(clientId, options = {}) {
+		const legacyKey = this.codeVerifierKey(clientId);
+		const keys = [];
+		if (await this.storage.get(legacyKey)) keys.push(legacyKey);
+		const stateKeys = await this.storage.list({ prefix: this.stateCodeVerifierPrefix(clientId) });
+		keys.push(...stateKeys.keys());
+		if (options.includeChallengeKeys) {
+			const challengeKeys = await this.storage.list({ prefix: this.challengeCodeVerifierPrefix(clientId) });
+			keys.push(...challengeKeys.keys());
+		}
+		return keys;
+	}
 	async saveCodeVerifier(verifier) {
-		const key = this.codeVerifierKey(this.clientId);
-		if (await this.storage.get(key)) return;
-		await this.storage.put(key, verifier);
+		await this.deleteExpiredChallengeCodeVerifiers(this.clientId);
+		const codeChallenge = await createCodeChallenge(verifier);
+		const storedVerifier = {
+			verifier,
+			createdAt: Date.now()
+		};
+		await this.storage.put(this.challengeCodeVerifierKey(this.clientId, codeChallenge), storedVerifier);
+	}
+	async deleteExpiredChallengeCodeVerifiers(clientId) {
+		const expiredKeys = [...(await this.storage.list({ prefix: this.challengeCodeVerifierPrefix(clientId) })).entries()].filter(([, storedVerifier]) => isExpired(storedVerifier.createdAt)).map(([key]) => key);
+		if (expiredKeys.length > 0) await this.storage.delete(expiredKeys);
 	}
 	async codeVerifier() {
-		const codeVerifier = await this.storage.get(this.codeVerifierKey(this.clientId));
-		if (!codeVerifier) throw new Error("No code verifier found");
-		return codeVerifier;
+		const context = codeVerifierStateStorage.getStore();
+		if (context) {
+			const stateVerifier = await this.codeVerifierForState(context.state);
+			if (stateVerifier) {
+				context.servedKey = stateVerifier.key;
+				return stateVerifier.verifier;
+			}
+		}
+		const legacyVerifier = await this.storage.get(this.codeVerifierKey(this.clientId));
+		if (legacyVerifier) {
+			if (context) context.servedKey = this.codeVerifierKey(this.clientId);
+			return legacyVerifier;
+		}
+		if (context) throw new Error("No code verifier found for OAuth state");
+		const pendingVerifiers = await this.storage.list({ prefix: this.stateCodeVerifierPrefix(this.clientId) });
+		const unexpiredPendingVerifiers = [...pendingVerifiers.entries()].filter(([, storedVerifier]) => !isExpired(storedVerifier.createdAt));
+		const expiredKeys = [...pendingVerifiers.entries()].filter(([, storedVerifier]) => isExpired(storedVerifier.createdAt)).map(([key]) => key);
+		if (expiredKeys.length > 0) await this.storage.delete(expiredKeys);
+		if (unexpiredPendingVerifiers.length === 1) {
+			const [[, storedVerifier]] = unexpiredPendingVerifiers;
+			return storedVerifier.verifier;
+		}
+		if (unexpiredPendingVerifiers.length > 1) throw new Error("Multiple OAuth code verifiers are pending; complete authorization with the callback state");
+		throw new Error("No code verifier found");
+	}
+	async codeVerifierForState(state) {
+		const parsed = parseOAuthState(state);
+		if (!parsed) throw new Error("Invalid state format");
+		const key = this.stateCodeVerifierKey(this.clientId, parsed.nonce);
+		const storedVerifier = await this.storage.get(key);
+		if (!storedVerifier) return;
+		if (isExpired(storedVerifier.createdAt)) {
+			await this.storage.delete(key);
+			throw new Error("Code verifier expired");
+		}
+		return {
+			key,
+			verifier: storedVerifier.verifier
+		};
+	}
+	async runWithCodeVerifierState(state, callback) {
+		return codeVerifierStateStorage.run({ state }, callback);
 	}
 	async deleteCodeVerifier() {
-		await this.storage.delete(this.codeVerifierKey(this.clientId));
+		const context = codeVerifierStateStorage.getStore();
+		if (context?.servedKey) {
+			await this.storage.delete(context.servedKey);
+			return;
+		}
+		if (context) {
+			const parsed = parseOAuthState(context.state);
+			if (parsed) {
+				await this.storage.delete(this.stateCodeVerifierKey(this.clientId, parsed.nonce));
+				return;
+			}
+		}
+		const keys = await this.codeVerifierKeys(this.clientId);
+		if (keys.length > 0) await this.storage.delete(keys);
 	}
 };
 //#endregion

package/dist/mcp/do-oauth-client-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"do-oauth-client-provider.js","names":[],"sources":["../../src/mcp/do-oauth-client-provider.ts"],"sourcesContent":["import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n  OAuthClientInformation,\n  OAuthClientInformationFull,\n  OAuthClientMetadata,\n  OAuthTokens\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport { nanoid } from \"nanoid\";\n\nconst STATE_EXPIRATION_MS = 10 * 60 * 1000; // 10 minutes\n\ninterface StoredState {\n  nonce: string;\n  serverId: string;\n  createdAt: number;\n}\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\n// This allows us to track authentication for a specific server and associated dynamic client registration\nexport interface AgentMcpOAuthProvider extends OAuthClientProvider {\n  authUrl: string | undefined;\n  clientId: string | undefined;\n  serverId: string | undefined;\n  checkState(\n    state: string\n  ): Promise<{ valid: boolean; serverId?: string; error?: string }>;\n  consumeState(state: string): Promise<void>;\n  deleteCodeVerifier(): Promise<void>;\n}\n\n/**\n * @deprecated Use {@link AgentMcpOAuthProvider} instead.\n */\nexport type AgentsOAuthProvider = AgentMcpOAuthProvider;\n\nexport class DurableObjectOAuthClientProvider implements AgentMcpOAuthProvider {\n  private _authUrl_: string | undefined;\n  private _serverId_: string | undefined;\n  private _clientId_: string | undefined;\n\n  constructor(\n    public storage: DurableObjectStorage,\n    public clientName: string,\n    public baseRedirectUrl: string\n  ) {\n    if (!storage) {\n      throw new Error(\n        \"DurableObjectOAuthClientProvider requires a valid DurableObjectStorage instance\"\n      );\n    }\n  }\n\n  get clientMetadata(): OAuthClientMetadata {\n    return {\n      client_name: this.clientName,\n      client_uri: this.clientUri,\n      grant_types: [\"authorization_code\", \"refresh_token\"],\n      redirect_uris: [this.redirectUrl],\n      response_types: [\"code\"],\n      token_endpoint_auth_method: \"none\"\n    };\n  }\n\n  get clientUri() {\n    return new URL(this.redirectUrl).origin;\n  }\n\n  get redirectUrl() {\n    return this.baseRedirectUrl;\n  }\n\n  get clientId() {\n    if (!this._clientId_) {\n      throw new Error(\"Trying to access clientId before it was set\");\n    }\n    return this._clientId_;\n  }\n\n  set clientId(clientId_: string) {\n    this._clientId_ = clientId_;\n  }\n\n  get serverId() {\n    if (!this._serverId_) {\n      throw new Error(\"Trying to access serverId before it was set\");\n    }\n    return this._serverId_;\n  }\n\n  set serverId(serverId_: string) {\n    this._serverId_ = serverId_;\n  }\n\n  keyPrefix(clientId: string) {\n    return `/${this.clientName}/${this.serverId}/${clientId}`;\n  }\n\n  clientInfoKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/client_info/`;\n  }\n\n  async clientInformation(): Promise<OAuthClientInformation | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthClientInformation>(\n        this.clientInfoKey(this.clientId)\n      )) ?? undefined\n    );\n  }\n\n  async saveClientInformation(\n    clientInformation: OAuthClientInformationFull\n  ): Promise<void> {\n    await this.storage.put(\n      this.clientInfoKey(clientInformation.client_id),\n      clientInformation\n    );\n    this.clientId = clientInformation.client_id;\n  }\n\n  tokenKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/token`;\n  }\n\n  async tokens(): Promise<OAuthTokens | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n      undefined\n    );\n  }\n\n  async saveTokens(tokens: OAuthTokens): Promise<void> {\n    await this.storage.put(this.tokenKey(this.clientId), tokens);\n  }\n\n  get authUrl() {\n    return this._authUrl_;\n  }\n\n  stateKey(nonce: string) {\n    return `/${this.clientName}/${this.serverId}/state/${nonce}`;\n  }\n\n  async state(): Promise<string> {\n    const nonce = nanoid();\n    const state = `${nonce}.${this.serverId}`;\n    const storedState: StoredState = {\n      nonce,\n      serverId: this.serverId,\n      createdAt: Date.now()\n    };\n    await this.storage.put(this.stateKey(nonce), storedState);\n    return state;\n  }\n\n  async checkState(\n    state: string\n  ): Promise<{ valid: boolean; serverId?: string; error?: string }> {\n    const parts = state.split(\".\");\n    if (parts.length !== 2) {\n      return { valid: false, error: \"Invalid state format\" };\n    }\n\n    const [nonce, serverId] = parts;\n    const key = this.stateKey(nonce);\n    const storedState = await this.storage.get<StoredState>(key);\n\n    if (!storedState) {\n      return { valid: false, error: \"State not found or already used\" };\n    }\n\n    if (storedState.serverId !== serverId) {\n      await this.storage.delete(key);\n      return { valid: false, error: \"State serverId mismatch\" };\n    }\n\n    const age = Date.now() - storedState.createdAt;\n    if (age > STATE_EXPIRATION_MS) {\n      await this.storage.delete(key);\n      return { valid: false, error: \"State expired\" };\n    }\n\n    return { valid: true, serverId };\n  }\n\n  async consumeState(state: string): Promise<void> {\n    const parts = state.split(\".\");\n    if (parts.length !== 2) {\n      // This should never happen since checkState validates format first.\n      // Log for debugging but don't throw - state consumption is best-effort.\n      console.warn(`[OAuth] consumeState called with invalid state format`);\n      return;\n    }\n    const [nonce] = parts;\n    await this.storage.delete(this.stateKey(nonce));\n  }\n\n  async redirectToAuthorization(authUrl: URL): Promise<void> {\n    this._authUrl_ = authUrl.toString();\n  }\n\n  async invalidateCredentials(\n    scope: \"all\" | \"client\" | \"tokens\" | \"verifier\"\n  ): Promise<void> {\n    if (!this._clientId_) return;\n\n    const deleteKeys: string[] = [];\n\n    if (scope === \"all\" || scope === \"client\") {\n      deleteKeys.push(this.clientInfoKey(this.clientId));\n    }\n    if (scope === \"all\" || scope === \"tokens\") {\n      deleteKeys.push(this.tokenKey(this.clientId));\n    }\n    if (scope === \"all\" || scope === \"verifier\") {\n      deleteKeys.push(this.codeVerifierKey(this.clientId));\n    }\n\n    if (deleteKeys.length > 0) {\n      await this.storage.delete(deleteKeys);\n    }\n  }\n\n  codeVerifierKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier`;\n  }\n\n  async saveCodeVerifier(verifier: string): Promise<void> {\n    const key = this.codeVerifierKey(this.clientId);\n\n    // Don't overwrite existing verifier to preserve first PKCE verifier\n    const existing = await this.storage.get<string>(key);\n    if (existing) {\n      return;\n    }\n\n    await this.storage.put(key, verifier);\n  }\n\n  async codeVerifier(): Promise<string> {\n    const codeVerifier = await this.storage.get<string>(\n      this.codeVerifierKey(this.clientId)\n    );\n    if (!codeVerifier) {\n      throw new Error(\"No code verifier found\");\n    }\n    return codeVerifier;\n  }\n\n  async deleteCodeVerifier(): Promise<void> {\n    await this.storage.delete(this.codeVerifierKey(this.clientId));\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"do-oauth-client-provider.js","names":[],"sources":["../../src/mcp/do-oauth-client-provider.ts"],"sourcesContent":["import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n  OAuthClientInformation,\n  OAuthClientInformationFull,\n  OAuthClientMetadata,\n  OAuthTokens\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport { nanoid } from \"nanoid\";\n\nconst STATE_EXPIRATION_MS = 10 * 60 * 1000; // 10 minutes\n\nconst codeVerifierStateStorage = new AsyncLocalStorage<{\n  state: string;\n  servedKey?: string;\n}>();\n\ninterface StoredState {\n  nonce: string;\n  serverId: string;\n  createdAt: number;\n}\n\ninterface StoredCodeVerifier {\n  verifier: string;\n  createdAt: number;\n}\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\n// This allows us to track authentication for a specific server and associated dynamic client registration\nexport interface AgentMcpOAuthProvider extends OAuthClientProvider {\n  authUrl: string | undefined;\n  clientId: string | undefined;\n  serverId: string | undefined;\n  checkState(\n    state: string\n  ): Promise<{ valid: boolean; serverId?: string; error?: string }>;\n  consumeState(state: string): Promise<void>;\n  runWithCodeVerifierState?<T>(\n    state: string,\n    callback: () => Promise<T>\n  ): Promise<T>;\n  deleteCodeVerifier(): Promise<void>;\n}\n\nfunction parseOAuthState(\n  state: string\n): { nonce: string; serverId: string } | undefined {\n  const parts = state.split(\".\");\n  if (parts.length !== 2) {\n    return undefined;\n  }\n\n  const [nonce, serverId] = parts;\n  if (!nonce || !serverId) {\n    return undefined;\n  }\n\n  return { nonce, serverId };\n}\n\nfunction base64UrlEncode(bytes: Uint8Array): string {\n  let binary = \"\";\n  for (const byte of bytes) {\n    binary += String.fromCharCode(byte);\n  }\n  return btoa(binary)\n    .replace(/\\+/g, \"-\")\n    .replace(/\\//g, \"_\")\n    .replace(/=+$/, \"\");\n}\n\nasync function createCodeChallenge(verifier: string): Promise<string> {\n  const digest = await crypto.subtle.digest(\n    \"SHA-256\",\n    new TextEncoder().encode(verifier)\n  );\n  return base64UrlEncode(new Uint8Array(digest));\n}\n\nfunction isExpired(createdAt: number): boolean {\n  return Date.now() - createdAt > STATE_EXPIRATION_MS;\n}\n\n/**\n * @deprecated Use {@link AgentMcpOAuthProvider} instead.\n */\nexport type AgentsOAuthProvider = AgentMcpOAuthProvider;\n\nexport class DurableObjectOAuthClientProvider implements AgentMcpOAuthProvider {\n  private _authUrl_: string | undefined;\n  private _serverId_: string | undefined;\n  private _clientId_: string | undefined;\n\n  constructor(\n    public storage: DurableObjectStorage,\n    public clientName: string,\n    public baseRedirectUrl: string\n  ) {\n    if (!storage) {\n      throw new Error(\n        \"DurableObjectOAuthClientProvider requires a valid DurableObjectStorage instance\"\n      );\n    }\n  }\n\n  get clientMetadata(): OAuthClientMetadata {\n    return {\n      client_name: this.clientName,\n      client_uri: this.clientUri,\n      grant_types: [\"authorization_code\", \"refresh_token\"],\n      redirect_uris: [this.redirectUrl],\n      response_types: [\"code\"],\n      token_endpoint_auth_method: \"none\"\n    };\n  }\n\n  get clientUri() {\n    return new URL(this.redirectUrl).origin;\n  }\n\n  get redirectUrl() {\n    return this.baseRedirectUrl;\n  }\n\n  get clientId() {\n    if (!this._clientId_) {\n      throw new Error(\"Trying to access clientId before it was set\");\n    }\n    return this._clientId_;\n  }\n\n  set clientId(clientId_: string) {\n    this._clientId_ = clientId_;\n  }\n\n  get serverId() {\n    if (!this._serverId_) {\n      throw new Error(\"Trying to access serverId before it was set\");\n    }\n    return this._serverId_;\n  }\n\n  set serverId(serverId_: string) {\n    this._serverId_ = serverId_;\n  }\n\n  keyPrefix(clientId: string) {\n    return `/${this.clientName}/${this.serverId}/${clientId}`;\n  }\n\n  clientInfoKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/client_info/`;\n  }\n\n  async clientInformation(): Promise<OAuthClientInformation | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthClientInformation>(\n        this.clientInfoKey(this.clientId)\n      )) ?? undefined\n    );\n  }\n\n  async saveClientInformation(\n    clientInformation: OAuthClientInformationFull\n  ): Promise<void> {\n    await this.storage.put(\n      this.clientInfoKey(clientInformation.client_id),\n      clientInformation\n    );\n    this.clientId = clientInformation.client_id;\n  }\n\n  tokenKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/token`;\n  }\n\n  async tokens(): Promise<OAuthTokens | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n      undefined\n    );\n  }\n\n  async saveTokens(tokens: OAuthTokens): Promise<void> {\n    await this.storage.put(this.tokenKey(this.clientId), tokens);\n  }\n\n  get authUrl() {\n    return this._authUrl_;\n  }\n\n  stateKey(nonce: string) {\n    return `/${this.clientName}/${this.serverId}/state/${nonce}`;\n  }\n\n  async state(): Promise<string> {\n    const nonce = nanoid();\n    const state = `${nonce}.${this.serverId}`;\n    const storedState: StoredState = {\n      nonce,\n      serverId: this.serverId,\n      createdAt: Date.now()\n    };\n    await this.storage.put(this.stateKey(nonce), storedState);\n    return state;\n  }\n\n  async checkState(\n    state: string\n  ): Promise<{ valid: boolean; serverId?: string; error?: string }> {\n    const parsed = parseOAuthState(state);\n    if (!parsed) {\n      return { valid: false, error: \"Invalid state format\" };\n    }\n\n    const { nonce, serverId } = parsed;\n    const key = this.stateKey(nonce);\n    const storedState = await this.storage.get<StoredState>(key);\n\n    if (!storedState) {\n      return { valid: false, error: \"State not found or already used\" };\n    }\n\n    if (storedState.serverId !== serverId) {\n      await this.storage.delete(key);\n      return { valid: false, error: \"State serverId mismatch\" };\n    }\n\n    if (isExpired(storedState.createdAt)) {\n      const deleteKeys = [key];\n      if (this._clientId_) {\n        deleteKeys.push(this.stateCodeVerifierKey(this.clientId, nonce));\n      }\n      await this.storage.delete(deleteKeys);\n      return { valid: false, error: \"State expired\" };\n    }\n\n    return { valid: true, serverId };\n  }\n\n  async consumeState(state: string): Promise<void> {\n    const parsed = parseOAuthState(state);\n    if (!parsed) {\n      // This should never happen since checkState validates format first.\n      // Log for debugging but don't throw - state consumption is best-effort.\n      console.warn(`[OAuth] consumeState called with invalid state format`);\n      return;\n    }\n    await this.storage.delete(this.stateKey(parsed.nonce));\n  }\n\n  async redirectToAuthorization(authUrl: URL): Promise<void> {\n    this._authUrl_ = authUrl.toString();\n\n    const clientId = this._clientId_;\n    const serverId = this._serverId_;\n    if (!clientId || !serverId) {\n      return;\n    }\n\n    const state = authUrl.searchParams.get(\"state\");\n    const codeChallenge = authUrl.searchParams.get(\"code_challenge\");\n    if (!state || !codeChallenge) {\n      return;\n    }\n\n    const parsed = parseOAuthState(state);\n    if (!parsed || parsed.serverId !== serverId) {\n      return;\n    }\n\n    const challengeKey = this.challengeCodeVerifierKey(clientId, codeChallenge);\n    const pendingVerifier =\n      await this.storage.get<StoredCodeVerifier>(challengeKey);\n    if (!pendingVerifier) {\n      return;\n    }\n\n    if (isExpired(pendingVerifier.createdAt)) {\n      await this.storage.delete(challengeKey);\n      return;\n    }\n\n    await this.storage.put(\n      this.stateCodeVerifierKey(clientId, parsed.nonce),\n      pendingVerifier\n    );\n    await this.storage.delete(challengeKey);\n  }\n\n  async invalidateCredentials(\n    scope: \"all\" | \"client\" | \"tokens\" | \"verifier\"\n  ): Promise<void> {\n    if (!this._clientId_) return;\n\n    const deleteKeys: string[] = [];\n\n    if (scope === \"all\" || scope === \"client\") {\n      deleteKeys.push(this.clientInfoKey(this.clientId));\n    }\n    if (scope === \"all\" || scope === \"tokens\") {\n      deleteKeys.push(this.tokenKey(this.clientId));\n    }\n    if (scope === \"all\" || scope === \"verifier\") {\n      deleteKeys.push(\n        ...(await this.codeVerifierKeys(this.clientId, {\n          includeChallengeKeys: true\n        }))\n      );\n    }\n\n    if (deleteKeys.length > 0) {\n      await this.storage.delete(deleteKeys);\n    }\n  }\n\n  codeVerifierKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier`;\n  }\n\n  stateCodeVerifierPrefix(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier/`;\n  }\n\n  stateCodeVerifierKey(clientId: string, nonce: string) {\n    return `${this.stateCodeVerifierPrefix(clientId)}${nonce}`;\n  }\n\n  challengeCodeVerifierPrefix(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier_challenge/`;\n  }\n\n  challengeCodeVerifierKey(clientId: string, codeChallenge: string) {\n    return `${this.challengeCodeVerifierPrefix(clientId)}${codeChallenge}`;\n  }\n\n  async codeVerifierKeys(\n    clientId: string,\n    options: { includeChallengeKeys?: boolean } = {}\n  ): Promise<string[]> {\n    const legacyKey = this.codeVerifierKey(clientId);\n    const keys: string[] = [];\n\n    if (await this.storage.get(legacyKey)) {\n      keys.push(legacyKey);\n    }\n\n    const stateKeys = await this.storage.list({\n      prefix: this.stateCodeVerifierPrefix(clientId)\n    });\n    keys.push(...stateKeys.keys());\n\n    if (options.includeChallengeKeys) {\n      const challengeKeys = await this.storage.list({\n        prefix: this.challengeCodeVerifierPrefix(clientId)\n      });\n      keys.push(...challengeKeys.keys());\n    }\n\n    return keys;\n  }\n\n  async saveCodeVerifier(verifier: string): Promise<void> {\n    await this.deleteExpiredChallengeCodeVerifiers(this.clientId);\n\n    const codeChallenge = await createCodeChallenge(verifier);\n    const storedVerifier: StoredCodeVerifier = {\n      verifier,\n      createdAt: Date.now()\n    };\n\n    await this.storage.put(\n      this.challengeCodeVerifierKey(this.clientId, codeChallenge),\n      storedVerifier\n    );\n  }\n\n  private async deleteExpiredChallengeCodeVerifiers(\n    clientId: string\n  ): Promise<void> {\n    const challengeVerifiers = await this.storage.list<StoredCodeVerifier>({\n      prefix: this.challengeCodeVerifierPrefix(clientId)\n    });\n    const expiredKeys = [...challengeVerifiers.entries()]\n      .filter(([, storedVerifier]) => isExpired(storedVerifier.createdAt))\n      .map(([key]) => key);\n    if (expiredKeys.length > 0) {\n      await this.storage.delete(expiredKeys);\n    }\n  }\n\n  async codeVerifier(): Promise<string> {\n    const context = codeVerifierStateStorage.getStore();\n    if (context) {\n      const stateVerifier = await this.codeVerifierForState(context.state);\n      if (stateVerifier) {\n        context.servedKey = stateVerifier.key;\n        return stateVerifier.verifier;\n      }\n    }\n\n    const legacyVerifier = await this.storage.get<string>(\n      this.codeVerifierKey(this.clientId)\n    );\n    if (legacyVerifier) {\n      if (context) {\n        context.servedKey = this.codeVerifierKey(this.clientId);\n      }\n      return legacyVerifier;\n    }\n\n    if (context) {\n      throw new Error(\"No code verifier found for OAuth state\");\n    }\n\n    const pendingVerifiers = await this.storage.list<StoredCodeVerifier>({\n      prefix: this.stateCodeVerifierPrefix(this.clientId)\n    });\n    const unexpiredPendingVerifiers = [...pendingVerifiers.entries()].filter(\n      ([, storedVerifier]) => !isExpired(storedVerifier.createdAt)\n    );\n    const expiredKeys = [...pendingVerifiers.entries()]\n      .filter(([, storedVerifier]) => isExpired(storedVerifier.createdAt))\n      .map(([key]) => key);\n    if (expiredKeys.length > 0) {\n      await this.storage.delete(expiredKeys);\n    }\n\n    if (unexpiredPendingVerifiers.length === 1) {\n      const [[, storedVerifier]] = unexpiredPendingVerifiers;\n      return storedVerifier.verifier;\n    }\n\n    if (unexpiredPendingVerifiers.length > 1) {\n      throw new Error(\n        \"Multiple OAuth code verifiers are pending; complete authorization with the callback state\"\n      );\n    }\n\n    throw new Error(\"No code verifier found\");\n  }\n\n  private async codeVerifierForState(\n    state: string\n  ): Promise<{ key: string; verifier: string } | undefined> {\n    const parsed = parseOAuthState(state);\n    if (!parsed) {\n      throw new Error(\"Invalid state format\");\n    }\n\n    const key = this.stateCodeVerifierKey(this.clientId, parsed.nonce);\n    const storedVerifier = await this.storage.get<StoredCodeVerifier>(key);\n    if (!storedVerifier) {\n      return undefined;\n    }\n\n    if (isExpired(storedVerifier.createdAt)) {\n      await this.storage.delete(key);\n      throw new Error(\"Code verifier expired\");\n    }\n\n    return { key, verifier: storedVerifier.verifier };\n  }\n\n  async runWithCodeVerifierState<T>(\n    state: string,\n    callback: () => Promise<T>\n  ): Promise<T> {\n    return codeVerifierStateStorage.run({ state }, callback);\n  }\n\n  async deleteCodeVerifier(): Promise<void> {\n    const context = codeVerifierStateStorage.getStore();\n    if (context?.servedKey) {\n      await this.storage.delete(context.servedKey);\n      return;\n    }\n\n    if (context) {\n      const parsed = parseOAuthState(context.state);\n      if (parsed) {\n        await this.storage.delete(\n          this.stateCodeVerifierKey(this.clientId, parsed.nonce)\n        );\n        return;\n      }\n    }\n\n    const keys = await this.codeVerifierKeys(this.clientId);\n    if (keys.length > 0) {\n      await this.storage.delete(keys);\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/mcp/index.d.ts

@@ -1,32 +1,38 @@
 import {
-  At as McpAuthContext,
-  Ct as ElicitRequest,
-  Dt as CreateMcpHandlerOptions,
-  Et as McpAgent,
-  Ft as SSEEdgeClientTransport,
-  It as StreamableHTTPEdgeClientTransport,
-  Lt as McpClientOptions,
-  Mt as TransportState,
-  Nt as WorkerTransport,
-  Ot as createMcpHandler,
-  Pt as WorkerTransportOptions,
-  St as RPC_DO_PREFIX,
-  Tt as ElicitResult,
-  bt as RPCServerTransport,
-  dt as MCPConnectionResult,
-  ft as MCPDiscoverResult,
-  ht as MCPServerOptions,
-  jt as getMcpAuthContext,
-  kt as experimental_createMcpHandler,
-  lt as MCPClientOAuthCallbackConfig,
-  ut as MCPClientOAuthResult,
-  vt as RPCClientTransport,
-  wt as ElicitRequestSchema,
-  xt as RPCServerTransportOptions,
-  yt as RPCClientTransportOptions
-} from "../agent-tool-types-l98LCbBl.js";
+  At as ClearableEventStore,
+  Bt as SSEEdgeClientTransport,
+  Ct as RPCServerTransport,
+  Dt as ElicitRequestSchema,
+  Et as ElicitRequest,
+  Ft as McpAuthContext,
+  Ht as McpClientOptions,
+  It as getMcpAuthContext,
+  Lt as TransportState,
+  Mt as CreateMcpHandlerOptions,
+  Nt as createMcpHandler,
+  Ot as ElicitResult,
+  Pt as experimental_createMcpHandler,
+  Rt as WorkerTransport,
+  St as RPCClientTransportOptions,
+  Tt as RPC_DO_PREFIX,
+  Vt as StreamableHTTPEdgeClientTransport,
+  _t as MCP_SERVER_ID_MAX_LENGTH,
+  bt as normalizeServerId,
+  dt as MCPClientOAuthResult,
+  ft as MCPConnectionResult,
+  gt as MCPServerOptions,
+  jt as DurableObjectEventStore,
+  kt as McpAgent,
+  pt as MCPDiscoverResult,
+  ut as MCPClientOAuthCallbackConfig,
+  wt as RPCServerTransportOptions,
+  xt as RPCClientTransport,
+  zt as WorkerTransportOptions
+} from "../agent-tool-types-BAJWu8s4.js";
 export {
+  type ClearableEventStore,
   type CreateMcpHandlerOptions,
+  DurableObjectEventStore,
   type ElicitRequest,
   ElicitRequestSchema,
   type ElicitResult,
@@ -35,6 +41,7 @@ export {
   type MCPConnectionResult,
   type MCPDiscoverResult,
   type MCPServerOptions,
+  MCP_SERVER_ID_MAX_LENGTH,
   McpAgent,
   type McpAuthContext,
   type McpClientOptions,
@@ -50,5 +57,6 @@ export {
   type WorkerTransportOptions,
   createMcpHandler,
   experimental_createMcpHandler,
-  getMcpAuthContext
+  getMcpAuthContext,
+  normalizeServerId
 };