braintrust 3.26.0 → 3.28.0

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

@@ -7,6 +7,7 @@ import {
   claudeAgentSDKChannels,
   cloudflareAIChatChannels,
   cloudflareAgentsChannels,
+  cloudflareThinkChannels,
   cohereChannels,
   cursorSDKChannels,
   detectSpanOriginEnvironment,
@@ -31,6 +32,7 @@ import {
   langSmithChannels,
   mergeSpanOriginContext,
   mistralChannels,
+  ollamaChannels,
   openAIAgentsCoreChannels,
   openAIChannels,
   openAICodexChannels,
@@ -43,8 +45,9 @@ import {
   smithyClientChannels,
   smithyCoreChannels,
   strandsAgentSDKChannels,
+  voyageAIChannels,
   withSpanInstrumentationName
-} from "./chunk-PN7EWK66.mjs";
+} from "./chunk-ZHUHZWFY.mjs";
 
 // src/id-gen.ts
 import { v4 as uuidv4 } from "uuid";
@@ -1119,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 = [];
@@ -1160,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;
     }
@@ -1778,7 +1781,8 @@ var AclObjectType = z6.union([
     "org_member",
     "project_log",
     "org_project",
-    "org_audit_logs"
+    "org_audit_logs",
+    "project_group"
   ]),
   z6.null()
 ]);
@@ -1907,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(),
@@ -1976,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(),
@@ -1987,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(),
@@ -2002,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(),
@@ -2015,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(),
@@ -2276,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(),
@@ -2509,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(),
@@ -3014,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",
@@ -3035,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(),
@@ -3115,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()
@@ -3156,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()
 });
@@ -3170,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()
         })
       ])
     }),
@@ -3229,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(),
@@ -3461,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(),
@@ -3666,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(),
@@ -4250,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()
         };
       })
@@ -4908,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"
@@ -5505,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]) : []
@@ -5528,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;
@@ -5537,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",
@@ -5558,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(
@@ -6131,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;
@@ -9011,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"
@@ -9020,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`,
         {
@@ -9059,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;
@@ -9579,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() {
@@ -10883,6 +11037,25 @@ function getCachedMetricFromHeaders(headers) {
   return parseCachedHeader(headers.get(LEGACY_CACHED_HEADER));
 }
 
+// src/wrappers/anthropic-session-collector.ts
+var sessionStreamCollectors = /* @__PURE__ */ new WeakMap();
+function registerAnthropicSessionStreamCollector(stream, collector) {
+  sessionStreamCollectors.set(stream, collector);
+}
+function collectAnthropicSession(stream) {
+  const collector = sessionStreamCollectors.get(stream);
+  if (!collector) {
+    return stream;
+  }
+  sessionStreamCollectors.delete(stream);
+  try {
+    collector();
+  } catch (error) {
+    debugLogger.error("Failed to collect Anthropic Sessions stream:", error);
+  }
+  return stream;
+}
+
 // src/instrumentation/core/stream-patcher.ts
 function isAsyncIterable(value) {
   return value !== null && typeof value === "object" && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
@@ -10907,6 +11080,34 @@ function patchStreamIfNeeded(stream, options) {
     );
     return stream;
   }
+  const chunks = [];
+  let completed = false;
+  const notifyCancellation = async () => {
+    try {
+      await (options.onCancel ?? options.onComplete)(chunks);
+    } catch (error) {
+      debugLogger.error("Error in stream cancellation handler:", error);
+    }
+  };
+  const patchAbortIfPresent = () => {
+    try {
+      if ("abort" in stream && typeof stream.abort === "function") {
+        const originalAbort = stream.abort.bind(stream);
+        stream.abort = (...args) => {
+          try {
+            return originalAbort(...args);
+          } finally {
+            if (!completed) {
+              completed = true;
+              void notifyCancellation();
+            }
+          }
+        };
+      }
+    } catch (error) {
+      debugLogger.warn("Failed to patch stream abort method:", error);
+    }
+  };
   if (hasAsyncIteratorMethods(stream) && isSelfAsyncIterator(stream)) {
     if ("__braintrust_patched_iterator_methods" in stream) {
       return stream;
@@ -10915,8 +11116,6 @@ function patchStreamIfNeeded(stream, options) {
       const originalNext = stream.next.bind(stream);
       const originalReturn = typeof stream.return === "function" ? stream.return.bind(stream) : null;
       const originalThrow = typeof stream.throw === "function" ? stream.throw.bind(stream) : null;
-      const chunks = [];
-      let completed = false;
       stream.next = async (...args) => {
         try {
           const result = await runNextWithWrapper(
@@ -10968,11 +11167,7 @@ function patchStreamIfNeeded(stream, options) {
         stream.return = async (...args) => {
           if (!completed) {
             completed = true;
-            try {
-              await options.onComplete(chunks);
-            } catch (error) {
-              console.error("Error in stream onComplete handler:", error);
-            }
+            await notifyCancellation();
           }
           return originalReturn(...args);
         };
@@ -10997,6 +11192,7 @@ function patchStreamIfNeeded(stream, options) {
       Object.defineProperty(stream, "__braintrust_patched_iterator_methods", {
         value: true
       });
+      patchAbortIfPresent();
       return stream;
     } catch (error) {
       console.warn("Failed to patch stream iterator methods:", error);
@@ -11010,8 +11206,6 @@ function patchStreamIfNeeded(stream, options) {
     const patchedIteratorFn = function() {
       const iterator = originalIteratorFn.call(this);
       const originalNext = iterator.next.bind(iterator);
-      const chunks = [];
-      let completed = false;
       iterator.next = async function(...args) {
         try {
           const result = await runNextWithWrapper(
@@ -11064,11 +11258,7 @@ function patchStreamIfNeeded(stream, options) {
         iterator.return = async function(...args) {
           if (!completed) {
             completed = true;
-            try {
-              await options.onComplete(chunks);
-            } catch (error) {
-              console.error("Error in stream onComplete handler:", error);
-            }
+            await notifyCancellation();
           }
           return originalReturn(...args);
         };
@@ -11097,6 +11287,7 @@ function patchStreamIfNeeded(stream, options) {
       value: true
     });
     stream[Symbol.asyncIterator] = patchedIteratorFn;
+    patchAbortIfPresent();
     return stream;
   } catch (error) {
     console.warn("Failed to patch stream:", error);
@@ -11845,6 +12036,33 @@ function traceStreamingChannel(channel, config) {
       const { span, startTime } = spanData;
       if (isAsyncIterable(asyncEndEvent.result)) {
         let firstChunkTime;
+        const handleStreamError = (error) => {
+          try {
+            span.log({ error });
+          } catch (loggingError) {
+            debugLogger.error(
+              `Error logging failure for ${channelName}:`,
+              loggingError
+            );
+          }
+          try {
+            span.end();
+          } catch (endingError) {
+            debugLogger.error(
+              `Error ending span for ${channelName}:`,
+              endingError
+            );
+          }
+          states.delete(event);
+          runStreamingErrorHook({
+            channelName,
+            config,
+            error,
+            event: asyncEndEvent,
+            span,
+            startTime
+          });
+        };
         patchStreamIfNeeded(asyncEndEvent.result, {
           onChunk: () => {
             if (firstChunkTime === void 0) {
@@ -11924,33 +12142,12 @@ function traceStreamingChannel(channel, config) {
               });
             }
           },
-          onError: (error) => {
-            try {
-              span.log({ error });
-            } catch (loggingError) {
-              debugLogger.error(
-                `Error logging failure for ${channelName}:`,
-                loggingError
-              );
-            }
-            try {
-              span.end();
-            } catch (endingError) {
-              debugLogger.error(
-                `Error ending span for ${channelName}:`,
-                endingError
-              );
-            }
-            states.delete(event);
-            runStreamingErrorHook({
-              channelName,
-              config,
-              error,
-              event: asyncEndEvent,
-              span,
-              startTime
-            });
-          }
+          onCancel: () => {
+            const error = new Error("Stream cancelled before completion");
+            error.name = "AbortError";
+            handleStreamError(error);
+          },
+          onError: handleStreamError
         });
         return;
       }
@@ -12266,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,
@@ -12710,6 +12923,29 @@ function currentWorkflowAgentWrapperSpan() {
   return void 0;
 }
 
+// src/instrumentation/plugins/cloudflare-think-context.ts
+var cloudflareThinkSpans = /* @__PURE__ */ new Map();
+function registerCloudflareThinkSpan(span) {
+  if (span.spanId) {
+    cloudflareThinkSpans.set(span.spanId, span);
+  }
+}
+function unregisterCloudflareThinkSpan(span) {
+  if (span.spanId) {
+    cloudflareThinkSpans.delete(span.spanId);
+  }
+}
+function currentCloudflareThinkSpan() {
+  const parentSpanIds = _internalGetGlobalState()?.contextManager.getParentSpanIds()?.spanParents ?? [];
+  for (const parentSpanId of parentSpanIds) {
+    const span = cloudflareThinkSpans.get(parentSpanId);
+    if (span) {
+      return span;
+    }
+  }
+  return void 0;
+}
+
 // src/vendor-sdk-types/ai-sdk-v7-telemetry.ts
 var BRAINTRUST_AI_SDK_V7_OPERATION_KEY = /* @__PURE__ */ Symbol.for(
   "braintrust.ai-sdk.v7.telemetry-operation-key"
@@ -12821,6 +13057,7 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamText, {
         name: "streamText",
         type: "function" /* FUNCTION */,
+        shouldTrace: () => currentCloudflareThinkSpan() === void 0,
         extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
@@ -12841,6 +13078,7 @@ var AISDKPlugin = class extends BasePlugin {
       traceSyncStreamChannel(aiSDKChannels.streamTextSync, {
         name: "streamText",
         type: "function" /* FUNCTION */,
+        shouldTrace: () => currentCloudflareThinkSpan() === void 0,
         extractInput: ([params], event, span) => prepareAISDKCallInput(params, event, span, denyOutputPaths),
         patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
           defaultDenyOutputPaths: denyOutputPaths,
@@ -13423,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;
@@ -13826,6 +14064,23 @@ function prepareAISDKWorkflowAgentStreamInput(params, event, span, defaultDenyOu
     metadata
   };
 }
+function prepareAISDKAgentCallInput(params, event, span, defaultDenyOutputPaths = DEFAULT_DENY_OUTPUT_PATHS) {
+  const { input } = processAISDKWorkflowAgentCallInput(params);
+  const metadata = extractMetadataFromCallParams(params, event.self);
+  const childTracing = prepareAISDKChildTracing(
+    params,
+    event.self,
+    span,
+    defaultDenyOutputPaths,
+    event.aiSDK,
+    { agentOwner: true }
+  );
+  event.modelWrapped = childTracing.modelWrapped;
+  if (childTracing.cleanup) {
+    event.__braintrust_ai_sdk_cleanup = childTracing.cleanup;
+  }
+  return { input, metadata };
+}
 function prepareAISDKEmbedInput(params, self) {
   return {
     input: { ...params },
@@ -13849,6 +14104,18 @@ function extractTopLevelAISDKMetrics(result, event, startTime) {
   }
   return metrics;
 }
+async function extractResolvedAISDKTokenMetrics(result) {
+  for (const field of ["totalUsage", "usage"]) {
+    try {
+      const usage = await Promise.resolve(result[field]);
+      if (usage !== void 0) {
+        return extractTokenMetrics({ [field]: usage });
+      }
+    } catch {
+    }
+  }
+  return extractTokenMetrics(result);
+}
 function hasModelChildTracing(event) {
   return event?.modelWrapped === true || event?.__braintrust_ai_sdk_model_wrapped === true;
 }
@@ -14666,13 +14933,15 @@ function patchAISDKStreamingResult(args) {
   const {
     defaultDenyOutputPaths,
     endEvent,
+    forceTopLevelMetrics,
     onComplete,
     onCancel,
     onError,
     result,
     resolvePromiseUsage,
     span,
-    startTime
+    startTime,
+    transformOutput
   } = args;
   if (!result || typeof result !== "object") {
     return false;
@@ -14725,8 +14994,8 @@ function patchAISDKStreamingResult(args) {
     }
     outputLogged = true;
     try {
-      const metrics = extractTopLevelAISDKMetrics(result, endEvent);
-      if (resolvePromiseUsage) {
+      const metrics = forceTopLevelMetrics ? await extractResolvedAISDKTokenMetrics(result) : extractTopLevelAISDKMetrics(result, endEvent);
+      if (resolvePromiseUsage && !forceTopLevelMetrics) {
         try {
           const resultRecord2 = result;
           const pendingUsage = resultRecord2.totalUsage ?? resultRecord2.usage;
@@ -14745,10 +15014,11 @@ function patchAISDKStreamingResult(args) {
       if (metrics.time_to_first_token === void 0 && firstChunkTime !== void 0) {
         metrics.time_to_first_token = firstChunkTime - startTime;
       }
-      const output = await processAISDKStreamingOutput(
+      const processedOutput = await processAISDKStreamingOutput(
         result,
         resolveDenyOutputPaths(endEvent, defaultDenyOutputPaths)
       );
+      const output = transformOutput ? transformOutput(processedOutput) : processedOutput;
       const metadata = buildResolvedMetadataPayload(result).metadata;
       try {
         span.log({
@@ -15153,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) {
@@ -15596,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);
@@ -15613,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 === "") {
@@ -15669,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;
 }
@@ -16897,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) {
@@ -16915,16 +17188,21 @@ var FlueObserveBridge = class {
       return;
     }
     const state = this.operationsById.get(event.operationId) ?? this.startSyntheticOperation(event);
-    const output = operationOutput(event);
+    const output = operationOutput(event) ?? outputFromAgentTurn(state.latestAgentOutput);
     const metadata = {
       ...state.metadata,
       ...extractEventMetadata(event),
       ...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.error) } : {},
+      ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.error) } : {},
       metadata,
       metrics: durationMetrics(event.durationMs),
       output
@@ -16938,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);
@@ -16950,20 +17230,22 @@ 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, {
-      name: `llm:${model ?? event.purpose ?? "unknown"}`,
+      name: "flue.turn",
       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) {
@@ -16999,6 +17281,12 @@ var FlueObserveBridge = class {
       },
       output
     });
+    if (event.purpose === "agent" && event.operationId) {
+      const operation = this.operationsById.get(event.operationId);
+      if (operation) {
+        operation.latestAgentOutput = output;
+      }
+    }
     safeEnd(state.span, eventTime(event.timestamp));
     this.turnsByKey.delete(key);
   }
@@ -17078,7 +17366,7 @@ var FlueObserveBridge = class {
       return;
     }
     safeLog(state.span, {
-      ...event.isError ? { error: toLoggedError(event.result) } : {},
+      ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.result) } : {},
       metadata: {
         ...state.metadata,
         ...extractEventMetadata(event),
@@ -17124,6 +17412,7 @@ var FlueObserveBridge = class {
       ...event.usage ? { "flue.usage": event.usage } : {}
     };
     safeLog(state.span, {
+      ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.error) } : {},
       metadata,
       metrics: {
         ...durationMetrics(event.durationMs),
@@ -17203,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) {
@@ -17228,7 +17521,7 @@ var FlueObserveBridge = class {
       ...event.purpose ? { "flue.turn_purpose": event.purpose } : {}
     };
     const span = startFlueSpan(this.parentSpanForEvent(event), {
-      name: `llm:${model ?? event.purpose ?? "unknown"}`,
+      name: "flue.turn",
       spanAttributes: { type: "llm" /* LLM */ },
       startTime: eventTime(event.timestamp),
       event: { metadata }
@@ -17360,7 +17653,10 @@ function extractEventMetadata(event, ctx) {
   return {
     ...event.runId ? { "flue.run_id": event.runId } : {},
     ...event.instanceId ? { "flue.instance_id": event.instanceId } : {},
+    ...event.submissionId ? { "flue.submission_id": event.submissionId } : {},
     ...event.dispatchId ? { "flue.dispatch_id": event.dispatchId } : {},
+    ...event.agentName ? { "flue.agent_name": event.agentName } : {},
+    ...event.conversationId ? { "flue.conversation_id": event.conversationId } : {},
     ...typeof event.eventIndex === "number" ? { "flue.event_index": event.eventIndex } : {},
     ...event.session ? { "flue.session": event.session } : {},
     ...event.parentSession ? { "flue.parent_session": event.parentSession } : {},
@@ -17388,8 +17684,73 @@ 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?.model ?? event.model;
+  return event.request?.requestedModel ?? event.request?.model ?? event.model;
 }
 function flueTurnRequestProvider(event) {
   return event.request?.providerName ?? event.provider ?? event.request?.providerId;
@@ -17398,10 +17759,10 @@ function flueTurnRequestApi(event) {
   return event.request?.api ?? event.api;
 }
 function flueTurnRequestReasoning(event) {
-  return event.request?.reasoning ?? event.reasoning;
+  return event.request?.reasoningLevel ?? event.request?.reasoning ?? event.reasoning;
 }
 function flueTurnModel(event) {
-  return event.request?.model ?? event.model;
+  return event.response?.responseModel ?? event.request?.requestedModel ?? event.request?.model ?? event.model;
 }
 function flueTurnProvider(event) {
   return event.request?.providerName ?? event.provider ?? event.request?.providerId;
@@ -17416,7 +17777,7 @@ function flueTurnOutput(event) {
   return event.response?.output ?? event.output;
 }
 function flueTurnStopReason(event) {
-  return event.response?.stopReason ?? event.stopReason;
+  return event.response?.finishReason ?? event.response?.stopReason ?? event.stopReason;
 }
 function flueTurnError(event) {
   return event.response?.error ?? event.response?.errorInfo?.message ?? event.error;
@@ -17431,6 +17792,9 @@ function flueToolInput(event) {
   return event.input;
 }
 function flueToolOutput(event) {
+  if (Object.hasOwn(event, "effectiveResult")) {
+    return event.effectiveResult;
+  }
   return event.output !== void 0 ? event.output : event.result;
 }
 function flueToolError(event) {
@@ -17438,10 +17802,36 @@ function flueToolError(event) {
 }
 function operationOutput(event) {
   if (event.operationKind === "prompt" || event.operationKind === "skill") {
-    return llmResultFromOperationResult(event.result);
+    return outputFromAgentInvocation(event.agentOutput) ?? llmResultFromOperationResult(event.result);
   }
   return event.result ?? (event.operationKind === "compact" ? { completed: true } : void 0);
 }
+function outputFromAgentInvocation(output) {
+  if (output?.type === "text") {
+    return output.text;
+  }
+  if (output?.type === "data") {
+    return output.data;
+  }
+  return void 0;
+}
+function outputFromAgentTurn(output) {
+  if (!isObjectLike(output)) {
+    return output;
+  }
+  const content = Reflect.get(output, "content");
+  if (!Array.isArray(content)) {
+    return output;
+  }
+  const text = content.flatMap((part) => {
+    if (!isObjectLike(part) || Reflect.get(part, "type") !== "text") {
+      return [];
+    }
+    const value = Reflect.get(part, "text");
+    return typeof value === "string" ? [value] : [];
+  });
+  return text.length > 0 ? text.join("") : output;
+}
 function llmResultFromOperationResult(result) {
   if (!isObjectLike(result)) {
     return result;
@@ -17516,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;
@@ -17540,7 +17945,7 @@ function safeEnd(span, endTime) {
   }
 }
 function logInstrumentationError(label, error) {
-  console.error(`Error in ${label} instrumentation:`, error);
+  debugLogger.debug(`Error in ${label} instrumentation:`, error);
 }
 
 // src/wrappers/langchain/callback-handler.ts
@@ -19011,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 = {};
@@ -19037,6 +19460,7 @@ var AnthropicPlugin = class extends BasePlugin {
   onEnable() {
     this.subscribeToAnthropicChannels();
     this.subscribeToAnthropicToolRunner();
+    this.subscribeToAnthropicSessionStreams();
   }
   onDisable() {
     this.unsubscribers = unsubscribeAll(this.unsubscribers);
@@ -19154,7 +19578,411 @@ var AnthropicPlugin = class extends BasePlugin {
       tracingChannel.unsubscribe(handlers);
     });
   }
+  subscribeToAnthropicSessionStreams() {
+    this.subscribeToAnthropicSessionStream(
+      anthropicChannels.betaSessionsEventsStream,
+      false
+    );
+    this.subscribeToAnthropicSessionStream(
+      anthropicChannels.betaSessionsThreadsEventsStream,
+      true
+    );
+  }
+  subscribeToAnthropicSessionStream(channel, isThread) {
+    const tracingChannel = channel.tracingChannel();
+    const pending = /* @__PURE__ */ new WeakSet();
+    const handlers = {
+      start: (event) => {
+        if (isAutoInstrumentationSuppressed()) {
+          return;
+        }
+        pending.add(event);
+      },
+      asyncEnd: (event) => {
+        if (!pending.delete(event)) {
+          return;
+        }
+        const stream = event.result;
+        if (!isAsyncIterable(stream)) {
+          return;
+        }
+        registerAnthropicSessionStreamCollector(stream, () => {
+          wrapAnthropicSessionEventStream(stream, isThread);
+        });
+      },
+      error: (event) => {
+        pending.delete(event);
+      }
+    };
+    tracingChannel.subscribe(handlers);
+    this.unsubscribers.push(() => tracingChannel.unsubscribe(handlers));
+  }
 };
+function wrapAnthropicSessionEventStream(stream, isThread) {
+  const state = {
+    history: [],
+    isThread,
+    pendingInput: [],
+    seenEventIds: /* @__PURE__ */ new Set()
+  };
+  patchStreamIfNeeded(stream, {
+    onChunk: (event) => handleAnthropicSessionEvent(state, event),
+    onComplete: () => finalizeAnthropicSessionTurn(state),
+    onError: (error) => finalizeAnthropicSessionTurn(state, error)
+  });
+  return stream;
+}
+function handleAnthropicSessionEvent(state, event) {
+  try {
+    if (typeof event.id === "string" && event.type !== "event_delta" && state.seenEventIds.has(event.id)) {
+      return;
+    }
+    if (typeof event.id === "string" && event.type !== "event_delta") {
+      state.seenEventIds.add(event.id);
+    }
+    switch (event.type) {
+      case "user.message":
+      case "system.message":
+        recordAnthropicSessionInput(
+          state,
+          event
+        );
+        break;
+      case "session.status_running":
+        if (!state.isThread) {
+          ensureAnthropicSessionTurn(state);
+        }
+        break;
+      case "session.thread_status_running":
+        if (state.isThread) {
+          ensureAnthropicSessionTurn(state);
+        }
+        break;
+      case "span.model_request_start":
+        if (typeof event.id === "string") {
+          startAnthropicSessionModel(state, event.id);
+        }
+        break;
+      case "event_delta":
+        recordAnthropicSessionFirstToken(state, event);
+        break;
+      case "agent.message":
+        recordAnthropicSessionMessage(
+          state,
+          event
+        );
+        break;
+      case "agent.custom_tool_use":
+      case "agent.mcp_tool_use":
+      case "agent.tool_use":
+        startAnthropicSessionTool(state, event);
+        break;
+      case "user.tool_confirmation":
+        recordAnthropicSessionToolConfirmation(state, event);
+        break;
+      case "agent.mcp_tool_result":
+      case "agent.tool_result":
+      case "user.custom_tool_result":
+      case "user.tool_result":
+        finalizeAnthropicSessionTool(
+          state,
+          event
+        );
+        break;
+      case "span.model_request_end":
+        finalizeAnthropicSessionModel(
+          state,
+          event
+        );
+        break;
+      case "session.status_idle":
+      case "session.thread_status_idle": {
+        if (event.type === "session.status_idle" && state.isThread || event.type === "session.thread_status_idle" && !state.isThread) {
+          break;
+        }
+        const stopReason = isObject(event.stop_reason) ? event.stop_reason.type : void 0;
+        if (stopReason === "end_turn") {
+          finalizeAnthropicSessionTurn(state);
+        } else if (stopReason === "retries_exhausted") {
+          finalizeAnthropicSessionTurn(
+            state,
+            "Anthropic session retries exhausted"
+          );
+        }
+        break;
+      }
+      case "session.error":
+        finalizeAnthropicSessionTurn(state, event.error);
+        break;
+      case "session.deleted":
+      case "session.status_terminated":
+      case "session.thread_status_terminated":
+        if (event.type === "session.deleted" || event.type === "session.status_terminated" && !state.isThread || event.type === "session.thread_status_terminated" && state.isThread) {
+          finalizeAnthropicSessionTurn(state);
+        }
+        break;
+      default:
+        break;
+    }
+  } catch (error) {
+    debugLogger.debug("Error processing Anthropic Sessions event:", error);
+  }
+}
+function ensureAnthropicSessionTurn(state) {
+  if (state.activeTurn) {
+    return state.activeTurn;
+  }
+  const input = state.pendingInput;
+  state.pendingInput = [];
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          ...input.length > 0 ? { input } : {},
+          metadata: { provider: "anthropic" }
+        },
+        name: state.isThread ? "anthropic.beta.sessions.thread.turn" : "anthropic.beta.sessions.turn",
+        spanAttributes: { type: "task" /* TASK */ }
+      },
+      INSTRUMENTATION_NAMES.ANTHROPIC
+    )
+  );
+  state.activeTurn = {
+    activeTools: /* @__PURE__ */ new Map(),
+    input: input.slice(),
+    metrics: {},
+    span
+  };
+  return state.activeTurn;
+}
+function recordAnthropicSessionInput(state, event) {
+  const content = processAttachmentsInInput(event.content);
+  const message = {
+    role: event.type === "system.message" ? "system" : "user",
+    content
+  };
+  state.history.push(message);
+  if (state.activeTurn) {
+    state.activeTurn.input.push(message);
+  } else {
+    state.pendingInput.push(message);
+  }
+}
+function startAnthropicSessionModel(state, startEventId) {
+  const turn = ensureAnthropicSessionTurn(state);
+  if (turn.activeModel) {
+    finalizeAnthropicSessionModelState(state, turn);
+  }
+  const span = withCurrent(
+    turn.span,
+    () => startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            ...state.history.length > 0 ? { input: state.history.slice() } : {},
+            metadata: { provider: "anthropic" }
+          },
+          name: "anthropic.messages.create",
+          spanAttributes: { type: "llm" /* LLM */ }
+        },
+        INSTRUMENTATION_NAMES.ANTHROPIC
+      )
+    )
+  );
+  turn.activeModel = {
+    output: [],
+    span,
+    startEventId,
+    startTime: getCurrentUnixTimestamp()
+  };
+}
+function recordAnthropicSessionFirstToken(state, event) {
+  const model = state.activeTurn?.activeModel;
+  if (!model || model.firstTokenTime !== void 0 || !isObject(event.delta) || !isObject(event.delta.content) || typeof event.delta.content.text !== "string") {
+    return;
+  }
+  model.firstTokenTime = getCurrentUnixTimestamp();
+}
+function recordAnthropicSessionMessage(state, event) {
+  const turn = ensureAnthropicSessionTurn(state);
+  const content = processAttachmentsInInput(
+    event.content
+  );
+  if (turn.activeModel) {
+    turn.activeModel.output.push(...content);
+  } else {
+    const output = { role: "assistant", content };
+    turn.lastOutput = output;
+    state.history.push(output);
+  }
+}
+function startAnthropicSessionTool(state, event) {
+  const turn = ensureAnthropicSessionTurn(state);
+  if (turn.activeModel) {
+    turn.activeModel.output.push({
+      type: "tool_use",
+      id: event.id,
+      name: event.name,
+      input: event.input
+    });
+  }
+  const existing = turn.activeTools.get(event.id);
+  if (existing) {
+    existing.span.end();
+    turn.activeTools.delete(event.id);
+  }
+  const span = withCurrent(
+    turn.span,
+    () => startSpan(
+      withSpanInstrumentationName(
+        {
+          event: { input: event.input },
+          name: event.name,
+          spanAttributes: { type: "tool" /* TOOL */ }
+        },
+        INSTRUMENTATION_NAMES.ANTHROPIC
+      )
+    )
+  );
+  const toolState = {
+    approval: event.evaluated_permission === "allow" ? "approved" : event.evaluated_permission === "deny" ? "denied" : void 0,
+    span
+  };
+  turn.activeTools.set(event.id, toolState);
+  if (toolState.approval === "denied") {
+    finalizeAnthropicSessionToolState(toolState);
+    turn.activeTools.delete(event.id);
+  }
+}
+function recordAnthropicSessionToolConfirmation(state, event) {
+  if (typeof event.tool_use_id !== "string" || event.result !== "allow" && event.result !== "deny") {
+    return;
+  }
+  const turn = state.activeTurn;
+  const tool = turn?.activeTools.get(event.tool_use_id);
+  if (!turn || !tool) {
+    return;
+  }
+  tool.approval = event.result === "allow" ? "approved" : "denied";
+  if (tool.approval === "denied") {
+    finalizeAnthropicSessionToolState(tool);
+    turn.activeTools.delete(event.tool_use_id);
+  }
+}
+function finalizeAnthropicSessionTool(state, event) {
+  const toolUseId = event.tool_use_id ?? event.mcp_tool_use_id ?? event.custom_tool_use_id;
+  if (!toolUseId) {
+    return;
+  }
+  const content = processAttachmentsInInput(event.content);
+  const turn = state.activeTurn;
+  const tool = turn?.activeTools.get(toolUseId);
+  if (turn && tool) {
+    finalizeAnthropicSessionToolState(tool, event, content);
+    turn.activeTools.delete(toolUseId);
+  }
+  const toolResult = {
+    type: "tool_result",
+    tool_use_id: toolUseId,
+    ...content !== void 0 ? { content } : {},
+    ...event.is_error === true ? { is_error: true } : {}
+  };
+  state.history.push({
+    role: "user",
+    content: [toolResult]
+  });
+}
+function finalizeAnthropicSessionToolState(state, event, content = event?.content) {
+  safeAnthropicSessionLog(state.span, {
+    ...event?.is_error === true ? {
+      error: content ?? "Anthropic session tool execution failed"
+    } : {},
+    ...state.approval ? { metadata: { tool_approval: state.approval } } : {},
+    ...content !== void 0 ? { output: content } : {}
+  });
+  state.span.end();
+}
+function finalizeAnthropicSessionModel(state, event) {
+  const turn = state.activeTurn;
+  const model = turn?.activeModel;
+  if (!turn || !model || model.startEventId !== event.model_request_start_id) {
+    return;
+  }
+  finalizeAnthropicSessionModelState(state, turn, event);
+}
+function finalizeAnthropicSessionModelState(state, turn, event) {
+  const model = turn.activeModel;
+  if (!model) {
+    return;
+  }
+  turn.activeModel = void 0;
+  const metrics = event ? parseAnthropicSessionModelUsage(event.model_usage) : {};
+  if (model.firstTokenTime !== void 0) {
+    metrics.time_to_first_token = model.firstTokenTime - model.startTime;
+  }
+  const output = model.output.length > 0 ? { role: "assistant", content: model.output } : void 0;
+  safeAnthropicSessionLog(model.span, {
+    ...event?.is_error ? { error: "Anthropic session model request failed" } : {},
+    ...Object.keys(metrics).length > 0 ? { metrics } : {},
+    ...output ? { output } : {}
+  });
+  model.span.end();
+  if (output) {
+    turn.lastOutput = output;
+    state.history.push(output);
+  }
+  for (const key of [
+    "prompt_tokens",
+    "completion_tokens",
+    "tokens",
+    "prompt_cached_tokens",
+    "prompt_cache_creation_tokens"
+  ]) {
+    const value = metrics[key];
+    if (typeof value === "number") {
+      turn.metrics[key] = (turn.metrics[key] ?? 0) + value;
+    }
+  }
+}
+function parseAnthropicSessionModelUsage(usage) {
+  const finalized = finalizeAnthropicTokens({
+    completion_tokens: usage.output_tokens,
+    prompt_cache_creation_tokens: usage.cache_creation_input_tokens,
+    prompt_cached_tokens: usage.cache_read_input_tokens,
+    prompt_tokens: usage.input_tokens
+  });
+  return Object.fromEntries(
+    Object.entries(finalized).filter(
+      (entry) => entry[1] !== void 0
+    )
+  );
+}
+function finalizeAnthropicSessionTurn(state, error) {
+  const turn = state.activeTurn;
+  if (!turn) {
+    return;
+  }
+  state.activeTurn = void 0;
+  finalizeAnthropicSessionModelState(state, turn);
+  for (const tool of turn.activeTools.values()) {
+    finalizeAnthropicSessionToolState(tool);
+  }
+  turn.activeTools.clear();
+  safeAnthropicSessionLog(turn.span, {
+    ...error !== void 0 ? { error: error instanceof Error ? error : toLoggedError(error) } : {},
+    ...turn.input.length > 0 ? { input: turn.input } : {},
+    ...turn.lastOutput ? { output: turn.lastOutput } : {},
+    ...Object.keys(turn.metrics).length > 0 ? { metrics: turn.metrics } : {}
+  });
+  turn.span.end();
+}
+function safeAnthropicSessionLog(span, event) {
+  try {
+    span.log(event);
+  } catch (error) {
+    debugLogger.debug("Error logging Anthropic Sessions span:", error);
+  }
+}
 function parseMetricsFromUsage2(usage) {
   if (!usage) {
     return {};
@@ -19170,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") {
@@ -20141,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];
@@ -20205,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
@@ -20236,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();
@@ -20327,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 {};
     }
@@ -20527,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 {
@@ -20551,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,
@@ -20560,6 +21463,8 @@ function injectTracingHooks(options, resolveParentSpan, activeToolSpans, localTo
     subagentStop
   } = createToolTracingHooks(
     resolveParentSpan,
+    taskIdToToolUseId,
+    toolUseToParent,
     activeToolSpans,
     options.mcpServers,
     localToolHookNames,
@@ -20641,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,
@@ -20648,6 +21560,8 @@ async function finalizeCurrentMessageGroup(state) {
     state.options,
     state.currentMessageStartTime,
     parentSpan,
+    usage,
+    hasFinalOutputUsage,
     existingLlmSpan
   );
   if (llmSpanResult) {
@@ -20665,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;
 }
@@ -20758,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(
       {
@@ -20877,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;
@@ -20924,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;
@@ -20961,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) {
@@ -20986,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();
     }
@@ -21110,6 +22058,8 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
         const optionsWithHooks = injectTracingHooks(
           options,
           resolveToolUseParentSpan,
+          taskIdToToolUseId,
+          toolUseToParent,
           activeToolSpans,
           localToolHookNames,
           skipLocalToolHooks,
@@ -21120,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,
@@ -21129,6 +22079,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           currentMessageStartTime: startTime,
           currentMessages: [],
           endedSubAgentSpans,
+          finalOutputUsageMessageIds: /* @__PURE__ */ new Set(),
           finalResults: [],
           options: optionsWithHooks,
           originalPrompt,
@@ -21144,6 +22095,7 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
           latestLlmParentBySubAgentToolUse,
           latestRootLlmParentRef,
           toolUseToParent,
+          usageByMessageId: /* @__PURE__ */ new Map(),
           localToolContext
         });
       },
@@ -21213,6 +22165,283 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
   }
 };
 
+// src/instrumentation/plugins/cloudflare-think-plugin.ts
+var THINK_STATE_ID = /* @__PURE__ */ Symbol.for("braintrust.cloudflare-think.state-id");
+var CloudflareThinkPlugin = class extends BasePlugin {
+  statesBySpanId = /* @__PURE__ */ new Map();
+  onEnable() {
+    this.subscribeToThinkRuns();
+    this.subscribeToAISDKStreamTextSync();
+    this.subscribeToAISDKStreamTextAsync();
+  }
+  onDisable() {
+    for (const unsubscribe of this.unsubscribers) {
+      unsubscribe();
+    }
+    this.unsubscribers = [];
+    for (const state of this.statesBySpanId.values()) {
+      this.finishState(state);
+    }
+    this.statesBySpanId.clear();
+  }
+  subscribeToThinkRuns() {
+    const channel = cloudflareThinkChannels.runInferenceLoop.tracingChannel();
+    const states = /* @__PURE__ */ new WeakMap();
+    const state = _internalGetGlobalState();
+    const contextManager = state?.contextManager;
+    const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
+    const ensureState2 = (event) => {
+      if (isAutoInstrumentationSuppressed()) {
+        return void 0;
+      }
+      const existing = states.get(event);
+      if (existing) {
+        return existing;
+      }
+      const span = startSpan(
+        withSpanInstrumentationName(
+          {
+            name: "Think.runTurn",
+            spanAttributes: { type: "task" /* TASK */ }
+          },
+          INSTRUMENTATION_NAMES.CLOUDFLARE_THINK
+        )
+      );
+      const runState = {
+        aiResultPatched: false,
+        fallbackInput: extractFallbackInput(event.self?.messages),
+        finalized: false,
+        inputLogged: false,
+        span,
+        startTime: getCurrentUnixTimestamp()
+      };
+      const metadata = {
+        braintrust: {
+          integration_name: "cloudflare-think",
+          sdk_language: "typescript"
+        }
+      };
+      if (typeof event.moduleVersion === "string") {
+        metadata["cloudflare_think.version"] = event.moduleVersion;
+      }
+      span.log({ metadata });
+      states.set(event, runState);
+      if (span.spanId) {
+        this.statesBySpanId.set(span.spanId, runState);
+      }
+      registerCloudflareThinkSpan(span);
+      return runState;
+    };
+    if (contextManager && currentSpanStore && channel.start) {
+      channel.start.bindStore(currentSpanStore, (event) => {
+        const runState = ensureState2(event);
+        return runState ? contextManager.wrapSpanForStore(runState.span) : currentSpanStore.getStore();
+      });
+      this.unsubscribers.push(
+        () => channel.start?.unbindStore(currentSpanStore)
+      );
+    }
+    const handlers = {
+      start: (event) => {
+        ensureState2(event);
+      },
+      asyncEnd: (event) => {
+        const runState = states.get(event);
+        states.delete(event);
+        if (!runState || runState.finalized || runState.aiResultPatched) {
+          return;
+        }
+        this.finishState(runState, void 0, event.result);
+      },
+      error: (event) => {
+        const runState = states.get(event);
+        states.delete(event);
+        if (runState) {
+          this.finishState(runState, event.error);
+        }
+      }
+    };
+    channel.subscribe(handlers);
+    this.unsubscribers.push(() => channel.unsubscribe(handlers));
+  }
+  subscribeToAISDKStreamTextSync() {
+    const channel = aiSDKChannels.streamTextSync.tracingChannel();
+    const handlers = {
+      start: (event) => {
+        this.startAISDKStream(event);
+      },
+      end: (event) => {
+        this.endAISDKStream(event);
+      },
+      error: (event) => {
+        this.errorAISDKStream(event);
+      }
+    };
+    channel.subscribe(handlers);
+    this.unsubscribers.push(() => channel.unsubscribe(handlers));
+  }
+  subscribeToAISDKStreamTextAsync() {
+    const channel = aiSDKChannels.streamText.tracingChannel();
+    const handlers = {
+      start: (event) => {
+        this.startAISDKStream(event);
+      },
+      asyncEnd: (event) => {
+        this.endAISDKStream(event);
+      },
+      error: (event) => {
+        this.errorAISDKStream(event);
+      }
+    };
+    channel.subscribe(handlers);
+    this.unsubscribers.push(() => channel.unsubscribe(handlers));
+  }
+  startAISDKStream(event) {
+    const runState = this.currentState();
+    if (!runState || runState.finalized) {
+      return;
+    }
+    try {
+      const prepared = prepareAISDKAgentCallInput(
+        event.arguments[0],
+        event,
+        runState.span
+      );
+      runState.span.log({
+        input: extractThinkTaskInput(prepared.input),
+        metadata: {
+          ...prepared.metadata,
+          braintrust: {
+            integration_name: "cloudflare-think",
+            sdk_language: "typescript"
+          }
+        }
+      });
+      runState.inputLogged = true;
+      runState.aiEvent = event;
+      Reflect.set(event, THINK_STATE_ID, runState.span.spanId);
+    } catch (error) {
+      debugLogger.error(
+        "Error preparing @cloudflare/think AI SDK tracing:",
+        error
+      );
+    }
+  }
+  endAISDKStream(event) {
+    const runState = this.stateForAISDKEvent(event);
+    if (!runState || runState.finalized) {
+      return;
+    }
+    const patched = patchAISDKStreamingResult({
+      defaultDenyOutputPaths: DEFAULT_DENY_OUTPUT_PATHS,
+      endEvent: event,
+      forceTopLevelMetrics: true,
+      onComplete: () => this.releaseState(runState),
+      result: event.result,
+      span: runState.span,
+      startTime: runState.startTime,
+      transformOutput: extractThinkTaskOutput
+    });
+    runState.aiResultPatched = patched;
+    if (!patched) {
+      this.finishState(runState, void 0, event.result);
+    }
+  }
+  errorAISDKStream(event) {
+    const runState = this.stateForAISDKEvent(event);
+    if (runState) {
+      this.finishState(runState, event.error);
+    }
+  }
+  currentState() {
+    const parentIds = _internalGetGlobalState()?.contextManager.getParentSpanIds()?.spanParents ?? [];
+    for (const parentId of parentIds) {
+      const state = this.statesBySpanId.get(parentId);
+      if (state) {
+        return state;
+      }
+    }
+    return void 0;
+  }
+  stateForAISDKEvent(event) {
+    const spanId = Reflect.get(event, THINK_STATE_ID);
+    return typeof spanId === "string" ? this.statesBySpanId.get(spanId) : void 0;
+  }
+  finishState(state, error, output) {
+    if (state.finalized) {
+      return;
+    }
+    state.finalized = true;
+    try {
+      if (!state.inputLogged && state.fallbackInput !== void 0) {
+        state.span.log({ input: state.fallbackInput });
+      }
+      if (error !== void 0) {
+        state.span.log({ error });
+      } else if (output !== void 0) {
+        state.span.log({ output: extractThinkTaskOutput(output) });
+      }
+      finalizeAISDKChildTracing(state.aiEvent);
+      state.span.end();
+    } finally {
+      this.releaseState(state);
+    }
+  }
+  releaseState(state) {
+    state.finalized = true;
+    unregisterCloudflareThinkSpan(state.span);
+    if (state.span.spanId) {
+      this.statesBySpanId.delete(state.span.spanId);
+    }
+  }
+};
+function extractFallbackInput(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) {
+    return void 0;
+  }
+  let latestUserIndex = -1;
+  for (let index = messages.length - 1; index >= 0; index--) {
+    if (messages[index]?.role === "user") {
+      latestUserIndex = index;
+      break;
+    }
+  }
+  const selected = latestUserIndex >= 0 ? messages.slice(latestUserIndex) : [];
+  return selected.map((message) => ({
+    role: message.role,
+    content: message.content ?? message.parts
+  }));
+}
+function extractThinkTaskOutput(output) {
+  if (!isObject(output)) {
+    return output;
+  }
+  if (typeof output.text === "string") {
+    return { role: "assistant", content: output.text };
+  }
+  if (output.object !== void 0) {
+    return output.object;
+  }
+  return output;
+}
+function extractThinkTaskInput(input) {
+  if (!isObject(input)) {
+    return input;
+  }
+  const system = input.instructions ?? input.system;
+  if (Array.isArray(input.messages)) {
+    return system === void 0 ? input.messages : [{ role: "system", content: system }, ...input.messages];
+  }
+  if (Array.isArray(input.prompt)) {
+    return system === void 0 ? input.prompt : [{ role: "system", content: system }, ...input.prompt];
+  }
+  if (typeof input.prompt === "string") {
+    const messages = [{ role: "user", content: input.prompt }];
+    return system === void 0 ? messages : [{ role: "system", content: system }, ...messages];
+  }
+  return input;
+}
+
 // src/instrumentation/plugins/cursor-sdk-plugin.ts
 var PATCHED_AGENT = /* @__PURE__ */ Symbol.for("braintrust.cursor-sdk.auto-patched-agent");
 var PATCHED_RUN = /* @__PURE__ */ Symbol.for("braintrust.cursor-sdk.patched-run");
@@ -23257,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;
     }
   }
@@ -26730,6 +27959,450 @@ function aggregateMistralStreamChunks(chunks) {
   };
 }
 
+// src/instrumentation/plugins/ollama-plugin.ts
+var OllamaPlugin = class extends BasePlugin {
+  onEnable() {
+    this.unsubscribers.push(
+      traceStreamingChannel(ollamaChannels.chat, {
+        name: "ollama.chat",
+        type: "llm" /* LLM */,
+        extractInput: extractOllamaChatInput,
+        extractOutput: (result, event) => extractOllamaChatOutput(
+          result,
+          countOllamaToolCalls(event?.arguments?.[0]?.messages)
+        ),
+        extractMetadata: extractOllamaResponseMetadata,
+        extractMetrics: extractOllamaMetrics,
+        aggregateChunks: aggregateOllamaChatChunks
+      }),
+      traceStreamingChannel(ollamaChannels.generate, {
+        name: "ollama.generate",
+        type: "llm" /* LLM */,
+        extractInput: extractOllamaGenerateInput,
+        extractOutput: extractOllamaGenerateOutput,
+        extractMetadata: extractOllamaResponseMetadata,
+        extractMetrics: extractOllamaMetrics,
+        aggregateChunks: aggregateOllamaGenerateChunks
+      }),
+      traceAsyncChannel(ollamaChannels.embed, {
+        name: "ollama.embed",
+        type: "llm" /* LLM */,
+        extractInput: extractOllamaEmbedInput,
+        extractOutput: extractOllamaEmbedOutput,
+        extractMetadata: extractOllamaResponseMetadata,
+        extractMetrics: extractOllamaMetrics
+      })
+    );
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+};
+function isNonNegativeNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+function normalizeFinishReason(response, hasToolCalls = false) {
+  if (hasToolCalls) {
+    return "tool_calls";
+  }
+  return response?.done_reason || "stop";
+}
+function stringifyArguments(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  try {
+    return JSON.stringify(value ?? {});
+  } catch {
+    return String(value);
+  }
+}
+function syntheticToolCallId(name, index) {
+  const normalizedName = name.replace(/[^a-zA-Z0-9_-]/g, "_") || "tool";
+  return `ollama_call_${normalizedName}_${index}`;
+}
+function normalizeToolCall(toolCall, index) {
+  const name = toolCall.function?.name;
+  if (typeof name !== "string" || name.length === 0) {
+    return void 0;
+  }
+  return {
+    id: typeof toolCall.id === "string" && toolCall.id.length > 0 ? toolCall.id : syntheticToolCallId(name, index),
+    type: "function",
+    function: {
+      name,
+      arguments: stringifyArguments(toolCall.function?.arguments)
+    }
+  };
+}
+function normalizeToolCalls(toolCalls, syntheticIdOffset = 0) {
+  if (!Array.isArray(toolCalls)) {
+    return [];
+  }
+  return toolCalls.flatMap((toolCall, index) => {
+    const normalized = normalizeToolCall(toolCall, syntheticIdOffset + index);
+    return normalized ? [normalized] : [];
+  });
+}
+function countOllamaToolCalls(messages) {
+  if (!Array.isArray(messages)) {
+    return 0;
+  }
+  return messages.reduce(
+    (count, message) => count + (isObject(message) && Array.isArray(message.tool_calls) ? message.tool_calls.length : 0),
+    0
+  );
+}
+function imageBytes(value) {
+  if (value instanceof Uint8Array) {
+    return value;
+  }
+  if (value instanceof ArrayBuffer) {
+    return new Uint8Array(value);
+  }
+  if (typeof value !== "string" || value.startsWith("data:")) {
+    return void 0;
+  }
+  try {
+    const decoded = atob(value.slice(0, 24));
+    return Uint8Array.from(decoded, (character) => character.charCodeAt(0));
+  } catch {
+    return void 0;
+  }
+}
+function inferImageMediaType(value) {
+  if (typeof value === "string") {
+    const dataUrlType = value.match(/^data:(image\/[^;]+);base64,/i)?.[1];
+    if (dataUrlType) {
+      return dataUrlType;
+    }
+  }
+  const bytes = imageBytes(value);
+  if (!bytes) {
+    return void 0;
+  }
+  if (bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71) {
+    return "image/png";
+  }
+  if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) {
+    return "image/jpeg";
+  }
+  const signature = String.fromCharCode(...bytes.slice(0, 12));
+  if (signature.startsWith("GIF87a") || signature.startsWith("GIF89a")) {
+    return "image/gif";
+  }
+  if (signature.startsWith("RIFF") && signature.slice(8, 12) === "WEBP") {
+    return "image/webp";
+  }
+  return void 0;
+}
+function normalizeTextAndImages(content, images) {
+  if (!images || images.length === 0) {
+    return { content };
+  }
+  const imageParts = [];
+  const unrecognizedImages = [];
+  for (const image of images) {
+    let localImagePath;
+    let localPathMediaType;
+    if (typeof image === "string" && !/^data:/i.test(image) && !/^https?:\/\//i.test(image)) {
+      const extension = image.match(/\.([a-z0-9]+)$/i)?.[1]?.toLowerCase();
+      const extensionMediaType = {
+        png: "image/png",
+        jpg: "image/jpeg",
+        jpeg: "image/jpeg",
+        gif: "image/gif",
+        webp: "image/webp"
+      }[extension ?? ""];
+      if (extensionMediaType && isomorph_default.statSync) {
+        try {
+          if (isomorph_default.statSync(image).isFile()) {
+            localImagePath = image;
+            localPathMediaType = extensionMediaType;
+          }
+        } catch {
+        }
+      }
+    }
+    const mediaType = localPathMediaType ?? inferImageMediaType(image);
+    if (!mediaType) {
+      unrecognizedImages.push(image);
+      continue;
+    }
+    const processedImage = localImagePath ? new Attachment({
+      data: localImagePath,
+      filename: localImagePath.split(/[\\/]/).at(-1) ?? "image",
+      contentType: mediaType
+    }) : processInputAttachments({
+      type: "image",
+      image,
+      mediaType
+    }).image;
+    imageParts.push({
+      type: "image_url",
+      image_url: { url: processedImage }
+    });
+  }
+  return {
+    content: imageParts.length > 0 ? [...content ? [{ type: "text", text: content }] : [], ...imageParts] : content,
+    ...unrecognizedImages.length > 0 ? { unrecognizedImages } : {}
+  };
+}
+function normalizeMessage(message, toolCallId, syntheticToolCallIdOffset = 0) {
+  if (typeof message.role !== "string") {
+    return void 0;
+  }
+  const toolCalls = normalizeToolCalls(
+    message.tool_calls,
+    syntheticToolCallIdOffset
+  );
+  if (message.role === "tool") {
+    const toolName = typeof message.tool_name === "string" && message.tool_name.length > 0 ? message.tool_name : "tool";
+    return {
+      role: "tool",
+      tool_call_id: toolCallId ?? syntheticToolCallId(toolName, 0),
+      content: typeof message.content === "string" ? message.content : ""
+    };
+  }
+  const normalizedContent = normalizeTextAndImages(
+    typeof message.content === "string" ? message.content || (toolCalls.length > 0 ? null : "") : toolCalls.length > 0 ? null : "",
+    message.images
+  );
+  return {
+    role: message.role,
+    content: normalizedContent.content,
+    ...typeof message.thinking === "string" && message.thinking.length > 0 ? { reasoning: message.thinking } : {},
+    ...toolCalls.length > 0 ? { tool_calls: toolCalls } : {},
+    ...normalizedContent.unrecognizedImages ? { images: normalizedContent.unrecognizedImages } : {}
+  };
+}
+function normalizeMessages(messages) {
+  if (!Array.isArray(messages)) {
+    return [];
+  }
+  const pendingToolCallIds = /* @__PURE__ */ new Map();
+  let syntheticToolCallIdOffset = 0;
+  return messages.flatMap((message) => {
+    if (!isObject(message)) {
+      return [];
+    }
+    const ollamaMessage = message;
+    let toolCallId;
+    if (ollamaMessage.role === "tool") {
+      const toolName = ollamaMessage.tool_name;
+      if (typeof toolName === "string") {
+        toolCallId = pendingToolCallIds.get(toolName)?.shift();
+      }
+    }
+    const normalized = normalizeMessage(
+      ollamaMessage,
+      toolCallId,
+      syntheticToolCallIdOffset
+    );
+    if (Array.isArray(ollamaMessage.tool_calls)) {
+      syntheticToolCallIdOffset += ollamaMessage.tool_calls.length;
+    }
+    if (ollamaMessage.role === "assistant" && normalized) {
+      const toolCalls = Array.isArray(normalized.tool_calls) ? normalized.tool_calls : [];
+      for (const toolCall of toolCalls) {
+        if (!isObject(toolCall) || !isObject(toolCall.function)) {
+          continue;
+        }
+        const name = toolCall.function.name;
+        const id = toolCall.id;
+        if (typeof name === "string" && typeof id === "string") {
+          const ids = pendingToolCallIds.get(name) ?? [];
+          ids.push(id);
+          pendingToolCallIds.set(name, ids);
+        }
+      }
+    }
+    return normalized ? [normalized] : [];
+  });
+}
+function normalizeToolDefinition(tool) {
+  const fn = tool.function;
+  if (!fn || typeof fn.name !== "string" || fn.name.length === 0) {
+    return void 0;
+  }
+  return {
+    type: "function",
+    function: {
+      name: fn.name,
+      ...typeof fn.description === "string" ? { description: fn.description } : {},
+      ...isObject(fn.parameters) ? { parameters: fn.parameters } : {}
+    }
+  };
+}
+function extractToolsMetadata(tools) {
+  if (!Array.isArray(tools)) {
+    return {};
+  }
+  const normalized = tools.flatMap((tool) => {
+    if (!isObject(tool)) {
+      return [];
+    }
+    const definition = normalizeToolDefinition(tool);
+    return definition ? [definition] : [];
+  });
+  return normalized.length > 0 ? { tools: normalized } : {};
+}
+function extractOptionsMetadata(options) {
+  if (!isObject(options)) {
+    return {};
+  }
+  const metadata = {};
+  const mappings = [
+    ["temperature", "temperature"],
+    ["top_p", "top_p"],
+    ["num_predict", "max_tokens"],
+    ["frequency_penalty", "frequency_penalty"],
+    ["presence_penalty", "presence_penalty"],
+    ["stop", "stop"]
+  ];
+  for (const [source, target] of mappings) {
+    if (options[source] !== void 0) {
+      metadata[target] = options[source];
+    }
+  }
+  return metadata;
+}
+function extractRequestMetadata(request) {
+  return {
+    provider: "ollama",
+    ...typeof request?.model === "string" ? { model: request.model } : {},
+    ...extractOptionsMetadata(request?.options),
+    ...request?.format !== void 0 ? { response_format: request.format } : {}
+  };
+}
+function extractOllamaChatInput([request]) {
+  return {
+    input: normalizeMessages(request.messages),
+    metadata: {
+      ...extractRequestMetadata(request),
+      ...extractToolsMetadata(request.tools)
+    }
+  };
+}
+function extractOllamaGenerateInput([request]) {
+  const normalizedPrompt = normalizeTextAndImages(
+    typeof request.prompt === "string" ? request.prompt : "",
+    Array.isArray(request.images) ? request.images : void 0
+  );
+  const input = [
+    ...typeof request.system === "string" ? [{ role: "system", content: request.system }] : [],
+    {
+      role: "user",
+      content: normalizedPrompt.content,
+      ...typeof request.suffix === "string" ? { suffix: request.suffix } : {},
+      ...normalizedPrompt.unrecognizedImages ? { images: normalizedPrompt.unrecognizedImages } : {}
+    }
+  ];
+  return {
+    input,
+    metadata: extractRequestMetadata(request)
+  };
+}
+function extractOllamaEmbedInput([request]) {
+  return {
+    input: request.input,
+    metadata: extractRequestMetadata(request)
+  };
+}
+function extractOllamaChatOutput(result, syntheticToolCallIdOffset = 0) {
+  if (!isObject(result) || !isObject(result.message)) {
+    return void 0;
+  }
+  const message = normalizeMessage(
+    result.message,
+    void 0,
+    syntheticToolCallIdOffset
+  );
+  if (!message) {
+    return void 0;
+  }
+  const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+  return [
+    {
+      index: 0,
+      finish_reason: normalizeFinishReason(result, toolCalls.length > 0),
+      message
+    }
+  ];
+}
+function extractOllamaGenerateOutput(result) {
+  if (!isObject(result) || typeof result.response !== "string") {
+    return void 0;
+  }
+  return [
+    {
+      index: 0,
+      finish_reason: normalizeFinishReason(result),
+      message: {
+        role: "assistant",
+        content: result.response,
+        ...typeof result.thinking === "string" && result.thinking.length > 0 ? { reasoning: result.thinking } : {}
+      }
+    }
+  ];
+}
+function extractOllamaEmbedOutput(result) {
+  const embedding = Array.isArray(result?.embeddings) ? result.embeddings[0] : void 0;
+  return Array.isArray(embedding) ? { embedding_length: embedding.length } : void 0;
+}
+function extractOllamaResponseMetadata(result) {
+  return typeof result?.model === "string" ? { model: result.model } : void 0;
+}
+function extractOllamaMetrics(result) {
+  const metrics = {};
+  const promptTokens = result?.prompt_eval_count;
+  const completionTokens = result?.eval_count;
+  if (isNonNegativeNumber(promptTokens)) {
+    metrics.prompt_tokens = promptTokens;
+  }
+  if (isNonNegativeNumber(completionTokens)) {
+    metrics.completion_tokens = completionTokens;
+  }
+  if (isNonNegativeNumber(promptTokens) || isNonNegativeNumber(completionTokens)) {
+    metrics.tokens = (isNonNegativeNumber(promptTokens) ? promptTokens : 0) + (isNonNegativeNumber(completionTokens) ? completionTokens : 0);
+  }
+  return metrics;
+}
+function aggregateOllamaChatChunks(chunks, _result, event, _startTime) {
+  const last = chunks.at(-1);
+  const message = {
+    role: "assistant",
+    content: chunks.map((chunk) => chunk.message?.content ?? "").join(""),
+    thinking: chunks.map((chunk) => chunk.message?.thinking ?? "").join(""),
+    tool_calls: chunks.flatMap((chunk) => chunk.message?.tool_calls ?? [])
+  };
+  const response = {
+    ...last,
+    message
+  };
+  return {
+    output: extractOllamaChatOutput(
+      response,
+      countOllamaToolCalls(event?.arguments?.[0]?.messages)
+    ),
+    metrics: extractOllamaMetrics(last ?? {}),
+    metadata: extractOllamaResponseMetadata(last ?? {})
+  };
+}
+function aggregateOllamaGenerateChunks(chunks, _result, _event, _startTime) {
+  const last = chunks.at(-1);
+  const response = {
+    ...last,
+    response: chunks.map((chunk) => chunk.response ?? "").join(""),
+    thinking: chunks.map((chunk) => chunk.thinking ?? "").join("")
+  };
+  return {
+    output: extractOllamaGenerateOutput(response),
+    metrics: extractOllamaMetrics(last ?? {}),
+    metadata: extractOllamaResponseMetadata(last ?? {})
+  };
+}
+
 // src/instrumentation/plugins/google-adk-plugin.ts
 var GoogleADKPlugin = class extends BasePlugin {
   activeRunnerSpans = /* @__PURE__ */ new Map();
@@ -29365,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(
@@ -29374,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
   };
@@ -30406,12 +32079,13 @@ function sanitizeLoggedValue(value, seen = /* @__PURE__ */ new WeakSet(), depth
 }
 
 // src/instrumentation/plugins/pi-coding-agent-plugin.ts
-var piStreamPatchStates = /* @__PURE__ */ new WeakMap();
+var piAgentPatchStates = /* @__PURE__ */ new WeakMap();
+var piAgentEventSubscriptions = /* @__PURE__ */ new WeakSet();
 var piPromptContextStore;
 var PiCodingAgentPlugin = class extends BasePlugin {
   activePromptStates = /* @__PURE__ */ new Set();
   onEnable() {
-    this.subscribeToPrompt();
+    this.interceptPrompt();
   }
   onDisable() {
     for (const unsubscribe of this.unsubscribers) {
@@ -30419,65 +32093,74 @@ var PiCodingAgentPlugin = class extends BasePlugin {
     }
     this.unsubscribers = [];
     for (const state of [...this.activePromptStates]) {
-      void finalizePiPromptRun(state).catch((error) => {
-        logInstrumentationError4("Pi Coding Agent disable cleanup", error);
-      });
+      finishPiPromptRun(state);
     }
   }
-  subscribeToPrompt() {
-    const channel = piCodingAgentChannels.prompt.tracingChannel();
-    const states = /* @__PURE__ */ new WeakMap();
-    const unbindAutoInstrumentationSuppression = bindAutoInstrumentationSuppressionToStart(channel);
-    const handlers = {
-      start: (event) => {
-        const state = startPiPromptRun(event, (state2) => {
-          this.activePromptStates.delete(state2);
-        });
-        if (state) {
-          this.activePromptStates.add(state);
-          states.set(event, state);
-        }
-      },
-      asyncEnd: async (event) => {
-        const state = states.get(event);
-        if (!state) {
-          return;
-        }
-        states.delete(event);
-        state.promptCallEnded = true;
-        if (!state.finalized && state.deferCompletionUntilTurnEnd && !state.turnEnded) {
-          if (!state.sawStreamFn) {
-            state.queued = true;
-            if (!state.streamPatchState.queuedPromptStates.includes(state)) {
-              state.streamPatchState.queuedPromptStates.push(state);
-            }
+  interceptPrompt() {
+    this.unsubscribers.push(
+      piCodingAgentChannels.prompt.intercept(
+        (target, thisArg, args, additional) => {
+          const invokeTarget = () => Reflect.apply(target, thisArg, args);
+          let state;
+          try {
+            state = startPiPromptRun(
+              {
+                ...additional,
+                arguments: args,
+                self: thisArg
+              },
+              (finalizedState) => {
+                this.activePromptStates.delete(finalizedState);
+              }
+            );
+          } catch (error) {
+            logInstrumentationError4("Pi Coding Agent prompt start", error);
           }
-          return;
-        }
-        await finalizePiPromptRun(state);
-      },
-      error: async (event) => {
-        const state = states.get(event);
-        if (!state) {
-          return;
+          if (!state) {
+            return runWithAutoInstrumentationSuppressed(invokeTarget);
+          }
+          this.activePromptStates.add(state);
+          return promptContextStore().run(
+            state,
+            () => runWithAutoInstrumentationSuppressed(() => {
+              let result;
+              try {
+                result = invokeTarget();
+              } catch (error) {
+                finishPiPromptRun(state, error);
+                throw error;
+              }
+              return Promise.resolve(result).then(
+                (value) => {
+                  finishPiPromptCall(state);
+                  return value;
+                },
+                (error) => {
+                  finishPiPromptRun(state, error);
+                  throw error;
+                }
+              );
+            })
+          );
         }
-        states.delete(event);
-        await finalizePiPromptRun(state, event.error);
-      }
-    };
-    channel.subscribe(handlers);
-    this.unsubscribers.push(() => {
-      unbindAutoInstrumentationSuppression?.();
-      channel.unsubscribe(handlers);
-    });
+      )
+    );
   }
 };
+function finishPiPromptCall(state) {
+  state.promptCallEnded = true;
+  if (state.deferCompletionUntilTurnEnd && !state.turnEnded) {
+    return;
+  }
+  finishPiPromptRun(state);
+}
 function startPiPromptRun(event, onFinalize) {
   const session = extractSession(event);
   const agent = session?.agent;
   if (!session || !isPiAgent(agent)) {
     return void 0;
   }
+  installPiAgentInstrumentation(agent);
   const metadata = {
     ...extractSessionMetadata(session),
     ...extractPromptOptionsMetadata(event.arguments[1]),
@@ -30499,9 +32182,7 @@ function startPiPromptRun(event, onFinalize) {
       INSTRUMENTATION_NAMES.PI_CODING_AGENT
     )
   );
-  const streamPatchState = installPiStreamPatch(agent);
   const options = event.arguments[1];
-  const promptText = event.arguments[0];
   const state = {
     activeLlmSpans: /* @__PURE__ */ new Set(),
     activeToolSpans: /* @__PURE__ */ new Map(),
@@ -30513,29 +32194,10 @@ function startPiPromptRun(event, onFinalize) {
     metrics: {},
     onFinalize,
     promptCallEnded: false,
-    ...typeof promptText === "string" ? { promptText } : {},
-    queued: false,
     span,
-    sawStreamFn: false,
     startTime: getCurrentUnixTimestamp(),
-    streamPatchState,
     turnEnded: false
   };
-  state.restorePromptContext = enterPiPromptContext(state);
-  streamPatchState.activePromptStates.add(state);
-  try {
-    state.unsubscribeAgent = agent.subscribe(async (agentEvent) => {
-      try {
-        await runWithAutoInstrumentationSuppressed(
-          () => handlePiAgentEvent(state, agentEvent)
-        );
-      } catch (error) {
-        logInstrumentationError4("Pi Coding Agent event", error);
-      }
-    });
-  } catch (error) {
-    logInstrumentationError4("Pi Coding Agent event subscription", error);
-  }
   return state;
 }
 function extractSession(event) {
@@ -30549,111 +32211,55 @@ function promptContextStore() {
   piPromptContextStore ??= isomorph_default.newAsyncLocalStorage();
   return piPromptContextStore;
 }
-function currentPromptContextFrames() {
-  return promptContextStore().getStore()?.frames ?? [];
-}
 function currentPiPromptState() {
-  const frames = currentPromptContextFrames();
-  return frames[frames.length - 1]?.state;
-}
-function enterPiPromptContext(state) {
-  const frame = {
-    id: /* @__PURE__ */ Symbol("braintrust.pi-coding-agent.prompt"),
-    state
-  };
-  promptContextStore().enterWith({
-    frames: [...currentPromptContextFrames(), frame]
-  });
-  return () => {
-    const frames = currentPromptContextFrames().filter(
-      (candidate) => candidate.id !== frame.id
-    );
-    promptContextStore().enterWith(frames.length > 0 ? { frames } : void 0);
-  };
-}
-function installPiStreamPatch(agent) {
-  const existing = piStreamPatchStates.get(agent);
-  if (existing) {
-    if (agent.streamFn !== existing.wrappedStreamFn) {
-      debugLogger.debug(
-        "Pi Coding Agent streamFn changed while Braintrust instrumentation was active; preserving existing patch state."
-      );
-    }
-    return existing;
-  }
-  const patchState = {
-    activePromptStates: /* @__PURE__ */ new Set(),
-    agent,
-    originalStreamFn: agent.streamFn,
-    queuedPromptStates: [],
-    wrappedStreamFn: agent.streamFn
-  };
-  patchState.wrappedStreamFn = makeSharedInstrumentedStreamFn(patchState);
-  agent.streamFn = patchState.wrappedStreamFn;
-  piStreamPatchStates.set(agent, patchState);
-  return patchState;
-}
-function resolveStreamPromptState(patchState, context) {
-  let lastUserText;
-  if (Array.isArray(context.messages)) {
-    for (let i = context.messages.length - 1; i >= 0; i--) {
-      const message = context.messages[i];
-      if (isPiUserMessage(message)) {
-        if (typeof message.content === "string") {
-          lastUserText = message.content;
-        } else {
-          lastUserText = message.content.flatMap((part) => part.type === "text" ? [part.text] : []).join("");
-        }
-        break;
-      }
-    }
-  }
-  if (lastUserText !== void 0) {
-    const queuedMatch = patchState.queuedPromptStates.find(
-      (state) => state.promptText === lastUserText
-    );
-    if (queuedMatch) {
-      return queuedMatch;
-    }
-    const matches = [...patchState.activePromptStates].filter(
-      (state) => state.promptText === lastUserText
+  return promptContextStore().getStore();
+}
+function installPiAgentInstrumentation(agent) {
+  const existing = piAgentPatchStates.get(agent);
+  if (!existing || agent.streamFn !== existing.wrappedStreamFn) {
+    const patchState = {
+      originalStreamFn: agent.streamFn,
+      wrappedStreamFn: agent.streamFn
+    };
+    patchState.wrappedStreamFn = makeInstrumentedStreamFn(
+      agent,
+      patchState.originalStreamFn
     );
-    if (matches.length === 1) {
-      return matches[0];
-    }
+    agent.streamFn = patchState.wrappedStreamFn;
+    piAgentPatchStates.set(agent, patchState);
   }
-  const contextState = currentPiPromptState();
-  if (contextState && patchState.activePromptStates.has(contextState) && (!contextState.queued || lastUserText !== void 0 && contextState.promptText === lastUserText)) {
-    return contextState;
+  if (piAgentEventSubscriptions.has(agent)) {
+    return;
   }
-  if (patchState.activePromptStates.size === 1) {
-    return [...patchState.activePromptStates][0];
+  try {
+    agent.subscribe(async (event) => {
+      const state = currentPiPromptState();
+      if (!state || state.agent !== agent || state.finalized) {
+        return;
+      }
+      try {
+        await runWithAutoInstrumentationSuppressed(
+          () => handlePiAgentEvent(state, event)
+        );
+      } catch (error) {
+        logInstrumentationError4("Pi Coding Agent event", error);
+      }
+    });
+    piAgentEventSubscriptions.add(agent);
+  } catch (error) {
+    logInstrumentationError4("Pi Coding Agent event subscription", error);
   }
-  return void 0;
 }
-function makeSharedInstrumentedStreamFn(patchState) {
+function makeInstrumentedStreamFn(agent, originalStreamFn) {
   return async function instrumentedPiStreamFn(model, context, options) {
-    const state = resolveStreamPromptState(patchState, context);
-    if (!state) {
-      const invokeOriginal = () => Reflect.apply(patchState.originalStreamFn, this, [
-        model,
-        context,
-        options
-      ]);
-      return patchState.activePromptStates.size > 0 ? runWithAutoInstrumentationSuppressed(invokeOriginal) : invokeOriginal();
+    const invokeOriginal = () => Reflect.apply(originalStreamFn, this, [model, context, options]);
+    const state = currentPiPromptState();
+    if (!state || state.agent !== agent || state.finalized) {
+      return invokeOriginal();
     }
-    state.sawStreamFn = true;
-    removeQueuedPromptState(state);
-    state.streamPatchState.eventPromptState = state;
     const llmState = await startPiLlmSpan(state, model, context, options);
     try {
-      const stream = await runWithAutoInstrumentationSuppressed(
-        () => Reflect.apply(patchState.originalStreamFn, this, [
-          model,
-          context,
-          options
-        ])
-      );
+      const stream = await runWithAutoInstrumentationSuppressed(invokeOriginal);
       return patchAssistantMessageStream(stream, state, llmState);
     } catch (error) {
       finishPiLlmSpan(state, llmState, void 0, error);
@@ -30800,13 +32406,6 @@ async function handlePiAgentEvent(state, event) {
   if (state.finalized) {
     return;
   }
-  const eventPromptState = state.streamPatchState.eventPromptState;
-  if (eventPromptState && eventPromptState !== state) {
-    return;
-  }
-  if (!eventPromptState && (state.queued || state.streamPatchState.activePromptStates.size > 1 && currentPiPromptState() !== state)) {
-    return;
-  }
   switch (event.type) {
     case "message_end":
       if (isPiAssistantMessage(event.message)) {
@@ -30821,11 +32420,8 @@ async function handlePiAgentEvent(state, event) {
           addMetrics(state.metrics, extractUsageMetrics2(event.message.usage));
         }
       }
-      if (state.streamPatchState.eventPromptState === state) {
-        state.streamPatchState.eventPromptState = void 0;
-      }
       if (state.promptCallEnded && state.deferCompletionUntilTurnEnd) {
-        await finalizePiPromptRun(state);
+        finishPiPromptRun(state);
       }
       return;
     case "tool_execution_start":
@@ -30898,19 +32494,13 @@ function finishPiToolSpan(state, event) {
     }
   }
 }
-async function finalizePiPromptRun(state, error) {
+function finishPiPromptRun(state, error) {
   if (state.finalized) {
     return;
   }
   state.finalized = true;
   state.onFinalize?.(state);
-  restorePiStreamFn(state);
-  try {
-    state.unsubscribeAgent?.();
-  } catch (unsubscribeError) {
-    logInstrumentationError4("Pi Coding Agent unsubscribe", unsubscribeError);
-  }
-  await finishOpenLlmSpans(state, error);
+  finishOpenLlmSpans(state, error);
   finishOpenToolSpans(state, error);
   const metadata = {
     ...state.metadata,
@@ -30927,34 +32517,14 @@ async function finalizePiPromptRun(state, error) {
       output: state.output
     });
   } finally {
-    state.span.end();
-  }
-}
-function restorePiStreamFn(state) {
-  const patchState = state.streamPatchState;
-  patchState.activePromptStates.delete(state);
-  removeQueuedPromptState(state);
-  if (patchState.eventPromptState === state) {
-    patchState.eventPromptState = void 0;
-  }
-  state.restorePromptContext?.();
-  if (patchState.activePromptStates.size > 0) {
-    return;
-  }
-  if (patchState.agent.streamFn === patchState.wrappedStreamFn) {
-    patchState.agent.streamFn = patchState.originalStreamFn;
-  }
-  piStreamPatchStates.delete(patchState.agent);
-}
-function removeQueuedPromptState(state) {
-  state.queued = false;
-  const queuedPromptStates = state.streamPatchState.queuedPromptStates;
-  const index = queuedPromptStates.indexOf(state);
-  if (index >= 0) {
-    queuedPromptStates.splice(index, 1);
+    try {
+      state.span.end();
+    } catch (endError) {
+      logInstrumentationError4("Pi Coding Agent prompt end", endError);
+    }
   }
 }
-async function finishOpenLlmSpans(state, error) {
+function finishOpenLlmSpans(state, error) {
   for (const llmState of [...state.activeLlmSpans]) {
     finishPiLlmSpan(state, llmState, void 0, error);
   }
@@ -31035,7 +32605,7 @@ function normalizeAssistantMessage(message) {
     (part) => part.type === "thinking" && !part.redacted ? [part.thinking] : []
   ).join("");
   const toolCalls = message.content.flatMap(
-    (part) => part.type === "toolCall" ? [normalizeToolCall(part)] : []
+    (part) => part.type === "toolCall" ? [normalizeToolCall2(part)] : []
   );
   return {
     role: "assistant",
@@ -31070,13 +32640,13 @@ function normalizeUserContent(content) {
     return part;
   });
 }
-function normalizeToolCall(toolCall) {
+function normalizeToolCall2(toolCall) {
   return {
     id: toolCall.id,
     type: "function",
     function: {
       name: toolCall.name,
-      arguments: stringifyArguments(toolCall.arguments)
+      arguments: stringifyArguments2(toolCall.arguments)
     }
   };
 }
@@ -31259,7 +32829,7 @@ function cleanMetrics5(metrics) {
   }
   return cleaned;
 }
-function stringifyArguments(value) {
+function stringifyArguments2(value) {
   if (typeof value === "string") {
     return value;
   }
@@ -31435,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();
@@ -31486,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]);
@@ -32273,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();
@@ -32802,6 +34660,7 @@ var BraintrustPlugin = class extends BasePlugin {
   anthropicPlugin = null;
   aiSDKPlugin = null;
   claudeAgentSDKPlugin = null;
+  cloudflareThinkPlugin = null;
   cursorSDKPlugin = null;
   openAIAgentsPlugin = null;
   googleGenAIPlugin = null;
@@ -32810,6 +34669,7 @@ var BraintrustPlugin = class extends BasePlugin {
   openRouterPlugin = null;
   openRouterAgentPlugin = null;
   mistralPlugin = null;
+  ollamaPlugin = null;
   googleADKPlugin = null;
   coherePlugin = null;
   groqPlugin = null;
@@ -32821,6 +34681,7 @@ var BraintrustPlugin = class extends BasePlugin {
   langSmithPlugin = null;
   piCodingAgentPlugin = null;
   strandsAgentSDKPlugin = null;
+  voyageAIPlugin = null;
   cloudflareAIChatPlugin = null;
   cloudflareAgentsPlugin = null;
   constructor(config = {}) {
@@ -32849,6 +34710,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.claudeAgentSDKPlugin = new ClaudeAgentSDKPlugin();
       this.claudeAgentSDKPlugin.enable();
     }
+    if (integrations.cloudflareThink !== false) {
+      this.cloudflareThinkPlugin = new CloudflareThinkPlugin();
+      this.cloudflareThinkPlugin.enable();
+    }
     if (integrations.cursorSDK !== false && integrations.cursor !== false) {
       this.cursorSDKPlugin = new CursorSDKPlugin();
       this.cursorSDKPlugin.enable();
@@ -32879,6 +34744,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.mistralPlugin = new MistralPlugin();
       this.mistralPlugin.enable();
     }
+    if (integrations.ollama !== false) {
+      this.ollamaPlugin = new OllamaPlugin();
+      this.ollamaPlugin.enable();
+    }
     if (integrations.googleADK !== false) {
       this.googleADKPlugin = new GoogleADKPlugin();
       this.googleADKPlugin.enable();
@@ -32887,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();
@@ -32955,6 +34828,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.claudeAgentSDKPlugin.disable();
       this.claudeAgentSDKPlugin = null;
     }
+    if (this.cloudflareThinkPlugin) {
+      this.cloudflareThinkPlugin.disable();
+      this.cloudflareThinkPlugin = null;
+    }
     if (this.cursorSDKPlugin) {
       this.cursorSDKPlugin.disable();
       this.cursorSDKPlugin = null;
@@ -32987,6 +34864,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.mistralPlugin.disable();
       this.mistralPlugin = null;
     }
+    if (this.ollamaPlugin) {
+      this.ollamaPlugin.disable();
+      this.ollamaPlugin = null;
+    }
     if (this.googleADKPlugin) {
       this.googleADKPlugin.disable();
       this.googleADKPlugin = null;
@@ -32995,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;
@@ -33361,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";
@@ -33370,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)
     );
@@ -33405,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}`);
         }
@@ -33423,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;
@@ -33458,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 {
@@ -33490,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;
@@ -33503,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 {
@@ -33606,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;
       }
     }
@@ -33650,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;
@@ -33688,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];
@@ -33699,7 +35654,7 @@ function getNearestBraintrustEnvValue(name) {
         return void 0;
       }
     }
-    if (path.dirname(dir) === dir) {
+    if (path2.dirname(dir) === dir) {
       break;
     }
   }
@@ -33757,9 +35712,10 @@ export {
   TRACESTATE_HEADER,
   BAGGAGE_HEADER,
   BRAINTRUST_PARENT_KEY,
+  uint8ArrayToBase64,
+  base64ToUint8Array,
   spanObjectTypeV3ToTypedString,
   isObject,
-  mergeDicts,
   slugify,
   SpanComponentsV4,
   makeScorerPropagatedEvent,
@@ -33810,6 +35766,7 @@ export {
   ReadonlyAttachment,
   JSONAttachment,
   updateSpan,
+  _internalResumeSpan,
   spanComponentsToObjectId,
   ERR_PERMALINK,
   permalink,
@@ -33871,7 +35828,9 @@ export {
   X_CACHED_HEADER,
   parseCachedHeader,
   finalizeAnthropicTokens,
+  toNumericMetrics,
   extractAnthropicCacheTokens,
+  collectAnthropicSession,
   zodToJsonSchema,
   currentWorkflowAgentWrapperSpan,
   braintrustAISDKTelemetry,