elasticdash-sdk 0.2.8 → 0.2.9

package/dist/index.cjs

@@ -1751,18 +1751,18 @@ function interceptFetch() {
     const ctx = getCaptureContext();
     const httpCtx = getHttpRunContext();
     const obsCtx = getObservabilityContext();
+    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    if (isAIProviderUrl(url)) {
+      return originalFetch(input, init);
+    }
     const mockHeader = encodeMockConfigHeader();
     if (!ctx && !httpCtx && !obsCtx) {
       return originalFetch(input, mockHeader ? attachMockConfigHeader(init, mockHeader) : init);
     }
     if (mockHeader) init = attachMockConfigHeader(init, mockHeader);
-    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     const method = (init?.method ?? (input instanceof Request ? input.method : "GET")).toUpperCase();
     const rawHeaders = init?.headers ?? (input instanceof Request ? input.headers : void 0);
     const rawBody = init?.body ?? (input instanceof Request ? input.body : void 0);
-    if (isAIProviderUrl(url)) {
-      return originalFetch(input, init);
-    }
     if (!ctx && !httpCtx && obsCtx) {
       const id2 = obsCtx.nextId();
       const { response: response2, event: event2 } = await executeLiveAndRecord(originalFetch, input, init, id2, url, method, rawHeaders, rawBody);
@@ -1853,7 +1853,8 @@ var init_http = __esm({
       /https?:\/\/api\.anthropic\.com\/v1\/messages/,
       /https?:\/\/generativelanguage\.googleapis\.com\/.*\/models\/[^/:]+:(generateContent|streamGenerateContent)/,
       /https?:\/\/api\.x\.ai\/v1\/(chat\/)?completions/,
-      /https?:\/\/api\.moonshot\.ai\/v1\/(chat\/)?completions/
+      /https?:\/\/api\.moonshot\.ai\/v1\/(chat\/)?completions/,
+      /https?:\/\/bedrock-runtime\.[^./]+\.amazonaws\.com\/model\/[^/]+\/(invoke|invoke-with-response-stream|converse|converse-stream)/
     ];
   }
 });
@@ -1861,8 +1862,14 @@ var init_http = __esm({
 // src/interceptors/ai-interceptor.ts
 var ai_interceptor_exports = {};
 __export(ai_interceptor_exports, {
+  bedrockApiKind: () => bedrockApiKind,
+  bedrockVendor: () => bedrockVendor,
+  bufferBedrockEventStream: () => bufferBedrockEventStream,
   consumeCapturedLLMRequest: () => consumeCapturedLLMRequest,
+  encodeBedrockFrame: () => encodeBedrockFrame,
+  extractBedrockModelId: () => extractBedrockModelId,
   installAIInterceptor: () => installAIInterceptor,
+  parseBedrockEventStream: () => parseBedrockEventStream,
   uninstallAIInterceptor: () => uninstallAIInterceptor
 });
 function isAIWrapperActive() {
@@ -1894,7 +1901,7 @@ function extractPromptSnippet(body) {
   }
   return void 0;
 }
-function extractUsage(provider, body) {
+function extractUsage(provider, body, url) {
   if (provider === "openai" || provider === "grok" || provider === "kimi") {
     const u = body.usage;
     if (!u) return void 0;
@@ -1910,9 +1917,24 @@ function extractUsage(provider, body) {
     if (!u) return void 0;
     return { inputTokens: u.promptTokenCount, outputTokens: u.candidatesTokenCount, totalTokens: u.totalTokenCount };
   }
+  if (provider === "bedrock") {
+    const kind = url ? bedrockApiKind(url) : void 0;
+    const vendor = url ? bedrockVendor(extractBedrockModelId(url)) : "unknown";
+    if (kind === "converse" || kind === "converse-stream") {
+      const u = body.usage;
+      if (!u) return void 0;
+      return { inputTokens: u.inputTokens, outputTokens: u.outputTokens, totalTokens: u.totalTokens ?? (u.inputTokens ?? 0) + (u.outputTokens ?? 0) };
+    }
+    if (vendor === "anthropic") {
+      const u = body.usage;
+      if (!u) return void 0;
+      return { inputTokens: u.input_tokens, outputTokens: u.output_tokens, totalTokens: (u.input_tokens ?? 0) + (u.output_tokens ?? 0) };
+    }
+    return void 0;
+  }
   return void 0;
 }
-function extractAssistantMessage(provider, body) {
+function extractAssistantMessage(provider, body, url) {
   if (provider === "openai" || provider === "grok" || provider === "kimi") {
     const choices = body.choices;
     if (Array.isArray(choices) && choices.length > 0) {
@@ -1933,6 +1955,17 @@ function extractAssistantMessage(provider, body) {
       if (content && typeof content === "object") return content;
     }
   }
+  if (provider === "bedrock") {
+    const kind = url ? bedrockApiKind(url) : void 0;
+    const vendor = url ? bedrockVendor(extractBedrockModelId(url)) : "unknown";
+    if (kind === "converse" || kind === "converse-stream") {
+      const output = body.output;
+      const msg = output?.message;
+      if (msg && typeof msg === "object") return msg;
+    } else if (vendor === "anthropic" && Array.isArray(body.content)) {
+      return { role: "assistant", content: body.content };
+    }
+  }
   return null;
 }
 function detectProvider2(url) {
@@ -1941,14 +1974,94 @@ function detectProvider2(url) {
   }
   return null;
 }
+function bedrockApiKind(url) {
+  if (/\/converse-stream(\?|$)/.test(url)) return "converse-stream";
+  if (/\/converse(\?|$)/.test(url)) return "converse";
+  if (/\/invoke-with-response-stream(\?|$)/.test(url)) return "invoke-stream";
+  if (/\/invoke(\?|$)/.test(url)) return "invoke";
+  return void 0;
+}
+function extractBedrockModelId(url) {
+  const m = /\/model\/([^/]+)\//.exec(url);
+  if (!m) return "unknown";
+  try {
+    return decodeURIComponent(m[1]);
+  } catch {
+    return m[1];
+  }
+}
+function bedrockVendor(modelId) {
+  const stripped = modelId.replace(/^(us|eu|apac|au|ap)\./, "");
+  const vendor = stripped.split(".")[0];
+  switch (vendor) {
+    case "anthropic":
+      return "anthropic";
+    case "amazon":
+      return "amazon";
+    case "cohere":
+      return "cohere";
+    case "meta":
+      return "meta";
+    case "mistral":
+      return "mistral";
+    case "ai21":
+      return "ai21";
+    case "stability":
+      return "stability";
+    default:
+      return "unknown";
+  }
+}
 function extractModel2(provider, body, url) {
   if (provider === "gemini") {
     const match = /\/models\/([^/:]+):/.exec(url);
     return match ? match[1] : "unknown";
   }
+  if (provider === "bedrock") {
+    return extractBedrockModelId(url);
+  }
   return typeof body.model === "string" ? body.model : "unknown";
 }
-function extractPrompt2(provider, body) {
+function extractPrompt2(provider, body, url) {
+  if (provider === "bedrock") {
+    const kind = url ? bedrockApiKind(url) : void 0;
+    const vendor = url ? bedrockVendor(extractBedrockModelId(url)) : "unknown";
+    if (kind === "converse" || kind === "converse-stream") {
+      let systemPrefix = "";
+      if (Array.isArray(body.system)) {
+        systemPrefix = body.system.map((b) => b && typeof b === "object" ? String(b.text ?? "") : String(b)).filter(Boolean).map((t) => `system: ${t}`).join("\n");
+        if (systemPrefix) systemPrefix += "\n";
+      }
+      const messages = body.messages;
+      if (Array.isArray(messages)) {
+        const msgText = messages.map((m) => {
+          if (!m || typeof m !== "object") return String(m);
+          const msg = m;
+          let content = msg.content;
+          if (Array.isArray(content)) {
+            content = content.map((b) => b && typeof b === "object" ? String(b.text ?? "") : String(b)).filter(Boolean).join("");
+          }
+          return `${msg.role}: ${content}`;
+        }).join("\n");
+        return systemPrefix + msgText;
+      }
+      return systemPrefix;
+    }
+    if (vendor === "anthropic") {
+      provider = "anthropic";
+    } else {
+      if (typeof body.prompt === "string") return body.prompt;
+      if (typeof body.inputText === "string") return body.inputText;
+      if (Array.isArray(body.messages)) {
+        return body.messages.map((m) => {
+          if (!m || typeof m !== "object") return String(m);
+          const msg = m;
+          return `${msg.role ?? "user"}: ${String(msg.content ?? "")}`;
+        }).join("\n");
+      }
+      return "";
+    }
+  }
   if (provider === "openai" || provider === "anthropic" || provider === "grok" || provider === "kimi") {
     let systemPrefix = "";
     if (provider === "anthropic") {
@@ -2010,10 +2123,47 @@ function extractPrompt2(provider, body) {
   }
   return "";
 }
-function extractCompletion2(provider, responseBody) {
+function extractCompletion2(provider, responseBody, url) {
   if (responseBody.streamed === true && typeof responseBody.completion === "string") {
     return responseBody.completion;
   }
+  if (provider === "bedrock") {
+    const kind = url ? bedrockApiKind(url) : void 0;
+    const vendor = url ? bedrockVendor(extractBedrockModelId(url)) : "unknown";
+    if (kind === "converse" || kind === "converse-stream") {
+      const output = responseBody.output;
+      const msg = output?.message;
+      if (msg && Array.isArray(msg.content)) {
+        return msg.content.map((b) => b && typeof b === "object" ? String(b.text ?? "") : "").filter(Boolean).join("");
+      }
+      return "";
+    }
+    if (vendor === "anthropic") {
+      const content = responseBody.content;
+      if (Array.isArray(content)) {
+        return content.map((block) => {
+          if (block && typeof block === "object") {
+            const b = block;
+            if (b.type === "text" && typeof b.text === "string") return b.text;
+          }
+          return "";
+        }).filter(Boolean).join("");
+      }
+      return "";
+    }
+    if (typeof responseBody.completion === "string") return responseBody.completion;
+    if (typeof responseBody.outputText === "string") return responseBody.outputText;
+    if (typeof responseBody.generation === "string") return responseBody.generation;
+    if (Array.isArray(responseBody.results)) {
+      return responseBody.results.map((r) => r && typeof r === "object" ? String(r.outputText ?? r.text ?? "") : "").filter(Boolean).join("");
+    }
+    if (Array.isArray(responseBody.choices)) {
+      const first = responseBody.choices[0];
+      const msg = first?.message;
+      if (msg && typeof msg.content === "string") return msg.content;
+    }
+    return "";
+  }
   if (provider === "openai" || provider === "grok" || provider === "kimi") {
     const choices = responseBody.choices;
     if (Array.isArray(choices) && choices.length > 0) {
@@ -2064,6 +2214,182 @@ function extractCompletion2(provider, responseBody) {
   }
   return "";
 }
+function crc32(bytes, init = 4294967295) {
+  let crc = init;
+  for (let i = 0; i < bytes.length; i++) {
+    crc = crc ^ bytes[i];
+    for (let j = 0; j < 8; j++) {
+      crc = crc >>> 1 ^ 3988292384 & -(crc & 1);
+    }
+  }
+  return (crc ^ 4294967295) >>> 0;
+}
+function concatChunks(chunks) {
+  let len = 0;
+  for (const c of chunks) len += c.length;
+  const out = new Uint8Array(len);
+  let offset = 0;
+  for (const c of chunks) {
+    out.set(c, offset);
+    offset += c.length;
+  }
+  return out;
+}
+function parseBedrockEventStream(buf) {
+  const frames = [];
+  const view = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
+  const decoder = new TextDecoder();
+  let offset = 0;
+  while (offset + 12 <= buf.length) {
+    const totalLen = view.getUint32(offset, false);
+    const headersLen = view.getUint32(offset + 4, false);
+    if (totalLen < 16 || totalLen > buf.length - offset) break;
+    const headers2 = {};
+    let h = offset + 12;
+    const hEnd = h + headersLen;
+    while (h < hEnd) {
+      const nameLen = buf[h];
+      h += 1;
+      if (h + nameLen > hEnd) break;
+      const name = decoder.decode(buf.subarray(h, h + nameLen));
+      h += nameLen;
+      const type = buf[h];
+      h += 1;
+      if (type === 7) {
+        const valueLen = view.getUint16(h, false);
+        h += 2;
+        headers2[name] = decoder.decode(buf.subarray(h, h + valueLen));
+        h += valueLen;
+      } else {
+        const lenByType = { 0: 0, 1: 0, 2: 1, 3: 2, 4: 4, 5: 8, 8: 8, 9: 16 };
+        const skipLen = lenByType[type];
+        if (skipLen === void 0) break;
+        h += skipLen;
+      }
+    }
+    const payloadStart = offset + 12 + headersLen;
+    const payloadEnd = offset + totalLen - 4;
+    if (payloadEnd >= payloadStart) {
+      frames.push({ headers: headers2, payload: buf.subarray(payloadStart, payloadEnd) });
+    }
+    offset += totalLen;
+  }
+  return frames;
+}
+function encodeBedrockFrame(eventType, payloadObj) {
+  const encoder = new TextEncoder();
+  const payload = encoder.encode(JSON.stringify(payloadObj));
+  const writeHeader = (name, value) => {
+    const nameBytes = encoder.encode(name);
+    const valueBytes = encoder.encode(value);
+    const out2 = new Uint8Array(1 + nameBytes.length + 1 + 2 + valueBytes.length);
+    const dv2 = new DataView(out2.buffer);
+    let p = 0;
+    out2[p++] = nameBytes.length;
+    out2.set(nameBytes, p);
+    p += nameBytes.length;
+    out2[p++] = 7;
+    dv2.setUint16(p, valueBytes.length, false);
+    p += 2;
+    out2.set(valueBytes, p);
+    return out2;
+  };
+  const headers2 = concatChunks([
+    writeHeader(":event-type", eventType),
+    writeHeader(":content-type", "application/json"),
+    writeHeader(":message-type", "event")
+  ]);
+  const totalLen = 12 + headers2.length + payload.length + 4;
+  const out = new Uint8Array(totalLen);
+  const dv = new DataView(out.buffer);
+  dv.setUint32(0, totalLen, false);
+  dv.setUint32(4, headers2.length, false);
+  const preludeCrc = crc32(out.subarray(0, 8));
+  dv.setUint32(8, preludeCrc, false);
+  out.set(headers2, 12);
+  out.set(payload, 12 + headers2.length);
+  const msgCrc = crc32(out.subarray(0, totalLen - 4));
+  dv.setUint32(totalLen - 4, msgCrc, false);
+  return out;
+}
+async function bufferBedrockEventStream(url, stream) {
+  const reader = stream.getReader();
+  const chunks = [];
+  try {
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      chunks.push(value);
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  const buf = concatChunks(chunks);
+  const frames = parseBedrockEventStream(buf);
+  const kind = bedrockApiKind(url);
+  const vendor = bedrockVendor(extractBedrockModelId(url));
+  const isInvoke = kind === "invoke-stream";
+  const decoder = new TextDecoder();
+  let completion = "";
+  let usage;
+  for (const frame of frames) {
+    let obj;
+    try {
+      obj = JSON.parse(decoder.decode(frame.payload));
+    } catch {
+      continue;
+    }
+    const eventType = frame.headers[":event-type"];
+    if (isInvoke && typeof obj.bytes === "string") {
+      try {
+        const innerJson = typeof atob === "function" ? atob(obj.bytes) : Buffer.from(obj.bytes, "base64").toString("utf8");
+        const decoded = JSON.parse(innerJson);
+        if (vendor === "anthropic") {
+          if (decoded.type === "content_block_delta") {
+            const d = decoded.delta;
+            if (d?.type === "text_delta" && typeof d.text === "string") completion += d.text;
+          }
+          if (decoded.type === "message_delta") {
+            const u = decoded.usage;
+            if (u) usage = extractUsage("anthropic", { usage: u }) ?? usage;
+          }
+          if (decoded.type === "message_start") {
+            const msg = decoded.message;
+            if (msg?.usage) usage = extractUsage("anthropic", { usage: msg.usage }) ?? usage;
+          }
+        } else {
+          if (typeof decoded.outputText === "string") completion += decoded.outputText;
+          if (typeof decoded.generation === "string") completion += decoded.generation;
+        }
+      } catch {
+      }
+      continue;
+    }
+    if (eventType === "contentBlockDelta" || obj.contentBlockDelta) {
+      const body = obj.contentBlockDelta ?? obj;
+      const delta = body.delta;
+      if (typeof delta?.text === "string") completion += delta.text;
+    }
+    if (eventType === "metadata" || obj.metadata) {
+      const body = obj.metadata ?? obj;
+      const u = body.usage;
+      if (u) {
+        usage = { inputTokens: u.inputTokens, outputTokens: u.outputTokens, totalTokens: u.totalTokens ?? (u.inputTokens ?? 0) + (u.outputTokens ?? 0) };
+      }
+    }
+  }
+  return { completion, usage };
+}
+function streamContentType(provider) {
+  if (provider === "gemini") return "application/json";
+  if (provider === "bedrock") return "application/vnd.amazon.eventstream";
+  return "text/event-stream";
+}
+async function bufferAIStream(provider, url, stream) {
+  if (provider === "bedrock") return bufferBedrockEventStream(url, stream);
+  const completion = await bufferSSEStream(provider, stream);
+  return { completion };
+}
 async function bufferSSEStream(provider, stream) {
   const decoder = new TextDecoder();
   const reader = stream.getReader();
@@ -2157,7 +2483,7 @@ function extractStreamUsage(provider, rawSSE) {
   }
   return void 0;
 }
-function synthesizeCompletionJSON(provider, completion) {
+function synthesizeCompletionJSON(provider, completion, url) {
   if (provider === "gemini") {
     return {
       candidates: [{ content: { parts: [{ text: completion }], role: "model" }, finishReason: "STOP" }]
@@ -2173,14 +2499,67 @@ function synthesizeCompletionJSON(provider, completion) {
       stop_sequence: null
     };
   }
+  if (provider === "bedrock") {
+    const kind = url ? bedrockApiKind(url) : void 0;
+    const vendor = url ? bedrockVendor(extractBedrockModelId(url)) : "unknown";
+    if (kind === "converse" || kind === "converse-stream") {
+      return {
+        output: { message: { role: "assistant", content: [{ text: completion }] } },
+        stopReason: "end_turn",
+        usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 }
+      };
+    }
+    if (vendor === "anthropic") {
+      return {
+        id: "replay",
+        type: "message",
+        role: "assistant",
+        content: [{ type: "text", text: completion }],
+        stop_reason: "end_turn",
+        stop_sequence: null
+      };
+    }
+    return { outputText: completion };
+  }
   return {
     id: "replay",
     object: "chat.completion",
     choices: [{ index: 0, message: { role: "assistant", content: completion }, finish_reason: "stop" }]
   };
 }
-function synthesizeSSEStream(provider, completion) {
+function synthesizeSSEStream(provider, completion, url) {
   const encoder = new TextEncoder();
+  if (provider === "bedrock") {
+    const kind = url ? bedrockApiKind(url) : void 0;
+    const vendor = url ? bedrockVendor(extractBedrockModelId(url)) : "unknown";
+    return new ReadableStream({
+      start(ctrl) {
+        if (kind === "converse-stream") {
+          ctrl.enqueue(encodeBedrockFrame("messageStart", { role: "assistant" }));
+          ctrl.enqueue(encodeBedrockFrame("contentBlockDelta", { contentBlockIndex: 0, delta: { text: completion } }));
+          ctrl.enqueue(encodeBedrockFrame("contentBlockStop", { contentBlockIndex: 0 }));
+          ctrl.enqueue(encodeBedrockFrame("messageStop", { stopReason: "end_turn" }));
+          ctrl.enqueue(encodeBedrockFrame("metadata", { usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 }, metrics: { latencyMs: 0 } }));
+        } else if (vendor === "anthropic") {
+          const wrap = (eventType, inner) => {
+            const innerJson = JSON.stringify(inner);
+            const b64 = typeof btoa === "function" ? btoa(innerJson) : Buffer.from(innerJson, "utf8").toString("base64");
+            return encodeBedrockFrame(eventType, { bytes: b64 });
+          };
+          ctrl.enqueue(wrap("chunk", { type: "message_start", message: { id: "replay", type: "message", role: "assistant", content: [], stop_reason: null, stop_sequence: null } }));
+          ctrl.enqueue(wrap("chunk", { type: "content_block_start", index: 0, content_block: { type: "text", text: "" } }));
+          ctrl.enqueue(wrap("chunk", { type: "content_block_delta", index: 0, delta: { type: "text_delta", text: completion } }));
+          ctrl.enqueue(wrap("chunk", { type: "content_block_stop", index: 0 }));
+          ctrl.enqueue(wrap("chunk", { type: "message_delta", delta: { stop_reason: "end_turn", stop_sequence: null } }));
+          ctrl.enqueue(wrap("chunk", { type: "message_stop" }));
+        } else {
+          const b64 = typeof btoa === "function" ? btoa(JSON.stringify({ outputText: completion })) : Buffer.from(JSON.stringify({ outputText: completion }), "utf8").toString("base64");
+          ctrl.enqueue(encodeBedrockFrame("chunk", { bytes: b64 }));
+        }
+        ctrl.close();
+      }
+    });
+  }
   return new ReadableStream({
     start(ctrl) {
       if (provider === "gemini") {
@@ -2261,25 +2640,33 @@ function installAIInterceptor() {
           body: capturedReq,
           promptSnippet: capturedSnippet
         };
-        const isStreaming2 = capturedReq.stream === true;
+        const isStreaming2 = provider === "bedrock" ? (bedrockApiKind(url) ?? "").endsWith("-stream") : capturedReq.stream === true;
         try {
           const cloned = response2.clone();
           if (!isStreaming2) {
             const responseBody = await cloned.json();
-            captured.usage = extractUsage(provider, responseBody);
+            captured.usage = extractUsage(provider, responseBody, url);
           } else if (cloned.body) {
-            try {
-              const decoder = new TextDecoder();
-              const reader = cloned.body.getReader();
-              let rawSSE = "";
-              for (; ; ) {
-                const { done, value } = await reader.read();
-                if (done) break;
-                rawSSE += decoder.decode(value, { stream: true });
+            if (provider === "bedrock") {
+              try {
+                const { usage } = await bufferBedrockEventStream(url, cloned.body);
+                captured.usage = usage;
+              } catch {
+              }
+            } else {
+              try {
+                const decoder = new TextDecoder();
+                const reader = cloned.body.getReader();
+                let rawSSE = "";
+                for (; ; ) {
+                  const { done, value } = await reader.read();
+                  if (done) break;
+                  rawSSE += decoder.decode(value, { stream: true });
+                }
+                reader.releaseLock();
+                captured.usage = extractStreamUsage(provider, rawSSE);
+              } catch {
               }
-              reader.releaseLock();
-              captured.usage = extractStreamUsage(provider, rawSSE);
-            } catch {
             }
           }
         } catch {
@@ -2304,12 +2691,19 @@ function installAIInterceptor() {
       if (rawBody && typeof rawBody === "string") {
         const body = JSON.parse(rawBody);
         model = extractModel2(provider, body, url);
-        prompt = extractPrompt2(provider, body);
-        isStreaming = body.stream === true;
+        prompt = extractPrompt2(provider, body, url);
+        isStreaming = provider === "bedrock" ? (bedrockApiKind(url) ?? "").endsWith("-stream") : body.stream === true;
         if (Array.isArray(body.messages)) messages = body.messages;
         else if (Array.isArray(body.contents)) messages = body.contents;
+      } else if (provider === "bedrock") {
+        isStreaming = (bedrockApiKind(url) ?? "").endsWith("-stream");
+        model = extractModel2(provider, {}, url);
       }
     } catch {
+      if (provider === "bedrock") {
+        isStreaming = (bedrockApiKind(url) ?? "").endsWith("-stream");
+        model = extractModel2(provider, {}, url);
+      }
     }
     const ctx = getCaptureContext();
     if (!traceAtCall && !ctx && obsCtx && !isAIWrapperActive()) {
@@ -2319,9 +2713,9 @@ function installAIInterceptor() {
       const response2 = await originalFetch2(input, init);
       if (isStreaming && response2.body) {
         const [streamForCaller, streamForRecorder] = response2.body.tee();
-        bufferSSEStream(provider, streamForRecorder).then((completion) => {
+        bufferAIStream(provider, url, streamForRecorder).then(({ completion, usage }) => {
           const durationMs = rawDateNow() - start;
-          pushTelemetryEvent({ id, type: "ai", name: model, input: eventInput, output: { streamed: true, completion }, timestamp: start, durationMs });
+          pushTelemetryEvent({ id, type: "ai", name: model, input: eventInput, output: { streamed: true, completion }, timestamp: start, durationMs, ...usage ? { usage } : {} });
         }).catch(() => {
           const durationMs = rawDateNow() - start;
           pushTelemetryEvent({ id, type: "ai", name: model, input: eventInput, output: null, streamed: true, streamRaw: "", timestamp: start, durationMs });
@@ -2331,8 +2725,8 @@ function installAIInterceptor() {
       try {
         const cloned = response2.clone();
         const responseBody = await cloned.json();
-        const completion = extractCompletion2(provider, responseBody);
-        const usage = extractUsage(provider, responseBody);
+        const completion = extractCompletion2(provider, responseBody, url);
+        const usage = extractUsage(provider, responseBody, url);
         const durationMs = rawDateNow() - start;
         const event = {
           id,
@@ -2358,14 +2752,14 @@ function installAIInterceptor() {
       if (frozen && frozen.type === "ai") {
         pushTelemetryEvent(frozen);
         const frozenOutput = frozen.output;
-        const completion = frozenOutput ? extractCompletion2(provider, frozenOutput) : "(replayed)";
+        const completion = frozenOutput ? extractCompletion2(provider, frozenOutput, url) : "(replayed)";
         if (isStreaming) {
-          return new Response(synthesizeSSEStream(provider, completion), {
+          return new Response(synthesizeSSEStream(provider, completion, url), {
             status: 200,
-            headers: { "Content-Type": provider === "gemini" ? "application/json" : "text/event-stream" }
+            headers: { "Content-Type": streamContentType(provider) }
           });
         }
-        const body = frozenOutput?.streamed === true ? synthesizeCompletionJSON(provider, completion) : frozenOutput ?? synthesizeCompletionJSON(provider, completion);
+        const body = frozenOutput?.streamed === true ? synthesizeCompletionJSON(provider, completion, url) : frozenOutput ?? synthesizeCompletionJSON(provider, completion, url);
         return new Response(JSON.stringify(body), {
           status: 200,
           headers: { "Content-Type": "application/json" }
@@ -2375,9 +2769,9 @@ function installAIInterceptor() {
       const response2 = await originalFetch2(input, init);
       if (isStreaming && response2.body) {
         const [streamForCaller, streamForRecorder] = response2.body.tee();
-        bufferSSEStream(provider, streamForRecorder).then((completion) => {
+        bufferAIStream(provider, url, streamForRecorder).then(({ completion, usage }) => {
           const durationMs = rawDateNow() - start;
-          pushTelemetryEvent({ id, type: "ai", name: model, input: eventInput, output: { streamed: true, completion }, timestamp: start, durationMs });
+          pushTelemetryEvent({ id, type: "ai", name: model, input: eventInput, output: { streamed: true, completion }, timestamp: start, durationMs, ...usage ? { usage } : {} });
         }).catch(() => {
           const durationMs = rawDateNow() - start;
           pushTelemetryEvent({ id, type: "ai", name: model, input: eventInput, output: null, streamed: true, streamRaw: "", timestamp: start, durationMs });
@@ -2387,8 +2781,8 @@ function installAIInterceptor() {
       try {
         const cloned = response2.clone();
         const responseBody = await cloned.json();
-        const completion = extractCompletion2(provider, responseBody);
-        const usage = extractUsage(provider, responseBody);
+        const completion = extractCompletion2(provider, responseBody, url);
+        const usage = extractUsage(provider, responseBody, url);
         const durationMs = rawDateNow() - start;
         pushTelemetryEvent({ id, type: "ai", name: model, input: eventInput, output: { completion }, timestamp: start, durationMs, ...usage ? { usage } : {} });
       } catch {
@@ -2410,16 +2804,16 @@ function installAIInterceptor() {
         if (isReplayMatch && historicalEvent) {
           recorder.record(historicalEvent);
           const historicalOutput = historicalEvent.output;
-          const completion = historicalOutput ? extractCompletion2(provider, historicalOutput) : "(replayed)";
+          const completion = historicalOutput ? extractCompletion2(provider, historicalOutput, url) : "(replayed)";
           traceAtCall.recordLLMStep({ model, provider, prompt, completion, workflowEventId: id });
           if (isStreaming) {
-            return new Response(synthesizeSSEStream(provider, completion), {
+            return new Response(synthesizeSSEStream(provider, completion, url), {
               status: 200,
-              headers: { "Content-Type": provider === "gemini" ? "application/json" : "text/event-stream" }
+              headers: { "Content-Type": streamContentType(provider) }
             });
           }
           if (historicalOutput?.streamed === true) {
-            return new Response(JSON.stringify(synthesizeCompletionJSON(provider, completion)), {
+            return new Response(JSON.stringify(synthesizeCompletionJSON(provider, completion, url)), {
               status: 200,
               headers: { "Content-Type": "application/json" }
             });
@@ -2436,10 +2830,10 @@ function installAIInterceptor() {
         if (response2.body) {
           const [streamForCaller, streamForRecorder] = response2.body.tee();
           recorder.trackAsync(
-            bufferSSEStream(provider, streamForRecorder).then((completion) => {
+            bufferAIStream(provider, url, streamForRecorder).then(({ completion, usage }) => {
               const durationMs2 = rawDateNow() - start;
               traceAtCall.recordLLMStep({ model, provider, prompt, completion, workflowEventId: id, durationMs: durationMs2 });
-              recorder.record({ id, type: "ai", name: model, input: { url, provider, model, prompt, messages }, output: { streamed: true, completion }, timestamp: start, durationMs: durationMs2 });
+              recorder.record({ id, type: "ai", name: model, input: { url, provider, model, prompt, messages }, output: { streamed: true, completion }, timestamp: start, durationMs: durationMs2, ...usage ? { usage } : {} });
             }).catch(() => {
               const durationMs2 = rawDateNow() - start;
               traceAtCall.recordLLMStep({ model, provider, prompt, completion: "(streamed-error)", workflowEventId: id, durationMs: durationMs2 });
@@ -2459,9 +2853,9 @@ function installAIInterceptor() {
         try {
           const cloned = response2.clone();
           const responseBody = await cloned.json();
-          const completion = extractCompletion2(provider, responseBody);
-          const usage = extractUsage(provider, responseBody);
-          const assistantMessage = extractAssistantMessage(provider, responseBody);
+          const completion = extractCompletion2(provider, responseBody, url);
+          const usage = extractUsage(provider, responseBody, url);
+          const assistantMessage = extractAssistantMessage(provider, responseBody, url);
           traceAtCall.recordLLMStep({ model, provider, prompt, completion, workflowEventId: id, durationMs });
           recorder.record({ id, type: "ai", name: model, input: { url, provider, model, prompt, messages }, output: assistantMessage ?? responseBody, timestamp: start, durationMs, usage });
         } catch {
@@ -2475,7 +2869,7 @@ function installAIInterceptor() {
     const response = await originalFetch2(input, init);
     if (isStreaming && response.body) {
       const [streamForCaller, streamForRecorder] = response.body.tee();
-      bufferSSEStream(provider, streamForRecorder).then((completion) => {
+      bufferAIStream(provider, url, streamForRecorder).then(({ completion }) => {
         traceAtCall.recordLLMStep({ model, provider, prompt, completion });
       }).catch(() => {
         traceAtCall.recordLLMStep({ model, provider, prompt, completion: "(streamed-error)" });
@@ -2485,7 +2879,7 @@ function installAIInterceptor() {
       try {
         const cloned = response.clone();
         const responseBody = await cloned.json();
-        const completion = extractCompletion2(provider, responseBody);
+        const completion = extractCompletion2(provider, responseBody, url);
         traceAtCall.recordLLMStep({ model, provider, prompt, completion });
       } catch {
         traceAtCall.recordLLMStep({ model, provider, prompt, completion: "" });
@@ -2515,7 +2909,8 @@ var init_ai_interceptor = __esm({
       anthropic: /https?:\/\/api\.anthropic\.com\/v1\/messages/,
       gemini: /https?:\/\/generativelanguage\.googleapis\.com\/.*\/models\/[^\/:]+:(generateContent|streamGenerateContent)/,
       grok: /https?:\/\/api\.x\.ai\/v1\/(chat\/)?completions/,
-      kimi: /https?:\/\/api\.moonshot\.ai\/v1\/(chat\/)?completions/
+      kimi: /https?:\/\/api\.moonshot\.ai\/v1\/(chat\/)?completions/,
+      bedrock: /https?:\/\/bedrock-runtime\.[^./]+\.amazonaws\.com\/model\/[^/]+\/(invoke|invoke-with-response-stream|converse|converse-stream)/
     };
     originalFetch2 = null;
   }