braintrust 3.7.1 → 3.8.0

package/dist/browser.js

@@ -32,6 +32,7 @@ var browser_exports = {};
 __export(browser_exports, {
   Attachment: () => Attachment,
   AttachmentReference: () => AttachmentReference,
+  BRAINTRUST_CURRENT_SPAN_STORE: () => BRAINTRUST_CURRENT_SPAN_STORE,
   BaseAttachment: () => BaseAttachment,
   BaseExperiment: () => BaseExperiment,
   BraintrustMiddleware: () => BraintrustMiddleware,
@@ -159,9 +160,11 @@ __export(browser_exports, {
   wrapClaudeAgentSDK: () => wrapClaudeAgentSDK,
   wrapGoogleGenAI: () => wrapGoogleGenAI,
   wrapMastraAgent: () => wrapMastraAgent,
+  wrapMistral: () => wrapMistral,
   wrapOpenAI: () => wrapOpenAI,
   wrapOpenAIv4: () => wrapOpenAIv4,
   wrapOpenRouter: () => wrapOpenRouter,
+  wrapOpenRouterAgent: () => wrapOpenRouterAgent,
   wrapTraced: () => wrapTraced,
   wrapVitest: () => wrapVitest
 });
@@ -1954,6 +1957,16 @@ var NullableSavedFunctionId = import_v36.z.union([
   }),
   import_v36.z.null()
 ]);
+var TopicMapGenerationSettings = import_v36.z.object({
+  algorithm: import_v36.z.enum(["hdbscan", "kmeans"]),
+  dimension_reduction: import_v36.z.enum(["umap", "pca", "none"]),
+  sample_size: import_v36.z.number().int().gt(0).optional(),
+  n_clusters: import_v36.z.number().int().gt(0).optional(),
+  min_cluster_size: import_v36.z.number().int().gt(0).optional(),
+  min_samples: import_v36.z.number().int().gt(0).optional(),
+  hierarchy_threshold: import_v36.z.number().int().gt(0).optional(),
+  naming_model: import_v36.z.string().optional()
+});
 var TopicMapData = import_v36.z.object({
   type: import_v36.z.literal("topic_map"),
   source_facet: import_v36.z.string(),
@@ -1961,6 +1974,7 @@ var TopicMapData = import_v36.z.object({
   bundle_key: import_v36.z.string().optional(),
   report_key: import_v36.z.string().optional(),
   topic_names: import_v36.z.record(import_v36.z.string()).optional(),
+  generation_settings: TopicMapGenerationSettings.optional(),
   distance_threshold: import_v36.z.number().optional()
 });
 var BatchedFacetData = import_v36.z.object({
@@ -2185,6 +2199,7 @@ var Dataset = import_v36.z.object({
   created: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   deleted_at: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   user_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  tags: import_v36.z.union([import_v36.z.array(import_v36.z.string()), import_v36.z.null()]).optional(),
   metadata: import_v36.z.union([import_v36.z.object({}).partial().passthrough(), import_v36.z.null()]).optional(),
   url_slug: import_v36.z.string()
 });
@@ -2267,6 +2282,14 @@ var DatasetEvent = import_v36.z.object({
     import_v36.z.null()
   ]).optional()
 });
+var DatasetSnapshot = import_v36.z.object({
+  id: import_v36.z.string().uuid(),
+  dataset_id: import_v36.z.string().uuid(),
+  name: import_v36.z.string(),
+  description: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]),
+  xact_id: import_v36.z.string(),
+  created: import_v36.z.union([import_v36.z.string(), import_v36.z.null()])
+});
 var EnvVar = import_v36.z.object({
   id: import_v36.z.string().uuid(),
   object_type: import_v36.z.enum(["organization", "project", "function"]),
@@ -3025,6 +3048,8 @@ var TopicAutomationConfig = import_v36.z.object({
   scope: import_v36.z.union([SpanScope, TraceScope, GroupScope, import_v36.z.null()]).optional(),
   data_scope: TopicAutomationDataScope.optional(),
   btql_filter: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  rerun_seconds: import_v36.z.union([import_v36.z.number(), import_v36.z.null()]).optional(),
+  relabel_overlap_seconds: import_v36.z.union([import_v36.z.number(), import_v36.z.null()]).optional(),
   backfill_time_range: import_v36.z.union([
     import_v36.z.string(),
     import_v36.z.object({ from: import_v36.z.string(), to: import_v36.z.string() }),
@@ -3361,7 +3386,8 @@ var User = import_v36.z.object({
   family_name: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   email: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   avatar_url: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
-  created: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional()
+  created: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  last_active_at: import_v36.z.union([import_v36.z.number(), import_v36.z.null()]).optional()
 });
 var ViewDataSearch = import_v36.z.union([
   import_v36.z.object({
@@ -4519,6 +4545,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;
@@ -10092,18 +10127,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);
@@ -10120,6 +10159,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();
@@ -10247,6 +10306,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 } : {},
@@ -10296,6 +10367,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) } : {},
@@ -10679,6 +10761,10 @@ var openAIChannels = defineChannels("openai", {
   responsesParse: channel({
     channelName: "responses.parse",
     kind: "async"
+  }),
+  responsesCompact: channel({
+    channelName: "responses.compact",
+    kind: "async"
   })
 });
 
@@ -10958,6 +11044,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);
@@ -11547,6 +11667,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamText",
     kind: "async"
   }),
+  streamTextSync: channel({
+    channelName: "streamText.sync",
+    kind: "sync-stream"
+  }),
   generateObject: channel({
     channelName: "generateObject",
     kind: "async"
@@ -11555,6 +11679,20 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamObject",
     kind: "async"
   }),
+  streamObjectSync: channel({
+    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"
@@ -11563,6 +11701,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"
@@ -11611,7 +11753,7 @@ 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(
@@ -11627,7 +11769,7 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamText, {
         name: "streamText",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -11643,11 +11785,25 @@ var AISDKPlugin = class extends BasePlugin {
         })
       })
     );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(aiSDKChannels.streamTextSync, {
+        name: "streamText",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          defaultDenyOutputPaths: denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
     this.unsubscribers.push(
       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(
@@ -11663,7 +11819,7 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamObject, {
         name: "streamObject",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -11679,11 +11835,49 @@ var AISDKPlugin = class extends BasePlugin {
         })
       })
     );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(aiSDKChannels.streamObjectSync, {
+        name: "streamObject",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          defaultDenyOutputPaths: denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
+    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(
@@ -11699,7 +11893,7 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.agentStream, {
         name: "Agent.stream",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -11715,11 +11909,25 @@ var AISDKPlugin = class extends BasePlugin {
         })
       })
     );
+    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,
+          startTime
+        })
+      })
+    );
     this.unsubscribers.push(
       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(
@@ -11735,7 +11943,7 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.toolLoopAgentStream, {
         name: "ToolLoopAgent.stream",
         type: "llm" /* LLM */,
-        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -12045,11 +12253,11 @@ var convertDataToAttachment = (data, mimeType, filename) => {
   }
   return null;
 };
-function processAISDKInput(params) {
+function processAISDKCallInput(params) {
   return processInputAttachmentsSync(params);
 }
-function prepareAISDKInput(params, event, span, defaultDenyOutputPaths) {
-  const { input, outputPromise } = processAISDKInput(params);
+function prepareAISDKCallInput(params, event, span, defaultDenyOutputPaths) {
+  const { input, outputPromise } = processAISDKCallInput(params);
   if (outputPromise && input && typeof input === "object") {
     outputPromise.then((resolvedData) => {
       span.log({
@@ -12061,7 +12269,7 @@ function prepareAISDKInput(params, event, span, defaultDenyOutputPaths) {
     }).catch(() => {
     });
   }
-  const metadata = extractMetadataFromParams(params, event.self);
+  const metadata = extractMetadataFromCallParams(params, event.self);
   const childTracing = prepareAISDKChildTracing(
     params,
     event.self,
@@ -12078,6 +12286,12 @@ function prepareAISDKInput(params, event, span, defaultDenyOutputPaths) {
     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) {
@@ -12088,29 +12302,41 @@ function extractTopLevelAISDKMetrics(result, event, startTime) {
 function hasModelChildTracing(event) {
   return event?.modelWrapped === true || event?.__braintrust_ai_sdk_model_wrapped === true;
 }
-function extractMetadataFromParams(params, self) {
-  const metadata = {
+function createAISDKIntegrationMetadata() {
+  return {
     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
+}
+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 (model) {
-    metadata.model = model;
+  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 extractMetadataFromEmbedParams(params, self) {
+  return extractBaseMetadata(params.model, self);
+}
 function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiSDK) {
   const cleanup = [];
   const patchedModels = /* @__PURE__ */ new WeakSet();
@@ -12148,7 +12374,7 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
             type: "llm" /* LLM */
           },
           event: {
-            input: processAISDKInput(options).input,
+            input: processAISDKCallInput(options).input,
             metadata: baseMetadata
           }
         }
@@ -12162,7 +12388,7 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
             type: "llm" /* LLM */
           },
           event: {
-            input: processAISDKInput(options).input,
+            input: processAISDKCallInput(options).input,
             metadata: baseMetadata
           }
         });
@@ -12471,9 +12697,14 @@ function attachKnownResultPromiseHandlers(result) {
     "content",
     "text",
     "object",
+    "value",
+    "values",
     "finishReason",
+    "embedding",
+    "embeddings",
     "usage",
     "totalUsage",
+    "responses",
     "steps"
   ];
   for (const field of promiseLikeFields) {
@@ -12621,6 +12852,38 @@ function processAISDKOutput(output, denyOutputPaths) {
   const merged = extractSerializableOutputFields(output);
   return normalizeAISDKLoggedOutput(omit(merged, denyOutputPaths));
 }
+function processAISDKEmbeddingOutput(output, denyOutputPaths) {
+  if (!output || typeof output !== "object") {
+    return output;
+  }
+  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;
@@ -12719,12 +12982,17 @@ function extractGetterValues(obj) {
     "content",
     "text",
     "object",
+    "value",
+    "values",
+    "embedding",
+    "embeddings",
     "finishReason",
     "usage",
     "totalUsage",
     "toolCalls",
     "toolResults",
     "warnings",
+    "responses",
     "experimental_providerMetadata",
     "providerMetadata",
     "rawResponse",
@@ -12985,65 +13253,365 @@ var claudeAgentSDKChannels = defineChannels(
   }
 );
 
-// src/instrumentation/plugins/claude-agent-sdk-plugin.ts
-function isSubAgentToolName(toolName) {
-  return toolName === "Agent" || toolName === "Task";
-}
-function filterSerializableOptions(options) {
-  const allowedKeys = [
-    "model",
-    "maxTurns",
-    "cwd",
-    "continue",
-    "allowedTools",
-    "disallowedTools",
-    "additionalDirectories",
-    "permissionMode",
-    "debug",
-    "apiKey",
-    "apiKeySource",
-    "agentName",
-    "instructions"
-  ];
-  const filtered = {};
-  for (const key of allowedKeys) {
-    if (options[key] !== void 0) {
-      filtered[key] = options[key];
+// 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;
   }
-  return filtered;
+  const created = {};
+  localToolContextStore.enterWith(created);
+  return created;
 }
-function getNumberProperty(obj, key) {
-  if (!obj || typeof obj !== "object" || !(key in obj)) {
-    return void 0;
+function setClaudeLocalToolParentResolver(resolver) {
+  fallbackLocalToolParentResolver = resolver;
+  const context = ensureClaudeLocalToolContext();
+  if (!context) {
+    return;
   }
-  const value = Reflect.get(obj, key);
-  return typeof value === "number" ? value : void 0;
+  context.resolveLocalToolParent = resolver;
 }
-function extractUsageFromMessage(message) {
-  const metrics = {};
-  let usage;
-  if (message.type === "assistant") {
-    usage = message.message?.usage;
-  } else if (message.type === "result") {
-    usage = message.usage;
+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;
   }
-  if (!usage || typeof usage !== "object") {
-    return metrics;
+  const stream = result;
+  const originalAsyncIterator = stream[Symbol.asyncIterator];
+  if (originalAsyncIterator[LOCAL_TOOL_CONTEXT_ASYNC_ITERATOR_PATCHED]) {
+    return result;
   }
-  const inputTokens = getNumberProperty(usage, "input_tokens");
-  if (inputTokens !== void 0) {
-    metrics.prompt_tokens = inputTokens;
+  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 outputTokens = getNumberProperty(usage, "output_tokens");
-  if (outputTokens !== void 0) {
-    metrics.completion_tokens = outputTokens;
+  const meta = Reflect.get(extra, "_meta");
+  if (!meta || typeof meta !== "object") {
+    return void 0;
   }
-  const cacheReadTokens = getNumberProperty(usage, "cache_read_input_tokens") || 0;
-  const cacheCreationTokens = getNumberProperty(usage, "cache_creation_input_tokens") || 0;
-  if (cacheReadTokens > 0 || cacheCreationTokens > 0) {
-    Object.assign(
-      metrics,
+  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";
+}
+function filterSerializableOptions(options) {
+  const allowedKeys = [
+    "model",
+    "maxTurns",
+    "cwd",
+    "continue",
+    "allowedTools",
+    "disallowedTools",
+    "additionalDirectories",
+    "permissionMode",
+    "debug",
+    "apiKey",
+    "apiKeySource",
+    "agentName",
+    "instructions"
+  ];
+  const filtered = {};
+  for (const key of allowedKeys) {
+    if (options[key] !== void 0) {
+      filtered[key] = options[key];
+    }
+  }
+  return filtered;
+}
+function getNumberProperty(obj, key) {
+  if (!obj || typeof obj !== "object" || !(key in obj)) {
+    return void 0;
+  }
+  const value = Reflect.get(obj, key);
+  return typeof value === "number" ? value : void 0;
+}
+function extractUsageFromMessage(message) {
+  const metrics = {};
+  let usage;
+  if (message.type === "assistant") {
+    usage = message.message?.usage;
+  } else if (message.type === "result") {
+    usage = message.usage;
+  }
+  if (!usage || typeof usage !== "object") {
+    return metrics;
+  }
+  const inputTokens = getNumberProperty(usage, "input_tokens");
+  if (inputTokens !== void 0) {
+    metrics.prompt_tokens = inputTokens;
+  }
+  const outputTokens = getNumberProperty(usage, "output_tokens");
+  if (outputTokens !== void 0) {
+    metrics.completion_tokens = outputTokens;
+  }
+  const cacheReadTokens = getNumberProperty(usage, "cache_read_input_tokens") || 0;
+  const cacheCreationTokens = getNumberProperty(usage, "cache_creation_input_tokens") || 0;
+  if (cacheReadTokens > 0 || cacheCreationTokens > 0) {
+    Object.assign(
+      metrics,
       extractAnthropicCacheTokens(cacheReadTokens, cacheCreationTokens)
     );
   }
@@ -13071,7 +13639,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;
   }
@@ -13091,7 +13659,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: {
@@ -13105,8 +13673,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) {
@@ -13150,11 +13723,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 {};
     }
@@ -13183,6 +13796,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 {
@@ -13223,6 +13839,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 {
@@ -13257,11 +13876,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
   );
@@ -13292,6 +13913,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);
@@ -13299,17 +13921,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) {
@@ -13377,6 +14012,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) {
@@ -13437,6 +14095,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();
@@ -13502,26 +14164,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
         );
@@ -13529,6 +14216,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         event.arguments[0] = params;
         spans.set(event, {
           accumulatedOutputTokens: 0,
+          activeLlmSpansByParentToolUse,
           activeToolSpans,
           capturedPromptMessages,
           currentMessageId: void 0,
@@ -13544,7 +14232,10 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           promptStarted: () => promptStarted,
           span,
           subAgentSpans,
-          toolUseToParent
+          latestLlmParentBySubAgentToolUse,
+          latestRootLlmParentRef,
+          toolUseToParent,
+          localToolContext
         });
       },
       end: (event) => {
@@ -13552,7 +14243,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);
@@ -13757,19 +14451,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);
   };
@@ -14164,20 +14859,8 @@ 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"
@@ -14192,65 +14875,862 @@ var openRouterChannels = defineChannels("@openrouter/sdk", {
   })
 });
 
-// src/instrumentation/plugins/openrouter-plugin.ts
-var OpenRouterPlugin = class extends BasePlugin {
+// src/instrumentation/plugins/openrouter-agent-plugin.ts
+var OpenRouterAgentPlugin = class extends BasePlugin {
   onEnable() {
-    this.subscribeToOpenRouterChannels();
+    this.subscribeToOpenRouterAgentChannels();
   }
   onDisable() {
     this.unsubscribers = unsubscribeAll(this.unsubscribers);
   }
-  subscribeToOpenRouterChannels() {
+  subscribeToOpenRouterAgentChannels() {
     this.unsubscribers.push(
-      traceStreamingChannel(openRouterChannels.chatSend, {
-        name: "openrouter.chat.send",
+      traceSyncStreamChannel(openRouterAgentChannels.callModel, {
+        name: "openrouter.callModel",
         type: "llm" /* LLM */,
         extractInput: (args) => {
-          const request = getOpenRouterRequestArg(args);
-          const chatGenerationParams = isObject(request?.chatGenerationParams) ? request.chatGenerationParams : {};
-          const httpReferer = request?.httpReferer;
-          const xTitle = request?.xTitle;
-          const { messages, ...metadata } = chatGenerationParams;
+          const request = getOpenRouterCallModelRequestArg(args);
           return {
-            input: messages,
-            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
+            input: request ? extractOpenRouterCallModelInput(request) : void 0,
+            metadata: request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" }
           };
         },
-        extractOutput: (result) => {
-          return isObject(result) ? result.choices : void 0;
-        },
-        extractMetrics: (result, startTime) => {
-          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
-        aggregateChunks: aggregateOpenRouterChatChunks
+        patchResult: ({ endEvent, result, span }) => {
+          return patchOpenRouterCallModelResult({
+            request: getOpenRouterCallModelRequestArg(endEvent.arguments),
+            result,
+            span
+          });
+        }
       })
     );
     this.unsubscribers.push(
-      traceAsyncChannel(openRouterChannels.embeddingsGenerate, {
-        name: "openrouter.embeddings.generate",
+      traceAsyncChannel(openRouterAgentChannels.callModelTurn, {
+        name: "openrouter.beta.responses.send",
         type: "llm" /* LLM */,
-        extractInput: (args) => {
-          const request = getOpenRouterRequestArg(args);
-          const requestBody = isObject(request?.requestBody) ? request.requestBody : {};
-          const httpReferer = request?.httpReferer;
-          const xTitle = request?.xTitle;
-          const { input, ...metadata } = requestBody;
+        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,
-            metadata: buildOpenRouterEmbeddingMetadata(
-              metadata,
-              httpReferer,
-              xTitle
-            )
+            input: request ? extractOpenRouterCallModelInput(request) : void 0,
+            metadata: {
+              ...metadata,
+              step: event.step,
+              step_type: event.stepType
+            }
           };
         },
-        extractOutput: (result) => {
+        extractOutput: (result) => extractOpenRouterResponseOutput(result),
+        extractMetadata: (result, event) => {
           if (!isObject(result)) {
-            return void 0;
+            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",
+  prompt_tokens_details: "prompt",
+  input_tokens_details: "prompt",
+  completion_tokens_details: "completion",
+  output_tokens_details: "completion",
+  cost_details: "cost"
+};
+function camelToSnake(value) {
+  return value.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
+}
+function parseOpenRouterMetricsFromUsage(usage) {
+  if (!isObject(usage)) {
+    return {};
+  }
+  const metrics = {};
+  for (const [name, value] of Object.entries(usage)) {
+    if (typeof value === "number") {
+      metrics[TOKEN_NAME_MAP2[name] || camelToSnake(name)] = value;
+      continue;
+    }
+    if (!isObject(value)) {
+      continue;
+    }
+    const prefix = TOKEN_DETAIL_PREFIX_MAP[name];
+    if (!prefix) {
+      continue;
+    }
+    for (const [nestedName, nestedValue] of Object.entries(value)) {
+      if (typeof nestedValue !== "number") {
+        continue;
+      }
+      metrics[`${prefix}_${camelToSnake(nestedName)}`] = nestedValue;
+    }
+  }
+  return metrics;
+}
+function extractOpenRouterUsageMetadata(usage) {
+  if (!isObject(usage)) {
+    return void 0;
+  }
+  const metadata = {};
+  if (typeof usage.isByok === "boolean") {
+    metadata.is_byok = usage.isByok;
+  } else if (typeof usage.is_byok === "boolean") {
+    metadata.is_byok = usage.is_byok;
+  }
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+var OMITTED_OPENROUTER_KEYS = /* @__PURE__ */ new Set([
+  "execute",
+  "render",
+  "nextTurnParams",
+  "requireApproval"
+]);
+function parseOpenRouterModelString(model) {
+  if (typeof model !== "string") {
+    return { model };
+  }
+  const slashIndex = model.indexOf("/");
+  if (slashIndex > 0 && slashIndex < model.length - 1) {
+    return {
+      provider: model.substring(0, slashIndex),
+      model: model.substring(slashIndex + 1)
+    };
+  }
+  return { model };
+}
+function isZodSchema3(value) {
+  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
+}
+function serializeZodSchema3(schema) {
+  try {
+    return zodToJsonSchema(schema);
+  } catch {
+    return {
+      type: "object",
+      description: "Zod schema (conversion failed)"
+    };
+  }
+}
+function serializeOpenRouterTool(tool) {
+  if (!isObject(tool)) {
+    return tool;
+  }
+  const serialized = {};
+  for (const [key, value] of Object.entries(tool)) {
+    if (OMITTED_OPENROUTER_KEYS.has(key)) {
+      continue;
+    }
+    if (key === "function" && isObject(value)) {
+      serialized.function = sanitizeOpenRouterLoggedValue(value);
+      continue;
+    }
+    serialized[key] = sanitizeOpenRouterLoggedValue(value);
+  }
+  return serialized;
+}
+function serializeOpenRouterToolsForLogging(tools) {
+  if (!Array.isArray(tools)) {
+    return void 0;
+  }
+  return tools.map((tool) => serializeOpenRouterTool(tool));
+}
+function sanitizeOpenRouterLoggedValue(value) {
+  if (isZodSchema3(value)) {
+    return serializeZodSchema3(value);
+  }
+  if (typeof value === "function") {
+    return "[Function]";
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => sanitizeOpenRouterLoggedValue(entry));
+  }
+  if (!isObject(value)) {
+    return value;
+  }
+  const sanitized = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (OMITTED_OPENROUTER_KEYS.has(key)) {
+      continue;
+    }
+    if (key === "tools" && Array.isArray(entry)) {
+      sanitized.tools = serializeOpenRouterToolsForLogging(entry);
+      continue;
+    }
+    sanitized[key] = sanitizeOpenRouterLoggedValue(entry);
+  }
+  return sanitized;
+}
+function buildOpenRouterMetadata(metadata, httpReferer, appTitle, appCategories, xTitle) {
+  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider: providerRouting, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString(model);
+  return {
+    ...rest,
+    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
+    ...providerRouting !== void 0 ? { providerRouting } : {},
+    ...httpReferer !== void 0 ? { httpReferer } : {},
+    ...appTitle !== void 0 ? { appTitle } : {},
+    ...appCategories !== void 0 ? { appCategories } : {},
+    ...xTitle !== void 0 ? { xTitle } : {},
+    provider: normalizedModel.provider || "openrouter"
+  };
+}
+function extractOpenRouterCallModelInput(request) {
+  return isObject(request) && "input" in request ? sanitizeOpenRouterLoggedValue(request.input) : void 0;
+}
+function extractOpenRouterCallModelMetadata(request) {
+  if (!isObject(request)) {
+    return { provider: "openrouter" };
+  }
+  const { input: _input, ...metadata } = request;
+  return buildOpenRouterMetadata(
+    metadata,
+    void 0,
+    void 0,
+    void 0,
+    void 0
+  );
+}
+function extractOpenRouterResponseMetadata(result) {
+  if (!isObject(result)) {
+    return void 0;
+  }
+  const { output: _output, data: _data, usage, ...metadata } = result;
+  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString(model);
+  const normalizedProvider = (typeof provider === "string" ? provider : void 0) || normalizedModel.provider;
+  const usageMetadata = extractOpenRouterUsageMetadata(usage);
+  const combined = {
+    ...rest,
+    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
+    ...usageMetadata || {},
+    ...normalizedProvider !== void 0 ? { provider: normalizedProvider } : {}
+  };
+  return Object.keys(combined).length > 0 ? combined : void 0;
+}
+function extractOpenRouterResponseOutput(response, fallbackOutput) {
+  if (isObject(response) && "output" in response && response.output !== void 0) {
+    return sanitizeOpenRouterLoggedValue(response.output);
+  }
+  if (fallbackOutput !== void 0) {
+    return sanitizeOpenRouterLoggedValue(fallbackOutput);
+  }
+  return void 0;
+}
+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"
+);
+var OPENROUTER_CALL_MODEL_STREAM_METHODS = [
+  "getFullResponsesStream",
+  "getItemsStream",
+  "getNewMessagesStream",
+  "getReasoningStream",
+  "getTextStream",
+  "getToolCallsStream",
+  "getToolStream"
+];
+var OPENROUTER_CALL_MODEL_CONTEXT_METHODS = [
+  "cancel",
+  "getPendingToolCalls",
+  "getState",
+  "getToolCalls",
+  "requiresApproval"
+];
+function patchOpenRouterCallModelResult(args) {
+  const { request, result, span } = args;
+  if (!isObject(result) || isWrappedCallModelResult(result)) {
+    return false;
+  }
+  const resultLike = result;
+  const hasInstrumentableMethod = typeof resultLike.getResponse === "function" || typeof resultLike.getText === "function" || OPENROUTER_CALL_MODEL_STREAM_METHODS.some(
+    (methodName) => typeof resultLike[methodName] === "function"
+  );
+  if (!hasInstrumentableMethod) {
+    return false;
+  }
+  Object.defineProperty(resultLike, OPENROUTER_WRAPPED_CALL_MODEL_RESULT, {
+    value: true,
+    enumerable: false,
+    configurable: false
+  });
+  const originalGetResponse = typeof resultLike.getResponse === "function" ? resultLike.getResponse.bind(resultLike) : void 0;
+  const originalGetInitialResponse = typeof resultLike.getInitialResponse === "function" ? resultLike.getInitialResponse.bind(resultLike) : void 0;
+  const originalMakeFollowupRequest = typeof resultLike.makeFollowupRequest === "function" ? resultLike.makeFollowupRequest.bind(resultLike) : void 0;
+  let ended = false;
+  let tracedTurnCount = 0;
+  const endSpanWithResult = async (response, fallbackOutput) => {
+    if (ended) {
+      return;
+    }
+    ended = true;
+    const finalResponse = getFinalOpenRouterCallModelResponse(
+      resultLike,
+      response
+    );
+    if (finalResponse) {
+      const rounds = getOpenRouterCallModelRounds(resultLike);
+      const metadata = extractOpenRouterCallModelResultMetadata(
+        finalResponse,
+        rounds.length + 1
+      );
+      span.log({
+        output: extractOpenRouterResponseOutput(finalResponse, fallbackOutput),
+        ...metadata ? { metadata } : {},
+        metrics: aggregateOpenRouterCallModelMetrics(rounds, finalResponse)
+      });
+      span.end();
+      return;
+    }
+    if (fallbackOutput !== void 0) {
+      span.log({
+        output: fallbackOutput
+      });
+    }
+    span.end();
+  };
+  const endSpanWithError = (error) => {
+    if (ended) {
+      return;
+    }
+    ended = true;
+    span.log({
+      error: normalizeError(error).message
+    });
+    span.end();
+  };
+  const finalizeFromResponse = async (fallbackOutput) => {
+    if (!originalGetResponse) {
+      await endSpanWithResult(void 0, fallbackOutput);
+      return;
+    }
+    try {
+      await endSpanWithResult(await originalGetResponse(), fallbackOutput);
+    } catch {
+      await endSpanWithResult(void 0, fallbackOutput);
+    }
+  };
+  if (originalGetResponse) {
+    resultLike.getResponse = async (...args2) => {
+      return await withCurrent(span, async () => {
+        try {
+          const response = await originalGetResponse(...args2);
+          await endSpanWithResult(response);
+          return response;
+        } catch (error) {
+          endSpanWithError(error);
+          throw error;
+        }
+      });
+    };
+  }
+  if (typeof resultLike.getText === "function") {
+    const originalGetText = resultLike.getText.bind(resultLike);
+    resultLike.getText = async (...args2) => {
+      return await withCurrent(span, async () => {
+        try {
+          const text = await originalGetText(...args2);
+          await finalizeFromResponse(text);
+          return text;
+        } catch (error) {
+          endSpanWithError(error);
+          throw error;
+        }
+      });
+    };
+  }
+  for (const methodName of OPENROUTER_CALL_MODEL_CONTEXT_METHODS) {
+    if (typeof resultLike[methodName] !== "function") {
+      continue;
+    }
+    const originalMethod = resultLike[methodName];
+    resultLike[methodName] = async (...args2) => {
+      return await withCurrent(span, async () => {
+        return await originalMethod.apply(resultLike, args2);
+      });
+    };
+  }
+  for (const methodName of OPENROUTER_CALL_MODEL_STREAM_METHODS) {
+    if (typeof resultLike[methodName] !== "function") {
+      continue;
+    }
+    const originalMethod = resultLike[methodName];
+    resultLike[methodName] = (...args2) => {
+      const stream = withCurrent(
+        span,
+        () => originalMethod.apply(resultLike, args2)
+      );
+      if (!isAsyncIterable3(stream)) {
+        return stream;
+      }
+      return wrapAsyncIterableWithSpan({
+        finalize: finalizeFromResponse,
+        iteratorFactory: () => stream[Symbol.asyncIterator](),
+        onError: endSpanWithError,
+        span
+      });
+    };
+  }
+  if (originalGetInitialResponse) {
+    let initialTurnTraced = false;
+    resultLike.getInitialResponse = async (...args2) => {
+      if (initialTurnTraced) {
+        return await withCurrent(span, async () => {
+          return await originalGetInitialResponse(...args2);
+        });
+      }
+      initialTurnTraced = true;
+      const step = tracedTurnCount + 1;
+      const stepType = tracedTurnCount === 0 ? "initial" : "continue";
+      const response = await traceOpenRouterCallModelTurn({
+        fn: async () => {
+          const nextResponse = await originalGetInitialResponse(...args2);
+          tracedTurnCount++;
+          return nextResponse;
+        },
+        parentSpan: span,
+        request: getOpenRouterResolvedRequest(resultLike, request),
+        step,
+        stepType
+      });
+      return response;
+    };
+  }
+  if (originalMakeFollowupRequest) {
+    resultLike.makeFollowupRequest = async (...args2) => {
+      const currentResponse = args2[0];
+      const toolResults = Array.isArray(args2[1]) ? args2[1] : [];
+      const step = tracedTurnCount + 1;
+      const response = await traceOpenRouterCallModelTurn({
+        fn: async () => {
+          const nextResponse = await originalMakeFollowupRequest(...args2);
+          tracedTurnCount++;
+          return nextResponse;
+        },
+        parentSpan: span,
+        request: buildOpenRouterFollowupRequest(
+          getOpenRouterResolvedRequest(resultLike, request),
+          currentResponse,
+          toolResults
+        ),
+        step,
+        stepType: "continue"
+      });
+      return response;
+    };
+  }
+  return true;
+}
+async function traceOpenRouterCallModelTurn(args) {
+  const context = {
+    arguments: [args.request],
+    step: args.step,
+    stepType: args.stepType
+  };
+  return await withCurrent(
+    args.parentSpan,
+    () => openRouterAgentChannels.callModelTurn.tracePromise(args.fn, context)
+  );
+}
+function isWrappedCallModelResult(value) {
+  return Boolean(
+    isObject(value) && value[OPENROUTER_WRAPPED_CALL_MODEL_RESULT]
+  );
+}
+function extractOpenRouterCallModelResultMetadata(response, turnCount) {
+  const combined = {
+    ...extractOpenRouterResponseMetadata(response) || {},
+    ...turnCount !== void 0 ? { turn_count: turnCount } : {}
+  };
+  return Object.keys(combined).length > 0 ? combined : void 0;
+}
+function getFinalOpenRouterCallModelResponse(result, response) {
+  if (isObject(response)) {
+    return response;
+  }
+  return isObject(result.finalResponse) ? result.finalResponse : void 0;
+}
+function getOpenRouterCallModelRounds(result) {
+  if (!Array.isArray(result.allToolExecutionRounds)) {
+    return [];
+  }
+  return result.allToolExecutionRounds.filter((round) => isObject(round)).map((round) => ({
+    response: isObject(round.response) ? round.response : void 0,
+    round: typeof round.round === "number" ? round.round : void 0,
+    toolResults: Array.isArray(round.toolResults) ? round.toolResults : []
+  })).filter((round) => round.response !== void 0);
+}
+function aggregateOpenRouterCallModelMetrics(rounds, finalResponse) {
+  const metrics = {};
+  const responses = [
+    ...rounds.map((round) => round.response).filter(isObject),
+    finalResponse
+  ];
+  for (const response of responses) {
+    const responseMetrics = parseOpenRouterMetricsFromUsage(response.usage);
+    for (const [name, value] of Object.entries(responseMetrics)) {
+      metrics[name] = (metrics[name] || 0) + value;
+    }
+  }
+  return metrics;
+}
+function buildNextOpenRouterCallModelInput(currentInput, response, toolResults) {
+  const normalizedInput = Array.isArray(currentInput) ? [...currentInput] : currentInput === void 0 ? [] : [currentInput];
+  const responseOutput = Array.isArray(response.output) ? response.output : response.output === void 0 ? [] : [response.output];
+  return [...normalizedInput, ...responseOutput, ...toolResults].map(
+    (entry) => sanitizeOpenRouterLoggedValue(entry)
+  );
+}
+function getOpenRouterResolvedRequest(result, request) {
+  if (isObject(result.resolvedRequest)) {
+    return result.resolvedRequest;
+  }
+  return request;
+}
+function buildOpenRouterFollowupRequest(request, currentResponse, toolResults) {
+  if (!request) {
+    return void 0;
+  }
+  return {
+    ...request,
+    input: buildNextOpenRouterCallModelInput(
+      extractOpenRouterCallModelInput(request),
+      isObject(currentResponse) ? currentResponse : {},
+      toolResults
+    ),
+    stream: false
+  };
+}
+function wrapAsyncIterableWithSpan(args) {
+  return {
+    [Symbol.asyncIterator]() {
+      const iterator = args.iteratorFactory();
+      return {
+        next(value) {
+          return withCurrent(
+            args.span,
+            () => value === void 0 ? iterator.next() : iterator.next(value)
+          ).then(
+            async (result) => {
+              if (result.done) {
+                await args.finalize();
+              }
+              return result;
+            },
+            (error) => {
+              args.onError(error);
+              throw error;
+            }
+          );
+        },
+        return(value) {
+          if (typeof iterator.return !== "function") {
+            return args.finalize().then(() => ({
+              done: true,
+              value
+            }));
+          }
+          return withCurrent(args.span, () => iterator.return(value)).then(
+            async (result) => {
+              await args.finalize();
+              return result;
+            },
+            (error) => {
+              args.onError(error);
+              throw error;
+            }
+          );
+        },
+        throw(error) {
+          args.onError(error);
+          if (typeof iterator.throw !== "function") {
+            return Promise.reject(error);
+          }
+          return withCurrent(args.span, () => iterator.throw(error));
+        },
+        [Symbol.asyncIterator]() {
+          return this;
+        }
+      };
+    }
+  };
+}
+function isAsyncIterable3(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+}
+function normalizeError(error) {
+  return error instanceof Error ? error : new Error(String(error));
+}
+
+// src/instrumentation/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() {
+    this.subscribeToOpenRouterChannels();
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+  subscribeToOpenRouterChannels() {
+    this.unsubscribers.push(
+      traceStreamingChannel(openRouterChannels.chatSend, {
+        name: "openrouter.chat.send",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterRequestArg(args);
+          const chatGenerationParams = isObject(request?.chatGenerationParams) ? request.chatGenerationParams : {};
+          const httpReferer = request?.httpReferer;
+          const xTitle = request?.xTitle;
+          const { messages, ...metadata } = chatGenerationParams;
+          return {
+            input: messages,
+            metadata: buildOpenRouterMetadata2(metadata, httpReferer, xTitle)
+          };
+        },
+        extractOutput: (result) => {
+          return isObject(result) ? result.choices : void 0;
+        },
+        extractMetrics: (result, startTime) => {
+          const metrics = parseOpenRouterMetricsFromUsage2(result?.usage);
+          if (startTime) {
+            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+          }
+          return metrics;
+        },
+        aggregateChunks: aggregateOpenRouterChatChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceAsyncChannel(openRouterChannels.embeddingsGenerate, {
+        name: "openrouter.embeddings.generate",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterRequestArg(args);
+          const requestBody = isObject(request?.requestBody) ? request.requestBody : {};
+          const httpReferer = request?.httpReferer;
+          const xTitle = request?.xTitle;
+          const { input, ...metadata } = requestBody;
+          return {
+            input,
+            metadata: buildOpenRouterEmbeddingMetadata(
+              metadata,
+              httpReferer,
+              xTitle
+            )
+          };
+        },
+        extractOutput: (result) => {
+          if (!isObject(result)) {
+            return void 0;
           }
           const embedding = result.data?.[0]?.embedding;
           return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
@@ -14259,10 +15739,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) : {};
         }
       })
     );
@@ -14278,13 +15758,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;
           }
@@ -14298,15 +15778,15 @@ 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({
-            request: getOpenRouterCallModelRequestArg(endEvent.arguments),
+          return patchOpenRouterCallModelResult2({
+            request: getOpenRouterCallModelRequestArg2(endEvent.arguments),
             result,
             span
           });
@@ -14318,13 +15798,13 @@ var OpenRouterPlugin = class extends BasePlugin {
         name: "openrouter.beta.responses.send",
         type: "llm" /* LLM */,
         extractInput: (args, event) => {
-          const request = getOpenRouterCallModelRequestArg(args);
-          const metadata = request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" };
+          const request = getOpenRouterCallModelRequestArg2(args);
+          const metadata = request ? extractOpenRouterCallModelMetadata2(request) : { provider: "openrouter" };
           if (isObject(metadata) && "tools" in metadata) {
             delete metadata.tools;
           }
           return {
-            input: request ? extractOpenRouterCallModelInput(request) : void 0,
+            input: request ? extractOpenRouterCallModelInput2(request) : void 0,
             metadata: {
               ...metadata,
               step: event.step,
@@ -14332,7 +15812,7 @@ var OpenRouterPlugin = class extends BasePlugin {
             }
           };
         },
-        extractOutput: (result) => extractOpenRouterResponseOutput(result),
+        extractOutput: (result) => extractOpenRouterResponseOutput2(result),
         extractMetadata: (result, event) => {
           if (!isObject(result)) {
             return {
@@ -14341,12 +15821,12 @@ var OpenRouterPlugin = class extends BasePlugin {
             };
           }
           return {
-            ...extractOpenRouterResponseMetadata(result) || {},
+            ...extractOpenRouterResponseMetadata2(result) || {},
             ...event?.step !== void 0 ? { step: event.step } : {},
             ...event?.stepType ? { step_type: event.stepType } : {}
           };
         },
-        extractMetrics: (result) => isObject(result) ? parseOpenRouterMetricsFromUsage(result.usage) : {}
+        extractMetrics: (result) => isObject(result) ? parseOpenRouterMetricsFromUsage2(result.usage) : {}
       })
     );
     this.unsubscribers.push(
@@ -14372,11 +15852,11 @@ var OpenRouterPlugin = class extends BasePlugin {
     const callModelChannel = openRouterChannels.callModel.tracingChannel();
     const callModelHandlers = {
       start: (event) => {
-        const request = getOpenRouterCallModelRequestArg(event.arguments);
+        const request = getOpenRouterCallModelRequestArg2(event.arguments);
         if (!request) {
           return;
         }
-        patchOpenRouterCallModelRequestTools(request);
+        patchOpenRouterCallModelRequestTools2(request);
       }
     };
     callModelChannel.subscribe(callModelHandlers);
@@ -14385,20 +15865,20 @@ var OpenRouterPlugin = class extends BasePlugin {
     });
   }
 };
-function normalizeArgs(args) {
+function normalizeArgs2(args) {
   if (Array.isArray(args)) {
     return args;
   }
-  if (isArrayLike(args)) {
+  if (isArrayLike2(args)) {
     return Array.from(args);
   }
   return [args];
 }
-function isArrayLike(value) {
+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 = normalizeArgs(args);
+  const normalizedArgs = normalizeArgs2(args);
   const keyedCandidate = normalizedArgs.find(
     (arg) => isObject(arg) && ("chatGenerationParams" in arg || "requestBody" in arg || "openResponsesRequest" in arg)
   );
@@ -14408,11 +15888,11 @@ function getOpenRouterRequestArg(args) {
   const firstObjectArg = normalizedArgs.find((arg) => isObject(arg));
   return isObject(firstObjectArg) ? firstObjectArg : void 0;
 }
-function getOpenRouterCallModelRequestArg(args) {
-  const firstObjectArg = normalizeArgs(args).find((arg) => isObject(arg));
+function getOpenRouterCallModelRequestArg2(args) {
+  const firstObjectArg = normalizeArgs2(args).find((arg) => isObject(arg));
   return isObject(firstObjectArg) ? firstObjectArg : void 0;
 }
-var TOKEN_NAME_MAP2 = {
+var TOKEN_NAME_MAP3 = {
   promptTokens: "prompt_tokens",
   inputTokens: "prompt_tokens",
   completionTokens: "completion_tokens",
@@ -14424,7 +15904,7 @@ var TOKEN_NAME_MAP2 = {
   output_tokens: "completion_tokens",
   total_tokens: "tokens"
 };
-var TOKEN_DETAIL_PREFIX_MAP = {
+var TOKEN_DETAIL_PREFIX_MAP2 = {
   promptTokensDetails: "prompt",
   inputTokensDetails: "prompt",
   completionTokensDetails: "completion",
@@ -14436,23 +15916,23 @@ var TOKEN_DETAIL_PREFIX_MAP = {
   output_tokens_details: "completion",
   cost_details: "cost"
 };
-function camelToSnake(value) {
+function camelToSnake2(value) {
   return value.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
 }
-function parseOpenRouterMetricsFromUsage(usage) {
+function parseOpenRouterMetricsFromUsage2(usage) {
   if (!isObject(usage)) {
     return {};
   }
   const metrics = {};
   for (const [name, value] of Object.entries(usage)) {
     if (typeof value === "number") {
-      metrics[TOKEN_NAME_MAP2[name] || camelToSnake(name)] = value;
+      metrics[TOKEN_NAME_MAP3[name] || camelToSnake2(name)] = value;
       continue;
     }
     if (!isObject(value)) {
       continue;
     }
-    const prefix = TOKEN_DETAIL_PREFIX_MAP[name];
+    const prefix = TOKEN_DETAIL_PREFIX_MAP2[name];
     if (!prefix) {
       continue;
     }
@@ -14460,12 +15940,12 @@ function parseOpenRouterMetricsFromUsage(usage) {
       if (typeof nestedValue !== "number") {
         continue;
       }
-      metrics[`${prefix}_${camelToSnake(nestedName)}`] = nestedValue;
+      metrics[`${prefix}_${camelToSnake2(nestedName)}`] = nestedValue;
     }
   }
   return metrics;
 }
-function extractOpenRouterUsageMetadata(usage) {
+function extractOpenRouterUsageMetadata2(usage) {
   if (!isObject(usage)) {
     return void 0;
   }
@@ -14477,13 +15957,13 @@ function extractOpenRouterUsageMetadata(usage) {
   }
   return Object.keys(metadata).length > 0 ? metadata : void 0;
 }
-var OMITTED_OPENROUTER_KEYS = /* @__PURE__ */ new Set([
+var OMITTED_OPENROUTER_KEYS2 = /* @__PURE__ */ new Set([
   "execute",
   "render",
   "nextTurnParams",
   "requireApproval"
 ]);
-function parseOpenRouterModelString(model) {
+function parseOpenRouterModelString2(model) {
   if (typeof model !== "string") {
     return { model };
   }
@@ -14496,10 +15976,10 @@ function parseOpenRouterModelString(model) {
   }
   return { model };
 }
-function isZodSchema3(value) {
+function isZodSchema4(value) {
   return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
 }
-function serializeZodSchema3(schema) {
+function serializeZodSchema4(schema) {
   try {
     return zodToJsonSchema(schema);
   } catch {
@@ -14509,60 +15989,60 @@ function serializeZodSchema3(schema) {
     };
   }
 }
-function serializeOpenRouterTool(tool) {
+function serializeOpenRouterTool2(tool) {
   if (!isObject(tool)) {
     return tool;
   }
   const serialized = {};
   for (const [key, value] of Object.entries(tool)) {
-    if (OMITTED_OPENROUTER_KEYS.has(key)) {
+    if (OMITTED_OPENROUTER_KEYS2.has(key)) {
       continue;
     }
     if (key === "function" && isObject(value)) {
-      serialized.function = sanitizeOpenRouterLoggedValue(value);
+      serialized.function = sanitizeOpenRouterLoggedValue2(value);
       continue;
     }
-    serialized[key] = sanitizeOpenRouterLoggedValue(value);
+    serialized[key] = sanitizeOpenRouterLoggedValue2(value);
   }
   return serialized;
 }
-function serializeOpenRouterToolsForLogging(tools) {
+function serializeOpenRouterToolsForLogging2(tools) {
   if (!Array.isArray(tools)) {
     return void 0;
   }
-  return tools.map((tool) => serializeOpenRouterTool(tool));
+  return tools.map((tool) => serializeOpenRouterTool2(tool));
 }
-function sanitizeOpenRouterLoggedValue(value) {
-  if (isZodSchema3(value)) {
-    return serializeZodSchema3(value);
+function sanitizeOpenRouterLoggedValue2(value) {
+  if (isZodSchema4(value)) {
+    return serializeZodSchema4(value);
   }
   if (typeof value === "function") {
     return "[Function]";
   }
   if (Array.isArray(value)) {
-    return value.map((entry) => sanitizeOpenRouterLoggedValue(entry));
+    return value.map((entry) => sanitizeOpenRouterLoggedValue2(entry));
   }
   if (!isObject(value)) {
     return value;
   }
   const sanitized = {};
   for (const [key, entry] of Object.entries(value)) {
-    if (OMITTED_OPENROUTER_KEYS.has(key)) {
+    if (OMITTED_OPENROUTER_KEYS2.has(key)) {
       continue;
     }
     if (key === "tools" && Array.isArray(entry)) {
-      sanitized.tools = serializeOpenRouterToolsForLogging(entry);
+      sanitized.tools = serializeOpenRouterToolsForLogging2(entry);
       continue;
     }
-    sanitized[key] = sanitizeOpenRouterLoggedValue(entry);
+    sanitized[key] = sanitizeOpenRouterLoggedValue2(entry);
   }
   return sanitized;
 }
-function buildOpenRouterMetadata(metadata, httpReferer, xTitle) {
-  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+function buildOpenRouterMetadata2(metadata, httpReferer, xTitle) {
+  const sanitized = sanitizeOpenRouterLoggedValue2(metadata);
   const metadataRecord = isObject(sanitized) ? sanitized : {};
   const { model, provider: providerRouting, ...rest } = metadataRecord;
-  const normalizedModel = parseOpenRouterModelString(model);
+  const normalizedModel = parseOpenRouterModelString2(model);
   return {
     ...rest,
     ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
@@ -14573,33 +16053,33 @@ function buildOpenRouterMetadata(metadata, httpReferer, xTitle) {
   };
 }
 function buildOpenRouterEmbeddingMetadata(metadata, httpReferer, xTitle) {
-  const normalized = buildOpenRouterMetadata(metadata, httpReferer, xTitle);
+  const normalized = buildOpenRouterMetadata2(metadata, httpReferer, xTitle);
   return typeof normalized.model === "string" ? {
     ...normalized,
     embedding_model: normalized.model
   } : normalized;
 }
-function extractOpenRouterCallModelInput(request) {
-  return isObject(request) && "input" in request ? sanitizeOpenRouterLoggedValue(request.input) : void 0;
+function extractOpenRouterCallModelInput2(request) {
+  return isObject(request) && "input" in request ? sanitizeOpenRouterLoggedValue2(request.input) : void 0;
 }
-function extractOpenRouterCallModelMetadata(request) {
+function extractOpenRouterCallModelMetadata2(request) {
   if (!isObject(request)) {
     return { provider: "openrouter" };
   }
   const { input: _input, ...metadata } = request;
-  return buildOpenRouterMetadata(metadata, void 0, void 0);
+  return buildOpenRouterMetadata2(metadata, void 0, void 0);
 }
-function extractOpenRouterResponseMetadata(result) {
+function extractOpenRouterResponseMetadata2(result) {
   if (!isObject(result)) {
     return void 0;
   }
   const { output: _output, data: _data, usage, ...metadata } = result;
-  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+  const sanitized = sanitizeOpenRouterLoggedValue2(metadata);
   const metadataRecord = isObject(sanitized) ? sanitized : {};
   const { model, provider, ...rest } = metadataRecord;
-  const normalizedModel = parseOpenRouterModelString(model);
+  const normalizedModel = parseOpenRouterModelString2(model);
   const normalizedProvider = (typeof provider === "string" ? provider : void 0) || normalizedModel.provider;
-  const usageMetadata = extractOpenRouterUsageMetadata(usage);
+  const usageMetadata = extractOpenRouterUsageMetadata2(usage);
   const combined = {
     ...rest,
     ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
@@ -14608,22 +16088,22 @@ function extractOpenRouterResponseMetadata(result) {
   };
   return Object.keys(combined).length > 0 ? combined : void 0;
 }
-function extractOpenRouterResponseOutput(response, fallbackOutput) {
+function extractOpenRouterResponseOutput2(response, fallbackOutput) {
   if (isObject(response) && "output" in response && response.output !== void 0) {
-    return sanitizeOpenRouterLoggedValue(response.output);
+    return sanitizeOpenRouterLoggedValue2(response.output);
   }
   if (fallbackOutput !== void 0) {
-    return sanitizeOpenRouterLoggedValue(fallbackOutput);
+    return sanitizeOpenRouterLoggedValue2(fallbackOutput);
   }
   return void 0;
 }
-var OPENROUTER_WRAPPED_TOOL = Symbol("braintrust.openrouter.wrappedTool");
-function patchOpenRouterCallModelRequestTools(request) {
+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) => wrapOpenRouterTool(tool));
+  const wrappedTools = originalTools.map((tool) => wrapOpenRouterTool2(tool));
   const didPatch = wrappedTools.some(
     (tool, index) => tool !== originalTools[index]
   );
@@ -14635,8 +16115,8 @@ function patchOpenRouterCallModelRequestTools(request) {
     request.tools = originalTools;
   };
 }
-function wrapOpenRouterTool(tool) {
-  if (isWrappedTool(tool) || !tool.function || typeof tool.function !== "object" || typeof tool.function.execute !== "function") {
+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";
@@ -14646,26 +16126,26 @@ function wrapOpenRouterTool(tool) {
     function: {
       ...tool.function,
       execute(...args) {
-        return traceToolExecution({
+        return traceToolExecution2({
           args,
           execute: () => Reflect.apply(originalExecute, this, args),
-          toolCallId: getToolCallId(args[1]),
+          toolCallId: getToolCallId2(args[1]),
           toolName
         });
       }
     }
   };
-  Object.defineProperty(wrappedTool, OPENROUTER_WRAPPED_TOOL, {
+  Object.defineProperty(wrappedTool, OPENROUTER_WRAPPED_TOOL2, {
     value: true,
     enumerable: false,
     configurable: false
   });
   return wrappedTool;
 }
-function isWrappedTool(tool) {
-  return Boolean(tool[OPENROUTER_WRAPPED_TOOL]);
+function isWrappedTool2(tool) {
+  return Boolean(tool[OPENROUTER_WRAPPED_TOOL2]);
 }
-function traceToolExecution(args) {
+function traceToolExecution2(args) {
   const tracingChannel2 = openRouterChannels.toolExecute.tracingChannel();
   const input = args.args.length > 0 ? args.args[0] : void 0;
   const event = {
@@ -14679,15 +16159,15 @@ function traceToolExecution(args) {
   tracingChannel2.start.publish(event);
   try {
     const result = args.execute();
-    return publishToolResult(tracingChannel2, event, result);
+    return publishToolResult2(tracingChannel2, event, result);
   } catch (error) {
-    event.error = normalizeError(error);
+    event.error = normalizeError2(error);
     tracingChannel2.error.publish(event);
     throw error;
   }
 }
-function publishToolResult(tracingChannel2, event, result) {
-  if (isPromiseLike2(result)) {
+function publishToolResult2(tracingChannel2, event, result) {
+  if (isPromiseLike4(result)) {
     return result.then(
       (resolved) => {
         event.result = resolved;
@@ -14695,7 +16175,7 @@ function publishToolResult(tracingChannel2, event, result) {
         return resolved;
       },
       (error) => {
-        event.error = normalizeError(error);
+        event.error = normalizeError2(error);
         tracingChannel2.error.publish(event);
         throw error;
       }
@@ -14705,11 +16185,11 @@ function publishToolResult(tracingChannel2, event, result) {
   tracingChannel2.asyncEnd.publish(event);
   return result;
 }
-function getToolCallId(context) {
+function getToolCallId2(context) {
   const toolContext = context;
   return typeof toolContext?.toolCall?.id === "string" ? toolContext.toolCall.id : void 0;
 }
-function isPromiseLike2(value) {
+function isPromiseLike4(value) {
   return !!value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
 }
 function aggregateOpenRouterChatChunks(chunks) {
@@ -14721,7 +16201,7 @@ function aggregateOpenRouterChatChunks(chunks) {
   for (const chunk of chunks) {
     metrics = {
       ...metrics,
-      ...parseOpenRouterMetricsFromUsage(chunk?.usage)
+      ...parseOpenRouterMetricsFromUsage2(chunk?.usage)
     };
     const choice = chunk?.choices?.[0];
     const delta = choice?.delta;
@@ -14815,15 +16295,15 @@ function aggregateOpenRouterResponseStreamEvents(chunks) {
     };
   }
   return {
-    output: extractOpenRouterResponseOutput(finalResponse),
-    metrics: parseOpenRouterMetricsFromUsage(finalResponse.usage),
-    ...extractOpenRouterResponseMetadata(finalResponse) ? { metadata: extractOpenRouterResponseMetadata(finalResponse) } : {}
+    output: extractOpenRouterResponseOutput2(finalResponse),
+    metrics: parseOpenRouterMetricsFromUsage2(finalResponse.usage),
+    ...extractOpenRouterResponseMetadata2(finalResponse) ? { metadata: extractOpenRouterResponseMetadata2(finalResponse) } : {}
   };
 }
-var OPENROUTER_WRAPPED_CALL_MODEL_RESULT = Symbol(
+var OPENROUTER_WRAPPED_CALL_MODEL_RESULT2 = Symbol(
   "braintrust.openrouter.wrappedCallModelResult"
 );
-var OPENROUTER_CALL_MODEL_STREAM_METHODS = [
+var OPENROUTER_CALL_MODEL_STREAM_METHODS2 = [
   "getFullResponsesStream",
   "getItemsStream",
   "getNewMessagesStream",
@@ -14832,26 +16312,26 @@ var OPENROUTER_CALL_MODEL_STREAM_METHODS = [
   "getToolCallsStream",
   "getToolStream"
 ];
-var OPENROUTER_CALL_MODEL_CONTEXT_METHODS = [
+var OPENROUTER_CALL_MODEL_CONTEXT_METHODS2 = [
   "cancel",
   "getPendingToolCalls",
   "getState",
   "getToolCalls",
   "requiresApproval"
 ];
-function patchOpenRouterCallModelResult(args) {
+function patchOpenRouterCallModelResult2(args) {
   const { request, result, span } = args;
-  if (!isObject(result) || isWrappedCallModelResult(result)) {
+  if (!isObject(result) || isWrappedCallModelResult2(result)) {
     return false;
   }
   const resultLike = result;
-  const hasInstrumentableMethod = typeof resultLike.getResponse === "function" || typeof resultLike.getText === "function" || OPENROUTER_CALL_MODEL_STREAM_METHODS.some(
+  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_RESULT, {
+  Object.defineProperty(resultLike, OPENROUTER_WRAPPED_CALL_MODEL_RESULT2, {
     value: true,
     enumerable: false,
     configurable: false
@@ -14866,20 +16346,20 @@ function patchOpenRouterCallModelResult(args) {
       return;
     }
     ended = true;
-    const finalResponse = getFinalOpenRouterCallModelResponse(
+    const finalResponse = getFinalOpenRouterCallModelResponse2(
       resultLike,
       response
     );
     if (finalResponse) {
-      const rounds = getOpenRouterCallModelRounds(resultLike);
-      const metadata = extractOpenRouterCallModelResultMetadata(
+      const rounds = getOpenRouterCallModelRounds2(resultLike);
+      const metadata = extractOpenRouterCallModelResultMetadata2(
         finalResponse,
         rounds.length + 1
       );
       span.log({
-        output: extractOpenRouterResponseOutput(finalResponse, fallbackOutput),
+        output: extractOpenRouterResponseOutput2(finalResponse, fallbackOutput),
         ...metadata ? { metadata } : {},
-        metrics: aggregateOpenRouterCallModelMetrics(rounds, finalResponse)
+        metrics: aggregateOpenRouterCallModelMetrics2(rounds, finalResponse)
       });
       span.end();
       return;
@@ -14897,7 +16377,7 @@ function patchOpenRouterCallModelResult(args) {
     }
     ended = true;
     span.log({
-      error: normalizeError(error).message
+      error: normalizeError2(error).message
     });
     span.end();
   };
@@ -14941,7 +16421,7 @@ function patchOpenRouterCallModelResult(args) {
       });
     };
   }
-  for (const methodName of OPENROUTER_CALL_MODEL_CONTEXT_METHODS) {
+  for (const methodName of OPENROUTER_CALL_MODEL_CONTEXT_METHODS2) {
     if (typeof resultLike[methodName] !== "function") {
       continue;
     }
@@ -14952,7 +16432,7 @@ function patchOpenRouterCallModelResult(args) {
       });
     };
   }
-  for (const methodName of OPENROUTER_CALL_MODEL_STREAM_METHODS) {
+  for (const methodName of OPENROUTER_CALL_MODEL_STREAM_METHODS2) {
     if (typeof resultLike[methodName] !== "function") {
       continue;
     }
@@ -14962,10 +16442,10 @@ function patchOpenRouterCallModelResult(args) {
         span,
         () => originalMethod.apply(resultLike, args2)
       );
-      if (!isAsyncIterable2(stream)) {
+      if (!isAsyncIterable4(stream)) {
         return stream;
       }
-      return wrapAsyncIterableWithSpan({
+      return wrapAsyncIterableWithSpan2({
         finalize: finalizeFromResponse,
         iteratorFactory: () => stream[Symbol.asyncIterator](),
         onError: endSpanWithError,
@@ -14984,14 +16464,14 @@ function patchOpenRouterCallModelResult(args) {
       initialTurnTraced = true;
       const step = tracedTurnCount + 1;
       const stepType = tracedTurnCount === 0 ? "initial" : "continue";
-      const response = await traceOpenRouterCallModelTurn({
+      const response = await traceOpenRouterCallModelTurn2({
         fn: async () => {
           const nextResponse = await originalGetInitialResponse(...args2);
           tracedTurnCount++;
           return nextResponse;
         },
         parentSpan: span,
-        request: getOpenRouterResolvedRequest(resultLike, request),
+        request: getOpenRouterResolvedRequest2(resultLike, request),
         step,
         stepType
       });
@@ -15003,15 +16483,15 @@ function patchOpenRouterCallModelResult(args) {
       const currentResponse = args2[0];
       const toolResults = Array.isArray(args2[1]) ? args2[1] : [];
       const step = tracedTurnCount + 1;
-      const response = await traceOpenRouterCallModelTurn({
+      const response = await traceOpenRouterCallModelTurn2({
         fn: async () => {
           const nextResponse = await originalMakeFollowupRequest(...args2);
           tracedTurnCount++;
           return nextResponse;
         },
         parentSpan: span,
-        request: buildOpenRouterFollowupRequest(
-          getOpenRouterResolvedRequest(resultLike, request),
+        request: buildOpenRouterFollowupRequest2(
+          getOpenRouterResolvedRequest2(resultLike, request),
           currentResponse,
           toolResults
         ),
@@ -15023,7 +16503,7 @@ function patchOpenRouterCallModelResult(args) {
   }
   return true;
 }
-async function traceOpenRouterCallModelTurn(args) {
+async function traceOpenRouterCallModelTurn2(args) {
   const context = {
     arguments: [args.request],
     step: args.step,
@@ -15034,25 +16514,25 @@ async function traceOpenRouterCallModelTurn(args) {
     () => openRouterChannels.callModelTurn.tracePromise(args.fn, context)
   );
 }
-function isWrappedCallModelResult(value) {
+function isWrappedCallModelResult2(value) {
   return Boolean(
-    isObject(value) && value[OPENROUTER_WRAPPED_CALL_MODEL_RESULT]
+    isObject(value) && value[OPENROUTER_WRAPPED_CALL_MODEL_RESULT2]
   );
 }
-function extractOpenRouterCallModelResultMetadata(response, turnCount) {
+function extractOpenRouterCallModelResultMetadata2(response, turnCount) {
   const combined = {
-    ...extractOpenRouterResponseMetadata(response) || {},
+    ...extractOpenRouterResponseMetadata2(response) || {},
     ...turnCount !== void 0 ? { turn_count: turnCount } : {}
   };
   return Object.keys(combined).length > 0 ? combined : void 0;
 }
-function getFinalOpenRouterCallModelResponse(result, response) {
+function getFinalOpenRouterCallModelResponse2(result, response) {
   if (isObject(response)) {
     return response;
   }
   return isObject(result.finalResponse) ? result.finalResponse : void 0;
 }
-function getOpenRouterCallModelRounds(result) {
+function getOpenRouterCallModelRounds2(result) {
   if (!Array.isArray(result.allToolExecutionRounds)) {
     return [];
   }
@@ -15062,48 +16542,48 @@ function getOpenRouterCallModelRounds(result) {
     toolResults: Array.isArray(round.toolResults) ? round.toolResults : []
   })).filter((round) => round.response !== void 0);
 }
-function aggregateOpenRouterCallModelMetrics(rounds, finalResponse) {
+function aggregateOpenRouterCallModelMetrics2(rounds, finalResponse) {
   const metrics = {};
   const responses = [
     ...rounds.map((round) => round.response).filter(isObject),
     finalResponse
   ];
   for (const response of responses) {
-    const responseMetrics = parseOpenRouterMetricsFromUsage(response.usage);
+    const responseMetrics = parseOpenRouterMetricsFromUsage2(response.usage);
     for (const [name, value] of Object.entries(responseMetrics)) {
       metrics[name] = (metrics[name] || 0) + value;
     }
   }
   return metrics;
 }
-function buildNextOpenRouterCallModelInput(currentInput, response, toolResults) {
+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) => sanitizeOpenRouterLoggedValue(entry)
+    (entry) => sanitizeOpenRouterLoggedValue2(entry)
   );
 }
-function getOpenRouterResolvedRequest(result, request) {
+function getOpenRouterResolvedRequest2(result, request) {
   if (isObject(result.resolvedRequest)) {
     return result.resolvedRequest;
   }
   return request;
 }
-function buildOpenRouterFollowupRequest(request, currentResponse, toolResults) {
+function buildOpenRouterFollowupRequest2(request, currentResponse, toolResults) {
   if (!request) {
     return void 0;
   }
   return {
     ...request,
-    input: buildNextOpenRouterCallModelInput(
-      extractOpenRouterCallModelInput(request),
+    input: buildNextOpenRouterCallModelInput2(
+      extractOpenRouterCallModelInput2(request),
       isObject(currentResponse) ? currentResponse : {},
       toolResults
     ),
     stream: false
   };
 }
-function wrapAsyncIterableWithSpan(args) {
+function wrapAsyncIterableWithSpan2(args) {
   return {
     [Symbol.asyncIterator]() {
       const iterator = args.iteratorFactory();
@@ -15157,11 +16637,516 @@ function wrapAsyncIterableWithSpan(args) {
     }
   };
 }
-function isAsyncIterable2(value) {
-  return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+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
+      })
+    );
+  }
+};
+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 (isArrayLike3(args)) {
+    return Array.from(args);
+  }
+  return [args];
+}
+function isArrayLike3(value) {
+  return isObject(value) && "length" in value && typeof value.length === "number" && Number.isInteger(value.length) && value.length >= 0;
+}
+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
+  );
+  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;
+  }
+  return metrics;
+}
+function extractMistralStreamOutput(result) {
+  return isObject(result) ? result.choices : void 0;
+}
+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 normalizeError(error) {
-  return error instanceof Error ? error : new Error(String(error));
+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;
+    }
+    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 mergedToolCall.id === "string" && !idToPosition.has(mergedToolCall.id)) {
+      idToPosition.set(mergedToolCall.id, existingPosition);
+    }
+  }
+  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;
+    }
+    if (!isObject(value)) {
+      continue;
+    }
+    const prefix = TOKEN_DETAIL_PREFIX_MAP3[name];
+    if (!prefix) {
+      continue;
+    }
+    for (const [nestedName, nestedValue] of Object.entries(value)) {
+      if (typeof nestedValue !== "number") {
+        continue;
+      }
+      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 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++
+        });
+      }
+      const accumulator = choiceAccumulators.get(accumulatorKey);
+      if (!accumulator) {
+        continue;
+      }
+      if (choiceIndex !== void 0) {
+        accumulator.index = choiceIndex;
+        indexToAccumulatorKey.set(choiceIndex, accumulatorKey);
+      }
+      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;
+      }
+    }
+  }
+  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,
+    metrics,
+    ...metadata ? { metadata } : {}
+  };
 }
 
 // src/instrumentation/braintrust-plugin.ts
@@ -15173,6 +17158,8 @@ var BraintrustPlugin = class extends BasePlugin {
   claudeAgentSDKPlugin = null;
   googleGenAIPlugin = null;
   openRouterPlugin = null;
+  openRouterAgentPlugin = null;
+  mistralPlugin = null;
   constructor(config = {}) {
     super();
     this.config = config;
@@ -15203,6 +17190,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) {
@@ -15229,6 +17224,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;
+    }
   }
 };
 
@@ -15301,7 +17304,9 @@ var PluginRegistry = class {
       aisdk: true,
       google: true,
       claudeAgentSDK: true,
-      openrouter: true
+      openrouter: true,
+      openrouterAgent: true,
+      mistral: true
     };
   }
   /**
@@ -15448,6 +17453,7 @@ var exports_exports = {};
 __export(exports_exports, {
   Attachment: () => Attachment,
   AttachmentReference: () => AttachmentReference,
+  BRAINTRUST_CURRENT_SPAN_STORE: () => BRAINTRUST_CURRENT_SPAN_STORE,
   BaseAttachment: () => BaseAttachment,
   BaseExperiment: () => BaseExperiment,
   BraintrustMiddleware: () => BraintrustMiddleware,
@@ -15574,9 +17580,11 @@ __export(exports_exports, {
   wrapClaudeAgentSDK: () => wrapClaudeAgentSDK,
   wrapGoogleGenAI: () => wrapGoogleGenAI,
   wrapMastraAgent: () => wrapMastraAgent,
+  wrapMistral: () => wrapMistral,
   wrapOpenAI: () => wrapOpenAI,
   wrapOpenAIv4: () => wrapOpenAIv4,
   wrapOpenRouter: () => wrapOpenRouter,
+  wrapOpenRouterAgent: () => wrapOpenRouterAgent,
   wrapTraced: () => wrapTraced,
   wrapVitest: () => wrapVitest
 });
@@ -15833,21 +17841,26 @@ function responsesProxy(openai) {
   }
   return new Proxy(openai.responses, {
     get(target, name, receiver) {
-      if (name === "create") {
+      if (name === "create" && typeof target.create === "function") {
         return wrapResponsesAsync(
           target.create.bind(target),
           openAIChannels.responsesCreate
         );
-      } else if (name === "stream") {
+      } else if (name === "stream" && typeof target.stream === "function") {
         return wrapResponsesSyncStream(
           target.stream.bind(target),
           openAIChannels.responsesStream
         );
-      } else if (name === "parse") {
+      } else if (name === "parse" && typeof target.parse === "function") {
         return wrapResponsesAsync(
           target.parse.bind(target),
           openAIChannels.responsesParse
         );
+      } else if (name === "compact" && typeof target.compact === "function") {
+        return wrapResponsesAsync(
+          target.compact.bind(target),
+          openAIChannels.responsesCompact
+        );
       }
       return Reflect.get(target, name, receiver);
     }
@@ -15908,7 +17921,7 @@ function wrapOpenAIv4(openai) {
       return baseVal;
     }
   });
-  const chatProxy2 = new Proxy(typedOpenai.chat, {
+  const chatProxy3 = new Proxy(typedOpenai.chat, {
     get(target, name, receiver) {
       if (name === "completions") {
         return completionProxy;
@@ -15955,7 +17968,7 @@ function wrapOpenAIv4(openai) {
     get(target, name) {
       switch (name) {
         case "chat":
-          return chatProxy2;
+          return chatProxy3;
         case "embeddings":
           return embeddingProxy;
         case "moderations":
@@ -16124,6 +18137,10 @@ function wrapAISDK(aiSDK, options = {}) {
           );
         case "streamObject":
           return wrapStreamObject(typedAISDK.streamObject, options, typedAISDK);
+        case "embed":
+          return wrapEmbed(typedAISDK.embed, options, typedAISDK);
+        case "embedMany":
+          return wrapEmbedMany(typedAISDK.embedMany, options, typedAISDK);
         case "Agent":
         case "Experimental_Agent":
         case "ToolLoopAgent":
@@ -16224,6 +18241,44 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
     options
   );
 };
+var makeEmbedWrapper = (channel2, name, embed, contextOptions = {}, options = {}) => {
+  const wrapper = async function(allParams) {
+    const { span_info, ...params } = allParams;
+    const tracedParams = { ...params };
+    return channel2.tracePromise(
+      () => embed(tracedParams),
+      createAISDKChannelContext(tracedParams, {
+        aiSDK: contextOptions.aiSDK,
+        denyOutputPaths: options.denyOutputPaths,
+        self: contextOptions.self,
+        span_info: mergeSpanInfo(span_info, {
+          name,
+          spanType: contextOptions.spanType
+        })
+      })
+    );
+  };
+  Object.defineProperty(wrapper, "name", { value: name, writable: false });
+  return wrapper;
+};
+var wrapEmbed = (embed, options = {}, aiSDK) => {
+  return makeEmbedWrapper(
+    aiSDKChannels.embed,
+    "embed",
+    embed,
+    { aiSDK },
+    options
+  );
+};
+var wrapEmbedMany = (embedMany, options = {}, aiSDK) => {
+  return makeEmbedWrapper(
+    aiSDKChannels.embedMany,
+    "embedMany",
+    embedMany,
+    { aiSDK },
+    options
+  );
+};
 var makeStreamWrapper = (channel2, name, streamText, contextOptions = {}, options = {}) => {
   const wrapper = function(allParams) {
     const { span_info, ...params } = allParams;
@@ -16578,14 +18633,14 @@ function extractModelFromResult(result) {
 function extractModelFromWrapGenerateCallback(model) {
   return model?.modelId;
 }
-function camelToSnake2(str) {
+function camelToSnake4(str) {
   return str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
 function extractModelParameters(params, excludeKeys) {
   const modelParams = {};
   for (const [key, value] of Object.entries(params)) {
     if (value !== void 0 && !excludeKeys.has(key)) {
-      const snakeKey = camelToSnake2(key);
+      const snakeKey = camelToSnake4(key);
       modelParams[snakeKey] = value;
     }
   }
@@ -16963,20 +19018,80 @@ function wrapClaudeAgentQuery(queryFn, defaultThis) {
   const proxy = new Proxy(queryFn, {
     apply(target, thisArg, argArray) {
       const params = argArray[0] ?? {};
+      const wrappedParams = {
+        ...params,
+        options: {
+          ...params.options ?? {},
+          [CLAUDE_AGENT_SDK_SKIP_LOCAL_TOOL_HOOKS_OPTION]: true
+        }
+      };
       const invocationTarget = thisArg === proxy || thisArg === void 0 ? defaultThis ?? thisArg : thisArg;
       return claudeAgentSDKChannels.query.traceSync(
-        // Async iterator shenanigans are handled purely in the plugin which consumes this channel emission.
-        () => Reflect.apply(target, invocationTarget, [params]),
+        () => Reflect.apply(target, invocationTarget, [wrappedParams]),
         // The channel carries no extra context fields, but the generated
         // StartOf<> type for Record<string, never> is overly strict here.
-        { arguments: [params] }
+        { arguments: [wrappedParams] }
+      );
+    }
+  });
+  return proxy;
+}
+function wrapClaudeAgentTool(toolFn, localToolMetadataByTool, defaultThis) {
+  const proxy = new Proxy(toolFn, {
+    apply(target, thisArg, argArray) {
+      const invocationTarget = thisArg === proxy || thisArg === void 0 ? defaultThis ?? thisArg : thisArg;
+      const wrappedArgs = [...argArray];
+      const toolName = wrappedArgs[0];
+      let handlerIndex = -1;
+      for (let i = wrappedArgs.length - 1; i >= 0; i -= 1) {
+        if (typeof wrappedArgs[i] === "function") {
+          handlerIndex = i;
+          break;
+        }
+      }
+      if (typeof toolName !== "string" || handlerIndex === -1) {
+        return Reflect.apply(target, invocationTarget, wrappedArgs);
+      }
+      const localToolMetadata = { toolName };
+      const originalHandler = wrappedArgs[handlerIndex];
+      wrappedArgs[handlerIndex] = wrapLocalClaudeToolHandler(
+        originalHandler,
+        () => localToolMetadata
       );
+      const wrappedTool = Reflect.apply(target, invocationTarget, wrappedArgs);
+      if (wrappedTool && typeof wrappedTool === "object") {
+        localToolMetadataByTool.set(wrappedTool, localToolMetadata);
+      }
+      return wrappedTool;
+    }
+  });
+  return proxy;
+}
+function wrapCreateSdkMcpServer(createSdkMcpServerFn, localToolMetadataByTool, defaultThis) {
+  const proxy = new Proxy(createSdkMcpServerFn, {
+    apply(target, thisArg, argArray) {
+      const invocationTarget = thisArg === proxy || thisArg === void 0 ? defaultThis ?? thisArg : thisArg;
+      const config = argArray[0];
+      const serverName = config?.name;
+      if (typeof serverName === "string" && Array.isArray(config?.tools)) {
+        for (const tool of config.tools) {
+          if (!tool || typeof tool !== "object") {
+            continue;
+          }
+          const metadata = localToolMetadataByTool.get(tool);
+          if (metadata) {
+            metadata.serverName = serverName;
+          }
+        }
+      }
+      return Reflect.apply(target, invocationTarget, argArray);
     }
   });
   return proxy;
 }
 function claudeAgentSDKProxy(sdk) {
   const cache = /* @__PURE__ */ new Map();
+  const localToolMetadataByTool = /* @__PURE__ */ new WeakMap();
   return new Proxy(sdk, {
     get(target, prop, receiver) {
       if (cache.has(prop)) {
@@ -16988,6 +19103,24 @@ function claudeAgentSDKProxy(sdk) {
         cache.set(prop, wrappedQuery);
         return wrappedQuery;
       }
+      if (prop === "tool" && typeof value === "function") {
+        const wrappedTool = wrapClaudeAgentTool(
+          target.tool,
+          localToolMetadataByTool,
+          target
+        );
+        cache.set(prop, wrappedTool);
+        return wrappedTool;
+      }
+      if (prop === "createSdkMcpServer" && typeof value === "function") {
+        const wrappedCreateSdkMcpServer = wrapCreateSdkMcpServer(
+          value,
+          localToolMetadataByTool,
+          target
+        );
+        cache.set(prop, wrappedCreateSdkMcpServer);
+        return wrappedCreateSdkMcpServer;
+      }
       if (typeof value === "function") {
         const bound = value.bind(target);
         cache.set(prop, bound);
@@ -17073,6 +19206,62 @@ function wrapGenerateContentStream(original) {
   };
 }
 
+// src/wrappers/openrouter-agent.ts
+function wrapOpenRouterAgent(agent) {
+  const candidate = agent;
+  if (candidate && typeof candidate === "object" && "callModel" in candidate && typeof candidate.callModel === "function") {
+    return openRouterAgentProxy(candidate);
+  }
+  console.warn("Unsupported OpenRouter Agent library. Not wrapping.");
+  return agent;
+}
+function openRouterAgentProxy(agent) {
+  const cache = /* @__PURE__ */ new Map();
+  return new Proxy(agent, {
+    get(target, prop, receiver) {
+      if (cache.has(prop)) {
+        return cache.get(prop);
+      }
+      const value = Reflect.get(target, prop, receiver);
+      if (prop === "callModel" && typeof value === "function") {
+        const wrapped = wrapCallModel(
+          value,
+          target
+        );
+        cache.set(prop, wrapped);
+        return wrapped;
+      }
+      if (typeof value === "function") {
+        const bound = value.bind(target);
+        cache.set(prop, bound);
+        return bound;
+      }
+      return value;
+    }
+  });
+}
+function wrapCallModel(callModelFn, defaultThis) {
+  return new Proxy(callModelFn, {
+    apply(target, thisArg, argArray) {
+      const request = cloneCallModelRequest(argArray[0]);
+      const options = argArray[1];
+      const invocationTarget = thisArg === void 0 ? defaultThis ?? thisArg : thisArg;
+      return openRouterAgentChannels.callModel.traceSync(
+        () => Reflect.apply(target, invocationTarget, [request, options]),
+        {
+          arguments: [request]
+        }
+      );
+    }
+  });
+}
+function cloneCallModelRequest(request) {
+  if (!request || typeof request !== "object") {
+    return request;
+  }
+  return { ...request };
+}
+
 // src/wrappers/openrouter.ts
 function wrapOpenRouter(openrouter) {
   const or = openrouter;
@@ -17093,7 +19282,7 @@ function openRouterProxy(openrouter) {
         case "beta":
           return target.beta ? betaProxy2(target.beta) : target.beta;
         case "callModel":
-          return typeof target.callModel === "function" ? wrapCallModel(target.callModel.bind(target)) : target.callModel;
+          return typeof target.callModel === "function" ? wrapCallModel2(target.callModel.bind(target)) : target.callModel;
         default:
           return Reflect.get(target, prop, receiver);
       }
@@ -17157,7 +19346,7 @@ function wrapResponsesSend(send) {
     { arguments: [request] }
   );
 }
-function wrapCallModel(callModel) {
+function wrapCallModel2(callModel) {
   return (request, options) => {
     const tracedRequest = { ...request };
     return openRouterChannels.callModel.traceSync(
@@ -17169,6 +19358,148 @@ function wrapCallModel(callModel) {
   };
 }
 
+// src/wrappers/mistral.ts
+function wrapMistral(mistral) {
+  if (isSupportedMistralClient(mistral)) {
+    return mistralProxy(mistral);
+  }
+  console.warn("Unsupported Mistral library. Not wrapping.");
+  return mistral;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function hasFunction(value, methodName) {
+  return isRecord(value) && methodName in value && typeof value[methodName] === "function";
+}
+function isSupportedMistralClient(value) {
+  if (!isRecord(value)) {
+    return false;
+  }
+  return value.chat !== void 0 && hasChat(value.chat) || value.embeddings !== void 0 && hasEmbeddings(value.embeddings) || value.fim !== void 0 && hasFim(value.fim) || value.agents !== void 0 && hasAgents(value.agents);
+}
+function hasChat(value) {
+  return hasFunction(value, "complete") && hasFunction(value, "stream");
+}
+function hasEmbeddings(value) {
+  return hasFunction(value, "create");
+}
+function hasFim(value) {
+  return hasFunction(value, "complete") && hasFunction(value, "stream");
+}
+function hasAgents(value) {
+  return hasFunction(value, "complete") && hasFunction(value, "stream");
+}
+function mistralProxy(mistral) {
+  return new Proxy(mistral, {
+    get(target, prop, receiver) {
+      switch (prop) {
+        case "chat":
+          return target.chat ? chatProxy2(target.chat) : target.chat;
+        case "fim":
+          return target.fim ? fimProxy(target.fim) : target.fim;
+        case "agents":
+          return target.agents ? agentsProxy(target.agents) : target.agents;
+        case "embeddings":
+          return target.embeddings ? embeddingsProxy2(target.embeddings) : target.embeddings;
+        default:
+          return Reflect.get(target, prop, receiver);
+      }
+    }
+  });
+}
+function chatProxy2(chat) {
+  return new Proxy(chat, {
+    get(target, prop, receiver) {
+      if (prop === "complete") {
+        return wrapChatComplete(target.complete.bind(target));
+      }
+      if (prop === "stream") {
+        return wrapChatStream(target.stream.bind(target));
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function embeddingsProxy2(embeddings) {
+  return new Proxy(embeddings, {
+    get(target, prop, receiver) {
+      if (prop === "create") {
+        return wrapEmbeddingsCreate(target.create.bind(target));
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function fimProxy(fim) {
+  return new Proxy(fim, {
+    get(target, prop, receiver) {
+      if (prop === "complete") {
+        return wrapFimComplete(target.complete.bind(target));
+      }
+      if (prop === "stream") {
+        return wrapFimStream(target.stream.bind(target));
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function agentsProxy(agents) {
+  return new Proxy(agents, {
+    get(target, prop, receiver) {
+      if (prop === "complete") {
+        return wrapAgentsComplete(target.complete.bind(target));
+      }
+      if (prop === "stream") {
+        return wrapAgentsStream(target.stream.bind(target));
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function wrapChatComplete(complete) {
+  return (request, options) => mistralChannels.chatComplete.tracePromise(
+    () => complete(request, options),
+    {
+      arguments: [request]
+    }
+  );
+}
+function wrapChatStream(stream) {
+  return (request, options) => mistralChannels.chatStream.tracePromise(() => stream(request, options), {
+    arguments: [request]
+  });
+}
+function wrapEmbeddingsCreate(create) {
+  return (request, options) => mistralChannels.embeddingsCreate.tracePromise(
+    () => create(request, options),
+    { arguments: [request] }
+  );
+}
+function wrapFimComplete(complete) {
+  return (request, options) => mistralChannels.fimComplete.tracePromise(() => complete(request, options), {
+    arguments: [request]
+  });
+}
+function wrapFimStream(stream) {
+  return (request, options) => mistralChannels.fimStream.tracePromise(() => stream(request, options), {
+    arguments: [request]
+  });
+}
+function wrapAgentsComplete(complete) {
+  return (request, options) => mistralChannels.agentsComplete.tracePromise(
+    () => complete(request, options),
+    {
+      arguments: [request]
+    }
+  );
+}
+function wrapAgentsStream(stream) {
+  return (request, options) => mistralChannels.agentsStream.tracePromise(() => stream(request, options), {
+    arguments: [request]
+  });
+}
+
 // src/wrappers/vitest/context-manager.ts
 var VitestContextManager = class {
   /**
@@ -18139,7 +20470,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) {
@@ -18189,7 +20520,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 = {};
@@ -18237,7 +20568,7 @@ function createObjectIterator(obj) {
   };
 }
 function createIterator(coll) {
-  if (isArrayLike2(coll)) {
+  if (isArrayLike4(coll)) {
     return createArrayIterator(coll);
   }
   var iterator = getIterator(coll);
@@ -18311,7 +20642,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);
@@ -18383,7 +20714,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);
@@ -18898,7 +21229,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) {
@@ -18973,7 +21304,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) {
@@ -19599,7 +21930,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) {
@@ -19823,7 +22154,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)) {
@@ -20882,7 +23213,7 @@ var parametersContainerSchema = import_v313.z.object({
 var staticParametersContainerSchema = import_v313.z.object({
   type: import_v313.z.literal("braintrust.staticParameters"),
   schema: staticParametersSchema,
-  source: import_v313.z.null()
+  source: import_v313.z.null().nullish()
 });
 var serializedParametersContainerSchema = import_v313.z.union([
   parametersContainerSchema,