braintrust 3.5.0 → 3.7.0

package/dev/dist/index.js

@@ -2,6 +2,90 @@
 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 publishRejected(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)]);
+      }
+      function publishResolved(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 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") {
+            if (result.constructor === Promise) {
+              return result.then(
+                (res) => {
+                  publishResolved(res);
+                  return res;
+                },
+                (err) => {
+                  publishRejected(err);
+                  return Promise.reject(err);
+                }
+              );
+            }
+            void result.then(
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              (resolved) => {
+                try {
+                  publishResolved(resolved);
+                } catch (e2) {
+                }
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              (err) => {
+                try {
+                  publishRejected(err);
+                } catch (e3) {
+                }
+              }
+            );
+            return result;
+          }
+          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);
@@ -157,8 +241,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;
   }
@@ -187,7 +271,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);
@@ -221,7 +305,7 @@ async function currentRepo() {
     } else {
       return null;
     }
-  } catch (e2) {
+  } catch (e4) {
     return null;
   }
 }
@@ -232,7 +316,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");
     }
@@ -254,7 +338,7 @@ async function getBaseBranch(remote = void 0) {
           throw new Error(`Could not find HEAD branch in remote ${remoteName}`);
         }
         branch = match[1];
-      } catch (e3) {
+      } catch (e5) {
         branch = "main";
       }
     }
@@ -277,7 +361,7 @@ async function getBaseBranchAncestor(remote = void 0) {
       `${remoteName}/${baseBranch}`
     ]);
     return ancestor.trim();
-  } catch (e4) {
+  } catch (e6) {
     return void 0;
   }
 }
@@ -304,7 +388,7 @@ async function getPastNAncestors(n = 1e3, remote = void 0) {
 async function attempt(fn) {
   try {
     return await fn();
-  } catch (e5) {
+  } catch (e7) {
     return void 0;
   }
 }
@@ -325,7 +409,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;
@@ -411,9 +495,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,
@@ -660,7 +744,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()])
     };
   }
 };
@@ -874,7 +958,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()])
     };
   }
 };
@@ -925,7 +1009,7 @@ function tryMakeUuid3(s) {
       throw new Error();
     }
     return { bytes: new Uint8Array(ret), isUUID: true };
-  } catch (e6) {
+  } catch (e8) {
     return { bytes: void 0, isUUID: false };
   }
 }
@@ -1089,7 +1173,7 @@ var SpanComponentsV3 = class _SpanComponentsV3 {
         }
       }
       return _SpanComponentsV3.fromJsonObj(jsonObj);
-    } catch (e7) {
+    } catch (e9) {
       throw new Error(INVALID_ENCODING_ERRMSG3);
     }
   }
@@ -1414,20 +1498,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;
@@ -1448,7 +1532,7 @@ function tryMakeHexTraceId(s) {
       }
       return { bytes, isHex: true };
     }
-  } catch (e8) {
+  } catch (e10) {
   }
   return { bytes: void 0, isHex: false };
 }
@@ -1464,7 +1548,7 @@ function tryMakeHexSpanId(s) {
       }
       return { bytes, isHex: true };
     }
-  } catch (e9) {
+  } catch (e11) {
   }
   return { bytes: void 0, isHex: false };
 }
@@ -1613,7 +1697,7 @@ var SpanComponentsV4 = class _SpanComponentsV4 {
         }
       }
       return _SpanComponentsV4.fromJsonObj(jsonObj);
-    } catch (e10) {
+    } catch (e12) {
       throw new Error(INVALID_ENCODING_ERRMSG_V4);
     }
   }
@@ -3554,7 +3638,7 @@ function getMustacheVars(prompt) {
     return _mustache2.default.parse(prompt).filter(
       (span) => span[0] === "name" || span[0] === "&"
     );
-  } catch (e11) {
+  } catch (e13) {
     return [];
   }
 }
@@ -3566,8 +3650,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));
@@ -3601,7 +3685,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);
@@ -4235,7 +4319,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
@@ -4313,13 +4397,13 @@ var SpanCache = (_class6 = class {
               cache.fileHandle.close().catch(() => {
               });
               cache.fileHandle = null;
-            } catch (e12) {
+            } catch (e14) {
             }
           }
           if (cache.cacheFilePath && canUseSpanCache() && isomorph_default.unlinkSync) {
             try {
               isomorph_default.unlinkSync(cache.cacheFilePath);
-            } catch (e13) {
+            } catch (e15) {
             }
           }
         }
@@ -4416,10 +4500,10 @@ var SpanCache = (_class6 = class {
             } else {
               spanMap.set(record.spanId, record.data);
             }
-          } catch (e14) {
+          } catch (e16) {
           }
         }
-      } catch (e15) {
+      } catch (e17) {
       }
     }
     for (const record of this.writeBuffer) {
@@ -4491,7 +4575,7 @@ var SpanCache = (_class6 = class {
     if (this.cacheFilePath && canUseSpanCache() && isomorph_default.unlinkSync) {
       try {
         isomorph_default.unlinkSync(this.cacheFilePath);
-      } catch (e16) {
+      } catch (e18) {
       }
       this.cacheFilePath = null;
     }
@@ -4506,6 +4590,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(),
@@ -4568,13 +4655,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();
@@ -4625,7 +4717,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 "";
@@ -4781,6 +4873,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();
@@ -4887,8 +4982,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);
@@ -5061,7 +5156,7 @@ var HTTPConnection = class _HTTPConnection {
     try {
       const resp = await this.get("ping");
       return resp.status === 200;
-    } catch (e17) {
+    } catch (e19) {
       return false;
     }
   }
@@ -5590,8 +5685,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;
   }
@@ -5601,9 +5696,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({});
@@ -5613,7 +5708,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({});
@@ -5748,7 +5843,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`"
       );
@@ -5816,12 +5911,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 */
     });
@@ -6156,7 +6251,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;
@@ -6470,10 +6565,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 {
@@ -6900,24 +6995,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) {
@@ -6946,7 +7041,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);
@@ -6958,7 +7053,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 () => {
@@ -6974,14 +7069,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) {
@@ -6998,14 +7093,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);
@@ -7153,10 +7248,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,
@@ -7240,7 +7335,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(
@@ -7314,7 +7409,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;
     }
   }
@@ -7324,7 +7419,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;
@@ -7419,7 +7514,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`"
       );
@@ -7472,12 +7567,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 */
     });
@@ -7821,7 +7916,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 */) {
@@ -7881,18 +7976,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))
       })
     });
   }
@@ -7906,12 +8001,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
     });
@@ -7920,7 +8015,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;
@@ -7971,8 +8066,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) {
@@ -7982,7 +8077,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 {
@@ -8304,7 +8399,7 @@ function isURL(url) {
   try {
     const parsedUrl = new URL(url.trim());
     return parsedUrl.protocol === "http:" || parsedUrl.protocol === "https:";
-  } catch (e18) {
+  } catch (e20) {
     return false;
   }
 }
@@ -8482,16 +8577,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();
@@ -8653,7 +8748,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
       };
@@ -8869,7 +8964,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;
   }
@@ -8880,13 +8975,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) {
@@ -8976,7 +9071,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 } : {},
@@ -9283,6 +9378,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) {
@@ -9298,15 +9423,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) => {
@@ -9326,7 +9455,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
         )]);
@@ -9348,6 +9477,7 @@ function traceAsyncChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _148 => _148()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9355,15 +9485,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) => {
@@ -9437,7 +9571,7 @@ function traceStreamingChannel(channel2, config) {
         });
         return;
       }
-      if (_optionalChain([config, 'access', _115 => _115.patchResult, 'optionalCall', _116 => _116({
+      if (_optionalChain([config, 'access', _149 => _149.patchResult, 'optionalCall', _150 => _150({
         channelName,
         endEvent: asyncEndEvent,
         result: asyncEndEvent.result,
@@ -9457,7 +9591,7 @@ function traceStreamingChannel(channel2, config) {
           startTime,
           asyncEndEvent
         );
-        const metadata = _optionalChain([config, 'access', _117 => _117.extractMetadata, 'optionalCall', _118 => _118(
+        const metadata = _optionalChain([config, 'access', _151 => _151.extractMetadata, 'optionalCall', _152 => _152(
           asyncEndEvent.result,
           asyncEndEvent
         )]);
@@ -9479,6 +9613,7 @@ function traceStreamingChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _153 => _153()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9486,15 +9621,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) => {
@@ -9504,7 +9643,7 @@ function traceSyncStreamChannel(channel2, config) {
       }
       const { span, startTime } = spanData;
       const endEvent = event;
-      if (_optionalChain([config, 'access', _119 => _119.patchResult, 'optionalCall', _120 => _120({
+      if (_optionalChain([config, 'access', _154 => _154.patchResult, 'optionalCall', _155 => _155({
         channelName,
         endEvent,
         result: endEvent.result,
@@ -9583,6 +9722,7 @@ function traceSyncStreamChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _156 => _156()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9645,7 +9785,7 @@ function convertDataToBlob(data, mediaType) {
     } else if (typeof Buffer !== "undefined" && data instanceof Buffer) {
       return new Blob([data], { type: mediaType });
     }
-  } catch (e19) {
+  } catch (e21) {
     return null;
   }
   return null;
@@ -9657,7 +9797,7 @@ function processInputAttachments(input) {
   let attachmentIndex = 0;
   const inferMediaTypeFromDataUrl = (value, fallback2) => {
     const mediaTypeMatch = value.match(/^data:([^;]+);/);
-    return _optionalChain([mediaTypeMatch, 'optionalAccess', _121 => _121[1]]) || fallback2;
+    return _optionalChain([mediaTypeMatch, 'optionalAccess', _157 => _157[1]]) || fallback2;
   };
   const toAttachment = (value, mediaType, filename) => {
     const blob = convertDataToBlob(value, mediaType);
@@ -9907,11 +10047,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _122 => _122.choices]);
+          return _optionalChain([result, 'optionalAccess', _158 => _158.choices]);
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _123 => _123.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _159 => _159.usage])),
             result,
             endEvent
           );
@@ -9935,12 +10075,12 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          const embedding = _optionalChain([result, 'optionalAccess', _124 => _124.data, 'optionalAccess', _125 => _125[0], 'optionalAccess', _126 => _126.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', _127 => _127.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _163 => _163.usage])),
             result,
             endEvent
           );
@@ -9959,11 +10099,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _128 => _128.choices]);
+          return _optionalChain([result, 'optionalAccess', _164 => _164.choices]);
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _129 => _129.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _165 => _165.usage])),
             result,
             endEvent
           );
@@ -10000,11 +10140,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _130 => _130.results]);
+          return _optionalChain([result, 'optionalAccess', _166 => _166.results]);
         },
         extractMetrics: (result, _startTime, endEvent) => {
           return withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _131 => _131.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _167 => _167.usage])),
             result,
             endEvent
           );
@@ -10023,7 +10163,7 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _132 => _132.output]));
+          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _168 => _168.output]));
         },
         extractMetadata: (result) => {
           if (!result) {
@@ -10034,7 +10174,7 @@ var OpenAIPlugin = class extends BasePlugin {
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _133 => _133.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _169 => _169.usage])),
             result,
             endEvent
           );
@@ -10087,7 +10227,7 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _134 => _134.output]));
+          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _170 => _170.output]));
         },
         extractMetadata: (result) => {
           if (!result) {
@@ -10098,7 +10238,7 @@ var OpenAIPlugin = class extends BasePlugin {
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _135 => _135.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _171 => _171.usage])),
             result,
             endEvent
           );
@@ -10194,7 +10334,7 @@ function aggregateChatCompletionChunks(chunks, streamResult, endEvent) {
         ...parseMetricsFromUsage(chunk.usage)
       };
     }
-    const delta = _optionalChain([chunk, 'access', _136 => _136.choices, 'optionalAccess', _137 => _137[0], 'optionalAccess', _138 => _138.delta]);
+    const delta = _optionalChain([chunk, 'access', _172 => _172.choices, 'optionalAccess', _173 => _173[0], 'optionalAccess', _174 => _174.delta]);
     if (!delta) {
       continue;
     }
@@ -10252,14 +10392,14 @@ function aggregateResponseStreamEvents(chunks, _streamResult, endEvent) {
       continue;
     }
     const response = chunk.response;
-    if (_optionalChain([response, 'optionalAccess', _139 => _139.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', _140 => _140.usage]));
+    metrics = parseMetricsFromUsage(_optionalChain([response, 'optionalAccess', _176 => _176.usage]));
   }
   return {
     output,
@@ -10325,7 +10465,7 @@ var AnthropicPlugin = class extends BasePlugin {
         return message ? { role: message.role, content: message.content } : null;
       },
       extractMetrics: (message, startTime) => {
-        const metrics = parseMetricsFromUsage2(_optionalChain([message, 'optionalAccess', _141 => _141.usage]));
+        const metrics = parseMetricsFromUsage2(_optionalChain([message, 'optionalAccess', _177 => _177.usage]));
         if (startTime) {
           metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
         }
@@ -10340,7 +10480,7 @@ var AnthropicPlugin = class extends BasePlugin {
         const metadata = {};
         const metas = ["stop_reason", "stop_sequence"];
         for (const m of metas) {
-          if (_optionalChain([message, 'optionalAccess', _142 => _142[m]]) !== void 0) {
+          if (_optionalChain([message, 'optionalAccess', _178 => _178[m]]) !== void 0) {
             metadata[m] = message[m];
           }
         }
@@ -10354,7 +10494,7 @@ var AnthropicPlugin = class extends BasePlugin {
     this.unsubscribers.push(
       traceStreamingChannel(anthropicChannels.betaMessagesCreate, {
         ...anthropicConfig,
-        name: "anthropic.beta.messages.create"
+        name: "anthropic.messages.create"
       })
     );
   }
@@ -10377,25 +10517,56 @@ function parseMetricsFromUsage2(usage) {
   return metrics;
 }
 function aggregateAnthropicStreamChunks(chunks) {
-  const deltas = [];
+  const fallbackTextDeltas = [];
+  const contentBlocks = {};
+  const contentBlockDeltas = {};
   let metrics = {};
   let metadata = {};
+  let role;
   for (const event of chunks) {
-    switch (_optionalChain([event, 'optionalAccess', _143 => _143.type])) {
+    switch (_optionalChain([event, 'optionalAccess', _179 => _179.type])) {
       case "message_start":
-        if (_optionalChain([event, 'access', _144 => _144.message, 'optionalAccess', _145 => _145.usage])) {
+        if (_optionalChain([event, 'access', _180 => _180.message, 'optionalAccess', _181 => _181.usage])) {
           const initialMetrics = parseMetricsFromUsage2(event.message.usage);
           metrics = { ...metrics, ...initialMetrics };
         }
+        if (typeof _optionalChain([event, 'access', _182 => _182.message, 'optionalAccess', _183 => _183.role]) === "string") {
+          role = event.message.role;
+        }
+        break;
+      case "content_block_start":
+        if (event.content_block) {
+          contentBlocks[event.index] = event.content_block;
+          contentBlockDeltas[event.index] = [];
+        }
         break;
       case "content_block_delta":
-        if (_optionalChain([event, 'access', _146 => _146.delta, 'optionalAccess', _147 => _147.type]) === "text_delta") {
+        if (_optionalChain([event, 'access', _184 => _184.delta, 'optionalAccess', _185 => _185.type]) === "text_delta") {
           const text = event.delta.text;
           if (text) {
-            deltas.push(text);
+            if (contentBlocks[event.index] !== void 0 || contentBlockDeltas[event.index] !== void 0) {
+              contentBlockDeltas[event.index] ??= [];
+              contentBlockDeltas[event.index].push(text);
+            } else {
+              fallbackTextDeltas.push(text);
+            }
+          }
+        } else if (_optionalChain([event, 'access', _186 => _186.delta, 'optionalAccess', _187 => _187.type]) === "input_json_delta") {
+          const partialJson = event.delta.partial_json;
+          if (partialJson) {
+            contentBlockDeltas[event.index] ??= [];
+            contentBlockDeltas[event.index].push(partialJson);
           }
         }
         break;
+      case "content_block_stop":
+        finalizeContentBlock(
+          event.index,
+          contentBlocks,
+          contentBlockDeltas,
+          fallbackTextDeltas
+        );
+        break;
       case "message_delta":
         if (event.usage) {
           const finalMetrics = parseMetricsFromUsage2(event.usage);
@@ -10407,7 +10578,21 @@ function aggregateAnthropicStreamChunks(chunks) {
         break;
     }
   }
-  const output = deltas.join("");
+  const orderedContent = Object.entries(contentBlocks).map(([index, block]) => ({
+    block,
+    index: Number(index)
+  })).filter(({ block }) => block !== void 0).sort((left, right) => left.index - right.index).map(({ block }) => block);
+  let output = fallbackTextDeltas.join("");
+  if (orderedContent.length > 0) {
+    if (orderedContent.every(isTextContentBlock)) {
+      output = orderedContent.map((block) => block.text).join("");
+    } else {
+      output = {
+        ...role ? { role } : {},
+        content: orderedContent
+      };
+    }
+  }
   const finalized = finalizeAnthropicTokens(metrics);
   const filteredMetrics = Object.fromEntries(
     Object.entries(finalized).filter(
@@ -10420,6 +10605,49 @@ function aggregateAnthropicStreamChunks(chunks) {
     metadata
   };
 }
+function finalizeContentBlock(index, contentBlocks, contentBlockDeltas, fallbackTextDeltas) {
+  const contentBlock = contentBlocks[index];
+  if (!contentBlock) {
+    return;
+  }
+  const text = _nullishCoalesce(_optionalChain([contentBlockDeltas, 'access', _188 => _188[index], 'optionalAccess', _189 => _189.join, 'call', _190 => _190("")]), () => ( ""));
+  if (isToolUseContentBlock(contentBlock)) {
+    if (!text) {
+      return;
+    }
+    try {
+      contentBlocks[index] = {
+        ...contentBlock,
+        input: JSON.parse(text)
+      };
+    } catch (e22) {
+      fallbackTextDeltas.push(text);
+      delete contentBlocks[index];
+    }
+    return;
+  }
+  if (isTextContentBlock(contentBlock)) {
+    if (!text) {
+      delete contentBlocks[index];
+      return;
+    }
+    contentBlocks[index] = {
+      ...contentBlock,
+      text
+    };
+    return;
+  }
+  if (text) {
+    fallbackTextDeltas.push(text);
+  }
+  delete contentBlocks[index];
+}
+function isTextContentBlock(contentBlock) {
+  return contentBlock.type === "text";
+}
+function isToolUseContentBlock(contentBlock) {
+  return contentBlock.type === "tool_use";
+}
 function isAnthropicBase64ContentBlock(input) {
   return (input.type === "image" || input.type === "document") && isObject(input.source) && input.source.type === "base64";
 }
@@ -10546,7 +10774,7 @@ function isZodSchema(value) {
 function serializeZodSchema(schema) {
   try {
     return zodToJsonSchema(schema);
-  } catch (e20) {
+  } catch (e23) {
     return {
       type: "object",
       description: "Zod schema (conversion failed)"
@@ -10846,7 +11074,7 @@ function extractTopLevelAISDKMetrics(result, event, startTime) {
   return metrics;
 }
 function hasModelChildTracing(event) {
-  return _optionalChain([event, 'optionalAccess', _148 => _148.__braintrust_ai_sdk_model_wrapped]) === true;
+  return _optionalChain([event, 'optionalAccess', _191 => _191.__braintrust_ai_sdk_model_wrapped]) === true;
 }
 function extractMetadataFromParams(params, self) {
   const metadata = {
@@ -10855,7 +11083,7 @@ function extractMetadataFromParams(params, self) {
       sdk_language: "typescript"
     }
   };
-  const agentModel = self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && _optionalChain([self, 'access', _149 => _149.settings, 'optionalAccess', _150 => _150.model]) ? _optionalChain([self, 'access', _151 => _151.settings, 'optionalAccess', _152 => _152.model]) : void 0;
+  const agentModel = self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && _optionalChain([self, 'access', _192 => _192.settings, 'optionalAccess', _193 => _193.model]) ? _optionalChain([self, 'access', _194 => _194.settings, 'optionalAccess', _195 => _195.model]) : void 0;
   const { model, provider } = serializeModelWithProvider(
     _nullishCoalesce(params.model, () => ( agentModel))
   );
@@ -10957,9 +11185,9 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
               case "raw":
                 if (chunk.rawValue) {
                   const rawVal = chunk.rawValue;
-                  if (_optionalChain([rawVal, 'access', _153 => _153.delta, 'optionalAccess', _154 => _154.content])) {
+                  if (_optionalChain([rawVal, 'access', _196 => _196.delta, 'optionalAccess', _197 => _197.content])) {
                     text += rawVal.delta.content;
-                  } else if (_optionalChain([rawVal, 'access', _155 => _155.choices, 'optionalAccess', _156 => _156[0], 'optionalAccess', _157 => _157.delta, 'optionalAccess', _158 => _158.content])) {
+                  } else if (_optionalChain([rawVal, 'access', _198 => _198.choices, 'optionalAccess', _199 => _199[0], 'optionalAccess', _200 => _200.delta, 'optionalAccess', _201 => _201.content])) {
                     text += rawVal.choices[0].delta.content;
                   } else if (typeof rawVal.text === "string") {
                     text += rawVal.text;
@@ -11096,14 +11324,14 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
   return {
     cleanup: cleanup.length > 0 ? () => {
       while (cleanup.length > 0) {
-        _optionalChain([cleanup, 'access', _159 => _159.pop, 'call', _160 => _160(), 'optionalCall', _161 => _161()]);
+        _optionalChain([cleanup, 'access', _202 => _202.pop, 'call', _203 => _203(), 'optionalCall', _204 => _204()]);
       }
     } : void 0,
     modelWrapped
   };
 }
 function finalizeAISDKChildTracing(event) {
-  const cleanup = _optionalChain([event, 'optionalAccess', _162 => _162.__braintrust_ai_sdk_cleanup]);
+  const cleanup = _optionalChain([event, 'optionalAccess', _205 => _205.__braintrust_ai_sdk_cleanup]);
   if (event && typeof cleanup === "function") {
     cleanup();
     delete event.__braintrust_ai_sdk_cleanup;
@@ -11168,7 +11396,7 @@ async function processAISDKStreamingOutput(result, denyOutputPaths) {
     if ("text" in result && typeof result.text === "string") {
       outputRecord.text = result.text;
     }
-  } catch (e21) {
+  } catch (e24) {
   }
   try {
     if ("object" in result) {
@@ -11177,7 +11405,7 @@ async function processAISDKStreamingOutput(result, denyOutputPaths) {
         outputRecord.object = resolvedObject;
       }
     }
-  } catch (e22) {
+  } catch (e25) {
   }
   return outputRecord;
 }
@@ -11195,10 +11423,10 @@ function buildAISDKChildMetadata(model) {
 function buildResolvedMetadataPayload(result) {
   const gatewayInfo = extractGatewayRoutingInfo(result);
   const metadata = {};
-  if (_optionalChain([gatewayInfo, 'optionalAccess', _163 => _163.provider])) {
+  if (_optionalChain([gatewayInfo, 'optionalAccess', _206 => _206.provider])) {
     metadata.provider = gatewayInfo.provider;
   }
-  if (_optionalChain([gatewayInfo, 'optionalAccess', _164 => _164.model])) {
+  if (_optionalChain([gatewayInfo, 'optionalAccess', _207 => _207.model])) {
     metadata.model = gatewayInfo.model;
   }
   if (result.finishReason !== void 0) {
@@ -11233,7 +11461,7 @@ function processAISDKOutput(output, denyOutputPaths) {
 }
 function extractTokenMetrics(result) {
   const metrics = {};
-  let usage = _optionalChain([result, 'optionalAccess', _165 => _165.totalUsage]) || _optionalChain([result, 'optionalAccess', _166 => _166.usage]);
+  let usage = _optionalChain([result, 'optionalAccess', _208 => _208.totalUsage]) || _optionalChain([result, 'optionalAccess', _209 => _209.usage]);
   if (!usage && result) {
     try {
       if ("totalUsage" in result && typeof result.totalUsage !== "function") {
@@ -11241,14 +11469,14 @@ function extractTokenMetrics(result) {
       } else if ("usage" in result && typeof result.usage !== "function") {
         usage = result.usage;
       }
-    } catch (e23) {
+    } catch (e26) {
     }
   }
   if (!usage) {
     return metrics;
   }
   const promptTokens = firstNumber(
-    _optionalChain([usage, 'access', _167 => _167.inputTokens, 'optionalAccess', _168 => _168.total]),
+    _optionalChain([usage, 'access', _210 => _210.inputTokens, 'optionalAccess', _211 => _211.total]),
     usage.inputTokens,
     usage.promptTokens,
     usage.prompt_tokens
@@ -11257,7 +11485,7 @@ function extractTokenMetrics(result) {
     metrics.prompt_tokens = promptTokens;
   }
   const completionTokens = firstNumber(
-    _optionalChain([usage, 'access', _169 => _169.outputTokens, 'optionalAccess', _170 => _170.total]),
+    _optionalChain([usage, 'access', _212 => _212.outputTokens, 'optionalAccess', _213 => _213.total]),
     usage.outputTokens,
     usage.completionTokens,
     usage.completion_tokens
@@ -11324,7 +11552,7 @@ function extractGetterValues(obj) {
       if (obj && name in obj && isSerializableOutputValue(obj[name])) {
         getterValues[name] = obj[name];
       }
-    } catch (e24) {
+    } catch (e27) {
     }
   }
   return getterValues;
@@ -11343,11 +11571,11 @@ function extractSerializableOutputFields(output) {
   ];
   for (const name of directFieldNames) {
     try {
-      const value = _optionalChain([output, 'optionalAccess', _171 => _171[name]]);
+      const value = _optionalChain([output, 'optionalAccess', _214 => _214[name]]);
       if (isSerializableOutputValue(value)) {
         serialized[name] = value;
       }
-    } catch (e25) {
+    } catch (e28) {
     }
   }
   return {
@@ -11371,8 +11599,8 @@ function isSerializableOutputValue(value) {
   return true;
 }
 function serializeModelWithProvider(model) {
-  const modelId = typeof model === "string" ? model : _optionalChain([model, 'optionalAccess', _172 => _172.modelId]);
-  const explicitProvider = typeof model === "object" ? _optionalChain([model, 'optionalAccess', _173 => _173.provider]) : void 0;
+  const modelId = typeof model === "string" ? model : _optionalChain([model, 'optionalAccess', _215 => _215.modelId]);
+  const explicitProvider = typeof model === "object" ? _optionalChain([model, 'optionalAccess', _216 => _216.provider]) : void 0;
   if (!modelId) {
     return { model: modelId, provider: explicitProvider };
   }
@@ -11396,8 +11624,8 @@ function parseGatewayModelString(modelString) {
   return { model: modelString };
 }
 function extractGatewayRoutingInfo(result) {
-  if (_optionalChain([result, 'optionalAccess', _174 => _174.steps]) && Array.isArray(result.steps) && result.steps.length > 0) {
-    const routing2 = _optionalChain([result, 'access', _175 => _175.steps, 'access', _176 => _176[0], 'optionalAccess', _177 => _177.providerMetadata, 'optionalAccess', _178 => _178.gateway, 'optionalAccess', _179 => _179.routing]);
+  if (_optionalChain([result, 'optionalAccess', _217 => _217.steps]) && Array.isArray(result.steps) && result.steps.length > 0) {
+    const routing2 = _optionalChain([result, 'access', _218 => _218.steps, 'access', _219 => _219[0], 'optionalAccess', _220 => _220.providerMetadata, 'optionalAccess', _221 => _221.gateway, 'optionalAccess', _222 => _222.routing]);
     if (routing2) {
       return {
         provider: routing2.resolvedProvider || routing2.finalProvider,
@@ -11405,7 +11633,7 @@ function extractGatewayRoutingInfo(result) {
       };
     }
   }
-  const routing = _optionalChain([result, 'optionalAccess', _180 => _180.providerMetadata, 'optionalAccess', _181 => _181.gateway, 'optionalAccess', _182 => _182.routing]);
+  const routing = _optionalChain([result, 'optionalAccess', _223 => _223.providerMetadata, 'optionalAccess', _224 => _224.gateway, 'optionalAccess', _225 => _225.routing]);
   if (routing) {
     return {
       provider: routing.resolvedProvider || routing.finalProvider,
@@ -11415,12 +11643,12 @@ function extractGatewayRoutingInfo(result) {
   return null;
 }
 function extractCostFromResult(result) {
-  if (_optionalChain([result, 'optionalAccess', _183 => _183.steps]) && Array.isArray(result.steps) && result.steps.length > 0) {
+  if (_optionalChain([result, 'optionalAccess', _226 => _226.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', _184 => _184.providerMetadata, 'optionalAccess', _185 => _185.gateway]);
-      const stepCost = parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _186 => _186.cost])) || parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _187 => _187.marketCost]));
+      const gateway2 = _optionalChain([step, 'optionalAccess', _227 => _227.providerMetadata, 'optionalAccess', _228 => _228.gateway]);
+      const stepCost = parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _229 => _229.cost])) || parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _230 => _230.marketCost]));
       if (stepCost !== void 0 && stepCost > 0) {
         totalCost += stepCost;
         foundCost = true;
@@ -11430,8 +11658,8 @@ function extractCostFromResult(result) {
       return totalCost;
     }
   }
-  const gateway = _optionalChain([result, 'optionalAccess', _188 => _188.providerMetadata, 'optionalAccess', _189 => _189.gateway]);
-  const directCost = parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _190 => _190.cost])) || parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _191 => _191.marketCost]));
+  const gateway = _optionalChain([result, 'optionalAccess', _231 => _231.providerMetadata, 'optionalAccess', _232 => _232.gateway]);
+  const directCost = parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _233 => _233.cost])) || parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _234 => _234.marketCost]));
   if (directCost !== void 0 && directCost > 0) {
     return directCost;
   }
@@ -11542,12 +11770,15 @@ var claudeAgentSDKChannels = defineChannels(
   {
     query: channel({
       channelName: "query",
-      kind: "async"
+      kind: "sync-stream"
     })
   }
 );
 
 // src/instrumentation/plugins/claude-agent-sdk-plugin.ts
+function isSubAgentToolName(toolName) {
+  return toolName === "Agent" || toolName === "Task";
+}
 function filterSerializableOptions(options) {
   const allowedKeys = [
     "model",
@@ -11583,7 +11814,7 @@ function extractUsageFromMessage(message) {
   const metrics = {};
   let usage;
   if (message.type === "assistant") {
-    usage = _optionalChain([message, 'access', _192 => _192.message, 'optionalAccess', _193 => _193.usage]);
+    usage = _optionalChain([message, 'access', _235 => _235.message, 'optionalAccess', _236 => _236.usage]);
   } else if (message.type === "result") {
     usage = message.usage;
   }
@@ -11601,55 +11832,409 @@ function extractUsageFromMessage(message) {
   const cacheReadTokens = getNumberProperty(usage, "cache_read_input_tokens") || 0;
   const cacheCreationTokens = getNumberProperty(usage, "cache_creation_input_tokens") || 0;
   if (cacheReadTokens > 0 || cacheCreationTokens > 0) {
-    const cacheTokens = extractAnthropicCacheTokens(
-      cacheReadTokens,
-      cacheCreationTokens
+    Object.assign(
+      metrics,
+      extractAnthropicCacheTokens(cacheReadTokens, cacheCreationTokens)
     );
-    Object.assign(metrics, cacheTokens);
   }
   if (Object.keys(metrics).length > 0) {
     Object.assign(metrics, finalizeAnthropicTokens(metrics));
   }
   return metrics;
 }
-function buildLLMInput(prompt, conversationHistory) {
-  const promptMessage = typeof prompt === "string" ? { content: prompt, role: "user" } : void 0;
-  const inputParts = [
-    ...promptMessage ? [promptMessage] : [],
-    ...conversationHistory
-  ];
+function buildLLMInput(prompt, conversationHistory, capturedPromptMessages) {
+  const promptMessages = [];
+  if (typeof prompt === "string") {
+    promptMessages.push({ content: prompt, role: "user" });
+  } else if (capturedPromptMessages && capturedPromptMessages.length > 0) {
+    for (const msg of capturedPromptMessages) {
+      const role = _optionalChain([msg, 'access', _237 => _237.message, 'optionalAccess', _238 => _238.role]);
+      const content = _optionalChain([msg, 'access', _239 => _239.message, 'optionalAccess', _240 => _240.content]);
+      if (role && content !== void 0) {
+        promptMessages.push({ content, role });
+      }
+    }
+  }
+  const inputParts = [...promptMessages, ...conversationHistory];
   return inputParts.length > 0 ? inputParts : void 0;
 }
-async function createLLMSpanForMessages(messages, prompt, conversationHistory, options, startTime, parentSpan) {
-  if (messages.length === 0) return void 0;
+function formatCapturedMessages(messages) {
+  return messages.length > 0 ? messages : [];
+}
+async function createLLMSpanForMessages(messages, prompt, conversationHistory, options, startTime, capturedPromptMessages, parentSpan) {
+  if (messages.length === 0) {
+    return void 0;
+  }
   const lastMessage = messages[messages.length - 1];
-  if (lastMessage.type !== "assistant" || !_optionalChain([lastMessage, 'access', _194 => _194.message, 'optionalAccess', _195 => _195.usage])) {
+  if (lastMessage.type !== "assistant" || !_optionalChain([lastMessage, 'access', _241 => _241.message, 'optionalAccess', _242 => _242.usage])) {
     return void 0;
   }
   const model = lastMessage.message.model || options.model;
   const usage = extractUsageFromMessage(lastMessage);
-  const input = buildLLMInput(prompt, conversationHistory);
+  const input = buildLLMInput(
+    prompt,
+    conversationHistory,
+    capturedPromptMessages
+  );
   const outputs = messages.map(
-    (m) => _optionalChain([m, 'access', _196 => _196.message, 'optionalAccess', _197 => _197.content]) && _optionalChain([m, 'access', _198 => _198.message, 'optionalAccess', _199 => _199.role]) ? { content: m.message.content, role: m.message.role } : void 0
+    (m) => _optionalChain([m, 'access', _243 => _243.message, 'optionalAccess', _244 => _244.content]) && _optionalChain([m, 'access', _245 => _245.message, 'optionalAccess', _246 => _246.role]) ? { content: m.message.content, role: m.message.role } : void 0
   ).filter(
     (c) => c !== void 0
   );
   const span = startSpan({
     name: "anthropic.messages.create",
+    parent: parentSpan,
     spanAttributes: {
       type: "llm" /* LLM */
     },
-    startTime,
-    parent: parentSpan
+    startTime
   });
   span.log({
     input,
-    output: outputs,
     metadata: model ? { model } : void 0,
-    metrics: usage
+    metrics: usage,
+    output: outputs
   });
   await span.end();
-  return _optionalChain([lastMessage, 'access', _200 => _200.message, 'optionalAccess', _201 => _201.content]) && _optionalChain([lastMessage, 'access', _202 => _202.message, 'optionalAccess', _203 => _203.role]) ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
+  return _optionalChain([lastMessage, 'access', _247 => _247.message, 'optionalAccess', _248 => _248.content]) && _optionalChain([lastMessage, 'access', _249 => _249.message, 'optionalAccess', _250 => _250.role]) ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
+}
+function getMcpServerMetadata(serverName, mcpServers) {
+  if (!serverName || !mcpServers) {
+    return {};
+  }
+  const serverConfig = mcpServers[serverName];
+  if (!serverConfig) {
+    return {};
+  }
+  const metadata = {};
+  if (serverConfig.type) {
+    metadata["mcp.type"] = serverConfig.type;
+  } else if (typeof serverConfig === "object" && "transport" in serverConfig) {
+    metadata["mcp.type"] = "sdk";
+  }
+  if (serverConfig.url) {
+    metadata["mcp.url"] = serverConfig.url;
+  }
+  if (serverConfig.command) {
+    metadata["mcp.command"] = serverConfig.command;
+    if (serverConfig.args) {
+      metadata["mcp.args"] = serverConfig.args.join(" ");
+    }
+  }
+  return metadata;
+}
+function parseToolName(rawToolName) {
+  const mcpMatch = rawToolName.match(/^mcp__([^_]+)__(.+)$/);
+  if (mcpMatch) {
+    const [, mcpServer, toolName] = mcpMatch;
+    return {
+      displayName: `tool: ${mcpServer}/${toolName}`,
+      mcpServer,
+      rawToolName,
+      toolName
+    };
+  }
+  return {
+    displayName: `tool: ${rawToolName}`,
+    rawToolName,
+    toolName: rawToolName
+  };
+}
+function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers, subAgentSpans, endedSubAgentSpans) {
+  const preToolUse = async (input, toolUseID) => {
+    if (input.hook_event_name !== "PreToolUse" || !toolUseID) {
+      return {};
+    }
+    if (isSubAgentToolName(input.tool_name)) {
+      return {};
+    }
+    const parsed = parseToolName(input.tool_name);
+    const toolSpan = startSpan({
+      event: {
+        input: input.tool_input,
+        metadata: {
+          "claude_agent_sdk.cwd": input.cwd,
+          "claude_agent_sdk.raw_tool_name": parsed.rawToolName,
+          "claude_agent_sdk.session_id": input.session_id,
+          "gen_ai.tool.call.id": toolUseID,
+          "gen_ai.tool.name": parsed.toolName,
+          ...parsed.mcpServer && { "mcp.server": parsed.mcpServer },
+          ...getMcpServerMetadata(parsed.mcpServer, mcpServers)
+        }
+      },
+      name: parsed.displayName,
+      parent: await resolveParentSpan(toolUseID),
+      spanAttributes: { type: "tool" /* TOOL */ }
+    });
+    activeToolSpans.set(toolUseID, toolSpan);
+    return {};
+  };
+  const postToolUse = async (input, toolUseID) => {
+    if (input.hook_event_name !== "PostToolUse" || !toolUseID) {
+      return {};
+    }
+    const subAgentSpan = subAgentSpans.get(toolUseID);
+    if (subAgentSpan) {
+      try {
+        const response = input.tool_response;
+        const metadata = {};
+        if (_optionalChain([response, 'optionalAccess', _251 => _251.status])) {
+          metadata["claude_agent_sdk.status"] = response.status;
+        }
+        if (_optionalChain([response, 'optionalAccess', _252 => _252.totalDurationMs])) {
+          metadata["claude_agent_sdk.duration_ms"] = response.totalDurationMs;
+        }
+        if (_optionalChain([response, 'optionalAccess', _253 => _253.totalToolUseCount]) !== void 0) {
+          metadata["claude_agent_sdk.tool_use_count"] = response.totalToolUseCount;
+        }
+        subAgentSpan.log({
+          metadata,
+          output: _optionalChain([response, 'optionalAccess', _254 => _254.content])
+        });
+      } finally {
+        subAgentSpan.end();
+        endedSubAgentSpans.add(toolUseID);
+      }
+      return {};
+    }
+    const toolSpan = activeToolSpans.get(toolUseID);
+    if (!toolSpan) {
+      return {};
+    }
+    try {
+      toolSpan.log({ output: input.tool_response });
+    } finally {
+      toolSpan.end();
+      activeToolSpans.delete(toolUseID);
+    }
+    return {};
+  };
+  const postToolUseFailure = async (input, toolUseID) => {
+    if (input.hook_event_name !== "PostToolUseFailure" || !toolUseID) {
+      return {};
+    }
+    const subAgentSpan = subAgentSpans.get(toolUseID);
+    if (subAgentSpan) {
+      try {
+        subAgentSpan.log({ error: input.error });
+      } finally {
+        subAgentSpan.end();
+        endedSubAgentSpans.add(toolUseID);
+      }
+      return {};
+    }
+    const toolSpan = activeToolSpans.get(toolUseID);
+    if (!toolSpan) {
+      return {};
+    }
+    const parsed = parseToolName(input.tool_name);
+    try {
+      toolSpan.log({
+        error: input.error,
+        metadata: {
+          "claude_agent_sdk.is_interrupt": input.is_interrupt,
+          "claude_agent_sdk.session_id": input.session_id,
+          "gen_ai.tool.call.id": toolUseID,
+          "gen_ai.tool.name": parsed.toolName,
+          ...parsed.mcpServer && { "mcp.server": parsed.mcpServer }
+        }
+      });
+    } finally {
+      toolSpan.end();
+      activeToolSpans.delete(toolUseID);
+    }
+    return {};
+  };
+  return { postToolUse, postToolUseFailure, preToolUse };
+}
+function injectTracingHooks(options, resolveParentSpan, activeToolSpans, subAgentSpans, endedSubAgentSpans) {
+  const { preToolUse, postToolUse, postToolUseFailure } = createToolTracingHooks(
+    resolveParentSpan,
+    activeToolSpans,
+    options.mcpServers,
+    subAgentSpans,
+    endedSubAgentSpans
+  );
+  const existingHooks = _nullishCoalesce(options.hooks, () => ( {}));
+  return {
+    ...options,
+    hooks: {
+      ...existingHooks,
+      PostToolUse: [
+        ..._nullishCoalesce(existingHooks.PostToolUse, () => ( [])),
+        { hooks: [postToolUse] }
+      ],
+      PostToolUseFailure: [
+        ..._nullishCoalesce(existingHooks.PostToolUseFailure, () => ( [])),
+        {
+          hooks: [postToolUseFailure]
+        }
+      ],
+      PreToolUse: [
+        ..._nullishCoalesce(existingHooks.PreToolUse, () => ( [])),
+        { hooks: [preToolUse] }
+      ]
+    }
+  };
+}
+async function finalizeCurrentMessageGroup(state) {
+  if (state.currentMessages.length === 0) {
+    return;
+  }
+  const parentToolUseId = _nullishCoalesce(_optionalChain([state, 'access', _255 => _255.currentMessages, 'access', _256 => _256[0], 'optionalAccess', _257 => _257.parent_tool_use_id]), () => ( null));
+  let parentSpan = await state.span.export();
+  if (parentToolUseId) {
+    const subAgentSpan = state.subAgentSpans.get(parentToolUseId);
+    if (subAgentSpan) {
+      parentSpan = await subAgentSpan.export();
+    }
+  }
+  const finalMessage = await createLLMSpanForMessages(
+    state.currentMessages,
+    state.originalPrompt,
+    state.finalResults,
+    state.options,
+    state.currentMessageStartTime,
+    state.capturedPromptMessages,
+    parentSpan
+  );
+  if (finalMessage) {
+    state.finalResults.push(finalMessage);
+  }
+  const lastMessage = state.currentMessages[state.currentMessages.length - 1];
+  if (_optionalChain([lastMessage, 'optionalAccess', _258 => _258.message, 'optionalAccess', _259 => _259.usage])) {
+    state.accumulatedOutputTokens += getNumberProperty(lastMessage.message.usage, "output_tokens") || 0;
+  }
+  state.currentMessages.length = 0;
+}
+function maybeTrackToolUseContext(state, message) {
+  if (message.type !== "assistant" || !Array.isArray(_optionalChain([message, 'access', _260 => _260.message, 'optionalAccess', _261 => _261.content]))) {
+    return;
+  }
+  const parentToolUseId = _nullishCoalesce(message.parent_tool_use_id, () => ( null));
+  for (const block of message.message.content) {
+    if (typeof block !== "object" || block === null || !("type" in block) || block.type !== "tool_use" || !("id" in block) || typeof block.id !== "string") {
+      continue;
+    }
+    state.toolUseToParent.set(block.id, parentToolUseId);
+    if (block.name === "Task" && typeof block.input === "object" && block.input !== null && "subagent_type" in block.input && typeof block.input.subagent_type === "string") {
+      state.pendingSubAgentNames.set(block.id, block.input.subagent_type);
+    }
+  }
+}
+async function maybeStartSubAgentSpan(state, message) {
+  if (!("parent_tool_use_id" in message)) {
+    return;
+  }
+  const parentToolUseId = message.parent_tool_use_id;
+  if (!parentToolUseId) {
+    return;
+  }
+  await ensureSubAgentSpan(
+    state.pendingSubAgentNames,
+    state.span,
+    state.subAgentSpans,
+    parentToolUseId
+  );
+}
+async function ensureSubAgentSpan(pendingSubAgentNames, rootSpan, subAgentSpans, parentToolUseId) {
+  const existingSpan = subAgentSpans.get(parentToolUseId);
+  if (existingSpan) {
+    return existingSpan;
+  }
+  const agentName = pendingSubAgentNames.get(parentToolUseId);
+  const spanName = agentName ? `Agent: ${agentName}` : "Agent: sub-agent";
+  const subAgentSpan = startSpan({
+    event: {
+      metadata: {
+        ...agentName && { "claude_agent_sdk.agent_type": agentName }
+      }
+    },
+    name: spanName,
+    parent: await rootSpan.export(),
+    spanAttributes: { type: "task" /* TASK */ }
+  });
+  subAgentSpans.set(parentToolUseId, subAgentSpan);
+  return subAgentSpan;
+}
+async function handleStreamMessage(state, message) {
+  maybeTrackToolUseContext(state, message);
+  await maybeStartSubAgentSpan(state, message);
+  const messageId = _optionalChain([message, 'access', _262 => _262.message, 'optionalAccess', _263 => _263.id]);
+  if (messageId && messageId !== state.currentMessageId) {
+    await finalizeCurrentMessageGroup(state);
+    state.currentMessageId = messageId;
+    state.currentMessageStartTime = getCurrentUnixTimestamp();
+  }
+  if (message.type === "assistant" && _optionalChain([message, 'access', _264 => _264.message, 'optionalAccess', _265 => _265.usage])) {
+    state.currentMessages.push(message);
+  }
+  if (message.type !== "result" || !message.usage) {
+    return;
+  }
+  const finalUsageMetrics = extractUsageFromMessage(message);
+  if (state.currentMessages.length > 0 && finalUsageMetrics.completion_tokens !== void 0) {
+    const lastMessage = state.currentMessages[state.currentMessages.length - 1];
+    if (_optionalChain([lastMessage, 'optionalAccess', _266 => _266.message, 'optionalAccess', _267 => _267.usage])) {
+      const adjustedTokens = finalUsageMetrics.completion_tokens - state.accumulatedOutputTokens;
+      if (adjustedTokens >= 0) {
+        lastMessage.message.usage.output_tokens = adjustedTokens;
+      }
+      const resultUsage = message.usage;
+      if (resultUsage && typeof resultUsage === "object") {
+        const cacheReadTokens = getNumberProperty(
+          resultUsage,
+          "cache_read_input_tokens"
+        );
+        if (cacheReadTokens !== void 0) {
+          lastMessage.message.usage.cache_read_input_tokens = cacheReadTokens;
+        }
+        const cacheCreationTokens = getNumberProperty(
+          resultUsage,
+          "cache_creation_input_tokens"
+        );
+        if (cacheCreationTokens !== void 0) {
+          lastMessage.message.usage.cache_creation_input_tokens = cacheCreationTokens;
+        }
+      }
+    }
+  }
+  const metadata = {};
+  if (message.num_turns !== void 0) {
+    metadata.num_turns = message.num_turns;
+  }
+  if (message.session_id !== void 0) {
+    metadata.session_id = message.session_id;
+  }
+  if (Object.keys(metadata).length > 0) {
+    state.span.log({ metadata });
+  }
+}
+async function finalizeQuerySpan(state) {
+  try {
+    await finalizeCurrentMessageGroup(state);
+    state.span.log({
+      output: state.finalResults.length > 0 ? state.finalResults[state.finalResults.length - 1] : void 0
+    });
+    if (state.capturedPromptMessages) {
+      if (state.promptStarted()) {
+        await state.promptDone;
+      }
+      if (state.capturedPromptMessages.length > 0) {
+        state.span.log({
+          input: formatCapturedMessages(state.capturedPromptMessages)
+        });
+      }
+    }
+  } finally {
+    for (const [id, subAgentSpan] of state.subAgentSpans) {
+      if (!state.endedSubAgentSpans.has(id)) {
+        subAgentSpan.end();
+      }
+    }
+    state.subAgentSpans.clear();
+    state.span.end();
+  }
 }
 var ClaudeAgentSDKPlugin = class extends BasePlugin {
   onEnable() {
@@ -11661,19 +12246,36 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
     }
     this.unsubscribers = [];
   }
-  /**
-   * Subscribe to the query channel for agent interactions.
-   * Handles streaming responses and traces both the top-level agent task
-   * and individual LLM calls.
-   */
   subscribeToQuery() {
     const channel2 = claudeAgentSDKChannels.query.tracingChannel();
     const spans = /* @__PURE__ */ new WeakMap();
     const handlers = {
       start: (event) => {
-        const params = event.arguments[0];
-        const prompt = _optionalChain([params, 'optionalAccess', _204 => _204.prompt]);
-        const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _205 => _205.options]), () => ( {}));
+        const params = _nullishCoalesce(event.arguments[0], () => ( {}));
+        const originalPrompt = params.prompt;
+        const options = _nullishCoalesce(params.options, () => ( {}));
+        const promptIsAsyncIterable = isAsyncIterable(originalPrompt);
+        let promptStarted = false;
+        let capturedPromptMessages;
+        let resolvePromptDone;
+        const promptDone = new Promise((resolve) => {
+          resolvePromptDone = resolve;
+        });
+        if (promptIsAsyncIterable) {
+          capturedPromptMessages = [];
+          const promptStream = originalPrompt;
+          params.prompt = (async function* () {
+            promptStarted = true;
+            try {
+              for await (const message of promptStream) {
+                capturedPromptMessages.push(message);
+                yield message;
+              }
+            } finally {
+              _optionalChain([resolvePromptDone, 'optionalCall', _268 => _268()]);
+            }
+          })();
+        }
         const span = startSpan({
           name: "Claude Agent",
           spanAttributes: {
@@ -11683,163 +12285,115 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         const startTime = getCurrentUnixTimestamp();
         try {
           span.log({
-            input: typeof prompt === "string" ? prompt : {
-              type: "streaming",
-              description: "AsyncIterable<ClaudeAgentSDKMessage>"
-            },
+            input: typeof originalPrompt === "string" ? originalPrompt : promptIsAsyncIterable ? void 0 : originalPrompt !== void 0 ? String(originalPrompt) : void 0,
             metadata: filterSerializableOptions(options)
           });
         } catch (error) {
           console.error("Error extracting input for Claude Agent SDK:", error);
         }
+        const activeToolSpans = /* @__PURE__ */ new Map();
+        const subAgentSpans = /* @__PURE__ */ new Map();
+        const endedSubAgentSpans = /* @__PURE__ */ new Set();
+        const toolUseToParent = /* @__PURE__ */ new Map();
+        const pendingSubAgentNames = /* @__PURE__ */ new Map();
+        const optionsWithHooks = injectTracingHooks(
+          options,
+          async (toolUseID) => {
+            const parentToolUseId = toolUseToParent.get(toolUseID);
+            if (parentToolUseId) {
+              const subAgentSpan = await ensureSubAgentSpan(
+                pendingSubAgentNames,
+                span,
+                subAgentSpans,
+                parentToolUseId
+              );
+              return subAgentSpan.export();
+            }
+            return span.export();
+          },
+          activeToolSpans,
+          subAgentSpans,
+          endedSubAgentSpans
+        );
+        params.options = optionsWithHooks;
+        event.arguments[0] = params;
         spans.set(event, {
-          span,
-          startTime,
-          conversationHistory: [],
-          currentMessages: [],
+          accumulatedOutputTokens: 0,
+          activeToolSpans,
+          capturedPromptMessages,
           currentMessageId: void 0,
           currentMessageStartTime: startTime,
-          accumulatedOutputTokens: 0
+          currentMessages: [],
+          endedSubAgentSpans,
+          finalResults: [],
+          options: optionsWithHooks,
+          originalPrompt,
+          pendingSubAgentNames,
+          processing: Promise.resolve(),
+          promptDone,
+          promptStarted: () => promptStarted,
+          span,
+          subAgentSpans,
+          toolUseToParent
         });
       },
-      asyncEnd: (event) => {
-        const spanData = spans.get(event);
-        if (!spanData) {
+      end: (event) => {
+        const state = spans.get(event);
+        if (!state) {
           return;
         }
         const eventResult = event.result;
         if (eventResult === void 0) {
-          spanData.span.end();
+          state.span.end();
           spans.delete(event);
           return;
         }
         if (isAsyncIterable(eventResult)) {
           patchStreamIfNeeded(eventResult, {
-            onChunk: async (message) => {
-              const currentTime = getCurrentUnixTimestamp();
-              const params = event.arguments[0];
-              const prompt = _optionalChain([params, 'optionalAccess', _206 => _206.prompt]);
-              const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _207 => _207.options]), () => ( {}));
-              const messageId = _optionalChain([message, 'access', _208 => _208.message, 'optionalAccess', _209 => _209.id]);
-              if (messageId && messageId !== spanData.currentMessageId) {
-                if (spanData.currentMessages.length > 0) {
-                  const finalMessage = await createLLMSpanForMessages(
-                    spanData.currentMessages,
-                    prompt,
-                    spanData.conversationHistory,
-                    options,
-                    spanData.currentMessageStartTime,
-                    await spanData.span.export()
-                  );
-                  if (finalMessage) {
-                    spanData.conversationHistory.push(finalMessage);
-                  }
-                  const lastMessage = spanData.currentMessages[spanData.currentMessages.length - 1];
-                  if (_optionalChain([lastMessage, 'optionalAccess', _210 => _210.message, 'optionalAccess', _211 => _211.usage])) {
-                    const outputTokens = getNumberProperty(
-                      lastMessage.message.usage,
-                      "output_tokens"
-                    ) || 0;
-                    spanData.accumulatedOutputTokens += outputTokens;
-                  }
-                  spanData.currentMessages = [];
-                }
-                spanData.currentMessageId = messageId;
-                spanData.currentMessageStartTime = currentTime;
-              }
-              if (message.type === "assistant" && _optionalChain([message, 'access', _212 => _212.message, 'optionalAccess', _213 => _213.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', _214 => _214.message, 'optionalAccess', _215 => _215.usage])) {
-                    const adjustedTokens = finalUsageMetrics.completion_tokens - spanData.accumulatedOutputTokens;
-                    if (adjustedTokens >= 0) {
-                      lastMessage.message.usage.output_tokens = adjustedTokens;
-                    }
-                  }
-                }
-                const result_metadata = {};
-                if (message.num_turns !== void 0) {
-                  result_metadata.num_turns = message.num_turns;
-                }
-                if (message.session_id !== void 0) {
-                  result_metadata.session_id = message.session_id;
-                }
-                if (Object.keys(result_metadata).length > 0) {
-                  spanData.span.log({
-                    metadata: result_metadata
-                  });
-                }
-              }
-            },
-            onComplete: async () => {
-              try {
-                const params = event.arguments[0];
-                const prompt = _optionalChain([params, 'optionalAccess', _216 => _216.prompt]);
-                const options = _nullishCoalesce(_optionalChain([params, 'optionalAccess', _217 => _217.options]), () => ( {}));
-                if (spanData.currentMessages.length > 0) {
-                  const finalMessage = await createLLMSpanForMessages(
-                    spanData.currentMessages,
-                    prompt,
-                    spanData.conversationHistory,
-                    options,
-                    spanData.currentMessageStartTime,
-                    await spanData.span.export()
-                  );
-                  if (finalMessage) {
-                    spanData.conversationHistory.push(finalMessage);
-                  }
-                }
-                spanData.span.log({
-                  output: spanData.conversationHistory.length > 0 ? spanData.conversationHistory[spanData.conversationHistory.length - 1] : void 0
-                });
-              } catch (error) {
+            onChunk: (message) => {
+              maybeTrackToolUseContext(state, message);
+              state.processing = state.processing.then(() => handleStreamMessage(state, message)).catch((error) => {
                 console.error(
-                  "Error extracting output for Claude Agent SDK:",
+                  "Error processing Claude Agent SDK stream chunk:",
                   error
                 );
-              } finally {
-                spanData.span.end();
+              });
+            },
+            onComplete: () => {
+              void state.processing.then(() => finalizeQuerySpan(state)).finally(() => {
                 spans.delete(event);
-              }
+              });
             },
             onError: (error) => {
-              spanData.span.log({
-                error: error.message
+              void state.processing.then(() => {
+                state.span.log({
+                  error: error.message
+                });
+              }).then(() => finalizeQuerySpan(state)).finally(() => {
+                spans.delete(event);
               });
-              spanData.span.end();
-              spans.delete(event);
             }
           });
-        } else {
-          try {
-            spanData.span.log({
-              output: eventResult
-            });
-          } catch (error) {
-            console.error(
-              "Error extracting output for Claude Agent SDK:",
-              error
-            );
-          } finally {
-            spanData.span.end();
-            spans.delete(event);
-          }
+          return;
+        }
+        try {
+          state.span.log({ output: eventResult });
+        } catch (error) {
+          console.error("Error extracting output for Claude Agent SDK:", error);
+        } finally {
+          state.span.end();
+          spans.delete(event);
         }
       },
       error: (event) => {
-        const spanData = spans.get(event);
-        if (!spanData || !event.error) {
+        const state = spans.get(event);
+        if (!state || !event.error) {
           return;
         }
-        const { span } = spanData;
-        span.log({
+        state.span.log({
           error: event.error.message
         });
-        span.end();
+        state.span.end();
         spans.delete(event);
       }
     };
@@ -11863,6 +12417,18 @@ var googleGenAIChannels = defineChannels("@google/genai", {
 });
 
 // src/instrumentation/plugins/google-genai-plugin.ts
+var GOOGLE_GENAI_INTERNAL_CONTEXT = {
+  caller_filename: "<node-internal>",
+  caller_functionname: "<node-internal>",
+  caller_lineno: 0
+};
+function createWrapperParityEvent(args) {
+  return {
+    context: GOOGLE_GENAI_INTERNAL_CONTEXT,
+    input: args.input,
+    metadata: args.metadata
+  };
+}
 var GoogleGenAIPlugin = class extends BasePlugin {
   onEnable() {
     this.subscribeToGoogleGenAIChannels();
@@ -11871,277 +12437,1541 @@ var GoogleGenAIPlugin = class extends BasePlugin {
     this.unsubscribers = unsubscribeAll(this.unsubscribers);
   }
   subscribeToGoogleGenAIChannels() {
-    this.unsubscribers.push(
-      traceAsyncChannel(googleGenAIChannels.generateContent, {
-        name: "google-genai.generateContent",
-        type: "llm" /* LLM */,
-        extractInput: ([params]) => {
+    this.subscribeToGenerateContentChannel();
+    this.subscribeToGenerateContentStreamChannel();
+  }
+  subscribeToGenerateContentChannel() {
+    const tracingChannel2 = googleGenAIChannels.generateContent.tracingChannel();
+    const states = /* @__PURE__ */ new WeakMap();
+    const unbindCurrentSpanStore = bindCurrentSpanStoreToStart2(
+      tracingChannel2,
+      states,
+      (event) => {
+        const params = event.arguments[0];
+        const input = serializeInput(params);
+        const metadata = extractMetadata(params);
+        const span = startSpan({
+          name: "generate_content",
+          spanAttributes: {
+            type: "llm" /* LLM */
+          },
+          event: createWrapperParityEvent({ input, metadata })
+        });
+        return {
+          span,
+          startTime: getCurrentUnixTimestamp()
+        };
+      }
+    );
+    const handlers = {
+      start: (event) => {
+        ensureSpanState(states, event, () => {
+          const params = event.arguments[0];
           const input = serializeInput(params);
           const metadata = extractMetadata(params);
+          const span = startSpan({
+            name: "generate_content",
+            spanAttributes: {
+              type: "llm" /* LLM */
+            },
+            event: createWrapperParityEvent({ input, metadata })
+          });
           return {
-            input,
-            metadata: { ...metadata, provider: "google-genai" }
+            span,
+            startTime: getCurrentUnixTimestamp()
           };
+        });
+      },
+      asyncEnd: (event) => {
+        const spanState = states.get(event);
+        if (!spanState) {
+          return;
+        }
+        try {
+          spanState.span.log({
+            metrics: cleanMetrics(
+              extractGenerateContentMetrics(
+                event.result,
+                spanState.startTime
+              )
+            ),
+            output: event.result
+          });
+        } finally {
+          spanState.span.end();
+          states.delete(event);
+        }
+      },
+      error: (event) => {
+        logErrorAndEndSpan(states, event);
+      }
+    };
+    tracingChannel2.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _269 => _269()]);
+      tracingChannel2.unsubscribe(handlers);
+    });
+  }
+  subscribeToGenerateContentStreamChannel() {
+    const tracingChannel2 = googleGenAIChannels.generateContentStream.tracingChannel();
+    const handlers = {
+      start: (event) => {
+        const streamEvent = event;
+        const params = event.arguments[0];
+        streamEvent.googleGenAIInput = serializeInput(params);
+        streamEvent.googleGenAIMetadata = extractMetadata(params);
+      },
+      asyncEnd: (event) => {
+        const streamEvent = event;
+        patchGoogleGenAIStreamingResult({
+          input: streamEvent.googleGenAIInput,
+          metadata: streamEvent.googleGenAIMetadata,
+          result: streamEvent.result
+        });
+      },
+      error: () => {
+      }
+    };
+    tracingChannel2.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      tracingChannel2.unsubscribe(handlers);
+    });
+  }
+};
+function ensureSpanState(states, event, create) {
+  const existing = states.get(event);
+  if (existing) {
+    return existing;
+  }
+  const created = create();
+  states.set(event, created);
+  return created;
+}
+function bindCurrentSpanStoreToStart2(tracingChannel2, states, create) {
+  const state = _internalGetGlobalState();
+  const startChannel = tracingChannel2.start;
+  const currentSpanStore = _optionalChain([state, 'optionalAccess', _270 => _270.contextManager]) ? state.contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
+  if (!_optionalChain([startChannel, 'optionalAccess', _271 => _271.bindStore]) || !currentSpanStore) {
+    return void 0;
+  }
+  startChannel.bindStore(
+    currentSpanStore,
+    (event) => ensureSpanState(
+      states,
+      event,
+      () => create(event)
+    ).span
+  );
+  return () => {
+    _optionalChain([startChannel, 'access', _272 => _272.unbindStore, 'optionalCall', _273 => _273(currentSpanStore)]);
+  };
+}
+function logErrorAndEndSpan(states, event) {
+  const spanState = states.get(event);
+  if (!spanState) {
+    return;
+  }
+  spanState.span.log({
+    error: event.error.message
+  });
+  spanState.span.end();
+  states.delete(event);
+}
+function patchGoogleGenAIStreamingResult(args) {
+  const { input, metadata, result } = args;
+  if (!input || !metadata || !result || typeof result !== "object" || typeof result.next !== "function") {
+    return false;
+  }
+  const chunks = [];
+  let firstTokenTime = null;
+  let finalized = false;
+  let span = null;
+  let startTime = null;
+  const ensureSpan = () => {
+    if (!span) {
+      span = startSpan({
+        name: "generate_content_stream",
+        spanAttributes: {
+          type: "llm" /* LLM */
         },
-        extractOutput: (result) => {
-          return result;
-        },
-        extractMetrics: (result, startTime) => {
-          return extractGenerateContentMetrics(result, startTime);
+        event: {
+          input,
+          metadata
         }
-      })
-    );
-    this.unsubscribers.push(
-      traceStreamingChannel(googleGenAIChannels.generateContentStream, {
-        name: "google-genai.generateContentStream",
-        type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const input = serializeInput(params);
-          const metadata = extractMetadata(params);
+      });
+      startTime = getCurrentUnixTimestamp();
+    }
+    return span;
+  };
+  const finalize = (options) => {
+    if (finalized || !span) {
+      return;
+    }
+    finalized = true;
+    if (options.result) {
+      const { end, ...metricsWithoutEnd } = options.result.metrics;
+      span.log({
+        metrics: cleanMetrics(metricsWithoutEnd),
+        output: options.result.aggregated
+      });
+      span.end(typeof end === "number" ? { endTime: end } : void 0);
+      return;
+    }
+    if (options.error !== void 0) {
+      span.log({
+        error: options.error instanceof Error ? options.error.message : String(options.error)
+      });
+    }
+    span.end();
+  };
+  const patchIterator = (iterator) => {
+    if (typeof iterator !== "object" || iterator === null || "__braintrustGoogleGenAIPatched" in iterator) {
+      return iterator;
+    }
+    const iteratorRecord = iterator;
+    const originalNext = typeof iteratorRecord.next === "function" ? iteratorRecord.next.bind(iterator) : void 0;
+    const originalReturn = typeof iteratorRecord.return === "function" ? iteratorRecord.return.bind(iterator) : void 0;
+    const originalThrow = typeof iteratorRecord.throw === "function" ? iteratorRecord.throw.bind(iterator) : void 0;
+    const asyncIteratorMethod = iteratorRecord[Symbol.asyncIterator];
+    const originalAsyncIterator = typeof asyncIteratorMethod === "function" ? asyncIteratorMethod.bind(iterator) : void 0;
+    Object.defineProperty(iteratorRecord, "__braintrustGoogleGenAIPatched", {
+      configurable: true,
+      enumerable: false,
+      value: true,
+      writable: false
+    });
+    if (originalNext) {
+      iteratorRecord.next = async (...nextArgs) => {
+        ensureSpan();
+        try {
+          const nextResult = await originalNext(
+            ...nextArgs
+          );
+          if (!nextResult.done && nextResult.value) {
+            if (firstTokenTime === null) {
+              firstTokenTime = getCurrentUnixTimestamp();
+            }
+            chunks.push(nextResult.value);
+          }
+          if (nextResult.done && startTime !== null) {
+            finalize({
+              result: aggregateGenerateContentChunks(
+                chunks,
+                startTime,
+                firstTokenTime
+              )
+            });
+          }
+          return nextResult;
+        } catch (error) {
+          finalize({ error });
+          throw error;
+        }
+      };
+    }
+    if (originalReturn) {
+      iteratorRecord.return = async (...returnArgs) => {
+        ensureSpan();
+        try {
+          return await originalReturn(
+            ...returnArgs
+          );
+        } finally {
+          if (startTime !== null) {
+            finalize({
+              result: chunks.length > 0 ? aggregateGenerateContentChunks(
+                chunks,
+                startTime,
+                firstTokenTime
+              ) : void 0
+            });
+          } else {
+            finalize({});
+          }
+        }
+      };
+    }
+    if (originalThrow) {
+      iteratorRecord.throw = async (...throwArgs) => {
+        ensureSpan();
+        try {
+          return await originalThrow(
+            ...throwArgs
+          );
+        } catch (error) {
+          finalize({ error });
+          throw error;
+        }
+      };
+    }
+    iteratorRecord[Symbol.asyncIterator] = () => {
+      const asyncIterator = originalAsyncIterator ? originalAsyncIterator() : iterator;
+      return patchIterator(asyncIterator);
+    };
+    return iterator;
+  };
+  patchIterator(result);
+  return true;
+}
+function serializeInput(params) {
+  const input = {
+    model: params.model,
+    contents: serializeContents(params.contents)
+  };
+  if (params.config) {
+    const config = tryToDict(params.config);
+    if (config) {
+      const filteredConfig = {};
+      Object.keys(config).forEach((key) => {
+        if (key !== "tools") {
+          filteredConfig[key] = config[key];
+        }
+      });
+      input.config = filteredConfig;
+    }
+  }
+  return input;
+}
+function serializeContents(contents) {
+  if (contents === null || contents === void 0) {
+    return null;
+  }
+  if (Array.isArray(contents)) {
+    return contents.map((item) => serializeContentItem(item));
+  }
+  return serializeContentItem(contents);
+}
+function serializeContentItem(item) {
+  if (typeof item === "object" && item !== null) {
+    if (item.parts && Array.isArray(item.parts)) {
+      return {
+        ...item,
+        parts: item.parts.map((part) => serializePart(part))
+      };
+    }
+    return item;
+  }
+  if (typeof item === "string") {
+    return { text: item };
+  }
+  return item;
+}
+function serializePart(part) {
+  if (!part || typeof part !== "object") {
+    return part;
+  }
+  if (part.inlineData && part.inlineData.data) {
+    const { data, mimeType } = part.inlineData;
+    if (data instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(data) || typeof data === "string") {
+      const extension = mimeType ? mimeType.split("/")[1] : "bin";
+      const filename = `file.${extension}`;
+      const buffer = typeof data === "string" ? typeof Buffer !== "undefined" ? Buffer.from(data, "base64") : new Uint8Array(
+        atob(data).split("").map((c) => c.charCodeAt(0))
+      ) : typeof Buffer !== "undefined" ? Buffer.from(data) : new Uint8Array(data);
+      const arrayBuffer = buffer instanceof Uint8Array ? buffer.buffer.slice(
+        buffer.byteOffset,
+        buffer.byteOffset + buffer.byteLength
+      ) : buffer;
+      const attachment = new Attachment({
+        data: arrayBuffer,
+        filename,
+        contentType: mimeType || "application/octet-stream"
+      });
+      return {
+        image_url: { url: attachment }
+      };
+    }
+  }
+  return part;
+}
+function serializeTools(params) {
+  if (!_optionalChain([params, 'access', _274 => _274.config, 'optionalAccess', _275 => _275.tools])) {
+    return null;
+  }
+  try {
+    return params.config.tools.map((tool) => {
+      if (typeof tool === "object" && tool.functionDeclarations) {
+        return tool;
+      }
+      return tool;
+    });
+  } catch (e29) {
+    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];
+        }
+      });
+    }
+  }
+  const tools = serializeTools(params);
+  if (tools) {
+    metadata.tools = tools;
+  }
+  return metadata;
+}
+function extractGenerateContentMetrics(response, startTime) {
+  const metrics = {};
+  if (startTime !== void 0) {
+    const end = getCurrentUnixTimestamp();
+    metrics.start = startTime;
+    metrics.end = end;
+    metrics.duration = end - startTime;
+  }
+  if (_optionalChain([response, 'optionalAccess', _276 => _276.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, firstTokenTime) {
+  const end = getCurrentUnixTimestamp();
+  const metrics = {
+    start: startTime,
+    end,
+    duration: end - startTime
+  };
+  if (firstTokenTime !== null) {
+    metrics.time_to_first_token = firstTokenTime - startTime;
+  }
+  if (chunks.length === 0) {
+    return { aggregated: {}, 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', _277 => _277.content, 'optionalAccess', _278 => _278.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 aggregated = {};
+  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', _279 => _279.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);
+    }
+    aggregated.candidates = candidates;
+  }
+  if (usageMetadata) {
+    aggregated.usageMetadata = usageMetadata;
+    populateUsageMetrics(metrics, usageMetadata);
+  }
+  if (text) {
+    aggregated.text = text;
+  }
+  return { aggregated, metrics };
+}
+function cleanMetrics(metrics) {
+  const cleaned = {};
+  for (const [key, value] of Object.entries(metrics)) {
+    if (value !== null && value !== void 0) {
+      cleaned[key] = value;
+    }
+  }
+  return cleaned;
+}
+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 (e30) {
+    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 (e31) {
+      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', _280 => _280.toolCall, 'optionalAccess', _281 => _281.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', _282 => _282.chatGenerationParams])) ? request.chatGenerationParams : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _283 => _283.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _284 => _284.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', _285 => _285.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', _286 => _286.requestBody])) ? request.requestBody : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _287 => _287.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _288 => _288.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', _289 => _289.data, 'optionalAccess', _290 => _290[0], 'optionalAccess', _291 => _291.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', _292 => _292.openResponsesRequest])) ? request.openResponsesRequest : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _293 => _293.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _294 => _294.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', _295 => _295.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,
-            metadata: { ...metadata, provider: "google-genai" }
+            input: request ? extractOpenRouterCallModelInput(request) : void 0,
+            metadata: request ? extractOpenRouterCallModelMetadata(request) : { provider: "openrouter" }
           };
         },
-        extractOutput: (result) => {
-          return result;
-        },
-        extractMetrics: () => {
-          return {};
-        },
-        aggregateChunks: (chunks, _result, _endEvent, startTime) => {
-          return aggregateGenerateContentChunks(chunks, startTime);
+        patchResult: ({ endEvent, result, span }) => {
+          return patchOpenRouterCallModelResult(
+            span,
+            result,
+            getOpenRouterCallModelRequestArg(endEvent.arguments)
+          );
         }
       })
     );
-  }
-};
-function serializeInput(params) {
-  const input = {
-    model: params.model,
-    contents: serializeContents(params.contents)
-  };
-  if (params.config) {
-    const config = tryToDict(params.config);
-    if (config) {
-      const tools = serializeTools(params);
-      if (tools) {
-        config.tools = tools;
-      }
-      input.config = config;
-    }
-  }
-  return input;
-}
-function serializeContents(contents) {
-  if (contents === null || contents === void 0) {
-    return null;
-  }
-  if (Array.isArray(contents)) {
-    return contents.map((item) => serializeContentItem(item));
-  }
-  return serializeContentItem(contents);
-}
-function serializeContentItem(item) {
-  if (typeof item === "object" && item !== null) {
-    if (item.parts && Array.isArray(item.parts)) {
-      return {
-        ...item,
-        parts: item.parts.map((part) => serializePart(part))
-      };
-    }
-    return item;
-  }
-  if (typeof item === "string") {
-    return { text: item };
-  }
-  return item;
-}
-function serializePart(part) {
-  if (!part || typeof part !== "object") {
-    return part;
-  }
-  if (part.inlineData && part.inlineData.data) {
-    const { data, mimeType } = part.inlineData;
-    if (data instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(data) || typeof data === "string") {
-      const extension = mimeType ? mimeType.split("/")[1] : "bin";
-      const filename = `file.${extension}`;
-      const buffer = typeof data === "string" ? typeof Buffer !== "undefined" ? Buffer.from(data, "base64") : new Uint8Array(
-        atob(data).split("").map((c) => c.charCodeAt(0))
-      ) : typeof Buffer !== "undefined" ? Buffer.from(data) : new Uint8Array(data);
-      const arrayBuffer = buffer instanceof Uint8Array ? buffer.buffer.slice(
-        buffer.byteOffset,
-        buffer.byteOffset + buffer.byteLength
-      ) : buffer;
-      const attachment = new Attachment({
-        data: arrayBuffer,
-        filename,
-        contentType: mimeType || "application/octet-stream"
-      });
-      return {
-        image_url: { url: attachment }
-      };
-    }
-  }
-  return part;
-}
-function serializeTools(params) {
-  if (!_optionalChain([params, 'access', _218 => _218.config, 'optionalAccess', _219 => _219.tools])) {
-    return null;
-  }
-  try {
-    return params.config.tools.map((tool) => {
-      if (typeof tool === "object" && tool.functionDeclarations) {
-        return tool;
+    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);
       }
-      return tool;
+    };
+    callModelChannel.subscribe(callModelHandlers);
+    this.unsubscribers.push(() => {
+      callModelChannel.unsubscribe(callModelHandlers);
     });
-  } catch (e26) {
-    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', _220 => _220.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', _296 => _296.usage]))
+    };
+    const choice = _optionalChain([chunk, 'optionalAccess', _297 => _297.choices, 'optionalAccess', _298 => _298[0]]);
+    const delta = _optionalChain([choice, 'optionalAccess', _299 => _299.delta]);
+    if (!delta) {
+      if (_optionalChain([choice, 'optionalAccess', _300 => _300.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', _221 => _221.content, 'optionalAccess', _222 => _222.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', _301 => _301.finishReason]), () => ( _optionalChain([choice, 'optionalAccess', _302 => _302.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', _303 => _303.function])) {
+        continue;
+      }
+      const toolIndex = _nullishCoalesce(toolDelta.index, () => ( 0));
+      const existingToolCall = _optionalChain([toolCalls, 'optionalAccess', _304 => _304[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', _223 => _223.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', _305 => _305.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
@@ -12152,8 +13982,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() {
@@ -12178,6 +14009,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) {
@@ -12200,14 +14035,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.
@@ -12271,7 +14110,8 @@ var PluginRegistry = (_class19 = class {constructor() { _class19.prototype.__ini
       vercel: true,
       aisdk: true,
       google: true,
-      claudeAgentSDK: true
+      claudeAgentSDK: true,
+      openrouter: true
     };
   }
   /**
@@ -12301,6 +14141,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);
   };
@@ -12405,7 +14246,7 @@ function isAsync(fn) {
 function isAsyncGenerator2(fn) {
   return fn[Symbol.toStringTag] === "AsyncGenerator";
 }
-function isAsyncIterable2(obj) {
+function isAsyncIterable3(obj) {
   return typeof obj[Symbol.asyncIterator] === "function";
 }
 function wrapAsync(asyncFn) {
@@ -12455,7 +14296,7 @@ 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 = {};
@@ -12503,7 +14344,7 @@ function createObjectIterator(obj) {
   };
 }
 function createIterator(coll) {
-  if (isArrayLike(coll)) {
+  if (isArrayLike2(coll)) {
     return createArrayIterator(coll);
   }
   var iterator = getIterator(coll);
@@ -12577,7 +14418,7 @@ var eachOfLimit$2 = (limit) => {
     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);
@@ -12649,7 +14490,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);
@@ -13164,7 +15005,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) {
@@ -13239,7 +15080,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) {
@@ -13506,10 +15347,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 {
@@ -13524,7 +15365,7 @@ var CachedSpanFetcher = (_class20 = class {
           spanType
         );
         const rows = await fetcher.fetchedData();
-        return rows.filter((row) => _optionalChain([row, 'access', _224 => _224.span_attributes, 'optionalAccess', _225 => _225.purpose]) !== "scorer").map((row) => ({
+        return rows.filter((row) => _optionalChain([row, 'access', _306 => _306.span_attributes, 'optionalAccess', _307 => _307.purpose]) !== "scorer").map((row) => ({
           input: row.input,
           output: row.output,
           metadata: row.metadata,
@@ -13558,7 +15399,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', _226 => _226.span_attributes, 'optionalAccess', _227 => _227.type]), () => ( ""));
+      const type = _nullishCoalesce(_optionalChain([span, 'access', _308 => _308.span_attributes, 'optionalAccess', _309 => _309.type]), () => ( ""));
       const existing = _nullishCoalesce(this.spanCache.get(type), () => ( []));
       existing.push(span);
       this.spanCache.set(type, existing);
@@ -13582,17 +15423,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;
@@ -13638,11 +15479,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', _228 => _228.span_attributes, 'optionalAccess', _229 => _229.purpose]) !== "scorer"
+        (span) => _optionalChain([span, 'access', _310 => _310.span_attributes, 'optionalAccess', _311 => _311.purpose]) !== "scorer"
       );
       if (spanType && spanType.length > 0) {
         spans = spans.filter(
-          (span) => spanType.includes(_nullishCoalesce(_optionalChain([span, 'access', _230 => _230.span_attributes, 'optionalAccess', _231 => _231.type]), () => ( "")))
+          (span) => spanType.includes(_nullishCoalesce(_optionalChain([span, 'access', _312 => _312.span_attributes, 'optionalAccess', _313 => _313.type]), () => ( "")))
         );
       }
       return spans.map((span) => ({
@@ -13661,7 +15502,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', _232 => _232.preprocessor]), () => ( "project_default"));
+    const cacheKey = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _314 => _314.preprocessor]), () => ( "project_default"));
     if (!this.threadCache.has(cacheKey)) {
       const promise = this.fetchThread(options);
       this.threadCache.set(cacheKey, promise);
@@ -13672,7 +15513,7 @@ var LocalTrace = (_class21 = class {
     await this.ensureSpansReady();
     await this.state.login({});
     const result = await invoke({
-      globalFunction: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _233 => _233.preprocessor]), () => ( "project_default")),
+      globalFunction: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _315 => _315.preprocessor]), () => ( "project_default")),
       functionType: "preprocessor",
       input: {
         trace_ref: {
@@ -13848,10 +15689,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', _234 => _234.errors, 'optionalAccess', _235 => _235.map, 'call', _236 => _236((err) => {
+    const errorMessages = _optionalChain([validate, 'access', _316 => _316.errors, 'optionalAccess', _317 => _317.map, 'call', _318 => _318((err) => {
       const path2 = err.instancePath || "root";
       return `${path2}: ${err.message}`;
-    }), 'access', _237 => _237.join, 'call', _238 => _238(", ")]);
+    }), 'access', _319 => _319.join, 'call', _320 => _320(", ")]);
     throw Error(`Invalid parameters: ${errorMessages}`);
   }
   return parameters;
@@ -13920,7 +15761,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) {
@@ -14089,7 +15930,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', _239 => _239.spanCache, 'optionalAccess', _240 => _240.start, 'call', _241 => _241()]);
+    _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _321 => _321.spanCache, 'optionalAccess', _322 => _322.start, 'call', _323 => _323()]);
   }
   try {
     if (typeof evaluator.data === "string") {
@@ -14125,7 +15966,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)) {
@@ -14144,7 +15985,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     const experimentIdPromise = experiment ? (async () => {
       try {
         return await experiment.id;
-      } catch (e27) {
+      } catch (e32) {
         return void 0;
       }
     })() : void 0;
@@ -14200,7 +16041,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             objectType: parentComponents ? spanObjectTypeV3ToTypedString(
               parentComponents.data.object_type
             ) : "experiment",
-            objectId: await _asyncNullishCoalesce(await _asyncOptionalChain([parentComponents, 'optionalAccess', async _242 => _242.data, 'access', async _243 => _243.object_id]), async () => ( (experimentIdPromise ? await _asyncNullishCoalesce(await experimentIdPromise, async () => ( "")) : ""))),
+            objectId: await _asyncNullishCoalesce(await _asyncOptionalChain([parentComponents, 'optionalAccess', async _324 => _324.data, 'access', async _325 => _325.object_id]), async () => ( (experimentIdPromise ? await _asyncNullishCoalesce(await experimentIdPromise, async () => ( "")) : ""))),
             rootSpanId: rootSpan.rootSpanId,
             ensureSpansFlushed,
             state
@@ -14226,10 +16067,10 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                   span,
                   parameters: _nullishCoalesce(parameters, () => ( {})),
                   reportProgress: (event) => {
-                    _optionalChain([stream, 'optionalCall', _244 => _244({
+                    _optionalChain([stream, 'optionalCall', _326 => _326({
                       ...event,
                       id: rootSpan.id,
-                      origin: _optionalChain([baseEvent, 'access', _245 => _245.event, 'optionalAccess', _246 => _246.origin]),
+                      origin: _optionalChain([baseEvent, 'access', _327 => _327.event, 'optionalAccess', _328 => _328.origin]),
                       name: evaluator.evalName,
                       object_type: "task"
                     })]);
@@ -14393,7 +16234,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
               metadata,
               scores: mergedScores,
               error,
-              origin: _optionalChain([baseEvent, 'access', _247 => _247.event, 'optionalAccess', _248 => _248.origin])
+              origin: _optionalChain([baseEvent, 'access', _329 => _329.event, 'optionalAccess', _330 => _330.origin])
             });
           }
         };
@@ -14428,7 +16269,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             break;
           }
           scheduledTrials++;
-          _optionalChain([progressReporter, 'access', _249 => _249.setTotal, 'optionalCall', _250 => _250(evaluator.evalName, scheduledTrials)]);
+          _optionalChain([progressReporter, 'access', _331 => _331.setTotal, 'optionalCall', _332 => _332(evaluator.evalName, scheduledTrials)]);
           q.pushAsync({ datum, trialIndex }).catch((e) => {
             if (queueErrors.length < 5) {
               queueErrors.push(e);
@@ -14513,9 +16354,9 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     );
   } finally {
     if (enableCache) {
-      const spanCache = _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _251 => _251.spanCache]);
-      _optionalChain([spanCache, 'optionalAccess', _252 => _252.dispose, 'call', _253 => _253()]);
-      _optionalChain([spanCache, 'optionalAccess', _254 => _254.stop, 'call', _255 => _255()]);
+      const spanCache = _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _333 => _333.spanCache]);
+      _optionalChain([spanCache, 'optionalAccess', _334 => _334.dispose, 'call', _335 => _335()]);
+      _optionalChain([spanCache, 'optionalAccess', _336 => _336.stop, 'call', _337 => _337()]);
     }
   }
 }
@@ -14752,7 +16593,7 @@ async function cachedLogin(options) {
 }
 function makeCheckAuthorized(allowedOrgName) {
   return async (req, _res, next) => {
-    if (!_optionalChain([req, 'access', _256 => _256.ctx, 'optionalAccess', _257 => _257.token])) {
+    if (!_optionalChain([req, 'access', _338 => _338.ctx, 'optionalAccess', _339 => _339.token])) {
       return next(_httperrors2.default.call(void 0, 401, "Unauthorized"));
     }
     try {
@@ -14765,7 +16606,7 @@ function makeCheckAuthorized(allowedOrgName) {
         return next(_httperrors2.default.call(void 0, 403, errorMessage));
       }
       const state = await cachedLogin({
-        apiKey: _optionalChain([req, 'access', _258 => _258.ctx, 'optionalAccess', _259 => _259.token]),
+        apiKey: _optionalChain([req, 'access', _340 => _340.ctx, 'optionalAccess', _341 => _341.token]),
         orgName
       });
       req.ctx.state = state;
@@ -14962,10 +16803,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;
@@ -15019,10 +16860,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) {
@@ -15049,10 +16890,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;
@@ -15407,9 +17248,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", {
@@ -15514,7 +17355,7 @@ function runDevServer(evaluators, opts) {
         scores,
         stream
       } = evalBodySchema.parse(req.body);
-      if (!_optionalChain([req, 'access', _260 => _260.ctx, 'optionalAccess', _261 => _261.state])) {
+      if (!_optionalChain([req, 'access', _342 => _342.ctx, 'optionalAccess', _343 => _343.state])) {
         res.status(500).json({ error: "Braintrust state not initialized in request" });
         return;
       }
@@ -15565,12 +17406,12 @@ function runDevServer(evaluators, opts) {
             ...evaluator,
             data: evalData.data,
             scores: evaluator.scores.concat(
-              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _262 => _262.map, 'call', _263 => _263(
+              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _344 => _344.map, 'call', _345 => _345(
                 (score) => makeScorer(
                   state,
                   score.name,
                   score.function_id,
-                  _optionalChain([req, 'access', _264 => _264.ctx, 'optionalAccess', _265 => _265.projectId])
+                  _optionalChain([req, 'access', _346 => _346.ctx, 'optionalAccess', _347 => _347.projectId])
                 )
               )]), () => ( []))
             ),