braintrust 3.25.0 → 3.27.0

package/dist/instrumentation/index.mjs

@@ -1,328 +1,685 @@
-// src/isomorph.ts
-var DefaultAsyncLocalStorage = class {
-  constructor() {
-  }
-  enterWith(_) {
-  }
-  run(_, callback) {
-    return callback();
+// src/global-instrumentation-hooks.ts
+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;
+  errorReporter = reporter;
+  return () => {
+    if (errorReporter === reporter) {
+      errorReporter = previousReporter;
+    }
+  };
+}
+function reportError(error) {
+  try {
+    errorReporter?.(error);
+  } catch {
   }
-  getStore() {
-    return void 0;
+}
+function setContextValue(context, key, value) {
+  try {
+    context[key] = value;
+  } catch (error) {
+    reportError(error);
   }
-};
-var DefaultChannel = class {
+}
+function wrapStoreRun(store, message, next, transform) {
+  return () => {
+    let context;
+    try {
+      context = transform ? transform(message) : message;
+    } catch (error) {
+      reportError(error);
+      return next();
+    }
+    let called = false;
+    let result;
+    let providerError;
+    let providerThrew = false;
+    const runNext = () => {
+      if (called) {
+        reportError(
+          new Error(
+            "Instrumentation store invoked its callback more than once"
+          )
+        );
+        if (providerThrew) {
+          throw providerError;
+        }
+        return result;
+      }
+      called = true;
+      try {
+        result = next();
+        return result;
+      } catch (error) {
+        providerThrew = true;
+        providerError = error;
+        throw error;
+      }
+    };
+    try {
+      store.run(context, runNext);
+    } catch (error) {
+      if (!providerThrew || error !== providerError) {
+        reportError(error);
+      }
+    }
+    if (!called) {
+      reportError(
+        new Error("Instrumentation store did not invoke its callback")
+      );
+      return runNext();
+    }
+    if (providerThrew) {
+      throw providerError;
+    }
+    return result;
+  };
+}
+var HookChannel = class {
   constructor(name) {
     this.name = name;
   }
   name;
-  hasSubscribers = false;
-  subscribe(_subscription) {
+  subscribers = [];
+  stores = /* @__PURE__ */ new Map();
+  get hasSubscribers() {
+    return this.subscribers.length > 0 || this.stores.size > 0;
   }
-  unsubscribe(_subscription) {
-    return false;
+  subscribe(subscription) {
+    if (typeof subscription !== "function") {
+      throw new TypeError("subscription must be a function");
+    }
+    this.subscribers = [...this.subscribers, subscription];
   }
-  bindStore(_store, _transform) {
+  unsubscribe(subscription) {
+    const index = this.subscribers.indexOf(subscription);
+    if (index === -1) {
+      return false;
+    }
+    this.subscribers = [
+      ...this.subscribers.slice(0, index),
+      ...this.subscribers.slice(index + 1)
+    ];
+    return true;
   }
-  unbindStore(_store) {
-    return false;
+  bindStore(store, transform) {
+    if (!store || typeof store.run !== "function") {
+      throw new TypeError("store must have a run method");
+    }
+    this.stores.set(
+      store,
+      transform
+    );
   }
-  publish(_message) {
+  unbindStore(store) {
+    return this.stores.delete(store);
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  runStores(_message, fn, thisArg, ...args) {
-    return fn.apply(thisArg, args);
+  publish(message) {
+    const subscribers = this.subscribers;
+    for (const subscriber of subscribers) {
+      try {
+        subscriber(message, this.name);
+      } catch (error) {
+        reportError(error);
+      }
+    }
+  }
+  runStores(message, fn, thisArg, ...args) {
+    let run = () => {
+      this.publish(message);
+      return Reflect.apply(fn, thisArg, args);
+    };
+    for (const [store, transform] of this.stores.entries()) {
+      run = wrapStoreRun(store, message, run, transform);
+    }
+    return run();
   }
 };
-var DefaultTracingChannel = class {
+var traceEvents = [
+  "start",
+  "end",
+  "asyncStart",
+  "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,
+      enumerable: false,
+      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 DefaultChannel(`tracing:${nameOrChannels}:start`);
-      this.end = new DefaultChannel(`tracing:${nameOrChannels}:end`);
-      this.asyncStart = new DefaultChannel(
-        `tracing:${nameOrChannels}:asyncStart`
-      );
-      this.asyncEnd = new DefaultChannel(`tracing:${nameOrChannels}:asyncEnd`);
-      this.error = new DefaultChannel(`tracing:${nameOrChannels}:error`);
+      this.start = new HookChannel(`tracing:${nameOrChannels}:start`);
+      this.end = new HookChannel(`tracing:${nameOrChannels}:end`);
+      this.asyncStart = new HookChannel(`tracing:${nameOrChannels}:asyncStart`);
+      this.asyncEnd = new HookChannel(`tracing:${nameOrChannels}:asyncEnd`);
+      this.error = new HookChannel(`tracing:${nameOrChannels}:error`);
       return;
     }
-    this.start = nameOrChannels.start ?? new DefaultChannel("tracing:start");
-    this.end = nameOrChannels.end ?? new DefaultChannel("tracing:end");
-    this.asyncStart = nameOrChannels.asyncStart ?? new DefaultChannel("tracing:asyncStart");
-    this.asyncEnd = nameOrChannels.asyncEnd ?? new DefaultChannel("tracing:asyncEnd");
-    this.error = nameOrChannels.error ?? new DefaultChannel("tracing:error");
+    this.start = nameOrChannels.start ?? new HookChannel("tracing:start");
+    this.end = nameOrChannels.end ?? new HookChannel("tracing:end");
+    this.asyncStart = nameOrChannels.asyncStart ?? new HookChannel("tracing:asyncStart");
+    this.asyncEnd = nameOrChannels.asyncEnd ?? new HookChannel("tracing:asyncEnd");
+    this.error = nameOrChannels.error ?? new HookChannel("tracing:error");
   }
   get hasSubscribers() {
     return this.start.hasSubscribers || this.end.hasSubscribers || this.asyncStart.hasSubscribers || this.asyncEnd.hasSubscribers || this.error.hasSubscribers;
   }
-  subscribe(_handlers) {
-  }
-  unsubscribe(_handlers) {
-    return false;
+  get hasInterceptors() {
+    return this.invocationHook.hasInterceptors;
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  traceSync(fn, _message, thisArg, ...args) {
-    return fn.apply(thisArg, args);
+  intercept(interceptor) {
+    return this.invocationHook.intercept(interceptor);
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  tracePromise(fn, _message, thisArg, ...args) {
-    return fn.apply(thisArg, args);
+  invoke(target, thisArg, args, additional) {
+    return this.invocationHook.invoke(target, thisArg, args, additional);
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  traceCallback(fn, _position, _message, thisArg, ...args) {
-    return fn.apply(thisArg, args);
+  traceInvocation(operator, target, thisArg, args, additional, callbackIndex = -1) {
+    return traceInvocation(
+      this,
+      operator,
+      target,
+      thisArg,
+      args,
+      additional,
+      callbackIndex
+    );
   }
-};
-var iso = {
-  buildType: "unknown",
-  // Will be set by configureBrowser() or configureNode()
-  getRepoInfo: async (_settings) => void 0,
-  getPastNAncestors: async () => [],
-  getEnv: (_name) => void 0,
-  getBraintrustApiKey: async () => void 0,
-  getCallerLocation: () => void 0,
-  newAsyncLocalStorage: () => new DefaultAsyncLocalStorage(),
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  newTracingChannel: (nameOrChannels) => new DefaultTracingChannel(nameOrChannels),
-  processOn: (_0, _1) => {
-  },
-  basename: (filepath) => filepath.split(/[\\/]/).pop() || filepath,
-  // eslint-disable-next-line no-restricted-properties -- preserving intentional console usage.
-  writeln: (text) => console.log(text)
-};
-var isomorph_default = iso;
-
-// src/instrumentation/core/stream-patcher.ts
-function isAsyncIterable(value) {
-  return value !== null && typeof value === "object" && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
-}
-function hasAsyncIteratorMethods(value) {
-  return value !== null && typeof value === "object" && "next" in value && typeof value.next === "function";
-}
-function isSelfAsyncIterator(value) {
-  try {
-    return value[Symbol.asyncIterator]() === value;
-  } catch {
-    return false;
+  subscribe(handlers) {
+    for (const eventName of traceEvents) {
+      const handler = handlers[eventName];
+      if (handler) {
+        this[eventName].subscribe(handler);
+      }
+    }
   }
-}
-function patchStreamIfNeeded(stream, options) {
-  if (!isAsyncIterable(stream)) {
-    return stream;
+  unsubscribe(handlers) {
+    let done = true;
+    for (const eventName of traceEvents) {
+      const handler = handlers[eventName];
+      if (handler && !this[eventName].unsubscribe(handler)) {
+        done = false;
+      }
+    }
+    return done;
   }
-  if (Object.isFrozen(stream) || Object.isSealed(stream)) {
-    console.warn(
-      "Cannot patch frozen/sealed stream. Stream output will not be collected."
-    );
-    return stream;
+  traceSync(fn, message = {}, thisArg, ...args) {
+    if (!this.hasSubscribers) {
+      return Reflect.apply(fn, thisArg, args);
+    }
+    const context = message;
+    return this.start.runStores(message, () => {
+      try {
+        const result = Reflect.apply(fn, thisArg, args);
+        setContextValue(context, "result", result);
+        return result;
+      } catch (error) {
+        setContextValue(context, "error", error);
+        this.error.publish(message);
+        throw error;
+      } finally {
+        this.end.publish(message);
+      }
+    });
   }
-  if (hasAsyncIteratorMethods(stream) && isSelfAsyncIterator(stream)) {
-    if ("__braintrust_patched_iterator_methods" in stream) {
-      return stream;
+  tracePromise(fn, message = {}, thisArg, ...args) {
+    if (!this.hasSubscribers) {
+      return Reflect.apply(fn, thisArg, args);
     }
-    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 (!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;
+    const context = message;
+    return this.start.runStores(message, () => {
+      let result;
+      try {
+        result = Reflect.apply(fn, thisArg, args);
+      } catch (error) {
+        setContextValue(context, "error", error);
+        this.error.publish(message);
+        this.end.publish(message);
+        throw error;
+      }
+      this.end.publish(message);
+      if (!result || typeof result !== "object" && typeof result !== "function") {
+        setContextValue(context, "result", result);
+        this.asyncStart.publish(message);
+        this.asyncEnd.publish(message);
+        return result;
+      }
+      let terminalPublished = false;
+      const finishUnobservedResult = (error) => {
+        reportError(error);
+        if (!terminalPublished) {
+          terminalPublished = true;
+          setContextValue(context, "result", result);
+          this.asyncStart.publish(message);
+          this.asyncEnd.publish(message);
         }
+        return result;
       };
-      if (originalReturn) {
-        stream.return = async (...args) => {
-          if (!completed) {
-            completed = true;
+      let then;
+      try {
+        then = result.then;
+      } catch (error) {
+        return finishUnobservedResult(error);
+      }
+      if (typeof then !== "function") {
+        setContextValue(context, "result", result);
+        this.asyncStart.publish(message);
+        this.asyncEnd.publish(message);
+        return result;
+      }
+      const resolve = (resolved) => {
+        if (!terminalPublished) {
+          terminalPublished = true;
+          setContextValue(context, "result", resolved);
+          this.asyncStart.publish(message);
+          this.asyncEnd.publish(message);
+        }
+        return resolved;
+      };
+      let rejectionThrown = false;
+      let rejectionError;
+      const reject = (error) => {
+        if (!terminalPublished) {
+          terminalPublished = true;
+          setContextValue(context, "error", error);
+          this.error.publish(message);
+          this.asyncStart.publish(message);
+          this.asyncEnd.publish(message);
+        }
+        rejectionThrown = true;
+        rejectionError = error;
+        throw error;
+      };
+      let isPlainPromise;
+      try {
+        isPlainPromise = result instanceof Promise && result.constructor === Promise;
+      } catch (error) {
+        return finishUnobservedResult(error);
+      }
+      try {
+        if (isPlainPromise) {
+          return Reflect.apply(then, result, [resolve, reject]);
+        }
+        Reflect.apply(then, result, [
+          resolve,
+          (error) => {
             try {
-              await options.onComplete(chunks);
-            } catch (error) {
-              console.error("Error in stream onComplete handler:", error);
+              reject(error);
+            } catch {
             }
           }
-          return originalReturn(...args);
-        };
+        ]);
+      } catch (error) {
+        if (rejectionThrown && error === rejectionError) {
+          return result;
+        }
+        return finishUnobservedResult(error);
       }
-      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);
-        };
+      return result;
+    });
+  }
+  traceCallback(fn, position = -1, message = {}, thisArg, ...args) {
+    if (!this.hasSubscribers) {
+      return Reflect.apply(fn, thisArg, args);
+    }
+    const context = message;
+    const callArgs = args.length > 0 ? args : context.arguments ?? args;
+    const callback = Array.prototype.at.call(callArgs, position);
+    if (typeof callback !== "function") {
+      return Reflect.apply(fn, thisArg, args);
+    }
+    const { asyncStart, asyncEnd, error: errorChannel } = this;
+    function wrappedCallback(error, result) {
+      if (error) {
+        setContextValue(context, "error", error);
+        errorChannel.publish(message);
+      } else {
+        setContextValue(context, "result", result);
       }
-      Object.defineProperty(stream, "__braintrust_patched_iterator_methods", {
-        value: true
+      return asyncStart.runStores(message, () => {
+        try {
+          return Reflect.apply(callback, this, arguments);
+        } finally {
+          asyncEnd.publish(message);
+        }
       });
-      return stream;
-    } catch (error) {
-      console.warn("Failed to patch stream iterator methods:", error);
     }
+    Array.prototype.splice.call(callArgs, position, 1, wrappedCallback);
+    return this.start.runStores(message, () => {
+      try {
+        return Reflect.apply(fn, thisArg, args);
+      } catch (error) {
+        setContextValue(context, "error", error);
+        this.error.publish(message);
+        throw error;
+      } finally {
+        this.end.publish(message);
+      }
+    });
   }
-  const originalIteratorFn = stream[Symbol.asyncIterator];
-  if ("__braintrust_patched" in originalIteratorFn && originalIteratorFn["__braintrust_patched"]) {
-    return stream;
+};
+var inertChannel = Object.freeze({
+  name: "braintrust:inert",
+  hasSubscribers: false,
+  subscribe() {
+  },
+  unsubscribe() {
+    return false;
+  },
+  bindStore() {
+  },
+  unbindStore() {
+    return false;
+  },
+  publish() {
+  },
+  runStores(_message, fn, thisArg, ...args) {
+    return Reflect.apply(fn, thisArg, args);
+  }
+});
+var inertTracingHook = new TracingHook({
+  start: inertChannel,
+  end: inertChannel,
+  asyncStart: inertChannel,
+  asyncEnd: inertChannel,
+  error: inertChannel
+});
+function isHookChannel(value) {
+  if (typeof value !== "object" && typeof value !== "function" || value === null) {
+    return false;
   }
   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) {
-        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;
+    const channel2 = value;
+    return typeof channel2.hasSubscribers === "boolean" && typeof channel2.subscribe === "function" && typeof channel2.unsubscribe === "function" && typeof channel2.bindStore === "function" && typeof channel2.unbindStore === "function" && typeof channel2.publish === "function" && typeof channel2.runStores === "function";
+  } catch {
+    return false;
+  }
+}
+function hasTracingHookShape(value) {
+  if (typeof value !== "object" && typeof value !== "function" || value === null) {
+    return false;
+  }
+  try {
+    const hook = value;
+    return typeof hook.hasSubscribers === "boolean" && typeof hook.subscribe === "function" && typeof hook.unsubscribe === "function" && typeof hook.traceSync === "function" && typeof hook.tracePromise === "function" && typeof hook.traceCallback === "function" && isHookChannel(hook.start) && isHookChannel(hook.end) && isHookChannel(hook.asyncStart) && isHookChannel(hook.asyncEnd) && isHookChannel(hook.error);
+  } catch {
+    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 (iterator.return) {
-        const originalReturn = iterator.return.bind(iterator);
-        iterator.return = async function(...args) {
-          if (!completed) {
-            completed = true;
-            try {
-              await options.onComplete(chunks);
-            } catch (error) {
-              console.error("Error in stream onComplete handler:", error);
-            }
-          }
-          return originalReturn(...args);
-        };
-      }
-      if (iterator.throw) {
-        const originalThrow = iterator.throw.bind(iterator);
-        iterator.throw = async function(...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);
-        };
+      });
+    }
+    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);
+  } catch {
+    return false;
+  }
+}
+function isCompatibleHookRegistry(value) {
+  try {
+    return value instanceof Map && value[registryBrand] === GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION;
+  } catch {
+    return false;
+  }
+}
+function getHookRegistry() {
+  let descriptor;
+  try {
+    descriptor = Object.getOwnPropertyDescriptor(
+      globalThis,
+      GLOBAL_INSTRUMENTATION_HOOKS_KEY
+    );
+  } catch (error) {
+    reportError(error);
+    return void 0;
+  }
+  if (descriptor && "value" in descriptor && isCompatibleHookRegistry(descriptor.value) && (descriptor.configurable || descriptor.enumerable === false)) {
+    if (descriptor.configurable || descriptor.writable) {
+      try {
+        Object.defineProperty(globalThis, GLOBAL_INSTRUMENTATION_HOOKS_KEY, {
+          configurable: false,
+          enumerable: false,
+          value: descriptor.value,
+          writable: false
+        });
+      } catch (error) {
+        reportError(error);
+        return void 0;
       }
-      return iterator;
-    };
-    Object.defineProperty(patchedIteratorFn, "__braintrust_patched", {
-      value: true
+    }
+    return descriptor.value;
+  }
+  if (descriptor && !descriptor.configurable) {
+    reportError(new Error("Incompatible global instrumentation hook registry"));
+    return void 0;
+  }
+  const registry2 = /* @__PURE__ */ new Map();
+  try {
+    Object.defineProperty(registry2, registryBrand, {
+      configurable: false,
+      enumerable: false,
+      value: GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION,
+      writable: false
     });
-    stream[Symbol.asyncIterator] = patchedIteratorFn;
-    return stream;
   } catch (error) {
-    console.warn("Failed to patch stream:", error);
-    return stream;
+    reportError(error);
+    return void 0;
+  }
+  try {
+    Object.defineProperty(globalThis, GLOBAL_INSTRUMENTATION_HOOKS_KEY, {
+      configurable: false,
+      enumerable: false,
+      value: registry2,
+      writable: false
+    });
+    return registry2;
+  } catch (error) {
+    reportError(error);
+    return void 0;
   }
 }
-function runNextWithWrapper(options, callback) {
-  return options.aroundNext ? options.aroundNext(callback) : callback();
+function newGlobalTracingChannel(nameOrChannels) {
+  if (typeof nameOrChannels !== "string") {
+    return new TracingHook(nameOrChannels);
+  }
+  const registry2 = getHookRegistry();
+  if (!registry2) {
+    return inertTracingHook;
+  }
+  let existing;
+  try {
+    existing = Map.prototype.get.call(registry2, nameOrChannels);
+  } catch (error) {
+    reportError(error);
+    return inertTracingHook;
+  }
+  if (isCompatibleTracingHook(existing)) {
+    installInvocationHook(existing);
+    return existing;
+  }
+  if (existing !== void 0) {
+    reportError(
+      new Error(`Invalid global instrumentation hook: ${nameOrChannels}`)
+    );
+    try {
+      Map.prototype.delete.call(registry2, nameOrChannels);
+    } catch (error) {
+      reportError(error);
+      return inertTracingHook;
+    }
+  }
+  const hook = new TracingHook(nameOrChannels);
+  try {
+    Map.prototype.set.call(registry2, nameOrChannels, hook);
+  } catch (error) {
+    reportError(error);
+    return inertTracingHook;
+  }
+  return hook;
 }
 
-// src/logger.ts
-import { v4 as uuidv42 } from "uuid";
+// src/isomorph.ts
+var DefaultAsyncLocalStorage = class {
+  constructor() {
+  }
+  enterWith(_) {
+  }
+  run(_, callback) {
+    return callback();
+  }
+  getStore() {
+    return void 0;
+  }
+};
+var iso = {
+  buildType: "unknown",
+  // Will be set by configureBrowser() or configureNode()
+  getRepoInfo: async (_settings) => void 0,
+  getPastNAncestors: async () => [],
+  getEnv: (_name) => void 0,
+  getBraintrustApiKey: async () => void 0,
+  getCallerLocation: () => void 0,
+  newAsyncLocalStorage: () => new DefaultAsyncLocalStorage(),
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  newTracingChannel: (nameOrChannels) => newGlobalTracingChannel(nameOrChannels),
+  processOn: (_0, _1) => {
+  },
+  basename: (filepath) => filepath.split(/[\\/]/).pop() || filepath,
+  // eslint-disable-next-line no-restricted-properties -- preserving intentional console usage.
+  writeln: (text) => console.log(text)
+};
+var isomorph_default = iso;
 
 // src/debug-logger.ts
 var PREFIX = "[braintrust]";
@@ -428,6 +785,254 @@ var debugLogger = {
     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";
+}
+function hasAsyncIteratorMethods(value) {
+  return value !== null && typeof value === "object" && "next" in value && typeof value.next === "function";
+}
+function isSelfAsyncIterator(value) {
+  try {
+    return value[Symbol.asyncIterator]() === value;
+  } catch {
+    return false;
+  }
+}
+function patchStreamIfNeeded(stream, options) {
+  if (!isAsyncIterable(stream)) {
+    return stream;
+  }
+  if (Object.isFrozen(stream) || Object.isSealed(stream)) {
+    console.warn(
+      "Cannot patch frozen/sealed stream. Stream output will not be collected."
+    );
+    return stream;
+  }
+  const chunks = [];
+  let completed = false;
+  const notifyCancellation = async () => {
+    try {
+      await (options.onCancel ?? options.onComplete)(chunks);
+    } catch (error) {
+      debugLogger.error("Error in stream cancellation handler:", error);
+    }
+  };
+  const patchAbortIfPresent = () => {
+    try {
+      if ("abort" in stream && typeof stream.abort === "function") {
+        const originalAbort = stream.abort.bind(stream);
+        stream.abort = (...args) => {
+          try {
+            return originalAbort(...args);
+          } finally {
+            if (!completed) {
+              completed = true;
+              void notifyCancellation();
+            }
+          }
+        };
+      }
+    } catch (error) {
+      debugLogger.warn("Failed to patch stream abort method:", error);
+    }
+  };
+  if (hasAsyncIteratorMethods(stream) && isSelfAsyncIterator(stream)) {
+    if ("__braintrust_patched_iterator_methods" in stream) {
+      return stream;
+    }
+    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,
+            () => 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 (iterator.return) {
+        const originalReturn = iterator.return.bind(iterator);
+        iterator.return = async function(...args) {
+          if (!completed) {
+            completed = true;
+            await notifyCancellation();
+          }
+          return originalReturn(...args);
+        };
+      }
+      if (iterator.throw) {
+        const originalThrow = iterator.throw.bind(iterator);
+        iterator.throw = async function(...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);
+        };
+      }
+      return iterator;
+    };
+    Object.defineProperty(patchedIteratorFn, "__braintrust_patched", {
+      value: true
+    });
+    stream[Symbol.asyncIterator] = patchedIteratorFn;
+    patchAbortIfPresent();
+    return stream;
+  } catch (error) {
+    console.warn("Failed to patch stream:", error);
+    return stream;
+  }
+}
+function runNextWithWrapper(options, callback) {
+  return options.aroundNext ? options.aroundNext(callback) : callback();
+}
+
+// src/logger.ts
+import { v4 as uuidv42 } from "uuid";
 
 // src/queue.ts
 var DEFAULT_QUEUE_SIZE = 15e3;
@@ -2079,7 +2684,8 @@ var ApiKey = z6.object({
   user_email: z6.union([z6.string(), z6.null()]).optional(),
   user_given_name: z6.union([z6.string(), z6.null()]).optional(),
   user_family_name: z6.union([z6.string(), z6.null()]).optional(),
-  org_id: z6.union([z6.string(), z6.null()]).optional()
+  org_id: z6.union([z6.string(), z6.null()]).optional(),
+  expires_at: z6.union([z6.string(), z6.null()]).optional()
 });
 var TriggeredFunctionState = z6.object({
   triggered_xact_id: z6.string(),
@@ -2199,6 +2805,7 @@ var TopicMapData = z6.object({
   topic_names: z6.record(z6.string()).optional(),
   generation_settings: TopicMapGenerationSettings.optional(),
   disable_reconciliation: z6.boolean().optional(),
+  reconcile_mode: z6.enum(["evolve", "names_only"]).optional(),
   distance_threshold: z6.number().optional(),
   btql_filter: z6.string().optional(),
   automation_btql_filter: z6.string().optional()
@@ -2779,7 +3386,12 @@ var ModelParams = z6.union([
   }).partial().passthrough()
 ]);
 var PromptOptionsNullish = z6.union([
-  z6.object({ model: z6.string(), params: ModelParams, position: z6.string() }).partial(),
+  z6.object({
+    model: z6.string(),
+    params: ModelParams,
+    position: z6.string(),
+    endpoint_name: z6.union([z6.string(), z6.null()])
+  }).partial(),
   z6.null()
 ]);
 var PromptParserNullish = z6.union([
@@ -2793,11 +3405,25 @@ var PromptParserNullish = z6.union([
   }),
   z6.null()
 ]);
+var PreprocessorSavedFunctionId = z6.union([
+  z6.object({
+    type: z6.literal("function"),
+    id: z6.string(),
+    version: z6.string().optional()
+  }),
+  z6.object({
+    type: z6.literal("global"),
+    name: z6.string(),
+    function_type: z6.literal("preprocessor").optional().default("preprocessor")
+  }),
+  z6.null()
+]);
 var PromptDataNullish = z6.union([
   z6.object({
     prompt: PromptBlockDataNullish,
     options: PromptOptionsNullish,
     parser: PromptParserNullish,
+    preprocessor: PreprocessorSavedFunctionId,
     tool_functions: z6.union([z6.array(SavedFunctionId), z6.null()]),
     template_format: z6.union([
       z6.enum(["mustache", "nunjucks", "none"]),
@@ -2999,6 +3625,7 @@ var PromptData = z6.object({
   prompt: PromptBlockDataNullish,
   options: PromptOptionsNullish,
   parser: PromptParserNullish,
+  preprocessor: PreprocessorSavedFunctionId,
   tool_functions: z6.union([z6.array(SavedFunctionId), z6.null()]),
   template_format: z6.union([
     z6.enum(["mustache", "nunjucks", "none"]),
@@ -3161,7 +3788,8 @@ var InvokeFunction = FunctionId.and(
     mode: StreamingMode,
     strict: z6.union([z6.boolean(), z6.null()]),
     mcp_auth: z6.record(z6.object({ oauth_token: z6.string() }).partial()),
-    overrides: z6.union([z6.object({}).partial().passthrough(), z6.null()])
+    overrides: z6.union([z6.object({}).partial().passthrough(), z6.null()]),
+    endpoint_name: z6.union([z6.string(), z6.null()])
   }).partial()
 );
 var MCPServer = z6.object({
@@ -3225,6 +3853,24 @@ var Organization = z6.object({
   created: z6.union([z6.string(), z6.null()]).optional(),
   image_rendering_mode: ImageRenderingMode.optional()
 });
+var RetentionObjectType = z6.enum([
+  "project_logs",
+  "experiment",
+  "dataset"
+]);
+var OrgAutomation = z6.object({
+  id: z6.string().uuid(),
+  org_id: z6.string().uuid(),
+  user_id: z6.union([z6.string(), z6.null()]).optional(),
+  created: z6.union([z6.string(), z6.null()]).optional(),
+  name: z6.string(),
+  description: z6.union([z6.string(), z6.null()]).optional(),
+  config: z6.object({
+    event_type: z6.literal("retention"),
+    object_type: RetentionObjectType,
+    retention_days: z6.number().int().gte(0)
+  })
+});
 var ProjectSettings = z6.union([
   z6.object({
     comparison_key: z6.union([z6.string(), z6.null()]),
@@ -3251,6 +3897,7 @@ var ProjectSettings = z6.union([
       z6.null()
     ]),
     disable_realtime_queries: z6.union([z6.boolean(), z6.null()]),
+    monitor_charts_use_metrics_start: z6.union([z6.boolean(), z6.null()]),
     default_preprocessor: NullableSavedFunctionId
   }).partial(),
   z6.null()
@@ -3265,11 +3912,6 @@ var Project = z6.object({
   user_id: z6.union([z6.string(), z6.null()]).optional(),
   settings: ProjectSettings.optional()
 });
-var RetentionObjectType = z6.enum([
-  "project_logs",
-  "experiment",
-  "dataset"
-]);
 var TopicAutomationFacetModel = z6.union([
   z6.enum(["brain-facet-latest", "brain-facet-1", "brain-facet-2"]),
   z6.null()
@@ -3380,7 +4022,7 @@ var ProjectAutomation = z6.object({
     z6.object({
       event_type: z6.literal("retention"),
       object_type: RetentionObjectType,
-      retention_days: z6.number().gte(0)
+      retention_days: z6.number().int().gte(0)
     }),
     z6.object({
       event_type: z6.literal("environment_update"),
@@ -3552,7 +4194,12 @@ var Prompt = z6.object({
   metadata: z6.union([z6.object({}).partial().passthrough(), z6.null()]).optional(),
   function_type: FunctionTypeEnumNullish.optional()
 });
-var PromptOptions = z6.object({ model: z6.string(), params: ModelParams, position: z6.string() }).partial();
+var PromptOptions = z6.object({
+  model: z6.string(),
+  params: ModelParams,
+  position: z6.string(),
+  endpoint_name: z6.union([z6.string(), z6.null()])
+}).partial();
 var PromptSessionEvent = z6.object({
   id: z6.string(),
   _xact_id: z6.string(),
@@ -3635,7 +4282,8 @@ var RunEval = z6.object({
   stop_token: z6.union([z6.string(), z6.null()]).optional(),
   extra_messages: z6.string().optional(),
   tags: z6.array(z6.string()).optional(),
-  mcp_auth: z6.record(z6.object({ oauth_token: z6.string() }).partial()).optional()
+  mcp_auth: z6.record(z6.object({ oauth_token: z6.string() }).partial()).optional(),
+  endpoint_name: z6.union([z6.string(), z6.null()]).optional()
 });
 var ServiceToken = z6.object({
   id: z6.string().uuid(),
@@ -3645,7 +4293,8 @@ var ServiceToken = z6.object({
   service_account_id: z6.union([z6.string(), z6.null()]).optional(),
   service_account_email: z6.union([z6.string(), z6.null()]).optional(),
   service_account_name: z6.union([z6.string(), z6.null()]).optional(),
-  org_id: z6.union([z6.string(), z6.null()]).optional()
+  org_id: z6.union([z6.string(), z6.null()]).optional(),
+  expires_at: z6.union([z6.string(), z6.null()]).optional()
 });
 var SpanIFrame = z6.object({
   id: z6.string().uuid(),
@@ -3767,6 +4416,13 @@ var ViewOptions = z6.union([
       }),
       z6.null()
     ]),
+    pointSizeMetric: z6.union([
+      z6.object({
+        type: z6.enum(["none", "score", "metric", "metadata"]),
+        value: z6.string()
+      }),
+      z6.null()
+    ]),
     xAxisAggregation: z6.union([z6.string(), z6.null()]),
     chartAnnotations: z6.union([
       z6.array(z6.object({ id: z6.string(), text: z6.string() })),
@@ -4882,6 +5538,9 @@ var INSTRUMENTATION_NAMES = {
   BEDROCK_RUNTIME: "bedrock-runtime",
   BRAINTRUST_JS_LOGGER: "braintrust-js-logger",
   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",
@@ -4896,6 +5555,7 @@ var INSTRUMENTATION_NAMES = {
   LANGSMITH: "langsmith",
   MASTRA: "mastra",
   MISTRAL: "mistral",
+  OLLAMA: "ollama",
   OPENAI: "openai",
   OPENAI_AGENTS: "openai-agents",
   OPENAI_CODEX: "openai-codex",
@@ -4907,7 +5567,7 @@ var INSTRUMENTATION_NAMES = {
 var INTERNAL_SPAN_INSTRUMENTATION_NAME = /* @__PURE__ */ Symbol.for(
   "braintrust.spanInstrumentationName"
 );
-var SDK_VERSION = true ? "3.25.0" : "0.0.0";
+var SDK_VERSION = true ? "3.27.0" : "0.0.0";
 function withSpanInstrumentationName(args, instrumentationName) {
   return {
     ...args,
@@ -5102,12 +5762,13 @@ function applyMaskingToField(maskingFunction, data, fieldName) {
 var INITIAL_SPAN_WRITE_AS_MERGE = /* @__PURE__ */ Symbol(
   "braintrust.initial-span-write-as-merge"
 );
+var INTERNAL_SPAN_CONTEXT = /* @__PURE__ */ Symbol("braintrust.internal-span-context");
 var BRAINTRUST_CURRENT_SPAN_STORE = /* @__PURE__ */ Symbol.for(
   "braintrust.currentSpanStore"
 );
 var ContextManager = class {
   /**
-   * Returns the value to store in the ALS bound to a TracingChannel's start event.
+   * Returns the value to store in the ALS bound to a global hook's start event.
    * In default mode this is the Span itself; in OTEL mode it is the OTEL Context
    * containing the span so that OTEL's own ALS stores a proper Context object.
    */
@@ -7651,6 +8312,12 @@ function _internalStartSpanWithInitialMerge(args) {
     [INITIAL_SPAN_WRITE_AS_MERGE]: true
   }).span;
 }
+function _internalStartSpanWithContext(args, context) {
+  return startSpanAndIsLogger({
+    ...args,
+    [INTERNAL_SPAN_CONTEXT]: context
+  }).span;
+}
 async function flush(options) {
   const state = options?.state ?? _globalState;
   return await state.bgLogger().flush();
@@ -8444,7 +9111,7 @@ var SpanImpl = class _SpanImpl {
         start: args.startTime ?? getCurrentUnixTimestamp()
       },
       context: mergeSpanOriginContext(
-        { ...callerLocation },
+        { ...callerLocation, ...args[INTERNAL_SPAN_CONTEXT] },
         instrumentationName,
         this._state.spanOriginEnvironment
       ),
@@ -9921,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) {
@@ -10000,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;
       }
@@ -10414,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,
@@ -10432,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,
@@ -11687,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",
@@ -11702,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 }
@@ -11715,6 +12422,7 @@ var AnthropicPlugin = class extends BasePlugin {
   onEnable() {
     this.subscribeToAnthropicChannels();
     this.subscribeToAnthropicToolRunner();
+    this.subscribeToAnthropicSessionStreams();
   }
   onDisable() {
     this.unsubscribers = unsubscribeAll(this.unsubscribers);
@@ -11832,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 {};
@@ -13706,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
@@ -13812,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,
@@ -13832,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,
@@ -14817,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 },
@@ -14840,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;
 }
@@ -15657,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;
@@ -15716,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;
@@ -15736,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({
@@ -18161,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",
@@ -20303,11 +21761,11 @@ function summarizeEmbedContentOutput(response) {
   };
 }
 function populateUsageMetrics(metrics, usage) {
-  if (usage.promptTokenCount !== void 0) {
-    metrics.prompt_tokens = usage.promptTokenCount;
+  if (usage.promptTokenCount !== void 0 || usage.toolUsePromptTokenCount !== void 0) {
+    metrics.prompt_tokens = (usage.promptTokenCount ?? 0) + (usage.toolUsePromptTokenCount ?? 0);
   }
-  if (usage.candidatesTokenCount !== void 0) {
-    metrics.completion_tokens = usage.candidatesTokenCount;
+  if (usage.candidatesTokenCount !== void 0 || usage.thoughtsTokenCount !== void 0) {
+    metrics.completion_tokens = (usage.candidatesTokenCount ?? 0) + (usage.thoughtsTokenCount ?? 0);
   }
   if (usage.totalTokenCount !== void 0) {
     metrics.tokens = usage.totalTokenCount;
@@ -20318,13 +21776,26 @@ function populateUsageMetrics(metrics, usage) {
   if (usage.thoughtsTokenCount !== void 0) {
     metrics.completion_reasoning_tokens = usage.thoughtsTokenCount;
   }
+  for (const detail of usage.promptTokensDetails ?? []) {
+    if (detail.modality === "AUDIO" && detail.tokenCount !== void 0) {
+      metrics.prompt_audio_tokens = (metrics.prompt_audio_tokens ?? 0) + detail.tokenCount;
+    }
+  }
+  for (const detail of usage.candidatesTokensDetails ?? []) {
+    if (detail.modality === "AUDIO" && detail.tokenCount !== void 0) {
+      metrics.completion_audio_tokens = (metrics.completion_audio_tokens ?? 0) + detail.tokenCount;
+    }
+    if (detail.modality === "IMAGE" && detail.tokenCount !== void 0) {
+      metrics.completion_image_tokens = (metrics.completion_image_tokens ?? 0) + detail.tokenCount;
+    }
+  }
 }
 function populateInteractionUsageMetrics(metrics, usage) {
   if (typeof usage.total_input_tokens === "number") {
     metrics.prompt_tokens = usage.total_input_tokens;
   }
   if (typeof usage.total_output_tokens === "number") {
-    metrics.completion_tokens = usage.total_output_tokens;
+    metrics.completion_tokens = usage.total_output_tokens + (typeof usage.total_thought_tokens === "number" ? usage.total_thought_tokens : 0);
   }
   if (typeof usage.total_tokens === "number") {
     metrics.tokens = usage.total_tokens;
@@ -20335,6 +21806,24 @@ function populateInteractionUsageMetrics(metrics, usage) {
   if (typeof usage.total_thought_tokens === "number") {
     metrics.completion_reasoning_tokens = usage.total_thought_tokens;
   }
+  for (const detail of Array.isArray(usage.input_tokens_by_modality) ? usage.input_tokens_by_modality : []) {
+    if (typeof detail?.modality === "string" && detail.modality.toLowerCase() === "audio" && typeof detail.tokens === "number") {
+      metrics.prompt_audio_tokens = (metrics.prompt_audio_tokens ?? 0) + detail.tokens;
+    }
+  }
+  for (const detail of Array.isArray(usage.output_tokens_by_modality) ? usage.output_tokens_by_modality : []) {
+    if (typeof detail?.modality !== "string" || typeof detail.tokens !== "number") {
+      continue;
+    }
+    switch (detail.modality.toLowerCase()) {
+      case "audio":
+        metrics.completion_audio_tokens = (metrics.completion_audio_tokens ?? 0) + detail.tokens;
+        break;
+      case "image":
+        metrics.completion_image_tokens = (metrics.completion_image_tokens ?? 0) + detail.tokens;
+        break;
+    }
+  }
 }
 function aggregateGenerateContentChunks(chunks, startTime, firstTokenTime) {
   const end = getCurrentUnixTimestamp();
@@ -21073,6 +22562,299 @@ function extractTextGenerationStreamMetadata(chunks) {
   return void 0;
 }
 
+// src/instrumentation/plugins/huggingface-transformers-channels.ts
+var SUPPORTED_TASKS = /* @__PURE__ */ new Set([
+  "text-generation",
+  "text2text-generation",
+  "summarization",
+  "feature-extraction",
+  "question-answering"
+]);
+var pipelineInfo = /* @__PURE__ */ new WeakMap();
+function isSupportedHuggingFaceTransformersTask(task) {
+  return typeof task === "string" && SUPPORTED_TASKS.has(task);
+}
+function registerHuggingFaceTransformersPipeline(pipeline, task, model) {
+  if (typeof task !== "string") {
+    return;
+  }
+  const info = { task };
+  if (typeof model === "string") {
+    info.model = model;
+  }
+  pipelineInfo.set(pipeline, info);
+}
+function getHuggingFaceTransformersPipelineInfo(pipeline) {
+  return pipeline ? pipelineInfo.get(pipeline) : void 0;
+}
+var huggingFaceTransformersChannels = defineChannels(
+  "@huggingface/transformers",
+  {
+    pipeline: channel({
+      channelName: "pipeline",
+      kind: "async"
+    }),
+    pipelineCall: channel({
+      channelName: "pipeline.call",
+      kind: "async"
+    })
+  },
+  { instrumentationName: INSTRUMENTATION_NAMES.HUGGINGFACE }
+);
+
+// src/instrumentation/plugins/huggingface-transformers-plugin.ts
+var REQUEST_METADATA_KEYS = [
+  "temperature",
+  "top_p",
+  "max_tokens",
+  "stop"
+];
+var HuggingFaceTransformersPlugin = class extends BasePlugin {
+  onEnable() {
+    this.subscribeToPipelineFactory();
+    this.unsubscribers.push(
+      traceAsyncChannel(huggingFaceTransformersChannels.pipelineCall, {
+        name: (_args, event) => {
+          const task = getTask(event);
+          const operation = task?.replaceAll("-", "_") ?? "unknown";
+          return `huggingface.transformers.${operation}`;
+        },
+        type: "llm" /* LLM */,
+        shouldTrace: (_args, event) => isSupportedHuggingFaceTransformersTask(
+          getTask(event)
+        ),
+        extractInput: (args, event) => ({
+          input: extractInput(
+            getTask(event),
+            args
+          ),
+          metadata: extractMetadata(
+            event,
+            args
+          )
+        }),
+        extractOutput: (result, event) => extractOutput(
+          getTask(event),
+          result
+        ),
+        extractMetrics: () => ({})
+      })
+    );
+  }
+  onDisable() {
+    this.unsubscribers = unsubscribeAll(this.unsubscribers);
+  }
+  subscribeToPipelineFactory() {
+    const channel2 = huggingFaceTransformersChannels.pipeline.tracingChannel();
+    const handlers = {
+      asyncEnd: (event) => {
+        if (typeof event.result !== "function") {
+          return;
+        }
+        registerHuggingFaceTransformersPipeline(
+          event.result,
+          event.arguments?.[0],
+          event.arguments?.[1]
+        );
+      }
+    };
+    channel2.subscribe(handlers);
+    this.unsubscribers.push(() => channel2.unsubscribe(handlers));
+  }
+};
+function getTask(event) {
+  const self = event.self;
+  const registeredTask = getHuggingFaceTransformersPipelineInfo(self)?.task;
+  if (registeredTask !== void 0) {
+    return registeredTask;
+  }
+  if (typeof self?.task === "string") {
+    return self.task;
+  }
+  return void 0;
+}
+function extractMetadata(event, args) {
+  const metadata = {
+    provider: "huggingface"
+  };
+  const registeredModel = getHuggingFaceTransformersPipelineInfo(
+    event.self
+  )?.model;
+  const model = registeredModel ?? modelIdentifier(event.self);
+  if (model) {
+    metadata.model = model;
+  }
+  const task = getTask(event);
+  const options = task === "question-answering" ? args[2] : args[1];
+  if (isObject(options)) {
+    for (const key of REQUEST_METADATA_KEYS) {
+      if (options[key] !== void 0) {
+        metadata[key] = options[key];
+      }
+    }
+  }
+  return metadata;
+}
+function modelIdentifier(pipeline) {
+  const model = pipeline?.model;
+  if (!isObject(model)) {
+    return void 0;
+  }
+  const config = isObject(model.config) ? model.config : void 0;
+  for (const value of [
+    config?._name_or_path,
+    config?.name_or_path,
+    config?.model_id,
+    config?.modelId,
+    model.name
+  ]) {
+    if (typeof value === "string" && value.length > 0) {
+      return value;
+    }
+  }
+  return void 0;
+}
+function extractInput(task, args) {
+  switch (task) {
+    case "feature-extraction":
+      return args[0];
+    case "question-answering": {
+      const question = args[0];
+      const context = args[1];
+      if (Array.isArray(question) && Array.isArray(context) && question.every((value) => typeof value === "string") && context.every((value) => typeof value === "string")) {
+        return question.map((value, index) => [
+          {
+            role: "user",
+            content: `Context:
+${context[index] ?? ""}
+
+Question:
+${value}`
+          }
+        ]);
+      }
+      if (typeof question === "string" && typeof context === "string") {
+        return [
+          {
+            role: "user",
+            content: `Context:
+${context}
+
+Question:
+${question}`
+          }
+        ];
+      }
+      return { context, question };
+    }
+  }
+  const input = args[0];
+  if (task === "text-generation" && isChat(input)) {
+    return input;
+  }
+  if (task === "text-generation" && Array.isArray(input) && input.every(isChat)) {
+    return input;
+  }
+  if (typeof input === "string") {
+    return [{ role: "user", content: input }];
+  }
+  if (Array.isArray(input) && input.every((value) => typeof value === "string")) {
+    return input.map((value) => [
+      {
+        role: "user",
+        content: value
+      }
+    ]);
+  }
+  return input;
+}
+function isChat(value) {
+  return Array.isArray(value) && value.length > 0 && value.every(
+    (message) => isObject(message) && typeof message.role === "string" && "content" in message
+  );
+}
+function extractOutput(task, result) {
+  switch (task) {
+    case "feature-extraction":
+      return summarizeEmbedding(result);
+    case "question-answering":
+      return choicesFromAnswers(result);
+    default:
+      return choicesFromGenerations(result);
+  }
+}
+function summarizeEmbedding(result) {
+  if (!isObject(result) || !Array.isArray(result.dims)) {
+    return void 0;
+  }
+  const { dims } = result;
+  if (dims.length === 0 || !dims.every((dimension) => typeof dimension === "number")) {
+    return void 0;
+  }
+  if (dims.length === 1) {
+    return { embedding_length: dims[0] };
+  }
+  if (dims.length === 2) {
+    return {
+      embedding_count: dims[0],
+      embedding_length: dims[1]
+    };
+  }
+  return {
+    embedding_batch_count: dims[0],
+    embedding_count: dims[1],
+    embedding_length: dims.at(-1) ?? 0
+  };
+}
+function choicesFromAnswers(result) {
+  const answers = Array.isArray(result) ? result.flat() : [result];
+  const choices = answers.flatMap((answer, index) => {
+    if (!isObject(answer) || typeof answer.answer !== "string") {
+      return [];
+    }
+    return [
+      {
+        index,
+        finish_reason: "stop",
+        message: {
+          role: "assistant",
+          content: answer.answer
+        }
+      }
+    ];
+  });
+  return choices.length > 0 ? choices : void 0;
+}
+function choicesFromGenerations(result) {
+  const generations = Array.isArray(result) ? result.flat() : [result];
+  const choices = generations.flatMap((generation, index) => {
+    if (!isObject(generation)) {
+      return [];
+    }
+    const generated = generation.generated_text ?? generation.summary_text;
+    let content;
+    if (typeof generated === "string") {
+      content = generated;
+    } else if (isChat(generated)) {
+      content = generated.at(-1)?.content;
+    }
+    if (typeof content !== "string") {
+      return [];
+    }
+    return [
+      {
+        index,
+        finish_reason: "stop",
+        message: {
+          role: "assistant",
+          content
+        }
+      }
+    ];
+  });
+  return choices.length > 0 ? choices : void 0;
+}
+
 // src/instrumentation/plugins/openrouter-agent-channels.ts
 var openRouterAgentChannels = defineChannels(
   "@openrouter/agent",
@@ -23602,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",
@@ -24238,15 +26484,32 @@ function aggregateUsageFromEvents(events) {
     if (usage.thoughtsTokenCount !== void 0) {
       aggregated.thoughtsTokenCount = (aggregated.thoughtsTokenCount ?? 0) + usage.thoughtsTokenCount;
     }
+    if (usage.toolUsePromptTokenCount !== void 0) {
+      aggregated.toolUsePromptTokenCount = (aggregated.toolUsePromptTokenCount ?? 0) + usage.toolUsePromptTokenCount;
+    }
+    for (const detailsField of [
+      "promptTokensDetails",
+      "cacheTokensDetails",
+      "candidatesTokensDetails",
+      "toolUsePromptTokensDetails"
+    ]) {
+      const details = usage[detailsField];
+      if (details !== void 0) {
+        aggregated[detailsField] = [
+          ...aggregated[detailsField] ?? [],
+          ...details
+        ];
+      }
+    }
   }
   return hasUsage ? aggregated : void 0;
 }
 function populateUsageMetrics2(metrics, usage) {
-  if (usage.promptTokenCount !== void 0) {
-    metrics.prompt_tokens = usage.promptTokenCount;
+  if (usage.promptTokenCount !== void 0 || usage.toolUsePromptTokenCount !== void 0) {
+    metrics.prompt_tokens = (usage.promptTokenCount ?? 0) + (usage.toolUsePromptTokenCount ?? 0);
   }
-  if (usage.candidatesTokenCount !== void 0) {
-    metrics.completion_tokens = usage.candidatesTokenCount;
+  if (usage.candidatesTokenCount !== void 0 || usage.thoughtsTokenCount !== void 0) {
+    metrics.completion_tokens = (usage.candidatesTokenCount ?? 0) + (usage.thoughtsTokenCount ?? 0);
   }
   if (usage.totalTokenCount !== void 0) {
     metrics.tokens = usage.totalTokenCount;
@@ -24257,6 +26520,19 @@ function populateUsageMetrics2(metrics, usage) {
   if (usage.thoughtsTokenCount !== void 0) {
     metrics.completion_reasoning_tokens = usage.thoughtsTokenCount;
   }
+  for (const detail of usage.promptTokensDetails ?? []) {
+    if (detail.modality === "AUDIO" && detail.tokenCount !== void 0) {
+      metrics.prompt_audio_tokens = (metrics.prompt_audio_tokens ?? 0) + detail.tokenCount;
+    }
+  }
+  for (const detail of usage.candidatesTokensDetails ?? []) {
+    if (detail.modality === "AUDIO" && detail.tokenCount !== void 0) {
+      metrics.completion_audio_tokens = (metrics.completion_audio_tokens ?? 0) + detail.tokenCount;
+    }
+    if (detail.modality === "IMAGE" && detail.tokenCount !== void 0) {
+      metrics.completion_image_tokens = (metrics.completion_image_tokens ?? 0) + detail.tokenCount;
+    }
+  }
 }
 function cleanMetrics4(metrics) {
   const cleaned = {};
@@ -27325,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),
@@ -27334,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
@@ -27365,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: {
@@ -27409,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);
   }
@@ -27488,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),
@@ -27534,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),
@@ -27638,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 }
@@ -27770,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 } : {},
@@ -27799,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;
@@ -27808,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;
@@ -27826,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;
@@ -27841,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) {
@@ -27848,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;
@@ -27950,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
@@ -28622,7 +30937,7 @@ var LangSmithPlugin = class extends BasePlugin {
     const inputs = preferOwnValue(run, previous, "inputs");
     const outputs = preferOwnValue(run, previous, "outputs");
     const error = errorMessage(preferOwnValue(run, previous, "error"));
-    const metadata = extractMetadata(run, previous);
+    const metadata = extractMetadata2(run, previous);
     const tags = extractTags(preferOwnValue(run, previous, "tags"));
     const metrics = extractMetrics(run, previous);
     span.log({
@@ -28727,7 +31042,7 @@ function mapRunType(runType) {
       return "task" /* TASK */;
   }
 }
-function extractMetadata(run, previous) {
+function extractMetadata2(run, previous) {
   const extra = preferOwnValue(run, previous, "extra");
   const rawMetadata = ownValue(extra, "metadata");
   if (!isRecord2(rawMetadata)) {
@@ -28879,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) {
@@ -28892,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]),
@@ -28972,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(),
@@ -28986,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) {
@@ -29022,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);
@@ -29273,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)) {
@@ -29294,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":
@@ -29371,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,
@@ -29400,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);
   }
@@ -29508,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",
@@ -29543,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)
     }
   };
 }
@@ -29732,7 +31944,7 @@ function cleanMetrics5(metrics) {
   }
   return cleaned;
 }
-function stringifyArguments(value) {
+function stringifyArguments2(value) {
   if (typeof value === "string") {
     return value;
   }
@@ -30100,6 +32312,15 @@ function handleMultiAgentStreamEvent(state, event, activeChildParents) {
     logInstrumentationError5("Strands Agent SDK multi-agent event", error);
   }
 }
+function buildModelSpanInput(event, attachmentCache) {
+  const systemPrompt = typeof event.agent?.systemPrompt === "string" && event.agent.systemPrompt.length > 0 ? event.agent.systemPrompt : void 0;
+  const processedMessages = Array.isArray(event.agent?.messages) ? processStrandsInputAttachments(event.agent.messages, attachmentCache) : void 0;
+  if (!systemPrompt) {
+    return processedMessages;
+  }
+  const systemMessage = { role: "system", content: systemPrompt };
+  return Array.isArray(processedMessages) ? [systemMessage, ...processedMessages] : [systemMessage];
+}
 function startModelSpan(state, event) {
   if (state.activeModel) {
     finalizeModelSpan(state);
@@ -30117,10 +32338,7 @@ function startModelSpan(state, event) {
       withSpanInstrumentationName(
         {
           event: {
-            input: Array.isArray(event.agent?.messages) ? processStrandsInputAttachments(
-              event.agent.messages,
-              state.attachmentCache
-            ) : void 0,
+            input: buildModelSpanInput(event, state.attachmentCache),
             metadata
           },
           name: formatModelSpanName(model),
@@ -30760,6 +32978,532 @@ function logInstrumentationError5(context, error) {
   debugLogger.debug(`${context}:`, error);
 }
 
+// src/instrumentation/plugins/cloudflare-ai-chat-channels.ts
+var cloudflareAIChatChannels = defineChannels(
+  "@cloudflare/ai-chat",
+  {
+    runExclusiveChatTurn: channel({
+      channelName: "AIChatAgent._runExclusiveChatTurn",
+      kind: "async"
+    }),
+    onChatResponse: channel({
+      channelName: "AIChatAgent.onChatResponse",
+      kind: "sync-stream"
+    })
+  },
+  { instrumentationName: INSTRUMENTATION_NAMES.CLOUDFLARE_AI_CHAT }
+);
+
+// src/instrumentation/plugins/cloudflare-ai-chat-instrumentation.ts
+var wrappedResponseHooks = /* @__PURE__ */ new WeakSet();
+function instrumentCloudflareAIChatResponseHook(agent) {
+  try {
+    const original = Reflect.get(agent, "onChatResponse");
+    if (typeof original !== "function" || wrappedResponseHooks.has(original)) {
+      return;
+    }
+    const wrapped = function(result) {
+      const args = [result];
+      return cloudflareAIChatChannels.onChatResponse.traceSync(
+        () => Reflect.apply(original, this, args),
+        {
+          arguments: args,
+          self: this
+        }
+      );
+    };
+    wrappedResponseHooks.add(wrapped);
+    defineWrappedMethod(agent, "onChatResponse", original, wrapped);
+  } catch (error) {
+    debugLogger.debug(
+      "Failed to wrap @cloudflare/ai-chat response hook:",
+      error
+    );
+  }
+}
+function defineWrappedMethod(target, property, original, wrapped) {
+  const ownDescriptor = Object.getOwnPropertyDescriptor(target, property);
+  Object.defineProperty(target, property, {
+    configurable: ownDescriptor?.configurable ?? true,
+    enumerable: ownDescriptor?.enumerable ?? false,
+    value: wrapped,
+    writable: ownDescriptor && "writable" in ownDescriptor ? ownDescriptor.writable : true
+  });
+  try {
+    Object.defineProperty(wrapped, "name", {
+      configurable: true,
+      value: original.name
+    });
+  } catch {
+  }
+}
+
+// src/instrumentation/plugins/cloudflare-ai-chat-plugin.ts
+var BLOCKED_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
+var RESPONSE_STATE_RETENTION_MS = 6e4;
+var CloudflareAIChatPlugin = class extends BasePlugin {
+  activeStates = /* @__PURE__ */ new Set();
+  activeTurns = /* @__PURE__ */ new WeakMap();
+  eventStates = /* @__PURE__ */ new WeakMap();
+  onEnable() {
+    this.subscribeToResponseHook();
+    this.subscribeToTurnRunner();
+  }
+  onDisable() {
+    for (const unsubscribe of this.unsubscribers) {
+      unsubscribe();
+    }
+    this.unsubscribers = [];
+    for (const state of this.activeStates) {
+      this.cleanupState(state);
+    }
+    this.activeStates.clear();
+  }
+  subscribeToTurnRunner() {
+    const tracingChannel = cloudflareAIChatChannels.runExclusiveChatTurn.tracingChannel();
+    const unbindCurrentSpanStore = this.bindCurrentSpanStore(tracingChannel);
+    const handlers = {
+      start: (event) => {
+        this.ensureEventState(event);
+      },
+      asyncEnd: (event) => {
+        this.finishEvent(event);
+      },
+      error: (event) => {
+        this.finishEvent(event, event.error);
+      }
+    };
+    tracingChannel.subscribe(handlers);
+    this.unsubscribers.push(() => {
+      unbindCurrentSpanStore?.();
+      tracingChannel.unsubscribe(handlers);
+    });
+  }
+  subscribeToResponseHook() {
+    const tracingChannel = cloudflareAIChatChannels.onChatResponse.tracingChannel();
+    const handlers = {
+      start: (event) => {
+        let state;
+        try {
+          const agent = asObject(event.self);
+          const result = event.arguments[0];
+          state = agent ? this.findResponseState(
+            agent,
+            stringValue3(ownValue2(result, "requestId"))
+          ) : void 0;
+          if (!state) {
+            return;
+          }
+          state.responseObserved = true;
+          const output = serializeMessage(ownValue2(result, "message"));
+          const status = stringValue3(ownValue2(result, "status"));
+          const error = ownValue2(result, "error");
+          const input = ownValue2(result, "continuation") === true ? state.input : serializeMessages(readProperty(agent, "messages"))?.filter(
+            (message) => typeof output?.id !== "string" || message.id !== output.id
+          );
+          state.span.log({
+            ...input !== void 0 ? { input } : {},
+            ...output !== void 0 ? { output } : {},
+            ...status === "error" && error !== void 0 ? { error } : {}
+          });
+        } catch (error) {
+          debugLogger.debug(
+            "Failed to process @cloudflare/ai-chat response hook:",
+            error
+          );
+        } finally {
+          if (state?.settled) {
+            this.cleanupState(state);
+          }
+        }
+      }
+    };
+    tracingChannel.subscribe(handlers);
+    this.unsubscribers.push(() => tracingChannel.unsubscribe(handlers));
+  }
+  bindCurrentSpanStore(tracingChannel) {
+    const globalState = _internalGetGlobalState();
+    const contextManager = globalState?.contextManager;
+    const startChannel = tracingChannel.start;
+    const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
+    if (!startChannel || !currentSpanStore || !contextManager) {
+      return void 0;
+    }
+    startChannel.bindStore(currentSpanStore, (event) => {
+      const state = this.ensureEventState(event);
+      return state ? contextManager.wrapSpanForStore(state.span) : currentSpanStore.getStore();
+    });
+    return () => startChannel.unbindStore(currentSpanStore);
+  }
+  ensureEventState(event) {
+    const eventKey = event;
+    const known = this.eventStates.get(eventKey);
+    if (known) {
+      return known;
+    }
+    try {
+      const agent = asObject(event.self);
+      const requestId = stringValue3(event.arguments[0]);
+      const key = requestId ?? /* @__PURE__ */ Symbol("cloudflare-ai-chat-turn");
+      const activeForAgent = agent ? this.getActiveTurns(agent) : void 0;
+      const existing = activeForAgent?.get(key);
+      const state = existing && !existing.settled ? existing : this.createTurnState(agent, key);
+      if (existing && !existing.settled) {
+        state.depth += 1;
+      }
+      this.eventStates.set(eventKey, state);
+      this.bindTurnCallback(event, agent, state);
+      if (agent) {
+        instrumentCloudflareAIChatResponseHook(agent);
+      }
+      return state;
+    } catch (error) {
+      debugLogger.debug(
+        "Failed to start @cloudflare/ai-chat instrumentation:",
+        error
+      );
+      return void 0;
+    }
+  }
+  createTurnState(agent, key) {
+    const span = startSpan(
+      withSpanInstrumentationName(
+        {
+          name: "AIChatAgent.onChatMessage",
+          spanAttributes: { type: "task" /* TASK */ }
+        },
+        INSTRUMENTATION_NAMES.CLOUDFLARE_AI_CHAT
+      )
+    );
+    const state = {
+      agent,
+      depth: 1,
+      ended: false,
+      key,
+      responseObserved: false,
+      settled: false,
+      span
+    };
+    this.activeStates.add(state);
+    if (agent) {
+      this.getActiveTurns(agent).set(key, state);
+    }
+    return state;
+  }
+  bindTurnCallback(event, agent, state) {
+    const callback = event.arguments[1];
+    if (typeof callback !== "function") {
+      return;
+    }
+    try {
+      event.arguments[1] = function(...args) {
+        return withCurrent(state.span, () => {
+          try {
+            const input = serializeMessages(readProperty(agent, "messages"));
+            if (input !== void 0 && state.input === void 0) {
+              state.input = input;
+              state.span.log({ input });
+            }
+          } catch (error) {
+            debugLogger.debug(
+              "Failed to capture @cloudflare/ai-chat messages:",
+              error
+            );
+          }
+          return Reflect.apply(callback, this, args);
+        });
+      };
+    } catch (error) {
+      debugLogger.debug(
+        "Failed to bind @cloudflare/ai-chat turn callback context:",
+        error
+      );
+    }
+  }
+  finishEvent(event, error) {
+    const eventKey = event;
+    const state = this.eventStates.get(eventKey);
+    if (!state || state.ended) {
+      return;
+    }
+    this.eventStates.delete(eventKey);
+    if (error !== void 0 && state.pendingError === void 0) {
+      state.pendingError = error;
+    }
+    state.depth -= 1;
+    if (state.depth === 0) {
+      state.settled = true;
+      this.endState(state);
+      if (state.responseObserved || error !== void 0) {
+        this.cleanupState(state);
+      } else {
+        state.cleanupTimer = setTimeout(
+          () => this.cleanupState(state),
+          RESPONSE_STATE_RETENTION_MS
+        );
+        if (typeof state.cleanupTimer === "object" && state.cleanupTimer !== null && "unref" in state.cleanupTimer && typeof state.cleanupTimer.unref === "function") {
+          state.cleanupTimer.unref();
+        }
+      }
+    }
+  }
+  endState(state) {
+    if (state.ended) {
+      return;
+    }
+    state.ended = true;
+    try {
+      if (state.pendingError !== void 0) {
+        state.span.log({ error: state.pendingError });
+      }
+    } finally {
+      state.span.end();
+    }
+  }
+  cleanupState(state) {
+    if (state.cleanupTimer !== void 0) {
+      clearTimeout(state.cleanupTimer);
+      state.cleanupTimer = void 0;
+    }
+    try {
+      this.endState(state);
+    } finally {
+      this.activeStates.delete(state);
+      if (state.agent) {
+        const activeForAgent = this.activeTurns.get(state.agent);
+        if (activeForAgent?.get(state.key) === state) {
+          activeForAgent.delete(state.key);
+        }
+      }
+    }
+  }
+  getActiveTurns(agent) {
+    let turns = this.activeTurns.get(agent);
+    if (!turns) {
+      turns = /* @__PURE__ */ new Map();
+      this.activeTurns.set(agent, turns);
+    }
+    return turns;
+  }
+  findResponseState(agent, requestId) {
+    const turns = this.activeTurns.get(agent);
+    if (!turns) {
+      return void 0;
+    }
+    if (requestId !== void 0) {
+      return turns.get(requestId);
+    }
+    const active = [...turns.values()];
+    return active.length === 1 ? active[0] : void 0;
+  }
+};
+function asObject(value) {
+  return value !== null && (typeof value === "object" || typeof value === "function") ? value : void 0;
+}
+function readProperty(value, key) {
+  const object = asObject(value);
+  return object ? Reflect.get(object, key) : void 0;
+}
+function ownValue2(value, key) {
+  const object = asObject(value);
+  if (!object) {
+    return void 0;
+  }
+  const descriptor = Object.getOwnPropertyDescriptor(object, key);
+  return descriptor && "value" in descriptor ? descriptor.value : void 0;
+}
+function stringValue3(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function serializeMessages(value) {
+  if (!Array.isArray(value)) {
+    return void 0;
+  }
+  return value.flatMap((message) => {
+    const serialized = serializeMessage(message);
+    return serialized === void 0 ? [] : [serialized];
+  });
+}
+function serializeMessage(value) {
+  const message = asObject(value);
+  if (!message) {
+    return void 0;
+  }
+  const serialized = [];
+  const id = ownValue2(message, "id");
+  const role = ownValue2(message, "role");
+  const parts = ownValue2(message, "parts");
+  if (typeof id === "string") {
+    serialized.push(["id", id]);
+  }
+  if (typeof role === "string") {
+    serialized.push(["role", role]);
+  }
+  const sanitizedParts = sanitizeLoggedValue2(parts);
+  if (sanitizedParts !== void 0) {
+    serialized.push(["parts", sanitizedParts]);
+  }
+  return serialized.length > 0 ? Object.fromEntries(serialized) : void 0;
+}
+function sanitizeLoggedValue2(value, seen = /* @__PURE__ */ new WeakSet(), depth = 0) {
+  if (value === null || typeof value === "string" || typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value : void 0;
+  }
+  const object = asObject(value);
+  if (!object || depth >= 20 || typeof value === "function") {
+    return void 0;
+  }
+  if (seen.has(object)) {
+    return "[Circular]";
+  }
+  seen.add(object);
+  if (Array.isArray(value)) {
+    return value.map((entry) => sanitizeLoggedValue2(entry, seen, depth + 1));
+  }
+  const entries = [];
+  for (const [key, descriptor] of Object.entries(
+    Object.getOwnPropertyDescriptors(object)
+  )) {
+    if (BLOCKED_KEYS.has(key) || !descriptor.enumerable || !("value" in descriptor)) {
+      continue;
+    }
+    const sanitized = sanitizeLoggedValue2(descriptor.value, seen, depth + 1);
+    if (sanitized !== void 0) {
+      entries.push([key, sanitized]);
+    }
+  }
+  return Object.fromEntries(entries);
+}
+
+// src/instrumentation/plugins/cloudflare-agents-channels.ts
+var cloudflareAgentsChannels = defineChannels(
+  "agents",
+  {
+    runAgentTool: channel({
+      channelName: "Agent.runAgentTool",
+      kind: "async"
+    })
+  },
+  { instrumentationName: INSTRUMENTATION_NAMES.CLOUDFLARE_AGENTS }
+);
+
+// src/instrumentation/plugins/cloudflare-agents-plugin.ts
+var CLOUDFLARE_WORKERS_CONTEXT = {
+  span_origin: {
+    environment: { type: "server", name: "cloudflare_workers" }
+  }
+};
+var CloudflareAgentsPlugin = class extends BasePlugin {
+  onEnable() {
+    const channel2 = cloudflareAgentsChannels.runAgentTool.tracingChannel();
+    const spans = /* @__PURE__ */ new WeakMap();
+    const handlers = {
+      start: (event) => {
+        try {
+          const agentClass = event.arguments[0];
+          const options = event.arguments[1];
+          if (ownValue3(options, "detached")) {
+            return;
+          }
+          const name = ownValue3(agentClass, "name");
+          if (typeof name !== "string" || name.length === 0) {
+            debugLogger.warn(
+              "Skipping Cloudflare Agents runAgentTool span because the child agent class has no name."
+            );
+            return;
+          }
+          const span = _internalStartSpanWithContext(
+            withSpanInstrumentationName(
+              {
+                name,
+                spanAttributes: { type: "tool" /* TOOL */ },
+                event: {
+                  input: ownValue3(options, "input")
+                }
+              },
+              INSTRUMENTATION_NAMES.CLOUDFLARE_AGENTS
+            ),
+            CLOUDFLARE_WORKERS_CONTEXT
+          );
+          spans.set(event, span);
+        } catch (error) {
+          logInstrumentationError6("start", error);
+        }
+      },
+      asyncEnd: (event) => {
+        const span = spans.get(event);
+        if (!span) {
+          return;
+        }
+        spans.delete(event);
+        try {
+          const status = ownValue3(event.result, "status");
+          if (status === "completed") {
+            span.log({ output: ownValue3(event.result, "output") });
+          } else {
+            const error = ownValue3(event.result, "error");
+            if (typeof error === "string") {
+              span.log({ error });
+            }
+          }
+        } catch (error) {
+          logInstrumentationError6("completion", error);
+        } finally {
+          safelyEndSpan(span);
+        }
+      },
+      error: (event) => {
+        const span = spans.get(event);
+        if (!span) {
+          return;
+        }
+        spans.delete(event);
+        try {
+          span.log({ error: event.error });
+        } catch (error) {
+          logInstrumentationError6("rejection", error);
+        } finally {
+          safelyEndSpan(span);
+        }
+      }
+    };
+    channel2.subscribe(handlers);
+    this.unsubscribers.push(() => channel2.unsubscribe(handlers));
+  }
+  onDisable() {
+    for (const unsubscribe of this.unsubscribers) {
+      unsubscribe();
+    }
+    this.unsubscribers = [];
+  }
+};
+function ownValue3(value, key) {
+  if (!isObjectLike2(value)) {
+    return void 0;
+  }
+  const descriptor = Object.getOwnPropertyDescriptor(value, key);
+  return descriptor && "value" in descriptor ? descriptor.value : void 0;
+}
+function isObjectLike2(value) {
+  return typeof value === "object" && value !== null || typeof value === "function";
+}
+function safelyEndSpan(span) {
+  try {
+    span.end();
+  } catch (error) {
+    logInstrumentationError6("span end", error);
+  }
+}
+function logInstrumentationError6(operation, error) {
+  debugLogger.error(
+    `Failed to process Cloudflare Agents ${operation} instrumentation:`,
+    error
+  );
+}
+
 // src/instrumentation/braintrust-plugin.ts
 var BraintrustPlugin = class extends BasePlugin {
   config;
@@ -30768,13 +33512,16 @@ var BraintrustPlugin = class extends BasePlugin {
   anthropicPlugin = null;
   aiSDKPlugin = null;
   claudeAgentSDKPlugin = null;
+  cloudflareThinkPlugin = null;
   cursorSDKPlugin = null;
   openAIAgentsPlugin = null;
   googleGenAIPlugin = null;
   huggingFacePlugin = null;
+  huggingFaceTransformersPlugin = null;
   openRouterPlugin = null;
   openRouterAgentPlugin = null;
   mistralPlugin = null;
+  ollamaPlugin = null;
   googleADKPlugin = null;
   coherePlugin = null;
   groqPlugin = null;
@@ -30786,6 +33533,8 @@ var BraintrustPlugin = class extends BasePlugin {
   langSmithPlugin = null;
   piCodingAgentPlugin = null;
   strandsAgentSDKPlugin = null;
+  cloudflareAIChatPlugin = null;
+  cloudflareAgentsPlugin = null;
   constructor(config = {}) {
     super();
     this.config = config;
@@ -30812,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();
@@ -30827,6 +33580,8 @@ var BraintrustPlugin = class extends BasePlugin {
     if (integrations.huggingface !== false) {
       this.huggingFacePlugin = new HuggingFacePlugin();
       this.huggingFacePlugin.enable();
+      this.huggingFaceTransformersPlugin = new HuggingFaceTransformersPlugin();
+      this.huggingFaceTransformersPlugin.enable();
     }
     if (integrations.openrouter !== false) {
       this.openRouterPlugin = new OpenRouterPlugin();
@@ -30840,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();
@@ -30872,6 +33631,14 @@ var BraintrustPlugin = class extends BasePlugin {
       this.strandsAgentSDKPlugin = new StrandsAgentSDKPlugin();
       this.strandsAgentSDKPlugin.enable();
     }
+    if (integrations.cloudflareAIChat !== false) {
+      this.cloudflareAIChatPlugin = new CloudflareAIChatPlugin();
+      this.cloudflareAIChatPlugin.enable();
+    }
+    if (integrations.cloudflareAgents !== false) {
+      this.cloudflareAgentsPlugin = new CloudflareAgentsPlugin();
+      this.cloudflareAgentsPlugin.enable();
+    }
     if (integrations.flue !== false) {
       this.fluePlugin = new FluePlugin();
       this.fluePlugin.enable();
@@ -30908,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;
@@ -30924,6 +33695,10 @@ var BraintrustPlugin = class extends BasePlugin {
       this.huggingFacePlugin.disable();
       this.huggingFacePlugin = null;
     }
+    if (this.huggingFaceTransformersPlugin) {
+      this.huggingFaceTransformersPlugin.disable();
+      this.huggingFaceTransformersPlugin = null;
+    }
     if (this.openRouterPlugin) {
       this.openRouterPlugin.disable();
       this.openRouterPlugin = null;
@@ -30936,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;
@@ -30968,6 +33747,14 @@ var BraintrustPlugin = class extends BasePlugin {
       this.strandsAgentSDKPlugin.disable();
       this.strandsAgentSDKPlugin = null;
     }
+    if (this.cloudflareAIChatPlugin) {
+      this.cloudflareAIChatPlugin.disable();
+      this.cloudflareAIChatPlugin = null;
+    }
+    if (this.cloudflareAgentsPlugin) {
+      this.cloudflareAgentsPlugin.disable();
+      this.cloudflareAgentsPlugin = null;
+    }
     if (this.fluePlugin) {
       this.fluePlugin.disable();
       this.fluePlugin = null;
@@ -32651,6 +35438,9 @@ var envIntegrationAliases = {
   strandsagentsdk: "strandsAgentSDK",
   "strands-agent-sdk": "strandsAgentSDK",
   "@strands-agents/sdk": "strandsAgentSDK",
+  agents: "cloudflareAgents",
+  "cloudflare-agents": "cloudflareAgents",
+  cloudflareagents: "cloudflareAgents",
   anthropic: "anthropic",
   aisdk: "aisdk",
   "ai-sdk": "aisdk",
@@ -32658,6 +35448,10 @@ var envIntegrationAliases = {
   vercel: "vercel",
   claudeagentsdk: "claudeAgentSDK",
   "claude-agent-sdk": "claudeAgentSDK",
+  cloudflareaichat: "cloudflareAIChat",
+  "cloudflare-ai-chat": "cloudflareAIChat",
+  "@cloudflare/ai-chat": "cloudflareAIChat",
+  cloudflarethink: "cloudflareThink",
   cursor: "cursor",
   "cursor-sdk": "cursorSDK",
   cursorsdk: "cursorSDK",
@@ -32672,10 +35466,13 @@ var envIntegrationAliases = {
   "google-genai": "googleGenAI",
   googlegenai: "googleGenAI",
   huggingface: "huggingface",
+  "@huggingface/transformers": "huggingface",
+  transformers: "huggingface",
   openrouter: "openrouter",
   openrouteragent: "openrouterAgent",
   "openrouter-agent": "openrouterAgent",
   mistral: "mistral",
+  ollama: "ollama",
   googleadk: "googleADK",
   "google-adk": "googleADK",
   cohere: "cohere",
@@ -32710,6 +35507,8 @@ function getDefaultInstrumentationIntegrations() {
     googleADK: true,
     huggingface: true,
     claudeAgentSDK: true,
+    cloudflareAIChat: true,
+    cloudflareThink: true,
     cursor: true,
     cursorSDK: true,
     flue: true,
@@ -32718,6 +35517,7 @@ function getDefaultInstrumentationIntegrations() {
     openrouter: true,
     openrouterAgent: true,
     mistral: true,
+    ollama: true,
     cohere: true,
     groq: true,
     bedrock: true,
@@ -32729,7 +35529,8 @@ function getDefaultInstrumentationIntegrations() {
     langgraph: true,
     langsmith: true,
     piCodingAgent: true,
-    strandsAgentSDK: true
+    strandsAgentSDK: true,
+    cloudflareAgents: true
   };
 }
 function readDisabledInstrumentationEnvConfig(disabledList) {
@@ -32747,7 +35548,9 @@ function readDisabledInstrumentationEnvConfig(disabledList) {
 }
 
 // src/instrumentation/registry.ts
-var REGISTRY_STATE_KEY = /* @__PURE__ */ Symbol.for("braintrust.registry");
+var REGISTRY_STATE_KEY = /* @__PURE__ */ Symbol.for(
+  `braintrust.registry.global-hooks.v${GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION}`
+);
 function getSharedState() {
   const state = globalThis[/* @__PURE__ */ Symbol.for("braintrust-state")];
   return state && typeof state === "object" ? state : void 0;