braintrust 3.13.0 → 3.15.0

package/dist/apply-auto-instrumentation.mjs

@@ -1,6 +1,7 @@
 import {
   aiSDKChannels,
   anthropicChannels,
+  classifyMastraTarget,
   claudeAgentSDKChannels,
   cohereChannels,
   cursorSDKChannels,
@@ -20,9 +21,10 @@ import {
   openAICodexChannels,
   openRouterAgentChannels,
   openRouterChannels,
+  patchMastraSource,
   patchTracingChannel,
   readDisabledInstrumentationEnvConfig
-} from "./chunk-75IQCUB2.mjs";
+} from "./chunk-O4ZIWXO3.mjs";
 
 // src/node/apply-auto-instrumentation-entry.ts
 import * as diagnostics_channel from "node:diagnostics_channel";
@@ -775,7 +777,7 @@ var cursorSDKConfigs = cursorSDKEntrypoints.flatMap((filePath) => [
 ]);
 
 // src/auto-instrumentations/configs/flue.ts
-var flueVersionRange = ">=0.7.0 <0.8.0";
+var flueVersionRange = ">=0.8.0";
 var flueConfigs = [
   {
     channelName: flueChannels.createContext.channelName,
@@ -788,19 +790,6 @@ var flueConfigs = [
       functionName: "createFlueContext",
       kind: "Sync"
     }
-  },
-  {
-    channelName: flueChannels.openSession.channelName,
-    module: {
-      name: "@flue/runtime",
-      versionRange: flueVersionRange,
-      filePath: "dist/internal.mjs"
-    },
-    functionQuery: {
-      className: "Harness",
-      methodName: "openSession",
-      kind: "Async"
-    }
   }
 ];
 
@@ -2275,7 +2264,6 @@ var defaultInstrumentationConfigGroups = [
     configs: claudeAgentSDKConfigs
   },
   { integrations: ["cursor", "cursorSDK"], configs: cursorSDKConfigs },
-  { integrations: ["flue"], configs: flueConfigs },
   {
     integrations: ["openAIAgents"],
     configs: openAIAgentsCoreConfigs
@@ -2305,7 +2293,18 @@ var defaultInstrumentationConfigGroups = [
   {
     integrations: ["gitHubCopilot"],
     configs: gitHubCopilotConfigs
+  },
+  {
+    integrations: ["flue"],
+    configs: flueConfigs
   }
+  // Note: `@mastra/core` is not listed here because its instrumentation
+  // doesn't go through the AST `code-transformer` matcher — Mastra's
+  // content-hashed chunks make `filePath`-based matching too brittle.
+  // Instead it's handled by the source-replacement entry in
+  // `loader/special-case-patches.ts`, which both the runtime loader
+  // (`hook.mjs` → `cjs-patch.ts`/`esm-hook.mts`) and the bundler plugin
+  // (`bundler/plugin.ts`) call. The `mastra` env-var disable still works.
 ];
 function getDefaultInstrumentationConfigs({
   additionalInstrumentations,
@@ -2414,6 +2413,21 @@ var OPENAI_API_PROMISE_PATCH = `
 })();
 `;
 
+// src/auto-instrumentations/loader/special-case-patches.ts
+function applySpecialCasePatch(input) {
+  if (input.packageName === "openai" && input.modulePath.includes("api-promise")) {
+    return input.source + OPENAI_API_PROMISE_PATCH;
+  }
+  const mastraTarget = classifyMastraTarget(
+    input.packageName,
+    input.modulePath
+  );
+  if (mastraTarget) {
+    return patchMastraSource(input.source, mastraTarget, input.format);
+  }
+  return null;
+}
+
 // src/auto-instrumentations/loader/cjs-patch.ts
 var ModulePatch = class {
   packages;
@@ -2442,12 +2456,18 @@ var ModulePatch = class {
       const resolvedModule = moduleDetailsFromPath(normalizedForPlatform);
       if (resolvedModule) {
         const packageName = getPackageName(resolvedModule.basedir) ?? resolvedModule.name;
-        if (!self.packages.has(packageName)) {
+        const normalizedModulePath = resolvedModule.path.replace(/\\/g, "/");
+        const patched = applySpecialCasePatch({
+          packageName,
+          modulePath: normalizedModulePath,
+          source: String(content),
+          format: "cjs"
+        });
+        if (patched !== null) {
+          args[0] = patched;
           return self.originalCompile.apply(this, args);
         }
-        const normalizedModulePath = resolvedModule.path.replace(/\\/g, "/");
-        if (packageName === "openai" && normalizedModulePath.includes("api-promise")) {
-          args[0] = content + OPENAI_API_PROMISE_PATCH;
+        if (!self.packages.has(packageName)) {
           return self.originalCompile.apply(this, args);
         }
         const version = getPackageVersion(resolvedModule.basedir);

package/dist/auto-instrumentations/bundler/esbuild.cjs

@@ -63,6 +63,7 @@ var envIntegrationAliases = {
   cursorsdk: "cursorSDK",
   flue: "flue",
   "flue-runtime": "flue",
+  mastra: "mastra",
   "openai-agents": "openAIAgents",
   openaiagents: "openAIAgents",
   "openai-agents-core": "openAIAgents",
@@ -1129,35 +1130,11 @@ var flueChannels = defineChannels("@flue/runtime", {
   createContext: channel({
     channelName: "createFlueContext",
     kind: "sync-stream"
-  }),
-  openSession: channel({
-    channelName: "Harness.openSession",
-    kind: "async"
-  }),
-  contextEvent: channel({
-    channelName: "context.event",
-    kind: "sync-stream"
-  }),
-  prompt: channel({
-    channelName: "session.prompt",
-    kind: "async"
-  }),
-  skill: channel({
-    channelName: "session.skill",
-    kind: "async"
-  }),
-  task: channel({
-    channelName: "session.task",
-    kind: "async"
-  }),
-  compact: channel({
-    channelName: "session.compact",
-    kind: "async"
   })
 });
 
 // src/auto-instrumentations/configs/flue.ts
-var flueVersionRange = ">=0.7.0 <0.8.0";
+var flueVersionRange = ">=0.8.0";
 var flueConfigs = [
   {
     channelName: flueChannels.createContext.channelName,
@@ -1170,19 +1147,6 @@ var flueConfigs = [
       functionName: "createFlueContext",
       kind: "Sync"
     }
-  },
-  {
-    channelName: flueChannels.openSession.channelName,
-    module: {
-      name: "@flue/runtime",
-      versionRange: flueVersionRange,
-      filePath: "dist/internal.mjs"
-    },
-    functionQuery: {
-      className: "Harness",
-      methodName: "openSession",
-      kind: "Async"
-    }
   }
 ];
 
@@ -2959,7 +2923,6 @@ var defaultInstrumentationConfigGroups = [
     configs: claudeAgentSDKConfigs
   },
   { integrations: ["cursor", "cursorSDK"], configs: cursorSDKConfigs },
-  { integrations: ["flue"], configs: flueConfigs },
   {
     integrations: ["openAIAgents"],
     configs: openAIAgentsCoreConfigs
@@ -2989,7 +2952,18 @@ var defaultInstrumentationConfigGroups = [
   {
     integrations: ["gitHubCopilot"],
     configs: gitHubCopilotConfigs
+  },
+  {
+    integrations: ["flue"],
+    configs: flueConfigs
   }
+  // Note: `@mastra/core` is not listed here because its instrumentation
+  // doesn't go through the AST `code-transformer` matcher — Mastra's
+  // content-hashed chunks make `filePath`-based matching too brittle.
+  // Instead it's handled by the source-replacement entry in
+  // `loader/special-case-patches.ts`, which both the runtime loader
+  // (`hook.mjs` → `cjs-patch.ts`/`esm-hook.mts`) and the bundler plugin
+  // (`bundler/plugin.ts`) call. The `mastra` env-var disable still works.
 ];
 function getDefaultInstrumentationConfigs({
   additionalInstrumentations,
@@ -3007,6 +2981,211 @@ function getDefaultInstrumentationConfigs({
   ];
 }
 
+// src/auto-instrumentations/loader/mastra-observability-patch.ts
+var MASTRA_EXPORTER_FACTORY_GLOBAL = "__braintrustMastraExporterFactory";
+var MASTRA_CORE_PACKAGE = "@mastra/core";
+var MASTRA_OBSERVABILITY_PACKAGE = "@mastra/observability";
+var MASTRA_CORE_ENTRY_PATHS = /* @__PURE__ */ new Set([
+  "dist/index.js",
+  "dist/index.cjs",
+  "dist/mastra/index.js",
+  "dist/mastra/index.cjs"
+]);
+var MASTRA_OBSERVABILITY_ENTRY_PATHS = /* @__PURE__ */ new Set([
+  "dist/index.js",
+  "dist/index.cjs"
+]);
+function classifyMastraTarget(packageName, modulePath) {
+  if (packageName === MASTRA_CORE_PACKAGE && MASTRA_CORE_ENTRY_PATHS.has(modulePath)) {
+    return "core";
+  }
+  if (packageName === MASTRA_OBSERVABILITY_PACKAGE && MASTRA_OBSERVABILITY_ENTRY_PATHS.has(modulePath)) {
+    return "observability";
+  }
+  return null;
+}
+function extractChunkPath(source) {
+  const esmMatch = source.match(
+    /export\s*\{\s*Mastra(?:\s+as\s+\w+)?\s*\}\s*from\s*['"]([^'"]+)['"]/
+  );
+  if (esmMatch) return esmMatch[1];
+  const cjsMatch = source.match(
+    /require\s*\(\s*['"]([^'"]+chunk-[^'"]+)['"]\s*\)/
+  );
+  if (cjsMatch) return cjsMatch[1];
+  return null;
+}
+var EXPORTER_FACTORY_KEY = JSON.stringify(MASTRA_EXPORTER_FACTORY_GLOBAL);
+var MASTRA_PROXY_HANDLER_BODY = `
+{
+  construct(target, args, newTarget) {
+    var firstArg = args[0];
+    if (
+      (!firstArg || typeof firstArg !== "object" || !firstArg.observability) &&
+      __braintrustObservabilityClass
+    ) {
+      try {
+        // serviceName is required by Mastra's Observability validator; pass
+        // something sensible by default. Users who want a different name
+        // should construct Observability themselves.
+        var observability = new __braintrustObservabilityClass({
+          configs: { default: { serviceName: "mastra" } },
+        });
+        args = args.slice();
+        args[0] = Object.assign({}, firstArg, { observability: observability });
+      } catch (e) {
+        // Fall through. Mastra will use its own NoOp; user code still works,
+        // just without auto-instrumentation.
+      }
+    }
+    return Reflect.construct(target, args, newTarget);
+  },
+}`;
+function buildMastraEsmWrapper(chunkPath) {
+  const chunk = JSON.stringify(chunkPath);
+  return `import { Mastra as __braintrustOrigMastra } from ${chunk};
+import { createRequire as __braintrustCreateRequire } from "node:module";
+
+let __braintrustObservabilityClass = null;
+try {
+  // Resolve @mastra/observability relative to this module (the Mastra entry),
+  // so it's looked up from the user's node_modules tree.
+  const __braintrustRequire = __braintrustCreateRequire(import.meta.url);
+  __braintrustObservabilityClass =
+    __braintrustRequire("@mastra/observability").Observability;
+} catch (e) {
+  // @mastra/observability isn't installed; the construct trap will skip the
+  // auto-construct branch and Mastra falls back to its own NoOp.
+}
+const Mastra = new Proxy(__braintrustOrigMastra, ${MASTRA_PROXY_HANDLER_BODY});
+export { Mastra };
+`;
+}
+function buildMastraCjsWrapper(chunkPath) {
+  const chunk = JSON.stringify(chunkPath);
+  return `'use strict';
+const __braintrustChunk = require(${chunk});
+
+let __braintrustObservabilityClass = null;
+try {
+  __braintrustObservabilityClass = require("@mastra/observability").Observability;
+} catch (e) {
+  // @mastra/observability isn't installed; same fallback as the ESM wrapper.
+}
+
+const __braintrustWrappedMastra = new Proxy(
+  __braintrustChunk.Mastra,
+  ${MASTRA_PROXY_HANDLER_BODY},
+);
+Object.defineProperty(exports, "Mastra", {
+  enumerable: true,
+  configurable: true,
+  get: function () { return __braintrustWrappedMastra; }
+});
+`;
+}
+var OBSERVABILITY_APPEND_BODY = `
+;(function __braintrustWrapObservability() {
+  // Top-level so we can both read and reassign the var binding the original
+  // entry declared.
+  if (typeof Observability === "undefined") return;
+  if (Observability.__braintrustWrapped) return;
+  function __braintrustEnsureExporter(rawConfig) {
+    try {
+      var factory = globalThis[${EXPORTER_FACTORY_KEY}];
+      if (typeof factory !== "function") return rawConfig;
+      var config = rawConfig && typeof rawConfig === "object" ? rawConfig : {};
+      var configsIn = config.configs && typeof config.configs === "object" ? config.configs : null;
+      var configsOut = {};
+      var hadEntries = false;
+      if (configsIn) {
+        for (var name in configsIn) {
+          if (!Object.prototype.hasOwnProperty.call(configsIn, name)) continue;
+          hadEntries = true;
+          var inst = configsIn[name] || {};
+          var existing = Array.isArray(inst.exporters) ? inst.exporters : [];
+          var hasOurs = existing.some(function (e) { return e && e.name === "braintrust"; });
+          configsOut[name] = Object.assign({}, inst, {
+            exporters: hasOurs ? existing : existing.concat([factory()]),
+          });
+        }
+      }
+      if (!hadEntries) {
+        configsOut.default = {
+          serviceName: "mastra",
+          exporters: [factory()],
+        };
+      }
+      return Object.assign({}, config, { configs: configsOut });
+    } catch (e) {
+      return rawConfig;
+    }
+  }
+  var __OriginalObservability = Observability;
+  Observability = new Proxy(__OriginalObservability, {
+    construct: function (target, args, newTarget) {
+      var nextArgs = args.slice();
+      nextArgs[0] = __braintrustEnsureExporter(nextArgs[0]);
+      return Reflect.construct(target, nextArgs, newTarget);
+    },
+  });
+  Observability.__braintrustWrapped = true;
+  if (typeof exports !== "undefined" && exports && typeof exports === "object") {
+    try {
+      Object.defineProperty(exports, "Observability", {
+        enumerable: true,
+        configurable: true,
+        get: function () { return Observability; },
+      });
+    } catch (e) {}
+  }
+})();
+`;
+function patchMastraSource(source, target, format) {
+  if (target === "core") {
+    const chunkPath = extractChunkPath(source);
+    if (!chunkPath) return source;
+    return format === "esm" ? buildMastraEsmWrapper(chunkPath) : buildMastraCjsWrapper(chunkPath);
+  }
+  return source + OBSERVABILITY_APPEND_BODY;
+}
+
+// src/auto-instrumentations/loader/openai-api-promise-patch.ts
+var OPENAI_API_PROMISE_PATCH = `
+;(function __btPatchAPIPromise() {
+  if (typeof APIPromise === "undefined" || APIPromise.prototype.__btParsePatched) return;
+  APIPromise.prototype.__btParsePatched = true;
+  var _origThen = APIPromise.prototype.then;
+  APIPromise.prototype.then = function __btThen(onfulfilled, onrejected) {
+    if (!this.__btParseWrapped && Object.prototype.hasOwnProperty.call(this, "parseResponse")) {
+      this.__btParseWrapped = true;
+      var _origParse = this.parseResponse;
+      var _cached;
+      this.parseResponse = function() {
+        if (!_cached) _cached = _origParse.apply(this, arguments);
+        return _cached;
+      };
+    }
+    return _origThen.call(this, onfulfilled, onrejected);
+  };
+})();
+`;
+
+// src/auto-instrumentations/loader/special-case-patches.ts
+function applySpecialCasePatch(input) {
+  if (input.packageName === "openai" && input.modulePath.includes("api-promise")) {
+    return input.source + OPENAI_API_PROMISE_PATCH;
+  }
+  const mastraTarget = classifyMastraTarget(
+    input.packageName,
+    input.modulePath
+  );
+  if (mastraTarget) {
+    return patchMastraSource(input.source, mastraTarget, input.format);
+  }
+  return null;
+}
+
 // src/auto-instrumentations/bundler/plugin.ts
 function getModuleVersion(basedir) {
   try {
@@ -3045,6 +3224,18 @@ var unplugin = (0, import_unplugin.createUnplugin)(
           return null;
         }
         const moduleName = moduleDetails.name;
+        const normalizedModulePath = moduleDetails.path.replace(/\\/g, "/");
+        if (options.browser !== true) {
+          const patched = applySpecialCasePatch({
+            packageName: moduleName,
+            modulePath: normalizedModulePath,
+            source: code,
+            format: isModule ? "esm" : "cjs"
+          });
+          if (patched !== null) {
+            return { code: patched, map: null };
+          }
+        }
         const moduleVersion = getModuleVersion(moduleDetails.basedir);
         if (!moduleVersion) {
           console.warn(
@@ -3052,7 +3243,6 @@ var unplugin = (0, import_unplugin.createUnplugin)(
           );
           return null;
         }
-        const normalizedModulePath = moduleDetails.path.replace(/\\/g, "/");
         const transformer = instrumentationMatcher.getTransformer(
           moduleName,
           moduleVersion,

package/dist/auto-instrumentations/bundler/esbuild.mjs

@@ -1,7 +1,8 @@
 import {
   unplugin
-} from "../chunk-GJOO4ESL.mjs";
+} from "../chunk-VXJONZVX.mjs";
 import "../chunk-E5DUYJWK.mjs";
+import "../chunk-J57YF7WS.mjs";
 
 // src/auto-instrumentations/bundler/esbuild.ts
 function braintrustEsbuildPlugin(options = {}) {