braintrust 3.28.0 → 3.30.0

package/dist/index.mjs

@@ -74,7 +74,6 @@ import {
   currentLogger,
   currentSpan,
   currentWorkflowAgentWrapperSpan,
-  debugLogger,
   deepCopyEvent,
   deserializePlainStringAsJSON,
   devNullWritableStream,
@@ -144,7 +143,7 @@ import {
   wrapMastraAgent,
   wrapTraced,
   zodToJsonSchema
-} from "./chunk-UPFNQCGB.mjs";
+} from "./chunk-BU6SM54N.mjs";
 import {
   INSTRUMENTATION_NAMES,
   __export,
@@ -156,6 +155,7 @@ import {
   cloudflareThinkChannels,
   cohereChannels,
   cursorSDKChannels,
+  debugLogger,
   genkitChannels,
   gitHubCopilotChannels,
   googleADKChannels,
@@ -177,7 +177,7 @@ import {
   strandsAgentSDKChannels,
   voyageAIChannels,
   withSpanInstrumentationName
-} from "./chunk-ZHUHZWFY.mjs";
+} from "./chunk-N3JKQ3D3.mjs";
 
 // src/exports.ts
 var exports_exports = {};
@@ -256,6 +256,7 @@ __export(exports_exports, {
   braintrustStreamChunkSchema: () => braintrustStreamChunkSchema,
   buildLocalSummary: () => buildLocalSummary,
   collectAnthropicSession: () => collectAnthropicSession,
+  completeOpenAIBatchTrace: () => completeOpenAIBatchTrace,
   configureInstrumentation: () => configureInstrumentation,
   constructLogs3OverflowRequest: () => constructLogs3OverflowRequest,
   createFinalValuePassThroughStream: () => createFinalValuePassThroughStream,
@@ -294,6 +295,8 @@ __export(exports_exports, {
   loginToState: () => loginToState,
   logs3OverflowUploadSchema: () => logs3OverflowUploadSchema,
   newId: () => newId,
+  openaiBatchesRetrieveTraced: () => openaiBatchesRetrieveTraced,
+  openaiFilesCreateTraced: () => openaiFilesCreateTraced,
   parseCachedHeader: () => parseCachedHeader,
   parseTemplateFormat: () => parseTemplateFormat,
   permalink: () => permalink,
@@ -458,6 +461,260 @@ async function registerSandbox(options) {
   };
 }
 
+// src/wrappers/openai-promise-utils.ts
+function splitSpanInfo(allParams) {
+  const { span_info, ...params } = allParams;
+  return {
+    params,
+    span_info
+  };
+}
+function createChannelContext(_channel, params, span_info) {
+  return {
+    arguments: (
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      [params]
+    ),
+    span_info
+  };
+}
+async function tracePromiseWithResponse(channel, traceContext, apiPromise) {
+  let enhancedResponse;
+  const tracePromise = (
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    channel.tracePromise
+  );
+  const data = await tracePromise(async () => {
+    enhancedResponse = await apiPromise.withResponse();
+    traceContext.response = enhancedResponse.response;
+    return enhancedResponse.data;
+  }, traceContext);
+  if (!enhancedResponse) {
+    throw new Error("Expected withResponse() to provide response");
+  }
+  return {
+    data,
+    response: enhancedResponse.response,
+    request_id: enhancedResponse.request_id
+  };
+}
+async function tracePromiseAsResponse(channel, traceContext, apiPromise) {
+  const tracePromise = (
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    channel.tracePromise
+  );
+  let response;
+  await tracePromise(async () => {
+    response = await apiPromise.asResponse();
+    traceContext.response = response;
+    return void 0;
+  }, traceContext);
+  if (!response) {
+    throw new Error("Expected asResponse() to provide response");
+  }
+  return response;
+}
+function createLazyAPIPromise(ensureExecuted, ensureResponse, getAPIPromise) {
+  let firstConsumption;
+  let enhancedResponsePromise;
+  let dataPromise;
+  let responsePromise;
+  const withResponse = () => {
+    firstConsumption ??= "data";
+    enhancedResponsePromise ??= firstConsumption === "data" ? ensureExecuted() : getAPIPromise().withResponse();
+    return enhancedResponsePromise;
+  };
+  const asResponse = () => {
+    firstConsumption ??= "response";
+    responsePromise ??= firstConsumption === "response" ? ensureResponse() : getAPIPromise().asResponse();
+    return responsePromise;
+  };
+  return new Proxy({}, {
+    get(target, prop, receiver) {
+      if (prop === "withResponse") {
+        return withResponse;
+      }
+      if (prop === "asResponse") {
+        return asResponse;
+      }
+      if (prop === "then" || prop === "catch" || prop === "finally" || prop in Promise.prototype) {
+        dataPromise ??= withResponse().then((result) => result.data);
+        const value = Reflect.get(dataPromise, prop, receiver);
+        return typeof value === "function" ? value.bind(dataPromise) : value;
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+
+// src/openai-batch.ts
+function read(value, key) {
+  if (value === null || typeof value !== "object" && typeof value !== "function") {
+    return void 0;
+  }
+  try {
+    return Reflect.get(value, key);
+  } catch {
+    return void 0;
+  }
+}
+function isAsyncIterable(value) {
+  return typeof read(value, Symbol.asyncIterator) === "function";
+}
+function teeAsyncIterable(source) {
+  const iterator = source[Symbol.asyncIterator]();
+  const stream = new ReadableStream({
+    async pull(controller) {
+      try {
+        const result = await iterator.next();
+        if (result.done) {
+          controller.close();
+          return;
+        }
+        if (!(result.value instanceof Uint8Array)) {
+          throw new TypeError(
+            "OpenAI upload streams must yield Uint8Array chunks"
+          );
+        }
+        controller.enqueue(result.value);
+      } catch (error) {
+        controller.error(error);
+      }
+    },
+    async cancel(reason) {
+      await iterator.return?.(reason);
+    }
+  });
+  const [uploadStream, trace] = stream.tee();
+  const upload = {
+    async *[Symbol.asyncIterator]() {
+      const reader = uploadStream.getReader();
+      try {
+        while (true) {
+          const result = await reader.read();
+          if (result.done) {
+            return;
+          }
+          yield result.value;
+        }
+      } finally {
+        reader.releaseLock();
+      }
+    }
+  };
+  const path = read(source, "path");
+  if (typeof path === "string") {
+    Object.defineProperty(upload, "path", { value: path });
+  }
+  return { upload, trace: new Response(trace) };
+}
+function teeUpload(upload) {
+  if (upload instanceof Blob) {
+    return { upload, trace: new Response(upload) };
+  }
+  if (upload instanceof Response) {
+    return { upload, trace: upload.clone() };
+  }
+  if (isAsyncIterable(upload)) {
+    return teeAsyncIterable(upload);
+  }
+  return void 0;
+}
+function openaiFilesCreateTraced(files) {
+  return (params, options) => {
+    const parent = getSpanParentObject();
+    const purpose = read(params, "purpose");
+    const file = read(params, "file");
+    if (purpose !== "batch") {
+      return files.create(params, options);
+    }
+    let branches;
+    try {
+      branches = teeUpload(file);
+    } catch {
+      return files.create(params, options);
+    }
+    if (!branches) {
+      return files.create(params, options);
+    }
+    const tracedParams = {
+      ...Object(params),
+      file: branches.upload
+    };
+    const apiPromise = files.create(tracedParams, options);
+    let enhancedResponse;
+    const tracedResponse = openAIChannels.filesCreateTraced.invoke(
+      async () => {
+        enhancedResponse = await apiPromise.withResponse();
+        return enhancedResponse.data;
+      },
+      files,
+      [{ params, inputFileContent: branches.trace, parent }],
+      {}
+    ).then((data) => {
+      if (!enhancedResponse) {
+        throw new Error(
+          "Expected OpenAI withResponse() to provide a response"
+        );
+      }
+      return { ...enhancedResponse, data };
+    });
+    return createLazyAPIPromise(
+      () => tracedResponse,
+      () => tracedResponse.then(({ response }) => response),
+      () => apiPromise
+    );
+  };
+}
+function openaiBatchesRetrieveTraced(batches) {
+  return (batchId, options) => {
+    const apiPromise = batches.retrieve(batchId, options);
+    let enhancedResponse;
+    const tracedResponse = openAIChannels.batchesRetrieveTraced.invoke(
+      async () => {
+        enhancedResponse = await apiPromise.withResponse();
+        return enhancedResponse.data;
+      },
+      batches,
+      [{ batchId }],
+      {}
+    ).then((data) => {
+      if (!enhancedResponse) {
+        throw new Error(
+          "Expected OpenAI withResponse() to provide a response"
+        );
+      }
+      return { ...enhancedResponse, data };
+    });
+    return createLazyAPIPromise(
+      () => tracedResponse,
+      () => tracedResponse.then(({ response }) => response),
+      () => apiPromise
+    );
+  };
+}
+async function completeOpenAIBatchTrace(args) {
+  const inputFileContent = Promise.resolve(args.inputFileContent);
+  const outputFileContent = args.outputFileContent === void 0 ? void 0 : Promise.resolve(args.outputFileContent);
+  const errorFileContent = args.errorFileContent === void 0 ? void 0 : Promise.resolve(args.errorFileContent);
+  void inputFileContent.catch(() => void 0);
+  void outputFileContent?.catch(() => void 0);
+  void errorFileContent?.catch(() => void 0);
+  await openAIChannels.batchesCompleteTrace.invoke(
+    async () => void 0,
+    void 0,
+    [
+      {
+        ...args,
+        inputFileContent,
+        outputFileContent,
+        errorFileContent
+      }
+    ],
+    {}
+  );
+}
+
 // src/functions/invoke.ts
 async function invoke(args) {
   const {
@@ -560,58 +817,6 @@ function initFunction({
   return f;
 }
 
-// src/wrappers/openai-promise-utils.ts
-function splitSpanInfo(allParams) {
-  const { span_info, ...params } = allParams;
-  return {
-    params,
-    span_info
-  };
-}
-function createChannelContext(_channel, params, span_info) {
-  return {
-    arguments: (
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      [params]
-    ),
-    span_info
-  };
-}
-async function tracePromiseWithResponse(channel, traceContext, apiPromise) {
-  let enhancedResponse;
-  const tracePromise = (
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    channel.tracePromise
-  );
-  const data = await tracePromise(async () => {
-    enhancedResponse = await apiPromise.withResponse();
-    traceContext.response = enhancedResponse.response;
-    return enhancedResponse.data;
-  }, traceContext);
-  if (!enhancedResponse) {
-    throw new Error("Expected withResponse() to provide response");
-  }
-  return { data, response: enhancedResponse.response };
-}
-function createLazyAPIPromise(ensureExecuted) {
-  let dataPromise = null;
-  return new Proxy({}, {
-    get(target, prop, receiver) {
-      if (prop === "withResponse") {
-        return () => ensureExecuted();
-      }
-      if (prop === "then" || prop === "catch" || prop === "finally" || prop in Promise.prototype) {
-        if (!dataPromise) {
-          dataPromise = ensureExecuted().then((result) => result.data);
-        }
-        const value = Reflect.get(dataPromise, prop, receiver);
-        return typeof value === "function" ? value.bind(dataPromise) : value;
-      }
-      return Reflect.get(target, prop, receiver);
-    }
-  });
-}
-
 // src/wrappers/oai_responses.ts
 function responsesProxy(openai) {
   if (!openai.responses) {
@@ -648,17 +853,33 @@ function wrapResponsesAsync(target, channel) {
   return (allParams, options) => {
     const { span_info, params } = splitSpanInfo(allParams);
     let executionPromise = null;
+    let apiPromise = null;
+    const getAPIPromise = () => {
+      apiPromise ??= target(params, options);
+      return apiPromise;
+    };
     const ensureExecuted = () => {
       if (!executionPromise) {
         executionPromise = (async () => {
           const traceContext = createChannelContext(channel, params, span_info);
-          const apiPromise = target(params, options);
-          return tracePromiseWithResponse(channel, traceContext, apiPromise);
+          return tracePromiseWithResponse(
+            channel,
+            traceContext,
+            getAPIPromise()
+          );
         })();
       }
       return executionPromise;
     };
-    return createLazyAPIPromise(ensureExecuted);
+    return createLazyAPIPromise(
+      ensureExecuted,
+      () => tracePromiseAsResponse(
+        channel,
+        createChannelContext(channel, params, span_info),
+        getAPIPromise()
+      ),
+      getAPIPromise
+    );
   };
 }
 function wrapResponsesSyncStream(target, channel) {
@@ -804,6 +1025,11 @@ function wrapChatCompletion(completion) {
       allParams
     );
     let executionPromise = null;
+    let apiPromise = null;
+    const getAPIPromise = () => {
+      apiPromise ??= completion(params, options);
+      return apiPromise;
+    };
     const ensureExecuted = () => {
       if (!executionPromise) {
         executionPromise = (async () => {
@@ -813,32 +1039,44 @@ function wrapChatCompletion(completion) {
             span_info
           );
           if (params.stream) {
-            const completionPromise = completion(
-              params,
-              options
+            const completionPromise = (
+              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+              getAPIPromise()
             );
-            const { data: data2, response: response2 } = await tracePromiseWithResponse(
+            const { data: data2, response: response2, request_id: request_id2 } = await tracePromiseWithResponse(
               openAIChannels.chatCompletionsCreate,
               traceContext,
               completionPromise
             );
-            return { data: data2, response: response2 };
+            return { data: data2, response: response2, request_id: request_id2 };
           }
-          const completionResponse = completion(
-            params,
-            options
+          const completionResponse = (
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            getAPIPromise()
           );
-          const { data, response } = await tracePromiseWithResponse(
+          const { data, response, request_id } = await tracePromiseWithResponse(
             openAIChannels.chatCompletionsCreate,
             traceContext,
             completionResponse
           );
-          return { data, response };
+          return { data, response, request_id };
         })();
       }
       return executionPromise;
     };
-    return createLazyAPIPromise(ensureExecuted);
+    return createLazyAPIPromise(
+      ensureExecuted,
+      () => tracePromiseAsResponse(
+        openAIChannels.chatCompletionsCreate,
+        createChannelContext(
+          openAIChannels.chatCompletionsCreate,
+          params,
+          span_info
+        ),
+        getAPIPromise()
+      ),
+      getAPIPromise
+    );
   };
 }
 function createEndpointProxy(target, wrapperFn) {
@@ -856,6 +1094,11 @@ function wrapApiCreateWithChannel(create, channel) {
   return (allParams, options) => {
     const { span_info, params } = splitSpanInfo(allParams);
     let executionPromise = null;
+    let apiPromise = null;
+    const getAPIPromise = () => {
+      apiPromise ??= create(params, options);
+      return apiPromise;
+    };
     const ensureExecuted = () => {
       if (!executionPromise) {
         executionPromise = (async () => {
@@ -863,13 +1106,21 @@ function wrapApiCreateWithChannel(create, channel) {
           return tracePromiseWithResponse(
             channel,
             traceContext,
-            create(params, options)
+            getAPIPromise()
           );
         })();
       }
       return executionPromise;
     };
-    return createLazyAPIPromise(ensureExecuted);
+    return createLazyAPIPromise(
+      ensureExecuted,
+      () => tracePromiseAsResponse(
+        channel,
+        createChannelContext(channel, params, span_info),
+        getAPIPromise()
+      ),
+      getAPIPromise
+    );
   };
 }
 var wrapEmbeddings = (create) => wrapApiCreateWithChannel(create, openAIChannels.embeddingsCreate);
@@ -905,6 +1156,13 @@ function wrapAISDK(aiSDK, options = {}) {
       switch (prop) {
         case "generateText":
           return wrapGenerateText(typedAISDK.generateText, options, typedAISDK);
+        case "generateImage":
+        case "experimental_generateImage":
+          return typeof original === "function" ? wrapGenerateImage(
+            original,
+            options,
+            typedAISDK
+          ) : original;
         case "streamText":
           return wrapStreamText(typedAISDK.streamText, options, typedAISDK);
         case "generateObject":
@@ -1141,6 +1399,32 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
     options
   );
 };
+var wrapGenerateImage = (generateImage, options = {}, aiSDK) => {
+  return makeGenerateImageWrapper(generateImage, { aiSDK }, options);
+};
+var makeGenerateImageWrapper = (generateImage, contextOptions = {}, options = {}) => {
+  const wrapper = async function(allParams) {
+    const { span_info, ...params } = allParams;
+    const tracedParams = { ...params };
+    return aiSDKChannels.generateImage.tracePromise(
+      () => generateImage(tracedParams),
+      createAISDKChannelContext(tracedParams, {
+        aiSDK: contextOptions.aiSDK,
+        denyOutputPaths: options.denyOutputPaths,
+        self: contextOptions.self,
+        span_info: mergeSpanInfo(span_info, {
+          name: "generateImage",
+          spanType: contextOptions.spanType
+        })
+      })
+    );
+  };
+  Object.defineProperty(wrapper, "name", {
+    value: "generateImage",
+    writable: false
+  });
+  return wrapper;
+};
 var makeEmbedWrapper = (channel, name, embed, contextOptions = {}, options = {}) => {
   const wrapper = async function(allParams) {
     const { span_info, ...params } = allParams;
@@ -1891,7 +2175,7 @@ function braintrustEveHook(options) {
     }
   };
 }
-function braintrustEveInstrumentation(options) {
+function createLegacyEveInstrumentation(options) {
   const state = options.defineState(EVE_TRACE_STATE_KEY, emptyEveTraceState);
   return {
     events: {
@@ -3279,8 +3563,10 @@ function capturedModelInput(modelInput) {
   const value = [];
   if (typeof instructions === "string") {
     value.push({ content: instructions, role: "system" });
-  } else if (instructions) {
+  } else if (Array.isArray(instructions)) {
     value.push(...instructions.map(capturedEveModelMessage));
+  } else if (instructions) {
+    value.push(capturedEveModelMessage(instructions));
   }
   value.push(...messages.map(capturedEveModelMessage));
   try {
@@ -3524,6 +3810,472 @@ async function deterministicEveId(...parts) {
   return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
 
+// src/instrumentation/plugins/eve-provider.ts
+var MAX_EVE_PROVIDER_CACHE_ENTRIES = 1e4;
+function createEveInstrumentationProvider(options = {}) {
+  const bridge = new EveProviderBridge(options.metadata);
+  return {
+    // Eve versions before tracePolicy use capture to decide whether provider
+    // events include content. Newer versions prefer tracePolicy when both are
+    // present, so keep the deprecated field for backwards compatibility.
+    capture: "content",
+    tracePolicy: () => ({
+      emit: true,
+      recordInputs: true,
+      recordOutputs: true
+    }),
+    events: {
+      "action.completed": (event, context) => bridge.handleActionTerminal(event, context),
+      "action.failed": (event, context) => bridge.handleActionTerminal(event, context),
+      "action.started": (event, context) => bridge.handleActionStarted(event, context),
+      "model.call.completed": (event, context) => bridge.handleModelTerminal(event, context),
+      "model.call.failed": (event, context) => bridge.handleModelTerminal(event, context),
+      "model.call.started": (event, context) => bridge.handleModelStarted(event, context),
+      "step.attempt.completed": (event) => bridge.handleStepAttemptTerminal(event),
+      "step.attempt.failed": (event) => bridge.handleStepAttemptTerminal(event),
+      "turn.cancelled": (event, context) => bridge.handleTurnTerminal(event, context),
+      "turn.completed": (event, context) => bridge.handleTurnTerminal(event, context),
+      "turn.failed": (event, context) => bridge.handleTurnTerminal(event, context),
+      "turn.started": (event, context) => bridge.handleTurnStarted(event, context)
+    },
+    flush,
+    setup: options.setup
+  };
+}
+var EveProviderBridge = class {
+  constructor(metadata) {
+    this.metadata = metadata;
+  }
+  metadata;
+  activeActions = /* @__PURE__ */ new Map();
+  activeModels = /* @__PURE__ */ new Map();
+  modelsByAttempt = /* @__PURE__ */ new Map();
+  settledOperations = new LRUCache({
+    max: MAX_EVE_PROVIDER_CACHE_ENTRIES
+  });
+  turns = new LRUCache({
+    max: MAX_EVE_PROVIDER_CACHE_ENTRIES
+  });
+  async handleTurnStarted(event, context) {
+    await this.contain("turn start", async () => {
+      if (this.settledOperations.has(event.idempotencyKey)) {
+        context.state.set({ skip: true });
+        return;
+      }
+      const { rowId, spanId } = await generateEveIds(
+        "turn",
+        event.idempotencyKey
+      );
+      const key = turnKey2(event.sessionId, event.turnId);
+      const stored = storedSpan(context);
+      if (stored && "exported" in stored && stored.rootSpanId) {
+        this.turns.set(key, { rootSpanId: stored.rootSpanId, spanId });
+        return;
+      }
+      let rootSpanId = spanId;
+      let parentSpanId;
+      if (event.parentLineage) {
+        const parentTurnKey = turnKey2(
+          event.parentLineage.sessionId,
+          event.parentLineage.turnId
+        );
+        const parentTurn = this.turns.get(parentTurnKey);
+        rootSpanId = parentTurn?.rootSpanId ?? // Eve propagates the root session through every nested subagent. Use
+        // it instead of the immediate parent session when no ancestor ran
+        // in-process.
+        (await generateEveIds(
+          "turn",
+          turnIdempotencyKey(
+            event.rootSessionId,
+            event.parentLineage.turnId
+          )
+        )).spanId;
+        parentSpanId = (await generateEveIds(
+          "subagent",
+          actionIdempotencyKey(
+            event.parentLineage.sessionId,
+            event.parentLineage.turnId,
+            event.parentLineage.callId
+          )
+        )).spanId;
+      }
+      const metadata = this.spanMetadata(event.sessionId);
+      const span = await this.startSpan(
+        context,
+        {
+          event: { id: rowId, metadata },
+          name: "eve.turn",
+          parentSpanIds: parentSpanId ? { rootSpanId, spanId: parentSpanId } : { parentSpanIds: [], rootSpanId },
+          spanAttributes: { type: "task" /* TASK */ },
+          spanId
+        },
+        rootSpanId
+      );
+      span?.log({ metadata });
+      this.turns.set(key, {
+        rootSpanId,
+        spanId
+      });
+    });
+  }
+  async handleTurnTerminal(event, context) {
+    await this.contain("turn terminal", async () => {
+      if (this.settledOperations.has(event.idempotencyKey)) {
+        context.state.set(void 0);
+        return;
+      }
+      const error = event.type === "turn.failed" ? event.error : void 0;
+      this.drainActionsForTurn(event.sessionId, event.turnId, error);
+      const stored = storedSpan(context);
+      if (stored && "exported" in stored) {
+        updateSpan({
+          exported: stored.exported,
+          ...error !== void 0 ? { error } : {},
+          metrics: { end: Date.now() / 1e3 }
+        });
+      }
+      this.settledOperations.set(event.idempotencyKey, true);
+      context.state.set(void 0);
+      this.turns.delete(turnKey2(event.sessionId, event.turnId));
+    });
+  }
+  async handleModelStarted(event, context) {
+    await this.contain("model start", async () => {
+      if (this.settledOperations.has(event.idempotencyKey)) {
+        context.state.set({ skip: true });
+        return;
+      }
+      const parent = await this.parentForScope(event.scope);
+      const { rowId, spanId } = await generateEveIds(
+        "step",
+        event.idempotencyKey
+      );
+      const input = event.input ? capturedModelInput(event.input) : void 0;
+      const metadata = {
+        ...this.spanMetadata(event.scope.sessionId),
+        model: event.model.modelId,
+        provider: event.model.provider
+      };
+      const span = await this.startSpan(context, {
+        event: {
+          id: rowId,
+          ...input !== void 0 ? { input } : {},
+          metadata
+        },
+        name: "eve.step",
+        parentSpanIds: parent,
+        spanAttributes: { type: "llm" /* LLM */ },
+        spanId
+      });
+      if (!span) return;
+      span.log({ ...input !== void 0 ? { input } : {}, metadata });
+      this.activeModels.set(event.idempotencyKey, {
+        span,
+        turnKey: turnKey2(event.scope.sessionId, event.scope.turnId)
+      });
+      const keys = this.modelsByAttempt.get(event.scope.attemptId) ?? /* @__PURE__ */ new Set();
+      keys.add(event.idempotencyKey);
+      this.modelsByAttempt.set(event.scope.attemptId, keys);
+    });
+  }
+  async handleModelTerminal(event, context) {
+    await this.contain("model terminal", async () => {
+      if (this.settledOperations.has(event.idempotencyKey)) {
+        context.state.set(void 0);
+        return;
+      }
+      const active = this.activeModels.get(event.idempotencyKey);
+      if (active) {
+        const span = active.span;
+        if (event.type === "model.call.failed") {
+          if (event.error !== void 0) span.log({ error: event.error });
+        } else {
+          span.log({
+            metrics: usageMetrics(event.usage),
+            output: modelOutput(event)
+          });
+        }
+        span.end();
+      } else {
+        const stored = storedSpan(context);
+        if (stored && "exported" in stored) {
+          updateSpan({
+            exported: stored.exported,
+            ...event.type === "model.call.failed" ? event.error !== void 0 ? { error: event.error } : {} : { output: modelOutput(event) },
+            metrics: {
+              ...event.type === "model.call.completed" ? usageMetrics(event.usage) : {},
+              end: Date.now() / 1e3
+            }
+          });
+        }
+      }
+      this.settledOperations.set(event.idempotencyKey, true);
+      this.forgetModel(event.scope.attemptId, event.idempotencyKey);
+      context.state.set(void 0);
+    });
+  }
+  async handleActionStarted(event, context) {
+    await this.contain("action start", async () => {
+      if (event.kind === "load-skill" || this.settledOperations.has(event.idempotencyKey)) {
+        context.state.set({ skip: true });
+        return;
+      }
+      const parent = await this.parentForScope(event.scope);
+      const { rowId, spanId } = await generateEveIds(
+        event.kind === "subagent-call" ? "subagent" : "tool",
+        event.idempotencyKey
+      );
+      const metadata = {
+        ...this.spanMetadata(event.scope.sessionId),
+        "eve.action_kind": event.kind
+      };
+      const span = await this.startSpan(context, {
+        event: {
+          id: rowId,
+          ...event.input !== void 0 ? { input: event.input } : {},
+          metadata
+        },
+        name: event.name,
+        parentSpanIds: parent,
+        spanAttributes: { type: "tool" /* TOOL */ },
+        spanId
+      });
+      if (!span) return;
+      span.log({
+        ...event.input !== void 0 ? { input: event.input } : {},
+        metadata
+      });
+      this.activeActions.set(event.idempotencyKey, {
+        span,
+        turnKey: turnKey2(event.scope.sessionId, event.scope.turnId)
+      });
+    });
+  }
+  async handleActionTerminal(event, context) {
+    await this.contain("action terminal", async () => {
+      if (this.settledOperations.has(event.idempotencyKey)) {
+        context.state.set(void 0);
+        return;
+      }
+      const stored = storedSpan(context);
+      if (stored?.skip) {
+        context.state.set(void 0);
+        return;
+      }
+      const active = this.activeActions.get(event.idempotencyKey);
+      const end = finiteTimestamp(event.acceptedAtMs) ?? Date.now();
+      if (active) {
+        const span = active.span;
+        if (event.type === "action.failed") {
+          span.log({
+            error: event.error ?? new Error(event.errorCode ?? `Eve action ${event.outcome}`)
+          });
+        } else if (event.output.type === "error") {
+          span.log({
+            error: event.output.error ?? new Error("Eve action returned an error")
+          });
+        } else {
+          span.log({ output: event.output.output });
+        }
+        span.end({ endTime: end / 1e3 });
+      } else {
+        const stored2 = storedSpan(context);
+        if (stored2 && "exported" in stored2) {
+          updateSpan({
+            exported: stored2.exported,
+            ...event.type === "action.failed" ? {
+              error: event.error ?? new Error(event.errorCode ?? `Eve action ${event.outcome}`)
+            } : event.output.type === "error" ? {
+              error: event.output.error ?? new Error("Eve action returned an error")
+            } : { output: event.output.output },
+            metrics: { end: end / 1e3 }
+          });
+        }
+      }
+      this.settledOperations.set(event.idempotencyKey, true);
+      this.activeActions.delete(event.idempotencyKey);
+      context.state.set(void 0);
+    });
+  }
+  handleStepAttemptTerminal(event) {
+    void this.contain("step attempt terminal", () => {
+      const keys = this.modelsByAttempt.get(event.scope.attemptId);
+      if (!keys) return;
+      for (const key of keys) {
+        const active = this.activeModels.get(key);
+        if (!active) continue;
+        if (event.type === "step.attempt.failed" && event.error !== void 0) {
+          active.span.log({ error: event.error });
+        }
+        active.span.end();
+        this.activeModels.delete(key);
+      }
+      this.modelsByAttempt.delete(event.scope.attemptId);
+    });
+  }
+  async parentForScope(scope) {
+    const key = turnKey2(scope.sessionId, scope.turnId);
+    const known = this.turns.get(key);
+    if (known) {
+      return { rootSpanId: known.rootSpanId, spanId: known.spanId };
+    }
+    const [{ spanId }, { spanId: rootSpanId }] = await Promise.all([
+      generateEveIds("turn", turnIdempotencyKey(scope.sessionId, scope.turnId)),
+      generateEveIds(
+        "turn",
+        turnIdempotencyKey(
+          scope.rootSessionId ?? scope.sessionId,
+          scope.turnId
+        )
+      )
+    ]);
+    return { rootSpanId, spanId };
+  }
+  async startSpan(context, args, rootSpanId) {
+    const span = withCurrent(
+      NOOP_SPAN,
+      () => _internalStartSpanWithInitialMerge(
+        withSpanInstrumentationName(args ?? {}, INSTRUMENTATION_NAMES.EVE)
+      )
+    );
+    try {
+      context.state.set({
+        exported: await span.export(),
+        ...rootSpanId ? { rootSpanId } : {}
+      });
+    } catch (error) {
+      debugLogger.warn("Error exporting Eve provider span:", error);
+    }
+    return span;
+  }
+  drainActionsForTurn(sessionId, turnId, error) {
+    const key = turnKey2(sessionId, turnId);
+    for (const [idempotencyKey, active] of this.activeActions) {
+      if (active.turnKey !== key) continue;
+      if (error !== void 0) active.span.log({ error });
+      active.span.end();
+      this.activeActions.delete(idempotencyKey);
+    }
+  }
+  forgetModel(attemptId, idempotencyKey) {
+    this.activeModels.delete(idempotencyKey);
+    const keys = this.modelsByAttempt.get(attemptId);
+    keys?.delete(idempotencyKey);
+    if (keys?.size === 0) this.modelsByAttempt.delete(attemptId);
+  }
+  spanMetadata(sessionId) {
+    return {
+      ...this.metadata ?? {},
+      "eve.session_id": sessionId
+    };
+  }
+  async contain(operation, fn) {
+    try {
+      await fn();
+    } catch (error) {
+      debugLogger.warn(`Error in Eve provider ${operation}:`, error);
+    }
+  }
+};
+function storedSpan(context) {
+  const value = context.state.get();
+  if (!isObject(value)) return void 0;
+  if (value["skip"] === true) return { skip: true };
+  return typeof value["exported"] === "string" ? {
+    exported: value["exported"],
+    ...typeof value["rootSpanId"] === "string" && value["rootSpanId"].length > 0 ? { rootSpanId: value["rootSpanId"] } : {}
+  } : void 0;
+}
+function modelOutput(event) {
+  const content = event.content ?? [];
+  let text = "";
+  const reasoning = [];
+  const toolCalls2 = [];
+  for (const part of content) {
+    if (part.type === "text") {
+      text += part.text;
+    } else if (part.type === "reasoning" && part.text.trim().length > 0) {
+      reasoning.push({ content: part.text });
+    } else if (part.type === "tool-call") {
+      toolCalls2.push({
+        function: {
+          arguments: safeJsonStringify(part.input),
+          name: part.toolName
+        },
+        id: part.callId,
+        type: "function"
+      });
+    }
+  }
+  return [
+    {
+      finish_reason: normalizeFinishReason2(event.finishReason),
+      index: 0,
+      message: {
+        content: text || null,
+        ...reasoning.length > 0 ? { reasoning } : {},
+        role: "assistant",
+        ...toolCalls2.length > 0 ? { tool_calls: toolCalls2 } : {}
+      }
+    }
+  ];
+}
+function usageMetrics(usage) {
+  const promptTokens = nonNegativeNumber(usage.inputTokens);
+  const completionTokens = nonNegativeNumber(usage.outputTokens);
+  const cachedTokens = nonNegativeNumber(
+    usage.inputTokenDetails?.cacheReadTokens
+  );
+  const cacheCreationTokens = nonNegativeNumber(
+    usage.inputTokenDetails?.cacheWriteTokens
+  );
+  return {
+    ...promptTokens !== void 0 ? { prompt_tokens: promptTokens } : {},
+    ...completionTokens !== void 0 ? { completion_tokens: completionTokens } : {},
+    ...promptTokens !== void 0 && completionTokens !== void 0 ? { tokens: promptTokens + completionTokens } : {},
+    ...cachedTokens !== void 0 ? { prompt_cached_tokens: cachedTokens } : {},
+    ...cacheCreationTokens !== void 0 ? { prompt_cache_creation_tokens: cacheCreationTokens } : {}
+  };
+}
+function nonNegativeNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
+}
+function finiteTimestamp(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function normalizeFinishReason2(value) {
+  if (value === "content-filter") return "content_filter";
+  if (value === "tool-calls") return "tool_calls";
+  return value;
+}
+function safeJsonStringify(value) {
+  try {
+    return JSON.stringify(value) ?? "null";
+  } catch {
+    return "null";
+  }
+}
+function turnKey2(sessionId, turnId) {
+  return `${sessionId}:${turnId}`;
+}
+function turnIdempotencyKey(sessionId, turnId) {
+  return `turn:${sessionId}:${turnId}`;
+}
+function actionIdempotencyKey(sessionId, turnId, callId) {
+  return `action:${sessionId}:${turnId}:${callId}`;
+}
+
+// src/instrumentation/plugins/eve-instrumentation.ts
+var EVE_INSTRUMENTATION_PROVIDER = /* @__PURE__ */ Symbol.for("eve.instrumentation.provider");
+function braintrustEveInstrumentation(options) {
+  const definition = "defineState" in options ? createLegacyEveInstrumentation(options) : createEveInstrumentationProvider(options);
+  const declaration = {
+    ...definition,
+    [EVE_INSTRUMENTATION_PROVIDER]: true
+  };
+  return declaration;
+}
+
 // src/typed-instrumentation-helpers.ts
 var TypedApplyProxy = Proxy;
 
@@ -3705,11 +4457,11 @@ function wrapClaudeAgentQuery(queryFn, defaultThis) {
         }
       };
       const invocationTarget = thisArg === proxy || thisArg === void 0 ? defaultThis ?? thisArg : thisArg;
-      return claudeAgentSDKChannels.query.traceSync(
-        () => Reflect.apply(target, invocationTarget, [wrappedParams]),
-        // The channel carries no extra context fields, but the generated
-        // StartOf<> type for Record<string, never> is overly strict here.
-        { arguments: [wrappedParams] }
+      return claudeAgentSDKChannels.query.invoke(
+        target,
+        invocationTarget,
+        [wrappedParams],
+        {}
       );
     }
   });
@@ -4324,13 +5076,11 @@ function wrapAgentInstance(agent) {
       if (prop === "stream" && typeof value === "function") {
         return function(args, options) {
           const callArgs = [args, options];
-          return strandsAgentSDKChannels.agentStream.traceSync(
-            () => Reflect.apply(value, target, callArgs),
-            {
-              agent: proxy,
-              arguments: callArgs,
-              self: proxy
-            }
+          return strandsAgentSDKChannels.agentStream.invoke(
+            value,
+            target,
+            callArgs,
+            { agent: proxy }
           );
         };
       }
@@ -4361,12 +5111,12 @@ function wrapMultiAgentInstance(orchestrator, kind) {
         return function(input, options) {
           const callArgs = [input, options];
           const channel = kind === "graph" ? strandsAgentSDKChannels.graphStream : strandsAgentSDKChannels.swarmStream;
-          return channel.traceSync(
-            () => Reflect.apply(value, target, callArgs),
+          return channel.invoke(
+            value,
+            target,
+            callArgs,
             {
-              arguments: callArgs,
-              orchestrator: proxy,
-              self: proxy
+              orchestrator: proxy
             }
           );
         };
@@ -6318,9 +7068,6 @@ var VitestContextManager = class {
   getCurrentContext() {
     return this.contextStorage.getStore();
   }
-  setContext(context) {
-    this.contextStorage.enterWith(context);
-  }
   runInContext(context, callback) {
     return this.contextStorage.run(context, callback);
   }
@@ -6665,8 +7412,7 @@ function wrapDescribe(originalDescribe, config, afterAll) {
         if (config.onProgress) {
           config.onProgress({ type: "suite_start", suiteName });
         }
-        contextManager.setContext(lazyContext);
-        factory();
+        contextManager.runInContext(lazyContext, factory);
         if (afterAll) {
           afterAll(async () => {
             await flushExperimentWithSync(context, config);
@@ -7245,7 +7991,7 @@ function isAsync(fn) {
 function isAsyncGenerator(fn) {
   return fn[Symbol.toStringTag] === "AsyncGenerator";
 }
-function isAsyncIterable(obj) {
+function isAsyncIterable2(obj) {
   return typeof obj[Symbol.asyncIterator] === "function";
 }
 function wrapAsync(asyncFn) {
@@ -7417,7 +8163,7 @@ var eachOfLimit$2 = (limit) => {
     if (isAsyncGenerator(obj)) {
       return asyncEachOfLimit(obj, limit, iteratee, callback);
     }
-    if (isAsyncIterable(obj)) {
+    if (isAsyncIterable2(obj)) {
       return asyncEachOfLimit(obj[Symbol.asyncIterator](), limit, iteratee, callback);
     }
     var nextElem = createIterator(obj);
@@ -8772,7 +9518,7 @@ function callEvaluatorData(data) {
     baseExperiment
   };
 }
-function isAsyncIterable2(value) {
+function isAsyncIterable3(value) {
   return typeof value === "object" && value !== null && Symbol.asyncIterator in value && typeof value[Symbol.asyncIterator] === "function";
 }
 function isIterable(value) {
@@ -8807,7 +9553,7 @@ async function _internalResolveEvaluatorData(evaluator, experiment) {
     }).asDataset();
   }
   const resolvedDataResult = dataResult instanceof Promise ? await dataResult : dataResult;
-  if (isAsyncIterable2(resolvedDataResult)) {
+  if (isAsyncIterable3(resolvedDataResult)) {
     return resolvedDataResult;
   }
   if (Array.isArray(resolvedDataResult) || isIterable(resolvedDataResult)) {
@@ -11855,6 +12601,7 @@ export {
   braintrustStreamChunkSchema,
   buildLocalSummary,
   collectAnthropicSession,
+  completeOpenAIBatchTrace,
   configureInstrumentation,
   constructLogs3OverflowRequest,
   createFinalValuePassThroughStream,
@@ -11894,6 +12641,8 @@ export {
   loginToState,
   logs3OverflowUploadSchema,
   newId,
+  openaiBatchesRetrieveTraced,
+  openaiFilesCreateTraced,
   parseCachedHeader,
   parseTemplateFormat,
   permalink,