@mastra/observability 1.17.1-alpha.0 → 1.17.1-alpha.2

package/dist/index.js

@@ -192,6 +192,12 @@ const LOGGER_METHODS = [
 	"warn",
 	"error"
 ];
+/** Keys whose value decides the outcome in `shouldStripEntry()`. */
+const VALUE_STRIP_KEYS = /* @__PURE__ */ new Set([
+	"logger",
+	"tracingContext",
+	...FUNCTION_KEYS_TO_STRIP
+]);
 const DEFAULT_DEEP_CLEAN_OPTIONS = Object.freeze({
 	keysToStrip: [],
 	maxDepth: 8,
@@ -273,6 +279,25 @@ function shouldStripEntry(key, value, stripSet) {
 	if (key === "logger") return typeof value === "function" || isLoggerLike(value);
 	return FUNCTION_KEYS_TO_STRIP.has(key) && typeof value === "function";
 }
+/**
+* Whether an entry past the object-key limit would have been stripped anyway.
+*
+* The entry is dropped either way, so the value is taken from its property descriptor
+* rather than read: a getter must not run for data that is being discarded. That keeps
+* the truncation count the same wherever a runtime-shaped key sits. An accessor cannot
+* be classified without invoking it, so it is left to the limit and counted.
+*/
+function wouldBeStripped(key, val, stripSet) {
+	if (!VALUE_STRIP_KEYS.has(key)) return false;
+	let descriptor;
+	try {
+		descriptor = Object.getOwnPropertyDescriptor(val, key);
+	} catch {
+		return false;
+	}
+	if (!descriptor || !("value" in descriptor)) return false;
+	return shouldStripEntry(key, descriptor.value, stripSet);
+}
 function restoreSerializedMapKey(keyType, key) {
 	switch (keyType) {
 		case "undefined": return;
@@ -458,25 +483,22 @@ function deepClean(value, options = DEFAULT_DEEP_CLEAN_OPTIONS) {
 				return formatSerializationError(error);
 			}
 			let keyCount = 0;
+			let omittedByLimit = 0;
 			for (const key of keys) {
 				if (stripSet.has(key)) continue;
+				if (keyCount >= maxObjectKeys) {
+					if (!wouldBeStripped(key, val, stripSet)) omittedByLimit++;
+					continue;
+				}
 				let rawValue;
 				try {
 					rawValue = val[key];
 				} catch (error) {
-					if (keyCount >= maxObjectKeys) {
-						cleaned["__truncated"] = `${keys.length - keyCount} more keys omitted`;
-						break;
-					}
 					cleaned[key] = formatSerializationError(error);
 					keyCount++;
 					continue;
 				}
 				if (shouldStripEntry(key, rawValue, stripSet)) continue;
-				if (keyCount >= maxObjectKeys) {
-					cleaned["__truncated"] = `${keys.length - keyCount} more keys omitted`;
-					break;
-				}
 				try {
 					cleaned[key] = helper(rawValue, depth + 1);
 					keyCount++;
@@ -485,6 +507,7 @@ function deepClean(value, options = DEFAULT_DEEP_CLEAN_OPTIONS) {
 					keyCount++;
 				}
 			}
+			if (omittedByLimit > 0) cleaned["__truncated"] = `${omittedByLimit} more keys omitted`;
 			return cleaned;
 		} finally {
 			if (typeof val === "object" && val !== null) ancestors.delete(val);
@@ -1077,6 +1100,8 @@ const MINIFIED_METER_TO_CANONICAL = {
 	ot: "output_tokens",
 	icrt: "input_cache_read_tokens",
 	icwt: "input_cache_write_tokens",
+	icwt5m: "input_cache_write_5m_tokens",
+	icwt1h: "input_cache_write_1h_tokens",
 	iat: "input_audio_tokens",
 	oat: "output_audio_tokens",
 	ort: "output_reasoning_tokens"
@@ -1133,6 +1158,15 @@ function parsePricingModelText(content) {
 	}
 	return pricingModels;
 }
+function expandRates(row, tier) {
+	const rates = Object.fromEntries(Object.entries(tier.r).map(([meter, value]) => [MINIFIED_METER_TO_CANONICAL[meter], value.c]));
+	const cacheWriteRate = rates.input_cache_write_tokens;
+	if (row.m.includes("claude") && typeof cacheWriteRate === "number") {
+		rates.input_cache_write_5m_tokens ??= cacheWriteRate;
+		rates.input_cache_write_1h_tokens ??= cacheWriteRate * 1.6;
+	}
+	return rates;
+}
 function expandPricingModelRow(row) {
 	return new PricingModel({
 		id: row.i,
@@ -1147,7 +1181,7 @@ function expandPricingModelRow(row) {
 				op: condition.op,
 				value: condition.value
 			})),
-			rates: Object.fromEntries(Object.entries(tier.r).map(([meter, value]) => [MINIFIED_METER_TO_CANONICAL[meter], value.c]))
+			rates: expandRates(row, tier)
 		}))
 	});
 }
@@ -1278,6 +1312,8 @@ const PricingMeter = {
 	INPUT_AUDIO_TOKENS: "input_audio_tokens",
 	INPUT_CACHE_READ_TOKENS: "input_cache_read_tokens",
 	INPUT_CACHE_WRITE_TOKENS: "input_cache_write_tokens",
+	INPUT_CACHE_WRITE_5M_TOKENS: "input_cache_write_5m_tokens",
+	INPUT_CACHE_WRITE_1H_TOKENS: "input_cache_write_1h_tokens",
 	INPUT_IMAGE_TOKENS: "input_image_tokens",
 	OUTPUT_TOKENS: "output_tokens",
 	OUTPUT_AUDIO_TOKENS: "output_audio_tokens",
@@ -1290,6 +1326,8 @@ const TokenMetrics = {
 	INPUT_TEXT: "mastra_model_input_text_tokens",
 	INPUT_CACHE_READ: "mastra_model_input_cache_read_tokens",
 	INPUT_CACHE_WRITE: "mastra_model_input_cache_write_tokens",
+	INPUT_CACHE_WRITE_5M: "mastra_model_input_cache_write_5m_tokens",
+	INPUT_CACHE_WRITE_1H: "mastra_model_input_cache_write_1h_tokens",
 	INPUT_AUDIO: "mastra_model_input_audio_tokens",
 	INPUT_IMAGE: "mastra_model_input_image_tokens",
 	OUTPUT_TEXT: "mastra_model_output_text_tokens",
@@ -1319,6 +1357,8 @@ function getTokenMetricSamples(usage) {
 		pushIfPositive(TokenMetrics.INPUT_TEXT, usage.inputDetails.text);
 		pushIfPositive(TokenMetrics.INPUT_CACHE_READ, usage.inputDetails.cacheRead);
 		pushIfPositive(TokenMetrics.INPUT_CACHE_WRITE, usage.inputDetails.cacheWrite);
+		pushIfPositive(TokenMetrics.INPUT_CACHE_WRITE_5M, usage.inputDetails.cacheWrite5m);
+		pushIfPositive(TokenMetrics.INPUT_CACHE_WRITE_1H, usage.inputDetails.cacheWrite1h);
 		pushIfPositive(TokenMetrics.INPUT_AUDIO, usage.inputDetails.audio);
 		pushIfPositive(TokenMetrics.INPUT_IMAGE, usage.inputDetails.image);
 	}
@@ -1385,15 +1425,40 @@ function estimateCosts(args, pricingRegistry = PricingRegistry.getGlobal()) {
 		results.set(TokenMetrics.INPUT_CACHE_READ, result.costContext);
 		inputDetailResults.push(result);
 	}
-	if (usage.inputDetails?.cacheWrite) {
+	const cacheWriteDetailResults = [];
+	const cacheWrite5m = usage.inputDetails?.cacheWrite5m ?? 0;
+	const cacheWrite1h = usage.inputDetails?.cacheWrite1h ?? 0;
+	if (cacheWrite5m > 0) {
+		const result = estimateCostForMeter({
+			meter: PricingMeter.INPUT_CACHE_WRITE_5M_TOKENS,
+			tokenCount: cacheWrite5m,
+			...estimateFields
+		});
+		results.set(TokenMetrics.INPUT_CACHE_WRITE_5M, result.costContext);
+		cacheWriteDetailResults.push(result);
+		inputDetailResults.push(result);
+	}
+	if (cacheWrite1h > 0) {
+		const result = estimateCostForMeter({
+			meter: PricingMeter.INPUT_CACHE_WRITE_1H_TOKENS,
+			tokenCount: cacheWrite1h,
+			...estimateFields
+		});
+		results.set(TokenMetrics.INPUT_CACHE_WRITE_1H, result.costContext);
+		cacheWriteDetailResults.push(result);
+		inputDetailResults.push(result);
+	}
+	const unclassifiedCacheWrite = Math.max(0, (usage.inputDetails?.cacheWrite ?? 0) - cacheWrite5m - cacheWrite1h);
+	if (unclassifiedCacheWrite > 0) {
 		const result = estimateCostForMeter({
 			meter: PricingMeter.INPUT_CACHE_WRITE_TOKENS,
-			tokenCount: usage.inputDetails.cacheWrite,
+			tokenCount: unclassifiedCacheWrite,
 			...estimateFields
 		});
-		results.set(TokenMetrics.INPUT_CACHE_WRITE, result.costContext);
+		cacheWriteDetailResults.push(result);
 		inputDetailResults.push(result);
 	}
+	if (cacheWriteDetailResults.length > 0) setCombinedCostContext(results, TokenMetrics.INPUT_CACHE_WRITE, cacheWriteDetailResults, pricingModel, costMetadata);
 	if (usage.inputDetails?.image) {
 		const result = estimateCostForMeter({
 			meter: PricingMeter.INPUT_IMAGE_TOKENS,
@@ -1470,6 +1535,20 @@ function estimateCosts(args, pricingRegistry = PricingRegistry.getGlobal()) {
 function applyErrorContextForUsage(results, usage, errorContext) {
 	for (const sample of getTokenMetricSamples(usage)) results.set(sample.name, errorContext);
 }
+function setCombinedCostContext(results, metric, detailResults, pricingModel, costMetadata) {
+	const estimatedCosts = detailResults.map((result) => result.costContext.estimatedCost).filter((value) => typeof value === "number");
+	const hasFailedCost = detailResults.some((result) => !result.success);
+	results.set(metric, {
+		provider: pricingModel.provider,
+		model: pricingModel.model,
+		...estimatedCosts.length > 0 && { estimatedCost: estimatedCosts.reduce((sum, value) => sum + value, 0) },
+		...estimatedCosts.length > 0 && { costUnit: pricingModel.currency },
+		costMetadata: hasFailedCost ? {
+			...costMetadata,
+			error: "partial_cost"
+		} : { ...costMetadata }
+	});
+}
 function setAggregateCostContext(args) {
 	const { results, totalMetric, fallbackMeter, totalTokenCount, detailResults, pricingModel, pricingTier, costMetadata } = args;
 	if (totalTokenCount == null) return;
@@ -1710,14 +1789,24 @@ function extractUsageMetrics(usage, providerMetadata) {
 	if (isDefined(aiSdkDetails?.cacheReadTokens)) inputDetails.cacheRead = aiSdkDetails.cacheReadTokens;
 	if (isDefined(aiSdkDetails?.cacheWriteTokens)) inputDetails.cacheWrite = aiSdkDetails.cacheWriteTokens;
 	if (!isDefined(inputDetails.cacheRead) && isDefined(usage.cachedInputTokens)) inputDetails.cacheRead = usage.cachedInputTokens;
+	if (isDefined(usage.cacheCreationInputTokens5m)) inputDetails.cacheWrite5m = usage.cacheCreationInputTokens5m;
+	if (isDefined(usage.cacheCreationInputTokens1h)) inputDetails.cacheWrite1h = usage.cacheCreationInputTokens1h;
 	if (!isDefined(inputDetails.cacheWrite) && isDefined(usage.cacheCreationInputTokens)) inputDetails.cacheWrite = usage.cacheCreationInputTokens;
+	if (!isDefined(inputDetails.cacheWrite) && (isDefined(inputDetails.cacheWrite5m) || isDefined(inputDetails.cacheWrite1h))) inputDetails.cacheWrite = (inputDetails.cacheWrite5m ?? 0) + (inputDetails.cacheWrite1h ?? 0);
 	if (isDefined(usage.reasoningTokens)) outputDetails.reasoning = usage.reasoningTokens;
 	const anthropic = providerMetadata?.anthropic;
 	if (anthropic) {
 		const rawV3InputUsage = isV3RawUsage(usage.raw) ? usage.raw.inputTokens : void 0;
 		const hasV3CachedTotals = rawV3InputUsage?.total !== void 0 && (rawV3InputUsage.cacheRead !== void 0 || rawV3InputUsage.cacheWrite !== void 0);
 		if (!isDefined(inputDetails.cacheRead) && isDefined(anthropic.cacheReadInputTokens)) inputDetails.cacheRead = anthropic.cacheReadInputTokens;
-		if (!isDefined(inputDetails.cacheWrite) && isDefined(anthropic.cacheCreationInputTokens)) inputDetails.cacheWrite = anthropic.cacheCreationInputTokens;
+		const cacheWrite5m = anthropic.cacheCreation?.ephemeral_5m_input_tokens ?? anthropic.cacheCreation?.ephemeral5mInputTokens;
+		const cacheWrite1h = anthropic.cacheCreation?.ephemeral_1h_input_tokens ?? anthropic.cacheCreation?.ephemeral1hInputTokens;
+		if (!isDefined(inputDetails.cacheWrite5m) && isDefined(cacheWrite5m)) inputDetails.cacheWrite5m = cacheWrite5m;
+		if (!isDefined(inputDetails.cacheWrite1h) && isDefined(cacheWrite1h)) inputDetails.cacheWrite1h = cacheWrite1h;
+		if (!isDefined(inputDetails.cacheWrite)) {
+			if (isDefined(anthropic.cacheCreationInputTokens)) inputDetails.cacheWrite = anthropic.cacheCreationInputTokens;
+			else if (isDefined(cacheWrite5m) || isDefined(cacheWrite1h)) inputDetails.cacheWrite = (cacheWrite5m ?? 0) + (cacheWrite1h ?? 0);
+		}
 		if (!(hasV3CachedTotals || isDefined(usage.cachedInputTokens) && usage.cachedInputTokens > 0 || isDefined(usage.cacheCreationInputTokens) && usage.cacheCreationInputTokens > 0) && (isDefined(inputDetails.cacheRead) || isDefined(inputDetails.cacheWrite))) inputTokens = (usage.inputTokens ?? 0) + (inputDetails.cacheRead ?? 0) + (inputDetails.cacheWrite ?? 0);
 	}
 	const google = providerMetadata?.google;
@@ -1758,6 +1847,8 @@ function mergeInputDetails(a, b) {
 		text: addOptional(a.text, b.text),
 		cacheRead: addOptional(a.cacheRead, b.cacheRead),
 		cacheWrite: addOptional(a.cacheWrite, b.cacheWrite),
+		cacheWrite5m: addOptional(a.cacheWrite5m, b.cacheWrite5m),
+		cacheWrite1h: addOptional(a.cacheWrite1h, b.cacheWrite1h),
 		audio: addOptional(a.audio, b.audio),
 		image: addOptional(a.image, b.image)
 	};