braintrust 3.28.0 → 3.30.0

package/dev/dist/index.mjs

@@ -664,8 +664,6 @@ function newGlobalTracingChannel(nameOrChannels) {
 var DefaultAsyncLocalStorage = class {
   constructor() {
   }
-  enterWith(_) {
-  }
   run(_, callback) {
     return callback();
   }
@@ -2777,7 +2775,9 @@ var AclObjectType = z6.union([
     "project_log",
     "org_project",
     "org_audit_logs",
-    "project_group"
+    "project_group",
+    "ai_secret",
+    "org_ai_secret"
   ]),
   z6.null()
 ]);
@@ -3610,7 +3610,7 @@ var PromptParserNullish = z6.union([
   }),
   z6.null()
 ]);
-var PreprocessorSavedFunctionId = z6.union([
+var PreprocessorId = z6.union([
   z6.object({
     type: z6.literal("function"),
     id: z6.string(),
@@ -3621,6 +3621,7 @@ var PreprocessorSavedFunctionId = z6.union([
     name: z6.string(),
     function_type: z6.literal("preprocessor").optional().default("preprocessor")
   }),
+  z6.object({ type: z6.literal("inline"), code: z6.string().min(1) }),
   z6.null()
 ]);
 var PromptDataNullish = z6.union([
@@ -3628,7 +3629,7 @@ var PromptDataNullish = z6.union([
     prompt: PromptBlockDataNullish,
     options: PromptOptionsNullish,
     parser: PromptParserNullish,
-    preprocessor: PreprocessorSavedFunctionId,
+    preprocessor: PreprocessorId,
     tool_functions: z6.union([z6.array(SavedFunctionId), z6.null()]),
     template_format: z6.union([
       z6.enum(["mustache", "nunjucks", "none"]),
@@ -3830,7 +3831,7 @@ var PromptData = z6.object({
   prompt: PromptBlockDataNullish,
   options: PromptOptionsNullish,
   parser: PromptParserNullish,
-  preprocessor: PreprocessorSavedFunctionId,
+  preprocessor: PreprocessorId,
   tool_functions: z6.union([z6.array(SavedFunctionId), z6.null()]),
   template_format: z6.union([
     z6.enum(["mustache", "nunjucks", "none"]),
@@ -4774,6 +4775,7 @@ var View = z6.object({
   ]),
   name: z6.string(),
   description: z6.union([z6.string(), z6.null()]).optional(),
+  starred: z6.boolean().optional(),
   created: z6.union([z6.string(), z6.null()]).optional(),
   updated_at: z6.union([z6.string(), z6.null()]).optional(),
   view_data: ViewData.optional(),
@@ -5477,44 +5479,72 @@ function createCacheLayers({
 }
 
 // src/prompt-cache/prompt-cache.ts
-function createCacheKey(key) {
+function createCacheKey(key, namespace) {
+  let cacheKey;
   if (key.id) {
-    return `id:${key.id}`;
-  }
-  const prefix = key.projectId ?? key.projectName;
-  if (!prefix) {
-    throw new Error("Either projectId or projectName must be provided");
-  }
-  if (!key.slug) {
-    throw new Error("Slug must be provided when not using ID");
+    cacheKey = `id:${key.id}`;
+  } else {
+    const prefix = key.projectId ?? key.projectName;
+    if (!prefix) {
+      throw new Error("Either projectId or projectName must be provided");
+    }
+    if (!key.slug) {
+      throw new Error("Slug must be provided when not using ID");
+    }
+    cacheKey = `${prefix}:${key.slug}:${key.version ?? "latest"}`;
   }
-  return `${prefix}:${key.slug}:${key.version ?? "latest"}`;
+  return namespace === void 0 ? cacheKey : `${namespace.length}:${namespace}:${cacheKey}`;
 }
-var PromptCache = class {
+var PromptCache = class _PromptCache {
   memoryCache;
   diskCache;
+  namespace;
+  expectedResolvedOrgIdentity;
   constructor(options) {
     this.memoryCache = options.memoryCache;
     this.diskCache = options.diskCache;
+    this.namespace = options.namespace;
+    this.expectedResolvedOrgIdentity = options.expectedResolvedOrgIdentity;
+  }
+  /**
+   * Returns a cache view that shares the same storage layers but isolates all
+   * entries under the provided namespace.
+   */
+  withNamespace(namespace, expectedResolvedOrgIdentity) {
+    return new _PromptCache({
+      memoryCache: this.memoryCache,
+      diskCache: this.diskCache,
+      namespace,
+      expectedResolvedOrgIdentity
+    });
   }
   /**
    * Retrieves a prompt from the cache.
    * First checks the in-memory LRU cache, then falls back to checking the disk cache if available.
    */
   async get(key) {
-    const cacheKey = createCacheKey(key);
+    const cacheKey = createCacheKey(key, this.namespace);
     if (this.memoryCache) {
-      const memoryPrompt = this.memoryCache.get(cacheKey);
-      if (memoryPrompt !== void 0) {
-        return memoryPrompt;
+      const memoryEntry = this.memoryCache.get(cacheKey);
+      if (memoryEntry !== void 0 && (this.expectedResolvedOrgIdentity === void 0 || memoryEntry.resolvedOrgIdentity === this.expectedResolvedOrgIdentity)) {
+        return memoryEntry.value;
       }
     }
     if (this.diskCache) {
-      const diskPrompt = await this.diskCache.get(cacheKey);
-      if (!diskPrompt) {
+      const diskEntry = await this.diskCache.get(cacheKey);
+      if (!diskEntry || this.expectedResolvedOrgIdentity !== void 0 && diskEntry.resolvedOrgIdentity !== this.expectedResolvedOrgIdentity) {
         return void 0;
       }
-      this.memoryCache?.set(cacheKey, diskPrompt);
+      const serializedPrompt = diskEntry.value;
+      const diskPrompt = new Prompt2(
+        serializedPrompt.metadata,
+        serializedPrompt.defaults,
+        serializedPrompt.noTrace
+      );
+      this.memoryCache?.set(cacheKey, {
+        value: diskPrompt,
+        resolvedOrgIdentity: diskEntry.resolvedOrgIdentity
+      });
       return diskPrompt;
     }
     return void 0;
@@ -5528,58 +5558,91 @@ var PromptCache = class {
    * @throws If there is an error writing to the disk cache.
    */
   async set(key, value) {
-    const cacheKey = createCacheKey(key);
-    this.memoryCache?.set(cacheKey, value);
+    const cacheKey = createCacheKey(key, this.namespace);
+    const memoryEntry = {
+      value,
+      resolvedOrgIdentity: this.expectedResolvedOrgIdentity
+    };
+    this.memoryCache?.set(cacheKey, memoryEntry);
     if (this.diskCache) {
-      await this.diskCache.set(cacheKey, value);
+      await this.diskCache.set(cacheKey, {
+        value: value._internalSerializeForCache(),
+        resolvedOrgIdentity: this.expectedResolvedOrgIdentity
+      });
     }
   }
 };
 
 // src/prompt-cache/parameters-cache.ts
-function createCacheKey2(key) {
+function createCacheKey2(key, namespace) {
+  let cacheKey;
   if (key.id) {
-    return `parameters:id:${key.id}`;
-  }
-  const prefix = key.projectId ?? key.projectName;
-  if (!prefix) {
-    throw new Error("Either projectId or projectName must be provided");
-  }
-  if (!key.slug) {
-    throw new Error("Slug must be provided when not using ID");
+    cacheKey = `parameters:id:${key.id}`;
+  } else {
+    const prefix = key.projectId ?? key.projectName;
+    if (!prefix) {
+      throw new Error("Either projectId or projectName must be provided");
+    }
+    if (!key.slug) {
+      throw new Error("Slug must be provided when not using ID");
+    }
+    cacheKey = `parameters:${prefix}:${key.slug}:${key.version ?? "latest"}`;
   }
-  return `parameters:${prefix}:${key.slug}:${key.version ?? "latest"}`;
+  return namespace === void 0 ? cacheKey : `${namespace.length}:${namespace}:${cacheKey}`;
 }
-var ParametersCache = class {
+var ParametersCache = class _ParametersCache {
   memoryCache;
   diskCache;
+  namespace;
+  expectedResolvedOrgIdentity;
   constructor(options) {
     this.memoryCache = options.memoryCache;
     this.diskCache = options.diskCache;
+    this.namespace = options.namespace;
+    this.expectedResolvedOrgIdentity = options.expectedResolvedOrgIdentity;
+  }
+  withNamespace(namespace, expectedResolvedOrgIdentity) {
+    return new _ParametersCache({
+      memoryCache: this.memoryCache,
+      diskCache: this.diskCache,
+      namespace,
+      expectedResolvedOrgIdentity
+    });
   }
   async get(key) {
-    const cacheKey = createCacheKey2(key);
+    const cacheKey = createCacheKey2(key, this.namespace);
     if (this.memoryCache) {
-      const memoryParams = this.memoryCache.get(cacheKey);
-      if (memoryParams !== void 0) {
-        return memoryParams;
+      const memoryEntry = this.memoryCache.get(cacheKey);
+      if (memoryEntry !== void 0 && (this.expectedResolvedOrgIdentity === void 0 || memoryEntry.resolvedOrgIdentity === this.expectedResolvedOrgIdentity)) {
+        return memoryEntry.value;
       }
     }
     if (this.diskCache) {
-      const diskParams = await this.diskCache.get(cacheKey);
-      if (!diskParams) {
+      const diskEntry = await this.diskCache.get(cacheKey);
+      if (!diskEntry || this.expectedResolvedOrgIdentity !== void 0 && diskEntry.resolvedOrgIdentity !== this.expectedResolvedOrgIdentity) {
         return void 0;
       }
-      this.memoryCache?.set(cacheKey, diskParams);
-      return diskParams;
+      const diskParameters = new RemoteEvalParameters(diskEntry.value.metadata);
+      this.memoryCache?.set(cacheKey, {
+        value: diskParameters,
+        resolvedOrgIdentity: diskEntry.resolvedOrgIdentity
+      });
+      return diskParameters;
     }
     return void 0;
   }
   async set(key, value) {
-    const cacheKey = createCacheKey2(key);
-    this.memoryCache?.set(cacheKey, value);
+    const cacheKey = createCacheKey2(key, this.namespace);
+    const memoryEntry = {
+      value,
+      resolvedOrgIdentity: this.expectedResolvedOrgIdentity
+    };
+    this.memoryCache?.set(cacheKey, memoryEntry);
     if (this.diskCache) {
-      await this.diskCache.set(cacheKey, value);
+      await this.diskCache.set(cacheKey, {
+        value: value._internalSerializeForCache(),
+        resolvedOrgIdentity: this.expectedResolvedOrgIdentity
+      });
     }
   }
 };
@@ -5883,6 +5946,7 @@ var INSTRUMENTATION_NAMES = {
   CLOUDFLARE_THINK: "cloudflare-think",
   COHERE: "cohere",
   CURSOR_SDK: "cursor-sdk",
+  DEEPSEEK_HARNESS: "deepseek-harness",
   EVE: "eve",
   FLUE: "flue",
   GENKIT: "genkit",
@@ -5908,7 +5972,7 @@ var INSTRUMENTATION_NAMES = {
 var INTERNAL_SPAN_INSTRUMENTATION_NAME = /* @__PURE__ */ Symbol.for(
   "braintrust.spanInstrumentationName"
 );
-var SDK_VERSION = true ? "3.28.0" : "0.0.0";
+var SDK_VERSION = true ? "3.30.0" : "0.0.0";
 function withSpanInstrumentationName(args, instrumentationName) {
   return {
     ...args,
@@ -6027,6 +6091,16 @@ var datasetSnapshotRegisterResponseSchema = z8.object({
   dataset_snapshot: DatasetSnapshot,
   found_existing: z8.boolean().optional()
 });
+var datasetObjectInfoSchema = z8.object({
+  object_id: z8.string(),
+  object_name: z8.string(),
+  parent_cols: z8.object({
+    project: z8.object({
+      id: z8.string(),
+      name: z8.string()
+    })
+  })
+});
 var datasetRestorePreviewResultSchema = z8.object({
   rows_to_restore: z8.number(),
   rows_to_delete: z8.number()
@@ -6240,12 +6314,53 @@ var loginSchema = z8.strictObject({
 });
 var stateNonce = 0;
 var V1_PROXY_SUFFIX = "/v1/proxy";
+var LOADER_LOGIN_CACHE_MAX = 16;
 function normalizeProxyConnUrl(proxyUrl) {
   return proxyUrl.endsWith(V1_PROXY_SUFFIX) ? proxyUrl.slice(0, proxyUrl.length - V1_PROXY_SUFFIX.length) : proxyUrl;
 }
 var BraintrustState = class _BraintrustState {
+  id;
+  currentExperiment;
+  // Note: the value of IsAsyncFlush doesn't really matter here, since we
+  // (safely) dynamically cast it whenever retrieving the logger.
+  currentLogger;
+  currentParent;
+  currentSpan;
+  // Any time we re-log in, we directly update the apiConn inside the logger.
+  // This is preferable to replacing the whole logger, which would create the
+  // possibility of multiple loggers floating around, which may not log in a
+  // deterministic order.
+  _bgLogger;
+  _overrideBgLogger = null;
+  appUrl = null;
+  appPublicUrl = null;
+  loginToken = null;
+  orgId = null;
+  orgName = null;
+  apiUrl = null;
+  proxyUrl = null;
+  loggedIn = false;
+  gitMetadataSettings;
+  debugLogLevel;
+  debugLogLevelConfigured = false;
+  fetch = globalThis.fetch;
+  _appConn = null;
+  _apiConn = null;
+  _proxyConn = null;
+  promptCache;
+  parametersCache;
+  spanCache;
+  _idGenerator = null;
+  _contextManager = null;
+  _otelFlushCallback = null;
+  spanOriginEnvironment;
+  traceContextSigningSecret;
+  loaderLoginCache = /* @__PURE__ */ new WeakMap();
+  loginParams;
+  activeLoginOrgNameSelector;
   constructor(loginParams) {
-    this.loginParams = loginParams;
+    this.loginParams = { ...loginParams };
+    this.activeLoginOrgNameSelector = loginParams.orgName ?? isomorph_default.getEnv("BRAINTRUST_ORG_NAME");
     this.id = `${(/* @__PURE__ */ new Date()).toLocaleString()}-${stateNonce++}`;
     this.currentExperiment = void 0;
     this.currentLogger = void 0;
@@ -6282,12 +6397,14 @@ var BraintrustState = class _BraintrustState {
     const {
       memoryCache: parametersMemoryCache,
       diskCache: parametersDiskCache
-    } = createCacheLayers({
-      memoryMaxEnvVar: "BRAINTRUST_PARAMETERS_CACHE_MEMORY_MAX",
-      diskCacheDirEnvVar: "BRAINTRUST_PARAMETERS_CACHE_DIR",
-      diskMaxEnvVar: "BRAINTRUST_PARAMETERS_CACHE_DISK_MAX",
-      getDefaultDiskCacheDir: () => `${isomorph_default.getEnv("HOME") ?? isomorph_default.homedir()}/.braintrust/parameters_cache`
-    });
+    } = createCacheLayers(
+      {
+        memoryMaxEnvVar: "BRAINTRUST_PARAMETERS_CACHE_MEMORY_MAX",
+        diskCacheDirEnvVar: "BRAINTRUST_PARAMETERS_CACHE_DIR",
+        diskMaxEnvVar: "BRAINTRUST_PARAMETERS_CACHE_DISK_MAX",
+        getDefaultDiskCacheDir: () => `${isomorph_default.getEnv("HOME") ?? isomorph_default.homedir()}/.braintrust/parameters_cache`
+      }
+    );
     this.parametersCache = new ParametersCache({
       memoryCache: parametersMemoryCache,
       diskCache: parametersDiskCache
@@ -6296,43 +6413,6 @@ var BraintrustState = class _BraintrustState {
     this.spanOriginEnvironment = detectSpanOriginEnvironment();
     this._internalSetTraceContextSigningSecret(loginParams.apiKey);
   }
-  loginParams;
-  id;
-  currentExperiment;
-  // Note: the value of IsAsyncFlush doesn't really matter here, since we
-  // (safely) dynamically cast it whenever retrieving the logger.
-  currentLogger;
-  currentParent;
-  currentSpan;
-  // Any time we re-log in, we directly update the apiConn inside the logger.
-  // This is preferable to replacing the whole logger, which would create the
-  // possibility of multiple loggers floating around, which may not log in a
-  // deterministic order.
-  _bgLogger;
-  _overrideBgLogger = null;
-  appUrl = null;
-  appPublicUrl = null;
-  loginToken = null;
-  orgId = null;
-  orgName = null;
-  apiUrl = null;
-  proxyUrl = null;
-  loggedIn = false;
-  gitMetadataSettings;
-  debugLogLevel;
-  debugLogLevelConfigured = false;
-  fetch = globalThis.fetch;
-  _appConn = null;
-  _apiConn = null;
-  _proxyConn = null;
-  promptCache;
-  parametersCache;
-  spanCache;
-  _idGenerator = null;
-  _contextManager = null;
-  _otelFlushCallback = null;
-  spanOriginEnvironment;
-  traceContextSigningSecret;
   /** @internal */
   _internalSetTraceContextSigningSecret(secret) {
     const normalizedSecret = secret?.trim();
@@ -6357,6 +6437,101 @@ var BraintrustState = class _BraintrustState {
     this._appConn = null;
     this._apiConn = null;
     this._proxyConn = null;
+    this.loaderLoginCache = /* @__PURE__ */ new WeakMap();
+  }
+  /** @internal */
+  async _internalResolveLoaderLoginOptions({
+    apiKey,
+    appUrl,
+    orgName,
+    fetch: fetch2,
+    forceLogin
+  }) {
+    const resolvedAppUrl = appUrl ?? (this.loggedIn ? this.appUrl ?? void 0 : void 0) ?? this.loginParams.appUrl ?? isomorph_default.getEnv("BRAINTRUST_APP_URL") ?? "https://www.braintrust.dev";
+    const resolvedApiKey = apiKey ?? (this.loggedIn ? this.loginToken ?? void 0 : void 0) ?? this.loginParams.apiKey ?? await isomorph_default.getBraintrustApiKey();
+    if (!resolvedApiKey) {
+      throw new Error(
+        "Please specify an api key (e.g. by setting BRAINTRUST_API_KEY)."
+      );
+    }
+    const normalizedApiKey = HTTPConnection.sanitize_token(resolvedApiKey);
+    const usesActiveCredential = this.loggedIn && normalizedApiKey === this.loginToken;
+    const requestedOrgName = orgName ?? (usesActiveCredential ? this.activeLoginOrgNameSelector : void 0) ?? this.loginParams.orgName ?? isomorph_default.getEnv("BRAINTRUST_ORG_NAME");
+    const resolvedOrgName = orgName ?? (usesActiveCredential ? this.orgName ?? void 0 : void 0) ?? requestedOrgName;
+    const resolvedFetch = fetch2 ?? (this.loggedIn ? this.fetch : void 0) ?? this.loginParams.fetch ?? globalThis.fetch;
+    const credentialCacheNamespace = JSON.stringify([
+      "loader-credential",
+      resolvedAppUrl,
+      requestedOrgName,
+      normalizedApiKey
+    ]);
+    return {
+      apiKey: normalizedApiKey,
+      appUrl: resolvedAppUrl,
+      orgName: resolvedOrgName,
+      fetch: resolvedFetch,
+      forceLogin,
+      credentialCacheNamespace,
+      existingState: !forceLogin && usesActiveCredential && resolvedAppUrl === this.appUrl && resolvedOrgName === this.orgName && resolvedFetch === this.fetch ? this : void 0
+    };
+  }
+  /** @internal */
+  _internalGetLoaderCacheViews(loginOptions, requestState) {
+    const expectedResolvedOrgIdentity = requestState?.orgId && requestState.appUrl ? JSON.stringify([
+      "loader-org",
+      requestState.appUrl,
+      requestState.orgId
+    ]) : void 0;
+    return {
+      promptCache: this.promptCache.withNamespace(
+        loginOptions.credentialCacheNamespace,
+        expectedResolvedOrgIdentity
+      ),
+      parametersCache: this.parametersCache.withNamespace(
+        loginOptions.credentialCacheNamespace,
+        expectedResolvedOrgIdentity
+      )
+    };
+  }
+  /** @internal */
+  async _internalGetLoaderState({
+    apiKey,
+    appUrl,
+    orgName,
+    fetch: fetch2,
+    forceLogin,
+    existingState
+  }) {
+    if (existingState) {
+      return existingState;
+    }
+    let cache = this.loaderLoginCache.get(fetch2);
+    if (!cache) {
+      cache = new LRUCache({ max: LOADER_LOGIN_CACHE_MAX });
+      this.loaderLoginCache.set(fetch2, cache);
+    }
+    const cacheKey = JSON.stringify([appUrl, orgName, apiKey]);
+    if (!forceLogin) {
+      const cachedState = cache.get(cacheKey);
+      if (cachedState) {
+        return cachedState;
+      }
+    }
+    const statePromise = loginToLoaderRequestState({
+      orgName,
+      apiKey,
+      appUrl,
+      fetch: fetch2
+    });
+    cache.set(cacheKey, statePromise);
+    try {
+      return await statePromise;
+    } catch (error) {
+      if (cache.get(cacheKey) === statePromise) {
+        cache.delete(cacheKey);
+      }
+      throw error;
+    }
   }
   resetIdGenState() {
     this._idGenerator = null;
@@ -6405,6 +6580,8 @@ var BraintrustState = class _BraintrustState {
     this.debugLogLevel = other.debugLogLevel;
     this.debugLogLevelConfigured = other.debugLogLevelConfigured;
     this.traceContextSigningSecret = other.traceContextSigningSecret;
+    this.fetch = other.fetch;
+    this.activeLoginOrgNameSelector = other.activeLoginOrgNameSelector;
     setGlobalDebugLogLevel(
       this.debugLogLevelConfigured ? this.debugLogLevel ?? false : void 0
     );
@@ -6612,36 +6789,76 @@ var FailedHTTPResponse = class extends Error {
   status;
   text;
   data;
-  constructor(status, text, data) {
+  cause;
+  constructor(status, text, data, cause) {
     super(`${status}: ${text} (${data})`);
     this.status = status;
     this.text = text;
     this.data = data;
+    this.cause = cause;
+  }
+};
+var HTTPTransportError = class extends Error {
+  cause;
+  constructor(cause) {
+    super(cause instanceof Error ? cause.message : String(cause));
+    this.name = "HTTPTransportError";
+    this.cause = cause;
   }
 };
+var httpTransportErrorCauses = /* @__PURE__ */ new WeakSet();
+function recordHTTPTransportError(error) {
+  if (typeof error === "object" && error !== null || typeof error === "function") {
+    httpTransportErrorCauses.add(error);
+  }
+}
+function rethrowHTTPTransportError(error, classifyTransportErrors) {
+  if (classifyTransportErrors) {
+    throw new HTTPTransportError(error);
+  }
+  recordHTTPTransportError(error);
+  throw error;
+}
+async function readJSONResponse(response, classifyTransportErrors = false) {
+  let data;
+  try {
+    data = await response.text();
+  } catch (error) {
+    rethrowHTTPTransportError(error, classifyTransportErrors);
+  }
+  return JSON.parse(data);
+}
 async function checkResponse(resp) {
   if (resp.ok) {
     return resp;
-  } else {
+  }
+  let data;
+  try {
+    data = await resp.text();
+  } catch (error) {
     throw new FailedHTTPResponse(
       resp.status,
       resp.statusText,
-      await resp.text()
+      "Unable to read response body",
+      error
     );
   }
+  throw new FailedHTTPResponse(resp.status, resp.statusText, data);
 }
 var HTTPConnection = class _HTTPConnection {
-  base_url;
-  token;
-  headers;
-  fetch;
-  constructor(base_url, fetch2) {
+  constructor(base_url, fetch2, classifyTransportErrors = false) {
+    this.classifyTransportErrors = classifyTransportErrors;
     this.base_url = base_url;
     this.token = null;
     this.headers = {};
     this._reset();
     this.fetch = fetch2;
   }
+  classifyTransportErrors;
+  base_url;
+  token;
+  headers;
+  fetch;
   setFetch(fetch2) {
     this.fetch = fetch2;
   }
@@ -6681,9 +6898,9 @@ var HTTPConnection = class _HTTPConnection {
     ).toString();
     const this_fetch = this.fetch;
     const this_headers = this.headers;
-    return await checkResponse(
-      // Using toString() here makes it work with isomorphic fetch
-      await this_fetch(url.toString(), {
+    let response;
+    try {
+      response = await this_fetch(url.toString(), {
         headers: {
           Accept: "application/json",
           ...this_headers,
@@ -6691,8 +6908,14 @@ var HTTPConnection = class _HTTPConnection {
         },
         keepalive: true,
         ...rest
-      })
-    );
+      });
+    } catch (error) {
+      if (config?.signal?.aborted) {
+        throw getAbortReason(config.signal);
+      }
+      rethrowHTTPTransportError(error, this.classifyTransportErrors);
+    }
+    return await checkResponse(response);
   }
   async post(path3, params, config, retries = 0) {
     const { headers, ...rest } = config || {};
@@ -6702,8 +6925,9 @@ var HTTPConnection = class _HTTPConnection {
     const tries = retries + 1;
     for (let i = 0; i < tries; i++) {
       try {
-        return await checkResponse(
-          await this_fetch(_urljoin(this_base_url, path3), {
+        let response;
+        try {
+          response = await this_fetch(_urljoin(this_base_url, path3), {
             method: "POST",
             headers: {
               Accept: "application/json",
@@ -6714,8 +6938,14 @@ var HTTPConnection = class _HTTPConnection {
             body: typeof params === "string" ? params : params ? JSON.stringify(params) : void 0,
             keepalive: true,
             ...rest
-          })
-        );
+          });
+        } catch (error) {
+          if (config?.signal?.aborted) {
+            throw getAbortReason(config.signal);
+          }
+          rethrowHTTPTransportError(error, this.classifyTransportErrors);
+        }
+        return await checkResponse(response);
       } catch (error) {
         if (config?.signal?.aborted) {
           throw getAbortReason(config.signal);
@@ -6740,7 +6970,7 @@ var HTTPConnection = class _HTTPConnection {
     for (let i = 0; i < tries; i++) {
       try {
         const resp = await this.get(`${object_type}`, args);
-        return await resp.json();
+        return await readJSONResponse(resp, this.classifyTransportErrors);
       } catch (e) {
         if (i < tries - 1) {
           debugLogger.debug(
@@ -6763,7 +6993,7 @@ var HTTPConnection = class _HTTPConnection {
     const resp = await this.post(`${object_type}`, args, {
       headers: { "Content-Type": "application/json" }
     });
-    return await resp.json();
+    return await readJSONResponse(resp, this.classifyTransportErrors);
   }
   // Custom inspect for Node.js console.log
   [/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")]() {
@@ -8583,6 +8813,7 @@ function initDataset(projectOrOptions, optionalOptions) {
   const {
     project,
     dataset,
+    datasetId,
     description,
     version,
     snapshotName,
@@ -8598,6 +8829,11 @@ function initDataset(projectOrOptions, optionalOptions) {
     state: stateArg,
     _internal_btql
   } = options;
+  if (datasetId !== void 0 && (description !== void 0 || metadata !== void 0)) {
+    throw new Error(
+      "Cannot specify description or metadata when datasetId is provided"
+    );
+  }
   const selection = normalizeDatasetSelection({
     version,
     environment,
@@ -8618,6 +8854,35 @@ function initDataset(projectOrOptions, optionalOptions) {
         fetch: fetch2,
         forceLogin
       });
+      if (datasetId !== void 0) {
+        const objectInfo = datasetObjectInfoSchema.array().parse(
+          await state.appConn().post_json("api/self/get_object_info", {
+            object_type: "dataset",
+            object_ids: [datasetId]
+          })
+        );
+        if (objectInfo.length === 0) {
+          throw new Error(`Dataset with ID ${datasetId} not found`);
+        }
+        if (objectInfo.length !== 1) {
+          throw new Error(
+            `Expected exactly one dataset with ID ${datasetId}, but found ${objectInfo.length}`
+          );
+        }
+        const datasetInfo = objectInfo[0];
+        return {
+          project: {
+            id: datasetInfo.parent_cols.project.id,
+            name: datasetInfo.parent_cols.project.name,
+            fullInfo: datasetInfo.parent_cols.project
+          },
+          dataset: {
+            id: datasetInfo.object_id,
+            name: datasetInfo.object_name,
+            fullInfo: datasetInfo
+          }
+        };
+      }
       const args = {
         org_id: state.orgId,
         project_name: project,
@@ -8792,6 +9057,52 @@ async function login(options = {}) {
   await state.login(options);
   return state;
 }
+async function loginToLoaderRequestState({
+  appUrl,
+  apiKey,
+  orgName,
+  fetch: fetch2
+}) {
+  let orgId;
+  let apiUrl;
+  if (apiKey === TEST_API_KEY) {
+    orgId = "test-org-id";
+    apiUrl = "https://braintrust.dev/fake-api-url";
+  } else {
+    let loginResponse;
+    try {
+      loginResponse = await fetch2(_urljoin(appUrl, `/api/apikey/login`), {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${apiKey}`
+        }
+      });
+    } catch (error) {
+      throw new HTTPTransportError(error);
+    }
+    const info = await readJSONResponse(
+      await checkResponse(loginResponse),
+      true
+    );
+    const org = selectLoginOrg(info.org_info, orgName);
+    orgId = org.id;
+    apiUrl = isomorph_default.getEnv("BRAINTRUST_API_URL") ?? org.api_url;
+    if (!apiUrl) {
+      throw new Error(
+        orgName ? `Unable to log into organization '${orgName}'. Are you sure this credential is scoped to the organization?` : "Unable to log into any organization with the provided credential."
+      );
+    }
+  }
+  const apiConnection = new HTTPConnection(apiUrl, fetch2, true);
+  apiConnection.set_token(apiKey);
+  apiConnection.make_long_lived();
+  return {
+    appUrl,
+    orgId,
+    apiConn: () => apiConnection
+  };
+}
 async function loginToState(options = {}) {
   const {
     appUrl = isomorph_default.getEnv("BRAINTRUST_APP_URL") || "https://www.braintrust.dev",
@@ -8823,16 +9134,18 @@ async function loginToState(options = {}) {
     _saveOrgInfo(state, testOrgInfo, testOrgInfo[0].name);
     return state;
   } else {
-    const resp = await checkResponse(
-      await fetch2(_urljoin(state.appUrl, `/api/apikey/login`), {
+    const loginResponse = await fetch2(
+      _urljoin(state.appUrl, `/api/apikey/login`),
+      {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
           Authorization: `Bearer ${apiKey}`
         }
-      })
+      }
     );
-    const info = await resp.json();
+    const resp = await checkResponse(loginResponse);
+    const info = await readJSONResponse(resp);
     _saveOrgInfo(state, info.org_info, orgName);
     if (!state.apiUrl) {
       if (orgName) {
@@ -9174,6 +9487,15 @@ function _internalStartSpanWithInitialMerge(args) {
     [INITIAL_SPAN_WRITE_AS_MERGE]: true
   }).span;
 }
+function _internalStartSpanWithInitialMergeAndParentSpanIds(args) {
+  return startSpanAndIsLogger(
+    {
+      ...args,
+      [INITIAL_SPAN_WRITE_AS_MERGE]: true
+    },
+    { useParentSpanIdsForObjectParent: true }
+  ).span;
+}
 function _internalStartSpanWithContext(args, context) {
   return startSpanAndIsLogger({
     ...args,
@@ -9184,7 +9506,7 @@ async function flush(options) {
   const state = options?.state ?? _globalState;
   return await state.bgLogger().flush();
 }
-function startSpanAndIsLogger(args) {
+function startSpanAndIsLogger(args, internalOptions) {
   const state = args?.state ?? _globalState;
   const { parentObject, propagatedState } = getSpanParentObjectAndPropagatedState({
     asyncFlush: args?.asyncFlush,
@@ -9198,7 +9520,7 @@ function startSpanAndIsLogger(args) {
     ) ? {
       spanId: parentObject.data.span_id,
       rootSpanId: parentObject.data.root_span_id
-    } : void 0;
+    } : internalOptions?.useParentSpanIdsForObjectParent ? args?.parentSpanIds : void 0;
     const { parent: _ignoredParent, ...spanArgs } = args ?? {};
     const span = new SpanImpl({
       state,
@@ -9234,27 +9556,28 @@ function withCurrent(span, callback, state = void 0) {
 function withParent(parent, callback, state = void 0) {
   return (state ?? _globalState).currentParent.run(parent, () => callback());
 }
-function _saveOrgInfo(state, org_info, org_name) {
-  if (org_info.length === 0) {
+function _saveOrgInfo(state, orgInfo, orgName) {
+  const org = selectLoginOrg(orgInfo, orgName);
+  state.orgId = org.id;
+  state.orgName = org.name;
+  state.apiUrl = isomorph_default.getEnv("BRAINTRUST_API_URL") ?? org.api_url;
+  state.proxyUrl = isomorph_default.getEnv("BRAINTRUST_PROXY_URL") ?? org.proxy_url;
+  state.gitMetadataSettings = org.git_metadata || void 0;
+}
+function selectLoginOrg(orgInfo, orgName) {
+  if (orgInfo.length === 0) {
     throw new LoginInvalidOrgError(
       "This user is not part of any organizations."
     );
   }
-  for (const org of org_info) {
-    if (org_name === void 0 || org.name === org_name) {
-      state.orgId = org.id;
-      state.orgName = org.name;
-      state.apiUrl = isomorph_default.getEnv("BRAINTRUST_API_URL") ?? org.api_url;
-      state.proxyUrl = isomorph_default.getEnv("BRAINTRUST_PROXY_URL") ?? org.proxy_url;
-      state.gitMetadataSettings = org.git_metadata || void 0;
-      break;
+  for (const org of orgInfo) {
+    if (orgName === void 0 || org.name === orgName) {
+      return org;
     }
   }
-  if (state.orgId === void 0) {
-    throw new LoginInvalidOrgError(
-      `Organization ${org_name} not found. Must be one of ${org_info.map((x) => x.name).join(", ")}`
-    );
-  }
+  throw new LoginInvalidOrgError(
+    `Organization ${orgName} not found. Must be one of ${orgInfo.map((org) => org.name).join(", ")}`
+  );
 }
 function validateTags(tags) {
   const seen = /* @__PURE__ */ new Set();
@@ -11157,6 +11480,14 @@ var Prompt2 = class _Prompt {
   static isPrompt(data) {
     return typeof data === "object" && data !== null && "__braintrust_prompt_marker" in data;
   }
+  /** @internal */
+  _internalSerializeForCache() {
+    return {
+      metadata: this.metadata,
+      defaults: this.defaults,
+      noTrace: this.noTrace
+    };
+  }
   static fromPromptData(name, promptData) {
     return new _Prompt(
       {
@@ -11197,6 +11528,10 @@ var RemoteEvalParameters = class {
   get data() {
     return this.metadata.function_data.data ?? {};
   }
+  /** @internal */
+  _internalSerializeForCache() {
+    return { metadata: this.metadata };
+  }
   validate(data) {
     if (typeof data !== "object" || data === null) {
       return false;
@@ -11888,56 +12223,14 @@ function suppressionStore() {
   autoInstrumentationSuppressionStore ??= isomorph_default.newAsyncLocalStorage();
   return autoInstrumentationSuppressionStore;
 }
-function currentFrames() {
-  return suppressionStore().getStore()?.frames ?? [];
-}
 function isAutoInstrumentationSuppressed() {
-  const frames = currentFrames();
-  return frames[frames.length - 1]?.mode === "suppress";
+  return suppressionStore().getStore() === true;
 }
 function runWithAutoInstrumentationSuppressed(callback) {
-  const frame = {
-    id: /* @__PURE__ */ Symbol("braintrust.auto-instrumentation-suppress"),
-    mode: "suppress"
-  };
-  return suppressionStore().run(
-    { frames: [...currentFrames(), frame] },
-    callback
-  );
+  return suppressionStore().run(true, callback);
 }
-function bindAutoInstrumentationSuppressionToStart(tracingChannel) {
-  const startChannel = tracingChannel.start;
-  if (!startChannel) {
-    return void 0;
-  }
-  const store = suppressionStore();
-  startChannel.bindStore(store, () => ({
-    frames: [
-      ...currentFrames(),
-      {
-        id: /* @__PURE__ */ Symbol("braintrust.auto-instrumentation-suppress"),
-        mode: "suppress"
-      }
-    ]
-  }));
-  return () => {
-    startChannel.unbindStore(store);
-  };
-}
-function enterAutoInstrumentationAllowed() {
-  const frame = {
-    id: /* @__PURE__ */ Symbol("braintrust.auto-instrumentation-allow"),
-    mode: "allow"
-  };
-  suppressionStore().enterWith({
-    frames: [...currentFrames(), frame]
-  });
-  return () => {
-    const frames = currentFrames().filter(
-      (candidate) => candidate.id !== frame.id
-    );
-    suppressionStore().enterWith(frames.length > 0 ? { frames } : void 0);
-  };
+function runWithAutoInstrumentationAllowed(callback) {
+  return suppressionStore().run(void 0, callback);
 }
 
 // src/instrumentation/core/channel-tracing.ts
@@ -12527,6 +12820,131 @@ function unsubscribeAll(unsubscribers) {
   return [];
 }
 
+// src/instrumentation/core/channel-definitions.ts
+function channel(spec) {
+  return spec;
+}
+function defineChannels(pkg, channels, options) {
+  const { instrumentationName } = options;
+  return Object.fromEntries(
+    Object.entries(channels).map(([key, spec]) => {
+      const fullChannelName = `orchestrion:${pkg}:${spec.channelName}`;
+      if (spec.kind === "async") {
+        const asyncSpec = spec;
+        const tracingChannel2 = () => isomorph_default.newTracingChannel(
+          fullChannelName
+        );
+        const intercept2 = (interceptor) => {
+          const hook = tracingChannel2();
+          return typeof hook.intercept === "function" ? hook.intercept(interceptor) : () => {
+          };
+        };
+        return [
+          key,
+          {
+            ...asyncSpec,
+            instrumentationName,
+            intercept: intercept2,
+            invoke: (target, thisArg, args, additional) => {
+              const hook = tracingChannel2();
+              return typeof hook.invoke === "function" ? hook.invoke(target, thisArg, args, additional) : Reflect.apply(target, thisArg, args);
+            },
+            tracingChannel: tracingChannel2,
+            tracePromise: (fn, context) => tracingChannel2().tracePromise(
+              fn,
+              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+              context
+            )
+          }
+        ];
+      }
+      const syncSpec = spec;
+      const tracingChannel = () => isomorph_default.newTracingChannel(
+        fullChannelName
+      );
+      const intercept = (interceptor) => {
+        const hook = tracingChannel();
+        return typeof hook.intercept === "function" ? hook.intercept(interceptor) : () => {
+        };
+      };
+      return [
+        key,
+        {
+          ...syncSpec,
+          instrumentationName,
+          intercept,
+          invoke: (target, thisArg, args, additional) => {
+            const hook = tracingChannel();
+            return typeof hook.invoke === "function" ? hook.invoke(target, thisArg, args, additional) : Reflect.apply(target, thisArg, args);
+          },
+          tracingChannel,
+          traceSync: (fn, context) => tracingChannel().traceSync(
+            fn,
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            context
+          )
+        }
+      ];
+    })
+  );
+}
+
+// src/instrumentation/plugins/openai-channels.ts
+var openAIChannels = defineChannels(
+  "openai",
+  {
+    filesCreateTraced: channel({
+      channelName: "files.create-traced",
+      kind: "async"
+    }),
+    batchesRetrieveTraced: channel({
+      channelName: "batches.retrieve-traced",
+      kind: "async"
+    }),
+    batchesCompleteTrace: channel({
+      channelName: "batches.complete-trace",
+      kind: "async"
+    }),
+    chatCompletionsCreate: channel({
+      channelName: "chat.completions.create",
+      kind: "async"
+    }),
+    embeddingsCreate: channel({
+      channelName: "embeddings.create",
+      kind: "async"
+    }),
+    betaChatCompletionsParse: channel({
+      channelName: "beta.chat.completions.parse",
+      kind: "async"
+    }),
+    betaChatCompletionsStream: channel({
+      channelName: "beta.chat.completions.stream",
+      kind: "sync-stream"
+    }),
+    moderationsCreate: channel({
+      channelName: "moderations.create",
+      kind: "async"
+    }),
+    responsesCreate: channel({
+      channelName: "responses.create",
+      kind: "async"
+    }),
+    responsesStream: channel({
+      channelName: "responses.stream",
+      kind: "sync-stream"
+    }),
+    responsesParse: channel({
+      channelName: "responses.parse",
+      kind: "async"
+    }),
+    responsesCompact: channel({
+      channelName: "responses.compact",
+      kind: "async"
+    })
+  },
+  { instrumentationName: INSTRUMENTATION_NAMES.OPENAI }
+);
+
 // src/wrappers/attachment-utils.ts
 function getExtensionFromMediaType(mediaType) {
   const extensionMap = {
@@ -12702,118 +13120,91 @@ function processInputAttachments(input) {
   return processNode(input);
 }
 
-// src/instrumentation/core/channel-definitions.ts
-function channel(spec) {
-  return spec;
-}
-function defineChannels(pkg, channels, options) {
-  const { instrumentationName } = options;
-  return Object.fromEntries(
-    Object.entries(channels).map(([key, spec]) => {
-      const fullChannelName = `orchestrion:${pkg}:${spec.channelName}`;
-      if (spec.kind === "async") {
-        const asyncSpec = spec;
-        const tracingChannel2 = () => isomorph_default.newTracingChannel(
-          fullChannelName
-        );
-        const intercept2 = (interceptor) => {
-          const hook = tracingChannel2();
-          return typeof hook.intercept === "function" ? hook.intercept(interceptor) : () => {
-          };
-        };
-        return [
-          key,
-          {
-            ...asyncSpec,
-            instrumentationName,
-            intercept: intercept2,
-            invoke: (target, thisArg, args, additional) => {
-              const hook = tracingChannel2();
-              return typeof hook.invoke === "function" ? hook.invoke(target, thisArg, args, additional) : Reflect.apply(target, thisArg, args);
-            },
-            tracingChannel: tracingChannel2,
-            tracePromise: (fn, context) => tracingChannel2().tracePromise(
-              fn,
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-              context
-            )
-          }
-        ];
+// src/instrumentation/plugins/openai-span-data.ts
+var OPENAI_METADATA_KEYS = [
+  "model",
+  "temperature",
+  "top_p",
+  "max_tokens",
+  "frequency_penalty",
+  "presence_penalty",
+  "stop",
+  "response_format",
+  "tools",
+  "tool_choice",
+  "parallel_tool_calls",
+  "max_tool_calls"
+];
+function batchMetadata(params) {
+  const metadata = { provider: "openai" };
+  for (const key of OPENAI_METADATA_KEYS) {
+    try {
+      const value = Reflect.get(params, key);
+      if (value !== void 0) {
+        metadata[key] = value;
       }
-      const syncSpec = spec;
-      const tracingChannel = () => isomorph_default.newTracingChannel(
-        fullChannelName
-      );
-      const intercept = (interceptor) => {
-        const hook = tracingChannel();
-        return typeof hook.intercept === "function" ? hook.intercept(interceptor) : () => {
-        };
-      };
-      return [
-        key,
-        {
-          ...syncSpec,
-          instrumentationName,
-          intercept,
-          invoke: (target, thisArg, args, additional) => {
-            const hook = tracingChannel();
-            return typeof hook.invoke === "function" ? hook.invoke(target, thisArg, args, additional) : Reflect.apply(target, thisArg, args);
-          },
-          tracingChannel,
-          traceSync: (fn, context) => tracingChannel().traceSync(
-            fn,
-            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            context
-          )
-        }
-      ];
-    })
-  );
+    } catch {
+    }
+  }
+  return metadata;
+}
+function extractOpenAIBatchInput(endpoint, params) {
+  const input = endpoint === "/v1/chat/completions" ? params.messages : params.input;
+  return {
+    input: processInputAttachments(input),
+    metadata: batchMetadata(params)
+  };
+}
+function extractOpenAIChatInput(params) {
+  const { messages, ...metadata } = params;
+  return {
+    input: processInputAttachments(messages),
+    metadata: { ...metadata, provider: "openai" }
+  };
+}
+function extractOpenAIResponsesInput(params) {
+  const { input, ...metadata } = params;
+  return {
+    input: processInputAttachments(input),
+    metadata: { ...metadata, provider: "openai" }
+  };
+}
+function extractOpenAIResponsesMetadata(result) {
+  if (!result) {
+    return void 0;
+  }
+  const { output: _output, usage: _usage, ...metadata } = result;
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+function processImagesInOutput(output) {
+  if (Array.isArray(output)) {
+    return output.map(processImagesInOutput);
+  }
+  if (isObject(output) && output.type === "image_generation_call" && typeof output.result === "string" && output.result) {
+    const fileExtension = output.output_format || "png";
+    const contentType = `image/${fileExtension}`;
+    const baseFilename = typeof output.revised_prompt === "string" ? output.revised_prompt.slice(0, 50).replace(/[^a-zA-Z0-9]/g, "_") : "generated_image";
+    let binaryString;
+    try {
+      binaryString = atob(output.result);
+    } catch {
+      return output;
+    }
+    const bytes = new Uint8Array(binaryString.length);
+    for (let i = 0; i < binaryString.length; i++) {
+      bytes[i] = binaryString.charCodeAt(i);
+    }
+    return {
+      ...output,
+      result: new Attachment({
+        data: new Blob([bytes], { type: contentType }),
+        filename: `${baseFilename}.${fileExtension}`,
+        contentType
+      })
+    };
+  }
+  return output;
 }
-
-// src/instrumentation/plugins/openai-channels.ts
-var openAIChannels = defineChannels(
-  "openai",
-  {
-    chatCompletionsCreate: channel({
-      channelName: "chat.completions.create",
-      kind: "async"
-    }),
-    embeddingsCreate: channel({
-      channelName: "embeddings.create",
-      kind: "async"
-    }),
-    betaChatCompletionsParse: channel({
-      channelName: "beta.chat.completions.parse",
-      kind: "async"
-    }),
-    betaChatCompletionsStream: channel({
-      channelName: "beta.chat.completions.stream",
-      kind: "sync-stream"
-    }),
-    moderationsCreate: channel({
-      channelName: "moderations.create",
-      kind: "async"
-    }),
-    responsesCreate: channel({
-      channelName: "responses.create",
-      kind: "async"
-    }),
-    responsesStream: channel({
-      channelName: "responses.stream",
-      kind: "sync-stream"
-    }),
-    responsesParse: channel({
-      channelName: "responses.parse",
-      kind: "async"
-    }),
-    responsesCompact: channel({
-      channelName: "responses.compact",
-      kind: "async"
-    })
-  },
-  { instrumentationName: INSTRUMENTATION_NAMES.OPENAI }
-);
 
 // src/openai-utils.ts
 var BRAINTRUST_CACHED_STREAM_METRIC = "__braintrust_cached_metric";
@@ -12870,23 +13261,573 @@ function getCachedMetricFromHeaders(headers) {
   return parseCachedHeader(headers.get(LEGACY_CACHED_HEADER));
 }
 
+// src/instrumentation/plugins/openai-batch-instrumentation.ts
+var SUPPORTED_ENDPOINTS = /* @__PURE__ */ new Set(["/v1/chat/completions", "/v1/responses"]);
+var TERMINAL_STATUSES = /* @__PURE__ */ new Set([
+  "completed",
+  "failed",
+  "expired",
+  "cancelled"
+]);
+var pendingBatchTraces = /* @__PURE__ */ new Map();
+function read(value, key) {
+  if (!isObject(value)) {
+    return void 0;
+  }
+  try {
+    return Reflect.get(value, key);
+  } catch {
+    return void 0;
+  }
+}
+function isBatchRecordIterable(value) {
+  if (value === null || typeof value !== "object" && typeof value !== "function") {
+    return false;
+  }
+  return typeof read(value, Symbol.iterator) === "function" || typeof read(value, Symbol.asyncIterator) === "function";
+}
+function validCustomId(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= 64;
+}
+function logBatchInstrumentationError(context, error) {
+  debugLogger.debug(`OpenAI Batch instrumentation ${context}:`, error);
+}
+async function exportParent(parent) {
+  if ("toStr" in parent && typeof parent.toStr === "function") {
+    return parent.toStr();
+  }
+  if ("export" in parent && typeof parent.export === "function") {
+    return await parent.export();
+  }
+  return void 0;
+}
+async function deterministicDigest(namespace, ...parts) {
+  const encoded = new TextEncoder().encode(
+    [namespace, ...parts].map((part) => `${part.length}:${part}`).join("\0")
+  );
+  return new Uint8Array(
+    await globalThis.crypto.subtle.digest("SHA-256", encoded)
+  );
+}
+function digestHex(bytes, length) {
+  return Array.from(bytes.slice(0, length)).map((byte) => byte.toString(16).padStart(2, "0")).join("");
+}
+function digestUuid(bytes) {
+  const hex = digestHex(bytes, 16);
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+async function batchSpanIds(inputFileId) {
+  const [row, span, root] = await Promise.all([
+    deterministicDigest("openai:batch:row", inputFileId),
+    deterministicDigest("openai:batch:span", inputFileId),
+    deterministicDigest("openai:batch:root", inputFileId)
+  ]);
+  return {
+    rowId: digestUuid(row),
+    spanId: digestHex(span, 8),
+    rootSpanId: digestHex(root, 16)
+  };
+}
+async function childSpanIds(inputFileId, customId) {
+  const [row, span] = await Promise.all([
+    deterministicDigest("openai:batch:child:row", inputFileId, customId),
+    deterministicDigest("openai:batch:child:span", inputFileId, customId)
+  ]);
+  return { rowId: digestUuid(row), spanId: digestHex(span, 8) };
+}
+async function startBatchSpan(context) {
+  const ids = await batchSpanIds(context.inputFileId);
+  const parent = SpanComponentsV4.fromStr(context.parent);
+  const hasParentSpan = Boolean(
+    parent.data.row_id && parent.data.span_id && parent.data.root_span_id
+  );
+  return withCurrent(
+    NOOP_SPAN,
+    () => _internalStartSpanWithInitialMergeAndParentSpanIds(
+      withSpanInstrumentationName(
+        {
+          name: "openai.batch",
+          type: "task" /* TASK */,
+          parent: context.parent,
+          ...!hasParentSpan ? {
+            parentSpanIds: {
+              parentSpanIds: [],
+              rootSpanId: ids.rootSpanId
+            }
+          } : {},
+          spanId: ids.spanId,
+          startTime: context.taskStartTime,
+          event: {
+            id: ids.rowId,
+            metadata: {
+              endpoint: context.endpoint,
+              input_file_id: context.inputFileId,
+              provider: "openai"
+            }
+          }
+        },
+        INSTRUMENTATION_NAMES.OPENAI
+      )
+    )
+  );
+}
+async function startBatchChild(context, taskParent, input) {
+  const ids = await childSpanIds(context.inputFileId, input.customId);
+  return withCurrent(
+    NOOP_SPAN,
+    () => _internalStartSpanWithInitialMerge(
+      withSpanInstrumentationName(
+        {
+          name: context.endpoint === "/v1/chat/completions" ? "Chat Completion" : "openai.responses.create",
+          type: "llm" /* LLM */,
+          parent: taskParent,
+          spanId: ids.spanId,
+          startTime: context.childStartTime,
+          event: {
+            id: ids.rowId,
+            ...input.spanData?.input !== void 0 ? { input: input.spanData.input } : {},
+            metadata: {
+              ...input.spanData?.metadata,
+              custom_id: input.customId,
+              provider: "openai"
+            }
+          }
+        },
+        INSTRUMENTATION_NAMES.OPENAI
+      )
+    )
+  );
+}
+async function* jsonlRecords(file, onIssue = () => {
+}) {
+  const resolvedFile = await file;
+  if (typeof resolvedFile === "string") {
+    for (const line of resolvedFile.split("\n")) {
+      if (!line.trim()) {
+        continue;
+      }
+      try {
+        yield JSON.parse(line.replace(/\r$/, ""));
+      } catch (error) {
+        logBatchInstrumentationError("skipped malformed JSONL", error);
+        onIssue(new Error("OpenAI Batch file contains malformed JSONL"));
+      }
+    }
+    return;
+  }
+  const body = read(resolvedFile, "body");
+  const getReader = read(body, "getReader");
+  if (isObject(body) && typeof getReader === "function") {
+    let reader;
+    try {
+      reader = Reflect.apply(getReader, body, []);
+      const decoder = new TextDecoder();
+      let pending = "";
+      while (true) {
+        const readChunk = read(reader, "read");
+        if (typeof readChunk !== "function") {
+          throw new Error("Response body stream has no read method");
+        }
+        const chunk = await Reflect.apply(readChunk, reader, []);
+        if (!isObject(chunk)) {
+          throw new Error("Response body stream returned an invalid chunk");
+        }
+        if (chunk.done === true) {
+          pending += decoder.decode();
+          break;
+        }
+        if (!(chunk.value instanceof Uint8Array)) {
+          throw new Error("Response body stream returned a non-byte chunk");
+        }
+        pending += decoder.decode(chunk.value, { stream: true });
+        let newline = pending.indexOf("\n");
+        while (newline !== -1) {
+          const line = pending.slice(0, newline).replace(/\r$/, "");
+          pending = pending.slice(newline + 1);
+          if (line.trim()) {
+            try {
+              yield JSON.parse(line);
+            } catch (error) {
+              logBatchInstrumentationError("skipped malformed JSONL", error);
+              onIssue(new Error("OpenAI Batch file contains malformed JSONL"));
+            }
+          }
+          newline = pending.indexOf("\n");
+        }
+      }
+      if (pending.trim()) {
+        try {
+          yield JSON.parse(pending.replace(/\r$/, ""));
+        } catch (error) {
+          logBatchInstrumentationError("skipped malformed JSONL", error);
+          onIssue(new Error("OpenAI Batch file contains malformed JSONL"));
+        }
+      }
+    } catch (error) {
+      logBatchInstrumentationError("could not read JSONL response body", error);
+      onIssue(new Error("OpenAI Batch response body could not be read"));
+    } finally {
+      const releaseLock = read(reader, "releaseLock");
+      if (typeof releaseLock === "function") {
+        try {
+          Reflect.apply(releaseLock, reader, []);
+        } catch (error) {
+          logBatchInstrumentationError(
+            "could not release stream reader",
+            error
+          );
+        }
+      }
+    }
+    return;
+  }
+  if (isBatchRecordIterable(resolvedFile)) {
+    for await (const record of resolvedFile) {
+      yield record;
+    }
+    return;
+  }
+  logBatchInstrumentationError("skipped invalid JSONL source", resolvedFile);
+  onIssue(new Error("OpenAI Batch file source is invalid"));
+}
+async function readBatchInputs(file) {
+  const inputs = /* @__PURE__ */ new Map();
+  const issues = [];
+  let endpoint;
+  try {
+    for await (const value of jsonlRecords(
+      file,
+      (issue) => issues.push(issue)
+    )) {
+      const customId = read(value, "custom_id");
+      const url = read(value, "url");
+      const body = read(value, "body");
+      if (!validCustomId(customId) || inputs.has(customId) || read(value, "method") !== "POST" || typeof url !== "string" || !SUPPORTED_ENDPOINTS.has(url) || endpoint !== void 0 && endpoint !== url || !isObject(body)) {
+        issues.push(new Error("OpenAI Batch input contains an invalid record"));
+        continue;
+      }
+      endpoint = url;
+      let spanData;
+      try {
+        spanData = extractOpenAIBatchInput(url, body);
+      } catch (error) {
+        logBatchInstrumentationError("could not extract batch input", error);
+      }
+      inputs.set(customId, { customId, spanData });
+    }
+  } catch (error) {
+    logBatchInstrumentationError("could not process input file", error);
+    issues.push(new Error("OpenAI Batch input file could not be processed"));
+  }
+  if (!endpoint || inputs.size === 0) {
+    issues.push(new Error("OpenAI Batch input contains no supported records"));
+  }
+  return { endpoint, inputs, issues };
+}
+async function writePendingSpans(trace, endTime) {
+  const task = await startBatchSpan(trace.context);
+  const taskParent = await task.export();
+  for (const input of trace.inputs.values()) {
+    try {
+      const child = await startBatchChild(trace.context, taskParent, input);
+      if (endTime !== void 0) {
+        child.end({ endTime });
+      }
+    } catch (error) {
+      logBatchInstrumentationError("could not write batch request span", error);
+    }
+  }
+  if (endTime !== void 0) {
+    if (trace.status && trace.status !== "completed") {
+      task.log({ error: new Error(`OpenAI Batch ${trace.status}`) });
+    }
+    task.end({ endTime });
+  }
+}
+var interceptOpenAIFilesCreateTraced = async (target, thisArg, args) => {
+  const startTime = getCurrentUnixTimestamp();
+  const inputPromise = readBatchInputs(args[0].inputFileContent);
+  const parentPromise = exportParent(args[0].parent);
+  const file = await Reflect.apply(target, thisArg, args);
+  try {
+    const inputFileId = read(file, "id");
+    const [inputData, exportedParent2] = await Promise.all([
+      inputPromise,
+      parentPromise
+    ]);
+    if (typeof inputFileId !== "string" || !exportedParent2 || !inputData.endpoint || inputData.issues.length > 0) {
+      if (inputData.issues[0]) {
+        logBatchInstrumentationError(
+          "skipped invalid input file",
+          inputData.issues[0]
+        );
+      }
+      return file;
+    }
+    const trace = {
+      context: {
+        inputFileId,
+        endpoint: inputData.endpoint,
+        parent: exportedParent2,
+        taskStartTime: startTime,
+        childStartTime: startTime
+      },
+      inputs: inputData.inputs
+    };
+    pendingBatchTraces.set(inputFileId, trace);
+    await writePendingSpans(trace);
+  } catch (error) {
+    logBatchInstrumentationError("could not start batch spans", error);
+  }
+  return file;
+};
+function validTimestamp(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+function terminalEndTime(batch, startTime) {
+  let timestamp;
+  switch (batch.status) {
+    case "completed":
+      timestamp = batch.completed_at;
+      break;
+    case "failed":
+      timestamp = batch.failed_at;
+      break;
+    case "expired":
+      timestamp = batch.expired_at;
+      break;
+    default:
+      timestamp = batch.cancelled_at;
+  }
+  return validTimestamp(timestamp) ? Math.max(timestamp, startTime) : Math.max(getCurrentUnixTimestamp(), startTime);
+}
+async function updateBatchTimestamps(batch) {
+  const trace = pendingBatchTraces.get(batch.input_file_id);
+  if (!trace || trace.context.endpoint !== batch.endpoint) {
+    return;
+  }
+  if (validTimestamp(batch.created_at)) {
+    trace.context.taskStartTime = batch.created_at;
+  }
+  trace.context.childStartTime = validTimestamp(batch.in_progress_at) ? Math.max(batch.in_progress_at, trace.context.taskStartTime) : trace.context.taskStartTime;
+  trace.status = batch.status;
+  if (TERMINAL_STATUSES.has(batch.status)) {
+    trace.endTime = terminalEndTime(batch, trace.context.childStartTime);
+  }
+  await writePendingSpans(trace, trace.endTime);
+}
+var interceptOpenAIBatchesRetrieveTraced = (target, thisArg, args) => Promise.resolve(Reflect.apply(target, thisArg, args)).then(async (batch) => {
+  try {
+    await updateBatchTimestamps(batch);
+  } catch (error) {
+    logBatchInstrumentationError("could not update batch timestamps", error);
+  }
+  return batch;
+});
+function errorFromResult(result) {
+  const error = read(result.value, "error");
+  if (isObject(error)) {
+    const message = read(error, "message");
+    return new Error(
+      typeof message === "string" ? message : "OpenAI Batch request failed"
+    );
+  }
+  const response = read(result.value, "response");
+  const statusCode = read(response, "status_code");
+  if (result.source === "error" || typeof statusCode === "number" && (statusCode < 200 || statusCode >= 300)) {
+    const message = read(read(read(response, "body"), "error"), "message");
+    return new Error(
+      typeof message === "string" ? message : "OpenAI Batch request failed"
+    );
+  }
+  return void 0;
+}
+async function completeBatchResult(context, taskParent, endTime, input, result) {
+  const child = await startBatchChild(context, taskParent, input);
+  try {
+    const resultError = errorFromResult(result);
+    const responseBody = read(read(result.value, "response"), "body");
+    if (resultError) {
+      child.log({ error: resultError });
+    } else if (isObject(responseBody)) {
+      const model = read(responseBody, "model");
+      child.log({
+        output: context.endpoint === "/v1/chat/completions" ? read(responseBody, "choices") : processImagesInOutput(read(responseBody, "output")),
+        ...typeof model === "string" ? { metadata: { model } } : {},
+        metrics: parseMetricsFromUsage(read(responseBody, "usage"))
+      });
+    } else {
+      child.log({ error: new Error("OpenAI Batch response body is missing") });
+    }
+  } catch (error) {
+    child.log({ error });
+  } finally {
+    child.end({ endTime });
+  }
+}
+async function completeResultFile({
+  context,
+  endTime,
+  file,
+  inputs,
+  issues,
+  seen,
+  source,
+  taskParent
+}) {
+  if (file === void 0) {
+    return;
+  }
+  for await (const value of jsonlRecords(file, (issue) => issues.push(issue))) {
+    const customId = read(value, "custom_id");
+    if (!validCustomId(customId) || !isObject(value)) {
+      issues.push(
+        new Error("OpenAI Batch result is missing a valid custom_id")
+      );
+      continue;
+    }
+    if (seen.has(customId)) {
+      issues.push(new Error("OpenAI Batch result contains a duplicate"));
+      continue;
+    }
+    const input = inputs.get(customId);
+    if (!input) {
+      issues.push(
+        new Error("OpenAI Batch result does not match an input record")
+      );
+      continue;
+    }
+    seen.add(customId);
+    await completeBatchResult(context, taskParent, endTime, input, {
+      value,
+      source
+    });
+  }
+}
+function sameInputs(first, second) {
+  return first.size === second.size && [...first.keys()].every((customId) => second.has(customId));
+}
+async function contextForCompletion(inputFileId, inputData) {
+  if (!inputData.endpoint || inputData.issues.length > 0) {
+    return void 0;
+  }
+  const existing = pendingBatchTraces.get(inputFileId);
+  if (existing) {
+    if (existing.context.endpoint !== inputData.endpoint || !sameInputs(existing.inputs, inputData.inputs)) {
+      return void 0;
+    }
+    return { ...existing, inputs: inputData.inputs };
+  }
+  const parent = await exportParent(getSpanParentObject());
+  if (!parent) {
+    return void 0;
+  }
+  const startTime = getCurrentUnixTimestamp();
+  return {
+    context: {
+      inputFileId,
+      endpoint: inputData.endpoint,
+      parent,
+      taskStartTime: startTime,
+      childStartTime: startTime
+    },
+    inputs: inputData.inputs
+  };
+}
+async function completeBatch(args) {
+  const inputData = await readBatchInputs(args.inputFileContent);
+  const trace = await contextForCompletion(args.inputFileId, inputData);
+  if (!trace) {
+    logBatchInstrumentationError(
+      "left batch spans pending",
+      inputData.issues[0] ?? new Error("OpenAI Batch input does not match")
+    );
+    return;
+  }
+  const endTime = trace.endTime ?? getCurrentUnixTimestamp();
+  const task = await startBatchSpan(trace.context);
+  const taskParent = await task.export();
+  const issues = [];
+  const seen = /* @__PURE__ */ new Set();
+  await Promise.all([
+    completeResultFile({
+      context: trace.context,
+      endTime,
+      file: args.outputFileContent,
+      inputs: trace.inputs,
+      issues,
+      seen,
+      source: "output",
+      taskParent
+    }),
+    completeResultFile({
+      context: trace.context,
+      endTime,
+      file: args.errorFileContent,
+      inputs: trace.inputs,
+      issues,
+      seen,
+      source: "error",
+      taskParent
+    })
+  ]);
+  if (issues.length > 0) {
+    logBatchInstrumentationError("left batch spans pending", issues[0]);
+    return;
+  }
+  const missing = [...trace.inputs.values()].filter(
+    ({ customId }) => !seen.has(customId)
+  );
+  if (!trace.status || trace.status === "completed") {
+    if (missing.length > 0) {
+      logBatchInstrumentationError(
+        "left batch spans pending",
+        new Error("OpenAI Batch result files are incomplete")
+      );
+      return;
+    }
+  } else {
+    for (const input of missing) {
+      const child = await startBatchChild(trace.context, taskParent, input);
+      child.log({ error: new Error(`OpenAI Batch ${trace.status}`) });
+      child.end({ endTime });
+    }
+    task.log({ error: new Error(`OpenAI Batch ${trace.status}`) });
+  }
+  task.end({ endTime });
+  pendingBatchTraces.delete(args.inputFileId);
+}
+var interceptOpenAIBatchTraceComplete = (target, thisArg, args) => Promise.resolve(Reflect.apply(target, thisArg, args)).then(async (result) => {
+  try {
+    await completeBatch(args[0]);
+  } catch (error) {
+    logBatchInstrumentationError("could not complete batch", error);
+  }
+  return result;
+});
+
 // src/instrumentation/plugins/openai-plugin.ts
 var OpenAIPlugin = class extends BasePlugin {
   constructor() {
     super();
   }
   onEnable() {
+    this.unsubscribers.push(
+      openAIChannels.filesCreateTraced.intercept(
+        interceptOpenAIFilesCreateTraced
+      ),
+      openAIChannels.batchesRetrieveTraced.intercept(
+        interceptOpenAIBatchesRetrieveTraced
+      ),
+      openAIChannels.batchesCompleteTrace.intercept(
+        interceptOpenAIBatchTraceComplete
+      )
+    );
     this.unsubscribers.push(
       traceStreamingChannel(openAIChannels.chatCompletionsCreate, {
         name: "Chat Completion",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const { messages, ...metadata } = params;
-          return {
-            input: processInputAttachments(messages),
-            metadata: { ...metadata, provider: "openai" }
-          };
-        },
+        extractInput: ([params]) => extractOpenAIChatInput(params),
         extractOutput: (result) => {
           return result?.choices;
         },
@@ -12932,13 +13873,7 @@ var OpenAIPlugin = class extends BasePlugin {
       traceStreamingChannel(openAIChannels.betaChatCompletionsParse, {
         name: "Chat Completion",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const { messages, ...metadata } = params;
-          return {
-            input: processInputAttachments(messages),
-            metadata: { ...metadata, provider: "openai" }
-          };
-        },
+        extractInput: ([params]) => extractOpenAIChatInput(params),
         extractOutput: (result) => {
           return result?.choices;
         },
@@ -12960,13 +13895,7 @@ var OpenAIPlugin = class extends BasePlugin {
       traceSyncStreamChannel(openAIChannels.betaChatCompletionsStream, {
         name: "Chat Completion",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const { messages, ...metadata } = params;
-          return {
-            input: processInputAttachments(messages),
-            metadata: { ...metadata, provider: "openai" }
-          };
-        }
+        extractInput: ([params]) => extractOpenAIChatInput(params)
       })
     );
     this.unsubscribers.push(
@@ -12996,23 +13925,11 @@ var OpenAIPlugin = class extends BasePlugin {
       traceStreamingChannel(openAIChannels.responsesCreate, {
         name: "openai.responses.create",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const { input, ...metadata } = params;
-          return {
-            input: processInputAttachments(input),
-            metadata: { ...metadata, provider: "openai" }
-          };
-        },
+        extractInput: ([params]) => extractOpenAIResponsesInput(params),
         extractOutput: (result) => {
           return processImagesInOutput(result?.output);
         },
-        extractMetadata: (result) => {
-          if (!result) {
-            return void 0;
-          }
-          const { output: _output, usage: _usage, ...metadata } = result;
-          return Object.keys(metadata).length > 0 ? metadata : void 0;
-        },
+        extractMetadata: (result) => extractOpenAIResponsesMetadata(result),
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
             parseMetricsFromUsage(result?.usage),
@@ -13031,13 +13948,7 @@ var OpenAIPlugin = class extends BasePlugin {
       traceSyncStreamChannel(openAIChannels.responsesStream, {
         name: "openai.responses.create",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const { input, ...metadata } = params;
-          return {
-            input: processInputAttachments(input),
-            metadata: { ...metadata, provider: "openai" }
-          };
-        },
+        extractInput: ([params]) => extractOpenAIResponsesInput(params),
         extractFromEvent: (event) => {
           if (event.type !== "response.completed" || !event.response) {
             return {};
@@ -13060,23 +13971,11 @@ var OpenAIPlugin = class extends BasePlugin {
       traceStreamingChannel(openAIChannels.responsesParse, {
         name: "openai.responses.parse",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const { input, ...metadata } = params;
-          return {
-            input: processInputAttachments(input),
-            metadata: { ...metadata, provider: "openai" }
-          };
-        },
+        extractInput: ([params]) => extractOpenAIResponsesInput(params),
         extractOutput: (result) => {
           return processImagesInOutput(result?.output);
         },
-        extractMetadata: (result) => {
-          if (!result) {
-            return void 0;
-          }
-          const { output: _output, usage: _usage, ...metadata } = result;
-          return Object.keys(metadata).length > 0 ? metadata : void 0;
-        },
+        extractMetadata: (result) => extractOpenAIResponsesMetadata(result),
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
             parseMetricsFromUsage(result?.usage),
@@ -13095,23 +13994,11 @@ var OpenAIPlugin = class extends BasePlugin {
       traceAsyncChannel(openAIChannels.responsesCompact, {
         name: "openai.responses.compact",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          const { input, ...metadata } = params;
-          return {
-            input: processInputAttachments(input),
-            metadata: { ...metadata, provider: "openai" }
-          };
-        },
+        extractInput: ([params]) => extractOpenAIResponsesInput(params),
         extractOutput: (result) => {
           return processImagesInOutput(result?.output);
         },
-        extractMetadata: (result) => {
-          if (!result) {
-            return void 0;
-          }
-          const { output: _output, usage: _usage, ...metadata } = result;
-          return Object.keys(metadata).length > 0 ? metadata : void 0;
-        },
+        extractMetadata: (result) => extractOpenAIResponsesMetadata(result),
         extractMetrics: (result, startTime, endEvent) => {
           const metrics = withCachedMetric(
             parseMetricsFromUsage(result?.usage),
@@ -13167,35 +14054,6 @@ function withCachedMetric(metrics, result, endEvent) {
     cached
   };
 }
-function processImagesInOutput(output) {
-  if (Array.isArray(output)) {
-    return output.map(processImagesInOutput);
-  }
-  if (isObject(output)) {
-    if (output.type === "image_generation_call" && output.result && typeof output.result === "string") {
-      const fileExtension = output.output_format || "png";
-      const contentType = `image/${fileExtension}`;
-      const baseFilename = output.revised_prompt && typeof output.revised_prompt === "string" ? output.revised_prompt.slice(0, 50).replace(/[^a-zA-Z0-9]/g, "_") : "generated_image";
-      const filename = `${baseFilename}.${fileExtension}`;
-      const binaryString = atob(output.result);
-      const bytes = new Uint8Array(binaryString.length);
-      for (let i = 0; i < binaryString.length; i++) {
-        bytes[i] = binaryString.charCodeAt(i);
-      }
-      const blob = new Blob([bytes], { type: contentType });
-      const attachment = new Attachment({
-        data: blob,
-        filename,
-        contentType
-      });
-      return {
-        ...output,
-        result: attachment
-      };
-    }
-  }
-  return output;
-}
 function mergeLogprobTokens(existing, incoming) {
   if (incoming === void 0) {
     return existing;
@@ -13226,13 +14084,33 @@ function aggregateChatLogprobs(existing, incoming) {
   }
   return aggregated;
 }
+function createAggregatedChatChoice(index) {
+  return {
+    index,
+    role: void 0,
+    content: void 0,
+    refusal: void 0,
+    toolCallsByIndex: /* @__PURE__ */ new Map(),
+    logprobs: void 0,
+    finish_reason: void 0
+  };
+}
+function toChatChoice(choice) {
+  const toolCalls = Array.from(choice.toolCallsByIndex.entries()).sort(([left], [right]) => left - right).map(([, toolCall]) => toolCall);
+  return {
+    index: choice.index,
+    message: {
+      role: choice.role,
+      content: choice.content,
+      ...choice.refusal !== void 0 ? { refusal: choice.refusal } : {},
+      tool_calls: toolCalls.length > 0 ? toolCalls : void 0
+    },
+    logprobs: choice.logprobs ?? null,
+    finish_reason: choice.finish_reason
+  };
+}
 function aggregateChatCompletionChunks(chunks, streamResult, endEvent) {
-  let role = void 0;
-  let content = void 0;
-  let refusal = void 0;
-  let tool_calls = void 0;
-  let logprobs = void 0;
-  let finish_reason = void 0;
+  const choicesByIndex = /* @__PURE__ */ new Map();
   let metrics = {};
   for (const chunk of chunks) {
     if (chunk.usage) {
@@ -13241,62 +14119,75 @@ function aggregateChatCompletionChunks(chunks, streamResult, endEvent) {
         ...parseMetricsFromUsage(chunk.usage)
       };
     }
-    const choice = chunk.choices?.[0];
-    if (!choice) {
-      continue;
-    }
-    if (choice.finish_reason) {
-      finish_reason = choice.finish_reason;
-    }
-    logprobs = aggregateChatLogprobs(logprobs, choice.logprobs);
-    const delta = choice.delta;
-    if (!delta) {
+    const choices = chunk.choices;
+    if (!choices?.length) {
       continue;
     }
-    if (delta.finish_reason) {
-      finish_reason = delta.finish_reason;
-    }
-    if (!role && delta.role) {
-      role = delta.role;
-    }
-    if (delta.content) {
-      content = (content || "") + delta.content;
-    }
-    if (delta.refusal) {
-      refusal = (refusal || "") + delta.refusal;
-    }
-    if (delta.tool_calls) {
-      const toolDelta = delta.tool_calls[0];
-      if (!tool_calls || toolDelta.id && tool_calls[tool_calls.length - 1].id !== toolDelta.id) {
-        tool_calls = [
-          ...tool_calls || [],
-          {
-            id: toolDelta.id,
-            type: toolDelta.type,
-            function: toolDelta.function
+    for (const choice of choices) {
+      const choiceIndex = choice.index;
+      let aggregatedChoice = choicesByIndex.get(choiceIndex);
+      if (!aggregatedChoice) {
+        aggregatedChoice = createAggregatedChatChoice(choiceIndex);
+        choicesByIndex.set(choiceIndex, aggregatedChoice);
+      }
+      if (choice.finish_reason) {
+        aggregatedChoice.finish_reason = choice.finish_reason;
+      }
+      aggregatedChoice.logprobs = aggregateChatLogprobs(
+        aggregatedChoice.logprobs,
+        choice.logprobs
+      );
+      const delta = choice.delta;
+      if (!delta) {
+        continue;
+      }
+      if (delta.finish_reason) {
+        aggregatedChoice.finish_reason = delta.finish_reason;
+      }
+      if (!aggregatedChoice.role && delta.role) {
+        aggregatedChoice.role = delta.role;
+      }
+      if (delta.content) {
+        aggregatedChoice.content = (aggregatedChoice.content || "") + delta.content;
+      }
+      if (delta.refusal) {
+        aggregatedChoice.refusal = (aggregatedChoice.refusal || "") + delta.refusal;
+      }
+      if (delta.tool_calls) {
+        for (const toolDelta of delta.tool_calls) {
+          let aggregatedToolCall = aggregatedChoice.toolCallsByIndex.get(
+            toolDelta.index
+          );
+          if (!aggregatedToolCall) {
+            aggregatedToolCall = {
+              function: { arguments: "" }
+            };
+            aggregatedChoice.toolCallsByIndex.set(
+              toolDelta.index,
+              aggregatedToolCall
+            );
           }
-        ];
-      } else {
-        tool_calls[tool_calls.length - 1].function.arguments += toolDelta.function.arguments;
+          if (toolDelta.id !== void 0) {
+            aggregatedToolCall.id = toolDelta.id;
+          }
+          if (toolDelta.type !== void 0) {
+            aggregatedToolCall.type = toolDelta.type;
+          }
+          if (toolDelta.function?.name !== void 0) {
+            aggregatedToolCall.function.name = toolDelta.function.name;
+          }
+          if (toolDelta.function?.arguments !== void 0) {
+            aggregatedToolCall.function.arguments += toolDelta.function.arguments;
+          }
+        }
       }
     }
   }
   metrics = withCachedMetric(metrics, streamResult, endEvent);
+  const output = Array.from(choicesByIndex.values()).sort((left, right) => left.index - right.index).map(toChatChoice);
   return {
     metrics,
-    output: [
-      {
-        index: 0,
-        message: {
-          role,
-          content,
-          ...refusal !== void 0 ? { refusal } : {},
-          tool_calls
-        },
-        logprobs: logprobs ?? null,
-        finish_reason
-      }
-    ]
+    output: output.length > 0 ? output : [toChatChoice(createAggregatedChatChoice(0))]
   };
 }
 function aggregateResponseStreamEvents(chunks, _streamResult, endEvent) {
@@ -14619,6 +15510,12 @@ function parseMetricsFromUsage2(usage) {
       }
     }
   }
+  if (isObject(usage.output_tokens_details)) {
+    const thinkingTokens = usage.output_tokens_details.thinking_tokens;
+    if (typeof thinkingTokens === "number") {
+      metrics.completion_reasoning_tokens = thinkingTokens;
+    }
+  }
   if (isObject(usage.server_tool_use)) {
     for (const [name, value] of Object.entries(usage.server_tool_use)) {
       if (typeof value === "number") {
@@ -15575,7 +16472,6 @@ function endHarnessTurn(parent) {
 function braintrustAISDKTelemetry() {
   const operations = /* @__PURE__ */ new Map();
   const operationKeysByCallId = /* @__PURE__ */ new Map();
-  const workflowOperationKeyStore = isomorph_default.newAsyncLocalStorage();
   const modelSpans = /* @__PURE__ */ new Map();
   const objectSpans = /* @__PURE__ */ new Map();
   const embedSpans = /* @__PURE__ */ new Map();
@@ -15618,9 +16514,6 @@ function braintrustAISDKTelemetry() {
       return;
     }
     operations.delete(operationKey);
-    if (workflowOperationKeyStore.getStore() === operationKey) {
-      workflowOperationKeyStore.enterWith(void 0);
-    }
     const keys = operationKeysByCallId.get(state.callId);
     if (!keys) {
       return;
@@ -15668,14 +16561,7 @@ function braintrustAISDKTelemetry() {
         return key;
       }
     }
-    const workflowOperationKey = workflowOperationKeyStore.getStore();
-    if (workflowOperationKey && keys.includes(workflowOperationKey)) {
-      return workflowOperationKey;
-    }
-    if (callId === "workflow-agent") {
-      return void 0;
-    }
-    return mode === "finish" ? keys[0] : keys[keys.length - 1];
+    return callId === "workflow-agent" || mode === "active" ? keys[keys.length - 1] : keys[0];
   };
   const operationKeyFromEvent = (event, mode = "active") => {
     const explicit = explicitOperationKey(event);
@@ -15689,17 +16575,13 @@ function braintrustAISDKTelemetry() {
         if (operationKey) {
           return operationKey;
         }
-        const workflowOperationKey2 = workflowOperationKeyStore.getStore();
-        if (workflowOperationKey2 && operations.has(workflowOperationKey2)) {
-          return workflowOperationKey2;
+        const workflowAgentKeys2 = operationKeysByCallId.get("workflow-agent");
+        if (workflowAgentKeys2?.length) {
+          return workflowAgentKeys2[workflowAgentKeys2.length - 1];
         }
         return callId === "workflow-agent" ? void 0 : callId;
       }
     }
-    const workflowOperationKey = workflowOperationKeyStore.getStore();
-    if (workflowOperationKey && operations.has(workflowOperationKey)) {
-      return workflowOperationKey;
-    }
     const wrapperSpan = currentWorkflowAgentWrapperSpan();
     if (wrapperSpan?.spanId) {
       for (const [operationKey, state] of operations) {
@@ -15709,8 +16591,8 @@ function braintrustAISDKTelemetry() {
       }
     }
     const workflowAgentKeys = operationKeysByCallId.get("workflow-agent");
-    if (workflowAgentKeys?.length === 1) {
-      return workflowAgentKeys[0];
+    if (workflowAgentKeys?.length) {
+      return workflowAgentKeys[workflowAgentKeys.length - 1];
     }
     if (operations.size === 1) {
       return operations.keys().next().value;
@@ -15913,9 +16795,6 @@ function braintrustAISDKTelemetry() {
         if (!ownsSpan) {
           return;
         }
-        if (workflowAgent) {
-          workflowOperationKeyStore.enterWith(operationKey);
-        }
         let metadata = metadataFromEvent(event);
         const logPayload = { metadata };
         const workflowAgentCallInput = workflowAgent ? operationInput(event, operationName) : void 0;
@@ -16387,6 +17266,10 @@ var aiSDKChannels = defineChannels(
       channelName: "generateText",
       kind: "async"
     }),
+    generateImage: channel({
+      channelName: "generateImage",
+      kind: "async"
+    }),
     streamText: channel({
       channelName: "streamText",
       kind: "async"
@@ -16574,7 +17457,7 @@ var AISDKPlugin = class extends BasePlugin {
   }
   subscribeToAISDK() {
     const denyOutputPaths = this.config.denyOutputPaths || DEFAULT_DENY_OUTPUT_PATHS;
-    this.unsubscribers.push(subscribeToAISDKV7TelemetryDispatcher());
+    this.unsubscribers.push(interceptAISDKV7TelemetryDispatcher());
     this.unsubscribers.push(subscribeToHarnessAgentCreateSession());
     this.unsubscribers.push(
       subscribeToHarnessContinuation(
@@ -16602,6 +17485,18 @@ var AISDKPlugin = class extends BasePlugin {
         aggregateChunks: aggregateAISDKChunks
       })
     );
+    this.unsubscribers.push(
+      traceAsyncChannel(aiSDKChannels.generateImage, {
+        name: "generateImage",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event) => prepareAISDKGenerateImageInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKGenerateImageOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result) => extractTokenMetrics(result)
+      })
+    );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.streamText, {
         name: "streamText",
@@ -17091,26 +17986,29 @@ function subscribeToHarnessContinuation(continuationChannel, defaultDenyOutputPa
     channel2.unsubscribe(handlers);
   };
 }
-function subscribeToAISDKV7TelemetryDispatcher() {
-  const channel2 = aiSDKChannels.v7CreateTelemetryDispatcher.tracingChannel();
+function interceptAISDKV7TelemetryDispatcher() {
   const telemetry = braintrustAISDKTelemetry();
-  const handlers = {
-    end: (event) => {
-      const telemetryOptions = event.arguments?.[0]?.telemetry;
-      if (telemetryOptions?.isEnabled === false) {
-        return;
+  return aiSDKChannels.v7CreateTelemetryDispatcher.intercept(
+    (target, thisArg, args) => {
+      const dispatcher = Reflect.apply(target, thisArg, args);
+      const telemetryOptions = args[0]?.telemetry;
+      if (telemetryOptions?.isEnabled !== false) {
+        try {
+          patchAISDKV7TelemetryDispatcher(
+            dispatcher,
+            telemetry,
+            telemetryOptions
+          );
+        } catch (error) {
+          debugLogger.error(
+            "Error instrumenting AI SDK v7 telemetry dispatcher:",
+            error
+          );
+        }
       }
-      patchAISDKV7TelemetryDispatcher(
-        event.result,
-        telemetry,
-        telemetryOptions
-      );
+      return dispatcher;
     }
-  };
-  channel2.subscribe(handlers);
-  return () => {
-    channel2.unsubscribe(handlers);
-  };
+  );
 }
 function patchAISDKV7TelemetryDispatcher(dispatcher, telemetry, telemetryOptions) {
   if (!isObject(dispatcher)) {
@@ -17435,16 +18333,10 @@ var convertImageToAttachment = (image, explicitMimeType) => {
       }
     }
     if (explicitMimeType) {
-      if (image instanceof Uint8Array) {
-        return new Attachment({
-          data: new Blob([image], { type: explicitMimeType }),
-          filename: `image.${getExtensionFromMediaType(explicitMimeType)}`,
-          contentType: explicitMimeType
-        });
-      }
-      if (typeof Buffer !== "undefined" && Buffer.isBuffer(image)) {
+      const blob = convertDataToBlob(image, explicitMimeType);
+      if (blob) {
         return new Attachment({
-          data: new Blob([image], { type: explicitMimeType }),
+          data: blob,
           filename: `image.${getExtensionFromMediaType(explicitMimeType)}`,
           contentType: explicitMimeType
         });
@@ -17498,6 +18390,25 @@ var convertDataToAttachment = (data, mimeType, filename) => {
 function processAISDKCallInput(params) {
   return processInputAttachmentsSync(params);
 }
+function processAISDKGenerateImageInput(params) {
+  const prompt = params.prompt;
+  if (!isObject(prompt) || Array.isArray(prompt)) {
+    return processAISDKCallInput(params);
+  }
+  const processedPrompt = { ...prompt };
+  if (Array.isArray(prompt.images)) {
+    processedPrompt.images = prompt.images.map(
+      (image) => convertImageToAttachment(image, "image/png") ?? image
+    );
+  }
+  if (prompt.mask !== void 0) {
+    processedPrompt.mask = convertImageToAttachment(prompt.mask, "image/png") ?? prompt.mask;
+  }
+  return processAISDKCallInput({
+    ...params,
+    prompt: processedPrompt
+  });
+}
 function processAISDKWorkflowAgentCallInput(params) {
   const processed = processAISDKCallInput(params);
   return {
@@ -17636,6 +18547,12 @@ function prepareAISDKEmbedInput(params, self) {
     metadata: extractMetadataFromEmbedParams(params, self)
   };
 }
+function prepareAISDKGenerateImageInput(params, self) {
+  return {
+    input: processAISDKGenerateImageInput(params).input,
+    metadata: extractMetadataFromCallParams(params, self)
+  };
+}
 function prepareAISDKRerankInput(params, self) {
   const { documents, query } = params;
   return {
@@ -19011,6 +19928,57 @@ function processAISDKOutput(output, denyOutputPaths) {
   }
   return normalizeAISDKLoggedOutput(sanitized);
 }
+function processAISDKGenerateImageOutput(output, denyOutputPaths) {
+  if (!output || typeof output !== "object") {
+    return output;
+  }
+  const summarized = {};
+  for (const field of [
+    "usage",
+    "warnings",
+    "providerMetadata",
+    "experimental_providerMetadata",
+    "responses"
+  ]) {
+    const value = safeSerializableFieldRead(output, field);
+    if (value !== void 0 && isSerializableOutputValue(value)) {
+      summarized[field] = value;
+    }
+  }
+  const images = safeSerializableFieldRead(output, "images");
+  const image = safeSerializableFieldRead(output, "image");
+  const generatedFiles = Array.isArray(images) && images.length > 0 ? images : image !== void 0 ? [image] : [];
+  const loggedOutput = normalizeAISDKLoggedOutput(
+    omit(summarized, denyOutputPaths)
+  );
+  if (generatedFiles.length > 0) {
+    loggedOutput.images = generatedFiles.map(
+      (file, index) => convertAISDKGeneratedFileToAttachment(file, index)
+    );
+  }
+  return loggedOutput;
+}
+function convertAISDKGeneratedFileToAttachment(file, index) {
+  if (!file || typeof file !== "object") {
+    return file;
+  }
+  const generatedFile = file;
+  const generatedMediaType = safeSerializableFieldRead(
+    generatedFile,
+    "mediaType"
+  );
+  const mediaType = typeof generatedMediaType === "string" ? generatedMediaType : "application/octet-stream";
+  const data = safeSerializableFieldRead(generatedFile, "base64") ?? safeSerializableFieldRead(generatedFile, "uint8Array");
+  const blob = convertDataToBlob(data, mediaType);
+  if (blob) {
+    return new Attachment({
+      data: blob,
+      filename: `generated_image_${index}.${getExtensionFromMediaType(mediaType)}`,
+      contentType: mediaType
+    });
+  }
+  return file;
+}
 function processAISDKEmbeddingOutput(output, denyOutputPaths) {
   if (!output || typeof output !== "object") {
     return output;
@@ -19511,118 +20479,22 @@ var claudeAgentSDKChannels = defineChannels(
 var CLAUDE_AGENT_SDK_SKIP_LOCAL_TOOL_HOOKS_OPTION = "__braintrust_skip_local_tool_hooks";
 
 // src/instrumentation/plugins/claude-agent-sdk-local-tool-context.ts
-var LOCAL_TOOL_CONTEXT_ASYNC_ITERATOR_PATCHED = /* @__PURE__ */ Symbol.for(
-  "braintrust.claude_agent_sdk.local_tool_context_async_iterator_patched"
-);
-function createLocalToolContextStore() {
-  const maybeIsoWithAsyncLocalStorage = isomorph_default;
-  if (typeof maybeIsoWithAsyncLocalStorage.newAsyncLocalStorage === "function") {
-    return maybeIsoWithAsyncLocalStorage.newAsyncLocalStorage();
-  }
-  let currentStore;
-  return {
-    enterWith(store) {
-      currentStore = store;
-    },
-    getStore() {
-      return currentStore;
-    },
-    run(store, callback) {
-      const previousStore = currentStore;
-      currentStore = store;
-      try {
-        return callback();
-      } finally {
-        currentStore = previousStore;
-      }
-    }
-  };
-}
-var localToolContextStore = createLocalToolContextStore();
-var fallbackLocalToolParentResolver;
-function createClaudeLocalToolContext() {
-  return {};
-}
-function runWithClaudeLocalToolContext(callback, context) {
-  return localToolContextStore.run(
-    context ?? createClaudeLocalToolContext(),
-    callback
-  );
-}
-function ensureClaudeLocalToolContext() {
-  const existing = localToolContextStore.getStore();
-  if (existing) {
-    return existing;
-  }
-  const created = {};
-  localToolContextStore.enterWith(created);
-  return created;
-}
-function setClaudeLocalToolParentResolver(resolver) {
-  fallbackLocalToolParentResolver = resolver;
-  const context = ensureClaudeLocalToolContext();
-  if (!context) {
-    return;
-  }
-  context.resolveLocalToolParent = resolver;
-}
-function getClaudeLocalToolParentResolver() {
-  return localToolContextStore.getStore()?.resolveLocalToolParent ?? fallbackLocalToolParentResolver;
+var localToolContextStore = isomorph_default.newAsyncLocalStorage();
+var localToolParentResolversByToolUseId = /* @__PURE__ */ new Map();
+function runWithClaudeLocalToolContext(callback, resolver) {
+  return localToolContextStore.run(resolver, callback);
 }
-function isAsyncIterable3(value) {
-  return value !== null && typeof value === "object" && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
+function registerClaudeLocalToolParentResolver(toolUseId, resolver) {
+  localToolParentResolversByToolUseId.set(toolUseId, resolver);
 }
-function bindClaudeLocalToolContextToAsyncIterable(result, localToolContext) {
-  if (!isAsyncIterable3(result) || Object.isFrozen(result) || Object.isSealed(result)) {
-    return result;
-  }
-  const stream = result;
-  const originalAsyncIterator = stream[Symbol.asyncIterator];
-  if (originalAsyncIterator[LOCAL_TOOL_CONTEXT_ASYNC_ITERATOR_PATCHED]) {
-    return result;
+function getClaudeLocalToolParentResolver(toolUseId) {
+  const currentResolver = localToolContextStore.getStore();
+  if (!toolUseId) {
+    return currentResolver;
   }
-  const patchedAsyncIterator = function() {
-    return runWithClaudeLocalToolContext(() => {
-      const iterator = Reflect.apply(originalAsyncIterator, this, []);
-      if (!iterator || typeof iterator !== "object") {
-        return iterator;
-      }
-      const patchMethod = (methodName) => {
-        const originalMethod = Reflect.get(iterator, methodName);
-        if (typeof originalMethod !== "function") {
-          return;
-        }
-        Reflect.set(
-          iterator,
-          methodName,
-          (...args) => runWithClaudeLocalToolContext(
-            () => Reflect.apply(
-              originalMethod,
-              iterator,
-              args
-            ),
-            localToolContext
-          )
-        );
-      };
-      patchMethod("next");
-      patchMethod("return");
-      patchMethod("throw");
-      return iterator;
-    }, localToolContext);
-  };
-  Object.defineProperty(
-    patchedAsyncIterator,
-    LOCAL_TOOL_CONTEXT_ASYNC_ITERATOR_PATCHED,
-    {
-      configurable: false,
-      enumerable: false,
-      value: true,
-      writable: false
-    }
-  );
-  Reflect.set(stream, Symbol.asyncIterator, patchedAsyncIterator);
-  return result;
+  const registeredResolver = localToolParentResolversByToolUseId.get(toolUseId);
+  localToolParentResolversByToolUseId.delete(toolUseId);
+  return currentResolver ?? registeredResolver;
 }
 
 // src/instrumentation/plugins/claude-agent-sdk-local-tool-spans.ts
@@ -19648,7 +20520,7 @@ function wrapLocalClaudeToolHandler(handler, getMetadata) {
     const metadata = getMetadata();
     const rawToolName = metadata.serverName ? `mcp__${metadata.serverName}__${metadata.toolName}` : metadata.toolName;
     const toolUseId = getToolUseIdFromExtra(handlerArgs[1]);
-    const localToolParentResolver = getClaudeLocalToolParentResolver();
+    const localToolParentResolver = getClaudeLocalToolParentResolver(toolUseId);
     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;
@@ -20175,6 +21047,7 @@ function createToolTracingHooks(resolveParentSpan, taskIdToToolUseId, toolUseToP
       }
     }
     if (skipLocalToolHooks && (isLocalToolUse(input.tool_name, mcpServers) || localToolHookNames.has(input.tool_name))) {
+      registerClaudeLocalToolParentResolver(toolUseID, resolveParentSpan);
       return {};
     }
     const parsed = parseToolName(input.tool_name);
@@ -20885,7 +21758,7 @@ async function finalizeQuerySpan(state) {
 }
 var ClaudeAgentSDKPlugin = class extends BasePlugin {
   onEnable() {
-    this.subscribeToQuery();
+    this.interceptQuery();
   }
   onDisable() {
     for (const unsubscribe of this.unsubscribers) {
@@ -20893,211 +21766,218 @@ var ClaudeAgentSDKPlugin = class extends BasePlugin {
     }
     this.unsubscribers = [];
   }
-  subscribeToQuery() {
-    const channel2 = claudeAgentSDKChannels.query.tracingChannel();
-    const spans = /* @__PURE__ */ new WeakMap();
-    const handlers = {
-      start: (event) => {
-        const params = event.arguments[0] ?? {};
-        const originalPrompt = params.prompt;
-        const options = params.options ?? {};
-        const promptIsAsyncIterable = isAsyncIterable(originalPrompt);
-        let promptStarted = false;
-        let capturedPromptMessages;
-        let resolvePromptDone;
-        const promptDone = new Promise((resolve) => {
-          resolvePromptDone = resolve;
-        });
-        if (promptIsAsyncIterable) {
-          capturedPromptMessages = [];
-          const promptStream = originalPrompt;
-          params.prompt = (async function* () {
-            promptStarted = true;
-            try {
-              for await (const message of promptStream) {
-                capturedPromptMessages.push(message);
-                yield message;
-              }
-            } finally {
-              resolvePromptDone?.();
+  interceptQuery() {
+    const startQuery = (params) => {
+      const originalPrompt = params.prompt;
+      const options = params.options ?? {};
+      const promptIsAsyncIterable = isAsyncIterable(originalPrompt);
+      let promptStarted = false;
+      let capturedPromptMessages;
+      let resolvePromptDone;
+      const promptDone = new Promise((resolve) => {
+        resolvePromptDone = resolve;
+      });
+      if (promptIsAsyncIterable) {
+        capturedPromptMessages = [];
+        const promptStream = originalPrompt;
+        params.prompt = (async function* () {
+          promptStarted = true;
+          try {
+            for await (const message of promptStream) {
+              capturedPromptMessages.push(message);
+              yield message;
             }
-          })();
-        }
-        const span = startSpan(
-          withSpanInstrumentationName(
-            {
-              name: "Claude Agent",
-              spanAttributes: {
-                type: "task" /* TASK */
-              }
-            },
-            INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
-          )
-        );
-        const startTime = getCurrentUnixTimestamp();
-        try {
-          span.log({
-            input: typeof originalPrompt === "string" ? originalPrompt : promptIsAsyncIterable ? void 0 : originalPrompt !== void 0 ? String(originalPrompt) : void 0,
-            metadata: filterSerializableOptions(options)
-          });
-        } catch (error) {
-          console.error("Error extracting input for Claude Agent SDK:", error);
-        }
-        const activeToolSpans = /* @__PURE__ */ new Map();
-        const activeLlmSpansByParentToolUse = /* @__PURE__ */ new Map();
-        const conversationHistoryByParentKey = /* @__PURE__ */ new Map();
-        const subAgentSpans = /* @__PURE__ */ new Map();
-        const endedSubAgentSpans = /* @__PURE__ */ new Set();
-        const toolUseToParent = /* @__PURE__ */ new Map();
-        const latestLlmParentBySubAgentToolUse = /* @__PURE__ */ new Map();
-        const latestRootLlmParentRef = {
-          value: void 0
-        };
-        const subAgentDetailsByToolUseId = /* @__PURE__ */ new Map();
-        const taskIdToToolUseId = /* @__PURE__ */ new Map();
-        const promptMessagesByParentKey = /* @__PURE__ */ new Map();
-        const promptSourcePriorityByParentKey = /* @__PURE__ */ new Map();
-        const localToolContext = createClaudeLocalToolContext();
-        const { hasLocalToolHandlers, localToolHookNames } = prepareLocalToolHandlersInMcpServers(options.mcpServers);
-        const skipLocalToolHooks = options[CLAUDE_AGENT_SDK_SKIP_LOCAL_TOOL_HOOKS_OPTION] === true || hasLocalToolHandlers;
-        const resolveToolUseParentSpan = async (toolUseID, context) => {
-          const trackedParentToolUseId = toolUseToParent.get(toolUseID);
-          const parentToolUseId = trackedParentToolUseId ?? (context?.agentId ? taskIdToToolUseId.get(context.agentId) ?? null : null);
-          const parentKey = llmParentKey(parentToolUseId);
-          const activeLlmSpan = activeLlmSpansByParentToolUse.get(parentKey);
-          const latestLlmParent = parentToolUseId ? latestLlmParentBySubAgentToolUse.get(parentToolUseId) : latestRootLlmParentRef.value;
-          if (!activeLlmSpan && !latestLlmParent) {
-            await ensureActiveLlmSpanForParentToolUse(
-              span,
-              activeLlmSpansByParentToolUse,
-              subAgentDetailsByToolUseId,
-              activeToolSpans,
-              subAgentSpans,
-              parentToolUseId,
-              getCurrentUnixTimestamp()
-            );
-          }
-          if (parentToolUseId) {
-            const subAgentSpan = await ensureSubAgentSpan(
-              subAgentDetailsByToolUseId,
-              span,
-              activeToolSpans,
-              subAgentSpans,
-              parentToolUseId
-            );
-            return subAgentSpan.export();
+          } finally {
+            resolvePromptDone?.();
           }
-          return span.export();
-        };
-        localToolContext.resolveLocalToolParent = resolveToolUseParentSpan;
-        setClaudeLocalToolParentResolver(resolveToolUseParentSpan);
-        const optionsWithHooks = injectTracingHooks(
-          options,
-          resolveToolUseParentSpan,
-          taskIdToToolUseId,
-          toolUseToParent,
-          activeToolSpans,
-          localToolHookNames,
-          skipLocalToolHooks,
-          subAgentDetailsByToolUseId,
-          subAgentSpans,
-          endedSubAgentSpans
-        );
-        params.options = optionsWithHooks;
-        event.arguments[0] = params;
-        spans.set(event, {
-          activeLlmSpansByParentToolUse,
-          activePartialMessageIdByParentKey: /* @__PURE__ */ new Map(),
-          activeToolSpans,
-          conversationHistoryByParentKey,
-          capturedPromptMessages,
-          currentMessageId: void 0,
-          currentMessageStartTime: startTime,
-          currentMessages: [],
-          endedSubAgentSpans,
-          finalOutputUsageMessageIds: /* @__PURE__ */ new Set(),
-          finalResults: [],
-          options: optionsWithHooks,
-          originalPrompt,
-          processing: Promise.resolve(),
-          promptDone,
-          promptMessagesByParentKey,
-          promptStarted: () => promptStarted,
-          promptSourcePriorityByParentKey,
-          span,
-          subAgentDetailsByToolUseId,
-          subAgentSpans,
-          taskIdToToolUseId,
-          latestLlmParentBySubAgentToolUse,
-          latestRootLlmParentRef,
-          toolUseToParent,
-          usageByMessageId: /* @__PURE__ */ new Map(),
-          localToolContext
+        })();
+      }
+      const span = startSpan(
+        withSpanInstrumentationName(
+          {
+            name: "Claude Agent",
+            spanAttributes: {
+              type: "task" /* TASK */
+            }
+          },
+          INSTRUMENTATION_NAMES.CLAUDE_AGENT_SDK
+        )
+      );
+      const startTime = getCurrentUnixTimestamp();
+      try {
+        span.log({
+          input: typeof originalPrompt === "string" ? originalPrompt : promptIsAsyncIterable ? void 0 : originalPrompt !== void 0 ? String(originalPrompt) : void 0,
+          metadata: filterSerializableOptions(options)
         });
-      },
-      end: (event) => {
-        const state = spans.get(event);
-        if (!state) {
-          return;
-        }
-        const eventResult = bindClaudeLocalToolContextToAsyncIterable(
-          event.result,
-          state.localToolContext
-        );
-        if (eventResult === void 0) {
-          state.span.end();
-          spans.delete(event);
-          return;
-        }
-        if (isAsyncIterable(eventResult)) {
-          patchStreamIfNeeded(eventResult, {
-            onChunk: (message) => {
-              maybeTrackToolUseContext(state, message);
-              state.processing = state.processing.then(() => handleStreamMessage(state, message)).catch((error) => {
-                console.error(
-                  "Error processing Claude Agent SDK stream chunk:",
-                  error
-                );
-              });
-            },
-            onComplete: () => state.processing.then(() => finalizeQuerySpan(state)).finally(() => {
-              spans.delete(event);
-            }),
-            onError: (error) => state.processing.then(() => {
-              state.span.log({
-                error: error.message
-              });
-            }).then(() => finalizeQuerySpan(state)).finally(() => {
-              spans.delete(event);
-            })
-          });
-          return;
-        }
-        try {
-          state.span.log({ output: eventResult });
-        } catch (error) {
-          console.error("Error extracting output for Claude Agent SDK:", error);
-        } finally {
-          state.span.end();
-          spans.delete(event);
+      } catch (error) {
+        console.error("Error extracting input for Claude Agent SDK:", error);
+      }
+      const activeToolSpans = /* @__PURE__ */ new Map();
+      const activeLlmSpansByParentToolUse = /* @__PURE__ */ new Map();
+      const conversationHistoryByParentKey = /* @__PURE__ */ new Map();
+      const subAgentSpans = /* @__PURE__ */ new Map();
+      const endedSubAgentSpans = /* @__PURE__ */ new Set();
+      const toolUseToParent = /* @__PURE__ */ new Map();
+      const latestLlmParentBySubAgentToolUse = /* @__PURE__ */ new Map();
+      const latestRootLlmParentRef = {
+        value: void 0
+      };
+      const subAgentDetailsByToolUseId = /* @__PURE__ */ new Map();
+      const taskIdToToolUseId = /* @__PURE__ */ new Map();
+      const promptMessagesByParentKey = /* @__PURE__ */ new Map();
+      const promptSourcePriorityByParentKey = /* @__PURE__ */ new Map();
+      const { hasLocalToolHandlers, localToolHookNames } = prepareLocalToolHandlersInMcpServers(options.mcpServers);
+      const skipLocalToolHooks = options[CLAUDE_AGENT_SDK_SKIP_LOCAL_TOOL_HOOKS_OPTION] === true || hasLocalToolHandlers;
+      const resolveToolUseParentSpan = async (toolUseID, context) => {
+        const trackedParentToolUseId = toolUseToParent.get(toolUseID);
+        const parentToolUseId = trackedParentToolUseId ?? (context?.agentId ? taskIdToToolUseId.get(context.agentId) ?? null : null);
+        const parentKey = llmParentKey(parentToolUseId);
+        const activeLlmSpan = activeLlmSpansByParentToolUse.get(parentKey);
+        const latestLlmParent = parentToolUseId ? latestLlmParentBySubAgentToolUse.get(parentToolUseId) : latestRootLlmParentRef.value;
+        if (!activeLlmSpan && !latestLlmParent) {
+          await ensureActiveLlmSpanForParentToolUse(
+            span,
+            activeLlmSpansByParentToolUse,
+            subAgentDetailsByToolUseId,
+            activeToolSpans,
+            subAgentSpans,
+            parentToolUseId,
+            getCurrentUnixTimestamp()
+          );
         }
-      },
-      error: (event) => {
-        const state = spans.get(event);
-        if (!state || !event.error) {
-          return;
+        if (parentToolUseId) {
+          const subAgentSpan = await ensureSubAgentSpan(
+            subAgentDetailsByToolUseId,
+            span,
+            activeToolSpans,
+            subAgentSpans,
+            parentToolUseId
+          );
+          return subAgentSpan.export();
         }
-        state.span.log({
-          error: event.error.message
+        return span.export();
+      };
+      const optionsWithHooks = injectTracingHooks(
+        options,
+        resolveToolUseParentSpan,
+        taskIdToToolUseId,
+        toolUseToParent,
+        activeToolSpans,
+        localToolHookNames,
+        skipLocalToolHooks,
+        subAgentDetailsByToolUseId,
+        subAgentSpans,
+        endedSubAgentSpans
+      );
+      params.options = optionsWithHooks;
+      return {
+        activeLlmSpansByParentToolUse,
+        activePartialMessageIdByParentKey: /* @__PURE__ */ new Map(),
+        activeToolSpans,
+        conversationHistoryByParentKey,
+        capturedPromptMessages,
+        currentMessageId: void 0,
+        currentMessageStartTime: startTime,
+        currentMessages: [],
+        endedSubAgentSpans,
+        finalOutputUsageMessageIds: /* @__PURE__ */ new Set(),
+        finalResults: [],
+        options: optionsWithHooks,
+        originalPrompt,
+        processing: Promise.resolve(),
+        promptDone,
+        promptMessagesByParentKey,
+        promptStarted: () => promptStarted,
+        promptSourcePriorityByParentKey,
+        span,
+        subAgentDetailsByToolUseId,
+        subAgentSpans,
+        taskIdToToolUseId,
+        latestLlmParentBySubAgentToolUse,
+        latestRootLlmParentRef,
+        toolUseToParent,
+        usageByMessageId: /* @__PURE__ */ new Map(),
+        localToolParentResolver: resolveToolUseParentSpan
+      };
+    };
+    const finishQuery = (state, result) => {
+      if (isAsyncIterable(result)) {
+        patchStreamIfNeeded(result, {
+          aroundNext: (callback) => runWithClaudeLocalToolContext(
+            callback,
+            state.localToolParentResolver
+          ),
+          onChunk: (message) => {
+            maybeTrackToolUseContext(state, message);
+            state.processing = state.processing.then(() => handleStreamMessage(state, message)).catch((error) => {
+              console.error(
+                "Error processing Claude Agent SDK stream chunk:",
+                error
+              );
+            });
+          },
+          onComplete: () => state.processing.then(() => finalizeQuerySpan(state)),
+          onError: (error) => state.processing.then(() => {
+            state.span.log({ error: error.message });
+          }).then(() => finalizeQuerySpan(state))
         });
+        return;
+      }
+      try {
+        state.span.log({ output: result });
+      } catch (error) {
+        console.error("Error extracting output for Claude Agent SDK:", error);
+      } finally {
         state.span.end();
-        spans.delete(event);
       }
     };
-    channel2.subscribe(handlers);
-    this.unsubscribers.push(() => {
-      channel2.unsubscribe(handlers);
-    });
+    this.unsubscribers.push(
+      claudeAgentSDKChannels.query.intercept((target, thisArg, args) => {
+        let state;
+        try {
+          args[0] ??= {};
+          state = startQuery(args[0]);
+        } catch (error) {
+          debugLogger.error(
+            "Error starting Claude Agent SDK instrumentation:",
+            error
+          );
+        }
+        const invokeTarget = () => Reflect.apply(target, thisArg, args);
+        try {
+          const result = state ? runWithClaudeLocalToolContext(
+            invokeTarget,
+            state.localToolParentResolver
+          ) : invokeTarget();
+          if (state) {
+            try {
+              finishQuery(state, result);
+            } catch (error) {
+              debugLogger.error(
+                "Error finalizing Claude Agent SDK instrumentation:",
+                error
+              );
+            }
+          }
+          return result;
+        } catch (error) {
+          if (state) {
+            try {
+              state.span.log({
+                error: error instanceof Error ? error.message : String(error)
+              });
+              state.span.end();
+            } catch (instrumentationError) {
+              debugLogger.error(
+                "Error handling Claude Agent SDK instrumentation failure:",
+                instrumentationError
+              );
+            }
+          }
+          throw error;
+        }
+      })
+    );
   }
 };
 
@@ -25211,7 +26091,7 @@ function patchOpenRouterCallModelResult(args) {
         span,
         () => originalMethod.apply(resultLike, args2)
       );
-      if (!isAsyncIterable4(stream)) {
+      if (!isAsyncIterable3(stream)) {
         return stream;
       }
       return wrapAsyncIterableWithSpan({
@@ -25406,7 +26286,7 @@ function wrapAsyncIterableWithSpan(args) {
     }
   };
 }
-function isAsyncIterable4(value) {
+function isAsyncIterable3(value) {
   return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function normalizeError(error) {
@@ -26284,7 +27164,7 @@ function patchOpenRouterCallModelResult2(args) {
         span,
         () => originalMethod.apply(resultLike, args2)
       );
-      if (!isAsyncIterable5(stream)) {
+      if (!isAsyncIterable4(stream)) {
         return stream;
       }
       return wrapAsyncIterableWithSpan2({
@@ -26479,7 +27359,7 @@ function wrapAsyncIterableWithSpan2(args) {
     }
   };
 }
-function isAsyncIterable5(value) {
+function isAsyncIterable4(value) {
   return !!value && (typeof value === "object" || typeof value === "function") && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function normalizeError2(error) {
@@ -32471,12 +33351,14 @@ function getMetricsFromResponse(response) {
       continue;
     }
     const inputTokenDetails = usageMetadata.input_token_details;
+    const outputTokenDetails = usageMetadata.output_token_details;
     return normalizeTokenMetrics({
       total_tokens: usageMetadata.total_tokens,
       prompt_tokens: usageMetadata.input_tokens,
       completion_tokens: usageMetadata.output_tokens,
       prompt_cache_creation_tokens: isRecord(inputTokenDetails) ? inputTokenDetails.cache_creation : void 0,
-      prompt_cached_tokens: isRecord(inputTokenDetails) ? inputTokenDetails.cache_read : void 0
+      prompt_cached_tokens: isRecord(inputTokenDetails) ? inputTokenDetails.cache_read : void 0,
+      completion_reasoning_tokens: isRecord(outputTokenDetails) ? outputTokenDetails.reasoning : void 0
     });
   }
   const llmOutput = response.llmOutput || {};
@@ -33063,6 +33945,9 @@ var piCodingAgentChannels = defineChannels(
 // src/instrumentation/plugins/pi-coding-agent-plugin.ts
 var piAgentPatchStates = /* @__PURE__ */ new WeakMap();
 var piAgentEventSubscriptions = /* @__PURE__ */ new WeakSet();
+var PI_TOOL_EXECUTE_WRAPPED = /* @__PURE__ */ Symbol.for(
+  "braintrust.pi_coding_agent.tool_execute_wrapped"
+);
 var piPromptContextStore;
 var PiCodingAgentPlugin = class extends BasePlugin {
   activePromptStates = /* @__PURE__ */ new Set();
@@ -33143,6 +34028,7 @@ function startPiPromptRun(event, onFinalize) {
     return void 0;
   }
   installPiAgentInstrumentation(agent);
+  wrapPiToolExecutors(agent.state?.tools);
   const metadata = {
     ...extractSessionMetadata(session),
     ...extractPromptOptionsMetadata(event.arguments[1]),
@@ -33187,7 +34073,7 @@ function extractSession(event) {
   return isObject(candidate) && typeof candidate.prompt === "function" ? candidate : void 0;
 }
 function isPiAgent(value) {
-  return isObject(value) && typeof value.streamFn === "function" && typeof value.subscribe === "function";
+  return isObject(value) && (typeof value.streamFunction === "function" || typeof value.streamFn === "function") && typeof value.subscribe === "function";
 }
 function promptContextStore() {
   piPromptContextStore ??= isomorph_default.newAsyncLocalStorage();
@@ -33197,17 +34083,21 @@ function currentPiPromptState() {
   return promptContextStore().getStore();
 }
 function installPiAgentInstrumentation(agent) {
+  const property = typeof agent.streamFunction === "function" ? "streamFunction" : "streamFn";
+  const streamFunction = agent[property];
   const existing = piAgentPatchStates.get(agent);
-  if (!existing || agent.streamFn !== existing.wrappedStreamFn) {
+  if (streamFunction && (!existing || existing.property !== property || streamFunction !== existing.wrappedStreamFunction)) {
     const patchState = {
-      originalStreamFn: agent.streamFn,
-      wrappedStreamFn: agent.streamFn
+      originalStreamFunction: streamFunction,
+      property,
+      wrappedStreamFunction: streamFunction
     };
-    patchState.wrappedStreamFn = makeInstrumentedStreamFn(
+    patchState.wrappedStreamFunction = makeInstrumentedStreamFunction(
       agent,
-      patchState.originalStreamFn
+      patchState.originalStreamFunction,
+      property
     );
-    agent.streamFn = patchState.wrappedStreamFn;
+    agent[property] = patchState.wrappedStreamFunction;
     piAgentPatchStates.set(agent, patchState);
   }
   if (piAgentEventSubscriptions.has(agent)) {
@@ -33232,14 +34122,21 @@ function installPiAgentInstrumentation(agent) {
     logInstrumentationError4("Pi Coding Agent event subscription", error);
   }
 }
-function makeInstrumentedStreamFn(agent, originalStreamFn) {
-  return async function instrumentedPiStreamFn(model, context, options) {
-    const invokeOriginal = () => Reflect.apply(originalStreamFn, this, [model, context, options]);
+function makeInstrumentedStreamFunction(agent, originalStreamFunction, property) {
+  return async function instrumentedPiStreamFunction(model, context, options) {
+    const invokeOriginal = () => Reflect.apply(originalStreamFunction, this, [model, context, options]);
     const state = currentPiPromptState();
     if (!state || state.agent !== agent || state.finalized) {
       return invokeOriginal();
     }
-    const llmState = await startPiLlmSpan(state, model, context, options);
+    wrapPiToolExecutors(context.tools);
+    const llmState = await startPiLlmSpan(
+      state,
+      model,
+      context,
+      property,
+      options
+    );
     try {
       const stream = await runWithAutoInstrumentationSuppressed(invokeOriginal);
       return patchAssistantMessageStream(stream, state, llmState);
@@ -33249,12 +34146,39 @@ function makeInstrumentedStreamFn(agent, originalStreamFn) {
     }
   };
 }
-async function startPiLlmSpan(state, model, context, options) {
+function wrapPiToolExecutors(tools) {
+  if (!tools) {
+    return;
+  }
+  for (const tool of tools) {
+    try {
+      const execute = tool.execute;
+      if (typeof execute !== "function" || execute[PI_TOOL_EXECUTE_WRAPPED]) {
+        continue;
+      }
+      const wrappedExecute = function(...args) {
+        return runWithAutoInstrumentationAllowed(
+          () => Reflect.apply(execute, this, args)
+        );
+      };
+      Object.defineProperty(wrappedExecute, PI_TOOL_EXECUTE_WRAPPED, {
+        configurable: false,
+        enumerable: false,
+        value: true,
+        writable: false
+      });
+      tool.execute = wrappedExecute;
+    } catch (error) {
+      logInstrumentationError4("Pi Coding Agent tool wrapping", error);
+    }
+  }
+}
+async function startPiLlmSpan(state, model, context, property, options) {
   const metadata = {
     ...extractModelMetadata2(model),
     ...extractStreamOptionsMetadata(options),
     ...extractToolMetadata(context.tools),
-    "pi_coding_agent.operation": "agent.streamFn"
+    "pi_coding_agent.operation": `agent.${property}`
   };
   const span = startSpan(
     withSpanInstrumentationName(
@@ -33420,35 +34344,26 @@ async function startPiToolSpan(state, event) {
   if (!event.toolCallId || state.activeToolSpans.has(event.toolCallId)) {
     return;
   }
-  const restoreAutoInstrumentation = enterAutoInstrumentationAllowed();
   const metadata = {
     "gen_ai.tool.call.id": event.toolCallId,
     "gen_ai.tool.name": event.toolName,
     "pi_coding_agent.tool.name": event.toolName
   };
-  try {
-    const span = startSpan(
-      withSpanInstrumentationName(
-        {
-          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
         },
-        INSTRUMENTATION_NAMES.PI_CODING_AGENT
-      )
-    );
-    state.activeToolSpans.set(event.toolCallId, {
-      restoreAutoInstrumentation,
-      span
-    });
-  } catch (error) {
-    restoreAutoInstrumentation();
-    throw error;
-  }
+        name: event.toolName || "tool",
+        parent: await state.span.export(),
+        spanAttributes: { type: "tool" /* TOOL */ }
+      },
+      INSTRUMENTATION_NAMES.PI_CODING_AGENT
+    )
+  );
+  state.activeToolSpans.set(event.toolCallId, { span });
 }
 function finishPiToolSpan(state, event) {
   const toolState = state.activeToolSpans.get(event.toolCallId);
@@ -33469,11 +34384,7 @@ function finishPiToolSpan(state, event) {
       output: event.result
     });
   } finally {
-    try {
-      toolState.span.end();
-    } finally {
-      toolState.restoreAutoInstrumentation?.();
-    }
+    toolState.span.end();
   }
 }
 function finishPiPromptRun(state, error) {
@@ -33544,14 +34455,10 @@ function finishPiLlmSpan(promptState, llmState, message, error) {
 }
 function finishOpenToolSpans(state, error) {
   for (const [, toolState] of state.activeToolSpans) {
-    try {
-      safeLog4(toolState.span, {
-        error: error ? toLoggedError(error) : "Pi tool did not complete"
-      });
-      toolState.span.end();
-    } finally {
-      toolState.restoreAutoInstrumentation?.();
-    }
+    safeLog4(toolState.span, {
+      error: error ? toLoggedError(error) : "Pi tool did not complete"
+    });
+    toolState.span.end();
   }
   state.activeToolSpans.clear();
 }
@@ -33870,12 +34777,12 @@ var MAX_STRANDS_STRING_ATTACHMENT_CACHE_ENTRIES = 32;
 var StrandsAgentSDKPlugin = class extends BasePlugin {
   activeChildParents = /* @__PURE__ */ new WeakMap();
   onEnable() {
-    this.subscribeToAgentStream();
-    this.subscribeToMultiAgentStream(
+    this.interceptAgentStream();
+    this.interceptMultiAgentStream(
       strandsAgentSDKChannels.graphStream,
       "Graph.stream"
     );
-    this.subscribeToMultiAgentStream(
+    this.interceptMultiAgentStream(
       strandsAgentSDKChannels.swarmStream,
       "Swarm.stream"
     );
@@ -33886,122 +34793,92 @@ var StrandsAgentSDKPlugin = class extends BasePlugin {
     }
     this.unsubscribers = [];
   }
-  subscribeToAgentStream() {
-    const channel2 = strandsAgentSDKChannels.agentStream.tracingChannel();
-    const states = /* @__PURE__ */ new WeakMap();
-    const unbindAutoInstrumentationSuppression = bindAutoInstrumentationSuppressionToStart(channel2);
-    const handlers = {
-      start: (event) => {
-        const state = startAgentStream(event, this.activeChildParents);
-        if (state) {
-          states.set(event, state);
-        }
-      },
-      end: (event) => {
-        const state = states.get(event);
-        if (!state) {
-          return;
-        }
-        const result = event.result;
-        if (isAsyncIterable(result)) {
-          patchStreamIfNeeded(result, {
-            aroundNext: (callback) => runWithAutoInstrumentationSuppressed(callback),
-            onChunk: (chunk) => handleAgentStreamEvent(state, chunk),
-            onComplete: () => {
-              finalizeAgentStream(state);
-              states.delete(event);
-            },
-            onError: (error) => {
-              finalizeAgentStream(state, error);
-              states.delete(event);
-            }
-          });
-          return;
-        }
-        finalizeAgentStream(state, void 0, result);
-        states.delete(event);
-      },
-      error: (event) => {
-        const state = states.get(event);
-        if (!state || !event.error) {
-          return;
-        }
-        finalizeAgentStream(state, event.error);
-        states.delete(event);
-      }
-    };
-    channel2.subscribe(handlers);
-    this.unsubscribers.push(() => {
-      unbindAutoInstrumentationSuppression?.();
-      channel2.unsubscribe(handlers);
-    });
+  interceptAgentStream() {
+    this.unsubscribers.push(
+      strandsAgentSDKChannels.agentStream.intercept(
+        (target, thisArg, args, additional) => instrumentStrandsStreamInvocation({
+          finalize: finalizeAgentStream,
+          handleChunk: handleAgentStreamEvent,
+          invoke: () => Reflect.apply(target, thisArg, args),
+          name: "Strands Agent SDK",
+          start: () => startAgentStream(
+            args[0],
+            extractAgent(additional.agent, thisArg),
+            this.activeChildParents
+          )
+        })
+      )
+    );
   }
-  subscribeToMultiAgentStream(channel2, operation) {
-    const tracingChannel = channel2.tracingChannel();
-    const states = /* @__PURE__ */ new WeakMap();
-    const unbindAutoInstrumentationSuppression = bindAutoInstrumentationSuppressionToStart(tracingChannel);
-    const handlers = {
-      start: (event) => {
-        const state = startMultiAgentStream(
-          event,
-          operation,
-          this.activeChildParents
-        );
-        if (state) {
-          states.set(event, state);
-        }
-      },
-      end: (event) => {
-        const state = states.get(event);
-        if (!state) {
-          return;
-        }
-        const result = event.result;
-        if (isAsyncIterable(result)) {
-          patchStreamIfNeeded(result, {
-            aroundNext: (callback) => runWithAutoInstrumentationSuppressed(callback),
-            onChunk: (chunk) => handleMultiAgentStreamEvent(
-              state,
-              chunk,
-              this.activeChildParents
-            ),
-            onComplete: () => {
-              finalizeMultiAgentStream(state, this.activeChildParents);
-              states.delete(event);
-            },
-            onError: (error) => {
-              finalizeMultiAgentStream(state, this.activeChildParents, error);
-              states.delete(event);
-            }
-          });
-          return;
-        }
-        finalizeMultiAgentStream(
-          state,
-          this.activeChildParents,
-          void 0,
-          result
+  interceptMultiAgentStream(channel2, operation) {
+    this.unsubscribers.push(
+      channel2.intercept(
+        (target, thisArg, args, additional) => instrumentStrandsStreamInvocation({
+          finalize: (state, error, output) => finalizeMultiAgentStream(
+            state,
+            this.activeChildParents,
+            error,
+            output
+          ),
+          handleChunk: (state, chunk) => handleMultiAgentStreamEvent(state, chunk, this.activeChildParents),
+          invoke: () => Reflect.apply(target, thisArg, args),
+          name: "Strands multi-agent",
+          start: () => startMultiAgentStream(
+            args[0],
+            extractOrchestrator(additional.orchestrator, thisArg),
+            operation,
+            this.activeChildParents
+          )
+        })
+      )
+    );
+  }
+};
+function instrumentStrandsStreamInvocation(options) {
+  let state;
+  try {
+    state = options.start();
+  } catch (error) {
+    debugLogger.error(`Error starting ${options.name} instrumentation:`, error);
+  }
+  let result;
+  try {
+    result = runWithAutoInstrumentationSuppressed(options.invoke);
+  } catch (error) {
+    if (state) {
+      try {
+        options.finalize(state, error);
+      } catch (instrumentationError) {
+        debugLogger.error(
+          `Error handling ${options.name} instrumentation failure:`,
+          instrumentationError
         );
-        states.delete(event);
-      },
-      error: (event) => {
-        const state = states.get(event);
-        if (!state || !event.error) {
-          return;
-        }
-        finalizeMultiAgentStream(state, this.activeChildParents, event.error);
-        states.delete(event);
       }
-    };
-    tracingChannel.subscribe(handlers);
-    this.unsubscribers.push(() => {
-      unbindAutoInstrumentationSuppression?.();
-      tracingChannel.unsubscribe(handlers);
-    });
+    }
+    throw error;
   }
-};
-function startAgentStream(event, activeChildParents) {
-  const agent = extractAgent(event);
+  if (state) {
+    try {
+      if (isAsyncIterable(result)) {
+        patchStreamIfNeeded(result, {
+          aroundNext: (callback) => runWithAutoInstrumentationSuppressed(callback),
+          onChunk: (chunk) => options.handleChunk(state, chunk),
+          onComplete: () => options.finalize(state),
+          onError: (error) => options.finalize(state, error)
+        });
+      } else {
+        options.finalize(state, void 0, result);
+      }
+    } catch (error) {
+      debugLogger.error(
+        `Error finalizing ${options.name} instrumentation:`,
+        error
+      );
+    }
+  }
+  return result;
+}
+function startAgentStream(input, agent, activeChildParents) {
   const model = agent?.model;
   const metadata = {
     ...extractAgentMetadata2(agent),
@@ -34011,17 +34888,14 @@ function startAgentStream(event, activeChildParents) {
   };
   const parentSpan = agent ? getOnlyChildParent(activeChildParents, agent) : void 0;
   const attachmentCache = createStrandsAttachmentCache();
-  const input = processStrandsInputAttachments(
-    event.arguments[0],
-    attachmentCache
-  );
+  const processedInput = processStrandsInputAttachments(input, attachmentCache);
   const span = parentSpan ? withCurrent(
     parentSpan,
     () => startSpan(
       withSpanInstrumentationName(
         {
           event: {
-            input,
+            input: processedInput,
             metadata
           },
           name: formatAgentSpanName(agent),
@@ -34034,7 +34908,7 @@ function startAgentStream(event, activeChildParents) {
     withSpanInstrumentationName(
       {
         event: {
-          input,
+          input: processedInput,
           metadata
         },
         name: formatAgentSpanName(agent),
@@ -34052,22 +34926,21 @@ function startAgentStream(event, activeChildParents) {
     startTime: getCurrentUnixTimestamp()
   };
 }
-function startMultiAgentStream(event, operation, activeChildParents) {
-  const orchestrator = extractOrchestrator(event);
+function startMultiAgentStream(input, orchestrator, operation, activeChildParents) {
   const metadata = {
     "strands.operation": operation,
     provider: "strands",
     ...orchestrator?.id ? { "strands.orchestrator.id": orchestrator.id } : {}
   };
   const parentSpan = orchestrator ? getOnlyChildParent(activeChildParents, orchestrator) : void 0;
-  const input = processStrandsInputAttachments(event.arguments[0]);
+  const processedInput = processStrandsInputAttachments(input);
   const span = parentSpan ? withCurrent(
     parentSpan,
     () => startSpan(
       withSpanInstrumentationName(
         {
           event: {
-            input,
+            input: processedInput,
             metadata
           },
           name: operation === "Graph.stream" ? "Strands Graph" : "Strands Swarm",
@@ -34080,7 +34953,7 @@ function startMultiAgentStream(event, operation, activeChildParents) {
     withSpanInstrumentationName(
       {
         event: {
-          input,
+          input: processedInput,
           metadata
         },
         name: operation === "Graph.stream" ? "Strands Graph" : "Strands Swarm",
@@ -34451,12 +35324,12 @@ function finalizeMultiAgentStream(state, activeChildParents, error, output) {
   });
   state.span.end();
 }
-function extractAgent(event) {
-  const candidate = event.agent ?? event.self;
+function extractAgent(agent, self) {
+  const candidate = agent ?? self;
   return isObject(candidate) && typeof candidate.stream === "function" ? candidate : void 0;
 }
-function extractOrchestrator(event) {
-  const candidate = event.orchestrator ?? event.self;
+function extractOrchestrator(orchestrator, self) {
+  const candidate = orchestrator ?? self;
   return isObject(candidate) && typeof candidate.stream === "function" ? candidate : void 0;
 }
 function extractAgentMetadata2(agent) {
@@ -36664,7 +37537,7 @@ function isAsync(fn) {
 function isAsyncGenerator2(fn) {
   return fn[Symbol.toStringTag] === "AsyncGenerator";
 }
-function isAsyncIterable6(obj) {
+function isAsyncIterable5(obj) {
   return typeof obj[Symbol.asyncIterator] === "function";
 }
 function wrapAsync(asyncFn) {
@@ -36836,7 +37709,7 @@ var eachOfLimit$2 = (limit) => {
     if (isAsyncGenerator2(obj)) {
       return asyncEachOfLimit(obj, limit, iteratee, callback);
     }
-    if (isAsyncIterable6(obj)) {
+    if (isAsyncIterable5(obj)) {
       return asyncEachOfLimit(obj[Symbol.asyncIterator](), limit, iteratee, callback);
     }
     var nextElem = createIterator(obj);
@@ -38272,7 +39145,7 @@ function callEvaluatorData(data) {
     baseExperiment
   };
 }
-function isAsyncIterable7(value) {
+function isAsyncIterable6(value) {
   return typeof value === "object" && value !== null && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function isIterable(value) {
@@ -38307,7 +39180,7 @@ async function _internalResolveEvaluatorData(evaluator, experiment) {
     }).asDataset();
   }
   const resolvedDataResult = dataResult instanceof Promise ? await dataResult : dataResult;
-  if (isAsyncIterable7(resolvedDataResult)) {
+  if (isAsyncIterable6(resolvedDataResult)) {
     return resolvedDataResult;
   }
   if (Array.isArray(resolvedDataResult) || isIterable(resolvedDataResult)) {
@@ -40207,14 +41080,9 @@ async function getDataset(state, data) {
       _internal_btql: data._internal_btql ?? void 0
     });
   } else if ("dataset_id" in data) {
-    const datasetInfo = await getDatasetById({
-      state,
-      datasetId: data.dataset_id
-    });
     return initDataset({
       state,
-      projectId: datasetInfo.projectId,
-      dataset: datasetInfo.dataset,
+      datasetId: data.dataset_id,
       version: data.dataset_version ?? void 0,
       environment: data.dataset_environment ?? void 0,
       _internal_btql: data._internal_btql ?? void 0
@@ -40225,23 +41093,6 @@ async function getDataset(state, data) {
     return data.data;
   }
 }
-var datasetFetchSchema = z14.object({
-  project_id: z14.string(),
-  name: z14.string()
-});
-async function getDatasetById({
-  state,
-  datasetId
-}) {
-  const dataset = await state.appConn().post_json("api/dataset/get", {
-    id: datasetId
-  });
-  const parsed = z14.array(datasetFetchSchema).parse(dataset);
-  if (parsed.length === 0) {
-    throw new Error(`Dataset '${datasetId}' not found`);
-  }
-  return { projectId: parsed[0].project_id, dataset: parsed[0].name };
-}
 function makeScorer(state, name, score, projectId) {
   const ret = async (input) => {
     const request = {