braintrust 3.4.0 → 3.6.0

package/dev/dist/index.js

@@ -2,6 +2,64 @@
 var _nodeasync_hooks = require('node:async_hooks');
 var _nodediagnostics_channel = require('node:diagnostics_channel'); var diagnostics_channel = _interopRequireWildcard(_nodediagnostics_channel);
 var _nodepath = require('node:path'); var path = _interopRequireWildcard(_nodepath);
+
+// src/auto-instrumentations/patch-tracing-channel.ts
+function patchTracingChannel(tracingChannelFn) {
+  const dummyChannel = tracingChannelFn("__braintrust_probe__");
+  const TracingChannel = _optionalChain([dummyChannel, 'optionalAccess', _2 => _2.constructor]);
+  if (!_optionalChain([TracingChannel, 'optionalAccess', _3 => _3.prototype])) {
+    return;
+  }
+  if (!Object.getOwnPropertyDescriptor(TracingChannel.prototype, "hasSubscribers")) {
+    Object.defineProperty(TracingChannel.prototype, "hasSubscribers", {
+      configurable: true,
+      enumerable: false,
+      get() {
+        return Boolean(
+          _optionalChain([this, 'access', _4 => _4.start, 'optionalAccess', _5 => _5.hasSubscribers]) || _optionalChain([this, 'access', _6 => _6.end, 'optionalAccess', _7 => _7.hasSubscribers]) || _optionalChain([this, 'access', _8 => _8.asyncStart, 'optionalAccess', _9 => _9.hasSubscribers]) || _optionalChain([this, 'access', _10 => _10.asyncEnd, 'optionalAccess', _11 => _11.hasSubscribers]) || _optionalChain([this, 'access', _12 => _12.error, 'optionalAccess', _13 => _13.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;
+        _optionalChain([error, 'optionalAccess', _14 => _14.publish, 'call', _15 => _15(context)]);
+        _optionalChain([asyncStart, 'optionalAccess', _16 => _16.publish, 'call', _17 => _17(context)]);
+        _optionalChain([asyncEnd, 'optionalAccess', _18 => _18.publish, 'call', _19 => _19(context)]);
+        return Promise.reject(err);
+      }
+      function resolve(result) {
+        context.result = result;
+        _optionalChain([asyncStart, 'optionalAccess', _20 => _20.publish, 'call', _21 => _21(context)]);
+        _optionalChain([asyncEnd, 'optionalAccess', _22 => _22.publish, 'call', _23 => _23(context)]);
+        return result;
+      }
+      return start.runStores(context, () => {
+        try {
+          const result = Reflect.apply(fn, thisArg, args);
+          _optionalChain([end, 'optionalAccess', _24 => _24.publish, 'call', _25 => _25(context)]);
+          if (result && (typeof result === "object" || typeof result === "function") && typeof result.then === "function") {
+            return result.then(resolve, reject2);
+          }
+          context.result = result;
+          _optionalChain([asyncStart, 'optionalAccess', _26 => _26.publish, 'call', _27 => _27(context)]);
+          _optionalChain([asyncEnd, 'optionalAccess', _28 => _28.publish, 'call', _29 => _29(context)]);
+          return result;
+        } catch (err) {
+          context.error = err;
+          _optionalChain([error, 'optionalAccess', _30 => _30.publish, 'call', _31 => _31(context)]);
+          _optionalChain([end, 'optionalAccess', _32 => _32.publish, 'call', _33 => _33(context)]);
+          throw err;
+        }
+      });
+    };
+  }
+}
+
+// src/node/config.ts
 var _promises = require('node:fs/promises'); var fs = _interopRequireWildcard(_promises);
 var _nodeos = require('node:os'); var os = _interopRequireWildcard(_nodeos);
 var _nodefs = require('node:fs'); var fsSync = _interopRequireWildcard(_nodefs);
@@ -22,8 +80,54 @@ var DefaultAsyncLocalStorage = class {
     return void 0;
   }
 };
-var DefaultTracingChannel = (_class = class {constructor() { _class.prototype.__init.call(this); }
+var DefaultChannel = (_class = class {
+  constructor(name) {;_class.prototype.__init.call(this);
+    this.name = name;
+  }
   __init() {this.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);
+  }
+}, _class);
+var DefaultTracingChannel = class {
+  
+  
+  
+  
+  
+  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 = _nullishCoalesce(nameOrChannels.start, () => ( new DefaultChannel("tracing:start")));
+    this.end = _nullishCoalesce(nameOrChannels.end, () => ( new DefaultChannel("tracing:end")));
+    this.asyncStart = _nullishCoalesce(nameOrChannels.asyncStart, () => ( new DefaultChannel("tracing:asyncStart")));
+    this.asyncEnd = _nullishCoalesce(nameOrChannels.asyncEnd, () => ( new DefaultChannel("tracing:asyncEnd")));
+    this.error = _nullishCoalesce(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) {
@@ -41,7 +145,7 @@ var DefaultTracingChannel = (_class = class {constructor() { _class.prototype.__
   traceCallback(fn, _position, _message, thisArg, ...args) {
     return fn.apply(thisArg, args);
   }
-}, _class);
+};
 var iso = {
   buildType: "unknown",
   // Will be set by configureBrowser() or configureNode()
@@ -51,7 +155,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,
@@ -111,8 +215,8 @@ function setDebugLogStateResolver(resolver) {
   debugLogStateResolver = resolver;
 }
 function resolveDebugLogLevel(state) {
-  const stateLevel = _optionalChain([state, 'optionalAccess', _2 => _2.getDebugLogLevel, 'optionalCall', _3 => _3()]);
-  const hasStateOverride = _nullishCoalesce(_optionalChain([state, 'optionalAccess', _4 => _4.hasDebugLogLevelOverride, 'optionalCall', _5 => _5()]), () => ( false));
+  const stateLevel = _optionalChain([state, 'optionalAccess', _34 => _34.getDebugLogLevel, 'optionalCall', _35 => _35()]);
+  const hasStateOverride = _nullishCoalesce(_optionalChain([state, 'optionalAccess', _36 => _36.hasDebugLogLevelOverride, 'optionalCall', _37 => _37()]), () => ( false));
   if (hasStateOverride) {
     return stateLevel;
   }
@@ -141,7 +245,7 @@ function emit(method, state, args) {
   }
 }
 function createDebugLogger(state) {
-  const resolveState = () => _nullishCoalesce(state, () => ( _optionalChain([debugLogStateResolver, 'optionalCall', _6 => _6()])));
+  const resolveState = () => _nullishCoalesce(state, () => ( _optionalChain([debugLogStateResolver, 'optionalCall', _38 => _38()])));
   return {
     info(...args) {
       emit("info", resolveState(), args);
@@ -186,7 +290,7 @@ async function getBaseBranch(remote = void 0) {
     if (git === null) {
       throw new Error("Not in a git repo");
     }
-    const remoteName = await _asyncNullishCoalesce(remote, async () => ( await _asyncOptionalChain([(await git.getRemotes()), 'access', async _7 => _7[0], 'optionalAccess', async _8 => _8.name])));
+    const remoteName = await _asyncNullishCoalesce(remote, async () => ( await _asyncOptionalChain([(await git.getRemotes()), 'access', async _39 => _39[0], 'optionalAccess', async _40 => _40.name])));
     if (!remoteName) {
       throw new Error("No remote found");
     }
@@ -279,7 +383,7 @@ async function getRepoInfo(settings) {
     return repo;
   }
   let sanitized = {};
-  _optionalChain([settings, 'access', _9 => _9.fields, 'optionalAccess', _10 => _10.forEach, 'call', _11 => _11((field) => {
+  _optionalChain([settings, 'access', _41 => _41.fields, 'optionalAccess', _42 => _42.forEach, 'call', _43 => _43((field) => {
     sanitized = { ...sanitized, [field]: repo[field] };
   })]);
   return sanitized;
@@ -365,9 +469,9 @@ function getCallerLocation() {
   const entries = getStackTrace();
   for (const frame of entries) {
     if (thisDir === void 0) {
-      thisDir = _optionalChain([isomorph_default, 'access', _12 => _12.pathDirname, 'optionalCall', _13 => _13(frame.fileName)]);
+      thisDir = _optionalChain([isomorph_default, 'access', _44 => _44.pathDirname, 'optionalCall', _45 => _45(frame.fileName)]);
     }
-    if (_optionalChain([isomorph_default, 'access', _14 => _14.pathDirname, 'optionalCall', _15 => _15(frame.fileName)]) !== thisDir) {
+    if (_optionalChain([isomorph_default, 'access', _46 => _46.pathDirname, 'optionalCall', _47 => _47(frame.fileName)]) !== thisDir) {
       return {
         caller_functionname: frame.functionName,
         caller_filename: frame.fileName,
@@ -614,7 +718,7 @@ var SpanComponentsV1 = class _SpanComponentsV1 {
     return {
       objectType: this.objectType,
       objectId: this.objectId,
-      rowIds: _optionalChain([this, 'access', _16 => _16.rowIds, 'optionalAccess', _17 => _17.toObject, 'call', _18 => _18()])
+      rowIds: _optionalChain([this, 'access', _48 => _48.rowIds, 'optionalAccess', _49 => _49.toObject, 'call', _50 => _50()])
     };
   }
 };
@@ -828,7 +932,7 @@ var SpanComponentsV2 = class _SpanComponentsV2 {
       objectType: this.objectType,
       objectId: this.objectId,
       computeObjectMetadataArgs: this.computeObjectMetadataArgs,
-      rowIds: _optionalChain([this, 'access', _19 => _19.rowIds, 'optionalAccess', _20 => _20.toObject, 'call', _21 => _21()])
+      rowIds: _optionalChain([this, 'access', _51 => _51.rowIds, 'optionalAccess', _52 => _52.toObject, 'call', _53 => _53()])
     };
   }
 };
@@ -1368,20 +1472,20 @@ function slugify(text, options) {
     \u00FF: "y"
   };
   const replacement = "-";
-  const trim = _optionalChain([options, 'optionalAccess', _22 => _22.trim]) !== false;
+  const trim = _optionalChain([options, 'optionalAccess', _54 => _54.trim]) !== false;
   let slug = text.normalize().split("").reduce((result, ch) => {
     const mapped = charMap[ch] || ch;
     const appendChar = mapped === replacement ? " " : mapped;
     return result + appendChar.replace(/[^\w\s$*_+~.()'"!\-:@]+/g, "");
   }, "");
-  if (_optionalChain([options, 'optionalAccess', _23 => _23.strict])) {
+  if (_optionalChain([options, 'optionalAccess', _55 => _55.strict])) {
     slug = slug.replace(/[^A-Za-z0-9\s]/g, "");
   }
   if (trim) {
     slug = slug.trim();
   }
   slug = slug.replace(/\s+/g, replacement);
-  if (_optionalChain([options, 'optionalAccess', _24 => _24.lower])) {
+  if (_optionalChain([options, 'optionalAccess', _56 => _56.lower])) {
     slug = slug.toLowerCase();
   }
   return slug;
@@ -2334,6 +2438,8 @@ var Experiment = _v3.z.object({
   deleted_at: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   dataset_id: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   dataset_version: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
+  parameters_id: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
+  parameters_version: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   public: _v3.z.boolean(),
   user_id: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   metadata: _v3.z.union([_v3.z.object({}).partial().passthrough(), _v3.z.null()]).optional(),
@@ -2356,7 +2462,11 @@ var SpanType = _v3.z.union([
   _v3.z.null()
 ]);
 var SpanAttributes = _v3.z.union([
-  _v3.z.object({ name: _v3.z.union([_v3.z.string(), _v3.z.null()]), type: SpanType }).partial().passthrough(),
+  _v3.z.object({
+    name: _v3.z.union([_v3.z.string(), _v3.z.null()]),
+    type: SpanType,
+    purpose: _v3.z.union([_v3.z.literal("scorer"), _v3.z.null()])
+  }).partial().passthrough(),
   _v3.z.null()
 ]);
 var ExperimentEvent = _v3.z.object({
@@ -2796,6 +2906,7 @@ var FunctionId = _v3.z.union([
       version: _v3.z.string()
     }),
     code: _v3.z.string(),
+    function_type: FunctionTypeEnum.and(_v3.z.unknown()).optional(),
     name: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional()
   }),
   _v3.z.object({
@@ -3025,7 +3136,12 @@ var TopicAutomationConfig = _v3.z.object({
   topic_map_functions: _v3.z.array(TopicMapFunctionAutomation),
   scope: _v3.z.union([SpanScope, TraceScope, GroupScope, _v3.z.null()]).optional(),
   data_scope: TopicAutomationDataScope.optional(),
-  btql_filter: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional()
+  btql_filter: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
+  backfill_time_range: _v3.z.union([
+    _v3.z.string(),
+    _v3.z.object({ from: _v3.z.string(), to: _v3.z.string() }),
+    _v3.z.null()
+  ]).optional()
 });
 var ProjectAutomation = _v3.z.object({
   id: _v3.z.string().uuid(),
@@ -3508,8 +3624,8 @@ var mustachePlugin = {
   defaultOptions: { strict: true, escape: jsonEscape },
   createRenderer() {
     const opts = _nullishCoalesce(this.defaultOptions, () => ( {}));
-    const escapeFn = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _25 => _25.escape]), () => ( jsonEscape));
-    const strictDefault = typeof _optionalChain([opts, 'optionalAccess', _26 => _26.strict]) === "boolean" ? opts.strict : true;
+    const escapeFn = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _57 => _57.escape]), () => ( jsonEscape));
+    const strictDefault = typeof _optionalChain([opts, 'optionalAccess', _58 => _58.strict]) === "boolean" ? opts.strict : true;
     return {
       render(template, variables, escape, strict) {
         const esc = _nullishCoalesce(escape, () => ( escapeFn));
@@ -3543,7 +3659,7 @@ var TemplatePluginRegistry = (_class5 = class {constructor() { _class5.prototype
     return Array.from(this.plugins.keys());
   }
   get(name) {
-    return _optionalChain([this, 'access', _27 => _27.plugins, 'access', _28 => _28.get, 'call', _29 => _29(name), 'optionalAccess', _30 => _30.renderer]);
+    return _optionalChain([this, 'access', _59 => _59.plugins, 'access', _60 => _60.get, 'call', _61 => _61(name), 'optionalAccess', _62 => _62.renderer]);
   }
   isRegistered(name) {
     return this.plugins.has(name);
@@ -4177,7 +4293,7 @@ var SpanCache = (_class6 = class {
   // Small in-memory index tracking which rootSpanIds have data
   __init14() {this.rootSpanIndex = /* @__PURE__ */ new Set()}
   constructor(options) {;_class6.prototype.__init8.call(this);_class6.prototype.__init9.call(this);_class6.prototype.__init10.call(this);_class6.prototype.__init11.call(this);_class6.prototype.__init12.call(this);_class6.prototype.__init13.call(this);_class6.prototype.__init14.call(this);_class6.prototype.__init15.call(this);_class6.prototype.__init16.call(this);_class6.prototype.__init17.call(this);
-    this._explicitlyDisabled = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _31 => _31.disabled]), () => ( false));
+    this._explicitlyDisabled = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _63 => _63.disabled]), () => ( false));
   }
   /**
    * Disable the cache at runtime. This is called automatically when
@@ -4448,6 +4564,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 = _v3.z.object({
   id: _v3.z.string().uuid(),
@@ -4464,6 +4583,12 @@ var parametersRowSchema = _v3.z.object({
   }),
   metadata: _v3.z.union([_v3.z.object({}).partial().passthrough(), _v3.z.null()]).optional()
 });
+var InlineAttachmentReferenceSchema = _v3.z.object({
+  type: _v3.z.literal("inline_attachment"),
+  src: _v3.z.string().min(1),
+  content_type: _v3.z.string().optional(),
+  filename: _v3.z.string().optional()
+});
 var LoginInvalidOrgError = class extends Error {
   constructor(message) {
     super(message);
@@ -4504,13 +4629,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 {
   
+  
   constructor() {
     super();
     this._currentSpan = isomorph_default.newAsyncLocalStorage();
+    this[BRAINTRUST_CURRENT_SPAN_STORE] = this._currentSpan;
   }
   getParentSpanIds() {
     const currentSpan2 = this._currentSpan.getStore();
@@ -4561,7 +4691,7 @@ var NoopSpan = (_class7 = class {
     return this;
   }
   end(args) {
-    return _nullishCoalesce(_optionalChain([args, 'optionalAccess', _32 => _32.endTime]), () => ( getCurrentUnixTimestamp()));
+    return _nullishCoalesce(_optionalChain([args, 'optionalAccess', _64 => _64.endTime]), () => ( getCurrentUnixTimestamp()));
   }
   async export() {
     return "";
@@ -4717,6 +4847,9 @@ var BraintrustState = (_class8 = class _BraintrustState {
   resetIdGenState() {
     this._idGenerator = null;
   }
+  [RESET_CONTEXT_MANAGER_STATE]() {
+    this._contextManager = null;
+  }
   get idGenerator() {
     if (this._idGenerator === null) {
       this._idGenerator = getIdGenerator();
@@ -4823,8 +4956,8 @@ var BraintrustState = (_class8 = class _BraintrustState {
   setFetch(fetch2) {
     this.loginParams.fetch = fetch2;
     this.fetch = fetch2;
-    _optionalChain([this, 'access', _33 => _33._apiConn, 'optionalAccess', _34 => _34.setFetch, 'call', _35 => _35(fetch2)]);
-    _optionalChain([this, 'access', _36 => _36._appConn, 'optionalAccess', _37 => _37.setFetch, 'call', _38 => _38(fetch2)]);
+    _optionalChain([this, 'access', _65 => _65._apiConn, 'optionalAccess', _66 => _66.setFetch, 'call', _67 => _67(fetch2)]);
+    _optionalChain([this, 'access', _68 => _68._appConn, 'optionalAccess', _69 => _69.setFetch, 'call', _70 => _70(fetch2)]);
   }
   setMaskingFunction(maskingFunction) {
     this.bgLogger().setMaskingFunction(maskingFunction);
@@ -5526,8 +5659,8 @@ function _getOrgName(orgName) {
   return orgName || isomorph_default.getEnv("BRAINTRUST_ORG_NAME") || void 0;
 }
 function _getLinkBaseUrl(state, linkArgs) {
-  const appUrl = _getAppUrl(state.appUrl || _optionalChain([linkArgs, 'optionalAccess', _39 => _39.app_url]));
-  const orgName = _getOrgName(state.orgName || _optionalChain([linkArgs, 'optionalAccess', _40 => _40.org_name]));
+  const appUrl = _getAppUrl(state.appUrl || _optionalChain([linkArgs, 'optionalAccess', _71 => _71.app_url]));
+  const orgName = _getOrgName(state.orgName || _optionalChain([linkArgs, 'optionalAccess', _72 => _72.org_name]));
   if (!orgName) {
     return null;
   }
@@ -5537,9 +5670,9 @@ async function permalink(slug, opts) {
   if (slug === "") {
     return NOOP_SPAN_PERMALINK;
   }
-  const state = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _41 => _41.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _73 => _73.state]), () => ( _globalState));
   const getOrgName = async () => {
-    if (_optionalChain([opts, 'optionalAccess', _42 => _42.orgName])) {
+    if (_optionalChain([opts, 'optionalAccess', _74 => _74.orgName])) {
       return opts.orgName;
     }
     await state.login({});
@@ -5549,7 +5682,7 @@ async function permalink(slug, opts) {
     return state.orgName;
   };
   const getAppUrl = async () => {
-    if (_optionalChain([opts, 'optionalAccess', _43 => _43.appUrl])) {
+    if (_optionalChain([opts, 'optionalAccess', _75 => _75.appUrl])) {
       return opts.appUrl;
     }
     await state.login({});
@@ -5684,7 +5817,7 @@ var Logger = (_class9 = class {
    * @returns The `id` of the logged event.
    */
   log(event, options) {
-    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _44 => _44.allowConcurrentWithSpans])) {
+    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _76 => _76.allowConcurrentWithSpans])) {
       throw new Error(
         "Cannot run toplevel `log` method while using spans. To log to the span, call `logger.traced` and then log with `span.log`"
       );
@@ -5752,12 +5885,12 @@ var Logger = (_class9 = class {
       state: this.state,
       ...startSpanParentArgs({
         state: this.state,
-        parent: _optionalChain([args, 'optionalAccess', _45 => _45.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _77 => _77.parent]),
         parentObjectType: this.parentObjectType(),
         parentObjectId: this.lazyId,
         parentComputeObjectMetadataArgs: this.computeMetadataArgs,
-        parentSpanIds: _optionalChain([args, 'optionalAccess', _46 => _46.parentSpanIds]),
-        propagatedEvent: _optionalChain([args, 'optionalAccess', _47 => _47.propagatedEvent])
+        parentSpanIds: _optionalChain([args, 'optionalAccess', _78 => _78.parentSpanIds]),
+        propagatedEvent: _optionalChain([args, 'optionalAccess', _79 => _79.propagatedEvent])
       }),
       defaultRootType: "task" /* TASK */
     });
@@ -6092,7 +6225,7 @@ var HTTPBackgroundLogger = (_class10 = class _HTTPBackgroundLogger {
       this.queue.clear();
       return;
     }
-    const batchSize = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _48 => _48.batchSize]), () => ( this.defaultBatchSize));
+    const batchSize = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _80 => _80.batchSize]), () => ( this.defaultBatchSize));
     const wrappedItems = this.queue.drain();
     if (wrappedItems.length === 0) {
       return;
@@ -6406,10 +6539,10 @@ Error: ${errorText}`;
         } catch (err) {
           if (err instanceof AggregateError) {
             for (const e of err.errors) {
-              _optionalChain([this, 'access', _49 => _49.onFlushError, 'optionalCall', _50 => _50(e)]);
+              _optionalChain([this, 'access', _81 => _81.onFlushError, 'optionalCall', _82 => _82(e)]);
             }
           } else {
-            _optionalChain([this, 'access', _51 => _51.onFlushError, 'optionalCall', _52 => _52(err)]);
+            _optionalChain([this, 'access', _83 => _83.onFlushError, 'optionalCall', _84 => _84(err)]);
           }
           this.activeFlushError = err;
         } finally {
@@ -6453,6 +6586,7 @@ function init(projectOrOptions, optionalOptions) {
     experiment,
     description,
     dataset,
+    parameters,
     baseExperiment,
     isPublic,
     open: open2,
@@ -6570,6 +6704,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;
       }
@@ -6824,24 +6969,24 @@ async function loginToState(options = {}) {
   return state;
 }
 function currentExperiment(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _53 => _53.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _85 => _85.state]), () => ( _globalState));
   return state.currentExperiment;
 }
 function currentLogger(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _54 => _54.state]), () => ( _globalState));
-  return castLogger(state.currentLogger, _optionalChain([options, 'optionalAccess', _55 => _55.asyncFlush]));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _86 => _86.state]), () => ( _globalState));
+  return castLogger(state.currentLogger, _optionalChain([options, 'optionalAccess', _87 => _87.asyncFlush]));
 }
 function currentSpan(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _56 => _56.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _88 => _88.state]), () => ( _globalState));
   return _nullishCoalesce(state.contextManager.getCurrentSpan(), () => ( NOOP_SPAN));
 }
 function getSpanParentObject(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _57 => _57.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _89 => _89.state]), () => ( _globalState));
   const parentSpan = currentSpan({ state });
   if (!Object.is(parentSpan, NOOP_SPAN)) {
     return parentSpan;
   }
-  const parentStr = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _58 => _58.parent]), () => ( state.currentParent.getStore()));
+  const parentStr = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _90 => _90.parent]), () => ( state.currentParent.getStore()));
   if (parentStr) return getSpanComponentsClass().fromStr(parentStr);
   const experiment = currentExperiment();
   if (experiment) {
@@ -6870,7 +7015,7 @@ function traced(callback, args) {
   const { span, isSyncFlushLogger } = startSpanAndIsLogger(args);
   const ret = runCatchFinally(
     () => {
-      if (_nullishCoalesce(_optionalChain([args, 'optionalAccess', _59 => _59.setCurrent]), () => ( true))) {
+      if (_nullishCoalesce(_optionalChain([args, 'optionalAccess', _91 => _91.setCurrent]), () => ( true))) {
         return withCurrent(span, callback);
       } else {
         return callback(span);
@@ -6882,7 +7027,7 @@ function traced(callback, args) {
     },
     () => span.end()
   );
-  if (_optionalChain([args, 'optionalAccess', _60 => _60.asyncFlush]) === void 0 || _optionalChain([args, 'optionalAccess', _61 => _61.asyncFlush])) {
+  if (_optionalChain([args, 'optionalAccess', _92 => _92.asyncFlush]) === void 0 || _optionalChain([args, 'optionalAccess', _93 => _93.asyncFlush])) {
     return ret;
   } else {
     return (async () => {
@@ -6898,14 +7043,14 @@ function startSpan(args) {
   return startSpanAndIsLogger(args).span;
 }
 async function flush(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _62 => _62.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _94 => _94.state]), () => ( _globalState));
   return await state.bgLogger().flush();
 }
 function startSpanAndIsLogger(args) {
-  const state = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _63 => _63.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _95 => _95.state]), () => ( _globalState));
   const parentObject = getSpanParentObject({
-    asyncFlush: _optionalChain([args, 'optionalAccess', _64 => _64.asyncFlush]),
-    parent: _optionalChain([args, 'optionalAccess', _65 => _65.parent]),
+    asyncFlush: _optionalChain([args, 'optionalAccess', _96 => _96.asyncFlush]),
+    parent: _optionalChain([args, 'optionalAccess', _97 => _97.parent]),
     state
   });
   if (parentObject instanceof SpanComponentsV3 || parentObject instanceof SpanComponentsV4) {
@@ -6922,14 +7067,14 @@ function startSpanAndIsLogger(args) {
       ),
       parentComputeObjectMetadataArgs: _nullishCoalesce(parentObject.data.compute_object_metadata_args, () => ( void 0)),
       parentSpanIds,
-      propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _66 => _66.propagatedEvent]), () => ( // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _98 => _98.propagatedEvent]), () => ( // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       (_nullishCoalesce(parentObject.data.propagated_event, () => ( void 0)))))
     });
     return {
       span,
       isSyncFlushLogger: parentObject.data.object_type === 2 /* PROJECT_LOGS */ && // Since there's no parent logger here, we're free to choose the async flush
       // behavior, and therefore propagate along whatever we get from the arguments
-      _optionalChain([args, 'optionalAccess', _67 => _67.asyncFlush]) === false
+      _optionalChain([args, 'optionalAccess', _99 => _99.asyncFlush]) === false
     };
   } else {
     const span = parentObject.startSpan(args);
@@ -7077,10 +7222,10 @@ function extractAttachments(event, attachments) {
       event[key] = value.reference;
       continue;
     }
-    if (_optionalChain([value, 'optionalAccess', _68 => _68.type]) === BRAINTRUST_ATTACHMENT && value.key && !value.uploader) {
+    if (_optionalChain([value, 'optionalAccess', _100 => _100.type]) === BRAINTRUST_ATTACHMENT && value.key && !value.uploader) {
       continue;
     }
-    if (_optionalChain([value, 'optionalAccess', _69 => _69.reference, 'optionalAccess', _70 => _70.type]) === BRAINTRUST_ATTACHMENT && _optionalChain([value, 'optionalAccess', _71 => _71.uploader])) {
+    if (_optionalChain([value, 'optionalAccess', _101 => _101.reference, 'optionalAccess', _102 => _102.type]) === BRAINTRUST_ATTACHMENT && _optionalChain([value, 'optionalAccess', _103 => _103.uploader])) {
       const attachment = new Attachment({
         data: value.dataDebugString,
         filename: value.reference.filename,
@@ -7164,7 +7309,7 @@ var ObjectFetcher = (_class11 = class {
     const state = await this.getState();
     const objectId = await this.id;
     const batchLimit = _nullishCoalesce(batchSize, () => ( DEFAULT_FETCH_BATCH_SIZE));
-    const internalLimit = _optionalChain([this, 'access', _72 => _72._internal_btql, 'optionalAccess', _73 => _73.limit]);
+    const internalLimit = _optionalChain([this, 'access', _104 => _104._internal_btql, 'optionalAccess', _105 => _105.limit]);
     const limit = batchSize !== void 0 ? batchSize : _nullishCoalesce(internalLimit, () => ( batchLimit));
     const internalBtqlWithoutReservedQueryKeys = Object.fromEntries(
       Object.entries(_nullishCoalesce(this._internal_btql, () => ( {}))).filter(
@@ -7238,7 +7383,7 @@ var ObjectFetcher = (_class11 = class {
       }
       return;
     }
-    for await (const record of this.fetchRecordsFromApi(_optionalChain([options, 'optionalAccess', _74 => _74.batchSize]))) {
+    for await (const record of this.fetchRecordsFromApi(_optionalChain([options, 'optionalAccess', _106 => _106.batchSize]))) {
       yield record;
     }
   }
@@ -7248,7 +7393,7 @@ var ObjectFetcher = (_class11 = class {
   async fetchedData(options) {
     if (this._fetchedData === void 0) {
       const data = [];
-      for await (const record of this.fetchRecordsFromApi(_optionalChain([options, 'optionalAccess', _75 => _75.batchSize]))) {
+      for await (const record of this.fetchRecordsFromApi(_optionalChain([options, 'optionalAccess', _107 => _107.batchSize]))) {
         data.push(record);
       }
       this._fetchedData = data;
@@ -7343,7 +7488,7 @@ var Experiment2 = (_class12 = class extends ObjectFetcher {
    * @returns The `id` of the logged event.
    */
   log(event, options) {
-    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _76 => _76.allowConcurrentWithSpans])) {
+    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _108 => _108.allowConcurrentWithSpans])) {
       throw new Error(
         "Cannot run toplevel `log` method while using spans. To log to the span, call `experiment.traced` and then log with `span.log`"
       );
@@ -7396,12 +7541,12 @@ var Experiment2 = (_class12 = class extends ObjectFetcher {
       state: this.state,
       ...startSpanParentArgs({
         state: this.state,
-        parent: _optionalChain([args, 'optionalAccess', _77 => _77.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _109 => _109.parent]),
         parentObjectType: this.parentObjectType(),
         parentObjectId: this.lazyId,
         parentComputeObjectMetadataArgs: void 0,
         parentSpanIds: void 0,
-        propagatedEvent: _optionalChain([args, 'optionalAccess', _78 => _78.propagatedEvent])
+        propagatedEvent: _optionalChain([args, 'optionalAccess', _110 => _110.propagatedEvent])
       }),
       defaultRootType: "eval" /* EVAL */
     });
@@ -7745,7 +7890,7 @@ var SpanImpl = (_class13 = class _SpanImpl {
       ...serializableInternalData,
       [IS_MERGE_FIELD]: this.isMerge
     });
-    if (typeof _optionalChain([partialRecord, 'access', _79 => _79.metrics, 'optionalAccess', _80 => _80.end]) === "number") {
+    if (typeof _optionalChain([partialRecord, 'access', _111 => _111.metrics, 'optionalAccess', _112 => _112.end]) === "number") {
       this.loggedEndTime = partialRecord.metrics.end;
     }
     if (this.parentObjectType === 1 /* EXPERIMENT */) {
@@ -7805,18 +7950,18 @@ var SpanImpl = (_class13 = class _SpanImpl {
     );
   }
   startSpan(args) {
-    const parentSpanIds = _optionalChain([args, 'optionalAccess', _81 => _81.parent]) ? void 0 : { spanId: this._spanId, rootSpanId: this._rootSpanId };
+    const parentSpanIds = _optionalChain([args, 'optionalAccess', _113 => _113.parent]) ? void 0 : { spanId: this._spanId, rootSpanId: this._rootSpanId };
     return new _SpanImpl({
       state: this._state,
       ...args,
       ...startSpanParentArgs({
         state: this._state,
-        parent: _optionalChain([args, 'optionalAccess', _82 => _82.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _114 => _114.parent]),
         parentObjectType: this.parentObjectType,
         parentObjectId: this.parentObjectId,
         parentComputeObjectMetadataArgs: this.parentComputeObjectMetadataArgs,
         parentSpanIds,
-        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _83 => _83.propagatedEvent]), () => ( this.propagatedEvent))
+        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _115 => _115.propagatedEvent]), () => ( this.propagatedEvent))
       })
     });
   }
@@ -7830,12 +7975,12 @@ var SpanImpl = (_class13 = class _SpanImpl {
       ...args,
       ...startSpanParentArgs({
         state: this._state,
-        parent: _optionalChain([args, 'optionalAccess', _84 => _84.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _116 => _116.parent]),
         parentObjectType: this.parentObjectType,
         parentObjectId: this.parentObjectId,
         parentComputeObjectMetadataArgs: this.parentComputeObjectMetadataArgs,
         parentSpanIds,
-        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _85 => _85.propagatedEvent]), () => ( this.propagatedEvent))
+        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _117 => _117.propagatedEvent]), () => ( this.propagatedEvent))
       }),
       spanId
     });
@@ -7844,7 +7989,7 @@ var SpanImpl = (_class13 = class _SpanImpl {
     let endTime;
     let internalData = {};
     if (!this.loggedEndTime) {
-      endTime = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _86 => _86.endTime]), () => ( getCurrentUnixTimestamp()));
+      endTime = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _118 => _118.endTime]), () => ( getCurrentUnixTimestamp()));
       internalData = { metrics: { end: endTime } };
     } else {
       endTime = this.loggedEndTime;
@@ -7895,8 +8040,8 @@ var SpanImpl = (_class13 = class _SpanImpl {
     const args = this.parentComputeObjectMetadataArgs;
     switch (this.parentObjectType) {
       case 2 /* PROJECT_LOGS */: {
-        const projectID = _optionalChain([args, 'optionalAccess', _87 => _87.project_id]) || this.parentObjectId.getSync().value;
-        const projectName = _optionalChain([args, 'optionalAccess', _88 => _88.project_name]);
+        const projectID = _optionalChain([args, 'optionalAccess', _119 => _119.project_id]) || this.parentObjectId.getSync().value;
+        const projectName = _optionalChain([args, 'optionalAccess', _120 => _120.project_name]);
         if (projectID) {
           return `${baseUrl}/object?object_type=project_logs&object_id=${projectID}&id=${this._id}`;
         } else if (projectName) {
@@ -7906,7 +8051,7 @@ var SpanImpl = (_class13 = class _SpanImpl {
         }
       }
       case 1 /* EXPERIMENT */: {
-        const expID = _optionalChain([args, 'optionalAccess', _89 => _89.experiment_id]) || _optionalChain([this, 'access', _90 => _90.parentObjectId, 'optionalAccess', _91 => _91.getSync, 'call', _92 => _92(), 'optionalAccess', _93 => _93.value]);
+        const expID = _optionalChain([args, 'optionalAccess', _121 => _121.experiment_id]) || _optionalChain([this, 'access', _122 => _122.parentObjectId, 'optionalAccess', _123 => _123.getSync, 'call', _124 => _124(), 'optionalAccess', _125 => _125.value]);
         if (!expID) {
           return getErrPermlink("provide-experiment-id");
         } else {
@@ -8221,40 +8366,82 @@ var Dataset2 = (_class14 = class extends ObjectFetcher {
     return typeof data === "object" && data !== null && "__braintrust_dataset_marker" in data;
   }
 }, _class14);
-function renderMessage(render, message) {
+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 (e18) {
+    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 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;
@@ -8364,16 +8551,16 @@ var Prompt2 = (_class15 = class _Prompt {
     return "slug" in this.metadata ? this.metadata.slug : this.metadata.id;
   }
   get prompt() {
-    return _optionalChain([this, 'access', _94 => _94.getParsedPromptData, 'call', _95 => _95(), 'optionalAccess', _96 => _96.prompt]);
+    return _optionalChain([this, 'access', _126 => _126.getParsedPromptData, 'call', _127 => _127(), 'optionalAccess', _128 => _128.prompt]);
   }
   get version() {
     return this.metadata[TRANSACTION_ID_FIELD];
   }
   get options() {
-    return _optionalChain([this, 'access', _97 => _97.getParsedPromptData, 'call', _98 => _98(), 'optionalAccess', _99 => _99.options]) || {};
+    return _optionalChain([this, 'access', _129 => _129.getParsedPromptData, 'call', _130 => _130(), 'optionalAccess', _131 => _131.options]) || {};
   }
   get templateFormat() {
-    return _optionalChain([this, 'access', _100 => _100.getParsedPromptData, 'call', _101 => _101(), 'optionalAccess', _102 => _102.template_format]);
+    return _optionalChain([this, 'access', _132 => _132.getParsedPromptData, 'call', _133 => _133(), 'optionalAccess', _134 => _134.template_format]);
   }
   get promptData() {
     return this.getParsedPromptData();
@@ -8411,17 +8598,19 @@ var Prompt2 = (_class15 = 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"
@@ -8521,7 +8710,7 @@ var Prompt2 = (_class15 = 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 = [
@@ -8533,7 +8722,7 @@ var Prompt2 = (_class15 = class _Prompt {
       return {
         type: "chat",
         messages,
-        ..._optionalChain([prompt, 'access', _103 => _103.tools, 'optionalAccess', _104 => _104.trim, 'call', _105 => _105()]) ? {
+        ..._optionalChain([prompt, 'access', _135 => _135.tools, 'optionalAccess', _136 => _136.trim, 'call', _137 => _137()]) ? {
           tools: render(prompt.tools)
         } : void 0
       };
@@ -8749,7 +8938,7 @@ function getChannelSpanInfo(event) {
   if (isObject(event.span_info)) {
     return event.span_info;
   }
-  const firstArg = _optionalChain([event, 'access', _106 => _106.arguments, 'optionalAccess', _107 => _107[0]]);
+  const firstArg = _optionalChain([event, 'access', _138 => _138.arguments, 'optionalAccess', _139 => _139[0]]);
   if (hasChannelSpanInfo(firstArg)) {
     return firstArg.span_info;
   }
@@ -8760,13 +8949,13 @@ function buildStartSpanArgs(config, event) {
   const spanAttributes = {
     type: config.type
   };
-  if (isObject(_optionalChain([spanInfo, 'optionalAccess', _108 => _108.spanAttributes]))) {
+  if (isObject(_optionalChain([spanInfo, 'optionalAccess', _140 => _140.spanAttributes]))) {
     mergeDicts(spanAttributes, spanInfo.spanAttributes);
   }
   return {
-    name: typeof _optionalChain([spanInfo, 'optionalAccess', _109 => _109.name]) === "string" && spanInfo.name ? spanInfo.name : config.name,
+    name: typeof _optionalChain([spanInfo, 'optionalAccess', _141 => _141.name]) === "string" && spanInfo.name ? spanInfo.name : config.name,
     spanAttributes,
-    spanInfoMetadata: isObject(_optionalChain([spanInfo, 'optionalAccess', _110 => _110.metadata])) ? spanInfo.metadata : void 0
+    spanInfoMetadata: isObject(_optionalChain([spanInfo, 'optionalAccess', _142 => _142.metadata])) ? spanInfo.metadata : void 0
   };
 }
 function mergeInputMetadata(metadata, spanInfoMetadata) {
@@ -8856,7 +9045,7 @@ var BasePlugin = (_class17 = class {constructor() { _class17.prototype.__init62.
         try {
           const output = config.extractOutput(event.result, event);
           const metrics = config.extractMetrics(event.result, startTime, event);
-          const metadata = _optionalChain([config, 'access', _111 => _111.extractMetadata, 'optionalCall', _112 => _112(event.result, event)]);
+          const metadata = _optionalChain([config, 'access', _143 => _143.extractMetadata, 'optionalCall', _144 => _144(event.result, event)]);
           span.log({
             output,
             ...metadata !== void 0 ? { metadata } : {},
@@ -9149,7 +9338,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)
@@ -9159,6 +9352,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 = _optionalChain([state, 'optionalAccess', _145 => _145.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) {
@@ -9174,15 +9397,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) => {
@@ -9202,7 +9429,7 @@ function traceAsyncChannel(channel2, config) {
           startTime,
           asyncEndEvent
         );
-        const metadata = _optionalChain([config, 'access', _113 => _113.extractMetadata, 'optionalCall', _114 => _114(
+        const metadata = _optionalChain([config, 'access', _146 => _146.extractMetadata, 'optionalCall', _147 => _147(
           asyncEndEvent.result,
           asyncEndEvent
         )]);
@@ -9224,6 +9451,7 @@ function traceAsyncChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _148 => _148()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9231,15 +9459,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) => {
@@ -9313,6 +9545,16 @@ function traceStreamingChannel(channel2, config) {
         });
         return;
       }
+      if (_optionalChain([config, 'access', _149 => _149.patchResult, 'optionalCall', _150 => _150({
+        channelName,
+        endEvent: asyncEndEvent,
+        result: asyncEndEvent.result,
+        span,
+        startTime
+      })])) {
+        states.delete(event);
+        return;
+      }
       try {
         const output = config.extractOutput(
           asyncEndEvent.result,
@@ -9323,7 +9565,7 @@ function traceStreamingChannel(channel2, config) {
           startTime,
           asyncEndEvent
         );
-        const metadata = _optionalChain([config, 'access', _115 => _115.extractMetadata, 'optionalCall', _116 => _116(
+        const metadata = _optionalChain([config, 'access', _151 => _151.extractMetadata, 'optionalCall', _152 => _152(
           asyncEndEvent.result,
           asyncEndEvent
         )]);
@@ -9345,6 +9587,7 @@ function traceStreamingChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _153 => _153()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9352,15 +9595,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) => {
@@ -9369,8 +9616,17 @@ function traceSyncStreamChannel(channel2, config) {
         return;
       }
       const { span, startTime } = spanData;
-      const resultEvent = event;
-      const stream = resultEvent.result;
+      const endEvent = event;
+      if (_optionalChain([config, 'access', _154 => _154.patchResult, 'optionalCall', _155 => _155({
+        channelName,
+        endEvent,
+        result: endEvent.result,
+        span,
+        startTime
+      })])) {
+        return;
+      }
+      const stream = endEvent.result;
       if (!isSyncStreamLike(stream)) {
         span.end();
         states.delete(event);
@@ -9440,6 +9696,7 @@ function traceSyncStreamChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _156 => _156()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9502,7 +9759,7 @@ function convertDataToBlob(data, mediaType) {
     } else if (typeof Buffer !== "undefined" && data instanceof Buffer) {
       return new Blob([data], { type: mediaType });
     }
-  } catch (e18) {
+  } catch (e19) {
     return null;
   }
   return null;
@@ -9514,7 +9771,7 @@ function processInputAttachments(input) {
   let attachmentIndex = 0;
   const inferMediaTypeFromDataUrl = (value, fallback2) => {
     const mediaTypeMatch = value.match(/^data:([^;]+);/);
-    return _optionalChain([mediaTypeMatch, 'optionalAccess', _117 => _117[1]]) || fallback2;
+    return _optionalChain([mediaTypeMatch, 'optionalAccess', _157 => _157[1]]) || fallback2;
   };
   const toAttachment = (value, mediaType, filename) => {
     const blob = convertDataToBlob(value, mediaType);
@@ -9764,11 +10021,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _118 => _118.choices]);
+          return _optionalChain([result, 'optionalAccess', _158 => _158.choices]);
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _119 => _119.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _159 => _159.usage])),
             result,
             endEvent
           );
@@ -9792,12 +10049,12 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          const embedding = _optionalChain([result, 'optionalAccess', _120 => _120.data, 'optionalAccess', _121 => _121[0], 'optionalAccess', _122 => _122.embedding]);
+          const embedding = _optionalChain([result, 'optionalAccess', _160 => _160.data, 'optionalAccess', _161 => _161[0], 'optionalAccess', _162 => _162.embedding]);
           return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
         },
         extractMetrics: (result, _startTime, endEvent) => {
           return withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _123 => _123.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _163 => _163.usage])),
             result,
             endEvent
           );
@@ -9816,11 +10073,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _124 => _124.choices]);
+          return _optionalChain([result, 'optionalAccess', _164 => _164.choices]);
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _125 => _125.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _165 => _165.usage])),
             result,
             endEvent
           );
@@ -9857,11 +10114,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _126 => _126.results]);
+          return _optionalChain([result, 'optionalAccess', _166 => _166.results]);
         },
         extractMetrics: (result, _startTime, endEvent) => {
           return withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _127 => _127.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _167 => _167.usage])),
             result,
             endEvent
           );
@@ -9880,7 +10137,7 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _128 => _128.output]));
+          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _168 => _168.output]));
         },
         extractMetadata: (result) => {
           if (!result) {
@@ -9891,7 +10148,7 @@ var OpenAIPlugin = class extends BasePlugin {
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _129 => _129.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _169 => _169.usage])),
             result,
             endEvent
           );
@@ -9944,7 +10201,7 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _130 => _130.output]));
+          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _170 => _170.output]));
         },
         extractMetadata: (result) => {
           if (!result) {
@@ -9955,7 +10212,7 @@ var OpenAIPlugin = class extends BasePlugin {
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _131 => _131.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _171 => _171.usage])),
             result,
             endEvent
           );
@@ -10051,7 +10308,7 @@ function aggregateChatCompletionChunks(chunks, streamResult, endEvent) {
         ...parseMetricsFromUsage(chunk.usage)
       };
     }
-    const delta = _optionalChain([chunk, 'access', _132 => _132.choices, 'optionalAccess', _133 => _133[0], 'optionalAccess', _134 => _134.delta]);
+    const delta = _optionalChain([chunk, 'access', _172 => _172.choices, 'optionalAccess', _173 => _173[0], 'optionalAccess', _174 => _174.delta]);
     if (!delta) {
       continue;
     }
@@ -10109,14 +10366,14 @@ function aggregateResponseStreamEvents(chunks, _streamResult, endEvent) {
       continue;
     }
     const response = chunk.response;
-    if (_optionalChain([response, 'optionalAccess', _135 => _135.output]) !== void 0) {
+    if (_optionalChain([response, 'optionalAccess', _175 => _175.output]) !== void 0) {
       output = processImagesInOutput(response.output);
     }
     const { usage: _usage, output: _output, ...rest } = response || {};
     if (Object.keys(rest).length > 0) {
       metadata = rest;
     }
-    metrics = parseMetricsFromUsage(_optionalChain([response, 'optionalAccess', _136 => _136.usage]));
+    metrics = parseMetricsFromUsage(_optionalChain([response, 'optionalAccess', _176 => _176.usage]));
   }
   return {
     output,
@@ -10182,7 +10439,7 @@ var AnthropicPlugin = class extends BasePlugin {
         return message ? { role: message.role, content: message.content } : null;
       },
       extractMetrics: (message, startTime) => {
-        const metrics = parseMetricsFromUsage2(_optionalChain([message, 'optionalAccess', _137 => _137.usage]));
+        const metrics = parseMetricsFromUsage2(_optionalChain([message, 'optionalAccess', _177 => _177.usage]));
         if (startTime) {
           metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
         }
@@ -10197,7 +10454,7 @@ var AnthropicPlugin = class extends BasePlugin {
         const metadata = {};
         const metas = ["stop_reason", "stop_sequence"];
         for (const m of metas) {
-          if (_optionalChain([message, 'optionalAccess', _138 => _138[m]]) !== void 0) {
+          if (_optionalChain([message, 'optionalAccess', _178 => _178[m]]) !== void 0) {
             metadata[m] = message[m];
           }
         }
@@ -10238,15 +10495,15 @@ function aggregateAnthropicStreamChunks(chunks) {
   let metrics = {};
   let metadata = {};
   for (const event of chunks) {
-    switch (_optionalChain([event, 'optionalAccess', _139 => _139.type])) {
+    switch (_optionalChain([event, 'optionalAccess', _179 => _179.type])) {
       case "message_start":
-        if (_optionalChain([event, 'access', _140 => _140.message, 'optionalAccess', _141 => _141.usage])) {
+        if (_optionalChain([event, 'access', _180 => _180.message, 'optionalAccess', _181 => _181.usage])) {
           const initialMetrics = parseMetricsFromUsage2(event.message.usage);
           metrics = { ...metrics, ...initialMetrics };
         }
         break;
       case "content_block_delta":
-        if (_optionalChain([event, 'access', _142 => _142.delta, 'optionalAccess', _143 => _143.type]) === "text_delta") {
+        if (_optionalChain([event, 'access', _182 => _182.delta, 'optionalAccess', _183 => _183.type]) === "text_delta") {
           const text = event.delta.text;
           if (text) {
             deltas.push(text);
@@ -10341,6 +10598,108 @@ function filterFrom(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 _zodtojsonschema = require('zod-to-json-schema');
+var _v4 = require('zod/v4'); var z42 = _interopRequireWildcard(_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 _zodtojsonschema.zodToJsonSchema.call(void 0, 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 (e20) {
+    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({
@@ -10351,6 +10710,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamText",
     kind: "async"
   }),
+  streamTextSync: channel({
+    channelName: "streamText.sync",
+    kind: "sync-stream"
+  }),
   generateObject: channel({
     channelName: "generateObject",
     kind: "async"
@@ -10359,6 +10722,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamObject",
     kind: "async"
   }),
+  streamObjectSync: channel({
+    channelName: "streamObject.sync",
+    kind: "sync-stream"
+  }),
   agentGenerate: channel({
     channelName: "Agent.generate",
     kind: "async"
@@ -10366,6 +10733,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"
   })
 });
 
@@ -10384,6 +10759,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 {
   
   constructor(config = {}) {
@@ -10402,22 +10779,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
       })
     );
@@ -10425,45 +10792,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
       })
     );
@@ -10471,45 +10836,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
       })
     );
@@ -10517,56 +10880,474 @@ 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) => {
+        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) => {
-          const metrics = extractTokenMetrics(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        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 hasModelChildTracing(event) {
+  return _optionalChain([event, 'optionalAccess', _184 => _184.__braintrust_ai_sdk_model_wrapped]) === true;
 }
-function extractMetadataFromParams(params) {
+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 && _optionalChain([self, 'access', _185 => _185.settings, 'optionalAccess', _186 => _186.model]) ? _optionalChain([self, 'access', _187 => _187.settings, 'optionalAccess', _188 => _188.model]) : void 0;
+  const { model, provider } = serializeModelWithProvider(
+    _nullishCoalesce(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 (_optionalChain([rawVal, 'access', _189 => _189.delta, 'optionalAccess', _190 => _190.content])) {
+                    text += rawVal.delta.content;
+                  } else if (_optionalChain([rawVal, 'access', _191 => _191.choices, 'optionalAccess', _192 => _192[0], 'optionalAccess', _193 => _193.delta, 'optionalAccess', _194 => _194.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) {
+        _optionalChain([cleanup, 'access', _195 => _195.pop, 'call', _196 => _196(), 'optionalCall', _197 => _197()]);
+      }
+    } : void 0,
+    modelWrapped
+  };
+}
+function finalizeAISDKChildTracing(event) {
+  const cleanup = _optionalChain([event, 'optionalAccess', _198 => _198.__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 (e21) {
+  }
+  try {
+    if ("object" in result) {
+      const resolvedObject = await Promise.resolve(result.object);
+      if (resolvedObject !== void 0) {
+        outputRecord.object = resolvedObject;
+      }
+    }
+  } catch (e22) {
+  }
+  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 (_optionalChain([gatewayInfo, 'optionalAccess', _199 => _199.provider])) {
+    metadata.provider = gatewayInfo.provider;
+  }
+  if (_optionalChain([gatewayInfo, 'optionalAccess', _200 => _200.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 = _nullishCoalesce(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 = {};
-  let usage = _optionalChain([result, 'optionalAccess', _144 => _144.totalUsage]) || _optionalChain([result, 'optionalAccess', _145 => _145.usage]);
+  let usage = _optionalChain([result, 'optionalAccess', _201 => _201.totalUsage]) || _optionalChain([result, 'optionalAccess', _202 => _202.usage]);
   if (!usage && result) {
     try {
       if ("totalUsage" in result && typeof result.totalUsage !== "function") {
@@ -10574,14 +11355,14 @@ function extractTokenMetrics(result) {
       } else if ("usage" in result && typeof result.usage !== "function") {
         usage = result.usage;
       }
-    } catch (e19) {
+    } catch (e23) {
     }
   }
   if (!usage) {
     return metrics;
   }
   const promptTokens = firstNumber(
-    _optionalChain([usage, 'access', _146 => _146.inputTokens, 'optionalAccess', _147 => _147.total]),
+    _optionalChain([usage, 'access', _203 => _203.inputTokens, 'optionalAccess', _204 => _204.total]),
     usage.inputTokens,
     usage.promptTokens,
     usage.prompt_tokens
@@ -10590,7 +11371,7 @@ function extractTokenMetrics(result) {
     metrics.prompt_tokens = promptTokens;
   }
   const completionTokens = firstNumber(
-    _optionalChain([usage, 'access', _148 => _148.outputTokens, 'optionalAccess', _149 => _149.total]),
+    _optionalChain([usage, 'access', _205 => _205.outputTokens, 'optionalAccess', _206 => _206.total]),
     usage.outputTokens,
     usage.completionTokens,
     usage.completion_tokens
@@ -10612,12 +11393,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;
     }
@@ -10631,7 +11414,8 @@ function aggregateAISDKChunks(chunks) {
       output.toolCalls = lastChunk.toolCalls;
     }
   }
-  return { output, metrics };
+  finalizeAISDKChildTracing(endEvent);
+  return { output, metrics, metadata };
 }
 function extractGetterValues(obj) {
   const getterValues = {};
@@ -10651,17 +11435,58 @@ 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 (e20) {
+    } catch (e24) {
     }
   }
   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 = _optionalChain([output, 'optionalAccess', _207 => _207[name]]);
+      if (isSerializableOutputValue(value)) {
+        serialized[name] = value;
+      }
+    } catch (e25) {
+    }
+  }
+  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 : _optionalChain([model, 'optionalAccess', _150 => _150.modelId]);
-  const explicitProvider = typeof model === "object" ? _optionalChain([model, 'optionalAccess', _151 => _151.provider]) : void 0;
+  const modelId = typeof model === "string" ? model : _optionalChain([model, 'optionalAccess', _208 => _208.modelId]);
+  const explicitProvider = typeof model === "object" ? _optionalChain([model, 'optionalAccess', _209 => _209.provider]) : void 0;
   if (!modelId) {
     return { model: modelId, provider: explicitProvider };
   }
@@ -10684,13 +11509,32 @@ function parseGatewayModelString(modelString) {
   }
   return { model: modelString };
 }
+function extractGatewayRoutingInfo(result) {
+  if (_optionalChain([result, 'optionalAccess', _210 => _210.steps]) && Array.isArray(result.steps) && result.steps.length > 0) {
+    const routing2 = _optionalChain([result, 'access', _211 => _211.steps, 'access', _212 => _212[0], 'optionalAccess', _213 => _213.providerMetadata, 'optionalAccess', _214 => _214.gateway, 'optionalAccess', _215 => _215.routing]);
+    if (routing2) {
+      return {
+        provider: routing2.resolvedProvider || routing2.finalProvider,
+        model: routing2.resolvedProviderApiModelId
+      };
+    }
+  }
+  const routing = _optionalChain([result, 'optionalAccess', _216 => _216.providerMetadata, 'optionalAccess', _217 => _217.gateway, 'optionalAccess', _218 => _218.routing]);
+  if (routing) {
+    return {
+      provider: routing.resolvedProvider || routing.finalProvider,
+      model: routing.resolvedProviderApiModelId
+    };
+  }
+  return null;
+}
 function extractCostFromResult(result) {
-  if (_optionalChain([result, 'optionalAccess', _152 => _152.steps]) && Array.isArray(result.steps) && result.steps.length > 0) {
+  if (_optionalChain([result, 'optionalAccess', _219 => _219.steps]) && Array.isArray(result.steps) && result.steps.length > 0) {
     let totalCost = 0;
     let foundCost = false;
     for (const step of result.steps) {
-      const gateway2 = _optionalChain([step, 'optionalAccess', _153 => _153.providerMetadata, 'optionalAccess', _154 => _154.gateway]);
-      const stepCost = parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _155 => _155.cost])) || parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _156 => _156.marketCost]));
+      const gateway2 = _optionalChain([step, 'optionalAccess', _220 => _220.providerMetadata, 'optionalAccess', _221 => _221.gateway]);
+      const stepCost = parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _222 => _222.cost])) || parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _223 => _223.marketCost]));
       if (stepCost !== void 0 && stepCost > 0) {
         totalCost += stepCost;
         foundCost = true;
@@ -10700,8 +11544,8 @@ function extractCostFromResult(result) {
       return totalCost;
     }
   }
-  const gateway = _optionalChain([result, 'optionalAccess', _157 => _157.providerMetadata, 'optionalAccess', _158 => _158.gateway]);
-  const directCost = parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _159 => _159.cost])) || parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _160 => _160.marketCost]));
+  const gateway = _optionalChain([result, 'optionalAccess', _224 => _224.providerMetadata, 'optionalAccess', _225 => _225.gateway]);
+  const directCost = parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _226 => _226.cost])) || parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _227 => _227.marketCost]));
   if (directCost !== void 0 && directCost > 0) {
     return directCost;
   }
@@ -10853,7 +11697,7 @@ function extractUsageFromMessage(message) {
   const metrics = {};
   let usage;
   if (message.type === "assistant") {
-    usage = _optionalChain([message, 'access', _161 => _161.message, 'optionalAccess', _162 => _162.usage]);
+    usage = _optionalChain([message, 'access', _228 => _228.message, 'optionalAccess', _229 => _229.usage]);
   } else if (message.type === "result") {
     usage = message.usage;
   }
@@ -10893,14 +11737,14 @@ function buildLLMInput(prompt, conversationHistory) {
 async function createLLMSpanForMessages(messages, prompt, conversationHistory, options, startTime, parentSpan) {
   if (messages.length === 0) return void 0;
   const lastMessage = messages[messages.length - 1];
-  if (lastMessage.type !== "assistant" || !_optionalChain([lastMessage, 'access', _163 => _163.message, 'optionalAccess', _164 => _164.usage])) {
+  if (lastMessage.type !== "assistant" || !_optionalChain([lastMessage, 'access', _230 => _230.message, 'optionalAccess', _231 => _231.usage])) {
     return void 0;
   }
   const model = lastMessage.message.model || options.model;
   const usage = extractUsageFromMessage(lastMessage);
   const input = buildLLMInput(prompt, conversationHistory);
   const outputs = messages.map(
-    (m) => _optionalChain([m, 'access', _165 => _165.message, 'optionalAccess', _166 => _166.content]) && _optionalChain([m, 'access', _167 => _167.message, 'optionalAccess', _168 => _168.role]) ? { content: m.message.content, role: m.message.role } : void 0
+    (m) => _optionalChain([m, 'access', _232 => _232.message, 'optionalAccess', _233 => _233.content]) && _optionalChain([m, 'access', _234 => _234.message, 'optionalAccess', _235 => _235.role]) ? { content: m.message.content, role: m.message.role } : void 0
   ).filter(
     (c) => c !== void 0
   );
@@ -10919,7 +11763,7 @@ async function createLLMSpanForMessages(messages, prompt, conversationHistory, o
     metrics: usage
   });
   await span.end();
-  return _optionalChain([lastMessage, 'access', _169 => _169.message, 'optionalAccess', _170 => _170.content]) && _optionalChain([lastMessage, 'access', _171 => _171.message, 'optionalAccess', _172 => _172.role]) ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
+  return _optionalChain([lastMessage, 'access', _236 => _236.message, 'optionalAccess', _237 => _237.content]) && _optionalChain([lastMessage, 'access', _238 => _238.message, 'optionalAccess', _239 => _239.role]) ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
 }
 var ClaudeAgentSDKPlugin = class extends BasePlugin {
   onEnable() {
@@ -10942,8 +11786,8 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
     const handlers = {
       start: (event) => {
         const params = event.arguments[0];
-        const prompt = _optionalChain([params, 'optionalAccess', _173 => _173.prompt]);
-        const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _174 => _174.options]), () => ( {}));
+        const prompt = _optionalChain([params, 'optionalAccess', _240 => _240.prompt]);
+        const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _241 => _241.options]), () => ( {}));
         const span = startSpan({
           name: "Claude Agent",
           spanAttributes: {
@@ -10988,9 +11832,9 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
             onChunk: async (message) => {
               const currentTime = getCurrentUnixTimestamp();
               const params = event.arguments[0];
-              const prompt = _optionalChain([params, 'optionalAccess', _175 => _175.prompt]);
-              const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _176 => _176.options]), () => ( {}));
-              const messageId = _optionalChain([message, 'access', _177 => _177.message, 'optionalAccess', _178 => _178.id]);
+              const prompt = _optionalChain([params, 'optionalAccess', _242 => _242.prompt]);
+              const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _243 => _243.options]), () => ( {}));
+              const messageId = _optionalChain([message, 'access', _244 => _244.message, 'optionalAccess', _245 => _245.id]);
               if (messageId && messageId !== spanData.currentMessageId) {
                 if (spanData.currentMessages.length > 0) {
                   const finalMessage = await createLLMSpanForMessages(
@@ -11005,7 +11849,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
                     spanData.conversationHistory.push(finalMessage);
                   }
                   const lastMessage = spanData.currentMessages[spanData.currentMessages.length - 1];
-                  if (_optionalChain([lastMessage, 'optionalAccess', _179 => _179.message, 'optionalAccess', _180 => _180.usage])) {
+                  if (_optionalChain([lastMessage, 'optionalAccess', _246 => _246.message, 'optionalAccess', _247 => _247.usage])) {
                     const outputTokens = getNumberProperty(
                       lastMessage.message.usage,
                       "output_tokens"
@@ -11017,14 +11861,14 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
                 spanData.currentMessageId = messageId;
                 spanData.currentMessageStartTime = currentTime;
               }
-              if (message.type === "assistant" && _optionalChain([message, 'access', _181 => _181.message, 'optionalAccess', _182 => _182.usage])) {
+              if (message.type === "assistant" && _optionalChain([message, 'access', _248 => _248.message, 'optionalAccess', _249 => _249.usage])) {
                 spanData.currentMessages.push(message);
               }
               if (message.type === "result" && message.usage) {
                 const finalUsageMetrics = extractUsageFromMessage(message);
                 if (spanData.currentMessages.length > 0 && finalUsageMetrics.completion_tokens !== void 0) {
                   const lastMessage = spanData.currentMessages[spanData.currentMessages.length - 1];
-                  if (_optionalChain([lastMessage, 'optionalAccess', _183 => _183.message, 'optionalAccess', _184 => _184.usage])) {
+                  if (_optionalChain([lastMessage, 'optionalAccess', _250 => _250.message, 'optionalAccess', _251 => _251.usage])) {
                     const adjustedTokens = finalUsageMetrics.completion_tokens - spanData.accumulatedOutputTokens;
                     if (adjustedTokens >= 0) {
                       lastMessage.message.usage.output_tokens = adjustedTokens;
@@ -11048,8 +11892,8 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
             onComplete: async () => {
               try {
                 const params = event.arguments[0];
-                const prompt = _optionalChain([params, 'optionalAccess', _185 => _185.prompt]);
-                const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _186 => _186.options]), () => ( {}));
+                const prompt = _optionalChain([params, 'optionalAccess', _252 => _252.prompt]);
+                const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _253 => _253.options]), () => ( {}));
                 if (spanData.currentMessages.length > 0) {
                   const finalMessage = await createLLMSpanForMessages(
                     spanData.currentMessages,
@@ -11256,7 +12100,7 @@ function serializePart(part) {
   return part;
 }
 function serializeTools(params) {
-  if (!_optionalChain([params, 'access', _187 => _187.config, 'optionalAccess', _188 => _188.tools])) {
+  if (!_optionalChain([params, 'access', _254 => _254.config, 'optionalAccess', _255 => _255.tools])) {
     return null;
   }
   try {
@@ -11264,154 +12108,1171 @@ function serializeTools(params) {
       if (typeof tool === "object" && tool.functionDeclarations) {
         return tool;
       }
-      return tool;
+      return tool;
+    });
+  } catch (e26) {
+    return null;
+  }
+}
+function extractMetadata(params) {
+  const metadata = {};
+  if (params.model) {
+    metadata.model = params.model;
+  }
+  if (params.config) {
+    const config = tryToDict(params.config);
+    if (config) {
+      Object.keys(config).forEach((key) => {
+        if (key !== "tools") {
+          metadata[key] = config[key];
+        }
+      });
+    }
+  }
+  return metadata;
+}
+function extractGenerateContentMetrics(response, startTime) {
+  const metrics = {};
+  if (startTime) {
+    const end = getCurrentUnixTimestamp();
+    metrics.duration = end - startTime;
+  }
+  if (_optionalChain([response, 'optionalAccess', _256 => _256.usageMetadata])) {
+    populateUsageMetrics(metrics, response.usageMetadata);
+  }
+  return metrics;
+}
+function populateUsageMetrics(metrics, usage) {
+  if (usage.promptTokenCount !== void 0) {
+    metrics.prompt_tokens = usage.promptTokenCount;
+  }
+  if (usage.candidatesTokenCount !== void 0) {
+    metrics.completion_tokens = usage.candidatesTokenCount;
+  }
+  if (usage.totalTokenCount !== void 0) {
+    metrics.tokens = usage.totalTokenCount;
+  }
+  if (usage.cachedContentTokenCount !== void 0) {
+    metrics.prompt_cached_tokens = usage.cachedContentTokenCount;
+  }
+  if (usage.thoughtsTokenCount !== void 0) {
+    metrics.completion_reasoning_tokens = usage.thoughtsTokenCount;
+  }
+}
+function aggregateGenerateContentChunks(chunks, startTime) {
+  const metrics = {};
+  if (startTime !== void 0) {
+    const end = getCurrentUnixTimestamp();
+    metrics.duration = end - startTime;
+  }
+  let firstTokenTime = null;
+  if (chunks.length > 0 && firstTokenTime === null && startTime !== void 0) {
+    firstTokenTime = getCurrentUnixTimestamp();
+    metrics.time_to_first_token = firstTokenTime - startTime;
+  }
+  if (chunks.length === 0) {
+    return { output: {}, metrics };
+  }
+  let text = "";
+  let thoughtText = "";
+  const otherParts = [];
+  let usageMetadata = null;
+  let lastResponse = null;
+  for (const chunk of chunks) {
+    lastResponse = chunk;
+    if (chunk.usageMetadata) {
+      usageMetadata = chunk.usageMetadata;
+    }
+    if (chunk.candidates && Array.isArray(chunk.candidates)) {
+      for (const candidate of chunk.candidates) {
+        if (_optionalChain([candidate, 'access', _257 => _257.content, 'optionalAccess', _258 => _258.parts])) {
+          for (const part of candidate.content.parts) {
+            if (part.text !== void 0) {
+              if (part.thought) {
+                thoughtText += part.text;
+              } else {
+                text += part.text;
+              }
+            } else if (part.functionCall) {
+              otherParts.push({ functionCall: part.functionCall });
+            } else if (part.codeExecutionResult) {
+              otherParts.push({
+                codeExecutionResult: part.codeExecutionResult
+              });
+            } else if (part.executableCode) {
+              otherParts.push({ executableCode: part.executableCode });
+            }
+          }
+        }
+      }
+    }
+  }
+  const output = {};
+  const parts = [];
+  if (thoughtText) {
+    parts.push({ text: thoughtText, thought: true });
+  }
+  if (text) {
+    parts.push({ text });
+  }
+  parts.push(...otherParts);
+  if (parts.length > 0 && _optionalChain([lastResponse, 'optionalAccess', _259 => _259.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 (e27) {
+    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 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 (e28) {
+      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 _optionalChain([toolContext, 'optionalAccess', _260 => _260.toolCall, 'optionalAccess', _261 => _261.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(_optionalChain([request, 'optionalAccess', _262 => _262.chatGenerationParams])) ? request.chatGenerationParams : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _263 => _263.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _264 => _264.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(_optionalChain([result, 'optionalAccess', _265 => _265.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(_optionalChain([request, 'optionalAccess', _266 => _266.requestBody])) ? request.requestBody : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _267 => _267.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _268 => _268.xTitle]);
+          const { input, ...metadata } = requestBody;
+          return {
+            input,
+            metadata: buildOpenRouterEmbeddingMetadata(
+              metadata,
+              httpReferer,
+              xTitle
+            )
+          };
+        },
+        extractOutput: (result) => {
+          if (!isObject(result)) {
+            return void 0;
+          }
+          const embedding = _optionalChain([result, 'access', _269 => _269.data, 'optionalAccess', _270 => _270[0], 'optionalAccess', _271 => _271.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(_optionalChain([request, 'optionalAccess', _272 => _272.openResponsesRequest])) ? request.openResponsesRequest : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _273 => _273.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _274 => _274.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(_optionalChain([result, 'optionalAccess', _275 => _275.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);
     });
-  } catch (e21) {
-    return null;
   }
-}
-function extractMetadata(params) {
-  const metadata = {};
-  if (params.model) {
-    metadata.model = params.model;
+};
+function normalizeArgs(args) {
+  if (Array.isArray(args)) {
+    return args;
   }
-  if (params.config) {
-    const config = tryToDict(params.config);
-    if (config) {
-      Object.keys(config).forEach((key) => {
-        if (key !== "tools") {
-          metadata[key] = config[key];
-        }
-      });
-    }
+  if (isArrayLike(args)) {
+    return Array.from(args);
   }
-  return metadata;
+  return [args];
 }
-function extractGenerateContentMetrics(response, startTime) {
-  const metrics = {};
-  if (startTime) {
-    const end = getCurrentUnixTimestamp();
-    metrics.duration = end - startTime;
-  }
-  if (_optionalChain([response, 'optionalAccess', _189 => _189.usageMetadata])) {
-    populateUsageMetrics(metrics, response.usageMetadata);
-  }
-  return metrics;
+function isArrayLike(value) {
+  return isObject(value) && "length" in value && typeof value.length === "number" && Number.isInteger(value.length) && value.length >= 0;
 }
-function populateUsageMetrics(metrics, usage) {
-  if (usage.promptTokenCount !== void 0) {
-    metrics.prompt_tokens = usage.promptTokenCount;
-  }
-  if (usage.candidatesTokenCount !== void 0) {
-    metrics.completion_tokens = usage.candidatesTokenCount;
-  }
-  if (usage.totalTokenCount !== void 0) {
-    metrics.tokens = usage.totalTokenCount;
-  }
-  if (usage.cachedContentTokenCount !== void 0) {
-    metrics.prompt_cached_tokens = usage.cachedContentTokenCount;
-  }
-  if (usage.thoughtsTokenCount !== void 0) {
-    metrics.completion_reasoning_tokens = usage.thoughtsTokenCount;
+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 aggregateGenerateContentChunks(chunks, startTime) {
-  const metrics = {};
-  if (startTime !== void 0) {
-    const end = getCurrentUnixTimestamp();
-    metrics.duration = end - startTime;
-  }
-  let firstTokenTime = null;
-  if (chunks.length > 0 && firstTokenTime === null && startTime !== void 0) {
-    firstTokenTime = getCurrentUnixTimestamp();
-    metrics.time_to_first_token = firstTokenTime - startTime;
-  }
-  if (chunks.length === 0) {
-    return { output: {}, metrics };
-  }
-  let text = "";
-  let thoughtText = "";
-  const otherParts = [];
-  let usageMetadata = null;
-  let lastResponse = null;
+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) {
-    lastResponse = chunk;
-    if (chunk.usageMetadata) {
-      usageMetadata = chunk.usageMetadata;
+    metrics = {
+      ...metrics,
+      ...parseOpenRouterMetricsFromUsage(_optionalChain([chunk, 'optionalAccess', _276 => _276.usage]))
+    };
+    const choice = _optionalChain([chunk, 'optionalAccess', _277 => _277.choices, 'optionalAccess', _278 => _278[0]]);
+    const delta = _optionalChain([choice, 'optionalAccess', _279 => _279.delta]);
+    if (!delta) {
+      if (_optionalChain([choice, 'optionalAccess', _280 => _280.finish_reason]) !== void 0) {
+        finishReason = choice.finish_reason;
+      }
+      continue;
     }
-    if (chunk.candidates && Array.isArray(chunk.candidates)) {
-      for (const candidate of chunk.candidates) {
-        if (_optionalChain([candidate, 'access', _190 => _190.content, 'optionalAccess', _191 => _191.parts])) {
-          for (const part of candidate.content.parts) {
-            if (part.text !== void 0) {
-              if (part.thought) {
-                thoughtText += part.text;
-              } else {
-                text += part.text;
-              }
-            } else if (part.functionCall) {
-              otherParts.push({ functionCall: part.functionCall });
-            } else if (part.codeExecutionResult) {
-              otherParts.push({
-                codeExecutionResult: part.codeExecutionResult
-              });
-            } else if (part.executableCode) {
-              otherParts.push({ executableCode: part.executableCode });
-            }
+    if (!role && delta.role) {
+      role = delta.role;
+    }
+    if (typeof delta.content === "string") {
+      content += delta.content;
+    }
+    const choiceFinishReason = _nullishCoalesce(_nullishCoalesce(_optionalChain([choice, 'optionalAccess', _281 => _281.finishReason]), () => ( _optionalChain([choice, 'optionalAccess', _282 => _282.finish_reason]))), () => ( void 0));
+    const deltaFinishReason = _nullishCoalesce(_nullishCoalesce(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 (!_optionalChain([toolDelta, 'optionalAccess', _283 => _283.function])) {
+        continue;
+      }
+      const toolIndex = _nullishCoalesce(toolDelta.index, () => ( 0));
+      const existingToolCall = _optionalChain([toolCalls, 'optionalAccess', _284 => _284[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 output = {};
-  const parts = [];
-  if (thoughtText) {
-    parts.push({ text: thoughtText, thought: true });
-  }
-  if (text) {
-    parts.push({ text });
-  }
-  parts.push(...otherParts);
-  if (parts.length > 0 && _optionalChain([lastResponse, 'optionalAccess', _192 => _192.candidates])) {
-    const candidates = [];
-    for (const candidate of lastResponse.candidates) {
-      const candidateDict = {
-        content: {
-          parts,
-          role: "model"
-        }
-      };
-      if (candidate.finishReason !== void 0) {
-        candidateDict.finishReason = candidate.finishReason;
+      const current = existingToolCall;
+      if (toolDelta.id && !current.id) {
+        current.id = toolDelta.id;
       }
-      if (candidate.safetyRatings) {
-        candidateDict.safetyRatings = candidate.safetyRatings;
+      if (toolDelta.type && !current.type) {
+        current.type = toolDelta.type;
       }
-      candidates.push(candidateDict);
+      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 = _optionalChain([chunk, 'optionalAccess', _285 => _285.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
@@ -11422,8 +13283,9 @@ var BraintrustPlugin = (_class18 = class extends BasePlugin {
   __init66() {this.aiSDKPlugin = null}
   __init67() {this.claudeAgentSDKPlugin = null}
   __init68() {this.googleGenAIPlugin = null}
+  __init69() {this.openRouterPlugin = null}
   constructor(config = {}) {
-    super();_class18.prototype.__init64.call(this);_class18.prototype.__init65.call(this);_class18.prototype.__init66.call(this);_class18.prototype.__init67.call(this);_class18.prototype.__init68.call(this);;
+    super();_class18.prototype.__init64.call(this);_class18.prototype.__init65.call(this);_class18.prototype.__init66.call(this);_class18.prototype.__init67.call(this);_class18.prototype.__init68.call(this);_class18.prototype.__init69.call(this);;
     this.config = config;
   }
   onEnable() {
@@ -11448,6 +13310,10 @@ var BraintrustPlugin = (_class18 = 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) {
@@ -11470,14 +13336,18 @@ var BraintrustPlugin = (_class18 = class extends BasePlugin {
       this.googleGenAIPlugin.disable();
       this.googleGenAIPlugin = null;
     }
+    if (this.openRouterPlugin) {
+      this.openRouterPlugin.disable();
+      this.openRouterPlugin = null;
+    }
   }
 }, _class18);
 
 // src/instrumentation/registry.ts
-var PluginRegistry = (_class19 = class {constructor() { _class19.prototype.__init69.call(this);_class19.prototype.__init70.call(this);_class19.prototype.__init71.call(this); }
-  __init69() {this.braintrustPlugin = null}
-  __init70() {this.config = {}}
-  __init71() {this.enabled = false}
+var PluginRegistry = (_class19 = class {constructor() { _class19.prototype.__init70.call(this);_class19.prototype.__init71.call(this);_class19.prototype.__init72.call(this); }
+  __init70() {this.braintrustPlugin = null}
+  __init71() {this.config = {}}
+  __init72() {this.enabled = false}
   /**
    * Configure which integrations should be enabled.
    * This must be called before any SDK imports to take effect.
@@ -11541,7 +13411,8 @@ var PluginRegistry = (_class19 = class {constructor() { _class19.prototype.__ini
       vercel: true,
       aisdk: true,
       google: true,
-      claudeAgentSDK: true
+      claudeAgentSDK: true,
+      openrouter: true
     };
   }
   /**
@@ -11571,6 +13442,7 @@ function configureNode() {
   isomorph_default.getCallerLocation = getCallerLocation;
   isomorph_default.newAsyncLocalStorage = () => new (0, _nodeasync_hooks.AsyncLocalStorage)();
   isomorph_default.newTracingChannel = (nameOrChannels) => diagnostics_channel.tracingChannel(nameOrChannels);
+  patchTracingChannel(diagnostics_channel.tracingChannel);
   isomorph_default.processOn = (event, handler) => {
     process.on(event, handler);
   };
@@ -11604,7 +13476,7 @@ function configureNode() {
 var _express = require('express'); var _express2 = _interopRequireDefault(_express);
 var _cors = require('cors'); var _cors2 = _interopRequireDefault(_cors);
 
-// ../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();
@@ -11672,10 +13544,10 @@ function invokeCallback(callback, error, value) {
 function isAsync(fn) {
   return fn[Symbol.toStringTag] === "AsyncFunction";
 }
-function isAsyncGenerator(fn) {
+function isAsyncGenerator2(fn) {
   return fn[Symbol.toStringTag] === "AsyncGenerator";
 }
-function isAsyncIterable2(obj) {
+function isAsyncIterable3(obj) {
   return typeof obj[Symbol.asyncIterator] === "function";
 }
 function wrapAsync(asyncFn) {
@@ -11725,10 +13597,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;
@@ -11772,7 +13645,7 @@ function createObjectIterator(obj) {
   };
 }
 function createIterator(coll) {
-  if (isArrayLike(coll)) {
+  if (isArrayLike2(coll)) {
     return createArrayIterator(coll);
   }
   var iterator = getIterator(coll);
@@ -11820,7 +13693,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);
     }
@@ -11843,10 +13716,10 @@ var eachOfLimit$2 = (limit) => {
     if (!obj) {
       return callback(null);
     }
-    if (isAsyncGenerator(obj)) {
+    if (isAsyncGenerator2(obj)) {
       return asyncEachOfLimit(obj, limit, iteratee, callback);
     }
-    if (isAsyncIterable2(obj)) {
+    if (isAsyncIterable3(obj)) {
       return asyncEachOfLimit(obj[Symbol.asyncIterator](), limit, iteratee, callback);
     }
     var nextElem = createIterator(obj);
@@ -11863,7 +13736,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) {
@@ -11906,7 +13779,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);
     }
   }
@@ -11918,7 +13791,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);
@@ -12302,7 +14175,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();
       });
@@ -12433,7 +14306,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) {
@@ -12508,7 +14381,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) {
@@ -12775,10 +14648,10 @@ var SpanFetcher = class _SpanFetcher extends ObjectFetcher {
   }
 };
 var CachedSpanFetcher = (_class20 = class {
-  __init72() {this.spanCache = /* @__PURE__ */ new Map()}
-  __init73() {this.allFetched = false}
+  __init73() {this.spanCache = /* @__PURE__ */ new Map()}
+  __init74() {this.allFetched = false}
   
-  constructor(objectTypeOrFetchFn, objectId, rootSpanId, getState) {;_class20.prototype.__init72.call(this);_class20.prototype.__init73.call(this);
+  constructor(objectTypeOrFetchFn, objectId, rootSpanId, getState) {;_class20.prototype.__init73.call(this);_class20.prototype.__init74.call(this);
     if (typeof objectTypeOrFetchFn === "function") {
       this.fetchFn = objectTypeOrFetchFn;
     } else {
@@ -12793,7 +14666,7 @@ var CachedSpanFetcher = (_class20 = class {
           spanType
         );
         const rows = await fetcher.fetchedData();
-        return rows.filter((row) => _optionalChain([row, 'access', _193 => _193.span_attributes, 'optionalAccess', _194 => _194.purpose]) !== "scorer").map((row) => ({
+        return rows.filter((row) => _optionalChain([row, 'access', _286 => _286.span_attributes, 'optionalAccess', _287 => _287.purpose]) !== "scorer").map((row) => ({
           input: row.input,
           output: row.output,
           metadata: row.metadata,
@@ -12827,7 +14700,7 @@ var CachedSpanFetcher = (_class20 = class {
   async fetchSpans(spanType) {
     const spans = await this.fetchFn(spanType);
     for (const span of spans) {
-      const type = _nullishCoalesce(_optionalChain([span, 'access', _195 => _195.span_attributes, 'optionalAccess', _196 => _196.type]), () => ( ""));
+      const type = _nullishCoalesce(_optionalChain([span, 'access', _288 => _288.span_attributes, 'optionalAccess', _289 => _289.type]), () => ( ""));
       const existing = _nullishCoalesce(this.spanCache.get(type), () => ( []));
       existing.push(span);
       this.spanCache.set(type, existing);
@@ -12851,17 +14724,17 @@ var LocalTrace = (_class21 = class {
   
   
   
-  __init74() {this.spansFlushed = false}
-  __init75() {this.spansFlushPromise = null}
+  __init75() {this.spansFlushed = false}
+  __init76() {this.spansFlushPromise = null}
   
-  __init76() {this.threadCache = /* @__PURE__ */ new Map()}
+  __init77() {this.threadCache = /* @__PURE__ */ new Map()}
   constructor({
     objectType,
     objectId,
     rootSpanId,
     ensureSpansFlushed,
     state
-  }) {;_class21.prototype.__init74.call(this);_class21.prototype.__init75.call(this);_class21.prototype.__init76.call(this);
+  }) {;_class21.prototype.__init75.call(this);_class21.prototype.__init76.call(this);_class21.prototype.__init77.call(this);
     this.objectType = objectType;
     this.objectId = objectId;
     this.rootSpanId = rootSpanId;
@@ -12907,11 +14780,11 @@ var LocalTrace = (_class21 = class {
     const cachedSpans = this.state.spanCache.getByRootSpanId(this.rootSpanId);
     if (cachedSpans && cachedSpans.length > 0) {
       let spans = cachedSpans.filter(
-        (span) => _optionalChain([span, 'access', _197 => _197.span_attributes, 'optionalAccess', _198 => _198.purpose]) !== "scorer"
+        (span) => _optionalChain([span, 'access', _290 => _290.span_attributes, 'optionalAccess', _291 => _291.purpose]) !== "scorer"
       );
       if (spanType && spanType.length > 0) {
         spans = spans.filter(
-          (span) => spanType.includes(_nullishCoalesce(_optionalChain([span, 'access', _199 => _199.span_attributes, 'optionalAccess', _200 => _200.type]), () => ( "")))
+          (span) => spanType.includes(_nullishCoalesce(_optionalChain([span, 'access', _292 => _292.span_attributes, 'optionalAccess', _293 => _293.type]), () => ( "")))
         );
       }
       return spans.map((span) => ({
@@ -12930,7 +14803,7 @@ var LocalTrace = (_class21 = class {
    * Calls the API with the project_default preprocessor (which falls back to "thread").
    */
   async getThread(options) {
-    const cacheKey = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _201 => _201.preprocessor]), () => ( "project_default"));
+    const cacheKey = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _294 => _294.preprocessor]), () => ( "project_default"));
     if (!this.threadCache.has(cacheKey)) {
       const promise = this.fetchThread(options);
       this.threadCache.set(cacheKey, promise);
@@ -12941,7 +14814,7 @@ var LocalTrace = (_class21 = class {
     await this.ensureSpansReady();
     await this.state.login({});
     const result = await invoke({
-      globalFunction: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _202 => _202.preprocessor]), () => ( "project_default")),
+      globalFunction: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _295 => _295.preprocessor]), () => ( "project_default")),
       functionType: "preprocessor",
       input: {
         trace_ref: {
@@ -13005,7 +14878,8 @@ var promptDefinitionSchema = promptContentsSchema.and(
   _v3.z.object({
     model: _v3.z.string(),
     params: ModelParams.optional(),
-    templateFormat: _v3.z.enum(["mustache", "nunjucks", "none"]).optional()
+    templateFormat: _v3.z.enum(["mustache", "nunjucks", "none"]).optional(),
+    environments: _v3.z.array(_v3.z.string()).optional()
   })
 );
 var promptDefinitionWithToolsSchema = promptDefinitionSchema.and(
@@ -13116,10 +14990,10 @@ function validateParametersWithJsonSchema(parameters, schema) {
   const ajv = new (0, _ajv2.default)({ coerceTypes: true, useDefaults: true, strict: false });
   const validate = ajv.compile(schema);
   if (!validate(parameters)) {
-    const errorMessages = _optionalChain([validate, 'access', _203 => _203.errors, 'optionalAccess', _204 => _204.map, 'call', _205 => _205((err) => {
+    const errorMessages = _optionalChain([validate, 'access', _296 => _296.errors, 'optionalAccess', _297 => _297.map, 'call', _298 => _298((err) => {
       const path2 = err.instancePath || "root";
       return `${path2}: ${err.message}`;
-    }), 'access', _206 => _206.join, 'call', _207 => _207(", ")]);
+    }), 'access', _299 => _299.join, 'call', _300 => _300(", ")]);
     throw Error(`Invalid parameters: ${errorMessages}`);
   }
   return parameters;
@@ -13161,6 +15035,22 @@ function initExperiment(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;
@@ -13172,7 +15062,7 @@ function callEvaluatorData(data) {
     baseExperiment
   };
 }
-function isAsyncIterable3(value) {
+function isAsyncIterable4(value) {
   return typeof value === "object" && value !== null && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function isIterable(value) {
@@ -13227,6 +15117,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 : initExperiment(evaluator.state, {
       ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: name },
       experiment: evaluator.experimentName,
@@ -13239,7 +15130,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();
@@ -13294,7 +15186,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 {
@@ -13339,7 +15231,7 @@ async function runEvaluator(experiment, evaluator, progressReporter, filters, st
 }
 async function runEvaluatorInternal(experiment, evaluator, progressReporter, filters, stream, parameters, collectResults, enableCache) {
   if (enableCache) {
-    _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _208 => _208.spanCache, 'optionalAccess', _209 => _209.start, 'call', _210 => _210()]);
+    _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _301 => _301.spanCache, 'optionalAccess', _302 => _302.start, 'call', _303 => _303()]);
   }
   try {
     if (typeof evaluator.data === "string") {
@@ -13375,7 +15267,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     }
     const resolvedDataResult = dataResult instanceof Promise ? await dataResult : dataResult;
     const dataIterable = (() => {
-      if (isAsyncIterable3(resolvedDataResult)) {
+      if (isAsyncIterable4(resolvedDataResult)) {
         return resolvedDataResult;
       }
       if (Array.isArray(resolvedDataResult) || isIterable(resolvedDataResult)) {
@@ -13394,7 +15286,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     const experimentIdPromise = experiment ? (async () => {
       try {
         return await experiment.id;
-      } catch (e22) {
+      } catch (e29) {
         return void 0;
       }
     })() : void 0;
@@ -13450,7 +15342,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             objectType: parentComponents ? spanObjectTypeV3ToTypedString(
               parentComponents.data.object_type
             ) : "experiment",
-            objectId: await _asyncNullishCoalesce(await _asyncOptionalChain([parentComponents, 'optionalAccess', async _211 => _211.data, 'access', async _212 => _212.object_id]), async () => ( (experimentIdPromise ? await _asyncNullishCoalesce(await experimentIdPromise, async () => ( "")) : ""))),
+            objectId: await _asyncNullishCoalesce(await _asyncOptionalChain([parentComponents, 'optionalAccess', async _304 => _304.data, 'access', async _305 => _305.object_id]), async () => ( (experimentIdPromise ? await _asyncNullishCoalesce(await experimentIdPromise, async () => ( "")) : ""))),
             rootSpanId: rootSpan.rootSpanId,
             ensureSpansFlushed,
             state
@@ -13476,10 +15368,10 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                   span,
                   parameters: _nullishCoalesce(parameters, () => ( {})),
                   reportProgress: (event) => {
-                    _optionalChain([stream, 'optionalCall', _213 => _213({
+                    _optionalChain([stream, 'optionalCall', _306 => _306({
                       ...event,
                       id: rootSpan.id,
-                      origin: _optionalChain([baseEvent, 'access', _214 => _214.event, 'optionalAccess', _215 => _215.origin]),
+                      origin: _optionalChain([baseEvent, 'access', _307 => _307.event, 'optionalAccess', _308 => _308.origin]),
                       name: evaluator.evalName,
                       object_type: "task"
                     })]);
@@ -13643,7 +15535,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
               metadata,
               scores: mergedScores,
               error,
-              origin: _optionalChain([baseEvent, 'access', _216 => _216.event, 'optionalAccess', _217 => _217.origin])
+              origin: _optionalChain([baseEvent, 'access', _309 => _309.event, 'optionalAccess', _310 => _310.origin])
             });
           }
         };
@@ -13663,6 +15555,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
       },
       Math.max(_nullishCoalesce(evaluator.maxConcurrency, () => ( Number.MAX_SAFE_INTEGER)), 1)
     );
+    const queueErrors = [];
     const enqueuePromise = (async () => {
       for await (const datum of dataIterable) {
         if (cancelled) {
@@ -13677,8 +15570,12 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             break;
           }
           scheduledTrials++;
-          _optionalChain([progressReporter, 'access', _218 => _218.setTotal, 'optionalCall', _219 => _219(evaluator.evalName, scheduledTrials)]);
-          q.push({ datum, trialIndex });
+          _optionalChain([progressReporter, 'access', _311 => _311.setTotal, 'optionalCall', _312 => _312(evaluator.evalName, scheduledTrials)]);
+          q.pushAsync({ datum, trialIndex }).catch((e) => {
+            if (queueErrors.length < 5) {
+              queueErrors.push(e);
+            }
+          });
         }
       }
     })();
@@ -13726,6 +15623,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) {
@@ -13752,9 +15655,9 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     );
   } finally {
     if (enableCache) {
-      const spanCache = _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _220 => _220.spanCache]);
-      _optionalChain([spanCache, 'optionalAccess', _221 => _221.dispose, 'call', _222 => _222()]);
-      _optionalChain([spanCache, 'optionalAccess', _223 => _223.stop, 'call', _224 => _224()]);
+      const spanCache = _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _313 => _313.spanCache]);
+      _optionalChain([spanCache, 'optionalAccess', _314 => _314.dispose, 'call', _315 => _315()]);
+      _optionalChain([spanCache, 'optionalAccess', _316 => _316.stop, 'call', _317 => _317()]);
     }
   }
 }
@@ -13991,7 +15894,7 @@ async function cachedLogin(options) {
 }
 function makeCheckAuthorized(allowedOrgName) {
   return async (req, _res, next) => {
-    if (!_optionalChain([req, 'access', _225 => _225.ctx, 'optionalAccess', _226 => _226.token])) {
+    if (!_optionalChain([req, 'access', _318 => _318.ctx, 'optionalAccess', _319 => _319.token])) {
       return next(_httperrors2.default.call(void 0, 401, "Unauthorized"));
     }
     try {
@@ -14004,7 +15907,7 @@ function makeCheckAuthorized(allowedOrgName) {
         return next(_httperrors2.default.call(void 0, 403, errorMessage));
       }
       const state = await cachedLogin({
-        apiKey: _optionalChain([req, 'access', _227 => _227.ctx, 'optionalAccess', _228 => _228.token]),
+        apiKey: _optionalChain([req, 'access', _320 => _320.ctx, 'optionalAccess', _321 => _321.token]),
         orgName
       });
       req.ctx.state = state;
@@ -14187,23 +16090,6 @@ var evaluatorDefinitionsSchema = _v3.z.record(
 
 // src/framework2.ts
 
-
-// src/zod/utils.ts
-var _zodtojsonschema = require('zod-to-json-schema');
-var _v4 = require('zod/v4'); var z42 = _interopRequireWildcard(_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 _zodtojsonschema.zodToJsonSchema.call(void 0, schema);
-}
-
-// src/framework2.ts
 var currentFilename = typeof __filename !== "undefined" ? __filename : "unknown";
 var ProjectBuilder = class {
   create(opts) {
@@ -14218,10 +16104,10 @@ var Project2 = (_class22 = class {
   
   
   
-  __init77() {this._publishableCodeFunctions = []}
-  __init78() {this._publishablePrompts = []}
-  __init79() {this._publishableParameters = []}
-  constructor(args) {;_class22.prototype.__init77.call(this);_class22.prototype.__init78.call(this);_class22.prototype.__init79.call(this);
+  __init78() {this._publishableCodeFunctions = []}
+  __init79() {this._publishablePrompts = []}
+  __init80() {this._publishableParameters = []}
+  constructor(args) {;_class22.prototype.__init78.call(this);_class22.prototype.__init79.call(this);_class22.prototype.__init80.call(this);
     _initializeSpanContext();
     this.name = "name" in args ? args.name : void 0;
     this.id = "id" in args ? args.id : void 0;
@@ -14275,10 +16161,10 @@ var Project2 = (_class22 = class {
   }
 }, _class22);
 var ToolBuilder = (_class23 = class {
-  constructor(project) {;_class23.prototype.__init80.call(this);
+  constructor(project) {;_class23.prototype.__init81.call(this);
     this.project = project;
   }
-  __init80() {this.taskCounter = 0}
+  __init81() {this.taskCounter = 0}
   // This type definition is just a catch all so that the implementation can be
   // less specific than the two more specific declarations above.
   create(opts) {
@@ -14305,10 +16191,10 @@ var ToolBuilder = (_class23 = class {
   }
 }, _class23);
 var ScorerBuilder = (_class24 = class {
-  constructor(project) {;_class24.prototype.__init81.call(this);
+  constructor(project) {;_class24.prototype.__init82.call(this);
     this.project = project;
   }
-  __init81() {this.taskCounter = 0}
+  __init82() {this.taskCounter = 0}
   create(opts) {
     this.taskCounter++;
     let resolvedName = opts.name;
@@ -14409,6 +16295,7 @@ var CodePrompt = class {
   
   
   
+  
   constructor(project, prompt, toolFunctions, opts, functionType) {
     this.project = project;
     this.name = opts.name;
@@ -14421,6 +16308,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 = {
@@ -14455,7 +16343,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
     };
   }
 };
@@ -14660,9 +16549,9 @@ function serializeRemoteEvalParametersContainer(parameters) {
     source: null
   };
 }
-var ProjectNameIdMap = (_class25 = class {constructor() { _class25.prototype.__init82.call(this);_class25.prototype.__init83.call(this); }
-  __init82() {this.nameToId = {}}
-  __init83() {this.idToName = {}}
+var ProjectNameIdMap = (_class25 = class {constructor() { _class25.prototype.__init83.call(this);_class25.prototype.__init84.call(this); }
+  __init83() {this.nameToId = {}}
+  __init84() {this.idToName = {}}
   async getId(projectName) {
     if (!(projectName in this.nameToId)) {
       const response = await _internalGetGlobalState().appConn().post_json("api/project/register", {
@@ -14767,7 +16656,7 @@ function runDevServer(evaluators, opts) {
         scores,
         stream
       } = evalBodySchema.parse(req.body);
-      if (!_optionalChain([req, 'access', _229 => _229.ctx, 'optionalAccess', _230 => _230.state])) {
+      if (!_optionalChain([req, 'access', _322 => _322.ctx, 'optionalAccess', _323 => _323.state])) {
         res.status(500).json({ error: "Braintrust state not initialized in request" });
         return;
       }
@@ -14818,12 +16707,12 @@ function runDevServer(evaluators, opts) {
             ...evaluator,
             data: evalData.data,
             scores: evaluator.scores.concat(
-              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _231 => _231.map, 'call', _232 => _232(
+              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _324 => _324.map, 'call', _325 => _325(
                 (score) => makeScorer(
                   state,
                   score.name,
                   score.function_id,
-                  _optionalChain([req, 'access', _233 => _233.ctx, 'optionalAccess', _234 => _234.projectId])
+                  _optionalChain([req, 'access', _326 => _326.ctx, 'optionalAccess', _327 => _327.projectId])
                 )
               )]), () => ( []))
             ),