braintrust 3.27.0 → 3.28.0

package/dist/{chunk-YKD22IMR.mjs → chunk-UPFNQCGB.mjs}

@@ -45,8 +45,9 @@ import {
   smithyClientChannels,
   smithyCoreChannels,
   strandsAgentSDKChannels,
+  voyageAIChannels,
   withSpanInstrumentationName
-} from "./chunk-CZM5JIQL.mjs";
+} from "./chunk-ZHUHZWFY.mjs";
 
 // src/id-gen.ts
 import { v4 as uuidv4 } from "uuid";
@@ -1121,15 +1122,15 @@ function mergeDictsWithPaths({
 function mergeDictsWithPathsHelper({
   mergeInto,
   mergeFrom,
-  path: path2,
+  path: path3,
   mergePaths
 }) {
   Object.entries(mergeFrom).forEach(([k, mergeFromV]) => {
     if (FORBIDDEN_MERGE_KEYS.has(k)) return;
-    const fullPath = path2.concat([k]);
+    const fullPath = path3.concat([k]);
     const fullPathSerialized = JSON.stringify(fullPath);
     const mergeIntoV = recordFind(mergeInto, k);
-    const isSetUnionField = path2.length === 0 && SET_UNION_FIELDS.has(k) && !mergePaths.has(fullPathSerialized);
+    const isSetUnionField = path3.length === 0 && SET_UNION_FIELDS.has(k) && !mergePaths.has(fullPathSerialized);
     if (isSetUnionField && isArray(mergeIntoV) && isArray(mergeFromV)) {
       const seen = /* @__PURE__ */ new Set();
       const combined = [];
@@ -1162,9 +1163,9 @@ function mergeDicts(mergeInto, mergeFrom) {
 function recordFind(m, k) {
   return m[k];
 }
-function getObjValueByPath(row, path2) {
+function getObjValueByPath(row, path3) {
   let curr = row;
-  for (const p of path2) {
+  for (const p of path3) {
     if (!isObjectOrArray(curr)) {
       return null;
     }
@@ -1780,7 +1781,8 @@ var AclObjectType = z6.union([
     "org_member",
     "project_log",
     "org_project",
-    "org_audit_logs"
+    "org_audit_logs",
+    "project_group"
   ]),
   z6.null()
 ]);
@@ -1909,7 +1911,8 @@ var AsyncScoringState = z6.union([
     token: z6.string(),
     function_ids: z6.array(z6.unknown()),
     skip_logging: z6.union([z6.boolean(), z6.null()]).optional(),
-    triggered_functions: z6.union([z6.record(TriggeredFunctionState), z6.null()]).optional()
+    triggered_functions: z6.union([z6.record(TriggeredFunctionState), z6.null()]).optional(),
+    last_triggered_xact_id: z6.union([z6.string(), z6.number(), z6.null()]).optional()
   }),
   z6.object({ status: z6.literal("disabled") }),
   z6.null(),
@@ -1978,7 +1981,7 @@ var FunctionTypeEnum = z6.enum([
   "parameters",
   "sandbox"
 ]);
-var NullableSavedFunctionId = z6.union([
+var FacetPreprocessorId = z6.union([
   z6.object({
     type: z6.literal("function"),
     id: z6.string(),
@@ -1989,10 +1992,23 @@ var NullableSavedFunctionId = z6.union([
     name: z6.string(),
     function_type: FunctionTypeEnum.optional().default("scorer")
   }),
+  z6.object({ type: z6.literal("inline"), code: z6.string().min(1) }),
   z6.null()
 ]);
+var SavedFunctionId = z6.union([
+  z6.object({
+    type: z6.literal("function"),
+    id: z6.string(),
+    version: z6.string().optional()
+  }),
+  z6.object({
+    type: z6.literal("global"),
+    name: z6.string(),
+    function_type: FunctionTypeEnum.optional().default("scorer")
+  })
+]);
 var TopicMapGenerationSettings = z6.object({
-  algorithm: z6.enum(["hdbscan", "kmeans"]),
+  algorithm: z6.enum(["hdbscan", "kmeans", "community"]),
   dimension_reduction: z6.enum(["umap", "pca", "none"]),
   sample_size: z6.number().int().gt(0).optional(),
   n_clusters: z6.number().int().gt(0).optional(),
@@ -2004,6 +2020,7 @@ var TopicMapGenerationSettings = z6.object({
 var TopicMapData = z6.object({
   type: z6.literal("topic_map"),
   source_facet: z6.string(),
+  source_facet_function: SavedFunctionId.and(z6.unknown()).optional(),
   embedding_model: z6.string(),
   bundle_key: z6.string().optional(),
   report_key: z6.string().optional(),
@@ -2017,7 +2034,7 @@ var TopicMapData = z6.object({
 });
 var BatchedFacetData = z6.object({
   type: z6.literal("batched_facet"),
-  preprocessor: NullableSavedFunctionId.and(z6.unknown()).optional(),
+  preprocessor: FacetPreprocessorId.optional(),
   facets: z6.array(
     z6.object({
       name: z6.string(),
@@ -2278,18 +2295,6 @@ var ObjectReferenceNullish = z6.union([
   }),
   z6.null()
 ]);
-var SavedFunctionId = z6.union([
-  z6.object({
-    type: z6.literal("function"),
-    id: z6.string(),
-    version: z6.string().optional()
-  }),
-  z6.object({
-    type: z6.literal("global"),
-    name: z6.string(),
-    function_type: FunctionTypeEnum.optional().default("scorer")
-  })
-]);
 var DatasetEvent = z6.object({
   id: z6.string(),
   _xact_id: z6.string(),
@@ -2511,7 +2516,7 @@ var ExtendedSavedFunctionId = z6.union([
 ]);
 var FacetData = z6.object({
   type: z6.literal("facet"),
-  preprocessor: NullableSavedFunctionId.and(z6.unknown()).optional(),
+  preprocessor: FacetPreprocessorId.optional(),
   prompt: z6.string(),
   model: z6.string().optional(),
   embedding_model: z6.string().optional(),
@@ -3016,6 +3021,19 @@ var MessageRole = z6.enum([
   "model",
   "developer"
 ]);
+var NullableSavedFunctionId = z6.union([
+  z6.object({
+    type: z6.literal("function"),
+    id: z6.string(),
+    version: z6.string().optional()
+  }),
+  z6.object({
+    type: z6.literal("global"),
+    name: z6.string(),
+    function_type: FunctionTypeEnum.optional().default("scorer")
+  }),
+  z6.null()
+]);
 var ObjectReference = z6.object({
   object_type: z6.enum([
     "project_logs",
@@ -3037,6 +3055,7 @@ var TraceScope = z6.object({
 });
 var OnlineScoreConfig = z6.union([
   z6.object({
+    status: AutomationStatus.optional(),
     sampling_rate: z6.number().gte(0).lte(1),
     scorers: z6.array(SavedFunctionId),
     btql_filter: z6.union([z6.string(), z6.null()]).optional(),
@@ -3117,6 +3136,72 @@ var Project = z6.object({
   user_id: z6.union([z6.string(), z6.null()]).optional(),
   settings: ProjectSettings.optional()
 });
+var WindowedAutomationConfig = z6.object({
+  event_type: z6.literal("windowed"),
+  product_origin: z6.union([z6.literal("patterns"), z6.null()]).optional(),
+  status: AutomationStatus.optional(),
+  threshold: z6.object({
+    calculation: z6.object({
+      type: z6.literal("btql"),
+      btql_query: z6.string().min(1),
+      output: z6.object({
+        type: z6.literal("scalar"),
+        value_column: z6.string().min(1)
+      })
+    }),
+    policy: z6.object({
+      condition: z6.object({
+        type: z6.literal("threshold"),
+        operator: z6.enum(["lt", "lte", "gt", "gte", "eq", "neq"]),
+        threshold: z6.number()
+      }),
+      pending_seconds: z6.number().int().gte(0).lte(2592e3),
+      no_data_behavior: z6.enum(["keep_last", "resolve", "alert"]),
+      renotify_interval_seconds: z6.union([z6.number(), z6.null()]).optional(),
+      notify_on_recovery: z6.boolean().optional().default(true)
+    })
+  }).optional(),
+  window: z6.object({
+    window_seconds: z6.number().int().gte(1).lte(2592e3),
+    schedule: z6.union([
+      z6.object({
+        type: z6.literal("interval"),
+        evaluation_interval_seconds: z6.number().int().gte(1).lte(2592e3)
+      }),
+      z6.object({
+        type: z6.literal("cron"),
+        cron_expression: z6.string().min(1),
+        timezone: z6.union([z6.string(), z6.null()]).optional()
+      })
+    ]),
+    evaluation_delay_seconds: z6.number().int().gte(0).lte(2592e3)
+  }),
+  loop: z6.object({
+    prompt: z6.string().min(1).max(1e4),
+    include_trigger_input: z6.boolean().optional().default(false),
+    agent_slug: z6.string().min(1),
+    auto_approve_tools: z6.array(z6.string().min(1)).optional().default([]),
+    harness: z6.enum(["native", "codex", "claude-code"]).optional(),
+    model: z6.string().min(1).optional(),
+    reasoning_effort: z6.enum(["none", "minimal", "low", "medium", "high", "xhigh", "max"]).optional()
+  }).optional(),
+  actions: z6.array(
+    z6.union([
+      z6.object({
+        type: z6.literal("webhook"),
+        url: z6.string(),
+        formatting_prompt: z6.string().min(1).max(1e4).optional()
+      }),
+      z6.object({
+        type: z6.literal("slack"),
+        workspace_id: z6.string(),
+        channel: z6.string(),
+        message_template: z6.string().optional(),
+        formatting_prompt: z6.string().min(1).max(1e4).optional()
+      })
+    ])
+  ).max(20).optional().default([])
+});
 var TopicAutomationFacetModel = z6.union([
   z6.enum(["brain-facet-latest", "brain-facet-1", "brain-facet-2"]),
   z6.null()
@@ -3158,7 +3243,8 @@ var TopicDigestAutomationConfig = z6.object({
     type: z6.literal("slack"),
     workspace_id: z6.string(),
     channel: z6.string(),
-    message_template: z6.string().optional()
+    message_template: z6.string().optional(),
+    formatting_prompt: z6.string().min(1).max(1e4).optional()
   }),
   topic_map_function_ids: z6.array(z6.string()).max(10).optional()
 });
@@ -3172,15 +3258,21 @@ var ProjectAutomation = z6.object({
   config: z6.union([
     z6.object({
       event_type: z6.literal("logs"),
+      status: AutomationStatus.optional(),
       btql_filter: z6.string(),
       interval_seconds: z6.number().gte(1).lte(2592e3),
       action: z6.union([
-        z6.object({ type: z6.literal("webhook"), url: z6.string() }),
+        z6.object({
+          type: z6.literal("webhook"),
+          url: z6.string(),
+          formatting_prompt: z6.string().min(1).max(1e4).optional()
+        }),
         z6.object({
           type: z6.literal("slack"),
           workspace_id: z6.string(),
           channel: z6.string(),
-          message_template: z6.string().optional()
+          message_template: z6.string().optional(),
+          formatting_prompt: z6.string().min(1).max(1e4).optional()
         })
       ])
     }),
@@ -3231,21 +3323,38 @@ var ProjectAutomation = z6.object({
     }),
     z6.object({
       event_type: z6.literal("environment_update"),
+      status: AutomationStatus.optional(),
       environment_filter: z6.array(z6.string()).optional(),
       action: z6.union([
-        z6.object({ type: z6.literal("webhook"), url: z6.string() }),
+        z6.object({
+          type: z6.literal("webhook"),
+          url: z6.string(),
+          formatting_prompt: z6.string().min(1).max(1e4).optional()
+        }),
         z6.object({
           type: z6.literal("slack"),
           workspace_id: z6.string(),
           channel: z6.string(),
-          message_template: z6.string().optional()
+          message_template: z6.string().optional(),
+          formatting_prompt: z6.string().min(1).max(1e4).optional()
         })
       ])
     }),
+    WindowedAutomationConfig,
     TopicAutomationConfig,
     TopicDigestAutomationConfig
   ])
 });
+var ProjectGroup = z6.object({
+  id: z6.string().uuid(),
+  org_id: z6.string().uuid(),
+  user_id: z6.union([z6.string(), z6.null()]).optional(),
+  created: z6.union([z6.string(), z6.null()]).optional(),
+  name: z6.string(),
+  description: z6.union([z6.string(), z6.null()]).optional(),
+  deleted_at: z6.union([z6.string(), z6.null()]).optional(),
+  member_projects: z6.array(z6.string().uuid()).max(1e4)
+});
 var ProjectLogsEvent = z6.object({
   id: z6.string(),
   _xact_id: z6.string(),
@@ -3463,7 +3572,8 @@ var RunEval = z6.object({
       dataset_environment: z6.union([z6.string(), z6.null()]).optional(),
       _internal_btql: z6.union([z6.object({}).partial().passthrough(), z6.null()]).optional()
     }),
-    z6.object({ data: z6.array(z6.unknown()) })
+    z6.object({ data: z6.array(z6.unknown()) }),
+    z6.object({ experiment_name: z6.string() })
   ]),
   name: z6.string().optional(),
   parameters: z6.object({}).partial().passthrough().optional(),
@@ -3668,7 +3778,9 @@ var View = z6.object({
     "for_review_datasets"
   ]),
   name: z6.string(),
+  description: z6.union([z6.string(), z6.null()]).optional(),
   created: z6.union([z6.string(), z6.null()]).optional(),
+  updated_at: z6.union([z6.string(), z6.null()]).optional(),
   view_data: ViewData.optional(),
   options: ViewOptions.optional(),
   user_id: z6.union([z6.string(), z6.null()]).optional(),
@@ -4252,10 +4364,10 @@ var DiskCache = class {
       return;
     }
     const stats = await Promise.all(
-      paths.map(async (path2) => {
-        const stat2 = await isomorph_default.stat(path2);
+      paths.map(async (path3) => {
+        const stat2 = await isomorph_default.stat(path3);
         return {
-          path: path2,
+          path: path3,
           mtime: stat2.mtime.getTime()
         };
       })
@@ -4910,6 +5022,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"
@@ -5507,9 +5622,9 @@ var HTTPConnection = class _HTTPConnection {
       this.headers["Authorization"] = `Bearer ${this.token}`;
     }
   }
-  async get(path2, params = void 0, config) {
+  async get(path3, params = void 0, config) {
     const { headers, ...rest } = config || {};
-    const url = new URL(_urljoin(this.base_url, path2));
+    const url = new URL(_urljoin(this.base_url, path3));
     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]) : []
@@ -5530,7 +5645,7 @@ var HTTPConnection = class _HTTPConnection {
       })
     );
   }
-  async post(path2, params, config, retries = 0) {
+  async post(path3, params, config, retries = 0) {
     const { headers, ...rest } = config || {};
     const this_fetch = this.fetch;
     const this_base_url = this.base_url;
@@ -5539,7 +5654,7 @@ var HTTPConnection = class _HTTPConnection {
     for (let i = 0; i < tries; i++) {
       try {
         return await checkResponse(
-          await this_fetch(_urljoin(this_base_url, path2), {
+          await this_fetch(_urljoin(this_base_url, path3), {
             method: "POST",
             headers: {
               Accept: "application/json",
@@ -5560,7 +5675,7 @@ var HTTPConnection = class _HTTPConnection {
           throw error;
         }
         debugLogger.debug(
-          `Retrying API request ${path2} after ${formatHTTPError(error)}`
+          `Retrying API request ${path3} after ${formatHTTPError(error)}`
         );
         const sleepTimeMs = HTTP_RETRY_BASE_SLEEP_TIME_S * 1e3 * 2 ** i + Math.random() * HTTP_RETRY_JITTER_MS;
         debugLogger.info(
@@ -6133,6 +6248,30 @@ function updateSpan({
     event
   });
 }
+function _internalResumeSpan({
+  exported,
+  state
+}) {
+  const resolvedState = state ?? _globalState;
+  const components = SpanComponentsV4.fromStr(exported);
+  const { row_id, root_span_id, span_id } = components.data;
+  if (!row_id || !root_span_id || !span_id) {
+    throw new Error("Only exported root spans can be resumed");
+  }
+  return new SpanImpl({
+    state: resolvedState,
+    parentObjectType: components.data.object_type,
+    parentObjectId: new LazyValue(
+      spanComponentsToObjectIdLambda(resolvedState, components)
+    ),
+    parentComputeObjectMetadataArgs: void 0,
+    parentSpanIds: { parentSpanIds: [], rootSpanId: root_span_id },
+    spanId: span_id,
+    event: { id: row_id },
+    propagatedEvent: components.data.propagated_event ?? void 0,
+    [RESUME_SPAN_WITHOUT_INITIAL_WRITE]: true
+  });
+}
 function spanComponentsToObjectIdLambda(state, components) {
   if (components.data.object_id) {
     const ret = components.data.object_id;
@@ -9013,7 +9152,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"
@@ -9022,6 +9161,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`,
         {
@@ -9061,7 +9204,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;
@@ -9581,7 +9731,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() {
@@ -12311,6 +12463,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,
@@ -13493,7 +13661,7 @@ function resolveDenyOutputPaths(event, defaultDenyOutputPaths) {
     return defaultDenyOutputPaths;
   }
   const runtimeDenyOutputPaths = firstArgument2[RUNTIME_DENY_OUTPUT_PATHS];
-  if (Array.isArray(runtimeDenyOutputPaths) && runtimeDenyOutputPaths.every((path2) => typeof path2 === "string")) {
+  if (Array.isArray(runtimeDenyOutputPaths) && runtimeDenyOutputPaths.every((path3) => typeof path3 === "string")) {
     return runtimeDenyOutputPaths;
   }
   return defaultDenyOutputPaths;
@@ -15255,11 +15423,11 @@ function processAISDKOutput(output, denyOutputPaths) {
   if (!output) return output;
   const merged = extractSerializableOutputFields(output);
   const deleteOutputPaths = denyOutputPaths.filter(
-    (path2) => path2.toLowerCase().endsWith("headers")
+    (path3) => path3.toLowerCase().endsWith("headers")
   );
   const sanitized = omit(merged, denyOutputPaths, deleteOutputPaths);
-  for (const path2 of TRANSPORT_PAYLOAD_ROOT_PATHS) {
-    const stack = [{ obj: sanitized, keys: parsePath(path2) }];
+  for (const path3 of TRANSPORT_PAYLOAD_ROOT_PATHS) {
+    const stack = [{ obj: sanitized, keys: parsePath(path3) }];
     while (stack.length > 0) {
       const entry = stack.pop();
       if (!entry || entry.keys.length === 0) {
@@ -15698,11 +15866,11 @@ function firstNumber(...values) {
 function deepCopy(obj) {
   return JSON.parse(JSON.stringify(obj));
 }
-function parsePath(path2) {
+function parsePath(path3) {
   const keys = [];
   let current = "";
-  for (let i = 0; i < path2.length; i++) {
-    const char = path2[i];
+  for (let i = 0; i < path3.length; i++) {
+    const char = path3[i];
     if (char === ".") {
       if (current) {
         keys.push(current);
@@ -15715,8 +15883,8 @@ function parsePath(path2) {
       }
       let bracketContent = "";
       i++;
-      while (i < path2.length && path2[i] !== "]") {
-        bracketContent += path2[i];
+      while (i < path3.length && path3[i] !== "]") {
+        bracketContent += path3[i];
         i++;
       }
       if (bracketContent === "") {
@@ -15771,9 +15939,9 @@ function omitAtPath(obj, keys, deleteLeaf = false) {
 function omit(obj, paths, deletePaths = []) {
   const result = deepCopy(obj);
   const deletePathSet = new Set(deletePaths);
-  for (const path2 of paths) {
-    const keys = parsePath(path2);
-    omitAtPath(result, keys, deletePathSet.has(path2));
+  for (const path3 of paths) {
+    const keys = parsePath(path3);
+    omitAtPath(result, keys, deletePathSet.has(path3));
   }
   return result;
 }
@@ -16999,17 +17167,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) {
@@ -17024,6 +17195,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) {
+      safeLog(state.span, { input });
+      state.loggedInput = true;
+    }
     this.finishPendingChildrenForOperation(event, output);
     safeLog(state.span, {
       ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.error) } : {},
@@ -17040,6 +17216,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);
@@ -17052,8 +17230,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, {
@@ -17061,11 +17238,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) {
@@ -17312,16 +17492,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) {
@@ -17500,6 +17684,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;
 }
@@ -17657,6 +17906,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;
@@ -19152,12 +19416,30 @@ function logInstrumentationError2(context, error) {
 
 // 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 = {};
@@ -19716,6 +19998,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") {
@@ -20687,37 +20981,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];
@@ -20751,16 +21105,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
@@ -20782,8 +21136,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();
@@ -20873,11 +21227,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 {};
     }
@@ -21073,9 +21433,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 {
@@ -21097,7 +21454,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,
@@ -21106,6 +21463,8 @@ function injectTracingHooks(options, resolveParentSpan, activeToolSpans, localTo
     subagentStop
   } = createToolTracingHooks(
     resolveParentSpan,
+    taskIdToToolUseId,
+    toolUseToParent,
     activeToolSpans,
     options.mcpServers,
     localToolHookNames,
@@ -21187,6 +21546,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,
@@ -21194,6 +21560,8 @@ async function finalizeCurrentMessageGroup(state) {
     state.options,
     state.currentMessageStartTime,
     parentSpan,
+    usage,
+    hasFinalOutputUsage,
     existingLlmSpan
   );
   if (llmSpanResult) {
@@ -21211,9 +21579,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;
 }
@@ -21304,6 +21680,10 @@ async function ensureActiveLlmSpanForParentToolUse(rootSpan, activeLlmSpansByPar
     );
     llmParentSpan = await subAgentSpan.export();
   }
+  const racedLlmSpan = activeLlmSpansByParentToolUse.get(parentKey);
+  if (racedLlmSpan) {
+    return racedLlmSpan;
+  }
   const llmSpan = startSpan(
     withSpanInstrumentationName(
       {
@@ -21423,7 +21803,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;
@@ -21470,36 +21892,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;
@@ -21507,8 +21902,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) {
@@ -21532,6 +21931,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();
     }
@@ -21656,6 +22058,8 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         const optionsWithHooks = injectTracingHooks(
           options,
           resolveToolUseParentSpan,
+          taskIdToToolUseId,
+          toolUseToParent,
           activeToolSpans,
           localToolHookNames,
           skipLocalToolHooks,
@@ -21666,8 +22070,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,
@@ -21675,6 +22079,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           currentMessageStartTime: startTime,
           currentMessages: [],
           endedSubAgentSpans,
+          finalOutputUsageMessageIds: /* @__PURE__ */ new Set(),
           finalResults: [],
           options: optionsWithHooks,
           originalPrompt,
@@ -21690,6 +22095,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           latestLlmParentBySubAgentToolUse,
           latestRootLlmParentRef,
           toolUseToParent,
+          usageByMessageId: /* @__PURE__ */ new Map(),
           localToolContext
         });
       },
@@ -24080,9 +24486,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;
     }
   }
@@ -30632,7 +31038,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(
@@ -30641,10 +31047,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
   };
@@ -32599,8 +33005,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();
@@ -32650,8 +33055,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]);
@@ -33437,6 +33841,296 @@ function logInstrumentationError5(context, error) {
   debugLogger.debug(`${context}:`, error);
 }
 
+// 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(channel, name, extractInput2, extractOutput2, extractMetrics2 = extractUsageMetrics3) {
+  return channel.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 (error) {
+      debugLogger.error(`Error starting span for ${name}:`, error);
+      return invokeTarget();
+    }
+    let result;
+    try {
+      result = withCurrent(
+        span,
+        () => runWithAutoInstrumentationSuppressed(invokeTarget)
+      );
+    } catch (error) {
+      finishVoyageAISpan(span, name, () => span.log({ error }));
+      throw error;
+    }
+    void Promise.resolve(result).then(
+      (value) => finishVoyageAISpan(span, name, () => {
+        const metadata = extractResponseMetadata3(value);
+        span.log({
+          output: extractOutput2(value),
+          ...metadata ? { metadata } : {},
+          metrics: extractMetrics2(value)
+        });
+      }),
+      (error) => finishVoyageAISpan(span, name, () => span.log({ error }))
+    );
+    return result;
+  });
+}
+function finishVoyageAISpan(span, name, log2) {
+  try {
+    log2();
+  } catch (error) {
+    debugLogger.error(`Error logging span for ${name}:`, error);
+  }
+  try {
+    span.end();
+  } catch (error) {
+    debugLogger.error(`Error ending span for ${name}:`, error);
+  }
+}
+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-instrumentation.ts
 var wrappedTurnRunners = /* @__PURE__ */ new WeakSet();
 var wrappedResponseHooks = /* @__PURE__ */ new WeakSet();
@@ -33987,6 +34681,7 @@ var BraintrustPlugin = class extends BasePlugin {
   langSmithPlugin = null;
   piCodingAgentPlugin = null;
   strandsAgentSDKPlugin = null;
+  voyageAIPlugin = null;
   cloudflareAIChatPlugin = null;
   cloudflareAgentsPlugin = null;
   constructor(config = {}) {
@@ -34061,6 +34756,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();
@@ -34177,6 +34876,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;
@@ -34543,7 +35246,7 @@ function wrapMastraAgent(agent, _options) {
 
 // src/node/config.ts
 import { AsyncLocalStorage } from "node:async_hooks";
-import * as path from "node:path";
+import * as path2 from "node:path";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as fsSync from "node:fs";
@@ -34552,34 +35255,93 @@ import { promisify } from "node:util";
 import * as zlib from "node:zlib";
 import * as dotenv from "dotenv";
 
-// src/gitutil.ts
-import { simpleGit } from "simple-git";
-var COMMON_BASE_BRANCHES = ["main", "master", "develop"];
-async function currentRepo() {
-  try {
-    const git = simpleGit();
-    if (await git.checkIsRepo()) {
-      return git;
-    } else {
-      return null;
+// src/git-command.ts
+import { execFile } from "node:child_process";
+import { constants } from "node:fs";
+import { access } from "node:fs/promises";
+import * as path from "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;
+    }
+    for (const executableName of GIT_EXECUTABLE_NAMES) {
+      const candidate = path.join(searchDir, executableName);
+      try {
+        await access(
+          candidate,
+          process.platform === "win32" ? constants.F_OK : constants.X_OK
+        );
+        return candidate;
+      } catch {
+      }
     }
-  } catch {
-    return null;
   }
+  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((resolve, reject) => {
+    execFile(
+      executable,
+      args,
+      {
+        cwd: options.cwd,
+        encoding: "utf8",
+        maxBuffer: GIT_MAX_BUFFER_BYTES
+      },
+      (error, stdout) => {
+        if (error) {
+          reject(error);
+        } else {
+          resolve(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)
     );
@@ -34587,7 +35349,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}`);
         }
@@ -34605,27 +35367,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;
@@ -34640,8 +35403,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 {
@@ -34672,9 +35437,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;
@@ -34685,29 +35455,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 {
@@ -34788,9 +35561,9 @@ function configureNode() {
       return value;
     }
     const envPaths = [];
-    for (let dir = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir = path.dirname(dir), depth++) {
-      envPaths.push(path.join(dir, ".env.braintrust"));
-      if (path.dirname(dir) === dir) {
+    for (let dir = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir = path2.dirname(dir), depth++) {
+      envPaths.push(path2.join(dir, ".env.braintrust"));
+      if (path2.dirname(dir) === dir) {
         break;
       }
     }
@@ -34832,10 +35605,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;
@@ -34870,8 +35643,8 @@ function configureNode() {
   registry.enable();
 }
 function getNearestBraintrustEnvValue(name) {
-  for (let dir = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir = path.dirname(dir), depth++) {
-    const envPath = path.join(dir, ".env.braintrust");
+  for (let dir = process.cwd(), depth = 0; depth <= BRAINTRUST_ENV_SEARCH_PARENT_LIMIT; dir = path2.dirname(dir), depth++) {
+    const envPath = path2.join(dir, ".env.braintrust");
     try {
       const parsed = dotenv.parse(fsSync.readFileSync(envPath, "utf8"));
       const value = parsed[name];
@@ -34881,7 +35654,7 @@ function getNearestBraintrustEnvValue(name) {
         return void 0;
       }
     }
-    if (path.dirname(dir) === dir) {
+    if (path2.dirname(dir) === dir) {
       break;
     }
   }
@@ -34939,9 +35712,10 @@ export {
   TRACESTATE_HEADER,
   BAGGAGE_HEADER,
   BRAINTRUST_PARENT_KEY,
+  uint8ArrayToBase64,
+  base64ToUint8Array,
   spanObjectTypeV3ToTypedString,
   isObject,
-  mergeDicts,
   slugify,
   SpanComponentsV4,
   makeScorerPropagatedEvent,
@@ -34992,6 +35766,7 @@ export {
   ReadonlyAttachment,
   JSONAttachment,
   updateSpan,
+  _internalResumeSpan,
   spanComponentsToObjectId,
   ERR_PERMALINK,
   permalink,
@@ -35053,6 +35828,7 @@ export {
   X_CACHED_HEADER,
   parseCachedHeader,
   finalizeAnthropicTokens,
+  toNumericMetrics,
   extractAnthropicCacheTokens,
   collectAnthropicSession,
   zodToJsonSchema,