braintrust 3.6.0 → 3.7.1

package/dev/dist/index.mjs

@@ -24,25 +24,51 @@ function patchTracingChannel(tracingChannelFn) {
   if (TracingChannel.prototype.tracePromise) {
     TracingChannel.prototype.tracePromise = function(fn, context = {}, thisArg, ...args) {
       const { start, end, asyncStart, asyncEnd, error } = this;
-      function reject2(err) {
+      function publishRejected(err) {
         context.error = err;
         error?.publish(context);
         asyncStart?.publish(context);
         asyncEnd?.publish(context);
-        return Promise.reject(err);
       }
-      function resolve(result) {
+      function publishResolved(result) {
         context.result = result;
         asyncStart?.publish(context);
         asyncEnd?.publish(context);
-        return result;
       }
       return start.runStores(context, () => {
         try {
           const result = Reflect.apply(fn, thisArg, args);
           end?.publish(context);
           if (result && (typeof result === "object" || typeof result === "function") && typeof result.then === "function") {
-            return result.then(resolve, reject2);
+            if (result.constructor === Promise) {
+              return result.then(
+                (res) => {
+                  publishResolved(res);
+                  return res;
+                },
+                (err) => {
+                  publishRejected(err);
+                  return Promise.reject(err);
+                }
+              );
+            }
+            void result.then(
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              (resolved) => {
+                try {
+                  publishResolved(resolved);
+                } catch {
+                }
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              (err) => {
+                try {
+                  publishRejected(err);
+                } catch {
+                }
+              }
+            );
+            return result;
           }
           context.result = result;
           asyncStart?.publish(context);
@@ -139,7 +165,7 @@ var DefaultTracingChannel = class {
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   tracePromise(fn, _message, thisArg, ...args) {
-    return Promise.resolve(fn.apply(thisArg, args));
+    return fn.apply(thisArg, args);
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   traceCallback(fn, _position, _message, thisArg, ...args) {
@@ -159,6 +185,7 @@ var iso = {
   processOn: (_0, _1) => {
   },
   basename: (filepath) => filepath.split(/[\\/]/).pop() || filepath,
+  // eslint-disable-next-line no-restricted-properties -- preserving intentional console usage.
   writeln: (text) => console.log(text)
 };
 var isomorph_default = iso;
@@ -1855,6 +1882,15 @@ var InternalAbortError = class extends Error {
     this.name = "InternalAbortError";
   }
 };
+function filterFrom(record, keys) {
+  const out = {};
+  for (const k of Object.keys(record)) {
+    if (!keys.includes(k)) {
+      out[k] = record[k];
+    }
+  }
+  return out;
+}
 
 // src/generated_types.ts
 import { z as z6 } from "zod/v3";
@@ -8848,7 +8884,7 @@ function patchStreamIfNeeded(stream, options) {
             if (!completed) {
               completed = true;
               try {
-                options.onComplete(chunks);
+                await options.onComplete(chunks);
               } catch (error) {
                 console.error("Error in stream onComplete handler:", error);
               }
@@ -8860,7 +8896,7 @@ function patchStreamIfNeeded(stream, options) {
               chunks.push(chunk);
               if (options.onChunk) {
                 try {
-                  options.onChunk(chunk);
+                  await options.onChunk(chunk);
                 } catch (error) {
                   console.error("Error in stream onChunk handler:", error);
                 }
@@ -8873,7 +8909,7 @@ function patchStreamIfNeeded(stream, options) {
             completed = true;
             if (options.onError) {
               try {
-                options.onError(
+                await options.onError(
                   error instanceof Error ? error : new Error(String(error)),
                   chunks
                 );
@@ -8891,7 +8927,7 @@ function patchStreamIfNeeded(stream, options) {
           if (!completed) {
             completed = true;
             try {
-              options.onComplete(chunks);
+              await options.onComplete(chunks);
             } catch (error) {
               console.error("Error in stream onComplete handler:", error);
             }
@@ -8908,7 +8944,7 @@ function patchStreamIfNeeded(stream, options) {
             const error = rawError instanceof Error ? rawError : new Error(String(rawError));
             if (options.onError) {
               try {
-                options.onError(error, chunks);
+                await options.onError(error, chunks);
               } catch (handlerError) {
                 console.error("Error in stream onError handler:", handlerError);
               }
@@ -9617,51 +9653,28 @@ function traceSyncStreamChannel(channel2, config) {
       }
       const { span, startTime } = spanData;
       const endEvent = event;
-      if (config.patchResult?.({
-        channelName,
-        endEvent,
-        result: endEvent.result,
-        span,
-        startTime
-      })) {
-        return;
-      }
-      const stream = endEvent.result;
-      if (!isSyncStreamLike(stream)) {
-        span.end();
-        states.delete(event);
-        return;
-      }
-      let first = true;
-      stream.on("chunk", () => {
-        if (first) {
-          span.log({
-            metrics: {
-              time_to_first_token: getCurrentUnixTimestamp() - startTime
-            }
-          });
-          first = false;
-        }
-      });
-      stream.on("chatCompletion", (completion) => {
-        try {
-          if (hasChoices(completion)) {
-            span.log({
-              output: completion.choices
-            });
-          }
-        } catch (error) {
-          console.error(
-            `Error extracting chatCompletion for ${channelName}:`,
-            error
-          );
+      const handleResolvedResult = (result) => {
+        const resolvedEndEvent = {
+          ...endEvent,
+          result
+        };
+        if (config.patchResult?.({
+          channelName,
+          endEvent: resolvedEndEvent,
+          result,
+          span,
+          startTime
+        })) {
+          return;
         }
-      });
-      stream.on("event", (streamEvent) => {
-        if (!config.extractFromEvent) {
+        const stream = result;
+        if (!isSyncStreamLike(stream)) {
+          span.end();
+          states.delete(event);
           return;
         }
-        try {
+        let first = true;
+        stream.on("chunk", () => {
           if (first) {
             span.log({
               metrics: {
@@ -9670,25 +9683,55 @@ function traceSyncStreamChannel(channel2, config) {
             });
             first = false;
           }
-          const extracted = config.extractFromEvent(streamEvent);
-          if (extracted && Object.keys(extracted).length > 0) {
-            span.log(extracted);
+        });
+        stream.on("chatCompletion", (completion) => {
+          try {
+            if (hasChoices(completion)) {
+              span.log({
+                output: completion.choices
+              });
+            }
+          } catch (error) {
+            console.error(
+              `Error extracting chatCompletion for ${channelName}:`,
+              error
+            );
           }
-        } catch (error) {
-          console.error(`Error extracting event for ${channelName}:`, error);
-        }
-      });
-      stream.on("end", () => {
-        span.end();
-        states.delete(event);
-      });
-      stream.on("error", (error) => {
-        span.log({
-          error: error.message
         });
-        span.end();
-        states.delete(event);
-      });
+        stream.on("event", (streamEvent) => {
+          if (!config.extractFromEvent) {
+            return;
+          }
+          try {
+            if (first) {
+              span.log({
+                metrics: {
+                  time_to_first_token: getCurrentUnixTimestamp() - startTime
+                }
+              });
+              first = false;
+            }
+            const extracted = config.extractFromEvent(streamEvent);
+            if (extracted && Object.keys(extracted).length > 0) {
+              span.log(extracted);
+            }
+          } catch (error) {
+            console.error(`Error extracting event for ${channelName}:`, error);
+          }
+        });
+        stream.on("end", () => {
+          span.end();
+          states.delete(event);
+        });
+        stream.on("error", (error) => {
+          span.log({
+            error: error.message
+          });
+          span.end();
+          states.delete(event);
+        });
+      };
+      handleResolvedResult(endEvent.result);
     },
     error: (event) => {
       logErrorAndEnd(states, event);
@@ -10468,7 +10511,7 @@ var AnthropicPlugin = class extends BasePlugin {
     this.unsubscribers.push(
       traceStreamingChannel(anthropicChannels.betaMessagesCreate, {
         ...anthropicConfig,
-        name: "anthropic.beta.messages.create"
+        name: "anthropic.messages.create"
       })
     );
   }
@@ -10491,9 +10534,12 @@ function parseMetricsFromUsage2(usage) {
   return metrics;
 }
 function aggregateAnthropicStreamChunks(chunks) {
-  const deltas = [];
+  const fallbackTextDeltas = [];
+  const contentBlocks = {};
+  const contentBlockDeltas = {};
   let metrics = {};
   let metadata = {};
+  let role;
   for (const event of chunks) {
     switch (event?.type) {
       case "message_start":
@@ -10501,15 +10547,55 @@ function aggregateAnthropicStreamChunks(chunks) {
           const initialMetrics = parseMetricsFromUsage2(event.message.usage);
           metrics = { ...metrics, ...initialMetrics };
         }
+        if (typeof event.message?.role === "string") {
+          role = event.message.role;
+        }
+        break;
+      case "content_block_start":
+        if (event.content_block) {
+          contentBlocks[event.index] = event.content_block;
+          contentBlockDeltas[event.index] = { textDeltas: [], citations: [] };
+        }
         break;
-      case "content_block_delta":
-        if (event.delta?.type === "text_delta") {
-          const text = event.delta.text;
+      case "content_block_delta": {
+        const acc = contentBlockDeltas[event.index];
+        const delta = event.delta;
+        if (!delta) break;
+        if (delta.type === "text_delta" && "text" in delta) {
+          const text = delta.text;
           if (text) {
-            deltas.push(text);
+            if (acc !== void 0) {
+              acc.textDeltas.push(text);
+            } else {
+              fallbackTextDeltas.push(text);
+            }
+          }
+        } else if (delta.type === "input_json_delta" && "partial_json" in delta) {
+          const partialJson = delta.partial_json;
+          if (partialJson && acc !== void 0) {
+            acc.textDeltas.push(partialJson);
+          }
+        } else if (delta.type === "thinking_delta" && "thinking" in delta) {
+          const thinking = delta.thinking;
+          if (thinking && acc !== void 0) {
+            acc.textDeltas.push(thinking);
+          }
+        } else if (delta.type === "citations_delta" && "citation" in delta) {
+          const citation = delta.citation;
+          if (citation && acc !== void 0) {
+            acc.citations.push(citation);
           }
         }
         break;
+      }
+      case "content_block_stop":
+        finalizeContentBlock(
+          event.index,
+          contentBlocks,
+          contentBlockDeltas,
+          fallbackTextDeltas
+        );
+        break;
       case "message_delta":
         if (event.usage) {
           const finalMetrics = parseMetricsFromUsage2(event.usage);
@@ -10521,7 +10607,21 @@ function aggregateAnthropicStreamChunks(chunks) {
         break;
     }
   }
-  const output = deltas.join("");
+  const orderedContent = Object.entries(contentBlocks).map(([index, block]) => ({
+    block,
+    index: Number(index)
+  })).filter(({ block }) => block !== void 0).sort((left, right) => left.index - right.index).map(({ block }) => block);
+  let output = fallbackTextDeltas.join("");
+  if (orderedContent.length > 0) {
+    if (orderedContent.every(isTextContentBlock) && orderedContent.every((block) => !block.citations?.length)) {
+      output = orderedContent.map((block) => block.text).join("");
+    } else {
+      output = {
+        ...role ? { role } : {},
+        content: orderedContent
+      };
+    }
+  }
   const finalized = finalizeAnthropicTokens(metrics);
   const filteredMetrics = Object.fromEntries(
     Object.entries(finalized).filter(
@@ -10534,6 +10634,61 @@ function aggregateAnthropicStreamChunks(chunks) {
     metadata
   };
 }
+function finalizeContentBlock(index, contentBlocks, contentBlockDeltas, fallbackTextDeltas) {
+  const contentBlock = contentBlocks[index];
+  if (!contentBlock) {
+    return;
+  }
+  const acc = contentBlockDeltas[index];
+  const text = acc?.textDeltas.join("") ?? "";
+  if (isToolUseContentBlock(contentBlock)) {
+    if (!text) {
+      return;
+    }
+    try {
+      contentBlocks[index] = {
+        ...contentBlock,
+        input: JSON.parse(text)
+      };
+    } catch {
+      fallbackTextDeltas.push(text);
+      delete contentBlocks[index];
+    }
+    return;
+  }
+  if (isTextContentBlock(contentBlock)) {
+    if (!text) {
+      delete contentBlocks[index];
+      return;
+    }
+    const updated = { ...contentBlock, text };
+    if (acc?.citations.length) {
+      updated.citations = acc.citations;
+    }
+    contentBlocks[index] = updated;
+    return;
+  }
+  if (isThinkingContentBlock(contentBlock)) {
+    if (!text) {
+      delete contentBlocks[index];
+      return;
+    }
+    contentBlocks[index] = {
+      ...contentBlock,
+      thinking: text
+    };
+    return;
+  }
+}
+function isTextContentBlock(contentBlock) {
+  return contentBlock.type === "text";
+}
+function isToolUseContentBlock(contentBlock) {
+  return contentBlock.type === "tool_use";
+}
+function isThinkingContentBlock(contentBlock) {
+  return contentBlock.type === "thinking";
+}
 function isAnthropicBase64ContentBlock(input) {
   return (input.type === "image" || input.type === "document") && isObject(input.source) && input.source.type === "base64";
 }
@@ -10588,15 +10743,6 @@ function coalesceInput(messages, system) {
   }
   return input;
 }
-function filterFrom(obj, fieldsToRemove) {
-  const result = {};
-  for (const [key, value] of Object.entries(obj)) {
-    if (!fieldsToRemove.includes(key)) {
-      result[key] = value;
-    }
-  }
-  return result;
-}
 
 // src/wrappers/ai-sdk/normalize-logged-output.ts
 var REMOVE_NORMALIZED_VALUE = Symbol("braintrust.ai-sdk.remove-normalized");
@@ -10710,10 +10856,6 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamText",
     kind: "async"
   }),
-  streamTextSync: channel({
-    channelName: "streamText.sync",
-    kind: "sync-stream"
-  }),
   generateObject: channel({
     channelName: "generateObject",
     kind: "async"
@@ -10722,10 +10864,6 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamObject",
     kind: "async"
   }),
-  streamObjectSync: channel({
-    channelName: "streamObject.sync",
-    kind: "sync-stream"
-  }),
   agentGenerate: channel({
     channelName: "Agent.generate",
     kind: "async"
@@ -10761,6 +10899,9 @@ var DEFAULT_DENY_OUTPUT_PATHS = [
 ];
 var AUTO_PATCHED_MODEL = Symbol.for("braintrust.ai-sdk.auto-patched-model");
 var AUTO_PATCHED_TOOL = Symbol.for("braintrust.ai-sdk.auto-patched-tool");
+var RUNTIME_DENY_OUTPUT_PATHS = Symbol.for(
+  "braintrust.ai-sdk.deny-output-paths"
+);
 var AISDKPlugin = class extends BasePlugin {
   config;
   constructor(config = {}) {
@@ -10782,7 +10923,10 @@ var AISDKPlugin = class extends BasePlugin {
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => {
           finalizeAISDKChildTracing(endEvent);
-          return processAISDKOutput(result, denyOutputPaths);
+          return processAISDKOutput(
+            result,
+            resolveDenyOutputPaths(endEvent, denyOutputPaths)
+          );
         },
         extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
@@ -10793,25 +10937,14 @@ var AISDKPlugin = class extends BasePlugin {
         name: "streamText",
         type: "llm" /* LLM */,
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
         extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
         aggregateChunks: aggregateAISDKChunks,
         patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
-          endEvent,
-          result,
-          span,
-          startTime
-        })
-      })
-    );
-    this.unsubscribers.push(
-      traceSyncStreamChannel(aiSDKChannels.streamTextSync, {
-        name: "streamText",
-        type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
+          defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           result,
           span,
@@ -10826,7 +10959,10 @@ var AISDKPlugin = class extends BasePlugin {
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => {
           finalizeAISDKChildTracing(endEvent);
-          return processAISDKOutput(result, denyOutputPaths);
+          return processAISDKOutput(
+            result,
+            resolveDenyOutputPaths(endEvent, denyOutputPaths)
+          );
         },
         extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
@@ -10837,25 +10973,14 @@ var AISDKPlugin = class extends BasePlugin {
         name: "streamObject",
         type: "llm" /* LLM */,
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
         extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
         aggregateChunks: aggregateAISDKChunks,
         patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
-          endEvent,
-          result,
-          span,
-          startTime
-        })
-      })
-    );
-    this.unsubscribers.push(
-      traceSyncStreamChannel(aiSDKChannels.streamObjectSync, {
-        name: "streamObject",
-        type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
+          defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           result,
           span,
@@ -10870,7 +10995,10 @@ var AISDKPlugin = class extends BasePlugin {
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => {
           finalizeAISDKChildTracing(endEvent);
-          return processAISDKOutput(result, denyOutputPaths);
+          return processAISDKOutput(
+            result,
+            resolveDenyOutputPaths(endEvent, denyOutputPaths)
+          );
         },
         extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
@@ -10881,11 +11009,14 @@ var AISDKPlugin = class extends BasePlugin {
         name: "Agent.stream",
         type: "llm" /* LLM */,
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
         extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
         aggregateChunks: aggregateAISDKChunks,
         patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
+          defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           result,
           span,
@@ -10900,7 +11031,10 @@ var AISDKPlugin = class extends BasePlugin {
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => {
           finalizeAISDKChildTracing(endEvent);
-          return processAISDKOutput(result, denyOutputPaths);
+          return processAISDKOutput(
+            result,
+            resolveDenyOutputPaths(endEvent, denyOutputPaths)
+          );
         },
         extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
@@ -10911,11 +11045,14 @@ var AISDKPlugin = class extends BasePlugin {
         name: "ToolLoopAgent.stream",
         type: "llm" /* LLM */,
         extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
         extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
         aggregateChunks: aggregateAISDKChunks,
         patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
+          defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           result,
           span,
@@ -10925,77 +11062,375 @@ var AISDKPlugin = class extends BasePlugin {
     );
   }
 };
-function processAISDKInput(params) {
-  if (!params) return params;
-  const input = processInputAttachments(params);
-  if (!input || typeof input !== "object" || Array.isArray(input)) {
-    return input;
+function resolveDenyOutputPaths(event, defaultDenyOutputPaths) {
+  if (Array.isArray(event?.denyOutputPaths)) {
+    return event.denyOutputPaths;
   }
-  const { tools: _tools, ...rest } = input;
-  return rest;
-}
-function prepareAISDKInput(params, event, span, denyOutputPaths) {
-  const input = processAISDKInput(params);
-  const metadata = extractMetadataFromParams(params, event.self);
-  const childTracing = prepareAISDKChildTracing(
-    params,
-    event.self,
-    span,
-    denyOutputPaths
-  );
-  event.__braintrust_ai_sdk_model_wrapped = childTracing.modelWrapped;
-  if (childTracing.cleanup) {
-    event.__braintrust_ai_sdk_cleanup = childTracing.cleanup;
+  const firstArgument = event?.arguments && event.arguments.length > 0 ? event.arguments[0] : void 0;
+  if (!firstArgument || typeof firstArgument !== "object") {
+    return defaultDenyOutputPaths;
   }
-  return {
-    input,
-    metadata
-  };
-}
-function extractTopLevelAISDKMetrics(result, event, startTime) {
-  const metrics = hasModelChildTracing(event) ? {} : extractTokenMetrics(result);
-  if (startTime) {
-    metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+  const runtimeDenyOutputPaths = firstArgument[RUNTIME_DENY_OUTPUT_PATHS];
+  if (Array.isArray(runtimeDenyOutputPaths) && runtimeDenyOutputPaths.every((path2) => typeof path2 === "string")) {
+    return runtimeDenyOutputPaths;
   }
-  return metrics;
-}
-function hasModelChildTracing(event) {
-  return event?.__braintrust_ai_sdk_model_wrapped === true;
+  return defaultDenyOutputPaths;
 }
-function extractMetadataFromParams(params, self) {
-  const metadata = {
-    braintrust: {
-      integration_name: "ai-sdk",
-      sdk_language: "typescript"
-    }
-  };
-  const agentModel = self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && self.settings?.model ? self.settings?.model : void 0;
-  const { model, provider } = serializeModelWithProvider(
-    params.model ?? agentModel
-  );
-  if (model) {
-    metadata.model = model;
+var isZodSchema2 = (value) => {
+  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
+};
+var serializeZodSchema2 = (schema) => {
+  try {
+    return zodToJsonSchema(schema);
+  } catch {
+    return {
+      type: "object",
+      description: "Zod schema (conversion failed)"
+    };
   }
-  if (provider) {
-    metadata.provider = provider;
+};
+var isOutputObject = (value) => {
+  if (value == null || typeof value !== "object") {
+    return false;
   }
-  const tools = serializeAISDKToolsForLogging(params.tools);
-  if (tools) {
-    metadata.tools = tools;
+  const output = value;
+  if (!("responseFormat" in output)) {
+    return false;
   }
-  return metadata;
-}
-function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
-  const cleanup = [];
-  const patchedModels = /* @__PURE__ */ new WeakSet();
-  const patchedTools = /* @__PURE__ */ new WeakSet();
-  let modelWrapped = false;
-  const patchModel = (model) => {
-    const resolvedModel = resolveAISDKModel(model);
-    if (!resolvedModel || typeof resolvedModel !== "object" || typeof resolvedModel.doGenerate !== "function" || patchedModels.has(resolvedModel) || resolvedModel[AUTO_PATCHED_MODEL]) {
-      return;
+  if (output.type === "object" || output.type === "text") {
+    return true;
+  }
+  if (typeof output.responseFormat === "function" || typeof output.responseFormat === "object") {
+    return true;
+  }
+  return false;
+};
+var serializeOutputObject = (output, model) => {
+  try {
+    const result = {
+      response_format: null
+    };
+    if (output.type) {
+      result.type = output.type;
+    }
+    let responseFormat;
+    if (typeof output.responseFormat === "function") {
+      const mockModelForSchema = {
+        supportsStructuredOutputs: true,
+        ...model && typeof model === "object" ? model : {}
+      };
+      responseFormat = output.responseFormat({ model: mockModelForSchema });
+    } else if (output.responseFormat != null && typeof output.responseFormat === "object") {
+      responseFormat = output.responseFormat;
+    }
+    if (responseFormat) {
+      if (typeof responseFormat.then === "function") {
+        result.response_format = Promise.resolve(responseFormat).then(
+          (resolved) => {
+            if (resolved.schema && isZodSchema2(resolved.schema)) {
+              return {
+                ...resolved,
+                schema: serializeZodSchema2(resolved.schema)
+              };
+            }
+            return resolved;
+          }
+        );
+      } else {
+        const syncResponseFormat = responseFormat;
+        if (syncResponseFormat.schema && isZodSchema2(syncResponseFormat.schema)) {
+          responseFormat = {
+            ...syncResponseFormat,
+            schema: serializeZodSchema2(syncResponseFormat.schema)
+          };
+        }
+        result.response_format = responseFormat;
+      }
     }
-    patchedModels.add(resolvedModel);
+    return result;
+  } catch {
+    return {
+      response_format: null
+    };
+  }
+};
+var processInputAttachmentsSync = (input) => {
+  if (!input) return { input };
+  const processed = { ...input };
+  if (input.messages && Array.isArray(input.messages)) {
+    processed.messages = input.messages.map(processMessage);
+  }
+  if (input.prompt && typeof input.prompt === "object") {
+    if (Array.isArray(input.prompt)) {
+      processed.prompt = input.prompt.map(processMessage);
+    } else {
+      processed.prompt = processPromptContent(input.prompt);
+    }
+  }
+  if (input.schema && isZodSchema2(input.schema)) {
+    processed.schema = serializeZodSchema2(input.schema);
+  }
+  if (input.callOptionsSchema && isZodSchema2(input.callOptionsSchema)) {
+    processed.callOptionsSchema = serializeZodSchema2(input.callOptionsSchema);
+  }
+  if (input.tools) {
+    processed.tools = serializeAISDKToolsForLogging(input.tools);
+  }
+  let outputPromise;
+  if (input.output && isOutputObject(input.output)) {
+    const serialized = serializeOutputObject(input.output, input.model);
+    if (serialized.response_format && typeof serialized.response_format.then === "function") {
+      processed.output = { ...serialized, response_format: {} };
+      outputPromise = serialized.response_format.then(
+        (resolvedFormat) => ({
+          output: { ...serialized, response_format: resolvedFormat }
+        })
+      );
+    } else {
+      processed.output = serialized;
+    }
+  }
+  if ("prepareCall" in processed && typeof processed.prepareCall === "function") {
+    processed.prepareCall = "[Function]";
+  }
+  return { input: processed, outputPromise };
+};
+var processMessage = (message) => {
+  if (!message || typeof message !== "object") return message;
+  if (Array.isArray(message.content)) {
+    return {
+      ...message,
+      content: message.content.map(processContentPart)
+    };
+  }
+  if (typeof message.content === "object" && message.content !== null) {
+    return {
+      ...message,
+      content: processContentPart(message.content)
+    };
+  }
+  return message;
+};
+var processPromptContent = (prompt) => {
+  if (Array.isArray(prompt)) {
+    return prompt.map(processContentPart);
+  }
+  if (prompt.content) {
+    if (Array.isArray(prompt.content)) {
+      return {
+        ...prompt,
+        content: prompt.content.map(processContentPart)
+      };
+    } else if (typeof prompt.content === "object") {
+      return {
+        ...prompt,
+        content: processContentPart(prompt.content)
+      };
+    }
+  }
+  return prompt;
+};
+var processContentPart = (part) => {
+  if (!part || typeof part !== "object") return part;
+  try {
+    if (part.type === "image" && part.image) {
+      const imageAttachment = convertImageToAttachment(
+        part.image,
+        part.mimeType || part.mediaType
+      );
+      if (imageAttachment) {
+        return {
+          ...part,
+          image: imageAttachment
+        };
+      }
+    }
+    if (part.type === "file" && part.data && (part.mimeType || part.mediaType)) {
+      const fileAttachment = convertDataToAttachment(
+        part.data,
+        part.mimeType || part.mediaType,
+        part.name || part.filename
+      );
+      if (fileAttachment) {
+        return {
+          ...part,
+          data: fileAttachment
+        };
+      }
+    }
+    if (part.type === "image_url" && part.image_url) {
+      if (typeof part.image_url === "object" && part.image_url.url) {
+        const imageAttachment = convertImageToAttachment(part.image_url.url);
+        if (imageAttachment) {
+          return {
+            ...part,
+            image_url: {
+              ...part.image_url,
+              url: imageAttachment
+            }
+          };
+        }
+      }
+    }
+  } catch (error) {
+    console.warn("Error processing content part:", error);
+  }
+  return part;
+};
+var convertImageToAttachment = (image, explicitMimeType) => {
+  try {
+    if (typeof image === "string" && image.startsWith("data:")) {
+      const [mimeTypeSection, base64Data] = image.split(",");
+      const mimeType = mimeTypeSection.match(/data:(.*?);/)?.[1];
+      if (mimeType && base64Data) {
+        const blob = convertDataToBlob(base64Data, mimeType);
+        if (blob) {
+          return new Attachment({
+            data: blob,
+            filename: `image.${getExtensionFromMediaType(mimeType)}`,
+            contentType: mimeType
+          });
+        }
+      }
+    }
+    if (explicitMimeType) {
+      if (image instanceof Uint8Array) {
+        return new Attachment({
+          data: new Blob([image], { type: explicitMimeType }),
+          filename: `image.${getExtensionFromMediaType(explicitMimeType)}`,
+          contentType: explicitMimeType
+        });
+      }
+      if (typeof Buffer !== "undefined" && Buffer.isBuffer(image)) {
+        return new Attachment({
+          data: new Blob([image], { type: explicitMimeType }),
+          filename: `image.${getExtensionFromMediaType(explicitMimeType)}`,
+          contentType: explicitMimeType
+        });
+      }
+    }
+    if (image instanceof Blob && image.type) {
+      return new Attachment({
+        data: image,
+        filename: `image.${getExtensionFromMediaType(image.type)}`,
+        contentType: image.type
+      });
+    }
+    if (image instanceof Attachment) {
+      return image;
+    }
+  } catch (error) {
+    console.warn("Error converting image to attachment:", error);
+  }
+  return null;
+};
+var convertDataToAttachment = (data, mimeType, filename) => {
+  if (!mimeType) return null;
+  try {
+    let blob = null;
+    if (typeof data === "string" && data.startsWith("data:")) {
+      const [, base64Data] = data.split(",");
+      if (base64Data) {
+        blob = convertDataToBlob(base64Data, mimeType);
+      }
+    } else if (typeof data === "string" && data.length > 0) {
+      blob = convertDataToBlob(data, mimeType);
+    } else if (data instanceof Uint8Array) {
+      blob = new Blob([data], { type: mimeType });
+    } else if (typeof Buffer !== "undefined" && Buffer.isBuffer(data)) {
+      blob = new Blob([data], { type: mimeType });
+    } else if (data instanceof Blob) {
+      blob = data;
+    }
+    if (blob) {
+      return new Attachment({
+        data: blob,
+        filename: filename || `file.${getExtensionFromMediaType(mimeType)}`,
+        contentType: mimeType
+      });
+    }
+  } catch (error) {
+    console.warn("Error converting data to attachment:", error);
+  }
+  return null;
+};
+function processAISDKInput(params) {
+  return processInputAttachmentsSync(params);
+}
+function prepareAISDKInput(params, event, span, defaultDenyOutputPaths) {
+  const { input, outputPromise } = processAISDKInput(params);
+  if (outputPromise && input && typeof input === "object") {
+    outputPromise.then((resolvedData) => {
+      span.log({
+        input: {
+          ...input,
+          ...resolvedData
+        }
+      });
+    }).catch(() => {
+    });
+  }
+  const metadata = extractMetadataFromParams(params, event.self);
+  const childTracing = prepareAISDKChildTracing(
+    params,
+    event.self,
+    span,
+    defaultDenyOutputPaths,
+    event.aiSDK
+  );
+  event.modelWrapped = childTracing.modelWrapped;
+  if (childTracing.cleanup) {
+    event.__braintrust_ai_sdk_cleanup = childTracing.cleanup;
+  }
+  return {
+    input,
+    metadata
+  };
+}
+function extractTopLevelAISDKMetrics(result, event, startTime) {
+  const metrics = hasModelChildTracing(event) ? {} : extractTokenMetrics(result);
+  if (startTime) {
+    metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+  }
+  return metrics;
+}
+function hasModelChildTracing(event) {
+  return event?.modelWrapped === true || event?.__braintrust_ai_sdk_model_wrapped === true;
+}
+function extractMetadataFromParams(params, self) {
+  const metadata = {
+    braintrust: {
+      integration_name: "ai-sdk",
+      sdk_language: "typescript"
+    }
+  };
+  const agentModel = self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && self.settings?.model ? self.settings?.model : void 0;
+  const { model, provider } = serializeModelWithProvider(
+    params.model ?? agentModel
+  );
+  if (model) {
+    metadata.model = model;
+  }
+  if (provider) {
+    metadata.provider = provider;
+  }
+  const tools = serializeAISDKToolsForLogging(params.tools);
+  if (tools) {
+    metadata.tools = tools;
+  }
+  return metadata;
+}
+function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiSDK) {
+  const cleanup = [];
+  const patchedModels = /* @__PURE__ */ new WeakSet();
+  const patchedTools = /* @__PURE__ */ new WeakSet();
+  let modelWrapped = false;
+  const patchModel = (model) => {
+    const resolvedModel = resolveAISDKModel(model, aiSDK);
+    if (!resolvedModel || typeof resolvedModel !== "object" || typeof resolvedModel.doGenerate !== "function" || patchedModels.has(resolvedModel) || resolvedModel[AUTO_PATCHED_MODEL]) {
+      return resolvedModel;
+    }
+    patchedModels.add(resolvedModel);
     resolvedModel[AUTO_PATCHED_MODEL] = true;
     modelWrapped = true;
     const originalDoGenerate = resolvedModel.doGenerate;
@@ -11022,7 +11457,7 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
             type: "llm" /* LLM */
           },
           event: {
-            input: processAISDKInput(options),
+            input: processAISDKInput(options).input,
             metadata: baseMetadata
           }
         }
@@ -11036,7 +11471,7 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
             type: "llm" /* LLM */
           },
           event: {
-            input: processAISDKInput(options),
+            input: processAISDKInput(options).input,
             metadata: baseMetadata
           }
         });
@@ -11044,6 +11479,8 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
           span,
           () => Reflect.apply(originalDoStream, resolvedModel, [options])
         );
+        const streamStartTime = getCurrentUnixTimestamp();
+        let firstChunkTime;
         const output = {};
         let text = "";
         let reasoning = "";
@@ -11051,6 +11488,9 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
         let object = void 0;
         const transformStream = new TransformStream({
           transform(chunk, controller) {
+            if (firstChunkTime === void 0) {
+              firstChunkTime = getCurrentUnixTimestamp();
+            }
             switch (chunk.type) {
               case "text-delta":
                 text += extractTextDelta(chunk);
@@ -11091,12 +11531,19 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
                 if (object !== void 0) {
                   output.object = object;
                 }
+                const metrics = extractTokenMetrics(output);
+                if (firstChunkTime !== void 0) {
+                  metrics.time_to_first_token = Math.max(
+                    firstChunkTime - streamStartTime,
+                    1e-6
+                  );
+                }
                 span.log({
                   output: processAISDKOutput(
                     output,
                     denyOutputPaths
                   ),
-                  metrics: extractTokenMetrics(output),
+                  metrics,
                   ...buildResolvedMetadataPayload(output)
                 });
                 span.end();
@@ -11118,6 +11565,7 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
       }
       delete resolvedModel[AUTO_PATCHED_MODEL];
     });
+    return resolvedModel;
   };
   const patchTool = (tool, name) => {
     if (tool == null || typeof tool !== "object" || !("execute" in tool) || typeof tool.execute !== "function" || patchedTools.has(tool) || tool[AUTO_PATCHED_TOOL]) {
@@ -11190,17 +11638,26 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
     }
   };
   if (params && typeof params === "object") {
-    patchModel(params.model);
+    const patchedParamModel = patchModel(params.model);
+    if (typeof params.model === "string" && patchedParamModel && typeof patchedParamModel === "object") {
+      params.model = patchedParamModel;
+    }
     patchTools(params.tools);
   }
   if (self && typeof self === "object") {
     const selfRecord = self;
     if (selfRecord.model !== void 0) {
-      patchModel(selfRecord.model);
+      const patchedSelfModel = patchModel(selfRecord.model);
+      if (typeof selfRecord.model === "string" && patchedSelfModel && typeof patchedSelfModel === "object") {
+        selfRecord.model = patchedSelfModel;
+      }
     }
     if (selfRecord.settings && typeof selfRecord.settings === "object") {
       if (selfRecord.settings.model !== void 0) {
-        patchModel(selfRecord.settings.model);
+        const patchedSettingsModel = patchModel(selfRecord.settings.model);
+        if (typeof selfRecord.settings.model === "string" && patchedSettingsModel && typeof patchedSettingsModel === "object") {
+          selfRecord.settings.model = patchedSettingsModel;
+        }
       }
       if (selfRecord.settings.tools !== void 0) {
         patchTools(selfRecord.settings.tools);
@@ -11224,63 +11681,173 @@ function finalizeAISDKChildTracing(event) {
   }
 }
 function patchAISDKStreamingResult(args) {
-  const { denyOutputPaths, endEvent, result, span, startTime } = args;
+  const { defaultDenyOutputPaths, endEvent, result, span, startTime } = args;
   if (!result || typeof result !== "object") {
     return false;
   }
   const resultRecord = result;
-  if (!isReadableStreamLike(resultRecord.baseStream)) {
+  attachKnownResultPromiseHandlers(resultRecord);
+  if (isReadableStreamLike(resultRecord.baseStream)) {
+    let firstChunkTime2;
+    const wrappedBaseStream = resultRecord.baseStream.pipeThrough(
+      new TransformStream({
+        transform(chunk, controller) {
+          if (firstChunkTime2 === void 0) {
+            firstChunkTime2 = getCurrentUnixTimestamp();
+          }
+          controller.enqueue(chunk);
+        },
+        async flush() {
+          const metrics = extractTopLevelAISDKMetrics(result, endEvent);
+          if (metrics.time_to_first_token === void 0 && firstChunkTime2 !== void 0) {
+            metrics.time_to_first_token = firstChunkTime2 - startTime;
+          }
+          const output = await processAISDKStreamingOutput(
+            result,
+            resolveDenyOutputPaths(endEvent, defaultDenyOutputPaths)
+          );
+          const metadata = buildResolvedMetadataPayload(result).metadata;
+          span.log({
+            output,
+            ...metadata ? { metadata } : {},
+            metrics
+          });
+          finalizeAISDKChildTracing(endEvent);
+          span.end();
+        }
+      })
+    );
+    Object.defineProperty(resultRecord, "baseStream", {
+      configurable: true,
+      enumerable: true,
+      value: wrappedBaseStream,
+      writable: true
+    });
+    return true;
+  }
+  const streamField = findAsyncIterableField(resultRecord, [
+    "partialObjectStream",
+    "textStream",
+    "fullStream",
+    "stream"
+  ]);
+  if (!streamField) {
     return false;
   }
   let firstChunkTime;
-  const wrappedBaseStream = resultRecord.baseStream.pipeThrough(
-    new TransformStream({
-      transform(chunk, controller) {
-        if (firstChunkTime === void 0) {
-          firstChunkTime = getCurrentUnixTimestamp();
-        }
-        controller.enqueue(chunk);
-      },
-      async flush() {
-        const metrics = extractTopLevelAISDKMetrics(result, endEvent);
-        if (metrics.time_to_first_token === void 0 && firstChunkTime !== void 0) {
-          metrics.time_to_first_token = firstChunkTime - startTime;
-        }
-        const output = await processAISDKStreamingOutput(
-          result,
-          denyOutputPaths
-        );
-        const metadata = buildResolvedMetadataPayload(result).metadata;
-        span.log({
-          output,
-          ...metadata ? { metadata } : {},
-          metrics
-        });
-        finalizeAISDKChildTracing(endEvent);
-        span.end();
+  const wrappedStream = createPatchedAsyncIterable(streamField.stream, {
+    onChunk: () => {
+      if (firstChunkTime === void 0) {
+        firstChunkTime = getCurrentUnixTimestamp();
       }
-    })
-  );
-  Object.defineProperty(resultRecord, "baseStream", {
+    },
+    onComplete: async () => {
+      const metrics = extractTopLevelAISDKMetrics(result, endEvent);
+      if (metrics.time_to_first_token === void 0 && firstChunkTime !== void 0) {
+        metrics.time_to_first_token = firstChunkTime - startTime;
+      }
+      const output = await processAISDKStreamingOutput(
+        result,
+        resolveDenyOutputPaths(endEvent, defaultDenyOutputPaths)
+      );
+      const metadata = buildResolvedMetadataPayload(result).metadata;
+      span.log({
+        output,
+        ...metadata ? { metadata } : {},
+        metrics
+      });
+      finalizeAISDKChildTracing(endEvent);
+      span.end();
+    },
+    onError: (error) => {
+      span.log({
+        error: error.message
+      });
+      finalizeAISDKChildTracing(endEvent);
+      span.end();
+    }
+  });
+  Object.defineProperty(resultRecord, streamField.field, {
     configurable: true,
     enumerable: true,
-    value: wrappedBaseStream,
+    value: wrappedStream,
     writable: true
   });
   return true;
 }
+function attachKnownResultPromiseHandlers(result) {
+  const promiseLikeFields = [
+    "content",
+    "text",
+    "object",
+    "finishReason",
+    "usage",
+    "totalUsage",
+    "steps"
+  ];
+  for (const field of promiseLikeFields) {
+    try {
+      if (!(field in result)) {
+        continue;
+      }
+      const value = result[field];
+      if (isPromiseLike(value)) {
+        void Promise.resolve(value).catch(() => {
+        });
+      }
+    } catch {
+    }
+  }
+}
 function isReadableStreamLike(value) {
   return value != null && typeof value === "object" && typeof value.pipeThrough === "function";
 }
+function isAsyncIterableLike(value) {
+  return value != null && typeof value === "object" && typeof value[Symbol.asyncIterator] === "function";
+}
+function findAsyncIterableField(result, candidateFields) {
+  for (const field of candidateFields) {
+    try {
+      const stream = result[field];
+      if (isAsyncIterableLike(stream)) {
+        return { field, stream };
+      }
+    } catch {
+    }
+  }
+  return null;
+}
+function createPatchedAsyncIterable(stream, hooks) {
+  return {
+    async *[Symbol.asyncIterator]() {
+      try {
+        for await (const chunk of stream) {
+          hooks.onChunk(chunk);
+          yield chunk;
+        }
+        await hooks.onComplete();
+      } catch (error) {
+        hooks.onError(
+          error instanceof Error ? error : new Error(String(error))
+        );
+        throw error;
+      }
+    }
+  };
+}
 async function processAISDKStreamingOutput(result, denyOutputPaths) {
   const output = processAISDKOutput(result, denyOutputPaths);
   if (!output || typeof output !== "object") {
     return output;
   }
   const outputRecord = output;
+  const isObjectStreamingResult = result != null && typeof result === "object" && "partialObjectStream" in result;
   try {
-    if ("text" in result && typeof result.text === "string") {
-      outputRecord.text = result.text;
+    if (!isObjectStreamingResult && "text" in result) {
+      const resolvedText = await Promise.resolve(result.text);
+      if (typeof resolvedText === "string") {
+        outputRecord.text = resolvedText;
+      }
     }
   } catch {
   }
@@ -11293,6 +11860,15 @@ async function processAISDKStreamingOutput(result, denyOutputPaths) {
     }
   } catch {
   }
+  try {
+    if ("finishReason" in result) {
+      const resolvedFinishReason = await Promise.resolve(result.finishReason);
+      if (resolvedFinishReason !== void 0) {
+        outputRecord.finishReason = resolvedFinishReason;
+      }
+    }
+  } catch {
+  }
   return outputRecord;
 }
 function buildAISDKChildMetadata(model) {
@@ -11315,16 +11891,25 @@ function buildResolvedMetadataPayload(result) {
   if (gatewayInfo?.model) {
     metadata.model = gatewayInfo.model;
   }
-  if (result.finishReason !== void 0) {
-    metadata.finish_reason = result.finishReason;
+  let finishReason;
+  try {
+    finishReason = result.finishReason;
+  } catch {
+    finishReason = void 0;
+  }
+  if (isPromiseLike(finishReason)) {
+    void Promise.resolve(finishReason).catch(() => {
+    });
+  } else if (finishReason !== void 0) {
+    metadata.finish_reason = finishReason;
   }
   return Object.keys(metadata).length > 0 ? { metadata } : {};
 }
-function resolveAISDKModel(model) {
+function resolveAISDKModel(model, aiSDK) {
   if (typeof model !== "string") {
     return model;
   }
-  const provider = globalThis.AI_SDK_DEFAULT_PROVIDER ?? null;
+  const provider = globalThis.AI_SDK_DEFAULT_PROVIDER ?? aiSDK?.gateway ?? null;
   if (provider && typeof provider.languageModel === "function") {
     return provider.languageModel(model);
   }
@@ -11347,15 +11932,15 @@ function processAISDKOutput(output, denyOutputPaths) {
 }
 function extractTokenMetrics(result) {
   const metrics = {};
-  let usage = result?.totalUsage || result?.usage;
-  if (!usage && result) {
-    try {
-      if ("totalUsage" in result && typeof result.totalUsage !== "function") {
-        usage = result.totalUsage;
-      } else if ("usage" in result && typeof result.usage !== "function") {
-        usage = result.usage;
-      }
-    } catch {
+  let usage;
+  const totalUsageValue = safeResultFieldRead(result, "totalUsage");
+  if (totalUsageValue !== void 0 && !isPromiseLike(totalUsageValue)) {
+    usage = totalUsageValue;
+  }
+  if (!usage) {
+    const usageValue = safeResultFieldRead(result, "usage");
+    if (usageValue !== void 0 && !isPromiseLike(usageValue)) {
+      usage = usageValue;
     }
   }
   if (!usage) {
@@ -11393,25 +11978,45 @@ function extractTokenMetrics(result) {
   }
   return metrics;
 }
-function aggregateAISDKChunks(chunks, _result, endEvent) {
-  const lastChunk = chunks[chunks.length - 1];
-  const output = {};
-  let metrics = {};
-  let metadata;
-  if (lastChunk) {
-    metrics = hasModelChildTracing(endEvent) ? {} : extractTokenMetrics(lastChunk);
-    metadata = buildResolvedMetadataPayload(lastChunk).metadata;
-    if (lastChunk.text !== void 0) {
-      output.text = lastChunk.text;
-    }
-    if (lastChunk.object !== void 0) {
-      output.object = lastChunk.object;
+function safeResultFieldRead(result, field) {
+  return safeSerializableFieldRead(result, field);
+}
+function safeSerializableFieldRead(obj, field) {
+  try {
+    const value = obj?.[field];
+    if (isPromiseLike(value)) {
+      void Promise.resolve(value).catch(() => {
+      });
+      return void 0;
+    }
+    return value;
+  } catch {
+    return void 0;
+  }
+}
+function aggregateAISDKChunks(chunks, _result, endEvent) {
+  const lastChunk = chunks[chunks.length - 1];
+  const output = {};
+  let metrics = {};
+  let metadata;
+  if (lastChunk) {
+    metrics = hasModelChildTracing(endEvent) ? {} : extractTokenMetrics(lastChunk);
+    metadata = buildResolvedMetadataPayload(lastChunk).metadata;
+    const text = safeSerializableFieldRead(lastChunk, "text");
+    if (text !== void 0) {
+      output.text = text;
     }
-    if (lastChunk.finishReason !== void 0) {
-      output.finishReason = lastChunk.finishReason;
+    const objectValue = safeSerializableFieldRead(lastChunk, "object");
+    if (objectValue !== void 0) {
+      output.object = objectValue;
     }
-    if (lastChunk.toolCalls !== void 0) {
-      output.toolCalls = lastChunk.toolCalls;
+    const finishReason = safeSerializableFieldRead(lastChunk, "finishReason");
+    if (finishReason !== void 0) {
+      output.finishReason = finishReason;
+    }
+    const toolCalls = safeSerializableFieldRead(lastChunk, "toolCalls");
+    if (toolCalls !== void 0) {
+      output.toolCalls = toolCalls;
     }
   }
   finalizeAISDKChildTracing(endEvent);
@@ -11420,6 +12025,7 @@ function aggregateAISDKChunks(chunks, _result, endEvent) {
 function extractGetterValues(obj) {
   const getterValues = {};
   const getterNames = [
+    "content",
     "text",
     "object",
     "finishReason",
@@ -11435,8 +12041,17 @@ function extractGetterValues(obj) {
   ];
   for (const name of getterNames) {
     try {
-      if (obj && name in obj && isSerializableOutputValue(obj[name])) {
-        getterValues[name] = obj[name];
+      if (!obj || !(name in obj)) {
+        continue;
+      }
+      const value = obj[name];
+      if (isPromiseLike(value)) {
+        void Promise.resolve(value).catch(() => {
+        });
+        continue;
+      }
+      if (isSerializableOutputValue(value)) {
+        getterValues[name] = value;
       }
     } catch {
     }
@@ -11458,6 +12073,11 @@ function extractSerializableOutputFields(output) {
   for (const name of directFieldNames) {
     try {
       const value = output?.[name];
+      if (isPromiseLike(value)) {
+        void Promise.resolve(value).catch(() => {
+        });
+        continue;
+      }
       if (isSerializableOutputValue(value)) {
         serialized[name] = value;
       }
@@ -11469,6 +12089,9 @@ function extractSerializableOutputFields(output) {
     ...extractGetterValues(output)
   };
 }
+function isPromiseLike(value) {
+  return value != null && typeof value === "object" && typeof value.then === "function";
+}
 function isSerializableOutputValue(value) {
   if (typeof value === "function") {
     return false;
@@ -11510,8 +12133,9 @@ function parseGatewayModelString(modelString) {
   return { model: modelString };
 }
 function extractGatewayRoutingInfo(result) {
-  if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
-    const routing2 = result.steps[0]?.providerMetadata?.gateway?.routing;
+  const steps = safeSerializableFieldRead(result, "steps");
+  if (Array.isArray(steps) && steps.length > 0) {
+    const routing2 = steps[0]?.providerMetadata?.gateway?.routing;
     if (routing2) {
       return {
         provider: routing2.resolvedProvider || routing2.finalProvider,
@@ -11519,7 +12143,11 @@ function extractGatewayRoutingInfo(result) {
       };
     }
   }
-  const routing = result?.providerMetadata?.gateway?.routing;
+  const providerMetadata = safeSerializableFieldRead(
+    result,
+    "providerMetadata"
+  );
+  const routing = providerMetadata?.gateway?.routing;
   if (routing) {
     return {
       provider: routing.resolvedProvider || routing.finalProvider,
@@ -11529,10 +12157,11 @@ function extractGatewayRoutingInfo(result) {
   return null;
 }
 function extractCostFromResult(result) {
-  if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
+  const steps = safeSerializableFieldRead(result, "steps");
+  if (Array.isArray(steps) && steps.length > 0) {
     let totalCost = 0;
     let foundCost = false;
-    for (const step of result.steps) {
+    for (const step of steps) {
       const gateway2 = step?.providerMetadata?.gateway;
       const stepCost = parseGatewayCost(gateway2?.cost) || parseGatewayCost(gateway2?.marketCost);
       if (stepCost !== void 0 && stepCost > 0) {
@@ -11544,7 +12173,11 @@ function extractCostFromResult(result) {
       return totalCost;
     }
   }
-  const gateway = result?.providerMetadata?.gateway;
+  const providerMetadata = safeSerializableFieldRead(
+    result,
+    "providerMetadata"
+  );
+  const gateway = providerMetadata?.gateway;
   const directCost = parseGatewayCost(gateway?.cost) || parseGatewayCost(gateway?.marketCost);
   if (directCost !== void 0 && directCost > 0) {
     return directCost;
@@ -11656,12 +12289,15 @@ var claudeAgentSDKChannels = defineChannels(
   {
     query: channel({
       channelName: "query",
-      kind: "async"
+      kind: "sync-stream"
     })
   }
 );
 
 // src/instrumentation/plugins/claude-agent-sdk-plugin.ts
+function isSubAgentToolName(toolName) {
+  return toolName === "Agent" || toolName === "Task";
+}
 function filterSerializableOptions(options) {
   const allowedKeys = [
     "model",
@@ -11715,34 +12351,50 @@ function extractUsageFromMessage(message) {
   const cacheReadTokens = getNumberProperty(usage, "cache_read_input_tokens") || 0;
   const cacheCreationTokens = getNumberProperty(usage, "cache_creation_input_tokens") || 0;
   if (cacheReadTokens > 0 || cacheCreationTokens > 0) {
-    const cacheTokens = extractAnthropicCacheTokens(
-      cacheReadTokens,
-      cacheCreationTokens
+    Object.assign(
+      metrics,
+      extractAnthropicCacheTokens(cacheReadTokens, cacheCreationTokens)
     );
-    Object.assign(metrics, cacheTokens);
   }
   if (Object.keys(metrics).length > 0) {
     Object.assign(metrics, finalizeAnthropicTokens(metrics));
   }
   return metrics;
 }
-function buildLLMInput(prompt, conversationHistory) {
-  const promptMessage = typeof prompt === "string" ? { content: prompt, role: "user" } : void 0;
-  const inputParts = [
-    ...promptMessage ? [promptMessage] : [],
-    ...conversationHistory
-  ];
+function buildLLMInput(prompt, conversationHistory, capturedPromptMessages) {
+  const promptMessages = [];
+  if (typeof prompt === "string") {
+    promptMessages.push({ content: prompt, role: "user" });
+  } else if (capturedPromptMessages && capturedPromptMessages.length > 0) {
+    for (const msg of capturedPromptMessages) {
+      const role = msg.message?.role;
+      const content = msg.message?.content;
+      if (role && content !== void 0) {
+        promptMessages.push({ content, role });
+      }
+    }
+  }
+  const inputParts = [...promptMessages, ...conversationHistory];
   return inputParts.length > 0 ? inputParts : void 0;
 }
-async function createLLMSpanForMessages(messages, prompt, conversationHistory, options, startTime, parentSpan) {
-  if (messages.length === 0) return void 0;
+function formatCapturedMessages(messages) {
+  return messages.length > 0 ? messages : [];
+}
+async function createLLMSpanForMessages(messages, prompt, conversationHistory, options, startTime, capturedPromptMessages, parentSpan) {
+  if (messages.length === 0) {
+    return void 0;
+  }
   const lastMessage = messages[messages.length - 1];
   if (lastMessage.type !== "assistant" || !lastMessage.message?.usage) {
     return void 0;
   }
   const model = lastMessage.message.model || options.model;
   const usage = extractUsageFromMessage(lastMessage);
-  const input = buildLLMInput(prompt, conversationHistory);
+  const input = buildLLMInput(
+    prompt,
+    conversationHistory,
+    capturedPromptMessages
+  );
   const outputs = messages.map(
     (m) => m.message?.content && m.message?.role ? { content: m.message.content, role: m.message.role } : void 0
   ).filter(
@@ -11750,21 +12402,359 @@ async function createLLMSpanForMessages(messages, prompt, conversationHistory, o
   );
   const span = startSpan({
     name: "anthropic.messages.create",
+    parent: parentSpan,
     spanAttributes: {
       type: "llm" /* LLM */
     },
-    startTime,
-    parent: parentSpan
+    startTime
   });
   span.log({
     input,
-    output: outputs,
     metadata: model ? { model } : void 0,
-    metrics: usage
+    metrics: usage,
+    output: outputs
   });
   await span.end();
   return lastMessage.message?.content && lastMessage.message?.role ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
 }
+function getMcpServerMetadata(serverName, mcpServers) {
+  if (!serverName || !mcpServers) {
+    return {};
+  }
+  const serverConfig = mcpServers[serverName];
+  if (!serverConfig) {
+    return {};
+  }
+  const metadata = {};
+  if (serverConfig.type) {
+    metadata["mcp.type"] = serverConfig.type;
+  } else if (typeof serverConfig === "object" && "transport" in serverConfig) {
+    metadata["mcp.type"] = "sdk";
+  }
+  if (serverConfig.url) {
+    metadata["mcp.url"] = serverConfig.url;
+  }
+  if (serverConfig.command) {
+    metadata["mcp.command"] = serverConfig.command;
+    if (serverConfig.args) {
+      metadata["mcp.args"] = serverConfig.args.join(" ");
+    }
+  }
+  return metadata;
+}
+function parseToolName(rawToolName) {
+  const mcpMatch = rawToolName.match(/^mcp__([^_]+)__(.+)$/);
+  if (mcpMatch) {
+    const [, mcpServer, toolName] = mcpMatch;
+    return {
+      displayName: `tool: ${mcpServer}/${toolName}`,
+      mcpServer,
+      rawToolName,
+      toolName
+    };
+  }
+  return {
+    displayName: `tool: ${rawToolName}`,
+    rawToolName,
+    toolName: rawToolName
+  };
+}
+function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers, subAgentSpans, endedSubAgentSpans) {
+  const preToolUse = async (input, toolUseID) => {
+    if (input.hook_event_name !== "PreToolUse" || !toolUseID) {
+      return {};
+    }
+    if (isSubAgentToolName(input.tool_name)) {
+      return {};
+    }
+    const parsed = parseToolName(input.tool_name);
+    const toolSpan = startSpan({
+      event: {
+        input: input.tool_input,
+        metadata: {
+          "claude_agent_sdk.cwd": input.cwd,
+          "claude_agent_sdk.raw_tool_name": parsed.rawToolName,
+          "claude_agent_sdk.session_id": input.session_id,
+          "gen_ai.tool.call.id": toolUseID,
+          "gen_ai.tool.name": parsed.toolName,
+          ...parsed.mcpServer && { "mcp.server": parsed.mcpServer },
+          ...getMcpServerMetadata(parsed.mcpServer, mcpServers)
+        }
+      },
+      name: parsed.displayName,
+      parent: await resolveParentSpan(toolUseID),
+      spanAttributes: { type: "tool" /* TOOL */ }
+    });
+    activeToolSpans.set(toolUseID, toolSpan);
+    return {};
+  };
+  const postToolUse = async (input, toolUseID) => {
+    if (input.hook_event_name !== "PostToolUse" || !toolUseID) {
+      return {};
+    }
+    const subAgentSpan = subAgentSpans.get(toolUseID);
+    if (subAgentSpan) {
+      try {
+        const response = input.tool_response;
+        const metadata = {};
+        if (response?.status) {
+          metadata["claude_agent_sdk.status"] = response.status;
+        }
+        if (response?.totalDurationMs) {
+          metadata["claude_agent_sdk.duration_ms"] = response.totalDurationMs;
+        }
+        if (response?.totalToolUseCount !== void 0) {
+          metadata["claude_agent_sdk.tool_use_count"] = response.totalToolUseCount;
+        }
+        subAgentSpan.log({
+          metadata,
+          output: response?.content
+        });
+      } finally {
+        subAgentSpan.end();
+        endedSubAgentSpans.add(toolUseID);
+      }
+      return {};
+    }
+    const toolSpan = activeToolSpans.get(toolUseID);
+    if (!toolSpan) {
+      return {};
+    }
+    try {
+      toolSpan.log({ output: input.tool_response });
+    } finally {
+      toolSpan.end();
+      activeToolSpans.delete(toolUseID);
+    }
+    return {};
+  };
+  const postToolUseFailure = async (input, toolUseID) => {
+    if (input.hook_event_name !== "PostToolUseFailure" || !toolUseID) {
+      return {};
+    }
+    const subAgentSpan = subAgentSpans.get(toolUseID);
+    if (subAgentSpan) {
+      try {
+        subAgentSpan.log({ error: input.error });
+      } finally {
+        subAgentSpan.end();
+        endedSubAgentSpans.add(toolUseID);
+      }
+      return {};
+    }
+    const toolSpan = activeToolSpans.get(toolUseID);
+    if (!toolSpan) {
+      return {};
+    }
+    const parsed = parseToolName(input.tool_name);
+    try {
+      toolSpan.log({
+        error: input.error,
+        metadata: {
+          "claude_agent_sdk.is_interrupt": input.is_interrupt,
+          "claude_agent_sdk.session_id": input.session_id,
+          "gen_ai.tool.call.id": toolUseID,
+          "gen_ai.tool.name": parsed.toolName,
+          ...parsed.mcpServer && { "mcp.server": parsed.mcpServer }
+        }
+      });
+    } finally {
+      toolSpan.end();
+      activeToolSpans.delete(toolUseID);
+    }
+    return {};
+  };
+  return { postToolUse, postToolUseFailure, preToolUse };
+}
+function injectTracingHooks(options, resolveParentSpan, activeToolSpans, subAgentSpans, endedSubAgentSpans) {
+  const { preToolUse, postToolUse, postToolUseFailure } = createToolTracingHooks(
+    resolveParentSpan,
+    activeToolSpans,
+    options.mcpServers,
+    subAgentSpans,
+    endedSubAgentSpans
+  );
+  const existingHooks = options.hooks ?? {};
+  return {
+    ...options,
+    hooks: {
+      ...existingHooks,
+      PostToolUse: [
+        ...existingHooks.PostToolUse ?? [],
+        { hooks: [postToolUse] }
+      ],
+      PostToolUseFailure: [
+        ...existingHooks.PostToolUseFailure ?? [],
+        {
+          hooks: [postToolUseFailure]
+        }
+      ],
+      PreToolUse: [
+        ...existingHooks.PreToolUse ?? [],
+        { hooks: [preToolUse] }
+      ]
+    }
+  };
+}
+async function finalizeCurrentMessageGroup(state) {
+  if (state.currentMessages.length === 0) {
+    return;
+  }
+  const parentToolUseId = state.currentMessages[0]?.parent_tool_use_id ?? null;
+  let parentSpan = await state.span.export();
+  if (parentToolUseId) {
+    const subAgentSpan = state.subAgentSpans.get(parentToolUseId);
+    if (subAgentSpan) {
+      parentSpan = await subAgentSpan.export();
+    }
+  }
+  const finalMessage = await createLLMSpanForMessages(
+    state.currentMessages,
+    state.originalPrompt,
+    state.finalResults,
+    state.options,
+    state.currentMessageStartTime,
+    state.capturedPromptMessages,
+    parentSpan
+  );
+  if (finalMessage) {
+    state.finalResults.push(finalMessage);
+  }
+  const lastMessage = state.currentMessages[state.currentMessages.length - 1];
+  if (lastMessage?.message?.usage) {
+    state.accumulatedOutputTokens += getNumberProperty(lastMessage.message.usage, "output_tokens") || 0;
+  }
+  state.currentMessages.length = 0;
+}
+function maybeTrackToolUseContext(state, message) {
+  if (message.type !== "assistant" || !Array.isArray(message.message?.content)) {
+    return;
+  }
+  const parentToolUseId = message.parent_tool_use_id ?? null;
+  for (const block of message.message.content) {
+    if (typeof block !== "object" || block === null || !("type" in block) || block.type !== "tool_use" || !("id" in block) || typeof block.id !== "string") {
+      continue;
+    }
+    state.toolUseToParent.set(block.id, parentToolUseId);
+    if (block.name === "Task" && typeof block.input === "object" && block.input !== null && "subagent_type" in block.input && typeof block.input.subagent_type === "string") {
+      state.pendingSubAgentNames.set(block.id, block.input.subagent_type);
+    }
+  }
+}
+async function maybeStartSubAgentSpan(state, message) {
+  if (!("parent_tool_use_id" in message)) {
+    return;
+  }
+  const parentToolUseId = message.parent_tool_use_id;
+  if (!parentToolUseId) {
+    return;
+  }
+  await ensureSubAgentSpan(
+    state.pendingSubAgentNames,
+    state.span,
+    state.subAgentSpans,
+    parentToolUseId
+  );
+}
+async function ensureSubAgentSpan(pendingSubAgentNames, rootSpan, subAgentSpans, parentToolUseId) {
+  const existingSpan = subAgentSpans.get(parentToolUseId);
+  if (existingSpan) {
+    return existingSpan;
+  }
+  const agentName = pendingSubAgentNames.get(parentToolUseId);
+  const spanName = agentName ? `Agent: ${agentName}` : "Agent: sub-agent";
+  const subAgentSpan = startSpan({
+    event: {
+      metadata: {
+        ...agentName && { "claude_agent_sdk.agent_type": agentName }
+      }
+    },
+    name: spanName,
+    parent: await rootSpan.export(),
+    spanAttributes: { type: "task" /* TASK */ }
+  });
+  subAgentSpans.set(parentToolUseId, subAgentSpan);
+  return subAgentSpan;
+}
+async function handleStreamMessage(state, message) {
+  maybeTrackToolUseContext(state, message);
+  await maybeStartSubAgentSpan(state, message);
+  const messageId = message.message?.id;
+  if (messageId && messageId !== state.currentMessageId) {
+    await finalizeCurrentMessageGroup(state);
+    state.currentMessageId = messageId;
+    state.currentMessageStartTime = getCurrentUnixTimestamp();
+  }
+  if (message.type === "assistant" && message.message?.usage) {
+    state.currentMessages.push(message);
+  }
+  if (message.type !== "result" || !message.usage) {
+    return;
+  }
+  const finalUsageMetrics = extractUsageFromMessage(message);
+  if (state.currentMessages.length > 0 && finalUsageMetrics.completion_tokens !== void 0) {
+    const lastMessage = state.currentMessages[state.currentMessages.length - 1];
+    if (lastMessage?.message?.usage) {
+      const adjustedTokens = finalUsageMetrics.completion_tokens - state.accumulatedOutputTokens;
+      if (adjustedTokens >= 0) {
+        lastMessage.message.usage.output_tokens = adjustedTokens;
+      }
+      const resultUsage = message.usage;
+      if (resultUsage && typeof resultUsage === "object") {
+        const cacheReadTokens = getNumberProperty(
+          resultUsage,
+          "cache_read_input_tokens"
+        );
+        if (cacheReadTokens !== void 0) {
+          lastMessage.message.usage.cache_read_input_tokens = cacheReadTokens;
+        }
+        const cacheCreationTokens = getNumberProperty(
+          resultUsage,
+          "cache_creation_input_tokens"
+        );
+        if (cacheCreationTokens !== void 0) {
+          lastMessage.message.usage.cache_creation_input_tokens = cacheCreationTokens;
+        }
+      }
+    }
+  }
+  const metadata = {};
+  if (message.num_turns !== void 0) {
+    metadata.num_turns = message.num_turns;
+  }
+  if (message.session_id !== void 0) {
+    metadata.session_id = message.session_id;
+  }
+  if (Object.keys(metadata).length > 0) {
+    state.span.log({ metadata });
+  }
+}
+async function finalizeQuerySpan(state) {
+  try {
+    await finalizeCurrentMessageGroup(state);
+    state.span.log({
+      output: state.finalResults.length > 0 ? state.finalResults[state.finalResults.length - 1] : void 0
+    });
+    if (state.capturedPromptMessages) {
+      if (state.promptStarted()) {
+        await state.promptDone;
+      }
+      if (state.capturedPromptMessages.length > 0) {
+        state.span.log({
+          input: formatCapturedMessages(state.capturedPromptMessages)
+        });
+      }
+    }
+  } finally {
+    for (const [id, subAgentSpan] of state.subAgentSpans) {
+      if (!state.endedSubAgentSpans.has(id)) {
+        subAgentSpan.end();
+      }
+    }
+    state.subAgentSpans.clear();
+    state.span.end();
+  }
+}
 var ClaudeAgentSDKPlugin = class extends BasePlugin {
   onEnable() {
     this.subscribeToQuery();
@@ -11775,19 +12765,36 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
     }
     this.unsubscribers = [];
   }
-  /**
-   * Subscribe to the query channel for agent interactions.
-   * Handles streaming responses and traces both the top-level agent task
-   * and individual LLM calls.
-   */
   subscribeToQuery() {
     const channel2 = claudeAgentSDKChannels.query.tracingChannel();
     const spans = /* @__PURE__ */ new WeakMap();
     const handlers = {
       start: (event) => {
-        const params = event.arguments[0];
-        const prompt = params?.prompt;
-        const options = params?.options ?? {};
+        const params = event.arguments[0] ?? {};
+        const originalPrompt = params.prompt;
+        const options = params.options ?? {};
+        const promptIsAsyncIterable = isAsyncIterable(originalPrompt);
+        let promptStarted = false;
+        let capturedPromptMessages;
+        let resolvePromptDone;
+        const promptDone = new Promise((resolve) => {
+          resolvePromptDone = resolve;
+        });
+        if (promptIsAsyncIterable) {
+          capturedPromptMessages = [];
+          const promptStream = originalPrompt;
+          params.prompt = (async function* () {
+            promptStarted = true;
+            try {
+              for await (const message of promptStream) {
+                capturedPromptMessages.push(message);
+                yield message;
+              }
+            } finally {
+              resolvePromptDone?.();
+            }
+          })();
+        }
         const span = startSpan({
           name: "Claude Agent",
           spanAttributes: {
@@ -11797,163 +12804,111 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         const startTime = getCurrentUnixTimestamp();
         try {
           span.log({
-            input: typeof prompt === "string" ? prompt : {
-              type: "streaming",
-              description: "AsyncIterable<ClaudeAgentSDKMessage>"
-            },
+            input: typeof originalPrompt === "string" ? originalPrompt : promptIsAsyncIterable ? void 0 : originalPrompt !== void 0 ? String(originalPrompt) : void 0,
             metadata: filterSerializableOptions(options)
           });
         } catch (error) {
           console.error("Error extracting input for Claude Agent SDK:", error);
         }
+        const activeToolSpans = /* @__PURE__ */ new Map();
+        const subAgentSpans = /* @__PURE__ */ new Map();
+        const endedSubAgentSpans = /* @__PURE__ */ new Set();
+        const toolUseToParent = /* @__PURE__ */ new Map();
+        const pendingSubAgentNames = /* @__PURE__ */ new Map();
+        const optionsWithHooks = injectTracingHooks(
+          options,
+          async (toolUseID) => {
+            const parentToolUseId = toolUseToParent.get(toolUseID);
+            if (parentToolUseId) {
+              const subAgentSpan = await ensureSubAgentSpan(
+                pendingSubAgentNames,
+                span,
+                subAgentSpans,
+                parentToolUseId
+              );
+              return subAgentSpan.export();
+            }
+            return span.export();
+          },
+          activeToolSpans,
+          subAgentSpans,
+          endedSubAgentSpans
+        );
+        params.options = optionsWithHooks;
+        event.arguments[0] = params;
         spans.set(event, {
-          span,
-          startTime,
-          conversationHistory: [],
-          currentMessages: [],
+          accumulatedOutputTokens: 0,
+          activeToolSpans,
+          capturedPromptMessages,
           currentMessageId: void 0,
           currentMessageStartTime: startTime,
-          accumulatedOutputTokens: 0
+          currentMessages: [],
+          endedSubAgentSpans,
+          finalResults: [],
+          options: optionsWithHooks,
+          originalPrompt,
+          pendingSubAgentNames,
+          processing: Promise.resolve(),
+          promptDone,
+          promptStarted: () => promptStarted,
+          span,
+          subAgentSpans,
+          toolUseToParent
         });
       },
-      asyncEnd: (event) => {
-        const spanData = spans.get(event);
-        if (!spanData) {
+      end: (event) => {
+        const state = spans.get(event);
+        if (!state) {
           return;
         }
         const eventResult = event.result;
         if (eventResult === void 0) {
-          spanData.span.end();
+          state.span.end();
           spans.delete(event);
           return;
         }
         if (isAsyncIterable(eventResult)) {
           patchStreamIfNeeded(eventResult, {
-            onChunk: async (message) => {
-              const currentTime = getCurrentUnixTimestamp();
-              const params = event.arguments[0];
-              const prompt = params?.prompt;
-              const options = params?.options ?? {};
-              const messageId = message.message?.id;
-              if (messageId && messageId !== spanData.currentMessageId) {
-                if (spanData.currentMessages.length > 0) {
-                  const finalMessage = await createLLMSpanForMessages(
-                    spanData.currentMessages,
-                    prompt,
-                    spanData.conversationHistory,
-                    options,
-                    spanData.currentMessageStartTime,
-                    await spanData.span.export()
-                  );
-                  if (finalMessage) {
-                    spanData.conversationHistory.push(finalMessage);
-                  }
-                  const lastMessage = spanData.currentMessages[spanData.currentMessages.length - 1];
-                  if (lastMessage?.message?.usage) {
-                    const outputTokens = getNumberProperty(
-                      lastMessage.message.usage,
-                      "output_tokens"
-                    ) || 0;
-                    spanData.accumulatedOutputTokens += outputTokens;
-                  }
-                  spanData.currentMessages = [];
-                }
-                spanData.currentMessageId = messageId;
-                spanData.currentMessageStartTime = currentTime;
-              }
-              if (message.type === "assistant" && message.message?.usage) {
-                spanData.currentMessages.push(message);
-              }
-              if (message.type === "result" && message.usage) {
-                const finalUsageMetrics = extractUsageFromMessage(message);
-                if (spanData.currentMessages.length > 0 && finalUsageMetrics.completion_tokens !== void 0) {
-                  const lastMessage = spanData.currentMessages[spanData.currentMessages.length - 1];
-                  if (lastMessage?.message?.usage) {
-                    const adjustedTokens = finalUsageMetrics.completion_tokens - spanData.accumulatedOutputTokens;
-                    if (adjustedTokens >= 0) {
-                      lastMessage.message.usage.output_tokens = adjustedTokens;
-                    }
-                  }
-                }
-                const result_metadata = {};
-                if (message.num_turns !== void 0) {
-                  result_metadata.num_turns = message.num_turns;
-                }
-                if (message.session_id !== void 0) {
-                  result_metadata.session_id = message.session_id;
-                }
-                if (Object.keys(result_metadata).length > 0) {
-                  spanData.span.log({
-                    metadata: result_metadata
-                  });
-                }
-              }
-            },
-            onComplete: async () => {
-              try {
-                const params = event.arguments[0];
-                const prompt = params?.prompt;
-                const options = params?.options ?? {};
-                if (spanData.currentMessages.length > 0) {
-                  const finalMessage = await createLLMSpanForMessages(
-                    spanData.currentMessages,
-                    prompt,
-                    spanData.conversationHistory,
-                    options,
-                    spanData.currentMessageStartTime,
-                    await spanData.span.export()
-                  );
-                  if (finalMessage) {
-                    spanData.conversationHistory.push(finalMessage);
-                  }
-                }
-                spanData.span.log({
-                  output: spanData.conversationHistory.length > 0 ? spanData.conversationHistory[spanData.conversationHistory.length - 1] : void 0
-                });
-              } catch (error) {
+            onChunk: (message) => {
+              maybeTrackToolUseContext(state, message);
+              state.processing = state.processing.then(() => handleStreamMessage(state, message)).catch((error) => {
                 console.error(
-                  "Error extracting output for Claude Agent SDK:",
+                  "Error processing Claude Agent SDK stream chunk:",
                   error
                 );
-              } finally {
-                spanData.span.end();
-                spans.delete(event);
-              }
+              });
             },
-            onError: (error) => {
-              spanData.span.log({
+            onComplete: () => state.processing.then(() => finalizeQuerySpan(state)).finally(() => {
+              spans.delete(event);
+            }),
+            onError: (error) => state.processing.then(() => {
+              state.span.log({
                 error: error.message
               });
-              spanData.span.end();
+            }).then(() => finalizeQuerySpan(state)).finally(() => {
               spans.delete(event);
-            }
+            })
           });
-        } else {
-          try {
-            spanData.span.log({
-              output: eventResult
-            });
-          } catch (error) {
-            console.error(
-              "Error extracting output for Claude Agent SDK:",
-              error
-            );
-          } finally {
-            spanData.span.end();
-            spans.delete(event);
-          }
+          return;
+        }
+        try {
+          state.span.log({ output: eventResult });
+        } catch (error) {
+          console.error("Error extracting output for Claude Agent SDK:", error);
+        } finally {
+          state.span.end();
+          spans.delete(event);
         }
       },
       error: (event) => {
-        const spanData = spans.get(event);
-        if (!spanData || !event.error) {
+        const state = spans.get(event);
+        if (!state || !event.error) {
           return;
         }
-        const { span } = spanData;
-        span.log({
+        state.span.log({
           error: event.error.message
         });
-        span.end();
+        state.span.end();
         spans.delete(event);
       }
     };
@@ -11977,6 +12932,18 @@ var googleGenAIChannels = defineChannels("@google/genai", {
 });
 
 // src/instrumentation/plugins/google-genai-plugin.ts
+var GOOGLE_GENAI_INTERNAL_CONTEXT = {
+  caller_filename: "<node-internal>",
+  caller_functionname: "<node-internal>",
+  caller_lineno: 0
+};
+function createWrapperParityEvent(args) {
+  return {
+    context: GOOGLE_GENAI_INTERNAL_CONTEXT,
+    input: args.input,
+    metadata: args.metadata
+  };
+}
 var GoogleGenAIPlugin = class extends BasePlugin {
   onEnable() {
     this.subscribeToGoogleGenAIChannels();
@@ -11985,51 +12952,283 @@ var GoogleGenAIPlugin = class extends BasePlugin {
     this.unsubscribers = unsubscribeAll(this.unsubscribers);
   }
   subscribeToGoogleGenAIChannels() {
-    this.unsubscribers.push(
-      traceAsyncChannel(googleGenAIChannels.generateContent, {
-        name: "google-genai.generateContent",
-        type: "llm" /* LLM */,
-        extractInput: ([params]) => {
+    this.subscribeToGenerateContentChannel();
+    this.subscribeToGenerateContentStreamChannel();
+  }
+  subscribeToGenerateContentChannel() {
+    const tracingChannel2 = googleGenAIChannels.generateContent.tracingChannel();
+    const states = /* @__PURE__ */ new WeakMap();
+    const unbindCurrentSpanStore = bindCurrentSpanStoreToStart2(
+      tracingChannel2,
+      states,
+      (event) => {
+        const params = event.arguments[0];
+        const input = serializeInput(params);
+        const metadata = extractMetadata(params);
+        const span = startSpan({
+          name: "generate_content",
+          spanAttributes: {
+            type: "llm" /* LLM */
+          },
+          event: createWrapperParityEvent({ input, metadata })
+        });
+        return {
+          span,
+          startTime: getCurrentUnixTimestamp()
+        };
+      }
+    );
+    const handlers = {
+      start: (event) => {
+        ensureSpanState(states, event, () => {
+          const params = event.arguments[0];
           const input = serializeInput(params);
           const metadata = extractMetadata(params);
+          const span = startSpan({
+            name: "generate_content",
+            spanAttributes: {
+              type: "llm" /* LLM */
+            },
+            event: createWrapperParityEvent({ input, metadata })
+          });
           return {
-            input,
-            metadata: { ...metadata, provider: "google-genai" }
+            span,
+            startTime: getCurrentUnixTimestamp()
           };
-        },
-        extractOutput: (result) => {
-          return result;
-        },
-        extractMetrics: (result, startTime) => {
-          return extractGenerateContentMetrics(result, startTime);
+        });
+      },
+      asyncEnd: (event) => {
+        const spanState = states.get(event);
+        if (!spanState) {
+          return;
         }
-      })
-    );
-    this.unsubscribers.push(
-      traceStreamingChannel(googleGenAIChannels.generateContentStream, {
-        name: "google-genai.generateContentStream",
-        type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const input = serializeInput(params);
-          const metadata = extractMetadata(params);
-          return {
-            input,
-            metadata: { ...metadata, provider: "google-genai" }
-          };
-        },
-        extractOutput: (result) => {
-          return result;
-        },
-        extractMetrics: () => {
-          return {};
-        },
-        aggregateChunks: (chunks, _result, _endEvent, startTime) => {
-          return aggregateGenerateContentChunks(chunks, startTime);
+        try {
+          spanState.span.log({
+            metrics: cleanMetrics(
+              extractGenerateContentMetrics(
+                event.result,
+                spanState.startTime
+              )
+            ),
+            output: event.result
+          });
+        } finally {
+          spanState.span.end();
+          states.delete(event);
         }
-      })
-    );
+      },
+      error: (event) => {
+        logErrorAndEndSpan(states, event);
+      }
+    };
+    tracingChannel2.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      unbindCurrentSpanStore?.();
+      tracingChannel2.unsubscribe(handlers);
+    });
+  }
+  subscribeToGenerateContentStreamChannel() {
+    const tracingChannel2 = googleGenAIChannels.generateContentStream.tracingChannel();
+    const handlers = {
+      start: (event) => {
+        const streamEvent = event;
+        const params = event.arguments[0];
+        streamEvent.googleGenAIInput = serializeInput(params);
+        streamEvent.googleGenAIMetadata = extractMetadata(params);
+        streamEvent.googleGenAIStartTime = getCurrentUnixTimestamp();
+      },
+      asyncEnd: (event) => {
+        const streamEvent = event;
+        patchGoogleGenAIStreamingResult({
+          input: streamEvent.googleGenAIInput,
+          metadata: streamEvent.googleGenAIMetadata,
+          startTime: streamEvent.googleGenAIStartTime,
+          result: streamEvent.result
+        });
+      },
+      error: () => {
+      }
+    };
+    tracingChannel2.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      tracingChannel2.unsubscribe(handlers);
+    });
   }
 };
+function ensureSpanState(states, event, create) {
+  const existing = states.get(event);
+  if (existing) {
+    return existing;
+  }
+  const created = create();
+  states.set(event, created);
+  return created;
+}
+function bindCurrentSpanStoreToStart2(tracingChannel2, states, create) {
+  const state = _internalGetGlobalState();
+  const startChannel = tracingChannel2.start;
+  const currentSpanStore = state?.contextManager ? state.contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
+  if (!startChannel?.bindStore || !currentSpanStore) {
+    return void 0;
+  }
+  startChannel.bindStore(
+    currentSpanStore,
+    (event) => ensureSpanState(
+      states,
+      event,
+      () => create(event)
+    ).span
+  );
+  return () => {
+    startChannel.unbindStore?.(currentSpanStore);
+  };
+}
+function logErrorAndEndSpan(states, event) {
+  const spanState = states.get(event);
+  if (!spanState) {
+    return;
+  }
+  spanState.span.log({
+    error: event.error.message
+  });
+  spanState.span.end();
+  states.delete(event);
+}
+function patchGoogleGenAIStreamingResult(args) {
+  const { input, metadata, result, startTime } = args;
+  if (!input || !metadata || !result || typeof result !== "object" || typeof result.next !== "function") {
+    return false;
+  }
+  const chunks = [];
+  let firstTokenTime = null;
+  let finalized = false;
+  let span = null;
+  const requestStartTime = startTime ?? getCurrentUnixTimestamp();
+  const ensureSpan = () => {
+    if (!span) {
+      span = startSpan({
+        name: "generate_content_stream",
+        spanAttributes: {
+          type: "llm" /* LLM */
+        },
+        event: {
+          input,
+          metadata
+        }
+      });
+    }
+    return span;
+  };
+  const finalize = (options) => {
+    if (finalized || !span) {
+      return;
+    }
+    finalized = true;
+    if (options.result) {
+      const { end, ...metricsWithoutEnd } = options.result.metrics;
+      span.log({
+        metrics: cleanMetrics(metricsWithoutEnd),
+        output: options.result.aggregated
+      });
+      span.end(typeof end === "number" ? { endTime: end } : void 0);
+      return;
+    }
+    if (options.error !== void 0) {
+      span.log({
+        error: options.error instanceof Error ? options.error.message : String(options.error)
+      });
+    }
+    span.end();
+  };
+  const patchIterator = (iterator) => {
+    if (typeof iterator !== "object" || iterator === null || "__braintrustGoogleGenAIPatched" in iterator) {
+      return iterator;
+    }
+    const iteratorRecord = iterator;
+    const originalNext = typeof iteratorRecord.next === "function" ? iteratorRecord.next.bind(iterator) : void 0;
+    const originalReturn = typeof iteratorRecord.return === "function" ? iteratorRecord.return.bind(iterator) : void 0;
+    const originalThrow = typeof iteratorRecord.throw === "function" ? iteratorRecord.throw.bind(iterator) : void 0;
+    const asyncIteratorMethod = iteratorRecord[Symbol.asyncIterator];
+    const originalAsyncIterator = typeof asyncIteratorMethod === "function" ? asyncIteratorMethod.bind(iterator) : void 0;
+    Object.defineProperty(iteratorRecord, "__braintrustGoogleGenAIPatched", {
+      configurable: true,
+      enumerable: false,
+      value: true,
+      writable: false
+    });
+    if (originalNext) {
+      iteratorRecord.next = async (...nextArgs) => {
+        ensureSpan();
+        try {
+          const nextResult = await originalNext(
+            ...nextArgs
+          );
+          if (!nextResult.done && nextResult.value) {
+            if (firstTokenTime === null) {
+              firstTokenTime = getCurrentUnixTimestamp();
+            }
+            chunks.push(nextResult.value);
+          }
+          if (nextResult.done) {
+            finalize({
+              result: aggregateGenerateContentChunks(
+                chunks,
+                requestStartTime,
+                firstTokenTime
+              )
+            });
+          }
+          return nextResult;
+        } catch (error) {
+          finalize({ error });
+          throw error;
+        }
+      };
+    }
+    if (originalReturn) {
+      iteratorRecord.return = async (...returnArgs) => {
+        ensureSpan();
+        try {
+          return await originalReturn(
+            ...returnArgs
+          );
+        } finally {
+          if (chunks.length > 0) {
+            finalize({
+              result: aggregateGenerateContentChunks(
+                chunks,
+                requestStartTime,
+                firstTokenTime
+              )
+            });
+          } else {
+            finalize({});
+          }
+        }
+      };
+    }
+    if (originalThrow) {
+      iteratorRecord.throw = async (...throwArgs) => {
+        ensureSpan();
+        try {
+          return await originalThrow(
+            ...throwArgs
+          );
+        } catch (error) {
+          finalize({ error });
+          throw error;
+        }
+      };
+    }
+    iteratorRecord[Symbol.asyncIterator] = () => {
+      const asyncIterator = originalAsyncIterator ? originalAsyncIterator() : iterator;
+      return patchIterator(asyncIterator);
+    };
+    return iterator;
+  };
+  patchIterator(result);
+  return true;
+}
 function serializeInput(params) {
   const input = {
     model: params.model,
@@ -12038,11 +13237,13 @@ function serializeInput(params) {
   if (params.config) {
     const config = tryToDict(params.config);
     if (config) {
-      const tools = serializeTools(params);
-      if (tools) {
-        config.tools = tools;
-      }
-      input.config = config;
+      const filteredConfig = {};
+      Object.keys(config).forEach((key) => {
+        if (key !== "tools") {
+          filteredConfig[key] = config[key];
+        }
+      });
+      input.config = filteredConfig;
     }
   }
   return input;
@@ -12129,12 +13330,18 @@ function extractMetadata(params) {
       });
     }
   }
+  const tools = serializeTools(params);
+  if (tools) {
+    metadata.tools = tools;
+  }
   return metadata;
 }
 function extractGenerateContentMetrics(response, startTime) {
   const metrics = {};
-  if (startTime) {
+  if (startTime !== void 0) {
     const end = getCurrentUnixTimestamp();
+    metrics.start = startTime;
+    metrics.end = end;
     metrics.duration = end - startTime;
   }
   if (response?.usageMetadata) {
@@ -12159,19 +13366,18 @@ function populateUsageMetrics(metrics, usage) {
     metrics.completion_reasoning_tokens = usage.thoughtsTokenCount;
   }
 }
-function aggregateGenerateContentChunks(chunks, startTime) {
-  const metrics = {};
-  if (startTime !== void 0) {
-    const end = getCurrentUnixTimestamp();
-    metrics.duration = end - startTime;
-  }
-  let firstTokenTime = null;
-  if (chunks.length > 0 && firstTokenTime === null && startTime !== void 0) {
-    firstTokenTime = getCurrentUnixTimestamp();
+function aggregateGenerateContentChunks(chunks, startTime, firstTokenTime) {
+  const end = getCurrentUnixTimestamp();
+  const metrics = {
+    start: startTime,
+    end,
+    duration: end - startTime
+  };
+  if (firstTokenTime !== null) {
     metrics.time_to_first_token = firstTokenTime - startTime;
   }
   if (chunks.length === 0) {
-    return { output: {}, metrics };
+    return { aggregated: {}, metrics };
   }
   let text = "";
   let thoughtText = "";
@@ -12207,7 +13413,7 @@ function aggregateGenerateContentChunks(chunks, startTime) {
       }
     }
   }
-  const output = {};
+  const aggregated = {};
   const parts = [];
   if (thoughtText) {
     parts.push({ text: thoughtText, thought: true });
@@ -12233,16 +13439,25 @@ function aggregateGenerateContentChunks(chunks, startTime) {
       }
       candidates.push(candidateDict);
     }
-    output.candidates = candidates;
+    aggregated.candidates = candidates;
   }
   if (usageMetadata) {
-    output.usageMetadata = usageMetadata;
+    aggregated.usageMetadata = usageMetadata;
     populateUsageMetrics(metrics, usageMetadata);
   }
   if (text) {
-    output.text = text;
+    aggregated.text = text;
+  }
+  return { aggregated, metrics };
+}
+function cleanMetrics(metrics) {
+  const cleaned = {};
+  for (const [key, value] of Object.entries(metrics)) {
+    if (value !== null && value !== void 0) {
+      cleaned[key] = value;
+    }
   }
-  return { output, metrics };
+  return cleaned;
 }
 function tryToDict(obj) {
   if (obj === null || obj === void 0) {
@@ -12276,895 +13491,535 @@ var openRouterChannels = defineChannels("@openrouter/sdk", {
     channelName: "callModel",
     kind: "sync-stream"
   }),
+  callModelTurn: channel({
+    channelName: "callModel.turn",
+    kind: "async"
+  }),
   toolExecute: channel({
     channelName: "tool.execute",
     kind: "async"
   })
 });
 
-// src/openrouter-utils.ts
-var TOKEN_NAME_MAP2 = {
-  promptTokens: "prompt_tokens",
-  inputTokens: "prompt_tokens",
-  completionTokens: "completion_tokens",
-  outputTokens: "completion_tokens",
-  totalTokens: "tokens",
-  prompt_tokens: "prompt_tokens",
-  input_tokens: "prompt_tokens",
-  completion_tokens: "completion_tokens",
-  output_tokens: "completion_tokens",
-  total_tokens: "tokens"
-};
-var TOKEN_DETAIL_PREFIX_MAP = {
-  promptTokensDetails: "prompt",
-  inputTokensDetails: "prompt",
-  completionTokensDetails: "completion",
-  outputTokensDetails: "completion",
-  costDetails: "cost",
-  prompt_tokens_details: "prompt",
-  input_tokens_details: "prompt",
-  completion_tokens_details: "completion",
-  output_tokens_details: "completion",
-  cost_details: "cost"
-};
-function camelToSnake(value) {
-  return value.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
-}
-function parseOpenRouterMetricsFromUsage(usage) {
-  if (!isObject(usage)) {
-    return {};
-  }
-  const metrics = {};
-  for (const [name, value] of Object.entries(usage)) {
-    if (typeof value === "number") {
-      metrics[TOKEN_NAME_MAP2[name] || camelToSnake(name)] = value;
-      continue;
-    }
-    if (!isObject(value)) {
-      continue;
-    }
-    const prefix = TOKEN_DETAIL_PREFIX_MAP[name];
-    if (!prefix) {
-      continue;
-    }
-    for (const [nestedName, nestedValue] of Object.entries(value)) {
-      if (typeof nestedValue !== "number") {
-        continue;
-      }
-      metrics[`${prefix}_${camelToSnake(nestedName)}`] = nestedValue;
-    }
-  }
-  return metrics;
-}
-function extractOpenRouterUsageMetadata(usage) {
-  if (!isObject(usage)) {
-    return void 0;
-  }
-  const metadata = {};
-  if (typeof usage.isByok === "boolean") {
-    metadata.is_byok = usage.isByok;
-  } else if (typeof usage.is_byok === "boolean") {
-    metadata.is_byok = usage.is_byok;
-  }
-  return Object.keys(metadata).length > 0 ? metadata : void 0;
-}
-
-// src/openrouter-logging.ts
-var OMITTED_OPENROUTER_KEYS = /* @__PURE__ */ new Set([
-  "execute",
-  "render",
-  "nextTurnParams",
-  "requireApproval"
-]);
-function parseOpenRouterModelString(model) {
-  if (typeof model !== "string") {
-    return { model };
-  }
-  const slashIndex = model.indexOf("/");
-  if (slashIndex > 0 && slashIndex < model.length - 1) {
-    return {
-      provider: model.substring(0, slashIndex),
-      model: model.substring(slashIndex + 1)
-    };
-  }
-  return { model };
-}
-function isZodSchema2(value) {
-  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
-}
-function serializeZodSchema2(schema) {
-  try {
-    return zodToJsonSchema(schema);
-  } catch {
-    return {
-      type: "object",
-      description: "Zod schema (conversion failed)"
-    };
+// src/instrumentation/plugins/openrouter-plugin.ts
+var OpenRouterPlugin = class extends BasePlugin {
+  onEnable() {
+    this.subscribeToOpenRouterChannels();
   }
-}
-function serializeOpenRouterTool(tool) {
-  if (!isObject(tool)) {
-    return tool;
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
   }
-  const serialized = {};
-  for (const [key, value] of Object.entries(tool)) {
-    if (OMITTED_OPENROUTER_KEYS.has(key)) {
-      continue;
-    }
-    if (key === "function" && isObject(value)) {
-      serialized.function = sanitizeOpenRouterLoggedValue(value);
-      continue;
-    }
-    serialized[key] = sanitizeOpenRouterLoggedValue(value);
-  }
-  return serialized;
-}
-function serializeOpenRouterToolsForLogging(tools) {
-  if (!Array.isArray(tools)) {
-    return void 0;
-  }
-  return tools.map((tool) => serializeOpenRouterTool(tool));
-}
-function sanitizeOpenRouterLoggedValue(value) {
-  if (isZodSchema2(value)) {
-    return serializeZodSchema2(value);
-  }
-  if (typeof value === "function") {
-    return "[Function]";
-  }
-  if (Array.isArray(value)) {
-    return value.map((entry) => sanitizeOpenRouterLoggedValue(entry));
-  }
-  if (!isObject(value)) {
-    return value;
-  }
-  const sanitized = {};
-  for (const [key, entry] of Object.entries(value)) {
-    if (OMITTED_OPENROUTER_KEYS.has(key)) {
-      continue;
-    }
-    if (key === "tools" && Array.isArray(entry)) {
-      sanitized.tools = serializeOpenRouterToolsForLogging(entry);
-      continue;
-    }
-    sanitized[key] = sanitizeOpenRouterLoggedValue(entry);
-  }
-  return sanitized;
-}
-function buildOpenRouterMetadata(metadata, httpReferer, xTitle) {
-  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
-  const metadataRecord = isObject(sanitized) ? sanitized : {};
-  const { model, provider: providerRouting, ...rest } = metadataRecord;
-  const normalizedModel = parseOpenRouterModelString(model);
-  return {
-    ...rest,
-    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
-    ...providerRouting !== void 0 ? { providerRouting } : {},
-    ...httpReferer !== void 0 ? { httpReferer } : {},
-    ...xTitle !== void 0 ? { xTitle } : {},
-    provider: normalizedModel.provider || "openrouter"
-  };
-}
-function buildOpenRouterEmbeddingMetadata(metadata, httpReferer, xTitle) {
-  const normalized = buildOpenRouterMetadata(metadata, httpReferer, xTitle);
-  return typeof normalized.model === "string" ? {
-    ...normalized,
-    embedding_model: normalized.model
-  } : normalized;
-}
-function extractOpenRouterCallModelInput(request) {
-  return isObject(request) && "input" in request ? sanitizeOpenRouterLoggedValue(request.input) : void 0;
-}
-function extractOpenRouterCallModelMetadata(request) {
-  if (!isObject(request)) {
-    return { provider: "openrouter" };
-  }
-  const { input: _input, ...metadata } = request;
-  return buildOpenRouterMetadata(metadata, void 0, void 0);
-}
-function extractOpenRouterResponseMetadata(result) {
-  if (!isObject(result)) {
-    return void 0;
-  }
-  const { output: _output, data: _data, usage, ...metadata } = result;
-  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
-  const metadataRecord = isObject(sanitized) ? sanitized : {};
-  const { model, provider, ...rest } = metadataRecord;
-  const normalizedModel = parseOpenRouterModelString(model);
-  const normalizedProvider = (typeof provider === "string" ? provider : void 0) || normalizedModel.provider;
-  const usageMetadata = extractOpenRouterUsageMetadata(usage);
-  const combined = {
-    ...rest,
-    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
-    ...usageMetadata || {},
-    ...normalizedProvider !== void 0 ? { provider: normalizedProvider } : {}
-  };
-  return Object.keys(combined).length > 0 ? combined : void 0;
-}
-function extractOpenRouterResponseOutput(response, fallbackOutput) {
-  if (isObject(response) && "output" in response && response.output !== void 0) {
-    return sanitizeOpenRouterLoggedValue(response.output);
-  }
-  if (fallbackOutput !== void 0) {
-    return sanitizeOpenRouterLoggedValue(fallbackOutput);
-  }
-  return void 0;
-}
-
-// src/openrouter-tool-wrapping.ts
-var OPENROUTER_WRAPPED_TOOL = Symbol("braintrust.openrouter.wrappedTool");
-var OPENROUTER_WRAPPED_CALL_MODEL_RESULT = Symbol(
-  "braintrust.openrouter.wrappedCallModelResult"
-);
-var OPENROUTER_CALL_MODEL_STREAM_METHODS = [
-  "getFullResponsesStream",
-  "getItemsStream",
-  "getNewMessagesStream",
-  "getReasoningStream",
-  "getTextStream",
-  "getToolCallsStream",
-  "getToolStream"
-];
-var OPENROUTER_CALL_MODEL_CONTEXT_METHODS = [
-  "cancel",
-  "getPendingToolCalls",
-  "getState",
-  "getToolCalls",
-  "requiresApproval"
-];
-function patchOpenRouterCallModelRequestTools(request) {
-  if (!Array.isArray(request.tools) || request.tools.length === 0) {
-    return void 0;
-  }
-  const originalTools = request.tools;
-  const wrappedTools = originalTools.map((tool) => wrapOpenRouterTool(tool));
-  const didPatch = wrappedTools.some(
-    (tool, index) => tool !== originalTools[index]
-  );
-  if (!didPatch) {
-    return void 0;
-  }
-  request.tools = wrappedTools;
-  return () => {
-    request.tools = originalTools;
-  };
-}
-function patchOpenRouterCallModelResult(span, result, request) {
-  if (!isObject(result) || isWrappedCallModelResult(result)) {
-    return false;
-  }
-  const resultLike = result;
-  const hasInstrumentableMethod = typeof resultLike.getResponse === "function" || typeof resultLike.getText === "function" || OPENROUTER_CALL_MODEL_STREAM_METHODS.some(
-    (methodName) => typeof resultLike[methodName] === "function"
-  );
-  if (!hasInstrumentableMethod) {
-    return false;
-  }
-  Object.defineProperty(resultLike, OPENROUTER_WRAPPED_CALL_MODEL_RESULT, {
-    value: true,
-    enumerable: false,
-    configurable: false
-  });
-  const originalGetResponse = typeof resultLike.getResponse === "function" ? resultLike.getResponse.bind(resultLike) : void 0;
-  const originalGetInitialResponse = typeof resultLike.getInitialResponse === "function" ? resultLike.getInitialResponse.bind(resultLike) : void 0;
-  const originalMakeFollowupRequest = typeof resultLike.makeFollowupRequest === "function" ? resultLike.makeFollowupRequest.bind(resultLike) : void 0;
-  let ended = false;
-  let tracedTurnCount = 0;
-  const endSpanWithResult = async (response, fallbackOutput) => {
-    if (ended) {
-      return;
-    }
-    ended = true;
-    const finalResponse = getFinalOpenRouterCallModelResponse(
-      resultLike,
-      response
+  subscribeToOpenRouterChannels() {
+    this.unsubscribers.push(
+      traceStreamingChannel(openRouterChannels.chatSend, {
+        name: "openrouter.chat.send",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterRequestArg(args);
+          const chatGenerationParams = isObject(request?.chatGenerationParams) ? request.chatGenerationParams : {};
+          const httpReferer = request?.httpReferer;
+          const xTitle = request?.xTitle;
+          const { messages, ...metadata } = chatGenerationParams;
+          return {
+            input: messages,
+            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
+          };
+        },
+        extractOutput: (result) => {
+          return isObject(result) ? result.choices : void 0;
+        },
+        extractMetrics: (result, startTime) => {
+          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
+          if (startTime) {
+            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+          }
+          return metrics;
+        },
+        aggregateChunks: aggregateOpenRouterChatChunks
+      })
     );
-    if (finalResponse) {
-      const rounds = getOpenRouterCallModelRounds(resultLike);
-      const metadata = extractOpenRouterCallModelResultMetadata(
-        finalResponse,
-        rounds.length + 1
-      );
-      span.log({
-        output: extractOpenRouterResponseOutput(finalResponse, fallbackOutput),
-        ...metadata ? { metadata } : {},
-        metrics: aggregateOpenRouterCallModelMetrics(rounds, finalResponse)
-      });
-      span.end();
-      return;
-    }
-    if (fallbackOutput !== void 0) {
-      span.log({
-        output: fallbackOutput
-      });
-    }
-    span.end();
-  };
-  const endSpanWithError = (error) => {
-    if (ended) {
-      return;
-    }
-    ended = true;
-    span.log({
-      error: normalizeError(error).message
-    });
-    span.end();
-  };
-  const finalizeFromResponse = async (fallbackOutput) => {
-    if (!originalGetResponse) {
-      await endSpanWithResult(void 0, fallbackOutput);
-      return;
-    }
-    try {
-      await endSpanWithResult(await originalGetResponse(), fallbackOutput);
-    } catch {
-      await endSpanWithResult(void 0, fallbackOutput);
-    }
-  };
-  if (originalGetResponse) {
-    resultLike.getResponse = async (...args) => {
-      return await withCurrent(span, async () => {
-        try {
-          const response = await originalGetResponse(...args);
-          await endSpanWithResult(response);
-          return response;
-        } catch (error) {
-          endSpanWithError(error);
-          throw error;
-        }
-      });
-    };
-  }
-  if (typeof resultLike.getText === "function") {
-    const originalGetText = resultLike.getText.bind(resultLike);
-    resultLike.getText = async (...args) => {
-      return await withCurrent(span, async () => {
-        try {
-          const text = await originalGetText(...args);
-          await finalizeFromResponse(text);
-          return text;
-        } catch (error) {
-          endSpanWithError(error);
-          throw error;
+    this.unsubscribers.push(
+      traceAsyncChannel(openRouterChannels.embeddingsGenerate, {
+        name: "openrouter.embeddings.generate",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterRequestArg(args);
+          const requestBody = isObject(request?.requestBody) ? request.requestBody : {};
+          const httpReferer = request?.httpReferer;
+          const xTitle = request?.xTitle;
+          const { input, ...metadata } = requestBody;
+          return {
+            input,
+            metadata: buildOpenRouterEmbeddingMetadata(
+              metadata,
+              httpReferer,
+              xTitle
+            )
+          };
+        },
+        extractOutput: (result) => {
+          if (!isObject(result)) {
+            return void 0;
+          }
+          const embedding = result.data?.[0]?.embedding;
+          return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
+        },
+        extractMetadata: (result) => {
+          if (!isObject(result)) {
+            return void 0;
+          }
+          return extractOpenRouterResponseMetadata(result);
+        },
+        extractMetrics: (result) => {
+          return isObject(result) ? parseOpenRouterMetricsFromUsage(result.usage) : {};
         }
-      });
-    };
-  }
-  for (const methodName of OPENROUTER_CALL_MODEL_CONTEXT_METHODS) {
-    if (typeof resultLike[methodName] !== "function") {
-      continue;
-    }
-    const originalMethod = resultLike[methodName];
-    resultLike[methodName] = async (...args) => {
-      return await withCurrent(span, async () => {
-        return await originalMethod.apply(resultLike, args);
-      });
-    };
-  }
-  for (const methodName of OPENROUTER_CALL_MODEL_STREAM_METHODS) {
-    if (typeof resultLike[methodName] !== "function") {
-      continue;
-    }
-    const originalMethod = resultLike[methodName];
-    resultLike[methodName] = (...args) => {
-      const stream = withCurrent(
-        span,
-        () => originalMethod.apply(resultLike, args)
-      );
-      if (!isAsyncIterable2(stream)) {
-        return stream;
-      }
-      return wrapAsyncIterableWithSpan({
-        finalize: finalizeFromResponse,
-        iteratorFactory: () => stream[Symbol.asyncIterator](),
-        onError: endSpanWithError,
-        span
-      });
-    };
-  }
-  if (originalGetInitialResponse) {
-    let initialTurnTraced = false;
-    resultLike.getInitialResponse = async (...args) => {
-      if (initialTurnTraced) {
-        return await withCurrent(span, async () => {
-          return await originalGetInitialResponse(...args);
-        });
-      }
-      initialTurnTraced = true;
-      const resolvedRequest = getOpenRouterResolvedRequest(resultLike, request);
-      const childSpan = startOpenRouterCallModelTurnSpan({
-        request: resolvedRequest,
-        step: tracedTurnCount + 1,
-        stepType: tracedTurnCount === 0 ? "initial" : "continue"
-      });
-      return await withCurrent(childSpan, async () => {
-        try {
-          const response = await originalGetInitialResponse(...args);
-          tracedTurnCount++;
-          finishOpenRouterCallModelTurnSpan({
-            response,
-            step: tracedTurnCount,
-            stepType: tracedTurnCount === 1 ? "initial" : "continue",
-            span: childSpan
-          });
-          return response;
-        } catch (error) {
-          childSpan.log({
-            error: normalizeError(error).message
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(openRouterChannels.betaResponsesSend, {
+        name: "openrouter.beta.responses.send",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterRequestArg(args);
+          const openResponsesRequest = isObject(request?.openResponsesRequest) ? request.openResponsesRequest : {};
+          const httpReferer = request?.httpReferer;
+          const xTitle = request?.xTitle;
+          const { input, ...metadata } = openResponsesRequest;
+          return {
+            input,
+            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
+          };
+        },
+        extractOutput: (result) => extractOpenRouterResponseOutput(result),
+        extractMetadata: (result) => extractOpenRouterResponseMetadata(result),
+        extractMetrics: (result, startTime) => {
+          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
+          if (startTime) {
+            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+          }
+          return metrics;
+        },
+        aggregateChunks: aggregateOpenRouterResponseStreamEvents
+      })
+    );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(openRouterChannels.callModel, {
+        name: "openrouter.callModel",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterCallModelRequestArg(args);
+          return {
+            input: request ? extractOpenRouterCallModelInput(request) : void 0,
+            metadata: request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" }
+          };
+        },
+        patchResult: ({ endEvent, result, span }) => {
+          return patchOpenRouterCallModelResult({
+            request: getOpenRouterCallModelRequestArg(endEvent.arguments),
+            result,
+            span
           });
-          childSpan.end();
-          throw error;
         }
-      });
-    };
-  }
-  if (originalMakeFollowupRequest) {
-    resultLike.makeFollowupRequest = async (...args) => {
-      const currentResponse = args[0];
-      const toolResults = Array.isArray(args[1]) ? args[1] : [];
-      const resolvedRequest = getOpenRouterResolvedRequest(resultLike, request);
-      const followupRequest = buildOpenRouterFollowupRequest(
-        resolvedRequest,
-        currentResponse,
-        toolResults
-      );
-      const childSpan = startOpenRouterCallModelTurnSpan({
-        request: followupRequest,
-        step: tracedTurnCount + 1,
-        stepType: "continue"
-      });
-      return await withCurrent(childSpan, async () => {
-        try {
-          const response = await originalMakeFollowupRequest(...args);
-          tracedTurnCount++;
-          finishOpenRouterCallModelTurnSpan({
-            response,
-            step: tracedTurnCount,
-            stepType: "continue",
-            span: childSpan
-          });
-          return response;
-        } catch (error) {
-          childSpan.log({
-            error: normalizeError(error).message
-          });
-          childSpan.end();
-          throw error;
+      })
+    );
+    this.unsubscribers.push(
+      traceAsyncChannel(openRouterChannels.callModelTurn, {
+        name: "openrouter.beta.responses.send",
+        type: "llm" /* LLM */,
+        extractInput: (args, event) => {
+          const request = getOpenRouterCallModelRequestArg(args);
+          const metadata = request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" };
+          if (isObject(metadata) && "tools" in metadata) {
+            delete metadata.tools;
+          }
+          return {
+            input: request ? extractOpenRouterCallModelInput(request) : void 0,
+            metadata: {
+              ...metadata,
+              step: event.step,
+              step_type: event.stepType
+            }
+          };
+        },
+        extractOutput: (result) => extractOpenRouterResponseOutput(result),
+        extractMetadata: (result, event) => {
+          if (!isObject(result)) {
+            return {
+              step: event?.step,
+              step_type: event?.stepType
+            };
+          }
+          return {
+            ...extractOpenRouterResponseMetadata(result) || {},
+            ...event?.step !== void 0 ? { step: event.step } : {},
+            ...event?.stepType ? { step_type: event.stepType } : {}
+          };
+        },
+        extractMetrics: (result) => isObject(result) ? parseOpenRouterMetricsFromUsage(result.usage) : {}
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(openRouterChannels.toolExecute, {
+        name: "openrouter.tool",
+        type: "tool" /* TOOL */,
+        extractInput: (args, event) => ({
+          input: args[0],
+          metadata: {
+            provider: "openrouter",
+            tool_name: event.toolName,
+            ...event.toolCallId ? { tool_call_id: event.toolCallId } : {}
+          }
+        }),
+        extractOutput: (result) => result,
+        extractMetrics: () => ({}),
+        aggregateChunks: (chunks) => ({
+          output: chunks.length > 0 ? chunks[chunks.length - 1] : void 0,
+          metrics: {}
+        })
+      })
+    );
+    const callModelChannel = openRouterChannels.callModel.tracingChannel();
+    const callModelHandlers = {
+      start: (event) => {
+        const request = getOpenRouterCallModelRequestArg(event.arguments);
+        if (!request) {
+          return;
         }
-      });
+        patchOpenRouterCallModelRequestTools(request);
+      }
     };
+    callModelChannel.subscribe(callModelHandlers);
+    this.unsubscribers.push(() => {
+      callModelChannel.unsubscribe(callModelHandlers);
+    });
   }
-  return true;
-}
-function wrapOpenRouterTool(tool) {
-  if (isWrappedTool(tool) || !tool.function || typeof tool.function !== "object" || typeof tool.function.execute !== "function") {
-    return tool;
-  }
-  const toolName = tool.function.name || "tool";
-  const originalExecute = tool.function.execute;
-  const wrappedTool = {
-    ...tool,
-    function: {
-      ...tool.function,
-      execute(...args) {
-        return traceToolExecution({
-          args,
-          execute: () => Reflect.apply(originalExecute, this, args),
-          toolCallId: getToolCallId(args[1]),
-          toolName
-        });
-      }
-    }
-  };
-  Object.defineProperty(wrappedTool, OPENROUTER_WRAPPED_TOOL, {
-    value: true,
-    enumerable: false,
-    configurable: false
-  });
-  return wrappedTool;
-}
-function isWrappedTool(tool) {
-  return Boolean(tool[OPENROUTER_WRAPPED_TOOL]);
-}
-function isWrappedCallModelResult(value) {
-  return Boolean(
-    isObject(value) && value[OPENROUTER_WRAPPED_CALL_MODEL_RESULT]
-  );
-}
-function traceToolExecution(args) {
-  const tracingChannel2 = openRouterChannels.toolExecute.tracingChannel();
-  const input = args.args.length > 0 ? args.args[0] : void 0;
-  const event = {
-    arguments: [input],
-    span_info: {
-      name: args.toolName
-    },
-    toolCallId: args.toolCallId,
-    toolName: args.toolName
-  };
-  tracingChannel2.start.publish(event);
-  try {
-    const result = args.execute();
-    return publishToolResult(tracingChannel2, event, result);
-  } catch (error) {
-    event.error = normalizeError(error);
-    tracingChannel2.error.publish(event);
-    throw error;
+};
+function normalizeArgs(args) {
+  if (Array.isArray(args)) {
+    return args;
   }
-}
-function publishToolResult(tracingChannel2, event, result) {
-  if (isPromiseLike(result)) {
-    return result.then(
-      (resolved) => {
-        event.result = resolved;
-        tracingChannel2.asyncEnd.publish(event);
-        return resolved;
-      },
-      (error) => {
-        event.error = normalizeError(error);
-        tracingChannel2.error.publish(event);
-        throw error;
-      }
-    );
+  if (isArrayLike(args)) {
+    return Array.from(args);
   }
-  event.result = result;
-  tracingChannel2.asyncEnd.publish(event);
-  return result;
-}
-function getToolCallId(context) {
-  const toolContext = context;
-  return typeof toolContext?.toolCall?.id === "string" ? toolContext.toolCall.id : void 0;
+  return [args];
 }
-function extractOpenRouterCallModelResultMetadata(response, turnCount) {
-  const combined = {
-    ...extractOpenRouterResponseMetadata(response) || {},
-    ...turnCount !== void 0 ? { turn_count: turnCount } : {}
-  };
-  return Object.keys(combined).length > 0 ? combined : void 0;
+function isArrayLike(value) {
+  return isObject(value) && "length" in value && typeof value.length === "number" && Number.isInteger(value.length) && value.length >= 0;
 }
-function getFinalOpenRouterCallModelResponse(result, response) {
-  if (isObject(response)) {
-    return response;
+function getOpenRouterRequestArg(args) {
+  const normalizedArgs = normalizeArgs(args);
+  const keyedCandidate = normalizedArgs.find(
+    (arg) => isObject(arg) && ("chatGenerationParams" in arg || "requestBody" in arg || "openResponsesRequest" in arg)
+  );
+  if (isObject(keyedCandidate)) {
+    return keyedCandidate;
   }
-  return isObject(result.finalResponse) ? result.finalResponse : void 0;
+  const firstObjectArg = normalizedArgs.find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
 }
-function getOpenRouterCallModelRounds(result) {
-  if (!Array.isArray(result.allToolExecutionRounds)) {
-    return [];
-  }
-  return result.allToolExecutionRounds.filter((round) => isObject(round)).map((round) => ({
-    response: isObject(round.response) ? round.response : void 0,
-    round: typeof round.round === "number" ? round.round : void 0,
-    toolResults: Array.isArray(round.toolResults) ? round.toolResults : []
-  })).filter((round) => round.response !== void 0);
+function getOpenRouterCallModelRequestArg(args) {
+  const firstObjectArg = normalizeArgs(args).find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
 }
-function aggregateOpenRouterCallModelMetrics(rounds, finalResponse) {
+var TOKEN_NAME_MAP2 = {
+  promptTokens: "prompt_tokens",
+  inputTokens: "prompt_tokens",
+  completionTokens: "completion_tokens",
+  outputTokens: "completion_tokens",
+  totalTokens: "tokens",
+  prompt_tokens: "prompt_tokens",
+  input_tokens: "prompt_tokens",
+  completion_tokens: "completion_tokens",
+  output_tokens: "completion_tokens",
+  total_tokens: "tokens"
+};
+var TOKEN_DETAIL_PREFIX_MAP = {
+  promptTokensDetails: "prompt",
+  inputTokensDetails: "prompt",
+  completionTokensDetails: "completion",
+  outputTokensDetails: "completion",
+  costDetails: "cost",
+  prompt_tokens_details: "prompt",
+  input_tokens_details: "prompt",
+  completion_tokens_details: "completion",
+  output_tokens_details: "completion",
+  cost_details: "cost"
+};
+function camelToSnake(value) {
+  return value.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
+}
+function parseOpenRouterMetricsFromUsage(usage) {
+  if (!isObject(usage)) {
+    return {};
+  }
   const metrics = {};
-  const responses = [
-    ...rounds.map((round) => round.response).filter(isObject),
-    finalResponse
-  ];
-  for (const response of responses) {
-    const responseMetrics = parseOpenRouterMetricsFromUsage(response.usage);
-    for (const [name, value] of Object.entries(responseMetrics)) {
-      metrics[name] = (metrics[name] || 0) + value;
+  for (const [name, value] of Object.entries(usage)) {
+    if (typeof value === "number") {
+      metrics[TOKEN_NAME_MAP2[name] || camelToSnake(name)] = value;
+      continue;
+    }
+    if (!isObject(value)) {
+      continue;
+    }
+    const prefix = TOKEN_DETAIL_PREFIX_MAP[name];
+    if (!prefix) {
+      continue;
+    }
+    for (const [nestedName, nestedValue] of Object.entries(value)) {
+      if (typeof nestedValue !== "number") {
+        continue;
+      }
+      metrics[`${prefix}_${camelToSnake(nestedName)}`] = nestedValue;
     }
   }
   return metrics;
 }
-function buildNextOpenRouterCallModelInput(currentInput, response, toolResults) {
-  const normalizedInput = Array.isArray(currentInput) ? [...currentInput] : currentInput === void 0 ? [] : [currentInput];
-  const responseOutput = Array.isArray(response.output) ? response.output : response.output === void 0 ? [] : [response.output];
-  return [...normalizedInput, ...responseOutput, ...toolResults].map(
-    (entry) => sanitizeOpenRouterLoggedValue(entry)
-  );
+function extractOpenRouterUsageMetadata(usage) {
+  if (!isObject(usage)) {
+    return void 0;
+  }
+  const metadata = {};
+  if (typeof usage.isByok === "boolean") {
+    metadata.is_byok = usage.isByok;
+  } else if (typeof usage.is_byok === "boolean") {
+    metadata.is_byok = usage.is_byok;
+  }
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
 }
-function startOpenRouterCallModelTurnSpan(args) {
-  const requestRecord = isObject(args.request) ? args.request : void 0;
-  const metadata = requestRecord ? extractOpenRouterCallModelMetadata(requestRecord) : { provider: "openrouter" };
-  if (isObject(metadata) && "tools" in metadata) {
-    delete metadata.tools;
+var OMITTED_OPENROUTER_KEYS = /* @__PURE__ */ new Set([
+  "execute",
+  "render",
+  "nextTurnParams",
+  "requireApproval"
+]);
+function parseOpenRouterModelString(model) {
+  if (typeof model !== "string") {
+    return { model };
   }
-  return startSpan({
-    name: "openrouter.beta.responses.send",
-    spanAttributes: {
-      type: "llm" /* LLM */
-    },
-    event: {
-      input: requestRecord ? extractOpenRouterCallModelInput(requestRecord) : void 0,
-      metadata: {
-        ...metadata,
-        step: args.step,
-        step_type: args.stepType
-      }
-    }
-  });
+  const slashIndex = model.indexOf("/");
+  if (slashIndex > 0 && slashIndex < model.length - 1) {
+    return {
+      provider: model.substring(0, slashIndex),
+      model: model.substring(slashIndex + 1)
+    };
+  }
+  return { model };
 }
-function finishOpenRouterCallModelTurnSpan(args) {
-  if (!isObject(args.response)) {
-    args.span.end();
-    return;
+function isZodSchema3(value) {
+  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
+}
+function serializeZodSchema3(schema) {
+  try {
+    return zodToJsonSchema(schema);
+  } catch {
+    return {
+      type: "object",
+      description: "Zod schema (conversion failed)"
+    };
   }
-  args.span.log({
-    output: extractOpenRouterResponseOutput(args.response),
-    ...extractOpenRouterResponseMetadata(args.response) ? {
-      metadata: {
-        ...extractOpenRouterResponseMetadata(args.response),
-        ...args.step !== void 0 ? { step: args.step } : {},
-        ...args.stepType ? { step_type: args.stepType } : {}
-      }
-    } : {},
-    metrics: parseOpenRouterMetricsFromUsage(args.response.usage)
-  });
-  args.span.end();
 }
-function getOpenRouterResolvedRequest(result, request) {
-  if (isObject(result.resolvedRequest)) {
-    return result.resolvedRequest;
+function serializeOpenRouterTool(tool) {
+  if (!isObject(tool)) {
+    return tool;
   }
-  return request;
+  const serialized = {};
+  for (const [key, value] of Object.entries(tool)) {
+    if (OMITTED_OPENROUTER_KEYS.has(key)) {
+      continue;
+    }
+    if (key === "function" && isObject(value)) {
+      serialized.function = sanitizeOpenRouterLoggedValue(value);
+      continue;
+    }
+    serialized[key] = sanitizeOpenRouterLoggedValue(value);
+  }
+  return serialized;
 }
-function buildOpenRouterFollowupRequest(request, currentResponse, toolResults) {
-  if (!request) {
+function serializeOpenRouterToolsForLogging(tools) {
+  if (!Array.isArray(tools)) {
     return void 0;
   }
-  return {
-    ...request,
-    input: buildNextOpenRouterCallModelInput(
-      extractOpenRouterCallModelInput(request),
-      isObject(currentResponse) ? currentResponse : {},
-      toolResults
-    ),
-    stream: false
-  };
+  return tools.map((tool) => serializeOpenRouterTool(tool));
 }
-function wrapAsyncIterableWithSpan(args) {
-  return {
-    [Symbol.asyncIterator]() {
-      const iterator = args.iteratorFactory();
-      return {
-        next(value) {
-          return withCurrent(
-            args.span,
-            () => value === void 0 ? iterator.next() : iterator.next(value)
-          ).then(
-            async (result) => {
-              if (result.done) {
-                await args.finalize();
-              }
-              return result;
-            },
-            (error) => {
-              args.onError(error);
-              throw error;
-            }
-          );
-        },
-        return(value) {
-          if (typeof iterator.return !== "function") {
-            return args.finalize().then(() => ({
-              done: true,
-              value
-            }));
-          }
-          return withCurrent(args.span, () => iterator.return(value)).then(
-            async (result) => {
-              await args.finalize();
-              return result;
-            },
-            (error) => {
-              args.onError(error);
-              throw error;
-            }
-          );
-        },
-        throw(error) {
-          args.onError(error);
-          if (typeof iterator.throw !== "function") {
-            return Promise.reject(error);
-          }
-          return withCurrent(args.span, () => iterator.throw(error));
-        },
-        [Symbol.asyncIterator]() {
-          return this;
-        }
-      };
+function sanitizeOpenRouterLoggedValue(value) {
+  if (isZodSchema3(value)) {
+    return serializeZodSchema3(value);
+  }
+  if (typeof value === "function") {
+    return "[Function]";
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => sanitizeOpenRouterLoggedValue(entry));
+  }
+  if (!isObject(value)) {
+    return value;
+  }
+  const sanitized = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (OMITTED_OPENROUTER_KEYS.has(key)) {
+      continue;
+    }
+    if (key === "tools" && Array.isArray(entry)) {
+      sanitized.tools = serializeOpenRouterToolsForLogging(entry);
+      continue;
     }
+    sanitized[key] = sanitizeOpenRouterLoggedValue(entry);
+  }
+  return sanitized;
+}
+function buildOpenRouterMetadata(metadata, httpReferer, xTitle) {
+  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider: providerRouting, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString(model);
+  return {
+    ...rest,
+    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
+    ...providerRouting !== void 0 ? { providerRouting } : {},
+    ...httpReferer !== void 0 ? { httpReferer } : {},
+    ...xTitle !== void 0 ? { xTitle } : {},
+    provider: normalizedModel.provider || "openrouter"
   };
 }
-function isAsyncIterable2(value) {
-  return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+function buildOpenRouterEmbeddingMetadata(metadata, httpReferer, xTitle) {
+  const normalized = buildOpenRouterMetadata(metadata, httpReferer, xTitle);
+  return typeof normalized.model === "string" ? {
+    ...normalized,
+    embedding_model: normalized.model
+  } : normalized;
 }
-function isPromiseLike(value) {
-  return !!value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
+function extractOpenRouterCallModelInput(request) {
+  return isObject(request) && "input" in request ? sanitizeOpenRouterLoggedValue(request.input) : void 0;
 }
-function normalizeError(error) {
-  return error instanceof Error ? error : new Error(String(error));
+function extractOpenRouterCallModelMetadata(request) {
+  if (!isObject(request)) {
+    return { provider: "openrouter" };
+  }
+  const { input: _input, ...metadata } = request;
+  return buildOpenRouterMetadata(metadata, void 0, void 0);
 }
-
-// src/instrumentation/plugins/openrouter-plugin.ts
-var OpenRouterPlugin = class extends BasePlugin {
-  onEnable() {
-    this.subscribeToOpenRouterChannels();
+function extractOpenRouterResponseMetadata(result) {
+  if (!isObject(result)) {
+    return void 0;
   }
-  onDisable() {
-    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  const { output: _output, data: _data, usage, ...metadata } = result;
+  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString(model);
+  const normalizedProvider = (typeof provider === "string" ? provider : void 0) || normalizedModel.provider;
+  const usageMetadata = extractOpenRouterUsageMetadata(usage);
+  const combined = {
+    ...rest,
+    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
+    ...usageMetadata || {},
+    ...normalizedProvider !== void 0 ? { provider: normalizedProvider } : {}
+  };
+  return Object.keys(combined).length > 0 ? combined : void 0;
+}
+function extractOpenRouterResponseOutput(response, fallbackOutput) {
+  if (isObject(response) && "output" in response && response.output !== void 0) {
+    return sanitizeOpenRouterLoggedValue(response.output);
   }
-  subscribeToOpenRouterChannels() {
-    this.unsubscribers.push(
-      traceStreamingChannel(openRouterChannels.chatSend, {
-        name: "openrouter.chat.send",
-        type: "llm" /* LLM */,
-        extractInput: (args) => {
-          const request = getOpenRouterRequestArg(args);
-          const chatGenerationParams = isObject(request?.chatGenerationParams) ? request.chatGenerationParams : {};
-          const httpReferer = request?.httpReferer;
-          const xTitle = request?.xTitle;
-          const { messages, ...metadata } = chatGenerationParams;
-          return {
-            input: messages,
-            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
-          };
-        },
-        extractOutput: (result) => {
-          return isObject(result) ? result.choices : void 0;
-        },
-        extractMetrics: (result, startTime) => {
-          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
-        aggregateChunks: aggregateOpenRouterChatChunks
-      })
-    );
-    this.unsubscribers.push(
-      traceAsyncChannel(openRouterChannels.embeddingsGenerate, {
-        name: "openrouter.embeddings.generate",
-        type: "llm" /* LLM */,
-        extractInput: (args) => {
-          const request = getOpenRouterRequestArg(args);
-          const requestBody = isObject(request?.requestBody) ? request.requestBody : {};
-          const httpReferer = request?.httpReferer;
-          const xTitle = request?.xTitle;
-          const { input, ...metadata } = requestBody;
-          return {
-            input,
-            metadata: buildOpenRouterEmbeddingMetadata(
-              metadata,
-              httpReferer,
-              xTitle
-            )
-          };
-        },
-        extractOutput: (result) => {
-          if (!isObject(result)) {
-            return void 0;
-          }
-          const embedding = result.data?.[0]?.embedding;
-          return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
-        },
-        extractMetadata: (result) => {
-          if (!isObject(result)) {
-            return void 0;
-          }
-          return extractOpenRouterResponseMetadata(result);
-        },
-        extractMetrics: (result) => {
-          return isObject(result) ? parseOpenRouterMetricsFromUsage(result.usage) : {};
-        }
-      })
-    );
-    this.unsubscribers.push(
-      traceStreamingChannel(openRouterChannels.betaResponsesSend, {
-        name: "openrouter.beta.responses.send",
-        type: "llm" /* LLM */,
-        extractInput: (args) => {
-          const request = getOpenRouterRequestArg(args);
-          const openResponsesRequest = isObject(request?.openResponsesRequest) ? request.openResponsesRequest : {};
-          const httpReferer = request?.httpReferer;
-          const xTitle = request?.xTitle;
-          const { input, ...metadata } = openResponsesRequest;
-          return {
-            input,
-            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
-          };
-        },
-        extractOutput: (result) => extractOpenRouterResponseOutput(result),
-        extractMetadata: (result) => extractOpenRouterResponseMetadata(result),
-        extractMetrics: (result, startTime) => {
-          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
-        aggregateChunks: aggregateOpenRouterResponseStreamEvents
-      })
-    );
-    this.unsubscribers.push(
-      traceSyncStreamChannel(openRouterChannels.callModel, {
-        name: "openrouter.callModel",
-        type: "llm" /* LLM */,
-        extractInput: (args) => {
-          const request = getOpenRouterCallModelRequestArg(args);
-          return {
-            input: request ? extractOpenRouterCallModelInput(request) : void 0,
-            metadata: request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" }
-          };
-        },
-        patchResult: ({ endEvent, result, span }) => {
-          return patchOpenRouterCallModelResult(
-            span,
-            result,
-            getOpenRouterCallModelRequestArg(endEvent.arguments)
-          );
-        }
-      })
-    );
-    this.unsubscribers.push(
-      traceStreamingChannel(openRouterChannels.toolExecute, {
-        name: "openrouter.tool",
-        type: "tool" /* TOOL */,
-        extractInput: (args, event) => ({
-          input: args[0],
-          metadata: {
-            provider: "openrouter",
-            tool_name: event.toolName,
-            ...event.toolCallId ? { tool_call_id: event.toolCallId } : {}
-          }
-        }),
-        extractOutput: (result) => result,
-        extractMetrics: () => ({}),
-        aggregateChunks: (chunks) => ({
-          output: chunks.length > 0 ? chunks[chunks.length - 1] : void 0,
-          metrics: {}
-        })
-      })
-    );
-    const callModelChannel = openRouterChannels.callModel.tracingChannel();
-    const callModelHandlers = {
-      start: (event) => {
-        const request = getOpenRouterCallModelRequestArg(event.arguments);
-        if (!request) {
-          return;
-        }
-        patchOpenRouterCallModelRequestTools(request);
-      }
-    };
-    callModelChannel.subscribe(callModelHandlers);
-    this.unsubscribers.push(() => {
-      callModelChannel.unsubscribe(callModelHandlers);
-    });
+  if (fallbackOutput !== void 0) {
+    return sanitizeOpenRouterLoggedValue(fallbackOutput);
   }
-};
-function normalizeArgs(args) {
-  if (Array.isArray(args)) {
-    return args;
+  return void 0;
+}
+var OPENROUTER_WRAPPED_TOOL = Symbol("braintrust.openrouter.wrappedTool");
+function patchOpenRouterCallModelRequestTools(request) {
+  if (!Array.isArray(request.tools) || request.tools.length === 0) {
+    return void 0;
   }
-  if (isArrayLike(args)) {
-    return Array.from(args);
+  const originalTools = request.tools;
+  const wrappedTools = originalTools.map((tool) => wrapOpenRouterTool(tool));
+  const didPatch = wrappedTools.some(
+    (tool, index) => tool !== originalTools[index]
+  );
+  if (!didPatch) {
+    return void 0;
+  }
+  request.tools = wrappedTools;
+  return () => {
+    request.tools = originalTools;
+  };
+}
+function wrapOpenRouterTool(tool) {
+  if (isWrappedTool(tool) || !tool.function || typeof tool.function !== "object" || typeof tool.function.execute !== "function") {
+    return tool;
+  }
+  const toolName = tool.function.name || "tool";
+  const originalExecute = tool.function.execute;
+  const wrappedTool = {
+    ...tool,
+    function: {
+      ...tool.function,
+      execute(...args) {
+        return traceToolExecution({
+          args,
+          execute: () => Reflect.apply(originalExecute, this, args),
+          toolCallId: getToolCallId(args[1]),
+          toolName
+        });
+      }
+    }
+  };
+  Object.defineProperty(wrappedTool, OPENROUTER_WRAPPED_TOOL, {
+    value: true,
+    enumerable: false,
+    configurable: false
+  });
+  return wrappedTool;
+}
+function isWrappedTool(tool) {
+  return Boolean(tool[OPENROUTER_WRAPPED_TOOL]);
+}
+function traceToolExecution(args) {
+  const tracingChannel2 = openRouterChannels.toolExecute.tracingChannel();
+  const input = args.args.length > 0 ? args.args[0] : void 0;
+  const event = {
+    arguments: [input],
+    span_info: {
+      name: args.toolName
+    },
+    toolCallId: args.toolCallId,
+    toolName: args.toolName
+  };
+  tracingChannel2.start.publish(event);
+  try {
+    const result = args.execute();
+    return publishToolResult(tracingChannel2, event, result);
+  } catch (error) {
+    event.error = normalizeError(error);
+    tracingChannel2.error.publish(event);
+    throw error;
   }
-  return [args];
-}
-function isArrayLike(value) {
-  return isObject(value) && "length" in value && typeof value.length === "number" && Number.isInteger(value.length) && value.length >= 0;
 }
-function getOpenRouterRequestArg(args) {
-  const normalizedArgs = normalizeArgs(args);
-  const keyedCandidate = normalizedArgs.find(
-    (arg) => isObject(arg) && ("chatGenerationParams" in arg || "requestBody" in arg || "openResponsesRequest" in arg)
-  );
-  if (isObject(keyedCandidate)) {
-    return keyedCandidate;
+function publishToolResult(tracingChannel2, event, result) {
+  if (isPromiseLike2(result)) {
+    return result.then(
+      (resolved) => {
+        event.result = resolved;
+        tracingChannel2.asyncEnd.publish(event);
+        return resolved;
+      },
+      (error) => {
+        event.error = normalizeError(error);
+        tracingChannel2.error.publish(event);
+        throw error;
+      }
+    );
   }
-  const firstObjectArg = normalizedArgs.find((arg) => isObject(arg));
-  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+  event.result = result;
+  tracingChannel2.asyncEnd.publish(event);
+  return result;
 }
-function getOpenRouterCallModelRequestArg(args) {
-  const firstObjectArg = normalizeArgs(args).find((arg) => isObject(arg));
-  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+function getToolCallId(context) {
+  const toolContext = context;
+  return typeof toolContext?.toolCall?.id === "string" ? toolContext.toolCall.id : void 0;
+}
+function isPromiseLike2(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
 }
 function aggregateOpenRouterChatChunks(chunks) {
   let role;
@@ -13185,95 +14040,438 @@ function aggregateOpenRouterChatChunks(chunks) {
       }
       continue;
     }
-    if (!role && delta.role) {
-      role = delta.role;
-    }
-    if (typeof delta.content === "string") {
-      content += delta.content;
-    }
-    const choiceFinishReason = choice?.finishReason ?? choice?.finish_reason ?? void 0;
-    const deltaFinishReason = delta.finishReason ?? delta.finish_reason ?? void 0;
-    if (choiceFinishReason !== void 0) {
-      finishReason = choiceFinishReason;
-    } else if (deltaFinishReason !== void 0) {
-      finishReason = deltaFinishReason;
-    }
-    const toolCallDeltas = Array.isArray(delta.toolCalls) ? delta.toolCalls : Array.isArray(delta.tool_calls) ? delta.tool_calls : void 0;
-    if (!toolCallDeltas) {
+    if (!role && delta.role) {
+      role = delta.role;
+    }
+    if (typeof delta.content === "string") {
+      content += delta.content;
+    }
+    const choiceFinishReason = choice?.finishReason ?? choice?.finish_reason ?? void 0;
+    const deltaFinishReason = delta.finishReason ?? delta.finish_reason ?? void 0;
+    if (choiceFinishReason !== void 0) {
+      finishReason = choiceFinishReason;
+    } else if (deltaFinishReason !== void 0) {
+      finishReason = deltaFinishReason;
+    }
+    const toolCallDeltas = Array.isArray(delta.toolCalls) ? delta.toolCalls : Array.isArray(delta.tool_calls) ? delta.tool_calls : void 0;
+    if (!toolCallDeltas) {
+      continue;
+    }
+    for (const toolDelta of toolCallDeltas) {
+      if (!toolDelta?.function) {
+        continue;
+      }
+      const toolIndex = toolDelta.index ?? 0;
+      const existingToolCall = toolCalls?.[toolIndex];
+      if (!existingToolCall || toolDelta.id && existingToolCall.id !== void 0 && existingToolCall.id !== toolDelta.id) {
+        const nextToolCalls = [...toolCalls || []];
+        nextToolCalls[toolIndex] = {
+          index: toolIndex,
+          id: toolDelta.id,
+          type: toolDelta.type,
+          function: {
+            name: toolDelta.function.name,
+            arguments: toolDelta.function.arguments || ""
+          }
+        };
+        toolCalls = nextToolCalls;
+        continue;
+      }
+      const current = existingToolCall;
+      if (toolDelta.id && !current.id) {
+        current.id = toolDelta.id;
+      }
+      if (toolDelta.type && !current.type) {
+        current.type = toolDelta.type;
+      }
+      if (toolDelta.function.name && !current.function.name) {
+        current.function.name = toolDelta.function.name;
+      }
+      current.function.arguments += toolDelta.function.arguments || "";
+    }
+  }
+  return {
+    output: [
+      {
+        index: 0,
+        message: {
+          role,
+          content: content || void 0,
+          ...toolCalls ? { tool_calls: toolCalls } : {}
+        },
+        logprobs: null,
+        finish_reason: finishReason
+      }
+    ],
+    metrics
+  };
+}
+function aggregateOpenRouterResponseStreamEvents(chunks) {
+  let finalResponse;
+  for (const chunk of chunks) {
+    const response = chunk?.response;
+    if (!response) {
+      continue;
+    }
+    if (chunk.type === "response.completed" || chunk.type === "response.incomplete" || chunk.type === "response.failed") {
+      finalResponse = response;
+    }
+  }
+  if (!finalResponse) {
+    return {
+      output: void 0,
+      metrics: {}
+    };
+  }
+  return {
+    output: extractOpenRouterResponseOutput(finalResponse),
+    metrics: parseOpenRouterMetricsFromUsage(finalResponse.usage),
+    ...extractOpenRouterResponseMetadata(finalResponse) ? { metadata: extractOpenRouterResponseMetadata(finalResponse) } : {}
+  };
+}
+var OPENROUTER_WRAPPED_CALL_MODEL_RESULT = Symbol(
+  "braintrust.openrouter.wrappedCallModelResult"
+);
+var OPENROUTER_CALL_MODEL_STREAM_METHODS = [
+  "getFullResponsesStream",
+  "getItemsStream",
+  "getNewMessagesStream",
+  "getReasoningStream",
+  "getTextStream",
+  "getToolCallsStream",
+  "getToolStream"
+];
+var OPENROUTER_CALL_MODEL_CONTEXT_METHODS = [
+  "cancel",
+  "getPendingToolCalls",
+  "getState",
+  "getToolCalls",
+  "requiresApproval"
+];
+function patchOpenRouterCallModelResult(args) {
+  const { request, result, span } = args;
+  if (!isObject(result) || isWrappedCallModelResult(result)) {
+    return false;
+  }
+  const resultLike = result;
+  const hasInstrumentableMethod = typeof resultLike.getResponse === "function" || typeof resultLike.getText === "function" || OPENROUTER_CALL_MODEL_STREAM_METHODS.some(
+    (methodName) => typeof resultLike[methodName] === "function"
+  );
+  if (!hasInstrumentableMethod) {
+    return false;
+  }
+  Object.defineProperty(resultLike, OPENROUTER_WRAPPED_CALL_MODEL_RESULT, {
+    value: true,
+    enumerable: false,
+    configurable: false
+  });
+  const originalGetResponse = typeof resultLike.getResponse === "function" ? resultLike.getResponse.bind(resultLike) : void 0;
+  const originalGetInitialResponse = typeof resultLike.getInitialResponse === "function" ? resultLike.getInitialResponse.bind(resultLike) : void 0;
+  const originalMakeFollowupRequest = typeof resultLike.makeFollowupRequest === "function" ? resultLike.makeFollowupRequest.bind(resultLike) : void 0;
+  let ended = false;
+  let tracedTurnCount = 0;
+  const endSpanWithResult = async (response, fallbackOutput) => {
+    if (ended) {
+      return;
+    }
+    ended = true;
+    const finalResponse = getFinalOpenRouterCallModelResponse(
+      resultLike,
+      response
+    );
+    if (finalResponse) {
+      const rounds = getOpenRouterCallModelRounds(resultLike);
+      const metadata = extractOpenRouterCallModelResultMetadata(
+        finalResponse,
+        rounds.length + 1
+      );
+      span.log({
+        output: extractOpenRouterResponseOutput(finalResponse, fallbackOutput),
+        ...metadata ? { metadata } : {},
+        metrics: aggregateOpenRouterCallModelMetrics(rounds, finalResponse)
+      });
+      span.end();
+      return;
+    }
+    if (fallbackOutput !== void 0) {
+      span.log({
+        output: fallbackOutput
+      });
+    }
+    span.end();
+  };
+  const endSpanWithError = (error) => {
+    if (ended) {
+      return;
+    }
+    ended = true;
+    span.log({
+      error: normalizeError(error).message
+    });
+    span.end();
+  };
+  const finalizeFromResponse = async (fallbackOutput) => {
+    if (!originalGetResponse) {
+      await endSpanWithResult(void 0, fallbackOutput);
+      return;
+    }
+    try {
+      await endSpanWithResult(await originalGetResponse(), fallbackOutput);
+    } catch {
+      await endSpanWithResult(void 0, fallbackOutput);
+    }
+  };
+  if (originalGetResponse) {
+    resultLike.getResponse = async (...args2) => {
+      return await withCurrent(span, async () => {
+        try {
+          const response = await originalGetResponse(...args2);
+          await endSpanWithResult(response);
+          return response;
+        } catch (error) {
+          endSpanWithError(error);
+          throw error;
+        }
+      });
+    };
+  }
+  if (typeof resultLike.getText === "function") {
+    const originalGetText = resultLike.getText.bind(resultLike);
+    resultLike.getText = async (...args2) => {
+      return await withCurrent(span, async () => {
+        try {
+          const text = await originalGetText(...args2);
+          await finalizeFromResponse(text);
+          return text;
+        } catch (error) {
+          endSpanWithError(error);
+          throw error;
+        }
+      });
+    };
+  }
+  for (const methodName of OPENROUTER_CALL_MODEL_CONTEXT_METHODS) {
+    if (typeof resultLike[methodName] !== "function") {
+      continue;
+    }
+    const originalMethod = resultLike[methodName];
+    resultLike[methodName] = async (...args2) => {
+      return await withCurrent(span, async () => {
+        return await originalMethod.apply(resultLike, args2);
+      });
+    };
+  }
+  for (const methodName of OPENROUTER_CALL_MODEL_STREAM_METHODS) {
+    if (typeof resultLike[methodName] !== "function") {
       continue;
     }
-    for (const toolDelta of toolCallDeltas) {
-      if (!toolDelta?.function) {
-        continue;
-      }
-      const toolIndex = toolDelta.index ?? 0;
-      const existingToolCall = toolCalls?.[toolIndex];
-      if (!existingToolCall || toolDelta.id && existingToolCall.id !== void 0 && existingToolCall.id !== toolDelta.id) {
-        const nextToolCalls = [...toolCalls || []];
-        nextToolCalls[toolIndex] = {
-          index: toolIndex,
-          id: toolDelta.id,
-          type: toolDelta.type,
-          function: {
-            name: toolDelta.function.name,
-            arguments: toolDelta.function.arguments || ""
-          }
-        };
-        toolCalls = nextToolCalls;
-        continue;
-      }
-      const current = existingToolCall;
-      if (toolDelta.id && !current.id) {
-        current.id = toolDelta.id;
-      }
-      if (toolDelta.type && !current.type) {
-        current.type = toolDelta.type;
+    const originalMethod = resultLike[methodName];
+    resultLike[methodName] = (...args2) => {
+      const stream = withCurrent(
+        span,
+        () => originalMethod.apply(resultLike, args2)
+      );
+      if (!isAsyncIterable2(stream)) {
+        return stream;
       }
-      if (toolDelta.function.name && !current.function.name) {
-        current.function.name = toolDelta.function.name;
+      return wrapAsyncIterableWithSpan({
+        finalize: finalizeFromResponse,
+        iteratorFactory: () => stream[Symbol.asyncIterator](),
+        onError: endSpanWithError,
+        span
+      });
+    };
+  }
+  if (originalGetInitialResponse) {
+    let initialTurnTraced = false;
+    resultLike.getInitialResponse = async (...args2) => {
+      if (initialTurnTraced) {
+        return await withCurrent(span, async () => {
+          return await originalGetInitialResponse(...args2);
+        });
       }
-      current.function.arguments += toolDelta.function.arguments || "";
-    }
+      initialTurnTraced = true;
+      const step = tracedTurnCount + 1;
+      const stepType = tracedTurnCount === 0 ? "initial" : "continue";
+      const response = await traceOpenRouterCallModelTurn({
+        fn: async () => {
+          const nextResponse = await originalGetInitialResponse(...args2);
+          tracedTurnCount++;
+          return nextResponse;
+        },
+        parentSpan: span,
+        request: getOpenRouterResolvedRequest(resultLike, request),
+        step,
+        stepType
+      });
+      return response;
+    };
   }
-  return {
-    output: [
-      {
-        index: 0,
-        message: {
-          role,
-          content: content || void 0,
-          ...toolCalls ? { tool_calls: toolCalls } : {}
+  if (originalMakeFollowupRequest) {
+    resultLike.makeFollowupRequest = async (...args2) => {
+      const currentResponse = args2[0];
+      const toolResults = Array.isArray(args2[1]) ? args2[1] : [];
+      const step = tracedTurnCount + 1;
+      const response = await traceOpenRouterCallModelTurn({
+        fn: async () => {
+          const nextResponse = await originalMakeFollowupRequest(...args2);
+          tracedTurnCount++;
+          return nextResponse;
         },
-        logprobs: null,
-        finish_reason: finishReason
-      }
-    ],
-    metrics
+        parentSpan: span,
+        request: buildOpenRouterFollowupRequest(
+          getOpenRouterResolvedRequest(resultLike, request),
+          currentResponse,
+          toolResults
+        ),
+        step,
+        stepType: "continue"
+      });
+      return response;
+    };
+  }
+  return true;
+}
+async function traceOpenRouterCallModelTurn(args) {
+  const context = {
+    arguments: [args.request],
+    step: args.step,
+    stepType: args.stepType
   };
+  return await withCurrent(
+    args.parentSpan,
+    () => openRouterChannels.callModelTurn.tracePromise(args.fn, context)
+  );
 }
-function aggregateOpenRouterResponseStreamEvents(chunks) {
-  let finalResponse;
-  for (const chunk of chunks) {
-    const response = chunk?.response;
-    if (!response) {
-      continue;
-    }
-    if (chunk.type === "response.completed" || chunk.type === "response.incomplete" || chunk.type === "response.failed") {
-      finalResponse = response;
+function isWrappedCallModelResult(value) {
+  return Boolean(
+    isObject(value) && value[OPENROUTER_WRAPPED_CALL_MODEL_RESULT]
+  );
+}
+function extractOpenRouterCallModelResultMetadata(response, turnCount) {
+  const combined = {
+    ...extractOpenRouterResponseMetadata(response) || {},
+    ...turnCount !== void 0 ? { turn_count: turnCount } : {}
+  };
+  return Object.keys(combined).length > 0 ? combined : void 0;
+}
+function getFinalOpenRouterCallModelResponse(result, response) {
+  if (isObject(response)) {
+    return response;
+  }
+  return isObject(result.finalResponse) ? result.finalResponse : void 0;
+}
+function getOpenRouterCallModelRounds(result) {
+  if (!Array.isArray(result.allToolExecutionRounds)) {
+    return [];
+  }
+  return result.allToolExecutionRounds.filter((round) => isObject(round)).map((round) => ({
+    response: isObject(round.response) ? round.response : void 0,
+    round: typeof round.round === "number" ? round.round : void 0,
+    toolResults: Array.isArray(round.toolResults) ? round.toolResults : []
+  })).filter((round) => round.response !== void 0);
+}
+function aggregateOpenRouterCallModelMetrics(rounds, finalResponse) {
+  const metrics = {};
+  const responses = [
+    ...rounds.map((round) => round.response).filter(isObject),
+    finalResponse
+  ];
+  for (const response of responses) {
+    const responseMetrics = parseOpenRouterMetricsFromUsage(response.usage);
+    for (const [name, value] of Object.entries(responseMetrics)) {
+      metrics[name] = (metrics[name] || 0) + value;
     }
   }
-  if (!finalResponse) {
-    return {
-      output: void 0,
-      metrics: {}
-    };
+  return metrics;
+}
+function buildNextOpenRouterCallModelInput(currentInput, response, toolResults) {
+  const normalizedInput = Array.isArray(currentInput) ? [...currentInput] : currentInput === void 0 ? [] : [currentInput];
+  const responseOutput = Array.isArray(response.output) ? response.output : response.output === void 0 ? [] : [response.output];
+  return [...normalizedInput, ...responseOutput, ...toolResults].map(
+    (entry) => sanitizeOpenRouterLoggedValue(entry)
+  );
+}
+function getOpenRouterResolvedRequest(result, request) {
+  if (isObject(result.resolvedRequest)) {
+    return result.resolvedRequest;
+  }
+  return request;
+}
+function buildOpenRouterFollowupRequest(request, currentResponse, toolResults) {
+  if (!request) {
+    return void 0;
   }
   return {
-    output: extractOpenRouterResponseOutput(finalResponse),
-    metrics: parseOpenRouterMetricsFromUsage(finalResponse.usage),
-    ...extractOpenRouterResponseMetadata(finalResponse) ? { metadata: extractOpenRouterResponseMetadata(finalResponse) } : {}
+    ...request,
+    input: buildNextOpenRouterCallModelInput(
+      extractOpenRouterCallModelInput(request),
+      isObject(currentResponse) ? currentResponse : {},
+      toolResults
+    ),
+    stream: false
+  };
+}
+function wrapAsyncIterableWithSpan(args) {
+  return {
+    [Symbol.asyncIterator]() {
+      const iterator = args.iteratorFactory();
+      return {
+        next(value) {
+          return withCurrent(
+            args.span,
+            () => value === void 0 ? iterator.next() : iterator.next(value)
+          ).then(
+            async (result) => {
+              if (result.done) {
+                await args.finalize();
+              }
+              return result;
+            },
+            (error) => {
+              args.onError(error);
+              throw error;
+            }
+          );
+        },
+        return(value) {
+          if (typeof iterator.return !== "function") {
+            return args.finalize().then(() => ({
+              done: true,
+              value
+            }));
+          }
+          return withCurrent(args.span, () => iterator.return(value)).then(
+            async (result) => {
+              await args.finalize();
+              return result;
+            },
+            (error) => {
+              args.onError(error);
+              throw error;
+            }
+          );
+        },
+        throw(error) {
+          args.onError(error);
+          if (typeof iterator.throw !== "function") {
+            return Promise.reject(error);
+          }
+          return withCurrent(args.span, () => iterator.throw(error));
+        },
+        [Symbol.asyncIterator]() {
+          return this;
+        }
+      };
+    }
   };
 }
+function isAsyncIterable2(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+}
+function normalizeError(error) {
+  return error instanceof Error ? error : new Error(String(error));
+}
 
 // src/instrumentation/braintrust-plugin.ts
 var BraintrustPlugin = class extends BasePlugin {
@@ -14996,7 +16194,28 @@ function validateParametersWithJsonSchema(parameters, schema) {
     }).join(", ");
     throw Error(`Invalid parameters: ${errorMessages}`);
   }
-  return parameters;
+  return rehydrateRemoteParameters(parameters, schema);
+}
+function rehydrateRemoteParameters(parameters, schema) {
+  const schemaProperties = schema.properties;
+  if (typeof schemaProperties !== "object" || schemaProperties === null) {
+    return parameters;
+  }
+  return Object.fromEntries(
+    Object.entries(parameters).map(([name, value]) => {
+      const propertySchema = Reflect.get(schemaProperties, name);
+      if (typeof propertySchema !== "object" || propertySchema === null) {
+        return [name, value];
+      }
+      if (Reflect.get(propertySchema, "x-bt-type") === "prompt") {
+        return [
+          name,
+          Prompt2.fromPromptData(name, PromptData.parse(value))
+        ];
+      }
+      return [name, value];
+    })
+  );
 }
 
 // src/framework.ts
@@ -16231,7 +17450,8 @@ var ScorerBuilder = class {
           type: "llm_classifier",
           use_cot: opts.useCot,
           choice_scores: opts.choiceScores
-        }
+        },
+        ...opts.templateFormat ? { template_format: opts.templateFormat } : {}
       };
       const codePrompt = new CodePrompt(
         this.project,