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

package/dist/index.js

@@ -18085,6 +18085,7 @@ var PricingRegistry = class _PricingRegistry {
   constructor(pricingModels) {
     this.pricingModels = pricingModels;
   }
+  pricingModels;
   static globalRegistry = null;
   static fromText(pricingModelText) {
     return new _PricingRegistry(parsePricingModelText(pricingModelText));
@@ -18101,12 +18102,11 @@ var PricingRegistry = class _PricingRegistry {
     return _PricingRegistry.globalRegistry;
   }
   get(args) {
-    const key = makePricingKey(args);
-    const exact = this.pricingModels.get(key);
-    if (exact) return exact;
-    const dashedKey = makePricingKey({ provider: args.provider, model: args.model.replace(/\./g, "-") });
-    if (dashedKey !== key) {
-      return this.pricingModels.get(dashedKey) ?? null;
+    const variants = getModelVariants(args.model);
+    for (const variant of variants) {
+      const key = makePricingKey({ provider: args.provider, model: variant });
+      const match = this.pricingModels.get(key);
+      if (match) return match;
     }
     return null;
   }
@@ -18196,6 +18196,18 @@ function normalizeProvider(provider) {
   const dotIndex = normalized.indexOf(".");
   return dotIndex !== -1 ? normalized.substring(0, dotIndex) : normalized;
 }
+function getModelVariants(model) {
+  const dashed = model.replace(/\./g, "-");
+  return [model, dashed, stripDateSuffix(model), stripDateSuffix(dashed)];
+}
+function stripDateSuffix(model) {
+  let stripped = model.replace(/-20\d{2}-\d{2}-\d{2}$/, "");
+  if (stripped !== model) return stripped;
+  stripped = model.replace(/-20\d{6}(-[a-z]+)?$/, "$1");
+  if (stripped !== model) return stripped;
+  stripped = model.replace(/-\d{2}-20\d{2}$/, "");
+  return stripped;
+}
 
 // src/metrics/types.ts
 var PricingMeter = {
@@ -18586,7 +18598,8 @@ function extractUsageMetrics(usage, providerMetadata) {
     if (!isDefined(inputDetails.cacheWrite) && isDefined(anthropic.cacheCreationInputTokens)) {
       inputDetails.cacheWrite = anthropic.cacheCreationInputTokens;
     }
-    if (!hasV3CachedTotals && (isDefined(inputDetails.cacheRead) || isDefined(inputDetails.cacheWrite))) {
+    const inputAlreadyIncludesCache = hasV3CachedTotals || isDefined(usage.cachedInputTokens) && usage.cachedInputTokens > 0;
+    if (!inputAlreadyIncludesCache && (isDefined(inputDetails.cacheRead) || isDefined(inputDetails.cacheWrite))) {
       inputTokens = (usage.inputTokens ?? 0) + (inputDetails.cacheRead ?? 0) + (inputDetails.cacheWrite ?? 0);
     }
   }
@@ -18625,15 +18638,150 @@ function sumDefinedValues(obj, keys) {
 }
 
 // src/model-tracing.ts
+function formatPreviewLabel(label, fallback) {
+  return typeof label === "string" && label.length > 0 ? label : fallback;
+}
+function summarizePart(part) {
+  if (typeof part === "string") {
+    return part;
+  }
+  if (!part || typeof part !== "object") {
+    return "";
+  }
+  if ("text" in part && typeof part.text === "string") {
+    return part.text;
+  }
+  if ("parts" in part && Array.isArray(part.parts)) {
+    return part.parts.map(summarizePart).filter(Boolean).join("");
+  }
+  if ("inlineData" in part && part.inlineData && typeof part.inlineData === "object") {
+    return `[${formatPreviewLabel(part.inlineData.mimeType, "binary")}]`;
+  }
+  if ("image_url" in part) {
+    return "[image]";
+  }
+  if ("functionCall" in part && part.functionCall && typeof part.functionCall === "object") {
+    return `[tool: ${formatPreviewLabel(part.functionCall.name, "unknown")}]`;
+  }
+  if ("function_call" in part && part.function_call && typeof part.function_call === "object") {
+    return `[tool: ${formatPreviewLabel(part.function_call.name, "unknown")}]`;
+  }
+  if ("function" in part && part.function && typeof part.function === "object") {
+    return `[tool: ${formatPreviewLabel(part.function.name, "unknown")}]`;
+  }
+  if ("toolName" in part) {
+    return `[tool: ${formatPreviewLabel(part.toolName, "unknown")}]`;
+  }
+  if ("type" in part && typeof part.type === "string") {
+    switch (part.type) {
+      case "image":
+        return "[image]";
+      case "file":
+        return "[file]";
+      case "reasoning":
+        return "[reasoning]";
+      case "tool-call":
+        return `[tool: ${formatPreviewLabel(part.toolName, "unknown")}]`;
+      case "tool-result":
+        return "[tool-result]";
+      default:
+        return `[${part.type}]`;
+    }
+  }
+  if ("content" in part && typeof part.content === "string") {
+    return part.content;
+  }
+  return "[object]";
+}
+function summarizeMessageContent(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (Array.isArray(content)) {
+    return content.map(summarizePart).filter(Boolean).join("");
+  }
+  if (content && typeof content === "object") {
+    if ("parts" in content && Array.isArray(content.parts)) {
+      return content.parts.map(summarizePart).filter(Boolean).join("");
+    }
+    return summarizePart(content);
+  }
+  if (content == null) {
+    return "";
+  }
+  return String(content);
+}
+function appendToolPreview(preview, toolCalls) {
+  if (!Array.isArray(toolCalls) || toolCalls.length === 0) {
+    return preview;
+  }
+  const toolPreview = toolCalls.map((toolCall) => summarizePart(toolCall)).filter(Boolean).join(" ");
+  if (!toolPreview) {
+    return preview;
+  }
+  return preview ? `${preview} ${toolPreview}` : toolPreview;
+}
+function appendPreview(preview, addition) {
+  if (!addition) {
+    return preview;
+  }
+  return preview ? `${preview} ${addition}` : addition;
+}
+function normalizeMessages(messages) {
+  return messages.map((message) => {
+    if (!message || typeof message !== "object") {
+      return { role: "user", content: summarizeMessageContent(message) };
+    }
+    const role = typeof message.role === "string" ? message.role : "user";
+    const baseContent = summarizeMessageContent(message.content);
+    const contentWithToolArrays = appendToolPreview(
+      appendToolPreview(baseContent, message.toolCalls),
+      message.tool_calls
+    );
+    const functionCall = message.functionCall;
+    const functionCallPreview = functionCall === void 0 ? "" : summarizePart({ functionCall });
+    const functionCallSnakeCase = message.function_call;
+    const functionCallSnakeCasePreview = functionCallSnakeCase === void 0 ? "" : summarizePart({ function_call: functionCallSnakeCase });
+    const contentWithFunctionCall = appendPreview(
+      appendPreview(contentWithToolArrays, functionCallPreview),
+      functionCallSnakeCasePreview
+    );
+    return { role, content: contentWithFunctionCall };
+  });
+}
+function summarizeRequestBody(body) {
+  if (body == null) {
+    return void 0;
+  }
+  if (typeof body !== "object") {
+    return typeof body === "string" ? body : String(body);
+  }
+  if (Array.isArray(body.messages)) {
+    return normalizeMessages(body.messages);
+  }
+  if (Array.isArray(body.contents)) {
+    return body.contents.map((item) => ({
+      role: typeof item?.role === "string" ? item.role : "user",
+      content: Array.isArray(item?.parts) ? item.parts.map(summarizePart).filter(Boolean).join("") : ""
+    }));
+  }
+  const summary = {};
+  if (typeof body.model === "string") {
+    summary.model = body.model;
+  }
+  const bodyKeys = Object.keys(body).filter((key) => key !== "body");
+  if (bodyKeys.length > 0) {
+    summary.keys = bodyKeys;
+  }
+  return Object.keys(summary).length > 0 ? summary : "[request body]";
+}
 function extractStepInput(request) {
   if (!request) return void 0;
   const { body } = request;
   if (body == null) return request;
   try {
     const parsed = typeof body === "string" ? JSON.parse(body) : body;
-    if (Array.isArray(parsed?.messages)) return parsed.messages;
-    if (Array.isArray(parsed?.contents)) return parsed.contents;
-    return parsed;
+    return summarizeRequestBody(parsed);
   } catch {
     return request;
   }
@@ -19220,6 +19368,10 @@ var BaseSpan = class {
     }
     const metadata = this.metadata ?? {};
     const getMetadataString = (key) => typeof metadata[key] === "string" ? metadata[key] : void 0;
+    const getSpanMetadataString = (span, key) => {
+      const m = span?.metadata;
+      return m && typeof m[key] === "string" ? m[key] : void 0;
+    };
     const parentSpan = this.getParentSpan(false);
     let rootSpan = this;
     while (rootSpan.parent) {
@@ -19233,12 +19385,15 @@ var BaseSpan = class {
       entityType: this.entityType,
       entityId: this.entityId,
       entityName: this.entityName,
+      entityVersionId: getMetadataString("entityVersionId"),
       parentEntityType: parentSpan?.entityType,
       parentEntityId: parentSpan?.entityId,
       parentEntityName: parentSpan?.entityName,
+      parentEntityVersionId: getSpanMetadataString(parentSpan, "entityVersionId"),
       rootEntityType: rootSpan.entityType,
       rootEntityId: rootSpan.entityId,
       rootEntityName: rootSpan.entityName,
+      rootEntityVersionId: getSpanMetadataString(rootSpan, "entityVersionId"),
       userId: getMetadataString("userId"),
       organizationId: getMetadataString("organizationId"),
       resourceId: getMetadataString("resourceId"),
@@ -19375,7 +19530,10 @@ var DefaultSpan = class extends BaseSpan {
         domain: error48.domain,
         message: error48.message,
         name: error48.name,
-        stack: error48.stack
+        // Prefer the original cause's stack when available. MastraError wraps
+        // thrown errors, so its own stack points to the wrapping site rather
+        // than where the underlying error was thrown.
+        stack: error48.cause instanceof Error && error48.cause.stack || error48.stack
       } : {
         message: error48.message,
         name: error48.name,