braintrust 3.21.0 → 3.22.0

package/dev/dist/index.js

@@ -2510,19 +2510,30 @@ var CallEvent = _v3.z.union([
 var ChatCompletionContentPartTextWithTitle = _v3.z.object({
   text: _v3.z.string().default(""),
   type: _v3.z.literal("text"),
-  cache_control: _v3.z.object({ type: _v3.z.literal("ephemeral") }).optional()
+  cache_control: _v3.z.object({
+    type: _v3.z.literal("ephemeral"),
+    ttl: _v3.z.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPartImageWithTitle = _v3.z.object({
   image_url: _v3.z.object({
     url: _v3.z.string(),
     detail: _v3.z.union([_v3.z.literal("auto"), _v3.z.literal("low"), _v3.z.literal("high")]).optional()
   }),
-  type: _v3.z.literal("image_url")
+  type: _v3.z.literal("image_url"),
+  cache_control: _v3.z.object({
+    type: _v3.z.literal("ephemeral"),
+    ttl: _v3.z.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPartFileFile = _v3.z.object({ file_data: _v3.z.string(), filename: _v3.z.string(), file_id: _v3.z.string() }).partial();
 var ChatCompletionContentPartFileWithTitle = _v3.z.object({
   file: ChatCompletionContentPartFileFile,
-  type: _v3.z.literal("file")
+  type: _v3.z.literal("file"),
+  cache_control: _v3.z.object({
+    type: _v3.z.literal("ephemeral"),
+    ttl: _v3.z.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPart = _v3.z.union([
   ChatCompletionContentPartTextWithTitle,
@@ -2532,7 +2543,10 @@ var ChatCompletionContentPart = _v3.z.union([
 var ChatCompletionContentPartText = _v3.z.object({
   text: _v3.z.string().default(""),
   type: _v3.z.literal("text"),
-  cache_control: _v3.z.object({ type: _v3.z.literal("ephemeral") }).optional()
+  cache_control: _v3.z.object({
+    type: _v3.z.literal("ephemeral"),
+    ttl: _v3.z.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionMessageToolCall = _v3.z.object({
   id: _v3.z.string(),
@@ -4585,13 +4599,23 @@ var LRUCache = class {
    * @returns The cached value if found, undefined otherwise.
    */
   get(key) {
-    const value = this.cache.get(key);
-    if (value === void 0) {
+    const entry = this.cache.get(key);
+    if (entry === void 0) {
       return void 0;
     }
     this.cache.delete(key);
-    this.cache.set(key, value);
-    return value;
+    this.cache.set(key, entry);
+    return entry.value;
+  }
+  /**
+   * Checks whether a key exists and marks it as most recently used.
+   */
+  has(key) {
+    if (!this.cache.has(key)) {
+      return false;
+    }
+    this.get(key);
+    return true;
   }
   /**
    * Stores a value in the cache.
@@ -4608,7 +4632,38 @@ var LRUCache = class {
       const first = this.cache.keys().next().value;
       this.cache.delete(first);
     }
-    this.cache.set(key, value);
+    this.cache.set(key, { value });
+  }
+  /**
+   * Removes an item from the cache.
+   */
+  delete(key) {
+    return this.cache.delete(key);
+  }
+  /**
+   * Iterates over cache entries from least to most recently used.
+   */
+  *entries() {
+    for (const [key, entry] of this.cache) {
+      yield [key, entry.value];
+    }
+  }
+  /**
+   * Iterates over cache keys from least to most recently used.
+   */
+  keys() {
+    return this.cache.keys();
+  }
+  /**
+   * Iterates over cache values from least to most recently used.
+   */
+  *values() {
+    for (const entry of this.cache.values()) {
+      yield entry.value;
+    }
+  }
+  [Symbol.iterator]() {
+    return this.entries();
   }
   /**
    * Removes all items from the cache.
@@ -5166,6 +5221,9 @@ function applyMaskingToField(maskingFunction, data, fieldName) {
     return `ERROR: Failed to mask field '${fieldName}' - ${errorType}`;
   }
 }
+var INITIAL_SPAN_WRITE_AS_MERGE = /* @__PURE__ */ Symbol(
+  "braintrust.initial-span-write-as-merge"
+);
 var BRAINTRUST_CURRENT_SPAN_STORE = /* @__PURE__ */ Symbol.for(
   "braintrust.currentSpanStore"
 );
@@ -8984,7 +9042,7 @@ var SpanImpl = (_class13 = class _SpanImpl {
     this._spanId = resolvedIds.spanId;
     this._rootSpanId = resolvedIds.rootSpanId;
     this._spanParents = resolvedIds.spanParents;
-    this.isMerge = false;
+    this.isMerge = args[INITIAL_SPAN_WRITE_AS_MERGE] === true;
     this.logInternal({ event, internalData });
     this.isMerge = true;
   }
@@ -30835,7 +30893,13 @@ var BraintrustObservabilityExporter = (_class29 = class {
     const args = {
       name: exported.name,
       spanAttributes: { type: spanTypeFor(exported.type) },
-      startTime: epochSeconds(exported.startTime)
+      startTime: epochSeconds(exported.startTime),
+      // Use the Mastra span id as the Braintrust row id so that
+      // `logFeedback({ id: <mastra span id> })` (and Mastra's score events)
+      // attach to the right row. Without this, `SpanImpl` auto-generates a
+      // row id (`this._id = eventId ?? idGenerator.getSpanId()`) that no
+      // external caller could know.
+      event: { id: exported.id }
     };
     const parentRecord = exported.parentSpanId ? this.spans.get(exported.parentSpanId) : void 0;
     if (!this.capturedParent) {

package/dev/dist/index.mjs

@@ -2510,19 +2510,30 @@ var CallEvent = z6.union([
 var ChatCompletionContentPartTextWithTitle = z6.object({
   text: z6.string().default(""),
   type: z6.literal("text"),
-  cache_control: z6.object({ type: z6.literal("ephemeral") }).optional()
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPartImageWithTitle = z6.object({
   image_url: z6.object({
     url: z6.string(),
     detail: z6.union([z6.literal("auto"), z6.literal("low"), z6.literal("high")]).optional()
   }),
-  type: z6.literal("image_url")
+  type: z6.literal("image_url"),
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPartFileFile = z6.object({ file_data: z6.string(), filename: z6.string(), file_id: z6.string() }).partial();
 var ChatCompletionContentPartFileWithTitle = z6.object({
   file: ChatCompletionContentPartFileFile,
-  type: z6.literal("file")
+  type: z6.literal("file"),
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPart = z6.union([
   ChatCompletionContentPartTextWithTitle,
@@ -2532,7 +2543,10 @@ var ChatCompletionContentPart = z6.union([
 var ChatCompletionContentPartText = z6.object({
   text: z6.string().default(""),
   type: z6.literal("text"),
-  cache_control: z6.object({ type: z6.literal("ephemeral") }).optional()
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionMessageToolCall = z6.object({
   id: z6.string(),
@@ -4585,13 +4599,23 @@ var LRUCache = class {
    * @returns The cached value if found, undefined otherwise.
    */
   get(key) {
-    const value = this.cache.get(key);
-    if (value === void 0) {
+    const entry = this.cache.get(key);
+    if (entry === void 0) {
       return void 0;
     }
     this.cache.delete(key);
-    this.cache.set(key, value);
-    return value;
+    this.cache.set(key, entry);
+    return entry.value;
+  }
+  /**
+   * Checks whether a key exists and marks it as most recently used.
+   */
+  has(key) {
+    if (!this.cache.has(key)) {
+      return false;
+    }
+    this.get(key);
+    return true;
   }
   /**
    * Stores a value in the cache.
@@ -4608,7 +4632,38 @@ var LRUCache = class {
       const first = this.cache.keys().next().value;
       this.cache.delete(first);
     }
-    this.cache.set(key, value);
+    this.cache.set(key, { value });
+  }
+  /**
+   * Removes an item from the cache.
+   */
+  delete(key) {
+    return this.cache.delete(key);
+  }
+  /**
+   * Iterates over cache entries from least to most recently used.
+   */
+  *entries() {
+    for (const [key, entry] of this.cache) {
+      yield [key, entry.value];
+    }
+  }
+  /**
+   * Iterates over cache keys from least to most recently used.
+   */
+  keys() {
+    return this.cache.keys();
+  }
+  /**
+   * Iterates over cache values from least to most recently used.
+   */
+  *values() {
+    for (const entry of this.cache.values()) {
+      yield entry.value;
+    }
+  }
+  [Symbol.iterator]() {
+    return this.entries();
   }
   /**
    * Removes all items from the cache.
@@ -5166,6 +5221,9 @@ function applyMaskingToField(maskingFunction, data, fieldName) {
     return `ERROR: Failed to mask field '${fieldName}' - ${errorType}`;
   }
 }
+var INITIAL_SPAN_WRITE_AS_MERGE = /* @__PURE__ */ Symbol(
+  "braintrust.initial-span-write-as-merge"
+);
 var BRAINTRUST_CURRENT_SPAN_STORE = /* @__PURE__ */ Symbol.for(
   "braintrust.currentSpanStore"
 );
@@ -8984,7 +9042,7 @@ var SpanImpl = class _SpanImpl {
     this._spanId = resolvedIds.spanId;
     this._rootSpanId = resolvedIds.rootSpanId;
     this._spanParents = resolvedIds.spanParents;
-    this.isMerge = false;
+    this.isMerge = args[INITIAL_SPAN_WRITE_AS_MERGE] === true;
     this.logInternal({ event, internalData });
     this.isMerge = true;
   }
@@ -30835,7 +30893,13 @@ var BraintrustObservabilityExporter = class {
     const args = {
       name: exported.name,
       spanAttributes: { type: spanTypeFor(exported.type) },
-      startTime: epochSeconds(exported.startTime)
+      startTime: epochSeconds(exported.startTime),
+      // Use the Mastra span id as the Braintrust row id so that
+      // `logFeedback({ id: <mastra span id> })` (and Mastra's score events)
+      // attach to the right row. Without this, `SpanImpl` auto-generates a
+      // row id (`this._id = eventId ?? idGenerator.getSpanId()`) that no
+      // external caller could know.
+      event: { id: exported.id }
     };
     const parentRecord = exported.parentSpanId ? this.spans.get(exported.parentSpanId) : void 0;
     if (!this.capturedParent) {

package/dist/auto-instrumentations/hook.mjs

@@ -2127,19 +2127,30 @@ var CallEvent = z6.union([
 var ChatCompletionContentPartTextWithTitle = z6.object({
   text: z6.string().default(""),
   type: z6.literal("text"),
-  cache_control: z6.object({ type: z6.literal("ephemeral") }).optional()
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPartImageWithTitle = z6.object({
   image_url: z6.object({
     url: z6.string(),
     detail: z6.union([z6.literal("auto"), z6.literal("low"), z6.literal("high")]).optional()
   }),
-  type: z6.literal("image_url")
+  type: z6.literal("image_url"),
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPartFileFile = z6.object({ file_data: z6.string(), filename: z6.string(), file_id: z6.string() }).partial();
 var ChatCompletionContentPartFileWithTitle = z6.object({
   file: ChatCompletionContentPartFileFile,
-  type: z6.literal("file")
+  type: z6.literal("file"),
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionContentPart = z6.union([
   ChatCompletionContentPartTextWithTitle,
@@ -2149,7 +2160,10 @@ var ChatCompletionContentPart = z6.union([
 var ChatCompletionContentPartText = z6.object({
   text: z6.string().default(""),
   type: z6.literal("text"),
-  cache_control: z6.object({ type: z6.literal("ephemeral") }).optional()
+  cache_control: z6.object({
+    type: z6.literal("ephemeral"),
+    ttl: z6.enum(["5m", "1h"]).optional()
+  }).optional()
 });
 var ChatCompletionMessageToolCall = z6.object({
   id: z6.string(),
@@ -4174,13 +4188,23 @@ var LRUCache = class {
    * @returns The cached value if found, undefined otherwise.
    */
   get(key) {
-    const value = this.cache.get(key);
-    if (value === void 0) {
+    const entry = this.cache.get(key);
+    if (entry === void 0) {
       return void 0;
     }
     this.cache.delete(key);
-    this.cache.set(key, value);
-    return value;
+    this.cache.set(key, entry);
+    return entry.value;
+  }
+  /**
+   * Checks whether a key exists and marks it as most recently used.
+   */
+  has(key) {
+    if (!this.cache.has(key)) {
+      return false;
+    }
+    this.get(key);
+    return true;
   }
   /**
    * Stores a value in the cache.
@@ -4197,7 +4221,38 @@ var LRUCache = class {
       const first = this.cache.keys().next().value;
       this.cache.delete(first);
     }
-    this.cache.set(key, value);
+    this.cache.set(key, { value });
+  }
+  /**
+   * Removes an item from the cache.
+   */
+  delete(key) {
+    return this.cache.delete(key);
+  }
+  /**
+   * Iterates over cache entries from least to most recently used.
+   */
+  *entries() {
+    for (const [key, entry] of this.cache) {
+      yield [key, entry.value];
+    }
+  }
+  /**
+   * Iterates over cache keys from least to most recently used.
+   */
+  keys() {
+    return this.cache.keys();
+  }
+  /**
+   * Iterates over cache values from least to most recently used.
+   */
+  *values() {
+    for (const entry of this.cache.values()) {
+      yield entry.value;
+    }
+  }
+  [Symbol.iterator]() {
+    return this.entries();
   }
   /**
    * Removes all items from the cache.
@@ -4755,6 +4810,9 @@ function applyMaskingToField(maskingFunction, data, fieldName) {
     return `ERROR: Failed to mask field '${fieldName}' - ${errorType}`;
   }
 }
+var INITIAL_SPAN_WRITE_AS_MERGE = /* @__PURE__ */ Symbol(
+  "braintrust.initial-span-write-as-merge"
+);
 var BRAINTRUST_CURRENT_SPAN_STORE = /* @__PURE__ */ Symbol.for(
   "braintrust.currentSpanStore"
 );
@@ -7959,7 +8017,7 @@ var SpanImpl = class _SpanImpl {
     this._spanId = resolvedIds.spanId;
     this._rootSpanId = resolvedIds.rootSpanId;
     this._spanParents = resolvedIds.spanParents;
-    this.isMerge = false;
+    this.isMerge = args[INITIAL_SPAN_WRITE_AS_MERGE] === true;
     this.logInternal({ event, internalData });
     this.isMerge = true;
   }
@@ -8786,7 +8844,13 @@ var BraintrustObservabilityExporter = class {
     const args = {
       name: exported.name,
       spanAttributes: { type: spanTypeFor(exported.type) },
-      startTime: epochSeconds(exported.startTime)
+      startTime: epochSeconds(exported.startTime),
+      // Use the Mastra span id as the Braintrust row id so that
+      // `logFeedback({ id: <mastra span id> })` (and Mastra's score events)
+      // attach to the right row. Without this, `SpanImpl` auto-generates a
+      // row id (`this._id = eventId ?? idGenerator.getSpanId()`) that no
+      // external caller could know.
+      event: { id: exported.id }
     };
     const parentRecord = exported.parentSpanId ? this.spans.get(exported.parentSpanId) : void 0;
     if (!this.capturedParent) {