braintrust 3.4.0 → 3.6.0

package/dist/browser.js

@@ -161,6 +161,7 @@ __export(browser_exports, {
   wrapMastraAgent: () => wrapMastraAgent,
   wrapOpenAI: () => wrapOpenAI,
   wrapOpenAIv4: () => wrapOpenAIv4,
+  wrapOpenRouter: () => wrapOpenRouter,
   wrapTraced: () => wrapTraced,
   wrapVitest: () => wrapVitest
 });
@@ -182,8 +183,54 @@ var DefaultAsyncLocalStorage = class {
     return void 0;
   }
 };
-var DefaultTracingChannel = class {
+var DefaultChannel = class {
+  constructor(name) {
+    this.name = name;
+  }
   hasSubscribers = false;
+  subscribe(_subscription) {
+  }
+  unsubscribe(_subscription) {
+    return false;
+  }
+  bindStore(_store, _transform) {
+  }
+  unbindStore(_store) {
+    return false;
+  }
+  publish(_message) {
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  runStores(_message, fn, thisArg, ...args) {
+    return fn.apply(thisArg, args);
+  }
+};
+var DefaultTracingChannel = class {
+  start;
+  end;
+  asyncStart;
+  asyncEnd;
+  error;
+  constructor(nameOrChannels) {
+    if (typeof nameOrChannels === "string") {
+      this.start = new DefaultChannel(`tracing:${nameOrChannels}:start`);
+      this.end = new DefaultChannel(`tracing:${nameOrChannels}:end`);
+      this.asyncStart = new DefaultChannel(
+        `tracing:${nameOrChannels}:asyncStart`
+      );
+      this.asyncEnd = new DefaultChannel(`tracing:${nameOrChannels}:asyncEnd`);
+      this.error = new DefaultChannel(`tracing:${nameOrChannels}:error`);
+      return;
+    }
+    this.start = nameOrChannels.start ?? new DefaultChannel("tracing:start");
+    this.end = nameOrChannels.end ?? new DefaultChannel("tracing:end");
+    this.asyncStart = nameOrChannels.asyncStart ?? new DefaultChannel("tracing:asyncStart");
+    this.asyncEnd = nameOrChannels.asyncEnd ?? new DefaultChannel("tracing:asyncEnd");
+    this.error = nameOrChannels.error ?? new DefaultChannel("tracing:error");
+  }
+  get hasSubscribers() {
+    return this.start.hasSubscribers || this.end.hasSubscribers || this.asyncStart.hasSubscribers || this.asyncEnd.hasSubscribers || this.error.hasSubscribers;
+  }
   subscribe(_handlers) {
   }
   unsubscribe(_handlers) {
@@ -211,7 +258,7 @@ var iso = {
   getCallerLocation: () => void 0,
   newAsyncLocalStorage: () => new DefaultAsyncLocalStorage(),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  newTracingChannel: (_nameOrChannels) => new DefaultTracingChannel(),
+  newTracingChannel: (nameOrChannels) => new DefaultTracingChannel(nameOrChannels),
   processOn: (_0, _1) => {
   },
   basename: (filepath) => filepath.split(/[\\/]/).pop() || filepath,
@@ -2278,6 +2325,8 @@ var Experiment = import_v36.z.object({
   deleted_at: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   dataset_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   dataset_version: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  parameters_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  parameters_version: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   public: import_v36.z.boolean(),
   user_id: import_v36.z.union([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(),
@@ -2300,7 +2349,11 @@ var SpanType = import_v36.z.union([
   import_v36.z.null()
 ]);
 var SpanAttributes = import_v36.z.union([
-  import_v36.z.object({ name: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]), type: SpanType }).partial().passthrough(),
+  import_v36.z.object({
+    name: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]),
+    type: SpanType,
+    purpose: import_v36.z.union([import_v36.z.literal("scorer"), import_v36.z.null()])
+  }).partial().passthrough(),
   import_v36.z.null()
 ]);
 var ExperimentEvent = import_v36.z.object({
@@ -2740,6 +2793,7 @@ var FunctionId = import_v36.z.union([
       version: import_v36.z.string()
     }),
     code: import_v36.z.string(),
+    function_type: FunctionTypeEnum.and(import_v36.z.unknown()).optional(),
     name: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional()
   }),
   import_v36.z.object({
@@ -2969,7 +3023,12 @@ var TopicAutomationConfig = import_v36.z.object({
   topic_map_functions: import_v36.z.array(TopicMapFunctionAutomation),
   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()
+  btql_filter: import_v36.z.union([import_v36.z.string(), 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() }),
+    import_v36.z.null()
+  ]).optional()
 });
 var ProjectAutomation = import_v36.z.object({
   id: import_v36.z.string().uuid(),
@@ -4390,6 +4449,9 @@ var BRAINTRUST_ATTACHMENT = BraintrustAttachmentReference.shape.type.value;
 var EXTERNAL_ATTACHMENT = ExternalAttachmentReference.shape.type.value;
 var LOGS3_OVERFLOW_REFERENCE_TYPE = "logs3_overflow";
 var BRAINTRUST_PARAMS = Object.keys(BraintrustModelParams.shape);
+var RESET_CONTEXT_MANAGER_STATE = Symbol.for(
+  "braintrust.resetContextManagerState"
+);
 var DEFAULT_MAX_REQUEST_SIZE = 6 * 1024 * 1024;
 var parametersRowSchema = import_v38.z.object({
   id: import_v38.z.string().uuid(),
@@ -4406,6 +4468,12 @@ var parametersRowSchema = import_v38.z.object({
   }),
   metadata: import_v38.z.union([import_v38.z.object({}).partial().passthrough(), import_v38.z.null()]).optional()
 });
+var InlineAttachmentReferenceSchema = import_v38.z.object({
+  type: import_v38.z.literal("inline_attachment"),
+  src: import_v38.z.string().min(1),
+  content_type: import_v38.z.string().optional(),
+  filename: import_v38.z.string().optional()
+});
 var LoginInvalidOrgError = class extends Error {
   constructor(message) {
     super(message);
@@ -4446,13 +4514,18 @@ function applyMaskingToField(maskingFunction, data, fieldName) {
     return `ERROR: Failed to mask field '${fieldName}' - ${errorType}`;
   }
 }
+var BRAINTRUST_CURRENT_SPAN_STORE = Symbol.for(
+  "braintrust.currentSpanStore"
+);
 var ContextManager = class {
 };
 var BraintrustContextManager = class extends ContextManager {
   _currentSpan;
+  [BRAINTRUST_CURRENT_SPAN_STORE];
   constructor() {
     super();
     this._currentSpan = isomorph_default.newAsyncLocalStorage();
+    this[BRAINTRUST_CURRENT_SPAN_STORE] = this._currentSpan;
   }
   getParentSpanIds() {
     const currentSpan2 = this._currentSpan.getStore();
@@ -4659,6 +4732,9 @@ var BraintrustState = class _BraintrustState {
   resetIdGenState() {
     this._idGenerator = null;
   }
+  [RESET_CONTEXT_MANAGER_STATE]() {
+    this._contextManager = null;
+  }
   get idGenerator() {
     if (this._idGenerator === null) {
       this._idGenerator = getIdGenerator();
@@ -6607,6 +6683,7 @@ function init(projectOrOptions, optionalOptions) {
     experiment,
     description,
     dataset,
+    parameters,
     baseExperiment,
     isPublic,
     open,
@@ -6724,6 +6801,17 @@ function init(projectOrOptions, optionalOptions) {
           args["dataset_version"] = await dataset.version();
         }
       }
+      if (parameters !== void 0) {
+        if (RemoteEvalParameters.isParameters(parameters)) {
+          args["parameters_id"] = parameters.id;
+          args["parameters_version"] = parameters.version;
+        } else {
+          args["parameters_id"] = parameters.id;
+          if (parameters.version !== void 0) {
+            args["parameters_version"] = parameters.version;
+          }
+        }
+      }
       if (isPublic !== void 0) {
         args["public"] = isPublic;
       }
@@ -6982,11 +7070,7 @@ async function loadPrompt({
   forceLogin,
   state: stateArg
 }) {
-  if (version && environment) {
-    throw new Error(
-      "Cannot specify both 'version' and 'environment' parameters. Please use only one (remove the other)."
-    );
-  }
+  const versionOrEnvironment = version ? { version } : environment ? { environment } : {};
   if (id) {
   } else if (isEmpty2(projectName) && isEmpty2(projectId)) {
     throw new Error("Must specify either projectName or projectId");
@@ -7004,10 +7088,7 @@ async function loadPrompt({
       forceLogin
     });
     if (id) {
-      response = await state.apiConn().get_json(`v1/prompt/${id}`, {
-        ...version && { version },
-        ...environment && { environment }
-      });
+      response = await state.apiConn().get_json(`v1/prompt/${id}`, versionOrEnvironment);
       if (response) {
         response = { objects: [response] };
       }
@@ -7016,12 +7097,11 @@ async function loadPrompt({
         project_name: projectName,
         project_id: projectId,
         slug,
-        version,
-        ...environment && { environment }
+        ...versionOrEnvironment
       });
     }
   } catch (e) {
-    if (environment || version) {
+    if (version || environment) {
       throw new Error(`Prompt not found with specified parameters: ${e}`);
     }
     debugLogger.forState(state).warn("Failed to load prompt, attempting to fall back to cache:", e);
@@ -7099,11 +7179,7 @@ async function loadParameters({
   forceLogin,
   state: stateArg
 }) {
-  if (version && environment) {
-    throw new Error(
-      "Cannot specify both 'version' and 'environment' parameters. Please use only one (remove the other)."
-    );
-  }
+  const versionOrEnvironment = version ? { version } : environment ? { environment } : {};
   if (id) {
   } else if (isEmpty2(projectName) && isEmpty2(projectId)) {
     throw new Error("Must specify either projectName or projectId");
@@ -7122,8 +7198,7 @@ async function loadParameters({
     });
     if (id) {
       response = await state.apiConn().get_json(`v1/function/${id}`, {
-        ...version && { version },
-        ...environment && { environment }
+        ...versionOrEnvironment
       });
       if (response) {
         response = { objects: [response] };
@@ -7133,13 +7208,12 @@ async function loadParameters({
         project_name: projectName,
         project_id: projectId,
         slug,
-        version,
         function_type: "parameters",
-        ...environment && { environment }
+        ...versionOrEnvironment
       });
     }
   } catch (e) {
-    if (environment || version) {
+    if (version || environment) {
       throw new Error(`Parameters not found with specified parameters: ${e}`);
     }
     debugLogger.forState(state).warn("Failed to load parameters, attempting to fall back to cache:", e);
@@ -8922,40 +8996,85 @@ var Dataset2 = class extends ObjectFetcher {
     return typeof data === "object" && data !== null && "__braintrust_dataset_marker" in data;
   }
 };
+function isAttachmentObject(value) {
+  return BraintrustAttachmentReference.safeParse(value).success || InlineAttachmentReferenceSchema.safeParse(value).success || ExternalAttachmentReference.safeParse(value).success;
+}
+function isURL(url) {
+  try {
+    const parsedUrl = new URL(url.trim());
+    return parsedUrl.protocol === "http:" || parsedUrl.protocol === "https:";
+  } catch {
+    return false;
+  }
+}
+function expandAttachmentArrayPreTemplate(content, variables) {
+  if (typeof content !== "string") return null;
+  const match = content.match(/^\{\{\s*([\w.]+)\s*\}\}$/);
+  if (!match) return null;
+  const varPath = match[1];
+  const value = varPath.includes(".") ? getObjValueByPath(variables, varPath.split(".")) : variables[varPath];
+  if (!Array.isArray(value)) return null;
+  const allValid = value.every(
+    (v) => isAttachmentObject(v) || typeof v === "string" && isURL(v)
+  );
+  if (!allValid) return null;
+  return value.map((item) => ({
+    type: "image_url",
+    image_url: { url: item }
+  }));
+}
 function renderMessage(render, message) {
+  return renderMessageImpl(render, message, {});
+}
+function renderMessageImpl(render, message, variables) {
   return {
     ...message,
     ..."content" in message ? {
-      content: isEmpty2(message.content) ? void 0 : typeof message.content === "string" ? render(message.content) : message.content.map((c) => {
+      content: isEmpty2(message.content) ? void 0 : typeof message.content === "string" ? render(message.content) : message.content.flatMap((c) => {
         switch (c.type) {
           case "text":
-            return { ...c, text: render(c.text) };
+            return [{ ...c, text: render(c.text) }];
           case "image_url":
             if (isObject(c.image_url.url)) {
               throw new Error(
                 "Attachments must be replaced with URLs before calling `build()`"
               );
             }
-            return {
-              ...c,
-              image_url: {
-                ...c.image_url,
-                url: render(c.image_url.url)
+            if (variables) {
+              const expanded = expandAttachmentArrayPreTemplate(
+                c.image_url.url,
+                variables
+              );
+              if (expanded) {
+                return expanded;
               }
-            };
+            }
+            return [
+              {
+                ...c,
+                image_url: {
+                  ...c.image_url,
+                  url: render(c.image_url.url)
+                }
+              }
+            ];
           case "file":
-            return {
-              ...c,
-              file: {
-                file_data: render(c.file.file_data || ""),
-                ...c.file.file_id && {
-                  file_id: render(c.file.file_id)
-                },
-                ...c.file.filename && {
-                  filename: render(c.file.filename)
+            return [
+              {
+                ...c,
+                file: {
+                  ...c.file.file_data && {
+                    file_data: render(c.file.file_data)
+                  },
+                  ...c.file.file_id && {
+                    file_id: render(c.file.file_id)
+                  },
+                  ...c.file.filename && {
+                    filename: render(c.file.filename)
+                  }
                 }
               }
-            };
+            ];
           default:
             const _exhaustiveCheck = c;
             return _exhaustiveCheck;
@@ -9112,17 +9231,19 @@ var Prompt2 = class _Prompt {
   }
   runBuild(buildArgs, options) {
     const { flavor } = options;
-    const params = {
-      ...this.defaults,
-      ...Object.fromEntries(
-        Object.entries(this.options.params || {}).filter(
-          ([k, _v]) => !BRAINTRUST_PARAMS.includes(k)
-        )
-      ),
-      ...!isEmpty2(this.options.model) ? {
-        model: this.options.model
-      } : {}
-    };
+    const params = Object.fromEntries(
+      Object.entries({
+        ...this.defaults,
+        ...Object.fromEntries(
+          Object.entries(this.options.params || {}).filter(
+            ([k, _v]) => !BRAINTRUST_PARAMS.includes(k)
+          )
+        ),
+        ...!isEmpty2(this.options.model) ? {
+          model: this.options.model
+        } : {}
+      }).filter(([key, value]) => key !== "response_format" || value !== null)
+    );
     if (!("model" in params) || isEmpty2(params.model)) {
       throw new Error(
         "No model specified. Either specify it in the prompt or as a default"
@@ -9222,7 +9343,7 @@ var Prompt2 = class _Prompt {
         templateFormat
       });
       const baseMessages = (prompt.messages || []).map(
-        (m) => renderMessage(render, m)
+        (m) => renderMessageImpl(render, m, variables)
       );
       const hasSystemPrompt = baseMessages.some((m) => m.role === "system");
       const messages = [
@@ -9342,6 +9463,8 @@ async function simulateLoginForTests() {
 function simulateLogoutForTests() {
   const state = _internalGetGlobalState();
   state.resetLoginInfo();
+  state.resetIdGenState();
+  state[RESET_CONTEXT_MANAGER_STATE]();
   state.appUrl = "https://www.braintrust.dev";
   return state;
 }
@@ -9941,7 +10064,11 @@ function startSpanForEvent(config, event, channelName) {
   });
   const startTime = getCurrentUnixTimestamp();
   try {
-    const { input, metadata } = config.extractInput(event.arguments);
+    const { input, metadata } = config.extractInput(
+      event.arguments,
+      event,
+      span
+    );
     span.log({
       input,
       metadata: mergeInputMetadata(metadata, spanInfoMetadata)
@@ -9951,6 +10078,36 @@ function startSpanForEvent(config, event, channelName) {
   }
   return { span, startTime };
 }
+function ensureSpanStateForEvent(states, config, event, channelName) {
+  const key = event;
+  const existing = states.get(key);
+  if (existing) {
+    return existing;
+  }
+  const created = startSpanForEvent(config, event, channelName);
+  states.set(key, created);
+  return created;
+}
+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;
+  if (!currentSpanStore || !startChannel) {
+    return void 0;
+  }
+  startChannel.bindStore(
+    currentSpanStore,
+    (event) => ensureSpanStateForEvent(
+      states,
+      config,
+      event,
+      channelName
+    ).span
+  );
+  return () => {
+    startChannel.unbindStore(currentSpanStore);
+  };
+}
 function logErrorAndEnd(states, event) {
   const spanData = states.get(event);
   if (!spanData) {
@@ -9966,15 +10123,19 @@ function traceAsyncChannel(channel2, config) {
   const tracingChannel2 = channel2.tracingChannel();
   const states = /* @__PURE__ */ new WeakMap();
   const channelName = channel2.channelName;
+  const unbindCurrentSpanStore = bindCurrentSpanStoreToStart(
+    tracingChannel2,
+    states,
+    config,
+    channelName
+  );
   const handlers = {
     start: (event) => {
-      states.set(
+      ensureSpanStateForEvent(
+        states,
+        config,
         event,
-        startSpanForEvent(
-          config,
-          event,
-          channelName
-        )
+        channelName
       );
     },
     asyncEnd: (event) => {
@@ -10016,6 +10177,7 @@ function traceAsyncChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    unbindCurrentSpanStore?.();
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -10023,15 +10185,19 @@ function traceStreamingChannel(channel2, config) {
   const tracingChannel2 = channel2.tracingChannel();
   const states = /* @__PURE__ */ new WeakMap();
   const channelName = channel2.channelName;
+  const unbindCurrentSpanStore = bindCurrentSpanStoreToStart(
+    tracingChannel2,
+    states,
+    config,
+    channelName
+  );
   const handlers = {
     start: (event) => {
-      states.set(
+      ensureSpanStateForEvent(
+        states,
+        config,
         event,
-        startSpanForEvent(
-          config,
-          event,
-          channelName
-        )
+        channelName
       );
     },
     asyncEnd: (event) => {
@@ -10105,6 +10271,16 @@ function traceStreamingChannel(channel2, config) {
         });
         return;
       }
+      if (config.patchResult?.({
+        channelName,
+        endEvent: asyncEndEvent,
+        result: asyncEndEvent.result,
+        span,
+        startTime
+      })) {
+        states.delete(event);
+        return;
+      }
       try {
         const output = config.extractOutput(
           asyncEndEvent.result,
@@ -10137,6 +10313,7 @@ function traceStreamingChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    unbindCurrentSpanStore?.();
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -10144,15 +10321,19 @@ function traceSyncStreamChannel(channel2, config) {
   const tracingChannel2 = channel2.tracingChannel();
   const states = /* @__PURE__ */ new WeakMap();
   const channelName = channel2.channelName;
+  const unbindCurrentSpanStore = bindCurrentSpanStoreToStart(
+    tracingChannel2,
+    states,
+    config,
+    channelName
+  );
   const handlers = {
     start: (event) => {
-      states.set(
+      ensureSpanStateForEvent(
+        states,
+        config,
         event,
-        startSpanForEvent(
-          config,
-          event,
-          channelName
-        )
+        channelName
       );
     },
     end: (event) => {
@@ -10161,8 +10342,17 @@ function traceSyncStreamChannel(channel2, config) {
         return;
       }
       const { span, startTime } = spanData;
-      const resultEvent = event;
-      const stream = resultEvent.result;
+      const endEvent = event;
+      if (config.patchResult?.({
+        channelName,
+        endEvent,
+        result: endEvent.result,
+        span,
+        startTime
+      })) {
+        return;
+      }
+      const stream = endEvent.result;
       if (!isSyncStreamLike(stream)) {
         span.end();
         states.delete(event);
@@ -10232,6 +10422,7 @@ function traceSyncStreamChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    unbindCurrentSpanStore?.();
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -11133,6 +11324,108 @@ function filterFrom2(obj, fieldsToRemove) {
   return result;
 }
 
+// src/wrappers/ai-sdk/normalize-logged-output.ts
+var REMOVE_NORMALIZED_VALUE = Symbol("braintrust.ai-sdk.remove-normalized");
+function normalizeAISDKLoggedOutput(value) {
+  const normalized = normalizeAISDKLoggedValue(value);
+  return normalized === REMOVE_NORMALIZED_VALUE ? {} : normalized;
+}
+function normalizeAISDKLoggedValue(value, context = {}) {
+  if (Array.isArray(value)) {
+    return value.map((entry) => normalizeAISDKLoggedValue(entry, context)).filter((entry) => entry !== REMOVE_NORMALIZED_VALUE);
+  }
+  if (!value || typeof value !== "object") {
+    return value;
+  }
+  const nextInProviderMetadata = context.inProviderMetadata || context.parentKey === "providerMetadata" || context.parentKey === "experimental_providerMetadata";
+  const normalizedEntries = [];
+  for (const [key, entry] of Object.entries(value)) {
+    if (key === "cachedPromptTokens" && entry === 0) {
+      continue;
+    }
+    if (context.parentKey === "request" && key === "body" && entry === "<omitted>") {
+      continue;
+    }
+    const normalizedEntry = normalizeAISDKLoggedValue(entry, {
+      inProviderMetadata: nextInProviderMetadata,
+      parentKey: key
+    });
+    if (normalizedEntry === REMOVE_NORMALIZED_VALUE) {
+      continue;
+    }
+    normalizedEntries.push([key, normalizedEntry]);
+  }
+  if (normalizedEntries.length === 0) {
+    if (context.parentKey === "request" || nextInProviderMetadata) {
+      return REMOVE_NORMALIZED_VALUE;
+    }
+    return {};
+  }
+  return Object.fromEntries(normalizedEntries);
+}
+
+// src/zod/utils.ts
+var import_zod_to_json_schema = require("zod-to-json-schema");
+var z42 = __toESM(require("zod/v4"));
+function isZodV4(zodObject) {
+  return typeof zodObject === "object" && zodObject !== null && "_zod" in zodObject && zodObject._zod !== void 0;
+}
+function zodToJsonSchema(schema) {
+  if (isZodV4(schema)) {
+    return z42.toJSONSchema(schema, {
+      target: "draft-7"
+    });
+  }
+  return (0, import_zod_to_json_schema.zodToJsonSchema)(schema);
+}
+
+// src/wrappers/ai-sdk/tool-serialization.ts
+function isZodSchema(value) {
+  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
+}
+function serializeZodSchema(schema) {
+  try {
+    return zodToJsonSchema(schema);
+  } catch {
+    return {
+      type: "object",
+      description: "Zod schema (conversion failed)"
+    };
+  }
+}
+function serializeTool(tool) {
+  if (!tool || typeof tool !== "object") {
+    return tool;
+  }
+  const serialized = { ...tool };
+  if (isZodSchema(serialized.inputSchema)) {
+    serialized.inputSchema = serializeZodSchema(serialized.inputSchema);
+  }
+  if (isZodSchema(serialized.parameters)) {
+    serialized.parameters = serializeZodSchema(serialized.parameters);
+  }
+  if ("execute" in serialized) {
+    delete serialized.execute;
+  }
+  if ("render" in serialized) {
+    delete serialized.render;
+  }
+  return serialized;
+}
+function serializeAISDKToolsForLogging(tools) {
+  if (!tools || typeof tools !== "object") {
+    return tools;
+  }
+  if (Array.isArray(tools)) {
+    return tools.map(serializeTool);
+  }
+  const serialized = {};
+  for (const [key, tool] of Object.entries(tools)) {
+    serialized[key] = serializeTool(tool);
+  }
+  return serialized;
+}
+
 // src/instrumentation/plugins/ai-sdk-channels.ts
 var aiSDKChannels = defineChannels("ai", {
   generateText: channel({
@@ -11143,6 +11436,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamText",
     kind: "async"
   }),
+  streamTextSync: channel({
+    channelName: "streamText.sync",
+    kind: "sync-stream"
+  }),
   generateObject: channel({
     channelName: "generateObject",
     kind: "async"
@@ -11151,6 +11448,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamObject",
     kind: "async"
   }),
+  streamObjectSync: channel({
+    channelName: "streamObject.sync",
+    kind: "sync-stream"
+  }),
   agentGenerate: channel({
     channelName: "Agent.generate",
     kind: "async"
@@ -11158,6 +11459,14 @@ var aiSDKChannels = defineChannels("ai", {
   agentStream: channel({
     channelName: "Agent.stream",
     kind: "async"
+  }),
+  toolLoopAgentGenerate: channel({
+    channelName: "ToolLoopAgent.generate",
+    kind: "async"
+  }),
+  toolLoopAgentStream: channel({
+    channelName: "ToolLoopAgent.stream",
+    kind: "async"
   })
 });
 
@@ -11176,6 +11485,8 @@ var DEFAULT_DENY_OUTPUT_PATHS = [
   "steps[].response.body",
   "steps[].response.headers"
 ];
+var AUTO_PATCHED_MODEL = Symbol.for("braintrust.ai-sdk.auto-patched-model");
+var AUTO_PATCHED_TOOL = Symbol.for("braintrust.ai-sdk.auto-patched-tool");
 var AISDKPlugin = class extends BasePlugin {
   config;
   constructor(config = {}) {
@@ -11194,22 +11505,12 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.generateText, {
         name: "generateText",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
           return processAISDKOutput(result, denyOutputPaths);
         },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
@@ -11217,45 +11518,43 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamText, {
         name: "streamText",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
-          return processAISDKOutput(result, denyOutputPaths);
-        },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
-        aggregateChunks: aggregateAISDKChunks
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(aiSDKChannels.streamTextSync, {
+        name: "streamText",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
       })
     );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.generateObject, {
         name: "generateObject",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
           return processAISDKOutput(result, denyOutputPaths);
         },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
@@ -11263,45 +11562,43 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamObject, {
         name: "streamObject",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
-          return processAISDKOutput(result, denyOutputPaths);
-        },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
-        aggregateChunks: aggregateAISDKChunks
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(aiSDKChannels.streamObjectSync, {
+        name: "streamObject",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
       })
     );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.agentGenerate, {
         name: "Agent.generate",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
           return processAISDKOutput(result, denyOutputPaths);
         },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
@@ -11309,52 +11606,470 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.agentStream, {
         name: "Agent.stream",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
-          return processAISDKOutput(result, denyOutputPaths);
-        },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(aiSDKChannels.toolLoopAgentGenerate, {
+        name: "ToolLoopAgent.generate",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
+          return processAISDKOutput(result, denyOutputPaths);
         },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
+    this.unsubscribers.push(
+      traceStreamingChannel(aiSDKChannels.toolLoopAgentStream, {
+        name: "ToolLoopAgent.stream",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
   }
 };
 function processAISDKInput(params) {
   if (!params) return params;
-  return processInputAttachments(params);
+  const input = processInputAttachments(params);
+  if (!input || typeof input !== "object" || Array.isArray(input)) {
+    return input;
+  }
+  const { tools: _tools, ...rest } = input;
+  return rest;
+}
+function prepareAISDKInput(params, event, span, denyOutputPaths) {
+  const input = processAISDKInput(params);
+  const metadata = extractMetadataFromParams(params, event.self);
+  const childTracing = prepareAISDKChildTracing(
+    params,
+    event.self,
+    span,
+    denyOutputPaths
+  );
+  event.__braintrust_ai_sdk_model_wrapped = childTracing.modelWrapped;
+  if (childTracing.cleanup) {
+    event.__braintrust_ai_sdk_cleanup = childTracing.cleanup;
+  }
+  return {
+    input,
+    metadata
+  };
+}
+function extractTopLevelAISDKMetrics(result, event, startTime) {
+  const metrics = hasModelChildTracing(event) ? {} : extractTokenMetrics(result);
+  if (startTime) {
+    metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+  }
+  return metrics;
 }
-function extractMetadataFromParams(params) {
+function hasModelChildTracing(event) {
+  return event?.__braintrust_ai_sdk_model_wrapped === true;
+}
+function extractMetadataFromParams(params, self) {
   const metadata = {
     braintrust: {
       integration_name: "ai-sdk",
       sdk_language: "typescript"
     }
   };
-  const { model, provider } = serializeModelWithProvider(params.model);
+  const agentModel = self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && self.settings?.model ? self.settings?.model : void 0;
+  const { model, provider } = serializeModelWithProvider(
+    params.model ?? agentModel
+  );
   if (model) {
     metadata.model = model;
   }
   if (provider) {
     metadata.provider = provider;
   }
+  const tools = serializeAISDKToolsForLogging(params.tools);
+  if (tools) {
+    metadata.tools = tools;
+  }
   return metadata;
 }
+function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
+  const cleanup = [];
+  const patchedModels = /* @__PURE__ */ new WeakSet();
+  const patchedTools = /* @__PURE__ */ new WeakSet();
+  let modelWrapped = false;
+  const patchModel = (model) => {
+    const resolvedModel = resolveAISDKModel(model);
+    if (!resolvedModel || typeof resolvedModel !== "object" || typeof resolvedModel.doGenerate !== "function" || patchedModels.has(resolvedModel) || resolvedModel[AUTO_PATCHED_MODEL]) {
+      return;
+    }
+    patchedModels.add(resolvedModel);
+    resolvedModel[AUTO_PATCHED_MODEL] = true;
+    modelWrapped = true;
+    const originalDoGenerate = resolvedModel.doGenerate;
+    const originalDoStream = resolvedModel.doStream;
+    const baseMetadata = buildAISDKChildMetadata(resolvedModel);
+    resolvedModel.doGenerate = async function doGeneratePatched(options) {
+      return parentSpan.traced(
+        async (span) => {
+          const result = await Reflect.apply(
+            originalDoGenerate,
+            resolvedModel,
+            [options]
+          );
+          span.log({
+            output: processAISDKOutput(result, denyOutputPaths),
+            metrics: extractTokenMetrics(result),
+            ...buildResolvedMetadataPayload(result)
+          });
+          return result;
+        },
+        {
+          name: "doGenerate",
+          spanAttributes: {
+            type: "llm" /* LLM */
+          },
+          event: {
+            input: processAISDKInput(options),
+            metadata: baseMetadata
+          }
+        }
+      );
+    };
+    if (originalDoStream) {
+      resolvedModel.doStream = async function doStreamPatched(options) {
+        const span = parentSpan.startSpan({
+          name: "doStream",
+          spanAttributes: {
+            type: "llm" /* LLM */
+          },
+          event: {
+            input: processAISDKInput(options),
+            metadata: baseMetadata
+          }
+        });
+        const result = await withCurrent(
+          span,
+          () => Reflect.apply(originalDoStream, resolvedModel, [options])
+        );
+        const output = {};
+        let text = "";
+        let reasoning = "";
+        const toolCalls = [];
+        let object = void 0;
+        const transformStream = new TransformStream({
+          transform(chunk, controller) {
+            switch (chunk.type) {
+              case "text-delta":
+                text += extractTextDelta(chunk);
+                break;
+              case "reasoning-delta":
+                if (chunk.delta) {
+                  reasoning += chunk.delta;
+                } else if (chunk.text) {
+                  reasoning += chunk.text;
+                }
+                break;
+              case "tool-call":
+                toolCalls.push(chunk);
+                break;
+              case "object":
+                object = chunk.object;
+                break;
+              case "raw":
+                if (chunk.rawValue) {
+                  const rawVal = chunk.rawValue;
+                  if (rawVal.delta?.content) {
+                    text += rawVal.delta.content;
+                  } else if (rawVal.choices?.[0]?.delta?.content) {
+                    text += rawVal.choices[0].delta.content;
+                  } else if (typeof rawVal.text === "string") {
+                    text += rawVal.text;
+                  } else if (typeof rawVal.content === "string") {
+                    text += rawVal.content;
+                  }
+                }
+                break;
+              case "finish":
+                output.text = text;
+                output.reasoning = reasoning;
+                output.toolCalls = toolCalls;
+                output.finishReason = chunk.finishReason;
+                output.usage = chunk.usage;
+                if (object !== void 0) {
+                  output.object = object;
+                }
+                span.log({
+                  output: processAISDKOutput(
+                    output,
+                    denyOutputPaths
+                  ),
+                  metrics: extractTokenMetrics(output),
+                  ...buildResolvedMetadataPayload(output)
+                });
+                span.end();
+                break;
+            }
+            controller.enqueue(chunk);
+          }
+        });
+        return {
+          ...result,
+          stream: result.stream.pipeThrough(transformStream)
+        };
+      };
+    }
+    cleanup.push(() => {
+      resolvedModel.doGenerate = originalDoGenerate;
+      if (originalDoStream) {
+        resolvedModel.doStream = originalDoStream;
+      }
+      delete resolvedModel[AUTO_PATCHED_MODEL];
+    });
+  };
+  const patchTool = (tool, name) => {
+    if (tool == null || typeof tool !== "object" || !("execute" in tool) || typeof tool.execute !== "function" || patchedTools.has(tool) || tool[AUTO_PATCHED_TOOL]) {
+      return;
+    }
+    patchedTools.add(tool);
+    tool[AUTO_PATCHED_TOOL] = true;
+    const originalExecute = tool.execute;
+    tool.execute = function executePatched(...args) {
+      const result = Reflect.apply(originalExecute, this, args);
+      if (isAsyncGenerator(result)) {
+        return (async function* () {
+          const span = parentSpan.startSpan({
+            name,
+            spanAttributes: {
+              type: "tool" /* TOOL */
+            }
+          });
+          span.log({ input: args.length === 1 ? args[0] : args });
+          try {
+            let lastValue;
+            for await (const value of result) {
+              lastValue = value;
+              yield value;
+            }
+            span.log({ output: lastValue });
+          } catch (error) {
+            span.log({
+              error: error instanceof Error ? error.message : String(error)
+            });
+            throw error;
+          } finally {
+            span.end();
+          }
+        })();
+      }
+      return parentSpan.traced(
+        async (span) => {
+          span.log({ input: args.length === 1 ? args[0] : args });
+          const awaitedResult = await result;
+          span.log({ output: awaitedResult });
+          return awaitedResult;
+        },
+        {
+          name,
+          spanAttributes: {
+            type: "tool" /* TOOL */
+          }
+        }
+      );
+    };
+    cleanup.push(() => {
+      tool.execute = originalExecute;
+      delete tool[AUTO_PATCHED_TOOL];
+    });
+  };
+  const patchTools = (tools) => {
+    if (!tools) {
+      return;
+    }
+    const inferName = (tool, fallback2) => tool && (tool.name || tool.toolName || tool.id) || fallback2;
+    if (Array.isArray(tools)) {
+      tools.forEach(
+        (tool, index) => patchTool(tool, inferName(tool, `tool[${index}]`))
+      );
+      return;
+    }
+    for (const [key, tool] of Object.entries(tools)) {
+      patchTool(tool, key);
+    }
+  };
+  if (params && typeof params === "object") {
+    patchModel(params.model);
+    patchTools(params.tools);
+  }
+  if (self && typeof self === "object") {
+    const selfRecord = self;
+    if (selfRecord.model !== void 0) {
+      patchModel(selfRecord.model);
+    }
+    if (selfRecord.settings && typeof selfRecord.settings === "object") {
+      if (selfRecord.settings.model !== void 0) {
+        patchModel(selfRecord.settings.model);
+      }
+      if (selfRecord.settings.tools !== void 0) {
+        patchTools(selfRecord.settings.tools);
+      }
+    }
+  }
+  return {
+    cleanup: cleanup.length > 0 ? () => {
+      while (cleanup.length > 0) {
+        cleanup.pop()?.();
+      }
+    } : void 0,
+    modelWrapped
+  };
+}
+function finalizeAISDKChildTracing(event) {
+  const cleanup = event?.__braintrust_ai_sdk_cleanup;
+  if (event && typeof cleanup === "function") {
+    cleanup();
+    delete event.__braintrust_ai_sdk_cleanup;
+  }
+}
+function patchAISDKStreamingResult(args) {
+  const { denyOutputPaths, endEvent, result, span, startTime } = args;
+  if (!result || typeof result !== "object") {
+    return false;
+  }
+  const resultRecord = result;
+  if (!isReadableStreamLike(resultRecord.baseStream)) {
+    return false;
+  }
+  let firstChunkTime;
+  const wrappedBaseStream = resultRecord.baseStream.pipeThrough(
+    new TransformStream({
+      transform(chunk, controller) {
+        if (firstChunkTime === void 0) {
+          firstChunkTime = getCurrentUnixTimestamp();
+        }
+        controller.enqueue(chunk);
+      },
+      async flush() {
+        const metrics = extractTopLevelAISDKMetrics(result, endEvent);
+        if (metrics.time_to_first_token === void 0 && firstChunkTime !== void 0) {
+          metrics.time_to_first_token = firstChunkTime - startTime;
+        }
+        const output = await processAISDKStreamingOutput(
+          result,
+          denyOutputPaths
+        );
+        const metadata = buildResolvedMetadataPayload(result).metadata;
+        span.log({
+          output,
+          ...metadata ? { metadata } : {},
+          metrics
+        });
+        finalizeAISDKChildTracing(endEvent);
+        span.end();
+      }
+    })
+  );
+  Object.defineProperty(resultRecord, "baseStream", {
+    configurable: true,
+    enumerable: true,
+    value: wrappedBaseStream,
+    writable: true
+  });
+  return true;
+}
+function isReadableStreamLike(value) {
+  return value != null && typeof value === "object" && typeof value.pipeThrough === "function";
+}
+async function processAISDKStreamingOutput(result, denyOutputPaths) {
+  const output = processAISDKOutput(result, denyOutputPaths);
+  if (!output || typeof output !== "object") {
+    return output;
+  }
+  const outputRecord = output;
+  try {
+    if ("text" in result && typeof result.text === "string") {
+      outputRecord.text = result.text;
+    }
+  } catch {
+  }
+  try {
+    if ("object" in result) {
+      const resolvedObject = await Promise.resolve(result.object);
+      if (resolvedObject !== void 0) {
+        outputRecord.object = resolvedObject;
+      }
+    }
+  } catch {
+  }
+  return outputRecord;
+}
+function buildAISDKChildMetadata(model) {
+  const { model: modelId, provider } = serializeModelWithProvider(model);
+  return {
+    ...modelId ? { model: modelId } : {},
+    ...provider ? { provider } : {},
+    braintrust: {
+      integration_name: "ai-sdk",
+      sdk_language: "typescript"
+    }
+  };
+}
+function buildResolvedMetadataPayload(result) {
+  const gatewayInfo = extractGatewayRoutingInfo(result);
+  const metadata = {};
+  if (gatewayInfo?.provider) {
+    metadata.provider = gatewayInfo.provider;
+  }
+  if (gatewayInfo?.model) {
+    metadata.model = gatewayInfo.model;
+  }
+  if (result.finishReason !== void 0) {
+    metadata.finish_reason = result.finishReason;
+  }
+  return Object.keys(metadata).length > 0 ? { metadata } : {};
+}
+function resolveAISDKModel(model) {
+  if (typeof model !== "string") {
+    return model;
+  }
+  const provider = globalThis.AI_SDK_DEFAULT_PROVIDER ?? null;
+  if (provider && typeof provider.languageModel === "function") {
+    return provider.languageModel(model);
+  }
+  return model;
+}
+function extractTextDelta(chunk) {
+  if (typeof chunk.textDelta === "string") return chunk.textDelta;
+  if (typeof chunk.delta === "string") return chunk.delta;
+  if (typeof chunk.text === "string") return chunk.text;
+  if (typeof chunk.content === "string") return chunk.content;
+  return "";
+}
+function isAsyncGenerator(value) {
+  return value != null && typeof value === "object" && typeof value[Symbol.asyncIterator] === "function" && typeof value.next === "function" && typeof value.return === "function" && typeof value.throw === "function";
+}
 function processAISDKOutput(output, denyOutputPaths) {
   if (!output) return output;
-  const getterValues = extractGetterValues(output);
-  const merged = { ...output, ...getterValues };
-  return omit(merged, denyOutputPaths);
+  const merged = extractSerializableOutputFields(output);
+  return normalizeAISDKLoggedOutput(omit(merged, denyOutputPaths));
 }
 function extractTokenMetrics(result) {
   const metrics = {};
@@ -11404,12 +12119,14 @@ function extractTokenMetrics(result) {
   }
   return metrics;
 }
-function aggregateAISDKChunks(chunks) {
+function aggregateAISDKChunks(chunks, _result, endEvent) {
   const lastChunk = chunks[chunks.length - 1];
   const output = {};
   let metrics = {};
+  let metadata;
   if (lastChunk) {
-    metrics = extractTokenMetrics(lastChunk);
+    metrics = hasModelChildTracing(endEvent) ? {} : extractTokenMetrics(lastChunk);
+    metadata = buildResolvedMetadataPayload(lastChunk).metadata;
     if (lastChunk.text !== void 0) {
       output.text = lastChunk.text;
     }
@@ -11423,7 +12140,8 @@ function aggregateAISDKChunks(chunks) {
       output.toolCalls = lastChunk.toolCalls;
     }
   }
-  return { output, metrics };
+  finalizeAISDKChildTracing(endEvent);
+  return { output, metrics, metadata };
 }
 function extractGetterValues(obj) {
   const getterValues = {};
@@ -11443,7 +12161,7 @@ function extractGetterValues(obj) {
   ];
   for (const name of getterNames) {
     try {
-      if (obj && name in obj && typeof obj[name] !== "function") {
+      if (obj && name in obj && isSerializableOutputValue(obj[name])) {
         getterValues[name] = obj[name];
       }
     } catch {
@@ -11451,6 +12169,47 @@ function extractGetterValues(obj) {
   }
   return getterValues;
 }
+function extractSerializableOutputFields(output) {
+  const serialized = {};
+  const directFieldNames = [
+    "steps",
+    "request",
+    "responseMessages",
+    "warnings",
+    "rawResponse",
+    "response",
+    "providerMetadata",
+    "experimental_providerMetadata"
+  ];
+  for (const name of directFieldNames) {
+    try {
+      const value = output?.[name];
+      if (isSerializableOutputValue(value)) {
+        serialized[name] = value;
+      }
+    } catch {
+    }
+  }
+  return {
+    ...serialized,
+    ...extractGetterValues(output)
+  };
+}
+function isSerializableOutputValue(value) {
+  if (typeof value === "function") {
+    return false;
+  }
+  if (value && typeof value === "object" && typeof value.then === "function") {
+    return false;
+  }
+  if (value && typeof value === "object" && typeof value.getReader === "function") {
+    return false;
+  }
+  if (value && typeof value === "object" && typeof value[Symbol.asyncIterator] === "function") {
+    return false;
+  }
+  return true;
+}
 function serializeModelWithProvider(model) {
   const modelId = typeof model === "string" ? model : model?.modelId;
   const explicitProvider = typeof model === "object" ? model?.provider : void 0;
@@ -11476,6 +12235,25 @@ function parseGatewayModelString(modelString) {
   }
   return { model: modelString };
 }
+function extractGatewayRoutingInfo(result) {
+  if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
+    const routing2 = result.steps[0]?.providerMetadata?.gateway?.routing;
+    if (routing2) {
+      return {
+        provider: routing2.resolvedProvider || routing2.finalProvider,
+        model: routing2.resolvedProviderApiModelId
+      };
+    }
+  }
+  const routing = result?.providerMetadata?.gateway?.routing;
+  if (routing) {
+    return {
+      provider: routing.resolvedProvider || routing.finalProvider,
+      model: routing.resolvedProviderApiModelId
+    };
+  }
+  return null;
+}
 function extractCostFromResult(result) {
   if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
     let totalCost = 0;
@@ -12153,57 +12931,1086 @@ function aggregateGenerateContentChunks(chunks, startTime) {
           }
         }
       }
-    }
+    }
+  }
+  const output = {};
+  const parts = [];
+  if (thoughtText) {
+    parts.push({ text: thoughtText, thought: true });
+  }
+  if (text) {
+    parts.push({ text });
+  }
+  parts.push(...otherParts);
+  if (parts.length > 0 && lastResponse?.candidates) {
+    const candidates = [];
+    for (const candidate of lastResponse.candidates) {
+      const candidateDict = {
+        content: {
+          parts,
+          role: "model"
+        }
+      };
+      if (candidate.finishReason !== void 0) {
+        candidateDict.finishReason = candidate.finishReason;
+      }
+      if (candidate.safetyRatings) {
+        candidateDict.safetyRatings = candidate.safetyRatings;
+      }
+      candidates.push(candidateDict);
+    }
+    output.candidates = candidates;
+  }
+  if (usageMetadata) {
+    output.usageMetadata = usageMetadata;
+    populateUsageMetrics(metrics, usageMetadata);
+  }
+  if (text) {
+    output.text = text;
+  }
+  return { output, metrics };
+}
+function tryToDict(obj) {
+  if (obj === null || obj === void 0) {
+    return null;
+  }
+  if (typeof obj === "object") {
+    if ("toJSON" in obj && // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    typeof obj.toJSON === "function") {
+      return obj.toJSON();
+    }
+    return 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"
+  }),
+  callModel: channel({
+    channelName: "callModel",
+    kind: "sync-stream"
+  }),
+  toolExecute: channel({
+    channelName: "tool.execute",
+    kind: "async"
+  })
+});
+
+// src/openrouter-utils.ts
+var TOKEN_NAME_MAP2 = {
+  promptTokens: "prompt_tokens",
+  inputTokens: "prompt_tokens",
+  completionTokens: "completion_tokens",
+  outputTokens: "completion_tokens",
+  totalTokens: "tokens",
+  prompt_tokens: "prompt_tokens",
+  input_tokens: "prompt_tokens",
+  completion_tokens: "completion_tokens",
+  output_tokens: "completion_tokens",
+  total_tokens: "tokens"
+};
+var TOKEN_DETAIL_PREFIX_MAP = {
+  promptTokensDetails: "prompt",
+  inputTokensDetails: "prompt",
+  completionTokensDetails: "completion",
+  outputTokensDetails: "completion",
+  costDetails: "cost",
+  prompt_tokens_details: "prompt",
+  input_tokens_details: "prompt",
+  completion_tokens_details: "completion",
+  output_tokens_details: "completion",
+  cost_details: "cost"
+};
+function camelToSnake(value) {
+  return value.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
+}
+function parseOpenRouterMetricsFromUsage(usage) {
+  if (!isObject(usage)) {
+    return {};
+  }
+  const metrics = {};
+  for (const [name, value] of Object.entries(usage)) {
+    if (typeof value === "number") {
+      metrics[TOKEN_NAME_MAP2[name] || camelToSnake(name)] = value;
+      continue;
+    }
+    if (!isObject(value)) {
+      continue;
+    }
+    const prefix = TOKEN_DETAIL_PREFIX_MAP[name];
+    if (!prefix) {
+      continue;
+    }
+    for (const [nestedName, nestedValue] of Object.entries(value)) {
+      if (typeof nestedValue !== "number") {
+        continue;
+      }
+      metrics[`${prefix}_${camelToSnake(nestedName)}`] = nestedValue;
+    }
+  }
+  return metrics;
+}
+function extractOpenRouterUsageMetadata(usage) {
+  if (!isObject(usage)) {
+    return void 0;
+  }
+  const metadata = {};
+  if (typeof usage.isByok === "boolean") {
+    metadata.is_byok = usage.isByok;
+  } else if (typeof usage.is_byok === "boolean") {
+    metadata.is_byok = usage.is_byok;
+  }
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+
+// src/openrouter-logging.ts
+var OMITTED_OPENROUTER_KEYS = /* @__PURE__ */ new Set([
+  "execute",
+  "render",
+  "nextTurnParams",
+  "requireApproval"
+]);
+function parseOpenRouterModelString(model) {
+  if (typeof model !== "string") {
+    return { model };
+  }
+  const slashIndex = model.indexOf("/");
+  if (slashIndex > 0 && slashIndex < model.length - 1) {
+    return {
+      provider: model.substring(0, slashIndex),
+      model: model.substring(slashIndex + 1)
+    };
+  }
+  return { model };
+}
+function isZodSchema2(value) {
+  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
+}
+function serializeZodSchema2(schema) {
+  try {
+    return zodToJsonSchema(schema);
+  } catch {
+    return {
+      type: "object",
+      description: "Zod schema (conversion failed)"
+    };
+  }
+}
+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 (isZodSchema2(value)) {
+    return serializeZodSchema2(value);
+  }
+  if (typeof value === "function") {
+    return "[Function]";
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => sanitizeOpenRouterLoggedValue(entry));
+  }
+  if (!isObject(value)) {
+    return value;
+  }
+  const sanitized = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (OMITTED_OPENROUTER_KEYS.has(key)) {
+      continue;
+    }
+    if (key === "tools" && Array.isArray(entry)) {
+      sanitized.tools = serializeOpenRouterToolsForLogging(entry);
+      continue;
+    }
+    sanitized[key] = sanitizeOpenRouterLoggedValue(entry);
+  }
+  return sanitized;
+}
+function buildOpenRouterMetadata(metadata, httpReferer, xTitle) {
+  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider: providerRouting, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString(model);
+  return {
+    ...rest,
+    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
+    ...providerRouting !== void 0 ? { providerRouting } : {},
+    ...httpReferer !== void 0 ? { httpReferer } : {},
+    ...xTitle !== void 0 ? { xTitle } : {},
+    provider: normalizedModel.provider || "openrouter"
+  };
+}
+function buildOpenRouterEmbeddingMetadata(metadata, httpReferer, xTitle) {
+  const normalized = buildOpenRouterMetadata(metadata, httpReferer, xTitle);
+  return typeof normalized.model === "string" ? {
+    ...normalized,
+    embedding_model: normalized.model
+  } : normalized;
+}
+function extractOpenRouterCallModelInput(request) {
+  return isObject(request) && "input" in request ? sanitizeOpenRouterLoggedValue(request.input) : void 0;
+}
+function extractOpenRouterCallModelMetadata(request) {
+  if (!isObject(request)) {
+    return { provider: "openrouter" };
+  }
+  const { input: _input, ...metadata } = request;
+  return buildOpenRouterMetadata(metadata, void 0, void 0);
+}
+function extractOpenRouterResponseMetadata(result) {
+  if (!isObject(result)) {
+    return void 0;
+  }
+  const { output: _output, data: _data, usage, ...metadata } = result;
+  const sanitized = sanitizeOpenRouterLoggedValue(metadata);
+  const metadataRecord = isObject(sanitized) ? sanitized : {};
+  const { model, provider, ...rest } = metadataRecord;
+  const normalizedModel = parseOpenRouterModelString(model);
+  const normalizedProvider = (typeof provider === "string" ? provider : void 0) || normalizedModel.provider;
+  const usageMetadata = extractOpenRouterUsageMetadata(usage);
+  const combined = {
+    ...rest,
+    ...normalizedModel.model !== void 0 ? { model: normalizedModel.model } : {},
+    ...usageMetadata || {},
+    ...normalizedProvider !== void 0 ? { provider: normalizedProvider } : {}
+  };
+  return Object.keys(combined).length > 0 ? combined : void 0;
+}
+function extractOpenRouterResponseOutput(response, fallbackOutput) {
+  if (isObject(response) && "output" in response && response.output !== void 0) {
+    return sanitizeOpenRouterLoggedValue(response.output);
+  }
+  if (fallbackOutput !== void 0) {
+    return sanitizeOpenRouterLoggedValue(fallbackOutput);
+  }
+  return void 0;
+}
+
+// src/openrouter-tool-wrapping.ts
+var OPENROUTER_WRAPPED_TOOL = Symbol("braintrust.openrouter.wrappedTool");
+var OPENROUTER_WRAPPED_CALL_MODEL_RESULT = Symbol(
+  "braintrust.openrouter.wrappedCallModelResult"
+);
+var OPENROUTER_CALL_MODEL_STREAM_METHODS = [
+  "getFullResponsesStream",
+  "getItemsStream",
+  "getNewMessagesStream",
+  "getReasoningStream",
+  "getTextStream",
+  "getToolCallsStream",
+  "getToolStream"
+];
+var OPENROUTER_CALL_MODEL_CONTEXT_METHODS = [
+  "cancel",
+  "getPendingToolCalls",
+  "getState",
+  "getToolCalls",
+  "requiresApproval"
+];
+function startOpenRouterCallModelSpan(request) {
+  return startSpan({
+    name: "openrouter.callModel",
+    spanAttributes: {
+      type: "llm" /* LLM */
+    },
+    event: {
+      input: extractOpenRouterCallModelInput(request),
+      metadata: extractOpenRouterCallModelMetadata(request)
+    }
+  });
+}
+function patchOpenRouterCallModelRequestTools(request) {
+  if (!Array.isArray(request.tools) || request.tools.length === 0) {
+    return void 0;
+  }
+  const originalTools = request.tools;
+  const wrappedTools = originalTools.map((tool) => wrapOpenRouterTool(tool));
+  const didPatch = wrappedTools.some(
+    (tool, index) => tool !== originalTools[index]
+  );
+  if (!didPatch) {
+    return void 0;
+  }
+  request.tools = wrappedTools;
+  return () => {
+    request.tools = originalTools;
+  };
+}
+function patchOpenRouterCallModelResult(span, result, request) {
+  if (!isObject(result) || isWrappedCallModelResult(result)) {
+    return false;
+  }
+  const resultLike = result;
+  const hasInstrumentableMethod = typeof resultLike.getResponse === "function" || typeof resultLike.getText === "function" || OPENROUTER_CALL_MODEL_STREAM_METHODS.some(
+    (methodName) => typeof resultLike[methodName] === "function"
+  );
+  if (!hasInstrumentableMethod) {
+    return false;
+  }
+  Object.defineProperty(resultLike, OPENROUTER_WRAPPED_CALL_MODEL_RESULT, {
+    value: true,
+    enumerable: false,
+    configurable: false
+  });
+  const originalGetResponse = typeof resultLike.getResponse === "function" ? resultLike.getResponse.bind(resultLike) : void 0;
+  const originalGetInitialResponse = typeof resultLike.getInitialResponse === "function" ? resultLike.getInitialResponse.bind(resultLike) : void 0;
+  const originalMakeFollowupRequest = typeof resultLike.makeFollowupRequest === "function" ? resultLike.makeFollowupRequest.bind(resultLike) : void 0;
+  let ended = false;
+  let tracedTurnCount = 0;
+  const endSpanWithResult = async (response, fallbackOutput) => {
+    if (ended) {
+      return;
+    }
+    ended = true;
+    const finalResponse = getFinalOpenRouterCallModelResponse(
+      resultLike,
+      response
+    );
+    if (finalResponse) {
+      const rounds = getOpenRouterCallModelRounds(resultLike);
+      const metadata = extractOpenRouterCallModelResultMetadata(
+        finalResponse,
+        rounds.length + 1
+      );
+      span.log({
+        output: extractOpenRouterResponseOutput(finalResponse, fallbackOutput),
+        ...metadata ? { metadata } : {},
+        metrics: aggregateOpenRouterCallModelMetrics(rounds, finalResponse)
+      });
+      span.end();
+      return;
+    }
+    if (fallbackOutput !== void 0) {
+      span.log({
+        output: fallbackOutput
+      });
+    }
+    span.end();
+  };
+  const endSpanWithError = (error) => {
+    if (ended) {
+      return;
+    }
+    ended = true;
+    span.log({
+      error: normalizeError(error).message
+    });
+    span.end();
+  };
+  const finalizeFromResponse = async (fallbackOutput) => {
+    if (!originalGetResponse) {
+      await endSpanWithResult(void 0, fallbackOutput);
+      return;
+    }
+    try {
+      await endSpanWithResult(await originalGetResponse(), fallbackOutput);
+    } catch {
+      await endSpanWithResult(void 0, fallbackOutput);
+    }
+  };
+  if (originalGetResponse) {
+    resultLike.getResponse = async (...args) => {
+      return await withCurrent(span, async () => {
+        try {
+          const response = await originalGetResponse(...args);
+          await endSpanWithResult(response);
+          return response;
+        } catch (error) {
+          endSpanWithError(error);
+          throw error;
+        }
+      });
+    };
+  }
+  if (typeof resultLike.getText === "function") {
+    const originalGetText = resultLike.getText.bind(resultLike);
+    resultLike.getText = async (...args) => {
+      return await withCurrent(span, async () => {
+        try {
+          const text = await originalGetText(...args);
+          await finalizeFromResponse(text);
+          return text;
+        } catch (error) {
+          endSpanWithError(error);
+          throw error;
+        }
+      });
+    };
+  }
+  for (const methodName of OPENROUTER_CALL_MODEL_CONTEXT_METHODS) {
+    if (typeof resultLike[methodName] !== "function") {
+      continue;
+    }
+    const originalMethod = resultLike[methodName];
+    resultLike[methodName] = async (...args) => {
+      return await withCurrent(span, async () => {
+        return await originalMethod.apply(resultLike, args);
+      });
+    };
+  }
+  for (const methodName of OPENROUTER_CALL_MODEL_STREAM_METHODS) {
+    if (typeof resultLike[methodName] !== "function") {
+      continue;
+    }
+    const originalMethod = resultLike[methodName];
+    resultLike[methodName] = (...args) => {
+      const stream = withCurrent(
+        span,
+        () => originalMethod.apply(resultLike, args)
+      );
+      if (!isAsyncIterable2(stream)) {
+        return stream;
+      }
+      return wrapAsyncIterableWithSpan({
+        finalize: finalizeFromResponse,
+        iteratorFactory: () => stream[Symbol.asyncIterator](),
+        onError: endSpanWithError,
+        span
+      });
+    };
+  }
+  if (originalGetInitialResponse) {
+    let initialTurnTraced = false;
+    resultLike.getInitialResponse = async (...args) => {
+      if (initialTurnTraced) {
+        return await withCurrent(span, async () => {
+          return await originalGetInitialResponse(...args);
+        });
+      }
+      initialTurnTraced = true;
+      const resolvedRequest = getOpenRouterResolvedRequest(resultLike, request);
+      const childSpan = startOpenRouterCallModelTurnSpan({
+        request: resolvedRequest,
+        step: tracedTurnCount + 1,
+        stepType: tracedTurnCount === 0 ? "initial" : "continue"
+      });
+      return await withCurrent(childSpan, async () => {
+        try {
+          const response = await originalGetInitialResponse(...args);
+          tracedTurnCount++;
+          finishOpenRouterCallModelTurnSpan({
+            response,
+            step: tracedTurnCount,
+            stepType: tracedTurnCount === 1 ? "initial" : "continue",
+            span: childSpan
+          });
+          return response;
+        } catch (error) {
+          childSpan.log({
+            error: normalizeError(error).message
+          });
+          childSpan.end();
+          throw error;
+        }
+      });
+    };
+  }
+  if (originalMakeFollowupRequest) {
+    resultLike.makeFollowupRequest = async (...args) => {
+      const currentResponse = args[0];
+      const toolResults = Array.isArray(args[1]) ? args[1] : [];
+      const resolvedRequest = getOpenRouterResolvedRequest(resultLike, request);
+      const followupRequest = buildOpenRouterFollowupRequest(
+        resolvedRequest,
+        currentResponse,
+        toolResults
+      );
+      const childSpan = startOpenRouterCallModelTurnSpan({
+        request: followupRequest,
+        step: tracedTurnCount + 1,
+        stepType: "continue"
+      });
+      return await withCurrent(childSpan, async () => {
+        try {
+          const response = await originalMakeFollowupRequest(...args);
+          tracedTurnCount++;
+          finishOpenRouterCallModelTurnSpan({
+            response,
+            step: tracedTurnCount,
+            stepType: "continue",
+            span: childSpan
+          });
+          return response;
+        } catch (error) {
+          childSpan.log({
+            error: normalizeError(error).message
+          });
+          childSpan.end();
+          throw error;
+        }
+      });
+    };
+  }
+  return true;
+}
+function wrapOpenRouterTool(tool) {
+  if (isWrappedTool(tool) || !tool.function || typeof tool.function !== "object" || typeof tool.function.execute !== "function") {
+    return tool;
+  }
+  const toolName = tool.function.name || "tool";
+  const originalExecute = tool.function.execute;
+  const wrappedTool = {
+    ...tool,
+    function: {
+      ...tool.function,
+      execute(...args) {
+        return traceToolExecution({
+          args,
+          execute: () => Reflect.apply(originalExecute, this, args),
+          toolCallId: getToolCallId(args[1]),
+          toolName
+        });
+      }
+    }
+  };
+  Object.defineProperty(wrappedTool, OPENROUTER_WRAPPED_TOOL, {
+    value: true,
+    enumerable: false,
+    configurable: false
+  });
+  return wrappedTool;
+}
+function isWrappedTool(tool) {
+  return Boolean(tool[OPENROUTER_WRAPPED_TOOL]);
+}
+function isWrappedCallModelResult(value) {
+  return Boolean(
+    isObject(value) && value[OPENROUTER_WRAPPED_CALL_MODEL_RESULT]
+  );
+}
+function traceToolExecution(args) {
+  const tracingChannel2 = openRouterChannels.toolExecute.tracingChannel();
+  const input = args.args.length > 0 ? args.args[0] : void 0;
+  const event = {
+    arguments: [input],
+    span_info: {
+      name: args.toolName
+    },
+    toolCallId: args.toolCallId,
+    toolName: args.toolName
+  };
+  tracingChannel2.start.publish(event);
+  try {
+    const result = args.execute();
+    return publishToolResult(tracingChannel2, event, result);
+  } catch (error) {
+    event.error = normalizeError(error);
+    tracingChannel2.error.publish(event);
+    throw error;
+  }
+}
+function publishToolResult(tracingChannel2, event, result) {
+  if (isPromiseLike(result)) {
+    return result.then(
+      (resolved) => {
+        event.result = resolved;
+        tracingChannel2.asyncEnd.publish(event);
+        return resolved;
+      },
+      (error) => {
+        event.error = normalizeError(error);
+        tracingChannel2.error.publish(event);
+        throw error;
+      }
+    );
+  }
+  event.result = result;
+  tracingChannel2.asyncEnd.publish(event);
+  return result;
+}
+function getToolCallId(context) {
+  const toolContext = context;
+  return typeof toolContext?.toolCall?.id === "string" ? toolContext.toolCall.id : void 0;
+}
+function extractOpenRouterCallModelResultMetadata(response, turnCount) {
+  const combined = {
+    ...extractOpenRouterResponseMetadata(response) || {},
+    ...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 startOpenRouterCallModelTurnSpan(args) {
+  const requestRecord = isObject(args.request) ? args.request : void 0;
+  const metadata = requestRecord ? extractOpenRouterCallModelMetadata(requestRecord) : { provider: "openrouter" };
+  if (isObject(metadata) && "tools" in metadata) {
+    delete metadata.tools;
+  }
+  return startSpan({
+    name: "openrouter.beta.responses.send",
+    spanAttributes: {
+      type: "llm" /* LLM */
+    },
+    event: {
+      input: requestRecord ? extractOpenRouterCallModelInput(requestRecord) : void 0,
+      metadata: {
+        ...metadata,
+        step: args.step,
+        step_type: args.stepType
+      }
+    }
+  });
+}
+function finishOpenRouterCallModelTurnSpan(args) {
+  if (!isObject(args.response)) {
+    args.span.end();
+    return;
+  }
+  args.span.log({
+    output: extractOpenRouterResponseOutput(args.response),
+    ...extractOpenRouterResponseMetadata(args.response) ? {
+      metadata: {
+        ...extractOpenRouterResponseMetadata(args.response),
+        ...args.step !== void 0 ? { step: args.step } : {},
+        ...args.stepType ? { step_type: args.stepType } : {}
+      }
+    } : {},
+    metrics: parseOpenRouterMetricsFromUsage(args.response.usage)
+  });
+  args.span.end();
+}
+function getOpenRouterResolvedRequest(result, request) {
+  if (isObject(result.resolvedRequest)) {
+    return result.resolvedRequest;
+  }
+  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 isAsyncIterable2(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+}
+function isPromiseLike(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function";
+}
+function normalizeError(error) {
+  return error instanceof Error ? error : new Error(String(error));
+}
+
+// src/instrumentation/plugins/openrouter-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: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
+          };
+        },
+        extractOutput: (result) => {
+          return isObject(result) ? result.choices : void 0;
+        },
+        extractMetrics: (result, startTime) => {
+          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
+          if (startTime) {
+            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+          }
+          return metrics;
+        },
+        aggregateChunks: aggregateOpenRouterChatChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceAsyncChannel(openRouterChannels.embeddingsGenerate, {
+        name: "openrouter.embeddings.generate",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterRequestArg(args);
+          const requestBody = isObject(request?.requestBody) ? request.requestBody : {};
+          const httpReferer = request?.httpReferer;
+          const xTitle = request?.xTitle;
+          const { input, ...metadata } = requestBody;
+          return {
+            input,
+            metadata: buildOpenRouterEmbeddingMetadata(
+              metadata,
+              httpReferer,
+              xTitle
+            )
+          };
+        },
+        extractOutput: (result) => {
+          if (!isObject(result)) {
+            return void 0;
+          }
+          const embedding = result.data?.[0]?.embedding;
+          return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
+        },
+        extractMetadata: (result) => {
+          if (!isObject(result)) {
+            return void 0;
+          }
+          return extractOpenRouterResponseMetadata(result);
+        },
+        extractMetrics: (result) => {
+          return isObject(result) ? parseOpenRouterMetricsFromUsage(result.usage) : {};
+        }
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(openRouterChannels.betaResponsesSend, {
+        name: "openrouter.beta.responses.send",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterRequestArg(args);
+          const openResponsesRequest = isObject(request?.openResponsesRequest) ? request.openResponsesRequest : {};
+          const httpReferer = request?.httpReferer;
+          const xTitle = request?.xTitle;
+          const { input, ...metadata } = openResponsesRequest;
+          return {
+            input,
+            metadata: buildOpenRouterMetadata(metadata, httpReferer, xTitle)
+          };
+        },
+        extractOutput: (result) => extractOpenRouterResponseOutput(result),
+        extractMetadata: (result) => extractOpenRouterResponseMetadata(result),
+        extractMetrics: (result, startTime) => {
+          const metrics = parseOpenRouterMetricsFromUsage(result?.usage);
+          if (startTime) {
+            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+          }
+          return metrics;
+        },
+        aggregateChunks: aggregateOpenRouterResponseStreamEvents
+      })
+    );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(openRouterChannels.callModel, {
+        name: "openrouter.callModel",
+        type: "llm" /* LLM */,
+        extractInput: (args) => {
+          const request = getOpenRouterCallModelRequestArg(args);
+          return {
+            input: request ? extractOpenRouterCallModelInput(request) : void 0,
+            metadata: request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" }
+          };
+        },
+        patchResult: ({ endEvent, result, span }) => {
+          return patchOpenRouterCallModelResult(
+            span,
+            result,
+            getOpenRouterCallModelRequestArg(endEvent.arguments)
+          );
+        }
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(openRouterChannels.toolExecute, {
+        name: "openrouter.tool",
+        type: "tool" /* TOOL */,
+        extractInput: (args, event) => ({
+          input: args[0],
+          metadata: {
+            provider: "openrouter",
+            tool_name: event.toolName,
+            ...event.toolCallId ? { tool_call_id: event.toolCallId } : {}
+          }
+        }),
+        extractOutput: (result) => result,
+        extractMetrics: () => ({}),
+        aggregateChunks: (chunks) => ({
+          output: chunks.length > 0 ? chunks[chunks.length - 1] : void 0,
+          metrics: {}
+        })
+      })
+    );
+    const callModelChannel = openRouterChannels.callModel.tracingChannel();
+    const callModelHandlers = {
+      start: (event) => {
+        const request = getOpenRouterCallModelRequestArg(event.arguments);
+        if (!request) {
+          return;
+        }
+        patchOpenRouterCallModelRequestTools(request);
+      }
+    };
+    callModelChannel.subscribe(callModelHandlers);
+    this.unsubscribers.push(() => {
+      callModelChannel.unsubscribe(callModelHandlers);
+    });
   }
-  const output = {};
-  const parts = [];
-  if (thoughtText) {
-    parts.push({ text: thoughtText, thought: true });
+};
+function normalizeArgs(args) {
+  if (Array.isArray(args)) {
+    return args;
   }
-  if (text) {
-    parts.push({ text });
+  if (isArrayLike(args)) {
+    return Array.from(args);
   }
-  parts.push(...otherParts);
-  if (parts.length > 0 && lastResponse?.candidates) {
-    const candidates = [];
-    for (const candidate of lastResponse.candidates) {
-      const candidateDict = {
-        content: {
-          parts,
-          role: "model"
-        }
-      };
-      if (candidate.finishReason !== void 0) {
-        candidateDict.finishReason = candidate.finishReason;
+  return [args];
+}
+function isArrayLike(value) {
+  return isObject(value) && "length" in value && typeof value.length === "number" && Number.isInteger(value.length) && value.length >= 0;
+}
+function getOpenRouterRequestArg(args) {
+  const normalizedArgs = normalizeArgs(args);
+  const keyedCandidate = normalizedArgs.find(
+    (arg) => isObject(arg) && ("chatGenerationParams" in arg || "requestBody" in arg || "openResponsesRequest" in arg)
+  );
+  if (isObject(keyedCandidate)) {
+    return keyedCandidate;
+  }
+  const firstObjectArg = normalizedArgs.find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+}
+function getOpenRouterCallModelRequestArg(args) {
+  const firstObjectArg = normalizeArgs(args).find((arg) => isObject(arg));
+  return isObject(firstObjectArg) ? firstObjectArg : void 0;
+}
+function aggregateOpenRouterChatChunks(chunks) {
+  let role;
+  let content = "";
+  let toolCalls;
+  let finishReason;
+  let metrics = {};
+  for (const chunk of chunks) {
+    metrics = {
+      ...metrics,
+      ...parseOpenRouterMetricsFromUsage(chunk?.usage)
+    };
+    const choice = chunk?.choices?.[0];
+    const delta = choice?.delta;
+    if (!delta) {
+      if (choice?.finish_reason !== void 0) {
+        finishReason = choice.finish_reason;
       }
-      if (candidate.safetyRatings) {
-        candidateDict.safetyRatings = candidate.safetyRatings;
+      continue;
+    }
+    if (!role && delta.role) {
+      role = delta.role;
+    }
+    if (typeof delta.content === "string") {
+      content += delta.content;
+    }
+    const choiceFinishReason = choice?.finishReason ?? choice?.finish_reason ?? void 0;
+    const deltaFinishReason = delta.finishReason ?? delta.finish_reason ?? void 0;
+    if (choiceFinishReason !== void 0) {
+      finishReason = choiceFinishReason;
+    } else if (deltaFinishReason !== void 0) {
+      finishReason = deltaFinishReason;
+    }
+    const toolCallDeltas = Array.isArray(delta.toolCalls) ? delta.toolCalls : Array.isArray(delta.tool_calls) ? delta.tool_calls : void 0;
+    if (!toolCallDeltas) {
+      continue;
+    }
+    for (const toolDelta of toolCallDeltas) {
+      if (!toolDelta?.function) {
+        continue;
       }
-      candidates.push(candidateDict);
+      const toolIndex = toolDelta.index ?? 0;
+      const existingToolCall = toolCalls?.[toolIndex];
+      if (!existingToolCall || toolDelta.id && existingToolCall.id !== void 0 && existingToolCall.id !== toolDelta.id) {
+        const nextToolCalls = [...toolCalls || []];
+        nextToolCalls[toolIndex] = {
+          index: toolIndex,
+          id: toolDelta.id,
+          type: toolDelta.type,
+          function: {
+            name: toolDelta.function.name,
+            arguments: toolDelta.function.arguments || ""
+          }
+        };
+        toolCalls = nextToolCalls;
+        continue;
+      }
+      const current = existingToolCall;
+      if (toolDelta.id && !current.id) {
+        current.id = toolDelta.id;
+      }
+      if (toolDelta.type && !current.type) {
+        current.type = toolDelta.type;
+      }
+      if (toolDelta.function.name && !current.function.name) {
+        current.function.name = toolDelta.function.name;
+      }
+      current.function.arguments += toolDelta.function.arguments || "";
     }
-    output.candidates = candidates;
-  }
-  if (usageMetadata) {
-    output.usageMetadata = usageMetadata;
-    populateUsageMetrics(metrics, usageMetadata);
-  }
-  if (text) {
-    output.text = text;
   }
-  return { output, metrics };
+  return {
+    output: [
+      {
+        index: 0,
+        message: {
+          role,
+          content: content || void 0,
+          ...toolCalls ? { tool_calls: toolCalls } : {}
+        },
+        logprobs: null,
+        finish_reason: finishReason
+      }
+    ],
+    metrics
+  };
 }
-function tryToDict(obj) {
-  if (obj === null || obj === void 0) {
-    return null;
-  }
-  if (typeof obj === "object") {
-    if ("toJSON" in obj && // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    typeof obj.toJSON === "function") {
-      return obj.toJSON();
+function aggregateOpenRouterResponseStreamEvents(chunks) {
+  let finalResponse;
+  for (const chunk of chunks) {
+    const response = chunk?.response;
+    if (!response) {
+      continue;
+    }
+    if (chunk.type === "response.completed" || chunk.type === "response.incomplete" || chunk.type === "response.failed") {
+      finalResponse = response;
     }
-    return obj;
   }
-  return null;
+  if (!finalResponse) {
+    return {
+      output: void 0,
+      metrics: {}
+    };
+  }
+  return {
+    output: extractOpenRouterResponseOutput(finalResponse),
+    metrics: parseOpenRouterMetricsFromUsage(finalResponse.usage),
+    ...extractOpenRouterResponseMetadata(finalResponse) ? { metadata: extractOpenRouterResponseMetadata(finalResponse) } : {}
+  };
 }
 
 // src/instrumentation/braintrust-plugin.ts
@@ -12214,6 +14021,7 @@ var BraintrustPlugin = class extends BasePlugin {
   aiSDKPlugin = null;
   claudeAgentSDKPlugin = null;
   googleGenAIPlugin = null;
+  openRouterPlugin = null;
   constructor(config = {}) {
     super();
     this.config = config;
@@ -12240,6 +14048,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.googleGenAIPlugin = new GoogleGenAIPlugin();
       this.googleGenAIPlugin.enable();
     }
+    if (integrations.openrouter !== false) {
+      this.openRouterPlugin = new OpenRouterPlugin();
+      this.openRouterPlugin.enable();
+    }
   }
   onDisable() {
     if (this.openaiPlugin) {
@@ -12262,6 +14074,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.googleGenAIPlugin.disable();
       this.googleGenAIPlugin = null;
     }
+    if (this.openRouterPlugin) {
+      this.openRouterPlugin.disable();
+      this.openRouterPlugin = null;
+    }
   }
 };
 
@@ -12333,7 +14149,8 @@ var PluginRegistry = class {
       vercel: true,
       aisdk: true,
       google: true,
-      claudeAgentSDK: true
+      claudeAgentSDK: true,
+      openrouter: true
     };
   }
   /**
@@ -12357,6 +14174,62 @@ function configureInstrumentation(config) {
   registry.configure(config);
 }
 
+// src/auto-instrumentations/patch-tracing-channel.ts
+function patchTracingChannel(tracingChannelFn) {
+  const dummyChannel = tracingChannelFn("__braintrust_probe__");
+  const TracingChannel = dummyChannel?.constructor;
+  if (!TracingChannel?.prototype) {
+    return;
+  }
+  if (!Object.getOwnPropertyDescriptor(TracingChannel.prototype, "hasSubscribers")) {
+    Object.defineProperty(TracingChannel.prototype, "hasSubscribers", {
+      configurable: true,
+      enumerable: false,
+      get() {
+        return Boolean(
+          this.start?.hasSubscribers || this.end?.hasSubscribers || this.asyncStart?.hasSubscribers || this.asyncEnd?.hasSubscribers || this.error?.hasSubscribers
+        );
+      }
+    });
+  }
+  if (TracingChannel.prototype.tracePromise) {
+    TracingChannel.prototype.tracePromise = function(fn, context = {}, thisArg, ...args) {
+      const { start, end, asyncStart, asyncEnd, error } = this;
+      function reject2(err) {
+        context.error = err;
+        error?.publish(context);
+        asyncStart?.publish(context);
+        asyncEnd?.publish(context);
+        return Promise.reject(err);
+      }
+      function resolve(result) {
+        context.result = result;
+        asyncStart?.publish(context);
+        asyncEnd?.publish(context);
+        return result;
+      }
+      return start.runStores(context, () => {
+        try {
+          const result = Reflect.apply(fn, thisArg, args);
+          end?.publish(context);
+          if (result && (typeof result === "object" || typeof result === "function") && typeof result.then === "function") {
+            return result.then(resolve, reject2);
+          }
+          context.result = result;
+          asyncStart?.publish(context);
+          asyncEnd?.publish(context);
+          return result;
+        } catch (err) {
+          context.error = err;
+          error?.publish(context);
+          end?.publish(context);
+          throw err;
+        }
+      });
+    };
+  }
+}
+
 // src/browser/config.ts
 var browserConfigured = false;
 function configureBrowser() {
@@ -12371,6 +14244,7 @@ function configureBrowser() {
   } catch {
   }
   isomorph_default.newTracingChannel = (nameOrChannels) => (0, import_dc_browser.tracingChannel)(nameOrChannels);
+  patchTracingChannel(import_dc_browser.tracingChannel);
   isomorph_default.getEnv = (name) => {
     if (typeof process === "undefined" || typeof process.env === "undefined") {
       return void 0;
@@ -12525,6 +14399,7 @@ __export(exports_exports, {
   wrapMastraAgent: () => wrapMastraAgent,
   wrapOpenAI: () => wrapOpenAI,
   wrapOpenAIv4: () => wrapOpenAIv4,
+  wrapOpenRouter: () => wrapOpenRouter,
   wrapTraced: () => wrapTraced,
   wrapVitest: () => wrapVitest
 });
@@ -12855,7 +14730,7 @@ function wrapOpenAIv4(openai) {
       return baseVal;
     }
   });
-  const chatProxy = new Proxy(typedOpenai.chat, {
+  const chatProxy2 = new Proxy(typedOpenai.chat, {
     get(target, name, receiver) {
       if (name === "completions") {
         return completionProxy;
@@ -12865,7 +14740,7 @@ function wrapOpenAIv4(openai) {
   });
   const embeddingProxy = createEndpointProxy(typedOpenai.embeddings, wrapEmbeddings);
   const moderationProxy = createEndpointProxy(typedOpenai.moderations, wrapModerations);
-  let betaProxy2;
+  let betaProxy3;
   if (typedOpenai.beta?.chat?.completions?.stream) {
     const betaChatCompletionProxy = new Proxy(
       typedOpenai?.beta?.chat.completions,
@@ -12889,7 +14764,7 @@ function wrapOpenAIv4(openai) {
         return Reflect.get(target, name, receiver);
       }
     });
-    betaProxy2 = new Proxy(typedOpenai.beta, {
+    betaProxy3 = new Proxy(typedOpenai.beta, {
       get(target, name, receiver) {
         if (name === "chat") {
           return betaChatProxy;
@@ -12902,7 +14777,7 @@ function wrapOpenAIv4(openai) {
     get(target, name, receiver) {
       switch (name) {
         case "chat":
-          return chatProxy;
+          return chatProxy2;
         case "embeddings":
           return embeddingProxy;
         case "moderations":
@@ -12910,8 +14785,8 @@ function wrapOpenAIv4(openai) {
         case "responses":
           return responsesProxy(typedOpenai);
       }
-      if (name === "beta" && betaProxy2) {
-        return betaProxy2;
+      if (name === "beta" && betaProxy3) {
+        return betaProxy3;
       }
       return Reflect.get(target, name, receiver);
     }
@@ -12994,35 +14869,28 @@ function createEndpointProxy(target, wrapperFn) {
   });
 }
 function wrapApiCreateWithChannel(create, channel2) {
-  return async (allParams, options) => {
+  return (allParams, options) => {
     const { span_info, params } = splitSpanInfo(allParams);
-    const traceContext = createChannelContext(channel2, params, span_info);
-    const { data } = await tracePromiseWithResponse(
-      channel2,
-      traceContext,
-      create(params, options)
-    );
-    return data;
+    let executionPromise = null;
+    const ensureExecuted = () => {
+      if (!executionPromise) {
+        executionPromise = (async () => {
+          const traceContext = createChannelContext(channel2, params, span_info);
+          return tracePromiseWithResponse(
+            channel2,
+            traceContext,
+            create(params, options)
+          );
+        })();
+      }
+      return executionPromise;
+    };
+    return createLazyAPIPromise(ensureExecuted);
   };
 }
 var wrapEmbeddings = (create) => wrapApiCreateWithChannel(create, openAIChannels.embeddingsCreate);
 var wrapModerations = (create) => wrapApiCreateWithChannel(create, openAIChannels.moderationsCreate);
 
-// src/zod/utils.ts
-var import_zod_to_json_schema = require("zod-to-json-schema");
-var z42 = __toESM(require("zod/v4"));
-function isZodV4(zodObject) {
-  return typeof zodObject === "object" && zodObject !== null && "_zod" in zodObject && zodObject._zod !== void 0;
-}
-function zodToJsonSchema(schema) {
-  if (isZodV4(schema)) {
-    return z42.toJSONSchema(schema, {
-      target: "draft-7"
-    });
-  }
-  return (0, import_zod_to_json_schema.zodToJsonSchema)(schema);
-}
-
 // src/wrappers/ai-sdk/ai-sdk.ts
 var DENY_OUTPUT_PATHS = [
   // v3
@@ -13117,9 +14985,11 @@ var wrapAgentGenerate = (generate, instance, options = {}) => {
   return async (params) => makeGenerateTextWrapper(
     `${instance.constructor.name}.generate`,
     options,
-    generate.bind(instance)
+    generate.bind(instance),
     // as of v5 this is just streamText under the hood
     // Follows what the AI SDK does under the hood when calling generateText
+    void 0,
+    "function" /* FUNCTION */
   )({ ...instance.settings, ...params });
 };
 var wrapAgentStream = (stream, instance, options = {}) => {
@@ -13128,11 +14998,12 @@ var wrapAgentStream = (stream, instance, options = {}) => {
     options,
     stream.bind(instance),
     // as of v5 this is just streamText under the hood
-    void 0
+    void 0,
     // aiSDK not needed since model is already on instance
+    "function" /* FUNCTION */
   )({ ...instance.settings, ...params });
 };
-var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
+var makeGenerateTextWrapper = (name, options, generateText, aiSDK, spanType = "llm" /* LLM */) => {
   const wrapper = async function(allParams) {
     const { span_info, ...params } = allParams;
     const {
@@ -13141,6 +15012,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider2(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
@@ -13153,7 +15025,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
           model: wrappedModel,
           tools: wrapTools(params.tools)
         });
-        const gatewayInfo = extractGatewayRoutingInfo(result);
+        const gatewayInfo = extractGatewayRoutingInfo2(result);
         const resolvedMetadata = {};
         if (gatewayInfo?.provider) {
           resolvedMetadata.provider = gatewayInfo.provider;
@@ -13171,7 +15043,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
       {
         name: spanName || name,
         spanAttributes: {
-          type: "llm" /* LLM */,
+          type: spanType,
           ...spanInfoAttrs
         },
         event: {
@@ -13180,6 +15052,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
             ...spanInfoMetadata,
             model,
             ...provider ? { provider } : {},
+            ...serializedTools ? { tools: serializedTools } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -13214,11 +15087,12 @@ var wrapModel = (model, ai) => {
   const originalDoStream = resolvedModel.doStream?.bind(resolvedModel);
   const { model: modelId, provider } = serializeModelWithProvider2(resolvedModel);
   const wrappedDoGenerate = async (options) => {
+    const serializedTools = serializeAISDKToolsForLogging(options.tools);
     const processedInput = await processInputAttachments2(options);
     return traced(
       async (span) => {
         const result = await originalDoGenerate(options);
-        const gatewayInfo = extractGatewayRoutingInfo(result);
+        const gatewayInfo = extractGatewayRoutingInfo2(result);
         const resolvedMetadata = {};
         if (gatewayInfo?.provider) {
           resolvedMetadata.provider = gatewayInfo.provider;
@@ -13246,6 +15120,7 @@ var wrapModel = (model, ai) => {
           metadata: {
             model: modelId,
             ...provider ? { provider } : {},
+            ...serializedTools ? { tools: serializedTools } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -13258,6 +15133,7 @@ var wrapModel = (model, ai) => {
   const wrappedDoStream = async (options) => {
     const startTime = Date.now();
     let receivedFirst = false;
+    const serializedTools = serializeAISDKToolsForLogging(options.tools);
     const processedInput = await processInputAttachments2(options);
     const span = startSpan({
       name: "doStream",
@@ -13269,6 +15145,7 @@ var wrapModel = (model, ai) => {
         metadata: {
           model: modelId,
           ...provider ? { provider } : {},
+          ...serializedTools ? { tools: serializedTools } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -13282,7 +15159,7 @@ var wrapModel = (model, ai) => {
     let reasoning = "";
     const toolCalls = [];
     let object = void 0;
-    const extractTextDelta = (chunk) => {
+    const extractTextDelta2 = (chunk) => {
       if (typeof chunk.textDelta === "string") return chunk.textDelta;
       if (typeof chunk.delta === "string") return chunk.delta;
       if (typeof chunk.text === "string") return chunk.text;
@@ -13301,7 +15178,7 @@ var wrapModel = (model, ai) => {
         }
         switch (chunk.type) {
           case "text-delta":
-            text += extractTextDelta(chunk);
+            text += extractTextDelta2(chunk);
             break;
           case "reasoning-delta":
             if (chunk.delta) {
@@ -13339,7 +15216,7 @@ var wrapModel = (model, ai) => {
             if (object !== void 0) {
               output.object = object;
             }
-            const gatewayInfo = extractGatewayRoutingInfo(output);
+            const gatewayInfo = extractGatewayRoutingInfo2(output);
             const resolvedMetadata = {};
             if (gatewayInfo?.provider) {
               resolvedMetadata.provider = gatewayInfo.provider;
@@ -13401,6 +15278,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider2(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
@@ -13414,7 +15292,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
           tools: wrapTools(params.tools)
         });
         const output = await processOutput(result, options.denyOutputPaths);
-        const gatewayInfo = extractGatewayRoutingInfo(result);
+        const gatewayInfo = extractGatewayRoutingInfo2(result);
         const resolvedMetadata = {};
         if (gatewayInfo?.provider) {
           resolvedMetadata.provider = gatewayInfo.provider;
@@ -13441,6 +15319,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
             ...spanInfoMetadata,
             model,
             ...provider ? { provider } : {},
+            ...serializedTools ? { tools: serializedTools } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -13451,7 +15330,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
     );
   };
 };
-var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
+var makeStreamTextWrapper = (name, options, streamText, aiSDK, spanType = "llm" /* LLM */) => {
   const wrapper = function(allParams) {
     const { span_info, ...params } = allParams;
     const {
@@ -13460,11 +15339,12 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider2(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const { input: processedInput, outputPromise } = processInputAttachmentsSync(params);
     const span = startSpan({
       name: spanName || name,
       spanAttributes: {
-        type: "llm" /* LLM */,
+        type: spanType,
         ...spanInfoAttrs
       },
       event: {
@@ -13473,6 +15353,7 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
           ...spanInfoMetadata,
           model,
           ...provider ? { provider } : {},
+          ...serializedTools ? { tools: serializedTools } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -13512,7 +15393,7 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
           },
           onFinish: async (event) => {
             params.onFinish?.(event);
-            const gatewayInfo = extractGatewayRoutingInfo(event);
+            const gatewayInfo = extractGatewayRoutingInfo2(event);
             const resolvedMetadata = {};
             if (gatewayInfo?.provider) {
               resolvedMetadata.provider = gatewayInfo.provider;
@@ -13588,6 +15469,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider2(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const { input: processedInput, outputPromise } = processInputAttachmentsSync(params);
     const span = startSpan({
       name: spanName || "streamObject",
@@ -13601,6 +15483,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
           ...spanInfoMetadata,
           model,
           ...provider ? { provider } : {},
+          ...serializedTools ? { tools: serializedTools } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -13640,7 +15523,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
           },
           onFinish: async (event) => {
             params.onFinish?.(event);
-            const gatewayInfo = extractGatewayRoutingInfo(event);
+            const gatewayInfo = extractGatewayRoutingInfo2(event);
             const resolvedMetadata = {};
             if (gatewayInfo?.provider) {
               resolvedMetadata.provider = gatewayInfo.provider;
@@ -13717,7 +15600,7 @@ var wrapTools = (tools) => {
   }
   return wrappedTools;
 };
-var isAsyncGenerator = (value) => {
+var isAsyncGenerator2 = (value) => {
   return value != null && typeof value === "object" && typeof value[Symbol.asyncIterator] === "function" && typeof value.next === "function" && typeof value.return === "function" && typeof value.throw === "function";
 };
 var wrapToolExecute = (tool, name) => {
@@ -13728,7 +15611,7 @@ var wrapToolExecute = (tool, name) => {
         if (prop === "execute") {
           const wrappedExecute = (...args) => {
             const result = originalExecute.apply(target, args);
-            if (isAsyncGenerator(result)) {
+            if (isAsyncGenerator2(result)) {
               return (async function* () {
                 const span = startSpan({
                   name,
@@ -13848,7 +15731,7 @@ function serializeModelWithProvider2(model) {
     provider: explicitProvider || parsed.provider
   };
 }
-function extractGatewayRoutingInfo(result) {
+function extractGatewayRoutingInfo2(result) {
   if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
     const routing2 = result.steps[0]?.providerMetadata?.gateway?.routing;
     if (routing2) {
@@ -13867,10 +15750,10 @@ function extractGatewayRoutingInfo(result) {
   }
   return null;
 }
-var isZodSchema = (value) => {
+var isZodSchema3 = (value) => {
   return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
 };
-var serializeZodSchema = (schema) => {
+var serializeZodSchema3 = (schema) => {
   try {
     return zodToJsonSchema(schema);
   } catch {
@@ -13880,34 +15763,6 @@ var serializeZodSchema = (schema) => {
     };
   }
 };
-var processTools = (tools) => {
-  if (!tools || typeof tools !== "object") return tools;
-  if (Array.isArray(tools)) {
-    return tools.map(processTool);
-  }
-  const processed = {};
-  for (const [key, tool] of Object.entries(tools)) {
-    processed[key] = processTool(tool);
-  }
-  return processed;
-};
-var processTool = (tool) => {
-  if (!tool || typeof tool !== "object") return tool;
-  const processed = { ...tool };
-  if (isZodSchema(processed.inputSchema)) {
-    processed.inputSchema = serializeZodSchema(processed.inputSchema);
-  }
-  if (isZodSchema(processed.parameters)) {
-    processed.parameters = serializeZodSchema(processed.parameters);
-  }
-  if ("execute" in processed) {
-    processed.execute = "[Function]";
-  }
-  if ("render" in processed) {
-    processed.render = "[Function]";
-  }
-  return processed;
-};
 var isOutputObject = (value) => {
   if (value == null || typeof value !== "object") {
     return false;
@@ -13946,10 +15801,10 @@ var serializeOutputObject = (output, model) => {
       if (typeof responseFormat.then === "function") {
         result.response_format = Promise.resolve(responseFormat).then(
           (resolved) => {
-            if (resolved.schema && isZodSchema(resolved.schema)) {
+            if (resolved.schema && isZodSchema3(resolved.schema)) {
               return {
                 ...resolved,
-                schema: serializeZodSchema(resolved.schema)
+                schema: serializeZodSchema3(resolved.schema)
               };
             }
             return resolved;
@@ -13957,10 +15812,10 @@ var serializeOutputObject = (output, model) => {
         );
       } else {
         const syncResponseFormat = responseFormat;
-        if (syncResponseFormat.schema && isZodSchema(syncResponseFormat.schema)) {
+        if (syncResponseFormat.schema && isZodSchema3(syncResponseFormat.schema)) {
           responseFormat = {
             ...syncResponseFormat,
-            schema: serializeZodSchema(syncResponseFormat.schema)
+            schema: serializeZodSchema3(syncResponseFormat.schema)
           };
         }
         result.response_format = responseFormat;
@@ -13986,14 +15841,14 @@ var processInputAttachmentsSync = (input) => {
       processed.prompt = processPromptContent(input.prompt);
     }
   }
-  if (input.tools) {
-    processed.tools = processTools(input.tools);
+  if (input.schema && isZodSchema3(input.schema)) {
+    processed.schema = serializeZodSchema3(input.schema);
   }
-  if (input.schema && isZodSchema(input.schema)) {
-    processed.schema = serializeZodSchema(input.schema);
+  if (input.callOptionsSchema && isZodSchema3(input.callOptionsSchema)) {
+    processed.callOptionsSchema = serializeZodSchema3(input.callOptionsSchema);
   }
-  if (input.callOptionsSchema && isZodSchema(input.callOptionsSchema)) {
-    processed.callOptionsSchema = serializeZodSchema(input.callOptionsSchema);
+  if (input.tools) {
+    processed.tools = serializeAISDKToolsForLogging(input.tools);
   }
   let outputPromise;
   if (input.output && isOutputObject(input.output)) {
@@ -14027,14 +15882,14 @@ var processInputAttachments2 = async (input) => {
       processed.prompt = processPromptContent(input.prompt);
     }
   }
-  if (input.tools) {
-    processed.tools = processTools(input.tools);
+  if (input.schema && isZodSchema3(input.schema)) {
+    processed.schema = serializeZodSchema3(input.schema);
   }
-  if (input.schema && isZodSchema(input.schema)) {
-    processed.schema = serializeZodSchema(input.schema);
+  if (input.callOptionsSchema && isZodSchema3(input.callOptionsSchema)) {
+    processed.callOptionsSchema = serializeZodSchema3(input.callOptionsSchema);
   }
-  if (input.callOptionsSchema && isZodSchema(input.callOptionsSchema)) {
-    processed.callOptionsSchema = serializeZodSchema(input.callOptionsSchema);
+  if (input.tools) {
+    processed.tools = serializeAISDKToolsForLogging(input.tools);
   }
   if (input.output && isOutputObject(input.output)) {
     const serialized = serializeOutputObject(input.output, input.model);
@@ -14235,7 +16090,9 @@ var processOutput = async (output, denyOutputPaths) => {
   const getterValues = extractGetterValues2(output);
   const processed = await processOutputAttachments(output);
   const merged = { ...processed, ...getterValues };
-  return omit2(merged, denyOutputPaths ?? DENY_OUTPUT_PATHS);
+  return normalizeAISDKLoggedOutput(
+    omit2(merged, denyOutputPaths ?? DENY_OUTPUT_PATHS)
+  );
 };
 var processOutputAttachments = async (output) => {
   try {
@@ -14798,14 +16655,14 @@ function extractModelFromResult(result) {
 function extractModelFromWrapGenerateCallback(model) {
   return model?.modelId;
 }
-function camelToSnake(str) {
+function camelToSnake2(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 = camelToSnake(key);
+      const snakeKey = camelToSnake2(key);
       modelParams[snakeKey] = value;
     }
   }
@@ -15665,7 +17522,7 @@ function filterSerializableOptions2(options) {
   }
   return filtered;
 }
-function isAsyncIterable2(value) {
+function isAsyncIterable3(value) {
   return value !== null && typeof value === "object" && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function wrapClaudeAgentQuery(queryFn, defaultThis) {
@@ -15673,7 +17530,7 @@ function wrapClaudeAgentQuery(queryFn, defaultThis) {
     apply(target, thisArg, argArray) {
       const params = argArray[0] ?? {};
       const { prompt, options = {} } = params;
-      const promptIsAsyncIterable = isAsyncIterable2(prompt);
+      const promptIsAsyncIterable = isAsyncIterable3(prompt);
       let capturedPromptMessages;
       let promptForQuery = prompt;
       let promptStarted = false;
@@ -16293,11 +18150,13 @@ function serializeInput2(params) {
   if (params.config) {
     const config = tryToDict2(params.config);
     if (config) {
-      const tools = serializeTools2(params);
-      if (tools) {
-        config.tools = tools;
-      }
-      input.config = config;
+      const filteredConfig = {};
+      Object.keys(config).forEach((key) => {
+        if (key !== "tools") {
+          filteredConfig[key] = config[key];
+        }
+      });
+      input.config = filteredConfig;
     }
   }
   return input;
@@ -16378,6 +18237,10 @@ function extractMetadata2(params) {
       });
     }
   }
+  const tools = serializeTools2(params);
+  if (tools) {
+    metadata.tools = tools;
+  }
   return metadata;
 }
 function extractGenerateContentMetrics2(response, start) {
@@ -16516,6 +18379,111 @@ function tryToDict2(obj) {
   return null;
 }
 
+// src/wrappers/openrouter.ts
+function wrapOpenRouter(openrouter) {
+  const or = openrouter;
+  if (or && typeof or === "object" && ("chat" in or && typeof or.chat === "object" && or.chat && "send" in or.chat && "embeddings" in or && typeof or.embeddings === "object" && or.embeddings && "generate" in or.embeddings || "callModel" in or && typeof or.callModel === "function")) {
+    return openRouterProxy(or);
+  }
+  console.warn("Unsupported OpenRouter library. Not wrapping.");
+  return openrouter;
+}
+function openRouterProxy(openrouter) {
+  return new Proxy(openrouter, {
+    get(target, prop, receiver) {
+      switch (prop) {
+        case "chat":
+          return target.chat ? chatProxy(target.chat) : target.chat;
+        case "embeddings":
+          return target.embeddings ? embeddingsProxy(target.embeddings) : target.embeddings;
+        case "beta":
+          return target.beta ? betaProxy2(target.beta) : target.beta;
+        case "callModel":
+          return typeof target.callModel === "function" ? wrapCallModel(target.callModel.bind(target)) : target.callModel;
+        default:
+          return Reflect.get(target, prop, receiver);
+      }
+    }
+  });
+}
+function betaProxy2(beta) {
+  return new Proxy(beta, {
+    get(target, prop, receiver) {
+      if (prop === "responses") {
+        return target.responses ? responsesProxy2(target.responses) : void 0;
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function chatProxy(chat) {
+  return new Proxy(chat, {
+    get(target, prop, receiver) {
+      if (prop === "send") {
+        return wrapChatSend(target.send.bind(target));
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function embeddingsProxy(embeddings) {
+  return new Proxy(embeddings, {
+    get(target, prop, receiver) {
+      if (prop === "generate") {
+        return wrapEmbeddingsGenerate(target.generate.bind(target));
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function responsesProxy2(responses) {
+  return new Proxy(responses, {
+    get(target, prop, receiver) {
+      if (prop === "send") {
+        return wrapResponsesSend(target.send.bind(target));
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function wrapChatSend(send) {
+  return (request, options) => openRouterChannels.chatSend.tracePromise(() => send(request, options), {
+    arguments: [request]
+  });
+}
+function wrapEmbeddingsGenerate(generate) {
+  return (request, options) => openRouterChannels.embeddingsGenerate.tracePromise(
+    () => generate(request, options),
+    { arguments: [request] }
+  );
+}
+function wrapResponsesSend(send) {
+  return (request, options) => openRouterChannels.betaResponsesSend.tracePromise(
+    () => send(request, options),
+    { arguments: [request] }
+  );
+}
+function wrapCallModel(callModel) {
+  return (request, options) => {
+    const patchedRequest = { ...request };
+    patchOpenRouterCallModelRequestTools(patchedRequest);
+    const span = startOpenRouterCallModelSpan(patchedRequest);
+    try {
+      const result = callModel(patchedRequest, options);
+      if (!patchOpenRouterCallModelResult(span, result, patchedRequest)) {
+        span.end();
+      }
+      return result;
+    } catch (error) {
+      span.log({
+        error: error instanceof Error ? error.message : String(error)
+      });
+      span.end();
+      throw error;
+    }
+  };
+}
+
 // src/wrappers/vitest/context-manager.ts
 var VitestContextManager = class {
   /**
@@ -17415,7 +19383,7 @@ function unescapePath(path) {
 }
 var graph_framework_default = { createGraph };
 
-// ../node_modules/async/dist/async.mjs
+// ../node_modules/.pnpm/async@3.2.5/node_modules/async/dist/async.mjs
 function initialParams(fn) {
   return function(...args) {
     var callback = args.pop();
@@ -17483,10 +19451,10 @@ function invokeCallback(callback, error, value) {
 function isAsync(fn) {
   return fn[Symbol.toStringTag] === "AsyncFunction";
 }
-function isAsyncGenerator2(fn) {
+function isAsyncGenerator3(fn) {
   return fn[Symbol.toStringTag] === "AsyncGenerator";
 }
-function isAsyncIterable3(obj) {
+function isAsyncIterable4(obj) {
   return typeof obj[Symbol.asyncIterator] === "function";
 }
 function wrapAsync(asyncFn) {
@@ -17536,10 +19504,11 @@ function _asyncMap(eachfn, arr, iteratee, callback) {
     callback(err, results);
   });
 }
-function isArrayLike(value) {
+function isArrayLike2(value) {
   return value && typeof value.length === "number" && value.length >= 0 && value.length % 1 === 0;
 }
 var breakLoop = {};
+var breakLoop$1 = breakLoop;
 function once(fn) {
   function wrapper(...args) {
     if (fn === null) return;
@@ -17583,7 +19552,7 @@ function createObjectIterator(obj) {
   };
 }
 function createIterator(coll) {
-  if (isArrayLike(coll)) {
+  if (isArrayLike2(coll)) {
     return createArrayIterator(coll);
   }
   var iterator = getIterator(coll);
@@ -17631,7 +19600,7 @@ function asyncEachOfLimit(generator, limit, iteratee, callback) {
       canceled = true;
       return;
     }
-    if (result === breakLoop || done && running <= 0) {
+    if (result === breakLoop$1 || done && running <= 0) {
       done = true;
       return callback(null);
     }
@@ -17654,10 +19623,10 @@ var eachOfLimit$2 = (limit) => {
     if (!obj) {
       return callback(null);
     }
-    if (isAsyncGenerator2(obj)) {
+    if (isAsyncGenerator3(obj)) {
       return asyncEachOfLimit(obj, limit, iteratee, callback);
     }
-    if (isAsyncIterable3(obj)) {
+    if (isAsyncIterable4(obj)) {
       return asyncEachOfLimit(obj[Symbol.asyncIterator](), limit, iteratee, callback);
     }
     var nextElem = createIterator(obj);
@@ -17674,7 +19643,7 @@ var eachOfLimit$2 = (limit) => {
       } else if (err === false) {
         done = true;
         canceled = true;
-      } else if (value === breakLoop || done && running <= 0) {
+      } else if (value === breakLoop$1 || done && running <= 0) {
         done = true;
         return callback(null);
       } else if (!looping) {
@@ -17717,7 +19686,7 @@ function eachOfArrayLike(coll, iteratee, callback) {
     if (canceled === true) return;
     if (err) {
       callback(err);
-    } else if (++completed === length || value === breakLoop) {
+    } else if (++completed === length || value === breakLoop$1) {
       callback(null);
     }
   }
@@ -17729,7 +19698,7 @@ function eachOfGeneric(coll, iteratee, callback) {
   return eachOfLimit$1(coll, Infinity, iteratee, callback);
 }
 function eachOf(coll, iteratee, callback) {
-  var eachOfImplementation = isArrayLike(coll) ? eachOfArrayLike : eachOfGeneric;
+  var eachOfImplementation = isArrayLike2(coll) ? eachOfArrayLike : eachOfGeneric;
   return eachOfImplementation(coll, wrapAsync(iteratee), callback);
 }
 var eachOf$1 = awaitify(eachOf, 3);
@@ -18113,7 +20082,7 @@ function _createTester(check, getResult) {
         if (check(result) && !testResult) {
           testPassed = true;
           testResult = getResult(true, value);
-          return callback(null, breakLoop);
+          return callback(null, breakLoop$1);
         }
         callback();
       });
@@ -18244,7 +20213,7 @@ function filterGeneric(eachfn, coll, iteratee, callback) {
   });
 }
 function _filter(eachfn, coll, iteratee, callback) {
-  var filter2 = isArrayLike(coll) ? filterArray : filterGeneric;
+  var filter2 = isArrayLike2(coll) ? filterArray : filterGeneric;
   return filter2(eachfn, coll, wrapAsync(iteratee), callback);
 }
 function filter(coll, iteratee, callback) {
@@ -18319,7 +20288,7 @@ if (hasNextTick) {
 }
 var nextTick = wrap(_defer);
 var _parallel = awaitify((eachfn, tasks, callback) => {
-  var results = isArrayLike(tasks) ? [] : {};
+  var results = isArrayLike2(tasks) ? [] : {};
   eachfn(tasks, (task, key, taskCb) => {
     wrapAsync(task)((err, ...result) => {
       if (result.length < 2) {
@@ -18737,7 +20706,8 @@ var promptDefinitionSchema = promptContentsSchema.and(
   import_v310.z.object({
     model: import_v310.z.string(),
     params: ModelParams.optional(),
-    templateFormat: import_v310.z.enum(["mustache", "nunjucks", "none"]).optional()
+    templateFormat: import_v310.z.enum(["mustache", "nunjucks", "none"]).optional(),
+    environments: import_v310.z.array(import_v310.z.string()).optional()
   })
 );
 var promptDefinitionWithToolsSchema = promptDefinitionSchema.and(
@@ -18896,6 +20866,22 @@ function initExperiment2(state, options = {}) {
     setCurrent: false
   });
 }
+async function getExperimentParametersRef(parameters) {
+  if (!parameters) {
+    return void 0;
+  }
+  const resolvedParameters = parameters instanceof Promise ? await parameters : parameters;
+  if (!RemoteEvalParameters.isParameters(resolvedParameters)) {
+    return void 0;
+  }
+  if (resolvedParameters.id === void 0) {
+    return void 0;
+  }
+  return {
+    id: resolvedParameters.id,
+    version: resolvedParameters.version
+  };
+}
 function callEvaluatorData(data) {
   const dataResult = typeof data === "function" ? data() : data;
   let baseExperiment = void 0;
@@ -18907,7 +20893,7 @@ function callEvaluatorData(data) {
     baseExperiment
   };
 }
-function isAsyncIterable4(value) {
+function isAsyncIterable5(value) {
   return typeof value === "object" && value !== null && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function isIterable(value) {
@@ -18962,6 +20948,7 @@ async function Eval(name, evaluator, reporterOrOpts) {
     const { data, baseExperiment: defaultBaseExperiment } = callEvaluatorData(
       evaluator.data
     );
+    const parameters = await getExperimentParametersRef(evaluator.parameters);
     const experiment = options.parent || options.noSendLogs ? null : initExperiment2(evaluator.state, {
       ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: name },
       experiment: evaluator.experimentName,
@@ -18974,7 +20961,8 @@ async function Eval(name, evaluator, reporterOrOpts) {
       baseExperimentId: evaluator.baseExperimentId,
       gitMetadataSettings: evaluator.gitMetadataSettings,
       repoInfo: evaluator.repoInfo,
-      dataset: Dataset2.isDataset(data) ? data : void 0
+      dataset: Dataset2.isDataset(data) ? data : void 0,
+      parameters
     });
     if (experiment && typeof process !== "undefined" && globalThis.BRAINTRUST_CONTEXT_MANAGER !== void 0) {
       await experiment._waitForId();
@@ -19029,7 +21017,7 @@ async function Eval(name, evaluator, reporterOrOpts) {
       if (experiment) {
         await experiment.flush().catch(console.error);
       } else if (options.parent) {
-        await flush().catch(console.error);
+        await flush({ state: evaluator.state }).catch(console.error);
       }
     }
   } finally {
@@ -19129,7 +21117,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     }
     const resolvedDataResult = dataResult instanceof Promise ? await dataResult : dataResult;
     const dataIterable = (() => {
-      if (isAsyncIterable4(resolvedDataResult)) {
+      if (isAsyncIterable5(resolvedDataResult)) {
         return resolvedDataResult;
       }
       if (Array.isArray(resolvedDataResult) || isIterable(resolvedDataResult)) {
@@ -19417,6 +21405,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
       },
       Math.max(evaluator.maxConcurrency ?? Number.MAX_SAFE_INTEGER, 1)
     );
+    const queueErrors = [];
     const enqueuePromise = (async () => {
       for await (const datum of dataIterable) {
         if (cancelled) {
@@ -19432,7 +21421,11 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
           }
           scheduledTrials++;
           progressReporter.setTotal?.(evaluator.evalName, scheduledTrials);
-          q.push({ datum, trialIndex });
+          q.pushAsync({ datum, trialIndex }).catch((e) => {
+            if (queueErrors.length < 5) {
+              queueErrors.push(e);
+            }
+          });
         }
       }
     })();
@@ -19480,6 +21473,12 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     })();
     try {
       await Promise.race([waitForQueue, cancel()]);
+      if (queueErrors.length > 0) {
+        throw new AggregateError(
+          queueErrors,
+          `Encountered ${queueErrors.length} unhandled task errors`
+        );
+      }
     } catch (e) {
       q.kill();
       if (e instanceof InternalAbortError) {
@@ -19883,6 +21882,7 @@ var CodePrompt = class {
   toolFunctions;
   tags;
   metadata;
+  environmentSlugs;
   constructor(project, prompt, toolFunctions, opts, functionType) {
     this.project = project;
     this.name = opts.name;
@@ -19895,6 +21895,7 @@ var CodePrompt = class {
     this.functionType = functionType;
     this.tags = opts.tags;
     this.metadata = opts.metadata;
+    this.environmentSlugs = opts.environments;
   }
   async toFunctionDefinition(projectNameToId) {
     const prompt_data = {
@@ -19929,7 +21930,8 @@ var CodePrompt = class {
       prompt_data,
       if_exists: this.ifExists,
       tags: this.tags,
-      metadata: this.metadata
+      metadata: this.metadata,
+      environments: this.environmentSlugs && this.environmentSlugs.length > 0 ? this.environmentSlugs.map((slug) => ({ slug })) : void 0
     };
   }
 };