@adcp/sdk 13.0.4 → 13.1.1

package/dist/lib/protocols/rawResponseCapture.js

@@ -25,12 +25,29 @@ __export(rawResponseCapture_exports, {
 });
 module.exports = __toCommonJS(rawResponseCapture_exports);
 var import_global_async_local_storage = require('../utils/global-async-local-storage.js');
+var import_abort = require('./abort.js');
 const DEFAULT_MAX_BODY_BYTES = 1048576;
+const DEFAULT_REQUEST_METADATA_TIMEOUT_MS = 1e3;
+const DEFAULT_RESPONSE_BODY_TIMEOUT_MS = 1e4;
 const rawResponseCaptureStorage = (0, import_global_async_local_storage.globalAsyncLocalStorage)("rawResponseCapture");
 async function withRawResponseCapture(fn, options = {}) {
+  const maxBodyBytes = options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;
+  if (!Number.isSafeInteger(maxBodyBytes) || maxBodyBytes <= 0) {
+    throw new RangeError("maxBodyBytes must be a finite safe positive integer");
+  }
+  const requestMetadataTimeoutMs = options.requestMetadataTimeoutMs ?? DEFAULT_REQUEST_METADATA_TIMEOUT_MS;
+  if (!Number.isFinite(requestMetadataTimeoutMs) || requestMetadataTimeoutMs <= 0 || requestMetadataTimeoutMs > import_abort.MAX_TIMER_DELAY_MS) {
+    throw new RangeError(`requestMetadataTimeoutMs must be a finite positive number <= ${import_abort.MAX_TIMER_DELAY_MS}`);
+  }
+  const responseBodyTimeoutMs = options.responseBodyTimeoutMs ?? DEFAULT_RESPONSE_BODY_TIMEOUT_MS;
+  if (!Number.isFinite(responseBodyTimeoutMs) || responseBodyTimeoutMs <= 0 || responseBodyTimeoutMs > import_abort.MAX_TIMER_DELAY_MS) {
+    throw new RangeError(`responseBodyTimeoutMs must be a finite positive number <= ${import_abort.MAX_TIMER_DELAY_MS}`);
+  }
   const slot = {
     captures: [],
-    maxBodyBytes: options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES
+    maxBodyBytes,
+    requestMetadataTimeoutMs,
+    responseBodyTimeoutMs
   };
   try {
     const result = await rawResponseCaptureStorage.run(slot, fn);
@@ -71,11 +88,22 @@ function wrapFetchWithCapture(upstream) {
     if (!slot) return upstream(input, init);
     const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
     const method = (init?.method ?? (input instanceof Request ? input.method : "GET")).toUpperCase();
+    const requestBody = init?.body !== void 0 ? init.body : input instanceof Request ? await readRequestBodyFromClone(
+      input,
+      slot.maxBodyBytes,
+      init?.signal ?? input.signal,
+      slot.requestMetadataTimeoutMs
+    ) : void 0;
+    const requestMetadata = extractSafeRequestMetadata(requestBody, slot.maxBodyBytes);
     const startedAt = Date.now();
     const response = await upstream(input, init);
     const latencyMs = Date.now() - startedAt;
     const cloneForRead = response.clone();
-    const { body, bodyTruncated } = await readBodyBounded(cloneForRead, slot.maxBodyBytes);
+    const { body, bodyTruncated, bodyCaptureError } = await readBodyBounded(
+      cloneForRead,
+      slot.maxBodyBytes,
+      slot.responseBodyTimeoutMs
+    );
     const headers = {};
     response.headers.forEach((value, key) => {
       const lower = key.toLowerCase();
@@ -84,29 +112,144 @@ function wrapFetchWithCapture(upstream) {
     slot.captures.push({
       url,
       method,
+      ...requestMetadata,
       status: response.status,
       headers,
       body: redactBearerInBody(body),
       latencyMs,
       timestamp: new Date(startedAt).toISOString(),
-      bodyTruncated
+      bodyTruncated,
+      ...bodyCaptureError !== void 0 && { bodyCaptureError }
     });
     return response;
   };
   return wrapped;
 }
+async function readRequestBodyFromClone(request, maxBodyBytes, signal, timeoutMs) {
+  if (request.bodyUsed || request.method === "GET" || request.method === "HEAD") return void 0;
+  try {
+    const body = request.clone().body;
+    if (!body) return "";
+    const reader = body.getReader();
+    return await (0, import_abort.withAbortSignal)([signal], timeoutMs, async (captureSignal) => {
+      const cancel = () => void reader.cancel(captureSignal?.reason).catch(() => void 0);
+      captureSignal?.addEventListener("abort", cancel, { once: true });
+      try {
+        const chunks = [];
+        let length = 0;
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          length += value.byteLength;
+          if (length > maxBodyBytes) {
+            void reader.cancel().catch(() => void 0);
+            return void 0;
+          }
+          chunks.push(value);
+        }
+        const bytes = new Uint8Array(length);
+        let offset = 0;
+        for (const chunk of chunks) {
+          bytes.set(chunk, offset);
+          offset += chunk.byteLength;
+        }
+        return new TextDecoder().decode(bytes);
+      } finally {
+        captureSignal?.removeEventListener("abort", cancel);
+      }
+    });
+  } catch {
+    return void 0;
+  }
+}
+function extractSafeRequestMetadata(body, maxBodyBytes) {
+  if (typeof body !== "string" || body.length > maxBodyBytes) return {};
+  let parsed;
+  try {
+    parsed = JSON.parse(body);
+  } catch {
+    return {};
+  }
+  if (parsed == null || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+  const envelope = parsed;
+  const requestJsonRpcMethod = typeof envelope.method === "string" ? envelope.method : void 0;
+  let requestAdcpSkill;
+  const params = envelope.params != null && typeof envelope.params === "object" && !Array.isArray(envelope.params) ? envelope.params : void 0;
+  const message = params?.message != null && typeof params.message === "object" && !Array.isArray(params.message) ? params.message : void 0;
+  if (Array.isArray(message?.parts)) {
+    for (const part of message.parts) {
+      if (part == null || typeof part !== "object" || Array.isArray(part)) continue;
+      const data = part.data;
+      const content = part.content;
+      const nativeData = content != null && typeof content === "object" && !Array.isArray(content) ? content.data : void 0;
+      const value = data ?? nativeData;
+      if (value == null || typeof value !== "object" || Array.isArray(value)) continue;
+      const skill = value.skill;
+      if (typeof skill === "string") {
+        requestAdcpSkill = skill;
+        break;
+      }
+    }
+  }
+  return {
+    ...requestJsonRpcMethod !== void 0 && { requestJsonRpcMethod },
+    ...requestAdcpSkill !== void 0 && { requestAdcpSkill }
+  };
+}
 function redactBearerInBody(body) {
   return body.replace(/Bearer\s+[A-Za-z0-9._~+/=-]+/gi, "Bearer [redacted]");
 }
-async function readBodyBounded(response, maxBodyBytes) {
-  let text;
+async function readBodyBounded(response, maxBodyBytes, timeoutMs) {
+  if (!response.body) return { body: "", bodyTruncated: false };
+  const reader = response.body.getReader();
+  const retained = [];
+  let retainedBytes = 0;
+  const decodeRetained = () => {
+    const bytes = new Uint8Array(retainedBytes);
+    let offset = 0;
+    for (const chunk of retained) {
+      bytes.set(chunk, offset);
+      offset += chunk.byteLength;
+    }
+    return new TextDecoder().decode(bytes);
+  };
   try {
-    text = await response.text();
-  } catch {
-    return { body: "", bodyTruncated: false };
+    return await (0, import_abort.withAbortSignal)([], timeoutMs, async (signal) => {
+      const cancel = () => void reader.cancel(signal?.reason).catch(() => void 0);
+      signal?.addEventListener("abort", cancel, { once: true });
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            return { body: decodeRetained(), bodyTruncated: false };
+          }
+          const available = maxBodyBytes - retainedBytes;
+          const copyBytes = Math.min(available, value.byteLength);
+          if (copyBytes > 0) {
+            retained.push(value.slice(0, copyBytes));
+            retainedBytes += copyBytes;
+          }
+          if (copyBytes < value.byteLength) {
+            void reader.cancel().catch(() => void 0);
+            return {
+              body: decodeRetained(),
+              bodyTruncated: true,
+              bodyCaptureError: `Raw response capture exceeded maxBodyBytes (${maxBodyBytes})`
+            };
+          }
+        }
+      } finally {
+        signal?.removeEventListener("abort", cancel);
+      }
+    });
+  } catch (error) {
+    const timedOut = error instanceof Error && error.name === "TimeoutError";
+    return {
+      body: decodeRetained(),
+      bodyTruncated: true,
+      bodyCaptureError: timedOut ? `Raw response capture timed out after ${timeoutMs} ms before the response body completed` : "Raw response capture ended before the response body completed"
+    };
   }
-  if (text.length <= maxBodyBytes) return { body: text, bodyTruncated: false };
-  return { body: text.slice(0, maxBodyBytes), bodyTruncated: true };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/protocols/rawResponseCapture.ts"],"sourcesContent":["// Raw HTTP response capture for conformance probing.\n//\n// Scoped via AsyncLocalStorage so MCP + A2A protocol adapters can record\n// status, headers, body, and latency without threading options through\n// every call site. When the capture slot is absent, the fetch wrapper is a\n// pass-through — production clients pay only one ALS lookup per request.\n//\n// Consumers call `withRawResponseCapture(fn)` and receive captures for\n// every HTTP request that happened inside `fn`. The uniform-error invariant\n// uses the captures to compare two probes byte-for-byte.\n\nimport { globalAsyncLocalStorage } from '../utils/global-async-local-storage';\n\nexport interface RawHttpCapture {\n  url: string;\n  method: string;\n  status: number;\n  headers: Record<string, string>;\n  body: string;\n  latencyMs: number;\n  timestamp: string;\n  /** True when body capture hit `maxBodyBytes` and was truncated. */\n  bodyTruncated: boolean;\n}\n\ninterface CaptureSlot {\n  captures: RawHttpCapture[];\n  maxBodyBytes: number;\n}\n\n// Counted as UTF-16 code units (string.length), not UTF-8 bytes. Close\n// enough for ASCII-dominant response payloads and fine as a safety cap\n// against accidentally retaining huge responses.\nconst DEFAULT_MAX_BODY_BYTES = 1_048_576;\n\nexport const rawResponseCaptureStorage = globalAsyncLocalStorage<CaptureSlot>('rawResponseCapture');\n\n/**\n * Run `fn` with a raw-response capture slot active. Every HTTP request made\n * through the wrapped fetch inside `fn` is recorded.\n *\n * When `fn` rejects, the rejection propagates and the partial captures\n * are attached to the thrown error as `error.captures`. Callers that\n * need to inspect partial captures on failure can read that property;\n * callers that don't can ignore it. This lets storyboard validators\n * surface \"the SDK threw before the wire shape parsed\" diagnostics\n * with the actual bytes that arrived before the throw.\n */\nexport async function withRawResponseCapture<T>(\n  fn: () => Promise<T>,\n  options: { maxBodyBytes?: number } = {}\n): Promise<{ result: T; captures: RawHttpCapture[] }> {\n  const slot: CaptureSlot = {\n    captures: [],\n    maxBodyBytes: options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES,\n  };\n  try {\n    const result = await rawResponseCaptureStorage.run(slot, fn);\n    return { result, captures: slot.captures };\n  } catch (err) {\n    if (err && typeof err === 'object') {\n      try {\n        Object.defineProperty(err, 'captures', {\n          value: slot.captures,\n          enumerable: false,\n          configurable: true,\n          writable: true,\n        });\n      } catch {\n        // Frozen / sealed errors won't accept the property — drop the\n        // captures rather than crash on a defineProperty TypeError.\n      }\n    }\n    throw err;\n  }\n}\n\n/** Type guard for errors carrying partial captures from `withRawResponseCapture`. */\nexport function getCapturesFromError(err: unknown): RawHttpCapture[] | undefined {\n  if (err && typeof err === 'object' && Array.isArray((err as { captures?: unknown }).captures)) {\n    return (err as { captures: RawHttpCapture[] }).captures;\n  }\n  return undefined;\n}\n\n/**\n * Credential-bearing response header names. A misbehaving proxy that\n * echoes caller-supplied auth headers back on the response would\n * otherwise land bearer tokens in the capture — and downstream, in\n * `UniformErrorReport.probes.*.headers` which is written to disk /\n * pasted into tickets. Redact verbatim at capture time.\n */\nconst REDACTED_HEADER_NAMES: ReadonlySet<string> = new Set([\n  'authorization',\n  'proxy-authorization',\n  'cookie',\n  'set-cookie',\n  'x-adcp-auth',\n  'x-api-key',\n]);\n\nconst REDACTED_PLACEHOLDER = '[redacted]';\n\n/**\n * Wrap a fetch implementation so it records raw responses when a capture\n * slot is active. Safe to install unconditionally — pass-through when no\n * slot is set.\n */\nexport function wrapFetchWithCapture(upstream: typeof fetch): typeof fetch {\n  const wrapped: typeof fetch = async (input, init) => {\n    const slot = rawResponseCaptureStorage.getStore();\n    if (!slot) return upstream(input, init);\n\n    const url = typeof input === 'string' ? input : input instanceof URL ? input.toString() : input.url;\n    const method = (init?.method ?? (input instanceof Request ? input.method : 'GET')).toUpperCase();\n    const startedAt = Date.now();\n    const response = await upstream(input, init);\n    const latencyMs = Date.now() - startedAt;\n\n    // Clone before reading so the SDK still gets a consumable body.\n    const cloneForRead = response.clone();\n    const { body, bodyTruncated } = await readBodyBounded(cloneForRead, slot.maxBodyBytes);\n\n    const headers: Record<string, string> = {};\n    response.headers.forEach((value, key) => {\n      const lower = key.toLowerCase();\n      headers[key] = REDACTED_HEADER_NAMES.has(lower) ? REDACTED_PLACEHOLDER : value;\n    });\n\n    slot.captures.push({\n      url,\n      method,\n      status: response.status,\n      headers,\n      body: redactBearerInBody(body),\n      latencyMs,\n      timestamp: new Date(startedAt).toISOString(),\n      bodyTruncated,\n    });\n\n    return response;\n  };\n  return wrapped;\n}\n\n/**\n * Response bodies sometimes echo request headers — e.g., a misbehaving\n * \"debug\" handler that logs the Authorization header into its error\n * payload, or a 500 HTML page that templates the request dump. Strip\n * bearer-shaped tokens so they don't persist into captured output.\n *\n * Conservative: only masks the TOKEN portion of a `Bearer <token>` span\n * (case-insensitive). Doesn't try to detect arbitrary high-entropy\n * strings — false positives on those would damage the comparator's\n * byte-equivalence check.\n */\nfunction redactBearerInBody(body: string): string {\n  return body.replace(/Bearer\\s+[A-Za-z0-9._~+/=-]+/gi, 'Bearer [redacted]');\n}\n\nasync function readBodyBounded(\n  response: Response,\n  maxBodyBytes: number\n): Promise<{ body: string; bodyTruncated: boolean }> {\n  let text: string;\n  try {\n    text = await response.text();\n  } catch {\n    return { body: '', bodyTruncated: false };\n  }\n  if (text.length <= maxBodyBytes) return { body: text, bodyTruncated: false };\n  return { body: text.slice(0, maxBodyBytes), bodyTruncated: true };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAWA,wCAAwC;AAsBxC,MAAM,yBAAyB;AAExB,MAAM,gCAA4B,2DAAqC,oBAAoB;AAalG,eAAsB,uBACpB,IACA,UAAqC,CAAC,GACc;AACpD,QAAM,OAAoB;AAAA,IACxB,UAAU,CAAC;AAAA,IACX,cAAc,QAAQ,gBAAgB;AAAA,EACxC;AACA,MAAI;AACF,UAAM,SAAS,MAAM,0BAA0B,IAAI,MAAM,EAAE;AAC3D,WAAO,EAAE,QAAQ,UAAU,KAAK,SAAS;AAAA,EAC3C,SAAS,KAAK;AACZ,QAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,UAAI;AACF,eAAO,eAAe,KAAK,YAAY;AAAA,UACrC,OAAO,KAAK;AAAA,UACZ,YAAY;AAAA,UACZ,cAAc;AAAA,UACd,UAAU;AAAA,QACZ,CAAC;AAAA,MACH,QAAQ;AAAA,MAGR;AAAA,IACF;AACA,UAAM;AAAA,EACR;AACF;AAGO,SAAS,qBAAqB,KAA4C;AAC/E,MAAI,OAAO,OAAO,QAAQ,YAAY,MAAM,QAAS,IAA+B,QAAQ,GAAG;AAC7F,WAAQ,IAAuC;AAAA,EACjD;AACA,SAAO;AACT;AASA,MAAM,wBAA6C,oBAAI,IAAI;AAAA,EACzD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAED,MAAM,uBAAuB;AAOtB,SAAS,qBAAqB,UAAsC;AACzE,QAAM,UAAwB,OAAO,OAAO,SAAS;AACnD,UAAM,OAAO,0BAA0B,SAAS;AAChD,QAAI,CAAC,KAAM,QAAO,SAAS,OAAO,IAAI;AAEtC,UAAM,MAAM,OAAO,UAAU,WAAW,QAAQ,iBAAiB,MAAM,MAAM,SAAS,IAAI,MAAM;AAChG,UAAM,UAAU,MAAM,WAAW,iBAAiB,UAAU,MAAM,SAAS,QAAQ,YAAY;AAC/F,UAAM,YAAY,KAAK,IAAI;AAC3B,UAAM,WAAW,MAAM,SAAS,OAAO,IAAI;AAC3C,UAAM,YAAY,KAAK,IAAI,IAAI;AAG/B,UAAM,eAAe,SAAS,MAAM;AACpC,UAAM,EAAE,MAAM,cAAc,IAAI,MAAM,gBAAgB,cAAc,KAAK,YAAY;AAErF,UAAM,UAAkC,CAAC;AACzC,aAAS,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACvC,YAAM,QAAQ,IAAI,YAAY;AAC9B,cAAQ,GAAG,IAAI,sBAAsB,IAAI,KAAK,IAAI,uBAAuB;AAAA,IAC3E,CAAC;AAED,SAAK,SAAS,KAAK;AAAA,MACjB;AAAA,MACA;AAAA,MACA,QAAQ,SAAS;AAAA,MACjB;AAAA,MACA,MAAM,mBAAmB,IAAI;AAAA,MAC7B;AAAA,MACA,WAAW,IAAI,KAAK,SAAS,EAAE,YAAY;AAAA,MAC3C;AAAA,IACF,CAAC;AAED,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAaA,SAAS,mBAAmB,MAAsB;AAChD,SAAO,KAAK,QAAQ,kCAAkC,mBAAmB;AAC3E;AAEA,eAAe,gBACb,UACA,cACmD;AACnD,MAAI;AACJ,MAAI;AACF,WAAO,MAAM,SAAS,KAAK;AAAA,EAC7B,QAAQ;AACN,WAAO,EAAE,MAAM,IAAI,eAAe,MAAM;AAAA,EAC1C;AACA,MAAI,KAAK,UAAU,aAAc,QAAO,EAAE,MAAM,MAAM,eAAe,MAAM;AAC3E,SAAO,EAAE,MAAM,KAAK,MAAM,GAAG,YAAY,GAAG,eAAe,KAAK;AAClE;","names":[]}
+{"version":3,"sources":["../../../src/lib/protocols/rawResponseCapture.ts"],"sourcesContent":["// Raw HTTP response capture for conformance probing.\n//\n// Scoped via AsyncLocalStorage so MCP + A2A protocol adapters can record\n// status, headers, body, and latency without threading options through\n// every call site. When the capture slot is absent, the fetch wrapper is a\n// pass-through — production clients pay only one ALS lookup per request.\n//\n// Consumers call `withRawResponseCapture(fn)` and receive captures for\n// every HTTP request that happened inside `fn`. The uniform-error invariant\n// uses the captures to compare two probes byte-for-byte.\n\nimport { globalAsyncLocalStorage } from '../utils/global-async-local-storage';\nimport { MAX_TIMER_DELAY_MS, withAbortSignal } from './abort';\n\nexport interface RawHttpCapture {\n  url: string;\n  method: string;\n  requestJsonRpcMethod?: string;\n  requestAdcpSkill?: string;\n  status: number;\n  headers: Record<string, string>;\n  body: string;\n  latencyMs: number;\n  timestamp: string;\n  /** True when byte limits, deadlines, or stream errors made the captured body incomplete. */\n  bodyTruncated: boolean;\n  /** Actionable reason the captured body is incomplete. Never contains response bytes. */\n  bodyCaptureError?: string;\n}\n\ninterface CaptureSlot {\n  captures: RawHttpCapture[];\n  maxBodyBytes: number;\n  requestMetadataTimeoutMs: number;\n  responseBodyTimeoutMs: number;\n}\n\n// Request and response bodies are bounded as UTF-8 bytes while streaming.\nconst DEFAULT_MAX_BODY_BYTES = 1_048_576;\nconst DEFAULT_REQUEST_METADATA_TIMEOUT_MS = 1_000;\nconst DEFAULT_RESPONSE_BODY_TIMEOUT_MS = 10_000;\n\nexport const rawResponseCaptureStorage = globalAsyncLocalStorage<CaptureSlot>('rawResponseCapture');\n\n/**\n * Run `fn` with a raw-response capture slot active. Every HTTP request made\n * through the wrapped fetch inside `fn` is recorded.\n *\n * When `fn` rejects, the rejection propagates and the partial captures\n * are attached to the thrown error as `error.captures`. Callers that\n * need to inspect partial captures on failure can read that property;\n * callers that don't can ignore it. This lets storyboard validators\n * surface \"the SDK threw before the wire shape parsed\" diagnostics\n * with the actual bytes that arrived before the throw.\n */\nexport async function withRawResponseCapture<T>(\n  fn: () => Promise<T>,\n  options: { maxBodyBytes?: number; requestMetadataTimeoutMs?: number; responseBodyTimeoutMs?: number } = {}\n): Promise<{ result: T; captures: RawHttpCapture[] }> {\n  const maxBodyBytes = options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;\n  if (!Number.isSafeInteger(maxBodyBytes) || maxBodyBytes <= 0) {\n    throw new RangeError('maxBodyBytes must be a finite safe positive integer');\n  }\n  const requestMetadataTimeoutMs = options.requestMetadataTimeoutMs ?? DEFAULT_REQUEST_METADATA_TIMEOUT_MS;\n  if (\n    !Number.isFinite(requestMetadataTimeoutMs) ||\n    requestMetadataTimeoutMs <= 0 ||\n    requestMetadataTimeoutMs > MAX_TIMER_DELAY_MS\n  ) {\n    throw new RangeError(`requestMetadataTimeoutMs must be a finite positive number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  const responseBodyTimeoutMs = options.responseBodyTimeoutMs ?? DEFAULT_RESPONSE_BODY_TIMEOUT_MS;\n  if (\n    !Number.isFinite(responseBodyTimeoutMs) ||\n    responseBodyTimeoutMs <= 0 ||\n    responseBodyTimeoutMs > MAX_TIMER_DELAY_MS\n  ) {\n    throw new RangeError(`responseBodyTimeoutMs must be a finite positive number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  const slot: CaptureSlot = {\n    captures: [],\n    maxBodyBytes,\n    requestMetadataTimeoutMs,\n    responseBodyTimeoutMs,\n  };\n  try {\n    const result = await rawResponseCaptureStorage.run(slot, fn);\n    return { result, captures: slot.captures };\n  } catch (err) {\n    if (err && typeof err === 'object') {\n      try {\n        Object.defineProperty(err, 'captures', {\n          value: slot.captures,\n          enumerable: false,\n          configurable: true,\n          writable: true,\n        });\n      } catch {\n        // Frozen / sealed errors won't accept the property — drop the\n        // captures rather than crash on a defineProperty TypeError.\n      }\n    }\n    throw err;\n  }\n}\n\n/** Type guard for errors carrying partial captures from `withRawResponseCapture`. */\nexport function getCapturesFromError(err: unknown): RawHttpCapture[] | undefined {\n  if (err && typeof err === 'object' && Array.isArray((err as { captures?: unknown }).captures)) {\n    return (err as { captures: RawHttpCapture[] }).captures;\n  }\n  return undefined;\n}\n\n/**\n * Credential-bearing response header names. A misbehaving proxy that\n * echoes caller-supplied auth headers back on the response would\n * otherwise land bearer tokens in the capture — and downstream, in\n * `UniformErrorReport.probes.*.headers` which is written to disk /\n * pasted into tickets. Redact verbatim at capture time.\n */\nconst REDACTED_HEADER_NAMES: ReadonlySet<string> = new Set([\n  'authorization',\n  'proxy-authorization',\n  'cookie',\n  'set-cookie',\n  'x-adcp-auth',\n  'x-api-key',\n]);\n\nconst REDACTED_PLACEHOLDER = '[redacted]';\n\n/**\n * Wrap a fetch implementation so it records raw responses when a capture\n * slot is active. Safe to install unconditionally — pass-through when no\n * slot is set.\n */\nexport function wrapFetchWithCapture(upstream: typeof fetch): typeof fetch {\n  const wrapped: typeof fetch = async (input, init) => {\n    const slot = rawResponseCaptureStorage.getStore();\n    if (!slot) return upstream(input, init);\n\n    const url = typeof input === 'string' ? input : input instanceof URL ? input.toString() : input.url;\n    const method = (init?.method ?? (input instanceof Request ? input.method : 'GET')).toUpperCase();\n    const requestBody =\n      init?.body !== undefined\n        ? init.body\n        : input instanceof Request\n          ? await readRequestBodyFromClone(\n              input,\n              slot.maxBodyBytes,\n              init?.signal ?? input.signal,\n              slot.requestMetadataTimeoutMs\n            )\n          : undefined;\n    const requestMetadata = extractSafeRequestMetadata(requestBody, slot.maxBodyBytes);\n    const startedAt = Date.now();\n    const response = await upstream(input, init);\n    const latencyMs = Date.now() - startedAt;\n\n    // Clone before reading so the SDK still gets a consumable body.\n    const cloneForRead = response.clone();\n    const { body, bodyTruncated, bodyCaptureError } = await readBodyBounded(\n      cloneForRead,\n      slot.maxBodyBytes,\n      slot.responseBodyTimeoutMs\n    );\n\n    const headers: Record<string, string> = {};\n    response.headers.forEach((value, key) => {\n      const lower = key.toLowerCase();\n      headers[key] = REDACTED_HEADER_NAMES.has(lower) ? REDACTED_PLACEHOLDER : value;\n    });\n\n    slot.captures.push({\n      url,\n      method,\n      ...requestMetadata,\n      status: response.status,\n      headers,\n      body: redactBearerInBody(body),\n      latencyMs,\n      timestamp: new Date(startedAt).toISOString(),\n      bodyTruncated,\n      ...(bodyCaptureError !== undefined && { bodyCaptureError }),\n    });\n\n    return response;\n  };\n  return wrapped;\n}\n\nasync function readRequestBodyFromClone(\n  request: Request,\n  maxBodyBytes: number,\n  signal: AbortSignal | null | undefined,\n  timeoutMs: number\n): Promise<string | undefined> {\n  if (request.bodyUsed || request.method === 'GET' || request.method === 'HEAD') return undefined;\n  try {\n    const body = request.clone().body;\n    if (!body) return '';\n    const reader = body.getReader();\n    return await withAbortSignal([signal], timeoutMs, async captureSignal => {\n      const cancel = () => void reader.cancel(captureSignal?.reason).catch(() => undefined);\n      captureSignal?.addEventListener('abort', cancel, { once: true });\n      try {\n        const chunks: Uint8Array[] = [];\n        let length = 0;\n        while (true) {\n          const { done, value } = await reader.read();\n          if (done) break;\n          length += value.byteLength;\n          if (length > maxBodyBytes) {\n            // This reader belongs to a tee created by Request.clone(). Awaiting\n            // cancellation can deadlock until the original branch is consumed,\n            // which cannot happen until this wrapper calls the upstream fetch.\n            void reader.cancel().catch(() => undefined);\n            return undefined;\n          }\n          chunks.push(value);\n        }\n        const bytes = new Uint8Array(length);\n        let offset = 0;\n        for (const chunk of chunks) {\n          bytes.set(chunk, offset);\n          offset += chunk.byteLength;\n        }\n        return new TextDecoder().decode(bytes);\n      } finally {\n        captureSignal?.removeEventListener('abort', cancel);\n      }\n    });\n  } catch {\n    return undefined;\n  }\n}\n\nfunction extractSafeRequestMetadata(\n  body: BodyInit | null | undefined,\n  maxBodyBytes: number\n): Pick<RawHttpCapture, 'requestJsonRpcMethod' | 'requestAdcpSkill'> {\n  if (typeof body !== 'string' || body.length > maxBodyBytes) return {};\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(body);\n  } catch {\n    return {};\n  }\n  if (parsed == null || typeof parsed !== 'object' || Array.isArray(parsed)) return {};\n  const envelope = parsed as { method?: unknown; params?: unknown };\n  const requestJsonRpcMethod = typeof envelope.method === 'string' ? envelope.method : undefined;\n  let requestAdcpSkill: string | undefined;\n  const params =\n    envelope.params != null && typeof envelope.params === 'object' && !Array.isArray(envelope.params)\n      ? (envelope.params as { message?: unknown })\n      : undefined;\n  const message =\n    params?.message != null && typeof params.message === 'object' && !Array.isArray(params.message)\n      ? (params.message as { parts?: unknown })\n      : undefined;\n  if (Array.isArray(message?.parts)) {\n    for (const part of message.parts) {\n      if (part == null || typeof part !== 'object' || Array.isArray(part)) continue;\n      const data = (part as { data?: unknown; content?: unknown }).data;\n      const content = (part as { content?: unknown }).content;\n      const nativeData =\n        content != null && typeof content === 'object' && !Array.isArray(content)\n          ? (content as { data?: unknown }).data\n          : undefined;\n      const value = data ?? nativeData;\n      if (value == null || typeof value !== 'object' || Array.isArray(value)) continue;\n      const skill = (value as { skill?: unknown }).skill;\n      if (typeof skill === 'string') {\n        requestAdcpSkill = skill;\n        break;\n      }\n    }\n  }\n  return {\n    ...(requestJsonRpcMethod !== undefined && { requestJsonRpcMethod }),\n    ...(requestAdcpSkill !== undefined && { requestAdcpSkill }),\n  };\n}\n\n/**\n * Response bodies sometimes echo request headers — e.g., a misbehaving\n * \"debug\" handler that logs the Authorization header into its error\n * payload, or a 500 HTML page that templates the request dump. Strip\n * bearer-shaped tokens so they don't persist into captured output.\n *\n * Conservative: only masks the TOKEN portion of a `Bearer <token>` span\n * (case-insensitive). Doesn't try to detect arbitrary high-entropy\n * strings — false positives on those would damage the comparator's\n * byte-equivalence check.\n */\nfunction redactBearerInBody(body: string): string {\n  return body.replace(/Bearer\\s+[A-Za-z0-9._~+/=-]+/gi, 'Bearer [redacted]');\n}\n\nasync function readBodyBounded(\n  response: Response,\n  maxBodyBytes: number,\n  timeoutMs: number\n): Promise<{ body: string; bodyTruncated: boolean; bodyCaptureError?: string }> {\n  if (!response.body) return { body: '', bodyTruncated: false };\n  const reader = response.body.getReader();\n  const retained: Uint8Array[] = [];\n  let retainedBytes = 0;\n  const decodeRetained = () => {\n    const bytes = new Uint8Array(retainedBytes);\n    let offset = 0;\n    for (const chunk of retained) {\n      bytes.set(chunk, offset);\n      offset += chunk.byteLength;\n    }\n    return new TextDecoder().decode(bytes);\n  };\n  try {\n    return await withAbortSignal([], timeoutMs, async signal => {\n      const cancel = () => void reader.cancel(signal?.reason).catch(() => undefined);\n      signal?.addEventListener('abort', cancel, { once: true });\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          if (done) {\n            return { body: decodeRetained(), bodyTruncated: false };\n          }\n          const available = maxBodyBytes - retainedBytes;\n          const copyBytes = Math.min(available, value.byteLength);\n          if (copyBytes > 0) {\n            // Copy only bytes actually observed. In particular, accepting a\n            // large safe maxBodyBytes must not allocate that full capacity.\n            retained.push(value.slice(0, copyBytes));\n            retainedBytes += copyBytes;\n          }\n          if (copyBytes < value.byteLength) {\n            // This is a clone branch. Awaiting cancellation can wait for the SDK\n            // to consume the original branch, which cannot happen until capture\n            // returns, so cancel without awaiting.\n            void reader.cancel().catch(() => undefined);\n            return {\n              body: decodeRetained(),\n              bodyTruncated: true,\n              bodyCaptureError: `Raw response capture exceeded maxBodyBytes (${maxBodyBytes})`,\n            };\n          }\n        }\n      } finally {\n        signal?.removeEventListener('abort', cancel);\n      }\n    });\n  } catch (error) {\n    // Capture is observational: a stalled or broken clone must not prevent\n    // the SDK from consuming the original response. Preserve bytes already\n    // observed and mark the capture incomplete.\n    const timedOut = error instanceof Error && error.name === 'TimeoutError';\n    return {\n      body: decodeRetained(),\n      bodyTruncated: true,\n      bodyCaptureError: timedOut\n        ? `Raw response capture timed out after ${timeoutMs} ms before the response body completed`\n        : 'Raw response capture ended before the response body completed',\n    };\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAWA,wCAAwC;AACxC,mBAAoD;AA0BpD,MAAM,yBAAyB;AAC/B,MAAM,sCAAsC;AAC5C,MAAM,mCAAmC;AAElC,MAAM,gCAA4B,2DAAqC,oBAAoB;AAalG,eAAsB,uBACpB,IACA,UAAwG,CAAC,GACrD;AACpD,QAAM,eAAe,QAAQ,gBAAgB;AAC7C,MAAI,CAAC,OAAO,cAAc,YAAY,KAAK,gBAAgB,GAAG;AAC5D,UAAM,IAAI,WAAW,qDAAqD;AAAA,EAC5E;AACA,QAAM,2BAA2B,QAAQ,4BAA4B;AACrE,MACE,CAAC,OAAO,SAAS,wBAAwB,KACzC,4BAA4B,KAC5B,2BAA2B,iCAC3B;AACA,UAAM,IAAI,WAAW,gEAAgE,+BAAkB,EAAE;AAAA,EAC3G;AACA,QAAM,wBAAwB,QAAQ,yBAAyB;AAC/D,MACE,CAAC,OAAO,SAAS,qBAAqB,KACtC,yBAAyB,KACzB,wBAAwB,iCACxB;AACA,UAAM,IAAI,WAAW,6DAA6D,+BAAkB,EAAE;AAAA,EACxG;AACA,QAAM,OAAoB;AAAA,IACxB,UAAU,CAAC;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,MAAI;AACF,UAAM,SAAS,MAAM,0BAA0B,IAAI,MAAM,EAAE;AAC3D,WAAO,EAAE,QAAQ,UAAU,KAAK,SAAS;AAAA,EAC3C,SAAS,KAAK;AACZ,QAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,UAAI;AACF,eAAO,eAAe,KAAK,YAAY;AAAA,UACrC,OAAO,KAAK;AAAA,UACZ,YAAY;AAAA,UACZ,cAAc;AAAA,UACd,UAAU;AAAA,QACZ,CAAC;AAAA,MACH,QAAQ;AAAA,MAGR;AAAA,IACF;AACA,UAAM;AAAA,EACR;AACF;AAGO,SAAS,qBAAqB,KAA4C;AAC/E,MAAI,OAAO,OAAO,QAAQ,YAAY,MAAM,QAAS,IAA+B,QAAQ,GAAG;AAC7F,WAAQ,IAAuC;AAAA,EACjD;AACA,SAAO;AACT;AASA,MAAM,wBAA6C,oBAAI,IAAI;AAAA,EACzD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAED,MAAM,uBAAuB;AAOtB,SAAS,qBAAqB,UAAsC;AACzE,QAAM,UAAwB,OAAO,OAAO,SAAS;AACnD,UAAM,OAAO,0BAA0B,SAAS;AAChD,QAAI,CAAC,KAAM,QAAO,SAAS,OAAO,IAAI;AAEtC,UAAM,MAAM,OAAO,UAAU,WAAW,QAAQ,iBAAiB,MAAM,MAAM,SAAS,IAAI,MAAM;AAChG,UAAM,UAAU,MAAM,WAAW,iBAAiB,UAAU,MAAM,SAAS,QAAQ,YAAY;AAC/F,UAAM,cACJ,MAAM,SAAS,SACX,KAAK,OACL,iBAAiB,UACf,MAAM;AAAA,MACJ;AAAA,MACA,KAAK;AAAA,MACL,MAAM,UAAU,MAAM;AAAA,MACtB,KAAK;AAAA,IACP,IACA;AACR,UAAM,kBAAkB,2BAA2B,aAAa,KAAK,YAAY;AACjF,UAAM,YAAY,KAAK,IAAI;AAC3B,UAAM,WAAW,MAAM,SAAS,OAAO,IAAI;AAC3C,UAAM,YAAY,KAAK,IAAI,IAAI;AAG/B,UAAM,eAAe,SAAS,MAAM;AACpC,UAAM,EAAE,MAAM,eAAe,iBAAiB,IAAI,MAAM;AAAA,MACtD;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IACP;AAEA,UAAM,UAAkC,CAAC;AACzC,aAAS,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACvC,YAAM,QAAQ,IAAI,YAAY;AAC9B,cAAQ,GAAG,IAAI,sBAAsB,IAAI,KAAK,IAAI,uBAAuB;AAAA,IAC3E,CAAC;AAED,SAAK,SAAS,KAAK;AAAA,MACjB;AAAA,MACA;AAAA,MACA,GAAG;AAAA,MACH,QAAQ,SAAS;AAAA,MACjB;AAAA,MACA,MAAM,mBAAmB,IAAI;AAAA,MAC7B;AAAA,MACA,WAAW,IAAI,KAAK,SAAS,EAAE,YAAY;AAAA,MAC3C;AAAA,MACA,GAAI,qBAAqB,UAAa,EAAE,iBAAiB;AAAA,IAC3D,CAAC;AAED,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAEA,eAAe,yBACb,SACA,cACA,QACA,WAC6B;AAC7B,MAAI,QAAQ,YAAY,QAAQ,WAAW,SAAS,QAAQ,WAAW,OAAQ,QAAO;AACtF,MAAI;AACF,UAAM,OAAO,QAAQ,MAAM,EAAE;AAC7B,QAAI,CAAC,KAAM,QAAO;AAClB,UAAM,SAAS,KAAK,UAAU;AAC9B,WAAO,UAAM,8BAAgB,CAAC,MAAM,GAAG,WAAW,OAAM,kBAAiB;AACvE,YAAM,SAAS,MAAM,KAAK,OAAO,OAAO,eAAe,MAAM,EAAE,MAAM,MAAM,MAAS;AACpF,qBAAe,iBAAiB,SAAS,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/D,UAAI;AACF,cAAM,SAAuB,CAAC;AAC9B,YAAI,SAAS;AACb,eAAO,MAAM;AACX,gBAAM,EAAE,MAAM,MAAM,IAAI,MAAM,OAAO,KAAK;AAC1C,cAAI,KAAM;AACV,oBAAU,MAAM;AAChB,cAAI,SAAS,cAAc;AAIzB,iBAAK,OAAO,OAAO,EAAE,MAAM,MAAM,MAAS;AAC1C,mBAAO;AAAA,UACT;AACA,iBAAO,KAAK,KAAK;AAAA,QACnB;AACA,cAAM,QAAQ,IAAI,WAAW,MAAM;AACnC,YAAI,SAAS;AACb,mBAAW,SAAS,QAAQ;AAC1B,gBAAM,IAAI,OAAO,MAAM;AACvB,oBAAU,MAAM;AAAA,QAClB;AACA,eAAO,IAAI,YAAY,EAAE,OAAO,KAAK;AAAA,MACvC,UAAE;AACA,uBAAe,oBAAoB,SAAS,MAAM;AAAA,MACpD;AAAA,IACF,CAAC;AAAA,EACH,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,SAAS,2BACP,MACA,cACmE;AACnE,MAAI,OAAO,SAAS,YAAY,KAAK,SAAS,aAAc,QAAO,CAAC;AACpE,MAAI;AACJ,MAAI;AACF,aAAS,KAAK,MAAM,IAAI;AAAA,EAC1B,QAAQ;AACN,WAAO,CAAC;AAAA,EACV;AACA,MAAI,UAAU,QAAQ,OAAO,WAAW,YAAY,MAAM,QAAQ,MAAM,EAAG,QAAO,CAAC;AACnF,QAAM,WAAW;AACjB,QAAM,uBAAuB,OAAO,SAAS,WAAW,WAAW,SAAS,SAAS;AACrF,MAAI;AACJ,QAAM,SACJ,SAAS,UAAU,QAAQ,OAAO,SAAS,WAAW,YAAY,CAAC,MAAM,QAAQ,SAAS,MAAM,IAC3F,SAAS,SACV;AACN,QAAM,UACJ,QAAQ,WAAW,QAAQ,OAAO,OAAO,YAAY,YAAY,CAAC,MAAM,QAAQ,OAAO,OAAO,IACzF,OAAO,UACR;AACN,MAAI,MAAM,QAAQ,SAAS,KAAK,GAAG;AACjC,eAAW,QAAQ,QAAQ,OAAO;AAChC,UAAI,QAAQ,QAAQ,OAAO,SAAS,YAAY,MAAM,QAAQ,IAAI,EAAG;AACrE,YAAM,OAAQ,KAA+C;AAC7D,YAAM,UAAW,KAA+B;AAChD,YAAM,aACJ,WAAW,QAAQ,OAAO,YAAY,YAAY,CAAC,MAAM,QAAQ,OAAO,IACnE,QAA+B,OAChC;AACN,YAAM,QAAQ,QAAQ;AACtB,UAAI,SAAS,QAAQ,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,EAAG;AACxE,YAAM,QAAS,MAA8B;AAC7C,UAAI,OAAO,UAAU,UAAU;AAC7B,2BAAmB;AACnB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AAAA,IACL,GAAI,yBAAyB,UAAa,EAAE,qBAAqB;AAAA,IACjE,GAAI,qBAAqB,UAAa,EAAE,iBAAiB;AAAA,EAC3D;AACF;AAaA,SAAS,mBAAmB,MAAsB;AAChD,SAAO,KAAK,QAAQ,kCAAkC,mBAAmB;AAC3E;AAEA,eAAe,gBACb,UACA,cACA,WAC8E;AAC9E,MAAI,CAAC,SAAS,KAAM,QAAO,EAAE,MAAM,IAAI,eAAe,MAAM;AAC5D,QAAM,SAAS,SAAS,KAAK,UAAU;AACvC,QAAM,WAAyB,CAAC;AAChC,MAAI,gBAAgB;AACpB,QAAM,iBAAiB,MAAM;AAC3B,UAAM,QAAQ,IAAI,WAAW,aAAa;AAC1C,QAAI,SAAS;AACb,eAAW,SAAS,UAAU;AAC5B,YAAM,IAAI,OAAO,MAAM;AACvB,gBAAU,MAAM;AAAA,IAClB;AACA,WAAO,IAAI,YAAY,EAAE,OAAO,KAAK;AAAA,EACvC;AACA,MAAI;AACF,WAAO,UAAM,8BAAgB,CAAC,GAAG,WAAW,OAAM,WAAU;AAC1D,YAAM,SAAS,MAAM,KAAK,OAAO,OAAO,QAAQ,MAAM,EAAE,MAAM,MAAM,MAAS;AAC7E,cAAQ,iBAAiB,SAAS,QAAQ,EAAE,MAAM,KAAK,CAAC;AACxD,UAAI;AACF,eAAO,MAAM;AACX,gBAAM,EAAE,MAAM,MAAM,IAAI,MAAM,OAAO,KAAK;AAC1C,cAAI,MAAM;AACR,mBAAO,EAAE,MAAM,eAAe,GAAG,eAAe,MAAM;AAAA,UACxD;AACA,gBAAM,YAAY,eAAe;AACjC,gBAAM,YAAY,KAAK,IAAI,WAAW,MAAM,UAAU;AACtD,cAAI,YAAY,GAAG;AAGjB,qBAAS,KAAK,MAAM,MAAM,GAAG,SAAS,CAAC;AACvC,6BAAiB;AAAA,UACnB;AACA,cAAI,YAAY,MAAM,YAAY;AAIhC,iBAAK,OAAO,OAAO,EAAE,MAAM,MAAM,MAAS;AAC1C,mBAAO;AAAA,cACL,MAAM,eAAe;AAAA,cACrB,eAAe;AAAA,cACf,kBAAkB,+CAA+C,YAAY;AAAA,YAC/E;AAAA,UACF;AAAA,QACF;AAAA,MACF,UAAE;AACA,gBAAQ,oBAAoB,SAAS,MAAM;AAAA,MAC7C;AAAA,IACF,CAAC;AAAA,EACH,SAAS,OAAO;AAId,UAAM,WAAW,iBAAiB,SAAS,MAAM,SAAS;AAC1D,WAAO;AAAA,MACL,MAAM,eAAe;AAAA,MACrB,eAAe;AAAA,MACf,kBAAkB,WACd,wCAAwC,SAAS,2CACjD;AAAA,IACN;AAAA,EACF;AACF;","names":[]}

package/dist/lib/protocols/rawResponseCapture.mjs

@@ -4,12 +4,29 @@ import { createRequire as __adcpCreateRequire } from "node:module";
 const __dirname = __adcpDirname(__adcpFileURLToPath(import.meta.url));
 const require2 = __adcpCreateRequire(import.meta.url);
 import { globalAsyncLocalStorage } from "../utils/global-async-local-storage.mjs";
+import { MAX_TIMER_DELAY_MS, withAbortSignal } from "./abort.mjs";
 const DEFAULT_MAX_BODY_BYTES = 1048576;
+const DEFAULT_REQUEST_METADATA_TIMEOUT_MS = 1e3;
+const DEFAULT_RESPONSE_BODY_TIMEOUT_MS = 1e4;
 const rawResponseCaptureStorage = globalAsyncLocalStorage("rawResponseCapture");
 async function withRawResponseCapture(fn, options = {}) {
+  const maxBodyBytes = options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;
+  if (!Number.isSafeInteger(maxBodyBytes) || maxBodyBytes <= 0) {
+    throw new RangeError("maxBodyBytes must be a finite safe positive integer");
+  }
+  const requestMetadataTimeoutMs = options.requestMetadataTimeoutMs ?? DEFAULT_REQUEST_METADATA_TIMEOUT_MS;
+  if (!Number.isFinite(requestMetadataTimeoutMs) || requestMetadataTimeoutMs <= 0 || requestMetadataTimeoutMs > MAX_TIMER_DELAY_MS) {
+    throw new RangeError(`requestMetadataTimeoutMs must be a finite positive number <= ${MAX_TIMER_DELAY_MS}`);
+  }
+  const responseBodyTimeoutMs = options.responseBodyTimeoutMs ?? DEFAULT_RESPONSE_BODY_TIMEOUT_MS;
+  if (!Number.isFinite(responseBodyTimeoutMs) || responseBodyTimeoutMs <= 0 || responseBodyTimeoutMs > MAX_TIMER_DELAY_MS) {
+    throw new RangeError(`responseBodyTimeoutMs must be a finite positive number <= ${MAX_TIMER_DELAY_MS}`);
+  }
   const slot = {
     captures: [],
-    maxBodyBytes: options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES
+    maxBodyBytes,
+    requestMetadataTimeoutMs,
+    responseBodyTimeoutMs
   };
   try {
     const result = await rawResponseCaptureStorage.run(slot, fn);
@@ -50,11 +67,22 @@ function wrapFetchWithCapture(upstream) {
     if (!slot) return upstream(input, init);
     const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
     const method = (init?.method ?? (input instanceof Request ? input.method : "GET")).toUpperCase();
+    const requestBody = init?.body !== void 0 ? init.body : input instanceof Request ? await readRequestBodyFromClone(
+      input,
+      slot.maxBodyBytes,
+      init?.signal ?? input.signal,
+      slot.requestMetadataTimeoutMs
+    ) : void 0;
+    const requestMetadata = extractSafeRequestMetadata(requestBody, slot.maxBodyBytes);
     const startedAt = Date.now();
     const response = await upstream(input, init);
     const latencyMs = Date.now() - startedAt;
     const cloneForRead = response.clone();
-    const { body, bodyTruncated } = await readBodyBounded(cloneForRead, slot.maxBodyBytes);
+    const { body, bodyTruncated, bodyCaptureError } = await readBodyBounded(
+      cloneForRead,
+      slot.maxBodyBytes,
+      slot.responseBodyTimeoutMs
+    );
     const headers = {};
     response.headers.forEach((value, key) => {
       const lower = key.toLowerCase();
@@ -63,29 +91,144 @@ function wrapFetchWithCapture(upstream) {
     slot.captures.push({
       url,
       method,
+      ...requestMetadata,
       status: response.status,
       headers,
       body: redactBearerInBody(body),
       latencyMs,
       timestamp: new Date(startedAt).toISOString(),
-      bodyTruncated
+      bodyTruncated,
+      ...bodyCaptureError !== void 0 && { bodyCaptureError }
     });
     return response;
   };
   return wrapped;
 }
+async function readRequestBodyFromClone(request, maxBodyBytes, signal, timeoutMs) {
+  if (request.bodyUsed || request.method === "GET" || request.method === "HEAD") return void 0;
+  try {
+    const body = request.clone().body;
+    if (!body) return "";
+    const reader = body.getReader();
+    return await withAbortSignal([signal], timeoutMs, async (captureSignal) => {
+      const cancel = () => void reader.cancel(captureSignal?.reason).catch(() => void 0);
+      captureSignal?.addEventListener("abort", cancel, { once: true });
+      try {
+        const chunks = [];
+        let length = 0;
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          length += value.byteLength;
+          if (length > maxBodyBytes) {
+            void reader.cancel().catch(() => void 0);
+            return void 0;
+          }
+          chunks.push(value);
+        }
+        const bytes = new Uint8Array(length);
+        let offset = 0;
+        for (const chunk of chunks) {
+          bytes.set(chunk, offset);
+          offset += chunk.byteLength;
+        }
+        return new TextDecoder().decode(bytes);
+      } finally {
+        captureSignal?.removeEventListener("abort", cancel);
+      }
+    });
+  } catch {
+    return void 0;
+  }
+}
+function extractSafeRequestMetadata(body, maxBodyBytes) {
+  if (typeof body !== "string" || body.length > maxBodyBytes) return {};
+  let parsed;
+  try {
+    parsed = JSON.parse(body);
+  } catch {
+    return {};
+  }
+  if (parsed == null || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+  const envelope = parsed;
+  const requestJsonRpcMethod = typeof envelope.method === "string" ? envelope.method : void 0;
+  let requestAdcpSkill;
+  const params = envelope.params != null && typeof envelope.params === "object" && !Array.isArray(envelope.params) ? envelope.params : void 0;
+  const message = params?.message != null && typeof params.message === "object" && !Array.isArray(params.message) ? params.message : void 0;
+  if (Array.isArray(message?.parts)) {
+    for (const part of message.parts) {
+      if (part == null || typeof part !== "object" || Array.isArray(part)) continue;
+      const data = part.data;
+      const content = part.content;
+      const nativeData = content != null && typeof content === "object" && !Array.isArray(content) ? content.data : void 0;
+      const value = data ?? nativeData;
+      if (value == null || typeof value !== "object" || Array.isArray(value)) continue;
+      const skill = value.skill;
+      if (typeof skill === "string") {
+        requestAdcpSkill = skill;
+        break;
+      }
+    }
+  }
+  return {
+    ...requestJsonRpcMethod !== void 0 && { requestJsonRpcMethod },
+    ...requestAdcpSkill !== void 0 && { requestAdcpSkill }
+  };
+}
 function redactBearerInBody(body) {
   return body.replace(/Bearer\s+[A-Za-z0-9._~+/=-]+/gi, "Bearer [redacted]");
 }
-async function readBodyBounded(response, maxBodyBytes) {
-  let text;
+async function readBodyBounded(response, maxBodyBytes, timeoutMs) {
+  if (!response.body) return { body: "", bodyTruncated: false };
+  const reader = response.body.getReader();
+  const retained = [];
+  let retainedBytes = 0;
+  const decodeRetained = () => {
+    const bytes = new Uint8Array(retainedBytes);
+    let offset = 0;
+    for (const chunk of retained) {
+      bytes.set(chunk, offset);
+      offset += chunk.byteLength;
+    }
+    return new TextDecoder().decode(bytes);
+  };
   try {
-    text = await response.text();
-  } catch {
-    return { body: "", bodyTruncated: false };
+    return await withAbortSignal([], timeoutMs, async (signal) => {
+      const cancel = () => void reader.cancel(signal?.reason).catch(() => void 0);
+      signal?.addEventListener("abort", cancel, { once: true });
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            return { body: decodeRetained(), bodyTruncated: false };
+          }
+          const available = maxBodyBytes - retainedBytes;
+          const copyBytes = Math.min(available, value.byteLength);
+          if (copyBytes > 0) {
+            retained.push(value.slice(0, copyBytes));
+            retainedBytes += copyBytes;
+          }
+          if (copyBytes < value.byteLength) {
+            void reader.cancel().catch(() => void 0);
+            return {
+              body: decodeRetained(),
+              bodyTruncated: true,
+              bodyCaptureError: `Raw response capture exceeded maxBodyBytes (${maxBodyBytes})`
+            };
+          }
+        }
+      } finally {
+        signal?.removeEventListener("abort", cancel);
+      }
+    });
+  } catch (error) {
+    const timedOut = error instanceof Error && error.name === "TimeoutError";
+    return {
+      body: decodeRetained(),
+      bodyTruncated: true,
+      bodyCaptureError: timedOut ? `Raw response capture timed out after ${timeoutMs} ms before the response body completed` : "Raw response capture ended before the response body completed"
+    };
   }
-  if (text.length <= maxBodyBytes) return { body: text, bodyTruncated: false };
-  return { body: text.slice(0, maxBodyBytes), bodyTruncated: true };
 }
 export {
   getCapturesFromError,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/protocols/rawResponseCapture.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);\n// Raw HTTP response capture for conformance probing.\n//\n// Scoped via AsyncLocalStorage so MCP + A2A protocol adapters can record\n// status, headers, body, and latency without threading options through\n// every call site. When the capture slot is absent, the fetch wrapper is a\n// pass-through — production clients pay only one ALS lookup per request.\n//\n// Consumers call `withRawResponseCapture(fn)` and receive captures for\n// every HTTP request that happened inside `fn`. The uniform-error invariant\n// uses the captures to compare two probes byte-for-byte.\n\nimport { globalAsyncLocalStorage } from '../utils/global-async-local-storage';\n\nexport interface RawHttpCapture {\n  url: string;\n  method: string;\n  status: number;\n  headers: Record<string, string>;\n  body: string;\n  latencyMs: number;\n  timestamp: string;\n  /** True when body capture hit `maxBodyBytes` and was truncated. */\n  bodyTruncated: boolean;\n}\n\ninterface CaptureSlot {\n  captures: RawHttpCapture[];\n  maxBodyBytes: number;\n}\n\n// Counted as UTF-16 code units (string.length), not UTF-8 bytes. Close\n// enough for ASCII-dominant response payloads and fine as a safety cap\n// against accidentally retaining huge responses.\nconst DEFAULT_MAX_BODY_BYTES = 1_048_576;\n\nexport const rawResponseCaptureStorage = globalAsyncLocalStorage<CaptureSlot>('rawResponseCapture');\n\n/**\n * Run `fn` with a raw-response capture slot active. Every HTTP request made\n * through the wrapped fetch inside `fn` is recorded.\n *\n * When `fn` rejects, the rejection propagates and the partial captures\n * are attached to the thrown error as `error.captures`. Callers that\n * need to inspect partial captures on failure can read that property;\n * callers that don't can ignore it. This lets storyboard validators\n * surface \"the SDK threw before the wire shape parsed\" diagnostics\n * with the actual bytes that arrived before the throw.\n */\nexport async function withRawResponseCapture<T>(\n  fn: () => Promise<T>,\n  options: { maxBodyBytes?: number } = {}\n): Promise<{ result: T; captures: RawHttpCapture[] }> {\n  const slot: CaptureSlot = {\n    captures: [],\n    maxBodyBytes: options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES,\n  };\n  try {\n    const result = await rawResponseCaptureStorage.run(slot, fn);\n    return { result, captures: slot.captures };\n  } catch (err) {\n    if (err && typeof err === 'object') {\n      try {\n        Object.defineProperty(err, 'captures', {\n          value: slot.captures,\n          enumerable: false,\n          configurable: true,\n          writable: true,\n        });\n      } catch {\n        // Frozen / sealed errors won't accept the property — drop the\n        // captures rather than crash on a defineProperty TypeError.\n      }\n    }\n    throw err;\n  }\n}\n\n/** Type guard for errors carrying partial captures from `withRawResponseCapture`. */\nexport function getCapturesFromError(err: unknown): RawHttpCapture[] | undefined {\n  if (err && typeof err === 'object' && Array.isArray((err as { captures?: unknown }).captures)) {\n    return (err as { captures: RawHttpCapture[] }).captures;\n  }\n  return undefined;\n}\n\n/**\n * Credential-bearing response header names. A misbehaving proxy that\n * echoes caller-supplied auth headers back on the response would\n * otherwise land bearer tokens in the capture — and downstream, in\n * `UniformErrorReport.probes.*.headers` which is written to disk /\n * pasted into tickets. Redact verbatim at capture time.\n */\nconst REDACTED_HEADER_NAMES: ReadonlySet<string> = new Set([\n  'authorization',\n  'proxy-authorization',\n  'cookie',\n  'set-cookie',\n  'x-adcp-auth',\n  'x-api-key',\n]);\n\nconst REDACTED_PLACEHOLDER = '[redacted]';\n\n/**\n * Wrap a fetch implementation so it records raw responses when a capture\n * slot is active. Safe to install unconditionally — pass-through when no\n * slot is set.\n */\nexport function wrapFetchWithCapture(upstream: typeof fetch): typeof fetch {\n  const wrapped: typeof fetch = async (input, init) => {\n    const slot = rawResponseCaptureStorage.getStore();\n    if (!slot) return upstream(input, init);\n\n    const url = typeof input === 'string' ? input : input instanceof URL ? input.toString() : input.url;\n    const method = (init?.method ?? (input instanceof Request ? input.method : 'GET')).toUpperCase();\n    const startedAt = Date.now();\n    const response = await upstream(input, init);\n    const latencyMs = Date.now() - startedAt;\n\n    // Clone before reading so the SDK still gets a consumable body.\n    const cloneForRead = response.clone();\n    const { body, bodyTruncated } = await readBodyBounded(cloneForRead, slot.maxBodyBytes);\n\n    const headers: Record<string, string> = {};\n    response.headers.forEach((value, key) => {\n      const lower = key.toLowerCase();\n      headers[key] = REDACTED_HEADER_NAMES.has(lower) ? REDACTED_PLACEHOLDER : value;\n    });\n\n    slot.captures.push({\n      url,\n      method,\n      status: response.status,\n      headers,\n      body: redactBearerInBody(body),\n      latencyMs,\n      timestamp: new Date(startedAt).toISOString(),\n      bodyTruncated,\n    });\n\n    return response;\n  };\n  return wrapped;\n}\n\n/**\n * Response bodies sometimes echo request headers — e.g., a misbehaving\n * \"debug\" handler that logs the Authorization header into its error\n * payload, or a 500 HTML page that templates the request dump. Strip\n * bearer-shaped tokens so they don't persist into captured output.\n *\n * Conservative: only masks the TOKEN portion of a `Bearer <token>` span\n * (case-insensitive). Doesn't try to detect arbitrary high-entropy\n * strings — false positives on those would damage the comparator's\n * byte-equivalence check.\n */\nfunction redactBearerInBody(body: string): string {\n  return body.replace(/Bearer\\s+[A-Za-z0-9._~+/=-]+/gi, 'Bearer [redacted]');\n}\n\nasync function readBodyBounded(\n  response: Response,\n  maxBodyBytes: number\n): Promise<{ body: string; bodyTruncated: boolean }> {\n  let text: string;\n  try {\n    text = await response.text();\n  } catch {\n    return { body: '', bodyTruncated: false };\n  }\n  if (text.length <= maxBodyBytes) return { body: text, bodyTruncated: false };\n  return { body: text.slice(0, maxBodyBytes), bodyTruncated: true };\n}\n"],"mappings":"AAAA,SAAS,iBAAiB,2BAA2B;AACrD,SAAS,WAAW,qBAAqB;AACzC,SAAS,iBAAiB,2BAA2B;AACrD,MAAM,YAAY,cAAc,oBAAoB,YAAY,GAAG,CAAC;AACpE,MAAMA,WAAU,oBAAoB,YAAY,GAAG;AAYnD,SAAS,+BAA+B;AAsBxC,MAAM,yBAAyB;AAExB,MAAM,4BAA4B,wBAAqC,oBAAoB;AAalG,eAAsB,uBACpB,IACA,UAAqC,CAAC,GACc;AACpD,QAAM,OAAoB;AAAA,IACxB,UAAU,CAAC;AAAA,IACX,cAAc,QAAQ,gBAAgB;AAAA,EACxC;AACA,MAAI;AACF,UAAM,SAAS,MAAM,0BAA0B,IAAI,MAAM,EAAE;AAC3D,WAAO,EAAE,QAAQ,UAAU,KAAK,SAAS;AAAA,EAC3C,SAAS,KAAK;AACZ,QAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,UAAI;AACF,eAAO,eAAe,KAAK,YAAY;AAAA,UACrC,OAAO,KAAK;AAAA,UACZ,YAAY;AAAA,UACZ,cAAc;AAAA,UACd,UAAU;AAAA,QACZ,CAAC;AAAA,MACH,QAAQ;AAAA,MAGR;AAAA,IACF;AACA,UAAM;AAAA,EACR;AACF;AAGO,SAAS,qBAAqB,KAA4C;AAC/E,MAAI,OAAO,OAAO,QAAQ,YAAY,MAAM,QAAS,IAA+B,QAAQ,GAAG;AAC7F,WAAQ,IAAuC;AAAA,EACjD;AACA,SAAO;AACT;AASA,MAAM,wBAA6C,oBAAI,IAAI;AAAA,EACzD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAED,MAAM,uBAAuB;AAOtB,SAAS,qBAAqB,UAAsC;AACzE,QAAM,UAAwB,OAAO,OAAO,SAAS;AACnD,UAAM,OAAO,0BAA0B,SAAS;AAChD,QAAI,CAAC,KAAM,QAAO,SAAS,OAAO,IAAI;AAEtC,UAAM,MAAM,OAAO,UAAU,WAAW,QAAQ,iBAAiB,MAAM,MAAM,SAAS,IAAI,MAAM;AAChG,UAAM,UAAU,MAAM,WAAW,iBAAiB,UAAU,MAAM,SAAS,QAAQ,YAAY;AAC/F,UAAM,YAAY,KAAK,IAAI;AAC3B,UAAM,WAAW,MAAM,SAAS,OAAO,IAAI;AAC3C,UAAM,YAAY,KAAK,IAAI,IAAI;AAG/B,UAAM,eAAe,SAAS,MAAM;AACpC,UAAM,EAAE,MAAM,cAAc,IAAI,MAAM,gBAAgB,cAAc,KAAK,YAAY;AAErF,UAAM,UAAkC,CAAC;AACzC,aAAS,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACvC,YAAM,QAAQ,IAAI,YAAY;AAC9B,cAAQ,GAAG,IAAI,sBAAsB,IAAI,KAAK,IAAI,uBAAuB;AAAA,IAC3E,CAAC;AAED,SAAK,SAAS,KAAK;AAAA,MACjB;AAAA,MACA;AAAA,MACA,QAAQ,SAAS;AAAA,MACjB;AAAA,MACA,MAAM,mBAAmB,IAAI;AAAA,MAC7B;AAAA,MACA,WAAW,IAAI,KAAK,SAAS,EAAE,YAAY;AAAA,MAC3C;AAAA,IACF,CAAC;AAED,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAaA,SAAS,mBAAmB,MAAsB;AAChD,SAAO,KAAK,QAAQ,kCAAkC,mBAAmB;AAC3E;AAEA,eAAe,gBACb,UACA,cACmD;AACnD,MAAI;AACJ,MAAI;AACF,WAAO,MAAM,SAAS,KAAK;AAAA,EAC7B,QAAQ;AACN,WAAO,EAAE,MAAM,IAAI,eAAe,MAAM;AAAA,EAC1C;AACA,MAAI,KAAK,UAAU,aAAc,QAAO,EAAE,MAAM,MAAM,eAAe,MAAM;AAC3E,SAAO,EAAE,MAAM,KAAK,MAAM,GAAG,YAAY,GAAG,eAAe,KAAK;AAClE;","names":["require"]}
+{"version":3,"sources":["../../../src/lib/protocols/rawResponseCapture.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);\n// Raw HTTP response capture for conformance probing.\n//\n// Scoped via AsyncLocalStorage so MCP + A2A protocol adapters can record\n// status, headers, body, and latency without threading options through\n// every call site. When the capture slot is absent, the fetch wrapper is a\n// pass-through — production clients pay only one ALS lookup per request.\n//\n// Consumers call `withRawResponseCapture(fn)` and receive captures for\n// every HTTP request that happened inside `fn`. The uniform-error invariant\n// uses the captures to compare two probes byte-for-byte.\n\nimport { globalAsyncLocalStorage } from '../utils/global-async-local-storage';\nimport { MAX_TIMER_DELAY_MS, withAbortSignal } from './abort';\n\nexport interface RawHttpCapture {\n  url: string;\n  method: string;\n  requestJsonRpcMethod?: string;\n  requestAdcpSkill?: string;\n  status: number;\n  headers: Record<string, string>;\n  body: string;\n  latencyMs: number;\n  timestamp: string;\n  /** True when byte limits, deadlines, or stream errors made the captured body incomplete. */\n  bodyTruncated: boolean;\n  /** Actionable reason the captured body is incomplete. Never contains response bytes. */\n  bodyCaptureError?: string;\n}\n\ninterface CaptureSlot {\n  captures: RawHttpCapture[];\n  maxBodyBytes: number;\n  requestMetadataTimeoutMs: number;\n  responseBodyTimeoutMs: number;\n}\n\n// Request and response bodies are bounded as UTF-8 bytes while streaming.\nconst DEFAULT_MAX_BODY_BYTES = 1_048_576;\nconst DEFAULT_REQUEST_METADATA_TIMEOUT_MS = 1_000;\nconst DEFAULT_RESPONSE_BODY_TIMEOUT_MS = 10_000;\n\nexport const rawResponseCaptureStorage = globalAsyncLocalStorage<CaptureSlot>('rawResponseCapture');\n\n/**\n * Run `fn` with a raw-response capture slot active. Every HTTP request made\n * through the wrapped fetch inside `fn` is recorded.\n *\n * When `fn` rejects, the rejection propagates and the partial captures\n * are attached to the thrown error as `error.captures`. Callers that\n * need to inspect partial captures on failure can read that property;\n * callers that don't can ignore it. This lets storyboard validators\n * surface \"the SDK threw before the wire shape parsed\" diagnostics\n * with the actual bytes that arrived before the throw.\n */\nexport async function withRawResponseCapture<T>(\n  fn: () => Promise<T>,\n  options: { maxBodyBytes?: number; requestMetadataTimeoutMs?: number; responseBodyTimeoutMs?: number } = {}\n): Promise<{ result: T; captures: RawHttpCapture[] }> {\n  const maxBodyBytes = options.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES;\n  if (!Number.isSafeInteger(maxBodyBytes) || maxBodyBytes <= 0) {\n    throw new RangeError('maxBodyBytes must be a finite safe positive integer');\n  }\n  const requestMetadataTimeoutMs = options.requestMetadataTimeoutMs ?? DEFAULT_REQUEST_METADATA_TIMEOUT_MS;\n  if (\n    !Number.isFinite(requestMetadataTimeoutMs) ||\n    requestMetadataTimeoutMs <= 0 ||\n    requestMetadataTimeoutMs > MAX_TIMER_DELAY_MS\n  ) {\n    throw new RangeError(`requestMetadataTimeoutMs must be a finite positive number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  const responseBodyTimeoutMs = options.responseBodyTimeoutMs ?? DEFAULT_RESPONSE_BODY_TIMEOUT_MS;\n  if (\n    !Number.isFinite(responseBodyTimeoutMs) ||\n    responseBodyTimeoutMs <= 0 ||\n    responseBodyTimeoutMs > MAX_TIMER_DELAY_MS\n  ) {\n    throw new RangeError(`responseBodyTimeoutMs must be a finite positive number <= ${MAX_TIMER_DELAY_MS}`);\n  }\n  const slot: CaptureSlot = {\n    captures: [],\n    maxBodyBytes,\n    requestMetadataTimeoutMs,\n    responseBodyTimeoutMs,\n  };\n  try {\n    const result = await rawResponseCaptureStorage.run(slot, fn);\n    return { result, captures: slot.captures };\n  } catch (err) {\n    if (err && typeof err === 'object') {\n      try {\n        Object.defineProperty(err, 'captures', {\n          value: slot.captures,\n          enumerable: false,\n          configurable: true,\n          writable: true,\n        });\n      } catch {\n        // Frozen / sealed errors won't accept the property — drop the\n        // captures rather than crash on a defineProperty TypeError.\n      }\n    }\n    throw err;\n  }\n}\n\n/** Type guard for errors carrying partial captures from `withRawResponseCapture`. */\nexport function getCapturesFromError(err: unknown): RawHttpCapture[] | undefined {\n  if (err && typeof err === 'object' && Array.isArray((err as { captures?: unknown }).captures)) {\n    return (err as { captures: RawHttpCapture[] }).captures;\n  }\n  return undefined;\n}\n\n/**\n * Credential-bearing response header names. A misbehaving proxy that\n * echoes caller-supplied auth headers back on the response would\n * otherwise land bearer tokens in the capture — and downstream, in\n * `UniformErrorReport.probes.*.headers` which is written to disk /\n * pasted into tickets. Redact verbatim at capture time.\n */\nconst REDACTED_HEADER_NAMES: ReadonlySet<string> = new Set([\n  'authorization',\n  'proxy-authorization',\n  'cookie',\n  'set-cookie',\n  'x-adcp-auth',\n  'x-api-key',\n]);\n\nconst REDACTED_PLACEHOLDER = '[redacted]';\n\n/**\n * Wrap a fetch implementation so it records raw responses when a capture\n * slot is active. Safe to install unconditionally — pass-through when no\n * slot is set.\n */\nexport function wrapFetchWithCapture(upstream: typeof fetch): typeof fetch {\n  const wrapped: typeof fetch = async (input, init) => {\n    const slot = rawResponseCaptureStorage.getStore();\n    if (!slot) return upstream(input, init);\n\n    const url = typeof input === 'string' ? input : input instanceof URL ? input.toString() : input.url;\n    const method = (init?.method ?? (input instanceof Request ? input.method : 'GET')).toUpperCase();\n    const requestBody =\n      init?.body !== undefined\n        ? init.body\n        : input instanceof Request\n          ? await readRequestBodyFromClone(\n              input,\n              slot.maxBodyBytes,\n              init?.signal ?? input.signal,\n              slot.requestMetadataTimeoutMs\n            )\n          : undefined;\n    const requestMetadata = extractSafeRequestMetadata(requestBody, slot.maxBodyBytes);\n    const startedAt = Date.now();\n    const response = await upstream(input, init);\n    const latencyMs = Date.now() - startedAt;\n\n    // Clone before reading so the SDK still gets a consumable body.\n    const cloneForRead = response.clone();\n    const { body, bodyTruncated, bodyCaptureError } = await readBodyBounded(\n      cloneForRead,\n      slot.maxBodyBytes,\n      slot.responseBodyTimeoutMs\n    );\n\n    const headers: Record<string, string> = {};\n    response.headers.forEach((value, key) => {\n      const lower = key.toLowerCase();\n      headers[key] = REDACTED_HEADER_NAMES.has(lower) ? REDACTED_PLACEHOLDER : value;\n    });\n\n    slot.captures.push({\n      url,\n      method,\n      ...requestMetadata,\n      status: response.status,\n      headers,\n      body: redactBearerInBody(body),\n      latencyMs,\n      timestamp: new Date(startedAt).toISOString(),\n      bodyTruncated,\n      ...(bodyCaptureError !== undefined && { bodyCaptureError }),\n    });\n\n    return response;\n  };\n  return wrapped;\n}\n\nasync function readRequestBodyFromClone(\n  request: Request,\n  maxBodyBytes: number,\n  signal: AbortSignal | null | undefined,\n  timeoutMs: number\n): Promise<string | undefined> {\n  if (request.bodyUsed || request.method === 'GET' || request.method === 'HEAD') return undefined;\n  try {\n    const body = request.clone().body;\n    if (!body) return '';\n    const reader = body.getReader();\n    return await withAbortSignal([signal], timeoutMs, async captureSignal => {\n      const cancel = () => void reader.cancel(captureSignal?.reason).catch(() => undefined);\n      captureSignal?.addEventListener('abort', cancel, { once: true });\n      try {\n        const chunks: Uint8Array[] = [];\n        let length = 0;\n        while (true) {\n          const { done, value } = await reader.read();\n          if (done) break;\n          length += value.byteLength;\n          if (length > maxBodyBytes) {\n            // This reader belongs to a tee created by Request.clone(). Awaiting\n            // cancellation can deadlock until the original branch is consumed,\n            // which cannot happen until this wrapper calls the upstream fetch.\n            void reader.cancel().catch(() => undefined);\n            return undefined;\n          }\n          chunks.push(value);\n        }\n        const bytes = new Uint8Array(length);\n        let offset = 0;\n        for (const chunk of chunks) {\n          bytes.set(chunk, offset);\n          offset += chunk.byteLength;\n        }\n        return new TextDecoder().decode(bytes);\n      } finally {\n        captureSignal?.removeEventListener('abort', cancel);\n      }\n    });\n  } catch {\n    return undefined;\n  }\n}\n\nfunction extractSafeRequestMetadata(\n  body: BodyInit | null | undefined,\n  maxBodyBytes: number\n): Pick<RawHttpCapture, 'requestJsonRpcMethod' | 'requestAdcpSkill'> {\n  if (typeof body !== 'string' || body.length > maxBodyBytes) return {};\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(body);\n  } catch {\n    return {};\n  }\n  if (parsed == null || typeof parsed !== 'object' || Array.isArray(parsed)) return {};\n  const envelope = parsed as { method?: unknown; params?: unknown };\n  const requestJsonRpcMethod = typeof envelope.method === 'string' ? envelope.method : undefined;\n  let requestAdcpSkill: string | undefined;\n  const params =\n    envelope.params != null && typeof envelope.params === 'object' && !Array.isArray(envelope.params)\n      ? (envelope.params as { message?: unknown })\n      : undefined;\n  const message =\n    params?.message != null && typeof params.message === 'object' && !Array.isArray(params.message)\n      ? (params.message as { parts?: unknown })\n      : undefined;\n  if (Array.isArray(message?.parts)) {\n    for (const part of message.parts) {\n      if (part == null || typeof part !== 'object' || Array.isArray(part)) continue;\n      const data = (part as { data?: unknown; content?: unknown }).data;\n      const content = (part as { content?: unknown }).content;\n      const nativeData =\n        content != null && typeof content === 'object' && !Array.isArray(content)\n          ? (content as { data?: unknown }).data\n          : undefined;\n      const value = data ?? nativeData;\n      if (value == null || typeof value !== 'object' || Array.isArray(value)) continue;\n      const skill = (value as { skill?: unknown }).skill;\n      if (typeof skill === 'string') {\n        requestAdcpSkill = skill;\n        break;\n      }\n    }\n  }\n  return {\n    ...(requestJsonRpcMethod !== undefined && { requestJsonRpcMethod }),\n    ...(requestAdcpSkill !== undefined && { requestAdcpSkill }),\n  };\n}\n\n/**\n * Response bodies sometimes echo request headers — e.g., a misbehaving\n * \"debug\" handler that logs the Authorization header into its error\n * payload, or a 500 HTML page that templates the request dump. Strip\n * bearer-shaped tokens so they don't persist into captured output.\n *\n * Conservative: only masks the TOKEN portion of a `Bearer <token>` span\n * (case-insensitive). Doesn't try to detect arbitrary high-entropy\n * strings — false positives on those would damage the comparator's\n * byte-equivalence check.\n */\nfunction redactBearerInBody(body: string): string {\n  return body.replace(/Bearer\\s+[A-Za-z0-9._~+/=-]+/gi, 'Bearer [redacted]');\n}\n\nasync function readBodyBounded(\n  response: Response,\n  maxBodyBytes: number,\n  timeoutMs: number\n): Promise<{ body: string; bodyTruncated: boolean; bodyCaptureError?: string }> {\n  if (!response.body) return { body: '', bodyTruncated: false };\n  const reader = response.body.getReader();\n  const retained: Uint8Array[] = [];\n  let retainedBytes = 0;\n  const decodeRetained = () => {\n    const bytes = new Uint8Array(retainedBytes);\n    let offset = 0;\n    for (const chunk of retained) {\n      bytes.set(chunk, offset);\n      offset += chunk.byteLength;\n    }\n    return new TextDecoder().decode(bytes);\n  };\n  try {\n    return await withAbortSignal([], timeoutMs, async signal => {\n      const cancel = () => void reader.cancel(signal?.reason).catch(() => undefined);\n      signal?.addEventListener('abort', cancel, { once: true });\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          if (done) {\n            return { body: decodeRetained(), bodyTruncated: false };\n          }\n          const available = maxBodyBytes - retainedBytes;\n          const copyBytes = Math.min(available, value.byteLength);\n          if (copyBytes > 0) {\n            // Copy only bytes actually observed. In particular, accepting a\n            // large safe maxBodyBytes must not allocate that full capacity.\n            retained.push(value.slice(0, copyBytes));\n            retainedBytes += copyBytes;\n          }\n          if (copyBytes < value.byteLength) {\n            // This is a clone branch. Awaiting cancellation can wait for the SDK\n            // to consume the original branch, which cannot happen until capture\n            // returns, so cancel without awaiting.\n            void reader.cancel().catch(() => undefined);\n            return {\n              body: decodeRetained(),\n              bodyTruncated: true,\n              bodyCaptureError: `Raw response capture exceeded maxBodyBytes (${maxBodyBytes})`,\n            };\n          }\n        }\n      } finally {\n        signal?.removeEventListener('abort', cancel);\n      }\n    });\n  } catch (error) {\n    // Capture is observational: a stalled or broken clone must not prevent\n    // the SDK from consuming the original response. Preserve bytes already\n    // observed and mark the capture incomplete.\n    const timedOut = error instanceof Error && error.name === 'TimeoutError';\n    return {\n      body: decodeRetained(),\n      bodyTruncated: true,\n      bodyCaptureError: timedOut\n        ? `Raw response capture timed out after ${timeoutMs} ms before the response body completed`\n        : 'Raw response capture ended before the response body completed',\n    };\n  }\n}\n"],"mappings":"AAAA,SAAS,iBAAiB,2BAA2B;AACrD,SAAS,WAAW,qBAAqB;AACzC,SAAS,iBAAiB,2BAA2B;AACrD,MAAM,YAAY,cAAc,oBAAoB,YAAY,GAAG,CAAC;AACpE,MAAMA,WAAU,oBAAoB,YAAY,GAAG;AAYnD,SAAS,+BAA+B;AACxC,SAAS,oBAAoB,uBAAuB;AA0BpD,MAAM,yBAAyB;AAC/B,MAAM,sCAAsC;AAC5C,MAAM,mCAAmC;AAElC,MAAM,4BAA4B,wBAAqC,oBAAoB;AAalG,eAAsB,uBACpB,IACA,UAAwG,CAAC,GACrD;AACpD,QAAM,eAAe,QAAQ,gBAAgB;AAC7C,MAAI,CAAC,OAAO,cAAc,YAAY,KAAK,gBAAgB,GAAG;AAC5D,UAAM,IAAI,WAAW,qDAAqD;AAAA,EAC5E;AACA,QAAM,2BAA2B,QAAQ,4BAA4B;AACrE,MACE,CAAC,OAAO,SAAS,wBAAwB,KACzC,4BAA4B,KAC5B,2BAA2B,oBAC3B;AACA,UAAM,IAAI,WAAW,gEAAgE,kBAAkB,EAAE;AAAA,EAC3G;AACA,QAAM,wBAAwB,QAAQ,yBAAyB;AAC/D,MACE,CAAC,OAAO,SAAS,qBAAqB,KACtC,yBAAyB,KACzB,wBAAwB,oBACxB;AACA,UAAM,IAAI,WAAW,6DAA6D,kBAAkB,EAAE;AAAA,EACxG;AACA,QAAM,OAAoB;AAAA,IACxB,UAAU,CAAC;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,MAAI;AACF,UAAM,SAAS,MAAM,0BAA0B,IAAI,MAAM,EAAE;AAC3D,WAAO,EAAE,QAAQ,UAAU,KAAK,SAAS;AAAA,EAC3C,SAAS,KAAK;AACZ,QAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,UAAI;AACF,eAAO,eAAe,KAAK,YAAY;AAAA,UACrC,OAAO,KAAK;AAAA,UACZ,YAAY;AAAA,UACZ,cAAc;AAAA,UACd,UAAU;AAAA,QACZ,CAAC;AAAA,MACH,QAAQ;AAAA,MAGR;AAAA,IACF;AACA,UAAM;AAAA,EACR;AACF;AAGO,SAAS,qBAAqB,KAA4C;AAC/E,MAAI,OAAO,OAAO,QAAQ,YAAY,MAAM,QAAS,IAA+B,QAAQ,GAAG;AAC7F,WAAQ,IAAuC;AAAA,EACjD;AACA,SAAO;AACT;AASA,MAAM,wBAA6C,oBAAI,IAAI;AAAA,EACzD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAED,MAAM,uBAAuB;AAOtB,SAAS,qBAAqB,UAAsC;AACzE,QAAM,UAAwB,OAAO,OAAO,SAAS;AACnD,UAAM,OAAO,0BAA0B,SAAS;AAChD,QAAI,CAAC,KAAM,QAAO,SAAS,OAAO,IAAI;AAEtC,UAAM,MAAM,OAAO,UAAU,WAAW,QAAQ,iBAAiB,MAAM,MAAM,SAAS,IAAI,MAAM;AAChG,UAAM,UAAU,MAAM,WAAW,iBAAiB,UAAU,MAAM,SAAS,QAAQ,YAAY;AAC/F,UAAM,cACJ,MAAM,SAAS,SACX,KAAK,OACL,iBAAiB,UACf,MAAM;AAAA,MACJ;AAAA,MACA,KAAK;AAAA,MACL,MAAM,UAAU,MAAM;AAAA,MACtB,KAAK;AAAA,IACP,IACA;AACR,UAAM,kBAAkB,2BAA2B,aAAa,KAAK,YAAY;AACjF,UAAM,YAAY,KAAK,IAAI;AAC3B,UAAM,WAAW,MAAM,SAAS,OAAO,IAAI;AAC3C,UAAM,YAAY,KAAK,IAAI,IAAI;AAG/B,UAAM,eAAe,SAAS,MAAM;AACpC,UAAM,EAAE,MAAM,eAAe,iBAAiB,IAAI,MAAM;AAAA,MACtD;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IACP;AAEA,UAAM,UAAkC,CAAC;AACzC,aAAS,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACvC,YAAM,QAAQ,IAAI,YAAY;AAC9B,cAAQ,GAAG,IAAI,sBAAsB,IAAI,KAAK,IAAI,uBAAuB;AAAA,IAC3E,CAAC;AAED,SAAK,SAAS,KAAK;AAAA,MACjB;AAAA,MACA;AAAA,MACA,GAAG;AAAA,MACH,QAAQ,SAAS;AAAA,MACjB;AAAA,MACA,MAAM,mBAAmB,IAAI;AAAA,MAC7B;AAAA,MACA,WAAW,IAAI,KAAK,SAAS,EAAE,YAAY;AAAA,MAC3C;AAAA,MACA,GAAI,qBAAqB,UAAa,EAAE,iBAAiB;AAAA,IAC3D,CAAC;AAED,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAEA,eAAe,yBACb,SACA,cACA,QACA,WAC6B;AAC7B,MAAI,QAAQ,YAAY,QAAQ,WAAW,SAAS,QAAQ,WAAW,OAAQ,QAAO;AACtF,MAAI;AACF,UAAM,OAAO,QAAQ,MAAM,EAAE;AAC7B,QAAI,CAAC,KAAM,QAAO;AAClB,UAAM,SAAS,KAAK,UAAU;AAC9B,WAAO,MAAM,gBAAgB,CAAC,MAAM,GAAG,WAAW,OAAM,kBAAiB;AACvE,YAAM,SAAS,MAAM,KAAK,OAAO,OAAO,eAAe,MAAM,EAAE,MAAM,MAAM,MAAS;AACpF,qBAAe,iBAAiB,SAAS,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/D,UAAI;AACF,cAAM,SAAuB,CAAC;AAC9B,YAAI,SAAS;AACb,eAAO,MAAM;AACX,gBAAM,EAAE,MAAM,MAAM,IAAI,MAAM,OAAO,KAAK;AAC1C,cAAI,KAAM;AACV,oBAAU,MAAM;AAChB,cAAI,SAAS,cAAc;AAIzB,iBAAK,OAAO,OAAO,EAAE,MAAM,MAAM,MAAS;AAC1C,mBAAO;AAAA,UACT;AACA,iBAAO,KAAK,KAAK;AAAA,QACnB;AACA,cAAM,QAAQ,IAAI,WAAW,MAAM;AACnC,YAAI,SAAS;AACb,mBAAW,SAAS,QAAQ;AAC1B,gBAAM,IAAI,OAAO,MAAM;AACvB,oBAAU,MAAM;AAAA,QAClB;AACA,eAAO,IAAI,YAAY,EAAE,OAAO,KAAK;AAAA,MACvC,UAAE;AACA,uBAAe,oBAAoB,SAAS,MAAM;AAAA,MACpD;AAAA,IACF,CAAC;AAAA,EACH,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,SAAS,2BACP,MACA,cACmE;AACnE,MAAI,OAAO,SAAS,YAAY,KAAK,SAAS,aAAc,QAAO,CAAC;AACpE,MAAI;AACJ,MAAI;AACF,aAAS,KAAK,MAAM,IAAI;AAAA,EAC1B,QAAQ;AACN,WAAO,CAAC;AAAA,EACV;AACA,MAAI,UAAU,QAAQ,OAAO,WAAW,YAAY,MAAM,QAAQ,MAAM,EAAG,QAAO,CAAC;AACnF,QAAM,WAAW;AACjB,QAAM,uBAAuB,OAAO,SAAS,WAAW,WAAW,SAAS,SAAS;AACrF,MAAI;AACJ,QAAM,SACJ,SAAS,UAAU,QAAQ,OAAO,SAAS,WAAW,YAAY,CAAC,MAAM,QAAQ,SAAS,MAAM,IAC3F,SAAS,SACV;AACN,QAAM,UACJ,QAAQ,WAAW,QAAQ,OAAO,OAAO,YAAY,YAAY,CAAC,MAAM,QAAQ,OAAO,OAAO,IACzF,OAAO,UACR;AACN,MAAI,MAAM,QAAQ,SAAS,KAAK,GAAG;AACjC,eAAW,QAAQ,QAAQ,OAAO;AAChC,UAAI,QAAQ,QAAQ,OAAO,SAAS,YAAY,MAAM,QAAQ,IAAI,EAAG;AACrE,YAAM,OAAQ,KAA+C;AAC7D,YAAM,UAAW,KAA+B;AAChD,YAAM,aACJ,WAAW,QAAQ,OAAO,YAAY,YAAY,CAAC,MAAM,QAAQ,OAAO,IACnE,QAA+B,OAChC;AACN,YAAM,QAAQ,QAAQ;AACtB,UAAI,SAAS,QAAQ,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,EAAG;AACxE,YAAM,QAAS,MAA8B;AAC7C,UAAI,OAAO,UAAU,UAAU;AAC7B,2BAAmB;AACnB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AAAA,IACL,GAAI,yBAAyB,UAAa,EAAE,qBAAqB;AAAA,IACjE,GAAI,qBAAqB,UAAa,EAAE,iBAAiB;AAAA,EAC3D;AACF;AAaA,SAAS,mBAAmB,MAAsB;AAChD,SAAO,KAAK,QAAQ,kCAAkC,mBAAmB;AAC3E;AAEA,eAAe,gBACb,UACA,cACA,WAC8E;AAC9E,MAAI,CAAC,SAAS,KAAM,QAAO,EAAE,MAAM,IAAI,eAAe,MAAM;AAC5D,QAAM,SAAS,SAAS,KAAK,UAAU;AACvC,QAAM,WAAyB,CAAC;AAChC,MAAI,gBAAgB;AACpB,QAAM,iBAAiB,MAAM;AAC3B,UAAM,QAAQ,IAAI,WAAW,aAAa;AAC1C,QAAI,SAAS;AACb,eAAW,SAAS,UAAU;AAC5B,YAAM,IAAI,OAAO,MAAM;AACvB,gBAAU,MAAM;AAAA,IAClB;AACA,WAAO,IAAI,YAAY,EAAE,OAAO,KAAK;AAAA,EACvC;AACA,MAAI;AACF,WAAO,MAAM,gBAAgB,CAAC,GAAG,WAAW,OAAM,WAAU;AAC1D,YAAM,SAAS,MAAM,KAAK,OAAO,OAAO,QAAQ,MAAM,EAAE,MAAM,MAAM,MAAS;AAC7E,cAAQ,iBAAiB,SAAS,QAAQ,EAAE,MAAM,KAAK,CAAC;AACxD,UAAI;AACF,eAAO,MAAM;AACX,gBAAM,EAAE,MAAM,MAAM,IAAI,MAAM,OAAO,KAAK;AAC1C,cAAI,MAAM;AACR,mBAAO,EAAE,MAAM,eAAe,GAAG,eAAe,MAAM;AAAA,UACxD;AACA,gBAAM,YAAY,eAAe;AACjC,gBAAM,YAAY,KAAK,IAAI,WAAW,MAAM,UAAU;AACtD,cAAI,YAAY,GAAG;AAGjB,qBAAS,KAAK,MAAM,MAAM,GAAG,SAAS,CAAC;AACvC,6BAAiB;AAAA,UACnB;AACA,cAAI,YAAY,MAAM,YAAY;AAIhC,iBAAK,OAAO,OAAO,EAAE,MAAM,MAAM,MAAS;AAC1C,mBAAO;AAAA,cACL,MAAM,eAAe;AAAA,cACrB,eAAe;AAAA,cACf,kBAAkB,+CAA+C,YAAY;AAAA,YAC/E;AAAA,UACF;AAAA,QACF;AAAA,MACF,UAAE;AACA,gBAAQ,oBAAoB,SAAS,MAAM;AAAA,MAC7C;AAAA,IACF,CAAC;AAAA,EACH,SAAS,OAAO;AAId,UAAM,WAAW,iBAAiB,SAAS,MAAM,SAAS;AAC1D,WAAO;AAAA,MACL,MAAM,eAAe;AAAA,MACrB,eAAe;AAAA,MACf,kBAAkB,WACd,wCAAwC,SAAS,2CACjD;AAAA,IACN;AAAA,EACF;AACF;","names":["require"]}

package/dist/lib/schemas-data/v2.5/_provenance.json

@@ -4,5 +4,5 @@
   "source_sha": "4e553ad955f83b49c7d221ab5c3ff78237ad02e3",
   "source_tarball_sha256": "580656d6466ef9f0d1119985e6726c2efea718dc671e2ad30957fcb2fd54af0f",
   "upstream_adcp_version": "2.5.3",
-  "synced_at": "2026-09-14T12:59:06.841Z"
+  "synced_at": "2026-09-23T15:24:56.831Z"
 }

package/dist/lib/signing/agent-fetch.d.mts

@@ -7,8 +7,10 @@ type FetchLike = (input: string | URL | Request, init?: RequestInit) => Promise<
  * Extract the AdCP operation name from a JSON-RPC request body, if any.
  *
  * - MCP tool calls: `method === "tools/call"` → `params.name` is the op name.
- * - A2A `message/send` / `message/stream`: the op name lives on the first
+ * - A2A 0.3 `message/send` / `message/stream`: the op name lives on the first
  *   data-kind part as `data.skill`.
+ * - A2A 1.x `SendMessage` / `SendStreamingMessage`: proto-JSON DataParts omit
+ *   the legacy `kind` discriminator and carry the op at `data.skill`.
  * - All other JSON-RPC methods (`initialize`, `tools/list`, notifications)
  *   return `undefined` — those are protocol-layer housekeeping, not AdCP
  *   operations subject to request-signing policy.

package/dist/lib/signing/agent-fetch.d.ts

@@ -7,8 +7,10 @@ type FetchLike = (input: string | URL | Request, init?: RequestInit) => Promise<
  * Extract the AdCP operation name from a JSON-RPC request body, if any.
  *
  * - MCP tool calls: `method === "tools/call"` → `params.name` is the op name.
- * - A2A `message/send` / `message/stream`: the op name lives on the first
+ * - A2A 0.3 `message/send` / `message/stream`: the op name lives on the first
  *   data-kind part as `data.skill`.
+ * - A2A 1.x `SendMessage` / `SendStreamingMessage`: proto-JSON DataParts omit
+ *   the legacy `kind` discriminator and carry the op at `data.skill`.
  * - All other JSON-RPC methods (`initialize`, `tools/list`, notifications)
  *   return `undefined` — those are protocol-layer housekeeping, not AdCP
  *   operations subject to request-signing policy.

package/dist/lib/signing/agent-fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/signing/agent-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,+BAA+B,EAC/B,iCAAiC,EAClC,MAAM,eAAe,CAAC;AAGvB,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AA4C1F;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAgCtE;AAsBD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,kBAAkB,GAAG,SAAS,EAC1C,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAQT;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAG1F;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,+BAA+B,GAAG,SAAS,CAM9E;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,IAAI,+BAA+B,CAElH;AAED,+CAA+C;AAC/C,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,yBAAyB,GAChC,MAAM,IAAI,iCAAiC,CAE7C;AAED,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,yBAAyB,CAAC;IACnC,+EAA+E;IAC/E,aAAa,EAAE,MAAM,gBAAgB,GAAG,SAAS,CAAC;CACnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,6BAA6B,GAAG,SAAS,CAiCxF;AAcD,MAAM,WAAW,6BAA6B;IAC5C,iFAAiF;IACjF,OAAO,EAAE,yBAAyB,CAAC;IACnC;;;;;;;;;OASG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,sDAAsD;IACtD,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,6BAA6B,GAAG,SAAS,CAQxF"}
+{"version":3,"file":"agent-fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/signing/agent-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,+BAA+B,EAC/B,iCAAiC,EAClC,MAAM,eAAe,CAAC;AAGvB,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AA4C1F;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAkCtE;AAsBD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,kBAAkB,GAAG,SAAS,EAC1C,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAQT;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAG1F;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,+BAA+B,GAAG,SAAS,CAM9E;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,IAAI,+BAA+B,CAElH;AAED,+CAA+C;AAC/C,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,yBAAyB,GAChC,MAAM,IAAI,iCAAiC,CAE7C;AAED,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,yBAAyB,CAAC;IACnC,+EAA+E;IAC/E,aAAa,EAAE,MAAM,gBAAgB,GAAG,SAAS,CAAC;CACnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,6BAA6B,GAAG,SAAS,CAiCxF;AAcD,MAAM,WAAW,6BAA6B;IAC5C,iFAAiF;IACjF,OAAO,EAAE,yBAAyB,CAAC;IACnC;;;;;;;;;OASG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,sDAAsD;IACtD,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,6BAA6B,GAAG,SAAS,CAQxF"}

package/dist/lib/signing/agent-fetch.js

@@ -73,14 +73,16 @@ function extractAdcpOperation(body) {
     const params = rpc.params;
     return typeof params?.name === "string" ? params.name : void 0;
   }
-  if (rpc.method === "message/send" || rpc.method === "message/stream") {
+  const isLegacyA2a = rpc.method === "message/send" || rpc.method === "message/stream";
+  const isNativeA2a = rpc.method === "SendMessage" || rpc.method === "SendStreamingMessage";
+  if (isLegacyA2a || isNativeA2a) {
     const params = rpc.params;
     const parts = params?.message?.parts;
     if (!Array.isArray(parts)) return void 0;
     for (const part of parts) {
       if (part && typeof part === "object") {
         const p = part;
-        if (p.kind === "data" && typeof p.data?.skill === "string") {
+        if ((isNativeA2a || p.kind === "data") && typeof p.data?.skill === "string") {
           return p.data.skill;
         }
       }