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

package/dist/lib/net/ssrf-fetch.mjs

@@ -24,6 +24,7 @@ class SsrfRefusedError extends Error {
   }
 }
 async function ssrfSafeFetch(url, options = {}) {
+  throwIfSignalAborted(options.signal);
   const allowPrivateIp = options.allowPrivateIp === true;
   const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const maxBodyBytes = options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;
@@ -47,64 +48,69 @@ async function ssrfSafeFetch(url, options = {}) {
       hostname
     });
   }
-  let addresses;
+  const ac = new AbortController();
+  const onExternalAbort = () => ac.abort(options.signal?.reason);
+  options.signal?.addEventListener("abort", onExternalAbort, { once: true });
+  if (options.signal?.aborted) onExternalAbort();
+  const timer = setTimeout(() => ac.abort(new Error("ssrf-fetch: timeout")), timeoutMs);
+  let dispatcher;
   try {
-    addresses = await dnsLookupAsync(hostname, { all: true });
-  } catch (err) {
-    throw new SsrfRefusedError(
-      "dns_lookup_failed",
-      `DNS lookup failed for ${hostname}: ${err instanceof Error ? err.message : String(err)}`,
-      { url, hostname }
-    );
-  }
-  if (addresses.length === 0) {
-    throw new SsrfRefusedError("dns_empty", `DNS returned no addresses for ${hostname}`, {
-      url,
-      hostname
-    });
-  }
-  for (const a of addresses) {
-    if (isAlwaysBlocked(a.address)) {
+    let addresses;
+    try {
+      addresses = await raceWithAbort(dnsLookupAsync(hostname, { all: true }), ac.signal);
+    } catch (err) {
+      throwIfSignalAborted(ac.signal);
       throw new SsrfRefusedError(
-        "always_blocked_address",
-        `Refusing to fetch: ${hostname} resolves to an always-blocked address (link-local or cloud metadata)`,
-        { url, hostname, address: a.address }
+        "dns_lookup_failed",
+        `DNS lookup failed for ${hostname}: ${err instanceof Error ? err.message : String(err)}`,
+        { url, hostname }
       );
     }
-  }
-  if (!allowPrivateIp) {
+    throwIfSignalAborted(ac.signal);
+    if (addresses.length === 0) {
+      throw new SsrfRefusedError("dns_empty", `DNS returned no addresses for ${hostname}`, {
+        url,
+        hostname
+      });
+    }
     for (const a of addresses) {
-      if (isPrivateIp(a.address)) {
+      if (isAlwaysBlocked(a.address)) {
         throw new SsrfRefusedError(
-          "private_address",
-          `Refusing to fetch: ${hostname} resolves to a private/loopback address`,
+          "always_blocked_address",
+          `Refusing to fetch: ${hostname} resolves to an always-blocked address (link-local or cloud metadata)`,
           { url, hostname, address: a.address }
         );
       }
     }
-  }
-  const pinned = addresses[0];
-  const pinnedFamily = pinned.family === 6 ? 6 : 4;
-  const dispatcher = new Agent({
-    connect: {
-      // All addresses were validated above; pin the connect to the first. The
-      // custom lookup also means undici won't re-resolve and pick up a rebind.
-      // undici's Agent may call lookup with `{ all: true }` (it does for HTTPS
-      // targets under Node 22+), which expects the array form of the callback.
-      lookup: (_h, opts, cb) => {
-        if (opts?.all) {
-          cb(null, [{ address: pinned.address, family: pinnedFamily }]);
-        } else {
-          cb(null, pinned.address, pinnedFamily);
+    if (!allowPrivateIp) {
+      for (const a of addresses) {
+        if (isPrivateIp(a.address)) {
+          throw new SsrfRefusedError(
+            "private_address",
+            `Refusing to fetch: ${hostname} resolves to a private/loopback address`,
+            { url, hostname, address: a.address }
+          );
         }
       }
     }
-  });
-  const ac = new AbortController();
-  const onExternalAbort = () => ac.abort(options.signal?.reason);
-  options.signal?.addEventListener("abort", onExternalAbort, { once: true });
-  const timer = setTimeout(() => ac.abort(new Error("ssrf-fetch: timeout")), timeoutMs);
-  try {
+    const pinned = addresses[0];
+    const pinnedFamily = pinned.family === 6 ? 6 : 4;
+    dispatcher = new Agent({
+      connect: {
+        timeout: Math.min(5e3, timeoutMs),
+        // All addresses were validated above; pin the connect to the first. The
+        // custom lookup also means undici won't re-resolve and pick up a rebind.
+        // undici's Agent may call lookup with `{ all: true }` (it does for HTTPS
+        // targets under Node 22+), which expects the array form of the callback.
+        lookup: (_h, opts, cb) => {
+          if (opts?.all) {
+            cb(null, [{ address: pinned.address, family: pinnedFamily }]);
+          } else {
+            cb(null, pinned.address, pinnedFamily);
+          }
+        }
+      }
+    });
     const res = options.trustedFetchFn ? await options.trustedFetchFn(url, {
       method: options.method ?? "GET",
       redirect: "manual",
@@ -169,10 +175,28 @@ async function ssrfSafeFetch(url, options = {}) {
   } finally {
     clearTimeout(timer);
     options.signal?.removeEventListener("abort", onExternalAbort);
-    await dispatcher.close().catch(() => {
+    await dispatcher?.close().catch(() => {
     });
   }
 }
+function raceWithAbort(operation, signal) {
+  throwIfSignalAborted(signal);
+  return new Promise((resolve, reject) => {
+    const onAbort = () => reject(signalAbortError(signal));
+    signal.addEventListener("abort", onAbort, { once: true });
+    operation.then(resolve, reject).finally(() => signal.removeEventListener("abort", onAbort));
+  });
+}
+function signalAbortError(signal) {
+  if (signal.reason instanceof Error) return signal.reason;
+  const error = new Error(signal.reason == null ? "The operation was aborted" : String(signal.reason));
+  error.name = "AbortError";
+  return error;
+}
+function throwIfSignalAborted(signal) {
+  if (!signal?.aborted) return;
+  throw signalAbortError(signal);
+}
 function decodeBodyAsJsonOrText(body, contentType) {
   if (body.byteLength === 0) return null;
   const text = Buffer.from(body.buffer, body.byteOffset, body.byteLength).toString("utf8");

package/dist/lib/net/ssrf-fetch.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/net/ssrf-fetch.ts"],"sourcesContent":["/**\n * SSRF-safe HTTP fetch primitive.\n *\n * Used by compliance probes, storyboard runners, and (future) JWKS /\n * revocation-list resolvers — anywhere the library dispatches a request to a\n * URL that came from counterparty-controlled data and therefore might point at\n * the host's private network or a cloud metadata endpoint.\n *\n * Guarantees:\n *   - Scheme: only `https:` by default; `http:` allowed under the dev-opt-in\n *     `allowPrivateIp` flag. `file:`, `ftp:`, `data:`, etc. are always refused.\n *   - DNS: resolves every A/AAAA record once, validates the full set, then\n *     pins the outbound connection to the first validated address via an\n *     undici `Agent` whose `connect.lookup` returns the pinned tuple.\n *     Defeats DNS rebinding (attacker returns a public address to the guard\n *     lookup and a private address to the connect-time lookup) and any other\n *     TOCTOU gap between validation and connect.\n *   - IMDS (`169.254.169.254`, `fe80::`) stays refused even under\n *     `allowPrivateIp` — cloud metadata exfiltration is never a legitimate\n *     dev-loop use case.\n *   - Redirects are not followed (`redirect: 'manual'`). The 3xx response is\n *     returned with `Location` populated so callers can inspect it, but they\n *     MUST NOT re-dispatch to the `Location` URL themselves — that bypasses\n *     every guard above. To follow a redirect safely, re-invoke\n *     `ssrfSafeFetch` with the new URL so it runs through validation again.\n *   - Response body is buffered up to `maxBodyBytes` (default 64 KiB) and\n *     returned as raw bytes; the dispatcher is torn down after reading so\n *     connection-reuse can't carry an attacker-controlled keepalive.\n *\n * Returns a fully-buffered result. Callers that need streaming or large bodies\n * should extend this primitive rather than bypass it.\n */\nimport { type LookupAddress, type LookupOptions } from 'dns';\nimport { lookup as dnsLookupAsync } from 'dns/promises';\nimport { Agent, fetch as undiciFetch } from 'undici';\nimport { isAlwaysBlocked, isPrivateIp } from './address-guards';\n\nconst DEFAULT_TIMEOUT_MS = 10_000;\nconst DEFAULT_MAX_BODY_BYTES = 64 * 1024;\nconst ALLOWED_SCHEMES = new Set(['https:', 'http:']);\n\nexport type SsrfRefusedCode =\n  | 'invalid_url'\n  | 'scheme_not_allowed'\n  | 'non_https_without_opt_in'\n  | 'dns_lookup_failed'\n  | 'dns_empty'\n  | 'always_blocked_address'\n  | 'private_address'\n  | 'body_exceeds_limit';\n\n/**\n * SSRF refusal codes that indicate runtime/network conditions rather than\n * policy refusal. Callers that want to fall back to a \"host unreachable\" or\n * \"treat as unknown\" path on these codes — rather than surfacing the\n * SsrfRefusedError to their own caller — can intersect against this set:\n *\n * ```ts\n * if (err instanceof SsrfRefusedError && SSRF_TRANSIENT_CODES.has(err.code)) {\n *   // network condition, not a policy attack — treat as unreachable\n * } else if (err instanceof SsrfRefusedError) {\n *   // policy refusal — must propagate; silently downgrading to \"unreachable\"\n *   // reintroduces the catch-swallow class flagged in adcp-client#1618 review\n *   throw err;\n * }\n * ```\n *\n * - `dns_lookup_failed`, `dns_empty`: name does not resolve. CLI fixtures\n *   use `*.example.invalid` to provoke these — preserving the runtime-error\n *   path matches pre-`ssrfSafeFetch` native-fetch behavior.\n * - `body_exceeds_limit`: response started OK (validated address, scheme,\n *   etc.) but exceeded the caller's defensive cap. The host is real and\n *   knows the URL; classifying as \"policy attack\" would be a misread.\n *\n * NOT in this set: `always_blocked_address`, `private_address`,\n * `scheme_not_allowed`, `non_https_without_opt_in`, `invalid_url`. Those\n * are policy refusals — silently downgrading them to \"unreachable\" or\n * \"suspect\" reintroduces the SSRF gap the gate was added to close.\n *\n * Added in adcp-client#1633.\n */\nexport const SSRF_TRANSIENT_CODES: ReadonlySet<SsrfRefusedCode> = new Set([\n  'dns_lookup_failed',\n  'dns_empty',\n  'body_exceeds_limit',\n]);\n\n/**\n * Thrown when the SSRF guard refuses a request before (or during) the fetch.\n * Network failures after the guard passes are not wrapped in this type —\n * callers that want to distinguish \"we refused this\" from \"the remote broke\"\n * can `instanceof SsrfRefusedError` the catch.\n */\nexport class SsrfRefusedError extends Error {\n  readonly code: SsrfRefusedCode;\n  readonly url: string;\n  readonly hostname?: string;\n  readonly address?: string;\n\n  constructor(code: SsrfRefusedCode, message: string, meta: { url: string; hostname?: string; address?: string }) {\n    super(message);\n    this.name = 'SsrfRefusedError';\n    this.code = code;\n    this.url = meta.url;\n    this.hostname = meta.hostname;\n    this.address = meta.address;\n  }\n}\n\nexport interface SsrfFetchOptions {\n  method?: string;\n  /** Lowercased keys preferred; values preserved verbatim. */\n  headers?: Record<string, string>;\n  body?: string | Uint8Array;\n  /** Allow `http://` and private/loopback targets. Default false. */\n  allowPrivateIp?: boolean;\n  /** Overall timeout including DNS + connect + body read. Default 10_000 ms. */\n  timeoutMs?: number;\n  /** Hard cap on response body bytes. Default 64 KiB. */\n  maxBodyBytes?: number;\n  /** Caller-provided abort signal, composed with the internal timeout. */\n  signal?: AbortSignal;\n  /**\n   * Trusted scoped fetch implementation. URL validation and address\n   * classification still run before invocation, but DNS pinning is delegated\n   * to this implementation because custom fetchers do not accept undici\n   * dispatchers. The caller MUST enforce DNS-rebinding protection itself.\n   *\n   * This deliberately explicit name prevents callers from mistaking a custom\n   * transport for the internally DNS-pinned path.\n   */\n  trustedFetchFn?: typeof fetch;\n}\n\nexport interface SsrfFetchResult {\n  url: string;\n  status: number;\n  /** Response headers, lowercased. */\n  headers: Record<string, string>;\n  /** Raw response body bytes (empty Uint8Array if no body). */\n  body: Uint8Array;\n  /** The validated IP address. The connection used it only when `connectionPinned` is true. */\n  pinnedAddress: string;\n  pinnedFamily: 4 | 6;\n  /** Whether the internal undici dispatcher pinned the connection to `pinnedAddress`. */\n  connectionPinned: boolean;\n}\n\n/**\n * GET/POST/etc. a URL with SSRF guarding + DNS pinning. Throws\n * {@link SsrfRefusedError} when the guard refuses; other errors (network\n * timeouts, remote resets) propagate as the native fetch error.\n */\nexport async function ssrfSafeFetch(url: string, options: SsrfFetchOptions = {}): Promise<SsrfFetchResult> {\n  const allowPrivateIp = options.allowPrivateIp === true;\n  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;\n  const maxBodyBytes = options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;\n\n  let parsed: URL;\n  try {\n    parsed = new URL(url);\n  } catch {\n    throw new SsrfRefusedError('invalid_url', `Invalid URL: ${url}`, { url });\n  }\n\n  // `URL.hostname` wraps IPv6 literals in brackets (`https://[::1]/` →\n  // `[::1]`). `dns.lookup` and the address classifier both want the bare\n  // form; strip brackets here so IPv6 localhost URLs work under\n  // `allowPrivateIp` and so bracketed literals can't slip past classification\n  // on a future Node release that tolerates them.\n  const hostname = parsed.hostname.replace(/^\\[|\\]$/g, '');\n\n  if (!ALLOWED_SCHEMES.has(parsed.protocol)) {\n    throw new SsrfRefusedError(\n      'scheme_not_allowed',\n      `Refusing to fetch URL with unsupported scheme: ${parsed.protocol}`,\n      { url, hostname }\n    );\n  }\n  if (parsed.protocol !== 'https:' && !allowPrivateIp) {\n    throw new SsrfRefusedError('non_https_without_opt_in', `Refusing to fetch non-HTTPS URL: ${url}`, {\n      url,\n      hostname,\n    });\n  }\n\n  let addresses: { address: string; family: number }[];\n  try {\n    addresses = await dnsLookupAsync(hostname, { all: true });\n  } catch (err) {\n    throw new SsrfRefusedError(\n      'dns_lookup_failed',\n      `DNS lookup failed for ${hostname}: ${err instanceof Error ? err.message : String(err)}`,\n      { url, hostname }\n    );\n  }\n  if (addresses.length === 0) {\n    throw new SsrfRefusedError('dns_empty', `DNS returned no addresses for ${hostname}`, {\n      url,\n      hostname,\n    });\n  }\n  // Error messages intentionally do NOT include the resolved IP — a\n  // counterparty-supplied hostname that resolves into the caller's internal\n  // address space would otherwise leak network topology into compliance\n  // reports and log aggregators. The address is still available on the\n  // thrown error's `.address` field for programmatic debugging.\n  for (const a of addresses) {\n    if (isAlwaysBlocked(a.address)) {\n      throw new SsrfRefusedError(\n        'always_blocked_address',\n        `Refusing to fetch: ${hostname} resolves to an always-blocked address (link-local or cloud metadata)`,\n        { url, hostname, address: a.address }\n      );\n    }\n  }\n  if (!allowPrivateIp) {\n    for (const a of addresses) {\n      if (isPrivateIp(a.address)) {\n        throw new SsrfRefusedError(\n          'private_address',\n          `Refusing to fetch: ${hostname} resolves to a private/loopback address`,\n          { url, hostname, address: a.address }\n        );\n      }\n    }\n  }\n\n  const pinned = addresses[0]!;\n  const pinnedFamily = pinned.family === 6 ? 6 : 4;\n  const dispatcher = new Agent({\n    connect: {\n      // All addresses were validated above; pin the connect to the first. The\n      // custom lookup also means undici won't re-resolve and pick up a rebind.\n      // undici's Agent may call lookup with `{ all: true }` (it does for HTTPS\n      // targets under Node 22+), which expects the array form of the callback.\n      lookup: (\n        _h: string,\n        opts: LookupOptions | undefined,\n        cb: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family?: number) => void\n      ) => {\n        if (opts?.all) {\n          cb(null, [{ address: pinned.address, family: pinnedFamily }]);\n        } else {\n          cb(null, pinned.address, pinnedFamily);\n        }\n      },\n    },\n  });\n\n  const ac = new AbortController();\n  const onExternalAbort = () => ac.abort(options.signal?.reason);\n  options.signal?.addEventListener('abort', onExternalAbort, { once: true });\n  const timer = setTimeout(() => ac.abort(new Error('ssrf-fetch: timeout')), timeoutMs);\n\n  try {\n    const res = options.trustedFetchFn\n      ? await options.trustedFetchFn(url, {\n          method: options.method ?? 'GET',\n          redirect: 'manual',\n          signal: ac.signal,\n          headers: options.headers,\n          ...(options.body !== undefined && { body: options.body as BodyInit }),\n        })\n      : await undiciFetch(url, {\n          method: options.method ?? 'GET',\n          redirect: 'manual',\n          signal: ac.signal,\n          headers: options.headers,\n          dispatcher,\n          ...(options.body !== undefined && { body: options.body }),\n        });\n\n    const headers: Record<string, string> = {};\n    res.headers.forEach((v, k) => {\n      headers[k.toLowerCase()] = v;\n    });\n\n    const reader = res.body?.getReader();\n    if (!reader) {\n      return {\n        url,\n        status: res.status,\n        headers,\n        body: new Uint8Array(),\n        pinnedAddress: pinned.address,\n        pinnedFamily,\n        connectionPinned: !options.trustedFetchFn,\n      };\n    }\n\n    const chunks: Uint8Array[] = [];\n    let bytes = 0;\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      bytes += value.byteLength;\n      if (bytes > maxBodyBytes) {\n        await reader.cancel();\n        throw new SsrfRefusedError('body_exceeds_limit', `Response body exceeded ${maxBodyBytes} bytes`, {\n          url,\n          hostname: parsed.hostname,\n          address: pinned.address,\n        });\n      }\n      chunks.push(value);\n    }\n\n    const buf = new Uint8Array(bytes);\n    let offset = 0;\n    for (const c of chunks) {\n      buf.set(c, offset);\n      offset += c.byteLength;\n    }\n\n    return {\n      url,\n      status: res.status,\n      headers,\n      body: buf,\n      pinnedAddress: pinned.address,\n      pinnedFamily,\n      connectionPinned: !options.trustedFetchFn,\n    };\n  } finally {\n    clearTimeout(timer);\n    options.signal?.removeEventListener('abort', onExternalAbort);\n    await dispatcher.close().catch(() => {});\n  }\n}\n\n/**\n * Decode a UTF-8 byte buffer as JSON when the content-type declares JSON, or\n * fall back to a UTF-8 string. Handy shared helper for probe-style call sites\n * that don't care about binary bodies.\n */\nexport function decodeBodyAsJsonOrText(body: Uint8Array, contentType: string | undefined): unknown {\n  if (body.byteLength === 0) return null;\n  const text = Buffer.from(body.buffer, body.byteOffset, body.byteLength).toString('utf8');\n  if (contentType?.toLowerCase().includes('application/json')) {\n    try {\n      return JSON.parse(text);\n    } catch {\n      return text;\n    }\n  }\n  return text;\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/lib/net/ssrf-fetch.ts"],"sourcesContent":["/**\n * SSRF-safe HTTP fetch primitive.\n *\n * Used by compliance probes, storyboard runners, and (future) JWKS /\n * revocation-list resolvers — anywhere the library dispatches a request to a\n * URL that came from counterparty-controlled data and therefore might point at\n * the host's private network or a cloud metadata endpoint.\n *\n * Guarantees:\n *   - Scheme: only `https:` by default; `http:` allowed under the dev-opt-in\n *     `allowPrivateIp` flag. `file:`, `ftp:`, `data:`, etc. are always refused.\n *   - DNS: resolves every A/AAAA record once, validates the full set, then\n *     pins the outbound connection to the first validated address via an\n *     undici `Agent` whose `connect.lookup` returns the pinned tuple.\n *     Defeats DNS rebinding (attacker returns a public address to the guard\n *     lookup and a private address to the connect-time lookup) and any other\n *     TOCTOU gap between validation and connect.\n *   - IMDS (`169.254.169.254`, `fe80::`) stays refused even under\n *     `allowPrivateIp` — cloud metadata exfiltration is never a legitimate\n *     dev-loop use case.\n *   - Redirects are not followed (`redirect: 'manual'`). The 3xx response is\n *     returned with `Location` populated so callers can inspect it, but they\n *     MUST NOT re-dispatch to the `Location` URL themselves — that bypasses\n *     every guard above. To follow a redirect safely, re-invoke\n *     `ssrfSafeFetch` with the new URL so it runs through validation again.\n *   - Response body is buffered up to `maxBodyBytes` (default 64 KiB) and\n *     returned as raw bytes; the dispatcher is torn down after reading so\n *     connection-reuse can't carry an attacker-controlled keepalive.\n *\n * Returns a fully-buffered result. Callers that need streaming or large bodies\n * should extend this primitive rather than bypass it.\n */\nimport { type LookupAddress, type LookupOptions } from 'dns';\nimport { lookup as dnsLookupAsync } from 'dns/promises';\nimport { Agent, fetch as undiciFetch } from 'undici';\nimport { isAlwaysBlocked, isPrivateIp } from './address-guards';\n\nconst DEFAULT_TIMEOUT_MS = 10_000;\nconst DEFAULT_MAX_BODY_BYTES = 64 * 1024;\nconst ALLOWED_SCHEMES = new Set(['https:', 'http:']);\n\nexport type SsrfRefusedCode =\n  | 'invalid_url'\n  | 'scheme_not_allowed'\n  | 'non_https_without_opt_in'\n  | 'dns_lookup_failed'\n  | 'dns_empty'\n  | 'always_blocked_address'\n  | 'private_address'\n  | 'body_exceeds_limit';\n\n/**\n * SSRF refusal codes that indicate runtime/network conditions rather than\n * policy refusal. Callers that want to fall back to a \"host unreachable\" or\n * \"treat as unknown\" path on these codes — rather than surfacing the\n * SsrfRefusedError to their own caller — can intersect against this set:\n *\n * ```ts\n * if (err instanceof SsrfRefusedError && SSRF_TRANSIENT_CODES.has(err.code)) {\n *   // network condition, not a policy attack — treat as unreachable\n * } else if (err instanceof SsrfRefusedError) {\n *   // policy refusal — must propagate; silently downgrading to \"unreachable\"\n *   // reintroduces the catch-swallow class flagged in adcp-client#1618 review\n *   throw err;\n * }\n * ```\n *\n * - `dns_lookup_failed`, `dns_empty`: name does not resolve. CLI fixtures\n *   use `*.example.invalid` to provoke these — preserving the runtime-error\n *   path matches pre-`ssrfSafeFetch` native-fetch behavior.\n * - `body_exceeds_limit`: response started OK (validated address, scheme,\n *   etc.) but exceeded the caller's defensive cap. The host is real and\n *   knows the URL; classifying as \"policy attack\" would be a misread.\n *\n * NOT in this set: `always_blocked_address`, `private_address`,\n * `scheme_not_allowed`, `non_https_without_opt_in`, `invalid_url`. Those\n * are policy refusals — silently downgrading them to \"unreachable\" or\n * \"suspect\" reintroduces the SSRF gap the gate was added to close.\n *\n * Added in adcp-client#1633.\n */\nexport const SSRF_TRANSIENT_CODES: ReadonlySet<SsrfRefusedCode> = new Set([\n  'dns_lookup_failed',\n  'dns_empty',\n  'body_exceeds_limit',\n]);\n\n/**\n * Thrown when the SSRF guard refuses a request before (or during) the fetch.\n * Network failures after the guard passes are not wrapped in this type —\n * callers that want to distinguish \"we refused this\" from \"the remote broke\"\n * can `instanceof SsrfRefusedError` the catch.\n */\nexport class SsrfRefusedError extends Error {\n  readonly code: SsrfRefusedCode;\n  readonly url: string;\n  readonly hostname?: string;\n  readonly address?: string;\n\n  constructor(code: SsrfRefusedCode, message: string, meta: { url: string; hostname?: string; address?: string }) {\n    super(message);\n    this.name = 'SsrfRefusedError';\n    this.code = code;\n    this.url = meta.url;\n    this.hostname = meta.hostname;\n    this.address = meta.address;\n  }\n}\n\nexport interface SsrfFetchOptions {\n  method?: string;\n  /** Lowercased keys preferred; values preserved verbatim. */\n  headers?: Record<string, string>;\n  body?: string | Uint8Array;\n  /** Allow `http://` and private/loopback targets. Default false. */\n  allowPrivateIp?: boolean;\n  /** Overall timeout including DNS + connect + body read. Default 10_000 ms. */\n  timeoutMs?: number;\n  /** Hard cap on response body bytes. Default 64 KiB. */\n  maxBodyBytes?: number;\n  /** Caller-provided abort signal, composed with the internal timeout. */\n  signal?: AbortSignal;\n  /**\n   * Trusted scoped fetch implementation. URL validation and address\n   * classification still run before invocation, but DNS pinning is delegated\n   * to this implementation because custom fetchers do not accept undici\n   * dispatchers. The caller MUST enforce DNS-rebinding protection itself.\n   *\n   * This deliberately explicit name prevents callers from mistaking a custom\n   * transport for the internally DNS-pinned path.\n   */\n  trustedFetchFn?: typeof fetch;\n}\n\nexport interface SsrfFetchResult {\n  url: string;\n  status: number;\n  /** Response headers, lowercased. */\n  headers: Record<string, string>;\n  /** Raw response body bytes (empty Uint8Array if no body). */\n  body: Uint8Array;\n  /** The validated IP address. The connection used it only when `connectionPinned` is true. */\n  pinnedAddress: string;\n  pinnedFamily: 4 | 6;\n  /** Whether the internal undici dispatcher pinned the connection to `pinnedAddress`. */\n  connectionPinned: boolean;\n}\n\n/**\n * GET/POST/etc. a URL with SSRF guarding + DNS pinning. Throws\n * {@link SsrfRefusedError} when the guard refuses; other errors (network\n * timeouts, remote resets) propagate as the native fetch error.\n */\nexport async function ssrfSafeFetch(url: string, options: SsrfFetchOptions = {}): Promise<SsrfFetchResult> {\n  throwIfSignalAborted(options.signal);\n  const allowPrivateIp = options.allowPrivateIp === true;\n  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;\n  const maxBodyBytes = options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;\n\n  let parsed: URL;\n  try {\n    parsed = new URL(url);\n  } catch {\n    throw new SsrfRefusedError('invalid_url', `Invalid URL: ${url}`, { url });\n  }\n\n  // `URL.hostname` wraps IPv6 literals in brackets (`https://[::1]/` →\n  // `[::1]`). `dns.lookup` and the address classifier both want the bare\n  // form; strip brackets here so IPv6 localhost URLs work under\n  // `allowPrivateIp` and so bracketed literals can't slip past classification\n  // on a future Node release that tolerates them.\n  const hostname = parsed.hostname.replace(/^\\[|\\]$/g, '');\n\n  if (!ALLOWED_SCHEMES.has(parsed.protocol)) {\n    throw new SsrfRefusedError(\n      'scheme_not_allowed',\n      `Refusing to fetch URL with unsupported scheme: ${parsed.protocol}`,\n      { url, hostname }\n    );\n  }\n  if (parsed.protocol !== 'https:' && !allowPrivateIp) {\n    throw new SsrfRefusedError('non_https_without_opt_in', `Refusing to fetch non-HTTPS URL: ${url}`, {\n      url,\n      hostname,\n    });\n  }\n\n  // Start the request deadline before DNS. `dns.lookup()` does not accept an\n  // AbortSignal, so race it against the same controller used for connect and\n  // body reads. The lookup may continue inside libuv after an abort, but its\n  // eventual settlement is observed by `raceWithAbort` and cannot keep this\n  // caller pending or produce an unhandled rejection.\n  const ac = new AbortController();\n  const onExternalAbort = () => ac.abort(options.signal?.reason);\n  options.signal?.addEventListener('abort', onExternalAbort, { once: true });\n  if (options.signal?.aborted) onExternalAbort();\n  const timer = setTimeout(() => ac.abort(new Error('ssrf-fetch: timeout')), timeoutMs);\n  let dispatcher: Agent | undefined;\n\n  try {\n    let addresses: { address: string; family: number }[];\n    try {\n      addresses = await raceWithAbort(dnsLookupAsync(hostname, { all: true }), ac.signal);\n    } catch (err) {\n      throwIfSignalAborted(ac.signal);\n      throw new SsrfRefusedError(\n        'dns_lookup_failed',\n        `DNS lookup failed for ${hostname}: ${err instanceof Error ? err.message : String(err)}`,\n        { url, hostname }\n      );\n    }\n    throwIfSignalAborted(ac.signal);\n    if (addresses.length === 0) {\n      throw new SsrfRefusedError('dns_empty', `DNS returned no addresses for ${hostname}`, {\n        url,\n        hostname,\n      });\n    }\n    // Error messages intentionally do NOT include the resolved IP — a\n    // counterparty-supplied hostname that resolves into the caller's internal\n    // address space would otherwise leak network topology into compliance\n    // reports and log aggregators. The address is still available on the\n    // thrown error's `.address` field for programmatic debugging.\n    for (const a of addresses) {\n      if (isAlwaysBlocked(a.address)) {\n        throw new SsrfRefusedError(\n          'always_blocked_address',\n          `Refusing to fetch: ${hostname} resolves to an always-blocked address (link-local or cloud metadata)`,\n          { url, hostname, address: a.address }\n        );\n      }\n    }\n    if (!allowPrivateIp) {\n      for (const a of addresses) {\n        if (isPrivateIp(a.address)) {\n          throw new SsrfRefusedError(\n            'private_address',\n            `Refusing to fetch: ${hostname} resolves to a private/loopback address`,\n            { url, hostname, address: a.address }\n          );\n        }\n      }\n    }\n\n    const pinned = addresses[0]!;\n    const pinnedFamily = pinned.family === 6 ? 6 : 4;\n    dispatcher = new Agent({\n      connect: {\n        timeout: Math.min(5_000, timeoutMs),\n        // All addresses were validated above; pin the connect to the first. The\n        // custom lookup also means undici won't re-resolve and pick up a rebind.\n        // undici's Agent may call lookup with `{ all: true }` (it does for HTTPS\n        // targets under Node 22+), which expects the array form of the callback.\n        lookup: (\n          _h: string,\n          opts: LookupOptions | undefined,\n          cb: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family?: number) => void\n        ) => {\n          if (opts?.all) {\n            cb(null, [{ address: pinned.address, family: pinnedFamily }]);\n          } else {\n            cb(null, pinned.address, pinnedFamily);\n          }\n        },\n      },\n    });\n\n    const res = options.trustedFetchFn\n      ? await options.trustedFetchFn(url, {\n          method: options.method ?? 'GET',\n          redirect: 'manual',\n          signal: ac.signal,\n          headers: options.headers,\n          ...(options.body !== undefined && { body: options.body as BodyInit }),\n        })\n      : await undiciFetch(url, {\n          method: options.method ?? 'GET',\n          redirect: 'manual',\n          signal: ac.signal,\n          headers: options.headers,\n          dispatcher,\n          ...(options.body !== undefined && { body: options.body }),\n        });\n\n    const headers: Record<string, string> = {};\n    res.headers.forEach((v, k) => {\n      headers[k.toLowerCase()] = v;\n    });\n\n    const reader = res.body?.getReader();\n    if (!reader) {\n      return {\n        url,\n        status: res.status,\n        headers,\n        body: new Uint8Array(),\n        pinnedAddress: pinned.address,\n        pinnedFamily,\n        connectionPinned: !options.trustedFetchFn,\n      };\n    }\n\n    const chunks: Uint8Array[] = [];\n    let bytes = 0;\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      bytes += value.byteLength;\n      if (bytes > maxBodyBytes) {\n        await reader.cancel();\n        throw new SsrfRefusedError('body_exceeds_limit', `Response body exceeded ${maxBodyBytes} bytes`, {\n          url,\n          hostname: parsed.hostname,\n          address: pinned.address,\n        });\n      }\n      chunks.push(value);\n    }\n\n    const buf = new Uint8Array(bytes);\n    let offset = 0;\n    for (const c of chunks) {\n      buf.set(c, offset);\n      offset += c.byteLength;\n    }\n\n    return {\n      url,\n      status: res.status,\n      headers,\n      body: buf,\n      pinnedAddress: pinned.address,\n      pinnedFamily,\n      connectionPinned: !options.trustedFetchFn,\n    };\n  } finally {\n    clearTimeout(timer);\n    options.signal?.removeEventListener('abort', onExternalAbort);\n    await dispatcher?.close().catch(() => {});\n  }\n}\n\n/**\n * Await an operation that has no native AbortSignal support without allowing\n * it to retain the caller after cancellation. Attaching both fulfillment and\n * rejection handlers also observes a late operation failure after the abort\n * branch has already won the race.\n */\nfunction raceWithAbort<T>(operation: Promise<T>, signal: AbortSignal): Promise<T> {\n  throwIfSignalAborted(signal);\n  return new Promise<T>((resolve, reject) => {\n    const onAbort = () => reject(signalAbortError(signal));\n    signal.addEventListener('abort', onAbort, { once: true });\n    operation.then(resolve, reject).finally(() => signal.removeEventListener('abort', onAbort));\n  });\n}\n\nfunction signalAbortError(signal: AbortSignal): Error {\n  if (signal.reason instanceof Error) return signal.reason;\n  const error = new Error(signal.reason == null ? 'The operation was aborted' : String(signal.reason));\n  error.name = 'AbortError';\n  return error;\n}\n\nfunction throwIfSignalAborted(signal?: AbortSignal): void {\n  if (!signal?.aborted) return;\n  throw signalAbortError(signal);\n}\n\n/**\n * Decode a UTF-8 byte buffer as JSON when the content-type declares JSON, or\n * fall back to a UTF-8 string. Handy shared helper for probe-style call sites\n * that don't care about binary bodies.\n */\nexport function decodeBodyAsJsonOrText(body: Uint8Array, contentType: string | undefined): unknown {\n  if (body.byteLength === 0) return null;\n  const text = Buffer.from(body.buffer, body.byteOffset, body.byteLength).toString('utf8');\n  if (contentType?.toLowerCase().includes('application/json')) {\n    try {\n      return JSON.parse(text);\n    } catch {\n      return text;\n    }\n  }\n  return text;\n}\n"],"mappings":"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","names":[]}

package/dist/lib/protocols/abort.d.mts

@@ -6,4 +6,6 @@ export declare function createAbortError(reason?: unknown): Error;
 export declare function createTimeoutError(timeoutMs: number): Error;
 export declare function isAbortOrTimeoutError(error: unknown): boolean;
 export declare function throwIfAborted(signal?: AbortSignal): void;
-export declare function withAbortSignal<T>(signals: Array<AbortSignal | null | undefined>, timeoutMs: number | undefined, fn: (signal?: AbortSignal) => Promise<T>): Promise<T>;
+export declare function withAbortSignal<T>(signals: Array<AbortSignal | null | undefined>, timeoutMs: number | undefined, fn: (signal?: AbortSignal) => Promise<T>, options?: {
+    timeoutError?: Error;
+}): Promise<T>;

package/dist/lib/protocols/abort.d.ts

@@ -6,5 +6,7 @@ export declare function createAbortError(reason?: unknown): Error;
 export declare function createTimeoutError(timeoutMs: number): Error;
 export declare function isAbortOrTimeoutError(error: unknown): boolean;
 export declare function throwIfAborted(signal?: AbortSignal): void;
-export declare function withAbortSignal<T>(signals: Array<AbortSignal | null | undefined>, timeoutMs: number | undefined, fn: (signal?: AbortSignal) => Promise<T>): Promise<T>;
+export declare function withAbortSignal<T>(signals: Array<AbortSignal | null | undefined>, timeoutMs: number | undefined, fn: (signal?: AbortSignal) => Promise<T>, options?: {
+    timeoutError?: Error;
+}): Promise<T>;
 //# sourceMappingURL=abort.d.ts.map

package/dist/lib/protocols/abort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"abort.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/abort.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,QAAS,CAAC;AACjD,eAAO,MAAM,kBAAkB,aAAgB,CAAC;AAEhD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQpH;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAG/F;AAED,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CASxD;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAI3D;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQ7D;AAED,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAIzD;AAED,wBAAsB,eAAe,CAAC,CAAC,EACrC,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC,EAC9C,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GACvC,OAAO,CAAC,CAAC,CAAC,CAiDZ"}
+{"version":3,"file":"abort.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/abort.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,QAAS,CAAC;AACjD,eAAO,MAAM,kBAAkB,aAAgB,CAAC;AAEhD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQpH;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAG/F;AAED,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAcxD;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAI3D;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQ7D;AAED,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAIzD;AAED,wBAAsB,eAAe,CAAC,CAAC,EACrC,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC,EAC9C,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EACxC,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,KAAK,CAAA;CAAO,GACrC,OAAO,CAAC,CAAC,CAAC,CAoDZ"}

package/dist/lib/protocols/abort.js

@@ -45,7 +45,9 @@ function resolveClientRequestTimeoutMs(timeoutMs) {
   return resolveRequestTimeoutMs(timeoutMs);
 }
 function createAbortError(reason) {
-  if (reason instanceof Error && (reason.name === "AbortError" || reason.name === "TimeoutError")) return reason;
+  if (reason instanceof Error && (reason.name === "AbortError" || reason.name === "TimeoutError" || reason.name === "TaskTimeoutError")) {
+    return reason;
+  }
   const error = new Error(reason == null ? "The operation was aborted" : String(reason));
   error.name = "AbortError";
   if (reason instanceof Error) {
@@ -62,15 +64,15 @@ function createTimeoutError(timeoutMs) {
 function isAbortOrTimeoutError(error) {
   if (error == null || typeof error !== "object") return false;
   const value = error;
-  if (value.name === "AbortError" || value.name === "TimeoutError") return true;
-  return value.code === -32001 || value.code === "REQUEST_TIMEOUT";
+  if (value.name === "AbortError" || value.name === "TimeoutError" || value.name === "TaskTimeoutError") return true;
+  return value.code === -32001 || value.code === "REQUEST_TIMEOUT" || value.code === "TASK_TIMEOUT";
 }
 function throwIfAborted(signal) {
   if (signal?.aborted) {
     throw createAbortError(signal.reason);
   }
 }
-async function withAbortSignal(signals, timeoutMs, fn) {
+async function withAbortSignal(signals, timeoutMs, fn, options = {}) {
   const activeSignals = signals.filter((signal) => signal != null);
   for (const signal of activeSignals) {
     throwIfAborted(signal);
@@ -78,17 +80,6 @@ async function withAbortSignal(signals, timeoutMs, fn) {
   if (timeoutMs == null && activeSignals.length === 0) {
     return fn(void 0);
   }
-  if (timeoutMs == null && activeSignals.length === 1) {
-    const signal = activeSignals[0];
-    try {
-      return await fn(signal);
-    } catch (error) {
-      if (signal.aborted) {
-        throw createAbortError(signal.reason);
-      }
-      throw error;
-    }
-  }
   const controller = new AbortController();
   const abort = (reason) => {
     if (!controller.signal.aborted) {
@@ -101,12 +92,23 @@ async function withAbortSignal(signals, timeoutMs, fn) {
     return { signal, listener };
   });
   const timer = timeoutMs == null ? void 0 : setTimeout(() => {
-    abort(createTimeoutError(timeoutMs));
+    abort(options.timeoutError ?? createTimeoutError(timeoutMs));
   }, timeoutMs);
+  let rejectOnAbort;
+  const aborted = new Promise((_resolve, reject) => {
+    rejectOnAbort = () => reject(controller.signal.reason ?? createAbortError());
+    controller.signal.addEventListener("abort", rejectOnAbort, { once: true });
+  });
   try {
-    return await fn(controller.signal);
+    return await Promise.race([fn(controller.signal), aborted]);
+  } catch (error) {
+    if (controller.signal.aborted) {
+      throw controller.signal.reason ?? createAbortError();
+    }
+    throw error;
   } finally {
     if (timer) clearTimeout(timer);
+    if (rejectOnAbort) controller.signal.removeEventListener("abort", rejectOnAbort);
     for (const { signal, listener } of listeners) {
       signal.removeEventListener("abort", listener);
     }

package/dist/lib/protocols/abort.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/protocols/abort.ts"],"sourcesContent":["export const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;\nexport const MAX_TIMER_DELAY_MS = 2_147_483_647;\n\nexport function resolveRequestTimeoutMs(timeoutMs: number | undefined, defaultTimeoutMs?: number): number | undefined {\n  const resolved = timeoutMs ?? defaultTimeoutMs;\n  if (resolved == null) return undefined;\n  if (resolved === 0) return undefined;\n  if (!Number.isFinite(resolved) || resolved < 0 || resolved > MAX_TIMER_DELAY_MS) {\n    throw new RangeError(`requestTimeoutMs must be a finite non-negative number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  return resolved;\n}\n\nexport function resolveClientRequestTimeoutMs(timeoutMs: number | undefined): number | undefined {\n  if (timeoutMs === 0) return MAX_TIMER_DELAY_MS;\n  return resolveRequestTimeoutMs(timeoutMs);\n}\n\nexport function createAbortError(reason?: unknown): Error {\n  if (reason instanceof Error && (reason.name === 'AbortError' || reason.name === 'TimeoutError')) return reason;\n  const error = new Error(reason == null ? 'The operation was aborted' : String(reason));\n  error.name = 'AbortError';\n  if (reason instanceof Error) {\n    (error as Error & { cause?: unknown }).cause = reason;\n    error.message = reason.message;\n  }\n  return error;\n}\n\nexport function createTimeoutError(timeoutMs: number): Error {\n  const error = new Error(`Request timed out after ${timeoutMs} ms`);\n  error.name = 'TimeoutError';\n  return error;\n}\n\nexport function isAbortOrTimeoutError(error: unknown): boolean {\n  if (error == null || typeof error !== 'object') return false;\n  const value = error as { name?: unknown; code?: unknown };\n  if (value.name === 'AbortError' || value.name === 'TimeoutError') return true;\n  // MCP SDK v1 raises JSON-RPC RequestTimeout (-32001); the v2 packages use\n  // the typed SDK error code REQUEST_TIMEOUT. Both represent the same\n  // timeout/cancellation boundary and must bypass endpoint fallback.\n  return value.code === -32001 || value.code === 'REQUEST_TIMEOUT';\n}\n\nexport function throwIfAborted(signal?: AbortSignal): void {\n  if (signal?.aborted) {\n    throw createAbortError(signal.reason);\n  }\n}\n\nexport async function withAbortSignal<T>(\n  signals: Array<AbortSignal | null | undefined>,\n  timeoutMs: number | undefined,\n  fn: (signal?: AbortSignal) => Promise<T>\n): Promise<T> {\n  const activeSignals = signals.filter((signal): signal is AbortSignal => signal != null);\n  for (const signal of activeSignals) {\n    throwIfAborted(signal);\n  }\n\n  if (timeoutMs == null && activeSignals.length === 0) {\n    return fn(undefined);\n  }\n\n  if (timeoutMs == null && activeSignals.length === 1) {\n    const signal = activeSignals[0]!;\n    try {\n      return await fn(signal);\n    } catch (error) {\n      if (signal.aborted) {\n        throw createAbortError(signal.reason);\n      }\n      throw error;\n    }\n  }\n\n  const controller = new AbortController();\n  const abort = (reason?: unknown) => {\n    if (!controller.signal.aborted) {\n      controller.abort(reason);\n    }\n  };\n\n  const listeners = activeSignals.map(signal => {\n    const listener = () => abort(createAbortError(signal.reason));\n    signal.addEventListener('abort', listener, { once: true });\n    return { signal, listener };\n  });\n  const timer =\n    timeoutMs == null\n      ? undefined\n      : setTimeout(() => {\n          abort(createTimeoutError(timeoutMs));\n        }, timeoutMs);\n\n  try {\n    return await fn(controller.signal);\n  } finally {\n    if (timer) clearTimeout(timer);\n    for (const { signal, listener } of listeners) {\n      signal.removeEventListener('abort', listener);\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,6BAA6B;AACnC,MAAM,qBAAqB;AAE3B,SAAS,wBAAwB,WAA+B,kBAA+C;AACpH,QAAM,WAAW,aAAa;AAC9B,MAAI,YAAY,KAAM,QAAO;AAC7B,MAAI,aAAa,EAAG,QAAO;AAC3B,MAAI,CAAC,OAAO,SAAS,QAAQ,KAAK,WAAW,KAAK,WAAW,oBAAoB;AAC/E,UAAM,IAAI,WAAW,4DAA4D,kBAAkB,EAAE;AAAA,EACvG;AACA,SAAO;AACT;AAEO,SAAS,8BAA8B,WAAmD;AAC/F,MAAI,cAAc,EAAG,QAAO;AAC5B,SAAO,wBAAwB,SAAS;AAC1C;AAEO,SAAS,iBAAiB,QAAyB;AACxD,MAAI,kBAAkB,UAAU,OAAO,SAAS,gBAAgB,OAAO,SAAS,gBAAiB,QAAO;AACxG,QAAM,QAAQ,IAAI,MAAM,UAAU,OAAO,8BAA8B,OAAO,MAAM,CAAC;AACrF,QAAM,OAAO;AACb,MAAI,kBAAkB,OAAO;AAC3B,IAAC,MAAsC,QAAQ;AAC/C,UAAM,UAAU,OAAO;AAAA,EACzB;AACA,SAAO;AACT;AAEO,SAAS,mBAAmB,WAA0B;AAC3D,QAAM,QAAQ,IAAI,MAAM,2BAA2B,SAAS,KAAK;AACjE,QAAM,OAAO;AACb,SAAO;AACT;AAEO,SAAS,sBAAsB,OAAyB;AAC7D,MAAI,SAAS,QAAQ,OAAO,UAAU,SAAU,QAAO;AACvD,QAAM,QAAQ;AACd,MAAI,MAAM,SAAS,gBAAgB,MAAM,SAAS,eAAgB,QAAO;AAIzE,SAAO,MAAM,SAAS,UAAU,MAAM,SAAS;AACjD;AAEO,SAAS,eAAe,QAA4B;AACzD,MAAI,QAAQ,SAAS;AACnB,UAAM,iBAAiB,OAAO,MAAM;AAAA,EACtC;AACF;AAEA,eAAsB,gBACpB,SACA,WACA,IACY;AACZ,QAAM,gBAAgB,QAAQ,OAAO,CAAC,WAAkC,UAAU,IAAI;AACtF,aAAW,UAAU,eAAe;AAClC,mBAAe,MAAM;AAAA,EACvB;AAEA,MAAI,aAAa,QAAQ,cAAc,WAAW,GAAG;AACnD,WAAO,GAAG,MAAS;AAAA,EACrB;AAEA,MAAI,aAAa,QAAQ,cAAc,WAAW,GAAG;AACnD,UAAM,SAAS,cAAc,CAAC;AAC9B,QAAI;AACF,aAAO,MAAM,GAAG,MAAM;AAAA,IACxB,SAAS,OAAO;AACd,UAAI,OAAO,SAAS;AAClB,cAAM,iBAAiB,OAAO,MAAM;AAAA,MACtC;AACA,YAAM;AAAA,IACR;AAAA,EACF;AAEA,QAAM,aAAa,IAAI,gBAAgB;AACvC,QAAM,QAAQ,CAAC,WAAqB;AAClC,QAAI,CAAC,WAAW,OAAO,SAAS;AAC9B,iBAAW,MAAM,MAAM;AAAA,IACzB;AAAA,EACF;AAEA,QAAM,YAAY,cAAc,IAAI,YAAU;AAC5C,UAAM,WAAW,MAAM,MAAM,iBAAiB,OAAO,MAAM,CAAC;AAC5D,WAAO,iBAAiB,SAAS,UAAU,EAAE,MAAM,KAAK,CAAC;AACzD,WAAO,EAAE,QAAQ,SAAS;AAAA,EAC5B,CAAC;AACD,QAAM,QACJ,aAAa,OACT,SACA,WAAW,MAAM;AACf,UAAM,mBAAmB,SAAS,CAAC;AAAA,EACrC,GAAG,SAAS;AAElB,MAAI;AACF,WAAO,MAAM,GAAG,WAAW,MAAM;AAAA,EACnC,UAAE;AACA,QAAI,MAAO,cAAa,KAAK;AAC7B,eAAW,EAAE,QAAQ,SAAS,KAAK,WAAW;AAC5C,aAAO,oBAAoB,SAAS,QAAQ;AAAA,IAC9C;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../src/lib/protocols/abort.ts"],"sourcesContent":["export const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;\nexport const MAX_TIMER_DELAY_MS = 2_147_483_647;\n\nexport function resolveRequestTimeoutMs(timeoutMs: number | undefined, defaultTimeoutMs?: number): number | undefined {\n  const resolved = timeoutMs ?? defaultTimeoutMs;\n  if (resolved == null) return undefined;\n  if (resolved === 0) return undefined;\n  if (!Number.isFinite(resolved) || resolved < 0 || resolved > MAX_TIMER_DELAY_MS) {\n    throw new RangeError(`requestTimeoutMs must be a finite non-negative number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  return resolved;\n}\n\nexport function resolveClientRequestTimeoutMs(timeoutMs: number | undefined): number | undefined {\n  if (timeoutMs === 0) return MAX_TIMER_DELAY_MS;\n  return resolveRequestTimeoutMs(timeoutMs);\n}\n\nexport function createAbortError(reason?: unknown): Error {\n  if (\n    reason instanceof Error &&\n    (reason.name === 'AbortError' || reason.name === 'TimeoutError' || reason.name === 'TaskTimeoutError')\n  ) {\n    return reason;\n  }\n  const error = new Error(reason == null ? 'The operation was aborted' : String(reason));\n  error.name = 'AbortError';\n  if (reason instanceof Error) {\n    (error as Error & { cause?: unknown }).cause = reason;\n    error.message = reason.message;\n  }\n  return error;\n}\n\nexport function createTimeoutError(timeoutMs: number): Error {\n  const error = new Error(`Request timed out after ${timeoutMs} ms`);\n  error.name = 'TimeoutError';\n  return error;\n}\n\nexport function isAbortOrTimeoutError(error: unknown): boolean {\n  if (error == null || typeof error !== 'object') return false;\n  const value = error as { name?: unknown; code?: unknown };\n  if (value.name === 'AbortError' || value.name === 'TimeoutError' || value.name === 'TaskTimeoutError') return true;\n  // MCP SDK v1 raises JSON-RPC RequestTimeout (-32001); the v2 packages use\n  // the typed SDK error code REQUEST_TIMEOUT. Both represent the same\n  // timeout/cancellation boundary and must bypass endpoint fallback.\n  return value.code === -32001 || value.code === 'REQUEST_TIMEOUT' || value.code === 'TASK_TIMEOUT';\n}\n\nexport function throwIfAborted(signal?: AbortSignal): void {\n  if (signal?.aborted) {\n    throw createAbortError(signal.reason);\n  }\n}\n\nexport async function withAbortSignal<T>(\n  signals: Array<AbortSignal | null | undefined>,\n  timeoutMs: number | undefined,\n  fn: (signal?: AbortSignal) => Promise<T>,\n  options: { timeoutError?: Error } = {}\n): Promise<T> {\n  const activeSignals = signals.filter((signal): signal is AbortSignal => signal != null);\n  for (const signal of activeSignals) {\n    throwIfAborted(signal);\n  }\n\n  if (timeoutMs == null && activeSignals.length === 0) {\n    return fn(undefined);\n  }\n\n  const controller = new AbortController();\n  const abort = (reason?: unknown) => {\n    if (!controller.signal.aborted) {\n      controller.abort(reason);\n    }\n  };\n\n  const listeners = activeSignals.map(signal => {\n    const listener = () => abort(createAbortError(signal.reason));\n    signal.addEventListener('abort', listener, { once: true });\n    return { signal, listener };\n  });\n  const timer =\n    timeoutMs == null\n      ? undefined\n      : setTimeout(() => {\n          abort(options.timeoutError ?? createTimeoutError(timeoutMs));\n        }, timeoutMs);\n\n  let rejectOnAbort: ((reason: unknown) => void) | undefined;\n  const aborted = new Promise<never>((_resolve, reject) => {\n    rejectOnAbort = () => reject(controller.signal.reason ?? createAbortError());\n    controller.signal.addEventListener('abort', rejectOnAbort, { once: true });\n  });\n\n  try {\n    // The signal reclaims transports that honor cancellation. The race also\n    // guarantees the caller-facing deadline when an intermediate callback or\n    // protocol implementation is slow to observe that signal.\n    return await Promise.race([fn(controller.signal), aborted]);\n  } catch (error) {\n    if (controller.signal.aborted) {\n      throw controller.signal.reason ?? createAbortError();\n    }\n    throw error;\n  } finally {\n    if (timer) clearTimeout(timer);\n    if (rejectOnAbort) controller.signal.removeEventListener('abort', rejectOnAbort);\n    for (const { signal, listener } of listeners) {\n      signal.removeEventListener('abort', listener);\n    }\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/lib/protocols/abort.mjs

@@ -19,7 +19,9 @@ function resolveClientRequestTimeoutMs(timeoutMs) {
   return resolveRequestTimeoutMs(timeoutMs);
 }
 function createAbortError(reason) {
-  if (reason instanceof Error && (reason.name === "AbortError" || reason.name === "TimeoutError")) return reason;
+  if (reason instanceof Error && (reason.name === "AbortError" || reason.name === "TimeoutError" || reason.name === "TaskTimeoutError")) {
+    return reason;
+  }
   const error = new Error(reason == null ? "The operation was aborted" : String(reason));
   error.name = "AbortError";
   if (reason instanceof Error) {
@@ -36,15 +38,15 @@ function createTimeoutError(timeoutMs) {
 function isAbortOrTimeoutError(error) {
   if (error == null || typeof error !== "object") return false;
   const value = error;
-  if (value.name === "AbortError" || value.name === "TimeoutError") return true;
-  return value.code === -32001 || value.code === "REQUEST_TIMEOUT";
+  if (value.name === "AbortError" || value.name === "TimeoutError" || value.name === "TaskTimeoutError") return true;
+  return value.code === -32001 || value.code === "REQUEST_TIMEOUT" || value.code === "TASK_TIMEOUT";
 }
 function throwIfAborted(signal) {
   if (signal?.aborted) {
     throw createAbortError(signal.reason);
   }
 }
-async function withAbortSignal(signals, timeoutMs, fn) {
+async function withAbortSignal(signals, timeoutMs, fn, options = {}) {
   const activeSignals = signals.filter((signal) => signal != null);
   for (const signal of activeSignals) {
     throwIfAborted(signal);
@@ -52,17 +54,6 @@ async function withAbortSignal(signals, timeoutMs, fn) {
   if (timeoutMs == null && activeSignals.length === 0) {
     return fn(void 0);
   }
-  if (timeoutMs == null && activeSignals.length === 1) {
-    const signal = activeSignals[0];
-    try {
-      return await fn(signal);
-    } catch (error) {
-      if (signal.aborted) {
-        throw createAbortError(signal.reason);
-      }
-      throw error;
-    }
-  }
   const controller = new AbortController();
   const abort = (reason) => {
     if (!controller.signal.aborted) {
@@ -75,12 +66,23 @@ async function withAbortSignal(signals, timeoutMs, fn) {
     return { signal, listener };
   });
   const timer = timeoutMs == null ? void 0 : setTimeout(() => {
-    abort(createTimeoutError(timeoutMs));
+    abort(options.timeoutError ?? createTimeoutError(timeoutMs));
   }, timeoutMs);
+  let rejectOnAbort;
+  const aborted = new Promise((_resolve, reject) => {
+    rejectOnAbort = () => reject(controller.signal.reason ?? createAbortError());
+    controller.signal.addEventListener("abort", rejectOnAbort, { once: true });
+  });
   try {
-    return await fn(controller.signal);
+    return await Promise.race([fn(controller.signal), aborted]);
+  } catch (error) {
+    if (controller.signal.aborted) {
+      throw controller.signal.reason ?? createAbortError();
+    }
+    throw error;
   } finally {
     if (timer) clearTimeout(timer);
+    if (rejectOnAbort) controller.signal.removeEventListener("abort", rejectOnAbort);
     for (const { signal, listener } of listeners) {
       signal.removeEventListener("abort", listener);
     }

package/dist/lib/protocols/abort.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/protocols/abort.ts"],"sourcesContent":["import { fileURLToPath as __adcpFileURLToPath } from 'node:url';\nimport { dirname as __adcpDirname } from 'node:path';\nimport { createRequire as __adcpCreateRequire } from 'node:module';\nconst __dirname = __adcpDirname(__adcpFileURLToPath(import.meta.url));\nconst require = __adcpCreateRequire(import.meta.url);\nexport const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;\nexport const MAX_TIMER_DELAY_MS = 2_147_483_647;\n\nexport function resolveRequestTimeoutMs(timeoutMs: number | undefined, defaultTimeoutMs?: number): number | undefined {\n  const resolved = timeoutMs ?? defaultTimeoutMs;\n  if (resolved == null) return undefined;\n  if (resolved === 0) return undefined;\n  if (!Number.isFinite(resolved) || resolved < 0 || resolved > MAX_TIMER_DELAY_MS) {\n    throw new RangeError(`requestTimeoutMs must be a finite non-negative number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  return resolved;\n}\n\nexport function resolveClientRequestTimeoutMs(timeoutMs: number | undefined): number | undefined {\n  if (timeoutMs === 0) return MAX_TIMER_DELAY_MS;\n  return resolveRequestTimeoutMs(timeoutMs);\n}\n\nexport function createAbortError(reason?: unknown): Error {\n  if (reason instanceof Error && (reason.name === 'AbortError' || reason.name === 'TimeoutError')) return reason;\n  const error = new Error(reason == null ? 'The operation was aborted' : String(reason));\n  error.name = 'AbortError';\n  if (reason instanceof Error) {\n    (error as Error & { cause?: unknown }).cause = reason;\n    error.message = reason.message;\n  }\n  return error;\n}\n\nexport function createTimeoutError(timeoutMs: number): Error {\n  const error = new Error(`Request timed out after ${timeoutMs} ms`);\n  error.name = 'TimeoutError';\n  return error;\n}\n\nexport function isAbortOrTimeoutError(error: unknown): boolean {\n  if (error == null || typeof error !== 'object') return false;\n  const value = error as { name?: unknown; code?: unknown };\n  if (value.name === 'AbortError' || value.name === 'TimeoutError') return true;\n  // MCP SDK v1 raises JSON-RPC RequestTimeout (-32001); the v2 packages use\n  // the typed SDK error code REQUEST_TIMEOUT. Both represent the same\n  // timeout/cancellation boundary and must bypass endpoint fallback.\n  return value.code === -32001 || value.code === 'REQUEST_TIMEOUT';\n}\n\nexport function throwIfAborted(signal?: AbortSignal): void {\n  if (signal?.aborted) {\n    throw createAbortError(signal.reason);\n  }\n}\n\nexport async function withAbortSignal<T>(\n  signals: Array<AbortSignal | null | undefined>,\n  timeoutMs: number | undefined,\n  fn: (signal?: AbortSignal) => Promise<T>\n): Promise<T> {\n  const activeSignals = signals.filter((signal): signal is AbortSignal => signal != null);\n  for (const signal of activeSignals) {\n    throwIfAborted(signal);\n  }\n\n  if (timeoutMs == null && activeSignals.length === 0) {\n    return fn(undefined);\n  }\n\n  if (timeoutMs == null && activeSignals.length === 1) {\n    const signal = activeSignals[0]!;\n    try {\n      return await fn(signal);\n    } catch (error) {\n      if (signal.aborted) {\n        throw createAbortError(signal.reason);\n      }\n      throw error;\n    }\n  }\n\n  const controller = new AbortController();\n  const abort = (reason?: unknown) => {\n    if (!controller.signal.aborted) {\n      controller.abort(reason);\n    }\n  };\n\n  const listeners = activeSignals.map(signal => {\n    const listener = () => abort(createAbortError(signal.reason));\n    signal.addEventListener('abort', listener, { once: true });\n    return { signal, listener };\n  });\n  const timer =\n    timeoutMs == null\n      ? undefined\n      : setTimeout(() => {\n          abort(createTimeoutError(timeoutMs));\n        }, timeoutMs);\n\n  try {\n    return await fn(controller.signal);\n  } finally {\n    if (timer) clearTimeout(timer);\n    for (const { signal, listener } of listeners) {\n      signal.removeEventListener('abort', listener);\n    }\n  }\n}\n"],"mappings":"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","names":["require"]}
+{"version":3,"sources":["../../../src/lib/protocols/abort.ts"],"sourcesContent":["import { fileURLToPath as __adcpFileURLToPath } from 'node:url';\nimport { dirname as __adcpDirname } from 'node:path';\nimport { createRequire as __adcpCreateRequire } from 'node:module';\nconst __dirname = __adcpDirname(__adcpFileURLToPath(import.meta.url));\nconst require = __adcpCreateRequire(import.meta.url);\nexport const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;\nexport const MAX_TIMER_DELAY_MS = 2_147_483_647;\n\nexport function resolveRequestTimeoutMs(timeoutMs: number | undefined, defaultTimeoutMs?: number): number | undefined {\n  const resolved = timeoutMs ?? defaultTimeoutMs;\n  if (resolved == null) return undefined;\n  if (resolved === 0) return undefined;\n  if (!Number.isFinite(resolved) || resolved < 0 || resolved > MAX_TIMER_DELAY_MS) {\n    throw new RangeError(`requestTimeoutMs must be a finite non-negative number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  return resolved;\n}\n\nexport function resolveClientRequestTimeoutMs(timeoutMs: number | undefined): number | undefined {\n  if (timeoutMs === 0) return MAX_TIMER_DELAY_MS;\n  return resolveRequestTimeoutMs(timeoutMs);\n}\n\nexport function createAbortError(reason?: unknown): Error {\n  if (\n    reason instanceof Error &&\n    (reason.name === 'AbortError' || reason.name === 'TimeoutError' || reason.name === 'TaskTimeoutError')\n  ) {\n    return reason;\n  }\n  const error = new Error(reason == null ? 'The operation was aborted' : String(reason));\n  error.name = 'AbortError';\n  if (reason instanceof Error) {\n    (error as Error & { cause?: unknown }).cause = reason;\n    error.message = reason.message;\n  }\n  return error;\n}\n\nexport function createTimeoutError(timeoutMs: number): Error {\n  const error = new Error(`Request timed out after ${timeoutMs} ms`);\n  error.name = 'TimeoutError';\n  return error;\n}\n\nexport function isAbortOrTimeoutError(error: unknown): boolean {\n  if (error == null || typeof error !== 'object') return false;\n  const value = error as { name?: unknown; code?: unknown };\n  if (value.name === 'AbortError' || value.name === 'TimeoutError' || value.name === 'TaskTimeoutError') return true;\n  // MCP SDK v1 raises JSON-RPC RequestTimeout (-32001); the v2 packages use\n  // the typed SDK error code REQUEST_TIMEOUT. Both represent the same\n  // timeout/cancellation boundary and must bypass endpoint fallback.\n  return value.code === -32001 || value.code === 'REQUEST_TIMEOUT' || value.code === 'TASK_TIMEOUT';\n}\n\nexport function throwIfAborted(signal?: AbortSignal): void {\n  if (signal?.aborted) {\n    throw createAbortError(signal.reason);\n  }\n}\n\nexport async function withAbortSignal<T>(\n  signals: Array<AbortSignal | null | undefined>,\n  timeoutMs: number | undefined,\n  fn: (signal?: AbortSignal) => Promise<T>,\n  options: { timeoutError?: Error } = {}\n): Promise<T> {\n  const activeSignals = signals.filter((signal): signal is AbortSignal => signal != null);\n  for (const signal of activeSignals) {\n    throwIfAborted(signal);\n  }\n\n  if (timeoutMs == null && activeSignals.length === 0) {\n    return fn(undefined);\n  }\n\n  const controller = new AbortController();\n  const abort = (reason?: unknown) => {\n    if (!controller.signal.aborted) {\n      controller.abort(reason);\n    }\n  };\n\n  const listeners = activeSignals.map(signal => {\n    const listener = () => abort(createAbortError(signal.reason));\n    signal.addEventListener('abort', listener, { once: true });\n    return { signal, listener };\n  });\n  const timer =\n    timeoutMs == null\n      ? undefined\n      : setTimeout(() => {\n          abort(options.timeoutError ?? createTimeoutError(timeoutMs));\n        }, timeoutMs);\n\n  let rejectOnAbort: ((reason: unknown) => void) | undefined;\n  const aborted = new Promise<never>((_resolve, reject) => {\n    rejectOnAbort = () => reject(controller.signal.reason ?? createAbortError());\n    controller.signal.addEventListener('abort', rejectOnAbort, { once: true });\n  });\n\n  try {\n    // The signal reclaims transports that honor cancellation. The race also\n    // guarantees the caller-facing deadline when an intermediate callback or\n    // protocol implementation is slow to observe that signal.\n    return await Promise.race([fn(controller.signal), aborted]);\n  } catch (error) {\n    if (controller.signal.aborted) {\n      throw controller.signal.reason ?? createAbortError();\n    }\n    throw error;\n  } finally {\n    if (timer) clearTimeout(timer);\n    if (rejectOnAbort) controller.signal.removeEventListener('abort', rejectOnAbort);\n    for (const { signal, listener } of listeners) {\n      signal.removeEventListener('abort', listener);\n    }\n  }\n}\n"],"mappings":"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","names":["require"]}

package/dist/lib/protocols/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/protocols/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/protocols/index.js

@@ -186,7 +186,8 @@ class ProtocolClient {
               await (0, import_oauth.ensureClientCredentialsTokens)(agent, {
                 storage: ccStorage,
                 allowPrivateIp,
-                fetch: transport?.fetchFn
+                fetch: transport?.fetchFn,
+                signal
               });
             }
             const authToken = (0, import_auth.getAuthToken)(agent);
@@ -252,7 +253,7 @@ class ProtocolClient {
                     fetchFn: transport?.fetchFn
                   });
                 } catch (err) {
-                  await rethrowAsNeedsAuthorization(err, agent.agent_uri, transport?.fetchFn);
+                  await rethrowAsNeedsAuthorization(err, agent.agent_uri, transport?.fetchFn, signal);
                   throw err;
                 }
               }
@@ -281,7 +282,8 @@ class ProtocolClient {
                     storage: ccStorage,
                     force: true,
                     allowPrivateIp,
-                    fetch: transport?.fetchFn
+                    fetch: transport?.fetchFn,
+                    signal
                   });
                   const retryAuthToken = agent.oauth_tokens?.access_token ?? authToken;
                   try {
@@ -302,11 +304,11 @@ class ProtocolClient {
                       }
                     );
                   } catch (retryErr) {
-                    await rethrowAsNeedsAuthorization(retryErr, agent.agent_uri, transport?.fetchFn);
+                    await rethrowAsNeedsAuthorization(retryErr, agent.agent_uri, transport?.fetchFn, signal);
                     throw retryErr;
                   }
                 }
-                await rethrowAsNeedsAuthorization(err, agent.agent_uri, transport?.fetchFn);
+                await rethrowAsNeedsAuthorization(err, agent.agent_uri, transport?.fetchFn, signal);
                 throw err;
               }
             } else if (agent.protocol === "a2a") {
@@ -333,7 +335,8 @@ class ProtocolClient {
                     storage: ccStorage,
                     force: true,
                     allowPrivateIp,
-                    fetch: transport?.fetchFn
+                    fetch: transport?.fetchFn,
+                    signal
                   });
                   const retryAuthToken = agent.oauth_tokens?.access_token ?? authToken;
                   try {
@@ -352,11 +355,11 @@ class ProtocolClient {
                       transport?.fetchFn
                     );
                   } catch (retryErr) {
-                    await rethrowAsNeedsAuthorization(retryErr, agent.agent_uri, transport?.fetchFn);
+                    await rethrowAsNeedsAuthorization(retryErr, agent.agent_uri, transport?.fetchFn, signal);
                     throw retryErr;
                   }
                 }
-                await rethrowAsNeedsAuthorization(err, agent.agent_uri, transport?.fetchFn);
+                await rethrowAsNeedsAuthorization(err, agent.agent_uri, transport?.fetchFn, signal);
                 throw err;
               }
             } else {
@@ -368,11 +371,11 @@ class ProtocolClient {
     );
   }
 }
-async function rethrowAsNeedsAuthorization(err, agentUrl, fetchFn) {
+async function rethrowAsNeedsAuthorization(err, agentUrl, fetchFn, signal) {
   if (err instanceof import_oauth.NeedsAuthorizationError) throw err;
   if (!(0, import_errors.is401Error)(err)) return;
   const allowPrivateIp = (0, import_net.isLikelyPrivateUrl)(agentUrl);
-  const requirements = await (0, import_oauth.discoverAuthorizationRequirements)(agentUrl, { allowPrivateIp, fetchFn });
+  const requirements = await (0, import_oauth.discoverAuthorizationRequirements)(agentUrl, { allowPrivateIp, fetchFn, signal });
   if (requirements) {
     throw new import_oauth.NeedsAuthorizationError(requirements);
   }