braintrust 3.24.0 → 3.26.0

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

@@ -1,38 +1,50 @@
 import {
+  GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION,
+  INSTRUMENTATION_NAMES,
   aiSDKChannels,
   anthropicChannels,
   bedrockRuntimeChannels,
   claudeAgentSDKChannels,
+  cloudflareAIChatChannels,
+  cloudflareAgentsChannels,
   cohereChannels,
   cursorSDKChannels,
+  detectSpanOriginEnvironment,
   flueChannels,
   genkitChannels,
   genkitCoreChannels,
   getDefaultInstrumentationIntegrations,
+  getHuggingFaceTransformersPipelineInfo,
+  getSpanInstrumentationName,
   gitHubCopilotChannels,
   googleADKChannels,
   googleGenAIChannels,
   groqChannels,
   harnessAgentChannels,
   huggingFaceChannels,
+  huggingFaceTransformersChannels,
   installMastraExporterFactory,
   isInstrumentationIntegrationDisabled,
+  isSupportedHuggingFaceTransformersTask,
   isomorph_default,
   langChainChannels,
   langSmithChannels,
+  mergeSpanOriginContext,
   mistralChannels,
   openAIAgentsCoreChannels,
   openAIChannels,
   openAICodexChannels,
   openRouterAgentChannels,
   openRouterChannels,
-  patchTracingChannel,
   piCodingAgentChannels,
   readDisabledInstrumentationEnvConfig,
+  registerHuggingFaceTransformersPipeline,
+  setGlobalHookErrorReporter,
   smithyClientChannels,
   smithyCoreChannels,
-  strandsAgentSDKChannels
-} from "./chunk-7F6GCRHH.mjs";
+  strandsAgentSDKChannels,
+  withSpanInstrumentationName
+} from "./chunk-PN7EWK66.mjs";
 
 // src/id-gen.ts
 import { v4 as uuidv4 } from "uuid";
@@ -145,6 +157,9 @@ var debugLogger = {
     return createDebugLogger(state);
   }
 };
+setGlobalHookErrorReporter((error) => {
+  debugLogger.error("Global instrumentation hook error:", error);
+});
 
 // src/id-gen.ts
 var IDGenerator = class {
@@ -1872,7 +1887,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(),
@@ -1992,6 +2008,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()
@@ -2572,7 +2589,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([
@@ -2586,11 +2608,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"]),
@@ -2792,6 +2828,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"]),
@@ -2954,7 +2991,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({
@@ -3018,6 +3056,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()]),
@@ -3044,6 +3100,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()
@@ -3058,11 +3115,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()
@@ -3173,7 +3225,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"),
@@ -3345,7 +3397,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(),
@@ -3428,7 +3485,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(),
@@ -3438,7 +3496,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(),
@@ -3560,6 +3619,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() })),
@@ -4753,97 +4819,6 @@ var SpanCache = class {
   }
 };
 
-// src/span-origin.ts
-var SDK_VERSION = true ? "3.24.0" : "0.0.0";
-function detectSpanOriginEnvironment(explicit) {
-  if (explicit) return explicit;
-  const envType = isomorph_default.getEnv("BRAINTRUST_ENVIRONMENT_TYPE");
-  const envName = isomorph_default.getEnv("BRAINTRUST_ENVIRONMENT_NAME");
-  if (envType || envName) {
-    return {
-      ...envType ? { type: envType } : {},
-      ...envName ? { name: envName } : {}
-    };
-  }
-  const ci = firstPresent([
-    ["GITHUB_ACTIONS", "github_actions"],
-    ["GITLAB_CI", "gitlab_ci"],
-    ["CIRCLECI", "circleci"],
-    ["BUILDKITE", "buildkite"],
-    ["JENKINS_URL", "jenkins"],
-    ["JENKINS_HOME", "jenkins"],
-    ["TF_BUILD", "azure_pipelines"],
-    ["TEAMCITY_VERSION", "teamcity"],
-    ["TRAVIS", "travis"],
-    ["BITBUCKET_BUILD_NUMBER", "bitbucket"]
-  ]);
-  if (ci) return { type: "ci", name: ci };
-  if (isomorph_default.getEnv("CI")) return { type: "ci", name: "ci" };
-  const earlyServer = firstPresent([
-    ["VERCEL", "vercel"],
-    ["NETLIFY", "netlify"]
-  ]);
-  if (earlyServer) return { type: "server", name: earlyServer };
-  if (isomorph_default.getEnv("ECS_CONTAINER_METADATA_URI") || isomorph_default.getEnv("ECS_CONTAINER_METADATA_URI_V4")) {
-    return { type: "server", name: "ecs" };
-  }
-  const awsExecutionEnv = isomorph_default.getEnv("AWS_EXECUTION_ENV");
-  if (awsExecutionEnv?.startsWith("AWS_ECS_")) {
-    return { type: "server", name: "ecs" };
-  }
-  if (awsExecutionEnv?.startsWith("AWS_Lambda_")) {
-    return { type: "server", name: "aws_lambda" };
-  }
-  if (isomorph_default.getEnv("AWS_LAMBDA_FUNCTION_NAME")) {
-    return { type: "server", name: "aws_lambda" };
-  }
-  const server = firstPresent([
-    ["K_SERVICE", "cloud_run"],
-    ["FUNCTION_TARGET", "gcp_functions"],
-    ["KUBERNETES_SERVICE_HOST", "kubernetes"],
-    ["DYNO", "heroku"],
-    ["FLY_APP_NAME", "fly"],
-    ["RAILWAY_ENVIRONMENT", "railway"],
-    ["RENDER_SERVICE_NAME", "render"]
-  ]);
-  if (server) return { type: "server", name: server };
-  return deploymentModeEnvironment("NODE_ENV", isomorph_default.getEnv("NODE_ENV"));
-}
-function makeSpanOrigin(instrumentationName, environment) {
-  return {
-    name: "braintrust.sdk.javascript",
-    version: SDK_VERSION,
-    instrumentation: { name: instrumentationName },
-    ...environment ? { environment } : {}
-  };
-}
-function mergeSpanOriginContext(context, instrumentationName, environment) {
-  const next = { ...context ?? {} };
-  const current = isObject2(next.span_origin) ? { ...next.span_origin } : {};
-  next.span_origin = {
-    ...makeSpanOrigin(instrumentationName, environment),
-    ...current
-  };
-  return next;
-}
-function firstPresent(entries) {
-  return entries.find(([key]) => Boolean(isomorph_default.getEnv(key)))?.[1];
-}
-function deploymentModeEnvironment(_key, value) {
-  if (!value) return void 0;
-  const normalized = value.toLowerCase();
-  if (normalized === "production" || normalized === "staging") {
-    return { type: "server", name: normalized };
-  }
-  if (normalized === "development" || normalized === "local") {
-    return { type: "local", name: normalized };
-  }
-  return { name: value };
-}
-function isObject2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 // src/logger.ts
 var BRAINTRUST_ATTACHMENT = BraintrustAttachmentReference.shape.type.value;
 var EXTERNAL_ATTACHMENT = ExternalAttachmentReference.shape.type.value;
@@ -4933,12 +4908,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.
    */
@@ -5120,6 +5096,7 @@ var BraintrustState = class _BraintrustState {
     });
     this.spanCache = new SpanCache({ disabled: loginParams.disableSpanCache });
     this.spanOriginEnvironment = detectSpanOriginEnvironment();
+    this._internalSetTraceContextSigningSecret(loginParams.apiKey);
   }
   loginParams;
   id;
@@ -5157,6 +5134,18 @@ var BraintrustState = class _BraintrustState {
   _contextManager = null;
   _otelFlushCallback = null;
   spanOriginEnvironment;
+  traceContextSigningSecret;
+  /** @internal */
+  _internalSetTraceContextSigningSecret(secret) {
+    const normalizedSecret = secret?.trim();
+    if (normalizedSecret) {
+      this.traceContextSigningSecret = normalizedSecret;
+    }
+  }
+  /** @internal */
+  _internalGetTraceContextSigningSecret() {
+    return (this.traceContextSigningSecret ?? this.loginToken ?? isomorph_default.getEnv("BRAINTRUST_API_KEY"))?.trim();
+  }
   resetLoginInfo() {
     this.appUrl = null;
     this.appPublicUrl = null;
@@ -5217,6 +5206,7 @@ var BraintrustState = class _BraintrustState {
     this.gitMetadataSettings = other.gitMetadataSettings;
     this.debugLogLevel = other.debugLogLevel;
     this.debugLogLevelConfigured = other.debugLogLevelConfigured;
+    this.traceContextSigningSecret = other.traceContextSigningSecret;
     setGlobalDebugLogLevel(
       this.debugLogLevelConfigured ? this.debugLogLevel ?? false : void 0
     );
@@ -5304,6 +5294,7 @@ var BraintrustState = class _BraintrustState {
     return this.debugLogLevelConfigured;
   }
   async login(loginParams) {
+    this._internalSetTraceContextSigningSecret(loginParams.apiKey);
     this.setDebugLogLevel(loginParams.debugLogLevel);
     if (this.apiUrl && !loginParams.forceLogin) {
       return;
@@ -7283,6 +7274,7 @@ function init(projectOrOptions, optionalOptions) {
     throw new Error("Cannot open and update an experiment at the same time");
   }
   const state = stateArg ?? _globalState;
+  state._internalSetTraceContextSigningSecret(apiKey);
   state.enforceQueueSizeLimit(false);
   if (open2) {
     if (isEmpty2(experiment)) {
@@ -7791,6 +7783,7 @@ function initLogger(options = {}) {
     project_id: projectId
   };
   const state = stateArg ?? _globalState;
+  state._internalSetTraceContextSigningSecret(apiKey);
   state.setDebugLogLevel(debugLogLevel);
   state.spanOriginEnvironment = detectSpanOriginEnvironment(environment);
   state.enforceQueueSizeLimit(true);
@@ -8654,6 +8647,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();
@@ -8854,7 +8853,9 @@ function deepCopyEvent(event) {
   const ATTACHMENT_MARKER_KEY = "_bt_internal_saved_attachment_marker";
   const attachmentMarker = ++deepCopyEventMarkerCounter;
   const serialized = JSON.stringify(event, (_k, v) => {
-    if (v instanceof SpanImpl || v instanceof NoopSpan) {
+    if (v instanceof Error) {
+      return v.message;
+    } else if (v instanceof SpanImpl || v instanceof NoopSpan) {
       return `<span>`;
     } else if (v instanceof Experiment2) {
       return `<experiment>`;
@@ -9522,6 +9523,7 @@ var SpanImpl = class _SpanImpl {
   constructor(args) {
     this._state = args.state;
     this._propagatedState = args.propagatedState;
+    const instrumentationName = getSpanInstrumentationName(args) ?? INSTRUMENTATION_NAMES.BRAINTRUST_JS_LOGGER;
     const spanAttributes = args.spanAttributes ?? {};
     const rawEvent = args.event ?? {};
     const type = args.type ?? (args.parentSpanIds ? void 0 : args.defaultRootType);
@@ -9552,8 +9554,8 @@ var SpanImpl = class _SpanImpl {
         start: args.startTime ?? getCurrentUnixTimestamp()
       },
       context: mergeSpanOriginContext(
-        { ...callerLocation },
-        "braintrust-js-logger",
+        { ...callerLocation, ...args[INTERNAL_SPAN_CONTEXT] },
+        instrumentationName,
         this._state.spanOriginEnvironment
       ),
       span_attributes: {
@@ -11547,8 +11549,8 @@ function runWithAutoInstrumentationSuppressed(callback) {
     callback
   );
 }
-function bindAutoInstrumentationSuppressionToStart(tracingChannel2) {
-  const startChannel = tracingChannel2.start;
+function bindAutoInstrumentationSuppressionToStart(tracingChannel) {
+  const startChannel = tracingChannel.start;
   if (!startChannel) {
     return void 0;
   }
@@ -11592,15 +11594,25 @@ function hasChoices(value) {
 function normalizeMetadata(metadata) {
   return isObject(metadata) ? metadata : void 0;
 }
-function startSpanForEvent(config, event, channelName) {
+function startSpanForEvent(config, event, channelName, instrumentationName) {
   const { name, spanAttributes, spanInfoMetadata } = buildStartSpanArgs(
     config,
     event
   );
-  const span = startSpan({
-    name,
-    spanAttributes
-  });
+  const spanArgs = withSpanInstrumentationName(
+    {
+      name,
+      spanAttributes
+    },
+    instrumentationName
+  );
+  let span;
+  try {
+    span = config.startSpan?.(spanArgs) ?? startSpan(spanArgs);
+  } catch (error) {
+    debugLogger.error(`Error starting span for ${channelName}:`, error);
+    span = startSpan(spanArgs);
+  }
   const startTime = getCurrentUnixTimestamp();
   try {
     const { input, metadata } = config.extractInput(
@@ -11631,7 +11643,7 @@ function shouldTraceEvent(config, event, channelName) {
     return true;
   }
 }
-function ensureSpanStateForEvent(states, config, event, channelName) {
+function ensureSpanStateForEvent(states, config, event, channelName, instrumentationName) {
   const key = event;
   const existing = states.get(key);
   if (existing) {
@@ -11640,13 +11652,18 @@ function ensureSpanStateForEvent(states, config, event, channelName) {
   if (!shouldTraceEvent(config, event, channelName)) {
     return void 0;
   }
-  const created = startSpanForEvent(config, event, channelName);
+  const created = startSpanForEvent(
+    config,
+    event,
+    channelName,
+    instrumentationName
+  );
   states.set(key, created);
   return created;
 }
-function bindCurrentSpanStoreToStart(tracingChannel2, states, config, channelName) {
+function bindCurrentSpanStoreToStart(tracingChannel, states, config, channelName, instrumentationName) {
   const state = _internalGetGlobalState();
-  const startChannel = tracingChannel2.start;
+  const startChannel = tracingChannel.start;
   const contextManager = state?.contextManager;
   const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
   if (!currentSpanStore || !startChannel) {
@@ -11662,7 +11679,8 @@ function bindCurrentSpanStoreToStart(tracingChannel2, states, config, channelNam
         states,
         config,
         event,
-        channelName
+        channelName,
+        instrumentationName
       );
       return spanState ? contextManager.wrapSpanForStore(spanState.span) : currentSpanStore.getStore();
     }
@@ -11671,15 +11689,21 @@ function bindCurrentSpanStoreToStart(tracingChannel2, states, config, channelNam
     startChannel.unbindStore(currentSpanStore);
   };
 }
-function logErrorAndEnd(states, event) {
+function logErrorAndEnd(states, event, channelName) {
   const spanData = states.get(event);
   if (!spanData) {
     return;
   }
-  spanData.span.log({
-    error: event.error.message
-  });
-  spanData.span.end();
+  try {
+    spanData.span.log({ error: event.error });
+  } catch (error) {
+    debugLogger.error(`Error logging failure for ${channelName}:`, error);
+  }
+  try {
+    spanData.span.end();
+  } catch (error) {
+    debugLogger.error(`Error ending span for ${channelName}:`, error);
+  }
   states.delete(event);
 }
 function runStreamingCompletionHook(args) {
@@ -11722,14 +11746,15 @@ function runStreamingErrorHook(args) {
   }
 }
 function traceAsyncChannel(channel, config) {
-  const tracingChannel2 = channel.tracingChannel();
+  const tracingChannel = channel.tracingChannel();
   const states = /* @__PURE__ */ new WeakMap();
   const channelName = channel.channelName;
   const unbindCurrentSpanStore = bindCurrentSpanStoreToStart(
-    tracingChannel2,
+    tracingChannel,
     states,
     config,
-    channelName
+    channelName,
+    channel.instrumentationName
   );
   const handlers = {
     start: (event) => {
@@ -11740,7 +11765,8 @@ function traceAsyncChannel(channel, config) {
         states,
         config,
         event,
-        channelName
+        channelName,
+        channel.instrumentationName
       );
     },
     asyncEnd: (event) => {
@@ -11777,24 +11803,25 @@ function traceAsyncChannel(channel, config) {
       }
     },
     error: (event) => {
-      logErrorAndEnd(states, event);
+      logErrorAndEnd(states, event, channelName);
     }
   };
-  tracingChannel2.subscribe(handlers);
+  tracingChannel.subscribe(handlers);
   return () => {
     unbindCurrentSpanStore?.();
-    tracingChannel2.unsubscribe(handlers);
+    tracingChannel.unsubscribe(handlers);
   };
 }
 function traceStreamingChannel(channel, config) {
-  const tracingChannel2 = channel.tracingChannel();
+  const tracingChannel = channel.tracingChannel();
   const states = /* @__PURE__ */ new WeakMap();
   const channelName = channel.channelName;
   const unbindCurrentSpanStore = bindCurrentSpanStoreToStart(
-    tracingChannel2,
+    tracingChannel,
     states,
     config,
-    channelName
+    channelName,
+    channel.instrumentationName
   );
   const handlers = {
     start: (event) => {
@@ -11805,7 +11832,8 @@ function traceStreamingChannel(channel, config) {
         states,
         config,
         event,
-        channelName
+        channelName,
+        channel.instrumentationName
       );
     },
     asyncEnd: (event) => {
@@ -11824,6 +11852,7 @@ function traceStreamingChannel(channel, config) {
             }
           },
           onComplete: (chunks) => {
+            let completion2;
             try {
               let output;
               let metrics;
@@ -11854,18 +11883,11 @@ function traceStreamingChannel(channel, config) {
               } else if (metrics.time_to_first_token === void 0 && chunks.length > 0) {
                 metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
               }
-              runStreamingCompletionHook({
-                channelName,
-                chunks,
-                config,
-                endEvent: asyncEndEvent,
+              completion2 = {
                 ...metadata !== void 0 ? { metadata } : {},
                 metrics,
-                output,
-                result: asyncEndEvent.result,
-                span,
-                startTime
-              });
+                output
+              };
               span.log({
                 output,
                 ...metadata !== void 0 ? { metadata } : {},
@@ -11877,11 +11899,49 @@ function traceStreamingChannel(channel, config) {
                 error
               );
             } finally {
-              span.end();
+              try {
+                span.end();
+              } catch (error) {
+                debugLogger.error(
+                  `Error ending span for ${channelName}:`,
+                  error
+                );
+              }
               states.delete(event);
             }
+            if (completion2) {
+              runStreamingCompletionHook({
+                channelName,
+                chunks,
+                config,
+                endEvent: asyncEndEvent,
+                ...completion2.metadata !== void 0 ? { metadata: completion2.metadata } : {},
+                metrics: completion2.metrics,
+                output: completion2.output,
+                result: asyncEndEvent.result,
+                span,
+                startTime
+              });
+            }
           },
           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,
@@ -11890,11 +11950,6 @@ function traceStreamingChannel(channel, config) {
               span,
               startTime
             });
-            span.log({
-              error: error.message
-            });
-            span.end();
-            states.delete(event);
           }
         });
         return;
@@ -11909,6 +11964,7 @@ function traceStreamingChannel(channel, config) {
         states.delete(event);
         return;
       }
+      let completion;
       try {
         const output = config.extractOutput(
           asyncEndEvent.result,
@@ -11923,17 +11979,11 @@ function traceStreamingChannel(channel, config) {
           asyncEndEvent.result,
           asyncEndEvent
         );
-        runStreamingCompletionHook({
-          channelName,
-          config,
-          endEvent: asyncEndEvent,
+        completion = {
           ...normalizeMetadata(metadata) !== void 0 ? { metadata: normalizeMetadata(metadata) } : {},
           metrics,
-          output,
-          result: asyncEndEvent.result,
-          span,
-          startTime
-        });
+          output
+        };
         span.log({
           output,
           ...normalizeMetadata(metadata) !== void 0 ? { metadata: normalizeMetadata(metadata) } : {},
@@ -11942,12 +11992,30 @@ function traceStreamingChannel(channel, config) {
       } catch (error) {
         debugLogger.error(`Error extracting output for ${channelName}:`, error);
       } finally {
-        span.end();
+        try {
+          span.end();
+        } catch (error) {
+          debugLogger.error(`Error ending span for ${channelName}:`, error);
+        }
         states.delete(event);
       }
+      if (completion) {
+        runStreamingCompletionHook({
+          channelName,
+          config,
+          endEvent: asyncEndEvent,
+          ...completion.metadata !== void 0 ? { metadata: completion.metadata } : {},
+          metrics: completion.metrics,
+          output: completion.output,
+          result: asyncEndEvent.result,
+          span,
+          startTime
+        });
+      }
     },
     error: (event) => {
       const spanData = states.get(event);
+      logErrorAndEnd(states, event, channelName);
       if (spanData) {
         runStreamingErrorHook({
           channelName,
@@ -11958,24 +12026,24 @@ function traceStreamingChannel(channel, config) {
           startTime: spanData.startTime
         });
       }
-      logErrorAndEnd(states, event);
     }
   };
-  tracingChannel2.subscribe(handlers);
+  tracingChannel.subscribe(handlers);
   return () => {
     unbindCurrentSpanStore?.();
-    tracingChannel2.unsubscribe(handlers);
+    tracingChannel.unsubscribe(handlers);
   };
 }
 function traceSyncStreamChannel(channel, config) {
-  const tracingChannel2 = channel.tracingChannel();
+  const tracingChannel = channel.tracingChannel();
   const states = /* @__PURE__ */ new WeakMap();
   const channelName = channel.channelName;
   const unbindCurrentSpanStore = bindCurrentSpanStoreToStart(
-    tracingChannel2,
+    tracingChannel,
     states,
     config,
-    channelName
+    channelName,
+    channel.instrumentationName
   );
   const handlers = {
     start: (event) => {
@@ -11986,7 +12054,8 @@ function traceSyncStreamChannel(channel, config) {
         states,
         config,
         event,
-        channelName
+        channelName,
+        channel.instrumentationName
       );
     },
     end: (event) => {
@@ -12080,13 +12149,13 @@ function traceSyncStreamChannel(channel, config) {
       handleResolvedResult(endEvent.result);
     },
     error: (event) => {
-      logErrorAndEnd(states, event);
+      logErrorAndEnd(states, event, channelName);
     }
   };
-  tracingChannel2.subscribe(handlers);
+  tracingChannel.subscribe(handlers);
   return () => {
     unbindCurrentSpanStore?.();
-    tracingChannel2.unsubscribe(handlers);
+    tracingChannel.unsubscribe(handlers);
   };
 }
 function unsubscribeAll(unsubscribers) {
@@ -12357,75 +12426,336 @@ function serializeAISDKToolsForLogging(tools) {
   return serialized;
 }
 
-// src/wrappers/ai-sdk/workflow-agent-context.ts
-var workflowAgentWrapperSpans = /* @__PURE__ */ new Map();
-function registerWorkflowAgentWrapperSpan(span) {
-  if (span.spanId) {
-    workflowAgentWrapperSpans.set(span.spanId, span);
+// src/wrappers/ai-sdk/harness-agent-context.ts
+var BRAINTRUST_TURN_CONTEXT_KEY = "__braintrust_trace_context";
+var sessionTurnParents = /* @__PURE__ */ new WeakMap();
+var wrapperTurnParents = /* @__PURE__ */ new WeakMap();
+var patchedLifecycleMethods = /* @__PURE__ */ new WeakMap();
+var harnessTurnParentStore;
+function serializedTurnContext(value) {
+  if (!isObject(value)) {
+    return void 0;
+  }
+  const context = value[BRAINTRUST_TURN_CONTEXT_KEY];
+  if (!isObject(context) || typeof context.parent !== "string" || typeof context.sessionId !== "string" || typeof context.signature !== "string") {
+    return void 0;
+  }
+  const expectedSignature = signTurnContext({
+    parent: context.parent,
+    sessionId: context.sessionId
+  });
+  if (!expectedSignature || !isomorph_default.timingSafeEqual?.(context.signature, expectedSignature)) {
+    return void 0;
+  }
+  const parent = SpanComponentsV4.fromStr(context.parent);
+  if (!parent.data.row_id || !parent.data.root_span_id || !parent.data.span_id) {
+    return void 0;
   }
+  return {
+    parent: context.parent,
+    sessionId: context.sessionId
+  };
 }
-function unregisterWorkflowAgentWrapperSpan(span) {
-  if (span.spanId) {
-    workflowAgentWrapperSpans.delete(span.spanId);
+function signTurnContext(context) {
+  const secret = _internalGetGlobalState()._internalGetTraceContextSigningSecret();
+  return secret ? isomorph_default.hmacSha256?.(
+    secret,
+    JSON.stringify([BRAINTRUST_TURN_CONTEXT_KEY, context])
+  ) : void 0;
+}
+function continuationParentFromCreateSessionParams(params) {
+  if (!isObject(params)) {
+    return void 0;
+  }
+  const continuation = params.continueFrom ?? (isObject(params.resumeFrom) ? params.resumeFrom.continueFrom : void 0);
+  const context = serializedTurnContext(continuation);
+  if (!context) {
+    return void 0;
+  }
+  if (params.sessionId !== context.sessionId) {
+    return void 0;
   }
+  return context.parent;
 }
-function currentWorkflowAgentWrapperSpan() {
-  const parentSpanIds = _internalGetGlobalState().contextManager.getParentSpanIds()?.spanParents ?? [];
-  for (const parentSpanId of parentSpanIds) {
-    const span = workflowAgentWrapperSpans.get(parentSpanId);
-    if (span) {
-      return span;
+function exportSpanSynchronously(span) {
+  const parentInfo = span.getParentInfo();
+  if (!parentInfo) {
+    return void 0;
+  }
+  const objectId = parentInfo.objectId.getSync().value;
+  if (!objectId && !parentInfo.computeObjectMetadataArgs) {
+    return void 0;
+  }
+  return new SpanComponentsV4({
+    object_type: parentInfo.objectType,
+    ...objectId ? { object_id: objectId } : {
+      compute_object_metadata_args: parentInfo.computeObjectMetadataArgs ?? {}
+    },
+    row_id: span.id,
+    root_span_id: span.rootSpanId,
+    span_id: span.spanId
+  }).toStr();
+}
+function exportedParent(parent) {
+  return typeof parent === "string" ? parent : exportSpanSynchronously(parent);
+}
+function addSerializedContext(args) {
+  if (!isObject(args.continuation) || args.sessionId === void 0) {
+    return;
+  }
+  const parent = exportedParent(args.parent);
+  if (!parent) {
+    return;
+  }
+  const context = {
+    parent,
+    sessionId: args.sessionId
+  };
+  const signature = signTurnContext(context);
+  if (!signature) {
+    return;
+  }
+  Object.defineProperty(args.continuation, BRAINTRUST_TURN_CONTEXT_KEY, {
+    configurable: true,
+    enumerable: true,
+    value: {
+      ...context,
+      signature
+    },
+    writable: true
+  });
+}
+function lifecycleMethodDescriptor(session, method) {
+  let owner = session;
+  while (owner) {
+    const descriptor = Object.getOwnPropertyDescriptor(owner, method);
+    if (descriptor) {
+      return { descriptor, owner };
     }
+    owner = Object.getPrototypeOf(owner);
   }
   return void 0;
 }
-
-// src/vendor-sdk-types/ai-sdk-v7-telemetry.ts
-var BRAINTRUST_AI_SDK_V7_OPERATION_KEY = /* @__PURE__ */ Symbol.for(
-  "braintrust.ai-sdk.v7.telemetry-operation-key"
-);
-
-// src/instrumentation/plugins/ai-sdk-plugin.ts
-var DEFAULT_DENY_OUTPUT_PATHS = [
-  // v3
-  "roundtrips[].request.body",
-  "roundtrips[].request.headers",
-  "roundtrips[].response.headers",
-  "rawResponse.headers",
-  "responseMessages",
-  // v5
-  "request.body",
-  "request.headers",
-  "responses[].headers",
-  "response.body",
-  "response.headers",
-  "steps[].request.body",
-  "steps[].request.headers",
-  "steps[].responses[].headers",
-  "steps[].response.body",
-  "steps[].response.headers"
-];
-var AUTO_PATCHED_MODEL = /* @__PURE__ */ Symbol.for("braintrust.ai-sdk.auto-patched-model");
-var AUTO_PATCHED_TOOL = /* @__PURE__ */ Symbol.for("braintrust.ai-sdk.auto-patched-tool");
-var AUTO_PATCHED_V7_TELEMETRY_DISPATCHER = /* @__PURE__ */ Symbol.for(
-  "braintrust.ai-sdk.v7.auto-patched-telemetry-dispatcher"
-);
-var RUNTIME_DENY_OUTPUT_PATHS = /* @__PURE__ */ Symbol.for(
-  "braintrust.ai-sdk.deny-output-paths"
-);
-var aiSDKV7TelemetryOperationCounter = 0;
-var TRANSPORT_PAYLOAD_ROOT_PATHS = [
-  "rawResponse",
-  "request",
-  "response",
-  "responses[]",
-  "roundtrips[].request",
-  "roundtrips[].response",
-  "steps[].request",
-  "steps[].response",
-  "steps[].responses[]"
-];
-var AI_SDK_V7_TELEMETRY_CALLBACKS = [
+function patchLifecycleMethod(session, method) {
+  let resolvedDescriptor;
+  try {
+    resolvedDescriptor = lifecycleMethodDescriptor(session, method);
+  } catch {
+    return;
+  }
+  if (!resolvedDescriptor || !("value" in resolvedDescriptor.descriptor) || typeof resolvedDescriptor.descriptor.value !== "function") {
+    return;
+  }
+  const { descriptor, owner } = resolvedDescriptor;
+  const patched = patchedLifecycleMethods.get(owner);
+  if (patched?.has(method)) {
+    return;
+  }
+  const original = descriptor.value;
+  const replacement = function(...args) {
+    const result = Reflect.apply(original, this, args);
+    const addContext = (state) => {
+      try {
+        const parent = sessionTurnParents.get(this);
+        if (!parent) {
+          return;
+        }
+        const continuation = method === "suspendTurn" ? state : isObject(state) ? state.continueFrom : void 0;
+        addSerializedContext({
+          continuation,
+          parent,
+          sessionId: typeof this.sessionId === "string" ? this.sessionId : void 0
+        });
+      } catch {
+      }
+    };
+    try {
+      if (isObject(result) && typeof result.then === "function") {
+        void Promise.resolve(result).then(addContext, () => {
+        });
+      } else {
+        addContext(result);
+      }
+    } catch {
+    }
+    return result;
+  };
+  try {
+    Object.defineProperty(owner, method, {
+      ...descriptor,
+      value: replacement
+    });
+    const ownerMethods = patched ?? /* @__PURE__ */ new Set();
+    ownerMethods.add(method);
+    if (!patched) {
+      patchedLifecycleMethods.set(owner, ownerMethods);
+    }
+  } catch {
+  }
+}
+function patchLifecycleMethods(session) {
+  patchLifecycleMethod(session, "suspendTurn");
+  patchLifecycleMethod(session, "detach");
+  patchLifecycleMethod(session, "stop");
+}
+function registerHarnessTurnSpan(args) {
+  if (!isObject(args.session)) {
+    return;
+  }
+  const session = args.session;
+  sessionTurnParents.set(session, args.span);
+  wrapperTurnParents.set(args.span, args.span);
+  patchLifecycleMethods(session);
+}
+function harnessContinuationParent(session) {
+  return isObject(session) ? sessionTurnParents.get(session) : void 0;
+}
+function captureHarnessCreateSessionParent(params) {
+  try {
+    return continuationParentFromCreateSessionParams(params);
+  } catch {
+    return void 0;
+  }
+}
+function registerHarnessSessionParent(session, parent) {
+  if (!parent || !isObject(session)) {
+    return;
+  }
+  const harnessSession = session;
+  sessionTurnParents.set(harnessSession, parent);
+  patchLifecycleMethods(harnessSession);
+}
+function currentHarnessTurnParent() {
+  return harnessTurnParentStore?.getStore() ?? wrapperTurnParents.get(currentSpan());
+}
+function bindHarnessTurnParentToStart(tracingChannel, parentFromEvent) {
+  const startChannel = tracingChannel.start;
+  if (!startChannel) {
+    return () => {
+    };
+  }
+  harnessTurnParentStore ??= isomorph_default.newAsyncLocalStorage();
+  const store = harnessTurnParentStore;
+  startChannel.bindStore(
+    store,
+    (event) => parentFromEvent(event) ?? store.getStore()
+  );
+  return () => {
+    startChannel.unbindStore(store);
+  };
+}
+function startHarnessTurnChildSpan(parent, args) {
+  const spanArgs = withSpanInstrumentationName(
+    args,
+    INSTRUMENTATION_NAMES.AI_SDK
+  );
+  return typeof parent === "string" ? startSpan({ ...spanArgs, parent }) : parent.startSpan(spanArgs);
+}
+function updateHarnessTurn(parent, update = {}) {
+  if (!parent) {
+    return;
+  }
+  const log2 = (event) => {
+    if (typeof parent === "string") {
+      updateSpan({ exported: parent, ...event });
+    } else {
+      parent.log(event);
+    }
+  };
+  try {
+    if (Object.prototype.hasOwnProperty.call(update, "output")) {
+      log2({ output: null });
+    }
+    log2(update);
+  } catch {
+  }
+}
+function endHarnessTurn(parent) {
+  const endTime = getCurrentUnixTimestamp();
+  if (!parent) {
+    return endTime;
+  }
+  try {
+    const event = { metrics: { end: endTime } };
+    if (typeof parent === "string") {
+      updateSpan({ exported: parent, ...event });
+    } else {
+      parent.log(event);
+    }
+  } catch {
+  }
+  return endTime;
+}
+
+// src/wrappers/ai-sdk/workflow-agent-context.ts
+var workflowAgentWrapperSpans = /* @__PURE__ */ new Map();
+function registerWorkflowAgentWrapperSpan(span) {
+  if (span.spanId) {
+    workflowAgentWrapperSpans.set(span.spanId, span);
+  }
+}
+function unregisterWorkflowAgentWrapperSpan(span) {
+  if (span.spanId) {
+    workflowAgentWrapperSpans.delete(span.spanId);
+  }
+}
+function currentWorkflowAgentWrapperSpan() {
+  const parentSpanIds = _internalGetGlobalState().contextManager.getParentSpanIds()?.spanParents ?? [];
+  for (const parentSpanId of parentSpanIds) {
+    const span = workflowAgentWrapperSpans.get(parentSpanId);
+    if (span) {
+      return span;
+    }
+  }
+  return void 0;
+}
+
+// src/vendor-sdk-types/ai-sdk-v7-telemetry.ts
+var BRAINTRUST_AI_SDK_V7_OPERATION_KEY = /* @__PURE__ */ Symbol.for(
+  "braintrust.ai-sdk.v7.telemetry-operation-key"
+);
+
+// src/instrumentation/plugins/ai-sdk-plugin.ts
+var DEFAULT_DENY_OUTPUT_PATHS = [
+  // v3
+  "roundtrips[].request.body",
+  "roundtrips[].request.headers",
+  "roundtrips[].response.headers",
+  "rawResponse.headers",
+  "responseMessages",
+  // v5
+  "request.body",
+  "request.headers",
+  "responses[].headers",
+  "response.body",
+  "response.headers",
+  "steps[].request.body",
+  "steps[].request.headers",
+  "steps[].responses[].headers",
+  "steps[].response.body",
+  "steps[].response.headers"
+];
+var AUTO_PATCHED_MODEL = /* @__PURE__ */ Symbol.for("braintrust.ai-sdk.auto-patched-model");
+var AUTO_PATCHED_TOOL = /* @__PURE__ */ Symbol.for("braintrust.ai-sdk.auto-patched-tool");
+var AUTO_PATCHED_V7_TELEMETRY_DISPATCHER = /* @__PURE__ */ Symbol.for(
+  "braintrust.ai-sdk.v7.auto-patched-telemetry-dispatcher"
+);
+var RUNTIME_DENY_OUTPUT_PATHS = /* @__PURE__ */ Symbol.for(
+  "braintrust.ai-sdk.deny-output-paths"
+);
+var aiSDKV7TelemetryOperationCounter = 0;
+var TRANSPORT_PAYLOAD_ROOT_PATHS = [
+  "rawResponse",
+  "request",
+  "response",
+  "responses[]",
+  "roundtrips[].request",
+  "roundtrips[].response",
+  "steps[].request",
+  "steps[].response",
+  "steps[].responses[]"
+];
+var AI_SDK_V7_TELEMETRY_CALLBACKS = [
   "onStart",
   "onStepStart",
   "onLanguageModelCallStart",
@@ -12460,6 +12790,17 @@ var AISDKPlugin = class extends BasePlugin {
   subscribeToAISDK() {
     const denyOutputPaths = this.config.denyOutputPaths || DEFAULT_DENY_OUTPUT_PATHS;
     this.unsubscribers.push(subscribeToAISDKV7TelemetryDispatcher());
+    this.unsubscribers.push(subscribeToHarnessAgentCreateSession());
+    this.unsubscribers.push(
+      subscribeToHarnessContinuation(
+        harnessAgentChannels.continueGenerate,
+        denyOutputPaths
+      ),
+      subscribeToHarnessContinuation(
+        harnessAgentChannels.continueStream,
+        denyOutputPaths
+      )
+    );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.generateText, {
         name: "generateText",
@@ -12655,8 +12996,9 @@ var AISDKPlugin = class extends BasePlugin {
     this.unsubscribers.push(
       traceStreamingChannel(harnessAgentChannels.generate, {
         name: "HarnessAgent.generate",
+        startSpan: _internalStartSpanWithInitialMerge,
         type: "task" /* TASK */,
-        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractInput: ([params], event, span) => prepareAISDKHarnessAgentInput(params, event.self, span),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -12668,8 +13010,9 @@ var AISDKPlugin = class extends BasePlugin {
     this.unsubscribers.push(
       traceStreamingChannel(harnessAgentChannels.stream, {
         name: "HarnessAgent.stream",
+        startSpan: _internalStartSpanWithInitialMerge,
         type: "task" /* TASK */,
-        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractInput: ([params], event, span) => prepareAISDKHarnessAgentInput(params, event.self, span),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -12694,8 +13037,10 @@ var AISDKPlugin = class extends BasePlugin {
     this.unsubscribers.push(
       traceStreamingChannel(harnessAgentChannels.continueGenerate, {
         name: "HarnessAgent.continueGenerate",
+        shouldTrace: (args) => !harnessContinuationParent(harnessSessionFromArguments(args)),
+        startSpan: _internalStartSpanWithInitialMerge,
         type: "task" /* TASK */,
-        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractInput: ([params], event, span) => prepareAISDKHarnessAgentInput(params, event.self, span),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -12707,8 +13052,10 @@ var AISDKPlugin = class extends BasePlugin {
     this.unsubscribers.push(
       traceStreamingChannel(harnessAgentChannels.continueStream, {
         name: "HarnessAgent.continueStream",
+        shouldTrace: (args) => !harnessContinuationParent(harnessSessionFromArguments(args)),
+        startSpan: _internalStartSpanWithInitialMerge,
         type: "task" /* TASK */,
-        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractInput: ([params], event, span) => prepareAISDKHarnessAgentInput(params, event.self, span),
         extractOutput: (result, endEvent) => processAISDKOutput(
           result,
           resolveDenyOutputPaths(endEvent, denyOutputPaths)
@@ -12800,6 +13147,8 @@ var AISDKPlugin = class extends BasePlugin {
           defaultDenyOutputPaths: denyOutputPaths,
           endEvent,
           onComplete: () => unregisterWorkflowAgentWrapperSpan(span),
+          onCancel: () => unregisterWorkflowAgentWrapperSpan(span),
+          onError: () => unregisterWorkflowAgentWrapperSpan(span),
           result,
           span,
           startTime
@@ -12808,6 +13157,153 @@ var AISDKPlugin = class extends BasePlugin {
     );
   }
 };
+function subscribeToHarnessAgentCreateSession() {
+  const channel = harnessAgentChannels.createSession.tracingChannel();
+  const parents = /* @__PURE__ */ new WeakMap();
+  const handlers = {
+    start: (event) => {
+      const parent = captureHarnessCreateSessionParent(event.arguments?.[0]);
+      if (parent) {
+        parents.set(event, parent);
+      }
+    },
+    asyncEnd: (event) => {
+      registerHarnessSessionParent(event.result, parents.get(event));
+      parents.delete(event);
+    },
+    error: (event) => {
+      parents.delete(event);
+    }
+  };
+  channel.subscribe(handlers);
+  return () => channel.unsubscribe(handlers);
+}
+function harnessContinuationParentFromEvent(event) {
+  try {
+    return harnessContinuationParent(event.arguments?.[0]?.session);
+  } catch {
+    return void 0;
+  }
+}
+function subscribeToHarnessContinuation(continuationChannel, defaultDenyOutputPaths) {
+  const channel = continuationChannel.tracingChannel();
+  const parents = /* @__PURE__ */ new WeakMap();
+  const startTimes = /* @__PURE__ */ new WeakMap();
+  const unbindParentStore = bindHarnessTurnParentToStart(
+    channel,
+    harnessContinuationParentFromEvent
+  );
+  const handlers = {
+    start: (event) => {
+      const parent = harnessContinuationParentFromEvent(event);
+      if (!parent) {
+        return;
+      }
+      parents.set(event, parent);
+      startTimes.set(event, getCurrentUnixTimestamp());
+      try {
+        const params = event.arguments?.[0];
+        if (params) {
+          prepareAISDKHarnessAgentInput(params, event.self);
+        }
+      } catch (error) {
+        debugLogger.error(
+          "Error preparing Harness continuation telemetry:",
+          error
+        );
+      }
+    },
+    asyncEnd: (event) => {
+      const parent = parents.get(event);
+      const startTime = startTimes.get(event) ?? getCurrentUnixTimestamp();
+      parents.delete(event);
+      startTimes.delete(event);
+      if (!parent) {
+        return;
+      }
+      const endEvent = event;
+      const span = {
+        end: () => endHarnessTurn(parent),
+        log: (update) => updateHarnessTurn(
+          parent,
+          Object.prototype.hasOwnProperty.call(update, "error") && !Object.prototype.hasOwnProperty.call(update, "output") ? { ...update, output: null } : update
+        )
+      };
+      try {
+        if (isAsyncIterable(endEvent.result)) {
+          patchStreamIfNeeded(endEvent.result, {
+            onComplete: (chunks) => {
+              try {
+                const { metadata, metrics, output } = aggregateAISDKChunks(
+                  chunks,
+                  endEvent.result,
+                  endEvent
+                );
+                span.log({
+                  ...metadata ? { metadata } : {},
+                  metrics,
+                  output
+                });
+              } catch (error) {
+                debugLogger.error(
+                  "Error aggregating Harness continuation stream:",
+                  error
+                );
+              } finally {
+                span.end();
+              }
+            },
+            onError: (error) => {
+              span.log({ error: toLoggedError(error), output: null });
+              span.end();
+            }
+          });
+          return;
+        }
+        if (patchAISDKStreamingResult({
+          defaultDenyOutputPaths,
+          endEvent,
+          result: endEvent.result,
+          resolvePromiseUsage: true,
+          span,
+          startTime
+        })) {
+          return;
+        }
+        finalizeAISDKChildTracing(endEvent);
+        span.log({
+          metrics: extractTokenMetrics(endEvent.result),
+          output: processAISDKOutput(
+            endEvent.result,
+            resolveDenyOutputPaths(endEvent, defaultDenyOutputPaths)
+          )
+        });
+        span.end();
+      } catch (error) {
+        debugLogger.error("Error tracing Harness continuation:", error);
+        span.end();
+      }
+    },
+    error: (event) => {
+      const parent = parents.get(event);
+      parents.delete(event);
+      startTimes.delete(event);
+      if (!parent) {
+        return;
+      }
+      updateHarnessTurn(parent, {
+        error: toLoggedError(event.error),
+        output: null
+      });
+      endHarnessTurn(parent);
+    }
+  };
+  channel.subscribe(handlers);
+  return () => {
+    unbindParentStore();
+    channel.unsubscribe(handlers);
+  };
+}
 function subscribeToAISDKV7TelemetryDispatcher() {
   const channel = aiSDKChannels.v7CreateTelemetryDispatcher.tracingChannel();
   const telemetry = braintrustAISDKTelemetry();
@@ -13260,7 +13756,13 @@ function prepareAISDKCallInput(params, event, span, defaultDenyOutputPaths, chil
     metadata
   };
 }
-function prepareAISDKHarnessAgentInput(params, self) {
+function prepareAISDKHarnessAgentInput(params, self, span) {
+  if (span) {
+    registerHarnessTurnSpan({
+      session: params.session,
+      span
+    });
+  }
   if (isObject(self)) {
     try {
       if (isObject(self.settings)) {
@@ -13299,6 +13801,10 @@ function prepareAISDKHarnessAgentInput(params, self) {
     metadata
   };
 }
+function harnessSessionFromArguments(args) {
+  const params = args[0];
+  return isObject(params) ? params.session : void 0;
+}
 function prepareAISDKWorkflowAgentStreamInput(params, event, span, defaultDenyOutputPaths) {
   registerWorkflowAgentWrapperSpan(span);
   const { input } = processAISDKWorkflowAgentCallInput(params);
@@ -13746,19 +14252,22 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
             activeEntry.openSpans.delete(span);
           }
         },
-        {
-          name: "doGenerate",
-          spanAttributes: {
-            type: "llm" /* LLM */
+        withSpanInstrumentationName(
+          {
+            name: "doGenerate",
+            spanAttributes: {
+              type: "llm" /* LLM */
+            },
+            event: buildAISDKModelStartEvent(
+              callOptions,
+              activeEntry.baseMetadata,
+              {
+                workflowAgent: activeEntry.childTracingOptions.workflowAgent
+              }
+            )
           },
-          event: buildAISDKModelStartEvent(
-            callOptions,
-            activeEntry.baseMetadata,
-            {
-              workflowAgent: activeEntry.childTracingOptions.workflowAgent
-            }
-          )
-        }
+          INSTRUMENTATION_NAMES.AI_SDK
+        )
       );
     };
     if (originalDoStream) {
@@ -13768,19 +14277,24 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
           return Reflect.apply(originalDoStream, resolvedModel, [callOptions]);
         }
         closeOpenAISDKModelPatchSpans(activeEntry);
-        const span = activeEntry.parentSpan.startSpan({
-          name: "doStream",
-          spanAttributes: {
-            type: "llm" /* LLM */
-          },
-          event: buildAISDKModelStartEvent(
-            callOptions,
-            activeEntry.baseMetadata,
+        const span = activeEntry.parentSpan.startSpan(
+          withSpanInstrumentationName(
             {
-              workflowAgent: activeEntry.childTracingOptions.workflowAgent
-            }
+              name: "doStream",
+              spanAttributes: {
+                type: "llm" /* LLM */
+              },
+              event: buildAISDKModelStartEvent(
+                callOptions,
+                activeEntry.baseMetadata,
+                {
+                  workflowAgent: activeEntry.childTracingOptions.workflowAgent
+                }
+              )
+            },
+            INSTRUMENTATION_NAMES.AI_SDK
           )
-        });
+        );
         activeEntry.openSpans.add(span);
         const streamStartTime = getCurrentUnixTimestamp();
         const result = await withCurrent(
@@ -13952,12 +14466,17 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
       }
       if (isAsyncGenerator(result)) {
         return (async function* () {
-          const span = activeEntry.parentSpan.startSpan({
-            name: activeEntry.name,
-            spanAttributes: {
-              type: "tool" /* TOOL */
-            }
-          });
+          const span = activeEntry.parentSpan.startSpan(
+            withSpanInstrumentationName(
+              {
+                name: activeEntry.name,
+                spanAttributes: {
+                  type: "tool" /* TOOL */
+                }
+              },
+              INSTRUMENTATION_NAMES.AI_SDK
+            )
+          );
           span.log({ input: serializeToolExecutionInput(args) });
           try {
             let lastValue;
@@ -13981,12 +14500,15 @@ function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths, aiS
           span.log({ output: awaitedResult });
           return awaitedResult;
         },
-        {
-          name: activeEntry.name,
-          spanAttributes: {
-            type: "tool" /* TOOL */
-          }
-        }
+        withSpanInstrumentationName(
+          {
+            name: activeEntry.name,
+            spanAttributes: {
+              type: "tool" /* TOOL */
+            }
+          },
+          INSTRUMENTATION_NAMES.AI_SDK
+        )
       );
     };
     cleanup.push(() => {
@@ -14145,6 +14667,8 @@ function patchAISDKStreamingResult(args) {
     defaultDenyOutputPaths,
     endEvent,
     onComplete,
+    onCancel,
+    onError,
     result,
     resolvePromiseUsage,
     span,
@@ -14156,14 +14680,43 @@ function patchAISDKStreamingResult(args) {
   const resultRecord = result;
   attachKnownResultPromiseHandlers(resultRecord);
   let finalized = false;
-  const finalize = () => {
+  const finalize = (outcome) => {
     if (finalized) {
       return;
     }
     finalized = true;
-    finalizeAISDKChildTracing(endEvent);
-    span.end();
-    onComplete?.();
+    try {
+      finalizeAISDKChildTracing(endEvent);
+    } catch (error) {
+      debugLogger.error("Error finalizing AI SDK child tracing:", error);
+    }
+    try {
+      span.end();
+    } catch (error) {
+      debugLogger.error("Error ending AI SDK streaming span:", error);
+    }
+    if (outcome && "error" in outcome) {
+      try {
+        onError?.(outcome.error);
+      } catch (error) {
+        debugLogger.error("Error in AI SDK streaming error hook:", error);
+      }
+    } else if (outcome) {
+      try {
+        onComplete?.(outcome);
+      } catch (error) {
+        debugLogger.error("Error in AI SDK streaming completion hook:", error);
+      }
+    } else {
+      try {
+        onCancel?.();
+      } catch (error) {
+        debugLogger.error(
+          "Error in AI SDK streaming cancellation hook:",
+          error
+        );
+      }
+    }
   };
   let outputLogged = false;
   const logStreamingOutput = async (firstChunkTime) => {
@@ -14197,15 +14750,29 @@ function patchAISDKStreamingResult(args) {
         resolveDenyOutputPaths(endEvent, defaultDenyOutputPaths)
       );
       const metadata = buildResolvedMetadataPayload(result).metadata;
-      span.log({
-        output,
-        ...metadata ? { metadata } : {},
-        metrics
-      });
+      try {
+        span.log({
+          output,
+          ...metadata ? { metadata } : {},
+          metrics
+        });
+      } catch (error) {
+        debugLogger.error("Error logging AI SDK streaming output:", error);
+      }
+      finalize({ metrics, output });
     } catch (error) {
-      span.log({ error: toLoggedError(error) });
-    } finally {
-      finalize();
+      const loggedError = toLoggedError(error);
+      try {
+        span.log({ error: loggedError });
+      } catch (loggingError) {
+        debugLogger.error(
+          "Error logging AI SDK streaming failure:",
+          loggingError
+        );
+      }
+      finalize({
+        error: error instanceof Error ? error : new Error(String(loggedError))
+      });
     }
   };
   const createAsyncIterableHooks = () => {
@@ -14222,11 +14789,16 @@ function patchAISDKStreamingResult(args) {
       onError: (error) => {
         if (!outputLogged) {
           outputLogged = true;
-          span.log({
-            error: error.message
-          });
+          try {
+            span.log({ error });
+          } catch (loggingError) {
+            debugLogger.error(
+              "Error logging AI SDK stream failure:",
+              loggingError
+            );
+          }
         }
-        finalize();
+        finalize({ error });
       },
       onCancel: finalize
     };
@@ -14312,8 +14884,18 @@ function patchAISDKStreamingResult(args) {
           }
           controller.enqueue(value);
         } catch (error) {
-          span.log({ error: toLoggedError(error) });
-          finalize();
+          const loggedError = toLoggedError(error);
+          try {
+            span.log({ error: loggedError });
+          } catch (loggingError) {
+            debugLogger.error(
+              "Error logging AI SDK base stream failure:",
+              loggingError
+            );
+          }
+          finalize({
+            error: error instanceof Error ? error : new Error(String(loggedError))
+          });
           controller.error(error);
         }
       },
@@ -15112,14 +15694,17 @@ function braintrustAISDKTelemetry() {
       console.error(`Error in Braintrust AI SDK telemetry ${name}:`, error);
     }
   };
-  const startChildSpan = (operationKey, name, type, event) => {
+  const startChildSpan = (operationKey, name, type, event, parentOverride) => {
     const parent = operations.get(operationKey)?.span;
-    const spanArgs = {
-      name,
-      spanAttributes: { type },
-      ...event ? { event } : {}
-    };
-    const span = parent ? parent.startSpan(spanArgs) : startSpan(spanArgs);
+    const spanArgs = withSpanInstrumentationName(
+      {
+        name,
+        spanAttributes: { type },
+        ...event ? { event } : {}
+      },
+      INSTRUMENTATION_NAMES.AI_SDK
+    );
+    const span = parentOverride ? startHarnessTurnChildSpan(parentOverride, spanArgs) : parent ? parent.startSpan(spanArgs) : startSpan(spanArgs);
     const state = operations.get(operationKey);
     if (state && type === "llm" /* LLM */) {
       state.hadModelChild = true;
@@ -15399,14 +15984,30 @@ function braintrustAISDKTelemetry() {
         const workflowAgent = operationName === "WorkflowAgent.stream";
         const wrapperSpan = workflowAgent ? currentWorkflowAgentWrapperSpan() : void 0;
         const ownsSpan = !wrapperSpan;
-        const span = ownsSpan ? startSpan({
-          name: operationName,
-          spanAttributes: { type: "function" /* FUNCTION */ }
-        }) : wrapperSpan;
+        const harnessTurnParent = currentHarnessTurnParent();
+        const span = ownsSpan ? harnessTurnParent ? startHarnessTurnChildSpan(
+          harnessTurnParent,
+          withSpanInstrumentationName(
+            {
+              name: operationName,
+              spanAttributes: { type: "function" /* FUNCTION */ }
+            },
+            INSTRUMENTATION_NAMES.AI_SDK
+          )
+        ) : startSpan(
+          withSpanInstrumentationName(
+            {
+              name: operationName,
+              spanAttributes: { type: "function" /* FUNCTION */ }
+            },
+            INSTRUMENTATION_NAMES.AI_SDK
+          )
+        ) : wrapperSpan;
         const operationKey = createOperationKey(event, operationName);
         registerOperation({
           callId: event.callId,
           hadModelChild: false,
+          harnessTurnParent,
           loggedInput: false,
           operationName,
           operationKey,
@@ -15647,7 +16248,8 @@ function braintrustAISDKTelemetry() {
               toolCallId,
               ...typeof event.toolCall.toolName === "string" ? { toolName: event.toolCall.toolName } : {}
             }
-          }
+          },
+          state?.harnessTurnParent
         );
         toolSpans.set(toolCallId, { operationKey, span });
       });
@@ -16223,15 +16825,20 @@ var FlueObserveBridge = class {
       safeLog(existing.span, { input, metadata });
       return;
     }
-    const span = startSpan({
-      name: `workflow:${workflowName}`,
-      spanAttributes: { type: "task" /* TASK */ },
-      startTime: eventTime(event.startedAt ?? event.timestamp),
-      event: {
-        input,
-        metadata
-      }
-    });
+    const span = startSpan(
+      withSpanInstrumentationName(
+        {
+          name: `workflow:${workflowName}`,
+          spanAttributes: { type: "task" /* TASK */ },
+          startTime: eventTime(event.startedAt ?? event.timestamp),
+          event: {
+            input,
+            metadata
+          }
+        },
+        INSTRUMENTATION_NAMES.FLUE
+      )
+    );
     this.runsById.set(event.runId, { metadata, span });
   }
   handleRunResume(event, ctx) {
@@ -16251,12 +16858,17 @@ var FlueObserveBridge = class {
       safeLog(existing.span, { metadata });
       return;
     }
-    const span = startSpan({
-      name: `workflow:${workflowName}`,
-      spanAttributes: { type: "task" /* TASK */ },
-      startTime: eventTime(event.startedAt ?? event.timestamp),
-      event: { metadata }
-    });
+    const span = startSpan(
+      withSpanInstrumentationName(
+        {
+          name: `workflow:${workflowName}`,
+          spanAttributes: { type: "task" /* TASK */ },
+          startTime: eventTime(event.startedAt ?? event.timestamp),
+          event: { metadata }
+        },
+        INSTRUMENTATION_NAMES.FLUE
+      )
+    );
     this.runsById.set(event.runId, { metadata, span });
   }
   handleRunEnd(event) {
@@ -16895,7 +17507,14 @@ function stateMatchesRun(state, runId) {
   return state.metadata["flue.run_id"] === runId;
 }
 function startFlueSpan(parent, args) {
-  return parent ? withCurrent(parent, () => startSpan(args)) : startSpan(args);
+  return parent ? withCurrent(
+    parent,
+    () => startSpan(
+      withSpanInstrumentationName(args, INSTRUMENTATION_NAMES.FLUE)
+    )
+  ) : startSpan(
+    withSpanInstrumentationName(args, INSTRUMENTATION_NAMES.FLUE)
+  );
 }
 function runWithCurrentSpanStore(span, next) {
   const state = _internalGetGlobalState();
@@ -16985,9 +17604,13 @@ var BraintrustLangChainCallbackHandler = class {
         ...this.options.debug ? { runId, parentRunId } : {}
       }
     };
-    let span = parentSpan.startSpan(args);
+    const spanArgs = withSpanInstrumentationName(
+      args,
+      INSTRUMENTATION_NAMES.LANGCHAIN
+    );
+    let span = parentSpan.startSpan(spanArgs);
     if (!Object.is(this.options.logger, NOOP_SPAN) && Object.is(span, NOOP_SPAN)) {
-      span = initLogger().startSpan(args);
+      span = initLogger().startSpan(spanArgs);
     }
     this.spans.set(runId, span);
   }
@@ -17826,10 +18449,15 @@ function startCodexRun(event, operation) {
     provider: "openai",
     ...event.moduleVersion ? { "openai_codex.version": event.moduleVersion } : {}
   };
-  const span = startSpan({
-    name: "OpenAI Codex",
-    spanAttributes: { type: "task" /* TASK */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        name: "OpenAI Codex",
+        spanAttributes: { type: "task" /* TASK */ }
+      },
+      INSTRUMENTATION_NAMES.OPENAI_CODEX
+    )
+  );
   const startTime = getCurrentUnixTimestamp();
   safeLog2(span, {
     input: sanitizedInput,
@@ -17978,7 +18606,12 @@ async function createCompletedItemSpan(state, item) {
   if (!spanArgs) {
     return;
   }
-  const span = startSpan(spanArgs.start);
+  const span = startSpan(
+    withSpanInstrumentationName(
+      spanArgs.start,
+      INSTRUMENTATION_NAMES.OPENAI_CODEX
+    )
+  );
   safeLog2(span, spanArgs.end);
   span.end();
 }
@@ -18020,15 +18653,20 @@ async function ensureActiveLlmSpan(state) {
     ...state.metadata["openai_codex.thread_id"] ? { "openai_codex.thread_id": state.metadata["openai_codex.thread_id"] } : {},
     "openai_codex.llm_sequence": sequence
   };
-  const span = startSpan({
-    event: {
-      ...sequence === 1 ? { input: state.input } : {},
-      metadata
-    },
-    name: "OpenAI Codex LLM",
-    parent: await state.span.export(),
-    spanAttributes: { type: "llm" /* LLM */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          ...sequence === 1 ? { input: state.input } : {},
+          metadata
+        },
+        name: "OpenAI Codex LLM",
+        parent: await state.span.export(),
+        spanAttributes: { type: "llm" /* LLM */ }
+      },
+      INSTRUMENTATION_NAMES.OPENAI_CODEX
+    )
+  );
   state.activeLlmSpan = {
     anonymousMessages: [],
     anonymousReasoning: [],
@@ -18074,7 +18712,15 @@ async function startCodexItemSpan(state, item) {
   if (!spanArgs) {
     return;
   }
-  state.activeItemSpans.set(itemId, startSpan(spanArgs.start));
+  state.activeItemSpans.set(
+    itemId,
+    startSpan(
+      withSpanInstrumentationName(
+        spanArgs.start,
+        INSTRUMENTATION_NAMES.OPENAI_CODEX
+      )
+    )
+  );
 }
 function updateCodexItem(state, item) {
   if (item.type === "agent_message" && typeof item.text === "string") {
@@ -18446,7 +19092,7 @@ var AnthropicPlugin = class extends BasePlugin {
     );
   }
   subscribeToAnthropicToolRunner() {
-    const tracingChannel2 = anthropicChannels.betaMessagesToolRunner.tracingChannel();
+    const tracingChannel = anthropicChannels.betaMessagesToolRunner.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const handlers = {
       start: (event) => {
@@ -18454,12 +19100,17 @@ var AnthropicPlugin = class extends BasePlugin {
           return;
         }
         const params = event.arguments[0] ?? {};
-        const span = startSpan({
-          name: "anthropic.beta.messages.toolRunner",
-          spanAttributes: {
-            type: "task" /* TASK */
-          }
-        });
+        const span = startSpan(
+          withSpanInstrumentationName(
+            {
+              name: "anthropic.beta.messages.toolRunner",
+              spanAttributes: {
+                type: "task" /* TASK */
+              }
+            },
+            INSTRUMENTATION_NAMES.ANTHROPIC
+          )
+        );
         span.log({
           input: processAttachmentsInInput(
             coalesceInput(params.messages ?? [], params.system)
@@ -18498,9 +19149,9 @@ var AnthropicPlugin = class extends BasePlugin {
         states.delete(event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
 };
@@ -18600,19 +19251,22 @@ function wrapAnthropicToolRunnerTool(tool, index, state) {
             return finalizeError(error);
           }
         },
-        {
-          event: {
-            input: getAnthropicToolRunnerInput(args),
-            metadata: {
-              "gen_ai.tool.name": toolName,
-              provider: "anthropic"
+        withSpanInstrumentationName(
+          {
+            event: {
+              input: getAnthropicToolRunnerInput(args),
+              metadata: {
+                "gen_ai.tool.name": toolName,
+                provider: "anthropic"
+              }
+            },
+            name: `tool: ${toolName}`,
+            spanAttributes: {
+              type: "tool" /* TOOL */
             }
           },
-          name: `tool: ${toolName}`,
-          spanAttributes: {
-            type: "tool" /* TOOL */
-          }
-        }
+          INSTRUMENTATION_NAMES.ANTHROPIC
+        )
       );
     },
     writable: runDescriptor?.writable ?? true
@@ -19222,22 +19876,27 @@ function wrapLocalClaudeToolHandler(handler, getMetadata) {
     const spanName = metadata.serverName ? `tool: ${metadata.serverName}/${metadata.toolName}` : `tool: ${metadata.toolName}`;
     const runWithResolvedParent = async () => {
       const parent = toolUseId && localToolParentResolver ? await localToolParentResolver(toolUseId).catch(() => void 0) : void 0;
-      const span = startSpan({
-        event: {
-          input: handlerArgs[0],
-          metadata: {
-            "claude_agent_sdk.raw_tool_name": rawToolName,
-            "gen_ai.tool.name": metadata.toolName,
-            ...toolUseId && { "gen_ai.tool.call.id": toolUseId },
-            ...metadata.serverName && {
-              "mcp.server": metadata.serverName
-            }
-          }
-        },
-        name: spanName,
-        ...parent && { parent },
-        spanAttributes: { type: "tool" /* TOOL */ }
-      });
+      const span = startSpan(
+        withSpanInstrumentationName(
+          {
+            event: {
+              input: handlerArgs[0],
+              metadata: {
+                "claude_agent_sdk.raw_tool_name": rawToolName,
+                "gen_ai.tool.name": metadata.toolName,
+                ...toolUseId && { "gen_ai.tool.call.id": toolUseId },
+                ...metadata.serverName && {
+                  "mcp.server": metadata.serverName
+                }
+              }
+            },
+            name: spanName,
+            ...parent && { parent },
+            spanAttributes: { type: "tool" /* TOOL */ }
+          },
+          INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
+        )
+      );
       const runHandler = () => Reflect.apply(handler, this, handlerArgs);
       const finalizeSuccess = (result) => {
         span.log({ output: result });
@@ -19562,14 +20221,19 @@ async function createLLMSpanForMessages(messages, promptMessages, conversationHi
   ).filter(
     (c) => c !== void 0
   );
-  const span = existingSpan ?? startSpan({
-    name: "anthropic.messages.create",
-    parent: parentSpan,
-    spanAttributes: {
-      type: "llm" /* LLM */
-    },
-    startTime
-  });
+  const span = existingSpan ?? startSpan(
+    withSpanInstrumentationName(
+      {
+        name: "anthropic.messages.create",
+        parent: parentSpan,
+        spanAttributes: {
+          type: "llm" /* LLM */
+        },
+        startTime
+      },
+      INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
+    )
+  );
   span.log({
     input,
     metadata: model ? { model } : void 0,
@@ -19672,25 +20336,30 @@ function createToolTracingHooks(resolveParentSpan, activeToolSpans, mcpServers,
       return {};
     }
     const parsed = parseToolName(input.tool_name);
-    const toolSpan = startSpan({
-      event: {
-        input: input.tool_input,
-        metadata: {
-          "claude_agent_sdk.cwd": input.cwd,
-          "claude_agent_sdk.raw_tool_name": parsed.rawToolName,
-          "claude_agent_sdk.session_id": input.session_id,
-          "gen_ai.tool.call.id": toolUseID,
-          "gen_ai.tool.name": parsed.toolName,
-          ...parsed.mcpServer && { "mcp.server": parsed.mcpServer },
-          ...getMcpServerMetadata(parsed.mcpServer, mcpServers)
-        }
-      },
-      name: parsed.displayName,
-      parent: await resolveParentSpan(toolUseID, {
-        agentId: input.agent_id
-      }),
-      spanAttributes: { type: "tool" /* TOOL */ }
-    });
+    const toolSpan = startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            input: input.tool_input,
+            metadata: {
+              "claude_agent_sdk.cwd": input.cwd,
+              "claude_agent_sdk.raw_tool_name": parsed.rawToolName,
+              "claude_agent_sdk.session_id": input.session_id,
+              "gen_ai.tool.call.id": toolUseID,
+              "gen_ai.tool.name": parsed.toolName,
+              ...parsed.mcpServer && { "mcp.server": parsed.mcpServer },
+              ...getMcpServerMetadata(parsed.mcpServer, mcpServers)
+            }
+          },
+          name: parsed.displayName,
+          parent: await resolveParentSpan(toolUseID, {
+            agentId: input.agent_id
+          }),
+          spanAttributes: { type: "tool" /* TOOL */ }
+        },
+        INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
+      )
+    );
     activeToolSpans.set(toolUseID, toolSpan);
     return {};
   };
@@ -20056,14 +20725,19 @@ async function ensureSubAgentSpan(subAgentDetailsByToolUseId, rootSpan, activeTo
   const spanName = formatSubAgentSpanName(details);
   const parentToolSpan = activeToolSpans.get(parentToolUseId);
   const parentSpan = parentToolSpan ? await parentToolSpan.export() : await rootSpan.export();
-  const subAgentSpan = startSpan({
-    event: {
-      metadata: subAgentDetailsToMetadata(details)
-    },
-    name: spanName,
-    parent: parentSpan,
-    spanAttributes: { type: "task" /* TASK */ }
-  });
+  const subAgentSpan = startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          metadata: subAgentDetailsToMetadata(details)
+        },
+        name: spanName,
+        parent: parentSpan,
+        spanAttributes: { type: "task" /* TASK */ }
+      },
+      INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
+    )
+  );
   subAgentSpans.set(parentToolUseId, subAgentSpan);
   return subAgentSpan;
 }
@@ -20084,14 +20758,19 @@ async function ensureActiveLlmSpanForParentToolUse(rootSpan, activeLlmSpansByPar
     );
     llmParentSpan = await subAgentSpan.export();
   }
-  const llmSpan = startSpan({
-    name: "anthropic.messages.create",
-    parent: llmParentSpan,
-    spanAttributes: {
-      type: "llm" /* LLM */
-    },
-    startTime
-  });
+  const llmSpan = startSpan(
+    withSpanInstrumentationName(
+      {
+        name: "anthropic.messages.create",
+        parent: llmParentSpan,
+        spanAttributes: {
+          type: "llm" /* LLM */
+        },
+        startTime
+      },
+      INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
+    )
+  );
   activeLlmSpansByParentToolUse.set(parentKey, llmSpan);
   return llmSpan;
 }
@@ -20360,12 +21039,17 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
             }
           })();
         }
-        const span = startSpan({
-          name: "Claude Agent",
-          spanAttributes: {
-            type: "task" /* TASK */
-          }
-        });
+        const span = startSpan(
+          withSpanInstrumentationName(
+            {
+              name: "Claude Agent",
+              spanAttributes: {
+                type: "task" /* TASK */
+              }
+            },
+            INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
+          )
+        );
         const startTime = getCurrentUnixTimestamp();
         try {
           span.log({
@@ -20552,7 +21236,7 @@ var CursorSDKPlugin = class extends BasePlugin {
     this.subscribeToAgentFactory(cursorSDKChannels.resume);
   }
   subscribeToAgentFactory(channel) {
-    const tracingChannel2 = channel.tracingChannel();
+    const tracingChannel = channel.tracingChannel();
     const handlers = {
       asyncEnd: (event) => {
         patchCursorAgentInPlace(event.result);
@@ -20560,9 +21244,9 @@ var CursorSDKPlugin = class extends BasePlugin {
       error: () => {
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToPrompt() {
@@ -20579,10 +21263,15 @@ var CursorSDKPlugin = class extends BasePlugin {
           provider: "cursor",
           ...event.moduleVersion ? { "cursor_sdk.version": event.moduleVersion } : {}
         };
-        const span = startSpan({
-          name: "Cursor Agent",
-          spanAttributes: { type: "task" /* TASK */ }
-        });
+        const span = startSpan(
+          withSpanInstrumentationName(
+            {
+              name: "Cursor Agent",
+              spanAttributes: { type: "task" /* TASK */ }
+            },
+            INSTRUMENTATION_NAMES.CURSOR_SDK
+          )
+        );
         const startTime = getCurrentUnixTimestamp();
         safeLog3(span, {
           input: sanitizeUserMessage(message),
@@ -20644,10 +21333,15 @@ var CursorSDKPlugin = class extends BasePlugin {
           provider: "cursor",
           ...event.moduleVersion ? { "cursor_sdk.version": event.moduleVersion } : {}
         };
-        const span = startSpan({
-          name: "Cursor Agent",
-          spanAttributes: { type: "task" /* TASK */ }
-        });
+        const span = startSpan(
+          withSpanInstrumentationName(
+            {
+              name: "Cursor Agent",
+              spanAttributes: { type: "task" /* TASK */ }
+            },
+            INSTRUMENTATION_NAMES.CURSOR_SDK
+          )
+        );
         const startTime = getCurrentUnixTimestamp();
         safeLog3(span, {
           input: sanitizeUserMessage(message),
@@ -21094,29 +21788,39 @@ async function startToolSpan(state, args) {
   if (args.truncated?.result !== void 0) {
     metadata["cursor_sdk.tool.result_truncated"] = args.truncated.result;
   }
-  const span = startSpan({
-    event: {
-      input: args.args,
-      metadata
-    },
-    name: `tool: ${name}`,
-    parent: await state.span.export(),
-    spanAttributes: { type: "tool" /* TOOL */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          input: args.args,
+          metadata
+        },
+        name: `tool: ${name}`,
+        parent: await state.span.export(),
+        spanAttributes: { type: "tool" /* TOOL */ }
+      },
+      INSTRUMENTATION_NAMES.CURSOR_SDK
+    )
+  );
   let subAgentSpan;
   if (isSubAgentToolName(name)) {
-    subAgentSpan = startSpan({
-      event: {
-        input: args.args,
-        metadata: {
-          "cursor_sdk.subagent.tool_call_id": args.callId,
-          "gen_ai.tool.name": name
-        }
-      },
-      name: formatSubAgentSpanName2(args.toolCall, args.args),
-      parent: await span.export(),
-      spanAttributes: { type: "task" /* TASK */ }
-    });
+    subAgentSpan = startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            input: args.args,
+            metadata: {
+              "cursor_sdk.subagent.tool_call_id": args.callId,
+              "gen_ai.tool.name": name
+            }
+          },
+          name: formatSubAgentSpanName2(args.toolCall, args.args),
+          parent: await span.export(),
+          spanAttributes: { type: "task" /* TASK */ }
+        },
+        INSTRUMENTATION_NAMES.CURSOR_SDK
+      )
+    );
   }
   return { span, subAgentSpan };
 }
@@ -21488,16 +22192,19 @@ var OpenAIAgentsTraceProcessor = class _OpenAIAgentsTraceProcessor {
       this.evictOldestTrace();
     }
     const current = currentSpan();
-    const span = current && current !== NOOP_SPAN ? current.startSpan({
-      name: trace.name,
-      type: "task" /* TASK */
-    }) : this.logger ? this.logger.startSpan({
-      name: trace.name,
-      type: "task" /* TASK */
-    }) : startSpan({
-      name: trace.name,
-      type: "task" /* TASK */
-    });
+    const spanArgs = withSpanInstrumentationName(
+      {
+        name: trace.name,
+        type: "task" /* TASK */
+      },
+      INSTRUMENTATION_NAMES.OPENAI_AGENTS
+    );
+    const span = current && current !== NOOP_SPAN ? current.startSpan(spanArgs) : this.logger ? this.logger.startSpan(spanArgs) : startSpan(
+      withSpanInstrumentationName(
+        spanArgs,
+        INSTRUMENTATION_NAMES.OPENAI_AGENTS
+      )
+    );
     span.log({
       input: "Agent workflow started",
       metadata: {
@@ -21548,10 +22255,15 @@ var OpenAIAgentsTraceProcessor = class _OpenAIAgentsTraceProcessor {
     if (!parentSpan) {
       return Promise.resolve();
     }
-    const childSpan = parentSpan.startSpan({
-      name: spanNameFromAgents(span),
-      type: spanTypeFromAgents(span)
-    });
+    const childSpan = parentSpan.startSpan(
+      withSpanInstrumentationName(
+        {
+          name: spanNameFromAgents(span),
+          type: spanTypeFromAgents(span)
+        },
+        INSTRUMENTATION_NAMES.OPENAI_AGENTS
+      )
+    );
     traceData.childSpans.set(span.spanId, childSpan);
     return Promise.resolve();
   }
@@ -21842,22 +22554,27 @@ var GoogleGenAIPlugin = class extends BasePlugin {
     this.subscribeToInteractionsCreateChannel();
   }
   subscribeToGenerateContentChannel() {
-    const tracingChannel2 = googleGenAIChannels.generateContent.tracingChannel();
+    const tracingChannel = googleGenAIChannels.generateContent.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const unbindCurrentSpanStore = bindCurrentSpanStoreToStart2(
-      tracingChannel2,
+      tracingChannel,
       states,
       (event) => {
         const params = event.arguments[0];
         const input = serializeGenerateContentInput(params);
         const metadata = extractGenerateContentMetadata(params);
-        const span = startSpan({
-          name: "generate_content",
-          spanAttributes: {
-            type: "llm" /* LLM */
-          },
-          event: createWrapperParityEvent({ input, metadata })
-        });
+        const span = startSpan(
+          withSpanInstrumentationName(
+            {
+              name: "generate_content",
+              spanAttributes: {
+                type: "llm" /* LLM */
+              },
+              event: createWrapperParityEvent({ input, metadata })
+            },
+            INSTRUMENTATION_NAMES.GOOGLE_GENAI
+          )
+        );
         return {
           span,
           startTime: getCurrentUnixTimestamp()
@@ -21870,13 +22587,18 @@ var GoogleGenAIPlugin = class extends BasePlugin {
           const params = event.arguments[0];
           const input = serializeGenerateContentInput(params);
           const metadata = extractGenerateContentMetadata(params);
-          const span = startSpan({
-            name: "generate_content",
-            spanAttributes: {
-              type: "llm" /* LLM */
-            },
-            event: createWrapperParityEvent({ input, metadata })
-          });
+          const span = startSpan(
+            withSpanInstrumentationName(
+              {
+                name: "generate_content",
+                spanAttributes: {
+                  type: "llm" /* LLM */
+                },
+                event: createWrapperParityEvent({ input, metadata })
+              },
+              INSTRUMENTATION_NAMES.GOOGLE_GENAI
+            )
+          );
           return {
             span,
             startTime: getCurrentUnixTimestamp()
@@ -21909,14 +22631,14 @@ var GoogleGenAIPlugin = class extends BasePlugin {
         logErrorAndEndSpan(states, event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
       unbindCurrentSpanStore?.();
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToGenerateContentStreamChannel() {
-    const tracingChannel2 = googleGenAIChannels.generateContentStream.tracingChannel();
+    const tracingChannel = googleGenAIChannels.generateContentStream.tracingChannel();
     const handlers = {
       start: (event) => {
         const streamEvent = event;
@@ -21937,28 +22659,33 @@ var GoogleGenAIPlugin = class extends BasePlugin {
       error: () => {
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToEmbedContentChannel() {
-    const tracingChannel2 = googleGenAIChannels.embedContent.tracingChannel();
+    const tracingChannel = googleGenAIChannels.embedContent.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const unbindCurrentSpanStore = bindCurrentSpanStoreToStart2(
-      tracingChannel2,
+      tracingChannel,
       states,
       (event) => {
         const params = event.arguments[0];
         const input = serializeEmbedContentInput(params);
         const metadata = extractEmbedContentMetadata(params);
-        const span = startSpan({
-          name: "embed_content",
-          spanAttributes: {
-            type: "llm" /* LLM */
-          },
-          event: createWrapperParityEvent({ input, metadata })
-        });
+        const span = startSpan(
+          withSpanInstrumentationName(
+            {
+              name: "embed_content",
+              spanAttributes: {
+                type: "llm" /* LLM */
+              },
+              event: createWrapperParityEvent({ input, metadata })
+            },
+            INSTRUMENTATION_NAMES.GOOGLE_GENAI
+          )
+        );
         return {
           span,
           startTime: getCurrentUnixTimestamp()
@@ -21971,13 +22698,18 @@ var GoogleGenAIPlugin = class extends BasePlugin {
           const params = event.arguments[0];
           const input = serializeEmbedContentInput(params);
           const metadata = extractEmbedContentMetadata(params);
-          const span = startSpan({
-            name: "embed_content",
-            spanAttributes: {
-              type: "llm" /* LLM */
-            },
-            event: createWrapperParityEvent({ input, metadata })
-          });
+          const span = startSpan(
+            withSpanInstrumentationName(
+              {
+                name: "embed_content",
+                spanAttributes: {
+                  type: "llm" /* LLM */
+                },
+                event: createWrapperParityEvent({ input, metadata })
+              },
+              INSTRUMENTATION_NAMES.GOOGLE_GENAI
+            )
+          );
           return {
             span,
             startTime: getCurrentUnixTimestamp()
@@ -22006,10 +22738,10 @@ var GoogleGenAIPlugin = class extends BasePlugin {
         logErrorAndEndSpan(states, event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
       unbindCurrentSpanStore?.();
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToInteractionsCreateChannel() {
@@ -22045,10 +22777,10 @@ function ensureSpanState(states, event, create) {
   states.set(event, created);
   return created;
 }
-function bindCurrentSpanStoreToStart2(tracingChannel2, states, create) {
+function bindCurrentSpanStoreToStart2(tracingChannel, states, create) {
   const state = _internalGetGlobalState();
   const contextManager = state?.contextManager;
-  const startChannel = tracingChannel2.start;
+  const startChannel = tracingChannel.start;
   const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
   if (!startChannel?.bindStore || !currentSpanStore) {
     return void 0;
@@ -22088,16 +22820,21 @@ function patchGoogleGenAIStreamingResult(args) {
   const requestStartTime = startTime ?? getCurrentUnixTimestamp();
   const ensureSpan = () => {
     if (!span) {
-      span = startSpan({
-        name: "generate_content_stream",
-        spanAttributes: {
-          type: "llm" /* LLM */
-        },
-        event: {
-          input,
-          metadata
-        }
-      });
+      span = startSpan(
+        withSpanInstrumentationName(
+          {
+            name: "generate_content_stream",
+            spanAttributes: {
+              type: "llm" /* LLM */
+            },
+            event: {
+              input,
+              metadata
+            }
+          },
+          INSTRUMENTATION_NAMES.GOOGLE_GENAI
+        )
+      );
     }
     return span;
   };
@@ -22546,11 +23283,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;
@@ -22561,13 +23298,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;
@@ -22578,6 +23328,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();
@@ -23288,6 +24056,259 @@ function extractTextGenerationStreamMetadata(chunks) {
   return void 0;
 }
 
+// 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 channel = huggingFaceTransformersChannels.pipeline.tracingChannel();
+    const handlers = {
+      asyncEnd: (event) => {
+        if (typeof event.result !== "function") {
+          return;
+        }
+        registerHuggingFaceTransformersPipeline(
+          event.result,
+          event.arguments?.[0],
+          event.arguments?.[1]
+        );
+      }
+    };
+    channel.subscribe(handlers);
+    this.unsubscribers.push(() => channel.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-plugin.ts
 var OpenRouterAgentPlugin = class extends BasePlugin {
   onEnable() {
@@ -23667,7 +24688,7 @@ function isWrappedTool(tool) {
   return Boolean(tool[OPENROUTER_WRAPPED_TOOL]);
 }
 function traceToolExecution(args) {
-  const tracingChannel2 = openRouterAgentChannels.toolExecute.tracingChannel();
+  const tracingChannel = openRouterAgentChannels.toolExecute.tracingChannel();
   const input = args.args.length > 0 ? args.args[0] : void 0;
   const event = {
     arguments: [input],
@@ -23677,33 +24698,33 @@ function traceToolExecution(args) {
     toolCallId: args.toolCallId,
     toolName: args.toolName
   };
-  tracingChannel2.start.publish(event);
+  tracingChannel.start.publish(event);
   try {
     const result = args.execute();
-    return publishToolResult(tracingChannel2, event, result);
+    return publishToolResult(tracingChannel, event, result);
   } catch (error) {
     event.error = normalizeError(error);
-    tracingChannel2.error.publish(event);
+    tracingChannel.error.publish(event);
     throw error;
   }
 }
-function publishToolResult(tracingChannel2, event, result) {
+function publishToolResult(tracingChannel, event, result) {
   if (isPromiseLike(result)) {
     return result.then(
       (resolved) => {
         event.result = resolved;
-        tracingChannel2.asyncEnd.publish(event);
+        tracingChannel.asyncEnd.publish(event);
         return resolved;
       },
       (error) => {
         event.error = normalizeError(error);
-        tracingChannel2.error.publish(event);
+        tracingChannel.error.publish(event);
         throw error;
       }
     );
   }
   event.result = result;
-  tracingChannel2.asyncEnd.publish(event);
+  tracingChannel.asyncEnd.publish(event);
   return result;
 }
 function getToolCallId(context) {
@@ -24573,7 +25594,7 @@ function isWrappedTool2(tool) {
   return Boolean(tool[OPENROUTER_WRAPPED_TOOL2]);
 }
 function traceToolExecution2(args) {
-  const tracingChannel2 = openRouterChannels.toolExecute.tracingChannel();
+  const tracingChannel = openRouterChannels.toolExecute.tracingChannel();
   const input = args.args.length > 0 ? args.args[0] : void 0;
   const event = {
     arguments: [input],
@@ -24583,33 +25604,33 @@ function traceToolExecution2(args) {
     toolCallId: args.toolCallId,
     toolName: args.toolName
   };
-  tracingChannel2.start.publish(event);
+  tracingChannel.start.publish(event);
   try {
     const result = args.execute();
-    return publishToolResult2(tracingChannel2, event, result);
+    return publishToolResult2(tracingChannel, event, result);
   } catch (error) {
     event.error = normalizeError2(error);
-    tracingChannel2.error.publish(event);
+    tracingChannel.error.publish(event);
     throw error;
   }
 }
-function publishToolResult2(tracingChannel2, event, result) {
+function publishToolResult2(tracingChannel, event, result) {
   if (isPromiseLike(result)) {
     return result.then(
       (resolved) => {
         event.result = resolved;
-        tracingChannel2.asyncEnd.publish(event);
+        tracingChannel.asyncEnd.publish(event);
         return resolved;
       },
       (error) => {
         event.error = normalizeError2(error);
-        tracingChannel2.error.publish(event);
+        tracingChannel.error.publish(event);
         throw error;
       }
     );
   }
   event.result = result;
-  tracingChannel2.asyncEnd.publish(event);
+  tracingChannel.asyncEnd.publish(event);
   return result;
 }
 function getToolCallId2(context) {
@@ -25727,17 +26748,22 @@ var GoogleADKPlugin = class extends BasePlugin {
     this.activeAgentSpans.clear();
   }
   subscribeToRunnerRunAsync() {
-    const tracingChannel2 = googleADKChannels.runnerRunAsync.tracingChannel();
+    const tracingChannel = googleADKChannels.runnerRunAsync.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const createState = (event) => {
       const params = event.arguments[0] ?? {};
       const contextKey = extractRunnerContextKey(params);
-      const span = startSpan({
-        name: "Google ADK Runner",
-        spanAttributes: {
-          type: "task" /* TASK */
-        }
-      });
+      const span = startSpan(
+        withSpanInstrumentationName(
+          {
+            name: "Google ADK Runner",
+            spanAttributes: {
+              type: "task" /* TASK */
+            }
+          },
+          INSTRUMENTATION_NAMES.GOOGLE_ADK
+        )
+      );
       const startTime = getCurrentUnixTimestamp();
       try {
         const metadata = extractRunnerMetadata(params);
@@ -25753,7 +26779,7 @@ var GoogleADKPlugin = class extends BasePlugin {
       return { span, startTime, events: [], contextKey };
     };
     const unbindCurrentSpanStore = bindCurrentSpanStoreToStart3(
-      tracingChannel2,
+      tracingChannel,
       states,
       createState
     );
@@ -25805,14 +26831,14 @@ var GoogleADKPlugin = class extends BasePlugin {
         states.delete(event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
       unbindCurrentSpanStore?.();
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToAgentRunAsync() {
-    const tracingChannel2 = googleADKChannels.agentRunAsync.tracingChannel();
+    const tracingChannel = googleADKChannels.agentRunAsync.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const createState = (event) => {
       const parentContext = event.arguments[0];
@@ -25823,18 +26849,23 @@ var GoogleADKPlugin = class extends BasePlugin {
         this.activeRunnerSpans
       );
       const contextKey = extractInvocationContextKey(parentContext);
-      const span = startSpan({
-        name: agentName ? `Agent: ${agentName}` : "Google ADK Agent",
-        spanAttributes: {
-          type: "task" /* TASK */
-        },
-        ...runnerParentSpan ? {
-          parentSpanIds: {
-            spanId: runnerParentSpan.spanId,
-            rootSpanId: runnerParentSpan.rootSpanId
-          }
-        } : {}
-      });
+      const span = startSpan(
+        withSpanInstrumentationName(
+          {
+            name: agentName ? `Agent: ${agentName}` : "Google ADK Agent",
+            spanAttributes: {
+              type: "task" /* TASK */
+            },
+            ...runnerParentSpan ? {
+              parentSpanIds: {
+                spanId: runnerParentSpan.spanId,
+                rootSpanId: runnerParentSpan.rootSpanId
+              }
+            } : {}
+          },
+          INSTRUMENTATION_NAMES.GOOGLE_ADK
+        )
+      );
       const startTime = getCurrentUnixTimestamp();
       try {
         const metadata = {
@@ -25856,7 +26887,7 @@ var GoogleADKPlugin = class extends BasePlugin {
       return { span, startTime, events: [], contextKey, name: agentName };
     };
     const unbindCurrentSpanStore = bindCurrentSpanStoreToStart3(
-      tracingChannel2,
+      tracingChannel,
       states,
       createState
     );
@@ -25908,14 +26939,14 @@ var GoogleADKPlugin = class extends BasePlugin {
         states.delete(event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
       unbindCurrentSpanStore?.();
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToToolRunAsync() {
-    const tracingChannel2 = googleADKChannels.toolRunAsync.tracingChannel();
+    const tracingChannel = googleADKChannels.toolRunAsync.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const handlers = {
       start: (event) => {
@@ -25927,22 +26958,27 @@ var GoogleADKPlugin = class extends BasePlugin {
           this.activeAgentSpans,
           this.activeRunnerSpans
         );
-        const createSpan = () => startSpan({
-          name: toolName ? `tool: ${toolName}` : "Google ADK Tool",
-          spanAttributes: {
-            type: "tool" /* TOOL */
-          },
-          event: {
-            input: req.args,
-            metadata: {
-              provider: "google-adk",
-              ...toolName && { "google_adk.tool_name": toolName },
-              ...extractToolCallId(req) && {
-                "google_adk.tool_call_id": extractToolCallId(req)
+        const createSpan = () => startSpan(
+          withSpanInstrumentationName(
+            {
+              name: toolName ? `tool: ${toolName}` : "Google ADK Tool",
+              spanAttributes: {
+                type: "tool" /* TOOL */
+              },
+              event: {
+                input: req.args,
+                metadata: {
+                  provider: "google-adk",
+                  ...toolName && { "google_adk.tool_name": toolName },
+                  ...extractToolCallId(req) && {
+                    "google_adk.tool_call_id": extractToolCallId(req)
+                  }
+                }
               }
-            }
-          }
-        });
+            },
+            INSTRUMENTATION_NAMES.GOOGLE_ADK
+          )
+        );
         const span = parentSpan ? withCurrent(parentSpan, () => createSpan()) : createSpan();
         const startTime = getCurrentUnixTimestamp();
         states.set(event, { span, startTime });
@@ -25977,9 +27013,9 @@ var GoogleADKPlugin = class extends BasePlugin {
         states.delete(event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
 };
@@ -26055,10 +27091,10 @@ function bindAsyncIterableToCurrentSpan(stream, span) {
   }
   return stream;
 }
-function bindCurrentSpanStoreToStart3(tracingChannel2, states, create) {
+function bindCurrentSpanStoreToStart3(tracingChannel, states, create) {
   const state = _internalGetGlobalState();
   const contextManager = state?.contextManager;
-  const startChannel = tracingChannel2.start;
+  const startChannel = tracingChannel.start;
   const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
   if (!startChannel?.bindStore || !currentSpanStore) {
     return void 0;
@@ -26310,15 +27346,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;
@@ -26329,6 +27382,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 = {};
@@ -27785,10 +28851,10 @@ var GenkitPlugin = class extends BasePlugin {
     this.subscribeToActionStream();
   }
   subscribeToActionRun() {
-    const tracingChannel2 = genkitChannels.actionRun.tracingChannel();
+    const tracingChannel = genkitChannels.actionRun.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const unbindCurrentSpanStore = bindActionCurrentSpanStoreToStart(
-      tracingChannel2,
+      tracingChannel,
       states,
       (event) => startActionRunSpan(event)
     );
@@ -27825,17 +28891,17 @@ var GenkitPlugin = class extends BasePlugin {
         states.delete(event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
       unbindCurrentSpanStore?.();
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToActionSpan() {
-    const tracingChannel2 = genkitCoreChannels.actionSpan.tracingChannel();
+    const tracingChannel = genkitCoreChannels.actionSpan.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
     const unbindCurrentSpanStore = bindActionCurrentSpanStoreToStart(
-      tracingChannel2,
+      tracingChannel,
       states,
       (event) => startActionSpan(event)
     );
@@ -27873,10 +28939,10 @@ var GenkitPlugin = class extends BasePlugin {
         states.delete(event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
       unbindCurrentSpanStore?.();
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   subscribeToActionStream() {
@@ -27916,16 +28982,21 @@ function startActionSpanState(args) {
   if (!shouldTraceAction(args.metadata, args.runStepName)) {
     return void 0;
   }
-  const span = startSpan({
-    name: actionSpanName(args.metadata, args.runStepName),
-    spanAttributes: {
-      type: actionSpanType(args.metadata)
-    }
-  });
-  const startTime = getCurrentUnixTimestamp();
-  span.log({
-    input: args.input,
-    metadata: actionMetadataForLog(args.metadata, args.runStepName)
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        name: actionSpanName(args.metadata, args.runStepName),
+        spanAttributes: {
+          type: actionSpanType(args.metadata)
+        }
+      },
+      INSTRUMENTATION_NAMES.GENKIT
+    )
+  );
+  const startTime = getCurrentUnixTimestamp();
+  span.log({
+    input: args.input,
+    metadata: actionMetadataForLog(args.metadata, args.runStepName)
   });
   return { span, startTime };
 }
@@ -27940,10 +29011,10 @@ function ensureActionSpanState(states, event, create) {
   }
   return created;
 }
-function bindActionCurrentSpanStoreToStart(tracingChannel2, states, create) {
+function bindActionCurrentSpanStoreToStart(tracingChannel, states, create) {
   const state = _internalGetGlobalState();
   const contextManager = state?.contextManager;
-  const startChannel = tracingChannel2.start;
+  const startChannel = tracingChannel.start;
   const currentSpanStore = contextManager ? contextManager[BRAINTRUST_CURRENT_SPAN_STORE] : void 0;
   if (!startChannel?.bindStore || !currentSpanStore) {
     return void 0;
@@ -28370,11 +29441,16 @@ async function handleTurnStart(state, agentId) {
     return;
   }
   const parentId = await getParentIdForAgent(state, agentId);
-  const span = startSpan({
-    name: "Copilot Turn",
-    parent: parentId,
-    spanAttributes: { type: "task" /* TASK */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        name: "Copilot Turn",
+        parent: parentId,
+        spanAttributes: { type: "task" /* TASK */ }
+      },
+      INSTRUMENTATION_NAMES.GITHUB_COPILOT
+    )
+  );
   const pendingUserMessage = state.pendingUserMessages.get(key);
   if (pendingUserMessage) {
     span.log({ input: pendingUserMessage });
@@ -28405,11 +29481,16 @@ async function handleUsage(state, agentId, usage) {
   const parentId = turn ? await turn.id : await state.session.id;
   const content = state.currentMessageContent.get(key);
   const { metrics, metadata } = extractMetricsFromUsage(usage);
-  const llmSpan = startSpan({
-    name: "github.copilot.llm",
-    parent: parentId,
-    spanAttributes: { type: "llm" /* LLM */ }
-  });
+  const llmSpan = startSpan(
+    withSpanInstrumentationName(
+      {
+        name: "github.copilot.llm",
+        parent: parentId,
+        spanAttributes: { type: "llm" /* LLM */ }
+      },
+      INSTRUMENTATION_NAMES.GITHUB_COPILOT
+    )
+  );
   llmSpan.log({
     output: content ?? void 0,
     metadata,
@@ -28435,11 +29516,16 @@ async function handleToolStart(state, agentId, toolCallId, toolName, args, mcpSe
   }
   const parentId = await getToolParentId(state, agentId);
   const displayName = mcpServerName ? `tool: ${mcpServerName}/${toolName}` : `tool: ${toolName}`;
-  const span = startSpan({
-    name: displayName,
-    parent: parentId,
-    spanAttributes: { type: "tool" /* TOOL */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        name: displayName,
+        parent: parentId,
+        spanAttributes: { type: "tool" /* TOOL */ }
+      },
+      INSTRUMENTATION_NAMES.GITHUB_COPILOT
+    )
+  );
   const metadata = {
     "gen_ai.tool.name": toolName,
     "gen_ai.tool.call.id": toolCallId
@@ -28475,11 +29561,16 @@ async function handleSubagentStarted(state, agentId, toolCallId, agentDisplayNam
   }
   const tool = state.activeTools.get(toolCallId);
   const parentId = tool ? await tool.id : await state.session.id;
-  const span = startSpan({
-    name: `Agent: ${agentDisplayName}`,
-    parent: parentId,
-    spanAttributes: { type: "task" /* TASK */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        name: `Agent: ${agentDisplayName}`,
+        parent: parentId,
+        spanAttributes: { type: "task" /* TASK */ }
+      },
+      INSTRUMENTATION_NAMES.GITHUB_COPILOT
+    )
+  );
   span.log({
     metadata: {
       "github_copilot.agent_name": agentDisplayName,
@@ -28705,10 +29796,15 @@ function makeSessionHandlers(sessionStates, configArgIndex, includeProviderMetad
       if (!config || typeof config !== "object") {
         return;
       }
-      const sessionSpan = startSpan({
-        name: "Copilot Session",
-        spanAttributes: { type: "task" /* TASK */ }
-      });
+      const sessionSpan = startSpan(
+        withSpanInstrumentationName(
+          {
+            name: "Copilot Session",
+            spanAttributes: { type: "task" /* TASK */ }
+          },
+          INSTRUMENTATION_NAMES.GITHUB_COPILOT
+        )
+      );
       const metadata = {};
       if (config.model) {
         metadata["github_copilot.model"] = config.model;
@@ -28810,7 +29906,7 @@ var LangChainPlugin = class extends BasePlugin {
     this.injectedManagers = /* @__PURE__ */ new WeakSet();
   }
   subscribeToConfigure(channel) {
-    const tracingChannel2 = channel.tracingChannel();
+    const tracingChannel = channel.tracingChannel();
     const handlers = {
       start: (event) => {
         injectHandlerIntoArguments(event.arguments);
@@ -28819,9 +29915,9 @@ var LangChainPlugin = class extends BasePlugin {
         this.injectHandler(event.result);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
   injectHandler(result) {
@@ -29042,25 +30138,30 @@ var LangSmithPlugin = class extends BasePlugin {
     const traceId = stringValue2(ownValue(run, "trace_id")) ?? id;
     const parentId = stringValue2(ownValue(run, "parent_run_id")) ?? stringValue2(ownValue(ownValue(run, "parent_run"), "id"));
     const startTime = timestampSeconds(ownValue(run, "start_time"));
-    return startSpan({
-      name: stringValue2(ownValue(run, "name")) ?? "LangSmith run",
-      spanId: id,
-      parentSpanIds: {
-        parentSpanIds: parentId ? [parentId] : [],
-        rootSpanId: traceId
-      },
-      spanAttributes: {
-        type: mapRunType(ownValue(run, "run_type"))
-      },
-      ...startTime === void 0 ? {} : { startTime },
-      event: { id }
-    });
+    return startSpan(
+      withSpanInstrumentationName(
+        {
+          name: stringValue2(ownValue(run, "name")) ?? "LangSmith run",
+          spanId: id,
+          parentSpanIds: {
+            parentSpanIds: parentId ? [parentId] : [],
+            rootSpanId: traceId
+          },
+          spanAttributes: {
+            type: mapRunType(ownValue(run, "run_type"))
+          },
+          ...startTime === void 0 ? {} : { startTime },
+          event: { id }
+        },
+        INSTRUMENTATION_NAMES.LANGSMITH
+      )
+    );
   }
   logRun(span, run, previous, includeOutput) {
     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({
@@ -29165,7 +30266,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)) {
@@ -29385,14 +30486,19 @@ function startPiPromptRun(event, onFinalize) {
     ...session.model?.id || agent.state?.model?.id ? { model: session.model?.id ?? agent.state?.model?.id } : {},
     ...event.moduleVersion ? { "pi_coding_agent.version": event.moduleVersion } : {}
   };
-  const span = startSpan({
-    event: {
-      input: extractPromptInput(event.arguments[0], event.arguments[1]),
-      metadata
-    },
-    name: "AgentSession.prompt",
-    spanAttributes: { type: "task" /* TASK */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          input: extractPromptInput(event.arguments[0], event.arguments[1]),
+          metadata
+        },
+        name: "AgentSession.prompt",
+        spanAttributes: { type: "task" /* TASK */ }
+      },
+      INSTRUMENTATION_NAMES.PI_CODING_AGENT
+    )
+  );
   const streamPatchState = installPiStreamPatch(agent);
   const options = event.arguments[1];
   const promptText = event.arguments[0];
@@ -29562,15 +30668,20 @@ async function startPiLlmSpan(state, model, context, options) {
     ...extractToolMetadata(context.tools),
     "pi_coding_agent.operation": "agent.streamFn"
   };
-  const span = startSpan({
-    event: {
-      input: processInputAttachments(normalizePiContextInput(context)),
-      metadata
-    },
-    name: getLlmSpanName(model),
-    parent: await state.span.export(),
-    spanAttributes: { type: "llm" /* LLM */ }
-  });
+  const span = startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          input: processInputAttachments(normalizePiContextInput(context)),
+          metadata
+        },
+        name: getLlmSpanName(model),
+        parent: await state.span.export(),
+        spanAttributes: { type: "llm" /* LLM */ }
+      },
+      INSTRUMENTATION_NAMES.PI_CODING_AGENT
+    )
+  );
   const llmState = {
     finalized: false,
     metadata,
@@ -29738,15 +30849,20 @@ async function startPiToolSpan(state, event) {
     "pi_coding_agent.tool.name": event.toolName
   };
   try {
-    const span = startSpan({
-      event: {
-        input: event.args,
-        metadata
-      },
-      name: event.toolName || "tool",
-      parent: await state.span.export(),
-      spanAttributes: { type: "tool" /* TOOL */ }
-    });
+    const span = startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            input: event.args,
+            metadata
+          },
+          name: event.toolName || "tool",
+          parent: await state.span.export(),
+          spanAttributes: { type: "tool" /* TOOL */ }
+        },
+        INSTRUMENTATION_NAMES.PI_CODING_AGENT
+      )
+    );
     state.activeToolSpans.set(event.toolCallId, {
       restoreAutoInstrumentation,
       span
@@ -30249,9 +31365,9 @@ var StrandsAgentSDKPlugin = class extends BasePlugin {
     });
   }
   subscribeToMultiAgentStream(channel, operation) {
-    const tracingChannel2 = channel.tracingChannel();
+    const tracingChannel = channel.tracingChannel();
     const states = /* @__PURE__ */ new WeakMap();
-    const unbindAutoInstrumentationSuppression = bindAutoInstrumentationSuppressionToStart(tracingChannel2);
+    const unbindAutoInstrumentationSuppression = bindAutoInstrumentationSuppressionToStart(tracingChannel);
     const handlers = {
       start: (event) => {
         const state = startMultiAgentStream(
@@ -30305,10 +31421,10 @@ var StrandsAgentSDKPlugin = class extends BasePlugin {
         states.delete(event);
       }
     };
-    tracingChannel2.subscribe(handlers);
+    tracingChannel.subscribe(handlers);
     this.unsubscribers.push(() => {
       unbindAutoInstrumentationSuppression?.();
-      tracingChannel2.unsubscribe(handlers);
+      tracingChannel.unsubscribe(handlers);
     });
   }
 };
@@ -30330,22 +31446,32 @@ function startAgentStream(event, activeChildParents) {
   );
   const span = parentSpan ? withCurrent(
     parentSpan,
-    () => startSpan({
-      event: {
-        input,
-        metadata
+    () => startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            input,
+            metadata
+          },
+          name: formatAgentSpanName(agent),
+          spanAttributes: { type: "task" /* TASK */ }
+        },
+        INSTRUMENTATION_NAMES.STRANDS_AGENT_SDK
+      )
+    )
+  ) : startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          input,
+          metadata
+        },
+        name: formatAgentSpanName(agent),
+        spanAttributes: { type: "task" /* TASK */ }
       },
-      name: formatAgentSpanName(agent),
-      spanAttributes: { type: "task" /* TASK */ }
-    })
-  ) : startSpan({
-    event: {
-      input,
-      metadata
-    },
-    name: formatAgentSpanName(agent),
-    spanAttributes: { type: "task" /* TASK */ }
-  });
+      INSTRUMENTATION_NAMES.STRANDS_AGENT_SDK
+    )
+  );
   return {
     activeTools: /* @__PURE__ */ new Map(),
     attachmentCache,
@@ -30367,22 +31493,32 @@ function startMultiAgentStream(event, operation, activeChildParents) {
   const input = processStrandsInputAttachments(event.arguments[0]);
   const span = parentSpan ? withCurrent(
     parentSpan,
-    () => startSpan({
-      event: {
-        input,
-        metadata
+    () => startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            input,
+            metadata
+          },
+          name: operation === "Graph.stream" ? "Strands Graph" : "Strands Swarm",
+          spanAttributes: { type: "task" /* TASK */ }
+        },
+        INSTRUMENTATION_NAMES.STRANDS_AGENT_SDK
+      )
+    )
+  ) : startSpan(
+    withSpanInstrumentationName(
+      {
+        event: {
+          input,
+          metadata
+        },
+        name: operation === "Graph.stream" ? "Strands Graph" : "Strands Swarm",
+        spanAttributes: { type: "task" /* TASK */ }
       },
-      name: operation === "Graph.stream" ? "Strands Graph" : "Strands Swarm",
-      spanAttributes: { type: "task" /* TASK */ }
-    })
-  ) : startSpan({
-    event: {
-      input,
-      metadata
-    },
-    name: operation === "Graph.stream" ? "Strands Graph" : "Strands Swarm",
-    spanAttributes: { type: "task" /* TASK */ }
-  });
+      INSTRUMENTATION_NAMES.STRANDS_AGENT_SDK
+    )
+  );
   return {
     activeNodes: /* @__PURE__ */ new Map(),
     finalized: false,
@@ -30471,6 +31607,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);
@@ -30484,17 +31629,19 @@ function startModelSpan(state, event) {
   };
   const span = withCurrent(
     state.span,
-    () => startSpan({
-      event: {
-        input: Array.isArray(event.agent?.messages) ? processStrandsInputAttachments(
-          event.agent.messages,
-          state.attachmentCache
-        ) : void 0,
-        metadata
-      },
-      name: formatModelSpanName(model),
-      spanAttributes: { type: "llm" /* LLM */ }
-    })
+    () => startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            input: buildModelSpanInput(event, state.attachmentCache),
+            metadata
+          },
+          name: formatModelSpanName(model),
+          spanAttributes: { type: "llm" /* LLM */ }
+        },
+        INSTRUMENTATION_NAMES.STRANDS_AGENT_SDK
+      )
+    )
   );
   state.activeModel = {
     metadata,
@@ -30546,20 +31693,25 @@ function startToolSpan2(state, event) {
   const name = extractToolName3(toolUse, event.tool);
   const span = withCurrent(
     state.span,
-    () => startSpan({
-      event: {
-        input: toolUse?.input,
-        metadata: {
-          "gen_ai.tool.call.id": toolUse?.toolUseId,
-          "gen_ai.tool.name": name,
-          "strands.operation": "tool.call",
-          "strands.tool.name": name,
-          provider: "strands"
-        }
-      },
-      name: `tool: ${name}`,
-      spanAttributes: { type: "tool" /* TOOL */ }
-    })
+    () => startSpan(
+      withSpanInstrumentationName(
+        {
+          event: {
+            input: toolUse?.input,
+            metadata: {
+              "gen_ai.tool.call.id": toolUse?.toolUseId,
+              "gen_ai.tool.name": name,
+              "strands.operation": "tool.call",
+              "strands.tool.name": name,
+              provider: "strands"
+            }
+          },
+          name: `tool: ${name}`,
+          spanAttributes: { type: "tool" /* TOOL */ }
+        },
+        INSTRUMENTATION_NAMES.STRANDS_AGENT_SDK
+      )
+    )
   );
   state.activeTools.set(key, {
     span,
@@ -30630,11 +31782,16 @@ function startNodeSpan(state, event, activeChildParents) {
   };
   const span = withCurrent(
     state.span,
-    () => startSpan({
-      event: { metadata },
-      name: `node: ${nodeId}`,
-      spanAttributes: { type: "task" /* TASK */ }
-    })
+    () => startSpan(
+      withSpanInstrumentationName(
+        {
+          event: { metadata },
+          name: `node: ${nodeId}`,
+          spanAttributes: { type: "task" /* TASK */ }
+        },
+        INSTRUMENTATION_NAMES.STRANDS_AGENT_SDK
+      )
+    )
   );
   const nodeState = {
     ...child ? { child } : {},
@@ -31116,6 +32273,527 @@ function logInstrumentationError5(context, error) {
   debugLogger.debug(`${context}:`, error);
 }
 
+// src/instrumentation/plugins/cloudflare-ai-chat-instrumentation.ts
+var wrappedTurnRunners = /* @__PURE__ */ new WeakSet();
+var wrappedResponseHooks = /* @__PURE__ */ new WeakSet();
+function instrumentCloudflareAIChatAgent(agent) {
+  try {
+    const original = Reflect.get(agent, "_runExclusiveChatTurn");
+    if (typeof original !== "function" || wrappedTurnRunners.has(original)) {
+      return agent;
+    }
+    const wrapped = async function(...args) {
+      return cloudflareAIChatChannels.runExclusiveChatTurn.tracePromise(
+        () => Reflect.apply(original, this, args),
+        {
+          arguments: args,
+          self: this
+        }
+      );
+    };
+    wrappedTurnRunners.add(wrapped);
+    defineWrappedMethod(agent, "_runExclusiveChatTurn", original, wrapped);
+  } catch (error) {
+    debugLogger.debug("Failed to wrap @cloudflare/ai-chat turn runner:", error);
+  }
+  return agent;
+}
+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-plugin.ts
+var CLOUDFLARE_WORKERS_CONTEXT = {
+  span_origin: {
+    environment: { type: "server", name: "cloudflare_workers" }
+  }
+};
+var CloudflareAgentsPlugin = class extends BasePlugin {
+  onEnable() {
+    const channel = 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);
+        }
+      }
+    };
+    channel.subscribe(handlers);
+    this.unsubscribers.push(() => channel.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;
@@ -31128,6 +32806,7 @@ var BraintrustPlugin = class extends BasePlugin {
   openAIAgentsPlugin = null;
   googleGenAIPlugin = null;
   huggingFacePlugin = null;
+  huggingFaceTransformersPlugin = null;
   openRouterPlugin = null;
   openRouterAgentPlugin = null;
   mistralPlugin = null;
@@ -31142,6 +32821,8 @@ var BraintrustPlugin = class extends BasePlugin {
   langSmithPlugin = null;
   piCodingAgentPlugin = null;
   strandsAgentSDKPlugin = null;
+  cloudflareAIChatPlugin = null;
+  cloudflareAgentsPlugin = null;
   constructor(config = {}) {
     super();
     this.config = config;
@@ -31183,6 +32864,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();
@@ -31228,6 +32911,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();
@@ -31280,6 +32971,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;
@@ -31324,6 +33019,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;
@@ -31340,7 +33043,9 @@ var BraintrustPlugin = class extends BasePlugin {
 };
 
 // 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;
@@ -31571,17 +33276,20 @@ var BraintrustObservabilityExporter = class {
   }
   onStart(exported) {
     if (this.spans.has(exported.id)) return;
-    const args = {
-      name: exported.name,
-      spanAttributes: { type: spanTypeFor(exported.type) },
-      startTime: epochSeconds(exported.startTime),
-      // Use the Mastra span id as the Braintrust row id so that
-      // `logFeedback({ id: <mastra span id> })` (and Mastra's score events)
-      // attach to the right row. Without this, `SpanImpl` auto-generates a
-      // row id (`this._id = eventId ?? idGenerator.getSpanId()`) that no
-      // external caller could know.
-      event: { id: exported.id }
-    };
+    const args = withSpanInstrumentationName(
+      {
+        name: exported.name,
+        spanAttributes: { type: spanTypeFor(exported.type) },
+        startTime: epochSeconds(exported.startTime),
+        // Use the Mastra span id as the Braintrust row id so that
+        // `logFeedback({ id: <mastra span id> })` (and Mastra's score events)
+        // attach to the right row. Without this, `SpanImpl` auto-generates a
+        // row id (`this._id = eventId ?? idGenerator.getSpanId()`) that no
+        // external caller could know.
+        event: { id: exported.id }
+      },
+      INSTRUMENTATION_NAMES.MASTRA
+    );
     const parentRecord = exported.parentSpanId ? this.spans.get(exported.parentSpanId) : void 0;
     if (!this.capturedParent) {
       const probe = currentSpan();
@@ -31653,7 +33361,6 @@ function wrapMastraAgent(agent, _options) {
 
 // src/node/config.ts
 import { AsyncLocalStorage } from "node:async_hooks";
-import * as diagnostics_channel from "node:diagnostics_channel";
 import * as path from "node:path";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
@@ -31940,8 +33647,6 @@ function configureNode() {
   };
   isomorph_default.getCallerLocation = getCallerLocation;
   isomorph_default.newAsyncLocalStorage = () => new AsyncLocalStorage();
-  isomorph_default.newTracingChannel = (nameOrChannels) => diagnostics_channel.tracingChannel(nameOrChannels);
-  patchTracingChannel(diagnostics_channel.tracingChannel);
   isomorph_default.processOn = (event, handler) => {
     process.on(event, handler);
   };
@@ -31967,6 +33672,12 @@ function configureNode() {
   isomorph_default.gzip = promisify(zlib.gzip);
   isomorph_default.gunzip = promisify(zlib.gunzip);
   isomorph_default.hash = (data) => crypto.createHash("sha256").update(data).digest("hex");
+  isomorph_default.hmacSha256 = (key, data) => crypto.createHmac("sha256", key).update(data).digest("hex");
+  isomorph_default.timingSafeEqual = (left, right) => {
+    const leftBuffer = Buffer.from(left);
+    const rightBuffer = Buffer.from(right);
+    return leftBuffer.length === rightBuffer.length && crypto.timingSafeEqual(leftBuffer, rightBuffer);
+  };
   _internalSetInitialState();
   const disabled = readDisabledInstrumentationEnvConfig(
     isomorph_default.getEnv("BRAINTRUST_DISABLE_INSTRUMENTATION")
@@ -32172,6 +33883,7 @@ export {
   braintrustFlueObserver,
   BRAINTRUST_LANGCHAIN_CALLBACK_HANDLER_NAME,
   BraintrustLangChainCallbackHandler,
+  instrumentCloudflareAIChatAgent,
   configureInstrumentation,
   BraintrustObservabilityExporter,
   wrapMastraAgent,