braintrust 3.4.0 → 3.5.0

package/dist/edge-light.js

@@ -179,8 +179,54 @@ var DefaultAsyncLocalStorage = class {
     return void 0;
   }
 };
-var DefaultTracingChannel = class {
+var DefaultChannel = class {
+  constructor(name) {
+    this.name = name;
+  }
   hasSubscribers = false;
+  subscribe(_subscription) {
+  }
+  unsubscribe(_subscription) {
+    return false;
+  }
+  bindStore(_store, _transform) {
+  }
+  unbindStore(_store) {
+    return false;
+  }
+  publish(_message) {
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  runStores(_message, fn, thisArg, ...args) {
+    return fn.apply(thisArg, args);
+  }
+};
+var DefaultTracingChannel = class {
+  start;
+  end;
+  asyncStart;
+  asyncEnd;
+  error;
+  constructor(nameOrChannels) {
+    if (typeof nameOrChannels === "string") {
+      this.start = new DefaultChannel(`tracing:${nameOrChannels}:start`);
+      this.end = new DefaultChannel(`tracing:${nameOrChannels}:end`);
+      this.asyncStart = new DefaultChannel(
+        `tracing:${nameOrChannels}:asyncStart`
+      );
+      this.asyncEnd = new DefaultChannel(`tracing:${nameOrChannels}:asyncEnd`);
+      this.error = new DefaultChannel(`tracing:${nameOrChannels}:error`);
+      return;
+    }
+    this.start = nameOrChannels.start ?? new DefaultChannel("tracing:start");
+    this.end = nameOrChannels.end ?? new DefaultChannel("tracing:end");
+    this.asyncStart = nameOrChannels.asyncStart ?? new DefaultChannel("tracing:asyncStart");
+    this.asyncEnd = nameOrChannels.asyncEnd ?? new DefaultChannel("tracing:asyncEnd");
+    this.error = nameOrChannels.error ?? new DefaultChannel("tracing:error");
+  }
+  get hasSubscribers() {
+    return this.start.hasSubscribers || this.end.hasSubscribers || this.asyncStart.hasSubscribers || this.asyncEnd.hasSubscribers || this.error.hasSubscribers;
+  }
   subscribe(_handlers) {
   }
   unsubscribe(_handlers) {
@@ -208,7 +254,7 @@ var iso = {
   getCallerLocation: () => void 0,
   newAsyncLocalStorage: () => new DefaultAsyncLocalStorage(),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  newTracingChannel: (_nameOrChannels) => new DefaultTracingChannel(),
+  newTracingChannel: (nameOrChannels) => new DefaultTracingChannel(nameOrChannels),
   processOn: (_0, _1) => {
   },
   basename: (filepath) => filepath.split(/[\\/]/).pop() || filepath,
@@ -2275,6 +2321,8 @@ var Experiment = import_v36.z.object({
   deleted_at: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   dataset_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   dataset_version: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  parameters_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  parameters_version: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   public: import_v36.z.boolean(),
   user_id: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
   metadata: import_v36.z.union([import_v36.z.object({}).partial().passthrough(), import_v36.z.null()]).optional(),
@@ -2297,7 +2345,11 @@ var SpanType = import_v36.z.union([
   import_v36.z.null()
 ]);
 var SpanAttributes = import_v36.z.union([
-  import_v36.z.object({ name: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]), type: SpanType }).partial().passthrough(),
+  import_v36.z.object({
+    name: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]),
+    type: SpanType,
+    purpose: import_v36.z.union([import_v36.z.literal("scorer"), import_v36.z.null()])
+  }).partial().passthrough(),
   import_v36.z.null()
 ]);
 var ExperimentEvent = import_v36.z.object({
@@ -2737,6 +2789,7 @@ var FunctionId = import_v36.z.union([
       version: import_v36.z.string()
     }),
     code: import_v36.z.string(),
+    function_type: FunctionTypeEnum.and(import_v36.z.unknown()).optional(),
     name: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional()
   }),
   import_v36.z.object({
@@ -2966,7 +3019,12 @@ var TopicAutomationConfig = import_v36.z.object({
   topic_map_functions: import_v36.z.array(TopicMapFunctionAutomation),
   scope: import_v36.z.union([SpanScope, TraceScope, GroupScope, import_v36.z.null()]).optional(),
   data_scope: TopicAutomationDataScope.optional(),
-  btql_filter: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional()
+  btql_filter: import_v36.z.union([import_v36.z.string(), import_v36.z.null()]).optional(),
+  backfill_time_range: import_v36.z.union([
+    import_v36.z.string(),
+    import_v36.z.object({ from: import_v36.z.string(), to: import_v36.z.string() }),
+    import_v36.z.null()
+  ]).optional()
 });
 var ProjectAutomation = import_v36.z.object({
   id: import_v36.z.string().uuid(),
@@ -4403,6 +4461,12 @@ var parametersRowSchema = import_v38.z.object({
   }),
   metadata: import_v38.z.union([import_v38.z.object({}).partial().passthrough(), import_v38.z.null()]).optional()
 });
+var InlineAttachmentReferenceSchema = import_v38.z.object({
+  type: import_v38.z.literal("inline_attachment"),
+  src: import_v38.z.string().min(1),
+  content_type: import_v38.z.string().optional(),
+  filename: import_v38.z.string().optional()
+});
 var LoginInvalidOrgError = class extends Error {
   constructor(message) {
     super(message);
@@ -6604,6 +6668,7 @@ function init(projectOrOptions, optionalOptions) {
     experiment,
     description,
     dataset,
+    parameters,
     baseExperiment,
     isPublic,
     open,
@@ -6721,6 +6786,17 @@ function init(projectOrOptions, optionalOptions) {
           args["dataset_version"] = await dataset.version();
         }
       }
+      if (parameters !== void 0) {
+        if (RemoteEvalParameters.isParameters(parameters)) {
+          args["parameters_id"] = parameters.id;
+          args["parameters_version"] = parameters.version;
+        } else {
+          args["parameters_id"] = parameters.id;
+          if (parameters.version !== void 0) {
+            args["parameters_version"] = parameters.version;
+          }
+        }
+      }
       if (isPublic !== void 0) {
         args["public"] = isPublic;
       }
@@ -8919,40 +8995,85 @@ var Dataset2 = class extends ObjectFetcher {
     return typeof data === "object" && data !== null && "__braintrust_dataset_marker" in data;
   }
 };
+function isAttachmentObject(value) {
+  return BraintrustAttachmentReference.safeParse(value).success || InlineAttachmentReferenceSchema.safeParse(value).success || ExternalAttachmentReference.safeParse(value).success;
+}
+function isURL(url) {
+  try {
+    const parsedUrl = new URL(url.trim());
+    return parsedUrl.protocol === "http:" || parsedUrl.protocol === "https:";
+  } catch {
+    return false;
+  }
+}
+function expandAttachmentArrayPreTemplate(content, variables) {
+  if (typeof content !== "string") return null;
+  const match = content.match(/^\{\{\s*([\w.]+)\s*\}\}$/);
+  if (!match) return null;
+  const varPath = match[1];
+  const value = varPath.includes(".") ? getObjValueByPath(variables, varPath.split(".")) : variables[varPath];
+  if (!Array.isArray(value)) return null;
+  const allValid = value.every(
+    (v) => isAttachmentObject(v) || typeof v === "string" && isURL(v)
+  );
+  if (!allValid) return null;
+  return value.map((item) => ({
+    type: "image_url",
+    image_url: { url: item }
+  }));
+}
 function renderMessage(render, message) {
+  return renderMessageImpl(render, message, {});
+}
+function renderMessageImpl(render, message, variables) {
   return {
     ...message,
     ..."content" in message ? {
-      content: isEmpty2(message.content) ? void 0 : typeof message.content === "string" ? render(message.content) : message.content.map((c) => {
+      content: isEmpty2(message.content) ? void 0 : typeof message.content === "string" ? render(message.content) : message.content.flatMap((c) => {
         switch (c.type) {
           case "text":
-            return { ...c, text: render(c.text) };
+            return [{ ...c, text: render(c.text) }];
           case "image_url":
             if (isObject(c.image_url.url)) {
               throw new Error(
                 "Attachments must be replaced with URLs before calling `build()`"
               );
             }
-            return {
-              ...c,
-              image_url: {
-                ...c.image_url,
-                url: render(c.image_url.url)
+            if (variables) {
+              const expanded = expandAttachmentArrayPreTemplate(
+                c.image_url.url,
+                variables
+              );
+              if (expanded) {
+                return expanded;
               }
-            };
+            }
+            return [
+              {
+                ...c,
+                image_url: {
+                  ...c.image_url,
+                  url: render(c.image_url.url)
+                }
+              }
+            ];
           case "file":
-            return {
-              ...c,
-              file: {
-                file_data: render(c.file.file_data || ""),
-                ...c.file.file_id && {
-                  file_id: render(c.file.file_id)
-                },
-                ...c.file.filename && {
-                  filename: render(c.file.filename)
+            return [
+              {
+                ...c,
+                file: {
+                  ...c.file.file_data && {
+                    file_data: render(c.file.file_data)
+                  },
+                  ...c.file.file_id && {
+                    file_id: render(c.file.file_id)
+                  },
+                  ...c.file.filename && {
+                    filename: render(c.file.filename)
+                  }
                 }
               }
-            };
+            ];
           default:
             const _exhaustiveCheck = c;
             return _exhaustiveCheck;
@@ -9109,17 +9230,19 @@ var Prompt2 = class _Prompt {
   }
   runBuild(buildArgs, options) {
     const { flavor } = options;
-    const params = {
-      ...this.defaults,
-      ...Object.fromEntries(
-        Object.entries(this.options.params || {}).filter(
-          ([k, _v]) => !BRAINTRUST_PARAMS.includes(k)
-        )
-      ),
-      ...!isEmpty2(this.options.model) ? {
-        model: this.options.model
-      } : {}
-    };
+    const params = Object.fromEntries(
+      Object.entries({
+        ...this.defaults,
+        ...Object.fromEntries(
+          Object.entries(this.options.params || {}).filter(
+            ([k, _v]) => !BRAINTRUST_PARAMS.includes(k)
+          )
+        ),
+        ...!isEmpty2(this.options.model) ? {
+          model: this.options.model
+        } : {}
+      }).filter(([key, value]) => key !== "response_format" || value !== null)
+    );
     if (!("model" in params) || isEmpty2(params.model)) {
       throw new Error(
         "No model specified. Either specify it in the prompt or as a default"
@@ -9219,7 +9342,7 @@ var Prompt2 = class _Prompt {
         templateFormat
       });
       const baseMessages = (prompt.messages || []).map(
-        (m) => renderMessage(render, m)
+        (m) => renderMessageImpl(render, m, variables)
       );
       const hasSystemPrompt = baseMessages.some((m) => m.role === "system");
       const messages = [
@@ -9417,6 +9540,40 @@ var _exportsForTestingOnly = {
   // Expose isomorph for build type detection
 };
 
+// src/runtime-async-local-storage.ts
+function isAsyncLocalStorageConstructor(candidate) {
+  return typeof candidate === "function";
+}
+function resolveRuntimeAsyncLocalStorage() {
+  try {
+    const globalAsyncLocalStorage = Reflect.get(
+      globalThis,
+      "AsyncLocalStorage"
+    );
+    if (isAsyncLocalStorageConstructor(globalAsyncLocalStorage)) {
+      return globalAsyncLocalStorage;
+    }
+    if (typeof process === "undefined") {
+      return void 0;
+    }
+    const getBuiltinModule = Reflect.get(process, "getBuiltinModule");
+    if (typeof getBuiltinModule !== "function") {
+      return void 0;
+    }
+    const asyncHooksModule = getBuiltinModule("node:async_hooks");
+    if (typeof asyncHooksModule !== "object" || asyncHooksModule === null) {
+      return void 0;
+    }
+    if (!("AsyncLocalStorage" in asyncHooksModule)) {
+      return void 0;
+    }
+    const { AsyncLocalStorage: runtimeAsyncLocalStorage } = asyncHooksModule;
+    return isAsyncLocalStorageConstructor(runtimeAsyncLocalStorage) ? runtimeAsyncLocalStorage : void 0;
+  } catch {
+    return void 0;
+  }
+}
+
 // src/edge-light/config.ts
 var edgeLightConfigured = false;
 function configureEdgeLight() {
@@ -9424,11 +9581,9 @@ function configureEdgeLight() {
     return;
   }
   isomorph_default.buildType = "edge-light";
-  try {
-    if (typeof AsyncLocalStorage !== "undefined") {
-      isomorph_default.newAsyncLocalStorage = () => new AsyncLocalStorage();
-    }
-  } catch {
+  const runtimeAsyncLocalStorage = resolveRuntimeAsyncLocalStorage();
+  if (runtimeAsyncLocalStorage) {
+    isomorph_default.newAsyncLocalStorage = () => new runtimeAsyncLocalStorage();
   }
   isomorph_default.getEnv = (name) => {
     if (typeof process === "undefined" || typeof process.env === "undefined") {
@@ -10189,15 +10344,23 @@ function createEndpointProxy(target, wrapperFn) {
   });
 }
 function wrapApiCreateWithChannel(create, channel2) {
-  return async (allParams, options) => {
+  return (allParams, options) => {
     const { span_info, params } = splitSpanInfo(allParams);
-    const traceContext = createChannelContext(channel2, params, span_info);
-    const { data } = await tracePromiseWithResponse(
-      channel2,
-      traceContext,
-      create(params, options)
-    );
-    return data;
+    let executionPromise = null;
+    const ensureExecuted = () => {
+      if (!executionPromise) {
+        executionPromise = (async () => {
+          const traceContext = createChannelContext(channel2, params, span_info);
+          return tracePromiseWithResponse(
+            channel2,
+            traceContext,
+            create(params, options)
+          );
+        })();
+      }
+      return executionPromise;
+    };
+    return createLazyAPIPromise(ensureExecuted);
   };
 }
 var wrapEmbeddings = (create) => wrapApiCreateWithChannel(create, openAIChannels.embeddingsCreate);
@@ -10377,6 +10540,93 @@ function zodToJsonSchema(schema) {
   return (0, import_zod_to_json_schema.zodToJsonSchema)(schema);
 }
 
+// src/wrappers/ai-sdk/normalize-logged-output.ts
+var REMOVE_NORMALIZED_VALUE = Symbol("braintrust.ai-sdk.remove-normalized");
+function normalizeAISDKLoggedOutput(value) {
+  const normalized = normalizeAISDKLoggedValue(value);
+  return normalized === REMOVE_NORMALIZED_VALUE ? {} : normalized;
+}
+function normalizeAISDKLoggedValue(value, context = {}) {
+  if (Array.isArray(value)) {
+    return value.map((entry) => normalizeAISDKLoggedValue(entry, context)).filter((entry) => entry !== REMOVE_NORMALIZED_VALUE);
+  }
+  if (!value || typeof value !== "object") {
+    return value;
+  }
+  const nextInProviderMetadata = context.inProviderMetadata || context.parentKey === "providerMetadata" || context.parentKey === "experimental_providerMetadata";
+  const normalizedEntries = [];
+  for (const [key, entry] of Object.entries(value)) {
+    if (key === "cachedPromptTokens" && entry === 0) {
+      continue;
+    }
+    if (context.parentKey === "request" && key === "body" && entry === "<omitted>") {
+      continue;
+    }
+    const normalizedEntry = normalizeAISDKLoggedValue(entry, {
+      inProviderMetadata: nextInProviderMetadata,
+      parentKey: key
+    });
+    if (normalizedEntry === REMOVE_NORMALIZED_VALUE) {
+      continue;
+    }
+    normalizedEntries.push([key, normalizedEntry]);
+  }
+  if (normalizedEntries.length === 0) {
+    if (context.parentKey === "request" || nextInProviderMetadata) {
+      return REMOVE_NORMALIZED_VALUE;
+    }
+    return {};
+  }
+  return Object.fromEntries(normalizedEntries);
+}
+
+// src/wrappers/ai-sdk/tool-serialization.ts
+function isZodSchema(value) {
+  return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
+}
+function serializeZodSchema(schema) {
+  try {
+    return zodToJsonSchema(schema);
+  } catch {
+    return {
+      type: "object",
+      description: "Zod schema (conversion failed)"
+    };
+  }
+}
+function serializeTool(tool) {
+  if (!tool || typeof tool !== "object") {
+    return tool;
+  }
+  const serialized = { ...tool };
+  if (isZodSchema(serialized.inputSchema)) {
+    serialized.inputSchema = serializeZodSchema(serialized.inputSchema);
+  }
+  if (isZodSchema(serialized.parameters)) {
+    serialized.parameters = serializeZodSchema(serialized.parameters);
+  }
+  if ("execute" in serialized) {
+    delete serialized.execute;
+  }
+  if ("render" in serialized) {
+    delete serialized.render;
+  }
+  return serialized;
+}
+function serializeAISDKToolsForLogging(tools) {
+  if (!tools || typeof tools !== "object") {
+    return tools;
+  }
+  if (Array.isArray(tools)) {
+    return tools.map(serializeTool);
+  }
+  const serialized = {};
+  for (const [key, tool] of Object.entries(tools)) {
+    serialized[key] = serializeTool(tool);
+  }
+  return serialized;
+}
+
 // src/wrappers/ai-sdk/ai-sdk.ts
 var DENY_OUTPUT_PATHS = [
   // v3
@@ -10471,9 +10721,11 @@ var wrapAgentGenerate = (generate, instance, options = {}) => {
   return async (params) => makeGenerateTextWrapper(
     `${instance.constructor.name}.generate`,
     options,
-    generate.bind(instance)
+    generate.bind(instance),
     // as of v5 this is just streamText under the hood
     // Follows what the AI SDK does under the hood when calling generateText
+    void 0,
+    "function" /* FUNCTION */
   )({ ...instance.settings, ...params });
 };
 var wrapAgentStream = (stream, instance, options = {}) => {
@@ -10482,11 +10734,12 @@ var wrapAgentStream = (stream, instance, options = {}) => {
     options,
     stream.bind(instance),
     // as of v5 this is just streamText under the hood
-    void 0
+    void 0,
     // aiSDK not needed since model is already on instance
+    "function" /* FUNCTION */
   )({ ...instance.settings, ...params });
 };
-var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
+var makeGenerateTextWrapper = (name, options, generateText, aiSDK, spanType = "llm" /* LLM */) => {
   const wrapper = async function(allParams) {
     const { span_info, ...params } = allParams;
     const {
@@ -10495,6 +10748,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
@@ -10525,7 +10779,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
       {
         name: spanName || name,
         spanAttributes: {
-          type: "llm" /* LLM */,
+          type: spanType,
           ...spanInfoAttrs
         },
         event: {
@@ -10534,6 +10788,7 @@ var makeGenerateTextWrapper = (name, options, generateText, aiSDK) => {
             ...spanInfoMetadata,
             model,
             ...provider ? { provider } : {},
+            ...serializedTools ? { tools: serializedTools } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -10568,6 +10823,7 @@ var wrapModel = (model, ai) => {
   const originalDoStream = resolvedModel.doStream?.bind(resolvedModel);
   const { model: modelId, provider } = serializeModelWithProvider(resolvedModel);
   const wrappedDoGenerate = async (options) => {
+    const serializedTools = serializeAISDKToolsForLogging(options.tools);
     const processedInput = await processInputAttachments2(options);
     return traced(
       async (span) => {
@@ -10600,6 +10856,7 @@ var wrapModel = (model, ai) => {
           metadata: {
             model: modelId,
             ...provider ? { provider } : {},
+            ...serializedTools ? { tools: serializedTools } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -10612,6 +10869,7 @@ var wrapModel = (model, ai) => {
   const wrappedDoStream = async (options) => {
     const startTime = Date.now();
     let receivedFirst = false;
+    const serializedTools = serializeAISDKToolsForLogging(options.tools);
     const processedInput = await processInputAttachments2(options);
     const span = startSpan({
       name: "doStream",
@@ -10623,6 +10881,7 @@ var wrapModel = (model, ai) => {
         metadata: {
           model: modelId,
           ...provider ? { provider } : {},
+          ...serializedTools ? { tools: serializedTools } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -10636,7 +10895,7 @@ var wrapModel = (model, ai) => {
     let reasoning = "";
     const toolCalls = [];
     let object = void 0;
-    const extractTextDelta = (chunk) => {
+    const extractTextDelta2 = (chunk) => {
       if (typeof chunk.textDelta === "string") return chunk.textDelta;
       if (typeof chunk.delta === "string") return chunk.delta;
       if (typeof chunk.text === "string") return chunk.text;
@@ -10655,7 +10914,7 @@ var wrapModel = (model, ai) => {
         }
         switch (chunk.type) {
           case "text-delta":
-            text += extractTextDelta(chunk);
+            text += extractTextDelta2(chunk);
             break;
           case "reasoning-delta":
             if (chunk.delta) {
@@ -10755,6 +11014,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const processedInput = await processInputAttachments2(params);
     return traced(
       async (span) => {
@@ -10795,6 +11055,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
             ...spanInfoMetadata,
             model,
             ...provider ? { provider } : {},
+            ...serializedTools ? { tools: serializedTools } : {},
             braintrust: {
               integration_name: "ai-sdk",
               sdk_language: "typescript"
@@ -10805,7 +11066,7 @@ var wrapGenerateObject = (generateObject, options = {}, aiSDK) => {
     );
   };
 };
-var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
+var makeStreamTextWrapper = (name, options, streamText, aiSDK, spanType = "llm" /* LLM */) => {
   const wrapper = function(allParams) {
     const { span_info, ...params } = allParams;
     const {
@@ -10814,11 +11075,12 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const { input: processedInput, outputPromise } = processInputAttachmentsSync(params);
     const span = startSpan({
       name: spanName || name,
       spanAttributes: {
-        type: "llm" /* LLM */,
+        type: spanType,
         ...spanInfoAttrs
       },
       event: {
@@ -10827,6 +11089,7 @@ var makeStreamTextWrapper = (name, options, streamText, aiSDK) => {
           ...spanInfoMetadata,
           model,
           ...provider ? { provider } : {},
+          ...serializedTools ? { tools: serializedTools } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -10942,6 +11205,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
       spanAttributes: spanInfoAttrs
     } = span_info ?? {};
     const { model, provider } = serializeModelWithProvider(params.model);
+    const serializedTools = serializeAISDKToolsForLogging(params.tools);
     const { input: processedInput, outputPromise } = processInputAttachmentsSync(params);
     const span = startSpan({
       name: spanName || "streamObject",
@@ -10955,6 +11219,7 @@ var wrapStreamObject = (streamObject, options = {}, aiSDK) => {
           ...spanInfoMetadata,
           model,
           ...provider ? { provider } : {},
+          ...serializedTools ? { tools: serializedTools } : {},
           braintrust: {
             integration_name: "ai-sdk",
             sdk_language: "typescript"
@@ -11221,10 +11486,10 @@ function extractGatewayRoutingInfo(result) {
   }
   return null;
 }
-var isZodSchema = (value) => {
+var isZodSchema2 = (value) => {
   return value != null && typeof value === "object" && "_def" in value && typeof value._def === "object";
 };
-var serializeZodSchema = (schema) => {
+var serializeZodSchema2 = (schema) => {
   try {
     return zodToJsonSchema(schema);
   } catch {
@@ -11234,34 +11499,6 @@ var serializeZodSchema = (schema) => {
     };
   }
 };
-var processTools = (tools) => {
-  if (!tools || typeof tools !== "object") return tools;
-  if (Array.isArray(tools)) {
-    return tools.map(processTool);
-  }
-  const processed = {};
-  for (const [key, tool] of Object.entries(tools)) {
-    processed[key] = processTool(tool);
-  }
-  return processed;
-};
-var processTool = (tool) => {
-  if (!tool || typeof tool !== "object") return tool;
-  const processed = { ...tool };
-  if (isZodSchema(processed.inputSchema)) {
-    processed.inputSchema = serializeZodSchema(processed.inputSchema);
-  }
-  if (isZodSchema(processed.parameters)) {
-    processed.parameters = serializeZodSchema(processed.parameters);
-  }
-  if ("execute" in processed) {
-    processed.execute = "[Function]";
-  }
-  if ("render" in processed) {
-    processed.render = "[Function]";
-  }
-  return processed;
-};
 var isOutputObject = (value) => {
   if (value == null || typeof value !== "object") {
     return false;
@@ -11300,10 +11537,10 @@ var serializeOutputObject = (output, model) => {
       if (typeof responseFormat.then === "function") {
         result.response_format = Promise.resolve(responseFormat).then(
           (resolved) => {
-            if (resolved.schema && isZodSchema(resolved.schema)) {
+            if (resolved.schema && isZodSchema2(resolved.schema)) {
               return {
                 ...resolved,
-                schema: serializeZodSchema(resolved.schema)
+                schema: serializeZodSchema2(resolved.schema)
               };
             }
             return resolved;
@@ -11311,10 +11548,10 @@ var serializeOutputObject = (output, model) => {
         );
       } else {
         const syncResponseFormat = responseFormat;
-        if (syncResponseFormat.schema && isZodSchema(syncResponseFormat.schema)) {
+        if (syncResponseFormat.schema && isZodSchema2(syncResponseFormat.schema)) {
           responseFormat = {
             ...syncResponseFormat,
-            schema: serializeZodSchema(syncResponseFormat.schema)
+            schema: serializeZodSchema2(syncResponseFormat.schema)
           };
         }
         result.response_format = responseFormat;
@@ -11340,14 +11577,14 @@ var processInputAttachmentsSync = (input) => {
       processed.prompt = processPromptContent(input.prompt);
     }
   }
-  if (input.tools) {
-    processed.tools = processTools(input.tools);
+  if (input.schema && isZodSchema2(input.schema)) {
+    processed.schema = serializeZodSchema2(input.schema);
   }
-  if (input.schema && isZodSchema(input.schema)) {
-    processed.schema = serializeZodSchema(input.schema);
+  if (input.callOptionsSchema && isZodSchema2(input.callOptionsSchema)) {
+    processed.callOptionsSchema = serializeZodSchema2(input.callOptionsSchema);
   }
-  if (input.callOptionsSchema && isZodSchema(input.callOptionsSchema)) {
-    processed.callOptionsSchema = serializeZodSchema(input.callOptionsSchema);
+  if (input.tools) {
+    processed.tools = serializeAISDKToolsForLogging(input.tools);
   }
   let outputPromise;
   if (input.output && isOutputObject(input.output)) {
@@ -11381,14 +11618,14 @@ var processInputAttachments2 = async (input) => {
       processed.prompt = processPromptContent(input.prompt);
     }
   }
-  if (input.tools) {
-    processed.tools = processTools(input.tools);
+  if (input.schema && isZodSchema2(input.schema)) {
+    processed.schema = serializeZodSchema2(input.schema);
   }
-  if (input.schema && isZodSchema(input.schema)) {
-    processed.schema = serializeZodSchema(input.schema);
+  if (input.callOptionsSchema && isZodSchema2(input.callOptionsSchema)) {
+    processed.callOptionsSchema = serializeZodSchema2(input.callOptionsSchema);
   }
-  if (input.callOptionsSchema && isZodSchema(input.callOptionsSchema)) {
-    processed.callOptionsSchema = serializeZodSchema(input.callOptionsSchema);
+  if (input.tools) {
+    processed.tools = serializeAISDKToolsForLogging(input.tools);
   }
   if (input.output && isOutputObject(input.output)) {
     const serialized = serializeOutputObject(input.output, input.model);
@@ -11589,7 +11826,9 @@ var processOutput = async (output, denyOutputPaths) => {
   const getterValues = extractGetterValues(output);
   const processed = await processOutputAttachments(output);
   const merged = { ...processed, ...getterValues };
-  return omit(merged, denyOutputPaths ?? DENY_OUTPUT_PATHS);
+  return normalizeAISDKLoggedOutput(
+    omit(merged, denyOutputPaths ?? DENY_OUTPUT_PATHS)
+  );
 };
 var processOutputAttachments = async (output) => {
   try {
@@ -13667,11 +13906,13 @@ function serializeInput(params) {
   if (params.config) {
     const config = tryToDict(params.config);
     if (config) {
-      const tools = serializeTools(params);
-      if (tools) {
-        config.tools = tools;
-      }
-      input.config = config;
+      const filteredConfig = {};
+      Object.keys(config).forEach((key) => {
+        if (key !== "tools") {
+          filteredConfig[key] = config[key];
+        }
+      });
+      input.config = filteredConfig;
     }
   }
   return input;
@@ -13752,6 +13993,10 @@ function extractMetadata(params) {
       });
     }
   }
+  const tools = serializeTools(params);
+  if (tools) {
+    metadata.tools = tools;
+  }
   return metadata;
 }
 function extractGenerateContentMetrics(response, start) {
@@ -14789,7 +15034,7 @@ function unescapePath(path) {
 }
 var graph_framework_default = { createGraph };
 
-// ../node_modules/async/dist/async.mjs
+// ../node_modules/.pnpm/async@3.2.5/node_modules/async/dist/async.mjs
 function initialParams(fn) {
   return function(...args) {
     var callback = args.pop();
@@ -14914,6 +15159,7 @@ function isArrayLike(value) {
   return value && typeof value.length === "number" && value.length >= 0 && value.length % 1 === 0;
 }
 var breakLoop = {};
+var breakLoop$1 = breakLoop;
 function once(fn) {
   function wrapper(...args) {
     if (fn === null) return;
@@ -15005,7 +15251,7 @@ function asyncEachOfLimit(generator, limit, iteratee, callback) {
       canceled = true;
       return;
     }
-    if (result === breakLoop || done && running <= 0) {
+    if (result === breakLoop$1 || done && running <= 0) {
       done = true;
       return callback(null);
     }
@@ -15048,7 +15294,7 @@ var eachOfLimit$2 = (limit) => {
       } else if (err === false) {
         done = true;
         canceled = true;
-      } else if (value === breakLoop || done && running <= 0) {
+      } else if (value === breakLoop$1 || done && running <= 0) {
         done = true;
         return callback(null);
       } else if (!looping) {
@@ -15091,7 +15337,7 @@ function eachOfArrayLike(coll, iteratee, callback) {
     if (canceled === true) return;
     if (err) {
       callback(err);
-    } else if (++completed === length || value === breakLoop) {
+    } else if (++completed === length || value === breakLoop$1) {
       callback(null);
     }
   }
@@ -15487,7 +15733,7 @@ function _createTester(check, getResult) {
         if (check(result) && !testResult) {
           testPassed = true;
           testResult = getResult(true, value);
-          return callback(null, breakLoop);
+          return callback(null, breakLoop$1);
         }
         callback();
       });
@@ -16111,7 +16357,8 @@ var promptDefinitionSchema = promptContentsSchema.and(
   import_v310.z.object({
     model: import_v310.z.string(),
     params: ModelParams.optional(),
-    templateFormat: import_v310.z.enum(["mustache", "nunjucks", "none"]).optional()
+    templateFormat: import_v310.z.enum(["mustache", "nunjucks", "none"]).optional(),
+    environments: import_v310.z.array(import_v310.z.string()).optional()
   })
 );
 var promptDefinitionWithToolsSchema = promptDefinitionSchema.and(
@@ -16270,6 +16517,22 @@ function initExperiment2(state, options = {}) {
     setCurrent: false
   });
 }
+async function getExperimentParametersRef(parameters) {
+  if (!parameters) {
+    return void 0;
+  }
+  const resolvedParameters = parameters instanceof Promise ? await parameters : parameters;
+  if (!RemoteEvalParameters.isParameters(resolvedParameters)) {
+    return void 0;
+  }
+  if (resolvedParameters.id === void 0) {
+    return void 0;
+  }
+  return {
+    id: resolvedParameters.id,
+    version: resolvedParameters.version
+  };
+}
 function callEvaluatorData(data) {
   const dataResult = typeof data === "function" ? data() : data;
   let baseExperiment = void 0;
@@ -16336,6 +16599,7 @@ async function Eval(name, evaluator, reporterOrOpts) {
     const { data, baseExperiment: defaultBaseExperiment } = callEvaluatorData(
       evaluator.data
     );
+    const parameters = await getExperimentParametersRef(evaluator.parameters);
     const experiment = options.parent || options.noSendLogs ? null : initExperiment2(evaluator.state, {
       ...evaluator.projectId ? { projectId: evaluator.projectId } : { project: name },
       experiment: evaluator.experimentName,
@@ -16348,7 +16612,8 @@ async function Eval(name, evaluator, reporterOrOpts) {
       baseExperimentId: evaluator.baseExperimentId,
       gitMetadataSettings: evaluator.gitMetadataSettings,
       repoInfo: evaluator.repoInfo,
-      dataset: Dataset2.isDataset(data) ? data : void 0
+      dataset: Dataset2.isDataset(data) ? data : void 0,
+      parameters
     });
     if (experiment && typeof process !== "undefined" && globalThis.BRAINTRUST_CONTEXT_MANAGER !== void 0) {
       await experiment._waitForId();
@@ -16403,7 +16668,7 @@ async function Eval(name, evaluator, reporterOrOpts) {
       if (experiment) {
         await experiment.flush().catch(console.error);
       } else if (options.parent) {
-        await flush().catch(console.error);
+        await flush({ state: evaluator.state }).catch(console.error);
       }
     }
   } finally {
@@ -16791,6 +17056,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
       },
       Math.max(evaluator.maxConcurrency ?? Number.MAX_SAFE_INTEGER, 1)
     );
+    const queueErrors = [];
     const enqueuePromise = (async () => {
       for await (const datum of dataIterable) {
         if (cancelled) {
@@ -16806,7 +17072,11 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
           }
           scheduledTrials++;
           progressReporter.setTotal?.(evaluator.evalName, scheduledTrials);
-          q.push({ datum, trialIndex });
+          q.pushAsync({ datum, trialIndex }).catch((e) => {
+            if (queueErrors.length < 5) {
+              queueErrors.push(e);
+            }
+          });
         }
       }
     })();
@@ -16854,6 +17124,12 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
     })();
     try {
       await Promise.race([waitForQueue, cancel()]);
+      if (queueErrors.length > 0) {
+        throw new AggregateError(
+          queueErrors,
+          `Encountered ${queueErrors.length} unhandled task errors`
+        );
+      }
     } catch (e) {
       q.kill();
       if (e instanceof InternalAbortError) {
@@ -17257,6 +17533,7 @@ var CodePrompt = class {
   toolFunctions;
   tags;
   metadata;
+  environmentSlugs;
   constructor(project, prompt, toolFunctions, opts, functionType) {
     this.project = project;
     this.name = opts.name;
@@ -17269,6 +17546,7 @@ var CodePrompt = class {
     this.functionType = functionType;
     this.tags = opts.tags;
     this.metadata = opts.metadata;
+    this.environmentSlugs = opts.environments;
   }
   async toFunctionDefinition(projectNameToId) {
     const prompt_data = {
@@ -17303,7 +17581,8 @@ var CodePrompt = class {
       prompt_data,
       if_exists: this.ifExists,
       tags: this.tags,
-      metadata: this.metadata
+      metadata: this.metadata,
+      environments: this.environmentSlugs && this.environmentSlugs.length > 0 ? this.environmentSlugs.map((slug) => ({ slug })) : void 0
     };
   }
 };
@@ -18085,7 +18364,11 @@ function startSpanForEvent(config, event, channelName) {
   });
   const startTime = getCurrentUnixTimestamp();
   try {
-    const { input, metadata } = config.extractInput(event.arguments);
+    const { input, metadata } = config.extractInput(
+      event.arguments,
+      event,
+      span
+    );
     span.log({
       input,
       metadata: mergeInputMetadata(metadata, spanInfoMetadata)
@@ -18249,6 +18532,16 @@ function traceStreamingChannel(channel2, config) {
         });
         return;
       }
+      if (config.patchResult?.({
+        channelName,
+        endEvent: asyncEndEvent,
+        result: asyncEndEvent.result,
+        span,
+        startTime
+      })) {
+        states.delete(event);
+        return;
+      }
       try {
         const output = config.extractOutput(
           asyncEndEvent.result,
@@ -18305,8 +18598,17 @@ function traceSyncStreamChannel(channel2, config) {
         return;
       }
       const { span, startTime } = spanData;
-      const resultEvent = event;
-      const stream = resultEvent.result;
+      const endEvent = event;
+      if (config.patchResult?.({
+        channelName,
+        endEvent,
+        result: endEvent.result,
+        span,
+        startTime
+      })) {
+        return;
+      }
+      const stream = endEvent.result;
       if (!isSyncStreamLike(stream)) {
         span.end();
         states.delete(event);
@@ -18971,6 +19273,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamText",
     kind: "async"
   }),
+  streamTextSync: channel({
+    channelName: "streamText.sync",
+    kind: "sync-stream"
+  }),
   generateObject: channel({
     channelName: "generateObject",
     kind: "async"
@@ -18979,6 +19285,10 @@ var aiSDKChannels = defineChannels("ai", {
     channelName: "streamObject",
     kind: "async"
   }),
+  streamObjectSync: channel({
+    channelName: "streamObject.sync",
+    kind: "sync-stream"
+  }),
   agentGenerate: channel({
     channelName: "Agent.generate",
     kind: "async"
@@ -18986,6 +19296,14 @@ var aiSDKChannels = defineChannels("ai", {
   agentStream: channel({
     channelName: "Agent.stream",
     kind: "async"
+  }),
+  toolLoopAgentGenerate: channel({
+    channelName: "ToolLoopAgent.generate",
+    kind: "async"
+  }),
+  toolLoopAgentStream: channel({
+    channelName: "ToolLoopAgent.stream",
+    kind: "async"
   })
 });
 
@@ -19004,6 +19322,8 @@ var DEFAULT_DENY_OUTPUT_PATHS = [
   "steps[].response.body",
   "steps[].response.headers"
 ];
+var AUTO_PATCHED_MODEL = Symbol.for("braintrust.ai-sdk.auto-patched-model");
+var AUTO_PATCHED_TOOL = Symbol.for("braintrust.ai-sdk.auto-patched-tool");
 var AISDKPlugin = class extends BasePlugin {
   config;
   constructor(config = {}) {
@@ -19022,22 +19342,12 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.generateText, {
         name: "generateText",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
           return processAISDKOutput(result, denyOutputPaths);
         },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics2(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
@@ -19045,45 +19355,43 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamText, {
         name: "streamText",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
-          return processAISDKOutput(result, denyOutputPaths);
-        },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics2(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
-        aggregateChunks: aggregateAISDKChunks
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(aiSDKChannels.streamTextSync, {
+        name: "streamText",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
       })
     );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.generateObject, {
         name: "generateObject",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
           return processAISDKOutput(result, denyOutputPaths);
         },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics2(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
@@ -19091,45 +19399,43 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.streamObject, {
         name: "streamObject",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
-          return processAISDKOutput(result, denyOutputPaths);
-        },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics2(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
-        aggregateChunks: aggregateAISDKChunks
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceSyncStreamChannel(aiSDKChannels.streamObjectSync, {
+        name: "streamObject",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
       })
     );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.agentGenerate, {
         name: "Agent.generate",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
           return processAISDKOutput(result, denyOutputPaths);
         },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics2(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
@@ -19137,52 +19443,470 @@ var AISDKPlugin = class extends BasePlugin {
       traceStreamingChannel(aiSDKChannels.agentStream, {
         name: "Agent.stream",
         type: "llm" /* LLM */,
-        extractInput: ([params]) => {
-          return {
-            input: processAISDKInput(params),
-            metadata: extractMetadataFromParams(params)
-          };
-        },
-        extractOutput: (result) => {
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(aiSDKChannels.toolLoopAgentGenerate, {
+        name: "ToolLoopAgent.generate",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result, endEvent) => {
+          finalizeAISDKChildTracing(endEvent);
           return processAISDKOutput(result, denyOutputPaths);
         },
-        extractMetrics: (result, startTime) => {
-          const metrics = extractTokenMetrics2(result);
-          if (startTime) {
-            metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
-          }
-          return metrics;
-        },
+        extractMetrics: (result, _startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent),
         aggregateChunks: aggregateAISDKChunks
       })
     );
+    this.unsubscribers.push(
+      traceStreamingChannel(aiSDKChannels.toolLoopAgentStream, {
+        name: "ToolLoopAgent.stream",
+        type: "llm" /* LLM */,
+        extractInput: ([params], event, span) => prepareAISDKInput(params, event, span, denyOutputPaths),
+        extractOutput: (result) => processAISDKOutput(result, denyOutputPaths),
+        extractMetrics: (result, startTime, endEvent) => extractTopLevelAISDKMetrics(result, endEvent, startTime),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          denyOutputPaths,
+          endEvent,
+          result,
+          span,
+          startTime
+        })
+      })
+    );
   }
 };
 function processAISDKInput(params) {
   if (!params) return params;
-  return processInputAttachments(params);
+  const input = processInputAttachments(params);
+  if (!input || typeof input !== "object" || Array.isArray(input)) {
+    return input;
+  }
+  const { tools: _tools, ...rest } = input;
+  return rest;
 }
-function extractMetadataFromParams(params) {
+function prepareAISDKInput(params, event, span, denyOutputPaths) {
+  const input = processAISDKInput(params);
+  const metadata = extractMetadataFromParams(params, event.self);
+  const childTracing = prepareAISDKChildTracing(
+    params,
+    event.self,
+    span,
+    denyOutputPaths
+  );
+  event.__braintrust_ai_sdk_model_wrapped = childTracing.modelWrapped;
+  if (childTracing.cleanup) {
+    event.__braintrust_ai_sdk_cleanup = childTracing.cleanup;
+  }
+  return {
+    input,
+    metadata
+  };
+}
+function extractTopLevelAISDKMetrics(result, event, startTime) {
+  const metrics = hasModelChildTracing(event) ? {} : extractTokenMetrics2(result);
+  if (startTime) {
+    metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
+  }
+  return metrics;
+}
+function hasModelChildTracing(event) {
+  return event?.__braintrust_ai_sdk_model_wrapped === true;
+}
+function extractMetadataFromParams(params, self) {
   const metadata = {
     braintrust: {
       integration_name: "ai-sdk",
       sdk_language: "typescript"
     }
   };
-  const { model, provider } = serializeModelWithProvider2(params.model);
+  const agentModel = self && typeof self === "object" && "model" in self && self.model ? self.model : self && typeof self === "object" && "settings" in self && self.settings?.model ? self.settings?.model : void 0;
+  const { model, provider } = serializeModelWithProvider2(
+    params.model ?? agentModel
+  );
   if (model) {
     metadata.model = model;
   }
   if (provider) {
     metadata.provider = provider;
   }
+  const tools = serializeAISDKToolsForLogging(params.tools);
+  if (tools) {
+    metadata.tools = tools;
+  }
   return metadata;
 }
+function prepareAISDKChildTracing(params, self, parentSpan, denyOutputPaths) {
+  const cleanup = [];
+  const patchedModels = /* @__PURE__ */ new WeakSet();
+  const patchedTools = /* @__PURE__ */ new WeakSet();
+  let modelWrapped = false;
+  const patchModel = (model) => {
+    const resolvedModel = resolveAISDKModel(model);
+    if (!resolvedModel || typeof resolvedModel !== "object" || typeof resolvedModel.doGenerate !== "function" || patchedModels.has(resolvedModel) || resolvedModel[AUTO_PATCHED_MODEL]) {
+      return;
+    }
+    patchedModels.add(resolvedModel);
+    resolvedModel[AUTO_PATCHED_MODEL] = true;
+    modelWrapped = true;
+    const originalDoGenerate = resolvedModel.doGenerate;
+    const originalDoStream = resolvedModel.doStream;
+    const baseMetadata = buildAISDKChildMetadata(resolvedModel);
+    resolvedModel.doGenerate = async function doGeneratePatched(options) {
+      return parentSpan.traced(
+        async (span) => {
+          const result = await Reflect.apply(
+            originalDoGenerate,
+            resolvedModel,
+            [options]
+          );
+          span.log({
+            output: processAISDKOutput(result, denyOutputPaths),
+            metrics: extractTokenMetrics2(result),
+            ...buildResolvedMetadataPayload(result)
+          });
+          return result;
+        },
+        {
+          name: "doGenerate",
+          spanAttributes: {
+            type: "llm" /* LLM */
+          },
+          event: {
+            input: processAISDKInput(options),
+            metadata: baseMetadata
+          }
+        }
+      );
+    };
+    if (originalDoStream) {
+      resolvedModel.doStream = async function doStreamPatched(options) {
+        const span = parentSpan.startSpan({
+          name: "doStream",
+          spanAttributes: {
+            type: "llm" /* LLM */
+          },
+          event: {
+            input: processAISDKInput(options),
+            metadata: baseMetadata
+          }
+        });
+        const result = await withCurrent(
+          span,
+          () => Reflect.apply(originalDoStream, resolvedModel, [options])
+        );
+        const output = {};
+        let text = "";
+        let reasoning = "";
+        const toolCalls = [];
+        let object = void 0;
+        const transformStream = new TransformStream({
+          transform(chunk, controller) {
+            switch (chunk.type) {
+              case "text-delta":
+                text += extractTextDelta(chunk);
+                break;
+              case "reasoning-delta":
+                if (chunk.delta) {
+                  reasoning += chunk.delta;
+                } else if (chunk.text) {
+                  reasoning += chunk.text;
+                }
+                break;
+              case "tool-call":
+                toolCalls.push(chunk);
+                break;
+              case "object":
+                object = chunk.object;
+                break;
+              case "raw":
+                if (chunk.rawValue) {
+                  const rawVal = chunk.rawValue;
+                  if (rawVal.delta?.content) {
+                    text += rawVal.delta.content;
+                  } else if (rawVal.choices?.[0]?.delta?.content) {
+                    text += rawVal.choices[0].delta.content;
+                  } else if (typeof rawVal.text === "string") {
+                    text += rawVal.text;
+                  } else if (typeof rawVal.content === "string") {
+                    text += rawVal.content;
+                  }
+                }
+                break;
+              case "finish":
+                output.text = text;
+                output.reasoning = reasoning;
+                output.toolCalls = toolCalls;
+                output.finishReason = chunk.finishReason;
+                output.usage = chunk.usage;
+                if (object !== void 0) {
+                  output.object = object;
+                }
+                span.log({
+                  output: processAISDKOutput(
+                    output,
+                    denyOutputPaths
+                  ),
+                  metrics: extractTokenMetrics2(output),
+                  ...buildResolvedMetadataPayload(output)
+                });
+                span.end();
+                break;
+            }
+            controller.enqueue(chunk);
+          }
+        });
+        return {
+          ...result,
+          stream: result.stream.pipeThrough(transformStream)
+        };
+      };
+    }
+    cleanup.push(() => {
+      resolvedModel.doGenerate = originalDoGenerate;
+      if (originalDoStream) {
+        resolvedModel.doStream = originalDoStream;
+      }
+      delete resolvedModel[AUTO_PATCHED_MODEL];
+    });
+  };
+  const patchTool = (tool, name) => {
+    if (tool == null || typeof tool !== "object" || !("execute" in tool) || typeof tool.execute !== "function" || patchedTools.has(tool) || tool[AUTO_PATCHED_TOOL]) {
+      return;
+    }
+    patchedTools.add(tool);
+    tool[AUTO_PATCHED_TOOL] = true;
+    const originalExecute = tool.execute;
+    tool.execute = function executePatched(...args) {
+      const result = Reflect.apply(originalExecute, this, args);
+      if (isAsyncGenerator3(result)) {
+        return (async function* () {
+          const span = parentSpan.startSpan({
+            name,
+            spanAttributes: {
+              type: "tool" /* TOOL */
+            }
+          });
+          span.log({ input: args.length === 1 ? args[0] : args });
+          try {
+            let lastValue;
+            for await (const value of result) {
+              lastValue = value;
+              yield value;
+            }
+            span.log({ output: lastValue });
+          } catch (error) {
+            span.log({
+              error: error instanceof Error ? error.message : String(error)
+            });
+            throw error;
+          } finally {
+            span.end();
+          }
+        })();
+      }
+      return parentSpan.traced(
+        async (span) => {
+          span.log({ input: args.length === 1 ? args[0] : args });
+          const awaitedResult = await result;
+          span.log({ output: awaitedResult });
+          return awaitedResult;
+        },
+        {
+          name,
+          spanAttributes: {
+            type: "tool" /* TOOL */
+          }
+        }
+      );
+    };
+    cleanup.push(() => {
+      tool.execute = originalExecute;
+      delete tool[AUTO_PATCHED_TOOL];
+    });
+  };
+  const patchTools = (tools) => {
+    if (!tools) {
+      return;
+    }
+    const inferName = (tool, fallback2) => tool && (tool.name || tool.toolName || tool.id) || fallback2;
+    if (Array.isArray(tools)) {
+      tools.forEach(
+        (tool, index) => patchTool(tool, inferName(tool, `tool[${index}]`))
+      );
+      return;
+    }
+    for (const [key, tool] of Object.entries(tools)) {
+      patchTool(tool, key);
+    }
+  };
+  if (params && typeof params === "object") {
+    patchModel(params.model);
+    patchTools(params.tools);
+  }
+  if (self && typeof self === "object") {
+    const selfRecord = self;
+    if (selfRecord.model !== void 0) {
+      patchModel(selfRecord.model);
+    }
+    if (selfRecord.settings && typeof selfRecord.settings === "object") {
+      if (selfRecord.settings.model !== void 0) {
+        patchModel(selfRecord.settings.model);
+      }
+      if (selfRecord.settings.tools !== void 0) {
+        patchTools(selfRecord.settings.tools);
+      }
+    }
+  }
+  return {
+    cleanup: cleanup.length > 0 ? () => {
+      while (cleanup.length > 0) {
+        cleanup.pop()?.();
+      }
+    } : void 0,
+    modelWrapped
+  };
+}
+function finalizeAISDKChildTracing(event) {
+  const cleanup = event?.__braintrust_ai_sdk_cleanup;
+  if (event && typeof cleanup === "function") {
+    cleanup();
+    delete event.__braintrust_ai_sdk_cleanup;
+  }
+}
+function patchAISDKStreamingResult(args) {
+  const { denyOutputPaths, endEvent, result, span, startTime } = args;
+  if (!result || typeof result !== "object") {
+    return false;
+  }
+  const resultRecord = result;
+  if (!isReadableStreamLike(resultRecord.baseStream)) {
+    return false;
+  }
+  let firstChunkTime;
+  const wrappedBaseStream = resultRecord.baseStream.pipeThrough(
+    new TransformStream({
+      transform(chunk, controller) {
+        if (firstChunkTime === void 0) {
+          firstChunkTime = getCurrentUnixTimestamp();
+        }
+        controller.enqueue(chunk);
+      },
+      async flush() {
+        const metrics = extractTopLevelAISDKMetrics(result, endEvent);
+        if (metrics.time_to_first_token === void 0 && firstChunkTime !== void 0) {
+          metrics.time_to_first_token = firstChunkTime - startTime;
+        }
+        const output = await processAISDKStreamingOutput(
+          result,
+          denyOutputPaths
+        );
+        const metadata = buildResolvedMetadataPayload(result).metadata;
+        span.log({
+          output,
+          ...metadata ? { metadata } : {},
+          metrics
+        });
+        finalizeAISDKChildTracing(endEvent);
+        span.end();
+      }
+    })
+  );
+  Object.defineProperty(resultRecord, "baseStream", {
+    configurable: true,
+    enumerable: true,
+    value: wrappedBaseStream,
+    writable: true
+  });
+  return true;
+}
+function isReadableStreamLike(value) {
+  return value != null && typeof value === "object" && typeof value.pipeThrough === "function";
+}
+async function processAISDKStreamingOutput(result, denyOutputPaths) {
+  const output = processAISDKOutput(result, denyOutputPaths);
+  if (!output || typeof output !== "object") {
+    return output;
+  }
+  const outputRecord = output;
+  try {
+    if ("text" in result && typeof result.text === "string") {
+      outputRecord.text = result.text;
+    }
+  } catch {
+  }
+  try {
+    if ("object" in result) {
+      const resolvedObject = await Promise.resolve(result.object);
+      if (resolvedObject !== void 0) {
+        outputRecord.object = resolvedObject;
+      }
+    }
+  } catch {
+  }
+  return outputRecord;
+}
+function buildAISDKChildMetadata(model) {
+  const { model: modelId, provider } = serializeModelWithProvider2(model);
+  return {
+    ...modelId ? { model: modelId } : {},
+    ...provider ? { provider } : {},
+    braintrust: {
+      integration_name: "ai-sdk",
+      sdk_language: "typescript"
+    }
+  };
+}
+function buildResolvedMetadataPayload(result) {
+  const gatewayInfo = extractGatewayRoutingInfo2(result);
+  const metadata = {};
+  if (gatewayInfo?.provider) {
+    metadata.provider = gatewayInfo.provider;
+  }
+  if (gatewayInfo?.model) {
+    metadata.model = gatewayInfo.model;
+  }
+  if (result.finishReason !== void 0) {
+    metadata.finish_reason = result.finishReason;
+  }
+  return Object.keys(metadata).length > 0 ? { metadata } : {};
+}
+function resolveAISDKModel(model) {
+  if (typeof model !== "string") {
+    return model;
+  }
+  const provider = globalThis.AI_SDK_DEFAULT_PROVIDER ?? null;
+  if (provider && typeof provider.languageModel === "function") {
+    return provider.languageModel(model);
+  }
+  return model;
+}
+function extractTextDelta(chunk) {
+  if (typeof chunk.textDelta === "string") return chunk.textDelta;
+  if (typeof chunk.delta === "string") return chunk.delta;
+  if (typeof chunk.text === "string") return chunk.text;
+  if (typeof chunk.content === "string") return chunk.content;
+  return "";
+}
+function isAsyncGenerator3(value) {
+  return value != null && typeof value === "object" && typeof value[Symbol.asyncIterator] === "function" && typeof value.next === "function" && typeof value.return === "function" && typeof value.throw === "function";
+}
 function processAISDKOutput(output, denyOutputPaths) {
   if (!output) return output;
-  const getterValues = extractGetterValues2(output);
-  const merged = { ...output, ...getterValues };
-  return omit2(merged, denyOutputPaths);
+  const merged = extractSerializableOutputFields(output);
+  return normalizeAISDKLoggedOutput(omit2(merged, denyOutputPaths));
 }
 function extractTokenMetrics2(result) {
   const metrics = {};
@@ -19232,12 +19956,14 @@ function extractTokenMetrics2(result) {
   }
   return metrics;
 }
-function aggregateAISDKChunks(chunks) {
+function aggregateAISDKChunks(chunks, _result, endEvent) {
   const lastChunk = chunks[chunks.length - 1];
   const output = {};
   let metrics = {};
+  let metadata;
   if (lastChunk) {
-    metrics = extractTokenMetrics2(lastChunk);
+    metrics = hasModelChildTracing(endEvent) ? {} : extractTokenMetrics2(lastChunk);
+    metadata = buildResolvedMetadataPayload(lastChunk).metadata;
     if (lastChunk.text !== void 0) {
       output.text = lastChunk.text;
     }
@@ -19251,7 +19977,8 @@ function aggregateAISDKChunks(chunks) {
       output.toolCalls = lastChunk.toolCalls;
     }
   }
-  return { output, metrics };
+  finalizeAISDKChildTracing(endEvent);
+  return { output, metrics, metadata };
 }
 function extractGetterValues2(obj) {
   const getterValues = {};
@@ -19271,7 +19998,7 @@ function extractGetterValues2(obj) {
   ];
   for (const name of getterNames) {
     try {
-      if (obj && name in obj && typeof obj[name] !== "function") {
+      if (obj && name in obj && isSerializableOutputValue(obj[name])) {
         getterValues[name] = obj[name];
       }
     } catch {
@@ -19279,6 +20006,47 @@ function extractGetterValues2(obj) {
   }
   return getterValues;
 }
+function extractSerializableOutputFields(output) {
+  const serialized = {};
+  const directFieldNames = [
+    "steps",
+    "request",
+    "responseMessages",
+    "warnings",
+    "rawResponse",
+    "response",
+    "providerMetadata",
+    "experimental_providerMetadata"
+  ];
+  for (const name of directFieldNames) {
+    try {
+      const value = output?.[name];
+      if (isSerializableOutputValue(value)) {
+        serialized[name] = value;
+      }
+    } catch {
+    }
+  }
+  return {
+    ...serialized,
+    ...extractGetterValues2(output)
+  };
+}
+function isSerializableOutputValue(value) {
+  if (typeof value === "function") {
+    return false;
+  }
+  if (value && typeof value === "object" && typeof value.then === "function") {
+    return false;
+  }
+  if (value && typeof value === "object" && typeof value.getReader === "function") {
+    return false;
+  }
+  if (value && typeof value === "object" && typeof value[Symbol.asyncIterator] === "function") {
+    return false;
+  }
+  return true;
+}
 function serializeModelWithProvider2(model) {
   const modelId = typeof model === "string" ? model : model?.modelId;
   const explicitProvider = typeof model === "object" ? model?.provider : void 0;
@@ -19304,6 +20072,25 @@ function parseGatewayModelString2(modelString) {
   }
   return { model: modelString };
 }
+function extractGatewayRoutingInfo2(result) {
+  if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
+    const routing2 = result.steps[0]?.providerMetadata?.gateway?.routing;
+    if (routing2) {
+      return {
+        provider: routing2.resolvedProvider || routing2.finalProvider,
+        model: routing2.resolvedProviderApiModelId
+      };
+    }
+  }
+  const routing = result?.providerMetadata?.gateway?.routing;
+  if (routing) {
+    return {
+      provider: routing.resolvedProvider || routing.finalProvider,
+      model: routing.resolvedProviderApiModelId
+    };
+  }
+  return null;
+}
 function extractCostFromResult2(result) {
   if (result?.steps && Array.isArray(result.steps) && result.steps.length > 0) {
     let totalCost = 0;