braintrust 3.9.0 → 3.10.0

package/dev/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } async function _asyncOptionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = await fn(value); } else if (op === 'call' || op === 'optionalCall') { value = await fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13; var _class14; var _class15; var _class16; var _class17; var _class18; var _class19; var _class20; var _class21; var _class22; var _class23; var _class24; var _class25; var _class26;// src/node/config.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } async function _asyncOptionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = await fn(value); } else if (op === 'call' || op === 'optionalCall') { value = await fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13; var _class14; var _class15; var _class16; var _class17; var _class18; var _class19; var _class20; var _class21; var _class22; var _class23; var _class24; var _class25; var _class26; var _class27;// src/node/config.ts
 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);
@@ -2123,6 +2123,7 @@ var TopicMapData = _v3.z.object({
   report_key: _v3.z.string().optional(),
   topic_names: _v3.z.record(_v3.z.string()).optional(),
   generation_settings: TopicMapGenerationSettings.optional(),
+  disable_reconciliation: _v3.z.boolean().optional(),
   distance_threshold: _v3.z.number().optional()
 });
 var BatchedFacetData = _v3.z.object({
@@ -2453,28 +2454,6 @@ var EnvVar = _v3.z.object({
   secret_type: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   secret_category: _v3.z.enum(["env_var", "ai_provider", "sandbox_provider"]).optional().default("env_var")
 });
-var EvalStatusPageTheme = _v3.z.enum(["light", "dark"]);
-var EvalStatusPageConfig = _v3.z.object({
-  score_columns: _v3.z.union([_v3.z.array(_v3.z.string()), _v3.z.null()]),
-  metric_columns: _v3.z.union([_v3.z.array(_v3.z.string()), _v3.z.null()]),
-  grouping_field: _v3.z.union([_v3.z.string(), _v3.z.null()]),
-  filter: _v3.z.union([_v3.z.string(), _v3.z.null()]),
-  sort_by: _v3.z.union([_v3.z.string(), _v3.z.null()]),
-  sort_order: _v3.z.union([_v3.z.enum(["asc", "desc"]), _v3.z.null()]),
-  api_key: _v3.z.union([_v3.z.string(), _v3.z.null()])
-}).partial();
-var EvalStatusPage = _v3.z.object({
-  id: _v3.z.string().uuid(),
-  project_id: _v3.z.string().uuid(),
-  user_id: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
-  created: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
-  deleted_at: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
-  name: _v3.z.string(),
-  description: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
-  logo_url: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
-  theme: EvalStatusPageTheme,
-  config: EvalStatusPageConfig
-});
 var RepoInfo = _v3.z.union([
   _v3.z.object({
     commit: _v3.z.union([_v3.z.string(), _v3.z.null()]),
@@ -2501,6 +2480,15 @@ var Experiment = _v3.z.object({
   deleted_at: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   dataset_id: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   dataset_version: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
+  internal_metadata: _v3.z.union([
+    _v3.z.object({
+      dataset_filter: _v3.z.union([
+        _v3.z.object({}).partial().passthrough(),
+        _v3.z.null()
+      ])
+    }).partial().passthrough(),
+    _v3.z.null()
+  ]).optional(),
   parameters_id: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   parameters_version: _v3.z.union([_v3.z.string(), _v3.z.null()]).optional(),
   public: _v3.z.boolean(),
@@ -3237,14 +3225,21 @@ var ProjectAutomation = _v3.z.object({
         _v3.z.object({ type: _v3.z.literal("log_spans") }),
         _v3.z.object({ type: _v3.z.literal("btql_query"), btql_query: _v3.z.string() })
       ]),
+      scope: _v3.z.union([SpanScope, TraceScope, GroupScope, _v3.z.null()]).optional(),
       export_path: _v3.z.string(),
       format: _v3.z.enum(["jsonl", "parquet"]),
       interval_seconds: _v3.z.number().gte(1).lte(2592e3),
-      credentials: _v3.z.object({
-        type: _v3.z.literal("aws_iam"),
-        role_arn: _v3.z.string(),
-        external_id: _v3.z.string()
-      }),
+      credentials: _v3.z.union([
+        _v3.z.object({
+          type: _v3.z.literal("aws_iam"),
+          role_arn: _v3.z.string(),
+          external_id: _v3.z.string()
+        }),
+        _v3.z.object({
+          type: _v3.z.literal("gcp_service_account"),
+          service_account_email: _v3.z.string()
+        })
+      ]),
       batch_size: _v3.z.union([_v3.z.number(), _v3.z.null()]).optional()
     }),
     _v3.z.object({
@@ -3624,7 +3619,7 @@ var ViewOptions = _v3.z.union([
       _v3.z.object({ from: _v3.z.string(), to: _v3.z.string() }),
       _v3.z.null()
     ]),
-    queryShape: _v3.z.union([_v3.z.enum(["traces", "spans"]), _v3.z.null()]),
+    queryShape: _v3.z.union([_v3.z.enum(["traces", "spans", "topics"]), _v3.z.null()]),
     cluster: _v3.z.union([_v3.z.string(), _v3.z.null()]),
     freezeColumns: _v3.z.union([_v3.z.boolean(), _v3.z.null()])
   }).partial(),
@@ -4640,6 +4635,19 @@ var RESET_CONTEXT_MANAGER_STATE = Symbol.for(
   "braintrust.resetContextManagerState"
 );
 var DEFAULT_MAX_REQUEST_SIZE = 6 * 1024 * 1024;
+var datasetSnapshotRegisterResponseSchema = _v3.z.object({
+  dataset_snapshot: DatasetSnapshot,
+  found_existing: _v3.z.boolean().optional()
+});
+var datasetRestorePreviewResultSchema = _v3.z.object({
+  rows_to_restore: _v3.z.number(),
+  rows_to_delete: _v3.z.number()
+});
+var datasetRestoreResultSchema = _v3.z.object({
+  xact_id: _v3.z.string().nullable(),
+  rows_restored: _v3.z.number(),
+  rows_deleted: _v3.z.number()
+});
 var parametersRowSchema = _v3.z.object({
   id: _v3.z.string().uuid(),
   _xact_id: _v3.z.string(),
@@ -6649,6 +6657,33 @@ Error: ${errorText}`;
     this.queue.enforceQueueSizeLimit(enforce);
   }
 }, _class10);
+function isDatasetSnapshotNameLookup(lookup) {
+  return "snapshotName" in lookup;
+}
+function assertDatasetSnapshotLookup(lookup) {
+  const hasSnapshotName = lookup.snapshotName !== void 0;
+  const hasXactId = lookup.xactId !== void 0;
+  if (hasSnapshotName === hasXactId) {
+    throw new Error("Exactly one of snapshotName or xactId must be provided");
+  }
+}
+function getExperimentDatasetFilter({
+  dataset,
+  _internal_btql
+}) {
+  if (_internal_btql !== void 0) {
+    return _internal_btql;
+  }
+  if (!(dataset instanceof Dataset2)) {
+    return void 0;
+  }
+  const datasetFilter = Reflect.get(dataset, "_internal_btql");
+  return isObject(datasetFilter) ? datasetFilter : void 0;
+}
+function getInternalBtqlLimit(internalBtql) {
+  const limit = _optionalChain([internalBtql, 'optionalAccess', _85 => _85["limit"]]);
+  return typeof limit === "number" ? limit : void 0;
+}
 function init(projectOrOptions, optionalOptions) {
   const options = (() => {
     if (typeof projectOrOptions === "string") {
@@ -6667,6 +6702,7 @@ function init(projectOrOptions, optionalOptions) {
     experiment,
     description,
     dataset,
+    _internal_btql,
     parameters,
     baseExperiment,
     isPublic,
@@ -6775,16 +6811,24 @@ function init(projectOrOptions, optionalOptions) {
         args["ancestor_commits"] = await isomorph_default.getPastNAncestors();
       }
       if (dataset !== void 0) {
-        if ("id" in dataset && typeof dataset.id === "string" && !("__braintrust_dataset_marker" in dataset)) {
-          args["dataset_id"] = dataset.id;
-          if ("version" in dataset && dataset.version !== void 0) {
-            args["dataset_version"] = dataset.version;
-          }
-        } else {
-          args["dataset_id"] = await dataset.id;
-          args["dataset_version"] = await dataset.version();
+        const datasetSelection = await serializeDatasetForExperiment({
+          dataset,
+          state
+        });
+        args["dataset_id"] = datasetSelection.datasetId;
+        if (datasetSelection.datasetVersion !== void 0) {
+          args["dataset_version"] = datasetSelection.datasetVersion;
         }
       }
+      const datasetFilter = getExperimentDatasetFilter({
+        dataset,
+        _internal_btql
+      });
+      if (datasetFilter !== void 0) {
+        args["internal_metadata"] = {
+          dataset_filter: datasetFilter
+        };
+      }
       if (parameters !== void 0) {
         if (RemoteEvalParameters.isParameters(parameters)) {
           args["parameters_id"] = parameters.id;
@@ -6838,13 +6882,160 @@ function init(projectOrOptions, optionalOptions) {
   const ret = new Experiment2(
     state,
     lazyMetadata,
-    dataset !== void 0 && "version" in dataset ? dataset : void 0
+    dataset !== void 0 ? dataset : void 0
   );
   if (_nullishCoalesce(options.setCurrent, () => ( true))) {
     state.currentExperiment = ret;
   }
   return ret;
 }
+async function getDatasetSnapshots(params) {
+  const { state, datasetId } = params;
+  return DatasetSnapshot.array().parse(
+    await state.appConn().post_json("api/dataset_snapshot/get", {
+      dataset_id: datasetId,
+      ..."snapshotName" in params ? { name: params.snapshotName } : {},
+      ..."xactId" in params ? { xact_id: params.xactId } : {}
+    })
+  );
+}
+async function getDatasetSnapshot(params) {
+  assertDatasetSnapshotLookup(params);
+  const snapshots = await getDatasetSnapshots(params);
+  if (snapshots.length > 1) {
+    throw new Error(
+      isDatasetSnapshotNameLookup(params) ? `Expected a unique dataset snapshot named "${params.snapshotName}" for ${params.datasetId}` : `Expected a unique dataset snapshot for xact_id "${params.xactId}" in ${params.datasetId}`
+    );
+  }
+  return snapshots[0];
+}
+function normalizeDatasetSelection({
+  version,
+  environment,
+  snapshotName
+}) {
+  if (version !== void 0) {
+    return { version };
+  }
+  if (snapshotName !== void 0) {
+    return { snapshotName };
+  }
+  if (environment !== void 0) {
+    return { environment };
+  }
+  return {};
+}
+async function resolveDatasetSnapshotName({
+  state,
+  datasetId,
+  snapshotName
+}) {
+  const match = await getDatasetSnapshot({
+    state,
+    datasetId,
+    snapshotName
+  });
+  if (match === void 0) {
+    throw new Error(
+      `Dataset snapshot "${snapshotName}" not found for ${datasetId}`
+    );
+  }
+  return match.xact_id;
+}
+async function resolveDatasetSnapshotNameForMetadata({
+  state,
+  lazyMetadata,
+  snapshotName
+}) {
+  const metadata = await lazyMetadata.get();
+  return await resolveDatasetSnapshotName({
+    state,
+    datasetId: metadata.dataset.id,
+    snapshotName
+  });
+}
+async function resolveDatasetEnvironment({
+  state,
+  datasetId,
+  environment
+}) {
+  const environmentObjectPath = `environment-object/dataset/${datasetId}/${encodeURIComponent(environment)}`;
+  const response = state.orgName == null ? await state.apiConn().get_json(environmentObjectPath) : await state.apiConn().get_json(environmentObjectPath, {
+    org_name: state.orgName
+  });
+  return _v3.z.object({ object_version: _v3.z.string() }).parse(response).object_version;
+}
+async function resolveDatasetEnvironmentForMetadata({
+  state,
+  lazyMetadata,
+  environment
+}) {
+  const metadata = await lazyMetadata.get();
+  return await resolveDatasetEnvironment({
+    state,
+    datasetId: metadata.dataset.id,
+    environment
+  });
+}
+async function serializeDatasetForExperiment({
+  dataset,
+  state
+}) {
+  if (!Dataset2.isDataset(dataset)) {
+    const selection2 = normalizeDatasetSelection(dataset);
+    if (selection2.version !== void 0) {
+      return {
+        datasetId: dataset.id,
+        datasetVersion: selection2.version
+      };
+    }
+    if (selection2.snapshotName !== void 0) {
+      return {
+        datasetId: dataset.id,
+        datasetVersion: await resolveDatasetSnapshotName({
+          state,
+          datasetId: dataset.id,
+          snapshotName: selection2.snapshotName
+        })
+      };
+    }
+    if (selection2.environment !== void 0) {
+      return {
+        datasetId: dataset.id,
+        datasetVersion: await resolveDatasetEnvironment({
+          state,
+          datasetId: dataset.id,
+          environment: selection2.environment
+        })
+      };
+    }
+    return {
+      datasetId: dataset.id
+    };
+  }
+  const evalData = await dataset.toEvalData();
+  const selection = normalizeDatasetSelection({
+    version: evalData.dataset_version,
+    environment: evalData.dataset_environment,
+    snapshotName: evalData.dataset_snapshot_name
+  });
+  if (selection.version !== void 0) {
+    return {
+      datasetId: evalData.dataset_id,
+      datasetVersion: selection.version
+    };
+  }
+  const datasetVersion = await dataset.version();
+  if (datasetVersion !== void 0) {
+    return {
+      datasetId: evalData.dataset_id,
+      datasetVersion
+    };
+  }
+  return {
+    datasetId: evalData.dataset_id
+  };
+}
 function initDataset(projectOrOptions, optionalOptions) {
   const options = (() => {
     if (typeof projectOrOptions === "string") {
@@ -6863,6 +7054,8 @@ function initDataset(projectOrOptions, optionalOptions) {
     dataset,
     description,
     version,
+    snapshotName,
+    environment,
     appUrl,
     apiKey,
     orgName,
@@ -6874,6 +7067,14 @@ function initDataset(projectOrOptions, optionalOptions) {
     state: stateArg,
     _internal_btql
   } = options;
+  const selection = normalizeDatasetSelection({
+    version,
+    environment,
+    snapshotName
+  });
+  const normalizedVersion = selection.version;
+  const normalizedEnvironment = selection.environment;
+  const normalizedSnapshotName = selection.snapshotName;
   const state = _nullishCoalesce(stateArg, () => ( _globalState));
   const lazyMetadata = new LazyValue(
     async () => {
@@ -6907,13 +7108,38 @@ function initDataset(projectOrOptions, optionalOptions) {
       };
     }
   );
-  return new Dataset2(
+  const resolvedVersion = normalizedVersion !== void 0 ? normalizedVersion : normalizedSnapshotName !== void 0 ? new LazyValue(async () => {
+    return await resolveDatasetSnapshotNameForMetadata({
+      state,
+      lazyMetadata,
+      snapshotName: normalizedSnapshotName
+    });
+  }) : normalizedEnvironment !== void 0 ? new LazyValue(async () => {
+    return await resolveDatasetEnvironmentForMetadata({
+      state,
+      lazyMetadata,
+      environment: normalizedEnvironment
+    });
+  }) : void 0;
+  const datasetObject = new Dataset2(
     _nullishCoalesce(stateArg, () => ( _globalState)),
     lazyMetadata,
-    version,
+    typeof resolvedVersion === "string" ? resolvedVersion : void 0,
     legacy,
-    _internal_btql
+    _internal_btql,
+    resolvedVersion instanceof LazyValue || normalizedEnvironment !== void 0 || normalizedSnapshotName !== void 0 ? {
+      ...resolvedVersion instanceof LazyValue ? {
+        lazyPinnedVersion: resolvedVersion
+      } : {},
+      ...normalizedEnvironment !== void 0 ? {
+        pinnedEnvironment: normalizedEnvironment
+      } : {},
+      ...normalizedSnapshotName !== void 0 ? {
+        pinnedSnapshotName: normalizedSnapshotName
+      } : {}
+    } : void 0
   );
+  return datasetObject;
 }
 async function computeLoggerMetadata(state, {
   project_name,
@@ -7050,24 +7276,24 @@ async function loginToState(options = {}) {
   return state;
 }
 function currentExperiment(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _85 => _85.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _86 => _86.state]), () => ( _globalState));
   return state.currentExperiment;
 }
 function currentLogger(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _86 => _86.state]), () => ( _globalState));
-  return castLogger(state.currentLogger, _optionalChain([options, 'optionalAccess', _87 => _87.asyncFlush]));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _87 => _87.state]), () => ( _globalState));
+  return castLogger(state.currentLogger, _optionalChain([options, 'optionalAccess', _88 => _88.asyncFlush]));
 }
 function currentSpan(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _88 => _88.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _89 => _89.state]), () => ( _globalState));
   return _nullishCoalesce(state.contextManager.getCurrentSpan(), () => ( NOOP_SPAN));
 }
 function getSpanParentObject(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _89 => _89.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _90 => _90.state]), () => ( _globalState));
   const parentSpan = currentSpan({ state });
   if (!Object.is(parentSpan, NOOP_SPAN)) {
     return parentSpan;
   }
-  const parentStr = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _90 => _90.parent]), () => ( state.currentParent.getStore()));
+  const parentStr = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _91 => _91.parent]), () => ( state.currentParent.getStore()));
   if (parentStr) return getSpanComponentsClass().fromStr(parentStr);
   const experiment = currentExperiment();
   if (experiment) {
@@ -7096,7 +7322,7 @@ function traced(callback, args) {
   const { span, isSyncFlushLogger } = startSpanAndIsLogger(args);
   const ret = runCatchFinally(
     () => {
-      if (_nullishCoalesce(_optionalChain([args, 'optionalAccess', _91 => _91.setCurrent]), () => ( true))) {
+      if (_nullishCoalesce(_optionalChain([args, 'optionalAccess', _92 => _92.setCurrent]), () => ( true))) {
         return withCurrent(span, callback);
       } else {
         return callback(span);
@@ -7108,7 +7334,7 @@ function traced(callback, args) {
     },
     () => span.end()
   );
-  if (_optionalChain([args, 'optionalAccess', _92 => _92.asyncFlush]) === void 0 || _optionalChain([args, 'optionalAccess', _93 => _93.asyncFlush])) {
+  if (_optionalChain([args, 'optionalAccess', _93 => _93.asyncFlush]) === void 0 || _optionalChain([args, 'optionalAccess', _94 => _94.asyncFlush])) {
     return ret;
   } else {
     return (async () => {
@@ -7124,14 +7350,14 @@ function startSpan(args) {
   return startSpanAndIsLogger(args).span;
 }
 async function flush(options) {
-  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _94 => _94.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _95 => _95.state]), () => ( _globalState));
   return await state.bgLogger().flush();
 }
 function startSpanAndIsLogger(args) {
-  const state = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _95 => _95.state]), () => ( _globalState));
+  const state = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _96 => _96.state]), () => ( _globalState));
   const parentObject = getSpanParentObject({
-    asyncFlush: _optionalChain([args, 'optionalAccess', _96 => _96.asyncFlush]),
-    parent: _optionalChain([args, 'optionalAccess', _97 => _97.parent]),
+    asyncFlush: _optionalChain([args, 'optionalAccess', _97 => _97.asyncFlush]),
+    parent: _optionalChain([args, 'optionalAccess', _98 => _98.parent]),
     state
   });
   if (parentObject instanceof SpanComponentsV3 || parentObject instanceof SpanComponentsV4) {
@@ -7148,14 +7374,14 @@ function startSpanAndIsLogger(args) {
       ),
       parentComputeObjectMetadataArgs: _nullishCoalesce(parentObject.data.compute_object_metadata_args, () => ( void 0)),
       parentSpanIds,
-      propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _98 => _98.propagatedEvent]), () => ( // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _99 => _99.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', _99 => _99.asyncFlush]) === false
+      _optionalChain([args, 'optionalAccess', _100 => _100.asyncFlush]) === false
     };
   } else {
     const span = parentObject.startSpan(args);
@@ -7322,10 +7548,10 @@ function extractAttachments(event, attachments) {
       event[key] = value.reference;
       continue;
     }
-    if (_optionalChain([value, 'optionalAccess', _100 => _100.type]) === BRAINTRUST_ATTACHMENT && value.key && !value.uploader) {
+    if (_optionalChain([value, 'optionalAccess', _101 => _101.type]) === BRAINTRUST_ATTACHMENT && value.key && !value.uploader) {
       continue;
     }
-    if (_optionalChain([value, 'optionalAccess', _101 => _101.reference, 'optionalAccess', _102 => _102.type]) === BRAINTRUST_ATTACHMENT && _optionalChain([value, 'optionalAccess', _103 => _103.uploader])) {
+    if (_optionalChain([value, 'optionalAccess', _102 => _102.reference, 'optionalAccess', _103 => _103.type]) === BRAINTRUST_ATTACHMENT && _optionalChain([value, 'optionalAccess', _104 => _104.uploader])) {
       const attachment = new Attachment({
         data: value.dataDebugString,
         filename: value.reference.filename,
@@ -7405,11 +7631,20 @@ var ObjectFetcher = (_class11 = class {
   async getState() {
     throw new Error("ObjectFetcher subclasses must have a 'getState' method");
   }
+  getPinnedVersion() {
+    return this.pinnedVersion;
+  }
+  setPinnedVersion(pinnedVersion) {
+    this.pinnedVersion = pinnedVersion;
+  }
+  getInternalBtql() {
+    return this._internal_btql;
+  }
   async *fetchRecordsFromApi(batchSize) {
     const state = await this.getState();
     const objectId = await this.id;
     const batchLimit = _nullishCoalesce(batchSize, () => ( DEFAULT_FETCH_BATCH_SIZE));
-    const internalLimit = _optionalChain([this, 'access', _104 => _104._internal_btql, 'optionalAccess', _105 => _105.limit]);
+    const internalLimit = getInternalBtqlLimit(this._internal_btql);
     const limit = batchSize !== void 0 ? batchSize : _nullishCoalesce(internalLimit, () => ( batchLimit));
     const internalBtqlWithoutReservedQueryKeys = Object.fromEntries(
       Object.entries(_nullishCoalesce(this._internal_btql, () => ( {}))).filter(
@@ -7483,7 +7718,7 @@ var ObjectFetcher = (_class11 = class {
       }
       return;
     }
-    for await (const record of this.fetchRecordsFromApi(_optionalChain([options, 'optionalAccess', _106 => _106.batchSize]))) {
+    for await (const record of this.fetchRecordsFromApi(_optionalChain([options, 'optionalAccess', _105 => _105.batchSize]))) {
       yield record;
     }
   }
@@ -7493,7 +7728,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', _107 => _107.batchSize]))) {
+      for await (const record of this.fetchRecordsFromApi(_optionalChain([options, 'optionalAccess', _106 => _106.batchSize]))) {
         data.push(record);
       }
       this._fetchedData = data;
@@ -7588,7 +7823,7 @@ var Experiment2 = (_class12 = class extends ObjectFetcher {
    * @returns The `id` of the logged event.
    */
   log(event, options) {
-    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _108 => _108.allowConcurrentWithSpans])) {
+    if (this.calledStartSpan && !_optionalChain([options, 'optionalAccess', _107 => _107.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`"
       );
@@ -7641,12 +7876,12 @@ var Experiment2 = (_class12 = class extends ObjectFetcher {
       state: this.state,
       ...startSpanParentArgs({
         state: this.state,
-        parent: _optionalChain([args, 'optionalAccess', _109 => _109.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _108 => _108.parent]),
         parentObjectType: this.parentObjectType(),
         parentObjectId: this.lazyId,
         parentComputeObjectMetadataArgs: void 0,
         parentSpanIds: void 0,
-        propagatedEvent: _optionalChain([args, 'optionalAccess', _110 => _110.propagatedEvent])
+        propagatedEvent: _optionalChain([args, 'optionalAccess', _109 => _109.propagatedEvent])
       }),
       defaultRootType: "eval" /* EVAL */
     });
@@ -7990,7 +8225,7 @@ var SpanImpl = (_class13 = class _SpanImpl {
       ...serializableInternalData,
       [IS_MERGE_FIELD]: this.isMerge
     });
-    if (typeof _optionalChain([partialRecord, 'access', _111 => _111.metrics, 'optionalAccess', _112 => _112.end]) === "number") {
+    if (typeof _optionalChain([partialRecord, 'access', _110 => _110.metrics, 'optionalAccess', _111 => _111.end]) === "number") {
       this.loggedEndTime = partialRecord.metrics.end;
     }
     if (this.parentObjectType === 1 /* EXPERIMENT */) {
@@ -8050,18 +8285,18 @@ var SpanImpl = (_class13 = class _SpanImpl {
     );
   }
   startSpan(args) {
-    const parentSpanIds = _optionalChain([args, 'optionalAccess', _113 => _113.parent]) ? void 0 : { spanId: this._spanId, rootSpanId: this._rootSpanId };
+    const parentSpanIds = _optionalChain([args, 'optionalAccess', _112 => _112.parent]) ? void 0 : { spanId: this._spanId, rootSpanId: this._rootSpanId };
     return new _SpanImpl({
       state: this._state,
       ...args,
       ...startSpanParentArgs({
         state: this._state,
-        parent: _optionalChain([args, 'optionalAccess', _114 => _114.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _113 => _113.parent]),
         parentObjectType: this.parentObjectType,
         parentObjectId: this.parentObjectId,
         parentComputeObjectMetadataArgs: this.parentComputeObjectMetadataArgs,
         parentSpanIds,
-        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _115 => _115.propagatedEvent]), () => ( this.propagatedEvent))
+        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _114 => _114.propagatedEvent]), () => ( this.propagatedEvent))
       })
     });
   }
@@ -8075,12 +8310,12 @@ var SpanImpl = (_class13 = class _SpanImpl {
       ...args,
       ...startSpanParentArgs({
         state: this._state,
-        parent: _optionalChain([args, 'optionalAccess', _116 => _116.parent]),
+        parent: _optionalChain([args, 'optionalAccess', _115 => _115.parent]),
         parentObjectType: this.parentObjectType,
         parentObjectId: this.parentObjectId,
         parentComputeObjectMetadataArgs: this.parentComputeObjectMetadataArgs,
         parentSpanIds,
-        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _117 => _117.propagatedEvent]), () => ( this.propagatedEvent))
+        propagatedEvent: _nullishCoalesce(_optionalChain([args, 'optionalAccess', _116 => _116.propagatedEvent]), () => ( this.propagatedEvent))
       }),
       spanId
     });
@@ -8089,7 +8324,7 @@ var SpanImpl = (_class13 = class _SpanImpl {
     let endTime;
     let internalData = {};
     if (!this.loggedEndTime) {
-      endTime = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _118 => _118.endTime]), () => ( getCurrentUnixTimestamp()));
+      endTime = _nullishCoalesce(_optionalChain([args, 'optionalAccess', _117 => _117.endTime]), () => ( getCurrentUnixTimestamp()));
       internalData = { metrics: { end: endTime } };
     } else {
       endTime = this.loggedEndTime;
@@ -8140,8 +8375,8 @@ var SpanImpl = (_class13 = class _SpanImpl {
     const args = this.parentComputeObjectMetadataArgs;
     switch (this.parentObjectType) {
       case 2 /* PROJECT_LOGS */: {
-        const projectID = _optionalChain([args, 'optionalAccess', _119 => _119.project_id]) || this.parentObjectId.getSync().value;
-        const projectName = _optionalChain([args, 'optionalAccess', _120 => _120.project_name]);
+        const projectID = _optionalChain([args, 'optionalAccess', _118 => _118.project_id]) || this.parentObjectId.getSync().value;
+        const projectName = _optionalChain([args, 'optionalAccess', _119 => _119.project_name]);
         if (projectID) {
           return `${baseUrl}/object?object_type=project_logs&object_id=${projectID}&id=${this._id}`;
         } else if (projectName) {
@@ -8151,7 +8386,7 @@ var SpanImpl = (_class13 = class _SpanImpl {
         }
       }
       case 1 /* EXPERIMENT */: {
-        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]);
+        const expID = _optionalChain([args, 'optionalAccess', _120 => _120.experiment_id]) || _optionalChain([this, 'access', _121 => _121.parentObjectId, 'optionalAccess', _122 => _122.getSync, 'call', _123 => _123(), 'optionalAccess', _124 => _124.value]);
         if (!expID) {
           return getErrPermlink("provide-experiment-id");
         } else {
@@ -8223,7 +8458,7 @@ function splitLoggingData({
   return [serializableInternalData, lazyInternalData];
 }
 var Dataset2 = (_class14 = class extends ObjectFetcher {
-  constructor(state, lazyMetadata, pinnedVersion, legacy, _internal_btql) {
+  constructor(state, lazyMetadata, pinnedVersion, legacy, _internal_btql, pinState) {
     const isLegacyDataset = _nullishCoalesce(legacy, () => ( DEFAULT_IS_LEGACY_DATASET));
     if (isLegacyDataset) {
       debugLogger.forState(state).warn(
@@ -8244,10 +8479,16 @@ var Dataset2 = (_class14 = class extends ObjectFetcher {
     );_class14.prototype.__init57.call(this);_class14.prototype.__init58.call(this);;
     this.state = state;
     this.lazyMetadata = lazyMetadata;
+    this.lazyPinnedVersion = _optionalChain([pinState, 'optionalAccess', _125 => _125.lazyPinnedVersion]);
+    this.pinnedEnvironment = _optionalChain([pinState, 'optionalAccess', _126 => _126.pinnedEnvironment]);
+    this.pinnedSnapshotName = _optionalChain([pinState, 'optionalAccess', _127 => _127.pinnedSnapshotName]);
   }
   
   __init57() {this.__braintrust_dataset_marker = true}
   __init58() {this.newRecords = 0}
+  
+  
+  
   get id() {
     return (async () => {
       return (await this.lazyMetadata.get()).dataset.id;
@@ -8266,10 +8507,40 @@ var Dataset2 = (_class14 = class extends ObjectFetcher {
   get loggingState() {
     return this.state;
   }
+  async toEvalData() {
+    await this.getState();
+    const metadata = await this.lazyMetadata.get();
+    const pinnedVersion = this.getPinnedVersion();
+    const internalBtql = this.getInternalBtql();
+    return {
+      dataset_id: metadata.dataset.id,
+      ...this.pinnedEnvironment !== void 0 ? {
+        dataset_environment: this.pinnedEnvironment
+      } : {},
+      ...this.pinnedEnvironment === void 0 && this.pinnedSnapshotName !== void 0 ? {
+        dataset_snapshot_name: this.pinnedSnapshotName
+      } : {},
+      ...this.pinnedEnvironment === void 0 && this.pinnedSnapshotName === void 0 && pinnedVersion !== void 0 ? {
+        dataset_version: pinnedVersion
+      } : {},
+      ...internalBtql !== void 0 ? { _internal_btql: internalBtql } : {}
+    };
+  }
   async getState() {
     await this.lazyMetadata.get();
+    if (this.lazyPinnedVersion !== void 0 && this.getPinnedVersion() === void 0) {
+      this.setPinnedVersion(await this.lazyPinnedVersion.get());
+    }
     return this.state;
   }
+  async version(options) {
+    const pinnedVersion = this.getPinnedVersion();
+    if (pinnedVersion !== void 0) {
+      return pinnedVersion;
+    }
+    await this.getState();
+    return await super.version(options);
+  }
   validateEvent({
     metadata,
     expected,
@@ -8405,6 +8676,88 @@ var Dataset2 = (_class14 = class extends ObjectFetcher {
     this.state.bgLogger().log([args]);
     return id;
   }
+  async createSnapshot({
+    name,
+    description,
+    update
+  }) {
+    await this.flush();
+    const state = await this.getState();
+    const datasetId = await this.id;
+    const currentVersion = await this.version();
+    if (currentVersion === void 0) {
+      throw new Error("Cannot create snapshot: dataset has no version");
+    }
+    const response = await state.appConn().post_json("api/dataset_snapshot/register", {
+      dataset_id: datasetId,
+      dataset_snapshot_name: name,
+      description,
+      xact_id: currentVersion,
+      update
+    });
+    return datasetSnapshotRegisterResponseSchema.parse(response).dataset_snapshot;
+  }
+  async listSnapshots() {
+    const state = await this.getState();
+    return await getDatasetSnapshots({
+      state,
+      datasetId: await this.id
+    });
+  }
+  async getSnapshot(lookup) {
+    const state = await this.getState();
+    const datasetId = await this.id;
+    return await getDatasetSnapshot({
+      state,
+      datasetId,
+      ...lookup
+    });
+  }
+  async updateSnapshot(snapshotId, {
+    name,
+    description
+  }) {
+    const state = await this.getState();
+    return DatasetSnapshot.parse(
+      await state.appConn().post_json("api/dataset_snapshot/patch_id", {
+        id: snapshotId,
+        name,
+        description
+      })
+    );
+  }
+  async deleteSnapshot(snapshotId) {
+    const state = await this.getState();
+    return DatasetSnapshot.parse(
+      await state.appConn().post_json("api/dataset_snapshot/delete_id", {
+        id: snapshotId
+      })
+    );
+  }
+  async restorePreview({
+    version
+  }) {
+    await this.flush();
+    const state = await this.getState();
+    const datasetId = await this.id;
+    return datasetRestorePreviewResultSchema.parse(
+      await state.apiConn().post_json(`v1/dataset/${datasetId}/restore/preview`, {
+        version
+      })
+    );
+  }
+  async restore({
+    version
+  }) {
+    await this.flush();
+    const state = await this.getState();
+    const datasetId = await this.id;
+    return datasetRestoreResultSchema.parse(
+      await state.apiConn().post_json(`v1/dataset/${datasetId}/restore`, {
+        version
+      })
+    );
+  }
   /**
    * Summarize the dataset, including high level metrics about its size and other metadata.
    * @param summarizeData Whether to summarize the data. If false, only the metadata will be returned.
@@ -8651,16 +9004,16 @@ var Prompt2 = (_class15 = class _Prompt {
     return "slug" in this.metadata ? this.metadata.slug : this.metadata.id;
   }
   get prompt() {
-    return _optionalChain([this, 'access', _126 => _126.getParsedPromptData, 'call', _127 => _127(), 'optionalAccess', _128 => _128.prompt]);
+    return _optionalChain([this, 'access', _128 => _128.getParsedPromptData, 'call', _129 => _129(), 'optionalAccess', _130 => _130.prompt]);
   }
   get version() {
     return this.metadata[TRANSACTION_ID_FIELD];
   }
   get options() {
-    return _optionalChain([this, 'access', _129 => _129.getParsedPromptData, 'call', _130 => _130(), 'optionalAccess', _131 => _131.options]) || {};
+    return _optionalChain([this, 'access', _131 => _131.getParsedPromptData, 'call', _132 => _132(), 'optionalAccess', _133 => _133.options]) || {};
   }
   get templateFormat() {
-    return _optionalChain([this, 'access', _132 => _132.getParsedPromptData, 'call', _133 => _133(), 'optionalAccess', _134 => _134.template_format]);
+    return _optionalChain([this, 'access', _134 => _134.getParsedPromptData, 'call', _135 => _135(), 'optionalAccess', _136 => _136.template_format]);
   }
   get promptData() {
     return this.getParsedPromptData();
@@ -8822,7 +9175,7 @@ var Prompt2 = (_class15 = class _Prompt {
       return {
         type: "chat",
         messages,
-        ..._optionalChain([prompt, 'access', _135 => _135.tools, 'optionalAccess', _136 => _136.trim, 'call', _137 => _137()]) ? {
+        ..._optionalChain([prompt, 'access', _137 => _137.tools, 'optionalAccess', _138 => _138.trim, 'call', _139 => _139()]) ? {
           tools: render(prompt.tools)
         } : void 0
       };
@@ -9140,7 +9493,7 @@ function getChannelSpanInfo(event) {
   if (isObject(event.span_info)) {
     return event.span_info;
   }
-  const firstArg = _optionalChain([event, 'access', _138 => _138.arguments, 'optionalAccess', _139 => _139[0]]);
+  const firstArg = _optionalChain([event, 'access', _140 => _140.arguments, 'optionalAccess', _141 => _141[0]]);
   if (hasChannelSpanInfo(firstArg)) {
     return firstArg.span_info;
   }
@@ -9151,13 +9504,13 @@ function buildStartSpanArgs(config, event) {
   const spanAttributes = {
     type: config.type
   };
-  if (isObject(_optionalChain([spanInfo, 'optionalAccess', _140 => _140.spanAttributes]))) {
+  if (isObject(_optionalChain([spanInfo, 'optionalAccess', _142 => _142.spanAttributes]))) {
     mergeDicts(spanAttributes, spanInfo.spanAttributes);
   }
   return {
-    name: typeof _optionalChain([spanInfo, 'optionalAccess', _141 => _141.name]) === "string" && spanInfo.name ? spanInfo.name : config.name,
+    name: typeof _optionalChain([spanInfo, 'optionalAccess', _143 => _143.name]) === "string" && spanInfo.name ? spanInfo.name : config.name,
     spanAttributes,
-    spanInfoMetadata: isObject(_optionalChain([spanInfo, 'optionalAccess', _142 => _142.metadata])) ? spanInfo.metadata : void 0
+    spanInfoMetadata: isObject(_optionalChain([spanInfo, 'optionalAccess', _144 => _144.metadata])) ? spanInfo.metadata : void 0
   };
 }
 function mergeInputMetadata(metadata, spanInfoMetadata) {
@@ -9247,7 +9600,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', _143 => _143.extractMetadata, 'optionalCall', _144 => _144(event.result, event)]);
+          const metadata = _optionalChain([config, 'access', _145 => _145.extractMetadata, 'optionalCall', _146 => _146(event.result, event)]);
           span.log({
             output,
             ...metadata !== void 0 ? { metadata } : {},
@@ -9567,7 +9920,7 @@ function ensureSpanStateForEvent(states, config, event, channelName) {
 function bindCurrentSpanStoreToStart(tracingChannel2, states, config, channelName) {
   const state = _internalGetGlobalState();
   const startChannel = tracingChannel2.start;
-  const contextManager = _optionalChain([state, 'optionalAccess', _145 => _145.contextManager]);
+  const contextManager = _optionalChain([state, 'optionalAccess', _147 => _147.contextManager]);
   const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
   if (!currentSpanStore || !startChannel) {
     return void 0;
@@ -9655,7 +10008,7 @@ function traceAsyncChannel(channel2, config) {
           startTime,
           asyncEndEvent
         );
-        const metadata = _optionalChain([config, 'access', _146 => _146.extractMetadata, 'optionalCall', _147 => _147(
+        const metadata = _optionalChain([config, 'access', _148 => _148.extractMetadata, 'optionalCall', _149 => _149(
           asyncEndEvent.result,
           asyncEndEvent
         )]);
@@ -9677,7 +10030,7 @@ function traceAsyncChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
-    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _148 => _148()]);
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _150 => _150()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9783,7 +10136,7 @@ function traceStreamingChannel(channel2, config) {
         });
         return;
       }
-      if (_optionalChain([config, 'access', _149 => _149.patchResult, 'optionalCall', _150 => _150({
+      if (_optionalChain([config, 'access', _151 => _151.patchResult, 'optionalCall', _152 => _152({
         channelName,
         endEvent: asyncEndEvent,
         result: asyncEndEvent.result,
@@ -9803,7 +10156,7 @@ function traceStreamingChannel(channel2, config) {
           startTime,
           asyncEndEvent
         );
-        const metadata = _optionalChain([config, 'access', _151 => _151.extractMetadata, 'optionalCall', _152 => _152(
+        const metadata = _optionalChain([config, 'access', _153 => _153.extractMetadata, 'optionalCall', _154 => _154(
           asyncEndEvent.result,
           asyncEndEvent
         )]);
@@ -9836,7 +10189,7 @@ function traceStreamingChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
-    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _153 => _153()]);
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _155 => _155()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -9871,7 +10224,7 @@ function traceSyncStreamChannel(channel2, config) {
           ...endEvent,
           result
         };
-        if (_optionalChain([config, 'access', _154 => _154.patchResult, 'optionalCall', _155 => _155({
+        if (_optionalChain([config, 'access', _156 => _156.patchResult, 'optionalCall', _157 => _157({
           channelName,
           endEvent: resolvedEndEvent,
           result,
@@ -9952,7 +10305,7 @@ function traceSyncStreamChannel(channel2, config) {
   };
   tracingChannel2.subscribe(handlers);
   return () => {
-    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _156 => _156()]);
+    _optionalChain([unbindCurrentSpanStore, 'optionalCall', _158 => _158()]);
     tracingChannel2.unsubscribe(handlers);
   };
 }
@@ -10027,7 +10380,7 @@ function processInputAttachments(input) {
   let attachmentIndex = 0;
   const inferMediaTypeFromDataUrl = (value, fallback2) => {
     const mediaTypeMatch = value.match(/^data:([^;]+);/);
-    return _optionalChain([mediaTypeMatch, 'optionalAccess', _157 => _157[1]]) || fallback2;
+    return _optionalChain([mediaTypeMatch, 'optionalAccess', _159 => _159[1]]) || fallback2;
   };
   const toAttachment = (value, mediaType, filename) => {
     const blob = convertDataToBlob(value, mediaType);
@@ -10281,11 +10634,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _158 => _158.choices]);
+          return _optionalChain([result, 'optionalAccess', _160 => _160.choices]);
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _159 => _159.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _161 => _161.usage])),
             result,
             endEvent
           );
@@ -10309,12 +10662,12 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          const embedding = _optionalChain([result, 'optionalAccess', _160 => _160.data, 'optionalAccess', _161 => _161[0], 'optionalAccess', _162 => _162.embedding]);
+          const embedding = _optionalChain([result, 'optionalAccess', _162 => _162.data, 'optionalAccess', _163 => _163[0], 'optionalAccess', _164 => _164.embedding]);
           return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
         },
         extractMetrics: (result, _startTime, endEvent) => {
           return withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _163 => _163.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _165 => _165.usage])),
             result,
             endEvent
           );
@@ -10333,11 +10686,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _164 => _164.choices]);
+          return _optionalChain([result, 'optionalAccess', _166 => _166.choices]);
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _165 => _165.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _167 => _167.usage])),
             result,
             endEvent
           );
@@ -10374,11 +10727,11 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _166 => _166.results]);
+          return _optionalChain([result, 'optionalAccess', _168 => _168.results]);
         },
         extractMetrics: (result, _startTime, endEvent) => {
           return withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _167 => _167.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _169 => _169.usage])),
             result,
             endEvent
           );
@@ -10397,7 +10750,7 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _168 => _168.output]));
+          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _170 => _170.output]));
         },
         extractMetadata: (result) => {
           if (!result) {
@@ -10408,7 +10761,7 @@ var OpenAIPlugin = class extends BasePlugin {
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _169 => _169.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _171 => _171.usage])),
             result,
             endEvent
           );
@@ -10461,7 +10814,7 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _170 => _170.output]));
+          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _172 => _172.output]));
         },
         extractMetadata: (result) => {
           if (!result) {
@@ -10472,7 +10825,7 @@ var OpenAIPlugin = class extends BasePlugin {
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _171 => _171.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _173 => _173.usage])),
             result,
             endEvent
           );
@@ -10496,7 +10849,7 @@ var OpenAIPlugin = class extends BasePlugin {
           };
         },
         extractOutput: (result) => {
-          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _172 => _172.output]));
+          return processImagesInOutput(_optionalChain([result, 'optionalAccess', _174 => _174.output]));
         },
         extractMetadata: (result) => {
           if (!result) {
@@ -10507,7 +10860,7 @@ var OpenAIPlugin = class extends BasePlugin {
         },
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
-            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _173 => _173.usage])),
+            parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _175 => _175.usage])),
             result,
             endEvent
           );
@@ -10609,11 +10962,11 @@ function aggregateChatLogprobs(existing, incoming) {
     return _nullishCoalesce(existing, () => ( null));
   }
   const aggregated = existing && existing !== null ? { ...existing, ...incoming } : { ...incoming };
-  const content = mergeLogprobTokens(_optionalChain([existing, 'optionalAccess', _174 => _174.content]), incoming.content);
+  const content = mergeLogprobTokens(_optionalChain([existing, 'optionalAccess', _176 => _176.content]), incoming.content);
   if (content !== void 0) {
     aggregated.content = content;
   }
-  const refusal = mergeLogprobTokens(_optionalChain([existing, 'optionalAccess', _175 => _175.refusal]), incoming.refusal);
+  const refusal = mergeLogprobTokens(_optionalChain([existing, 'optionalAccess', _177 => _177.refusal]), incoming.refusal);
   if (refusal !== void 0) {
     aggregated.refusal = refusal;
   }
@@ -10634,7 +10987,7 @@ function aggregateChatCompletionChunks(chunks, streamResult, endEvent) {
         ...parseMetricsFromUsage(chunk.usage)
       };
     }
-    const choice = _optionalChain([chunk, 'access', _176 => _176.choices, 'optionalAccess', _177 => _177[0]]);
+    const choice = _optionalChain([chunk, 'access', _178 => _178.choices, 'optionalAccess', _179 => _179[0]]);
     if (!choice) {
       continue;
     }
@@ -10704,14 +11057,14 @@ function aggregateResponseStreamEvents(chunks, _streamResult, endEvent) {
       continue;
     }
     const response = chunk.response;
-    if (_optionalChain([response, 'optionalAccess', _178 => _178.output]) !== void 0) {
+    if (_optionalChain([response, 'optionalAccess', _180 => _180.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', _179 => _179.usage]));
+    metrics = parseMetricsFromUsage(_optionalChain([response, 'optionalAccess', _181 => _181.usage]));
   }
   return {
     output,
@@ -10785,7 +11138,7 @@ var AnthropicPlugin = class extends BasePlugin {
         return message ? { role: message.role, content: message.content } : null;
       },
       extractMetrics: (message, startTime) => {
-        const metrics = parseMetricsFromUsage2(_optionalChain([message, 'optionalAccess', _180 => _180.usage]));
+        const metrics = parseMetricsFromUsage2(_optionalChain([message, 'optionalAccess', _182 => _182.usage]));
         if (startTime) {
           metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
         }
@@ -10800,7 +11153,7 @@ var AnthropicPlugin = class extends BasePlugin {
         const metadata = {};
         const metas = ["stop_reason", "stop_sequence"];
         for (const m of metas) {
-          if (_optionalChain([message, 'optionalAccess', _181 => _181[m]]) !== void 0) {
+          if (_optionalChain([message, 'optionalAccess', _183 => _183[m]]) !== void 0) {
             metadata[m] = message[m];
           }
         }
@@ -10950,8 +11303,8 @@ function wrapAnthropicToolRunnerTool(tool, index, state) {
     Object.getOwnPropertyDescriptors(tool)
   );
   Object.defineProperty(wrappedTool, "run", {
-    configurable: _nullishCoalesce(_optionalChain([runDescriptor, 'optionalAccess', _182 => _182.configurable]), () => ( true)),
-    enumerable: _nullishCoalesce(_optionalChain([runDescriptor, 'optionalAccess', _183 => _183.enumerable]), () => ( true)),
+    configurable: _nullishCoalesce(_optionalChain([runDescriptor, 'optionalAccess', _184 => _184.configurable]), () => ( true)),
+    enumerable: _nullishCoalesce(_optionalChain([runDescriptor, 'optionalAccess', _185 => _185.enumerable]), () => ( true)),
     value: function braintrustAnthropicToolRunnerRun(...args) {
       return state.span.traced(
         (span) => {
@@ -10988,7 +11341,7 @@ function wrapAnthropicToolRunnerTool(tool, index, state) {
         }
       );
     },
-    writable: _nullishCoalesce(_optionalChain([runDescriptor, 'optionalAccess', _184 => _184.writable]), () => ( true))
+    writable: _nullishCoalesce(_optionalChain([runDescriptor, 'optionalAccess', _186 => _186.writable]), () => ( true))
   });
   Object.defineProperty(wrappedTool, ANTHROPIC_TOOL_RUNNER_TOOL_WRAPPED, {
     configurable: false,
@@ -11093,10 +11446,10 @@ async function finalizeAnthropicToolRunner(state, finalMessage) {
   const metadata = {
     anthropic_tool_runner_iterations: state.iterationCount
   };
-  if (_optionalChain([message, 'optionalAccess', _185 => _185.stop_reason]) !== void 0) {
+  if (_optionalChain([message, 'optionalAccess', _187 => _187.stop_reason]) !== void 0) {
     metadata.stop_reason = message.stop_reason;
   }
-  if (_optionalChain([message, 'optionalAccess', _186 => _186.stop_sequence]) !== void 0) {
+  if (_optionalChain([message, 'optionalAccess', _188 => _188.stop_sequence]) !== void 0) {
     metadata.stop_sequence = message.stop_sequence;
   }
   state.span.log({
@@ -11238,13 +11591,13 @@ function aggregateAnthropicStreamChunks(chunks) {
   let metadata = {};
   let role;
   for (const event of chunks) {
-    switch (_optionalChain([event, 'optionalAccess', _187 => _187.type])) {
+    switch (_optionalChain([event, 'optionalAccess', _189 => _189.type])) {
       case "message_start":
-        if (_optionalChain([event, 'access', _188 => _188.message, 'optionalAccess', _189 => _189.usage])) {
+        if (_optionalChain([event, 'access', _190 => _190.message, 'optionalAccess', _191 => _191.usage])) {
           const initialMetrics = parseMetricsFromUsage2(event.message.usage);
           metrics = { ...metrics, ...initialMetrics };
         }
-        if (typeof _optionalChain([event, 'access', _190 => _190.message, 'optionalAccess', _191 => _191.role]) === "string") {
+        if (typeof _optionalChain([event, 'access', _192 => _192.message, 'optionalAccess', _193 => _193.role]) === "string") {
           role = event.message.role;
         }
         break;
@@ -11310,7 +11663,7 @@ function aggregateAnthropicStreamChunks(chunks) {
   })).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) && orderedContent.every((block) => !_optionalChain([block, 'access', _192 => _192.citations, 'optionalAccess', _193 => _193.length]))) {
+    if (orderedContent.every(isTextContentBlock) && orderedContent.every((block) => !_optionalChain([block, 'access', _194 => _194.citations, 'optionalAccess', _195 => _195.length]))) {
       output = orderedContent.map((block) => block.text).join("");
     } else {
       output = {
@@ -11337,7 +11690,7 @@ function finalizeContentBlock(index, contentBlocks, contentBlockDeltas, fallback
     return;
   }
   const acc = contentBlockDeltas[index];
-  const text = _nullishCoalesce(_optionalChain([acc, 'optionalAccess', _194 => _194.textDeltas, 'access', _195 => _195.join, 'call', _196 => _196("")]), () => ( ""));
+  const text = _nullishCoalesce(_optionalChain([acc, 'optionalAccess', _196 => _196.textDeltas, 'access', _197 => _197.join, 'call', _198 => _198("")]), () => ( ""));
   if (isToolUseLikeContentBlock(contentBlock)) {
     if (!text) {
       return;
@@ -11368,7 +11721,7 @@ function finalizeContentBlock(index, contentBlocks, contentBlockDeltas, fallback
       return;
     }
     const updated = { ...contentBlock, text };
-    if (_optionalChain([acc, 'optionalAccess', _197 => _197.citations, 'access', _198 => _198.length])) {
+    if (_optionalChain([acc, 'optionalAccess', _199 => _199.citations, 'access', _200 => _200.length])) {
       updated.citations = acc.citations;
     }
     contentBlocks[index] = updated;
@@ -11873,10 +12226,10 @@ var AISDKPlugin = class extends BasePlugin {
   }
 };
 function resolveDenyOutputPaths(event, defaultDenyOutputPaths) {
-  if (Array.isArray(_optionalChain([event, 'optionalAccess', _199 => _199.denyOutputPaths]))) {
+  if (Array.isArray(_optionalChain([event, 'optionalAccess', _201 => _201.denyOutputPaths]))) {
     return event.denyOutputPaths;
   }
-  const firstArgument = _optionalChain([event, 'optionalAccess', _200 => _200.arguments]) && event.arguments.length > 0 ? event.arguments[0] : void 0;
+  const firstArgument = _optionalChain([event, 'optionalAccess', _202 => _202.arguments]) && event.arguments.length > 0 ? event.arguments[0] : void 0;
   if (!firstArgument || typeof firstArgument !== "object") {
     return defaultDenyOutputPaths;
   }
@@ -12091,7 +12444,7 @@ var convertImageToAttachment = (image, explicitMimeType) => {
   try {
     if (typeof image === "string" && image.startsWith("data:")) {
       const [mimeTypeSection, base64Data] = image.split(",");
-      const mimeType = _optionalChain([mimeTypeSection, 'access', _201 => _201.match, 'call', _202 => _202(/data:(.*?);/), 'optionalAccess', _203 => _203[1]]);
+      const mimeType = _optionalChain([mimeTypeSection, 'access', _203 => _203.match, 'call', _204 => _204(/data:(.*?);/), 'optionalAccess', _205 => _205[1]]);
       if (mimeType && base64Data) {
         const blob = convertDataToBlob(base64Data, mimeType);
         if (blob) {
@@ -12221,7 +12574,7 @@ function extractTopLevelAISDKMetrics(result, event, startTime) {
   return metrics;
 }
 function hasModelChildTracing(event) {
-  return _optionalChain([event, 'optionalAccess', _204 => _204.modelWrapped]) === true || _optionalChain([event, 'optionalAccess', _205 => _205.__braintrust_ai_sdk_model_wrapped]) === true;
+  return _optionalChain([event, 'optionalAccess', _206 => _206.modelWrapped]) === true || _optionalChain([event, 'optionalAccess', _207 => _207.__braintrust_ai_sdk_model_wrapped]) === true;
 }
 function createAISDKIntegrationMetadata() {
   return {
@@ -12232,7 +12585,7 @@ function createAISDKIntegrationMetadata() {
   };
 }
 function resolveModelFromSelf(self) {
-  return self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && _optionalChain([self, 'access', _206 => _206.settings, 'optionalAccess', _207 => _207.model]) ? _optionalChain([self, 'access', _208 => _208.settings, 'optionalAccess', _209 => _209.model]) : void 0;
+  return self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && _optionalChain([self, 'access', _208 => _208.settings, 'optionalAccess', _209 => _209.model]) ? _optionalChain([self, 'access', _210 => _210.settings, 'optionalAccess', _211 => _211.model]) : void 0;
 }
 function extractBaseMetadata(model, self) {
   const metadata = createAISDKIntegrationMetadata();
@@ -12359,9 +12712,9 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
               case "raw":
                 if (chunk.rawValue) {
                   const rawVal = chunk.rawValue;
-                  if (_optionalChain([rawVal, 'access', _210 => _210.delta, 'optionalAccess', _211 => _211.content])) {
+                  if (_optionalChain([rawVal, 'access', _212 => _212.delta, 'optionalAccess', _213 => _213.content])) {
                     text += rawVal.delta.content;
-                  } else if (_optionalChain([rawVal, 'access', _212 => _212.choices, 'optionalAccess', _213 => _213[0], 'optionalAccess', _214 => _214.delta, 'optionalAccess', _215 => _215.content])) {
+                  } else if (_optionalChain([rawVal, 'access', _214 => _214.choices, 'optionalAccess', _215 => _215[0], 'optionalAccess', _216 => _216.delta, 'optionalAccess', _217 => _217.content])) {
                     text += rawVal.choices[0].delta.content;
                   } else if (typeof rawVal.text === "string") {
                     text += rawVal.text;
@@ -12515,14 +12868,14 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
   return {
     cleanup: cleanup.length > 0 ? () => {
       while (cleanup.length > 0) {
-        _optionalChain([cleanup, 'access', _216 => _216.pop, 'call', _217 => _217(), 'optionalCall', _218 => _218()]);
+        _optionalChain([cleanup, 'access', _218 => _218.pop, 'call', _219 => _219(), 'optionalCall', _220 => _220()]);
       }
     } : void 0,
     modelWrapped
   };
 }
 function finalizeAISDKChildTracing(event) {
-  const cleanup = _optionalChain([event, 'optionalAccess', _219 => _219.__braintrust_ai_sdk_cleanup]);
+  const cleanup = _optionalChain([event, 'optionalAccess', _221 => _221.__braintrust_ai_sdk_cleanup]);
   if (event && typeof cleanup === "function") {
     cleanup();
     delete event.__braintrust_ai_sdk_cleanup;
@@ -12738,10 +13091,10 @@ function buildAISDKChildMetadata(model) {
 function buildResolvedMetadataPayload(result) {
   const gatewayInfo = extractGatewayRoutingInfo(result);
   const metadata = {};
-  if (_optionalChain([gatewayInfo, 'optionalAccess', _220 => _220.provider])) {
+  if (_optionalChain([gatewayInfo, 'optionalAccess', _222 => _222.provider])) {
     metadata.provider = gatewayInfo.provider;
   }
-  if (_optionalChain([gatewayInfo, 'optionalAccess', _221 => _221.model])) {
+  if (_optionalChain([gatewayInfo, 'optionalAccess', _223 => _223.model])) {
     metadata.model = gatewayInfo.model;
   }
   let finishReason;
@@ -12762,7 +13115,7 @@ function resolveAISDKModel(model, aiSDK) {
   if (typeof model !== "string") {
     return model;
   }
-  const provider = _nullishCoalesce(_nullishCoalesce(globalThis.AI_SDK_DEFAULT_PROVIDER, () => ( _optionalChain([aiSDK, 'optionalAccess', _222 => _222.gateway]))), () => ( null));
+  const provider = _nullishCoalesce(_nullishCoalesce(globalThis.AI_SDK_DEFAULT_PROVIDER, () => ( _optionalChain([aiSDK, 'optionalAccess', _224 => _224.gateway]))), () => ( null));
   if (provider && typeof provider.languageModel === "function") {
     return provider.languageModel(model);
   }
@@ -12824,8 +13177,8 @@ function processAISDKRerankOutput(output, _denyOutputPaths) {
     return ranking.slice(0, 100).map((item) => {
       const entry = item && typeof item === "object" ? item : void 0;
       return {
-        index: typeof _optionalChain([entry, 'optionalAccess', _223 => _223.originalIndex]) === "number" ? entry.originalIndex : void 0,
-        relevance_score: typeof _optionalChain([entry, 'optionalAccess', _224 => _224.score]) === "number" ? entry.score : void 0
+        index: typeof _optionalChain([entry, 'optionalAccess', _225 => _225.originalIndex]) === "number" ? entry.originalIndex : void 0,
+        relevance_score: typeof _optionalChain([entry, 'optionalAccess', _226 => _226.score]) === "number" ? entry.score : void 0
       };
     });
   }
@@ -12848,7 +13201,7 @@ function extractTokenMetrics(result) {
     return metrics;
   }
   const promptTokens = firstNumber(
-    _optionalChain([usage, 'access', _225 => _225.inputTokens, 'optionalAccess', _226 => _226.total]),
+    _optionalChain([usage, 'access', _227 => _227.inputTokens, 'optionalAccess', _228 => _228.total]),
     usage.inputTokens,
     usage.promptTokens,
     usage.prompt_tokens
@@ -12857,7 +13210,7 @@ function extractTokenMetrics(result) {
     metrics.prompt_tokens = promptTokens;
   }
   const completionTokens = firstNumber(
-    _optionalChain([usage, 'access', _227 => _227.outputTokens, 'optionalAccess', _228 => _228.total]),
+    _optionalChain([usage, 'access', _229 => _229.outputTokens, 'optionalAccess', _230 => _230.total]),
     usage.outputTokens,
     usage.completionTokens,
     usage.completion_tokens
@@ -12874,8 +13227,8 @@ function extractTokenMetrics(result) {
     metrics.tokens = totalTokens;
   }
   const promptCachedTokens = firstNumber(
-    _optionalChain([usage, 'access', _229 => _229.inputTokens, 'optionalAccess', _230 => _230.cacheRead]),
-    _optionalChain([usage, 'access', _231 => _231.inputTokenDetails, 'optionalAccess', _232 => _232.cacheReadTokens]),
+    _optionalChain([usage, 'access', _231 => _231.inputTokens, 'optionalAccess', _232 => _232.cacheRead]),
+    _optionalChain([usage, 'access', _233 => _233.inputTokenDetails, 'optionalAccess', _234 => _234.cacheReadTokens]),
     usage.cachedInputTokens,
     usage.promptCachedTokens,
     usage.prompt_cached_tokens
@@ -12884,8 +13237,8 @@ function extractTokenMetrics(result) {
     metrics.prompt_cached_tokens = promptCachedTokens;
   }
   const promptCacheCreationTokens = firstNumber(
-    _optionalChain([usage, 'access', _233 => _233.inputTokens, 'optionalAccess', _234 => _234.cacheWrite]),
-    _optionalChain([usage, 'access', _235 => _235.inputTokenDetails, 'optionalAccess', _236 => _236.cacheWriteTokens]),
+    _optionalChain([usage, 'access', _235 => _235.inputTokens, 'optionalAccess', _236 => _236.cacheWrite]),
+    _optionalChain([usage, 'access', _237 => _237.inputTokenDetails, 'optionalAccess', _238 => _238.cacheWriteTokens]),
     usage.promptCacheCreationTokens,
     usage.prompt_cache_creation_tokens,
     extractAnthropicCacheCreationTokens(result)
@@ -12908,7 +13261,7 @@ function extractTokenMetrics(result) {
     metrics.completion_cached_tokens = completionCachedTokens;
   }
   const reasoningTokenCount = firstNumber(
-    _optionalChain([usage, 'access', _237 => _237.outputTokens, 'optionalAccess', _238 => _238.reasoning]),
+    _optionalChain([usage, 'access', _239 => _239.outputTokens, 'optionalAccess', _240 => _240.reasoning]),
     usage.reasoningTokens,
     usage.completionReasoningTokens,
     usage.completion_reasoning_tokens,
@@ -12938,13 +13291,13 @@ function extractAnthropicCacheCreationTokens(result) {
     result,
     "providerMetadata"
   );
-  const anthropicMetadata = _optionalChain([providerMetadata, 'optionalAccess', _239 => _239.anthropic]);
+  const anthropicMetadata = _optionalChain([providerMetadata, 'optionalAccess', _241 => _241.anthropic]);
   if (!anthropicMetadata) {
     return void 0;
   }
   return firstNumber(
     anthropicMetadata.cacheCreationInputTokens,
-    _optionalChain([anthropicMetadata, 'access', _240 => _240.usage, 'optionalAccess', _241 => _241.cache_creation_input_tokens])
+    _optionalChain([anthropicMetadata, 'access', _242 => _242.usage, 'optionalAccess', _243 => _243.cache_creation_input_tokens])
   );
 }
 function safeResultFieldRead(result, field) {
@@ -12952,7 +13305,7 @@ function safeResultFieldRead(result, field) {
 }
 function safeSerializableFieldRead(obj, field) {
   try {
-    const value = _optionalChain([obj, 'optionalAccess', _242 => _242[field]]);
+    const value = _optionalChain([obj, 'optionalAccess', _244 => _244[field]]);
     if (isPromiseLike(value)) {
       void Promise.resolve(value).catch(() => {
       });
@@ -13046,7 +13399,7 @@ function extractSerializableOutputFields(output) {
   ];
   for (const name of directFieldNames) {
     try {
-      const value = _optionalChain([output, 'optionalAccess', _243 => _243[name]]);
+      const value = _optionalChain([output, 'optionalAccess', _245 => _245[name]]);
       if (isPromiseLike(value)) {
         void Promise.resolve(value).catch(() => {
         });
@@ -13079,8 +13432,8 @@ function isSerializableOutputValue(value) {
   return true;
 }
 function serializeModelWithProvider(model) {
-  const modelId = typeof model === "string" ? model : _optionalChain([model, 'optionalAccess', _244 => _244.modelId]);
-  const explicitProvider = typeof model === "object" ? _optionalChain([model, 'optionalAccess', _245 => _245.provider]) : void 0;
+  const modelId = typeof model === "string" ? model : _optionalChain([model, 'optionalAccess', _246 => _246.modelId]);
+  const explicitProvider = typeof model === "object" ? _optionalChain([model, 'optionalAccess', _247 => _247.provider]) : void 0;
   if (!modelId) {
     return { model: modelId, provider: explicitProvider };
   }
@@ -13106,7 +13459,7 @@ function parseGatewayModelString(modelString) {
 function extractGatewayRoutingInfo(result) {
   const steps = safeSerializableFieldRead(result, "steps");
   if (Array.isArray(steps) && steps.length > 0) {
-    const routing2 = _optionalChain([steps, 'access', _246 => _246[0], 'optionalAccess', _247 => _247.providerMetadata, 'optionalAccess', _248 => _248.gateway, 'optionalAccess', _249 => _249.routing]);
+    const routing2 = _optionalChain([steps, 'access', _248 => _248[0], 'optionalAccess', _249 => _249.providerMetadata, 'optionalAccess', _250 => _250.gateway, 'optionalAccess', _251 => _251.routing]);
     if (routing2) {
       return {
         provider: routing2.resolvedProvider || routing2.finalProvider,
@@ -13118,7 +13471,7 @@ function extractGatewayRoutingInfo(result) {
     result,
     "providerMetadata"
   );
-  const routing = _optionalChain([providerMetadata, 'optionalAccess', _250 => _250.gateway, 'optionalAccess', _251 => _251.routing]);
+  const routing = _optionalChain([providerMetadata, 'optionalAccess', _252 => _252.gateway, 'optionalAccess', _253 => _253.routing]);
   if (routing) {
     return {
       provider: routing.resolvedProvider || routing.finalProvider,
@@ -13133,8 +13486,8 @@ function extractCostFromResult(result) {
     let totalCost = 0;
     let foundCost = false;
     for (const step of steps) {
-      const gateway2 = _optionalChain([step, 'optionalAccess', _252 => _252.providerMetadata, 'optionalAccess', _253 => _253.gateway]);
-      const stepCost = parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _254 => _254.cost])) || parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _255 => _255.marketCost]));
+      const gateway2 = _optionalChain([step, 'optionalAccess', _254 => _254.providerMetadata, 'optionalAccess', _255 => _255.gateway]);
+      const stepCost = parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _256 => _256.cost])) || parseGatewayCost(_optionalChain([gateway2, 'optionalAccess', _257 => _257.marketCost]));
       if (stepCost !== void 0 && stepCost > 0) {
         totalCost += stepCost;
         foundCost = true;
@@ -13148,8 +13501,8 @@ function extractCostFromResult(result) {
     result,
     "providerMetadata"
   );
-  const gateway = _optionalChain([providerMetadata, 'optionalAccess', _256 => _256.gateway]);
-  const directCost = parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _257 => _257.cost])) || parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _258 => _258.marketCost]));
+  const gateway = _optionalChain([providerMetadata, 'optionalAccess', _258 => _258.gateway]);
+  const directCost = parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _259 => _259.cost])) || parseGatewayCost(_optionalChain([gateway, 'optionalAccess', _260 => _260.marketCost]));
   if (directCost !== void 0 && directCost > 0) {
     return directCost;
   }
@@ -13325,7 +13678,7 @@ function setClaudeLocalToolParentResolver(resolver) {
   context.resolveLocalToolParent = resolver;
 }
 function getClaudeLocalToolParentResolver() {
-  return _nullishCoalesce(_optionalChain([localToolContextStore, 'access', _259 => _259.getStore, 'call', _260 => _260(), 'optionalAccess', _261 => _261.resolveLocalToolParent]), () => ( fallbackLocalToolParentResolver));
+  return _nullishCoalesce(_optionalChain([localToolContextStore, 'access', _261 => _261.getStore, 'call', _262 => _262(), 'optionalAccess', _263 => _263.resolveLocalToolParent]), () => ( fallbackLocalToolParentResolver));
 }
 function isAsyncIterable2(value) {
   return value !== null && typeof value === "object" && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
@@ -13566,6 +13919,9 @@ function llmParentKey(parentToolUseId) {
 function isSubAgentDelegationToolName(toolName) {
   return toolName === "Agent" || toolName === "Task";
 }
+function shouldParentToolAsTaskSibling(toolName) {
+  return toolName === "Agent" || toolName === "Task" || toolName === "Bash";
+}
 function filterSerializableOptions(options) {
   const allowedKeys = [
     "model",
@@ -13616,10 +13972,10 @@ function upsertSubAgentDetails(detailsByToolUseId, toolUseId, update) {
   return merged;
 }
 function formatSubAgentSpanName(details) {
-  if (_optionalChain([details, 'optionalAccess', _262 => _262.description])) {
+  if (_optionalChain([details, 'optionalAccess', _264 => _264.description])) {
     return `Agent: ${details.description}`;
   }
-  if (_optionalChain([details, 'optionalAccess', _263 => _263.agentType])) {
+  if (_optionalChain([details, 'optionalAccess', _265 => _265.agentType])) {
     return `Agent: ${details.agentType}`;
   }
   return "Agent: sub-agent";
@@ -13665,11 +14021,16 @@ function resolveTaskToolUseId(taskIdToToolUseId, message) {
   }
   return void 0;
 }
+function seedTaskToolUseIdMapping(taskIdToToolUseId, message) {
+  if (typeof message.task_id === "string" && typeof message.tool_use_id === "string") {
+    taskIdToToolUseId.set(message.task_id, message.tool_use_id);
+  }
+}
 function extractUsageFromMessage(message) {
   const metrics = {};
   let usage;
   if (message.type === "assistant") {
-    usage = _optionalChain([message, 'access', _264 => _264.message, 'optionalAccess', _265 => _265.usage]);
+    usage = _optionalChain([message, 'access', _266 => _266.message, 'optionalAccess', _267 => _267.usage]);
   } else if (message.type === "result") {
     usage = message.usage;
   }
@@ -13703,8 +14064,8 @@ function buildLLMInput(prompt, conversationHistory, capturedPromptMessages) {
     promptMessages.push({ content: prompt, role: "user" });
   } else if (capturedPromptMessages && capturedPromptMessages.length > 0) {
     for (const msg of capturedPromptMessages) {
-      const role = _optionalChain([msg, 'access', _266 => _266.message, 'optionalAccess', _267 => _267.role]);
-      const content = _optionalChain([msg, 'access', _268 => _268.message, 'optionalAccess', _269 => _269.content]);
+      const role = _optionalChain([msg, 'access', _268 => _268.message, 'optionalAccess', _269 => _269.role]);
+      const content = _optionalChain([msg, 'access', _270 => _270.message, 'optionalAccess', _271 => _271.content]);
       if (role && content !== void 0) {
         promptMessages.push({ content, role });
       }
@@ -13721,7 +14082,7 @@ async function createLLMSpanForMessages(messages, prompt, conversationHistory, o
     return void 0;
   }
   const lastMessage = messages[messages.length - 1];
-  if (lastMessage.type !== "assistant" || !_optionalChain([lastMessage, 'access', _270 => _270.message, 'optionalAccess', _271 => _271.usage])) {
+  if (lastMessage.type !== "assistant" || !_optionalChain([lastMessage, 'access', _272 => _272.message, 'optionalAccess', _273 => _273.usage])) {
     return void 0;
   }
   const model = lastMessage.message.model || options.model;
@@ -13732,7 +14093,7 @@ async function createLLMSpanForMessages(messages, prompt, conversationHistory, o
     capturedPromptMessages
   );
   const outputs = messages.map(
-    (m) => _optionalChain([m, 'access', _272 => _272.message, 'optionalAccess', _273 => _273.content]) && _optionalChain([m, 'access', _274 => _274.message, 'optionalAccess', _275 => _275.role]) ? { content: m.message.content, role: m.message.role } : void 0
+    (m) => _optionalChain([m, 'access', _274 => _274.message, 'optionalAccess', _275 => _275.content]) && _optionalChain([m, 'access', _276 => _276.message, 'optionalAccess', _277 => _277.role]) ? { content: m.message.content, role: m.message.role } : void 0
   ).filter(
     (c) => c !== void 0
   );
@@ -13752,7 +14113,7 @@ async function createLLMSpanForMessages(messages, prompt, conversationHistory, o
   });
   const spanExport = await span.export();
   await span.end();
-  const finalMessage = _optionalChain([lastMessage, 'access', _276 => _276.message, 'optionalAccess', _277 => _277.content]) && _optionalChain([lastMessage, 'access', _278 => _278.message, 'optionalAccess', _279 => _279.role]) ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
+  const finalMessage = _optionalChain([lastMessage, 'access', _278 => _278.message, 'optionalAccess', _279 => _279.content]) && _optionalChain([lastMessage, 'access', _280 => _280.message, 'optionalAccess', _281 => _281.role]) ? { content: lastMessage.message.content, role: lastMessage.message.role } : void 0;
   return {
     finalMessage,
     spanExport
@@ -13860,7 +14221,10 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
         }
       },
       name: parsed.displayName,
-      parent: await resolveParentSpan(toolUseID),
+      parent: await resolveParentSpan(toolUseID, {
+        agentId: input.agent_id,
+        preferTaskSiblingParent: shouldParentToolAsTaskSibling(parsed.toolName)
+      }),
       spanAttributes: { type: "tool" /* TOOL */ }
     });
     activeToolSpans.set(toolUseID, toolSpan);
@@ -13886,18 +14250,18 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
             subAgentDetailsByToolUseId.get(toolUseID)
           )
         };
-        if (_optionalChain([response, 'optionalAccess', _280 => _280.status])) {
+        if (_optionalChain([response, 'optionalAccess', _282 => _282.status])) {
           metadata["claude_agent_sdk.status"] = response.status;
         }
-        if (_optionalChain([response, 'optionalAccess', _281 => _281.totalDurationMs])) {
+        if (_optionalChain([response, 'optionalAccess', _283 => _283.totalDurationMs])) {
           metadata["claude_agent_sdk.duration_ms"] = response.totalDurationMs;
         }
-        if (_optionalChain([response, 'optionalAccess', _282 => _282.totalToolUseCount]) !== void 0) {
+        if (_optionalChain([response, 'optionalAccess', _284 => _284.totalToolUseCount]) !== void 0) {
           metadata["claude_agent_sdk.tool_use_count"] = response.totalToolUseCount;
         }
         subAgentSpan.log({
           metadata,
-          output: _optionalChain([response, 'optionalAccess', _283 => _283.content])
+          output: _optionalChain([response, 'optionalAccess', _285 => _285.content])
         });
       } finally {
         subAgentSpan.end();
@@ -14109,7 +14473,7 @@ async function finalizeCurrentMessageGroup(state) {
   if (state.currentMessages.length === 0) {
     return;
   }
-  const parentToolUseId = _nullishCoalesce(_optionalChain([state, 'access', _284 => _284.currentMessages, 'access', _285 => _285[0], 'optionalAccess', _286 => _286.parent_tool_use_id]), () => ( null));
+  const parentToolUseId = _nullishCoalesce(_optionalChain([state, 'access', _286 => _286.currentMessages, 'access', _287 => _287[0], 'optionalAccess', _288 => _288.parent_tool_use_id]), () => ( null));
   const parentKey = llmParentKey(parentToolUseId);
   let parentSpan = await state.span.export();
   if (parentToolUseId) {
@@ -14144,13 +14508,14 @@ async function finalizeCurrentMessageGroup(state) {
   }
   state.activeLlmSpansByParentToolUse.delete(parentKey);
   const lastMessage = state.currentMessages[state.currentMessages.length - 1];
-  if (_optionalChain([lastMessage, 'optionalAccess', _287 => _287.message, 'optionalAccess', _288 => _288.usage])) {
+  if (_optionalChain([lastMessage, 'optionalAccess', _289 => _289.message, 'optionalAccess', _290 => _290.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', _289 => _289.message, 'optionalAccess', _290 => _290.content]))) {
+  seedTaskToolUseIdMapping(state.taskIdToToolUseId, message);
+  if (message.type !== "assistant" || !Array.isArray(_optionalChain([message, 'access', _291 => _291.message, 'optionalAccess', _292 => _292.content]))) {
     return;
   }
   const parentToolUseId = _nullishCoalesce(message.parent_tool_use_id, () => ( null));
@@ -14204,6 +14569,34 @@ async function ensureSubAgentSpan(subAgentDetailsByToolUseId, rootSpan, activeTo
   subAgentSpans.set(parentToolUseId, subAgentSpan);
   return subAgentSpan;
 }
+async function ensureActiveLlmSpanForParentToolUse(rootSpan, activeLlmSpansByParentToolUse, subAgentDetailsByToolUseId, activeToolSpans, subAgentSpans, parentToolUseId, startTime) {
+  const parentKey = llmParentKey(parentToolUseId);
+  const existingLlmSpan = activeLlmSpansByParentToolUse.get(parentKey);
+  if (existingLlmSpan) {
+    return existingLlmSpan;
+  }
+  let llmParentSpan = await rootSpan.export();
+  if (parentToolUseId) {
+    const subAgentSpan = await ensureSubAgentSpan(
+      subAgentDetailsByToolUseId,
+      rootSpan,
+      activeToolSpans,
+      subAgentSpans,
+      parentToolUseId
+    );
+    llmParentSpan = await subAgentSpan.export();
+  }
+  const llmSpan = startSpan({
+    name: "anthropic.messages.create",
+    parent: llmParentSpan,
+    spanAttributes: {
+      type: "llm" /* LLM */
+    },
+    startTime
+  });
+  activeLlmSpansByParentToolUse.set(parentKey, llmSpan);
+  return llmSpan;
+}
 async function maybeHandleTaskLifecycleMessage(state, message) {
   if (message.type !== "system") {
     return false;
@@ -14305,37 +14698,23 @@ async function handleStreamMessage(state, message) {
     return;
   }
   await maybeStartSubAgentSpan(state, message);
-  const messageId = _optionalChain([message, 'access', _291 => _291.message, 'optionalAccess', _292 => _292.id]);
+  const messageId = _optionalChain([message, 'access', _293 => _293.message, 'optionalAccess', _294 => _294.id]);
   if (messageId && messageId !== state.currentMessageId) {
     await finalizeCurrentMessageGroup(state);
     state.currentMessageId = messageId;
     state.currentMessageStartTime = getCurrentUnixTimestamp();
   }
-  if (message.type === "assistant" && _optionalChain([message, 'access', _293 => _293.message, 'optionalAccess', _294 => _294.usage])) {
+  if (message.type === "assistant" && _optionalChain([message, 'access', _295 => _295.message, 'optionalAccess', _296 => _296.usage])) {
     const parentToolUseId = _nullishCoalesce(message.parent_tool_use_id, () => ( null));
-    const parentKey = llmParentKey(parentToolUseId);
-    if (!state.activeLlmSpansByParentToolUse.has(parentKey)) {
-      let llmParentSpan = await state.span.export();
-      if (parentToolUseId) {
-        const subAgentSpan = await ensureSubAgentSpan(
-          state.subAgentDetailsByToolUseId,
-          state.span,
-          state.activeToolSpans,
-          state.subAgentSpans,
-          parentToolUseId
-        );
-        llmParentSpan = await subAgentSpan.export();
-      }
-      const llmSpan = startSpan({
-        name: "anthropic.messages.create",
-        parent: llmParentSpan,
-        spanAttributes: {
-          type: "llm" /* LLM */
-        },
-        startTime: state.currentMessageStartTime
-      });
-      state.activeLlmSpansByParentToolUse.set(parentKey, llmSpan);
-    }
+    await ensureActiveLlmSpanForParentToolUse(
+      state.span,
+      state.activeLlmSpansByParentToolUse,
+      state.subAgentDetailsByToolUseId,
+      state.activeToolSpans,
+      state.subAgentSpans,
+      parentToolUseId,
+      state.currentMessageStartTime
+    );
     state.currentMessages.push(message);
   }
   if (message.type !== "result" || !message.usage) {
@@ -14344,7 +14723,7 @@ async function handleStreamMessage(state, message) {
   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', _295 => _295.message, 'optionalAccess', _296 => _296.usage])) {
+    if (_optionalChain([lastMessage, 'optionalAccess', _297 => _297.message, 'optionalAccess', _298 => _298.usage])) {
       const adjustedTokens = finalUsageMetrics.completion_tokens - state.accumulatedOutputTokens;
       if (adjustedTokens >= 0) {
         lastMessage.message.usage.output_tokens = adjustedTokens;
@@ -14449,7 +14828,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
                 yield message;
               }
             } finally {
-              _optionalChain([resolvePromptDone, 'optionalCall', _297 => _297()]);
+              _optionalChain([resolvePromptDone, 'optionalCall', _299 => _299()]);
             }
           })();
         }
@@ -14482,10 +14861,35 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         const localToolContext = createClaudeLocalToolContext();
         const { hasLocalToolHandlers, localToolHookNames } = prepareLocalToolHandlersInMcpServers(options.mcpServers);
         const skipLocalToolHooks = options[CLAUDE_AGENT_SDK_SKIP_LOCAL_TOOL_HOOKS_OPTION] === true || hasLocalToolHandlers;
-        const resolveToolUseParentSpan = async (toolUseID) => {
-          const parentToolUseId = _nullishCoalesce(toolUseToParent.get(toolUseID), () => ( null));
+        const resolveToolUseParentSpan = async (toolUseID, context) => {
+          const trackedParentToolUseId = toolUseToParent.get(toolUseID);
+          const parentToolUseId = _nullishCoalesce(trackedParentToolUseId, () => ( (_optionalChain([context, 'optionalAccess', _300 => _300.agentId]) ? _nullishCoalesce(taskIdToToolUseId.get(context.agentId), () => ( null)) : null)));
           const parentKey = llmParentKey(parentToolUseId);
           const activeLlmSpan = activeLlmSpansByParentToolUse.get(parentKey);
+          if (_optionalChain([context, 'optionalAccess', _301 => _301.preferTaskSiblingParent])) {
+            if (!activeLlmSpan) {
+              await ensureActiveLlmSpanForParentToolUse(
+                span,
+                activeLlmSpansByParentToolUse,
+                subAgentDetailsByToolUseId,
+                activeToolSpans,
+                subAgentSpans,
+                parentToolUseId,
+                getCurrentUnixTimestamp()
+              );
+            }
+            if (parentToolUseId) {
+              const subAgentSpan = await ensureSubAgentSpan(
+                subAgentDetailsByToolUseId,
+                span,
+                activeToolSpans,
+                subAgentSpans,
+                parentToolUseId
+              );
+              return subAgentSpan.export();
+            }
+            return span.export();
+          }
           if (activeLlmSpan) {
             return activeLlmSpan.export();
           }
@@ -14613,56 +15017,934 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
   }
 };
 
-// src/instrumentation/plugins/google-genai-channels.ts
-var googleGenAIChannels = defineChannels("@google/genai", {
-  generateContent: channel({
-    channelName: "models.generateContent",
+// src/instrumentation/plugins/cursor-sdk-channels.ts
+var cursorSDKChannels = defineChannels("@cursor/sdk", {
+  create: channel({
+    channelName: "Agent.create",
     kind: "async"
   }),
-  generateContentStream: channel({
-    channelName: "models.generateContentStream",
+  resume: channel({
+    channelName: "Agent.resume",
     kind: "async"
   }),
-  embedContent: channel({
-    channelName: "models.embedContent",
+  prompt: channel({
+    channelName: "Agent.prompt",
+    kind: "async"
+  }),
+  send: channel({
+    channelName: "agent.send",
     kind: "async"
   })
 });
 
-// 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 {
+// src/instrumentation/plugins/cursor-sdk-plugin.ts
+var PATCHED_AGENT = Symbol.for("braintrust.cursor-sdk.auto-patched-agent");
+var PATCHED_RUN = Symbol.for("braintrust.cursor-sdk.patched-run");
+var WRAPPED_AGENT = Symbol.for("braintrust.cursor-sdk.wrapped-agent");
+var CursorSDKPlugin = (_class18 = class extends BasePlugin {constructor(...args3) { super(...args3); _class18.prototype.__init64.call(this); }
+  __init64() {this.promptDepth = 0}
   onEnable() {
-    this.subscribeToGoogleGenAIChannels();
+    this.subscribeToAgentFactories();
+    this.subscribeToPrompt();
+    this.subscribeToSend();
   }
   onDisable() {
-    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+    for (const unsubscribe of this.unsubscribers) {
+      unsubscribe();
+    }
+    this.unsubscribers = [];
+    this.promptDepth = 0;
   }
-  subscribeToGoogleGenAIChannels() {
-    this.subscribeToGenerateContentChannel();
-    this.subscribeToGenerateContentStreamChannel();
-    this.subscribeToEmbedContentChannel();
+  subscribeToAgentFactories() {
+    this.subscribeToAgentFactory(cursorSDKChannels.create);
+    this.subscribeToAgentFactory(cursorSDKChannels.resume);
   }
-  subscribeToGenerateContentChannel() {
-    const tracingChannel2 = googleGenAIChannels.generateContent.tracingChannel();
-    const states = /* @__PURE__ */ new WeakMap();
-    const unbindCurrentSpanStore = bindCurrentSpanStoreToStart2(
-      tracingChannel2,
-      states,
-      (event) => {
-        const params = event.arguments[0];
-        const input = serializeGenerateContentInput(params);
+  subscribeToAgentFactory(channel2) {
+    const tracingChannel2 = channel2.tracingChannel();
+    const handlers = {
+      asyncEnd: (event) => {
+        patchCursorAgentInPlace(event.result);
+      },
+      error: () => {
+      }
+    };
+    tracingChannel2.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      tracingChannel2.unsubscribe(handlers);
+    });
+  }
+  subscribeToPrompt() {
+    const channel2 = cursorSDKChannels.prompt.tracingChannel();
+    const states = /* @__PURE__ */ new WeakMap();
+    const handlers = {
+      start: (event) => {
+        this.promptDepth += 1;
+        const message = event.arguments[0];
+        const options = event.arguments[1];
+        const metadata = {
+          ...extractAgentOptionsMetadata(options),
+          "cursor_sdk.operation": "Agent.prompt",
+          provider: "cursor",
+          ...event.moduleVersion ? { "cursor_sdk.version": event.moduleVersion } : {}
+        };
+        const span = startSpan({
+          name: "Cursor Agent",
+          spanAttributes: { type: "task" /* TASK */ }
+        });
+        const startTime = getCurrentUnixTimestamp();
+        safeLog(span, {
+          input: sanitizeUserMessage(message),
+          metadata
+        });
+        states.set(event, { metadata, span, startTime });
+      },
+      asyncEnd: (event) => {
+        this.promptDepth = Math.max(0, this.promptDepth - 1);
+        const state = states.get(event);
+        if (!state) {
+          return;
+        }
+        try {
+          safeLog(state.span, {
+            metadata: {
+              ...state.metadata,
+              ...extractRunResultMetadata(event.result)
+            },
+            metrics: buildDurationMetrics(state.startTime),
+            output: _nullishCoalesce(_optionalChain([event, 'access', _302 => _302.result, 'optionalAccess', _303 => _303.result]), () => ( event.result))
+          });
+        } finally {
+          state.span.end();
+          states.delete(event);
+        }
+      },
+      error: (event) => {
+        this.promptDepth = Math.max(0, this.promptDepth - 1);
+        const state = states.get(event);
+        if (!state || !event.error) {
+          return;
+        }
+        safeLog(state.span, { error: event.error.message });
+        state.span.end();
+        states.delete(event);
+      }
+    };
+    channel2.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      channel2.unsubscribe(handlers);
+    });
+  }
+  subscribeToSend() {
+    const channel2 = cursorSDKChannels.send.tracingChannel();
+    const states = /* @__PURE__ */ new WeakMap();
+    const handlers = {
+      start: (event) => {
+        if (this.promptDepth > 0) {
+          return;
+        }
+        const message = event.arguments[0];
+        const sendOptions = event.arguments[1];
+        const agent = event.agent;
+        const metadata = {
+          ...extractSendMetadata(sendOptions),
+          ...agent ? extractAgentMetadata(agent) : {},
+          "cursor_sdk.operation": "agent.send",
+          provider: "cursor",
+          ...event.moduleVersion ? { "cursor_sdk.version": event.moduleVersion } : {}
+        };
+        const span = startSpan({
+          name: "Cursor Agent",
+          spanAttributes: { type: "task" /* TASK */ }
+        });
+        const startTime = getCurrentUnixTimestamp();
+        safeLog(span, {
+          input: sanitizeUserMessage(message),
+          metadata
+        });
+        const state = {
+          activeToolSpans: /* @__PURE__ */ new Map(),
+          agent,
+          conversationText: [],
+          deltaText: [],
+          finalized: false,
+          input: message,
+          metadata,
+          metrics: {},
+          span,
+          startTime,
+          streamMessages: [],
+          streamText: [],
+          stepText: [],
+          taskText: []
+        };
+        if (hasCursorCallbacks(sendOptions)) {
+          event.arguments[1] = wrapSendOptionsCallbacks(sendOptions, state);
+        }
+        states.set(event, state);
+      },
+      asyncEnd: (event) => {
+        const state = states.get(event);
+        if (!state) {
+          return;
+        }
+        if (!event.result) {
+          return;
+        }
+        state.run = event.result;
+        state.metadata = {
+          ...state.metadata,
+          ...extractRunMetadata(event.result)
+        };
+        patchCursorRun(event.result, state);
+      },
+      error: (event) => {
+        const state = states.get(event);
+        if (!state || !event.error) {
+          return;
+        }
+        safeLog(state.span, { error: event.error.message });
+        endOpenToolSpans(state, event.error.message);
+        state.span.end();
+        state.finalized = true;
+        states.delete(event);
+      }
+    };
+    channel2.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      channel2.unsubscribe(handlers);
+    });
+  }
+}, _class18);
+function patchCursorAgentInPlace(agent) {
+  if (!agent || typeof agent !== "object") {
+    return;
+  }
+  const agentRecord = agent;
+  if (agentRecord[PATCHED_AGENT] || agentRecord[WRAPPED_AGENT] || typeof agentRecord.send !== "function") {
+    return;
+  }
+  const originalSend = agentRecord.send.bind(agentRecord);
+  try {
+    Object.defineProperty(agentRecord, PATCHED_AGENT, {
+      configurable: false,
+      enumerable: false,
+      value: true
+    });
+    Object.defineProperty(agentRecord, "send", {
+      configurable: true,
+      value(message, options) {
+        const args = [message, options];
+        return cursorSDKChannels.send.tracePromise(
+          () => originalSend(...args),
+          {
+            agent: agentRecord,
+            arguments: args,
+            operation: "send"
+          }
+        );
+      },
+      writable: true
+    });
+  } catch (e36) {
+  }
+}
+function wrapSendOptionsCallbacks(options, state) {
+  const originalOnDelta = options.onDelta;
+  const originalOnStep = options.onStep;
+  return {
+    ...options,
+    async onDelta(args) {
+      try {
+        await handleInteractionUpdate(state, args.update);
+      } catch (error) {
+        logInstrumentationError("Cursor SDK onDelta", error);
+      }
+      if (originalOnDelta) {
+        return originalOnDelta(args);
+      }
+    },
+    async onStep(args) {
+      try {
+        handleStepUpdate(state, args.step);
+      } catch (error) {
+        logInstrumentationError("Cursor SDK onStep", error);
+      }
+      if (originalOnStep) {
+        return originalOnStep(args);
+      }
+    }
+  };
+}
+function hasCursorCallbacks(options) {
+  return !!options && (typeof options.onDelta === "function" || typeof options.onStep === "function");
+}
+function patchCursorRun(run, state) {
+  if (!run || typeof run !== "object") {
+    return;
+  }
+  const runRecord = run;
+  if (runRecord[PATCHED_RUN]) {
+    return;
+  }
+  try {
+    Object.defineProperty(runRecord, PATCHED_RUN, {
+      configurable: false,
+      enumerable: false,
+      value: true
+    });
+    if (typeof runRecord.stream === "function") {
+      const originalStream = runRecord.stream.bind(runRecord);
+      Object.defineProperty(runRecord, "stream", {
+        configurable: true,
+        value() {
+          const stream = originalStream();
+          return patchCursorStream(stream, state);
+        },
+        writable: true
+      });
+    }
+    if (typeof runRecord.wait === "function") {
+      const originalWait = runRecord.wait.bind(runRecord);
+      Object.defineProperty(runRecord, "wait", {
+        configurable: true,
+        async value() {
+          try {
+            const result = await originalWait();
+            state.lastResult = result;
+            await finalizeCursorRun(state, { result });
+            return result;
+          } catch (error) {
+            await finalizeCursorRun(state, { error });
+            throw error;
+          }
+        },
+        writable: true
+      });
+    }
+    if (typeof runRecord.conversation === "function") {
+      const originalConversation = runRecord.conversation.bind(runRecord);
+      Object.defineProperty(runRecord, "conversation", {
+        configurable: true,
+        async value() {
+          try {
+            const conversation = await originalConversation();
+            await handleConversation(state, conversation);
+            await finalizeCursorRun(state);
+            return conversation;
+          } catch (error) {
+            await finalizeCursorRun(state, { error });
+            throw error;
+          }
+        },
+        writable: true
+      });
+    }
+  } catch (e37) {
+    void finalizeCursorRun(state, { output: run });
+  }
+}
+async function* patchCursorStream(stream, state) {
+  try {
+    for await (const message of stream) {
+      try {
+        await handleStreamMessage2(state, message);
+      } catch (error) {
+        logInstrumentationError("Cursor SDK stream", error);
+      }
+      yield message;
+    }
+    await finalizeCursorRun(state);
+  } catch (error) {
+    await finalizeCursorRun(state, { error });
+    throw error;
+  }
+}
+async function handleInteractionUpdate(state, update) {
+  switch (update.type) {
+    case "text-delta":
+      if (typeof update.text === "string") {
+        state.deltaText.push(update.text);
+      }
+      return;
+    case "token-delta":
+      if (typeof update.tokens === "number") {
+        state.metrics["cursor_sdk.delta_tokens"] = (_nullishCoalesce(state.metrics["cursor_sdk.delta_tokens"], () => ( 0))) + update.tokens;
+      }
+      return;
+    case "tool-call-started":
+    case "partial-tool-call":
+    case "tool-call-completed":
+      await handleToolUpdate(
+        state,
+        update
+      );
+      return;
+    case "turn-ended":
+      addUsageMetrics(
+        state.metrics,
+        update.usage
+      );
+      return;
+    case "summary":
+      if (typeof update.summary === "string") {
+        state.taskText.push(update.summary);
+      }
+      return;
+    case "step-completed":
+      if (typeof update.stepDurationMs === "number") {
+        state.metrics["cursor_sdk.step_duration_ms"] = (_nullishCoalesce(state.metrics["cursor_sdk.step_duration_ms"], () => ( 0))) + update.stepDurationMs;
+      }
+      state.metrics["cursor_sdk.steps"] = (_nullishCoalesce(state.metrics["cursor_sdk.steps"], () => ( 0))) + 1;
+      return;
+    default:
+      return;
+  }
+}
+async function handleToolUpdate(state, update) {
+  const callId = update.callId;
+  if (!callId) {
+    return;
+  }
+  const toolCall = update.toolCall;
+  const name = extractToolName(toolCall);
+  const args = extractToolArgs(toolCall);
+  const result = extractToolResult(toolCall);
+  if (update.type === "tool-call-started" || update.type === "partial-tool-call") {
+    if (!state.activeToolSpans.has(callId)) {
+      state.activeToolSpans.set(
+        callId,
+        await startToolSpan(state, {
+          args,
+          callId,
+          name,
+          status: "running",
+          toolCall
+        })
+      );
+    }
+    return;
+  }
+  const toolState = await _asyncNullishCoalesce(state.activeToolSpans.get(callId), async () => ( await startToolSpan(state, {
+    args,
+    callId,
+    name,
+    status: "completed",
+    toolCall
+  })));
+  finishToolSpan(toolState, {
+    error: _optionalChain([toolCall, 'optionalAccess', _304 => _304.status]) === "error" ? stringifyUnknown(result) : void 0,
+    metadata: {
+      "cursor_sdk.tool.status": _nullishCoalesce(_optionalChain([toolCall, 'optionalAccess', _305 => _305.status]), () => ( "completed"))
+    },
+    output: result
+  });
+  state.activeToolSpans.delete(callId);
+}
+async function handleStreamMessage2(state, message) {
+  state.streamMessages.push(message);
+  if (message.type === "system") {
+    const systemMessage = message;
+    state.metadata = {
+      ...state.metadata,
+      ...extractModelMetadata(systemMessage.model),
+      ...systemMessage.agent_id ? { "cursor_sdk.agent_id": systemMessage.agent_id } : {},
+      ...systemMessage.run_id ? { "cursor_sdk.run_id": systemMessage.run_id } : {},
+      ...systemMessage.tools ? { "cursor_sdk.tools": systemMessage.tools } : {}
+    };
+    return;
+  }
+  if (message.type === "assistant") {
+    const assistantMessage = message;
+    for (const block of _nullishCoalesce(_optionalChain([assistantMessage, 'access', _306 => _306.message, 'optionalAccess', _307 => _307.content]), () => ( []))) {
+      if (_optionalChain([block, 'optionalAccess', _308 => _308.type]) === "text" && typeof block.text === "string") {
+        state.streamText.push(block.text);
+      } else if (_optionalChain([block, 'optionalAccess', _309 => _309.type]) === "tool_use" && block.id) {
+        state.activeToolSpans.set(
+          block.id,
+          await startToolSpan(state, {
+            args: block.input,
+            callId: block.id,
+            name: block.name,
+            status: "running"
+          })
+        );
+      }
+    }
+    return;
+  }
+  if (message.type === "tool_call") {
+    await handleToolMessage(
+      state,
+      message
+    );
+    return;
+  }
+  if (message.type === "task" && typeof message.text === "string") {
+    state.taskText.push(message.text);
+    return;
+  }
+  if (message.type === "status" && message.status) {
+    state.metadata["cursor_sdk.status"] = message.status;
+  }
+}
+async function handleToolMessage(state, message) {
+  const callId = message.call_id;
+  if (!callId) {
+    return;
+  }
+  if (message.status === "running") {
+    if (!state.activeToolSpans.has(callId)) {
+      state.activeToolSpans.set(
+        callId,
+        await startToolSpan(state, {
+          args: message.args,
+          callId,
+          name: message.name,
+          status: message.status,
+          truncated: message.truncated
+        })
+      );
+    }
+    return;
+  }
+  const toolState = await _asyncNullishCoalesce(state.activeToolSpans.get(callId), async () => ( await startToolSpan(state, {
+    args: message.args,
+    callId,
+    name: message.name,
+    status: message.status,
+    truncated: message.truncated
+  })));
+  finishToolSpan(toolState, {
+    error: message.status === "error" ? stringifyUnknown(message.result) : void 0,
+    metadata: {
+      "cursor_sdk.tool.status": message.status
+    },
+    output: message.result
+  });
+  state.activeToolSpans.delete(callId);
+}
+async function handleConversation(state, turns) {
+  state.conversationOutput = turns;
+  for (const turn of turns) {
+    if (turn.type === "agentConversationTurn") {
+      for (const step of _nullishCoalesce(_optionalChain([turn, 'access', _310 => _310.turn, 'optionalAccess', _311 => _311.steps]), () => ( []))) {
+        await handleConversationStep(state, step);
+      }
+    } else if (turn.type === "shellConversationTurn") {
+      const command = _optionalChain([turn, 'access', _312 => _312.turn, 'optionalAccess', _313 => _313.shellCommand, 'optionalAccess', _314 => _314.command]);
+      if (command) {
+        const callId = `shell:${state.activeToolSpans.size}:${command}`;
+        const toolState = await startToolSpan(state, {
+          args: _optionalChain([turn, 'access', _315 => _315.turn, 'optionalAccess', _316 => _316.shellCommand]),
+          callId,
+          name: "shell",
+          status: "completed"
+        });
+        finishToolSpan(toolState, {
+          metadata: { "cursor_sdk.tool.status": "completed" },
+          output: _optionalChain([turn, 'access', _317 => _317.turn, 'optionalAccess', _318 => _318.shellOutput])
+        });
+      }
+    }
+  }
+}
+async function handleConversationStep(state, step) {
+  if (step.type === "assistantMessage" && typeof _optionalChain([step, 'access', _319 => _319.message, 'optionalAccess', _320 => _320.text]) === "string") {
+    state.conversationText.push(step.message.text);
+    return;
+  }
+  if (step.type !== "toolCall") {
+    return;
+  }
+  const toolCall = step.message;
+  const callId = typeof _optionalChain([toolCall, 'optionalAccess', _321 => _321.callId]) === "string" ? toolCall.callId : `conversation-tool:${state.activeToolSpans.size}`;
+  const toolState = await startToolSpan(state, {
+    args: extractToolArgs(toolCall),
+    callId,
+    name: extractToolName(toolCall),
+    status: _optionalChain([toolCall, 'optionalAccess', _322 => _322.status]),
+    toolCall
+  });
+  finishToolSpan(toolState, {
+    error: _optionalChain([toolCall, 'optionalAccess', _323 => _323.status]) === "error" ? stringifyUnknown(toolCall.result) : void 0,
+    metadata: {
+      "cursor_sdk.tool.status": _nullishCoalesce(_optionalChain([toolCall, 'optionalAccess', _324 => _324.status]), () => ( "completed"))
+    },
+    output: extractToolResult(toolCall)
+  });
+}
+function handleStepUpdate(state, step) {
+  state.metrics["cursor_sdk.steps"] = (_nullishCoalesce(state.metrics["cursor_sdk.steps"], () => ( 0))) + 1;
+  if (step.type) {
+    const stepTypes = state.metadata["cursor_sdk.step_types"];
+    if (Array.isArray(stepTypes)) {
+      if (!stepTypes.includes(step.type)) {
+        stepTypes.push(step.type);
+      }
+    } else {
+      state.metadata["cursor_sdk.step_types"] = [step.type];
+    }
+  }
+  if (step.type === "assistantMessage" && typeof _optionalChain([step, 'access', _325 => _325.message, 'optionalAccess', _326 => _326.text]) === "string") {
+    state.stepText.push(step.message.text);
+  }
+}
+async function startToolSpan(state, args) {
+  const name = args.name || "unknown";
+  const metadata = {
+    "cursor_sdk.tool.status": args.status,
+    "gen_ai.tool.call.id": args.callId,
+    "gen_ai.tool.name": name
+  };
+  if (_optionalChain([args, 'access', _327 => _327.truncated, 'optionalAccess', _328 => _328.args]) !== void 0) {
+    metadata["cursor_sdk.tool.args_truncated"] = args.truncated.args;
+  }
+  if (_optionalChain([args, 'access', _329 => _329.truncated, 'optionalAccess', _330 => _330.result]) !== void 0) {
+    metadata["cursor_sdk.tool.result_truncated"] = args.truncated.result;
+  }
+  const span = startSpan({
+    event: {
+      input: args.args,
+      metadata
+    },
+    name: `tool: ${name}`,
+    parent: await state.span.export(),
+    spanAttributes: { type: "tool" /* TOOL */ }
+  });
+  let subAgentSpan;
+  if (isSubAgentToolName(name)) {
+    subAgentSpan = startSpan({
+      event: {
+        input: args.args,
+        metadata: {
+          "cursor_sdk.subagent.tool_call_id": args.callId,
+          "gen_ai.tool.name": name
+        }
+      },
+      name: formatSubAgentSpanName2(args.toolCall, args.args),
+      parent: await span.export(),
+      spanAttributes: { type: "task" /* TASK */ }
+    });
+  }
+  return { span, subAgentSpan };
+}
+function finishToolSpan(toolState, result) {
+  try {
+    if (result.error) {
+      safeLog(toolState.span, {
+        error: result.error,
+        metadata: result.metadata,
+        output: result.output
+      });
+      if (toolState.subAgentSpan) {
+        safeLog(toolState.subAgentSpan, {
+          error: result.error,
+          metadata: result.metadata,
+          output: result.output
+        });
+      }
+    } else {
+      safeLog(toolState.span, {
+        metadata: result.metadata,
+        output: result.output
+      });
+      if (toolState.subAgentSpan) {
+        safeLog(toolState.subAgentSpan, {
+          metadata: result.metadata,
+          output: result.output
+        });
+      }
+    }
+  } finally {
+    _optionalChain([toolState, 'access', _331 => _331.subAgentSpan, 'optionalAccess', _332 => _332.end, 'call', _333 => _333()]);
+    toolState.span.end();
+  }
+}
+async function finalizeCursorRun(state, params = {}) {
+  if (state.finalized) {
+    return;
+  }
+  state.finalized = true;
+  const error = params.error;
+  const result = _nullishCoalesce(params.result, () => ( state.lastResult));
+  const output = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(params.output, () => ( _optionalChain([result, 'optionalAccess', _334 => _334.result]))), () => ( _optionalChain([state, 'access', _335 => _335.run, 'optionalAccess', _336 => _336.result]))), () => ( (state.conversationText.length > 0 ? state.conversationText.join("\n") : void 0))), () => ( state.conversationOutput)), () => ( (state.streamText.length > 0 ? state.streamText.join("") : void 0))), () => ( (state.deltaText.length > 0 ? state.deltaText.join("") : void 0))), () => ( (state.stepText.length > 0 ? state.stepText.join("\n") : void 0))), () => ( (state.taskText.length > 0 ? state.taskText.join("\n") : void 0)));
+  try {
+    const metadata = {
+      ...state.metadata,
+      ...state.run ? extractRunMetadata(state.run) : {},
+      ...result ? extractRunResultMetadata(result) : {}
+    };
+    if (error) {
+      safeLog(state.span, {
+        error: error instanceof Error ? error.message : String(error),
+        metadata,
+        metrics: {
+          ...cleanMetrics(state.metrics),
+          ...buildDurationMetrics(state.startTime)
+        },
+        output
+      });
+    } else {
+      safeLog(state.span, {
+        metadata,
+        metrics: {
+          ...cleanMetrics(state.metrics),
+          ...buildDurationMetrics(state.startTime)
+        },
+        output
+      });
+    }
+  } finally {
+    endOpenToolSpans(state);
+    state.span.end();
+  }
+}
+function endOpenToolSpans(state, error) {
+  for (const [, toolState] of state.activeToolSpans) {
+    finishToolSpan(toolState, { error });
+  }
+  state.activeToolSpans.clear();
+}
+function sanitizeUserMessage(message) {
+  if (typeof message === "string" || message === void 0) {
+    return message;
+  }
+  return {
+    ...message,
+    images: _optionalChain([message, 'access', _337 => _337.images, 'optionalAccess', _338 => _338.map, 'call', _339 => _339((image) => {
+      const imageRecord = image;
+      return {
+        ...typeof imageRecord.url === "string" ? { url: imageRecord.url } : {},
+        ...typeof imageRecord.mimeType === "string" ? { mimeType: imageRecord.mimeType } : {},
+        ...image.dimension ? { dimension: image.dimension } : {},
+        hasData: typeof imageRecord.data === "string"
+      };
+    })])
+  };
+}
+function extractAgentOptionsMetadata(options) {
+  if (!options) {
+    return {};
+  }
+  return {
+    ...extractModelMetadata(options.model),
+    ...options.agentId ? { "cursor_sdk.agent_id": options.agentId } : {},
+    ...options.name ? { "cursor_sdk.agent_name": options.name } : {},
+    ...options.local ? {
+      "cursor_sdk.runtime": "local",
+      "cursor_sdk.local.cwd": Array.isArray(options.local.cwd) ? options.local.cwd.join(",") : options.local.cwd
+    } : {},
+    ...options.cloud ? {
+      "cursor_sdk.runtime": "cloud",
+      "cursor_sdk.cloud.auto_create_pr": options.cloud.autoCreatePR,
+      "cursor_sdk.cloud.env_type": _optionalChain([options, 'access', _340 => _340.cloud, 'access', _341 => _341.env, 'optionalAccess', _342 => _342.type]),
+      "cursor_sdk.cloud.env_name": _optionalChain([options, 'access', _343 => _343.cloud, 'access', _344 => _344.env, 'optionalAccess', _345 => _345.name]),
+      "cursor_sdk.cloud.repos": _optionalChain([options, 'access', _346 => _346.cloud, 'access', _347 => _347.repos, 'optionalAccess', _348 => _348.map, 'call', _349 => _349((repo) => repo.url), 'access', _350 => _350.filter, 'call', _351 => _351((url) => typeof url === "string")])
+    } : {}
+  };
+}
+function extractSendMetadata(options) {
+  if (!options) {
+    return {};
+  }
+  return {
+    ...extractModelMetadata(options.model),
+    ..._optionalChain([options, 'access', _352 => _352.local, 'optionalAccess', _353 => _353.force]) !== void 0 ? { "cursor_sdk.local.force": options.local.force } : {}
+  };
+}
+function extractAgentMetadata(agent) {
+  return {
+    ...agent.agentId ? { "cursor_sdk.agent_id": agent.agentId } : {},
+    ...extractModelMetadata(agent.model)
+  };
+}
+function extractRunMetadata(run) {
+  if (!run) {
+    return {};
+  }
+  return {
+    ...run.id ? { "cursor_sdk.run_id": run.id } : {},
+    ...run.agentId ? { "cursor_sdk.agent_id": run.agentId } : {},
+    ...run.status ? { "cursor_sdk.status": run.status } : {},
+    ...run.durationMs !== void 0 ? { "cursor_sdk.duration_ms": run.durationMs } : {},
+    ...extractModelMetadata(run.model),
+    ...extractGitMetadata(run.git)
+  };
+}
+function extractRunResultMetadata(result) {
+  if (!result) {
+    return {};
+  }
+  return {
+    ...result.id ? { "cursor_sdk.run_id": result.id } : {},
+    ...result.status ? { "cursor_sdk.status": result.status } : {},
+    ...result.durationMs !== void 0 ? { "cursor_sdk.duration_ms": result.durationMs } : {},
+    ...extractModelMetadata(result.model),
+    ...extractGitMetadata(result.git)
+  };
+}
+function extractGitMetadata(git) {
+  const branches = _optionalChain([git, 'optionalAccess', _354 => _354.branches]);
+  if (!branches || branches.length === 0) {
+    return {};
+  }
+  return {
+    "cursor_sdk.git.branches": branches.map((branch) => ({
+      branch: branch.branch,
+      prUrl: branch.prUrl,
+      repoUrl: branch.repoUrl
+    }))
+  };
+}
+function extractModelMetadata(model) {
+  if (!_optionalChain([model, 'optionalAccess', _355 => _355.id])) {
+    return {};
+  }
+  return {
+    model: model.id,
+    "cursor_sdk.model": model.id,
+    ...model.params ? { "cursor_sdk.model.params": model.params } : {}
+  };
+}
+function addUsageMetrics(metrics, usage) {
+  if (!usage) {
+    return;
+  }
+  if (usage.inputTokens !== void 0) {
+    metrics.prompt_tokens = (_nullishCoalesce(metrics.prompt_tokens, () => ( 0))) + usage.inputTokens;
+  }
+  if (usage.outputTokens !== void 0) {
+    metrics.completion_tokens = (_nullishCoalesce(metrics.completion_tokens, () => ( 0))) + usage.outputTokens;
+  }
+  if (usage.cacheReadTokens !== void 0) {
+    metrics.prompt_cached_tokens = (_nullishCoalesce(metrics.prompt_cached_tokens, () => ( 0))) + usage.cacheReadTokens;
+  }
+  if (usage.cacheWriteTokens !== void 0) {
+    metrics.prompt_cache_creation_tokens = (_nullishCoalesce(metrics.prompt_cache_creation_tokens, () => ( 0))) + usage.cacheWriteTokens;
+  }
+  metrics.tokens = (_nullishCoalesce(metrics.prompt_tokens, () => ( 0))) + (_nullishCoalesce(metrics.completion_tokens, () => ( 0))) + (_nullishCoalesce(metrics.prompt_cached_tokens, () => ( 0))) + (_nullishCoalesce(metrics.prompt_cache_creation_tokens, () => ( 0)));
+}
+function buildDurationMetrics(startTime) {
+  const end = getCurrentUnixTimestamp();
+  return {
+    duration: end - startTime,
+    end,
+    start: startTime
+  };
+}
+function extractToolName(toolCall) {
+  if (!toolCall) {
+    return "unknown";
+  }
+  if (typeof toolCall.name === "string") {
+    return toolCall.name;
+  }
+  if (typeof toolCall.type === "string") {
+    return toolCall.type;
+  }
+  return "unknown";
+}
+function extractToolArgs(toolCall) {
+  return toolCall && "args" in toolCall ? toolCall.args : void 0;
+}
+function extractToolResult(toolCall) {
+  return toolCall && "result" in toolCall ? toolCall.result : void 0;
+}
+function isSubAgentToolName(name) {
+  return name === "Agent" || name === "Task" || name === "task";
+}
+function formatSubAgentSpanName2(toolCall, args) {
+  const details = _nullishCoalesce(toolCall, () => ( args));
+  const description = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(getString(details, "description"), () => ( getString(details, "subagent_type"))), () => ( getString(details, "type"))), () => ( getString(details, "name")));
+  return description ? `Agent: ${description}` : "Agent: sub-agent";
+}
+function getString(obj, key) {
+  const value = _optionalChain([obj, 'optionalAccess', _356 => _356[key]]);
+  return typeof value === "string" ? value : void 0;
+}
+function stringifyUnknown(value) {
+  if (value instanceof Error) {
+    return value.message;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  try {
+    return JSON.stringify(value);
+  } catch (e38) {
+    return String(value);
+  }
+}
+function safeLog(span, event) {
+  try {
+    span.log(event);
+  } catch (error) {
+    logInstrumentationError("Cursor SDK span log", error);
+  }
+}
+function logInstrumentationError(context, error) {
+  debugLogger.error(`Error processing ${context}:`, error);
+}
+function cleanMetrics(metrics) {
+  const cleaned = {};
+  for (const [key, value] of Object.entries(metrics)) {
+    if (value !== void 0 && Number.isFinite(value)) {
+      cleaned[key] = value;
+    }
+  }
+  return cleaned;
+}
+
+// src/instrumentation/plugins/google-genai-channels.ts
+var googleGenAIChannels = defineChannels("@google/genai", {
+  generateContent: channel({
+    channelName: "models.generateContent",
+    kind: "async"
+  }),
+  generateContentStream: channel({
+    channelName: "models.generateContentStream",
+    kind: "async"
+  }),
+  embedContent: channel({
+    channelName: "models.embedContent",
+    kind: "async"
+  })
+});
+
+// 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();
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+  subscribeToGoogleGenAIChannels() {
+    this.subscribeToGenerateContentChannel();
+    this.subscribeToGenerateContentStreamChannel();
+    this.subscribeToEmbedContentChannel();
+  }
+  subscribeToGenerateContentChannel() {
+    const tracingChannel2 = googleGenAIChannels.generateContent.tracingChannel();
+    const states = /* @__PURE__ */ new WeakMap();
+    const unbindCurrentSpanStore = bindCurrentSpanStoreToStart2(
+      tracingChannel2,
+      states,
+      (event) => {
+        const params = event.arguments[0];
+        const input = serializeGenerateContentInput(params);
         const metadata = extractGenerateContentMetadata(params);
         const span = startSpan({
           name: "generate_content",
@@ -14705,7 +15987,7 @@ var GoogleGenAIPlugin = class extends BasePlugin {
           const responseMetadata = extractResponseMetadata(event.result);
           spanState.span.log({
             ...responseMetadata ? { metadata: responseMetadata } : {},
-            metrics: cleanMetrics(
+            metrics: cleanMetrics2(
               extractGenerateContentMetrics(
                 event.result,
                 spanState.startTime
@@ -14724,7 +16006,7 @@ var GoogleGenAIPlugin = class extends BasePlugin {
     };
     tracingChannel2.subscribe(handlers);
     this.unsubscribers.push(() => {
-      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _298 => _298()]);
+      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _357 => _357()]);
       tracingChannel2.unsubscribe(handlers);
     });
   }
@@ -14806,7 +16088,7 @@ var GoogleGenAIPlugin = class extends BasePlugin {
           const output = summarizeEmbedContentOutput(event.result);
           spanState.span.log({
             ...output ? { output } : {},
-            metrics: cleanMetrics(
+            metrics: cleanMetrics2(
               extractEmbedContentMetrics(event.result, spanState.startTime)
             )
           });
@@ -14821,7 +16103,7 @@ var GoogleGenAIPlugin = class extends BasePlugin {
     };
     tracingChannel2.subscribe(handlers);
     this.unsubscribers.push(() => {
-      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _299 => _299()]);
+      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _358 => _358()]);
       tracingChannel2.unsubscribe(handlers);
     });
   }
@@ -14837,10 +16119,10 @@ function ensureSpanState(states, event, create) {
 }
 function bindCurrentSpanStoreToStart2(tracingChannel2, states, create) {
   const state = _internalGetGlobalState();
-  const contextManager = _optionalChain([state, 'optionalAccess', _300 => _300.contextManager]);
+  const contextManager = _optionalChain([state, 'optionalAccess', _359 => _359.contextManager]);
   const startChannel = tracingChannel2.start;
   const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
-  if (!_optionalChain([startChannel, 'optionalAccess', _301 => _301.bindStore]) || !currentSpanStore) {
+  if (!_optionalChain([startChannel, 'optionalAccess', _360 => _360.bindStore]) || !currentSpanStore) {
     return void 0;
   }
   startChannel.bindStore(currentSpanStore, (event) => {
@@ -14852,7 +16134,7 @@ function bindCurrentSpanStoreToStart2(tracingChannel2, states, create) {
     return contextManager.wrapSpanForStore(span);
   });
   return () => {
-    _optionalChain([startChannel, 'access', _302 => _302.unbindStore, 'optionalCall', _303 => _303(currentSpanStore)]);
+    _optionalChain([startChannel, 'access', _361 => _361.unbindStore, 'optionalCall', _362 => _362(currentSpanStore)]);
   };
 }
 function logErrorAndEndSpan(states, event) {
@@ -14903,7 +16185,7 @@ function patchGoogleGenAIStreamingResult(args) {
       );
       span.log({
         ...responseMetadata ? { metadata: responseMetadata } : {},
-        metrics: cleanMetrics(metricsWithoutEnd),
+        metrics: cleanMetrics2(metricsWithoutEnd),
         output: options.result.aggregated
       });
       span.end(typeof end === "number" ? { endTime: end } : void 0);
@@ -15087,7 +16369,7 @@ function serializePart(part) {
 }
 function serializeGenerateContentTools(params) {
   const config = params.config ? tryToDict(params.config) : null;
-  const tools = _optionalChain([config, 'optionalAccess', _304 => _304.tools]);
+  const tools = _optionalChain([config, 'optionalAccess', _363 => _363.tools]);
   if (!Array.isArray(tools)) {
     return null;
   }
@@ -15100,7 +16382,7 @@ function serializeGenerateContentTools(params) {
       }
     }
     return serializedTools.length > 0 ? serializedTools : null;
-  } catch (e36) {
+  } catch (e39) {
     return null;
   }
 }
@@ -15146,7 +16428,7 @@ function extractGenerateContentMetrics(response, startTime) {
     metrics.end = end;
     metrics.duration = end - startTime;
   }
-  if (_optionalChain([response, 'optionalAccess', _305 => _305.usageMetadata])) {
+  if (_optionalChain([response, 'optionalAccess', _364 => _364.usageMetadata])) {
     populateUsageMetrics(metrics, response.usageMetadata);
   }
   return metrics;
@@ -15159,7 +16441,7 @@ function extractEmbedContentMetrics(response, startTime) {
     metrics.end = end;
     metrics.duration = end - startTime;
   }
-  if (_optionalChain([response, 'optionalAccess', _306 => _306.usageMetadata])) {
+  if (_optionalChain([response, 'optionalAccess', _365 => _365.usageMetadata])) {
     populateUsageMetrics(metrics, response.usageMetadata);
   }
   const embeddingTokenCount = extractEmbedPromptTokenCount(response);
@@ -15173,11 +16455,11 @@ function extractEmbedPromptTokenCount(response) {
   if (!response) {
     return void 0;
   }
-  const usagePromptTokens = _optionalChain([response, 'access', _307 => _307.usageMetadata, 'optionalAccess', _308 => _308.promptTokenCount]);
+  const usagePromptTokens = _optionalChain([response, 'access', _366 => _366.usageMetadata, 'optionalAccess', _367 => _367.promptTokenCount]);
   if (typeof usagePromptTokens === "number" && Number.isFinite(usagePromptTokens)) {
     return usagePromptTokens;
   }
-  const usageTotalTokens = _optionalChain([response, 'access', _309 => _309.usageMetadata, 'optionalAccess', _310 => _310.totalTokenCount]);
+  const usageTotalTokens = _optionalChain([response, 'access', _368 => _368.usageMetadata, 'optionalAccess', _369 => _369.totalTokenCount]);
   if (typeof usageTotalTokens === "number" && Number.isFinite(usageTotalTokens)) {
     return usageTotalTokens;
   }
@@ -15188,8 +16470,8 @@ function extractEmbedPromptTokenCount(response) {
   let total = 0;
   let sawAny = false;
   for (const embedding of embeddings) {
-    const embeddingStats = tryToDict(_optionalChain([tryToDict, 'call', _311 => _311(embedding), 'optionalAccess', _312 => _312.statistics]));
-    const tokenCount = _optionalChain([embeddingStats, 'optionalAccess', _313 => _313.tokenCount]);
+    const embeddingStats = tryToDict(_optionalChain([tryToDict, 'call', _370 => _370(embedding), 'optionalAccess', _371 => _371.statistics]));
+    const tokenCount = _optionalChain([embeddingStats, 'optionalAccess', _372 => _372.tokenCount]);
     if (typeof tokenCount === "number" && Number.isFinite(tokenCount)) {
       total += tokenCount;
       sawAny = true;
@@ -15205,7 +16487,7 @@ function summarizeEmbedContentOutput(response) {
   if (embeddings.length === 0) {
     return void 0;
   }
-  const firstValues = _optionalChain([embeddings, 'access', _314 => _314[0], 'optionalAccess', _315 => _315.values]);
+  const firstValues = _optionalChain([embeddings, 'access', _373 => _373[0], 'optionalAccess', _374 => _374.values]);
   if (!Array.isArray(firstValues)) {
     return void 0;
   }
@@ -15260,7 +16542,7 @@ function aggregateGenerateContentChunks(chunks, startTime, firstTokenTime) {
     }
     if (chunk.candidates && Array.isArray(chunk.candidates)) {
       for (const candidate of chunk.candidates) {
-        if (_optionalChain([candidate, 'access', _316 => _316.content, 'optionalAccess', _317 => _317.parts])) {
+        if (_optionalChain([candidate, 'access', _375 => _375.content, 'optionalAccess', _376 => _376.parts])) {
           for (const part of candidate.content.parts) {
             if (part.text !== void 0) {
               if (part.thought) {
@@ -15291,7 +16573,7 @@ function aggregateGenerateContentChunks(chunks, startTime, firstTokenTime) {
     parts.push({ text });
   }
   parts.push(...otherParts);
-  if (parts.length > 0 && _optionalChain([lastResponse, 'optionalAccess', _318 => _318.candidates])) {
+  if (parts.length > 0 && _optionalChain([lastResponse, 'optionalAccess', _377 => _377.candidates])) {
     const candidates = [];
     for (const candidate of lastResponse.candidates) {
       const candidateDict = {
@@ -15328,7 +16610,7 @@ function aggregateGenerateContentChunks(chunks, startTime, firstTokenTime) {
   }
   return { aggregated, metrics };
 }
-function cleanMetrics(metrics) {
+function cleanMetrics2(metrics) {
   const cleaned = {};
   for (const [key, value] of Object.entries(metrics)) {
     if (value !== null && value !== void 0) {
@@ -15348,7 +16630,7 @@ function extractResponseMetadata(response) {
   if (Array.isArray(responseDict.candidates)) {
     for (const candidate of responseDict.candidates) {
       const candidateDict = tryToDict(candidate);
-      if (_optionalChain([candidateDict, 'optionalAccess', _319 => _319.groundingMetadata]) !== void 0) {
+      if (_optionalChain([candidateDict, 'optionalAccess', _378 => _378.groundingMetadata]) !== void 0) {
         candidateGroundingMetadata.push(candidateDict.groundingMetadata);
       }
     }
@@ -15412,6 +16694,8 @@ var REQUEST_METADATA_ALLOWLIST = /* @__PURE__ */ new Set([
   "stop",
   "stream",
   "temperature",
+  "tool_choice",
+  "tools",
   "top_p"
 ]);
 var RESPONSE_METADATA_ALLOWLIST = /* @__PURE__ */ new Set([
@@ -15427,9 +16711,9 @@ var HuggingFacePlugin = class extends BasePlugin {
         name: "huggingface.chat_completion",
         type: "llm" /* LLM */,
         extractInput: extractChatInputWithMetadata,
-        extractOutput: (result) => _optionalChain([result, 'optionalAccess', _320 => _320.choices]),
+        extractOutput: (result) => _optionalChain([result, 'optionalAccess', _379 => _379.choices]),
         extractMetadata: (result) => extractResponseMetadata2(result),
-        extractMetrics: (result) => parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _321 => _321.usage]))
+        extractMetrics: (result) => parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _380 => _380.usage]))
       }),
       traceSyncStreamChannel(huggingFaceChannels.chatCompletionStream, {
         name: "huggingface.chat_completion_stream",
@@ -15447,7 +16731,7 @@ var HuggingFacePlugin = class extends BasePlugin {
         extractInput: extractTextGenerationInputWithMetadata,
         extractOutput: (result) => isObject(result) ? { generated_text: result.generated_text } : result,
         extractMetadata: extractTextGenerationMetadata,
-        extractMetrics: (result) => extractTextGenerationMetrics(_nullishCoalesce(_optionalChain([result, 'optionalAccess', _322 => _322.details]), () => ( null)))
+        extractMetrics: (result) => extractTextGenerationMetrics(_nullishCoalesce(_optionalChain([result, 'optionalAccess', _381 => _381.details]), () => ( null)))
       }),
       traceSyncStreamChannel(huggingFaceChannels.textGenerationStream, {
         name: "huggingface.text_generation_stream",
@@ -15566,7 +16850,7 @@ function extractTextGenerationMetrics(details) {
   return metrics;
 }
 function extractTextGenerationMetadata(result) {
-  if (!isObject(_optionalChain([result, 'optionalAccess', _323 => _323.details]))) {
+  if (!isObject(_optionalChain([result, 'optionalAccess', _382 => _382.details]))) {
     return void 0;
   }
   return typeof result.details.finish_reason === "string" ? {
@@ -15612,7 +16896,7 @@ function patchChatCompletionStream(args) {
       const lastChunk = chunks.at(-1);
       const responseMetadata = extractResponseMetadata2(lastChunk);
       const metrics = {
-        ...parseMetricsFromUsage(_optionalChain([lastChunk, 'optionalAccess', _324 => _324.usage])),
+        ...parseMetricsFromUsage(_optionalChain([lastChunk, 'optionalAccess', _383 => _383.usage])),
         ...firstChunkTime !== void 0 ? { time_to_first_token: firstChunkTime - startTime } : {}
       };
       span.log({
@@ -15650,8 +16934,8 @@ function patchTextGenerationStream(args) {
         output: aggregateTextGenerationStreamChunks(chunks),
         ...streamMetadata ? { metadata: streamMetadata } : {},
         metrics: {
-          ...extractTextGenerationMetrics(_nullishCoalesce(_optionalChain([lastChunk, 'optionalAccess', _325 => _325.details]), () => ( null))),
-          ...parseMetricsFromUsage(_optionalChain([lastChunk, 'optionalAccess', _326 => _326.usage])),
+          ...extractTextGenerationMetrics(_nullishCoalesce(_optionalChain([lastChunk, 'optionalAccess', _384 => _384.details]), () => ( null))),
+          ...parseMetricsFromUsage(_optionalChain([lastChunk, 'optionalAccess', _385 => _385.usage])),
           ...firstChunkTime !== void 0 ? { time_to_first_token: firstChunkTime - startTime } : {}
         }
       });
@@ -15674,22 +16958,29 @@ function aggregateChatCompletionChunks2(chunks) {
   for (const chunk of chunks) {
     for (const choice of _nullishCoalesce(chunk.choices, () => ( []))) {
       const index = typeof choice.index === "number" ? choice.index : 0;
-      const existing = _nullishCoalesce(aggregatedChoices.get(index), () => ( { content: "" }));
+      const existing = _nullishCoalesce(aggregatedChoices.get(index), () => ( {
+        content: "",
+        toolCallsByIndex: /* @__PURE__ */ new Map()
+      }));
       const delta = isObject(choice.delta) ? choice.delta : void 0;
       const message = isObject(choice.message) ? choice.message : void 0;
-      if (typeof _optionalChain([delta, 'optionalAccess', _327 => _327.content]) === "string") {
+      if (typeof _optionalChain([delta, 'optionalAccess', _386 => _386.content]) === "string") {
         existing.content += delta.content;
-      } else if (typeof _optionalChain([message, 'optionalAccess', _328 => _328.content]) === "string") {
+      } else if (typeof _optionalChain([message, 'optionalAccess', _387 => _387.content]) === "string") {
         existing.content = message.content;
       }
-      if (typeof _optionalChain([delta, 'optionalAccess', _329 => _329.role]) === "string") {
+      if (typeof _optionalChain([delta, 'optionalAccess', _388 => _388.role]) === "string") {
         existing.role = delta.role;
-      } else if (typeof _optionalChain([message, 'optionalAccess', _330 => _330.role]) === "string") {
+      } else if (typeof _optionalChain([message, 'optionalAccess', _389 => _389.role]) === "string") {
         existing.role = message.role;
       }
       if (choice.finish_reason !== void 0) {
         existing.finish_reason = choice.finish_reason;
       }
+      const toolCallDeltas = _nullishCoalesce(getChatToolCallDeltas(delta), () => ( getChatToolCallDeltas(message)));
+      if (toolCallDeltas) {
+        mergeChatToolCallDeltas(existing.toolCallsByIndex, toolCallDeltas);
+      }
       aggregatedChoices.set(index, existing);
     }
   }
@@ -15698,12 +16989,72 @@ function aggregateChatCompletionChunks2(chunks) {
       index,
       message: {
         content: choice.content,
-        role: _nullishCoalesce(choice.role, () => ( "assistant"))
+        role: _nullishCoalesce(choice.role, () => ( "assistant")),
+        ...choice.toolCallsByIndex.size > 0 ? {
+          tool_calls: [...choice.toolCallsByIndex.entries()].sort(([leftIndex], [rightIndex]) => leftIndex - rightIndex).map(([, toolCall]) => toolCall)
+        } : {}
       },
       ...choice.finish_reason !== void 0 ? { finish_reason: choice.finish_reason } : {}
     }))
   };
 }
+function getChatToolCallDeltas(value) {
+  if (!Array.isArray(_optionalChain([value, 'optionalAccess', _390 => _390.tool_calls]))) {
+    return void 0;
+  }
+  const toolCalls = value.tool_calls.filter((toolCall) => isObject(toolCall));
+  return toolCalls.length > 0 ? toolCalls : void 0;
+}
+function mergeChatToolCallDeltas(toolCallsByIndex, toolCallDeltas) {
+  for (const toolDelta of toolCallDeltas) {
+    const toolIndex = typeof toolDelta.index === "number" && toolDelta.index >= 0 ? toolDelta.index : 0;
+    const existing = toolCallsByIndex.get(toolIndex);
+    if (!existing) {
+      toolCallsByIndex.set(toolIndex, createChatToolCall(toolDelta));
+      continue;
+    }
+    mergeChatToolCall(existing, toolDelta);
+  }
+}
+function createChatToolCall(toolDelta) {
+  const toolFunction = isObject(toolDelta.function) ? toolDelta.function : {};
+  const toolCallFunction = {
+    arguments: typeof toolFunction.arguments === "string" ? toolFunction.arguments : ""
+  };
+  if (typeof toolFunction.name === "string") {
+    toolCallFunction.name = toolFunction.name;
+  }
+  const toolCall = {
+    function: toolCallFunction
+  };
+  if (typeof toolDelta.id === "string") {
+    toolCall.id = toolDelta.id;
+  }
+  if (typeof toolDelta.type === "string") {
+    toolCall.type = toolDelta.type;
+  }
+  return toolCall;
+}
+function mergeChatToolCall(existing, toolDelta) {
+  const currentFunction = isObject(existing.function) ? existing.function : {};
+  const deltaFunction = isObject(toolDelta.function) ? toolDelta.function : {};
+  const currentArguments = typeof currentFunction.arguments === "string" ? currentFunction.arguments : "";
+  const deltaArguments = typeof deltaFunction.arguments === "string" ? deltaFunction.arguments : "";
+  if (typeof toolDelta.id === "string" && typeof existing.id !== "string") {
+    existing.id = toolDelta.id;
+  }
+  if (typeof toolDelta.type === "string" && typeof existing.type !== "string") {
+    existing.type = toolDelta.type;
+  }
+  const nextFunction = {
+    ...currentFunction,
+    arguments: `${currentArguments}${deltaArguments}`
+  };
+  if (typeof deltaFunction.name === "string" && typeof currentFunction.name !== "string") {
+    nextFunction.name = deltaFunction.name;
+  }
+  existing.function = nextFunction;
+}
 function aggregateTextGenerationStreamChunks(chunks) {
   if (chunks.length === 0) {
     return void 0;
@@ -15713,7 +17064,7 @@ function aggregateTextGenerationStreamChunks(chunks) {
   for (const chunk of chunks) {
     if (typeof chunk.generated_text === "string") {
       generatedText = chunk.generated_text;
-    } else if (typeof _optionalChain([chunk, 'access', _331 => _331.token, 'optionalAccess', _332 => _332.text]) === "string" && !chunk.token.special) {
+    } else if (typeof _optionalChain([chunk, 'access', _391 => _391.token, 'optionalAccess', _392 => _392.text]) === "string" && !chunk.token.special) {
       generatedText += chunk.token.text;
     } else if (Array.isArray(chunk.choices)) {
       for (const choice of chunk.choices) {
@@ -15737,17 +17088,17 @@ function aggregateTextGenerationStreamChunks(chunks) {
 function extractTextGenerationStreamMetadata(chunks) {
   for (let index = chunks.length - 1; index >= 0; index--) {
     const chunk = chunks[index];
-    if (isObject(_optionalChain([chunk, 'optionalAccess', _333 => _333.details])) && typeof chunk.details.finish_reason === "string") {
+    if (isObject(_optionalChain([chunk, 'optionalAccess', _393 => _393.details])) && typeof chunk.details.finish_reason === "string") {
       return {
         finish_reason: chunk.details.finish_reason
       };
     }
-    if (!Array.isArray(_optionalChain([chunk, 'optionalAccess', _334 => _334.choices]))) {
+    if (!Array.isArray(_optionalChain([chunk, 'optionalAccess', _394 => _394.choices]))) {
       continue;
     }
     for (let choiceIndex = chunk.choices.length - 1; choiceIndex >= 0; choiceIndex--) {
       const choice = chunk.choices[choiceIndex];
-      if (_optionalChain([choice, 'optionalAccess', _335 => _335.finish_reason]) !== void 0) {
+      if (_optionalChain([choice, 'optionalAccess', _395 => _395.finish_reason]) !== void 0) {
         return { finish_reason: choice.finish_reason };
       }
     }
@@ -15823,14 +17174,14 @@ var OpenRouterAgentPlugin = class extends BasePlugin {
         extractMetadata: (result, event) => {
           if (!isObject(result)) {
             return {
-              step: _optionalChain([event, 'optionalAccess', _336 => _336.step]),
-              step_type: _optionalChain([event, 'optionalAccess', _337 => _337.stepType])
+              step: _optionalChain([event, 'optionalAccess', _396 => _396.step]),
+              step_type: _optionalChain([event, 'optionalAccess', _397 => _397.stepType])
             };
           }
           return {
             ...extractOpenRouterResponseMetadata(result) || {},
-            ..._optionalChain([event, 'optionalAccess', _338 => _338.step]) !== void 0 ? { step: event.step } : {},
-            ..._optionalChain([event, 'optionalAccess', _339 => _339.stepType]) ? { step_type: event.stepType } : {}
+            ..._optionalChain([event, 'optionalAccess', _398 => _398.step]) !== void 0 ? { step: event.step } : {},
+            ..._optionalChain([event, 'optionalAccess', _399 => _399.stepType]) ? { step_type: event.stepType } : {}
           };
         },
         extractMetrics: (result) => isObject(result) ? parseOpenRouterMetricsFromUsage(result.usage) : {}
@@ -15985,7 +17336,7 @@ function isZodSchema3(value) {
 function serializeZodSchema3(schema) {
   try {
     return zodToJsonSchema(schema);
-  } catch (e37) {
+  } catch (e40) {
     return {
       type: "object",
       description: "Zod schema (conversion failed)"
@@ -16191,7 +17542,7 @@ function publishToolResult(tracingChannel2, event, result) {
 }
 function getToolCallId(context) {
   const toolContext = context;
-  return typeof _optionalChain([toolContext, 'optionalAccess', _340 => _340.toolCall, 'optionalAccess', _341 => _341.id]) === "string" ? toolContext.toolCall.id : void 0;
+  return typeof _optionalChain([toolContext, 'optionalAccess', _400 => _400.toolCall, 'optionalAccess', _401 => _401.id]) === "string" ? toolContext.toolCall.id : void 0;
 }
 var OPENROUTER_WRAPPED_CALL_MODEL_RESULT = Symbol(
   "braintrust.openrouter.wrappedCallModelResult"
@@ -16281,7 +17632,7 @@ function patchOpenRouterCallModelResult(args) {
     }
     try {
       await endSpanWithResult(await originalGetResponse(), fallbackOutput);
-    } catch (e38) {
+    } catch (e41) {
       await endSpanWithResult(void 0, fallbackOutput);
     }
   };
@@ -16586,9 +17937,9 @@ var OpenRouterPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: (args) => {
           const request = getOpenRouterRequestArg(args);
-          const chatGenerationParams = isObject(_optionalChain([request, 'optionalAccess', _342 => _342.chatGenerationParams])) ? request.chatGenerationParams : {};
-          const httpReferer = _optionalChain([request, 'optionalAccess', _343 => _343.httpReferer]);
-          const xTitle = _optionalChain([request, 'optionalAccess', _344 => _344.xTitle]);
+          const chatGenerationParams = isObject(_optionalChain([request, 'optionalAccess', _402 => _402.chatGenerationParams])) ? request.chatGenerationParams : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _403 => _403.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _404 => _404.xTitle]);
           const { messages, ...metadata } = chatGenerationParams;
           return {
             input: messages,
@@ -16599,7 +17950,7 @@ var OpenRouterPlugin = class extends BasePlugin {
           return isObject(result) ? result.choices : void 0;
         },
         extractMetrics: (result, startTime) => {
-          const metrics = parseOpenRouterMetricsFromUsage2(_optionalChain([result, 'optionalAccess', _345 => _345.usage]));
+          const metrics = parseOpenRouterMetricsFromUsage2(_optionalChain([result, 'optionalAccess', _405 => _405.usage]));
           if (startTime) {
             metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
           }
@@ -16614,9 +17965,9 @@ var OpenRouterPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: (args) => {
           const request = getOpenRouterRequestArg(args);
-          const requestBody = isObject(_optionalChain([request, 'optionalAccess', _346 => _346.requestBody])) ? request.requestBody : {};
-          const httpReferer = _optionalChain([request, 'optionalAccess', _347 => _347.httpReferer]);
-          const xTitle = _optionalChain([request, 'optionalAccess', _348 => _348.xTitle]);
+          const requestBody = isObject(_optionalChain([request, 'optionalAccess', _406 => _406.requestBody])) ? request.requestBody : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _407 => _407.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _408 => _408.xTitle]);
           const { input, ...metadata } = requestBody;
           return {
             input,
@@ -16631,7 +17982,7 @@ var OpenRouterPlugin = class extends BasePlugin {
           if (!isObject(result)) {
             return void 0;
           }
-          const embedding = _optionalChain([result, 'access', _349 => _349.data, 'optionalAccess', _350 => _350[0], 'optionalAccess', _351 => _351.embedding]);
+          const embedding = _optionalChain([result, 'access', _409 => _409.data, 'optionalAccess', _410 => _410[0], 'optionalAccess', _411 => _411.embedding]);
           return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
         },
         extractMetadata: (result) => {
@@ -16651,9 +18002,9 @@ var OpenRouterPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: (args) => {
           const request = getOpenRouterRequestArg(args);
-          const requestBody = isObject(_optionalChain([request, 'optionalAccess', _352 => _352.requestBody])) ? request.requestBody : {};
-          const httpReferer = _optionalChain([request, 'optionalAccess', _353 => _353.httpReferer]);
-          const xTitle = _nullishCoalesce(_optionalChain([request, 'optionalAccess', _354 => _354.xTitle]), () => ( _optionalChain([request, 'optionalAccess', _355 => _355.appTitle])));
+          const requestBody = isObject(_optionalChain([request, 'optionalAccess', _412 => _412.requestBody])) ? request.requestBody : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _413 => _413.httpReferer]);
+          const xTitle = _nullishCoalesce(_optionalChain([request, 'optionalAccess', _414 => _414.xTitle]), () => ( _optionalChain([request, 'optionalAccess', _415 => _415.appTitle])));
           const { documents, query, ...metadata } = requestBody;
           return {
             input: {
@@ -16679,9 +18030,9 @@ var OpenRouterPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: (args) => {
           const request = getOpenRouterRequestArg(args);
-          const openResponsesRequest = isObject(_optionalChain([request, 'optionalAccess', _356 => _356.openResponsesRequest])) ? request.openResponsesRequest : {};
-          const httpReferer = _optionalChain([request, 'optionalAccess', _357 => _357.httpReferer]);
-          const xTitle = _optionalChain([request, 'optionalAccess', _358 => _358.xTitle]);
+          const openResponsesRequest = isObject(_optionalChain([request, 'optionalAccess', _416 => _416.openResponsesRequest])) ? request.openResponsesRequest : {};
+          const httpReferer = _optionalChain([request, 'optionalAccess', _417 => _417.httpReferer]);
+          const xTitle = _optionalChain([request, 'optionalAccess', _418 => _418.xTitle]);
           const { input, ...metadata } = openResponsesRequest;
           return {
             input,
@@ -16691,7 +18042,7 @@ var OpenRouterPlugin = class extends BasePlugin {
         extractOutput: (result) => extractOpenRouterResponseOutput2(result),
         extractMetadata: (result) => extractOpenRouterResponseMetadata2(result),
         extractMetrics: (result, startTime) => {
-          const metrics = parseOpenRouterMetricsFromUsage2(_optionalChain([result, 'optionalAccess', _359 => _359.usage]));
+          const metrics = parseOpenRouterMetricsFromUsage2(_optionalChain([result, 'optionalAccess', _419 => _419.usage]));
           if (startTime) {
             metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
           }
@@ -16743,14 +18094,14 @@ var OpenRouterPlugin = class extends BasePlugin {
         extractMetadata: (result, event) => {
           if (!isObject(result)) {
             return {
-              step: _optionalChain([event, 'optionalAccess', _360 => _360.step]),
-              step_type: _optionalChain([event, 'optionalAccess', _361 => _361.stepType])
+              step: _optionalChain([event, 'optionalAccess', _420 => _420.step]),
+              step_type: _optionalChain([event, 'optionalAccess', _421 => _421.stepType])
             };
           }
           return {
             ...extractOpenRouterResponseMetadata2(result) || {},
-            ..._optionalChain([event, 'optionalAccess', _362 => _362.step]) !== void 0 ? { step: event.step } : {},
-            ..._optionalChain([event, 'optionalAccess', _363 => _363.stepType]) ? { step_type: event.stepType } : {}
+            ..._optionalChain([event, 'optionalAccess', _422 => _422.step]) !== void 0 ? { step: event.step } : {},
+            ..._optionalChain([event, 'optionalAccess', _423 => _423.stepType]) ? { step_type: event.stepType } : {}
           };
         },
         extractMetrics: (result) => isObject(result) ? parseOpenRouterMetricsFromUsage2(result.usage) : {}
@@ -16909,7 +18260,7 @@ function isZodSchema4(value) {
 function serializeZodSchema4(schema) {
   try {
     return zodToJsonSchema(schema);
-  } catch (e39) {
+  } catch (e42) {
     return {
       type: "object",
       description: "Zod schema (conversion failed)"
@@ -17130,7 +18481,7 @@ function publishToolResult2(tracingChannel2, event, result) {
 }
 function getToolCallId2(context) {
   const toolContext = context;
-  return typeof _optionalChain([toolContext, 'optionalAccess', _364 => _364.toolCall, 'optionalAccess', _365 => _365.id]) === "string" ? toolContext.toolCall.id : void 0;
+  return typeof _optionalChain([toolContext, 'optionalAccess', _424 => _424.toolCall, 'optionalAccess', _425 => _425.id]) === "string" ? toolContext.toolCall.id : void 0;
 }
 function aggregateOpenRouterChatChunks(chunks) {
   let role;
@@ -17141,12 +18492,12 @@ function aggregateOpenRouterChatChunks(chunks) {
   for (const chunk of chunks) {
     metrics = {
       ...metrics,
-      ...parseOpenRouterMetricsFromUsage2(_optionalChain([chunk, 'optionalAccess', _366 => _366.usage]))
+      ...parseOpenRouterMetricsFromUsage2(_optionalChain([chunk, 'optionalAccess', _426 => _426.usage]))
     };
-    const choice = _optionalChain([chunk, 'optionalAccess', _367 => _367.choices, 'optionalAccess', _368 => _368[0]]);
-    const delta = _optionalChain([choice, 'optionalAccess', _369 => _369.delta]);
+    const choice = _optionalChain([chunk, 'optionalAccess', _427 => _427.choices, 'optionalAccess', _428 => _428[0]]);
+    const delta = _optionalChain([choice, 'optionalAccess', _429 => _429.delta]);
     if (!delta) {
-      if (_optionalChain([choice, 'optionalAccess', _370 => _370.finish_reason]) !== void 0) {
+      if (_optionalChain([choice, 'optionalAccess', _430 => _430.finish_reason]) !== void 0) {
         finishReason = choice.finish_reason;
       }
       continue;
@@ -17157,7 +18508,7 @@ function aggregateOpenRouterChatChunks(chunks) {
     if (typeof delta.content === "string") {
       content += delta.content;
     }
-    const choiceFinishReason = _nullishCoalesce(_nullishCoalesce(_optionalChain([choice, 'optionalAccess', _371 => _371.finishReason]), () => ( _optionalChain([choice, 'optionalAccess', _372 => _372.finish_reason]))), () => ( void 0));
+    const choiceFinishReason = _nullishCoalesce(_nullishCoalesce(_optionalChain([choice, 'optionalAccess', _431 => _431.finishReason]), () => ( _optionalChain([choice, 'optionalAccess', _432 => _432.finish_reason]))), () => ( void 0));
     const deltaFinishReason = _nullishCoalesce(_nullishCoalesce(delta.finishReason, () => ( delta.finish_reason)), () => ( void 0));
     if (choiceFinishReason !== void 0) {
       finishReason = choiceFinishReason;
@@ -17169,11 +18520,11 @@ function aggregateOpenRouterChatChunks(chunks) {
       continue;
     }
     for (const toolDelta of toolCallDeltas) {
-      if (!_optionalChain([toolDelta, 'optionalAccess', _373 => _373.function])) {
+      if (!_optionalChain([toolDelta, 'optionalAccess', _433 => _433.function])) {
         continue;
       }
       const toolIndex = _nullishCoalesce(toolDelta.index, () => ( 0));
-      const existingToolCall = _optionalChain([toolCalls, 'optionalAccess', _374 => _374[toolIndex]]);
+      const existingToolCall = _optionalChain([toolCalls, 'optionalAccess', _434 => _434[toolIndex]]);
       if (!existingToolCall || toolDelta.id && existingToolCall.id !== void 0 && existingToolCall.id !== toolDelta.id) {
         const nextToolCalls = [...toolCalls || []];
         nextToolCalls[toolIndex] = {
@@ -17220,7 +18571,7 @@ function aggregateOpenRouterChatChunks(chunks) {
 function aggregateOpenRouterResponseStreamEvents(chunks) {
   let finalResponse;
   for (const chunk of chunks) {
-    const response = _optionalChain([chunk, 'optionalAccess', _375 => _375.response]);
+    const response = _optionalChain([chunk, 'optionalAccess', _435 => _435.response]);
     if (!response) {
       continue;
     }
@@ -17328,7 +18679,7 @@ function patchOpenRouterCallModelResult2(args) {
     }
     try {
       await endSpanWithResult(await originalGetResponse(), fallbackOutput);
-    } catch (e40) {
+    } catch (e43) {
       await endSpanWithResult(void 0, fallbackOutput);
     }
   };
@@ -17631,10 +18982,10 @@ var MistralPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: extractMessagesInputWithMetadata,
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _376 => _376.choices]);
+          return _optionalChain([result, 'optionalAccess', _436 => _436.choices]);
         },
         extractMetadata: (result) => extractMistralResponseMetadata(result),
-        extractMetrics: (result, startTime) => extractMistralMetrics(_optionalChain([result, 'optionalAccess', _377 => _377.usage]), startTime)
+        extractMetrics: (result, startTime) => extractMistralMetrics(_optionalChain([result, 'optionalAccess', _437 => _437.usage]), startTime)
       })
     );
     this.unsubscribers.push(
@@ -17654,11 +19005,11 @@ var MistralPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: extractEmbeddingInputWithMetadata,
         extractOutput: (result) => {
-          const embedding = _optionalChain([result, 'optionalAccess', _378 => _378.data, 'optionalAccess', _379 => _379[0], 'optionalAccess', _380 => _380.embedding]);
+          const embedding = _optionalChain([result, 'optionalAccess', _438 => _438.data, 'optionalAccess', _439 => _439[0], 'optionalAccess', _440 => _440.embedding]);
           return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
         },
         extractMetadata: (result) => extractMistralResponseMetadata(result),
-        extractMetrics: (result) => parseMistralMetricsFromUsage(_optionalChain([result, 'optionalAccess', _381 => _381.usage]))
+        extractMetrics: (result) => parseMistralMetricsFromUsage(_optionalChain([result, 'optionalAccess', _441 => _441.usage]))
       })
     );
     this.unsubscribers.push(
@@ -17667,10 +19018,10 @@ var MistralPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: extractPromptInputWithMetadata,
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _382 => _382.choices]);
+          return _optionalChain([result, 'optionalAccess', _442 => _442.choices]);
         },
         extractMetadata: (result) => extractMistralResponseMetadata(result),
-        extractMetrics: (result, startTime) => extractMistralMetrics(_optionalChain([result, 'optionalAccess', _383 => _383.usage]), startTime)
+        extractMetrics: (result, startTime) => extractMistralMetrics(_optionalChain([result, 'optionalAccess', _443 => _443.usage]), startTime)
       })
     );
     this.unsubscribers.push(
@@ -17690,10 +19041,10 @@ var MistralPlugin = class extends BasePlugin {
         type: "llm" /* LLM */,
         extractInput: extractMessagesInputWithMetadata,
         extractOutput: (result) => {
-          return _optionalChain([result, 'optionalAccess', _384 => _384.choices]);
+          return _optionalChain([result, 'optionalAccess', _444 => _444.choices]);
         },
         extractMetadata: (result) => extractMistralResponseMetadata(result),
-        extractMetrics: (result, startTime) => extractMistralMetrics(_optionalChain([result, 'optionalAccess', _385 => _385.usage]), startTime)
+        extractMetrics: (result, startTime) => extractMistralMetrics(_optionalChain([result, 'optionalAccess', _445 => _445.usage]), startTime)
       })
     );
     this.unsubscribers.push(
@@ -17748,6 +19099,8 @@ var MISTRAL_REQUEST_METADATA_ALLOWLIST = /* @__PURE__ */ new Set([
   "presence_penalty",
   "randomSeed",
   "random_seed",
+  "reasoningEffort",
+  "reasoning_effort",
   "responseFormat",
   "response_format",
   "safePrompt",
@@ -17888,6 +19241,98 @@ function extractDeltaText(content) {
   }).filter((part) => part.length > 0);
   return textParts.length > 0 ? textParts.join("") : void 0;
 }
+function normalizeMistralTextContentPart(part) {
+  if (!isObject(part) || part.type !== "text" || typeof part.text !== "string") {
+    return void 0;
+  }
+  return {
+    type: "text",
+    text: part.text
+  };
+}
+function normalizeMistralThinkingContentPart(part) {
+  if (!isObject(part) || part.type !== "thinking") {
+    return void 0;
+  }
+  const thinking = Array.isArray(part.thinking) ? part.thinking.map((thinkingPart) => normalizeMistralTextContentPart(thinkingPart)).filter(
+    (thinkingPart) => thinkingPart !== void 0 && typeof thinkingPart.text === "string"
+  ) : [];
+  return {
+    type: "thinking",
+    thinking
+  };
+}
+function normalizeMistralContentParts(content) {
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  return content.map((part) => {
+    return normalizeMistralTextContentPart(part) || normalizeMistralThinkingContentPart(part);
+  }).filter((part) => part !== void 0);
+}
+function mergeMistralTextSegments(left, right) {
+  const merged = left.map((part) => ({ ...part }));
+  for (const part of right) {
+    const lastPart = merged[merged.length - 1];
+    if (lastPart && lastPart.type === "text" && typeof lastPart.text === "string" && typeof part.text === "string") {
+      lastPart.text += part.text;
+      continue;
+    }
+    merged.push({ ...part });
+  }
+  return merged;
+}
+function mergeMistralContentParts(left, right) {
+  const merged = [...(left || []).map((part) => structuredClone(part))];
+  for (const part of right) {
+    const lastPart = merged[merged.length - 1];
+    if (part.type === "text" && _optionalChain([lastPart, 'optionalAccess', _446 => _446.type]) === "text" && typeof lastPart.text === "string" && typeof part.text === "string") {
+      lastPart.text += part.text;
+      continue;
+    }
+    if (part.type === "thinking" && _optionalChain([lastPart, 'optionalAccess', _447 => _447.type]) === "thinking" && Array.isArray(lastPart.thinking) && Array.isArray(part.thinking)) {
+      lastPart.thinking = mergeMistralTextSegments(
+        lastPart.thinking,
+        part.thinking
+      );
+      continue;
+    }
+    merged.push(structuredClone(part));
+  }
+  return merged;
+}
+function appendMistralContent(accumulator, content) {
+  if (typeof content === "string") {
+    if (accumulator.contentParts) {
+      accumulator.contentParts = mergeMistralContentParts(
+        accumulator.contentParts,
+        [{ type: "text", text: content }]
+      );
+      return;
+    }
+    accumulator.content = `${accumulator.content || ""}${content}`;
+    return;
+  }
+  const normalizedContentParts = normalizeMistralContentParts(content);
+  if (normalizedContentParts.length === 0) {
+    return;
+  }
+  const hasStructuredContent = normalizedContentParts.some(
+    (part) => part.type !== "text"
+  );
+  if (!accumulator.contentParts && !hasStructuredContent) {
+    const text = extractDeltaText(content);
+    if (text) {
+      accumulator.content = `${accumulator.content || ""}${text}`;
+    }
+    return;
+  }
+  accumulator.contentParts = mergeMistralContentParts(
+    accumulator.contentParts || (accumulator.content ? [{ type: "text", text: accumulator.content }] : []),
+    normalizedContentParts
+  );
+  delete accumulator.content;
+}
 function getDeltaToolCalls(delta) {
   const toolCalls = Array.isArray(delta.toolCalls) && delta.toolCalls || Array.isArray(delta.tool_calls) && delta.tool_calls || [];
   return toolCalls.filter((toolCall) => isObject(toolCall));
@@ -17900,13 +19345,13 @@ function createMergedToolCallDelta(delta) {
     ...delta,
     function: {
       ...delta.function,
-      arguments: typeof _optionalChain([delta, 'access', _386 => _386.function, 'optionalAccess', _387 => _387.arguments]) === "string" ? delta.function.arguments : ""
+      arguments: typeof _optionalChain([delta, 'access', _448 => _448.function, 'optionalAccess', _449 => _449.arguments]) === "string" ? delta.function.arguments : ""
     }
   };
 }
 function mergeToolCallDeltaPair(current, delta) {
-  const currentArguments = typeof _optionalChain([current, 'access', _388 => _388.function, 'optionalAccess', _389 => _389.arguments]) === "string" ? current.function.arguments : "";
-  const deltaArguments = typeof _optionalChain([delta, 'access', _390 => _390.function, 'optionalAccess', _391 => _391.arguments]) === "string" ? delta.function.arguments : "";
+  const currentArguments = typeof _optionalChain([current, 'access', _450 => _450.function, 'optionalAccess', _451 => _451.arguments]) === "string" ? current.function.arguments : "";
+  const deltaArguments = typeof _optionalChain([delta, 'access', _452 => _452.function, 'optionalAccess', _453 => _453.arguments]) === "string" ? delta.function.arguments : "";
   return {
     ...current,
     ...delta,
@@ -18009,7 +19454,7 @@ function aggregateMistralStreamChunks(chunks) {
   let metrics = {};
   let metadata;
   for (const event of chunks) {
-    const chunk = isMistralChatCompletionChunk(_optionalChain([event, 'optionalAccess', _392 => _392.data])) ? event.data : void 0;
+    const chunk = isMistralChatCompletionChunk(_optionalChain([event, 'optionalAccess', _454 => _454.data])) ? event.data : void 0;
     if (!chunk) {
       continue;
     }
@@ -18056,10 +19501,7 @@ function aggregateMistralStreamChunks(chunks) {
         if (!accumulator.role && typeof delta.role === "string") {
           accumulator.role = delta.role;
         }
-        const deltaText = extractDeltaText(delta.content);
-        if (deltaText) {
-          accumulator.content = `${accumulator.content || ""}${deltaText}`;
-        }
+        appendMistralContent(accumulator, delta.content);
         accumulator.toolCalls = mergeToolCallDeltas(
           accumulator.toolCalls,
           getDeltaToolCalls(delta)
@@ -18077,7 +19519,7 @@ function aggregateMistralStreamChunks(chunks) {
     index: choice.index,
     message: {
       ...choice.role ? { role: choice.role } : {},
-      content: _nullishCoalesce(choice.content, () => ( null)),
+      content: _nullishCoalesce(_nullishCoalesce(choice.contentParts, () => ( choice.content)), () => ( null)),
       ...choice.toolCalls ? { toolCalls: choice.toolCalls } : {}
     },
     ...choice.finishReason !== void 0 ? { finishReason: choice.finishReason } : {}
@@ -18106,9 +19548,9 @@ var googleADKChannels = defineChannels("@google/adk", {
 });
 
 // src/instrumentation/plugins/google-adk-plugin.ts
-var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3) { super(...args3); _class18.prototype.__init64.call(this);_class18.prototype.__init65.call(this); }
-  __init64() {this.activeRunnerSpans = /* @__PURE__ */ new Map()}
-  __init65() {this.activeAgentSpans = /* @__PURE__ */ new Map()}
+var GoogleADKPlugin = (_class19 = class extends BasePlugin {constructor(...args4) { super(...args4); _class19.prototype.__init65.call(this);_class19.prototype.__init66.call(this); }
+  __init65() {this.activeRunnerSpans = /* @__PURE__ */ new Map()}
+  __init66() {this.activeAgentSpans = /* @__PURE__ */ new Map()}
   onEnable() {
     this.subscribeToRunnerRunAsync();
     this.subscribeToAgentRunAsync();
@@ -18141,7 +19583,7 @@ var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3
           input: extractRunnerInput(params),
           metadata
         });
-      } catch (e41) {
+      } catch (e44) {
       }
       if (contextKey) {
         this.activeRunnerSpans.set(contextKey, span);
@@ -18203,7 +19645,7 @@ var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3
     };
     tracingChannel2.subscribe(handlers);
     this.unsubscribers.push(() => {
-      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _393 => _393()]);
+      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _455 => _455()]);
       tracingChannel2.unsubscribe(handlers);
     });
   }
@@ -18243,7 +19685,7 @@ var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3
           metadata.model = modelName;
         }
         span.log({ metadata });
-      } catch (e42) {
+      } catch (e45) {
       }
       if (contextKey && agentName) {
         this.activeAgentSpans.set(agentContextKey(contextKey, agentName), span);
@@ -18305,7 +19747,7 @@ var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3
     };
     tracingChannel2.subscribe(handlers);
     this.unsubscribers.push(() => {
-      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _394 => _394()]);
+      _optionalChain([unbindCurrentSpanStore, 'optionalCall', _456 => _456()]);
       tracingChannel2.unsubscribe(handlers);
     });
   }
@@ -18316,7 +19758,7 @@ var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3
       start: (event) => {
         const req = _nullishCoalesce(event.arguments[0], () => ( {}));
         const tool = event.self;
-        const toolName = extractToolName(req, tool);
+        const toolName = extractToolName2(req, tool);
         const parentSpan = findToolParentSpan(
           req,
           this.activeAgentSpans,
@@ -18355,7 +19797,7 @@ var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3
           metrics.duration = end - state.startTime;
           state.span.log({
             output: event.result,
-            metrics: cleanMetrics2(metrics)
+            metrics: cleanMetrics3(metrics)
           });
         } finally {
           state.span.end();
@@ -18377,7 +19819,7 @@ var GoogleADKPlugin = (_class18 = class extends BasePlugin {constructor(...args3
       tracingChannel2.unsubscribe(handlers);
     });
   }
-}, _class18);
+}, _class19);
 function ensureState(states, event, create) {
   const existing = states.get(event);
   if (existing) {
@@ -18414,7 +19856,7 @@ function bindAsyncIterableToCurrentSpan(stream, span) {
         value: true
       });
       return stream;
-    } catch (e43) {
+    } catch (e46) {
       return stream;
     }
   }
@@ -18445,17 +19887,17 @@ function bindAsyncIterableToCurrentSpan(stream, span) {
       }
     );
     stream[Symbol.asyncIterator] = patchedIteratorFn;
-  } catch (e44) {
+  } catch (e47) {
     return stream;
   }
   return stream;
 }
 function bindCurrentSpanStoreToStart3(tracingChannel2, states, create) {
   const state = _internalGetGlobalState();
-  const contextManager = _optionalChain([state, 'optionalAccess', _395 => _395.contextManager]);
+  const contextManager = _optionalChain([state, 'optionalAccess', _457 => _457.contextManager]);
   const startChannel = tracingChannel2.start;
   const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
-  if (!_optionalChain([startChannel, 'optionalAccess', _396 => _396.bindStore]) || !currentSpanStore) {
+  if (!_optionalChain([startChannel, 'optionalAccess', _458 => _458.bindStore]) || !currentSpanStore) {
     return void 0;
   }
   startChannel.bindStore(currentSpanStore, (event) => {
@@ -18467,7 +19909,7 @@ function bindCurrentSpanStoreToStart3(tracingChannel2, states, create) {
     return contextManager.wrapSpanForStore(span);
   });
   return () => {
-    _optionalChain([startChannel, 'access', _397 => _397.unbindStore, 'optionalCall', _398 => _398(currentSpanStore)]);
+    _optionalChain([startChannel, 'access', _459 => _459.unbindStore, 'optionalCall', _460 => _460(currentSpanStore)]);
   };
 }
 function extractRunnerContextKey(paramsOrContext) {
@@ -18480,9 +19922,9 @@ function extractRunnerContextKey(paramsOrContext) {
   return extractInvocationContextKey(invocationContext);
 }
 function extractInvocationContextKey(parentContext) {
-  const session = _optionalChain([parentContext, 'optionalAccess', _399 => _399.session]);
-  const userId = _optionalChain([session, 'optionalAccess', _400 => _400.userId]);
-  const sessionId = _optionalChain([session, 'optionalAccess', _401 => _401.id]);
+  const session = _optionalChain([parentContext, 'optionalAccess', _461 => _461.session]);
+  const userId = _optionalChain([session, 'optionalAccess', _462 => _462.userId]);
+  const sessionId = _optionalChain([session, 'optionalAccess', _463 => _463.id]);
   if (typeof userId !== "string" || typeof sessionId !== "string") {
     return void 0;
   }
@@ -18539,10 +19981,10 @@ function extractRunnerMetadata(paramsOrContext) {
     metadata["google_adk.session_id"] = directSessionId;
   }
   const session = "session" in paramsOrContext ? paramsOrContext.session : void 0;
-  if (metadata["google_adk.user_id"] === void 0 && typeof _optionalChain([session, 'optionalAccess', _402 => _402.userId]) === "string") {
+  if (metadata["google_adk.user_id"] === void 0 && typeof _optionalChain([session, 'optionalAccess', _464 => _464.userId]) === "string") {
     metadata["google_adk.user_id"] = session.userId;
   }
-  if (metadata["google_adk.session_id"] === void 0 && typeof _optionalChain([session, 'optionalAccess', _403 => _403.id]) === "string") {
+  if (metadata["google_adk.session_id"] === void 0 && typeof _optionalChain([session, 'optionalAccess', _465 => _465.id]) === "string") {
     metadata["google_adk.session_id"] = session.id;
   }
   return metadata;
@@ -18552,14 +19994,14 @@ function extractAgentName(parentContext) {
     return void 0;
   }
   const agent = parentContext.agent;
-  return _optionalChain([agent, 'optionalAccess', _404 => _404.name]);
+  return _optionalChain([agent, 'optionalAccess', _466 => _466.name]);
 }
 function extractModelName(parentContext) {
   if (!parentContext) {
     return void 0;
   }
   const agent = parentContext.agent;
-  if (!_optionalChain([agent, 'optionalAccess', _405 => _405.model])) {
+  if (!_optionalChain([agent, 'optionalAccess', _467 => _467.model])) {
     return void 0;
   }
   if (typeof agent.model === "string") {
@@ -18572,30 +20014,30 @@ function extractModelName(parentContext) {
 }
 function extractToolCallId(req) {
   const toolContext = req.toolContext;
-  return _optionalChain([toolContext, 'optionalAccess', _406 => _406.functionCallId]);
+  return _optionalChain([toolContext, 'optionalAccess', _468 => _468.functionCallId]);
 }
-function extractToolName(req, tool) {
-  if (typeof _optionalChain([tool, 'optionalAccess', _407 => _407.name]) === "string" && tool.name.length > 0) {
+function extractToolName2(req, tool) {
+  if (typeof _optionalChain([tool, 'optionalAccess', _469 => _469.name]) === "string" && tool.name.length > 0) {
     return tool.name;
   }
   const toolContext = req.toolContext;
-  const invocationContext = _optionalChain([toolContext, 'optionalAccess', _408 => _408.invocationContext]);
-  const invocationTool = _optionalChain([invocationContext, 'optionalAccess', _409 => _409.tool]);
-  const toolName = _optionalChain([invocationTool, 'optionalAccess', _410 => _410.name]);
+  const invocationContext = _optionalChain([toolContext, 'optionalAccess', _470 => _470.invocationContext]);
+  const invocationTool = _optionalChain([invocationContext, 'optionalAccess', _471 => _471.tool]);
+  const toolName = _optionalChain([invocationTool, 'optionalAccess', _472 => _472.name]);
   return typeof toolName === "string" && toolName.length > 0 ? toolName : void 0;
 }
 function extractToolAgentName(req) {
   const toolContext = req.toolContext;
-  const directName = _optionalChain([toolContext, 'optionalAccess', _411 => _411.agentName]);
+  const directName = _optionalChain([toolContext, 'optionalAccess', _473 => _473.agentName]);
   if (typeof directName === "string" && directName.length > 0) {
     return directName;
   }
-  const invocationContext = _optionalChain([toolContext, 'optionalAccess', _412 => _412.invocationContext]);
+  const invocationContext = _optionalChain([toolContext, 'optionalAccess', _474 => _474.invocationContext]);
   return extractAgentName(invocationContext);
 }
 function findToolParentSpan(req, activeAgentSpans, activeRunnerSpans) {
   const toolContext = req.toolContext;
-  const invocationContext = _optionalChain([toolContext, 'optionalAccess', _413 => _413.invocationContext]);
+  const invocationContext = _optionalChain([toolContext, 'optionalAccess', _475 => _475.invocationContext]);
   const contextKey = extractInvocationContextKey(invocationContext);
   const agentName = extractToolAgentName(req);
   if (contextKey && agentName) {
@@ -18622,7 +20064,7 @@ function finalizeRunnerSpan(state, activeRunnerSpans) {
     }
     state.span.log({
       output: lastEvent ? extractEventOutput(lastEvent) : void 0,
-      metrics: cleanMetrics2(metrics)
+      metrics: cleanMetrics3(metrics)
     });
   } finally {
     cleanupActiveRunnerSpan(state, activeRunnerSpans);
@@ -18639,7 +20081,7 @@ function finalizeAgentSpan(state, activeAgentSpans) {
     metrics.duration = end - state.startTime;
     state.span.log({
       output: lastEvent ? extractEventOutput(lastEvent) : void 0,
-      metrics: cleanMetrics2(metrics)
+      metrics: cleanMetrics3(metrics)
     });
   } finally {
     cleanupActiveAgentSpan(state, activeAgentSpans);
@@ -18725,7 +20167,7 @@ function populateUsageMetrics2(metrics, usage) {
     metrics.completion_reasoning_tokens = usage.thoughtsTokenCount;
   }
 }
-function cleanMetrics2(metrics) {
+function cleanMetrics3(metrics) {
   const cleaned = {};
   for (const [key, value] of Object.entries(metrics)) {
     if (value !== null && value !== void 0) {
@@ -18853,6 +20295,11 @@ var CHAT_REQUEST_METADATA_ALLOWLIST = /* @__PURE__ */ new Set([
   "strictTools",
   "strict_tools",
   "temperature",
+  "thinking",
+  "thinkingTokenBudget",
+  "thinkingType",
+  "thinking_token_budget",
+  "thinking_type",
   "toolChoice",
   "tool_choice"
 ]);
@@ -18972,7 +20419,7 @@ function extractCohereResponseMetadata(result) {
     RESPONSE_METADATA_ALLOWLIST2
   );
   const meta = isObject(result.meta) ? result.meta : void 0;
-  const apiVersion = isObject(_optionalChain([meta, 'optionalAccess', _414 => _414.apiVersion])) && typeof meta.apiVersion.version === "string" && meta.apiVersion.version || isObject(_optionalChain([meta, 'optionalAccess', _415 => _415.api_version])) && typeof meta.api_version.version === "string" && meta.api_version.version;
+  const apiVersion = isObject(_optionalChain([meta, 'optionalAccess', _476 => _476.apiVersion])) && typeof meta.apiVersion.version === "string" && meta.apiVersion.version || isObject(_optionalChain([meta, 'optionalAccess', _477 => _477.api_version])) && typeof meta.api_version.version === "string" && meta.api_version.version;
   const metadata = {
     ...responseMetadata,
     ...apiVersion ? { api_version: apiVersion } : {}
@@ -19073,6 +20520,11 @@ function mergeUsageMetrics(metrics, usage) {
       "tokens",
       _nullishCoalesce(tokenContainer.totalTokens, () => ( tokenContainer.total_tokens))
     );
+    setMetricIfNumber(
+      metrics,
+      "reasoning_tokens",
+      _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(tokenContainer.reasoningTokens, () => ( tokenContainer.reasoning_tokens)), () => ( tokenContainer.thinkingTokens)), () => ( tokenContainer.thinking_tokens))
+    );
   }
   const billedUnits = (isObject(source.billedUnits) ? source.billedUnits : void 0) || (isObject(source.billed_units) ? source.billed_units : void 0);
   if (billedUnits) {
@@ -19128,13 +20580,13 @@ function getToolCallIndex2(toolCall, fallbackIndex) {
   return typeof toolCall.index === "number" && Number.isInteger(toolCall.index) ? toolCall.index : fallbackIndex;
 }
 function appendToolCallDelta(existing, incoming) {
-  const currentArguments = isObject(_optionalChain([existing, 'optionalAccess', _416 => _416.function])) && typeof existing.function.arguments === "string" ? existing.function.arguments : "";
+  const currentArguments = isObject(_optionalChain([existing, 'optionalAccess', _478 => _478.function])) && typeof existing.function.arguments === "string" ? existing.function.arguments : "";
   const incomingArguments = isObject(incoming.function) && typeof incoming.function.arguments === "string" ? incoming.function.arguments : "";
   return {
     ...existing,
     ...incoming,
     function: {
-      ...isObject(_optionalChain([existing, 'optionalAccess', _417 => _417.function])) ? existing.function : {},
+      ...isObject(_optionalChain([existing, 'optionalAccess', _479 => _479.function])) ? existing.function : {},
       ...isObject(incoming.function) ? incoming.function : {},
       ...incomingArguments ? { arguments: `${currentArguments}${incomingArguments}` } : {}
     }
@@ -19153,13 +20605,87 @@ function extractV8DeltaText(chunk) {
   }
   return void 0;
 }
+function getV8ContentIndex(chunk) {
+  return typeof chunk.index === "number" ? chunk.index : 0;
+}
+function toContentBlockType(value) {
+  return value === "text" || value === "thinking" ? value : void 0;
+}
+function getOrCreateContentBlock(contentBlocksByIndex, contentBlockOrder, index) {
+  if (!contentBlockOrder.includes(index)) {
+    contentBlockOrder.push(index);
+  }
+  if (!(index in contentBlocksByIndex)) {
+    contentBlocksByIndex[index] = {
+      text: "",
+      thinking: ""
+    };
+  }
+  return contentBlocksByIndex[index];
+}
+function appendV8ContentBlock(contentBlocksByIndex, contentBlockOrder, index, content) {
+  if (typeof content === "string") {
+    const block2 = getOrCreateContentBlock(
+      contentBlocksByIndex,
+      contentBlockOrder,
+      index
+    );
+    block2.type ??= "text";
+    block2.text += content;
+    return;
+  }
+  if (!isObject(content)) {
+    return;
+  }
+  const block = getOrCreateContentBlock(
+    contentBlocksByIndex,
+    contentBlockOrder,
+    index
+  );
+  const contentType = toContentBlockType(content.type);
+  if (contentType) {
+    block.type = contentType;
+  }
+  if (typeof content.text === "string") {
+    block.type ??= "text";
+    block.text += content.text;
+  }
+  if (typeof content.thinking === "string") {
+    block.type ??= "thinking";
+    block.thinking += content.thinking;
+  }
+}
+function serializeAggregatedContentBlocks(contentBlocksByIndex, contentBlockOrder) {
+  return contentBlockOrder.sort((left, right) => left - right).flatMap((index) => {
+    const block = contentBlocksByIndex[index];
+    if (!block) {
+      return [];
+    }
+    if (block.type === "thinking" && block.thinking.length > 0) {
+      return [{ type: "thinking", thinking: block.thinking }];
+    }
+    if (block.text.length > 0) {
+      return [{ type: "text", text: block.text }];
+    }
+    if (block.thinking.length > 0) {
+      return [{ type: "thinking", thinking: block.thinking }];
+    }
+    return [];
+  });
+}
+function hasThinkingContent(contentBlocks) {
+  return contentBlocks.some((block) => block.type === "thinking");
+}
 function aggregateCohereChatStreamChunks(chunks) {
   const textDeltas = [];
+  const contentBlocksByIndex = {};
+  const contentBlockOrder = [];
   const toolCallsByIndex = {};
   const toolCallOrder = [];
   let terminalResponse;
   let role;
   let finishReason;
+  let toolPlan = "";
   let metadata = {};
   let metrics = {};
   for (const chunk of chunks) {
@@ -19217,12 +20743,36 @@ function aggregateCohereChatStreamChunks(chunks) {
       continue;
     }
     if (eventType === "content-delta") {
+      appendV8ContentBlock(
+        contentBlocksByIndex,
+        contentBlockOrder,
+        getV8ContentIndex(chunk),
+        isObject(chunk.delta) && isObject(chunk.delta.message) ? chunk.delta.message.content : void 0
+      );
       const text = extractV8DeltaText(chunk);
       if (text) {
         textDeltas.push(text);
       }
       continue;
     }
+    if (eventType === "content-start") {
+      appendV8ContentBlock(
+        contentBlocksByIndex,
+        contentBlockOrder,
+        getV8ContentIndex(chunk),
+        isObject(chunk.delta) && isObject(chunk.delta.message) ? chunk.delta.message.content : void 0
+      );
+      continue;
+    }
+    if (eventType === "tool-plan-delta") {
+      if (isObject(chunk.delta) && isObject(chunk.delta.message)) {
+        const deltaToolPlan = typeof chunk.delta.message.toolPlan === "string" ? chunk.delta.message.toolPlan : typeof chunk.delta.message.tool_plan === "string" ? chunk.delta.message.tool_plan : void 0;
+        if (deltaToolPlan) {
+          toolPlan += deltaToolPlan;
+        }
+      }
+      continue;
+    }
     if (eventType === "tool-call-start") {
       const toolCalls = isObject(chunk.delta) && isObject(chunk.delta.message) ? toToolCallArray(
         Array.isArray(chunk.delta.message.toolCalls) ? chunk.delta.message.toolCalls : _nullishCoalesce(chunk.delta.message.toolCalls, () => ( chunk.delta.message.tool_calls))
@@ -19276,13 +20826,26 @@ function aggregateCohereChatStreamChunks(chunks) {
     }
   }
   const mergedToolCalls = toolCallOrder.sort((left, right) => left - right).map((index) => toolCallsByIndex[index]).filter((toolCall) => isObject(toolCall));
+  const aggregatedContentBlocks = serializeAggregatedContentBlocks(
+    contentBlocksByIndex,
+    contentBlockOrder
+  );
   let output = extractCohereChatOutput(terminalResponse);
   if (output === void 0) {
     const mergedText = textDeltas.join("");
-    if (mergedToolCalls.length > 0 || role || mergedText.length > 0) {
+    const shouldUseStructuredContent = hasThinkingContent(aggregatedContentBlocks) || toolPlan.length > 0;
+    if (shouldUseStructuredContent) {
+      output = {
+        ...role ? { role } : {},
+        ...aggregatedContentBlocks.length > 0 ? { content: aggregatedContentBlocks } : {},
+        ...toolPlan.length > 0 ? { toolPlan } : {},
+        ...mergedToolCalls.length > 0 ? { toolCalls: mergedToolCalls } : {}
+      };
+    } else if (mergedToolCalls.length > 0 || role || mergedText.length > 0 || aggregatedContentBlocks.length > 0) {
+      const textContent = mergedText.length > 0 ? mergedText : _optionalChain([aggregatedContentBlocks, 'access', _480 => _480[0], 'optionalAccess', _481 => _481.type]) === "text" ? aggregatedContentBlocks[0].text : void 0;
       output = {
         ...role ? { role } : {},
-        ...mergedText.length > 0 ? { content: mergedText } : {},
+        ...textContent ? { content: textContent } : {},
         ...mergedToolCalls.length > 0 ? { toolCalls: mergedToolCalls } : {}
       };
     }
@@ -19300,22 +20863,116 @@ function aggregateCohereChatStreamChunks(chunks) {
   };
 }
 
+// src/instrumentation/plugins/groq-channels.ts
+var groqChannels = defineChannels("groq-sdk", {
+  chatCompletionsCreate: channel({
+    channelName: "chat.completions.create",
+    kind: "async"
+  }),
+  embeddingsCreate: channel(
+    {
+      channelName: "embeddings.create",
+      kind: "async"
+    }
+  )
+});
+
+// src/instrumentation/plugins/groq-plugin.ts
+var GroqPlugin = class extends BasePlugin {
+  onEnable() {
+    this.unsubscribers.push(
+      traceStreamingChannel(groqChannels.chatCompletionsCreate, {
+        name: "groq.chat.completions.create",
+        type: "llm" /* LLM */,
+        extractInput: ([params]) => {
+          const { messages, ...metadata } = params;
+          return {
+            input: processInputAttachments(messages),
+            metadata: { ...metadata, provider: "groq" }
+          };
+        },
+        extractOutput: (result) => _optionalChain([result, 'optionalAccess', _482 => _482.choices]),
+        extractMetrics: (result, startTime) => {
+          const metrics = parseGroqMetrics(result);
+          if (startTime) {
+            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+          }
+          return metrics;
+        },
+        aggregateChunks: aggregateGroqChatCompletionChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceAsyncChannel(groqChannels.embeddingsCreate, {
+        name: "groq.embeddings.create",
+        type: "llm" /* LLM */,
+        extractInput: ([params]) => {
+          const { input, ...metadata } = params;
+          return {
+            input,
+            metadata: { ...metadata, provider: "groq" }
+          };
+        },
+        extractOutput: (result) => {
+          const embedding = _optionalChain([result, 'optionalAccess', _483 => _483.data, 'optionalAccess', _484 => _484[0], 'optionalAccess', _485 => _485.embedding]);
+          return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
+        },
+        extractMetrics: (result) => parseGroqMetrics(result)
+      })
+    );
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+};
+function parseGroqMetrics(result) {
+  const metrics = parseMetricsFromUsage(_optionalChain([result, 'optionalAccess', _486 => _486.usage]));
+  const xGroq = _optionalChain([result, 'optionalAccess', _487 => _487.x_groq]);
+  if (!xGroq || typeof xGroq !== "object") {
+    return metrics;
+  }
+  const extraUsage = "usage" in xGroq ? xGroq.usage : void 0;
+  if (!extraUsage || typeof extraUsage !== "object") {
+    return metrics;
+  }
+  const dramCachedTokens = extraUsage["dram_cached_tokens"];
+  const sramCachedTokens = extraUsage["sram_cached_tokens"];
+  return {
+    ...metrics,
+    ...typeof dramCachedTokens === "number" ? { dram_cached_tokens: dramCachedTokens } : {},
+    ...typeof sramCachedTokens === "number" ? { sram_cached_tokens: sramCachedTokens } : {}
+  };
+}
+function aggregateGroqChatCompletionChunks(chunks, streamResult, endEvent) {
+  const aggregated = aggregateChatCompletionChunks(
+    chunks,
+    streamResult,
+    endEvent
+  );
+  return {
+    metrics: aggregated.metrics,
+    output: aggregated.output
+  };
+}
+
 // src/instrumentation/braintrust-plugin.ts
-var BraintrustPlugin = (_class19 = class extends BasePlugin {
+var BraintrustPlugin = (_class20 = class extends BasePlugin {
   
-  __init66() {this.openaiPlugin = null}
-  __init67() {this.anthropicPlugin = null}
-  __init68() {this.aiSDKPlugin = null}
-  __init69() {this.claudeAgentSDKPlugin = null}
-  __init70() {this.googleGenAIPlugin = null}
-  __init71() {this.huggingFacePlugin = null}
-  __init72() {this.openRouterPlugin = null}
-  __init73() {this.openRouterAgentPlugin = null}
-  __init74() {this.mistralPlugin = null}
-  __init75() {this.googleADKPlugin = null}
-  __init76() {this.coherePlugin = null}
+  __init67() {this.openaiPlugin = null}
+  __init68() {this.anthropicPlugin = null}
+  __init69() {this.aiSDKPlugin = null}
+  __init70() {this.claudeAgentSDKPlugin = null}
+  __init71() {this.cursorSDKPlugin = null}
+  __init72() {this.googleGenAIPlugin = null}
+  __init73() {this.huggingFacePlugin = null}
+  __init74() {this.openRouterPlugin = null}
+  __init75() {this.openRouterAgentPlugin = null}
+  __init76() {this.mistralPlugin = null}
+  __init77() {this.googleADKPlugin = null}
+  __init78() {this.coherePlugin = null}
+  __init79() {this.groqPlugin = null}
   constructor(config = {}) {
-    super();_class19.prototype.__init66.call(this);_class19.prototype.__init67.call(this);_class19.prototype.__init68.call(this);_class19.prototype.__init69.call(this);_class19.prototype.__init70.call(this);_class19.prototype.__init71.call(this);_class19.prototype.__init72.call(this);_class19.prototype.__init73.call(this);_class19.prototype.__init74.call(this);_class19.prototype.__init75.call(this);_class19.prototype.__init76.call(this);;
+    super();_class20.prototype.__init67.call(this);_class20.prototype.__init68.call(this);_class20.prototype.__init69.call(this);_class20.prototype.__init70.call(this);_class20.prototype.__init71.call(this);_class20.prototype.__init72.call(this);_class20.prototype.__init73.call(this);_class20.prototype.__init74.call(this);_class20.prototype.__init75.call(this);_class20.prototype.__init76.call(this);_class20.prototype.__init77.call(this);_class20.prototype.__init78.call(this);_class20.prototype.__init79.call(this);;
     this.config = config;
   }
   onEnable() {
@@ -19336,6 +20993,10 @@ var BraintrustPlugin = (_class19 = class extends BasePlugin {
       this.claudeAgentSDKPlugin = new ClaudeAgentSDKPlugin();
       this.claudeAgentSDKPlugin.enable();
     }
+    if (integrations.cursorSDK !== false && integrations.cursor !== false) {
+      this.cursorSDKPlugin = new CursorSDKPlugin();
+      this.cursorSDKPlugin.enable();
+    }
     if (integrations.googleGenAI !== false && integrations.google !== false) {
       this.googleGenAIPlugin = new GoogleGenAIPlugin();
       this.googleGenAIPlugin.enable();
@@ -19364,6 +21025,10 @@ var BraintrustPlugin = (_class19 = class extends BasePlugin {
       this.coherePlugin = new CoherePlugin();
       this.coherePlugin.enable();
     }
+    if (integrations.groq !== false) {
+      this.groqPlugin = new GroqPlugin();
+      this.groqPlugin.enable();
+    }
   }
   onDisable() {
     if (this.openaiPlugin) {
@@ -19382,6 +21047,10 @@ var BraintrustPlugin = (_class19 = class extends BasePlugin {
       this.claudeAgentSDKPlugin.disable();
       this.claudeAgentSDKPlugin = null;
     }
+    if (this.cursorSDKPlugin) {
+      this.cursorSDKPlugin.disable();
+      this.cursorSDKPlugin = null;
+    }
     if (this.googleGenAIPlugin) {
       this.googleGenAIPlugin.disable();
       this.googleGenAIPlugin = null;
@@ -19410,14 +21079,18 @@ var BraintrustPlugin = (_class19 = class extends BasePlugin {
       this.coherePlugin.disable();
       this.coherePlugin = null;
     }
+    if (this.groqPlugin) {
+      this.groqPlugin.disable();
+      this.groqPlugin = null;
+    }
   }
-}, _class19);
+}, _class20);
 
 // src/instrumentation/registry.ts
-var PluginRegistry = (_class20 = class {constructor() { _class20.prototype.__init77.call(this);_class20.prototype.__init78.call(this);_class20.prototype.__init79.call(this); }
-  __init77() {this.braintrustPlugin = null}
-  __init78() {this.config = {}}
-  __init79() {this.enabled = false}
+var PluginRegistry = (_class21 = class {constructor() { _class21.prototype.__init80.call(this);_class21.prototype.__init81.call(this);_class21.prototype.__init82.call(this); }
+  __init80() {this.braintrustPlugin = null}
+  __init81() {this.config = {}}
+  __init82() {this.enabled = false}
   /**
    * Configure which integrations should be enabled.
    * This must be called before any SDK imports to take effect.
@@ -19483,6 +21156,8 @@ var PluginRegistry = (_class20 = class {constructor() { _class20.prototype.__ini
       google: true,
       huggingface: true,
       claudeAgentSDK: true,
+      cursor: true,
+      cursorSDK: true,
       openrouter: true,
       openrouterAgent: true,
       mistral: true,
@@ -19499,12 +21174,16 @@ var PluginRegistry = (_class20 = class {constructor() { _class20.prototype.__ini
     if (disabledList) {
       const disabled = disabledList.split(",").map((s) => s.trim().toLowerCase()).filter((s) => s.length > 0);
       for (const sdk of disabled) {
-        integrations[sdk] = false;
+        if (sdk === "cursor-sdk") {
+          integrations.cursorSDK = false;
+        } else {
+          integrations[sdk] = false;
+        }
       }
     }
     return { integrations };
   }
-}, _class20);
+}, _class21);
 var registry = new PluginRegistry();
 
 // src/node/config.ts
@@ -20721,11 +22400,11 @@ var SpanFetcher = class _SpanFetcher extends ObjectFetcher {
     return this._state;
   }
 };
-var CachedSpanFetcher = (_class21 = class {
-  __init80() {this.spanCache = /* @__PURE__ */ new Map()}
-  __init81() {this.allFetched = false}
+var CachedSpanFetcher = (_class22 = class {
+  __init83() {this.spanCache = /* @__PURE__ */ new Map()}
+  __init84() {this.allFetched = false}
   
-  constructor(objectTypeOrFetchFn, objectId, rootSpanId, getState) {;_class21.prototype.__init80.call(this);_class21.prototype.__init81.call(this);
+  constructor(objectTypeOrFetchFn, objectId, rootSpanId, getState) {;_class22.prototype.__init83.call(this);_class22.prototype.__init84.call(this);
     if (typeof objectTypeOrFetchFn === "function") {
       this.fetchFn = objectTypeOrFetchFn;
     } else {
@@ -20740,7 +22419,7 @@ var CachedSpanFetcher = (_class21 = class {
           spanType
         );
         const rows = await fetcher.fetchedData();
-        return rows.filter((row) => _optionalChain([row, 'access', _418 => _418.span_attributes, 'optionalAccess', _419 => _419.purpose]) !== "scorer").map((row) => ({
+        return rows.filter((row) => _optionalChain([row, 'access', _488 => _488.span_attributes, 'optionalAccess', _489 => _489.purpose]) !== "scorer").map((row) => ({
           input: row.input,
           output: row.output,
           metadata: row.metadata,
@@ -20774,7 +22453,7 @@ var CachedSpanFetcher = (_class21 = class {
   async fetchSpans(spanType) {
     const spans = await this.fetchFn(spanType);
     for (const span of spans) {
-      const type = _nullishCoalesce(_optionalChain([span, 'access', _420 => _420.span_attributes, 'optionalAccess', _421 => _421.type]), () => ( ""));
+      const type = _nullishCoalesce(_optionalChain([span, 'access', _490 => _490.span_attributes, 'optionalAccess', _491 => _491.type]), () => ( ""));
       const existing = _nullishCoalesce(this.spanCache.get(type), () => ( []));
       existing.push(span);
       this.spanCache.set(type, existing);
@@ -20791,24 +22470,24 @@ var CachedSpanFetcher = (_class21 = class {
     }
     return result;
   }
-}, _class21);
-var LocalTrace = (_class22 = class {
+}, _class22);
+var LocalTrace = (_class23 = class {
   
   
   
   
   
-  __init82() {this.spansFlushed = false}
-  __init83() {this.spansFlushPromise = null}
+  __init85() {this.spansFlushed = false}
+  __init86() {this.spansFlushPromise = null}
   
-  __init84() {this.threadCache = /* @__PURE__ */ new Map()}
+  __init87() {this.threadCache = /* @__PURE__ */ new Map()}
   constructor({
     objectType,
     objectId,
     rootSpanId,
     ensureSpansFlushed,
     state
-  }) {;_class22.prototype.__init82.call(this);_class22.prototype.__init83.call(this);_class22.prototype.__init84.call(this);
+  }) {;_class23.prototype.__init85.call(this);_class23.prototype.__init86.call(this);_class23.prototype.__init87.call(this);
     this.objectType = objectType;
     this.objectId = objectId;
     this.rootSpanId = rootSpanId;
@@ -20854,11 +22533,11 @@ var LocalTrace = (_class22 = class {
     const cachedSpans = this.state.spanCache.getByRootSpanId(this.rootSpanId);
     if (cachedSpans && cachedSpans.length > 0) {
       let spans = cachedSpans.filter(
-        (span) => _optionalChain([span, 'access', _422 => _422.span_attributes, 'optionalAccess', _423 => _423.purpose]) !== "scorer"
+        (span) => _optionalChain([span, 'access', _492 => _492.span_attributes, 'optionalAccess', _493 => _493.purpose]) !== "scorer"
       );
       if (spanType && spanType.length > 0) {
         spans = spans.filter(
-          (span) => spanType.includes(_nullishCoalesce(_optionalChain([span, 'access', _424 => _424.span_attributes, 'optionalAccess', _425 => _425.type]), () => ( "")))
+          (span) => spanType.includes(_nullishCoalesce(_optionalChain([span, 'access', _494 => _494.span_attributes, 'optionalAccess', _495 => _495.type]), () => ( "")))
         );
       }
       return spans.map((span) => ({
@@ -20877,7 +22556,7 @@ var LocalTrace = (_class22 = class {
    * Calls the API with the project_default preprocessor (which falls back to "thread").
    */
   async getThread(options) {
-    const cacheKey = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _426 => _426.preprocessor]), () => ( "project_default"));
+    const cacheKey = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _496 => _496.preprocessor]), () => ( "project_default"));
     if (!this.threadCache.has(cacheKey)) {
       const promise = this.fetchThread(options);
       this.threadCache.set(cacheKey, promise);
@@ -20888,7 +22567,7 @@ var LocalTrace = (_class22 = class {
     await this.ensureSpansReady();
     await this.state.login({});
     const result = await invoke({
-      globalFunction: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _427 => _427.preprocessor]), () => ( "project_default")),
+      globalFunction: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _497 => _497.preprocessor]), () => ( "project_default")),
       functionType: "preprocessor",
       input: {
         trace_ref: {
@@ -20919,7 +22598,7 @@ var LocalTrace = (_class22 = class {
     }
     await this.spansFlushPromise;
   }
-}, _class22);
+}, _class23);
 
 // src/reporters/progress.ts
 var SimpleProgressReporter = class {
@@ -21064,10 +22743,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', _428 => _428.errors, 'optionalAccess', _429 => _429.map, 'call', _430 => _430((err) => {
+    const errorMessages = _optionalChain([validate, 'access', _498 => _498.errors, 'optionalAccess', _499 => _499.map, 'call', _500 => _500((err) => {
       const path2 = err.instancePath || "root";
       return `${path2}: ${err.message}`;
-    }), 'access', _431 => _431.join, 'call', _432 => _432(", ")]);
+    }), 'access', _501 => _501.join, 'call', _502 => _502(", ")]);
     throw Error(`Invalid parameters: ${errorMessages}`);
   }
   return rehydrateRemoteParameters(parameters, schema);
@@ -21407,7 +23086,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', _433 => _433.spanCache, 'optionalAccess', _434 => _434.start, 'call', _435 => _435()]);
+    _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _503 => _503.spanCache, 'optionalAccess', _504 => _504.start, 'call', _505 => _505()]);
   }
   try {
     if (typeof evaluator.data === "string") {
@@ -21462,7 +23141,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     const experimentIdPromise = experiment ? (async () => {
       try {
         return await experiment.id;
-      } catch (e45) {
+      } catch (e48) {
         return void 0;
       }
     })() : void 0;
@@ -21518,7 +23197,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             objectType: parentComponents ? spanObjectTypeV3ToTypedString(
               parentComponents.data.object_type
             ) : "experiment",
-            objectId: await _asyncNullishCoalesce(await _asyncOptionalChain([parentComponents, 'optionalAccess', async _436 => _436.data, 'access', async _437 => _437.object_id]), async () => ( (experimentIdPromise ? await _asyncNullishCoalesce(await experimentIdPromise, async () => ( "")) : ""))),
+            objectId: await _asyncNullishCoalesce(await _asyncOptionalChain([parentComponents, 'optionalAccess', async _506 => _506.data, 'access', async _507 => _507.object_id]), async () => ( (experimentIdPromise ? await _asyncNullishCoalesce(await experimentIdPromise, async () => ( "")) : ""))),
             rootSpanId: rootSpan.rootSpanId,
             ensureSpansFlushed,
             state
@@ -21548,10 +23227,10 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                   span,
                   parameters: _nullishCoalesce(parameters, () => ( {})),
                   reportProgress: (event) => {
-                    _optionalChain([stream, 'optionalCall', _438 => _438({
+                    _optionalChain([stream, 'optionalCall', _508 => _508({
                       ...event,
                       id: rootSpan.id,
-                      origin: _optionalChain([baseEvent, 'access', _439 => _439.event, 'optionalAccess', _440 => _440.origin]),
+                      origin: _optionalChain([baseEvent, 'access', _509 => _509.event, 'optionalAccess', _510 => _510.origin]),
                       name: evaluator.evalName,
                       object_type: "task"
                     })]);
@@ -21739,7 +23418,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
               tags: tags.length ? tags : void 0,
               metadata,
               error,
-              origin: _optionalChain([baseEvent, 'access', _441 => _441.event, 'optionalAccess', _442 => _442.origin])
+              origin: _optionalChain([baseEvent, 'access', _511 => _511.event, 'optionalAccess', _512 => _512.origin])
             };
             collectedResults.push({
               ...baseResult,
@@ -21779,7 +23458,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             break;
           }
           scheduledTrials++;
-          _optionalChain([progressReporter, 'access', _443 => _443.setTotal, 'optionalCall', _444 => _444(evaluator.evalName, scheduledTrials)]);
+          _optionalChain([progressReporter, 'access', _513 => _513.setTotal, 'optionalCall', _514 => _514(evaluator.evalName, scheduledTrials)]);
           q.pushAsync({ datum, trialIndex }).catch((e) => {
             if (queueErrors.length < 5) {
               queueErrors.push(e);
@@ -21864,9 +23543,9 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     );
   } finally {
     if (enableCache) {
-      const spanCache = _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _445 => _445.spanCache]);
-      _optionalChain([spanCache, 'optionalAccess', _446 => _446.dispose, 'call', _447 => _447()]);
-      _optionalChain([spanCache, 'optionalAccess', _448 => _448.stop, 'call', _449 => _449()]);
+      const spanCache = _optionalChain([(_nullishCoalesce(evaluator.state, () => ( _internalGetGlobalState()))), 'optionalAccess', _515 => _515.spanCache]);
+      _optionalChain([spanCache, 'optionalAccess', _516 => _516.dispose, 'call', _517 => _517()]);
+      _optionalChain([spanCache, 'optionalAccess', _518 => _518.stop, 'call', _519 => _519()]);
     }
   }
 }
@@ -22106,7 +23785,7 @@ async function cachedLogin(options) {
 }
 function makeCheckAuthorized(allowedOrgName) {
   return async (req, _res, next) => {
-    if (!_optionalChain([req, 'access', _450 => _450.ctx, 'optionalAccess', _451 => _451.token])) {
+    if (!_optionalChain([req, 'access', _520 => _520.ctx, 'optionalAccess', _521 => _521.token])) {
       return next(_httperrors2.default.call(void 0, 401, "Unauthorized"));
     }
     try {
@@ -22119,7 +23798,7 @@ function makeCheckAuthorized(allowedOrgName) {
         return next(_httperrors2.default.call(void 0, 403, errorMessage));
       }
       const state = await cachedLogin({
-        apiKey: _optionalChain([req, 'access', _452 => _452.ctx, 'optionalAccess', _453 => _453.token]),
+        apiKey: _optionalChain([req, 'access', _522 => _522.ctx, 'optionalAccess', _523 => _523.token]),
         orgName
       });
       req.ctx.state = state;
@@ -22311,17 +23990,17 @@ var ProjectBuilder = class {
   }
 };
 var projects = new ProjectBuilder();
-var Project2 = (_class23 = class {
+var Project2 = (_class24 = class {
   
   
   
   
   
   
-  __init85() {this._publishableCodeFunctions = []}
-  __init86() {this._publishablePrompts = []}
-  __init87() {this._publishableParameters = []}
-  constructor(args) {;_class23.prototype.__init85.call(this);_class23.prototype.__init86.call(this);_class23.prototype.__init87.call(this);
+  __init88() {this._publishableCodeFunctions = []}
+  __init89() {this._publishablePrompts = []}
+  __init90() {this._publishableParameters = []}
+  constructor(args) {;_class24.prototype.__init88.call(this);_class24.prototype.__init89.call(this);_class24.prototype.__init90.call(this);
     _initializeSpanContext();
     this.name = "name" in args ? args.name : void 0;
     this.id = "id" in args ? args.id : void 0;
@@ -22373,12 +24052,12 @@ var Project2 = (_class23 = class {
       functions: functionDefinitions
     });
   }
-}, _class23);
-var ToolBuilder = (_class24 = class {
-  constructor(project) {;_class24.prototype.__init88.call(this);
+}, _class24);
+var ToolBuilder = (_class25 = class {
+  constructor(project) {;_class25.prototype.__init91.call(this);
     this.project = project;
   }
-  __init88() {this.taskCounter = 0}
+  __init91() {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) {
@@ -22403,12 +24082,12 @@ var ToolBuilder = (_class24 = class {
     this.project.addCodeFunction(tool);
     return tool;
   }
-}, _class24);
-var ScorerBuilder = (_class25 = class {
-  constructor(project) {;_class25.prototype.__init89.call(this);
+}, _class25);
+var ScorerBuilder = (_class26 = class {
+  constructor(project) {;_class26.prototype.__init92.call(this);
     this.project = project;
   }
-  __init89() {this.taskCounter = 0}
+  __init92() {this.taskCounter = 0}
   create(opts) {
     this.taskCounter++;
     let resolvedName = opts.name;
@@ -22462,7 +24141,7 @@ var ScorerBuilder = (_class25 = class {
       this.project.addPrompt(codePrompt);
     }
   }
-}, _class25);
+}, _class26);
 var CodeFunction = class {
   constructor(project, opts) {
     this.project = project;
@@ -22764,9 +24443,9 @@ function serializeRemoteEvalParametersContainer(parameters) {
     source: null
   };
 }
-var ProjectNameIdMap = (_class26 = class {constructor() { _class26.prototype.__init90.call(this);_class26.prototype.__init91.call(this); }
-  __init90() {this.nameToId = {}}
-  __init91() {this.idToName = {}}
+var ProjectNameIdMap = (_class27 = class {constructor() { _class27.prototype.__init93.call(this);_class27.prototype.__init94.call(this); }
+  __init93() {this.nameToId = {}}
+  __init94() {this.idToName = {}}
   async getId(projectName) {
     if (!(projectName in this.nameToId)) {
       const response = await _internalGetGlobalState().appConn().post_json("api/project/register", {
@@ -22799,7 +24478,7 @@ var ProjectNameIdMap = (_class26 = class {constructor() { _class26.prototype.__i
     }
     return this.getId(project.name);
   }
-}, _class26);
+}, _class27);
 
 // dev/server.ts
 function runDevServer(evaluators, opts) {
@@ -22874,7 +24553,7 @@ function runDevServer(evaluators, opts) {
         scores,
         stream
       } = evalBodySchema.parse(req.body);
-      if (!_optionalChain([req, 'access', _454 => _454.ctx, 'optionalAccess', _455 => _455.state])) {
+      if (!_optionalChain([req, 'access', _524 => _524.ctx, 'optionalAccess', _525 => _525.state])) {
         res.status(500).json({ error: "Braintrust state not initialized in request" });
         return;
       }
@@ -22925,12 +24604,12 @@ function runDevServer(evaluators, opts) {
             ...evaluator,
             data: evalData.data,
             scores: (_nullishCoalesce(evaluator.scores, () => ( []))).concat(
-              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _456 => _456.map, 'call', _457 => _457(
+              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _526 => _526.map, 'call', _527 => _527(
                 (score) => makeScorer(
                   state,
                   score.name,
                   score.function_id,
-                  _optionalChain([req, 'access', _458 => _458.ctx, 'optionalAccess', _459 => _459.projectId])
+                  _optionalChain([req, 'access', _528 => _528.ctx, 'optionalAccess', _529 => _529.projectId])
                 )
               )]), () => ( []))
             ),
@@ -23021,6 +24700,8 @@ async function getDataset(state, data) {
       state,
       project: data.project_name,
       dataset: data.dataset_name,
+      version: _nullishCoalesce(data.dataset_version, () => ( void 0)),
+      environment: _nullishCoalesce(data.dataset_environment, () => ( void 0)),
       _internal_btql: _nullishCoalesce(data._internal_btql, () => ( void 0))
     });
   } else if ("dataset_id" in data) {
@@ -23032,6 +24713,8 @@ async function getDataset(state, data) {
       state,
       projectId: datasetInfo.projectId,
       dataset: datasetInfo.dataset,
+      version: _nullishCoalesce(data.dataset_version, () => ( void 0)),
+      environment: _nullishCoalesce(data.dataset_environment, () => ( void 0)),
       _internal_btql: _nullishCoalesce(data._internal_btql, () => ( void 0))
     });
   } else {