braintrust 3.7.0 → 3.8.0

package/dev/dist/index.mjs

@@ -165,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) {
@@ -185,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;
@@ -1881,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";
@@ -2092,6 +2102,16 @@ var NullableSavedFunctionId = z6.union([
   }),
   z6.null()
 ]);
+var TopicMapGenerationSettings = z6.object({
+  algorithm: z6.enum(["hdbscan", "kmeans"]),
+  dimension_reduction: z6.enum(["umap", "pca", "none"]),
+  sample_size: z6.number().int().gt(0).optional(),
+  n_clusters: z6.number().int().gt(0).optional(),
+  min_cluster_size: z6.number().int().gt(0).optional(),
+  min_samples: z6.number().int().gt(0).optional(),
+  hierarchy_threshold: z6.number().int().gt(0).optional(),
+  naming_model: z6.string().optional()
+});
 var TopicMapData = z6.object({
   type: z6.literal("topic_map"),
   source_facet: z6.string(),
@@ -2099,6 +2119,7 @@ var TopicMapData = z6.object({
   bundle_key: z6.string().optional(),
   report_key: z6.string().optional(),
   topic_names: z6.record(z6.string()).optional(),
+  generation_settings: TopicMapGenerationSettings.optional(),
   distance_threshold: z6.number().optional()
 });
 var BatchedFacetData = z6.object({
@@ -2323,6 +2344,7 @@ var Dataset = z6.object({
   created: z6.union([z6.string(), z6.null()]).optional(),
   deleted_at: z6.union([z6.string(), z6.null()]).optional(),
   user_id: z6.union([z6.string(), z6.null()]).optional(),
+  tags: z6.union([z6.array(z6.string()), z6.null()]).optional(),
   metadata: z6.union([z6.object({}).partial().passthrough(), z6.null()]).optional(),
   url_slug: z6.string()
 });
@@ -2405,6 +2427,14 @@ var DatasetEvent = z6.object({
     z6.null()
   ]).optional()
 });
+var DatasetSnapshot = z6.object({
+  id: z6.string().uuid(),
+  dataset_id: z6.string().uuid(),
+  name: z6.string(),
+  description: z6.union([z6.string(), z6.null()]),
+  xact_id: z6.string(),
+  created: z6.union([z6.string(), z6.null()])
+});
 var EnvVar = z6.object({
   id: z6.string().uuid(),
   object_type: z6.enum(["organization", "project", "function"]),
@@ -3163,6 +3193,8 @@ var TopicAutomationConfig = z6.object({
   scope: z6.union([SpanScope, TraceScope, GroupScope, z6.null()]).optional(),
   data_scope: TopicAutomationDataScope.optional(),
   btql_filter: z6.union([z6.string(), z6.null()]).optional(),
+  rerun_seconds: z6.union([z6.number(), z6.null()]).optional(),
+  relabel_overlap_seconds: z6.union([z6.number(), z6.null()]).optional(),
   backfill_time_range: z6.union([
     z6.string(),
     z6.object({ from: z6.string(), to: z6.string() }),
@@ -3499,7 +3531,8 @@ var User = z6.object({
   family_name: z6.union([z6.string(), z6.null()]).optional(),
   email: z6.union([z6.string(), z6.null()]).optional(),
   avatar_url: z6.union([z6.string(), z6.null()]).optional(),
-  created: z6.union([z6.string(), z6.null()]).optional()
+  created: z6.union([z6.string(), z6.null()]).optional(),
+  last_active_at: z6.union([z6.number(), z6.null()]).optional()
 });
 var ViewDataSearch = z6.union([
   z6.object({
@@ -4659,6 +4692,15 @@ var BRAINTRUST_CURRENT_SPAN_STORE = Symbol.for(
   "braintrust.currentSpanStore"
 );
 var ContextManager = class {
+  /**
+   * Returns the value to store in the ALS bound to a TracingChannel's start event.
+   * In default mode this is the Span itself; in OTEL mode it is the OTEL Context
+   * containing the span so that OTEL's own ALS stores a proper Context object.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  wrapSpanForStore(span) {
+    return span;
+  }
 };
 var BraintrustContextManager = class extends ContextManager {
   _currentSpan;
@@ -8874,7 +8916,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);
               }
@@ -8886,7 +8928,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);
                 }
@@ -8899,7 +8941,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
                 );
@@ -8917,7 +8959,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);
             }
@@ -8934,7 +8976,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);
               }
@@ -9391,18 +9433,22 @@ function ensureSpanStateForEvent(states, config, event, channelName) {
 function bindCurrentSpanStoreToStart(tracingChannel2, states, config, channelName) {
   const state = _internalGetGlobalState();
   const startChannel = tracingChannel2.start;
-  const currentSpanStore = state?.contextManager ? state.contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
+  const contextManager = state?.contextManager;
+  const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
   if (!currentSpanStore || !startChannel) {
     return void 0;
   }
   startChannel.bindStore(
     currentSpanStore,
-    (event) => ensureSpanStateForEvent(
-      states,
-      config,
-      event,
-      channelName
-    ).span
+    (event) => {
+      const span = ensureSpanStateForEvent(
+        states,
+        config,
+        event,
+        channelName
+      ).span;
+      return contextManager.wrapSpanForStore(span);
+    }
   );
   return () => {
     startChannel.unbindStore(currentSpanStore);
@@ -9419,6 +9465,26 @@ function logErrorAndEnd(states, event) {
   spanData.span.end();
   states.delete(event);
 }
+function runStreamingCompletionHook(args) {
+  if (!args.config.onComplete) {
+    return;
+  }
+  try {
+    args.config.onComplete({
+      channelName: args.channelName,
+      ...args.chunks ? { chunks: args.chunks } : {},
+      endEvent: args.endEvent,
+      ...args.metadata !== void 0 ? { metadata: args.metadata } : {},
+      metrics: args.metrics,
+      output: args.output,
+      result: args.result,
+      span: args.span,
+      startTime: args.startTime
+    });
+  } catch (error) {
+    console.error(`Error in onComplete hook for ${args.channelName}:`, error);
+  }
+}
 function traceAsyncChannel(channel2, config) {
   const tracingChannel2 = channel2.tracingChannel();
   const states = /* @__PURE__ */ new WeakMap();
@@ -9546,6 +9612,18 @@ function traceStreamingChannel(channel2, config) {
               } else if (metrics.time_to_first_token === void 0 && chunks.length > 0) {
                 metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
               }
+              runStreamingCompletionHook({
+                channelName,
+                chunks,
+                config,
+                endEvent: asyncEndEvent,
+                ...metadata !== void 0 ? { metadata } : {},
+                metrics,
+                output,
+                result: asyncEndEvent.result,
+                span,
+                startTime
+              });
               span.log({
                 output,
                 ...metadata !== void 0 ? { metadata } : {},
@@ -9595,6 +9673,17 @@ function traceStreamingChannel(channel2, config) {
           asyncEndEvent.result,
           asyncEndEvent
         );
+        runStreamingCompletionHook({
+          channelName,
+          config,
+          endEvent: asyncEndEvent,
+          ...normalizeMetadata(metadata) !== void 0 ? { metadata: normalizeMetadata(metadata) } : {},
+          metrics,
+          output,
+          result: asyncEndEvent.result,
+          span,
+          startTime
+        });
         span.log({
           output,
           ...normalizeMetadata(metadata) !== void 0 ? { metadata: normalizeMetadata(metadata) } : {},
@@ -9643,51 +9732,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: {
@@ -9696,25 +9762,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);
@@ -9971,6 +10067,10 @@ var openAIChannels = defineChannels("openai", {
   responsesParse: channel({
     channelName: "responses.parse",
     kind: "async"
+  }),
+  responsesCompact: channel({
+    channelName: "responses.compact",
+    kind: "async"
   })
 });
 
@@ -10250,6 +10350,40 @@ var OpenAIPlugin = class extends BasePlugin {
         aggregateChunks: aggregateResponseStreamEvents
       })
     );
+    this.unsubscribers.push(
+      traceAsyncChannel(openAIChannels.responsesCompact, {
+        name: "openai.responses.compact",
+        type: "llm" /* LLM */,
+        extractInput: ([params]) => {
+          const { input, ...metadata } = params;
+          return {
+            input: processInputAttachments(input),
+            metadata: { ...metadata, provider: "openai" }
+          };
+        },
+        extractOutput: (result) => {
+          return processImagesInOutput(result?.output);
+        },
+        extractMetadata: (result) => {
+          if (!result) {
+            return void 0;
+          }
+          const { output: _output, usage: _usage, ...metadata } = result;
+          return Object.keys(metadata).length > 0 ? metadata : void 0;
+        },
+        extractMetrics: (result, startTime, endEvent) => {
+          const metrics = withCachedMetric(
+            parseMetricsFromUsage(result?.usage),
+            result,
+            endEvent
+          );
+          if (startTime) {
+            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+          }
+          return metrics;
+        }
+      })
+    );
   }
   onDisable() {
     this.unsubscribers = unsubscribeAll(this.unsubscribers);
@@ -10537,28 +10671,40 @@ function aggregateAnthropicStreamChunks(chunks) {
       case "content_block_start":
         if (event.content_block) {
           contentBlocks[event.index] = event.content_block;
-          contentBlockDeltas[event.index] = [];
+          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) {
-            if (contentBlocks[event.index] !== void 0 || contentBlockDeltas[event.index] !== void 0) {
-              contentBlockDeltas[event.index] ??= [];
-              contentBlockDeltas[event.index].push(text);
+            if (acc !== void 0) {
+              acc.textDeltas.push(text);
             } else {
               fallbackTextDeltas.push(text);
             }
           }
-        } else if (event.delta?.type === "input_json_delta") {
-          const partialJson = event.delta.partial_json;
-          if (partialJson) {
-            contentBlockDeltas[event.index] ??= [];
-            contentBlockDeltas[event.index].push(partialJson);
+        } 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,
@@ -10584,7 +10730,7 @@ function aggregateAnthropicStreamChunks(chunks) {
   })).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)) {
+    if (orderedContent.every(isTextContentBlock) && orderedContent.every((block) => !block.citations?.length)) {
       output = orderedContent.map((block) => block.text).join("");
     } else {
       output = {
@@ -10610,7 +10756,8 @@ function finalizeContentBlock(index, contentBlocks, contentBlockDeltas, fallback
   if (!contentBlock) {
     return;
   }
-  const text = contentBlockDeltas[index]?.join("") ?? "";
+  const acc = contentBlockDeltas[index];
+  const text = acc?.textDeltas.join("") ?? "";
   if (isToolUseContentBlock(contentBlock)) {
     if (!text) {
       return;
@@ -10627,20 +10774,28 @@ function finalizeContentBlock(index, contentBlocks, contentBlockDeltas, fallback
     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,
-      text
+      thinking: text
     };
     return;
   }
-  if (text) {
-    fallbackTextDeltas.push(text);
-  }
-  delete contentBlocks[index];
 }
 function isTextContentBlock(contentBlock) {
   return contentBlock.type === "text";
@@ -10648,6 +10803,9 @@ function isTextContentBlock(contentBlock) {
 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";
 }
@@ -10702,15 +10860,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");
@@ -10840,6 +10989,16 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamObject.sync",
     kind: "sync-stream"
   }),
+  embed: channel(
+    {
+      channelName: "embed",
+      kind: "async"
+    }
+  ),
+  embedMany: channel({
+    channelName: "embedMany",
+    kind: "async"
+  }),
   agentGenerate: channel({
     channelName: "Agent.generate",
     kind: "async"
@@ -10848,6 +11007,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "Agent.stream",
     kind: "async"
   }),
+  agentStreamSync: channel({
+    channelName: "Agent.stream.sync",
+    kind: "sync-stream"
+  }),
   toolLoopAgentGenerate: channel({
     channelName: "ToolLoopAgent.generate",
     kind: "async"
@@ -10875,6 +11038,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 = {}) {
@@ -10893,10 +11059,13 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.generateText, {
         name: "generateText",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(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
@@ -10906,12 +11075,15 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamText, {
         name: "streamText",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, 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,
@@ -10923,9 +11095,9 @@ var AISDKPlugin = class extends BasePlugin {
       traceSyncStreamChannel(aiSDKChannels.streamTextSync, {
         name: "streamText",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
+          defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           result,
           span,
@@ -10937,10 +11109,13 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.generateObject, {
         name: "generateObject",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(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
@@ -10950,12 +11125,15 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamObject, {
         name: "streamObject",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, 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,
@@ -10967,9 +11145,9 @@ var AISDKPlugin = class extends BasePlugin {
       traceSyncStreamChannel(aiSDKChannels.streamObjectSync, {
         name: "streamObject",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
-          denyOutputPaths,
+          defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           result,
           span,
@@ -10977,14 +11155,41 @@ var AISDKPlugin = class extends BasePlugin {
         })
       })
     );
+    this.unsubscribers.push(
+      traceAsyncChannel(aiSDKChannels.embed, {
+        name: "embed",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event) => prepareAISDKEmbedInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKEmbeddingOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent)
+      })
+    );
+    this.unsubscribers.push(
+      traceAsyncChannel(aiSDKChannels.embedMany, {
+        name: "embedMany",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event) => prepareAISDKEmbedInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKEmbeddingOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent)
+      })
+    );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.agentGenerate, {
         name: "Agent.generate",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(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
@@ -10994,12 +11199,29 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.agentStream, {
         name: "Agent.stream",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, 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,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(aiSDKChannels.agentStreamSync, {
+        name: "Agent.stream",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           result,
           span,
@@ -11011,10 +11233,13 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.toolLoopAgentGenerate, {
         name: "ToolLoopAgent.generate",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(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
@@ -11024,12 +11249,15 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.toolLoopAgentStream, {
         name: "ToolLoopAgent.stream",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
-        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, 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,
@@ -11039,75 +11267,391 @@ 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 output = value;
+  if (!("responseFormat" in output)) {
+    return false;
+  }
+  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;
+      }
+    }
+    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 processAISDKCallInput(params) {
+  return processInputAttachmentsSync(params);
+}
+function prepareAISDKCallInput(params, event, span, defaultDenyOutputPaths) {
+  const { input, outputPromise } = processAISDKCallInput(params);
+  if (outputPromise && input && typeof input === "object") {
+    outputPromise.then((resolvedData) => {
+      span.log({
+        input: {
+          ...input,
+          ...resolvedData
+        }
+      });
+    }).catch(() => {
+    });
+  }
+  const metadata = extractMetadataFromCallParams(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 prepareAISDKEmbedInput(params, self) {
+  return {
+    input: { ...params },
+    metadata: extractMetadataFromEmbedParams(params, self)
+  };
+}
+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 createAISDKIntegrationMetadata() {
+  return {
+    braintrust: {
+      integration_name: "ai-sdk",
+      sdk_language: "typescript"
+    }
+  };
+}
+function resolveModelFromSelf(self) {
+  return 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;
+}
+function extractBaseMetadata(model, self) {
+  const metadata = createAISDKIntegrationMetadata();
+  const { model: modelId, provider } = serializeModelWithProvider(
+    model ?? resolveModelFromSelf(self)
+  );
+  if (modelId) {
+    metadata.model = modelId;
+  }
+  if (provider) {
+    metadata.provider = provider;
+  }
+  return metadata;
+}
+function extractMetadataFromCallParams(params, self) {
+  const metadata = extractBaseMetadata(params.model, self);
   const tools = serializeAISDKToolsForLogging(params.tools);
   if (tools) {
     metadata.tools = tools;
   }
   return metadata;
 }
-function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
+function extractMetadataFromEmbedParams(params, self) {
+  return extractBaseMetadata(params.model, self);
+}
+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);
+    const resolvedModel = resolveAISDKModel(model, aiSDK);
     if (!resolvedModel || typeof resolvedModel !== "object" || typeof resolvedModel.doGenerate !== "function" || patchedModels.has(resolvedModel) || resolvedModel[AUTO_PATCHED_MODEL]) {
-      return;
+      return resolvedModel;
     }
     patchedModels.add(resolvedModel);
     resolvedModel[AUTO_PATCHED_MODEL] = true;
@@ -11136,7 +11680,7 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
             type: "llm" /* LLM */
           },
           event: {
-            input: processAISDKInput(options),
+            input: processAISDKCallInput(options).input,
             metadata: baseMetadata
           }
         }
@@ -11150,7 +11694,7 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
             type: "llm" /* LLM */
           },
           event: {
-            input: processAISDKInput(options),
+            input: processAISDKCallInput(options).input,
             metadata: baseMetadata
           }
         });
@@ -11158,6 +11702,8 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
           span,
           () => Reflect.apply(originalDoStream, resolvedModel, [options])
         );
+        const streamStartTime = getCurrentUnixTimestamp();
+        let firstChunkTime;
         const output = {};
         let text = "";
         let reasoning = "";
@@ -11165,6 +11711,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);
@@ -11205,12 +11754,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();
@@ -11232,6 +11788,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]) {
@@ -11304,17 +11861,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);
@@ -11338,63 +11904,178 @@ 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",
+    "value",
+    "values",
+    "finishReason",
+    "embedding",
+    "embeddings",
+    "usage",
+    "totalUsage",
+    "responses",
+    "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 {
   }
@@ -11407,6 +12088,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) {
@@ -11429,16 +12119,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);
   }
@@ -11459,23 +12158,55 @@ function processAISDKOutput(output, denyOutputPaths) {
   const merged = extractSerializableOutputFields(output);
   return normalizeAISDKLoggedOutput(omit(merged, 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 {
-    }
-  }
-  if (!usage) {
-    return metrics;
+function processAISDKEmbeddingOutput(output, denyOutputPaths) {
+  if (!output || typeof output !== "object") {
+    return output;
   }
-  const promptTokens = firstNumber(
+  const summarized = {};
+  const whitelistedFields = [
+    "usage",
+    "totalUsage",
+    "warnings",
+    "providerMetadata",
+    "experimental_providerMetadata"
+  ];
+  for (const field of whitelistedFields) {
+    const value = safeSerializableFieldRead(output, field);
+    if (value !== void 0 && isSerializableOutputValue(value)) {
+      summarized[field] = value;
+    }
+  }
+  const embedding = safeSerializableFieldRead(output, "embedding");
+  if (Array.isArray(embedding)) {
+    summarized.embedding_length = embedding.length;
+  }
+  const embeddings = safeSerializableFieldRead(output, "embeddings");
+  if (Array.isArray(embeddings)) {
+    summarized.embedding_count = embeddings.length;
+    const firstEmbedding = embeddings.find((item) => Array.isArray(item));
+    if (Array.isArray(firstEmbedding)) {
+      summarized.embedding_length = firstEmbedding.length;
+    }
+  }
+  return normalizeAISDKLoggedOutput(omit(summarized, denyOutputPaths));
+}
+function extractTokenMetrics(result) {
+  const metrics = {};
+  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) {
+    return metrics;
+  }
+  const promptTokens = firstNumber(
     usage.inputTokens?.total,
     usage.inputTokens,
     usage.promptTokens,
@@ -11507,6 +12238,22 @@ function extractTokenMetrics(result) {
   }
   return metrics;
 }
+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 = {};
@@ -11515,17 +12262,21 @@ function aggregateAISDKChunks(chunks, _result, endEvent) {
   if (lastChunk) {
     metrics = hasModelChildTracing(endEvent) ? {} : extractTokenMetrics(lastChunk);
     metadata = buildResolvedMetadataPayload(lastChunk).metadata;
-    if (lastChunk.text !== void 0) {
-      output.text = lastChunk.text;
+    const text = safeSerializableFieldRead(lastChunk, "text");
+    if (text !== void 0) {
+      output.text = text;
     }
-    if (lastChunk.object !== void 0) {
-      output.object = lastChunk.object;
+    const objectValue = safeSerializableFieldRead(lastChunk, "object");
+    if (objectValue !== void 0) {
+      output.object = objectValue;
     }
-    if (lastChunk.finishReason !== void 0) {
-      output.finishReason = lastChunk.finishReason;
+    const finishReason = safeSerializableFieldRead(lastChunk, "finishReason");
+    if (finishReason !== void 0) {
+      output.finishReason = finishReason;
     }
-    if (lastChunk.toolCalls !== void 0) {
-      output.toolCalls = lastChunk.toolCalls;
+    const toolCalls = safeSerializableFieldRead(lastChunk, "toolCalls");
+    if (toolCalls !== void 0) {
+      output.toolCalls = toolCalls;
     }
   }
   finalizeAISDKChildTracing(endEvent);
@@ -11534,14 +12285,20 @@ function aggregateAISDKChunks(chunks, _result, endEvent) {
 function extractGetterValues(obj) {
   const getterValues = {};
   const getterNames = [
+    "content",
     "text",
     "object",
+    "value",
+    "values",
+    "embedding",
+    "embeddings",
     "finishReason",
     "usage",
     "totalUsage",
     "toolCalls",
     "toolResults",
     "warnings",
+    "responses",
     "experimental_providerMetadata",
     "providerMetadata",
     "rawResponse",
@@ -11549,8 +12306,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 {
     }
@@ -11572,6 +12338,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;
       }
@@ -11583,6 +12354,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;
@@ -11624,8 +12398,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,
@@ -11633,7 +12408,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,
@@ -11643,10 +12422,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) {
@@ -11658,7 +12438,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;
@@ -11775,7 +12559,307 @@ var claudeAgentSDKChannels = defineChannels(
   }
 );
 
+// src/instrumentation/plugins/claude-agent-sdk-instrumentation-constants.ts
+var CLAUDE_AGENT_SDK_SKIP_LOCAL_TOOL_HOOKS_OPTION = "__braintrust_skip_local_tool_hooks";
+
+// src/instrumentation/plugins/claude-agent-sdk-local-tool-context.ts
+var LOCAL_TOOL_CONTEXT_ASYNC_ITERATOR_PATCHED = Symbol.for(
+  "braintrust.claude_agent_sdk.local_tool_context_async_iterator_patched"
+);
+function createLocalToolContextStore() {
+  const maybeIsoWithAsyncLocalStorage = isomorph_default;
+  if (typeof maybeIsoWithAsyncLocalStorage.newAsyncLocalStorage === "function") {
+    return maybeIsoWithAsyncLocalStorage.newAsyncLocalStorage();
+  }
+  let currentStore;
+  return {
+    enterWith(store) {
+      currentStore = store;
+    },
+    getStore() {
+      return currentStore;
+    },
+    run(store, callback) {
+      const previousStore = currentStore;
+      currentStore = store;
+      try {
+        return callback();
+      } finally {
+        currentStore = previousStore;
+      }
+    }
+  };
+}
+var localToolContextStore = createLocalToolContextStore();
+var fallbackLocalToolParentResolver;
+function createClaudeLocalToolContext() {
+  return {};
+}
+function runWithClaudeLocalToolContext(callback, context) {
+  return localToolContextStore.run(
+    context ?? createClaudeLocalToolContext(),
+    callback
+  );
+}
+function ensureClaudeLocalToolContext() {
+  const existing = localToolContextStore.getStore();
+  if (existing) {
+    return existing;
+  }
+  const created = {};
+  localToolContextStore.enterWith(created);
+  return created;
+}
+function setClaudeLocalToolParentResolver(resolver) {
+  fallbackLocalToolParentResolver = resolver;
+  const context = ensureClaudeLocalToolContext();
+  if (!context) {
+    return;
+  }
+  context.resolveLocalToolParent = resolver;
+}
+function getClaudeLocalToolParentResolver() {
+  return localToolContextStore.getStore()?.resolveLocalToolParent ?? fallbackLocalToolParentResolver;
+}
+function isAsyncIterable2(value) {
+  return value !== null && typeof value === "object" && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+}
+function bindClaudeLocalToolContextToAsyncIterable(result, localToolContext) {
+  if (!isAsyncIterable2(result) || Object.isFrozen(result) || Object.isSealed(result)) {
+    return result;
+  }
+  const stream = result;
+  const originalAsyncIterator = stream[Symbol.asyncIterator];
+  if (originalAsyncIterator[LOCAL_TOOL_CONTEXT_ASYNC_ITERATOR_PATCHED]) {
+    return result;
+  }
+  const patchedAsyncIterator = function() {
+    return runWithClaudeLocalToolContext(() => {
+      const iterator = Reflect.apply(originalAsyncIterator, this, []);
+      if (!iterator || typeof iterator !== "object") {
+        return iterator;
+      }
+      const patchMethod = (methodName) => {
+        const originalMethod = Reflect.get(iterator, methodName);
+        if (typeof originalMethod !== "function") {
+          return;
+        }
+        Reflect.set(
+          iterator,
+          methodName,
+          (...args) => runWithClaudeLocalToolContext(
+            () => Reflect.apply(
+              originalMethod,
+              iterator,
+              args
+            ),
+            localToolContext
+          )
+        );
+      };
+      patchMethod("next");
+      patchMethod("return");
+      patchMethod("throw");
+      return iterator;
+    }, localToolContext);
+  };
+  Object.defineProperty(
+    patchedAsyncIterator,
+    LOCAL_TOOL_CONTEXT_ASYNC_ITERATOR_PATCHED,
+    {
+      configurable: false,
+      enumerable: false,
+      value: true,
+      writable: false
+    }
+  );
+  Reflect.set(stream, Symbol.asyncIterator, patchedAsyncIterator);
+  return result;
+}
+
+// src/instrumentation/plugins/claude-agent-sdk-local-tool-spans.ts
+var LOCAL_TOOL_HANDLER_WRAPPED = Symbol.for(
+  "braintrust.claude_agent_sdk.local_tool_handler_wrapped"
+);
+function toErrorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+function isPromiseLike2(value) {
+  return value !== null && typeof value === "object" && "then" in value && typeof value.then === "function";
+}
+function getToolUseIdFromExtra(extra) {
+  if (!extra || typeof extra !== "object" || !("_meta" in extra)) {
+    return void 0;
+  }
+  const meta = Reflect.get(extra, "_meta");
+  if (!meta || typeof meta !== "object") {
+    return void 0;
+  }
+  const toolUseId = Reflect.get(meta, "claudecode/toolUseId");
+  return typeof toolUseId === "string" ? toolUseId : void 0;
+}
+function wrapLocalClaudeToolHandler(handler, getMetadata) {
+  if (handler[LOCAL_TOOL_HANDLER_WRAPPED]) {
+    return handler;
+  }
+  const wrappedHandler = function wrappedLocalToolHandler(...handlerArgs) {
+    const metadata = getMetadata();
+    const rawToolName = metadata.serverName ? `mcp__${metadata.serverName}__${metadata.toolName}` : metadata.toolName;
+    const toolUseId = getToolUseIdFromExtra(handlerArgs[1]);
+    const localToolParentResolver = getClaudeLocalToolParentResolver();
+    const spanName = metadata.serverName ? `tool: ${metadata.serverName}/${metadata.toolName}` : `tool: ${metadata.toolName}`;
+    const runWithResolvedParent = async () => {
+      const parent = toolUseId && localToolParentResolver ? await localToolParentResolver(toolUseId).catch(() => void 0) : void 0;
+      const span = startSpan({
+        event: {
+          input: handlerArgs[0],
+          metadata: {
+            "claude_agent_sdk.raw_tool_name": rawToolName,
+            "gen_ai.tool.name": metadata.toolName,
+            ...toolUseId && { "gen_ai.tool.call.id": toolUseId },
+            ...metadata.serverName && {
+              "mcp.server": metadata.serverName
+            }
+          }
+        },
+        name: spanName,
+        ...parent && { parent },
+        spanAttributes: { type: "tool" /* TOOL */ }
+      });
+      const runHandler = () => Reflect.apply(handler, this, handlerArgs);
+      const finalizeSuccess = (result) => {
+        span.log({ output: result });
+        span.end();
+        return result;
+      };
+      const finalizeError = (error) => {
+        span.log({ error: toErrorMessage(error) });
+        span.end();
+        throw error;
+      };
+      return withCurrent(span, () => {
+        try {
+          const result = runHandler();
+          if (isPromiseLike2(result)) {
+            return result.then(finalizeSuccess, finalizeError);
+          }
+          return finalizeSuccess(result);
+        } catch (error) {
+          return finalizeError(error);
+        }
+      });
+    };
+    return runWithResolvedParent();
+  };
+  Object.defineProperty(wrappedHandler, LOCAL_TOOL_HANDLER_WRAPPED, {
+    configurable: false,
+    enumerable: false,
+    value: true,
+    writable: false
+  });
+  return wrappedHandler;
+}
+function getRegisteredTools(instance) {
+  if (!instance || typeof instance !== "object") {
+    return void 0;
+  }
+  if (!("_registeredTools" in instance)) {
+    return void 0;
+  }
+  const registeredTools = Reflect.get(instance, "_registeredTools");
+  if (registeredTools instanceof Map) {
+    return registeredTools;
+  }
+  if (registeredTools && typeof registeredTools === "object") {
+    return registeredTools;
+  }
+  return void 0;
+}
+function wrapLocalMcpServerToolHandlers(serverName, serverConfig) {
+  if (!serverConfig || typeof serverConfig !== "object") {
+    return false;
+  }
+  if (!("instance" in serverConfig)) {
+    return false;
+  }
+  const instance = Reflect.get(serverConfig, "instance");
+  const registeredTools = getRegisteredTools(instance);
+  if (!registeredTools) {
+    return false;
+  }
+  let wrappedAny = false;
+  const wrapHandler = (toolName, registration) => {
+    if (!registration || typeof registration !== "object") {
+      return;
+    }
+    const handler = Reflect.get(registration, "handler");
+    if (typeof handler !== "function") {
+      return;
+    }
+    const wrappedHandler = wrapLocalClaudeToolHandler(handler, () => ({
+      serverName,
+      toolName
+    }));
+    if (wrappedHandler !== handler) {
+      Reflect.set(registration, "handler", wrappedHandler);
+      wrappedAny = true;
+    }
+  };
+  if (registeredTools instanceof Map) {
+    for (const [toolName, registration] of registeredTools.entries()) {
+      wrapHandler(toolName, registration);
+    }
+    return wrappedAny;
+  }
+  for (const [toolName, registration] of Object.entries(registeredTools)) {
+    wrapHandler(toolName, registration);
+  }
+  return wrappedAny;
+}
+function collectLocalMcpServerToolHookNames(serverName, serverConfig) {
+  const toolNames = /* @__PURE__ */ new Set();
+  if (!serverConfig || typeof serverConfig !== "object") {
+    return toolNames;
+  }
+  if ("instance" in serverConfig) {
+    const instance = Reflect.get(serverConfig, "instance");
+    const registeredTools = getRegisteredTools(instance);
+    if (registeredTools instanceof Map) {
+      for (const toolName of registeredTools.keys()) {
+        toolNames.add(toolName);
+        toolNames.add(`mcp__${serverName}__${toolName}`);
+      }
+    } else if (registeredTools) {
+      for (const toolName of Object.keys(registeredTools)) {
+        toolNames.add(toolName);
+        toolNames.add(`mcp__${serverName}__${toolName}`);
+      }
+    }
+  }
+  if ("tools" in serverConfig) {
+    const rawTools = Reflect.get(serverConfig, "tools");
+    if (Array.isArray(rawTools)) {
+      for (const tool of rawTools) {
+        if (!tool || typeof tool !== "object") {
+          continue;
+        }
+        const toolName = Reflect.get(tool, "name");
+        if (typeof toolName !== "string") {
+          continue;
+        }
+        toolNames.add(toolName);
+        toolNames.add(`mcp__${serverName}__${toolName}`);
+      }
+    }
+  }
+  return toolNames;
+}
+
 // src/instrumentation/plugins/claude-agent-sdk-plugin.ts
+var ROOT_LLM_PARENT_KEY = "__root__";
+function llmParentKey(parentToolUseId) {
+  return parentToolUseId ?? ROOT_LLM_PARENT_KEY;
+}
 function isSubAgentToolName(toolName) {
   return toolName === "Agent" || toolName === "Task";
 }
@@ -11861,7 +12945,7 @@ function buildLLMInput(prompt, conversationHistory, capturedPromptMessages) {
 function formatCapturedMessages(messages) {
   return messages.length > 0 ? messages : [];
 }
-async function createLLMSpanForMessages(messages, prompt, conversationHistory, options, startTime, capturedPromptMessages, parentSpan) {
+async function createLLMSpanForMessages(messages, prompt, conversationHistory, options, startTime, capturedPromptMessages, parentSpan, existingSpan) {
   if (messages.length === 0) {
     return void 0;
   }
@@ -11881,7 +12965,7 @@ async function createLLMSpanForMessages(messages, prompt, conversationHistory, o
   ).filter(
     (c) => c !== void 0
   );
-  const span = startSpan({
+  const span = existingSpan ?? startSpan({
     name: "anthropic.messages.create",
     parent: parentSpan,
     spanAttributes: {
@@ -11895,8 +12979,13 @@ async function createLLMSpanForMessages(messages, prompt, conversationHistory, o
     metrics: usage,
     output: outputs
   });
+  const spanExport = await span.export();
   await span.end();
-  return lastMessage.message?.content && lastMessage.message?.role ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
+  const finalMessage = lastMessage.message?.content && lastMessage.message?.role ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
+  return {
+    finalMessage,
+    spanExport
+  };
 }
 function getMcpServerMetadata(serverName, mcpServers) {
   if (!serverName || !mcpServers) {
@@ -11940,11 +13029,51 @@ function parseToolName(rawToolName) {
     toolName: rawToolName
   };
 }
-function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers, subAgentSpans, endedSubAgentSpans) {
+function isLocalToolUse(rawToolName, mcpServers) {
+  const parsed = parseToolName(rawToolName);
+  if (!parsed.mcpServer || !mcpServers) {
+    return false;
+  }
+  const serverConfig = mcpServers[parsed.mcpServer];
+  if (!serverConfig || typeof serverConfig !== "object") {
+    return false;
+  }
+  return serverConfig.type === "sdk" || "transport" in serverConfig;
+}
+function prepareLocalToolHandlersInMcpServers(mcpServers) {
+  const localToolHookNames = /* @__PURE__ */ new Set();
+  if (!mcpServers) {
+    return {
+      hasLocalToolHandlers: false,
+      localToolHookNames
+    };
+  }
+  let hasLocalToolHandlers = false;
+  for (const [serverName, serverConfig] of Object.entries(mcpServers)) {
+    const toolNames = collectLocalMcpServerToolHookNames(
+      serverName,
+      serverConfig
+    );
+    for (const toolName of toolNames) {
+      localToolHookNames.add(toolName);
+    }
+    if (toolNames.size > 0) {
+      hasLocalToolHandlers = true;
+    }
+    if (wrapLocalMcpServerToolHandlers(serverName, serverConfig)) {
+      hasLocalToolHandlers = true;
+    }
+  }
+  return { hasLocalToolHandlers, localToolHookNames };
+}
+function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers, localToolHookNames, skipLocalToolHooks, subAgentSpans, endedSubAgentSpans) {
   const preToolUse = async (input, toolUseID) => {
     if (input.hook_event_name !== "PreToolUse" || !toolUseID) {
       return {};
     }
+    if (skipLocalToolHooks && (isLocalToolUse(input.tool_name, mcpServers) || localToolHookNames.has(input.tool_name))) {
+      return {};
+    }
     if (isSubAgentToolName(input.tool_name)) {
       return {};
     }
@@ -11973,6 +13102,9 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
     if (input.hook_event_name !== "PostToolUse" || !toolUseID) {
       return {};
     }
+    if (skipLocalToolHooks && (isLocalToolUse(input.tool_name, mcpServers) || localToolHookNames.has(input.tool_name))) {
+      return {};
+    }
     const subAgentSpan = subAgentSpans.get(toolUseID);
     if (subAgentSpan) {
       try {
@@ -12013,6 +13145,9 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
     if (input.hook_event_name !== "PostToolUseFailure" || !toolUseID) {
       return {};
     }
+    if (skipLocalToolHooks && (isLocalToolUse(input.tool_name, mcpServers) || localToolHookNames.has(input.tool_name))) {
+      return {};
+    }
     const subAgentSpan = subAgentSpans.get(toolUseID);
     if (subAgentSpan) {
       try {
@@ -12047,11 +13182,13 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
   };
   return { postToolUse, postToolUseFailure, preToolUse };
 }
-function injectTracingHooks(options, resolveParentSpan, activeToolSpans, subAgentSpans, endedSubAgentSpans) {
+function injectTracingHooks(options, resolveParentSpan, activeToolSpans, localToolHookNames, skipLocalToolHooks, subAgentSpans, endedSubAgentSpans) {
   const { preToolUse, postToolUse, postToolUseFailure } = createToolTracingHooks(
     resolveParentSpan,
     activeToolSpans,
     options.mcpServers,
+    localToolHookNames,
+    skipLocalToolHooks,
     subAgentSpans,
     endedSubAgentSpans
   );
@@ -12082,6 +13219,7 @@ async function finalizeCurrentMessageGroup(state) {
     return;
   }
   const parentToolUseId = state.currentMessages[0]?.parent_tool_use_id ?? null;
+  const parentKey = llmParentKey(parentToolUseId);
   let parentSpan = await state.span.export();
   if (parentToolUseId) {
     const subAgentSpan = state.subAgentSpans.get(parentToolUseId);
@@ -12089,17 +13227,30 @@ async function finalizeCurrentMessageGroup(state) {
       parentSpan = await subAgentSpan.export();
     }
   }
-  const finalMessage = await createLLMSpanForMessages(
+  const existingLlmSpan = state.activeLlmSpansByParentToolUse.get(parentKey);
+  const llmSpanResult = await createLLMSpanForMessages(
     state.currentMessages,
     state.originalPrompt,
     state.finalResults,
     state.options,
     state.currentMessageStartTime,
     state.capturedPromptMessages,
-    parentSpan
+    parentSpan,
+    existingLlmSpan
   );
-  if (finalMessage) {
-    state.finalResults.push(finalMessage);
+  state.activeLlmSpansByParentToolUse.delete(parentKey);
+  if (llmSpanResult) {
+    if (parentToolUseId) {
+      state.latestLlmParentBySubAgentToolUse.set(
+        parentToolUseId,
+        llmSpanResult.spanExport
+      );
+    } else {
+      state.latestRootLlmParentRef.value = llmSpanResult.spanExport;
+    }
+    if (llmSpanResult.finalMessage) {
+      state.finalResults.push(llmSpanResult.finalMessage);
+    }
   }
   const lastMessage = state.currentMessages[state.currentMessages.length - 1];
   if (lastMessage?.message?.usage) {
@@ -12167,6 +13318,29 @@ async function handleStreamMessage(state, message) {
     state.currentMessageStartTime = getCurrentUnixTimestamp();
   }
   if (message.type === "assistant" && message.message?.usage) {
+    const parentToolUseId = message.parent_tool_use_id ?? null;
+    const parentKey = llmParentKey(parentToolUseId);
+    if (!state.activeLlmSpansByParentToolUse.has(parentKey)) {
+      let llmParentSpan = await state.span.export();
+      if (parentToolUseId) {
+        const subAgentSpan = await ensureSubAgentSpan(
+          state.pendingSubAgentNames,
+          state.span,
+          state.subAgentSpans,
+          parentToolUseId
+        );
+        llmParentSpan = await subAgentSpan.export();
+      }
+      const llmSpan = startSpan({
+        name: "anthropic.messages.create",
+        parent: llmParentSpan,
+        spanAttributes: {
+          type: "llm" /* LLM */
+        },
+        startTime: state.currentMessageStartTime
+      });
+      state.activeLlmSpansByParentToolUse.set(parentKey, llmSpan);
+    }
     state.currentMessages.push(message);
   }
   if (message.type !== "result" || !message.usage) {
@@ -12227,6 +13401,10 @@ async function finalizeQuerySpan(state) {
       }
     }
   } finally {
+    for (const llmSpan of state.activeLlmSpansByParentToolUse.values()) {
+      llmSpan.end();
+    }
+    state.activeLlmSpansByParentToolUse.clear();
     for (const [id, subAgentSpan] of state.subAgentSpans) {
       if (!state.endedSubAgentSpans.has(id)) {
         subAgentSpan.end();
@@ -12292,26 +13470,51 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           console.error("Error extracting input for Claude Agent SDK:", error);
         }
         const activeToolSpans = /* @__PURE__ */ new Map();
+        const activeLlmSpansByParentToolUse = /* @__PURE__ */ new Map();
         const subAgentSpans = /* @__PURE__ */ new Map();
         const endedSubAgentSpans = /* @__PURE__ */ new Set();
         const toolUseToParent = /* @__PURE__ */ new Map();
+        const latestLlmParentBySubAgentToolUse = /* @__PURE__ */ new Map();
+        const latestRootLlmParentRef = {
+          value: void 0
+        };
         const pendingSubAgentNames = /* @__PURE__ */ new Map();
+        const localToolContext = createClaudeLocalToolContext();
+        const { hasLocalToolHandlers, localToolHookNames } = prepareLocalToolHandlersInMcpServers(options.mcpServers);
+        const skipLocalToolHooks = options[CLAUDE_AGENT_SDK_SKIP_LOCAL_TOOL_HOOKS_OPTION] === true || hasLocalToolHandlers;
+        const resolveToolUseParentSpan = async (toolUseID) => {
+          const parentToolUseId = toolUseToParent.get(toolUseID) ?? null;
+          const parentKey = llmParentKey(parentToolUseId);
+          const activeLlmSpan = activeLlmSpansByParentToolUse.get(parentKey);
+          if (activeLlmSpan) {
+            return activeLlmSpan.export();
+          }
+          if (parentToolUseId) {
+            const parentLlm = latestLlmParentBySubAgentToolUse.get(parentToolUseId);
+            if (parentLlm) {
+              return parentLlm;
+            }
+            const subAgentSpan = await ensureSubAgentSpan(
+              pendingSubAgentNames,
+              span,
+              subAgentSpans,
+              parentToolUseId
+            );
+            return subAgentSpan.export();
+          }
+          if (latestRootLlmParentRef.value) {
+            return latestRootLlmParentRef.value;
+          }
+          return span.export();
+        };
+        localToolContext.resolveLocalToolParent = resolveToolUseParentSpan;
+        setClaudeLocalToolParentResolver(resolveToolUseParentSpan);
         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();
-          },
+          resolveToolUseParentSpan,
           activeToolSpans,
+          localToolHookNames,
+          skipLocalToolHooks,
           subAgentSpans,
           endedSubAgentSpans
         );
@@ -12319,6 +13522,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         event.arguments[0] = params;
         spans.set(event, {
           accumulatedOutputTokens: 0,
+          activeLlmSpansByParentToolUse,
           activeToolSpans,
           capturedPromptMessages,
           currentMessageId: void 0,
@@ -12334,7 +13538,10 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           promptStarted: () => promptStarted,
           span,
           subAgentSpans,
-          toolUseToParent
+          latestLlmParentBySubAgentToolUse,
+          latestRootLlmParentRef,
+          toolUseToParent,
+          localToolContext
         });
       },
       end: (event) => {
@@ -12342,7 +13549,10 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         if (!state) {
           return;
         }
-        const eventResult = event.result;
+        const eventResult = bindClaudeLocalToolContextToAsyncIterable(
+          event.result,
+          state.localToolContext
+        );
         if (eventResult === void 0) {
           state.span.end();
           spans.delete(event);
@@ -12359,20 +13569,16 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
                 );
               });
             },
-            onComplete: () => {
-              void state.processing.then(() => finalizeQuerySpan(state)).finally(() => {
-                spans.delete(event);
-              });
-            },
-            onError: (error) => {
-              void state.processing.then(() => {
-                state.span.log({
-                  error: error.message
-                });
-              }).then(() => finalizeQuerySpan(state)).finally(() => {
-                spans.delete(event);
+            onComplete: () => state.processing.then(() => finalizeQuerySpan(state)).finally(() => {
+              spans.delete(event);
+            }),
+            onError: (error) => state.processing.then(() => {
+              state.span.log({
+                error: error.message
               });
-            }
+            }).then(() => finalizeQuerySpan(state)).finally(() => {
+              spans.delete(event);
+            })
           });
           return;
         }
@@ -12520,12 +13726,14 @@ var GoogleGenAIPlugin = class extends BasePlugin {
         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
         });
       },
@@ -12549,19 +13757,20 @@ function ensureSpanState(states, event, create) {
 }
 function bindCurrentSpanStoreToStart2(tracingChannel2, states, create) {
   const state = _internalGetGlobalState();
+  const contextManager = state?.contextManager;
   const startChannel = tracingChannel2.start;
-  const currentSpanStore = state?.contextManager ? state.contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
+  const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
   if (!startChannel?.bindStore || !currentSpanStore) {
     return void 0;
   }
-  startChannel.bindStore(
-    currentSpanStore,
-    (event) => ensureSpanState(
+  startChannel.bindStore(currentSpanStore, (event) => {
+    const span = ensureSpanState(
       states,
       event,
       () => create(event)
-    ).span
-  );
+    ).span;
+    return contextManager.wrapSpanForStore(span);
+  });
   return () => {
     startChannel.unbindStore?.(currentSpanStore);
   };
@@ -12578,7 +13787,7 @@ function logErrorAndEndSpan(states, event) {
   states.delete(event);
 }
 function patchGoogleGenAIStreamingResult(args) {
-  const { input, metadata, result } = args;
+  const { input, metadata, result, startTime } = args;
   if (!input || !metadata || !result || typeof result !== "object" || typeof result.next !== "function") {
     return false;
   }
@@ -12586,7 +13795,7 @@ function patchGoogleGenAIStreamingResult(args) {
   let firstTokenTime = null;
   let finalized = false;
   let span = null;
-  let startTime = null;
+  const requestStartTime = startTime ?? getCurrentUnixTimestamp();
   const ensureSpan = () => {
     if (!span) {
       span = startSpan({
@@ -12599,7 +13808,6 @@ function patchGoogleGenAIStreamingResult(args) {
           metadata
         }
       });
-      startTime = getCurrentUnixTimestamp();
     }
     return span;
   };
@@ -12653,11 +13861,11 @@ function patchGoogleGenAIStreamingResult(args) {
             }
             chunks.push(nextResult.value);
           }
-          if (nextResult.done && startTime !== null) {
+          if (nextResult.done) {
             finalize({
               result: aggregateGenerateContentChunks(
                 chunks,
-                startTime,
+                requestStartTime,
                 firstTokenTime
               )
             });
@@ -12677,13 +13885,13 @@ function patchGoogleGenAIStreamingResult(args) {
             ...returnArgs
           );
         } finally {
-          if (startTime !== null) {
+          if (chunks.length > 0) {
             finalize({
-              result: chunks.length > 0 ? aggregateGenerateContentChunks(
+              result: aggregateGenerateContentChunks(
                 chunks,
-                startTime,
+                requestStartTime,
                 firstTokenTime
-              ) : void 0
+              )
             });
           } else {
             finalize({});
@@ -12957,46 +14165,161 @@ function tryToDict(obj) {
   return null;
 }
 
-// src/instrumentation/plugins/openrouter-channels.ts
-var openRouterChannels = defineChannels("@openrouter/sdk", {
-  chatSend: channel({
-    channelName: "chat.send",
-    kind: "async"
-  }),
-  embeddingsGenerate: channel({
-    channelName: "embeddings.generate",
-    kind: "async"
-  }),
-  betaResponsesSend: channel({
-    channelName: "beta.responses.send",
-    kind: "async"
-  }),
+// src/instrumentation/plugins/openrouter-agent-channels.ts
+var openRouterAgentChannels = defineChannels("@openrouter/agent", {
   callModel: channel({
     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",
+// src/instrumentation/plugins/openrouter-agent-plugin.ts
+var OpenRouterAgentPlugin = class extends BasePlugin {
+  onEnable() {
+    this.subscribeToOpenRouterAgentChannels();
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+  subscribeToOpenRouterAgentChannels() {
+    this.unsubscribers.push(
+      traceSyncStreamChannel(openRouterAgentChannels.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
+          });
+        }
+      })
+    );
+    this.unsubscribers.push(
+      traceAsyncChannel(openRouterAgentChannels.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(openRouterAgentChannels.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 = openRouterAgentChannels.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);
+    });
+  }
+};
+function normalizeArgs(args) {
+  if (Array.isArray(args)) {
+    return args;
+  }
+  if (isArrayLike(args)) {
+    return Array.from(args);
+  }
+  return [args];
+}
+function isArrayLike(value) {
+  return isObject(value) && "length" in value && typeof value.length === "number" && Number.isInteger(value.length) && value.length >= 0;
+}
+function getOpenRouterCallModelRequestArg(args) {
+  const normalizedArgs = normalizeArgs(args);
+  const keyedRequestArg = normalizedArgs.find(
+    (arg) => isObject(arg) && ("input" in arg || "model" in arg || "tools" in arg)
+  );
+  if (isObject(keyedRequestArg)) {
+    return keyedRequestArg;
+  }
+  const firstObjectArg = normalizedArgs.find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+}
+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",
@@ -13047,8 +14370,6 @@ function extractOpenRouterUsageMetadata(usage) {
   }
   return Object.keys(metadata).length > 0 ? metadata : void 0;
 }
-
-// src/openrouter-logging.ts
 var OMITTED_OPENROUTER_KEYS = /* @__PURE__ */ new Set([
   "execute",
   "render",
@@ -13068,10 +14389,10 @@ function parseOpenRouterModelString(model) {
   }
   return { model };
 }
-function isZodSchema2(value) {
+function isZodSchema3(value) {
   return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
 }
-function serializeZodSchema2(schema) {
+function serializeZodSchema3(schema) {
   try {
     return zodToJsonSchema(schema);
   } catch {
@@ -13105,8 +14426,8 @@ function serializeOpenRouterToolsForLogging(tools) {
   return tools.map((tool) => serializeOpenRouterTool(tool));
 }
 function sanitizeOpenRouterLoggedValue(value) {
-  if (isZodSchema2(value)) {
-    return serializeZodSchema2(value);
+  if (isZodSchema3(value)) {
+    return serializeZodSchema3(value);
   }
   if (typeof value === "function") {
     return "[Function]";
@@ -13130,7 +14451,7 @@ function sanitizeOpenRouterLoggedValue(value) {
   }
   return sanitized;
 }
-function buildOpenRouterMetadata(metadata, httpReferer, xTitle) {
+function buildOpenRouterMetadata(metadata, httpReferer, appTitle, appCategories, xTitle) {
   const sanitized = sanitizeOpenRouterLoggedValue(metadata);
   const metadataRecord = isObject(sanitized) ? sanitized : {};
   const { model, provider: providerRouting, ...rest } = metadataRecord;
@@ -13140,17 +14461,12 @@ function buildOpenRouterMetadata(metadata, httpReferer, xTitle) {
     ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
     ...providerRouting !== void 0 ? { providerRouting } : {},
     ...httpReferer !== void 0 ? { httpReferer } : {},
+    ...appTitle !== void 0 ? { appTitle } : {},
+    ...appCategories !== void 0 ? { appCategories } : {},
     ...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;
 }
@@ -13159,7 +14475,13 @@ function extractOpenRouterCallModelMetadata(request) {
     return { provider: "openrouter" };
   }
   const { input: _input, ...metadata } = request;
-  return buildOpenRouterMetadata(metadata, void 0, void 0);
+  return buildOpenRouterMetadata(
+    metadata,
+    void 0,
+    void 0,
+    void 0,
+    void 0
+  );
 }
 function extractOpenRouterResponseMetadata(result) {
   if (!isObject(result)) {
@@ -13189,9 +14511,101 @@ function extractOpenRouterResponseOutput(response, fallbackOutput) {
   }
   return void 0;
 }
-
-// src/openrouter-tool-wrapping.ts
 var OPENROUTER_WRAPPED_TOOL = Symbol("braintrust.openrouter.wrappedTool");
+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 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 = openRouterAgentChannels.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 publishToolResult(tracingChannel2, event, result) {
+  if (isPromiseLike3(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;
+      }
+    );
+  }
+  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;
+}
+function isPromiseLike3(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
+}
 var OPENROUTER_WRAPPED_CALL_MODEL_RESULT = Symbol(
   "braintrust.openrouter.wrappedCallModelResult"
 );
@@ -13211,24 +14625,8 @@ var OPENROUTER_CALL_MODEL_CONTEXT_METHODS = [
   "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) {
+function patchOpenRouterCallModelResult(args) {
+  const { request, result, span } = args;
   if (!isObject(result) || isWrappedCallModelResult(result)) {
     return false;
   }
@@ -13301,10 +14699,10 @@ function patchOpenRouterCallModelResult(span, result, request) {
     }
   };
   if (originalGetResponse) {
-    resultLike.getResponse = async (...args) => {
+    resultLike.getResponse = async (...args2) => {
       return await withCurrent(span, async () => {
         try {
-          const response = await originalGetResponse(...args);
+          const response = await originalGetResponse(...args2);
           await endSpanWithResult(response);
           return response;
         } catch (error) {
@@ -13316,10 +14714,10 @@ function patchOpenRouterCallModelResult(span, result, request) {
   }
   if (typeof resultLike.getText === "function") {
     const originalGetText = resultLike.getText.bind(resultLike);
-    resultLike.getText = async (...args) => {
+    resultLike.getText = async (...args2) => {
       return await withCurrent(span, async () => {
         try {
-          const text = await originalGetText(...args);
+          const text = await originalGetText(...args2);
           await finalizeFromResponse(text);
           return text;
         } catch (error) {
@@ -13334,9 +14732,9 @@ function patchOpenRouterCallModelResult(span, result, request) {
       continue;
     }
     const originalMethod = resultLike[methodName];
-    resultLike[methodName] = async (...args) => {
+    resultLike[methodName] = async (...args2) => {
       return await withCurrent(span, async () => {
-        return await originalMethod.apply(resultLike, args);
+        return await originalMethod.apply(resultLike, args2);
       });
     };
   }
@@ -13345,12 +14743,12 @@ function patchOpenRouterCallModelResult(span, result, request) {
       continue;
     }
     const originalMethod = resultLike[methodName];
-    resultLike[methodName] = (...args) => {
+    resultLike[methodName] = (...args2) => {
       const stream = withCurrent(
         span,
-        () => originalMethod.apply(resultLike, args)
+        () => originalMethod.apply(resultLike, args2)
       );
-      if (!isAsyncIterable2(stream)) {
+      if (!isAsyncIterable3(stream)) {
         return stream;
       }
       return wrapAsyncIterableWithSpan({
@@ -13363,157 +14761,70 @@ function patchOpenRouterCallModelResult(span, result, request) {
   }
   if (originalGetInitialResponse) {
     let initialTurnTraced = false;
-    resultLike.getInitialResponse = async (...args) => {
+    resultLike.getInitialResponse = async (...args2) => {
       if (initialTurnTraced) {
         return await withCurrent(span, async () => {
-          return await originalGetInitialResponse(...args);
+          return await originalGetInitialResponse(...args2);
         });
       }
       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);
+      const step = tracedTurnCount + 1;
+      const stepType = tracedTurnCount === 0 ? "initial" : "continue";
+      const response = await traceOpenRouterCallModelTurn({
+        fn: async () => {
+          const nextResponse = await originalGetInitialResponse(...args2);
           tracedTurnCount++;
-          finishOpenRouterCallModelTurnSpan({
-            response,
-            step: tracedTurnCount,
-            stepType: tracedTurnCount === 1 ? "initial" : "continue",
-            span: childSpan
-          });
-          return response;
-        } catch (error) {
-          childSpan.log({
-            error: normalizeError(error).message
-          });
-          childSpan.end();
-          throw error;
-        }
+          return nextResponse;
+        },
+        parentSpan: span,
+        request: getOpenRouterResolvedRequest(resultLike, request),
+        step,
+        stepType
       });
+      return response;
     };
   }
   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);
+    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++;
-          finishOpenRouterCallModelTurnSpan({
-            response,
-            step: tracedTurnCount,
-            stepType: "continue",
-            span: childSpan
-          });
-          return response;
-        } catch (error) {
-          childSpan.log({
-            error: normalizeError(error).message
-          });
-          childSpan.end();
-          throw error;
-        }
+          return nextResponse;
+        },
+        parentSpan: span,
+        request: buildOpenRouterFollowupRequest(
+          getOpenRouterResolvedRequest(resultLike, request),
+          currentResponse,
+          toolResults
+        ),
+        step,
+        stepType: "continue"
       });
+      return response;
     };
   }
   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
-        });
-      }
-    }
+async function traceOpenRouterCallModelTurn(args) {
+  const context = {
+    arguments: [args.request],
+    step: args.step,
+    stepType: args.stepType
   };
-  Object.defineProperty(wrappedTool, OPENROUTER_WRAPPED_TOOL, {
-    value: true,
-    enumerable: false,
-    configurable: false
-  });
-  return wrappedTool;
-}
-function isWrappedTool(tool) {
-  return Boolean(tool[OPENROUTER_WRAPPED_TOOL]);
+  return await withCurrent(
+    args.parentSpan,
+    () => openRouterAgentChannels.callModelTurn.tracePromise(args.fn, context)
+  );
 }
 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 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;
-      }
-    );
-  }
-  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;
-}
 function extractOpenRouterCallModelResultMetadata(response, turnCount) {
   const combined = {
     ...extractOpenRouterResponseMetadata(response) || {},
@@ -13558,45 +14869,6 @@ function buildNextOpenRouterCallModelInput(currentInput, response, toolResults)
     (entry) => sanitizeOpenRouterLoggedValue(entry)
   );
 }
-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;
-  }
-  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
-      }
-    }
-  });
-}
-function finishOpenRouterCallModelTurnSpan(args) {
-  if (!isObject(args.response)) {
-    args.span.end();
-    return;
-  }
-  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;
@@ -13671,16 +14943,41 @@ function wrapAsyncIterableWithSpan(args) {
     }
   };
 }
-function isAsyncIterable2(value) {
+function isAsyncIterable3(value) {
   return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
-function isPromiseLike(value) {
-  return !!value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
-}
 function normalizeError(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 
+// src/instrumentation/plugins/openrouter-channels.ts
+var openRouterChannels = defineChannels("@openrouter/sdk", {
+  chatSend: channel({
+    channelName: "chat.send",
+    kind: "async"
+  }),
+  embeddingsGenerate: channel({
+    channelName: "embeddings.generate",
+    kind: "async"
+  }),
+  betaResponsesSend: channel({
+    channelName: "beta.responses.send",
+    kind: "async"
+  }),
+  callModel: channel({
+    channelName: "callModel",
+    kind: "sync-stream"
+  }),
+  callModelTurn: channel({
+    channelName: "callModel.turn",
+    kind: "async"
+  }),
+  toolExecute: channel({
+    channelName: "tool.execute",
+    kind: "async"
+  })
+});
+
 // src/instrumentation/plugins/openrouter-plugin.ts
 var OpenRouterPlugin = class extends BasePlugin {
   onEnable() {
@@ -13702,14 +14999,14 @@ var OpenRouterPlugin = class extends BasePlugin {
           const { messages, ...metadata } = chatGenerationParams;
           return {
             input: messages,
-            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
+            metadata: buildOpenRouterMetadata2(metadata, httpReferer, xTitle)
           };
         },
         extractOutput: (result) => {
           return isObject(result) ? result.choices : void 0;
         },
         extractMetrics: (result, startTime) => {
-          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
+          const metrics = parseOpenRouterMetricsFromUsage2(result?.usage);
           if (startTime) {
             metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
           }
@@ -13748,10 +15045,10 @@ var OpenRouterPlugin = class extends BasePlugin {
           if (!isObject(result)) {
             return void 0;
           }
-          return extractOpenRouterResponseMetadata(result);
+          return extractOpenRouterResponseMetadata2(result);
         },
         extractMetrics: (result) => {
-          return isObject(result) ? parseOpenRouterMetricsFromUsage(result.usage) : {};
+          return isObject(result) ? parseOpenRouterMetricsFromUsage2(result.usage) : {};
         }
       })
     );
@@ -13767,13 +15064,13 @@ var OpenRouterPlugin = class extends BasePlugin {
           const { input, ...metadata } = openResponsesRequest;
           return {
             input,
-            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
+            metadata: buildOpenRouterMetadata2(metadata, httpReferer, xTitle)
           };
         },
-        extractOutput: (result) => extractOpenRouterResponseOutput(result),
-        extractMetadata: (result) => extractOpenRouterResponseMetadata(result),
+        extractOutput: (result) => extractOpenRouterResponseOutput2(result),
+        extractMetadata: (result) => extractOpenRouterResponseMetadata2(result),
         extractMetrics: (result, startTime) => {
-          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
+          const metrics = parseOpenRouterMetricsFromUsage2(result?.usage);
           if (startTime) {
             metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
           }
@@ -13787,21 +15084,57 @@ var OpenRouterPlugin = class extends BasePlugin {
         name: "openrouter.callModel",
         type: "llm" /* LLM */,
         extractInput: (args) => {
-          const request = getOpenRouterCallModelRequestArg(args);
+          const request = getOpenRouterCallModelRequestArg2(args);
           return {
-            input: request ? extractOpenRouterCallModelInput(request) : void 0,
-            metadata: request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" }
+            input: request ? extractOpenRouterCallModelInput2(request) : void 0,
+            metadata: request ? extractOpenRouterCallModelMetadata2(request) : { provider: "openrouter" }
           };
         },
         patchResult: ({ endEvent, result, span }) => {
-          return patchOpenRouterCallModelResult(
-            span,
+          return patchOpenRouterCallModelResult2({
+            request: getOpenRouterCallModelRequestArg2(endEvent.arguments),
             result,
-            getOpenRouterCallModelRequestArg(endEvent.arguments)
-          );
+            span
+          });
         }
       })
     );
+    this.unsubscribers.push(
+      traceAsyncChannel(openRouterChannels.callModelTurn, {
+        name: "openrouter.beta.responses.send",
+        type: "llm" /* LLM */,
+        extractInput: (args, event) => {
+          const request = getOpenRouterCallModelRequestArg2(args);
+          const metadata = request ? extractOpenRouterCallModelMetadata2(request) : { provider: "openrouter" };
+          if (isObject(metadata) && "tools" in metadata) {
+            delete metadata.tools;
+          }
+          return {
+            input: request ? extractOpenRouterCallModelInput2(request) : void 0,
+            metadata: {
+              ...metadata,
+              step: event.step,
+              step_type: event.stepType
+            }
+          };
+        },
+        extractOutput: (result) => extractOpenRouterResponseOutput2(result),
+        extractMetadata: (result, event) => {
+          if (!isObject(result)) {
+            return {
+              step: event?.step,
+              step_type: event?.stepType
+            };
+          }
+          return {
+            ...extractOpenRouterResponseMetadata2(result) || {},
+            ...event?.step !== void 0 ? { step: event.step } : {},
+            ...event?.stepType ? { step_type: event.stepType } : {}
+          };
+        },
+        extractMetrics: (result) => isObject(result) ? parseOpenRouterMetricsFromUsage2(result.usage) : {}
+      })
+    );
     this.unsubscribers.push(
       traceStreamingChannel(openRouterChannels.toolExecute, {
         name: "openrouter.tool",
@@ -13822,155 +15155,1303 @@ var OpenRouterPlugin = class extends BasePlugin {
         })
       })
     );
-    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);
-    });
+    const callModelChannel = openRouterChannels.callModel.tracingChannel();
+    const callModelHandlers = {
+      start: (event) => {
+        const request = getOpenRouterCallModelRequestArg2(event.arguments);
+        if (!request) {
+          return;
+        }
+        patchOpenRouterCallModelRequestTools2(request);
+      }
+    };
+    callModelChannel.subscribe(callModelHandlers);
+    this.unsubscribers.push(() => {
+      callModelChannel.unsubscribe(callModelHandlers);
+    });
+  }
+};
+function normalizeArgs2(args) {
+  if (Array.isArray(args)) {
+    return args;
+  }
+  if (isArrayLike2(args)) {
+    return Array.from(args);
+  }
+  return [args];
+}
+function isArrayLike2(value) {
+  return isObject(value) && "length" in value && typeof value.length === "number" && Number.isInteger(value.length) && value.length >= 0;
+}
+function getOpenRouterRequestArg(args) {
+  const normalizedArgs = normalizeArgs2(args);
+  const keyedCandidate = normalizedArgs.find(
+    (arg) => isObject(arg) && ("chatGenerationParams" in arg || "requestBody" in arg || "openResponsesRequest" in arg)
+  );
+  if (isObject(keyedCandidate)) {
+    return keyedCandidate;
+  }
+  const firstObjectArg = normalizedArgs.find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+}
+function getOpenRouterCallModelRequestArg2(args) {
+  const firstObjectArg = normalizeArgs2(args).find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+}
+var TOKEN_NAME_MAP3 = {
+  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_MAP2 = {
+  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 camelToSnake2(value) {
+  return value.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
+}
+function parseOpenRouterMetricsFromUsage2(usage) {
+  if (!isObject(usage)) {
+    return {};
+  }
+  const metrics = {};
+  for (const [name, value] of Object.entries(usage)) {
+    if (typeof value === "number") {
+      metrics[TOKEN_NAME_MAP3[name] || camelToSnake2(name)] = value;
+      continue;
+    }
+    if (!isObject(value)) {
+      continue;
+    }
+    const prefix = TOKEN_DETAIL_PREFIX_MAP2[name];
+    if (!prefix) {
+      continue;
+    }
+    for (const [nestedName, nestedValue] of Object.entries(value)) {
+      if (typeof nestedValue !== "number") {
+        continue;
+      }
+      metrics[`${prefix}_${camelToSnake2(nestedName)}`] = nestedValue;
+    }
+  }
+  return metrics;
+}
+function extractOpenRouterUsageMetadata2(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;
+}
+var OMITTED_OPENROUTER_KEYS2 = /* @__PURE__ */ new Set([
+  "execute",
+  "render",
+  "nextTurnParams",
+  "requireApproval"
+]);
+function parseOpenRouterModelString2(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 isZodSchema4(value) {
+  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
+}
+function serializeZodSchema4(schema) {
+  try {
+    return zodToJsonSchema(schema);
+  } catch {
+    return {
+      type: "object",
+      description: "Zod schema (conversion failed)"
+    };
+  }
+}
+function serializeOpenRouterTool2(tool) {
+  if (!isObject(tool)) {
+    return tool;
+  }
+  const serialized = {};
+  for (const [key, value] of Object.entries(tool)) {
+    if (OMITTED_OPENROUTER_KEYS2.has(key)) {
+      continue;
+    }
+    if (key === "function" && isObject(value)) {
+      serialized.function = sanitizeOpenRouterLoggedValue2(value);
+      continue;
+    }
+    serialized[key] = sanitizeOpenRouterLoggedValue2(value);
+  }
+  return serialized;
+}
+function serializeOpenRouterToolsForLogging2(tools) {
+  if (!Array.isArray(tools)) {
+    return void 0;
+  }
+  return tools.map((tool) => serializeOpenRouterTool2(tool));
+}
+function sanitizeOpenRouterLoggedValue2(value) {
+  if (isZodSchema4(value)) {
+    return serializeZodSchema4(value);
+  }
+  if (typeof value === "function") {
+    return "[Function]";
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => sanitizeOpenRouterLoggedValue2(entry));
+  }
+  if (!isObject(value)) {
+    return value;
+  }
+  const sanitized = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (OMITTED_OPENROUTER_KEYS2.has(key)) {
+      continue;
+    }
+    if (key === "tools" && Array.isArray(entry)) {
+      sanitized.tools = serializeOpenRouterToolsForLogging2(entry);
+      continue;
+    }
+    sanitized[key] = sanitizeOpenRouterLoggedValue2(entry);
+  }
+  return sanitized;
+}
+function buildOpenRouterMetadata2(metadata, httpReferer, xTitle) {
+  const sanitized = sanitizeOpenRouterLoggedValue2(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider: providerRouting, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString2(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 = buildOpenRouterMetadata2(metadata, httpReferer, xTitle);
+  return typeof normalized.model === "string" ? {
+    ...normalized,
+    embedding_model: normalized.model
+  } : normalized;
+}
+function extractOpenRouterCallModelInput2(request) {
+  return isObject(request) && "input" in request ? sanitizeOpenRouterLoggedValue2(request.input) : void 0;
+}
+function extractOpenRouterCallModelMetadata2(request) {
+  if (!isObject(request)) {
+    return { provider: "openrouter" };
+  }
+  const { input: _input, ...metadata } = request;
+  return buildOpenRouterMetadata2(metadata, void 0, void 0);
+}
+function extractOpenRouterResponseMetadata2(result) {
+  if (!isObject(result)) {
+    return void 0;
+  }
+  const { output: _output, data: _data, usage, ...metadata } = result;
+  const sanitized = sanitizeOpenRouterLoggedValue2(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString2(model);
+  const normalizedProvider = (typeof provider === "string" ? provider : void 0) || normalizedModel.provider;
+  const usageMetadata = extractOpenRouterUsageMetadata2(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 extractOpenRouterResponseOutput2(response, fallbackOutput) {
+  if (isObject(response) && "output" in response && response.output !== void 0) {
+    return sanitizeOpenRouterLoggedValue2(response.output);
+  }
+  if (fallbackOutput !== void 0) {
+    return sanitizeOpenRouterLoggedValue2(fallbackOutput);
+  }
+  return void 0;
+}
+var OPENROUTER_WRAPPED_TOOL2 = Symbol("braintrust.openrouter.wrappedTool");
+function patchOpenRouterCallModelRequestTools2(request) {
+  if (!Array.isArray(request.tools) || request.tools.length === 0) {
+    return void 0;
+  }
+  const originalTools = request.tools;
+  const wrappedTools = originalTools.map((tool) => wrapOpenRouterTool2(tool));
+  const didPatch = wrappedTools.some(
+    (tool, index) => tool !== originalTools[index]
+  );
+  if (!didPatch) {
+    return void 0;
+  }
+  request.tools = wrappedTools;
+  return () => {
+    request.tools = originalTools;
+  };
+}
+function wrapOpenRouterTool2(tool) {
+  if (isWrappedTool2(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 traceToolExecution2({
+          args,
+          execute: () => Reflect.apply(originalExecute, this, args),
+          toolCallId: getToolCallId2(args[1]),
+          toolName
+        });
+      }
+    }
+  };
+  Object.defineProperty(wrappedTool, OPENROUTER_WRAPPED_TOOL2, {
+    value: true,
+    enumerable: false,
+    configurable: false
+  });
+  return wrappedTool;
+}
+function isWrappedTool2(tool) {
+  return Boolean(tool[OPENROUTER_WRAPPED_TOOL2]);
+}
+function traceToolExecution2(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 publishToolResult2(tracingChannel2, event, result);
+  } catch (error) {
+    event.error = normalizeError2(error);
+    tracingChannel2.error.publish(event);
+    throw error;
+  }
+}
+function publishToolResult2(tracingChannel2, event, result) {
+  if (isPromiseLike4(result)) {
+    return result.then(
+      (resolved) => {
+        event.result = resolved;
+        tracingChannel2.asyncEnd.publish(event);
+        return resolved;
+      },
+      (error) => {
+        event.error = normalizeError2(error);
+        tracingChannel2.error.publish(event);
+        throw error;
+      }
+    );
+  }
+  event.result = result;
+  tracingChannel2.asyncEnd.publish(event);
+  return result;
+}
+function getToolCallId2(context) {
+  const toolContext = context;
+  return typeof toolContext?.toolCall?.id === "string" ? toolContext.toolCall.id : void 0;
+}
+function isPromiseLike4(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
+}
+function aggregateOpenRouterChatChunks(chunks) {
+  let role;
+  let content = "";
+  let toolCalls;
+  let finishReason;
+  let metrics = {};
+  for (const chunk of chunks) {
+    metrics = {
+      ...metrics,
+      ...parseOpenRouterMetricsFromUsage2(chunk?.usage)
+    };
+    const choice = chunk?.choices?.[0];
+    const delta = choice?.delta;
+    if (!delta) {
+      if (choice?.finish_reason !== void 0) {
+        finishReason = choice.finish_reason;
+      }
+      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) {
+      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: extractOpenRouterResponseOutput2(finalResponse),
+    metrics: parseOpenRouterMetricsFromUsage2(finalResponse.usage),
+    ...extractOpenRouterResponseMetadata2(finalResponse) ? { metadata: extractOpenRouterResponseMetadata2(finalResponse) } : {}
+  };
+}
+var OPENROUTER_WRAPPED_CALL_MODEL_RESULT2 = Symbol(
+  "braintrust.openrouter.wrappedCallModelResult"
+);
+var OPENROUTER_CALL_MODEL_STREAM_METHODS2 = [
+  "getFullResponsesStream",
+  "getItemsStream",
+  "getNewMessagesStream",
+  "getReasoningStream",
+  "getTextStream",
+  "getToolCallsStream",
+  "getToolStream"
+];
+var OPENROUTER_CALL_MODEL_CONTEXT_METHODS2 = [
+  "cancel",
+  "getPendingToolCalls",
+  "getState",
+  "getToolCalls",
+  "requiresApproval"
+];
+function patchOpenRouterCallModelResult2(args) {
+  const { request, result, span } = args;
+  if (!isObject(result) || isWrappedCallModelResult2(result)) {
+    return false;
+  }
+  const resultLike = result;
+  const hasInstrumentableMethod = typeof resultLike.getResponse === "function" || typeof resultLike.getText === "function" || OPENROUTER_CALL_MODEL_STREAM_METHODS2.some(
+    (methodName) => typeof resultLike[methodName] === "function"
+  );
+  if (!hasInstrumentableMethod) {
+    return false;
+  }
+  Object.defineProperty(resultLike, OPENROUTER_WRAPPED_CALL_MODEL_RESULT2, {
+    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 = getFinalOpenRouterCallModelResponse2(
+      resultLike,
+      response
+    );
+    if (finalResponse) {
+      const rounds = getOpenRouterCallModelRounds2(resultLike);
+      const metadata = extractOpenRouterCallModelResultMetadata2(
+        finalResponse,
+        rounds.length + 1
+      );
+      span.log({
+        output: extractOpenRouterResponseOutput2(finalResponse, fallbackOutput),
+        ...metadata ? { metadata } : {},
+        metrics: aggregateOpenRouterCallModelMetrics2(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: normalizeError2(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_METHODS2) {
+    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_METHODS2) {
+    if (typeof resultLike[methodName] !== "function") {
+      continue;
+    }
+    const originalMethod = resultLike[methodName];
+    resultLike[methodName] = (...args2) => {
+      const stream = withCurrent(
+        span,
+        () => originalMethod.apply(resultLike, args2)
+      );
+      if (!isAsyncIterable4(stream)) {
+        return stream;
+      }
+      return wrapAsyncIterableWithSpan2({
+        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);
+        });
+      }
+      initialTurnTraced = true;
+      const step = tracedTurnCount + 1;
+      const stepType = tracedTurnCount === 0 ? "initial" : "continue";
+      const response = await traceOpenRouterCallModelTurn2({
+        fn: async () => {
+          const nextResponse = await originalGetInitialResponse(...args2);
+          tracedTurnCount++;
+          return nextResponse;
+        },
+        parentSpan: span,
+        request: getOpenRouterResolvedRequest2(resultLike, request),
+        step,
+        stepType
+      });
+      return response;
+    };
+  }
+  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 traceOpenRouterCallModelTurn2({
+        fn: async () => {
+          const nextResponse = await originalMakeFollowupRequest(...args2);
+          tracedTurnCount++;
+          return nextResponse;
+        },
+        parentSpan: span,
+        request: buildOpenRouterFollowupRequest2(
+          getOpenRouterResolvedRequest2(resultLike, request),
+          currentResponse,
+          toolResults
+        ),
+        step,
+        stepType: "continue"
+      });
+      return response;
+    };
+  }
+  return true;
+}
+async function traceOpenRouterCallModelTurn2(args) {
+  const context = {
+    arguments: [args.request],
+    step: args.step,
+    stepType: args.stepType
+  };
+  return await withCurrent(
+    args.parentSpan,
+    () => openRouterChannels.callModelTurn.tracePromise(args.fn, context)
+  );
+}
+function isWrappedCallModelResult2(value) {
+  return Boolean(
+    isObject(value) && value[OPENROUTER_WRAPPED_CALL_MODEL_RESULT2]
+  );
+}
+function extractOpenRouterCallModelResultMetadata2(response, turnCount) {
+  const combined = {
+    ...extractOpenRouterResponseMetadata2(response) || {},
+    ...turnCount !== void 0 ? { turn_count: turnCount } : {}
+  };
+  return Object.keys(combined).length > 0 ? combined : void 0;
+}
+function getFinalOpenRouterCallModelResponse2(result, response) {
+  if (isObject(response)) {
+    return response;
+  }
+  return isObject(result.finalResponse) ? result.finalResponse : void 0;
+}
+function getOpenRouterCallModelRounds2(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 aggregateOpenRouterCallModelMetrics2(rounds, finalResponse) {
+  const metrics = {};
+  const responses = [
+    ...rounds.map((round) => round.response).filter(isObject),
+    finalResponse
+  ];
+  for (const response of responses) {
+    const responseMetrics = parseOpenRouterMetricsFromUsage2(response.usage);
+    for (const [name, value] of Object.entries(responseMetrics)) {
+      metrics[name] = (metrics[name] || 0) + value;
+    }
+  }
+  return metrics;
+}
+function buildNextOpenRouterCallModelInput2(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) => sanitizeOpenRouterLoggedValue2(entry)
+  );
+}
+function getOpenRouterResolvedRequest2(result, request) {
+  if (isObject(result.resolvedRequest)) {
+    return result.resolvedRequest;
+  }
+  return request;
+}
+function buildOpenRouterFollowupRequest2(request, currentResponse, toolResults) {
+  if (!request) {
+    return void 0;
+  }
+  return {
+    ...request,
+    input: buildNextOpenRouterCallModelInput2(
+      extractOpenRouterCallModelInput2(request),
+      isObject(currentResponse) ? currentResponse : {},
+      toolResults
+    ),
+    stream: false
+  };
+}
+function wrapAsyncIterableWithSpan2(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 isAsyncIterable4(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+}
+function normalizeError2(error) {
+  return error instanceof Error ? error : new Error(String(error));
+}
+
+// src/instrumentation/plugins/mistral-channels.ts
+var mistralChannels = defineChannels("@mistralai/mistralai", {
+  chatComplete: channel({
+    channelName: "chat.complete",
+    kind: "async"
+  }),
+  chatStream: channel({
+    channelName: "chat.stream",
+    kind: "async"
+  }),
+  embeddingsCreate: channel({
+    channelName: "embeddings.create",
+    kind: "async"
+  }),
+  fimComplete: channel({
+    channelName: "fim.complete",
+    kind: "async"
+  }),
+  fimStream: channel({
+    channelName: "fim.stream",
+    kind: "async"
+  }),
+  agentsComplete: channel({
+    channelName: "agents.complete",
+    kind: "async"
+  }),
+  agentsStream: channel({
+    channelName: "agents.stream",
+    kind: "async"
+  })
+});
+
+// src/instrumentation/plugins/mistral-plugin.ts
+var MistralPlugin = class extends BasePlugin {
+  onEnable() {
+    this.subscribeToMistralChannels();
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+  subscribeToMistralChannels() {
+    this.unsubscribers.push(
+      traceStreamingChannel(mistralChannels.chatComplete, {
+        name: "mistral.chat.complete",
+        type: "llm" /* LLM */,
+        extractInput: extractMessagesInputWithMetadata,
+        extractOutput: (result) => {
+          return result?.choices;
+        },
+        extractMetadata: (result) => extractMistralResponseMetadata(result),
+        extractMetrics: (result, startTime) => extractMistralMetrics(result?.usage, startTime)
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(mistralChannels.chatStream, {
+        name: "mistral.chat.stream",
+        type: "llm" /* LLM */,
+        extractInput: extractMessagesInputWithMetadata,
+        extractOutput: extractMistralStreamOutput,
+        extractMetadata: (result) => extractMistralResponseMetadata(result),
+        extractMetrics: (result, startTime) => extractMistralStreamingMetrics(result, startTime),
+        aggregateChunks: aggregateMistralStreamChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceAsyncChannel(mistralChannels.embeddingsCreate, {
+        name: "mistral.embeddings.create",
+        type: "llm" /* LLM */,
+        extractInput: extractEmbeddingInputWithMetadata,
+        extractOutput: (result) => {
+          const embedding = result?.data?.[0]?.embedding;
+          return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
+        },
+        extractMetadata: (result) => extractMistralResponseMetadata(result),
+        extractMetrics: (result) => parseMistralMetricsFromUsage(result?.usage)
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(mistralChannels.fimComplete, {
+        name: "mistral.fim.complete",
+        type: "llm" /* LLM */,
+        extractInput: extractPromptInputWithMetadata,
+        extractOutput: (result) => {
+          return result?.choices;
+        },
+        extractMetadata: (result) => extractMistralResponseMetadata(result),
+        extractMetrics: (result, startTime) => extractMistralMetrics(result?.usage, startTime)
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(mistralChannels.fimStream, {
+        name: "mistral.fim.stream",
+        type: "llm" /* LLM */,
+        extractInput: extractPromptInputWithMetadata,
+        extractOutput: extractMistralStreamOutput,
+        extractMetadata: (result) => extractMistralResponseMetadata(result),
+        extractMetrics: (result, startTime) => extractMistralStreamingMetrics(result, startTime),
+        aggregateChunks: aggregateMistralStreamChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(mistralChannels.agentsComplete, {
+        name: "mistral.agents.complete",
+        type: "llm" /* LLM */,
+        extractInput: extractMessagesInputWithMetadata,
+        extractOutput: (result) => {
+          return result?.choices;
+        },
+        extractMetadata: (result) => extractMistralResponseMetadata(result),
+        extractMetrics: (result, startTime) => extractMistralMetrics(result?.usage, startTime)
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(mistralChannels.agentsStream, {
+        name: "mistral.agents.stream",
+        type: "llm" /* LLM */,
+        extractInput: extractMessagesInputWithMetadata,
+        extractOutput: extractMistralStreamOutput,
+        extractMetadata: (result) => extractMistralResponseMetadata(result),
+        extractMetrics: (result, startTime) => extractMistralStreamingMetrics(result, startTime),
+        aggregateChunks: aggregateMistralStreamChunks
+      })
+    );
   }
 };
-function normalizeArgs(args) {
+var TOKEN_NAME_MAP4 = {
+  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",
+  promptAudioSeconds: "prompt_audio_seconds",
+  prompt_audio_seconds: "prompt_audio_seconds"
+};
+var TOKEN_DETAIL_PREFIX_MAP3 = {
+  promptTokensDetails: "prompt",
+  inputTokensDetails: "prompt",
+  completionTokensDetails: "completion",
+  outputTokensDetails: "completion",
+  prompt_tokens_details: "prompt",
+  input_tokens_details: "prompt",
+  completion_tokens_details: "completion",
+  output_tokens_details: "completion"
+};
+var MISTRAL_REQUEST_METADATA_ALLOWLIST = /* @__PURE__ */ new Set([
+  "agentId",
+  "agent_id",
+  "encodingFormat",
+  "encoding_format",
+  "frequencyPenalty",
+  "frequency_penalty",
+  "maxTokens",
+  "max_tokens",
+  "model",
+  "n",
+  "presencePenalty",
+  "presence_penalty",
+  "randomSeed",
+  "random_seed",
+  "responseFormat",
+  "response_format",
+  "safePrompt",
+  "safe_prompt",
+  "stream",
+  "stop",
+  "temperature",
+  "toolChoice",
+  "tool_choice",
+  "topP",
+  "top_p"
+]);
+var MISTRAL_RESPONSE_METADATA_ALLOWLIST = /* @__PURE__ */ new Set([
+  "agentId",
+  "agent_id",
+  "created",
+  "id",
+  "model",
+  "object"
+]);
+function camelToSnake3(value) {
+  return value.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
+}
+function normalizeArgs3(args) {
   if (Array.isArray(args)) {
     return args;
   }
-  if (isArrayLike(args)) {
+  if (isArrayLike3(args)) {
     return Array.from(args);
   }
   return [args];
 }
-function isArrayLike(value) {
+function isArrayLike3(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)
+function getMistralRequestArg(args) {
+  const firstObjectArg = normalizeArgs3(args).find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+}
+function addMistralProviderMetadata(metadata) {
+  return {
+    ...metadata,
+    provider: "mistral"
+  };
+}
+function pickAllowedMetadata(metadata, allowlist) {
+  if (!metadata) {
+    return {};
+  }
+  const picked = {};
+  for (const key of allowlist) {
+    const value = metadata[key];
+    if (value !== void 0) {
+      picked[key] = value;
+    }
+  }
+  return picked;
+}
+function extractMistralRequestMetadata(metadata) {
+  return pickAllowedMetadata(metadata, MISTRAL_REQUEST_METADATA_ALLOWLIST);
+}
+function isMistralChatCompletionChunk(value) {
+  return isObject(value);
+}
+function isMistralChunkChoice(value) {
+  return isObject(value);
+}
+function extractMessagesInputWithMetadata(args) {
+  const params = getMistralRequestArg(args);
+  const { messages, ...rawMetadata } = params || {};
+  return {
+    input: processInputAttachments(messages),
+    metadata: addMistralProviderMetadata(
+      extractMistralRequestMetadata(rawMetadata)
+    )
+  };
+}
+function extractEmbeddingInputWithMetadata(args) {
+  const params = getMistralRequestArg(args);
+  const { inputs, ...rawMetadata } = params || {};
+  return {
+    input: inputs,
+    metadata: addMistralProviderMetadata(
+      extractMistralRequestMetadata(rawMetadata)
+    )
+  };
+}
+function extractPromptInputWithMetadata(args) {
+  const params = getMistralRequestArg(args);
+  const { prompt, ...rawMetadata } = params || {};
+  return {
+    input: prompt,
+    metadata: addMistralProviderMetadata(
+      extractMistralRequestMetadata(rawMetadata)
+    )
+  };
+}
+function extractMistralResponseMetadata(result) {
+  if (!isObject(result)) {
+    return void 0;
+  }
+  const { choices: _choices, usage: _usage, data: _data, ...metadata } = result;
+  const picked = pickAllowedMetadata(
+    metadata,
+    MISTRAL_RESPONSE_METADATA_ALLOWLIST
   );
-  if (isObject(keyedCandidate)) {
-    return keyedCandidate;
+  return Object.keys(picked).length > 0 ? picked : void 0;
+}
+function extractMistralMetrics(usage, startTime) {
+  const metrics = parseMistralMetricsFromUsage(usage);
+  if (startTime) {
+    metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
   }
-  const firstObjectArg = normalizedArgs.find((arg) => isObject(arg));
-  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+  return metrics;
 }
-function getOpenRouterCallModelRequestArg(args) {
-  const firstObjectArg = normalizeArgs(args).find((arg) => isObject(arg));
-  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+function extractMistralStreamOutput(result) {
+  return isObject(result) ? result.choices : void 0;
 }
-function aggregateOpenRouterChatChunks(chunks) {
-  let role;
-  let content = "";
-  let toolCalls;
-  let finishReason;
-  let metrics = {};
-  for (const chunk of chunks) {
-    metrics = {
-      ...metrics,
-      ...parseOpenRouterMetricsFromUsage(chunk?.usage)
-    };
-    const choice = chunk?.choices?.[0];
-    const delta = choice?.delta;
-    if (!delta) {
-      if (choice?.finish_reason !== void 0) {
-        finishReason = choice.finish_reason;
+function extractMistralStreamingMetrics(result, startTime) {
+  const metrics = isObject(result) ? parseMistralMetricsFromUsage(result.usage) : {};
+  if (startTime) {
+    metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+  }
+  return metrics;
+}
+function extractDeltaText(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (!Array.isArray(content)) {
+    return void 0;
+  }
+  const textParts = content.map((part) => {
+    if (!isObject(part) || part.type !== "text") {
+      return "";
+    }
+    return typeof part.text === "string" ? part.text : "";
+  }).filter((part) => part.length > 0);
+  return textParts.length > 0 ? textParts.join("") : void 0;
+}
+function getDeltaToolCalls(delta) {
+  const toolCalls = Array.isArray(delta.toolCalls) && delta.toolCalls || Array.isArray(delta.tool_calls) && delta.tool_calls || [];
+  return toolCalls.filter((toolCall) => isObject(toolCall));
+}
+function getToolCallIndex(toolCall) {
+  return typeof toolCall.index === "number" && toolCall.index >= 0 ? toolCall.index : void 0;
+}
+function createMergedToolCallDelta(delta) {
+  return {
+    ...delta,
+    function: {
+      ...delta.function,
+      arguments: typeof delta.function?.arguments === "string" ? delta.function.arguments : ""
+    }
+  };
+}
+function mergeToolCallDeltaPair(current, delta) {
+  const currentArguments = typeof current.function?.arguments === "string" ? current.function.arguments : "";
+  const deltaArguments = typeof delta.function?.arguments === "string" ? delta.function.arguments : "";
+  return {
+    ...current,
+    ...delta,
+    function: {
+      ...current.function || {},
+      ...delta.function || {},
+      arguments: `${currentArguments}${deltaArguments}`
+    }
+  };
+}
+function mergeToolCallDeltas(toolCalls, deltas) {
+  if (deltas.length === 0) {
+    return toolCalls;
+  }
+  const merged = toolCalls ? [...toolCalls] : [];
+  const indexToPosition = /* @__PURE__ */ new Map();
+  const idToPosition = /* @__PURE__ */ new Map();
+  for (const [position, toolCall] of merged.entries()) {
+    const index = getToolCallIndex(toolCall);
+    if (index !== void 0 && !indexToPosition.has(index)) {
+      indexToPosition.set(index, position);
+    }
+    if (typeof toolCall.id === "string" && !idToPosition.has(toolCall.id)) {
+      idToPosition.set(toolCall.id, position);
+    }
+  }
+  for (const delta of deltas) {
+    const deltaIndex = getToolCallIndex(delta);
+    const existingByIndex = deltaIndex !== void 0 ? indexToPosition.get(deltaIndex) : void 0;
+    const existingById = typeof delta.id === "string" ? idToPosition.get(delta.id) : void 0;
+    const existingPosition = existingByIndex ?? existingById;
+    if (existingPosition === void 0) {
+      const newToolCall = createMergedToolCallDelta(delta);
+      merged.push(newToolCall);
+      const newPosition = merged.length - 1;
+      const newIndex = getToolCallIndex(newToolCall);
+      if (newIndex !== void 0 && !indexToPosition.has(newIndex)) {
+        indexToPosition.set(newIndex, newPosition);
+      }
+      if (typeof newToolCall.id === "string" && !idToPosition.has(newToolCall.id)) {
+        idToPosition.set(newToolCall.id, newPosition);
       }
       continue;
     }
-    if (!role && delta.role) {
-      role = delta.role;
+    const mergedToolCall = mergeToolCallDeltaPair(
+      merged[existingPosition],
+      delta
+    );
+    merged[existingPosition] = mergedToolCall;
+    const mergedIndex = getToolCallIndex(mergedToolCall);
+    if (mergedIndex !== void 0 && !indexToPosition.has(mergedIndex)) {
+      indexToPosition.set(mergedIndex, existingPosition);
     }
-    if (typeof delta.content === "string") {
-      content += delta.content;
+    if (typeof mergedToolCall.id === "string" && !idToPosition.has(mergedToolCall.id)) {
+      idToPosition.set(mergedToolCall.id, existingPosition);
     }
-    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;
+  }
+  return merged.length > 0 ? merged : void 0;
+}
+function getChoiceFinishReason(choice) {
+  if (typeof choice.finishReason === "string" || choice.finishReason === null) {
+    return choice.finishReason;
+  }
+  if (typeof choice.finish_reason === "string" || choice.finish_reason === null) {
+    return choice.finish_reason;
+  }
+  return void 0;
+}
+function parseMistralMetricsFromUsage(usage) {
+  if (!isObject(usage)) {
+    return {};
+  }
+  const metrics = {};
+  for (const [name, value] of Object.entries(usage)) {
+    if (typeof value === "number") {
+      metrics[TOKEN_NAME_MAP4[name] || camelToSnake3(name)] = value;
+      continue;
     }
-    const toolCallDeltas = Array.isArray(delta.toolCalls) ? delta.toolCalls : Array.isArray(delta.tool_calls) ? delta.tool_calls : void 0;
-    if (!toolCallDeltas) {
+    if (!isObject(value)) {
       continue;
     }
-    for (const toolDelta of toolCallDeltas) {
-      if (!toolDelta?.function) {
+    const prefix = TOKEN_DETAIL_PREFIX_MAP3[name];
+    if (!prefix) {
+      continue;
+    }
+    for (const [nestedName, nestedValue] of Object.entries(value)) {
+      if (typeof nestedValue !== "number") {
         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;
+      metrics[`${prefix}_${camelToSnake3(nestedName)}`] = nestedValue;
+    }
+  }
+  return metrics;
+}
+function aggregateMistralStreamChunks(chunks) {
+  const choiceAccumulators = /* @__PURE__ */ new Map();
+  const indexToAccumulatorKey = /* @__PURE__ */ new Map();
+  const positionToAccumulatorKey = /* @__PURE__ */ new Map();
+  let nextAccumulatorOrder = 0;
+  let metrics = {};
+  let metadata;
+  for (const event of chunks) {
+    const chunk = isMistralChatCompletionChunk(event?.data) ? event.data : void 0;
+    if (!chunk) {
+      continue;
+    }
+    if (isObject(chunk.usage)) {
+      metrics = {
+        ...metrics,
+        ...parseMistralMetricsFromUsage(chunk.usage)
+      };
+    }
+    const chunkMetadata = extractMistralResponseMetadata(chunk);
+    if (chunkMetadata) {
+      metadata = { ...metadata || {}, ...chunkMetadata };
+    }
+    for (const [choicePosition, rawChoice] of (chunk.choices || []).entries()) {
+      if (!isMistralChunkChoice(rawChoice)) {
         continue;
       }
-      const current = existingToolCall;
-      if (toolDelta.id && !current.id) {
-        current.id = toolDelta.id;
+      const choice = rawChoice;
+      const choiceIndex = typeof choice.index === "number" && choice.index >= 0 ? choice.index : void 0;
+      let accumulatorKey = choiceIndex !== void 0 ? indexToAccumulatorKey.get(choiceIndex) : void 0;
+      if (!accumulatorKey) {
+        accumulatorKey = positionToAccumulatorKey.get(choicePosition);
+      }
+      if (!accumulatorKey) {
+        const initialIndex = choiceIndex ?? choicePosition;
+        const keyPrefix = choiceIndex !== void 0 ? "index" : "position";
+        accumulatorKey = `${keyPrefix}:${initialIndex}`;
+        choiceAccumulators.set(accumulatorKey, {
+          index: initialIndex,
+          order: nextAccumulatorOrder++
+        });
       }
-      if (toolDelta.type && !current.type) {
-        current.type = toolDelta.type;
+      const accumulator = choiceAccumulators.get(accumulatorKey);
+      if (!accumulator) {
+        continue;
       }
-      if (toolDelta.function.name && !current.function.name) {
-        current.function.name = toolDelta.function.name;
+      if (choiceIndex !== void 0) {
+        accumulator.index = choiceIndex;
+        indexToAccumulatorKey.set(choiceIndex, accumulatorKey);
       }
-      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
+      positionToAccumulatorKey.set(choicePosition, accumulatorKey);
+      const delta = isObject(choice.delta) ? choice.delta : void 0;
+      if (delta) {
+        if (!accumulator.role && typeof delta.role === "string") {
+          accumulator.role = delta.role;
+        }
+        const deltaText = extractDeltaText(delta.content);
+        if (deltaText) {
+          accumulator.content = `${accumulator.content || ""}${deltaText}`;
+        }
+        accumulator.toolCalls = mergeToolCallDeltas(
+          accumulator.toolCalls,
+          getDeltaToolCalls(delta)
+        );
+      }
+      const choiceFinishReason = getChoiceFinishReason(choice);
+      if (choiceFinishReason !== void 0) {
+        accumulator.finishReason = choiceFinishReason;
       }
-    ],
-    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: {}
-    };
-  }
+  const output = Array.from(choiceAccumulators.values()).sort(
+    (left, right) => left.index === right.index ? left.order - right.order : left.index - right.index
+  ).map((choice) => ({
+    index: choice.index,
+    message: {
+      ...choice.role ? { role: choice.role } : {},
+      content: choice.content ?? null,
+      ...choice.toolCalls ? { toolCalls: choice.toolCalls } : {}
+    },
+    ...choice.finishReason !== void 0 ? { finishReason: choice.finishReason } : {}
+  }));
   return {
-    output: extractOpenRouterResponseOutput(finalResponse),
-    metrics: parseOpenRouterMetricsFromUsage(finalResponse.usage),
-    ...extractOpenRouterResponseMetadata(finalResponse) ? { metadata: extractOpenRouterResponseMetadata(finalResponse) } : {}
+    output,
+    metrics,
+    ...metadata ? { metadata } : {}
   };
 }
 
@@ -13983,6 +16464,8 @@ var BraintrustPlugin = class extends BasePlugin {
   claudeAgentSDKPlugin = null;
   googleGenAIPlugin = null;
   openRouterPlugin = null;
+  openRouterAgentPlugin = null;
+  mistralPlugin = null;
   constructor(config = {}) {
     super();
     this.config = config;
@@ -14013,6 +16496,14 @@ var BraintrustPlugin = class extends BasePlugin {
       this.openRouterPlugin = new OpenRouterPlugin();
       this.openRouterPlugin.enable();
     }
+    if (integrations.openrouterAgent !== false) {
+      this.openRouterAgentPlugin = new OpenRouterAgentPlugin();
+      this.openRouterAgentPlugin.enable();
+    }
+    if (integrations.mistral !== false) {
+      this.mistralPlugin = new MistralPlugin();
+      this.mistralPlugin.enable();
+    }
   }
   onDisable() {
     if (this.openaiPlugin) {
@@ -14039,6 +16530,14 @@ var BraintrustPlugin = class extends BasePlugin {
       this.openRouterPlugin.disable();
       this.openRouterPlugin = null;
     }
+    if (this.openRouterAgentPlugin) {
+      this.openRouterAgentPlugin.disable();
+      this.openRouterAgentPlugin = null;
+    }
+    if (this.mistralPlugin) {
+      this.mistralPlugin.disable();
+      this.mistralPlugin = null;
+    }
   }
 };
 
@@ -14111,7 +16610,9 @@ var PluginRegistry = class {
       aisdk: true,
       google: true,
       claudeAgentSDK: true,
-      openrouter: true
+      openrouter: true,
+      openrouterAgent: true,
+      mistral: true
     };
   }
   /**
@@ -14246,7 +16747,7 @@ function isAsync(fn) {
 function isAsyncGenerator2(fn) {
   return fn[Symbol.toStringTag] === "AsyncGenerator";
 }
-function isAsyncIterable3(obj) {
+function isAsyncIterable5(obj) {
   return typeof obj[Symbol.asyncIterator] === "function";
 }
 function wrapAsync(asyncFn) {
@@ -14296,7 +16797,7 @@ function _asyncMap(eachfn, arr, iteratee, callback) {
     callback(err, results);
   });
 }
-function isArrayLike2(value) {
+function isArrayLike4(value) {
   return value && typeof value.length === "number" && value.length >= 0 && value.length % 1 === 0;
 }
 var breakLoop = {};
@@ -14344,7 +16845,7 @@ function createObjectIterator(obj) {
   };
 }
 function createIterator(coll) {
-  if (isArrayLike2(coll)) {
+  if (isArrayLike4(coll)) {
     return createArrayIterator(coll);
   }
   var iterator = getIterator(coll);
@@ -14418,7 +16919,7 @@ var eachOfLimit$2 = (limit) => {
     if (isAsyncGenerator2(obj)) {
       return asyncEachOfLimit(obj, limit, iteratee, callback);
     }
-    if (isAsyncIterable3(obj)) {
+    if (isAsyncIterable5(obj)) {
       return asyncEachOfLimit(obj[Symbol.asyncIterator](), limit, iteratee, callback);
     }
     var nextElem = createIterator(obj);
@@ -14490,7 +16991,7 @@ function eachOfGeneric(coll, iteratee, callback) {
   return eachOfLimit$1(coll, Infinity, iteratee, callback);
 }
 function eachOf(coll, iteratee, callback) {
-  var eachOfImplementation = isArrayLike2(coll) ? eachOfArrayLike : eachOfGeneric;
+  var eachOfImplementation = isArrayLike4(coll) ? eachOfArrayLike : eachOfGeneric;
   return eachOfImplementation(coll, wrapAsync(iteratee), callback);
 }
 var eachOf$1 = awaitify(eachOf, 3);
@@ -15005,7 +17506,7 @@ function filterGeneric(eachfn, coll, iteratee, callback) {
   });
 }
 function _filter(eachfn, coll, iteratee, callback) {
-  var filter2 = isArrayLike2(coll) ? filterArray : filterGeneric;
+  var filter2 = isArrayLike4(coll) ? filterArray : filterGeneric;
   return filter2(eachfn, coll, wrapAsync(iteratee), callback);
 }
 function filter(coll, iteratee, callback) {
@@ -15080,7 +17581,7 @@ if (hasNextTick) {
 }
 var nextTick = wrap(_defer);
 var _parallel = awaitify((eachfn, tasks, callback) => {
-  var results = isArrayLike2(tasks) ? [] : {};
+  var results = isArrayLike4(tasks) ? [] : {};
   eachfn(tasks, (task, key, taskCb) => {
     wrapAsync(task)((err, ...result) => {
       if (result.length < 2) {
@@ -15695,7 +18196,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
@@ -15761,7 +18283,7 @@ function callEvaluatorData(data) {
     baseExperiment
   };
 }
-function isAsyncIterable4(value) {
+function isAsyncIterable6(value) {
   return typeof value === "object" && value !== null && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function isIterable(value) {
@@ -15966,7 +18488,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     }
     const resolvedDataResult = dataResult instanceof Promise ? await dataResult : dataResult;
     const dataIterable = (() => {
-      if (isAsyncIterable4(resolvedDataResult)) {
+      if (isAsyncIterable6(resolvedDataResult)) {
         return resolvedDataResult;
       }
       if (Array.isArray(resolvedDataResult) || isIterable(resolvedDataResult)) {
@@ -16766,7 +19288,7 @@ var parametersContainerSchema = z12.object({
 var staticParametersContainerSchema = z12.object({
   type: z12.literal("braintrust.staticParameters"),
   schema: staticParametersSchema,
-  source: z12.null()
+  source: z12.null().nullish()
 });
 var serializedParametersContainerSchema = z12.union([
   parametersContainerSchema,
@@ -16930,7 +19452,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,