@adcp/sdk 13.0.0-rc.7 → 13.0.0-rc.8

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

@@ -27,6 +27,7 @@ var import_types = require('./types.js');
 var import_secret_resolver = require('./secret-resolver.js');
 var import_net = require('../../net/index.js');
 var import_responseSizeLimit = require('../../protocols/responseSizeLimit.js');
+var import_abort = require('../../protocols/abort.js');
 const MAX_AS_ERROR_LENGTH = 200;
 class ClientCredentialsExchangeError extends Error {
   constructor(message, kind, oauthError, oauthErrorDescription, httpStatus) {
@@ -81,6 +82,7 @@ function validateTokenEndpoint(tokenEndpoint, options = {}) {
   return url;
 }
 async function exchangeClientCredentials(credentials, options = {}) {
+  (0, import_abort.throwIfAborted)(options.signal);
   const fetchImpl = (0, import_responseSizeLimit.wrapFetchWithSizeLimit)(options.fetch ?? fetch);
   const timeoutMs = options.timeoutMs ?? 3e4;
   validateTokenEndpoint(credentials.token_endpoint, { allowPrivateIp: options.allowPrivateIp });
@@ -112,18 +114,30 @@ async function exchangeClientCredentials(credentials, options = {}) {
     body.set("client_id", clientId);
     body.set("client_secret", clientSecret);
   }
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), timeoutMs);
   let response;
+  let bodyText;
+  const timeoutError = new Error(`Client credentials exchange timed out after ${timeoutMs}ms`);
+  timeoutError.name = "TimeoutError";
   try {
-    response = await fetchImpl(credentials.token_endpoint, {
-      method: "POST",
-      headers,
-      body: body.toString(),
-      signal: controller.signal
-    });
+    ({ response, bodyText } = await (0, import_abort.withAbortSignal)(
+      [options.signal],
+      timeoutMs,
+      async (signal) => {
+        const tokenResponse = await fetchImpl(credentials.token_endpoint, {
+          method: "POST",
+          headers,
+          body: body.toString(),
+          signal
+        });
+        return { response: tokenResponse, bodyText: await tokenResponse.text() };
+      },
+      { timeoutError }
+    ));
   } catch (err) {
-    if (err.name === "AbortError") {
+    if (options.signal?.aborted) {
+      throw (0, import_abort.createAbortError)(options.signal.reason);
+    }
+    if (err === timeoutError) {
       throw new ClientCredentialsExchangeError(
         `Token endpoint ${credentials.token_endpoint} did not respond within ${timeoutMs}ms.`,
         "network"
@@ -133,10 +147,7 @@ async function exchangeClientCredentials(credentials, options = {}) {
       `Failed to reach token endpoint ${credentials.token_endpoint}: ${err.message}`,
       "network"
     );
-  } finally {
-    clearTimeout(timeout);
   }
-  const bodyText = await response.text();
   let parsed;
   try {
     parsed = bodyText ? JSON.parse(bodyText) : void 0;
@@ -162,11 +173,28 @@ async function exchangeClientCredentials(credentials, options = {}) {
   }
   return (0, import_types.fromMCPTokens)(parsed);
 }
-const inFlightRefresh = /* @__PURE__ */ new Map();
-function coalesceKeyFor(agent, credentials, force) {
-  return `${force ? "force" : "normal"}\0${agent.id}\0${credentials.token_endpoint}\0${credentials.client_id}`;
+const inFlightRefresh = /* @__PURE__ */ new WeakMap();
+async function waitForRefresh(entry, signal) {
+  if (signal?.aborted) throw (0, import_abort.createAbortError)(signal.reason);
+  entry.waiters += 1;
+  let abortListener;
+  try {
+    if (!signal) return await entry.promise;
+    const aborted = new Promise((_resolve, reject) => {
+      abortListener = () => reject((0, import_abort.createAbortError)(signal.reason));
+      signal.addEventListener("abort", abortListener, { once: true });
+    });
+    return await Promise.race([entry.promise, aborted]);
+  } finally {
+    if (abortListener && signal) signal.removeEventListener("abort", abortListener);
+    entry.waiters -= 1;
+    if (entry.waiters === 0 && !entry.settled && !entry.controller.signal.aborted) {
+      entry.controller.abort((0, import_abort.createAbortError)(signal?.reason ?? "No callers remain for token refresh"));
+    }
+  }
 }
 async function ensureClientCredentialsTokens(agent, options = {}) {
+  (0, import_abort.throwIfAborted)(options.signal);
   if (!agent.oauth_client_credentials) {
     throw new Error(
       `ensureClientCredentialsTokens called for agent '${agent.id}' with no oauth_client_credentials configured.`
@@ -178,19 +206,32 @@ async function ensureClientCredentialsTokens(agent, options = {}) {
   if (cachedIsValid) {
     return cached;
   }
-  const coalesceKey = coalesceKeyFor(agent, agent.oauth_client_credentials, options.force === true);
-  const existing = inFlightRefresh.get(coalesceKey);
-  if (existing) {
-    const tokens = await existing;
+  const refreshMode = options.force ? "force" : "normal";
+  let agentRefreshes = inFlightRefresh.get(agent);
+  const existing = agentRefreshes?.get(refreshMode);
+  if (existing && !existing.controller.signal.aborted) {
+    const tokens = await waitForRefresh(existing, options.signal);
     agent.oauth_tokens = tokens;
     return tokens;
   }
-  const exchange = (async () => {
+  const controller = new AbortController();
+  const entry = {
+    promise: void 0,
+    controller,
+    waiters: 0,
+    settled: false
+  };
+  if (!agentRefreshes) {
+    agentRefreshes = /* @__PURE__ */ new Map();
+    inFlightRefresh.set(agent, agentRefreshes);
+  }
+  entry.promise = (async () => {
     try {
       const tokens = await exchangeClientCredentials(agent.oauth_client_credentials, {
         fetch: options.fetch,
         timeoutMs: options.timeoutMs,
-        allowPrivateIp: options.allowPrivateIp
+        allowPrivateIp: options.allowPrivateIp,
+        signal: controller.signal
       });
       agent.oauth_tokens = tokens;
       if (options.storage) {
@@ -198,11 +239,15 @@ async function ensureClientCredentialsTokens(agent, options = {}) {
       }
       return tokens;
     } finally {
-      inFlightRefresh.delete(coalesceKey);
+      entry.settled = true;
+      if (agentRefreshes?.get(refreshMode) === entry) {
+        agentRefreshes.delete(refreshMode);
+        if (agentRefreshes.size === 0) inFlightRefresh.delete(agent);
+      }
     }
   })();
-  inFlightRefresh.set(coalesceKey, exchange);
-  return exchange;
+  agentRefreshes.set(refreshMode, entry);
+  return waitForRefresh(entry, options.signal);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/auth/oauth/ClientCredentialsFlow.ts"],"sourcesContent":["/**\n * OAuth 2.0 client credentials grant — RFC 6749 §4.4.\n *\n * For machine-to-machine use cases (CI compliance runs, automated checks)\n * where there is no user to walk through an authorization-code flow. The\n * client POSTs its ID + secret to the authorization server's token endpoint\n * and gets back an access token directly.\n *\n * This file provides:\n * - {@link exchangeClientCredentials}: one-shot token exchange. Use for the\n *   initial fetch during `--save-auth` and for forced refresh.\n * - {@link ensureClientCredentialsTokens}: reads the cached tokens on an\n *   `AgentConfig`, checks expiry, re-exchanges if needed, and persists the\n *   refreshed tokens via an optional {@link OAuthConfigStorage}.\n *\n * Why a dedicated module instead of the MCP SDK's `OAuthClientProvider`:\n * client credentials doesn't need discovery, dynamic client registration,\n * PKCE, or authorization code exchange — all the plumbing that provider\n * exists to coordinate. A direct token POST and a cached-token check is the\n * entire protocol. The call path keeps using the plain `Authorization:\n * Bearer` header path — the same path it already uses for `auth_token`.\n *\n * **Security note (library consumers):** `token_endpoint` is passed to\n * `fetch` directly. Callers that accept untrusted `AgentConfig` values\n * from network requests (e.g. a hosted compliance service accepting\n * user-supplied configs) MUST validate the URL against an allowlist or\n * SSRF-block private IPs before invoking these helpers. The CLI and\n * operator-driven flows are already trusted.\n */\n\nimport { fromMCPTokens, type OAuthTokens, type AgentConfig, type AgentOAuthTokens } from './types';\nimport type { AgentOAuthClientCredentials } from '../../types/adcp';\nimport type { OAuthConfigStorage } from './types';\nimport { resolveSecret } from './secret-resolver';\nimport { isLikelyPrivateUrl } from '../../net';\nimport { wrapFetchWithSizeLimit } from '../../protocols/responseSizeLimit';\n\n/** Max length we'll echo from an AS-supplied error description into errors. */\nconst MAX_AS_ERROR_LENGTH = 200;\n\n/**\n * Raised when the authorization server rejects a client credentials\n * exchange or the token endpoint is unreachable/malformed.\n *\n * The {@link kind} discriminator lets callers branch without\n * string-matching on the message:\n * - `oauth`: the AS returned a structured OAuth error (RFC 6749 §5.2 —\n *   `invalid_client`, `invalid_grant`, `invalid_scope`, …). Read\n *   {@link oauthError} / {@link oauthErrorDescription}.\n * - `malformed`: the AS returned HTTP 200 but no `access_token`, or a\n *   non-JSON body.\n * - `network`: the exchange never reached the AS (DNS failure, connection\n *   refused, timeout, TLS error).\n */\nexport class ClientCredentialsExchangeError extends Error {\n  readonly code = 'client_credentials_exchange_failed';\n  constructor(\n    message: string,\n    public readonly kind: 'oauth' | 'malformed' | 'network',\n    public readonly oauthError?: string,\n    public readonly oauthErrorDescription?: string,\n    public readonly httpStatus?: number\n  ) {\n    super(message);\n    this.name = 'ClientCredentialsExchangeError';\n  }\n}\n\n/**\n * Options for {@link exchangeClientCredentials}.\n */\nexport interface ExchangeClientCredentialsOptions {\n  /**\n   * Custom fetch implementation (default: global `fetch`).\n   * Primarily a testing hook — lets unit tests stub the authorization server\n   * without intercepting the global.\n   */\n  fetch?: typeof fetch;\n  /**\n   * Request timeout in milliseconds (default: 30_000). Guards against a\n   * silently hung authorization server blocking the caller indefinitely.\n   */\n  timeoutMs?: number;\n  /**\n   * Allow `token_endpoint` to resolve to a private / loopback IP address.\n   * Default: false (SSRF guard). The CLI opts in because the operator is\n   * explicitly configuring the endpoint; hosted consumers accepting\n   * user-supplied configs should leave this off.\n   */\n  allowPrivateIp?: boolean;\n}\n\n/**\n * RFC 6749 §2.3.1 application/x-www-form-urlencoded encoding.\n *\n * Differs from `encodeURIComponent` in two important ways:\n * 1. Spaces are encoded as `+`, not `%20`.\n * 2. The characters `!'()*` are percent-encoded (URI component leaves them\n *    alone).\n *\n * A secret containing any of those chars would hash to a different Basic\n * string than the AS computes, producing a spurious `invalid_client`.\n */\nfunction formUrlEncode(value: string): string {\n  return encodeURIComponent(value)\n    .replace(/%20/g, '+')\n    .replace(/!/g, '%21')\n    .replace(/'/g, '%27')\n    .replace(/\\(/g, '%28')\n    .replace(/\\)/g, '%29')\n    .replace(/\\*/g, '%2A');\n}\n\n/**\n * Strip control chars (C0, C1, DEL) and truncate.\n *\n * Defensive cleanup on AS-controlled strings we print to a TTY. A\n * malicious or compromised AS could emit ANSI escape sequences or CRLF\n * payloads in `error_description`; we don't want those rewriting terminal\n * titles or forging log lines.\n */\nfunction sanitizeAsMessage(raw: string): string {\n  // eslint-disable-next-line no-control-regex\n  const stripped = raw.replace(/[\\x00-\\x1F\\x7F-\\x9F]/g, ' ');\n  if (stripped.length <= MAX_AS_ERROR_LENGTH) return stripped;\n  return stripped.slice(0, MAX_AS_ERROR_LENGTH) + '…';\n}\n\n/**\n * Validate the token endpoint before we hit it. Three checks, in order:\n *\n * 1. Parse as a URL. Unparseable → `malformed`.\n * 2. Reject URLs that carry `user:pass@` userinfo — they'd leak via error\n *    messages and log aggregators, and the OAuth client credentials live\n *    in `client_id` / `client_secret`, never the URL.\n * 3. Reject plaintext `http://` outside `localhost` / loopback IPs.\n *    RFC 6749 §3.1 requires TLS; the loopback carve-out covers local dev\n *    authorization servers where plaintext is not a leak risk.\n * 4. Reject private / loopback / link-local IPs unless `allowPrivateIp`.\n *    The library default is a SSRF guard; the CLI (operator-driven) opts\n *    in because a user pointing at `localhost:8080` is legitimate. Network\n *    code behind this call will still do DNS resolution, so this is a\n *    best-effort literal-IP / known-loopback check — host allowlisting\n *    upstream is the right control for adversarial environments.\n */\nfunction validateTokenEndpoint(tokenEndpoint: string, options: { allowPrivateIp?: boolean } = {}): URL {\n  let url: URL;\n  try {\n    url = new URL(tokenEndpoint);\n  } catch {\n    throw new ClientCredentialsExchangeError(`Invalid token_endpoint URL: ${tokenEndpoint}`, 'malformed');\n  }\n\n  if (url.username || url.password) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must not contain userinfo (user:pass@). Put credentials in client_id / client_secret instead.`,\n      'malformed'\n    );\n  }\n\n  const host = url.hostname;\n  const isLoopback = host === 'localhost' || host === '127.0.0.1' || host === '[::1]' || host === '::1';\n\n  if (url.protocol !== 'https:' && !(url.protocol === 'http:' && isLoopback)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must be HTTPS (got ${url.protocol}//${host}). The client secret would be sent in plaintext over HTTP. Use https:// (or http://localhost for local dev).`,\n      'malformed'\n    );\n  }\n\n  if (!options.allowPrivateIp && isLikelyPrivateUrl(tokenEndpoint)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint resolves to a private or loopback address (${host}). Pass { allowPrivateIp: true } to exchangeClientCredentials / ensureClientCredentialsTokens if this is intentional (operator-driven CLI or local test setups).`,\n      'malformed'\n    );\n  }\n\n  return url;\n}\n\n/**\n * Exchange client credentials for an access token.\n *\n * Secret values in `credentials.client_id` / `client_secret` may be `$ENV:VAR`\n * references — they are resolved here at exchange time. Missing env vars\n * surface as `MissingEnvSecretError` (from `secret-resolver`), which\n * callers typically print with the variable name for the user to fix.\n *\n * @throws {ClientCredentialsExchangeError} on any non-2xx response, malformed 200, or network failure\n * @throws {MissingEnvSecretError} if a `$ENV:VAR` ref points at an unset var\n */\nexport async function exchangeClientCredentials(\n  credentials: AgentOAuthClientCredentials,\n  options: ExchangeClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  // Wrap with the response-size-limit guard so a hostile token endpoint\n  // can't buffer-bomb on every refresh. Pass-through when no\n  // `withResponseSizeLimit` slot is active. (#1175)\n  const fetchImpl = wrapFetchWithSizeLimit(options.fetch ?? fetch);\n  const timeoutMs = options.timeoutMs ?? 30_000;\n\n  validateTokenEndpoint(credentials.token_endpoint, { allowPrivateIp: options.allowPrivateIp });\n\n  const clientId = resolveSecret(credentials.client_id);\n  const clientSecret = resolveSecret(credentials.client_secret);\n  const authMethod = credentials.auth_method ?? 'basic';\n\n  const body = new URLSearchParams();\n  body.set('grant_type', 'client_credentials');\n  if (credentials.scope) {\n    body.set('scope', credentials.scope);\n  }\n  // RFC 8707 resource indicators — emitted as one `resource` field per URI\n  // so the AS receives the full list. URLSearchParams#append is the only\n  // way to produce repeated keys in form encoding.\n  if (credentials.resource) {\n    const resources = Array.isArray(credentials.resource) ? credentials.resource : [credentials.resource];\n    for (const r of resources) body.append('resource', r);\n  }\n  if (credentials.audience) {\n    body.set('audience', credentials.audience);\n  }\n\n  const headers: Record<string, string> = {\n    'content-type': 'application/x-www-form-urlencoded',\n    accept: 'application/json',\n  };\n\n  if (authMethod === 'basic') {\n    // RFC 6749 §2.3.1: form-urlencode ID/secret before base64 (NOT URI\n    // component encoding — space is `+`, and `!'()*` must be percent-\n    // encoded). Most deployed servers accept raw values too, but spec\n    // compliance avoids a footgun with secrets containing those chars.\n    const encoded = Buffer.from(`${formUrlEncode(clientId)}:${formUrlEncode(clientSecret)}`, 'utf-8').toString(\n      'base64'\n    );\n    headers.authorization = `Basic ${encoded}`;\n  } else {\n    body.set('client_id', clientId);\n    body.set('client_secret', clientSecret);\n  }\n\n  const controller = new AbortController();\n  const timeout = setTimeout(() => controller.abort(), timeoutMs);\n\n  let response: Response;\n  try {\n    response = await fetchImpl(credentials.token_endpoint, {\n      method: 'POST',\n      headers,\n      body: body.toString(),\n      signal: controller.signal,\n    });\n  } catch (err) {\n    if ((err as { name?: string }).name === 'AbortError') {\n      throw new ClientCredentialsExchangeError(\n        `Token endpoint ${credentials.token_endpoint} did not respond within ${timeoutMs}ms.`,\n        'network'\n      );\n    }\n    throw new ClientCredentialsExchangeError(\n      `Failed to reach token endpoint ${credentials.token_endpoint}: ${(err as Error).message}`,\n      'network'\n    );\n  } finally {\n    clearTimeout(timeout);\n  }\n\n  const bodyText = await response.text();\n  let parsed: Record<string, unknown> | undefined;\n  try {\n    parsed = bodyText ? (JSON.parse(bodyText) as Record<string, unknown>) : undefined;\n  } catch {\n    // Non-JSON response; parsed stays undefined, handled below.\n  }\n\n  if (!response.ok) {\n    const rawOauthError = typeof parsed?.error === 'string' ? parsed.error : undefined;\n    const rawOauthDesc = typeof parsed?.error_description === 'string' ? parsed.error_description : undefined;\n    const oauthError = rawOauthError ? sanitizeAsMessage(rawOauthError) : undefined;\n    const oauthDesc = rawOauthDesc ? sanitizeAsMessage(rawOauthDesc) : undefined;\n    const message =\n      oauthError || oauthDesc\n        ? `Client credentials exchange failed: ${oauthError ?? 'error'}${oauthDesc ? ` — ${oauthDesc}` : ''}`\n        : `Client credentials exchange failed with HTTP ${response.status}: ${sanitizeAsMessage(bodyText) || '(empty body)'}`;\n    const kind = rawOauthError ? 'oauth' : 'malformed';\n    throw new ClientCredentialsExchangeError(message, kind, oauthError, oauthDesc, response.status);\n  }\n\n  if (!parsed || typeof parsed.access_token !== 'string') {\n    throw new ClientCredentialsExchangeError(\n      `Token endpoint returned HTTP ${response.status} but no access_token. Body: ${sanitizeAsMessage(bodyText)}`,\n      'malformed',\n      undefined,\n      undefined,\n      response.status\n    );\n  }\n\n  return fromMCPTokens(parsed as unknown as OAuthTokens);\n}\n\n/**\n * Options for {@link ensureClientCredentialsTokens}.\n */\nexport interface EnsureClientCredentialsOptions extends ExchangeClientCredentialsOptions {\n  /**\n   * Storage backend used to persist refreshed tokens. Optional — if omitted,\n   * tokens are only mutated on the in-memory `agent` object and the caller\n   * is responsible for persisting.\n   */\n  storage?: OAuthConfigStorage;\n  /**\n   * Force a re-exchange even if the cached token looks valid. Useful after a\n   * 401 in case the authorization server rotated something out-of-band.\n   */\n  force?: boolean;\n  /**\n   * Expiration skew (ms). Treat the token as expired this many milliseconds\n   * before its nominal `expires_at` — protects against clock skew and\n   * in-flight requests. Default: 60_000 (1 minute). The interactive auth\n   * code flow uses 5 minutes; client credentials refresh is cheap (single\n   * POST) so the shorter window is fine here.\n   */\n  expirationSkewMs?: number;\n}\n\n/**\n * In-flight refresh coalescing map. Keyed by the tuple\n * `(agent.id, token_endpoint, client_id)` — concurrent\n * `ensureClientCredentialsTokens` calls for the same credentials share a\n * single token POST instead of each racing to exchange the same secret.\n *\n * Two different `AgentConfig` objects that accidentally reuse the same\n * `id` (e.g. two tenants both creating `cli-agent`) but hold different\n * credentials won't cross-contaminate — the endpoint + client_id in the\n * key keeps them distinct.\n *\n * Cleared on completion regardless of success/failure.\n *\n * Note: this is an in-process map. Multi-process deployments (worker\n * pools, multiple CLI invocations, horizontally scaled Node servers)\n * don't coalesce across workers — each process will do its own refresh.\n * For the CLI this is fine; for high-throughput server deployments,\n * coalesce upstream at the storage layer.\n */\nconst inFlightRefresh = new Map<string, Promise<AgentOAuthTokens>>();\n\n/**\n * Compute the coalesce key for `ensureClientCredentialsTokens`. `force: true`\n * uses a distinct bucket so a 401-triggered forced refresh never piggybacks\n * on a still-pending non-forced exchange — the whole point of forcing is\n * that the in-flight token is *known* stale, so awaiting it would defeat\n * the retry.\n */\nfunction coalesceKeyFor(agent: AgentConfig, credentials: AgentOAuthClientCredentials, force: boolean): string {\n  return `${force ? 'force' : 'normal'}\\u0000${agent.id}\\u0000${credentials.token_endpoint}\\u0000${credentials.client_id}`;\n}\n\n/**\n * Ensure an agent has a valid access token, refreshing via client credentials\n * if the cached one is missing or expired. Idempotent and safe to call\n * before every request.\n *\n * Concurrent calls for the same `agent.id` are coalesced into a single\n * token POST via an in-process promise map — the common case of a\n * storyboard fan-out firing 10 tool calls in parallel does one refresh,\n * not ten.\n *\n * **Mutation:** this function writes `agent.oauth_tokens` in place. That is\n * the contract the MCP SDK's `OAuthClientProvider` pattern also uses, and\n * it lets the CLI's file-backed storage see the same object. Callers that\n * share an `AgentConfig` across different logical agents must copy first.\n *\n * Precondition: `agent.oauth_client_credentials` must be set. Throws a plain\n * Error if not — callers are expected to branch on its presence before\n * calling this.\n */\nexport async function ensureClientCredentialsTokens(\n  agent: AgentConfig,\n  options: EnsureClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  if (!agent.oauth_client_credentials) {\n    throw new Error(\n      `ensureClientCredentialsTokens called for agent '${agent.id}' with no oauth_client_credentials configured.`\n    );\n  }\n\n  const skew = options.expirationSkewMs ?? 60_000;\n  const cached = agent.oauth_tokens;\n  const cachedIsValid =\n    !options.force &&\n    cached?.access_token &&\n    (!cached.expires_at || new Date(cached.expires_at).getTime() - Date.now() > skew);\n\n  if (cachedIsValid) {\n    return cached!;\n  }\n\n  const coalesceKey = coalesceKeyFor(agent, agent.oauth_client_credentials, options.force === true);\n  const existing = inFlightRefresh.get(coalesceKey);\n  if (existing) {\n    const tokens = await existing;\n    agent.oauth_tokens = tokens;\n    return tokens;\n  }\n\n  const exchange = (async () => {\n    try {\n      const tokens = await exchangeClientCredentials(agent.oauth_client_credentials!, {\n        fetch: options.fetch,\n        timeoutMs: options.timeoutMs,\n        allowPrivateIp: options.allowPrivateIp,\n      });\n      agent.oauth_tokens = tokens;\n      if (options.storage) {\n        await options.storage.saveAgent(agent);\n      }\n      return tokens;\n    } finally {\n      inFlightRefresh.delete(coalesceKey);\n    }\n  })();\n\n  inFlightRefresh.set(coalesceKey, exchange);\n  return exchange;\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/lib/auth/oauth/ClientCredentialsFlow.ts"],"sourcesContent":["/**\n * OAuth 2.0 client credentials grant — RFC 6749 §4.4.\n *\n * For machine-to-machine use cases (CI compliance runs, automated checks)\n * where there is no user to walk through an authorization-code flow. The\n * client POSTs its ID + secret to the authorization server's token endpoint\n * and gets back an access token directly.\n *\n * This file provides:\n * - {@link exchangeClientCredentials}: one-shot token exchange. Use for the\n *   initial fetch during `--save-auth` and for forced refresh.\n * - {@link ensureClientCredentialsTokens}: reads the cached tokens on an\n *   `AgentConfig`, checks expiry, re-exchanges if needed, and persists the\n *   refreshed tokens via an optional {@link OAuthConfigStorage}.\n *\n * Why a dedicated module instead of the MCP SDK's `OAuthClientProvider`:\n * client credentials doesn't need discovery, dynamic client registration,\n * PKCE, or authorization code exchange — all the plumbing that provider\n * exists to coordinate. A direct token POST and a cached-token check is the\n * entire protocol. The call path keeps using the plain `Authorization:\n * Bearer` header path — the same path it already uses for `auth_token`.\n *\n * **Security note (library consumers):** `token_endpoint` is passed to\n * `fetch` directly. Callers that accept untrusted `AgentConfig` values\n * from network requests (e.g. a hosted compliance service accepting\n * user-supplied configs) MUST validate the URL against an allowlist or\n * SSRF-block private IPs before invoking these helpers. The CLI and\n * operator-driven flows are already trusted.\n */\n\nimport { fromMCPTokens, type OAuthTokens, type AgentConfig, type AgentOAuthTokens } from './types';\nimport type { AgentOAuthClientCredentials } from '../../types/adcp';\nimport type { OAuthConfigStorage } from './types';\nimport { resolveSecret } from './secret-resolver';\nimport { isLikelyPrivateUrl } from '../../net';\nimport { wrapFetchWithSizeLimit } from '../../protocols/responseSizeLimit';\nimport { createAbortError, throwIfAborted, withAbortSignal } from '../../protocols/abort';\n\n/** Max length we'll echo from an AS-supplied error description into errors. */\nconst MAX_AS_ERROR_LENGTH = 200;\n\n/**\n * Raised when the authorization server rejects a client credentials\n * exchange or the token endpoint is unreachable/malformed.\n *\n * The {@link kind} discriminator lets callers branch without\n * string-matching on the message:\n * - `oauth`: the AS returned a structured OAuth error (RFC 6749 §5.2 —\n *   `invalid_client`, `invalid_grant`, `invalid_scope`, …). Read\n *   {@link oauthError} / {@link oauthErrorDescription}.\n * - `malformed`: the AS returned HTTP 200 but no `access_token`, or a\n *   non-JSON body.\n * - `network`: the exchange never reached the AS (DNS failure, connection\n *   refused, timeout, TLS error).\n */\nexport class ClientCredentialsExchangeError extends Error {\n  readonly code = 'client_credentials_exchange_failed';\n  constructor(\n    message: string,\n    public readonly kind: 'oauth' | 'malformed' | 'network',\n    public readonly oauthError?: string,\n    public readonly oauthErrorDescription?: string,\n    public readonly httpStatus?: number\n  ) {\n    super(message);\n    this.name = 'ClientCredentialsExchangeError';\n  }\n}\n\n/**\n * Options for {@link exchangeClientCredentials}.\n */\nexport interface ExchangeClientCredentialsOptions {\n  /**\n   * Custom fetch implementation (default: global `fetch`).\n   * Primarily a testing hook — lets unit tests stub the authorization server\n   * without intercepting the global.\n   */\n  fetch?: typeof fetch;\n  /**\n   * Request timeout in milliseconds (default: 30_000). Guards against a\n   * silently hung authorization server blocking the caller indefinitely.\n   */\n  timeoutMs?: number;\n  /**\n   * Allow `token_endpoint` to resolve to a private / loopback IP address.\n   * Default: false (SSRF guard). The CLI opts in because the operator is\n   * explicitly configuring the endpoint; hosted consumers accepting\n   * user-supplied configs should leave this off.\n   */\n  allowPrivateIp?: boolean;\n  /** Caller-owned cancellation signal, composed with `timeoutMs`. */\n  signal?: AbortSignal;\n}\n\n/**\n * RFC 6749 §2.3.1 application/x-www-form-urlencoded encoding.\n *\n * Differs from `encodeURIComponent` in two important ways:\n * 1. Spaces are encoded as `+`, not `%20`.\n * 2. The characters `!'()*` are percent-encoded (URI component leaves them\n *    alone).\n *\n * A secret containing any of those chars would hash to a different Basic\n * string than the AS computes, producing a spurious `invalid_client`.\n */\nfunction formUrlEncode(value: string): string {\n  return encodeURIComponent(value)\n    .replace(/%20/g, '+')\n    .replace(/!/g, '%21')\n    .replace(/'/g, '%27')\n    .replace(/\\(/g, '%28')\n    .replace(/\\)/g, '%29')\n    .replace(/\\*/g, '%2A');\n}\n\n/**\n * Strip control chars (C0, C1, DEL) and truncate.\n *\n * Defensive cleanup on AS-controlled strings we print to a TTY. A\n * malicious or compromised AS could emit ANSI escape sequences or CRLF\n * payloads in `error_description`; we don't want those rewriting terminal\n * titles or forging log lines.\n */\nfunction sanitizeAsMessage(raw: string): string {\n  // eslint-disable-next-line no-control-regex\n  const stripped = raw.replace(/[\\x00-\\x1F\\x7F-\\x9F]/g, ' ');\n  if (stripped.length <= MAX_AS_ERROR_LENGTH) return stripped;\n  return stripped.slice(0, MAX_AS_ERROR_LENGTH) + '…';\n}\n\n/**\n * Validate the token endpoint before we hit it. Three checks, in order:\n *\n * 1. Parse as a URL. Unparseable → `malformed`.\n * 2. Reject URLs that carry `user:pass@` userinfo — they'd leak via error\n *    messages and log aggregators, and the OAuth client credentials live\n *    in `client_id` / `client_secret`, never the URL.\n * 3. Reject plaintext `http://` outside `localhost` / loopback IPs.\n *    RFC 6749 §3.1 requires TLS; the loopback carve-out covers local dev\n *    authorization servers where plaintext is not a leak risk.\n * 4. Reject private / loopback / link-local IPs unless `allowPrivateIp`.\n *    The library default is a SSRF guard; the CLI (operator-driven) opts\n *    in because a user pointing at `localhost:8080` is legitimate. Network\n *    code behind this call will still do DNS resolution, so this is a\n *    best-effort literal-IP / known-loopback check — host allowlisting\n *    upstream is the right control for adversarial environments.\n */\nfunction validateTokenEndpoint(tokenEndpoint: string, options: { allowPrivateIp?: boolean } = {}): URL {\n  let url: URL;\n  try {\n    url = new URL(tokenEndpoint);\n  } catch {\n    throw new ClientCredentialsExchangeError(`Invalid token_endpoint URL: ${tokenEndpoint}`, 'malformed');\n  }\n\n  if (url.username || url.password) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must not contain userinfo (user:pass@). Put credentials in client_id / client_secret instead.`,\n      'malformed'\n    );\n  }\n\n  const host = url.hostname;\n  const isLoopback = host === 'localhost' || host === '127.0.0.1' || host === '[::1]' || host === '::1';\n\n  if (url.protocol !== 'https:' && !(url.protocol === 'http:' && isLoopback)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must be HTTPS (got ${url.protocol}//${host}). The client secret would be sent in plaintext over HTTP. Use https:// (or http://localhost for local dev).`,\n      'malformed'\n    );\n  }\n\n  if (!options.allowPrivateIp && isLikelyPrivateUrl(tokenEndpoint)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint resolves to a private or loopback address (${host}). Pass { allowPrivateIp: true } to exchangeClientCredentials / ensureClientCredentialsTokens if this is intentional (operator-driven CLI or local test setups).`,\n      'malformed'\n    );\n  }\n\n  return url;\n}\n\n/**\n * Exchange client credentials for an access token.\n *\n * Secret values in `credentials.client_id` / `client_secret` may be `$ENV:VAR`\n * references — they are resolved here at exchange time. Missing env vars\n * surface as `MissingEnvSecretError` (from `secret-resolver`), which\n * callers typically print with the variable name for the user to fix.\n *\n * @throws {ClientCredentialsExchangeError} on any non-2xx response, malformed 200, or network failure\n * @throws {MissingEnvSecretError} if a `$ENV:VAR` ref points at an unset var\n */\nexport async function exchangeClientCredentials(\n  credentials: AgentOAuthClientCredentials,\n  options: ExchangeClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  throwIfAborted(options.signal);\n\n  // Wrap with the response-size-limit guard so a hostile token endpoint\n  // can't buffer-bomb on every refresh. Pass-through when no\n  // `withResponseSizeLimit` slot is active. (#1175)\n  const fetchImpl = wrapFetchWithSizeLimit(options.fetch ?? fetch);\n  const timeoutMs = options.timeoutMs ?? 30_000;\n\n  validateTokenEndpoint(credentials.token_endpoint, { allowPrivateIp: options.allowPrivateIp });\n\n  const clientId = resolveSecret(credentials.client_id);\n  const clientSecret = resolveSecret(credentials.client_secret);\n  const authMethod = credentials.auth_method ?? 'basic';\n\n  const body = new URLSearchParams();\n  body.set('grant_type', 'client_credentials');\n  if (credentials.scope) {\n    body.set('scope', credentials.scope);\n  }\n  // RFC 8707 resource indicators — emitted as one `resource` field per URI\n  // so the AS receives the full list. URLSearchParams#append is the only\n  // way to produce repeated keys in form encoding.\n  if (credentials.resource) {\n    const resources = Array.isArray(credentials.resource) ? credentials.resource : [credentials.resource];\n    for (const r of resources) body.append('resource', r);\n  }\n  if (credentials.audience) {\n    body.set('audience', credentials.audience);\n  }\n\n  const headers: Record<string, string> = {\n    'content-type': 'application/x-www-form-urlencoded',\n    accept: 'application/json',\n  };\n\n  if (authMethod === 'basic') {\n    // RFC 6749 §2.3.1: form-urlencode ID/secret before base64 (NOT URI\n    // component encoding — space is `+`, and `!'()*` must be percent-\n    // encoded). Most deployed servers accept raw values too, but spec\n    // compliance avoids a footgun with secrets containing those chars.\n    const encoded = Buffer.from(`${formUrlEncode(clientId)}:${formUrlEncode(clientSecret)}`, 'utf-8').toString(\n      'base64'\n    );\n    headers.authorization = `Basic ${encoded}`;\n  } else {\n    body.set('client_id', clientId);\n    body.set('client_secret', clientSecret);\n  }\n\n  let response: Response;\n  let bodyText: string;\n  const timeoutError = new Error(`Client credentials exchange timed out after ${timeoutMs}ms`);\n  timeoutError.name = 'TimeoutError';\n  try {\n    ({ response, bodyText } = await withAbortSignal(\n      [options.signal],\n      timeoutMs,\n      async signal => {\n        const tokenResponse = await fetchImpl(credentials.token_endpoint, {\n          method: 'POST',\n          headers,\n          body: body.toString(),\n          signal,\n        });\n        return { response: tokenResponse, bodyText: await tokenResponse.text() };\n      },\n      { timeoutError }\n    ));\n  } catch (err) {\n    if (options.signal?.aborted) {\n      throw createAbortError(options.signal.reason);\n    }\n    if (err === timeoutError) {\n      throw new ClientCredentialsExchangeError(\n        `Token endpoint ${credentials.token_endpoint} did not respond within ${timeoutMs}ms.`,\n        'network'\n      );\n    }\n    throw new ClientCredentialsExchangeError(\n      `Failed to reach token endpoint ${credentials.token_endpoint}: ${(err as Error).message}`,\n      'network'\n    );\n  }\n\n  let parsed: Record<string, unknown> | undefined;\n  try {\n    parsed = bodyText ? (JSON.parse(bodyText) as Record<string, unknown>) : undefined;\n  } catch {\n    // Non-JSON response; parsed stays undefined, handled below.\n  }\n\n  if (!response.ok) {\n    const rawOauthError = typeof parsed?.error === 'string' ? parsed.error : undefined;\n    const rawOauthDesc = typeof parsed?.error_description === 'string' ? parsed.error_description : undefined;\n    const oauthError = rawOauthError ? sanitizeAsMessage(rawOauthError) : undefined;\n    const oauthDesc = rawOauthDesc ? sanitizeAsMessage(rawOauthDesc) : undefined;\n    const message =\n      oauthError || oauthDesc\n        ? `Client credentials exchange failed: ${oauthError ?? 'error'}${oauthDesc ? ` — ${oauthDesc}` : ''}`\n        : `Client credentials exchange failed with HTTP ${response.status}: ${sanitizeAsMessage(bodyText) || '(empty body)'}`;\n    const kind = rawOauthError ? 'oauth' : 'malformed';\n    throw new ClientCredentialsExchangeError(message, kind, oauthError, oauthDesc, response.status);\n  }\n\n  if (!parsed || typeof parsed.access_token !== 'string') {\n    throw new ClientCredentialsExchangeError(\n      `Token endpoint returned HTTP ${response.status} but no access_token. Body: ${sanitizeAsMessage(bodyText)}`,\n      'malformed',\n      undefined,\n      undefined,\n      response.status\n    );\n  }\n\n  return fromMCPTokens(parsed as unknown as OAuthTokens);\n}\n\n/**\n * Options for {@link ensureClientCredentialsTokens}.\n */\nexport interface EnsureClientCredentialsOptions extends ExchangeClientCredentialsOptions {\n  /**\n   * Storage backend used to persist refreshed tokens. Optional — if omitted,\n   * tokens are only mutated on the in-memory `agent` object and the caller\n   * is responsible for persisting.\n   */\n  storage?: OAuthConfigStorage;\n  /**\n   * Force a re-exchange even if the cached token looks valid. Useful after a\n   * 401 in case the authorization server rotated something out-of-band.\n   */\n  force?: boolean;\n  /**\n   * Expiration skew (ms). Treat the token as expired this many milliseconds\n   * before its nominal `expires_at` — protects against clock skew and\n   * in-flight requests. Default: 60_000 (1 minute). The interactive auth\n   * code flow uses 5 minutes; client credentials refresh is cheap (single\n   * POST) so the shorter window is fine here.\n   */\n  expirationSkewMs?: number;\n}\n\n/**\n * In-flight refresh coalescing map. Scoped by `AgentConfig` object identity\n * so only callers deliberately sharing one configuration can share a bearer.\n * A string key built from public OAuth fields is insufficient here: two\n * tenants can reuse an agent id, endpoint, and client id while differing in\n * secret, scope, audience, or resource.\n *\n * Cleared on completion regardless of success/failure.\n *\n * Note: this is an in-process map. Multi-process deployments (worker\n * pools, multiple CLI invocations, horizontally scaled Node servers)\n * don't coalesce across workers — each process will do its own refresh.\n * For the CLI this is fine; for high-throughput server deployments,\n * coalesce upstream at the storage layer.\n */\ninterface InFlightRefresh {\n  promise: Promise<AgentOAuthTokens>;\n  controller: AbortController;\n  waiters: number;\n  settled: boolean;\n}\n\ntype RefreshMode = 'normal' | 'force';\n\nconst inFlightRefresh = new WeakMap<AgentConfig, Map<RefreshMode, InFlightRefresh>>();\n\nasync function waitForRefresh(entry: InFlightRefresh, signal?: AbortSignal): Promise<AgentOAuthTokens> {\n  if (signal?.aborted) throw createAbortError(signal.reason);\n  entry.waiters += 1;\n  let abortListener: (() => void) | undefined;\n  try {\n    if (!signal) return await entry.promise;\n    const aborted = new Promise<never>((_resolve, reject) => {\n      abortListener = () => reject(createAbortError(signal.reason));\n      signal.addEventListener('abort', abortListener, { once: true });\n    });\n    return await Promise.race([entry.promise, aborted]);\n  } finally {\n    if (abortListener && signal) signal.removeEventListener('abort', abortListener);\n    entry.waiters -= 1;\n    if (entry.waiters === 0 && !entry.settled && !entry.controller.signal.aborted) {\n      entry.controller.abort(createAbortError(signal?.reason ?? 'No callers remain for token refresh'));\n    }\n  }\n}\n\n/**\n * Ensure an agent has a valid access token, refreshing via client credentials\n * if the cached one is missing or expired. Idempotent and safe to call\n * before every request.\n *\n * Concurrent calls for the same `agent.id` are coalesced into a single\n * token POST via an in-process promise map — the common case of a\n * storyboard fan-out firing 10 tool calls in parallel does one refresh,\n * not ten.\n *\n * **Mutation:** this function writes `agent.oauth_tokens` in place. That is\n * the contract the MCP SDK's `OAuthClientProvider` pattern also uses, and\n * it lets the CLI's file-backed storage see the same object. Callers that\n * share an `AgentConfig` across different logical agents must copy first.\n *\n * Precondition: `agent.oauth_client_credentials` must be set. Throws a plain\n * Error if not — callers are expected to branch on its presence before\n * calling this.\n */\nexport async function ensureClientCredentialsTokens(\n  agent: AgentConfig,\n  options: EnsureClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  throwIfAborted(options.signal);\n\n  if (!agent.oauth_client_credentials) {\n    throw new Error(\n      `ensureClientCredentialsTokens called for agent '${agent.id}' with no oauth_client_credentials configured.`\n    );\n  }\n\n  const skew = options.expirationSkewMs ?? 60_000;\n  const cached = agent.oauth_tokens;\n  const cachedIsValid =\n    !options.force &&\n    cached?.access_token &&\n    (!cached.expires_at || new Date(cached.expires_at).getTime() - Date.now() > skew);\n\n  if (cachedIsValid) {\n    return cached!;\n  }\n\n  const refreshMode: RefreshMode = options.force ? 'force' : 'normal';\n  let agentRefreshes = inFlightRefresh.get(agent);\n  const existing = agentRefreshes?.get(refreshMode);\n  if (existing && !existing.controller.signal.aborted) {\n    const tokens = await waitForRefresh(existing, options.signal);\n    agent.oauth_tokens = tokens;\n    return tokens;\n  }\n\n  const controller = new AbortController();\n  const entry: InFlightRefresh = {\n    promise: undefined as unknown as Promise<AgentOAuthTokens>,\n    controller,\n    waiters: 0,\n    settled: false,\n  };\n  if (!agentRefreshes) {\n    agentRefreshes = new Map();\n    inFlightRefresh.set(agent, agentRefreshes);\n  }\n  entry.promise = (async () => {\n    try {\n      const tokens = await exchangeClientCredentials(agent.oauth_client_credentials!, {\n        fetch: options.fetch,\n        timeoutMs: options.timeoutMs,\n        allowPrivateIp: options.allowPrivateIp,\n        signal: controller.signal,\n      });\n      agent.oauth_tokens = tokens;\n      if (options.storage) {\n        await options.storage.saveAgent(agent);\n      }\n      return tokens;\n    } finally {\n      entry.settled = true;\n      if (agentRefreshes?.get(refreshMode) === entry) {\n        agentRefreshes.delete(refreshMode);\n        if (agentRefreshes.size === 0) inFlightRefresh.delete(agent);\n      }\n    }\n  })();\n\n  agentRefreshes.set(refreshMode, entry);\n  return waitForRefresh(entry, options.signal);\n}\n"],"mappings":"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","names":[]}

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

@@ -2,6 +2,7 @@ import { fromMCPTokens } from "./types.mjs";
 import { resolveSecret } from "./secret-resolver.mjs";
 import { isLikelyPrivateUrl } from "../../net/index.mjs";
 import { wrapFetchWithSizeLimit } from "../../protocols/responseSizeLimit.mjs";
+import { createAbortError, throwIfAborted, withAbortSignal } from "../../protocols/abort.mjs";
 const MAX_AS_ERROR_LENGTH = 200;
 class ClientCredentialsExchangeError extends Error {
   constructor(message, kind, oauthError, oauthErrorDescription, httpStatus) {
@@ -56,6 +57,7 @@ function validateTokenEndpoint(tokenEndpoint, options = {}) {
   return url;
 }
 async function exchangeClientCredentials(credentials, options = {}) {
+  throwIfAborted(options.signal);
   const fetchImpl = wrapFetchWithSizeLimit(options.fetch ?? fetch);
   const timeoutMs = options.timeoutMs ?? 3e4;
   validateTokenEndpoint(credentials.token_endpoint, { allowPrivateIp: options.allowPrivateIp });
@@ -87,18 +89,30 @@ async function exchangeClientCredentials(credentials, options = {}) {
     body.set("client_id", clientId);
     body.set("client_secret", clientSecret);
   }
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), timeoutMs);
   let response;
+  let bodyText;
+  const timeoutError = new Error(`Client credentials exchange timed out after ${timeoutMs}ms`);
+  timeoutError.name = "TimeoutError";
   try {
-    response = await fetchImpl(credentials.token_endpoint, {
-      method: "POST",
-      headers,
-      body: body.toString(),
-      signal: controller.signal
-    });
+    ({ response, bodyText } = await withAbortSignal(
+      [options.signal],
+      timeoutMs,
+      async (signal) => {
+        const tokenResponse = await fetchImpl(credentials.token_endpoint, {
+          method: "POST",
+          headers,
+          body: body.toString(),
+          signal
+        });
+        return { response: tokenResponse, bodyText: await tokenResponse.text() };
+      },
+      { timeoutError }
+    ));
   } catch (err) {
-    if (err.name === "AbortError") {
+    if (options.signal?.aborted) {
+      throw createAbortError(options.signal.reason);
+    }
+    if (err === timeoutError) {
       throw new ClientCredentialsExchangeError(
         `Token endpoint ${credentials.token_endpoint} did not respond within ${timeoutMs}ms.`,
         "network"
@@ -108,10 +122,7 @@ async function exchangeClientCredentials(credentials, options = {}) {
       `Failed to reach token endpoint ${credentials.token_endpoint}: ${err.message}`,
       "network"
     );
-  } finally {
-    clearTimeout(timeout);
   }
-  const bodyText = await response.text();
   let parsed;
   try {
     parsed = bodyText ? JSON.parse(bodyText) : void 0;
@@ -137,11 +148,28 @@ async function exchangeClientCredentials(credentials, options = {}) {
   }
   return fromMCPTokens(parsed);
 }
-const inFlightRefresh = /* @__PURE__ */ new Map();
-function coalesceKeyFor(agent, credentials, force) {
-  return `${force ? "force" : "normal"}\0${agent.id}\0${credentials.token_endpoint}\0${credentials.client_id}`;
+const inFlightRefresh = /* @__PURE__ */ new WeakMap();
+async function waitForRefresh(entry, signal) {
+  if (signal?.aborted) throw createAbortError(signal.reason);
+  entry.waiters += 1;
+  let abortListener;
+  try {
+    if (!signal) return await entry.promise;
+    const aborted = new Promise((_resolve, reject) => {
+      abortListener = () => reject(createAbortError(signal.reason));
+      signal.addEventListener("abort", abortListener, { once: true });
+    });
+    return await Promise.race([entry.promise, aborted]);
+  } finally {
+    if (abortListener && signal) signal.removeEventListener("abort", abortListener);
+    entry.waiters -= 1;
+    if (entry.waiters === 0 && !entry.settled && !entry.controller.signal.aborted) {
+      entry.controller.abort(createAbortError(signal?.reason ?? "No callers remain for token refresh"));
+    }
+  }
 }
 async function ensureClientCredentialsTokens(agent, options = {}) {
+  throwIfAborted(options.signal);
   if (!agent.oauth_client_credentials) {
     throw new Error(
       `ensureClientCredentialsTokens called for agent '${agent.id}' with no oauth_client_credentials configured.`
@@ -153,19 +181,32 @@ async function ensureClientCredentialsTokens(agent, options = {}) {
   if (cachedIsValid) {
     return cached;
   }
-  const coalesceKey = coalesceKeyFor(agent, agent.oauth_client_credentials, options.force === true);
-  const existing = inFlightRefresh.get(coalesceKey);
-  if (existing) {
-    const tokens = await existing;
+  const refreshMode = options.force ? "force" : "normal";
+  let agentRefreshes = inFlightRefresh.get(agent);
+  const existing = agentRefreshes?.get(refreshMode);
+  if (existing && !existing.controller.signal.aborted) {
+    const tokens = await waitForRefresh(existing, options.signal);
     agent.oauth_tokens = tokens;
     return tokens;
   }
-  const exchange = (async () => {
+  const controller = new AbortController();
+  const entry = {
+    promise: void 0,
+    controller,
+    waiters: 0,
+    settled: false
+  };
+  if (!agentRefreshes) {
+    agentRefreshes = /* @__PURE__ */ new Map();
+    inFlightRefresh.set(agent, agentRefreshes);
+  }
+  entry.promise = (async () => {
     try {
       const tokens = await exchangeClientCredentials(agent.oauth_client_credentials, {
         fetch: options.fetch,
         timeoutMs: options.timeoutMs,
-        allowPrivateIp: options.allowPrivateIp
+        allowPrivateIp: options.allowPrivateIp,
+        signal: controller.signal
       });
       agent.oauth_tokens = tokens;
       if (options.storage) {
@@ -173,11 +214,15 @@ async function ensureClientCredentialsTokens(agent, options = {}) {
       }
       return tokens;
     } finally {
-      inFlightRefresh.delete(coalesceKey);
+      entry.settled = true;
+      if (agentRefreshes?.get(refreshMode) === entry) {
+        agentRefreshes.delete(refreshMode);
+        if (agentRefreshes.size === 0) inFlightRefresh.delete(agent);
+      }
     }
   })();
-  inFlightRefresh.set(coalesceKey, exchange);
-  return exchange;
+  agentRefreshes.set(refreshMode, entry);
+  return waitForRefresh(entry, options.signal);
 }
 export {
   ClientCredentialsExchangeError,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/auth/oauth/ClientCredentialsFlow.ts"],"sourcesContent":["/**\n * OAuth 2.0 client credentials grant — RFC 6749 §4.4.\n *\n * For machine-to-machine use cases (CI compliance runs, automated checks)\n * where there is no user to walk through an authorization-code flow. The\n * client POSTs its ID + secret to the authorization server's token endpoint\n * and gets back an access token directly.\n *\n * This file provides:\n * - {@link exchangeClientCredentials}: one-shot token exchange. Use for the\n *   initial fetch during `--save-auth` and for forced refresh.\n * - {@link ensureClientCredentialsTokens}: reads the cached tokens on an\n *   `AgentConfig`, checks expiry, re-exchanges if needed, and persists the\n *   refreshed tokens via an optional {@link OAuthConfigStorage}.\n *\n * Why a dedicated module instead of the MCP SDK's `OAuthClientProvider`:\n * client credentials doesn't need discovery, dynamic client registration,\n * PKCE, or authorization code exchange — all the plumbing that provider\n * exists to coordinate. A direct token POST and a cached-token check is the\n * entire protocol. The call path keeps using the plain `Authorization:\n * Bearer` header path — the same path it already uses for `auth_token`.\n *\n * **Security note (library consumers):** `token_endpoint` is passed to\n * `fetch` directly. Callers that accept untrusted `AgentConfig` values\n * from network requests (e.g. a hosted compliance service accepting\n * user-supplied configs) MUST validate the URL against an allowlist or\n * SSRF-block private IPs before invoking these helpers. The CLI and\n * operator-driven flows are already trusted.\n */\n\nimport { fromMCPTokens, type OAuthTokens, type AgentConfig, type AgentOAuthTokens } from './types';\nimport type { AgentOAuthClientCredentials } from '../../types/adcp';\nimport type { OAuthConfigStorage } from './types';\nimport { resolveSecret } from './secret-resolver';\nimport { isLikelyPrivateUrl } from '../../net';\nimport { wrapFetchWithSizeLimit } from '../../protocols/responseSizeLimit';\n\n/** Max length we'll echo from an AS-supplied error description into errors. */\nconst MAX_AS_ERROR_LENGTH = 200;\n\n/**\n * Raised when the authorization server rejects a client credentials\n * exchange or the token endpoint is unreachable/malformed.\n *\n * The {@link kind} discriminator lets callers branch without\n * string-matching on the message:\n * - `oauth`: the AS returned a structured OAuth error (RFC 6749 §5.2 —\n *   `invalid_client`, `invalid_grant`, `invalid_scope`, …). Read\n *   {@link oauthError} / {@link oauthErrorDescription}.\n * - `malformed`: the AS returned HTTP 200 but no `access_token`, or a\n *   non-JSON body.\n * - `network`: the exchange never reached the AS (DNS failure, connection\n *   refused, timeout, TLS error).\n */\nexport class ClientCredentialsExchangeError extends Error {\n  readonly code = 'client_credentials_exchange_failed';\n  constructor(\n    message: string,\n    public readonly kind: 'oauth' | 'malformed' | 'network',\n    public readonly oauthError?: string,\n    public readonly oauthErrorDescription?: string,\n    public readonly httpStatus?: number\n  ) {\n    super(message);\n    this.name = 'ClientCredentialsExchangeError';\n  }\n}\n\n/**\n * Options for {@link exchangeClientCredentials}.\n */\nexport interface ExchangeClientCredentialsOptions {\n  /**\n   * Custom fetch implementation (default: global `fetch`).\n   * Primarily a testing hook — lets unit tests stub the authorization server\n   * without intercepting the global.\n   */\n  fetch?: typeof fetch;\n  /**\n   * Request timeout in milliseconds (default: 30_000). Guards against a\n   * silently hung authorization server blocking the caller indefinitely.\n   */\n  timeoutMs?: number;\n  /**\n   * Allow `token_endpoint` to resolve to a private / loopback IP address.\n   * Default: false (SSRF guard). The CLI opts in because the operator is\n   * explicitly configuring the endpoint; hosted consumers accepting\n   * user-supplied configs should leave this off.\n   */\n  allowPrivateIp?: boolean;\n}\n\n/**\n * RFC 6749 §2.3.1 application/x-www-form-urlencoded encoding.\n *\n * Differs from `encodeURIComponent` in two important ways:\n * 1. Spaces are encoded as `+`, not `%20`.\n * 2. The characters `!'()*` are percent-encoded (URI component leaves them\n *    alone).\n *\n * A secret containing any of those chars would hash to a different Basic\n * string than the AS computes, producing a spurious `invalid_client`.\n */\nfunction formUrlEncode(value: string): string {\n  return encodeURIComponent(value)\n    .replace(/%20/g, '+')\n    .replace(/!/g, '%21')\n    .replace(/'/g, '%27')\n    .replace(/\\(/g, '%28')\n    .replace(/\\)/g, '%29')\n    .replace(/\\*/g, '%2A');\n}\n\n/**\n * Strip control chars (C0, C1, DEL) and truncate.\n *\n * Defensive cleanup on AS-controlled strings we print to a TTY. A\n * malicious or compromised AS could emit ANSI escape sequences or CRLF\n * payloads in `error_description`; we don't want those rewriting terminal\n * titles or forging log lines.\n */\nfunction sanitizeAsMessage(raw: string): string {\n  // eslint-disable-next-line no-control-regex\n  const stripped = raw.replace(/[\\x00-\\x1F\\x7F-\\x9F]/g, ' ');\n  if (stripped.length <= MAX_AS_ERROR_LENGTH) return stripped;\n  return stripped.slice(0, MAX_AS_ERROR_LENGTH) + '…';\n}\n\n/**\n * Validate the token endpoint before we hit it. Three checks, in order:\n *\n * 1. Parse as a URL. Unparseable → `malformed`.\n * 2. Reject URLs that carry `user:pass@` userinfo — they'd leak via error\n *    messages and log aggregators, and the OAuth client credentials live\n *    in `client_id` / `client_secret`, never the URL.\n * 3. Reject plaintext `http://` outside `localhost` / loopback IPs.\n *    RFC 6749 §3.1 requires TLS; the loopback carve-out covers local dev\n *    authorization servers where plaintext is not a leak risk.\n * 4. Reject private / loopback / link-local IPs unless `allowPrivateIp`.\n *    The library default is a SSRF guard; the CLI (operator-driven) opts\n *    in because a user pointing at `localhost:8080` is legitimate. Network\n *    code behind this call will still do DNS resolution, so this is a\n *    best-effort literal-IP / known-loopback check — host allowlisting\n *    upstream is the right control for adversarial environments.\n */\nfunction validateTokenEndpoint(tokenEndpoint: string, options: { allowPrivateIp?: boolean } = {}): URL {\n  let url: URL;\n  try {\n    url = new URL(tokenEndpoint);\n  } catch {\n    throw new ClientCredentialsExchangeError(`Invalid token_endpoint URL: ${tokenEndpoint}`, 'malformed');\n  }\n\n  if (url.username || url.password) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must not contain userinfo (user:pass@). Put credentials in client_id / client_secret instead.`,\n      'malformed'\n    );\n  }\n\n  const host = url.hostname;\n  const isLoopback = host === 'localhost' || host === '127.0.0.1' || host === '[::1]' || host === '::1';\n\n  if (url.protocol !== 'https:' && !(url.protocol === 'http:' && isLoopback)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must be HTTPS (got ${url.protocol}//${host}). The client secret would be sent in plaintext over HTTP. Use https:// (or http://localhost for local dev).`,\n      'malformed'\n    );\n  }\n\n  if (!options.allowPrivateIp && isLikelyPrivateUrl(tokenEndpoint)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint resolves to a private or loopback address (${host}). Pass { allowPrivateIp: true } to exchangeClientCredentials / ensureClientCredentialsTokens if this is intentional (operator-driven CLI or local test setups).`,\n      'malformed'\n    );\n  }\n\n  return url;\n}\n\n/**\n * Exchange client credentials for an access token.\n *\n * Secret values in `credentials.client_id` / `client_secret` may be `$ENV:VAR`\n * references — they are resolved here at exchange time. Missing env vars\n * surface as `MissingEnvSecretError` (from `secret-resolver`), which\n * callers typically print with the variable name for the user to fix.\n *\n * @throws {ClientCredentialsExchangeError} on any non-2xx response, malformed 200, or network failure\n * @throws {MissingEnvSecretError} if a `$ENV:VAR` ref points at an unset var\n */\nexport async function exchangeClientCredentials(\n  credentials: AgentOAuthClientCredentials,\n  options: ExchangeClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  // Wrap with the response-size-limit guard so a hostile token endpoint\n  // can't buffer-bomb on every refresh. Pass-through when no\n  // `withResponseSizeLimit` slot is active. (#1175)\n  const fetchImpl = wrapFetchWithSizeLimit(options.fetch ?? fetch);\n  const timeoutMs = options.timeoutMs ?? 30_000;\n\n  validateTokenEndpoint(credentials.token_endpoint, { allowPrivateIp: options.allowPrivateIp });\n\n  const clientId = resolveSecret(credentials.client_id);\n  const clientSecret = resolveSecret(credentials.client_secret);\n  const authMethod = credentials.auth_method ?? 'basic';\n\n  const body = new URLSearchParams();\n  body.set('grant_type', 'client_credentials');\n  if (credentials.scope) {\n    body.set('scope', credentials.scope);\n  }\n  // RFC 8707 resource indicators — emitted as one `resource` field per URI\n  // so the AS receives the full list. URLSearchParams#append is the only\n  // way to produce repeated keys in form encoding.\n  if (credentials.resource) {\n    const resources = Array.isArray(credentials.resource) ? credentials.resource : [credentials.resource];\n    for (const r of resources) body.append('resource', r);\n  }\n  if (credentials.audience) {\n    body.set('audience', credentials.audience);\n  }\n\n  const headers: Record<string, string> = {\n    'content-type': 'application/x-www-form-urlencoded',\n    accept: 'application/json',\n  };\n\n  if (authMethod === 'basic') {\n    // RFC 6749 §2.3.1: form-urlencode ID/secret before base64 (NOT URI\n    // component encoding — space is `+`, and `!'()*` must be percent-\n    // encoded). Most deployed servers accept raw values too, but spec\n    // compliance avoids a footgun with secrets containing those chars.\n    const encoded = Buffer.from(`${formUrlEncode(clientId)}:${formUrlEncode(clientSecret)}`, 'utf-8').toString(\n      'base64'\n    );\n    headers.authorization = `Basic ${encoded}`;\n  } else {\n    body.set('client_id', clientId);\n    body.set('client_secret', clientSecret);\n  }\n\n  const controller = new AbortController();\n  const timeout = setTimeout(() => controller.abort(), timeoutMs);\n\n  let response: Response;\n  try {\n    response = await fetchImpl(credentials.token_endpoint, {\n      method: 'POST',\n      headers,\n      body: body.toString(),\n      signal: controller.signal,\n    });\n  } catch (err) {\n    if ((err as { name?: string }).name === 'AbortError') {\n      throw new ClientCredentialsExchangeError(\n        `Token endpoint ${credentials.token_endpoint} did not respond within ${timeoutMs}ms.`,\n        'network'\n      );\n    }\n    throw new ClientCredentialsExchangeError(\n      `Failed to reach token endpoint ${credentials.token_endpoint}: ${(err as Error).message}`,\n      'network'\n    );\n  } finally {\n    clearTimeout(timeout);\n  }\n\n  const bodyText = await response.text();\n  let parsed: Record<string, unknown> | undefined;\n  try {\n    parsed = bodyText ? (JSON.parse(bodyText) as Record<string, unknown>) : undefined;\n  } catch {\n    // Non-JSON response; parsed stays undefined, handled below.\n  }\n\n  if (!response.ok) {\n    const rawOauthError = typeof parsed?.error === 'string' ? parsed.error : undefined;\n    const rawOauthDesc = typeof parsed?.error_description === 'string' ? parsed.error_description : undefined;\n    const oauthError = rawOauthError ? sanitizeAsMessage(rawOauthError) : undefined;\n    const oauthDesc = rawOauthDesc ? sanitizeAsMessage(rawOauthDesc) : undefined;\n    const message =\n      oauthError || oauthDesc\n        ? `Client credentials exchange failed: ${oauthError ?? 'error'}${oauthDesc ? ` — ${oauthDesc}` : ''}`\n        : `Client credentials exchange failed with HTTP ${response.status}: ${sanitizeAsMessage(bodyText) || '(empty body)'}`;\n    const kind = rawOauthError ? 'oauth' : 'malformed';\n    throw new ClientCredentialsExchangeError(message, kind, oauthError, oauthDesc, response.status);\n  }\n\n  if (!parsed || typeof parsed.access_token !== 'string') {\n    throw new ClientCredentialsExchangeError(\n      `Token endpoint returned HTTP ${response.status} but no access_token. Body: ${sanitizeAsMessage(bodyText)}`,\n      'malformed',\n      undefined,\n      undefined,\n      response.status\n    );\n  }\n\n  return fromMCPTokens(parsed as unknown as OAuthTokens);\n}\n\n/**\n * Options for {@link ensureClientCredentialsTokens}.\n */\nexport interface EnsureClientCredentialsOptions extends ExchangeClientCredentialsOptions {\n  /**\n   * Storage backend used to persist refreshed tokens. Optional — if omitted,\n   * tokens are only mutated on the in-memory `agent` object and the caller\n   * is responsible for persisting.\n   */\n  storage?: OAuthConfigStorage;\n  /**\n   * Force a re-exchange even if the cached token looks valid. Useful after a\n   * 401 in case the authorization server rotated something out-of-band.\n   */\n  force?: boolean;\n  /**\n   * Expiration skew (ms). Treat the token as expired this many milliseconds\n   * before its nominal `expires_at` — protects against clock skew and\n   * in-flight requests. Default: 60_000 (1 minute). The interactive auth\n   * code flow uses 5 minutes; client credentials refresh is cheap (single\n   * POST) so the shorter window is fine here.\n   */\n  expirationSkewMs?: number;\n}\n\n/**\n * In-flight refresh coalescing map. Keyed by the tuple\n * `(agent.id, token_endpoint, client_id)` — concurrent\n * `ensureClientCredentialsTokens` calls for the same credentials share a\n * single token POST instead of each racing to exchange the same secret.\n *\n * Two different `AgentConfig` objects that accidentally reuse the same\n * `id` (e.g. two tenants both creating `cli-agent`) but hold different\n * credentials won't cross-contaminate — the endpoint + client_id in the\n * key keeps them distinct.\n *\n * Cleared on completion regardless of success/failure.\n *\n * Note: this is an in-process map. Multi-process deployments (worker\n * pools, multiple CLI invocations, horizontally scaled Node servers)\n * don't coalesce across workers — each process will do its own refresh.\n * For the CLI this is fine; for high-throughput server deployments,\n * coalesce upstream at the storage layer.\n */\nconst inFlightRefresh = new Map<string, Promise<AgentOAuthTokens>>();\n\n/**\n * Compute the coalesce key for `ensureClientCredentialsTokens`. `force: true`\n * uses a distinct bucket so a 401-triggered forced refresh never piggybacks\n * on a still-pending non-forced exchange — the whole point of forcing is\n * that the in-flight token is *known* stale, so awaiting it would defeat\n * the retry.\n */\nfunction coalesceKeyFor(agent: AgentConfig, credentials: AgentOAuthClientCredentials, force: boolean): string {\n  return `${force ? 'force' : 'normal'}\\u0000${agent.id}\\u0000${credentials.token_endpoint}\\u0000${credentials.client_id}`;\n}\n\n/**\n * Ensure an agent has a valid access token, refreshing via client credentials\n * if the cached one is missing or expired. Idempotent and safe to call\n * before every request.\n *\n * Concurrent calls for the same `agent.id` are coalesced into a single\n * token POST via an in-process promise map — the common case of a\n * storyboard fan-out firing 10 tool calls in parallel does one refresh,\n * not ten.\n *\n * **Mutation:** this function writes `agent.oauth_tokens` in place. That is\n * the contract the MCP SDK's `OAuthClientProvider` pattern also uses, and\n * it lets the CLI's file-backed storage see the same object. Callers that\n * share an `AgentConfig` across different logical agents must copy first.\n *\n * Precondition: `agent.oauth_client_credentials` must be set. Throws a plain\n * Error if not — callers are expected to branch on its presence before\n * calling this.\n */\nexport async function ensureClientCredentialsTokens(\n  agent: AgentConfig,\n  options: EnsureClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  if (!agent.oauth_client_credentials) {\n    throw new Error(\n      `ensureClientCredentialsTokens called for agent '${agent.id}' with no oauth_client_credentials configured.`\n    );\n  }\n\n  const skew = options.expirationSkewMs ?? 60_000;\n  const cached = agent.oauth_tokens;\n  const cachedIsValid =\n    !options.force &&\n    cached?.access_token &&\n    (!cached.expires_at || new Date(cached.expires_at).getTime() - Date.now() > skew);\n\n  if (cachedIsValid) {\n    return cached!;\n  }\n\n  const coalesceKey = coalesceKeyFor(agent, agent.oauth_client_credentials, options.force === true);\n  const existing = inFlightRefresh.get(coalesceKey);\n  if (existing) {\n    const tokens = await existing;\n    agent.oauth_tokens = tokens;\n    return tokens;\n  }\n\n  const exchange = (async () => {\n    try {\n      const tokens = await exchangeClientCredentials(agent.oauth_client_credentials!, {\n        fetch: options.fetch,\n        timeoutMs: options.timeoutMs,\n        allowPrivateIp: options.allowPrivateIp,\n      });\n      agent.oauth_tokens = tokens;\n      if (options.storage) {\n        await options.storage.saveAgent(agent);\n      }\n      return tokens;\n    } finally {\n      inFlightRefresh.delete(coalesceKey);\n    }\n  })();\n\n  inFlightRefresh.set(coalesceKey, exchange);\n  return exchange;\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/lib/auth/oauth/ClientCredentialsFlow.ts"],"sourcesContent":["/**\n * OAuth 2.0 client credentials grant — RFC 6749 §4.4.\n *\n * For machine-to-machine use cases (CI compliance runs, automated checks)\n * where there is no user to walk through an authorization-code flow. The\n * client POSTs its ID + secret to the authorization server's token endpoint\n * and gets back an access token directly.\n *\n * This file provides:\n * - {@link exchangeClientCredentials}: one-shot token exchange. Use for the\n *   initial fetch during `--save-auth` and for forced refresh.\n * - {@link ensureClientCredentialsTokens}: reads the cached tokens on an\n *   `AgentConfig`, checks expiry, re-exchanges if needed, and persists the\n *   refreshed tokens via an optional {@link OAuthConfigStorage}.\n *\n * Why a dedicated module instead of the MCP SDK's `OAuthClientProvider`:\n * client credentials doesn't need discovery, dynamic client registration,\n * PKCE, or authorization code exchange — all the plumbing that provider\n * exists to coordinate. A direct token POST and a cached-token check is the\n * entire protocol. The call path keeps using the plain `Authorization:\n * Bearer` header path — the same path it already uses for `auth_token`.\n *\n * **Security note (library consumers):** `token_endpoint` is passed to\n * `fetch` directly. Callers that accept untrusted `AgentConfig` values\n * from network requests (e.g. a hosted compliance service accepting\n * user-supplied configs) MUST validate the URL against an allowlist or\n * SSRF-block private IPs before invoking these helpers. The CLI and\n * operator-driven flows are already trusted.\n */\n\nimport { fromMCPTokens, type OAuthTokens, type AgentConfig, type AgentOAuthTokens } from './types';\nimport type { AgentOAuthClientCredentials } from '../../types/adcp';\nimport type { OAuthConfigStorage } from './types';\nimport { resolveSecret } from './secret-resolver';\nimport { isLikelyPrivateUrl } from '../../net';\nimport { wrapFetchWithSizeLimit } from '../../protocols/responseSizeLimit';\nimport { createAbortError, throwIfAborted, withAbortSignal } from '../../protocols/abort';\n\n/** Max length we'll echo from an AS-supplied error description into errors. */\nconst MAX_AS_ERROR_LENGTH = 200;\n\n/**\n * Raised when the authorization server rejects a client credentials\n * exchange or the token endpoint is unreachable/malformed.\n *\n * The {@link kind} discriminator lets callers branch without\n * string-matching on the message:\n * - `oauth`: the AS returned a structured OAuth error (RFC 6749 §5.2 —\n *   `invalid_client`, `invalid_grant`, `invalid_scope`, …). Read\n *   {@link oauthError} / {@link oauthErrorDescription}.\n * - `malformed`: the AS returned HTTP 200 but no `access_token`, or a\n *   non-JSON body.\n * - `network`: the exchange never reached the AS (DNS failure, connection\n *   refused, timeout, TLS error).\n */\nexport class ClientCredentialsExchangeError extends Error {\n  readonly code = 'client_credentials_exchange_failed';\n  constructor(\n    message: string,\n    public readonly kind: 'oauth' | 'malformed' | 'network',\n    public readonly oauthError?: string,\n    public readonly oauthErrorDescription?: string,\n    public readonly httpStatus?: number\n  ) {\n    super(message);\n    this.name = 'ClientCredentialsExchangeError';\n  }\n}\n\n/**\n * Options for {@link exchangeClientCredentials}.\n */\nexport interface ExchangeClientCredentialsOptions {\n  /**\n   * Custom fetch implementation (default: global `fetch`).\n   * Primarily a testing hook — lets unit tests stub the authorization server\n   * without intercepting the global.\n   */\n  fetch?: typeof fetch;\n  /**\n   * Request timeout in milliseconds (default: 30_000). Guards against a\n   * silently hung authorization server blocking the caller indefinitely.\n   */\n  timeoutMs?: number;\n  /**\n   * Allow `token_endpoint` to resolve to a private / loopback IP address.\n   * Default: false (SSRF guard). The CLI opts in because the operator is\n   * explicitly configuring the endpoint; hosted consumers accepting\n   * user-supplied configs should leave this off.\n   */\n  allowPrivateIp?: boolean;\n  /** Caller-owned cancellation signal, composed with `timeoutMs`. */\n  signal?: AbortSignal;\n}\n\n/**\n * RFC 6749 §2.3.1 application/x-www-form-urlencoded encoding.\n *\n * Differs from `encodeURIComponent` in two important ways:\n * 1. Spaces are encoded as `+`, not `%20`.\n * 2. The characters `!'()*` are percent-encoded (URI component leaves them\n *    alone).\n *\n * A secret containing any of those chars would hash to a different Basic\n * string than the AS computes, producing a spurious `invalid_client`.\n */\nfunction formUrlEncode(value: string): string {\n  return encodeURIComponent(value)\n    .replace(/%20/g, '+')\n    .replace(/!/g, '%21')\n    .replace(/'/g, '%27')\n    .replace(/\\(/g, '%28')\n    .replace(/\\)/g, '%29')\n    .replace(/\\*/g, '%2A');\n}\n\n/**\n * Strip control chars (C0, C1, DEL) and truncate.\n *\n * Defensive cleanup on AS-controlled strings we print to a TTY. A\n * malicious or compromised AS could emit ANSI escape sequences or CRLF\n * payloads in `error_description`; we don't want those rewriting terminal\n * titles or forging log lines.\n */\nfunction sanitizeAsMessage(raw: string): string {\n  // eslint-disable-next-line no-control-regex\n  const stripped = raw.replace(/[\\x00-\\x1F\\x7F-\\x9F]/g, ' ');\n  if (stripped.length <= MAX_AS_ERROR_LENGTH) return stripped;\n  return stripped.slice(0, MAX_AS_ERROR_LENGTH) + '…';\n}\n\n/**\n * Validate the token endpoint before we hit it. Three checks, in order:\n *\n * 1. Parse as a URL. Unparseable → `malformed`.\n * 2. Reject URLs that carry `user:pass@` userinfo — they'd leak via error\n *    messages and log aggregators, and the OAuth client credentials live\n *    in `client_id` / `client_secret`, never the URL.\n * 3. Reject plaintext `http://` outside `localhost` / loopback IPs.\n *    RFC 6749 §3.1 requires TLS; the loopback carve-out covers local dev\n *    authorization servers where plaintext is not a leak risk.\n * 4. Reject private / loopback / link-local IPs unless `allowPrivateIp`.\n *    The library default is a SSRF guard; the CLI (operator-driven) opts\n *    in because a user pointing at `localhost:8080` is legitimate. Network\n *    code behind this call will still do DNS resolution, so this is a\n *    best-effort literal-IP / known-loopback check — host allowlisting\n *    upstream is the right control for adversarial environments.\n */\nfunction validateTokenEndpoint(tokenEndpoint: string, options: { allowPrivateIp?: boolean } = {}): URL {\n  let url: URL;\n  try {\n    url = new URL(tokenEndpoint);\n  } catch {\n    throw new ClientCredentialsExchangeError(`Invalid token_endpoint URL: ${tokenEndpoint}`, 'malformed');\n  }\n\n  if (url.username || url.password) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must not contain userinfo (user:pass@). Put credentials in client_id / client_secret instead.`,\n      'malformed'\n    );\n  }\n\n  const host = url.hostname;\n  const isLoopback = host === 'localhost' || host === '127.0.0.1' || host === '[::1]' || host === '::1';\n\n  if (url.protocol !== 'https:' && !(url.protocol === 'http:' && isLoopback)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint must be HTTPS (got ${url.protocol}//${host}). The client secret would be sent in plaintext over HTTP. Use https:// (or http://localhost for local dev).`,\n      'malformed'\n    );\n  }\n\n  if (!options.allowPrivateIp && isLikelyPrivateUrl(tokenEndpoint)) {\n    throw new ClientCredentialsExchangeError(\n      `token_endpoint resolves to a private or loopback address (${host}). Pass { allowPrivateIp: true } to exchangeClientCredentials / ensureClientCredentialsTokens if this is intentional (operator-driven CLI or local test setups).`,\n      'malformed'\n    );\n  }\n\n  return url;\n}\n\n/**\n * Exchange client credentials for an access token.\n *\n * Secret values in `credentials.client_id` / `client_secret` may be `$ENV:VAR`\n * references — they are resolved here at exchange time. Missing env vars\n * surface as `MissingEnvSecretError` (from `secret-resolver`), which\n * callers typically print with the variable name for the user to fix.\n *\n * @throws {ClientCredentialsExchangeError} on any non-2xx response, malformed 200, or network failure\n * @throws {MissingEnvSecretError} if a `$ENV:VAR` ref points at an unset var\n */\nexport async function exchangeClientCredentials(\n  credentials: AgentOAuthClientCredentials,\n  options: ExchangeClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  throwIfAborted(options.signal);\n\n  // Wrap with the response-size-limit guard so a hostile token endpoint\n  // can't buffer-bomb on every refresh. Pass-through when no\n  // `withResponseSizeLimit` slot is active. (#1175)\n  const fetchImpl = wrapFetchWithSizeLimit(options.fetch ?? fetch);\n  const timeoutMs = options.timeoutMs ?? 30_000;\n\n  validateTokenEndpoint(credentials.token_endpoint, { allowPrivateIp: options.allowPrivateIp });\n\n  const clientId = resolveSecret(credentials.client_id);\n  const clientSecret = resolveSecret(credentials.client_secret);\n  const authMethod = credentials.auth_method ?? 'basic';\n\n  const body = new URLSearchParams();\n  body.set('grant_type', 'client_credentials');\n  if (credentials.scope) {\n    body.set('scope', credentials.scope);\n  }\n  // RFC 8707 resource indicators — emitted as one `resource` field per URI\n  // so the AS receives the full list. URLSearchParams#append is the only\n  // way to produce repeated keys in form encoding.\n  if (credentials.resource) {\n    const resources = Array.isArray(credentials.resource) ? credentials.resource : [credentials.resource];\n    for (const r of resources) body.append('resource', r);\n  }\n  if (credentials.audience) {\n    body.set('audience', credentials.audience);\n  }\n\n  const headers: Record<string, string> = {\n    'content-type': 'application/x-www-form-urlencoded',\n    accept: 'application/json',\n  };\n\n  if (authMethod === 'basic') {\n    // RFC 6749 §2.3.1: form-urlencode ID/secret before base64 (NOT URI\n    // component encoding — space is `+`, and `!'()*` must be percent-\n    // encoded). Most deployed servers accept raw values too, but spec\n    // compliance avoids a footgun with secrets containing those chars.\n    const encoded = Buffer.from(`${formUrlEncode(clientId)}:${formUrlEncode(clientSecret)}`, 'utf-8').toString(\n      'base64'\n    );\n    headers.authorization = `Basic ${encoded}`;\n  } else {\n    body.set('client_id', clientId);\n    body.set('client_secret', clientSecret);\n  }\n\n  let response: Response;\n  let bodyText: string;\n  const timeoutError = new Error(`Client credentials exchange timed out after ${timeoutMs}ms`);\n  timeoutError.name = 'TimeoutError';\n  try {\n    ({ response, bodyText } = await withAbortSignal(\n      [options.signal],\n      timeoutMs,\n      async signal => {\n        const tokenResponse = await fetchImpl(credentials.token_endpoint, {\n          method: 'POST',\n          headers,\n          body: body.toString(),\n          signal,\n        });\n        return { response: tokenResponse, bodyText: await tokenResponse.text() };\n      },\n      { timeoutError }\n    ));\n  } catch (err) {\n    if (options.signal?.aborted) {\n      throw createAbortError(options.signal.reason);\n    }\n    if (err === timeoutError) {\n      throw new ClientCredentialsExchangeError(\n        `Token endpoint ${credentials.token_endpoint} did not respond within ${timeoutMs}ms.`,\n        'network'\n      );\n    }\n    throw new ClientCredentialsExchangeError(\n      `Failed to reach token endpoint ${credentials.token_endpoint}: ${(err as Error).message}`,\n      'network'\n    );\n  }\n\n  let parsed: Record<string, unknown> | undefined;\n  try {\n    parsed = bodyText ? (JSON.parse(bodyText) as Record<string, unknown>) : undefined;\n  } catch {\n    // Non-JSON response; parsed stays undefined, handled below.\n  }\n\n  if (!response.ok) {\n    const rawOauthError = typeof parsed?.error === 'string' ? parsed.error : undefined;\n    const rawOauthDesc = typeof parsed?.error_description === 'string' ? parsed.error_description : undefined;\n    const oauthError = rawOauthError ? sanitizeAsMessage(rawOauthError) : undefined;\n    const oauthDesc = rawOauthDesc ? sanitizeAsMessage(rawOauthDesc) : undefined;\n    const message =\n      oauthError || oauthDesc\n        ? `Client credentials exchange failed: ${oauthError ?? 'error'}${oauthDesc ? ` — ${oauthDesc}` : ''}`\n        : `Client credentials exchange failed with HTTP ${response.status}: ${sanitizeAsMessage(bodyText) || '(empty body)'}`;\n    const kind = rawOauthError ? 'oauth' : 'malformed';\n    throw new ClientCredentialsExchangeError(message, kind, oauthError, oauthDesc, response.status);\n  }\n\n  if (!parsed || typeof parsed.access_token !== 'string') {\n    throw new ClientCredentialsExchangeError(\n      `Token endpoint returned HTTP ${response.status} but no access_token. Body: ${sanitizeAsMessage(bodyText)}`,\n      'malformed',\n      undefined,\n      undefined,\n      response.status\n    );\n  }\n\n  return fromMCPTokens(parsed as unknown as OAuthTokens);\n}\n\n/**\n * Options for {@link ensureClientCredentialsTokens}.\n */\nexport interface EnsureClientCredentialsOptions extends ExchangeClientCredentialsOptions {\n  /**\n   * Storage backend used to persist refreshed tokens. Optional — if omitted,\n   * tokens are only mutated on the in-memory `agent` object and the caller\n   * is responsible for persisting.\n   */\n  storage?: OAuthConfigStorage;\n  /**\n   * Force a re-exchange even if the cached token looks valid. Useful after a\n   * 401 in case the authorization server rotated something out-of-band.\n   */\n  force?: boolean;\n  /**\n   * Expiration skew (ms). Treat the token as expired this many milliseconds\n   * before its nominal `expires_at` — protects against clock skew and\n   * in-flight requests. Default: 60_000 (1 minute). The interactive auth\n   * code flow uses 5 minutes; client credentials refresh is cheap (single\n   * POST) so the shorter window is fine here.\n   */\n  expirationSkewMs?: number;\n}\n\n/**\n * In-flight refresh coalescing map. Scoped by `AgentConfig` object identity\n * so only callers deliberately sharing one configuration can share a bearer.\n * A string key built from public OAuth fields is insufficient here: two\n * tenants can reuse an agent id, endpoint, and client id while differing in\n * secret, scope, audience, or resource.\n *\n * Cleared on completion regardless of success/failure.\n *\n * Note: this is an in-process map. Multi-process deployments (worker\n * pools, multiple CLI invocations, horizontally scaled Node servers)\n * don't coalesce across workers — each process will do its own refresh.\n * For the CLI this is fine; for high-throughput server deployments,\n * coalesce upstream at the storage layer.\n */\ninterface InFlightRefresh {\n  promise: Promise<AgentOAuthTokens>;\n  controller: AbortController;\n  waiters: number;\n  settled: boolean;\n}\n\ntype RefreshMode = 'normal' | 'force';\n\nconst inFlightRefresh = new WeakMap<AgentConfig, Map<RefreshMode, InFlightRefresh>>();\n\nasync function waitForRefresh(entry: InFlightRefresh, signal?: AbortSignal): Promise<AgentOAuthTokens> {\n  if (signal?.aborted) throw createAbortError(signal.reason);\n  entry.waiters += 1;\n  let abortListener: (() => void) | undefined;\n  try {\n    if (!signal) return await entry.promise;\n    const aborted = new Promise<never>((_resolve, reject) => {\n      abortListener = () => reject(createAbortError(signal.reason));\n      signal.addEventListener('abort', abortListener, { once: true });\n    });\n    return await Promise.race([entry.promise, aborted]);\n  } finally {\n    if (abortListener && signal) signal.removeEventListener('abort', abortListener);\n    entry.waiters -= 1;\n    if (entry.waiters === 0 && !entry.settled && !entry.controller.signal.aborted) {\n      entry.controller.abort(createAbortError(signal?.reason ?? 'No callers remain for token refresh'));\n    }\n  }\n}\n\n/**\n * Ensure an agent has a valid access token, refreshing via client credentials\n * if the cached one is missing or expired. Idempotent and safe to call\n * before every request.\n *\n * Concurrent calls for the same `agent.id` are coalesced into a single\n * token POST via an in-process promise map — the common case of a\n * storyboard fan-out firing 10 tool calls in parallel does one refresh,\n * not ten.\n *\n * **Mutation:** this function writes `agent.oauth_tokens` in place. That is\n * the contract the MCP SDK's `OAuthClientProvider` pattern also uses, and\n * it lets the CLI's file-backed storage see the same object. Callers that\n * share an `AgentConfig` across different logical agents must copy first.\n *\n * Precondition: `agent.oauth_client_credentials` must be set. Throws a plain\n * Error if not — callers are expected to branch on its presence before\n * calling this.\n */\nexport async function ensureClientCredentialsTokens(\n  agent: AgentConfig,\n  options: EnsureClientCredentialsOptions = {}\n): Promise<AgentOAuthTokens> {\n  throwIfAborted(options.signal);\n\n  if (!agent.oauth_client_credentials) {\n    throw new Error(\n      `ensureClientCredentialsTokens called for agent '${agent.id}' with no oauth_client_credentials configured.`\n    );\n  }\n\n  const skew = options.expirationSkewMs ?? 60_000;\n  const cached = agent.oauth_tokens;\n  const cachedIsValid =\n    !options.force &&\n    cached?.access_token &&\n    (!cached.expires_at || new Date(cached.expires_at).getTime() - Date.now() > skew);\n\n  if (cachedIsValid) {\n    return cached!;\n  }\n\n  const refreshMode: RefreshMode = options.force ? 'force' : 'normal';\n  let agentRefreshes = inFlightRefresh.get(agent);\n  const existing = agentRefreshes?.get(refreshMode);\n  if (existing && !existing.controller.signal.aborted) {\n    const tokens = await waitForRefresh(existing, options.signal);\n    agent.oauth_tokens = tokens;\n    return tokens;\n  }\n\n  const controller = new AbortController();\n  const entry: InFlightRefresh = {\n    promise: undefined as unknown as Promise<AgentOAuthTokens>,\n    controller,\n    waiters: 0,\n    settled: false,\n  };\n  if (!agentRefreshes) {\n    agentRefreshes = new Map();\n    inFlightRefresh.set(agent, agentRefreshes);\n  }\n  entry.promise = (async () => {\n    try {\n      const tokens = await exchangeClientCredentials(agent.oauth_client_credentials!, {\n        fetch: options.fetch,\n        timeoutMs: options.timeoutMs,\n        allowPrivateIp: options.allowPrivateIp,\n        signal: controller.signal,\n      });\n      agent.oauth_tokens = tokens;\n      if (options.storage) {\n        await options.storage.saveAgent(agent);\n      }\n      return tokens;\n    } finally {\n      entry.settled = true;\n      if (agentRefreshes?.get(refreshMode) === entry) {\n        agentRefreshes.delete(refreshMode);\n        if (agentRefreshes.size === 0) inFlightRefresh.delete(agent);\n      }\n    }\n  })();\n\n  agentRefreshes.set(refreshMode, entry);\n  return waitForRefresh(entry, options.signal);\n}\n"],"mappings":"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","names":[]}

package/dist/lib/auth/oauth/authorization-required.d.mts

@@ -85,6 +85,8 @@ export interface DiscoverAuthorizationOptions {
     timeoutMs?: number;
     /** Scoped fetch implementation for the agent, PRM, and AS metadata probes. */
     fetchFn?: typeof fetch;
+    /** Caller cancellation, including the absolute task deadline. */
+    signal?: AbortSignal;
     /**
      * If provided, use this `WWW-Authenticate` header verbatim instead of
      * re-probing the agent. Use this when you already have a 401 response in
@@ -128,4 +130,5 @@ export declare function probeAuthChallenge(agentUrl: string, options?: {
     allowPrivateIp?: boolean;
     timeoutMs?: number;
     fetchFn?: typeof fetch;
+    signal?: AbortSignal;
 }): Promise<WWWAuthenticateChallenge | null>;

package/dist/lib/auth/oauth/authorization-required.d.ts

@@ -85,6 +85,8 @@ export interface DiscoverAuthorizationOptions {
     timeoutMs?: number;
     /** Scoped fetch implementation for the agent, PRM, and AS metadata probes. */
     fetchFn?: typeof fetch;
+    /** Caller cancellation, including the absolute task deadline. */
+    signal?: AbortSignal;
     /**
      * If provided, use this `WWW-Authenticate` header verbatim instead of
      * re-probing the agent. Use this when you already have a 401 response in
@@ -128,5 +130,6 @@ export declare function probeAuthChallenge(agentUrl: string, options?: {
     allowPrivateIp?: boolean;
     timeoutMs?: number;
     fetchFn?: typeof fetch;
+    signal?: AbortSignal;
 }): Promise<WWWAuthenticateChallenge | null>;
 //# sourceMappingURL=authorization-required.d.ts.map

package/dist/lib/auth/oauth/authorization-required.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorization-required.d.ts","sourceRoot":"","sources":["../../../../src/lib/auth/oauth/authorization-required.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,2BAA2B,EAA0B,MAAM,cAAc,CAAC;AACnF,OAAO,EAAwB,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AA8DpF;;;;GAIG;AACH,MAAM,WAAW,yBAAyB;IACxC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sGAAsG;IACtG,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,6EAA6E;IAC7E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,kFAAkF;IAClF,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uFAAuF;IACvF,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,sFAAsF;IACtF,cAAc,CAAC,EAAE,UAAU,GAAG,sBAAsB,CAAC;IACrD,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,SAAS,EAAE,wBAAwB,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,uBAAwB,SAAQ,2BAA2B;IACtE,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAG,qBAAqB,CAAU;IAClD,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;gBAErC,YAAY,EAAE,yBAAyB,EAAE,OAAO,CAAC,EAAE,MAAM;CAStE;AA+BD;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C,iEAAiE;IACjE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,uFAAuF;IACvF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAiH3C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,KAAK,CAAA;CAAO,GACrF,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAI1C"}
+{"version":3,"file":"authorization-required.d.ts","sourceRoot":"","sources":["../../../../src/lib/auth/oauth/authorization-required.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,2BAA2B,EAA0B,MAAM,cAAc,CAAC;AAEnF,OAAO,EAAwB,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AA8DpF;;;;GAIG;AACH,MAAM,WAAW,yBAAyB;IACxC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sGAAsG;IACtG,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,6EAA6E;IAC7E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,kFAAkF;IAClF,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uFAAuF;IACvF,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,sFAAsF;IACtF,cAAc,CAAC,EAAE,UAAU,GAAG,sBAAsB,CAAC;IACrD,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,SAAS,EAAE,wBAAwB,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,uBAAwB,SAAQ,2BAA2B;IACtE,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAG,qBAAqB,CAAU;IAClD,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;gBAErC,YAAY,EAAE,yBAAyB,EAAE,OAAO,CAAC,EAAE,MAAM;CAStE;AA+BD;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C,iEAAiE;IACjE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,uFAAuF;IACvF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IACvB,iEAAiE;IACjE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAoI3C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAO,GAC3G,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAU1C"}