braintrust 0.3.7 → 0.4.0

package/dev/dist/index.js

@@ -303,6 +303,44 @@ var Queue = (_class = class {
   }
 }, _class);
 
+// src/id-gen.ts
+
+function generateHexId(bytes) {
+  let result = "";
+  for (let i = 0; i < bytes; i++) {
+    result += Math.floor(Math.random() * 256).toString(16).padStart(2, "0");
+  }
+  return result;
+}
+var IDGenerator = class {
+};
+var UUIDGenerator = class extends IDGenerator {
+  getSpanId() {
+    return _uuid.v4.call(void 0, );
+  }
+  getTraceId() {
+    return _uuid.v4.call(void 0, );
+  }
+  shareRootSpanId() {
+    return true;
+  }
+};
+var OTELIDGenerator = class extends IDGenerator {
+  getSpanId() {
+    return generateHexId(8);
+  }
+  getTraceId() {
+    return generateHexId(16);
+  }
+  shareRootSpanId() {
+    return false;
+  }
+};
+function getIdGenerator() {
+  const useOtel = typeof process !== "undefined" && _optionalChain([process, 'access', _11 => _11.env, 'optionalAccess', _12 => _12.BRAINTRUST_OTEL_COMPAT, 'optionalAccess', _13 => _13.toLowerCase, 'call', _14 => _14()]) === "true";
+  return useOtel ? new OTELIDGenerator() : new UUIDGenerator();
+}
+
 // util/db_fields.ts
 var TRANSACTION_ID_FIELD = "_xact_id";
 var IS_MERGE_FIELD = "_is_merge";
@@ -453,7 +491,7 @@ var SpanComponentsV1 = class _SpanComponentsV1 {
     return {
       objectType: this.objectType,
       objectId: this.objectId,
-      rowIds: _optionalChain([this, 'access', _11 => _11.rowIds, 'optionalAccess', _12 => _12.toObject, 'call', _13 => _13()])
+      rowIds: _optionalChain([this, 'access', _15 => _15.rowIds, 'optionalAccess', _16 => _16.toObject, 'call', _17 => _17()])
     };
   }
 };
@@ -667,7 +705,7 @@ var SpanComponentsV2 = class _SpanComponentsV2 {
       objectType: this.objectType,
       objectId: this.objectId,
       computeObjectMetadataArgs: this.computeObjectMetadataArgs,
-      rowIds: _optionalChain([this, 'access', _14 => _14.rowIds, 'optionalAccess', _15 => _15.toObject, 'call', _16 => _16()])
+      rowIds: _optionalChain([this, 'access', _18 => _18.rowIds, 'optionalAccess', _19 => _19.toObject, 'call', _20 => _20()])
     };
   }
 };
@@ -908,22 +946,6 @@ var SpanComponentsV3 = class _SpanComponentsV3 {
     return new _SpanComponentsV3(spanComponentsV3Schema.parse(jsonObj));
   }
 };
-function parseParent(parent) {
-  return typeof parent === "string" ? parent : parent ? new SpanComponentsV3({
-    object_type: parent.object_type === "experiment" ? 1 /* EXPERIMENT */ : parent.object_type === "playground_logs" ? 3 /* PLAYGROUND_LOGS */ : 2 /* PROJECT_LOGS */,
-    object_id: parent.object_id,
-    ...parent.row_ids ? {
-      row_id: parent.row_ids.id,
-      span_id: parent.row_ids.span_id,
-      root_span_id: parent.row_ids.root_span_id
-    } : {
-      row_id: void 0,
-      span_id: void 0,
-      root_span_id: void 0
-    },
-    propagated_event: parent.propagated_event
-  }).toStr() : void 0;
-}
 
 // util/http_headers.ts
 var BT_FOUND_EXISTING_HEADER = "x-bt-found-existing";
@@ -1019,14 +1041,14 @@ function depthFirstSearch(args) {
   while (events.length) {
     const { eventType, vertex, extras } = events.pop();
     if (eventType === "last") {
-      _optionalChain([lastVisitF, 'optionalCall', _17 => _17(vertex)]);
+      _optionalChain([lastVisitF, 'optionalCall', _21 => _21(vertex)]);
       continue;
     }
     if (firstVisitedVertices.has(vertex)) {
       continue;
     }
     firstVisitedVertices.add(vertex);
-    _optionalChain([firstVisitF, 'optionalCall', _18 => _18(vertex, { parentVertex: extras.parentVertex })]);
+    _optionalChain([firstVisitF, 'optionalCall', _22 => _22(vertex, { parentVertex: extras.parentVertex })]);
     events.push({ eventType: "last", vertex, extras: {} });
     mapAt(graph, vertex).forEach((child) => {
       events.push({
@@ -1048,7 +1070,7 @@ function undirectedConnectedComponents(graph) {
   let labelCounter = 0;
   const vertexLabels = /* @__PURE__ */ new Map();
   const firstVisitF = (vertex, args) => {
-    const label = _optionalChain([args, 'optionalAccess', _19 => _19.parentVertex]) !== void 0 ? mapAt(vertexLabels, _optionalChain([args, 'optionalAccess', _20 => _20.parentVertex])) : labelCounter++;
+    const label = _optionalChain([args, 'optionalAccess', _23 => _23.parentVertex]) !== void 0 ? mapAt(vertexLabels, _optionalChain([args, 'optionalAccess', _24 => _24.parentVertex])) : labelCounter++;
     vertexLabels.set(vertex, label);
   };
   depthFirstSearch({ graph: directedGraph, firstVisitF });
@@ -1270,6 +1292,232 @@ function _urljoin(...parts) {
   ).filter((x) => x.trim() !== "").join("/");
 }
 
+// util/span_identifier_v4.ts
+
+var ENCODING_VERSION_NUMBER_V4 = 4;
+function tryMakeHexTraceId(s) {
+  try {
+    if (typeof s === "string" && s.length === 32) {
+      const bytes = new Uint8Array(16);
+      for (let i = 0; i < 16; i++) {
+        const hex = s.substr(i * 2, 2);
+        const byte = parseInt(hex, 16);
+        if (isNaN(byte)) throw new Error();
+        bytes[i] = byte;
+      }
+      return { bytes, isHex: true };
+    }
+  } catch (e5) {
+  }
+  return { bytes: void 0, isHex: false };
+}
+function tryMakeHexSpanId(s) {
+  try {
+    if (typeof s === "string" && s.length === 16) {
+      const bytes = new Uint8Array(8);
+      for (let i = 0; i < 8; i++) {
+        const hex = s.substr(i * 2, 2);
+        const byte = parseInt(hex, 16);
+        if (isNaN(byte)) throw new Error();
+        bytes[i] = byte;
+      }
+      return { bytes, isHex: true };
+    }
+  } catch (e6) {
+  }
+  return { bytes: void 0, isHex: false };
+}
+var INVALID_ENCODING_ERRMSG_V4 = `SpanComponents string is not properly encoded. This library only supports encoding versions up to ${ENCODING_VERSION_NUMBER_V4}. Please make sure the SDK library used to decode the SpanComponents is at least as new as any library used to encode it.`;
+var FIELDS_ID_TO_NAME = {
+  [1 /* OBJECT_ID */]: "object_id",
+  [2 /* ROW_ID */]: "row_id",
+  [3 /* SPAN_ID */]: "span_id",
+  [4 /* ROOT_SPAN_ID */]: "root_span_id"
+};
+var spanComponentsV4Schema = _v3.z.object({
+  object_type: spanObjectTypeV3EnumSchema,
+  propagated_event: _v3.z.record(_v3.z.unknown()).nullish()
+}).and(
+  _v3.z.union([
+    // Must provide one or the other.
+    _v3.z.object({
+      object_id: _v3.z.string().nullish(),
+      compute_object_metadata_args: _v3.z.optional(_v3.z.null())
+    }),
+    _v3.z.object({
+      object_id: _v3.z.optional(_v3.z.null()),
+      compute_object_metadata_args: _v3.z.record(_v3.z.unknown())
+    })
+  ])
+).and(
+  _v3.z.union([
+    // Either all of these must be provided or none.
+    _v3.z.object({
+      row_id: _v3.z.string(),
+      span_id: _v3.z.string(),
+      root_span_id: _v3.z.string()
+    }),
+    _v3.z.object({
+      row_id: _v3.z.optional(_v3.z.null()),
+      span_id: _v3.z.optional(_v3.z.null()),
+      root_span_id: _v3.z.optional(_v3.z.null())
+    })
+  ])
+);
+var SpanComponentsV4 = class _SpanComponentsV4 {
+  constructor(data) {
+    this.data = data;
+  }
+  toStr() {
+    const jsonObj = {
+      compute_object_metadata_args: this.data.compute_object_metadata_args || void 0,
+      propagated_event: this.data.propagated_event || void 0
+    };
+    Object.keys(jsonObj).forEach((key) => {
+      if (jsonObj[key] === void 0) {
+        delete jsonObj[key];
+      }
+    });
+    const allBuffers = [];
+    allBuffers.push(
+      new Uint8Array([ENCODING_VERSION_NUMBER_V4, this.data.object_type])
+    );
+    const hexEntries = [];
+    function addHexField(origVal, fieldId) {
+      let hexResult;
+      if (fieldId === 3 /* SPAN_ID */) {
+        hexResult = tryMakeHexSpanId(origVal);
+      } else if (fieldId === 4 /* ROOT_SPAN_ID */) {
+        hexResult = tryMakeHexTraceId(origVal);
+      } else {
+        hexResult = { bytes: void 0, isHex: false };
+      }
+      if (hexResult.isHex) {
+        hexEntries.push(
+          concatUint8Arrays(new Uint8Array([fieldId]), hexResult.bytes)
+        );
+      } else {
+        jsonObj[FIELDS_ID_TO_NAME[fieldId]] = origVal;
+      }
+    }
+    if (this.data.object_id) {
+      addHexField(this.data.object_id, 1 /* OBJECT_ID */);
+    }
+    if (this.data.row_id) {
+      addHexField(this.data.row_id, 2 /* ROW_ID */);
+    }
+    if (this.data.span_id) {
+      addHexField(this.data.span_id, 3 /* SPAN_ID */);
+    }
+    if (this.data.root_span_id) {
+      addHexField(this.data.root_span_id, 4 /* ROOT_SPAN_ID */);
+    }
+    if (hexEntries.length > 255) {
+      throw new Error("Impossible: too many hex entries to encode");
+    }
+    allBuffers.push(new Uint8Array([hexEntries.length]));
+    allBuffers.push(...hexEntries);
+    if (Object.keys(jsonObj).length > 0) {
+      allBuffers.push(stringToUint8Array(JSON.stringify(jsonObj)));
+    }
+    return uint8ArrayToBase64(concatUint8Arrays(...allBuffers));
+  }
+  static fromStr(s) {
+    try {
+      const rawBytes = base64ToUint8Array(s);
+      const jsonObj = {};
+      if (rawBytes[0] < ENCODING_VERSION_NUMBER_V4) {
+        const v3Components = SpanComponentsV3.fromStr(s);
+        jsonObj["object_type"] = v3Components.data.object_type;
+        jsonObj["object_id"] = v3Components.data.object_id;
+        jsonObj["compute_object_metadata_args"] = v3Components.data.compute_object_metadata_args;
+        jsonObj["row_id"] = v3Components.data.row_id;
+        jsonObj["span_id"] = v3Components.data.span_id;
+        jsonObj["root_span_id"] = v3Components.data.root_span_id;
+        jsonObj["propagated_event"] = v3Components.data.propagated_event;
+      } else {
+        jsonObj["object_type"] = rawBytes[1];
+        const numHexEntries = rawBytes[2];
+        let byteOffset = 3;
+        for (let i = 0; i < numHexEntries; i++) {
+          const fieldId = rawBytes[byteOffset];
+          if (fieldId === 3 /* SPAN_ID */) {
+            const hexBytes = rawBytes.subarray(byteOffset + 1, byteOffset + 9);
+            byteOffset += 9;
+            jsonObj[FIELDS_ID_TO_NAME[fieldId]] = Array.from(
+              hexBytes,
+              (b) => b.toString(16).padStart(2, "0")
+            ).join("");
+          } else if (fieldId === 4 /* ROOT_SPAN_ID */) {
+            const hexBytes = rawBytes.subarray(byteOffset + 1, byteOffset + 17);
+            byteOffset += 17;
+            jsonObj[FIELDS_ID_TO_NAME[fieldId]] = Array.from(
+              hexBytes,
+              (b) => b.toString(16).padStart(2, "0")
+            ).join("");
+          } else {
+            const hexBytes = rawBytes.subarray(byteOffset + 1, byteOffset + 17);
+            byteOffset += 17;
+            jsonObj[FIELDS_ID_TO_NAME[fieldId]] = Array.from(
+              hexBytes,
+              (b) => b.toString(16).padStart(2, "0")
+            ).join("");
+          }
+        }
+        if (byteOffset < rawBytes.length) {
+          const remainingJsonObj = JSON.parse(
+            uint8ArrayToString(rawBytes.subarray(byteOffset))
+          );
+          Object.assign(jsonObj, remainingJsonObj);
+        }
+      }
+      return _SpanComponentsV4.fromJsonObj(jsonObj);
+    } catch (e7) {
+      throw new Error(INVALID_ENCODING_ERRMSG_V4);
+    }
+  }
+  objectIdFields() {
+    if (!this.data.object_id) {
+      throw new Error(
+        "Impossible: cannot invoke `objectIdFields` unless SpanComponentsV4 is initialized with an `object_id`"
+      );
+    }
+    switch (this.data.object_type) {
+      case 1 /* EXPERIMENT */:
+        return { experiment_id: this.data.object_id };
+      case 2 /* PROJECT_LOGS */:
+        return { project_id: this.data.object_id, log_id: "g" };
+      case 3 /* PLAYGROUND_LOGS */:
+        return { prompt_session_id: this.data.object_id, log_id: "x" };
+      default:
+        const _ = this.data.object_type;
+        throw new Error(`Invalid object_type ${this.data.object_type}`);
+    }
+  }
+  async export() {
+    return this.toStr();
+  }
+  static fromJsonObj(jsonObj) {
+    return new _SpanComponentsV4(spanComponentsV4Schema.parse(jsonObj));
+  }
+};
+function parseParent(parent) {
+  return typeof parent === "string" ? parent : parent ? new SpanComponentsV4({
+    object_type: parent.object_type === "experiment" ? 1 /* EXPERIMENT */ : parent.object_type === "playground_logs" ? 3 /* PLAYGROUND_LOGS */ : 2 /* PROJECT_LOGS */,
+    object_id: parent.object_id,
+    ...parent.row_ids ? {
+      row_id: parent.row_ids.id,
+      span_id: parent.row_ids.span_id,
+      root_span_id: parent.row_ids.root_span_id
+    } : {
+      row_id: void 0,
+      span_id: void 0,
+      root_span_id: void 0
+    },
+    propagated_event: parent.propagated_event
+  }).toStr() : void 0;
+}
+
 // util/git_fields.ts
 function mergeGitMetadataSettings(s1, s2) {
   if (s1.collect === "all") {
@@ -3202,7 +3450,7 @@ function getMustacheVars(prompt) {
     return _mustache2.default.parse(prompt).filter(
       (span) => span[0] === "name" || span[0] === "&"
     );
-  } catch (e5) {
+  } catch (e8) {
     return [];
   }
 }
@@ -3268,7 +3516,7 @@ var NoopSpan = (_class4 = class {
     return this;
   }
   end(args) {
-    return _nullishCoalesce(_optionalChain([args, 'optionalAccess', _21 => _21.endTime]), () => ( getCurrentUnixTimestamp()));
+    return _nullishCoalesce(_optionalChain([args, 'optionalAccess', _25 => _25.endTime]), () => ( getCurrentUnixTimestamp()));
   }
   async export() {
     return "";
@@ -3292,6 +3540,20 @@ var NoopSpan = (_class4 = class {
   state() {
     return _internalGetGlobalState();
   }
+  // Custom inspect for Node.js console.log
+  [Symbol.for("nodejs.util.inspect.custom")]() {
+    return `NoopSpan {
+  kind: '${this.kind}',
+  id: '${this.id}',
+  spanId: '${this.spanId}',
+  rootSpanId: '${this.rootSpanId}',
+  spanParents: ${JSON.stringify(this.spanParents)}
+}`;
+  }
+  // Custom toString
+  toString() {
+    return `NoopSpan(id=${this.id}, spanId=${this.spanId})`;
+  }
 }, _class4);
 var NOOP_SPAN = new NoopSpan();
 var NOOP_SPAN_PERMALINK = "https://braintrust.dev/noop-span";
@@ -3307,7 +3569,7 @@ var loginSchema = _zod.z.strictObject({
 });
 var stateNonce = 0;
 var BraintrustState = (_class5 = class _BraintrustState {
-  constructor(loginParams) {;_class5.prototype.__init7.call(this);_class5.prototype.__init8.call(this);_class5.prototype.__init9.call(this);_class5.prototype.__init10.call(this);_class5.prototype.__init11.call(this);_class5.prototype.__init12.call(this);_class5.prototype.__init13.call(this);_class5.prototype.__init14.call(this);_class5.prototype.__init15.call(this);_class5.prototype.__init16.call(this);_class5.prototype.__init17.call(this);_class5.prototype.__init18.call(this);_class5.prototype.__init19.call(this);
+  constructor(loginParams) {;_class5.prototype.__init7.call(this);_class5.prototype.__init8.call(this);_class5.prototype.__init9.call(this);_class5.prototype.__init10.call(this);_class5.prototype.__init11.call(this);_class5.prototype.__init12.call(this);_class5.prototype.__init13.call(this);_class5.prototype.__init14.call(this);_class5.prototype.__init15.call(this);_class5.prototype.__init16.call(this);_class5.prototype.__init17.call(this);_class5.prototype.__init18.call(this);_class5.prototype.__init19.call(this);_class5.prototype.__init20.call(this);
     this.loginParams = loginParams;
     this.id = `${(/* @__PURE__ */ new Date()).toLocaleString()}-${stateNonce++}`;
     this.currentExperiment = void 0;
@@ -3361,6 +3623,7 @@ var BraintrustState = (_class5 = class _BraintrustState {
   __init18() {this._apiConn = null}
   __init19() {this._proxyConn = null}
   
+  __init20() {this._idGenerator = null}
   resetLoginInfo() {
     this.appUrl = null;
     this.appPublicUrl = null;
@@ -3375,6 +3638,15 @@ var BraintrustState = (_class5 = class _BraintrustState {
     this._apiConn = null;
     this._proxyConn = null;
   }
+  resetIdGenState() {
+    this._idGenerator = null;
+  }
+  get idGenerator() {
+    if (this._idGenerator === null) {
+      this._idGenerator = getIdGenerator();
+    }
+    return this._idGenerator;
+  }
   copyLoginInfo(other) {
     this.appUrl = other.appUrl;
     this.appPublicUrl = other.appPublicUrl;
@@ -3442,8 +3714,8 @@ var BraintrustState = (_class5 = class _BraintrustState {
   setFetch(fetch2) {
     this.loginParams.fetch = fetch2;
     this.fetch = fetch2;
-    _optionalChain([this, 'access', _22 => _22._apiConn, 'optionalAccess', _23 => _23.setFetch, 'call', _24 => _24(fetch2)]);
-    _optionalChain([this, 'access', _25 => _25._appConn, 'optionalAccess', _26 => _26.setFetch, 'call', _27 => _27(fetch2)]);
+    _optionalChain([this, 'access', _26 => _26._apiConn, 'optionalAccess', _27 => _27.setFetch, 'call', _28 => _28(fetch2)]);
+    _optionalChain([this, 'access', _29 => _29._appConn, 'optionalAccess', _30 => _30.setFetch, 'call', _31 => _31(fetch2)]);
   }
   setMaskingFunction(maskingFunction) {
     this.bgLogger().setMaskingFunction(maskingFunction);
@@ -3512,6 +3784,37 @@ var BraintrustState = (_class5 = class _BraintrustState {
   enforceQueueSizeLimit(enforce) {
     this._bgLogger.get().enforceQueueSizeLimit(enforce);
   }
+  // Custom serialization to avoid logging sensitive data
+  toJSON() {
+    return {
+      id: this.id,
+      orgId: this.orgId,
+      orgName: this.orgName,
+      appUrl: this.appUrl,
+      appPublicUrl: this.appPublicUrl,
+      apiUrl: this.apiUrl,
+      proxyUrl: this.proxyUrl,
+      loggedIn: this.loggedIn
+      // Explicitly exclude loginToken, _apiConn, _appConn, _proxyConn and other sensitive fields
+    };
+  }
+  // Custom inspect for Node.js console.log
+  [Symbol.for("nodejs.util.inspect.custom")]() {
+    return `BraintrustState {
+  id: '${this.id}',
+  orgId: ${this.orgId ? `'${this.orgId}'` : "null"},
+  orgName: ${this.orgName ? `'${this.orgName}'` : "null"},
+  appUrl: ${this.appUrl ? `'${this.appUrl}'` : "null"},
+  apiUrl: ${this.apiUrl ? `'${this.apiUrl}'` : "null"},
+  proxyUrl: ${this.proxyUrl ? `'${this.proxyUrl}'` : "null"},
+  loggedIn: ${this.loggedIn},
+  loginToken: '[REDACTED]'
+}`;
+  }
+  // Custom toString
+  toString() {
+    return `BraintrustState(id=${this.id}, org=${this.orgName || "none"}, loggedIn=${this.loggedIn})`;
+  }
 }, _class5);
 var _globalState;
 function _internalSetInitialState() {
@@ -3655,6 +3958,17 @@ var HTTPConnection = class _HTTPConnection {
     });
     return await resp.json();
   }
+  // Custom inspect for Node.js console.log
+  [Symbol.for("nodejs.util.inspect.custom")]() {
+    return `HTTPConnection {
+  base_url: '${this.base_url}',
+  token: '[REDACTED]'
+}`;
+  }
+  // Custom toString
+  toString() {
+    return `HTTPConnection(${this.base_url})`;
+  }
 };
 var BaseAttachment = class {
   
@@ -4075,9 +4389,9 @@ async function permalink(slug, opts) {
   if (slug === "") {
     return NOOP_SPAN_PERMALINK;
   }
-  const state = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _28 => _28.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _32 => _32.state]), () => ( _globalState));
   const getOrgName = async () => {
-    if (_optionalChain([opts, 'optionalAccess', _29 => _29.orgName])) {
+    if (_optionalChain([opts, 'optionalAccess', _33 => _33.orgName])) {
       return opts.orgName;
     }
     await state.login({});
@@ -4087,7 +4401,7 @@ async function permalink(slug, opts) {
     return state.orgName;
   };
   const getAppUrl = async () => {
-    if (_optionalChain([opts, 'optionalAccess', _30 => _30.appUrl])) {
+    if (_optionalChain([opts, 'optionalAccess', _34 => _34.appUrl])) {
       return opts.appUrl;
     }
     await state.login({});
@@ -4174,8 +4488,8 @@ var Logger = (_class6 = class {
   
   
   // For type identification.
-  __init20() {this.kind = "logger"}
-  constructor(state, lazyMetadata, logOptions = {}) {;_class6.prototype.__init20.call(this);
+  __init21() {this.kind = "logger"}
+  constructor(state, lazyMetadata, logOptions = {}) {;_class6.prototype.__init21.call(this);
     this.lazyMetadata = lazyMetadata;
     this._asyncFlush = logOptions.asyncFlush;
     this.computeMetadataArgs = logOptions.computeMetadataArgs;
@@ -4217,7 +4531,7 @@ var Logger = (_class6 = class {
    * @returns The `id` of the logged event.
    */
   log(event, options) {
-    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _31 => _31.allowConcurrentWithSpans])) {
+    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _35 => _35.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`"
       );
@@ -4285,12 +4599,12 @@ var Logger = (_class6 = class {
       state: this.state,
       ...startSpanParentArgs({
         state: this.state,
-        parent: _optionalChain([args, 'optionalAccess', _32 => _32.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _36 => _36.parent]),
         parentObjectType: this.parentObjectType(),
         parentObjectId: this.lazyId,
         parentComputeObjectMetadataArgs: this.computeMetadataArgs,
-        parentSpanIds: _optionalChain([args, 'optionalAccess', _33 => _33.parentSpanIds]),
-        propagatedEvent: _optionalChain([args, 'optionalAccess', _34 => _34.propagatedEvent])
+        parentSpanIds: _optionalChain([args, 'optionalAccess', _37 => _37.parentSpanIds]),
+        propagatedEvent: _optionalChain([args, 'optionalAccess', _38 => _38.propagatedEvent])
       }),
       defaultRootType: "task" /* TASK */
     });
@@ -4368,26 +4682,26 @@ var BACKGROUND_LOGGER_BASE_SLEEP_TIME_S = 1;
 var HTTPBackgroundLogger = (_class7 = class _HTTPBackgroundLogger {
   
   
-  __init21() {this.activeFlush = Promise.resolve()}
-  __init22() {this.activeFlushResolved = true}
-  __init23() {this.activeFlushError = void 0}
+  __init22() {this.activeFlush = Promise.resolve()}
+  __init23() {this.activeFlushResolved = true}
+  __init24() {this.activeFlushError = void 0}
   
-  __init24() {this.maskingFunction = null}
-  __init25() {this.syncFlush = false}
+  __init25() {this.maskingFunction = null}
+  __init26() {this.syncFlush = false}
   // 6 MB for the AWS lambda gateway (from our own testing).
-  __init26() {this.maxRequestSize = 6 * 1024 * 1024}
-  __init27() {this.defaultBatchSize = 100}
-  __init28() {this.numTries = 3}
-  __init29() {this.queueDropExceedingMaxsize = DEFAULT_QUEUE_SIZE}
-  __init30() {this.queueDropLoggingPeriod = 60}
-  __init31() {this.failedPublishPayloadsDir = void 0}
-  __init32() {this.allPublishPayloadsDir = void 0}
-  __init33() {this._disabled = false}
-  __init34() {this.queueDropLoggingState = {
+  __init27() {this.maxRequestSize = 6 * 1024 * 1024}
+  __init28() {this.defaultBatchSize = 100}
+  __init29() {this.numTries = 3}
+  __init30() {this.queueDropExceedingMaxsize = DEFAULT_QUEUE_SIZE}
+  __init31() {this.queueDropLoggingPeriod = 60}
+  __init32() {this.failedPublishPayloadsDir = void 0}
+  __init33() {this.allPublishPayloadsDir = void 0}
+  __init34() {this._disabled = false}
+  __init35() {this.queueDropLoggingState = {
     numDropped: 0,
     lastLoggedTimestamp: 0
   }}
-  constructor(apiConn, opts) {;_class7.prototype.__init21.call(this);_class7.prototype.__init22.call(this);_class7.prototype.__init23.call(this);_class7.prototype.__init24.call(this);_class7.prototype.__init25.call(this);_class7.prototype.__init26.call(this);_class7.prototype.__init27.call(this);_class7.prototype.__init28.call(this);_class7.prototype.__init29.call(this);_class7.prototype.__init30.call(this);_class7.prototype.__init31.call(this);_class7.prototype.__init32.call(this);_class7.prototype.__init33.call(this);_class7.prototype.__init34.call(this);
+  constructor(apiConn, opts) {;_class7.prototype.__init22.call(this);_class7.prototype.__init23.call(this);_class7.prototype.__init24.call(this);_class7.prototype.__init25.call(this);_class7.prototype.__init26.call(this);_class7.prototype.__init27.call(this);_class7.prototype.__init28.call(this);_class7.prototype.__init29.call(this);_class7.prototype.__init30.call(this);_class7.prototype.__init31.call(this);_class7.prototype.__init32.call(this);_class7.prototype.__init33.call(this);_class7.prototype.__init34.call(this);_class7.prototype.__init35.call(this);
     opts = _nullishCoalesce(opts, () => ( {}));
     this.apiConn = apiConn;
     const syncFlushEnv = Number(isomorph_default.getEnv("BRAINTRUST_SYNC_FLUSH"));
@@ -4476,7 +4790,7 @@ var HTTPBackgroundLogger = (_class7 = class _HTTPBackgroundLogger {
       this.queue.clear();
       return;
     }
-    const batchSize = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _35 => _35.batchSize]), () => ( this.defaultBatchSize));
+    const batchSize = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _39 => _39.batchSize]), () => ( this.defaultBatchSize));
     const wrappedItems = this.queue.drain();
     const [allItems, attachments] = await this.unwrapLazyValues(wrappedItems);
     if (allItems.length === 0) {
@@ -4725,10 +5039,10 @@ Error: ${errorText}`;
         } catch (err) {
           if (err instanceof AggregateError) {
             for (const e of err.errors) {
-              _optionalChain([this, 'access', _36 => _36.onFlushError, 'optionalCall', _37 => _37(e)]);
+              _optionalChain([this, 'access', _40 => _40.onFlushError, 'optionalCall', _41 => _41(e)]);
             }
           } else {
-            _optionalChain([this, 'access', _38 => _38.onFlushError, 'optionalCall', _39 => _39(err)]);
+            _optionalChain([this, 'access', _42 => _42.onFlushError, 'optionalCall', _43 => _43(err)]);
           }
           this.activeFlushError = err;
         } finally {
@@ -5123,24 +5437,24 @@ async function loginToState(options = {}) {
   return state;
 }
 function currentExperiment(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _40 => _40.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _44 => _44.state]), () => ( _globalState));
   return state.currentExperiment;
 }
 function currentLogger(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _41 => _41.state]), () => ( _globalState));
-  return castLogger(state.currentLogger, _optionalChain([options, 'optionalAccess', _42 => _42.asyncFlush]));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _45 => _45.state]), () => ( _globalState));
+  return castLogger(state.currentLogger, _optionalChain([options, 'optionalAccess', _46 => _46.asyncFlush]));
 }
 function currentSpan(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _43 => _43.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _47 => _47.state]), () => ( _globalState));
   return _nullishCoalesce(state.currentSpan.getStore(), () => ( NOOP_SPAN));
 }
 function getSpanParentObject(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _44 => _44.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _48 => _48.state]), () => ( _globalState));
   const parentSpan = currentSpan({ state });
   if (!Object.is(parentSpan, NOOP_SPAN)) {
     return parentSpan;
   }
-  const parentStr = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _45 => _45.parent]), () => ( state.currentParent.getStore()));
+  const parentStr = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _49 => _49.parent]), () => ( state.currentParent.getStore()));
   if (parentStr) return SpanComponentsV3.fromStr(parentStr);
   const experiment = currentExperiment();
   if (experiment) {
@@ -5169,7 +5483,7 @@ function traced(callback, args) {
   const { span, isSyncFlushLogger } = startSpanAndIsLogger(args);
   const ret = runCatchFinally(
     () => {
-      if (_nullishCoalesce(_optionalChain([args, 'optionalAccess', _46 => _46.setCurrent]), () => ( true))) {
+      if (_nullishCoalesce(_optionalChain([args, 'optionalAccess', _50 => _50.setCurrent]), () => ( true))) {
         return withCurrent(span, callback);
       } else {
         return callback(span);
@@ -5181,7 +5495,7 @@ function traced(callback, args) {
     },
     () => span.end()
   );
-  if (_optionalChain([args, 'optionalAccess', _47 => _47.asyncFlush]) === void 0 || _optionalChain([args, 'optionalAccess', _48 => _48.asyncFlush])) {
+  if (_optionalChain([args, 'optionalAccess', _51 => _51.asyncFlush]) === void 0 || _optionalChain([args, 'optionalAccess', _52 => _52.asyncFlush])) {
     return ret;
   } else {
     return (async () => {
@@ -5197,14 +5511,14 @@ function startSpan(args) {
   return startSpanAndIsLogger(args).span;
 }
 async function flush(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _49 => _49.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _53 => _53.state]), () => ( _globalState));
   return await state.bgLogger().flush();
 }
 function startSpanAndIsLogger(args) {
-  const state = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _50 => _50.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _54 => _54.state]), () => ( _globalState));
   const parentObject = getSpanParentObject({
-    asyncFlush: _optionalChain([args, 'optionalAccess', _51 => _51.asyncFlush]),
-    parent: _optionalChain([args, 'optionalAccess', _52 => _52.parent]),
+    asyncFlush: _optionalChain([args, 'optionalAccess', _55 => _55.asyncFlush]),
+    parent: _optionalChain([args, 'optionalAccess', _56 => _56.parent]),
     state
   });
   if (parentObject instanceof SpanComponentsV3) {
@@ -5221,14 +5535,14 @@ function startSpanAndIsLogger(args) {
       ),
       parentComputeObjectMetadataArgs: _nullishCoalesce(parentObject.data.compute_object_metadata_args, () => ( void 0)),
       parentSpanIds,
-      propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _53 => _53.propagatedEvent]), () => ( // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _57 => _57.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', _54 => _54.asyncFlush]) === false
+      _optionalChain([args, 'optionalAccess', _58 => _58.asyncFlush]) === false
     };
   } else {
     const span = parentObject.startSpan(args);
@@ -5371,10 +5685,10 @@ function extractAttachments(event, attachments) {
       event[key] = value.reference;
       continue;
     }
-    if (_optionalChain([value, 'optionalAccess', _55 => _55.type]) === BRAINTRUST_ATTACHMENT && value.key && !value.uploader) {
+    if (_optionalChain([value, 'optionalAccess', _59 => _59.type]) === BRAINTRUST_ATTACHMENT && value.key && !value.uploader) {
       continue;
     }
-    if (_optionalChain([value, 'optionalAccess', _56 => _56.reference, 'optionalAccess', _57 => _57.type]) === BRAINTRUST_ATTACHMENT && _optionalChain([value, 'optionalAccess', _58 => _58.uploader])) {
+    if (_optionalChain([value, 'optionalAccess', _60 => _60.reference, 'optionalAccess', _61 => _61.type]) === BRAINTRUST_ATTACHMENT && _optionalChain([value, 'optionalAccess', _62 => _62.uploader])) {
       const attachment = new Attachment({
         data: value.dataDebugString,
         filename: value.reference.filename,
@@ -5441,13 +5755,13 @@ function validateAndSanitizeExperimentLogFullArgs(event, hasDataset) {
 var INTERNAL_BTQL_LIMIT = 1e3;
 var MAX_BTQL_ITERATIONS = 1e4;
 var ObjectFetcher = (_class8 = class {
-  constructor(objectType, pinnedVersion, mutateRecord, _internal_btql) {;_class8.prototype.__init35.call(this);
+  constructor(objectType, pinnedVersion, mutateRecord, _internal_btql) {;_class8.prototype.__init36.call(this);
     this.objectType = objectType;
     this.pinnedVersion = pinnedVersion;
     this.mutateRecord = mutateRecord;
     this._internal_btql = _internal_btql;
   }
-  __init35() {this._fetchedData = void 0}
+  __init36() {this._fetchedData = void 0}
   get id() {
     throw new Error("ObjectFetcher subclasses must have an 'id' attribute");
   }
@@ -5512,7 +5826,7 @@ var ObjectFetcher = (_class8 = class {
           throw new Error("Too many BTQL iterations");
         }
       }
-      this._fetchedData = this.mutateRecord ? _optionalChain([data, 'optionalAccess', _59 => _59.map, 'call', _60 => _60(this.mutateRecord)]) : data;
+      this._fetchedData = this.mutateRecord ? _optionalChain([data, 'optionalAccess', _63 => _63.map, 'call', _64 => _64(this.mutateRecord)]) : data;
     }
     return this._fetchedData || [];
   }
@@ -5543,9 +5857,9 @@ var Experiment2 = (_class9 = class extends ObjectFetcher {
   
   
   // For type identification.
-  __init36() {this.kind = "experiment"}
+  __init37() {this.kind = "experiment"}
   constructor(state, lazyMetadata, dataset) {
-    super("experiment", void 0, (r) => enrichAttachments(r, state));_class9.prototype.__init36.call(this);;
+    super("experiment", void 0, (r) => enrichAttachments(r, state));_class9.prototype.__init37.call(this);;
     this.lazyMetadata = lazyMetadata;
     this.dataset = dataset;
     this.lastStartTime = getCurrentUnixTimestamp();
@@ -5593,7 +5907,7 @@ var Experiment2 = (_class9 = class extends ObjectFetcher {
    * @returns The `id` of the logged event.
    */
   log(event, options) {
-    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _61 => _61.allowConcurrentWithSpans])) {
+    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _65 => _65.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`"
       );
@@ -5646,12 +5960,12 @@ var Experiment2 = (_class9 = class extends ObjectFetcher {
       state: this.state,
       ...startSpanParentArgs({
         state: this.state,
-        parent: _optionalChain([args, 'optionalAccess', _62 => _62.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _66 => _66.parent]),
         parentObjectType: this.parentObjectType(),
         parentObjectId: this.lazyId,
         parentComputeObjectMetadataArgs: void 0,
         parentSpanIds: void 0,
-        propagatedEvent: _optionalChain([args, 'optionalAccess', _63 => _63.propagatedEvent])
+        propagatedEvent: _optionalChain([args, 'optionalAccess', _67 => _67.propagatedEvent])
       }),
       defaultRootType: "eval" /* EVAL */
     });
@@ -5852,8 +6166,8 @@ var SpanImpl = (_class10 = class _SpanImpl {
   
   
   
-  __init37() {this.kind = "span"}
-  constructor(args) {;_class10.prototype.__init37.call(this);
+  __init38() {this.kind = "span"}
+  constructor(args) {;_class10.prototype.__init38.call(this);
     this._state = args.state;
     const spanAttributes = _nullishCoalesce(args.spanAttributes, () => ( {}));
     const rawEvent = _nullishCoalesce(args.event, () => ( {}));
@@ -5893,13 +6207,17 @@ var SpanImpl = (_class10 = class _SpanImpl {
       },
       created: (/* @__PURE__ */ new Date()).toISOString()
     };
-    this._id = _nullishCoalesce(eventId, () => ( _uuid.v4.call(void 0, )));
-    this._spanId = _nullishCoalesce(args.spanId, () => ( _uuid.v4.call(void 0, )));
+    this._id = _nullishCoalesce(eventId, () => ( this._state.idGenerator.getSpanId()));
+    this._spanId = _nullishCoalesce(args.spanId, () => ( this._state.idGenerator.getSpanId()));
     if (args.parentSpanIds) {
       this._rootSpanId = args.parentSpanIds.rootSpanId;
       this._spanParents = "parentSpanIds" in args.parentSpanIds ? args.parentSpanIds.parentSpanIds : [args.parentSpanIds.spanId];
     } else {
-      this._rootSpanId = this._spanId;
+      if (this._state.idGenerator.shareRootSpanId()) {
+        this._rootSpanId = this._spanId;
+      } else {
+        this._rootSpanId = this._state.idGenerator.getTraceId();
+      }
       this._spanParents = void 0;
     }
     this.isMerge = false;
@@ -5943,10 +6261,10 @@ var SpanImpl = (_class10 = class _SpanImpl {
       ...serializableInternalData,
       [IS_MERGE_FIELD]: this.isMerge
     });
-    if (_optionalChain([partialRecord, 'access', _64 => _64.metrics, 'optionalAccess', _65 => _65.end])) {
-      this.loggedEndTime = _optionalChain([partialRecord, 'access', _66 => _66.metrics, 'optionalAccess', _67 => _67.end]);
+    if (_optionalChain([partialRecord, 'access', _68 => _68.metrics, 'optionalAccess', _69 => _69.end])) {
+      this.loggedEndTime = _optionalChain([partialRecord, 'access', _70 => _70.metrics, 'optionalAccess', _71 => _71.end]);
     }
-    if ((_nullishCoalesce(partialRecord.tags, () => ( []))).length > 0 && _optionalChain([this, 'access', _68 => _68._spanParents, 'optionalAccess', _69 => _69.length])) {
+    if ((_nullishCoalesce(partialRecord.tags, () => ( []))).length > 0 && _optionalChain([this, 'access', _72 => _72._spanParents, 'optionalAccess', _73 => _73.length])) {
       throw new Error("Tags can only be logged to the root span");
     }
     const computeRecord = async () => ({
@@ -5991,18 +6309,18 @@ var SpanImpl = (_class10 = class _SpanImpl {
     );
   }
   startSpan(args) {
-    const parentSpanIds = _optionalChain([args, 'optionalAccess', _70 => _70.parent]) ? void 0 : { spanId: this._spanId, rootSpanId: this._rootSpanId };
+    const parentSpanIds = _optionalChain([args, 'optionalAccess', _74 => _74.parent]) ? void 0 : { spanId: this._spanId, rootSpanId: this._rootSpanId };
     return new _SpanImpl({
       state: this._state,
       ...args,
       ...startSpanParentArgs({
         state: this._state,
-        parent: _optionalChain([args, 'optionalAccess', _71 => _71.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _75 => _75.parent]),
         parentObjectType: this.parentObjectType,
         parentObjectId: this.parentObjectId,
         parentComputeObjectMetadataArgs: this.parentComputeObjectMetadataArgs,
         parentSpanIds,
-        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _72 => _72.propagatedEvent]), () => ( this.propagatedEvent))
+        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _76 => _76.propagatedEvent]), () => ( this.propagatedEvent))
       })
     });
   }
@@ -6016,12 +6334,12 @@ var SpanImpl = (_class10 = class _SpanImpl {
       ...args,
       ...startSpanParentArgs({
         state: this._state,
-        parent: _optionalChain([args, 'optionalAccess', _73 => _73.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _77 => _77.parent]),
         parentObjectType: this.parentObjectType,
         parentObjectId: this.parentObjectId,
         parentComputeObjectMetadataArgs: this.parentComputeObjectMetadataArgs,
         parentSpanIds,
-        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _74 => _74.propagatedEvent]), () => ( this.propagatedEvent))
+        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _78 => _78.propagatedEvent]), () => ( this.propagatedEvent))
       }),
       spanId
     });
@@ -6030,7 +6348,7 @@ var SpanImpl = (_class10 = class _SpanImpl {
     let endTime;
     let internalData = {};
     if (!this.loggedEndTime) {
-      endTime = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _75 => _75.endTime]), () => ( getCurrentUnixTimestamp()));
+      endTime = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _79 => _79.endTime]), () => ( getCurrentUnixTimestamp()));
       internalData = { metrics: { end: endTime } };
     } else {
       endTime = this.loggedEndTime;
@@ -6073,8 +6391,8 @@ var SpanImpl = (_class10 = class _SpanImpl {
     const args = this.parentComputeObjectMetadataArgs;
     switch (this.parentObjectType) {
       case 2 /* PROJECT_LOGS */: {
-        const projectID = _optionalChain([args, 'optionalAccess', _76 => _76.project_id]) || this.parentObjectId.getSync().value;
-        const projectName = _optionalChain([args, 'optionalAccess', _77 => _77.project_name]);
+        const projectID = _optionalChain([args, 'optionalAccess', _80 => _80.project_id]) || this.parentObjectId.getSync().value;
+        const projectName = _optionalChain([args, 'optionalAccess', _81 => _81.project_name]);
         if (projectID) {
           return `${baseUrl}/object?object_type=project_logs&object_id=${projectID}&id=${this._id}`;
         } else if (projectName) {
@@ -6084,7 +6402,7 @@ var SpanImpl = (_class10 = class _SpanImpl {
         }
       }
       case 1 /* EXPERIMENT */: {
-        const expID = _optionalChain([args, 'optionalAccess', _78 => _78.experiment_id]) || _optionalChain([this, 'access', _79 => _79.parentObjectId, 'optionalAccess', _80 => _80.getSync, 'call', _81 => _81(), 'optionalAccess', _82 => _82.value]);
+        const expID = _optionalChain([args, 'optionalAccess', _82 => _82.experiment_id]) || _optionalChain([this, 'access', _83 => _83.parentObjectId, 'optionalAccess', _84 => _84.getSync, 'call', _85 => _85(), 'optionalAccess', _86 => _86.value]);
         if (!expID) {
           return getErrPermlink("provide-experiment-id");
         } else {
@@ -6110,6 +6428,20 @@ var SpanImpl = (_class10 = class _SpanImpl {
   state() {
     return this._state;
   }
+  // Custom inspect for Node.js console.log
+  [Symbol.for("nodejs.util.inspect.custom")]() {
+    return `SpanImpl {
+  kind: '${this.kind}',
+  id: '${this.id}',
+  spanId: '${this.spanId}',
+  rootSpanId: '${this.rootSpanId}',
+  spanParents: ${JSON.stringify(this.spanParents)}
+}`;
+  }
+  // Custom toString
+  toString() {
+    return `SpanImpl(id=${this.id}, spanId=${this.spanId})`;
+  }
 }, _class10);
 function splitLoggingData({
   event,
@@ -6160,13 +6492,13 @@ var Dataset2 = (_class11 = class extends ObjectFetcher {
         )
       ),
       _internal_btql
-    );_class11.prototype.__init38.call(this);_class11.prototype.__init39.call(this);;
+    );_class11.prototype.__init39.call(this);_class11.prototype.__init40.call(this);;
     this.state = state;
     this.lazyMetadata = lazyMetadata;
   }
   
-  __init38() {this.__braintrust_dataset_marker = true}
-  __init39() {this.newRecords = 0}
+  __init39() {this.__braintrust_dataset_marker = true}
+  __init40() {this.newRecords = 0}
   get id() {
     return (async () => {
       return (await this.lazyMetadata.get()).dataset.id;
@@ -6489,14 +6821,14 @@ function renderPromptParams(params, args, options) {
   return params;
 }
 var Prompt2 = (_class12 = class _Prompt {
-  constructor(metadata, defaults, noTrace) {;_class12.prototype.__init40.call(this);_class12.prototype.__init41.call(this);
+  constructor(metadata, defaults, noTrace) {;_class12.prototype.__init41.call(this);_class12.prototype.__init42.call(this);
     this.metadata = metadata;
     this.defaults = defaults;
     this.noTrace = noTrace;
   }
   
-  __init40() {this.hasParsedPromptData = false}
-  __init41() {this.__braintrust_prompt_marker = true}
+  __init41() {this.hasParsedPromptData = false}
+  __init42() {this.__braintrust_prompt_marker = true}
   get id() {
     return this.metadata.id;
   }
@@ -6510,13 +6842,13 @@ var Prompt2 = (_class12 = class _Prompt {
     return "slug" in this.metadata ? this.metadata.slug : this.metadata.id;
   }
   get prompt() {
-    return _optionalChain([this, 'access', _83 => _83.getParsedPromptData, 'call', _84 => _84(), 'optionalAccess', _85 => _85.prompt]);
+    return _optionalChain([this, 'access', _87 => _87.getParsedPromptData, 'call', _88 => _88(), 'optionalAccess', _89 => _89.prompt]);
   }
   get version() {
     return this.metadata[TRANSACTION_ID_FIELD];
   }
   get options() {
-    return _optionalChain([this, 'access', _86 => _86.getParsedPromptData, 'call', _87 => _87(), 'optionalAccess', _88 => _88.options]) || {};
+    return _optionalChain([this, 'access', _90 => _90.getParsedPromptData, 'call', _91 => _91(), 'optionalAccess', _92 => _92.options]) || {};
   }
   get promptData() {
     return this.getParsedPromptData();
@@ -6667,7 +6999,7 @@ var Prompt2 = (_class12 = class _Prompt {
       return {
         type: "chat",
         messages,
-        ..._optionalChain([prompt, 'access', _89 => _89.tools, 'optionalAccess', _90 => _90.trim, 'call', _91 => _91()]) ? {
+        ..._optionalChain([prompt, 'access', _93 => _93.tools, 'optionalAccess', _94 => _94.trim, 'call', _95 => _95()]) ? {
           tools: render(prompt.tools)
         } : void 0
       };
@@ -7801,8 +8133,8 @@ function fitNameToSpaces(name, length) {
 }
 var BarProgressReporter = (_class13 = class {
   
-  __init42() {this.bars = {}}
-  constructor() {;_class13.prototype.__init42.call(this);
+  __init43() {this.bars = {}}
+  constructor() {;_class13.prototype.__init43.call(this);
     this.multiBar = new cliProgress.MultiBar(
       {
         clearOnComplete: false,
@@ -7845,9 +8177,9 @@ var Project2 = (_class14 = class {
   
   
   
-  __init43() {this._publishableCodeFunctions = []}
-  __init44() {this._publishablePrompts = []}
-  constructor(args) {;_class14.prototype.__init43.call(this);_class14.prototype.__init44.call(this);
+  __init44() {this._publishableCodeFunctions = []}
+  __init45() {this._publishablePrompts = []}
+  constructor(args) {;_class14.prototype.__init44.call(this);_class14.prototype.__init45.call(this);
     _initializeSpanContext();
     this.name = "name" in args ? args.name : void 0;
     this.id = "id" in args ? args.id : void 0;
@@ -7892,10 +8224,10 @@ var Project2 = (_class14 = class {
   }
 }, _class14);
 var ToolBuilder = (_class15 = class {
-  constructor(project) {;_class15.prototype.__init45.call(this);
+  constructor(project) {;_class15.prototype.__init46.call(this);
     this.project = project;
   }
-  __init45() {this.taskCounter = 0}
+  __init46() {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) {
@@ -7922,10 +8254,10 @@ var ToolBuilder = (_class15 = class {
   }
 }, _class15);
 var ScorerBuilder = (_class16 = class {
-  constructor(project) {;_class16.prototype.__init46.call(this);
+  constructor(project) {;_class16.prototype.__init47.call(this);
     this.project = project;
   }
-  __init46() {this.taskCounter = 0}
+  __init47() {this.taskCounter = 0}
   create(opts) {
     this.taskCounter++;
     let resolvedName = opts.name;
@@ -8142,9 +8474,9 @@ function promptDefinitionToPromptData(promptDefinition, rawTools) {
     }
   };
 }
-var ProjectNameIdMap = (_class17 = class {constructor() { _class17.prototype.__init47.call(this);_class17.prototype.__init48.call(this); }
-  __init47() {this.nameToId = {}}
-  __init48() {this.idToName = {}}
+var ProjectNameIdMap = (_class17 = class {constructor() { _class17.prototype.__init48.call(this);_class17.prototype.__init49.call(this); }
+  __init48() {this.nameToId = {}}
+  __init49() {this.idToName = {}}
   async getId(projectName) {
     if (!(projectName in this.nameToId)) {
       const response = await _internalGetGlobalState().appConn().post_json("api/project/register", {
@@ -8506,10 +8838,10 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                 span,
                 parameters: _nullishCoalesce(parameters, () => ( {})),
                 reportProgress: (event) => {
-                  _optionalChain([stream, 'optionalCall', _92 => _92({
+                  _optionalChain([stream, 'optionalCall', _96 => _96({
                     ...event,
                     id: rootSpan.id,
-                    origin: _optionalChain([baseEvent, 'access', _93 => _93.event, 'optionalAccess', _94 => _94.origin]),
+                    origin: _optionalChain([baseEvent, 'access', _97 => _97.event, 'optionalAccess', _98 => _98.origin]),
                     name: evaluator.evalName,
                     object_type: "task"
                   })]);
@@ -8659,7 +8991,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             ...scores
           },
           error: error2,
-          origin: _optionalChain([baseEvent, 'access', _95 => _95.event, 'optionalAccess', _96 => _96.origin])
+          origin: _optionalChain([baseEvent, 'access', _99 => _99.event, 'optionalAccess', _100 => _100.origin])
         });
       };
       if (!experiment) {
@@ -8882,12 +9214,12 @@ async function cachedLogin(options) {
 }
 function makeCheckAuthorized(allowedOrgName) {
   return async (req, _res, next) => {
-    if (!_optionalChain([req, 'access', _97 => _97.ctx, 'optionalAccess', _98 => _98.token])) {
+    if (!_optionalChain([req, 'access', _101 => _101.ctx, 'optionalAccess', _102 => _102.token])) {
       return next(_httperrors2.default.call(void 0, 401, "Unauthorized"));
     }
     try {
       const state = await cachedLogin({
-        apiKey: _optionalChain([req, 'access', _99 => _99.ctx, 'optionalAccess', _100 => _100.token]),
+        apiKey: _optionalChain([req, 'access', _103 => _103.ctx, 'optionalAccess', _104 => _104.token]),
         orgName: allowedOrgName
       });
       req.ctx.state = state;
@@ -9093,7 +9425,7 @@ function runDevServer(evaluators, opts) {
         scores,
         stream
       } = evalBodySchema.parse(req.body);
-      if (!_optionalChain([req, 'access', _101 => _101.ctx, 'optionalAccess', _102 => _102.state])) {
+      if (!_optionalChain([req, 'access', _105 => _105.ctx, 'optionalAccess', _106 => _106.state])) {
         res.status(500).json({ error: "Braintrust state not initialized in request" });
         return;
       }
@@ -9150,7 +9482,7 @@ function runDevServer(evaluators, opts) {
             ...evaluator,
             data: evalData.data,
             scores: evaluator.scores.concat(
-              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _103 => _103.map, 'call', _104 => _104(
+              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _107 => _107.map, 'call', _108 => _108(
                 (score) => makeScorer(state, score.name, score.function_id)
               )]), () => ( []))
             ),