braintrust 3.26.0 → 3.27.0

package/dist/instrumentation/index.mjs

@@ -3,8 +3,10 @@ var GLOBAL_INSTRUMENTATION_HOOKS_KEY = "__braintrust_instrumentation_hooks";
 var GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION = 1;
 var GLOBAL_INSTRUMENTATION_HOOKS_REGISTRY_BRAND = "braintrust.global-instrumentation-hooks.registry";
 var GLOBAL_INSTRUMENTATION_HOOK_BRAND = "braintrust.global-instrumentation-hooks.hook";
+var GLOBAL_INVOCATION_HOOK_BRAND = "braintrust.global-instrumentation-hooks.invocation-hook";
 var registryBrand = Symbol.for(GLOBAL_INSTRUMENTATION_HOOKS_REGISTRY_BRAND);
 var hookBrand = Symbol.for(GLOBAL_INSTRUMENTATION_HOOK_BRAND);
+var invocationHookBrand = Symbol.for(GLOBAL_INVOCATION_HOOK_BRAND);
 var errorReporter;
 function setGlobalHookErrorReporter(reporter) {
   const previousReporter = errorReporter;
@@ -149,12 +151,69 @@ var traceEvents = [
   "asyncEnd",
   "error"
 ];
+function traceInvocation(hook, operator, target, thisArg, args, additional, callbackIndex = -1) {
+  const context = {
+    ...additional,
+    arguments: args,
+    self: thisArg
+  };
+  const invoke = () => hook.invoke(target, thisArg, args, additional);
+  if (operator === "traceCallback") {
+    return hook.traceCallback(invoke, callbackIndex, context);
+  }
+  if (operator === "tracePromise") {
+    return hook.tracePromise(invoke, context);
+  }
+  return hook.traceSync(invoke, context);
+}
+var InvocationHook = class {
+  interceptors = [];
+  get hasInterceptors() {
+    return this.interceptors.length > 0;
+  }
+  intercept(interceptor) {
+    if (typeof interceptor !== "function") {
+      throw new TypeError("interceptor must be a function");
+    }
+    this.interceptors = [...this.interceptors, interceptor];
+    let active = true;
+    return () => {
+      if (!active) {
+        return;
+      }
+      active = false;
+      const index = this.interceptors.indexOf(interceptor);
+      if (index !== -1) {
+        this.interceptors = [
+          ...this.interceptors.slice(0, index),
+          ...this.interceptors.slice(index + 1)
+        ];
+      }
+    };
+  }
+  invoke(target, thisArg, args, additional) {
+    const interceptors = this.interceptors;
+    if (interceptors.length === 0) {
+      return Reflect.apply(target, thisArg, args);
+    }
+    let next = target;
+    for (let index = interceptors.length - 1; index >= 0; index -= 1) {
+      const interceptor = interceptors[index];
+      const downstream = next;
+      next = function(...nextArgs) {
+        return interceptor(downstream, this, nextArgs, additional);
+      };
+    }
+    return Reflect.apply(next, thisArg, args);
+  }
+};
 var TracingHook = class {
   start;
   end;
   asyncStart;
   asyncEnd;
   error;
+  invocationHook = new InvocationHook();
   constructor(nameOrChannels) {
     Object.defineProperty(this, hookBrand, {
       configurable: false,
@@ -162,6 +221,12 @@ var TracingHook = class {
       value: GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION,
       writable: false
     });
+    Object.defineProperty(this, invocationHookBrand, {
+      configurable: false,
+      enumerable: false,
+      value: GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION,
+      writable: false
+    });
     if (typeof nameOrChannels === "string") {
       this.start = new HookChannel(`tracing:${nameOrChannels}:start`);
       this.end = new HookChannel(`tracing:${nameOrChannels}:end`);
@@ -179,6 +244,26 @@ var TracingHook = class {
   get hasSubscribers() {
     return this.start.hasSubscribers || this.end.hasSubscribers || this.asyncStart.hasSubscribers || this.asyncEnd.hasSubscribers || this.error.hasSubscribers;
   }
+  get hasInterceptors() {
+    return this.invocationHook.hasInterceptors;
+  }
+  intercept(interceptor) {
+    return this.invocationHook.intercept(interceptor);
+  }
+  invoke(target, thisArg, args, additional) {
+    return this.invocationHook.invoke(target, thisArg, args, additional);
+  }
+  traceInvocation(operator, target, thisArg, args, additional, callbackIndex = -1) {
+    return traceInvocation(
+      this,
+      operator,
+      target,
+      thisArg,
+      args,
+      additional,
+      callbackIndex
+    );
+  }
   subscribe(handlers) {
     for (const eventName of traceEvents) {
       const handler = handlers[eventName];
@@ -400,6 +485,60 @@ function hasTracingHookShape(value) {
     return false;
   }
 }
+function hasInvocationHookShape(value) {
+  if (typeof value !== "object" && typeof value !== "function" || value === null) {
+    return false;
+  }
+  try {
+    const hook = value;
+    return value[invocationHookBrand] === GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION && typeof hook.hasInterceptors === "boolean" && typeof hook.intercept === "function" && typeof hook.invoke === "function";
+  } catch {
+    return false;
+  }
+}
+function installInvocationHook(value) {
+  const hasInvocationHook = hasInvocationHookShape(value);
+  const invocationHook = new InvocationHook();
+  try {
+    if (!hasInvocationHook) {
+      Object.defineProperties(value, {
+        [invocationHookBrand]: {
+          configurable: false,
+          enumerable: false,
+          value: GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION,
+          writable: false
+        },
+        hasInterceptors: {
+          configurable: false,
+          enumerable: false,
+          get: () => invocationHook.hasInterceptors
+        },
+        intercept: {
+          configurable: false,
+          enumerable: false,
+          value: invocationHook.intercept.bind(invocationHook),
+          writable: false
+        },
+        invoke: {
+          configurable: false,
+          enumerable: false,
+          value: invocationHook.invoke.bind(invocationHook),
+          writable: false
+        }
+      });
+    }
+    if (typeof value.traceInvocation !== "function") {
+      Object.defineProperty(value, "traceInvocation", {
+        configurable: false,
+        enumerable: false,
+        value: traceInvocation.bind(void 0, value),
+        writable: false
+      });
+    }
+  } catch (error) {
+    reportError(error);
+  }
+}
 function isCompatibleTracingHook(value) {
   try {
     return value[hookBrand] === GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION && hasTracingHookShape(value);
@@ -486,6 +625,7 @@ function newGlobalTracingChannel(nameOrChannels) {
     return inertTracingHook;
   }
   if (isCompatibleTracingHook(existing)) {
+    installInvocationHook(existing);
     return existing;
   }
   if (existing !== void 0) {
@@ -541,6 +681,114 @@ var iso = {
 };
 var isomorph_default = iso;
 
+// src/debug-logger.ts
+var PREFIX = "[braintrust]";
+var DEBUG_LOG_LEVEL_SYMBOL = /* @__PURE__ */ Symbol.for("braintrust-debug-log-level");
+var LOG_LEVEL_PRIORITY = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3
+};
+var hasWarnedAboutInvalidEnvValue = false;
+var debugLogStateResolver = void 0;
+function warnInvalidEnvValue(value) {
+  if (hasWarnedAboutInvalidEnvValue) {
+    return;
+  }
+  hasWarnedAboutInvalidEnvValue = true;
+  console.warn(
+    PREFIX,
+    `Invalid BRAINTRUST_DEBUG_LOG_LEVEL value "${value}". Expected "error", "warn", "info", or "debug".`
+  );
+}
+function normalizeDebugLogLevelOption(option) {
+  if (option === false) {
+    return void 0;
+  }
+  if (option === "error" || option === "warn" || option === "info" || option === "debug") {
+    return option;
+  }
+  throw new Error(
+    `Invalid debugLogLevel value "${option}". Expected false, "error", "warn", "info", or "debug".`
+  );
+}
+function parseDebugLogLevelEnv(value) {
+  if (!value) {
+    return void 0;
+  }
+  if (value === "error" || value === "warn" || value === "info" || value === "debug") {
+    return value;
+  }
+  warnInvalidEnvValue(value);
+  return void 0;
+}
+function getEnvDebugLogLevel() {
+  return parseDebugLogLevelEnv(isomorph_default.getEnv("BRAINTRUST_DEBUG_LOG_LEVEL"));
+}
+function setGlobalDebugLogLevel(level) {
+  globalThis[DEBUG_LOG_LEVEL_SYMBOL] = level;
+}
+function setDebugLogStateResolver(resolver) {
+  debugLogStateResolver = resolver;
+}
+function resolveDebugLogLevel(state) {
+  const stateLevel = state?.getDebugLogLevel?.();
+  const hasStateOverride = state?.hasDebugLogLevelOverride?.() ?? false;
+  if (hasStateOverride) {
+    return stateLevel;
+  }
+  const globalLevel = (
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    globalThis[DEBUG_LOG_LEVEL_SYMBOL]
+  );
+  if (globalLevel !== void 0) {
+    return globalLevel === false ? void 0 : globalLevel;
+  }
+  return getEnvDebugLogLevel();
+}
+function emit(method, state, args) {
+  const level = resolveDebugLogLevel(state);
+  if (!level || LOG_LEVEL_PRIORITY[method] > LOG_LEVEL_PRIORITY[level]) {
+    return;
+  }
+  if (method === "info") {
+    console.log(PREFIX, ...args);
+  } else if (method === "debug") {
+    console.debug(PREFIX, ...args);
+  } else if (method === "warn") {
+    console.warn(PREFIX, ...args);
+  } else {
+    console.error(PREFIX, ...args);
+  }
+}
+function createDebugLogger(state) {
+  const resolveState = () => state ?? debugLogStateResolver?.();
+  return {
+    info(...args) {
+      emit("info", resolveState(), args);
+    },
+    debug(...args) {
+      emit("debug", resolveState(), args);
+    },
+    warn(...args) {
+      emit("warn", resolveState(), args);
+    },
+    error(...args) {
+      emit("error", resolveState(), args);
+    }
+  };
+}
+var debugLogger = {
+  ...createDebugLogger(),
+  forState(state) {
+    return createDebugLogger(state);
+  }
+};
+setGlobalHookErrorReporter((error) => {
+  debugLogger.error("Global instrumentation hook error:", error);
+});
+
 // src/instrumentation/core/stream-patcher.ts
 function isAsyncIterable(value) {
   return value !== null && typeof value === "object" && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
@@ -565,112 +813,133 @@ function patchStreamIfNeeded(stream, options) {
     );
     return stream;
   }
-  if (hasAsyncIteratorMethods(stream) && isSelfAsyncIterator(stream)) {
-    if ("__braintrust_patched_iterator_methods" in stream) {
-      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 {
-      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(
-            options,
-            () => originalNext(...args)
-          );
-          if (result.done) {
+      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;
-              try {
-                await options.onComplete(chunks);
-              } catch (error) {
-                console.error("Error in stream onComplete handler:", error);
-              }
-            }
-          } else {
-            const chunk = result.value;
-            const shouldCollect = options.shouldCollect ? options.shouldCollect(chunk) : true;
-            if (shouldCollect) {
-              chunks.push(chunk);
-              if (options.onChunk) {
-                try {
-                  await options.onChunk(chunk);
-                } catch (error) {
-                  console.error("Error in stream onChunk handler:", error);
-                }
-              }
+              void notifyCancellation();
             }
           }
-          return result;
-        } catch (error) {
-          if (!completed) {
-            completed = true;
-            if (options.onError) {
-              try {
-                await options.onError(
-                  error instanceof Error ? error : new Error(String(error)),
-                  chunks
-                );
-              } catch (handlerError) {
-                console.error("Error in stream onError handler:", handlerError);
-              }
-            }
-          }
-          throw error;
-        }
-      };
-      if (originalReturn) {
-        stream.return = async (...args) => {
-          if (!completed) {
-            completed = true;
-            try {
-              await options.onComplete(chunks);
-            } catch (error) {
-              console.error("Error in stream onComplete handler:", error);
-            }
-          }
-          return originalReturn(...args);
-        };
-      }
-      if (originalThrow) {
-        stream.throw = async (...args) => {
-          if (!completed) {
-            completed = true;
-            const rawError = args[0];
-            const error = rawError instanceof Error ? rawError : new Error(String(rawError));
-            if (options.onError) {
-              try {
-                await options.onError(error, chunks);
-              } catch (handlerError) {
-                console.error("Error in stream onError handler:", handlerError);
-              }
-            }
-          }
-          return originalThrow(...args);
         };
       }
-      Object.defineProperty(stream, "__braintrust_patched_iterator_methods", {
-        value: true
-      });
-      return stream;
     } catch (error) {
-      console.warn("Failed to patch stream iterator methods:", error);
+      debugLogger.warn("Failed to patch stream abort method:", error);
     }
-  }
-  const originalIteratorFn = stream[Symbol.asyncIterator];
-  if ("__braintrust_patched" in originalIteratorFn && originalIteratorFn["__braintrust_patched"]) {
-    return stream;
-  }
-  try {
-    const patchedIteratorFn = function() {
-      const iterator = originalIteratorFn.call(this);
-      const originalNext = iterator.next.bind(iterator);
-      const chunks = [];
-      let completed = false;
-      iterator.next = async function(...args) {
+  };
+  if (hasAsyncIteratorMethods(stream) && isSelfAsyncIterator(stream)) {
+    if ("__braintrust_patched_iterator_methods" in stream) {
+      return stream;
+    }
+    try {
+      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;
+      stream.next = async (...args) => {
+        try {
+          const result = await runNextWithWrapper(
+            options,
+            () => originalNext(...args)
+          );
+          if (result.done) {
+            if (!completed) {
+              completed = true;
+              try {
+                await options.onComplete(chunks);
+              } catch (error) {
+                console.error("Error in stream onComplete handler:", error);
+              }
+            }
+          } else {
+            const chunk = result.value;
+            const shouldCollect = options.shouldCollect ? options.shouldCollect(chunk) : true;
+            if (shouldCollect) {
+              chunks.push(chunk);
+              if (options.onChunk) {
+                try {
+                  await options.onChunk(chunk);
+                } catch (error) {
+                  console.error("Error in stream onChunk handler:", error);
+                }
+              }
+            }
+          }
+          return result;
+        } catch (error) {
+          if (!completed) {
+            completed = true;
+            if (options.onError) {
+              try {
+                await options.onError(
+                  error instanceof Error ? error : new Error(String(error)),
+                  chunks
+                );
+              } catch (handlerError) {
+                console.error("Error in stream onError handler:", handlerError);
+              }
+            }
+          }
+          throw error;
+        }
+      };
+      if (originalReturn) {
+        stream.return = async (...args) => {
+          if (!completed) {
+            completed = true;
+            await notifyCancellation();
+          }
+          return originalReturn(...args);
+        };
+      }
+      if (originalThrow) {
+        stream.throw = async (...args) => {
+          if (!completed) {
+            completed = true;
+            const rawError = args[0];
+            const error = rawError instanceof Error ? rawError : new Error(String(rawError));
+            if (options.onError) {
+              try {
+                await options.onError(error, chunks);
+              } catch (handlerError) {
+                console.error("Error in stream onError handler:", handlerError);
+              }
+            }
+          }
+          return originalThrow(...args);
+        };
+      }
+      Object.defineProperty(stream, "__braintrust_patched_iterator_methods", {
+        value: true
+      });
+      patchAbortIfPresent();
+      return stream;
+    } catch (error) {
+      console.warn("Failed to patch stream iterator methods:", error);
+    }
+  }
+  const originalIteratorFn = stream[Symbol.asyncIterator];
+  if ("__braintrust_patched" in originalIteratorFn && originalIteratorFn["__braintrust_patched"]) {
+    return stream;
+  }
+  try {
+    const patchedIteratorFn = function() {
+      const iterator = originalIteratorFn.call(this);
+      const originalNext = iterator.next.bind(iterator);
+      iterator.next = async function(...args) {
         try {
           const result = await runNextWithWrapper(
             options,
@@ -722,11 +991,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);
         };
@@ -755,6 +1020,7 @@ function patchStreamIfNeeded(stream, options) {
       value: true
     });
     stream[Symbol.asyncIterator] = patchedIteratorFn;
+    patchAbortIfPresent();
     return stream;
   } catch (error) {
     console.warn("Failed to patch stream:", error);
@@ -768,114 +1034,6 @@ function runNextWithWrapper(options, callback) {
 // src/logger.ts
 import { v4 as uuidv42 } from "uuid";
 
-// src/debug-logger.ts
-var PREFIX = "[braintrust]";
-var DEBUG_LOG_LEVEL_SYMBOL = /* @__PURE__ */ Symbol.for("braintrust-debug-log-level");
-var LOG_LEVEL_PRIORITY = {
-  error: 0,
-  warn: 1,
-  info: 2,
-  debug: 3
-};
-var hasWarnedAboutInvalidEnvValue = false;
-var debugLogStateResolver = void 0;
-function warnInvalidEnvValue(value) {
-  if (hasWarnedAboutInvalidEnvValue) {
-    return;
-  }
-  hasWarnedAboutInvalidEnvValue = true;
-  console.warn(
-    PREFIX,
-    `Invalid BRAINTRUST_DEBUG_LOG_LEVEL value "${value}". Expected "error", "warn", "info", or "debug".`
-  );
-}
-function normalizeDebugLogLevelOption(option) {
-  if (option === false) {
-    return void 0;
-  }
-  if (option === "error" || option === "warn" || option === "info" || option === "debug") {
-    return option;
-  }
-  throw new Error(
-    `Invalid debugLogLevel value "${option}". Expected false, "error", "warn", "info", or "debug".`
-  );
-}
-function parseDebugLogLevelEnv(value) {
-  if (!value) {
-    return void 0;
-  }
-  if (value === "error" || value === "warn" || value === "info" || value === "debug") {
-    return value;
-  }
-  warnInvalidEnvValue(value);
-  return void 0;
-}
-function getEnvDebugLogLevel() {
-  return parseDebugLogLevelEnv(isomorph_default.getEnv("BRAINTRUST_DEBUG_LOG_LEVEL"));
-}
-function setGlobalDebugLogLevel(level) {
-  globalThis[DEBUG_LOG_LEVEL_SYMBOL] = level;
-}
-function setDebugLogStateResolver(resolver) {
-  debugLogStateResolver = resolver;
-}
-function resolveDebugLogLevel(state) {
-  const stateLevel = state?.getDebugLogLevel?.();
-  const hasStateOverride = state?.hasDebugLogLevelOverride?.() ?? false;
-  if (hasStateOverride) {
-    return stateLevel;
-  }
-  const globalLevel = (
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    globalThis[DEBUG_LOG_LEVEL_SYMBOL]
-  );
-  if (globalLevel !== void 0) {
-    return globalLevel === false ? void 0 : globalLevel;
-  }
-  return getEnvDebugLogLevel();
-}
-function emit(method, state, args) {
-  const level = resolveDebugLogLevel(state);
-  if (!level || LOG_LEVEL_PRIORITY[method] > LOG_LEVEL_PRIORITY[level]) {
-    return;
-  }
-  if (method === "info") {
-    console.log(PREFIX, ...args);
-  } else if (method === "debug") {
-    console.debug(PREFIX, ...args);
-  } else if (method === "warn") {
-    console.warn(PREFIX, ...args);
-  } else {
-    console.error(PREFIX, ...args);
-  }
-}
-function createDebugLogger(state) {
-  const resolveState = () => state ?? debugLogStateResolver?.();
-  return {
-    info(...args) {
-      emit("info", resolveState(), args);
-    },
-    debug(...args) {
-      emit("debug", resolveState(), args);
-    },
-    warn(...args) {
-      emit("warn", resolveState(), args);
-    },
-    error(...args) {
-      emit("error", resolveState(), args);
-    }
-  };
-}
-var debugLogger = {
-  ...createDebugLogger(),
-  forState(state) {
-    return createDebugLogger(state);
-  }
-};
-setGlobalHookErrorReporter((error) => {
-  debugLogger.error("Global instrumentation hook error:", error);
-});
-
 // src/queue.ts
 var DEFAULT_QUEUE_SIZE = 15e3;
 var Queue = class {
@@ -5382,6 +5540,7 @@ var INSTRUMENTATION_NAMES = {
   CLAUDE_AGENT_SDK: "claude-agent-sdk",
   CLOUDFLARE_AI_CHAT: "cloudflare-ai-chat",
   CLOUDFLARE_AGENTS: "cloudflare-agents",
+  CLOUDFLARE_THINK: "cloudflare-think",
   COHERE: "cohere",
   CURSOR_SDK: "cursor-sdk",
   EVE: "eve",
@@ -5396,6 +5555,7 @@ var INSTRUMENTATION_NAMES = {
   LANGSMITH: "langsmith",
   MASTRA: "mastra",
   MISTRAL: "mistral",
+  OLLAMA: "ollama",
   OPENAI: "openai",
   OPENAI_AGENTS: "openai-agents",
   OPENAI_CODEX: "openai-codex",
@@ -5407,7 +5567,7 @@ var INSTRUMENTATION_NAMES = {
 var INTERNAL_SPAN_INSTRUMENTATION_NAME = /* @__PURE__ */ Symbol.for(
   "braintrust.spanInstrumentationName"
 );
-var SDK_VERSION = true ? "3.26.0" : "0.0.0";
+var SDK_VERSION = true ? "3.27.0" : "0.0.0";
 function withSpanInstrumentationName(args, instrumentationName) {
   return {
     ...args,
@@ -10428,6 +10588,33 @@ function traceStreamingChannel(channel2, 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) {
@@ -10507,33 +10694,12 @@ function traceStreamingChannel(channel2, 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;
       }
@@ -10921,11 +11087,21 @@ function defineChannels(pkg, channels, options) {
         const tracingChannel2 = () => isomorph_default.newTracingChannel(
           fullChannelName
         );
+        const intercept2 = (interceptor) => {
+          const hook = tracingChannel2();
+          return typeof hook.intercept === "function" ? hook.intercept(interceptor) : () => {
+          };
+        };
         return [
           key,
           {
             ...asyncSpec,
             instrumentationName,
+            intercept: intercept2,
+            invoke: (target, thisArg, args, additional) => {
+              const hook = tracingChannel2();
+              return typeof hook.invoke === "function" ? hook.invoke(target, thisArg, args, additional) : Reflect.apply(target, thisArg, args);
+            },
             tracingChannel: tracingChannel2,
             tracePromise: (fn, context) => tracingChannel2().tracePromise(
               fn,
@@ -10939,11 +11115,21 @@ function defineChannels(pkg, channels, options) {
       const tracingChannel = () => isomorph_default.newTracingChannel(
         fullChannelName
       );
+      const intercept = (interceptor) => {
+        const hook = tracingChannel();
+        return typeof hook.intercept === "function" ? hook.intercept(interceptor) : () => {
+        };
+      };
       return [
         key,
         {
           ...syncSpec,
           instrumentationName,
+          intercept,
+          invoke: (target, thisArg, args, additional) => {
+            const hook = tracingChannel();
+            return typeof hook.invoke === "function" ? hook.invoke(target, thisArg, args, additional) : Reflect.apply(target, thisArg, args);
+          },
           tracingChannel,
           traceSync: (fn, context) => tracingChannel().traceSync(
             fn,
@@ -12194,6 +12380,12 @@ function extractAnthropicCacheTokens(cacheReadTokens = 0, cacheCreationTokens =
   return cacheTokens;
 }
 
+// src/wrappers/anthropic-session-collector.ts
+var sessionStreamCollectors = /* @__PURE__ */ new WeakMap();
+function registerAnthropicSessionStreamCollector(stream, collector) {
+  sessionStreamCollectors.set(stream, collector);
+}
+
 // src/instrumentation/plugins/anthropic-channels.ts
 var anthropicChannels = defineChannels(
   "@anthropic-ai/sdk",
@@ -12209,6 +12401,14 @@ var anthropicChannels = defineChannels(
     betaMessagesToolRunner: channel({
       channelName: "beta.messages.toolRunner",
       kind: "sync-stream"
+    }),
+    betaSessionsEventsStream: channel({
+      channelName: "beta.sessions.events.stream",
+      kind: "async"
+    }),
+    betaSessionsThreadsEventsStream: channel({
+      channelName: "beta.sessions.threads.events.stream",
+      kind: "async"
     })
   },
   { instrumentationName: INSTRUMENTATION_NAMES.ANTHROPIC }
@@ -12222,6 +12422,7 @@ var AnthropicPlugin = class extends BasePlugin {
   onEnable() {
     this.subscribeToAnthropicChannels();
     this.subscribeToAnthropicToolRunner();
+    this.subscribeToAnthropicSessionStreams();
   }
   onDisable() {
     this.unsubscribers = unsubscribeAll(this.unsubscribers);
@@ -12339,7 +12540,411 @@ var AnthropicPlugin = class extends BasePlugin {
       tracingChannel.unsubscribe(handlers);
     });
   }
+  subscribeToAnthropicSessionStreams() {
+    this.subscribeToAnthropicSessionStream(
+      anthropicChannels.betaSessionsEventsStream,
+      false
+    );
+    this.subscribeToAnthropicSessionStream(
+      anthropicChannels.betaSessionsThreadsEventsStream,
+      true
+    );
+  }
+  subscribeToAnthropicSessionStream(channel2, isThread) {
+    const tracingChannel = channel2.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 {};
@@ -14213,6 +14818,29 @@ var harnessAgentChannels = defineChannels(
   { instrumentationName: INSTRUMENTATION_NAMES.AI_SDK }
 );
 
+// 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/instrumentation/plugins/ai-sdk-plugin.ts
 var DEFAULT_DENY_OUTPUT_PATHS = [
   // v3
@@ -14319,6 +14947,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,
@@ -14339,6 +14968,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,
@@ -15324,6 +15954,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 },
@@ -15347,6 +15994,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;
 }
@@ -16164,13 +16823,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;
@@ -16223,8 +16884,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;
@@ -16243,10 +16904,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({
@@ -18668,6 +19330,295 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
   }
 };
 
+// src/instrumentation/plugins/cloudflare-think-channels.ts
+var cloudflareThinkChannels = defineChannels(
+  "@cloudflare/think",
+  {
+    runInferenceLoop: channel({
+      channelName: "Think.runInferenceLoop",
+      kind: "async"
+    })
+  },
+  { instrumentationName: INSTRUMENTATION_NAMES.CLOUDFLARE_THINK }
+);
+
+// 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 channel2 = 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 && channel2.start) {
+      channel2.start.bindStore(currentSpanStore, (event) => {
+        const runState = ensureState2(event);
+        return runState ? contextManager.wrapSpanForStore(runState.span) : currentSpanStore.getStore();
+      });
+      this.unsubscribers.push(
+        () => channel2.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);
+        }
+      }
+    };
+    channel2.subscribe(handlers);
+    this.unsubscribers.push(() => channel2.unsubscribe(handlers));
+  }
+  subscribeToAISDKStreamTextSync() {
+    const channel2 = aiSDKChannels.streamTextSync.tracingChannel();
+    const handlers = {
+      start: (event) => {
+        this.startAISDKStream(event);
+      },
+      end: (event) => {
+        this.endAISDKStream(event);
+      },
+      error: (event) => {
+        this.errorAISDKStream(event);
+      }
+    };
+    channel2.subscribe(handlers);
+    this.unsubscribers.push(() => channel2.unsubscribe(handlers));
+  }
+  subscribeToAISDKStreamTextAsync() {
+    const channel2 = aiSDKChannels.streamText.tracingChannel();
+    const handlers = {
+      start: (event) => {
+        this.startAISDKStream(event);
+      },
+      asyncEnd: (event) => {
+        this.endAISDKStream(event);
+      },
+      error: (event) => {
+        this.errorAISDKStream(event);
+      }
+    };
+    channel2.subscribe(handlers);
+    this.unsubscribers.push(() => channel2.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-channels.ts
 var cursorSDKChannels = defineChannels(
   "@cursor/sdk",
@@ -24433,6 +25384,470 @@ function aggregateMistralStreamChunks(chunks) {
   };
 }
 
+// src/instrumentation/plugins/ollama-channels.ts
+var ollamaChannels = defineChannels(
+  "ollama",
+  {
+    chat: channel({
+      channelName: "chat",
+      kind: "async"
+    }),
+    generate: channel({
+      channelName: "generate",
+      kind: "async"
+    }),
+    embed: channel({
+      channelName: "embed",
+      kind: "async"
+    })
+  },
+  { instrumentationName: INSTRUMENTATION_NAMES.OLLAMA }
+);
+
+// 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-channels.ts
 var googleADKChannels = defineChannels(
   "@google/adk",
@@ -28186,7 +29601,7 @@ 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),
@@ -28195,7 +29610,7 @@ var FlueObserveBridge = class {
     };
     this.finishPendingChildrenForOperation(event, output);
     safeLog3(state.span, {
-      ...event.isError ? { error: toLoggedError(event.error) } : {},
+      ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.error) } : {},
       metadata,
       metrics: durationMetrics2(event.durationMs),
       output
@@ -28226,7 +29641,7 @@ var FlueObserveBridge = class {
     };
     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: {
@@ -28270,6 +29685,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);
   }
@@ -28349,7 +29770,7 @@ var FlueObserveBridge = class {
       return;
     }
     safeLog3(state.span, {
-      ...event.isError ? { error: toLoggedError(event.result) } : {},
+      ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.result) } : {},
       metadata: {
         ...state.metadata,
         ...extractEventMetadata(event),
@@ -28395,6 +29816,7 @@ var FlueObserveBridge = class {
       ...event.usage ? { "flue.usage": event.usage } : {}
     };
     safeLog3(state.span, {
+      ...event.isError ? { error: toLoggedError(event.errorInfo ?? event.error) } : {},
       metadata,
       metrics: {
         ...durationMetrics2(event.durationMs),
@@ -28499,7 +29921,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 }
@@ -28631,7 +30053,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 } : {},
@@ -28660,7 +30085,7 @@ function flueTurnRequestInput(event) {
   return event.request?.input ?? event.input;
 }
 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;
@@ -28669,10 +30094,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;
@@ -28687,7 +30112,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;
@@ -28702,6 +30127,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) {
@@ -28709,10 +30137,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;
@@ -28811,7 +30265,7 @@ function safeEnd(span, endTime) {
   }
 }
 function logInstrumentationError3(label, error) {
-  console.error(`Error in ${label} instrumentation:`, error);
+  debugLogger.debug(`Error in ${label} instrumentation:`, error);
 }
 
 // src/wrappers/langchain/callback-handler.ts
@@ -29740,12 +31194,13 @@ var piCodingAgentChannels = defineChannels(
 );
 
 // 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) {
@@ -29753,65 +31208,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 channel2 = piCodingAgentChannels.prompt.tracingChannel();
-    const states = /* @__PURE__ */ new WeakMap();
-    const unbindAutoInstrumentationSuppression = bindAutoInstrumentationSuppressionToStart(channel2);
-    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);
-      }
-    };
-    channel2.subscribe(handlers);
-    this.unsubscribers.push(() => {
-      unbindAutoInstrumentationSuppression?.();
-      channel2.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]),
@@ -29833,9 +31297,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(),
@@ -29847,29 +31309,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) {
@@ -29883,111 +31326,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);
@@ -30134,13 +31521,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)) {
@@ -30155,11 +31535,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":
@@ -30232,19 +31609,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,
@@ -30261,34 +31632,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);
   }
@@ -30369,7 +31720,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",
@@ -30404,13 +31755,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)
     }
   };
 }
@@ -30593,7 +31944,7 @@ function cleanMetrics5(metrics) {
   }
   return cleaned;
 }
-function stringifyArguments(value) {
+function stringifyArguments2(value) {
   if (typeof value === "string") {
     return value;
   }
@@ -32161,6 +33512,7 @@ var BraintrustPlugin = class extends BasePlugin {
   anthropicPlugin = null;
   aiSDKPlugin = null;
   claudeAgentSDKPlugin = null;
+  cloudflareThinkPlugin = null;
   cursorSDKPlugin = null;
   openAIAgentsPlugin = null;
   googleGenAIPlugin = null;
@@ -32169,6 +33521,7 @@ var BraintrustPlugin = class extends BasePlugin {
   openRouterPlugin = null;
   openRouterAgentPlugin = null;
   mistralPlugin = null;
+  ollamaPlugin = null;
   googleADKPlugin = null;
   coherePlugin = null;
   groqPlugin = null;
@@ -32208,6 +33561,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();
@@ -32238,6 +33595,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();
@@ -32314,6 +33675,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;
@@ -32346,6 +33711,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;
@@ -34082,6 +35451,7 @@ var envIntegrationAliases = {
   cloudflareaichat: "cloudflareAIChat",
   "cloudflare-ai-chat": "cloudflareAIChat",
   "@cloudflare/ai-chat": "cloudflareAIChat",
+  cloudflarethink: "cloudflareThink",
   cursor: "cursor",
   "cursor-sdk": "cursorSDK",
   cursorsdk: "cursorSDK",
@@ -34102,6 +35472,7 @@ var envIntegrationAliases = {
   openrouteragent: "openrouterAgent",
   "openrouter-agent": "openrouterAgent",
   mistral: "mistral",
+  ollama: "ollama",
   googleadk: "googleADK",
   "google-adk": "googleADK",
   cohere: "cohere",
@@ -34137,6 +35508,7 @@ function getDefaultInstrumentationIntegrations() {
     huggingface: true,
     claudeAgentSDK: true,
     cloudflareAIChat: true,
+    cloudflareThink: true,
     cursor: true,
     cursorSDK: true,
     flue: true,
@@ -34145,6 +35517,7 @@ function getDefaultInstrumentationIntegrations() {
     openrouter: true,
     openrouterAgent: true,
     mistral: true,
+    ollama: true,
     cohere: true,
     groq: true,
     bedrock: true,