braintrust 3.23.0 → 3.24.0

package/dist/cli.js

@@ -7,7 +7,11 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -1232,7 +1236,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "braintrust",
-      version: "3.23.0",
+      version: "3.24.0",
       description: "SDK for integrating Braintrust",
       repository: {
         type: "git",
@@ -1438,7 +1442,7 @@ var require_package = __commonJS({
         typedoc: "^0.25.13",
         "typedoc-plugin-markdown": "^3.17.1",
         typescript: "5.4.4",
-        vite: "^6.4.3",
+        vite: "^8.1.5",
         "vite-tsconfig-paths": "^4.3.2",
         vitest: "4.1.5",
         webpack: "^5.106.2",
@@ -1458,7 +1462,7 @@ var require_package = __commonJS({
         cors: "^2.8.5",
         "dc-browser": "^1.0.4",
         dotenv: "^16.4.5",
-        esbuild: "0.28.0",
+        esbuild: "0.28.1",
         esquery: "^1.7.0",
         "eventsource-parser": "^1.1.2",
         express: "^5.2.1",
@@ -1537,6 +1541,7 @@ var DefaultChannel = class {
   constructor(name) {
     this.name = name;
   }
+  name;
   hasSubscribers = false;
   subscribe(_subscription) {
   }
@@ -2586,6 +2591,7 @@ var SpanComponentsV3 = class _SpanComponentsV3 {
   constructor(data) {
     this.data = data;
   }
+  data;
   toStr() {
     const jsonObj = {
       compute_object_metadata_args: this.data.compute_object_metadata_args || void 0,
@@ -3104,6 +3110,7 @@ var SpanComponentsV4 = class _SpanComponentsV4 {
   constructor(data) {
     this.data = data;
   }
+  data;
   toStr() {
     const jsonObj = {
       compute_object_metadata_args: this.data.compute_object_metadata_args || void 0,
@@ -6353,6 +6360,97 @@ var SpanCache = class {
   }
 };
 
+// src/span-origin.ts
+var SDK_VERSION = true ? "3.24.0" : "0.0.0";
+function detectSpanOriginEnvironment(explicit) {
+  if (explicit) return explicit;
+  const envType = isomorph_default.getEnv("BRAINTRUST_ENVIRONMENT_TYPE");
+  const envName = isomorph_default.getEnv("BRAINTRUST_ENVIRONMENT_NAME");
+  if (envType || envName) {
+    return {
+      ...envType ? { type: envType } : {},
+      ...envName ? { name: envName } : {}
+    };
+  }
+  const ci = firstPresent([
+    ["GITHUB_ACTIONS", "github_actions"],
+    ["GITLAB_CI", "gitlab_ci"],
+    ["CIRCLECI", "circleci"],
+    ["BUILDKITE", "buildkite"],
+    ["JENKINS_URL", "jenkins"],
+    ["JENKINS_HOME", "jenkins"],
+    ["TF_BUILD", "azure_pipelines"],
+    ["TEAMCITY_VERSION", "teamcity"],
+    ["TRAVIS", "travis"],
+    ["BITBUCKET_BUILD_NUMBER", "bitbucket"]
+  ]);
+  if (ci) return { type: "ci", name: ci };
+  if (isomorph_default.getEnv("CI")) return { type: "ci", name: "ci" };
+  const earlyServer = firstPresent([
+    ["VERCEL", "vercel"],
+    ["NETLIFY", "netlify"]
+  ]);
+  if (earlyServer) return { type: "server", name: earlyServer };
+  if (isomorph_default.getEnv("ECS_CONTAINER_METADATA_URI") || isomorph_default.getEnv("ECS_CONTAINER_METADATA_URI_V4")) {
+    return { type: "server", name: "ecs" };
+  }
+  const awsExecutionEnv = isomorph_default.getEnv("AWS_EXECUTION_ENV");
+  if (awsExecutionEnv?.startsWith("AWS_ECS_")) {
+    return { type: "server", name: "ecs" };
+  }
+  if (awsExecutionEnv?.startsWith("AWS_Lambda_")) {
+    return { type: "server", name: "aws_lambda" };
+  }
+  if (isomorph_default.getEnv("AWS_LAMBDA_FUNCTION_NAME")) {
+    return { type: "server", name: "aws_lambda" };
+  }
+  const server = firstPresent([
+    ["K_SERVICE", "cloud_run"],
+    ["FUNCTION_TARGET", "gcp_functions"],
+    ["KUBERNETES_SERVICE_HOST", "kubernetes"],
+    ["DYNO", "heroku"],
+    ["FLY_APP_NAME", "fly"],
+    ["RAILWAY_ENVIRONMENT", "railway"],
+    ["RENDER_SERVICE_NAME", "render"]
+  ]);
+  if (server) return { type: "server", name: server };
+  return deploymentModeEnvironment("NODE_ENV", isomorph_default.getEnv("NODE_ENV"));
+}
+function makeSpanOrigin(instrumentationName, environment) {
+  return {
+    name: "braintrust.sdk.javascript",
+    version: SDK_VERSION,
+    instrumentation: { name: instrumentationName },
+    ...environment ? { environment } : {}
+  };
+}
+function mergeSpanOriginContext(context2, instrumentationName, environment) {
+  const next = { ...context2 ?? {} };
+  const current = isObject2(next.span_origin) ? { ...next.span_origin } : {};
+  next.span_origin = {
+    ...makeSpanOrigin(instrumentationName, environment),
+    ...current
+  };
+  return next;
+}
+function firstPresent(entries) {
+  return entries.find(([key]) => Boolean(isomorph_default.getEnv(key)))?.[1];
+}
+function deploymentModeEnvironment(_key, value) {
+  if (!value) return void 0;
+  const normalized = value.toLowerCase();
+  if (normalized === "production" || normalized === "staging") {
+    return { type: "server", name: normalized };
+  }
+  if (normalized === "development" || normalized === "local") {
+    return { type: "local", name: normalized };
+  }
+  return { name: value };
+}
+function isObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/logger.ts
 var BRAINTRUST_ATTACHMENT = BraintrustAttachmentReference.shape.type.value;
 var EXTERNAL_ATTACHMENT = ExternalAttachmentReference.shape.type.value;
@@ -6401,6 +6499,7 @@ var LoginInvalidOrgError = class extends Error {
     super(message);
     this.message = message;
   }
+  message;
 };
 var REDACTION_FIELDS = [
   "input",
@@ -6416,6 +6515,8 @@ var MaskingError = class {
     this.fieldName = fieldName;
     this.errorType = errorType;
   }
+  fieldName;
+  errorType;
   get errorMsg() {
     return `ERROR: Failed to mask field '${this.fieldName}' - ${this.errorType}`;
   }
@@ -6625,7 +6726,9 @@ var BraintrustState = class _BraintrustState {
       diskCache: parametersDiskCache
     });
     this.spanCache = new SpanCache({ disabled: loginParams.disableSpanCache });
+    this.spanOriginEnvironment = detectSpanOriginEnvironment();
   }
+  loginParams;
   id;
   currentExperiment;
   // Note: the value of IsAsyncFlush doesn't really matter here, since we
@@ -6660,6 +6763,7 @@ var BraintrustState = class _BraintrustState {
   _idGenerator = null;
   _contextManager = null;
   _otelFlushCallback = null;
+  spanOriginEnvironment;
   resetLoginInfo() {
     this.appUrl = null;
     this.appPublicUrl = null;
@@ -9013,6 +9117,7 @@ function initLogger(options = {}) {
     orgName,
     forceLogin,
     debugLogLevel,
+    environment,
     fetch: fetch2,
     state: stateArg
   } = options || {};
@@ -9029,6 +9134,7 @@ function initLogger(options = {}) {
   };
   const state = stateArg ?? _globalState;
   state.setDebugLogLevel(debugLogLevel);
+  state.spanOriginEnvironment = detectSpanOriginEnvironment(environment);
   state.enforceQueueSizeLimit(true);
   const lazyMetadata = new LazyValue(
     async () => {
@@ -9737,6 +9843,11 @@ var ObjectFetcher = class {
     this._internal_btql = _internal_btql;
     this._internalBrainstoreRealtime = _internalBrainstoreRealtime;
   }
+  objectType;
+  pinnedVersion;
+  mutateRecord;
+  _internal_btql;
+  _internalBrainstoreRealtime;
   _fetchedData = void 0;
   get id() {
     throw new Error("ObjectFetcher subclasses must have an 'id' attribute");
@@ -10175,6 +10286,8 @@ var ReadonlyExperiment = class extends ObjectFetcher {
     this.state = state;
     this.lazyMetadata = lazyMetadata;
   }
+  state;
+  lazyMetadata;
   get id() {
     return (async () => {
       return (await this.lazyMetadata.get()).experiment.id;
@@ -10297,7 +10410,11 @@ var SpanImpl = class _SpanImpl {
       metrics: {
         start: args.startTime ?? getCurrentUnixTimestamp()
       },
-      context: { ...callerLocation },
+      context: mergeSpanOriginContext(
+        { ...callerLocation },
+        "braintrust-js-logger",
+        this._state.spanOriginEnvironment
+      ),
       span_attributes: {
         name,
         type,
@@ -10671,6 +10788,7 @@ var Dataset2 = class extends ObjectFetcher {
     this.pinnedEnvironment = pinState?.pinnedEnvironment;
     this.pinnedSnapshotName = pinState?.pinnedSnapshotName;
   }
+  state;
   lazyMetadata;
   __braintrust_dataset_marker = true;
   newRecords = 0;
@@ -11182,6 +11300,9 @@ var Prompt2 = class _Prompt {
     this.noTrace = noTrace;
     void this.__braintrust_prompt_marker;
   }
+  metadata;
+  defaults;
+  noTrace;
   parsedPromptData;
   hasParsedPromptData = false;
   __braintrust_prompt_marker = true;
@@ -11419,6 +11540,7 @@ var RemoteEvalParameters = class {
     this.metadata = metadata;
     void this.__braintrust_parameters_marker;
   }
+  metadata;
   __braintrust_parameters_marker = true;
   get id() {
     return this.metadata.id;
@@ -12663,6 +12785,10 @@ var SpanFetcher = class _SpanFetcher extends ObjectFetcher {
     this._state = _state;
     this.spanTypeFilter = spanTypeFilter;
   }
+  _objectId;
+  rootSpanId;
+  _state;
+  spanTypeFilter;
   static buildFilter(rootSpanId, spanTypeFilter, includeScorers = false) {
     const children = [
       // Base filter: root_span_id = 'value'
@@ -13097,6 +13223,8 @@ var EvalResultWithSummary = class {
     this.summary = summary;
     this.results = results;
   }
+  summary;
+  results;
   /**
    * @deprecated Use `summary` instead.
    */
@@ -18877,6 +19005,24 @@ var aiSDKChannels = defineChannels("ai", {
     kind: "sync-stream"
   })
 });
+var harnessAgentChannels = defineChannels("@ai-sdk/harness", {
+  generate: channel({
+    channelName: "HarnessAgent.generate",
+    kind: "async"
+  }),
+  stream: channel({
+    channelName: "HarnessAgent.stream",
+    kind: "async"
+  }),
+  continueGenerate: channel({
+    channelName: "HarnessAgent.continueGenerate",
+    kind: "async"
+  }),
+  continueStream: channel({
+    channelName: "HarnessAgent.continueStream",
+    kind: "async"
+  })
+});
 
 // src/instrumentation/plugins/ai-sdk-plugin.ts
 var DEFAULT_DENY_OUTPUT_PATHS = [
@@ -19145,6 +19291,84 @@ var AISDKPlugin = class extends BasePlugin {
         })
       })
     );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.generate, {
+        name: "HarnessAgent.generate",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result) => extractTokenMetrics(result),
+        aggregateChunks: aggregateAISDKChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.stream, {
+        name: "HarnessAgent.stream",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result, startTime) => ({
+          ...extractTokenMetrics(result),
+          ...startTime === void 0 ? {} : {
+            time_to_first_token: getCurrentUnixTimestamp() - startTime
+          }
+        }),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          defaultDenyOutputPaths: denyOutputPaths,
+          endEvent,
+          result,
+          resolvePromiseUsage: true,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.continueGenerate, {
+        name: "HarnessAgent.continueGenerate",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result) => extractTokenMetrics(result),
+        aggregateChunks: aggregateAISDKChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.continueStream, {
+        name: "HarnessAgent.continueStream",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result, startTime) => ({
+          ...extractTokenMetrics(result),
+          ...startTime === void 0 ? {} : {
+            time_to_first_token: getCurrentUnixTimestamp() - startTime
+          }
+        }),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          defaultDenyOutputPaths: denyOutputPaths,
+          endEvent,
+          result,
+          resolvePromiseUsage: true,
+          span,
+          startTime
+        })
+      })
+    );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.toolLoopAgentGenerate, {
         name: "ToolLoopAgent.generate",
@@ -19675,6 +19899,45 @@ function prepareAISDKCallInput(params, event, span, defaultDenyOutputPaths, chil
     metadata
   };
 }
+function prepareAISDKHarnessAgentInput(params, self) {
+  if (isObject(self)) {
+    try {
+      if (isObject(self.settings)) {
+        const settings = self.settings;
+        if (settings.telemetry === void 0) {
+          Reflect.set(self, "settings", { ...settings, telemetry: {} });
+        }
+      }
+    } catch {
+    }
+  }
+  const selectedInput = {};
+  if (params.prompt !== void 0) {
+    selectedInput.prompt = params.prompt;
+  }
+  if (params.messages !== void 0) {
+    selectedInput.messages = params.messages;
+  }
+  if (params.toolApprovalContinuations !== void 0) {
+    selectedInput.toolApprovalContinuations = params.toolApprovalContinuations;
+  }
+  const metadata = extractMetadataFromCallParams({}, self);
+  if (isObject(params.session) && typeof params.session.sessionId === "string") {
+    metadata.sessionId = params.session.sessionId;
+  }
+  if (isObject(self)) {
+    if (typeof self.harnessId === "string") {
+      metadata.harnessId = self.harnessId;
+    }
+    if (typeof self.permissionMode === "string") {
+      metadata.permissionMode = self.permissionMode;
+    }
+  }
+  return {
+    input: processAISDKCallInput(selectedInput).input,
+    metadata
+  };
+}
 function prepareAISDKWorkflowAgentStreamInput(params, event, span, defaultDenyOutputPaths) {
   registerWorkflowAgentWrapperSpan(span);
   const { input } = processAISDKWorkflowAgentCallInput(params);
@@ -20522,6 +20785,7 @@ function patchAISDKStreamingResult(args) {
     endEvent,
     onComplete,
     result,
+    resolvePromiseUsage,
     span,
     startTime
   } = args;
@@ -20548,6 +20812,22 @@ function patchAISDKStreamingResult(args) {
     outputLogged = true;
     try {
       const metrics = extractTopLevelAISDKMetrics(result, endEvent);
+      if (resolvePromiseUsage) {
+        try {
+          const resultRecord2 = result;
+          const pendingUsage = resultRecord2.totalUsage ?? resultRecord2.usage;
+          if (isPromiseLike(pendingUsage)) {
+            const usage = await Promise.resolve(pendingUsage);
+            if (isObject(usage)) {
+              Object.assign(
+                metrics,
+                extractTokenMetrics({ usage })
+              );
+            }
+          }
+        } catch {
+        }
+      }
       if (metrics.time_to_first_token === void 0 && firstChunkTime !== void 0) {
         metrics.time_to_first_token = firstChunkTime - startTime;
       }
@@ -21778,8 +22058,6 @@ function filterSerializableOptions(options) {
     "additionalDirectories",
     "permissionMode",
     "debug",
-    "apiKey",
-    "apiKeySource",
     "agentName",
     "instructions"
   ];
@@ -32807,6 +33085,16 @@ function cleanObject(obj) {
     })
   );
 }
+function normalizeTokenMetrics(obj) {
+  const metrics = cleanObject(obj);
+  if (metrics.total_tokens !== void 0) {
+    metrics.tokens = metrics.total_tokens;
+  } else if (metrics.prompt_tokens !== void 0 && metrics.completion_tokens !== void 0) {
+    metrics.tokens = metrics.prompt_tokens + metrics.completion_tokens;
+  }
+  delete metrics.total_tokens;
+  return metrics;
+}
 function walkGenerations(response) {
   const result = [];
   const generations = response.generations || [];
@@ -32853,7 +33141,7 @@ function getMetricsFromResponse(response) {
       continue;
     }
     const inputTokenDetails = usageMetadata.input_token_details;
-    return cleanObject({
+    return normalizeTokenMetrics({
       total_tokens: usageMetadata.total_tokens,
       prompt_tokens: usageMetadata.input_tokens,
       completion_tokens: usageMetadata.output_tokens,
@@ -32863,7 +33151,7 @@ function getMetricsFromResponse(response) {
   }
   const llmOutput = response.llmOutput || {};
   const tokenUsage = isRecord(llmOutput.tokenUsage) ? llmOutput.tokenUsage : isRecord(llmOutput.estimatedTokens) ? llmOutput.estimatedTokens : {};
-  return cleanObject({
+  return normalizeTokenMetrics({
     total_tokens: tokenUsage.totalTokens,
     prompt_tokens: tokenUsage.promptTokens,
     completion_tokens: tokenUsage.completionTokens
@@ -35973,7 +36261,13 @@ function configureNode() {
   isomorph_default.getPastNAncestors = getPastNAncestors;
   isomorph_default.getEnv = (name) => {
     const value = process.env[name];
-    return name === "BRAINTRUST_API_KEY" && !value?.trim() ? void 0 : value;
+    if (name === "BRAINTRUST_API_KEY") {
+      return value?.trim() ? value : void 0;
+    }
+    if ((name === "BRAINTRUST_ENVIRONMENT_TYPE" || name === "BRAINTRUST_ENVIRONMENT_NAME") && !value?.trim()) {
+      return getNearestBraintrustEnvValue(name);
+    }
+    return value;
   };
   isomorph_default.getBraintrustApiKey = async () => {
     const value = process.env.BRAINTRUST_API_KEY;
@@ -36058,6 +36352,24 @@ function configureNode() {
   }
   registry.enable();
 }
+function getNearestBraintrustEnvValue(name) {
+  for (let dir2 = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir2 = path.dirname(dir2), depth++) {
+    const envPath = path.join(dir2, ".env.braintrust");
+    try {
+      const parsed = dotenv.parse(fsSync.readFileSync(envPath, "utf8"));
+      const value = parsed[name];
+      return value?.trim() ? value : void 0;
+    } catch (e) {
+      if (typeof e !== "object" || e === null || !("code" in e) || e.code !== "ENOENT") {
+        return void 0;
+      }
+    }
+    if (path.dirname(dir2) === dir2) {
+      break;
+    }
+  }
+  return void 0;
+}
 
 // src/cli/index.ts
 var import_env2 = require("@next/env");
@@ -36390,6 +36702,7 @@ var ToolBuilder = class {
   constructor(project) {
     this.project = project;
   }
+  project;
   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.
@@ -36420,6 +36733,7 @@ var ScorerBuilder = class {
   constructor(project) {
     this.project = project;
   }
+  project;
   taskCounter = 0;
   create(opts) {
     this.taskCounter++;
@@ -36479,6 +36793,7 @@ var ClassifierBuilder = class {
   constructor(project) {
     this.project = project;
   }
+  project;
   taskCounter = 0;
   create(opts) {
     this.taskCounter++;
@@ -36514,6 +36829,7 @@ var CodeFunction = class {
       throw new Error("parameters are required if return type is defined");
     }
   }
+  project;
   handler;
   name;
   slug;
@@ -36601,6 +36917,7 @@ var PromptBuilder = class {
   constructor(project) {
     this.project = project;
   }
+  project;
   create(opts) {
     const toolFunctions = [];
     const rawTools = [];
@@ -36677,6 +36994,7 @@ var ParametersBuilder = class {
   constructor(project) {
     this.project = project;
   }
+  project;
   create(opts) {
     const slug = opts.slug ?? slugify(opts.name, { lower: true, strict: true });
     const codeParameters = new CodeParameters(this.project, {