braintrust 3.27.0 → 3.28.0

package/dist/cli.js

@@ -41,8 +41,8 @@ var require_async = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.read = void 0;
-    function read(path8, settings, callback) {
-      settings.fs.lstat(path8, (lstatError, lstat) => {
+    function read(path9, settings, callback) {
+      settings.fs.lstat(path9, (lstatError, lstat) => {
         if (lstatError !== null) {
           callFailureCallback(callback, lstatError);
           return;
@@ -51,7 +51,7 @@ var require_async = __commonJS({
           callSuccessCallback(callback, lstat);
           return;
         }
-        settings.fs.stat(path8, (statError, stat2) => {
+        settings.fs.stat(path9, (statError, stat2) => {
           if (statError !== null) {
             if (settings.throwErrorOnBrokenSymbolicLink) {
               callFailureCallback(callback, statError);
@@ -83,13 +83,13 @@ var require_sync = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.read = void 0;
-    function read(path8, settings) {
-      const lstat = settings.fs.lstatSync(path8);
+    function read(path9, settings) {
+      const lstat = settings.fs.lstatSync(path9);
       if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
         return lstat;
       }
       try {
-        const stat2 = settings.fs.statSync(path8);
+        const stat2 = settings.fs.statSync(path9);
         if (settings.markSymbolicLink) {
           stat2.isSymbolicLink = () => true;
         }
@@ -160,17 +160,17 @@ var require_out = __commonJS({
     var sync = require_sync();
     var settings_1 = require_settings();
     exports2.Settings = settings_1.default;
-    function stat2(path8, optionsOrSettingsOrCallback, callback) {
+    function stat2(path9, optionsOrSettingsOrCallback, callback) {
       if (typeof optionsOrSettingsOrCallback === "function") {
-        async.read(path8, getSettings(), optionsOrSettingsOrCallback);
+        async.read(path9, getSettings(), optionsOrSettingsOrCallback);
         return;
       }
-      async.read(path8, getSettings(optionsOrSettingsOrCallback), callback);
+      async.read(path9, getSettings(optionsOrSettingsOrCallback), callback);
     }
     exports2.stat = stat2;
-    function statSync2(path8, optionsOrSettings) {
+    function statSync2(path9, optionsOrSettings) {
       const settings = getSettings(optionsOrSettings);
-      return sync.read(path8, settings);
+      return sync.read(path9, settings);
     }
     exports2.statSync = statSync2;
     function getSettings(settingsOrOptions = {}) {
@@ -388,16 +388,16 @@ var require_async2 = __commonJS({
           return;
         }
         const tasks = names.map((name) => {
-          const path8 = common.joinPathSegments(directory, name, settings.pathSegmentSeparator);
+          const path9 = common.joinPathSegments(directory, name, settings.pathSegmentSeparator);
           return (done) => {
-            fsStat.stat(path8, settings.fsStatSettings, (error2, stats) => {
+            fsStat.stat(path9, settings.fsStatSettings, (error2, stats) => {
               if (error2 !== null) {
                 done(error2);
                 return;
               }
               const entry = {
                 name,
-                path: path8,
+                path: path9,
                 dirent: utils.fs.createDirentFromStats(name, stats)
               };
               if (settings.stats) {
@@ -515,7 +515,7 @@ var require_settings2 = __commonJS({
   "../node_modules/.pnpm/@nodelib+fs.scandir@2.1.5/node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var path8 = require("path");
+    var path9 = require("path");
     var fsStat = require_out();
     var fs6 = require_fs3();
     var Settings = class {
@@ -523,7 +523,7 @@ var require_settings2 = __commonJS({
         this._options = _options;
         this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false);
         this.fs = fs6.createFileSystemAdapter(this._options.fs);
-        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path8.sep);
+        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path9.sep);
         this.stats = this._getValue(this._options.stats, false);
         this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
         this.fsStatSettings = new fsStat.Settings({
@@ -550,17 +550,17 @@ var require_out2 = __commonJS({
     var sync = require_sync2();
     var settings_1 = require_settings2();
     exports2.Settings = settings_1.default;
-    function scandir(path8, optionsOrSettingsOrCallback, callback) {
+    function scandir(path9, optionsOrSettingsOrCallback, callback) {
       if (typeof optionsOrSettingsOrCallback === "function") {
-        async.read(path8, getSettings(), optionsOrSettingsOrCallback);
+        async.read(path9, getSettings(), optionsOrSettingsOrCallback);
         return;
       }
-      async.read(path8, getSettings(optionsOrSettingsOrCallback), callback);
+      async.read(path9, getSettings(optionsOrSettingsOrCallback), callback);
     }
     exports2.scandir = scandir;
-    function scandirSync(path8, optionsOrSettings) {
+    function scandirSync(path9, optionsOrSettings) {
       const settings = getSettings(optionsOrSettings);
-      return sync.read(path8, settings);
+      return sync.read(path9, settings);
     }
     exports2.scandirSync = scandirSync;
     function getSettings(settingsOrOptions = {}) {
@@ -1164,7 +1164,7 @@ var require_settings3 = __commonJS({
   "../node_modules/.pnpm/@nodelib+fs.walk@1.2.8/node_modules/@nodelib/fs.walk/out/settings.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var path8 = require("path");
+    var path9 = require("path");
     var fsScandir = require_out2();
     var Settings = class {
       constructor(_options = {}) {
@@ -1174,7 +1174,7 @@ var require_settings3 = __commonJS({
         this.deepFilter = this._getValue(this._options.deepFilter, null);
         this.entryFilter = this._getValue(this._options.entryFilter, null);
         this.errorFilter = this._getValue(this._options.errorFilter, null);
-        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path8.sep);
+        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path9.sep);
         this.fsScandirSettings = new fsScandir.Settings({
           followSymbolicLinks: this._options.followSymbolicLinks,
           fs: this._options.fs,
@@ -1236,7 +1236,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "braintrust",
-      version: "3.27.0",
+      version: "3.28.0",
       description: "SDK for integrating Braintrust",
       repository: {
         type: "git",
@@ -1423,12 +1423,12 @@ var require_package = __commonJS({
         "@types/mustache": "^4.2.5",
         "@types/node": "^20.10.5",
         "@types/pluralize": "^0.0.30",
-        "@types/tar": "^6.1.13",
         "@typescript-eslint/eslint-plugin": "^8.49.0",
         "@typescript-eslint/parser": "^8.49.0",
         ai: "^6.0.0",
         async: "^3.2.5",
         "cross-env": "^7.0.3",
+        eslint: "^9.39.2",
         "eslint-plugin-es-x": "9.7.0",
         "eslint-plugin-n": "^18.2.1",
         "eslint-plugin-node-import": "^1.0.5",
@@ -1472,7 +1472,6 @@ var require_package = __commonJS({
         mustache: "^4.2.0",
         pluralize: "^8.0.0",
         semifies: "^1.0.0",
-        "simple-git": "^3.36.0",
         "source-map": "^0.7.4",
         "termi-link": "^1.0.1",
         unplugin: "^2.3.5",
@@ -1510,7 +1509,7 @@ __export(cli_exports, {
 module.exports = __toCommonJS(cli_exports);
 var esbuild = __toESM(require("esbuild"));
 var dotenv3 = __toESM(require("dotenv"));
-var import_node_fs3 = __toESM(require("node:fs"));
+var import_node_fs4 = __toESM(require("node:fs"));
 var import_node_os = __toESM(require("node:os"));
 var import_node_path5 = __toESM(require("node:path"));
 var import_node_util5 = __toESM(require("node:util"));
@@ -3336,15 +3335,15 @@ function mergeDictsWithPaths({
 function mergeDictsWithPathsHelper({
   mergeInto,
   mergeFrom,
-  path: path8,
+  path: path9,
   mergePaths
 }) {
   Object.entries(mergeFrom).forEach(([k, mergeFromV]) => {
     if (FORBIDDEN_MERGE_KEYS.has(k)) return;
-    const fullPath = path8.concat([k]);
+    const fullPath = path9.concat([k]);
     const fullPathSerialized = JSON.stringify(fullPath);
     const mergeIntoV = recordFind(mergeInto, k);
-    const isSetUnionField = path8.length === 0 && SET_UNION_FIELDS.has(k) && !mergePaths.has(fullPathSerialized);
+    const isSetUnionField = path9.length === 0 && SET_UNION_FIELDS.has(k) && !mergePaths.has(fullPathSerialized);
     if (isSetUnionField && isArray(mergeIntoV) && isArray(mergeFromV)) {
       const seen = /* @__PURE__ */ new Set();
       const combined = [];
@@ -3377,9 +3376,9 @@ function mergeDicts(mergeInto, mergeFrom) {
 function recordFind(m, k) {
   return m[k];
 }
-function getObjValueByPath(row, path8) {
+function getObjValueByPath(row, path9) {
   let curr = row;
-  for (const p of path8) {
+  for (const p of path9) {
     if (!isObjectOrArray(curr)) {
       return null;
     }
@@ -4015,7 +4014,8 @@ var AclObjectType = import_v36.z.union([
     "org_member",
     "project_log",
     "org_project",
-    "org_audit_logs"
+    "org_audit_logs",
+    "project_group"
   ]),
   import_v36.z.null()
 ]);
@@ -4144,7 +4144,8 @@ var AsyncScoringState = import_v36.z.union([
     token: import_v36.z.string(),
     function_ids: import_v36.z.array(import_v36.z.unknown()),
     skip_logging: import_v36.z.union([import_v36.z.boolean(), import_v36.z.null()]).optional(),
-    triggered_functions: import_v36.z.union([import_v36.z.record(TriggeredFunctionState), import_v36.z.null()]).optional()
+    triggered_functions: import_v36.z.union([import_v36.z.record(TriggeredFunctionState), import_v36.z.null()]).optional(),
+    last_triggered_xact_id: import_v36.z.union([import_v36.z.string(), import_v36.z.number(), import_v36.z.null()]).optional()
   }),
   import_v36.z.object({ status: import_v36.z.literal("disabled") }),
   import_v36.z.null(),
@@ -4213,7 +4214,7 @@ var FunctionTypeEnum = import_v36.z.enum([
   "parameters",
   "sandbox"
 ]);
-var NullableSavedFunctionId = import_v36.z.union([
+var FacetPreprocessorId = import_v36.z.union([
   import_v36.z.object({
     type: import_v36.z.literal("function"),
     id: import_v36.z.string(),
@@ -4224,10 +4225,23 @@ var NullableSavedFunctionId = import_v36.z.union([
     name: import_v36.z.string(),
     function_type: FunctionTypeEnum.optional().default("scorer")
   }),
+  import_v36.z.object({ type: import_v36.z.literal("inline"), code: import_v36.z.string().min(1) }),
   import_v36.z.null()
 ]);
+var SavedFunctionId = import_v36.z.union([
+  import_v36.z.object({
+    type: import_v36.z.literal("function"),
+    id: import_v36.z.string(),
+    version: import_v36.z.string().optional()
+  }),
+  import_v36.z.object({
+    type: import_v36.z.literal("global"),
+    name: import_v36.z.string(),
+    function_type: FunctionTypeEnum.optional().default("scorer")
+  })
+]);
 var TopicMapGenerationSettings = import_v36.z.object({
-  algorithm: import_v36.z.enum(["hdbscan", "kmeans"]),
+  algorithm: import_v36.z.enum(["hdbscan", "kmeans", "community"]),
   dimension_reduction: import_v36.z.enum(["umap", "pca", "none"]),
   sample_size: import_v36.z.number().int().gt(0).optional(),
   n_clusters: import_v36.z.number().int().gt(0).optional(),
@@ -4239,6 +4253,7 @@ var TopicMapGenerationSettings = import_v36.z.object({
 var TopicMapData = import_v36.z.object({
   type: import_v36.z.literal("topic_map"),
   source_facet: import_v36.z.string(),
+  source_facet_function: SavedFunctionId.and(import_v36.z.unknown()).optional(),
   embedding_model: import_v36.z.string(),
   bundle_key: import_v36.z.string().optional(),
   report_key: import_v36.z.string().optional(),
@@ -4252,7 +4267,7 @@ var TopicMapData = import_v36.z.object({
 });
 var BatchedFacetData = import_v36.z.object({
   type: import_v36.z.literal("batched_facet"),
-  preprocessor: NullableSavedFunctionId.and(import_v36.z.unknown()).optional(),
+  preprocessor: FacetPreprocessorId.optional(),
   facets: import_v36.z.array(
     import_v36.z.object({
       name: import_v36.z.string(),
@@ -4513,18 +4528,6 @@ var ObjectReferenceNullish = import_v36.z.union([
   }),
   import_v36.z.null()
 ]);
-var SavedFunctionId = import_v36.z.union([
-  import_v36.z.object({
-    type: import_v36.z.literal("function"),
-    id: import_v36.z.string(),
-    version: import_v36.z.string().optional()
-  }),
-  import_v36.z.object({
-    type: import_v36.z.literal("global"),
-    name: import_v36.z.string(),
-    function_type: FunctionTypeEnum.optional().default("scorer")
-  })
-]);
 var DatasetEvent = import_v36.z.object({
   id: import_v36.z.string(),
   _xact_id: import_v36.z.string(),
@@ -4746,7 +4749,7 @@ var ExtendedSavedFunctionId = import_v36.z.union([
 ]);
 var FacetData = import_v36.z.object({
   type: import_v36.z.literal("facet"),
-  preprocessor: NullableSavedFunctionId.and(import_v36.z.unknown()).optional(),
+  preprocessor: FacetPreprocessorId.optional(),
   prompt: import_v36.z.string(),
   model: import_v36.z.string().optional(),
   embedding_model: import_v36.z.string().optional(),
@@ -5251,6 +5254,19 @@ var MessageRole = import_v36.z.enum([
   "model",
   "developer"
 ]);
+var NullableSavedFunctionId = import_v36.z.union([
+  import_v36.z.object({
+    type: import_v36.z.literal("function"),
+    id: import_v36.z.string(),
+    version: import_v36.z.string().optional()
+  }),
+  import_v36.z.object({
+    type: import_v36.z.literal("global"),
+    name: import_v36.z.string(),
+    function_type: FunctionTypeEnum.optional().default("scorer")
+  }),
+  import_v36.z.null()
+]);
 var ObjectReference = import_v36.z.object({
   object_type: import_v36.z.enum([
     "project_logs",
@@ -5272,6 +5288,7 @@ var TraceScope = import_v36.z.object({
 });
 var OnlineScoreConfig = import_v36.z.union([
   import_v36.z.object({
+    status: AutomationStatus.optional(),
     sampling_rate: import_v36.z.number().gte(0).lte(1),
     scorers: import_v36.z.array(SavedFunctionId),
     btql_filter: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
@@ -5352,6 +5369,72 @@ var Project = import_v36.z.object({
   user_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   settings: ProjectSettings.optional()
 });
+var WindowedAutomationConfig = import_v36.z.object({
+  event_type: import_v36.z.literal("windowed"),
+  product_origin: import_v36.z.union([import_v36.z.literal("patterns"), import_v36.z.null()]).optional(),
+  status: AutomationStatus.optional(),
+  threshold: import_v36.z.object({
+    calculation: import_v36.z.object({
+      type: import_v36.z.literal("btql"),
+      btql_query: import_v36.z.string().min(1),
+      output: import_v36.z.object({
+        type: import_v36.z.literal("scalar"),
+        value_column: import_v36.z.string().min(1)
+      })
+    }),
+    policy: import_v36.z.object({
+      condition: import_v36.z.object({
+        type: import_v36.z.literal("threshold"),
+        operator: import_v36.z.enum(["lt", "lte", "gt", "gte", "eq", "neq"]),
+        threshold: import_v36.z.number()
+      }),
+      pending_seconds: import_v36.z.number().int().gte(0).lte(2592e3),
+      no_data_behavior: import_v36.z.enum(["keep_last", "resolve", "alert"]),
+      renotify_interval_seconds: import_v36.z.union([import_v36.z.number(), import_v36.z.null()]).optional(),
+      notify_on_recovery: import_v36.z.boolean().optional().default(true)
+    })
+  }).optional(),
+  window: import_v36.z.object({
+    window_seconds: import_v36.z.number().int().gte(1).lte(2592e3),
+    schedule: import_v36.z.union([
+      import_v36.z.object({
+        type: import_v36.z.literal("interval"),
+        evaluation_interval_seconds: import_v36.z.number().int().gte(1).lte(2592e3)
+      }),
+      import_v36.z.object({
+        type: import_v36.z.literal("cron"),
+        cron_expression: import_v36.z.string().min(1),
+        timezone: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional()
+      })
+    ]),
+    evaluation_delay_seconds: import_v36.z.number().int().gte(0).lte(2592e3)
+  }),
+  loop: import_v36.z.object({
+    prompt: import_v36.z.string().min(1).max(1e4),
+    include_trigger_input: import_v36.z.boolean().optional().default(false),
+    agent_slug: import_v36.z.string().min(1),
+    auto_approve_tools: import_v36.z.array(import_v36.z.string().min(1)).optional().default([]),
+    harness: import_v36.z.enum(["native", "codex", "claude-code"]).optional(),
+    model: import_v36.z.string().min(1).optional(),
+    reasoning_effort: import_v36.z.enum(["none", "minimal", "low", "medium", "high", "xhigh", "max"]).optional()
+  }).optional(),
+  actions: import_v36.z.array(
+    import_v36.z.union([
+      import_v36.z.object({
+        type: import_v36.z.literal("webhook"),
+        url: import_v36.z.string(),
+        formatting_prompt: import_v36.z.string().min(1).max(1e4).optional()
+      }),
+      import_v36.z.object({
+        type: import_v36.z.literal("slack"),
+        workspace_id: import_v36.z.string(),
+        channel: import_v36.z.string(),
+        message_template: import_v36.z.string().optional(),
+        formatting_prompt: import_v36.z.string().min(1).max(1e4).optional()
+      })
+    ])
+  ).max(20).optional().default([])
+});
 var TopicAutomationFacetModel = import_v36.z.union([
   import_v36.z.enum(["brain-facet-latest", "brain-facet-1", "brain-facet-2"]),
   import_v36.z.null()
@@ -5393,7 +5476,8 @@ var TopicDigestAutomationConfig = import_v36.z.object({
     type: import_v36.z.literal("slack"),
     workspace_id: import_v36.z.string(),
     channel: import_v36.z.string(),
-    message_template: import_v36.z.string().optional()
+    message_template: import_v36.z.string().optional(),
+    formatting_prompt: import_v36.z.string().min(1).max(1e4).optional()
   }),
   topic_map_function_ids: import_v36.z.array(import_v36.z.string()).max(10).optional()
 });
@@ -5407,15 +5491,21 @@ var ProjectAutomation = import_v36.z.object({
   config: import_v36.z.union([
     import_v36.z.object({
       event_type: import_v36.z.literal("logs"),
+      status: AutomationStatus.optional(),
       btql_filter: import_v36.z.string(),
       interval_seconds: import_v36.z.number().gte(1).lte(2592e3),
       action: import_v36.z.union([
-        import_v36.z.object({ type: import_v36.z.literal("webhook"), url: import_v36.z.string() }),
+        import_v36.z.object({
+          type: import_v36.z.literal("webhook"),
+          url: import_v36.z.string(),
+          formatting_prompt: import_v36.z.string().min(1).max(1e4).optional()
+        }),
         import_v36.z.object({
           type: import_v36.z.literal("slack"),
           workspace_id: import_v36.z.string(),
           channel: import_v36.z.string(),
-          message_template: import_v36.z.string().optional()
+          message_template: import_v36.z.string().optional(),
+          formatting_prompt: import_v36.z.string().min(1).max(1e4).optional()
         })
       ])
     }),
@@ -5466,21 +5556,38 @@ var ProjectAutomation = import_v36.z.object({
     }),
     import_v36.z.object({
       event_type: import_v36.z.literal("environment_update"),
+      status: AutomationStatus.optional(),
       environment_filter: import_v36.z.array(import_v36.z.string()).optional(),
       action: import_v36.z.union([
-        import_v36.z.object({ type: import_v36.z.literal("webhook"), url: import_v36.z.string() }),
+        import_v36.z.object({
+          type: import_v36.z.literal("webhook"),
+          url: import_v36.z.string(),
+          formatting_prompt: import_v36.z.string().min(1).max(1e4).optional()
+        }),
         import_v36.z.object({
           type: import_v36.z.literal("slack"),
           workspace_id: import_v36.z.string(),
           channel: import_v36.z.string(),
-          message_template: import_v36.z.string().optional()
+          message_template: import_v36.z.string().optional(),
+          formatting_prompt: import_v36.z.string().min(1).max(1e4).optional()
         })
       ])
     }),
+    WindowedAutomationConfig,
     TopicAutomationConfig,
     TopicDigestAutomationConfig
   ])
 });
+var ProjectGroup = import_v36.z.object({
+  id: import_v36.z.string().uuid(),
+  org_id: import_v36.z.string().uuid(),
+  user_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  created: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  name: import_v36.z.string(),
+  description: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  deleted_at: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  member_projects: import_v36.z.array(import_v36.z.string().uuid()).max(1e4)
+});
 var ProjectLogsEvent = import_v36.z.object({
   id: import_v36.z.string(),
   _xact_id: import_v36.z.string(),
@@ -5698,7 +5805,8 @@ var RunEval = import_v36.z.object({
       dataset_environment: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
       _internal_btql: import_v36.z.union([import_v36.z.object({}).partial().passthrough(), import_v36.z.null()]).optional()
     }),
-    import_v36.z.object({ data: import_v36.z.array(import_v36.z.unknown()) })
+    import_v36.z.object({ data: import_v36.z.array(import_v36.z.unknown()) }),
+    import_v36.z.object({ experiment_name: import_v36.z.string() })
   ]),
   name: import_v36.z.string().optional(),
   parameters: import_v36.z.object({}).partial().passthrough().optional(),
@@ -5903,7 +6011,9 @@ var View = import_v36.z.object({
     "for_review_datasets"
   ]),
   name: import_v36.z.string(),
+  description: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   created: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  updated_at: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   view_data: ViewData.optional(),
   options: ViewOptions.optional(),
   user_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
@@ -6428,10 +6538,10 @@ var DiskCache = class {
       return;
     }
     const stats = await Promise.all(
-      paths.map(async (path8) => {
-        const stat2 = await isomorph_default.stat(path8);
+      paths.map(async (path9) => {
+        const stat2 = await isomorph_default.stat(path9);
         return {
-          path: path8,
+          path: path9,
           mtime: stat2.mtime.getTime()
         };
       })
@@ -7028,12 +7138,13 @@ var INSTRUMENTATION_NAMES = {
   OPENROUTER: "openrouter",
   OPENROUTER_AGENT: "openrouter-agent",
   PI_CODING_AGENT: "pi-coding-agent",
-  STRANDS_AGENT_SDK: "strands-agent-sdk"
+  STRANDS_AGENT_SDK: "strands-agent-sdk",
+  VOYAGEAI: "voyageai"
 };
 var INTERNAL_SPAN_INSTRUMENTATION_NAME = /* @__PURE__ */ Symbol.for(
   "braintrust.spanInstrumentationName"
 );
-var SDK_VERSION = true ? "3.27.0" : "0.0.0";
+var SDK_VERSION = true ? "3.28.0" : "0.0.0";
 function withSpanInstrumentationName(args, instrumentationName) {
   return {
     ...args,
@@ -7228,6 +7339,9 @@ function applyMaskingToField(maskingFunction, data, fieldName) {
 var INITIAL_SPAN_WRITE_AS_MERGE = /* @__PURE__ */ Symbol(
   "braintrust.initial-span-write-as-merge"
 );
+var RESUME_SPAN_WITHOUT_INITIAL_WRITE = /* @__PURE__ */ Symbol(
+  "braintrust.resume-span-without-initial-write"
+);
 var INTERNAL_SPAN_CONTEXT = /* @__PURE__ */ Symbol("braintrust.internal-span-context");
 var BRAINTRUST_CURRENT_SPAN_STORE = /* @__PURE__ */ Symbol.for(
   "braintrust.currentSpanStore"
@@ -7793,9 +7907,9 @@ var HTTPConnection = class _HTTPConnection {
       this.headers["Authorization"] = `Bearer ${this.token}`;
     }
   }
-  async get(path8, params = void 0, config3) {
+  async get(path9, params = void 0, config3) {
     const { headers, ...rest } = config3 || {};
-    const url = new URL(_urljoin(this.base_url, path8));
+    const url = new URL(_urljoin(this.base_url, path9));
     url.search = new URLSearchParams(
       params ? Object.entries(params).filter(([_, v]) => v !== void 0).flatMap(
         ([k, v]) => v !== void 0 ? typeof v === "string" ? [[k, v]] : v.map((x) => [k, x]) : []
@@ -7816,7 +7930,7 @@ var HTTPConnection = class _HTTPConnection {
       })
     );
   }
-  async post(path8, params, config3, retries = 0) {
+  async post(path9, params, config3, retries = 0) {
     const { headers, ...rest } = config3 || {};
     const this_fetch = this.fetch;
     const this_base_url = this.base_url;
@@ -7825,7 +7939,7 @@ var HTTPConnection = class _HTTPConnection {
     for (let i = 0; i < tries; i++) {
       try {
         return await checkResponse(
-          await this_fetch(_urljoin(this_base_url, path8), {
+          await this_fetch(_urljoin(this_base_url, path9), {
             method: "POST",
             headers: {
               Accept: "application/json",
@@ -7846,7 +7960,7 @@ var HTTPConnection = class _HTTPConnection {
           throw error2;
         }
         debugLogger.debug(
-          `Retrying API request ${path8} after ${formatHTTPError(error2)}`
+          `Retrying API request ${path9} after ${formatHTTPError(error2)}`
         );
         const sleepTimeMs = HTTP_RETRY_BASE_SLEEP_TIME_S * 1e3 * 2 ** i + Math.random() * HTTP_RETRY_JITTER_MS;
         debugLogger.info(
@@ -10611,7 +10725,7 @@ var ObjectFetcher = class {
     const objectId = await this.id;
     const batchLimit = batchSize ?? DEFAULT_FETCH_BATCH_SIZE;
     const internalLimit = getInternalBtqlLimit(this._internal_btql);
-    const limit = batchSize !== void 0 ? batchSize : internalLimit ?? batchLimit;
+    let remainingLimit = internalLimit;
     const internalBtqlWithoutReservedQueryKeys = Object.fromEntries(
       Object.entries(this._internal_btql ?? {}).filter(
         ([key]) => key !== "cursor" && key !== "limit" && key !== "select" && key !== "from"
@@ -10620,6 +10734,10 @@ var ObjectFetcher = class {
     let cursor = void 0;
     let iterations = 0;
     while (true) {
+      if (remainingLimit !== void 0 && remainingLimit <= 0) {
+        return;
+      }
+      const limit = remainingLimit === void 0 ? batchLimit : Math.min(batchLimit, remainingLimit);
       const resp = await state.apiConn().post(
         `btql`,
         {
@@ -10659,7 +10777,14 @@ var ObjectFetcher = class {
       const respJson = await resp.json();
       const mutate = this.mutateRecord;
       for (const record of respJson.data ?? []) {
-        yield mutate ? mutate(record) : record;
+        if (remainingLimit !== void 0 && remainingLimit <= 0) {
+          return;
+        }
+        const mutatedRecord = mutate ? mutate(record) : record;
+        if (remainingLimit !== void 0) {
+          remainingLimit--;
+        }
+        yield mutatedRecord;
       }
       if (!respJson.cursor) {
         break;
@@ -11179,7 +11304,9 @@ var SpanImpl = class _SpanImpl {
     this._rootSpanId = resolvedIds.rootSpanId;
     this._spanParents = resolvedIds.spanParents;
     this.isMerge = args[INITIAL_SPAN_WRITE_AS_MERGE] === true;
-    this.logInternal({ event, internalData });
+    if (!args[RESUME_SPAN_WITHOUT_INITIAL_WRITE]) {
+      this.logInternal({ event, internalData });
+    }
     this.isMerge = true;
   }
   getParentInfo() {
@@ -13931,8 +14058,8 @@ function validateParametersWithJsonSchema(parameters, schema) {
   const validate = ajv.compile(schema);
   if (!validate(parameters)) {
     const errorMessages = validate.errors?.map((err) => {
-      const path8 = err.instancePath || "root";
-      return `${path8}: ${err.message}`;
+      const path9 = err.instancePath || "root";
+      return `${path9}: ${err.message}`;
     }).join(", ");
     throw Error(`Invalid parameters: ${errorMessages}`);
   }
@@ -13961,6 +14088,9 @@ function rehydrateRemoteParameters(parameters, schema) {
 }
 
 // src/framework.ts
+function BaseExperiment(options = {}) {
+  return { _type: "BaseExperiment", ...options };
+}
 var EvalResultWithSummary = class {
   constructor(summary, results) {
     this.summary = summary;
@@ -14021,6 +14151,26 @@ async function getExperimentParametersRef(parameters) {
     version: resolvedParameters.version
   };
 }
+async function _internalInitEvaluatorExperiment(projectName, evaluator, data, options = {}) {
+  if (options.disabled) return null;
+  const { baseExperiment } = callEvaluatorData(data);
+  const parameters = await getExperimentParametersRef(evaluator.parameters);
+  return initExperiment(evaluator.state, {
+    ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: projectName },
+    experiment: options.experimentName ?? evaluator.experimentName,
+    description: evaluator.description,
+    metadata: evaluator.metadata,
+    tags: evaluator.tags,
+    isPublic: evaluator.isPublic,
+    update: options.update ?? evaluator.update,
+    baseExperiment: evaluator.baseExperimentName ?? baseExperiment,
+    baseExperimentId: evaluator.baseExperimentId,
+    gitMetadataSettings: evaluator.gitMetadataSettings,
+    repoInfo: evaluator.repoInfo,
+    dataset: Dataset2.isDataset(data) ? data : void 0,
+    parameters
+  });
+}
 function callEvaluatorData(data) {
   const dataResult = typeof data === "function" ? data() : data;
   let baseExperiment = void 0;
@@ -14038,6 +14188,48 @@ function isAsyncIterable2(value) {
 function isIterable(value) {
   return typeof value === "object" && value !== null && Symbol.iterator in value && typeof value[Symbol.iterator] === "function";
 }
+async function _internalResolveEvaluatorData(evaluator, experiment) {
+  if (typeof evaluator.data === "string") {
+    throw new Error("Unimplemented: string data paths");
+  }
+  let dataResult = typeof evaluator.data === "function" ? evaluator.data() : evaluator.data;
+  if ("_type" in dataResult) {
+    if (dataResult._type !== "BaseExperiment") {
+      throw new Error("Invalid _type");
+    }
+    if (!experiment) {
+      throw new Error(
+        "Cannot use BaseExperiment() without connecting to Braintrust (you most likely set --no-send-logs)"
+      );
+    }
+    let name = dataResult.name;
+    if (isEmpty2(name)) {
+      const baseExperiment = await experiment.fetchBaseExperiment();
+      if (!baseExperiment) {
+        throw new Error("BaseExperiment() failed to fetch base experiment");
+      }
+      name = baseExperiment.name;
+    }
+    dataResult = initExperiment(evaluator.state, {
+      ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: evaluator.projectName },
+      experiment: name,
+      open: true
+    }).asDataset();
+  }
+  const resolvedDataResult = dataResult instanceof Promise ? await dataResult : dataResult;
+  if (isAsyncIterable2(resolvedDataResult)) {
+    return resolvedDataResult;
+  }
+  if (Array.isArray(resolvedDataResult) || isIterable(resolvedDataResult)) {
+    const iterable = resolvedDataResult;
+    return (async function* () {
+      for (const datum of iterable) yield datum;
+    })();
+  }
+  throw new Error(
+    "Evaluator data must be an array, iterable, or async iterable"
+  );
+}
 globalThis._evals = {
   functions: [],
   prompts: [],
@@ -14084,25 +14276,13 @@ async function Eval(name, evaluator, reporterOrOpts) {
   }
   const resolvedReporter = options.reporter || defaultReporter;
   try {
-    const { data, baseExperiment: defaultBaseExperiment } = callEvaluatorData(
-      evaluator.data
-    );
-    const parameters = await getExperimentParametersRef(evaluator.parameters);
-    const experiment = options.parent || options.noSendLogs ? null : initExperiment(evaluator.state, {
-      ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: name },
-      experiment: evaluator.experimentName,
-      description: evaluator.description,
-      metadata: evaluator.metadata,
-      tags: evaluator.tags,
-      isPublic: evaluator.isPublic,
-      update: evaluator.update,
-      baseExperiment: evaluator.baseExperimentName ?? defaultBaseExperiment,
-      baseExperimentId: evaluator.baseExperimentId,
-      gitMetadataSettings: evaluator.gitMetadataSettings,
-      repoInfo: evaluator.repoInfo,
-      dataset: Dataset2.isDataset(data) ? data : void 0,
-      parameters
-    });
+    const { data } = callEvaluatorData(evaluator.data);
+    const experiment = await _internalInitEvaluatorExperiment(
+      name,
+      evaluator,
+      data,
+      { disabled: Boolean(options.parent || options.noSendLogs) }
+    );
     if (experiment && typeof process !== "undefined" && globalThis.BRAINTRUST_CONTEXT_MANAGER !== void 0) {
       await experiment._waitForId();
     }
@@ -14184,21 +14364,21 @@ function parseFilters(filters) {
     if (equalsIdx === -1) {
       throw new Error(`Invalid filter ${f}`);
     }
-    const [path8, value] = [f.slice(0, equalsIdx), f.slice(equalsIdx + 1)];
+    const [path9, value] = [f.slice(0, equalsIdx), f.slice(equalsIdx + 1)];
     let deserializedValue = deserializePlainStringAsJSON2(value).value;
     if (typeof deserializedValue !== "string") {
       deserializedValue = value;
     }
     result.push({
-      path: path8.split("."),
+      path: path9.split("."),
       pattern: new RegExp(deserializedValue)
     });
   }
   return result;
 }
 function evaluateFilter(object, filter2) {
-  const { path: path8, pattern } = filter2;
-  const key = path8.reduce(
+  const { path: path9, pattern } = filter2;
+  const key = path9.reduce(
     (acc, p) => typeof acc === "object" && acc !== null ? (
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       acc[p]
@@ -14216,19 +14396,74 @@ function scorerName(scorer, scorer_idx) {
 function classifierName(classifier, classifier_idx) {
   return classifier.name || `classifier_${classifier_idx}`;
 }
+async function _internalRunEvaluatorTask(task, datum, trialIndex, parameters, span, reportProgress = () => void 0) {
+  const metadata = {
+    ..."metadata" in datum ? datum.metadata : {}
+  };
+  const hooks = {
+    meta(value) {
+      Object.assign(metadata, value);
+    },
+    metadata,
+    expected: "expected" in datum ? datum.expected : void 0,
+    span,
+    parameters,
+    reportProgress,
+    trialIndex,
+    tags: [...datum.tags ?? []]
+  };
+  const output = await task(datum.input, hooks);
+  span.log({ output });
+  return {
+    output,
+    metadata: hooks.metadata,
+    tags: hooks.tags ?? []
+  };
+}
 function buildSpanMetadata(results) {
-  return results.length === 1 ? results[0].metadata : results.reduce(
-    (prev, s) => mergeDicts(prev, { [s.name]: s.metadata }),
-    {}
+  return results.length === 1 ? results[0].metadata : Object.fromEntries(
+    results.map((result) => [result.name, result.metadata])
   );
 }
 function buildSpanScores(results) {
-  const scoresRecord = results.reduce(
-    (prev, s) => mergeDicts(prev, { [s.name]: s.score }),
-    {}
+  const scoresRecord = Object.fromEntries(
+    results.map((result) => [result.name, result.score])
   );
   return { resultMetadata: buildSpanMetadata(results), scoresRecord };
 }
+function _internalPrepareEvaluatorScore(scoreValue, name) {
+  if (scoreValue === null) return { results: null };
+  if (Array.isArray(scoreValue)) {
+    for (const score of scoreValue) {
+      if (!(typeof score === "object" && !isEmpty2(score))) {
+        throw new Error(
+          `When returning an array of scores, each score must be a non-empty object. Got: ${JSON.stringify(score)}`
+        );
+      }
+    }
+  }
+  let results;
+  if (Array.isArray(scoreValue)) {
+    results = scoreValue;
+  } else if (typeof scoreValue === "object" && !isEmpty2(scoreValue)) {
+    results = [scoreValue];
+  } else {
+    results = [{ name, score: scoreValue }];
+  }
+  const { resultMetadata, scoresRecord } = buildSpanScores(results);
+  const fields = (score) => {
+    const { metadata: _metadata, name: _name, ...rest } = score;
+    return rest;
+  };
+  return {
+    results,
+    output: results.length === 1 ? fields(results[0]) : Object.fromEntries(
+      results.map((score) => [score.name ?? name, fields(score)])
+    ),
+    metadata: resultMetadata,
+    scores: scoresRecord
+  };
+}
 async function runInScorerSpan(rootSpan, spanName, spanType, propagatedEvent, eventInput, fn) {
   try {
     const value = await rootSpan.traced(fn, {
@@ -14273,6 +14508,27 @@ function toClassificationItem(c) {
     ...c.metadata !== void 0 ? { metadata: c.metadata } : {}
   };
 }
+function _internalPrepareEvaluatorClassification(value, name) {
+  if (value === null) return { results: null };
+  const results = (Array.isArray(value) ? value : [value]).map(
+    (result) => validateClassificationResult(result, name)
+  );
+  const classifications = /* @__PURE__ */ Object.create(null);
+  for (const result of results) {
+    (classifications[result.name] ??= []).push(toClassificationItem(result));
+  }
+  return {
+    results,
+    output: results.length === 1 ? toClassificationItem(results[0]) : Object.fromEntries(
+      results.map((result) => [
+        result.name,
+        toClassificationItem(result)
+      ])
+    ),
+    metadata: buildSpanMetadata(results),
+    classifications
+  };
+}
 function logScoringFailures(kind, failures, metadata, rootSpan, state) {
   if (!failures.length) return [];
   const errorMap = Object.fromEntries(
@@ -14311,54 +14567,14 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     (evaluator.state ?? _internalGetGlobalState())?.spanCache?.start();
   }
   try {
-    if (typeof evaluator.data === "string") {
-      throw new Error("Unimplemented: string data paths");
-    }
-    let dataResult = typeof evaluator.data === "function" ? evaluator.data() : evaluator.data;
     parameters = await validateParameters(
       parameters ?? {},
       evaluator.parameters
     );
-    if ("_type" in dataResult) {
-      if (dataResult._type !== "BaseExperiment") {
-        throw new Error("Invalid _type");
-      }
-      if (!experiment) {
-        throw new Error(
-          "Cannot use BaseExperiment() without connecting to Braintrust (you most likely set --no-send-logs)"
-        );
-      }
-      let name = dataResult.name;
-      if (isEmpty2(name)) {
-        const baseExperiment = await experiment.fetchBaseExperiment();
-        if (!baseExperiment) {
-          throw new Error("BaseExperiment() failed to fetch base experiment");
-        }
-        name = baseExperiment.name;
-      }
-      dataResult = initExperiment(evaluator.state, {
-        ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: evaluator.projectName },
-        experiment: name,
-        open: true
-      }).asDataset();
-    }
-    const resolvedDataResult = dataResult instanceof Promise ? await dataResult : dataResult;
-    const dataIterable = (() => {
-      if (isAsyncIterable2(resolvedDataResult)) {
-        return resolvedDataResult;
-      }
-      if (Array.isArray(resolvedDataResult) || isIterable(resolvedDataResult)) {
-        const iterable = resolvedDataResult;
-        return (async function* () {
-          for (const datum of iterable) {
-            yield datum;
-          }
-        })();
-      }
-      throw new Error(
-        "Evaluator data must be an array, iterable, or async iterable"
-      );
-    })();
+    const dataIterable = await _internalResolveEvaluatorData(
+      evaluator,
+      experiment
+    );
     progressReporter.start(evaluator.evalName, 0);
     const experimentIdPromise = experiment ? (async () => {
       try {
@@ -14427,57 +14643,45 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             ensureSpansFlushed,
             state
           }) : void 0;
-          let metadata = {
-            ..."metadata" in datum ? datum.metadata : {}
-          };
+          let metadata = {};
           const expected = "expected" in datum ? datum.expected : void 0;
           let output = void 0;
           let error2 = void 0;
-          let tags = [...datum.tags ?? []];
-          const scores = {};
-          const classifications = {};
+          let tags = [];
+          const scores = /* @__PURE__ */ Object.create(null);
+          const classifications = /* @__PURE__ */ Object.create(null);
           const scorerNames = (evaluator.scores ?? []).map(scorerName);
           const classifierNames = (evaluator.classifiers ?? []).map(
             classifierName
           );
           let unhandledScores = scorerNames;
           try {
-            const meta = (o) => metadata = { ...metadata, ...o };
-            await rootSpan.traced(
-              async (span) => {
-                const hooksForTask = {
-                  meta,
-                  metadata,
-                  expected,
-                  span,
-                  parameters: parameters ?? {},
-                  reportProgress: (event) => {
-                    stream?.({
-                      ...event,
-                      id: rootSpan.id,
-                      origin: baseEvent.event?.origin,
-                      name: evaluator.evalName,
-                      object_type: "task"
-                    });
-                  },
-                  trialIndex,
-                  tags
-                };
-                const outputResult = evaluator.task(datum.input, hooksForTask);
-                if (outputResult instanceof Promise) {
-                  output = await outputResult;
-                } else {
-                  output = outputResult;
+            const taskResult = await rootSpan.traced(
+              (span) => _internalRunEvaluatorTask(
+                evaluator.task,
+                datum,
+                trialIndex,
+                parameters ?? {},
+                span,
+                (event) => {
+                  stream?.({
+                    ...event,
+                    id: rootSpan.id,
+                    origin: baseEvent.event?.origin,
+                    name: evaluator.evalName,
+                    object_type: "task"
+                  });
                 }
-                tags = hooksForTask.tags ?? [];
-                span.log({ output });
-              },
+              ),
               {
                 name: "task",
                 spanAttributes: { type: "task" /* TASK */ },
                 event: { input: datum.input }
               }
             );
+            output = taskResult.output;
+            metadata = taskResult.metadata;
+            tags = taskResult.tags;
             if (tags.length) {
               rootSpan.log({ output, metadata, expected, tags });
             } else {
@@ -14487,20 +14691,18 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
               await rootSpan.flush();
             }
             const scoringArgs = {
+              id: datum.id,
               input: datum.input,
               expected: "expected" in datum ? datum.expected : void 0,
               metadata,
               output,
+              tags,
               trace
             };
             const { trace: _trace, ...scoringArgsForLogging } = scoringArgs;
             const propagatedEvent = makeScorerPropagatedEvent(
               await rootSpan.export()
             );
-            const getOtherFields = (s) => {
-              const { metadata: _metadata, name: _name, ...rest } = s;
-              return rest;
-            };
             const [scoreResults, classificationResults] = await Promise.all([
               Promise.all(
                 (evaluator.scores ?? []).map(
@@ -14514,35 +14716,17 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                       const scoreValue = await Promise.resolve(
                         score(scoringArgs)
                       );
-                      if (scoreValue === null) return null;
-                      if (Array.isArray(scoreValue)) {
-                        for (const s of scoreValue) {
-                          if (!(typeof s === "object" && !isEmpty2(s))) {
-                            throw new Error(
-                              `When returning an array of scores, each score must be a non-empty object. Got: ${JSON.stringify(s)}`
-                            );
-                          }
-                        }
-                      }
-                      const results = Array.isArray(scoreValue) ? scoreValue : typeof scoreValue === "object" && !isEmpty2(scoreValue) ? [scoreValue] : [
-                        {
-                          name: scorerNames[score_idx],
-                          score: scoreValue
-                        }
-                      ];
-                      const { resultMetadata, scoresRecord } = buildSpanScores(results);
-                      const resultOutput = results.length === 1 ? getOtherFields(results[0]) : results.reduce(
-                        (prev, s) => mergeDicts(prev, {
-                          [s.name]: getOtherFields(s)
-                        }),
-                        {}
+                      const prepared = _internalPrepareEvaluatorScore(
+                        scoreValue,
+                        scorerNames[score_idx]
                       );
+                      if (prepared.results === null) return null;
                       span.log({
-                        output: resultOutput,
-                        metadata: resultMetadata,
-                        scores: scoresRecord
+                        output: prepared.output,
+                        metadata: prepared.metadata,
+                        scores: prepared.scores
                       });
-                      return results;
+                      return prepared.results;
                     }
                   )
                 )
@@ -14559,24 +14743,16 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                       const classifierValue = await Promise.resolve(
                         classifier(scoringArgs)
                       );
-                      if (classifierValue === null) return null;
-                      const rawResults = (Array.isArray(classifierValue) ? classifierValue : [classifierValue]).map(
-                        (result) => validateClassificationResult(
-                          result,
-                          classifierNames[idx]
-                        )
-                      );
-                      const resultOutput = rawResults.length === 1 ? toClassificationItem(rawResults[0]) : rawResults.reduce(
-                        (prev, r) => mergeDicts(prev, {
-                          [r.name]: toClassificationItem(r)
-                        }),
-                        {}
+                      const prepared = _internalPrepareEvaluatorClassification(
+                        classifierValue,
+                        classifierNames[idx]
                       );
+                      if (prepared.results === null) return null;
                       span.log({
-                        output: resultOutput,
-                        metadata: buildSpanMetadata(rawResults)
+                        output: prepared.output,
+                        metadata: prepared.metadata
                       });
-                      return rawResults;
+                      return prepared.results;
                     }
                   )
                 )
@@ -14806,7 +14982,7 @@ function accumulateScores(accumulator, scores) {
   }
 }
 function ensureScoreAccumulator(results) {
-  const accumulator = {};
+  const accumulator = /* @__PURE__ */ Object.create(null);
   for (const result of results) {
     accumulateScores(accumulator, result.scores);
   }
@@ -15117,7 +15293,7 @@ var fancyReporter = {
 
 // src/node/config.ts
 var import_node_async_hooks = require("node:async_hooks");
-var path = __toESM(require("node:path"));
+var path2 = __toESM(require("node:path"));
 var fs = __toESM(require("node:fs/promises"));
 var os = __toESM(require("node:os"));
 var fsSync = __toESM(require("node:fs"));
@@ -15126,34 +15302,93 @@ var import_node_util3 = require("node:util");
 var zlib = __toESM(require("node:zlib"));
 var dotenv = __toESM(require("dotenv"));
 
-// src/gitutil.ts
-var import_simple_git = require("simple-git");
-var COMMON_BASE_BRANCHES = ["main", "master", "develop"];
-async function currentRepo() {
-  try {
-    const git = (0, import_simple_git.simpleGit)();
-    if (await git.checkIsRepo()) {
-      return git;
-    } else {
-      return null;
+// src/git-command.ts
+var import_node_child_process = require("node:child_process");
+var import_node_fs = require("node:fs");
+var import_promises = require("node:fs/promises");
+var path = __toESM(require("node:path"));
+var GIT_EXECUTABLE_NAMES = process.platform === "win32" ? ["git.exe", "git"] : ["git"];
+var GIT_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
+var gitExecutablePromise;
+function executableSearchPath() {
+  return Object.entries(process.env).find(
+    ([name]) => name.toUpperCase() === "PATH"
+  )?.[1];
+}
+async function findGitExecutable(searchPath = executableSearchPath()) {
+  if (!searchPath) {
+    return void 0;
+  }
+  for (const rawSearchDir of searchPath.split(path.delimiter)) {
+    const searchDir = rawSearchDir.trim().replace(/^"(.*)"$/, "$1");
+    if (!path.isAbsolute(searchDir)) {
+      continue;
     }
-  } catch {
-    return null;
+    for (const executableName of GIT_EXECUTABLE_NAMES) {
+      const candidate = path.join(searchDir, executableName);
+      try {
+        await (0, import_promises.access)(
+          candidate,
+          process.platform === "win32" ? import_node_fs.constants.F_OK : import_node_fs.constants.X_OK
+        );
+        return candidate;
+      } catch {
+      }
+    }
+  }
+  return void 0;
+}
+async function resolveGitExecutable() {
+  gitExecutablePromise ??= findGitExecutable();
+  return await gitExecutablePromise;
+}
+async function runGitCommand(args, options = {}) {
+  const executable = await resolveGitExecutable();
+  if (!executable) {
+    throw new Error("Could not find a git executable on PATH");
   }
+  return await new Promise((resolve2, reject2) => {
+    (0, import_node_child_process.execFile)(
+      executable,
+      args,
+      {
+        cwd: options.cwd,
+        encoding: "utf8",
+        maxBuffer: GIT_MAX_BUFFER_BYTES
+      },
+      (error2, stdout) => {
+        if (error2) {
+          reject2(error2);
+        } else {
+          resolve2(stdout);
+        }
+      }
+    );
+  });
 }
+
+// src/gitutil.ts
+var COMMON_BASE_BRANCHES = ["main", "master", "develop"];
 var _baseBranch = null;
 async function getBaseBranch(remote = void 0) {
   if (_baseBranch === null) {
-    const git = await currentRepo();
-    if (git === null) {
+    const repoPath = await currentRepoPath();
+    if (!repoPath) {
       throw new Error("Not in a git repo");
     }
-    const remoteName = remote ?? (await git.getRemotes())[0]?.name;
+    const runGit = async (args) => await runGitCommand(args, { cwd: repoPath });
+    const remoteName = remote ?? (await runGit(["remote"])).trim().split(/\r?\n/)[0];
     if (!remoteName) {
       throw new Error("No remote found");
     }
     let branch = null;
-    const repoBranches = new Set((await git.branchLocal()).all);
+    const repoBranches = new Set(
+      (await runGit([
+        "for-each-ref",
+        "--format=%(refname:short)",
+        "refs/heads/"
+      ])).trim().split(/\r?\n/)
+    );
     const matchingBaseBranches = COMMON_BASE_BRANCHES.filter(
       (b) => repoBranches.has(b)
     );
@@ -15161,7 +15396,7 @@ async function getBaseBranch(remote = void 0) {
       branch = matchingBaseBranches[0];
     } else {
       try {
-        const remoteInfo = await git.remote(["show", remoteName]);
+        const remoteInfo = await runGit(["remote", "show", remoteName]);
         if (!remoteInfo) {
           throw new Error(`Could not find remote ${remoteName}`);
         }
@@ -15179,27 +15414,28 @@ async function getBaseBranch(remote = void 0) {
   return _baseBranch;
 }
 async function getBaseBranchAncestor(remote = void 0) {
-  const git = await currentRepo();
-  if (git === null) {
+  const repoPath = await currentRepoPath();
+  if (!repoPath) {
     throw new Error("Not in a git repo");
   }
   const { remote: remoteName, branch: baseBranch } = await getBaseBranch(remote);
-  const isDirty = (await git.diffSummary()).files.length > 0;
+  const isDirty = (await runGitCommand(["diff", "--name-only"], {
+    cwd: repoPath
+  })).trim().length > 0;
   const head = isDirty ? "HEAD" : "HEAD^";
   try {
-    const ancestor = await git.raw([
-      "merge-base",
-      head,
-      `${remoteName}/${baseBranch}`
-    ]);
+    const ancestor = await runGitCommand(
+      ["merge-base", head, `${remoteName}/${baseBranch}`],
+      { cwd: repoPath }
+    );
     return ancestor.trim();
   } catch {
     return void 0;
   }
 }
 async function getPastNAncestors(n = 1e3, remote = void 0) {
-  const git = await currentRepo();
-  if (git === null) {
+  const repoPath = await currentRepoPath();
+  if (!repoPath) {
     return [];
   }
   let ancestor = void 0;
@@ -15214,8 +15450,10 @@ async function getPastNAncestors(n = 1e3, remote = void 0) {
   if (!ancestor) {
     return [];
   }
-  const commits = await git.log({ from: ancestor, to: "HEAD", maxCount: n });
-  return commits.all.slice(0, n).map((c) => c.hash);
+  const commits = (await runGitCommand(["rev-list", `--max-count=${n}`, `${ancestor}..HEAD`], {
+    cwd: repoPath
+  })).trim();
+  return commits ? commits.split(/\r?\n/).slice(0, n) : [];
 }
 async function attempt(fn) {
   try {
@@ -15246,9 +15484,14 @@ async function getRepoInfo(settings) {
   });
   return sanitized;
 }
+async function currentRepoPath() {
+  return await attempt(
+    async () => (await runGitCommand(["rev-parse", "--show-toplevel"])).trim()
+  );
+}
 async function repoInfo() {
-  const git = await currentRepo();
-  if (git === null) {
+  const repoPath = await currentRepoPath();
+  if (!repoPath) {
     return void 0;
   }
   let commit = void 0;
@@ -15259,29 +15502,32 @@ async function repoInfo() {
   let tag = void 0;
   let branch = void 0;
   let git_diff = void 0;
-  const dirty = (await git.diffSummary()).files.length > 0;
-  commit = await attempt(async () => await git.revparse(["HEAD"]));
+  const runGit = async (args) => await runGitCommand(args, { cwd: repoPath });
+  const dirty = (await runGit(["diff", "--name-only"])).trim().length > 0;
+  commit = await attempt(
+    async () => (await runGit(["rev-parse", "HEAD"])).trim()
+  );
   commit_message = await attempt(
-    async () => (await git.raw(["log", "-1", "--pretty=%B"])).trim()
+    async () => (await runGit(["log", "-1", "--pretty=%B"])).trim()
   );
   commit_time = await attempt(
-    async () => (await git.raw(["log", "-1", "--pretty=%cI"])).trim()
+    async () => (await runGit(["log", "-1", "--pretty=%cI"])).trim()
   );
   author_name = await attempt(
-    async () => (await git.raw(["log", "-1", "--pretty=%aN"])).trim()
+    async () => (await runGit(["log", "-1", "--pretty=%aN"])).trim()
   );
   author_email = await attempt(
-    async () => (await git.raw(["log", "-1", "--pretty=%aE"])).trim()
+    async () => (await runGit(["log", "-1", "--pretty=%aE"])).trim()
   );
   tag = await attempt(
-    async () => (await git.raw(["describe", "--tags", "--exact-match", "--always"])).trim()
+    async () => (await runGit(["describe", "--tags", "--exact-match", "--always"])).trim()
   );
   branch = await attempt(
-    async () => (await git.raw(["rev-parse", "--abbrev-ref", "HEAD"])).trim()
+    async () => (await runGit(["rev-parse", "--abbrev-ref", "HEAD"])).trim()
   );
   if (dirty) {
     git_diff = await attempt(
-      async () => truncateToByteLimit(await git.raw(["--no-ext-diff", "diff", "HEAD"]))
+      async () => truncateToByteLimit(await runGit(["diff", "--no-ext-diff", "HEAD"]))
     );
   }
   return {
@@ -16747,6 +16993,22 @@ function processInputAttachments(input) {
         };
       }
     }
+    const voyageBase64Key = node.type === "image_base64" ? Object.hasOwn(node, "imageBase64") ? "imageBase64" : "image_base64" : node.type === "video_base64" ? Object.hasOwn(node, "videoBase64") ? "videoBase64" : "video_base64" : void 0;
+    const voyageBase64Value = voyageBase64Key ? node[voyageBase64Key] : void 0;
+    if (voyageBase64Key && typeof voyageBase64Value === "string" && voyageBase64Value.startsWith("data:")) {
+      const mediaType = inferMediaTypeFromDataUrl(
+        voyageBase64Value,
+        node.type === "video_base64" ? "video/mp4" : "image/png"
+      );
+      const filename = `${node.type === "video_base64" ? "video" : "image"}.${getExtensionFromMediaType(mediaType)}`;
+      const attachment = toAttachment(voyageBase64Value, mediaType, filename);
+      if (attachment) {
+        return {
+          ...node,
+          [voyageBase64Key]: attachment
+        };
+      }
+    }
     if (node.type === "file" && node.file && typeof node.file === "object" && typeof node.file.file_data === "string" && node.file.file_data.startsWith("data:")) {
       const mediaType = inferMediaTypeFromDataUrl(
         node.file.file_data,
@@ -18094,12 +18356,30 @@ function logInstrumentationError(context2, error2) {
 
 // src/wrappers/anthropic-tokens-util.ts
 function finalizeAnthropicTokens(metrics) {
-  const prompt_tokens = (metrics.prompt_tokens || 0) + (metrics.prompt_cached_tokens || 0) + (metrics.prompt_cache_creation_tokens || 0);
-  return {
+  const hasSplitCacheCreationTokens = metrics.prompt_cache_creation_5m_tokens !== void 0 || metrics.prompt_cache_creation_1h_tokens !== void 0;
+  const splitCacheCreationTokens = (metrics.prompt_cache_creation_5m_tokens || 0) + (metrics.prompt_cache_creation_1h_tokens || 0);
+  const aggregateCacheCreationTokens = metrics.prompt_cache_creation_tokens || 0;
+  const effectiveCacheCreationTokens = Math.max(
+    aggregateCacheCreationTokens,
+    splitCacheCreationTokens
+  );
+  const prompt_tokens = (metrics.prompt_tokens || 0) + (metrics.prompt_cached_tokens || 0) + effectiveCacheCreationTokens;
+  const finalized = {
     ...metrics,
     prompt_tokens,
     tokens: prompt_tokens + (metrics.completion_tokens || 0)
   };
+  if (hasSplitCacheCreationTokens && splitCacheCreationTokens >= aggregateCacheCreationTokens) {
+    delete finalized.prompt_cache_creation_tokens;
+  }
+  return finalized;
+}
+function toNumericMetrics(metrics) {
+  return Object.fromEntries(
+    Object.entries(metrics).filter(
+      (entry) => entry[1] !== void 0
+    )
+  );
 }
 function extractAnthropicCacheTokens(cacheReadTokens = 0, cacheCreationTokens = 0) {
   const cacheTokens = {};
@@ -18692,6 +18972,18 @@ function parseMetricsFromUsage2(usage) {
   saveIfExistsTo("output_tokens", "completion_tokens");
   saveIfExistsTo("cache_read_input_tokens", "prompt_cached_tokens");
   saveIfExistsTo("cache_creation_input_tokens", "prompt_cache_creation_tokens");
+  if (isObject(usage.cache_creation)) {
+    const cacheCreation = usage.cache_creation;
+    for (const [source, target] of [
+      ["ephemeral_5m_input_tokens", "prompt_cache_creation_5m_tokens"],
+      ["ephemeral_1h_input_tokens", "prompt_cache_creation_1h_tokens"]
+    ]) {
+      const value = cacheCreation[source];
+      if (typeof value === "number") {
+        metrics[target] = value;
+      }
+    }
+  }
   if (isObject(usage.server_tool_use)) {
     for (const [name, value] of Object.entries(usage.server_tool_use)) {
       if (typeof value === "number") {
@@ -21283,7 +21575,7 @@ function resolveDenyOutputPaths(event, defaultDenyOutputPaths) {
     return defaultDenyOutputPaths;
   }
   const runtimeDenyOutputPaths = firstArgument2[RUNTIME_DENY_OUTPUT_PATHS];
-  if (Array.isArray(runtimeDenyOutputPaths) && runtimeDenyOutputPaths.every((path8) => typeof path8 === "string")) {
+  if (Array.isArray(runtimeDenyOutputPaths) && runtimeDenyOutputPaths.every((path9) => typeof path9 === "string")) {
     return runtimeDenyOutputPaths;
   }
   return defaultDenyOutputPaths;
@@ -23045,11 +23337,11 @@ function processAISDKOutput(output, denyOutputPaths) {
   if (!output) return output;
   const merged = extractSerializableOutputFields(output);
   const deleteOutputPaths = denyOutputPaths.filter(
-    (path8) => path8.toLowerCase().endsWith("headers")
+    (path9) => path9.toLowerCase().endsWith("headers")
   );
   const sanitized = omit(merged, denyOutputPaths, deleteOutputPaths);
-  for (const path8 of TRANSPORT_PAYLOAD_ROOT_PATHS) {
-    const stack = [{ obj: sanitized, keys: parsePath(path8) }];
+  for (const path9 of TRANSPORT_PAYLOAD_ROOT_PATHS) {
+    const stack = [{ obj: sanitized, keys: parsePath(path9) }];
     while (stack.length > 0) {
       const entry = stack.pop();
       if (!entry || entry.keys.length === 0) {
@@ -23488,11 +23780,11 @@ function firstNumber2(...values) {
 function deepCopy(obj) {
   return JSON.parse(JSON.stringify(obj));
 }
-function parsePath(path8) {
+function parsePath(path9) {
   const keys = [];
   let current = "";
-  for (let i = 0; i < path8.length; i++) {
-    const char = path8[i];
+  for (let i = 0; i < path9.length; i++) {
+    const char = path9[i];
     if (char === ".") {
       if (current) {
         keys.push(current);
@@ -23505,8 +23797,8 @@ function parsePath(path8) {
       }
       let bracketContent = "";
       i++;
-      while (i < path8.length && path8[i] !== "]") {
-        bracketContent += path8[i];
+      while (i < path9.length && path9[i] !== "]") {
+        bracketContent += path9[i];
         i++;
       }
       if (bracketContent === "") {
@@ -23561,9 +23853,9 @@ function omitAtPath(obj, keys, deleteLeaf = false) {
 function omit(obj, paths, deletePaths = []) {
   const result = deepCopy(obj);
   const deletePathSet = new Set(deletePaths);
-  for (const path8 of paths) {
-    const keys = parsePath(path8);
-    omitAtPath(result, keys, deletePathSet.has(path8));
+  for (const path9 of paths) {
+    const keys = parsePath(path9);
+    omitAtPath(result, keys, deletePathSet.has(path9));
   }
   return result;
 }
@@ -23990,37 +24282,97 @@ function seedTaskToolUseIdMapping(taskIdToToolUseId, message) {
     taskIdToToolUseId.set(message.task_id, message.tool_use_id);
   }
 }
-function extractUsageFromMessage(message) {
-  const metrics = {};
-  let usage;
-  if (message.type === "assistant") {
-    usage = message.message?.usage;
-  } else if (message.type === "result") {
-    usage = message.usage;
-  }
+function tokenCount(value) {
+  return typeof value === "number" && Number.isFinite(value) && Number.isInteger(value) && value >= 0 ? value : void 0;
+}
+function copyUsage(usage) {
   if (!usage || typeof usage !== "object") {
-    return metrics;
+    return void 0;
+  }
+  const copy = {};
+  for (const key of [
+    "input_tokens",
+    "output_tokens",
+    "cache_read_input_tokens",
+    "cache_creation_input_tokens"
+  ]) {
+    const value = tokenCount(Reflect.get(usage, key));
+    if (value !== void 0) {
+      copy[key] = value;
+    }
+  }
+  const cacheCreation = Reflect.get(usage, "cache_creation");
+  if (cacheCreation && typeof cacheCreation === "object") {
+    const cacheCreationCopy = {};
+    for (const key of [
+      "ephemeral_5m_input_tokens",
+      "ephemeral_1h_input_tokens"
+    ]) {
+      const value = tokenCount(Reflect.get(cacheCreation, key));
+      if (value !== void 0) {
+        cacheCreationCopy[key] = value;
+      }
+    }
+    if (Object.keys(cacheCreationCopy).length > 0) {
+      copy.cache_creation = cacheCreationCopy;
+    }
+  }
+  return Object.keys(copy).length > 0 ? copy : void 0;
+}
+function mergeUsage(base, override) {
+  if (!base || !override) {
+    return override ?? base;
+  }
+  const cacheCreation = base.cache_creation || override.cache_creation ? { ...base.cache_creation, ...override.cache_creation } : void 0;
+  return {
+    ...base,
+    ...override,
+    ...cacheCreation && { cache_creation: cacheCreation }
+  };
+}
+function extractUsage(usage, includeOutput) {
+  const metrics = {};
+  if (!usage) {
+    return {};
   }
   const inputTokens = getNumberProperty(usage, "input_tokens");
   if (inputTokens !== void 0) {
     metrics.prompt_tokens = inputTokens;
   }
-  const outputTokens = getNumberProperty(usage, "output_tokens");
-  if (outputTokens !== void 0) {
-    metrics.completion_tokens = outputTokens;
+  if (includeOutput) {
+    const outputTokens = getNumberProperty(usage, "output_tokens");
+    if (outputTokens !== void 0) {
+      metrics.completion_tokens = outputTokens;
+    }
   }
   const cacheReadTokens = getNumberProperty(usage, "cache_read_input_tokens") || 0;
   const cacheCreationTokens = getNumberProperty(usage, "cache_creation_input_tokens") || 0;
-  if (cacheReadTokens > 0 || cacheCreationTokens > 0) {
-    Object.assign(
-      metrics,
-      extractAnthropicCacheTokens(cacheReadTokens, cacheCreationTokens)
-    );
+  Object.assign(
+    metrics,
+    extractAnthropicCacheTokens(cacheReadTokens, cacheCreationTokens)
+  );
+  const cacheCreation5mTokens = getNumberProperty(
+    usage.cache_creation,
+    "ephemeral_5m_input_tokens"
+  );
+  const cacheCreation1hTokens = getNumberProperty(
+    usage.cache_creation,
+    "ephemeral_1h_input_tokens"
+  );
+  if (cacheCreation5mTokens !== void 0) {
+    metrics.prompt_cache_creation_5m_tokens = cacheCreation5mTokens;
   }
-  if (Object.keys(metrics).length > 0) {
-    Object.assign(metrics, finalizeAnthropicTokens(metrics));
+  if (cacheCreation1hTokens !== void 0) {
+    metrics.prompt_cache_creation_1h_tokens = cacheCreation1hTokens;
   }
-  return metrics;
+  if (Object.keys(metrics).length === 0) {
+    return {};
+  }
+  const finalized = finalizeAnthropicTokens(metrics);
+  if (metrics.completion_tokens === void 0) {
+    delete finalized.tokens;
+  }
+  return toNumericMetrics(finalized);
 }
 function buildLLMInput(promptMessages, conversationHistory) {
   const inputParts = [...promptMessages, ...conversationHistory];
@@ -24054,16 +24406,16 @@ function buildRootPromptMessages(prompt, capturedPromptMessages) {
 function formatCapturedMessages(messages) {
   return messages.length > 0 ? messages : [];
 }
-async function createLLMSpanForMessages(messages, promptMessages, conversationHistory, options, startTime, parentSpan, existingSpan) {
+async function createLLMSpanForMessages(messages, promptMessages, conversationHistory, options, startTime, parentSpan, usage, hasFinalOutputUsage, existingSpan) {
   if (messages.length === 0) {
     return void 0;
   }
   const lastMessage = messages[messages.length - 1];
-  if (lastMessage.type !== "assistant" || !lastMessage.message?.usage) {
+  if (lastMessage.type !== "assistant") {
     return void 0;
   }
-  const model = lastMessage.message.model || options.model;
-  const usage = extractUsageFromMessage(lastMessage);
+  const model = lastMessage.message?.model || options.model;
+  const metrics = options.includePartialMessages ? extractUsage(usage, hasFinalOutputUsage) : {};
   const input = buildLLMInput(promptMessages, conversationHistory);
   const outputs = messages.map(
     (m) => m.message?.content && m.message?.role ? { content: m.message.content, role: m.message.role } : void 0
@@ -24085,8 +24437,8 @@ async function createLLMSpanForMessages(messages, promptMessages, conversationHi
   );
   span.log({
     input,
-    metadata: model ? { model } : void 0,
-    metrics: usage,
+    metadata: { ...model && { model }, provider: "anthropic" },
+    ...Object.keys(metrics).length > 0 ? { metrics } : {},
     output: outputs
   });
   const spanExport = await span.export();
@@ -24176,11 +24528,17 @@ function prepareLocalToolHandlersInMcpServers(mcpServers) {
   }
   return { hasLocalToolHandlers, localToolHookNames };
 }
-function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers, localToolHookNames, skipLocalToolHooks, subAgentDetailsByToolUseId, subAgentSpans, endedSubAgentSpans) {
+function createToolTracingHooks(resolveParentSpan, taskIdToToolUseId, toolUseToParent, activeToolSpans, mcpServers, localToolHookNames, skipLocalToolHooks, subAgentDetailsByToolUseId, subAgentSpans, endedSubAgentSpans) {
   const preToolUse = async (input, toolUseID) => {
     if (input.hook_event_name !== "PreToolUse" || !toolUseID) {
       return {};
     }
+    if (!toolUseToParent.has(toolUseID) && input.agent_id) {
+      const parentToolUseId = taskIdToToolUseId.get(input.agent_id);
+      if (parentToolUseId) {
+        toolUseToParent.set(toolUseID, parentToolUseId);
+      }
+    }
     if (skipLocalToolHooks && (isLocalToolUse(input.tool_name, mcpServers) || localToolHookNames.has(input.tool_name))) {
       return {};
     }
@@ -24376,9 +24734,6 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
     }
     const metadata = {
       ...subAgentDetailsToMetadata(details),
-      ...input.agent_transcript_path && {
-        "claude_agent_sdk.agent_transcript_path": input.agent_transcript_path
-      },
       "claude_agent_sdk.stop_hook_active": input.stop_hook_active
     };
     try {
@@ -24400,7 +24755,7 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
     subagentStop
   };
 }
-function injectTracingHooks(options, resolveParentSpan, activeToolSpans, localToolHookNames, skipLocalToolHooks, subAgentDetailsByToolUseId, subAgentSpans, endedSubAgentSpans) {
+function injectTracingHooks(options, resolveParentSpan, taskIdToToolUseId, toolUseToParent, activeToolSpans, localToolHookNames, skipLocalToolHooks, subAgentDetailsByToolUseId, subAgentSpans, endedSubAgentSpans) {
   const {
     preToolUse,
     postToolUse,
@@ -24409,6 +24764,8 @@ function injectTracingHooks(options, resolveParentSpan, activeToolSpans, localTo
     subagentStop
   } = createToolTracingHooks(
     resolveParentSpan,
+    taskIdToToolUseId,
+    toolUseToParent,
     activeToolSpans,
     options.mcpServers,
     localToolHookNames,
@@ -24490,6 +24847,13 @@ async function finalizeCurrentMessageGroup(state) {
     }
   }
   const existingLlmSpan = state.activeLlmSpansByParentToolUse.get(parentKey);
+  const lastMessage = state.currentMessages[state.currentMessages.length - 1];
+  const messageId = lastMessage?.message?.id;
+  const usage = state.options.includePartialMessages ? mergeUsage(
+    copyUsage(lastMessage?.message?.usage),
+    messageId ? state.usageByMessageId.get(messageId) : void 0
+  ) : void 0;
+  const hasFinalOutputUsage = messageId !== void 0 && state.finalOutputUsageMessageIds.has(messageId);
   const llmSpanResult = await createLLMSpanForMessages(
     state.currentMessages,
     promptMessages,
@@ -24497,6 +24861,8 @@ async function finalizeCurrentMessageGroup(state) {
     state.options,
     state.currentMessageStartTime,
     parentSpan,
+    usage,
+    hasFinalOutputUsage,
     existingLlmSpan
   );
   if (llmSpanResult) {
@@ -24514,9 +24880,17 @@ async function finalizeCurrentMessageGroup(state) {
     }
   }
   state.activeLlmSpansByParentToolUse.delete(parentKey);
-  const lastMessage = state.currentMessages[state.currentMessages.length - 1];
-  if (lastMessage?.message?.usage) {
-    state.accumulatedOutputTokens += getNumberProperty(lastMessage.message.usage, "output_tokens") || 0;
+  if (messageId) {
+    state.usageByMessageId.delete(messageId);
+    state.finalOutputUsageMessageIds.delete(messageId);
+    for (const [
+      parent,
+      activeMessageId
+    ] of state.activePartialMessageIdByParentKey) {
+      if (activeMessageId === messageId) {
+        state.activePartialMessageIdByParentKey.delete(parent);
+      }
+    }
   }
   state.currentMessages.length = 0;
 }
@@ -24607,6 +24981,10 @@ async function ensureActiveLlmSpanForParentToolUse(rootSpan, activeLlmSpansByPar
     );
     llmParentSpan = await subAgentSpan.export();
   }
+  const racedLlmSpan = activeLlmSpansByParentToolUse.get(parentKey);
+  if (racedLlmSpan) {
+    return racedLlmSpan;
+  }
   const llmSpan = startSpan(
     withSpanInstrumentationName(
       {
@@ -24726,7 +25104,49 @@ async function maybeHandleTaskLifecycleMessage(state, message) {
   }
   return true;
 }
+function handlePartialUsageMessage(state, message) {
+  if (message.type !== "stream_event") {
+    return false;
+  }
+  const event = message.event;
+  if (!event || typeof event !== "object") {
+    return true;
+  }
+  const parentKey = llmParentKey(message.parent_tool_use_id ?? null);
+  if (event.type === "message_start") {
+    const messageId2 = event.message?.id;
+    const usage = copyUsage(event.message?.usage);
+    if (messageId2) {
+      state.activePartialMessageIdByParentKey.set(parentKey, messageId2);
+      if (usage) {
+        state.usageByMessageId.set(messageId2, usage);
+      }
+    }
+    return true;
+  }
+  const messageId = state.activePartialMessageIdByParentKey.get(parentKey);
+  if (!messageId) {
+    return true;
+  }
+  if (event.type === "message_delta") {
+    const update = copyUsage(event.usage);
+    if (update) {
+      const usage = state.usageByMessageId.get(messageId) ?? {};
+      Object.assign(usage, update);
+      state.usageByMessageId.set(messageId, usage);
+      if (update.output_tokens !== void 0) {
+        state.finalOutputUsageMessageIds.add(messageId);
+      }
+    }
+  } else if (event.type === "message_stop") {
+    state.activePartialMessageIdByParentKey.delete(parentKey);
+  }
+  return true;
+}
 async function handleStreamMessage(state, message) {
+  if (handlePartialUsageMessage(state, message)) {
+    return;
+  }
   maybeTrackToolUseContext(state, message);
   if (await maybeHandleTaskLifecycleMessage(state, message)) {
     return;
@@ -24773,36 +25193,9 @@ async function handleStreamMessage(state, message) {
     );
     state.currentMessages.push(message);
   }
-  if (message.type !== "result" || !message.usage) {
+  if (message.type !== "result") {
     return;
   }
-  const finalUsageMetrics = extractUsageFromMessage(message);
-  if (state.currentMessages.length > 0 && finalUsageMetrics.completion_tokens !== void 0) {
-    const lastMessage = state.currentMessages[state.currentMessages.length - 1];
-    if (lastMessage?.message?.usage) {
-      const adjustedTokens = finalUsageMetrics.completion_tokens - state.accumulatedOutputTokens;
-      if (adjustedTokens >= 0) {
-        lastMessage.message.usage.output_tokens = adjustedTokens;
-      }
-      const resultUsage = message.usage;
-      if (resultUsage && typeof resultUsage === "object") {
-        const cacheReadTokens = getNumberProperty(
-          resultUsage,
-          "cache_read_input_tokens"
-        );
-        if (cacheReadTokens !== void 0) {
-          lastMessage.message.usage.cache_read_input_tokens = cacheReadTokens;
-        }
-        const cacheCreationTokens = getNumberProperty(
-          resultUsage,
-          "cache_creation_input_tokens"
-        );
-        if (cacheCreationTokens !== void 0) {
-          lastMessage.message.usage.cache_creation_input_tokens = cacheCreationTokens;
-        }
-      }
-    }
-  }
   const metadata = {};
   if (message.num_turns !== void 0) {
     metadata.num_turns = message.num_turns;
@@ -24810,8 +25203,12 @@ async function handleStreamMessage(state, message) {
   if (message.session_id !== void 0) {
     metadata.session_id = message.session_id;
   }
-  if (Object.keys(metadata).length > 0) {
-    state.span.log({ metadata });
+  const metrics = state.options.includePartialMessages ? {} : extractUsage(copyUsage(message.usage), true);
+  if (Object.keys(metadata).length > 0 || Object.keys(metrics).length > 0) {
+    state.span.log({
+      ...Object.keys(metadata).length > 0 ? { metadata } : {},
+      ...Object.keys(metrics).length > 0 ? { metrics } : {}
+    });
   }
 }
 async function finalizeQuerySpan(state) {
@@ -24835,6 +25232,9 @@ async function finalizeQuerySpan(state) {
       llmSpan.end();
     }
     state.activeLlmSpansByParentToolUse.clear();
+    state.activePartialMessageIdByParentKey.clear();
+    state.finalOutputUsageMessageIds.clear();
+    state.usageByMessageId.clear();
     for (const toolSpan of state.activeToolSpans.values()) {
       toolSpan.end();
     }
@@ -24959,6 +25359,8 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         const optionsWithHooks = injectTracingHooks(
           options,
           resolveToolUseParentSpan,
+          taskIdToToolUseId,
+          toolUseToParent,
           activeToolSpans,
           localToolHookNames,
           skipLocalToolHooks,
@@ -24969,8 +25371,8 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         params.options = optionsWithHooks;
         event.arguments[0] = params;
         spans.set(event, {
-          accumulatedOutputTokens: 0,
           activeLlmSpansByParentToolUse,
+          activePartialMessageIdByParentKey: /* @__PURE__ */ new Map(),
           activeToolSpans,
           conversationHistoryByParentKey,
           capturedPromptMessages,
@@ -24978,6 +25380,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           currentMessageStartTime: startTime,
           currentMessages: [],
           endedSubAgentSpans,
+          finalOutputUsageMessageIds: /* @__PURE__ */ new Set(),
           finalResults: [],
           options: optionsWithHooks,
           originalPrompt,
@@ -24993,6 +25396,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           latestLlmParentBySubAgentToolUse,
           latestRootLlmParentRef,
           toolUseToParent,
+          usageByMessageId: /* @__PURE__ */ new Map(),
           localToolContext
         });
       },
@@ -27467,9 +27871,9 @@ function extractEmbedPromptTokenCount(response) {
   let sawAny = false;
   for (const embedding of embeddings) {
     const embeddingStats = tryToDict(tryToDict(embedding)?.statistics);
-    const tokenCount = embeddingStats?.tokenCount;
-    if (typeof tokenCount === "number" && Number.isFinite(tokenCount)) {
-      total += tokenCount;
+    const tokenCount2 = embeddingStats?.tokenCount;
+    if (typeof tokenCount2 === "number" && Number.isFinite(tokenCount2)) {
+      total += tokenCount2;
       sawAny = true;
     }
   }
@@ -34364,7 +34768,7 @@ function getStringProperty2(obj, key) {
   return typeof value === "string" ? value : void 0;
 }
 function extractMetricsFromUsage(usage) {
-  const metrics = {
+  const rawMetrics = {
     prompt_tokens: usage.inputTokens,
     completion_tokens: usage.outputTokens,
     ...extractAnthropicCacheTokens(
@@ -34373,10 +34777,10 @@ function extractMetricsFromUsage(usage) {
     )
   };
   if (usage.reasoningTokens !== void 0) {
-    metrics.completion_reasoning_tokens = usage.reasoningTokens;
-    metrics.reasoning_tokens = usage.reasoningTokens;
+    rawMetrics.completion_reasoning_tokens = usage.reasoningTokens;
+    rawMetrics.reasoning_tokens = usage.reasoningTokens;
   }
-  Object.assign(metrics, finalizeAnthropicTokens(metrics));
+  const metrics = finalizeAnthropicTokens(rawMetrics);
   const metadata = {
     model: usage.model
   };
@@ -35315,17 +35719,20 @@ var FlueObserveBridge = class {
       return;
     }
     const metadata = {
+      ...event.runId ? this.runsById.get(event.runId)?.metadata : {},
       ...extractEventMetadata(event),
       "flue.operation": event.operationKind,
       provider: "flue"
     };
     const parent = this.parentSpanForEvent(event);
-    const span = startFlueSpan(parent, {
+    const args = {
       name: `flue.${event.operationKind}`,
       spanAttributes: { type: "task" /* TASK */ },
       startTime: eventTime(event.timestamp),
       event: { metadata }
-    });
+    };
+    const runSpan = event.runId ? this.runsById.get(event.runId)?.span : void 0;
+    const span = event.operationKind === "prompt" && (!parent || parent === runSpan) ? startFlueRootSpan(args) : startFlueSpan(parent, args);
     this.operationsById.set(event.operationId, { metadata, span });
   }
   handleOperation(event) {
@@ -35340,6 +35747,11 @@ var FlueObserveBridge = class {
       ...event.isError !== void 0 ? { "flue.is_error": event.isError } : {},
       ...event.usage ? { "flue.usage": event.usage } : {}
     };
+    const input = flueOperationInput(event);
+    if (!state.loggedInput && input !== void 0) {
+      safeLog3(state.span, { input });
+      state.loggedInput = true;
+    }
     this.finishPendingChildrenForOperation(event, output);
     safeLog3(state.span, {
       ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.error) } : {},
@@ -35356,6 +35768,8 @@ var FlueObserveBridge = class {
       return;
     }
     const input = flueTurnRequestInput(event);
+    const operation = event.operationId ? this.operationsById.get(event.operationId) : void 0;
+    const turnInput = prepareFlueTurnInput(event, input, operation);
     const model = flueTurnRequestModel(event);
     const provider = flueTurnRequestProvider(event);
     const api = flueTurnRequestApi(event);
@@ -35368,8 +35782,7 @@ var FlueObserveBridge = class {
       ...provider ? { "flue.provider": provider } : {},
       ...event.purpose ? { "flue.turn_purpose": event.purpose } : {},
       ...reasoning ? { reasoning } : {},
-      ...input?.systemPrompt ? { "flue.system_prompt": input.systemPrompt } : {},
-      ...input?.tools ? { tools: input.tools } : {}
+      ...turnInput.metadata
     };
     const parent = this.parentSpanForTurn(event);
     const span = startFlueSpan(parent, {
@@ -35377,11 +35790,14 @@ var FlueObserveBridge = class {
       spanAttributes: { type: "llm" /* LLM */ },
       startTime: eventTime(event.timestamp),
       event: {
-        input: input?.messages,
+        input: turnInput.messages,
         metadata
       }
     });
-    this.logOperationInput(event.operationId, input?.messages ?? input);
+    this.logOperationInput(
+      event.operationId,
+      latestUserMessageInput(input?.messages)
+    );
     this.turnsByKey.set(key, { metadata, span });
   }
   handleTurn(event) {
@@ -35628,16 +36044,20 @@ var FlueObserveBridge = class {
   }
   startSyntheticOperation(event) {
     const metadata = {
+      ...event.runId ? this.runsById.get(event.runId)?.metadata : {},
       ...extractEventMetadata(event),
       "flue.operation": event.operationKind,
       provider: "flue"
     };
-    const span = startFlueSpan(this.parentSpanForEvent(event), {
+    const args = {
       name: `flue.${event.operationKind}`,
       spanAttributes: { type: "task" /* TASK */ },
       startTime: eventTime(event.timestamp),
       event: { metadata }
-    });
+    };
+    const parent = this.parentSpanForEvent(event);
+    const runSpan = event.runId ? this.runsById.get(event.runId)?.span : void 0;
+    const span = event.operationKind === "prompt" && (!parent || parent === runSpan) ? startFlueRootSpan(args) : startFlueSpan(parent, args);
     return { metadata, span };
   }
   startSyntheticTurn(event) {
@@ -35816,6 +36236,71 @@ function flueRunInput(event) {
 function flueTurnRequestInput(event) {
   return event.request?.input ?? event.input;
 }
+function prepareFlueTurnInput(event, input, operation) {
+  const messages = input?.messages;
+  const tracksUserTurn = event.purpose === "agent" && operation?.metadata["flue.operation"] === "prompt" && Array.isArray(messages);
+  if (!tracksUserTurn) {
+    return {
+      messages,
+      metadata: {
+        ...input?.systemPrompt ? { "flue.system_prompt": input.systemPrompt } : {},
+        ...input?.tools ? { tools: input.tools } : {}
+      }
+    };
+  }
+  const previous = operation.turnInputState;
+  const previousMessageCount = previous?.messageCount ?? 0;
+  const boundaryFingerprint = messages.length > 0 ? fingerprintJsonValue(messages[messages.length - 1]) : void 0;
+  const continuesPreviousInput = previous !== void 0 && messages.length >= previousMessageCount && (previousMessageCount === 0 || previous.boundaryFingerprint !== void 0 && previous.boundaryFingerprint === fingerprintJsonValue(messages[previousMessageCount - 1]));
+  const inputMode = previous === void 0 ? "full" : continuesPreviousInput ? "delta" : "reset";
+  const systemPromptFingerprint = fingerprintJsonValue(input?.systemPrompt);
+  const toolsFingerprint = fingerprintJsonValue(input?.tools);
+  operation.turnInputState = {
+    ...boundaryFingerprint !== void 0 ? { boundaryFingerprint } : {},
+    messageCount: messages.length,
+    ...systemPromptFingerprint !== void 0 ? { systemPromptFingerprint } : {},
+    ...toolsFingerprint !== void 0 ? { toolsFingerprint } : {}
+  };
+  return {
+    messages: continuesPreviousInput ? messages.slice(previousMessageCount) : messages,
+    metadata: {
+      "flue.input_mode": inputMode,
+      ...continuesPreviousInput ? { "flue.input_message_offset": previousMessageCount } : {},
+      ...input?.systemPrompt && (!continuesPreviousInput || systemPromptFingerprint !== previous?.systemPromptFingerprint) ? { "flue.system_prompt": input.systemPrompt } : {},
+      ...input?.tools && (!continuesPreviousInput || toolsFingerprint !== previous?.toolsFingerprint) ? { tools: input.tools } : {}
+    }
+  };
+}
+function fingerprintJsonValue(value) {
+  try {
+    const serialized = JSON.stringify(value);
+    if (serialized === void 0) {
+      return void 0;
+    }
+    let hash = 2166136261;
+    for (let i = 0; i < serialized.length; i++) {
+      hash = Math.imul(hash ^ serialized.charCodeAt(i), 16777619);
+    }
+    return `${serialized.length}:${hash >>> 0}`;
+  } catch {
+    return void 0;
+  }
+}
+function latestUserMessageInput(messages) {
+  if (!messages) {
+    return void 0;
+  }
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (isObjectLike(message) && Reflect.get(message, "role") === "user") {
+      return [message];
+    }
+  }
+  return void 0;
+}
+function flueOperationInput(event) {
+  return typeof event.agentInput?.text === "string" ? [{ content: event.agentInput.text, role: "user" }] : void 0;
+}
 function flueTurnRequestModel(event) {
   return event.request?.requestedModel ?? event.request?.model ?? event.model;
 }
@@ -35973,6 +36458,21 @@ function startFlueSpan(parent, args) {
     withSpanInstrumentationName(args, INSTRUMENTATION_NAMES.FLUE)
   );
 }
+function startFlueRootSpan(args) {
+  const state = _internalGetGlobalState();
+  const spanId = state.idGenerator.getSpanId();
+  const rootSpanId = state.idGenerator.shareRootSpanId() ? spanId : state.idGenerator.getTraceId();
+  return withCurrent(
+    NOOP_SPAN,
+    () => startSpan({
+      ...withSpanInstrumentationName(args, INSTRUMENTATION_NAMES.FLUE),
+      parentSpanIds: { parentSpanIds: [], rootSpanId },
+      spanId,
+      state
+    }),
+    state
+  );
+}
 function runWithCurrentSpanStore(span, next) {
   const state = _internalGetGlobalState();
   const contextManager = state?.contextManager;
@@ -37872,8 +38372,7 @@ function startAgentStream(event, activeChildParents) {
     ...extractAgentMetadata2(agent),
     ...extractModelMetadata3(model),
     "strands.operation": "Agent.stream",
-    provider: extractProvider(model),
-    ...event.moduleVersion ? { "strands_agent_sdk.version": event.moduleVersion } : {}
+    provider: extractProvider(model)
   };
   const parentSpan = agent ? getOnlyChildParent(activeChildParents, agent) : void 0;
   const attachmentCache = createStrandsAttachmentCache();
@@ -37923,8 +38422,7 @@ function startMultiAgentStream(event, operation, activeChildParents) {
   const metadata = {
     "strands.operation": operation,
     provider: "strands",
-    ...orchestrator?.id ? { "strands.orchestrator.id": orchestrator.id } : {},
-    ...event.moduleVersion ? { "strands_agent_sdk.version": event.moduleVersion } : {}
+    ...orchestrator?.id ? { "strands.orchestrator.id": orchestrator.id } : {}
   };
   const parentSpan = orchestrator ? getOnlyChildParent(activeChildParents, orchestrator) : void 0;
   const input = processStrandsInputAttachments(event.arguments[0]);
@@ -38710,6 +39208,320 @@ function logInstrumentationError5(context2, error2) {
   debugLogger.debug(`${context2}:`, error2);
 }
 
+// src/instrumentation/plugins/voyageai-channels.ts
+var voyageAIChannels = defineChannels(
+  "voyageai",
+  {
+    embed: channel({
+      channelName: "embed",
+      kind: "async"
+    }),
+    multimodalEmbed: channel({
+      channelName: "multimodalEmbed",
+      kind: "async"
+    }),
+    rerank: channel({
+      channelName: "rerank",
+      kind: "async"
+    }),
+    contextualizedEmbed: channel({
+      channelName: "contextualizedEmbed",
+      kind: "async"
+    })
+  },
+  { instrumentationName: INSTRUMENTATION_NAMES.VOYAGEAI }
+);
+
+// src/instrumentation/plugins/voyageai-plugin.ts
+var RERANK_METADATA_ALLOWLIST = /* @__PURE__ */ new Set([
+  "model",
+  "returnDocuments",
+  "topK",
+  "truncation"
+]);
+var VoyageAIPlugin = class extends BasePlugin {
+  onEnable() {
+    this.unsubscribers.push(
+      interceptVoyageAICall(
+        voyageAIChannels.embed,
+        "voyageai.embed",
+        extractTextEmbeddingInput,
+        summarizeEmbeddingOutput,
+        extractEmbeddingUsageMetrics
+      ),
+      interceptVoyageAICall(
+        voyageAIChannels.multimodalEmbed,
+        "voyageai.multimodalEmbed",
+        extractMultimodalEmbeddingInput,
+        summarizeEmbeddingOutput,
+        extractEmbeddingUsageMetrics
+      ),
+      interceptVoyageAICall(
+        voyageAIChannels.rerank,
+        "voyageai.rerank",
+        extractRerankInput,
+        summarizeRerankOutput
+      ),
+      interceptVoyageAICall(
+        voyageAIChannels.contextualizedEmbed,
+        "voyageai.contextualizedEmbed",
+        extractContextualizedEmbeddingInput,
+        summarizeContextualizedEmbeddingOutput,
+        extractEmbeddingUsageMetrics
+      )
+    );
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+};
+function interceptVoyageAICall(channel2, name, extractInput2, extractOutput2, extractMetrics2 = extractUsageMetrics3) {
+  return channel2.intercept((target, thisArg, args) => {
+    const invokeTarget = () => Reflect.apply(target, thisArg, args);
+    if (isAutoInstrumentationSuppressed()) {
+      return invokeTarget();
+    }
+    let span;
+    try {
+      const { input, metadata } = extractInput2(args);
+      span = startSpan(
+        withSpanInstrumentationName(
+          {
+            event: { input, metadata },
+            name,
+            spanAttributes: { type: "llm" /* LLM */ }
+          },
+          INSTRUMENTATION_NAMES.VOYAGEAI
+        )
+      );
+    } catch (error2) {
+      debugLogger.error(`Error starting span for ${name}:`, error2);
+      return invokeTarget();
+    }
+    let result;
+    try {
+      result = withCurrent(
+        span,
+        () => runWithAutoInstrumentationSuppressed(invokeTarget)
+      );
+    } catch (error2) {
+      finishVoyageAISpan(span, name, () => span.log({ error: error2 }));
+      throw error2;
+    }
+    void Promise.resolve(result).then(
+      (value) => finishVoyageAISpan(span, name, () => {
+        const metadata = extractResponseMetadata3(value);
+        span.log({
+          output: extractOutput2(value),
+          ...metadata ? { metadata } : {},
+          metrics: extractMetrics2(value)
+        });
+      }),
+      (error2) => finishVoyageAISpan(span, name, () => span.log({ error: error2 }))
+    );
+    return result;
+  });
+}
+function finishVoyageAISpan(span, name, log2) {
+  try {
+    log2();
+  } catch (error2) {
+    debugLogger.error(`Error logging span for ${name}:`, error2);
+  }
+  try {
+    span.end();
+  } catch (error2) {
+    debugLogger.error(`Error ending span for ${name}:`, error2);
+  }
+}
+function getRequestArg2(args) {
+  if (Array.isArray(args)) {
+    return isObject(args[0]) ? args[0] : void 0;
+  }
+  if (!isObject(args)) {
+    return void 0;
+  }
+  const firstArg = Reflect.get(args, "0");
+  return isObject(firstArg) ? firstArg : void 0;
+}
+function pickMetadata(request, allowlist) {
+  const metadata = {};
+  if (request) {
+    for (const key of allowlist) {
+      if (!Object.hasOwn(request, key)) {
+        continue;
+      }
+      const value = request[key];
+      if (value !== void 0) {
+        metadata[key] = value;
+      }
+    }
+  }
+  return {
+    ...metadata,
+    provider: "voyage"
+  };
+}
+function buildEmbeddingInput(inputs, request) {
+  const outputDimensions = request?.outputDimension;
+  return {
+    inputs,
+    ...typeof outputDimensions === "number" && Number.isFinite(outputDimensions) ? { output_dimensions: outputDimensions } : {}
+  };
+}
+function embeddingMetadata(request) {
+  return {
+    ...typeof request?.model === "string" ? { model: request.model } : {},
+    provider: "voyage"
+  };
+}
+function extractTextEmbeddingInput(args) {
+  const request = getRequestArg2(args);
+  const rawInput = request?.input;
+  const values = Array.isArray(rawInput) ? rawInput : [rawInput];
+  return {
+    input: buildEmbeddingInput(
+      values.flatMap(
+        (value) => typeof value === "string" ? [{ content: value }] : []
+      ),
+      request
+    ),
+    metadata: embeddingMetadata(request)
+  };
+}
+function extractContextualizedEmbeddingInput(args) {
+  const request = getRequestArg2(args);
+  const rawInputs = request?.inputs;
+  const values = Array.isArray(rawInputs) ? rawInputs.flatMap((value) => Array.isArray(value) ? value : [value]) : [];
+  return {
+    input: buildEmbeddingInput(
+      values.flatMap(
+        (value) => typeof value === "string" ? [{ content: value }] : []
+      ),
+      request
+    ),
+    metadata: embeddingMetadata(request)
+  };
+}
+function extractMultimodalEmbeddingInput(args) {
+  const request = getRequestArg2(args);
+  const rawInputs = request?.inputs;
+  const inputs = Array.isArray(rawInputs) ? rawInputs.map((rawInput) => {
+    const rawContent = isObject(rawInput) ? rawInput.content : void 0;
+    return {
+      content: Array.isArray(rawContent) ? rawContent.flatMap(normalizeMultimodalContentPart) : []
+    };
+  }) : [];
+  const input = buildEmbeddingInput(inputs, request);
+  const processedInput = processInputAttachments(input);
+  return {
+    input: hasInlineEmbeddingMedia(processedInput) ? input : processedInput,
+    metadata: embeddingMetadata(request)
+  };
+}
+function normalizeMultimodalContentPart(part) {
+  if (!isObject(part) || typeof part.type !== "string") {
+    return [];
+  }
+  if (part.type === "text") {
+    return typeof part.text === "string" ? [{ type: "text", text: part.text }] : [];
+  }
+  const camelCaseField = {
+    image_base64: "imageBase64",
+    image_url: "imageUrl",
+    video_base64: "videoBase64",
+    video_url: "videoUrl"
+  };
+  const field = camelCaseField[part.type];
+  if (!field) {
+    return [];
+  }
+  const data = typeof part[field] === "string" ? part[field] : part[part.type];
+  if (typeof data !== "string") {
+    return [];
+  }
+  return part.type.startsWith("image_") ? [{ type: "image_url", image_url: { url: data } }] : [{ type: "file", file: { file_data: data } }];
+}
+function hasInlineEmbeddingMedia(input) {
+  return input.inputs.some(
+    ({ content }) => Array.isArray(content) ? content.some((part) => {
+      const value = part.type === "image_url" ? part.image_url.url : part.type === "file" ? part.file.file_data : void 0;
+      return typeof value === "string" && value.startsWith("data:");
+    }) : false
+  );
+}
+function extractRerankInput(args) {
+  const request = getRequestArg2(args);
+  const documents = request?.documents;
+  return {
+    input: {
+      documents,
+      query: request?.query
+    },
+    metadata: {
+      ...pickMetadata(request, RERANK_METADATA_ALLOWLIST),
+      ...Array.isArray(documents) ? { document_count: documents.length } : {}
+    }
+  };
+}
+function extractResponseMetadata3(result) {
+  if (!isObject(result)) {
+    return void 0;
+  }
+  const rawResponse = isObject(result.rawResponse) ? result.rawResponse : void 0;
+  const model = typeof result.model === "string" ? result.model : typeof rawResponse?.model === "string" ? rawResponse.model : void 0;
+  return model ? { model } : void 0;
+}
+function summarizeEmbeddingOutput(result) {
+  return {
+    count: isObject(result) && Array.isArray(result.data) ? result.data.length : 0
+  };
+}
+function summarizeRerankOutput(result) {
+  if (!isObject(result) || !Array.isArray(result.data)) {
+    return void 0;
+  }
+  return result.data.slice(0, 100).map((item) => ({
+    index: isObject(item) ? item.index : void 0,
+    relevance_score: isObject(item) ? (typeof item.relevanceScore === "number" ? item.relevanceScore : item.relevance_score) ?? null : null
+  }));
+}
+function summarizeContextualizedEmbeddingOutput(result) {
+  if (!isObject(result)) {
+    return { count: 0 };
+  }
+  if (Array.isArray(result.results)) {
+    return {
+      count: result.results.reduce(
+        (count, item) => count + (isObject(item) && Array.isArray(item.embeddings) ? item.embeddings.length : 0),
+        0
+      )
+    };
+  }
+  if (!Array.isArray(result.data)) {
+    return { count: 0 };
+  }
+  return {
+    count: result.data.reduce(
+      (count, item) => count + (isObject(item) && Array.isArray(item.data) ? item.data.length : 0),
+      0
+    )
+  };
+}
+function extractEmbeddingUsageMetrics(result) {
+  const metrics = extractUsageMetrics3(result);
+  return typeof metrics.tokens === "number" ? { prompt_tokens: metrics.tokens, tokens: metrics.tokens } : {};
+}
+function extractUsageMetrics3(result) {
+  if (!isObject(result)) {
+    return {};
+  }
+  const rawResponse = isObject(result.rawResponse) ? result.rawResponse : void 0;
+  const usage = isObject(result.usage) ? result.usage : isObject(rawResponse?.usage) ? rawResponse.usage : void 0;
+  const tokens = typeof result.totalTokens === "number" ? result.totalTokens : usage?.totalTokens ?? usage?.total_tokens;
+  return typeof tokens === "number" && Number.isFinite(tokens) && tokens >= 0 ? { tokens } : {};
+}
+
 // src/instrumentation/plugins/cloudflare-ai-chat-channels.ts
 var cloudflareAIChatChannels = defineChannels(
   "@cloudflare/ai-chat",
@@ -39265,6 +40077,7 @@ var BraintrustPlugin = class extends BasePlugin {
   langSmithPlugin = null;
   piCodingAgentPlugin = null;
   strandsAgentSDKPlugin = null;
+  voyageAIPlugin = null;
   cloudflareAIChatPlugin = null;
   cloudflareAgentsPlugin = null;
   constructor(config3 = {}) {
@@ -39339,6 +40152,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.coherePlugin = new CoherePlugin();
       this.coherePlugin.enable();
     }
+    if (integrations.voyageai !== false) {
+      this.voyageAIPlugin = new VoyageAIPlugin();
+      this.voyageAIPlugin.enable();
+    }
     if (integrations.groq !== false) {
       this.groqPlugin = new GroqPlugin();
       this.groqPlugin.enable();
@@ -39455,6 +40272,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.coherePlugin.disable();
       this.coherePlugin = null;
     }
+    if (this.voyageAIPlugin) {
+      this.voyageAIPlugin.disable();
+      this.voyageAIPlugin = null;
+    }
     if (this.groqPlugin) {
       this.groqPlugin.disable();
       this.groqPlugin = null;
@@ -39574,7 +40395,10 @@ var envIntegrationAliases = {
   "langchain-js": "langchain",
   "@langchain": "langchain",
   langgraph: "langgraph",
-  langsmith: "langsmith"
+  langsmith: "langsmith",
+  voyage: "voyageai",
+  "voyage-ai": "voyageai",
+  voyageai: "voyageai"
 };
 function getDefaultInstrumentationIntegrations() {
   return {
@@ -39609,6 +40433,7 @@ function getDefaultInstrumentationIntegrations() {
     langchain: true,
     langgraph: true,
     langsmith: true,
+    voyageai: true,
     piCodingAgent: true,
     strandsAgentSDK: true,
     cloudflareAgents: true
@@ -40029,9 +40854,9 @@ function configureNode() {
       return value;
     }
     const envPaths = [];
-    for (let dir2 = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir2 = path.dirname(dir2), depth++) {
-      envPaths.push(path.join(dir2, ".env.braintrust"));
-      if (path.dirname(dir2) === dir2) {
+    for (let dir2 = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir2 = path2.dirname(dir2), depth++) {
+      envPaths.push(path2.join(dir2, ".env.braintrust"));
+      if (path2.dirname(dir2) === dir2) {
         break;
       }
     }
@@ -40073,10 +40898,10 @@ function configureNode() {
   isomorph_default.processOn = (event, handler) => {
     process.on(event, handler);
   };
-  isomorph_default.basename = path.basename;
+  isomorph_default.basename = path2.basename;
   isomorph_default.writeln = (text) => process.stdout.write(text + "\n");
-  isomorph_default.pathJoin = path.join;
-  isomorph_default.pathDirname = path.dirname;
+  isomorph_default.pathJoin = path2.join;
+  isomorph_default.pathDirname = path2.dirname;
   isomorph_default.mkdir = fs.mkdir;
   isomorph_default.writeFile = fs.writeFile;
   isomorph_default.readFile = fs.readFile;
@@ -40111,8 +40936,8 @@ 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");
+  for (let dir2 = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir2 = path2.dirname(dir2), depth++) {
+    const envPath = path2.join(dir2, ".env.braintrust");
     try {
       const parsed = dotenv.parse(fsSync.readFileSync(envPath, "utf8"));
       const value = parsed[name];
@@ -40122,7 +40947,7 @@ function getNearestBraintrustEnvValue(name) {
         return void 0;
       }
     }
-    if (path.dirname(dir2) === dir2) {
+    if (path2.dirname(dir2) === dir2) {
       break;
     }
   }
@@ -40133,7 +40958,7 @@ function getNearestBraintrustEnvValue(name) {
 var import_env2 = require("@next/env");
 
 // src/cli/functions/upload.ts
-var import_node_fs2 = __toESM(require("node:fs"));
+var import_node_fs3 = __toESM(require("node:fs"));
 var import_node_path3 = __toESM(require("node:path"));
 var import_node_zlib = require("node:zlib");
 var import_v312 = require("zod/v3");
@@ -40143,11 +40968,11 @@ var import_source_map = require("source-map");
 var fs2 = __toESM(require("node:fs/promises"));
 
 // src/cli/jest/nodeModulesPaths.ts
-var path2 = __toESM(require("node:path"));
-var import_node_fs = require("node:fs");
+var path3 = __toESM(require("node:path"));
+var import_node_fs2 = require("node:fs");
 function nodeModulesPaths(basedir, options) {
   const modules = options && options.moduleDirectory ? Array.from(options.moduleDirectory) : ["node_modules"];
-  const basedirAbs = path2.resolve(basedir);
+  const basedirAbs = path3.resolve(basedir);
   let prefix = "/";
   if (/^([A-Za-z]:)/.test(basedirAbs)) {
     prefix = "";
@@ -40156,24 +40981,24 @@ function nodeModulesPaths(basedir, options) {
   }
   let physicalBasedir;
   try {
-    physicalBasedir = import_node_fs.realpathSync.native(basedirAbs);
+    physicalBasedir = import_node_fs2.realpathSync.native(basedirAbs);
   } catch {
     physicalBasedir = basedirAbs;
   }
   const paths = [physicalBasedir];
-  let parsed = path2.parse(physicalBasedir);
+  let parsed = path3.parse(physicalBasedir);
   while (parsed.dir !== paths[paths.length - 1]) {
     paths.push(parsed.dir);
-    parsed = path2.parse(parsed.dir);
+    parsed = path3.parse(parsed.dir);
   }
   const dirs = paths.reduce((dirs2, aPath) => {
     for (const moduleDir of modules) {
-      if (path2.isAbsolute(moduleDir)) {
+      if (path3.isAbsolute(moduleDir)) {
         if (aPath === basedirAbs && moduleDir) {
           dirs2.push(moduleDir);
         }
       } else {
-        dirs2.push(path2.join(prefix, aPath, moduleDir));
+        dirs2.push(path3.join(prefix, aPath, moduleDir));
       }
     }
     return dirs2;
@@ -41163,7 +41988,7 @@ async function uploadBundles({
     if (!pathInfo) {
       return true;
     }
-    const bundleStream = import_node_fs2.default.createReadStream(bundleFile).pipe((0, import_node_zlib.createGzip)());
+    const bundleStream = import_node_fs3.default.createReadStream(bundleFile).pipe((0, import_node_zlib.createGzip)());
     const bundleData = await new Promise((resolve2, reject2) => {
       const chunks = [];
       bundleStream.on("data", (chunk) => {
@@ -41363,7 +42188,7 @@ async function bundleCommand(args) {
 
 // src/cli/util/pull.ts
 var import_v313 = require("zod/v3");
-var import_promises = __toESM(require("node:fs/promises"));
+var import_promises2 = __toESM(require("node:fs/promises"));
 var import_node_util4 = __toESM(require("node:util"));
 var import_node_path4 = __toESM(require("node:path"));
 var import_pluralize3 = __toESM(require("pluralize"));
@@ -41401,14 +42226,13 @@ async function pullCommand(args) {
     console.log(` * ${projectName}`);
   }
   const outputDir = args.output_dir ?? "./braintrust";
-  await import_promises.default.mkdir(outputDir, { recursive: true });
-  const git = await currentRepo();
-  const diffSummary = await git?.diffSummary("HEAD");
-  const repoRoot = await git?.revparse(["--show-toplevel"]);
+  await import_promises2.default.mkdir(outputDir, { recursive: true });
+  const repoRoot = await currentRepoPath();
+  const dirtyFileOutput = repoRoot ? await runGitCommand(["diff", "--name-only", "-z", "HEAD"], {
+    cwd: repoRoot
+  }) : "";
   const dirtyFiles = new Set(
-    (diffSummary?.files ?? []).map(
-      (f) => import_node_path4.default.resolve(repoRoot ?? ".", f.file)
-    )
+    dirtyFileOutput.split("\0").filter(Boolean).map((file) => import_node_path4.default.resolve(repoRoot ?? ".", file))
   );
   for (const projectName of Object.keys(projectNameToFunctions)) {
     const projectFile = import_node_path4.default.join(
@@ -41416,7 +42240,7 @@ async function pullCommand(args) {
       `${slugify(projectName, { lower: true, strict: true, trim: true })}.ts`
     );
     const resolvedProjectFile = import_node_path4.default.resolve(projectFile);
-    const fileExists = await import_promises.default.stat(projectFile).then(
+    const fileExists = await import_promises2.default.stat(projectFile).then(
       () => true,
       () => false
     );
@@ -41436,7 +42260,7 @@ async function pullCommand(args) {
       );
       continue;
     } else if (fileExists) {
-      if (!git) {
+      if (!repoRoot) {
         console.warn(
           warning(
             `Project ${projectName} already exists in ${doubleQuote(projectFile)}. Skipping since this is not a git repository...`
@@ -41458,7 +42282,7 @@ async function pullCommand(args) {
       functions: projectNameToFunctions[projectName],
       hasSpecifiedFunction: !!args.slug || !!args.id
     });
-    await import_promises.default.writeFile(projectFile, projectFileContents || "");
+    await import_promises2.default.writeFile(projectFile, projectFileContents || "");
     console.log(`Wrote ${projectName} to ${doubleQuote(projectFile)}`);
   }
 }
@@ -42151,6 +42975,8 @@ async function getDataset(state, data) {
       environment: data.dataset_environment ?? void 0,
       _internal_btql: data._internal_btql ?? void 0
     });
+  } else if ("experiment_name" in data) {
+    return BaseExperiment({ name: data.experiment_name });
   } else {
     return data.data;
   }
@@ -42676,7 +43502,7 @@ function checkMatch(pathInput, include_patterns, exclude_patterns) {
 async function collectFiles(inputPath, mode) {
   let pathStat = null;
   try {
-    pathStat = import_node_fs3.default.lstatSync(inputPath);
+    pathStat = import_node_fs4.default.lstatSync(inputPath);
   } catch (e) {
     console.error(error(`Error reading ${inputPath}: ${e}`));
     process.exit(1);
@@ -42732,8 +43558,8 @@ var nativeNodeModulesPlugin = {
     };
     build2.onResolve({ filter: /\.node$/ }, (args) => {
       try {
-        const path8 = require.resolve(args.path, { paths: [args.resolveDir] });
-        const match = path8.match(
+        const path9 = require.resolve(args.path, { paths: [args.resolveDir] });
+        const match = path9.match(
           /node_modules[/\\]((?:@[^/\\]+[/\\])?[^/\\]+)/
         );
         if (match) {