@sentry/junior 0.40.0 → 0.41.0

package/dist/{chunk-SPNY2HJJ.js → chunk-7QYONRLH.js}

@@ -2,7 +2,7 @@ import {
   getPluginForSkillPath,
   getPluginSkillRoots,
   logWarn
-} from "./chunk-EU6E7QU2.js";
+} from "./chunk-SCE5C645.js";
 import {
   skillRoots
 } from "./chunk-XPXD3FCE.js";
@@ -219,7 +219,7 @@ async function readSkillDirectory(skillDir) {
         {},
         {
           "file.path": skillDir,
-          "error.message": parsed.error
+          "exception.message": parsed.error
         },
         "Invalid skill frontmatter"
       );
@@ -240,7 +240,7 @@ async function readSkillDirectory(skillDir) {
       {},
       {
         "file.path": skillDir,
-        "error.message": error instanceof Error ? error.message : String(error)
+        "exception.message": error instanceof Error ? error.message : String(error)
       },
       "Failed to read skill directory"
     );
@@ -276,7 +276,7 @@ async function discoverSkills(options) {
         {},
         {
           "file.directory": root,
-          "error.message": error instanceof Error ? error.message : String(error)
+          "exception.message": error instanceof Error ? error.message : String(error)
         },
         "Failed to read skill root"
       );

package/dist/{chunk-EU6E7QU2.js → chunk-SCE5C645.js}

@@ -37,14 +37,14 @@ var SECRETS_RE = [
   /\b[A-Z0-9_]+(?:KEY|TOKEN|SECRET|PASSWORD|PASSWD)\s*[=:]\s*([^\s"']{8,})/gi
 ];
 var LEGACY_KEY_MAP = {
-  error: "error.message",
+  error: "exception.message",
   "error.stack": "exception.stacktrace",
   "gen_ai.system": "gen_ai.provider.name",
   "gen_ai.request.messages": "gen_ai.input.messages",
   "gen_ai.response.text": "gen_ai.output.messages",
   "messaging.conversation.id": "messaging.message.conversation_id",
   bytes: "file.size",
-  media_type: "file.mime_type",
+  media_type: "app.file.mime_type",
   skillDir: "file.path",
   root: "file.directory",
   originalLength: "app.output.original_length",
@@ -70,14 +70,12 @@ var LOGTAPE_BODY_KEY = "__logtape_body";
 var ROOT_LOGGER_CATEGORY = ["junior"];
 var CONSOLE_PRIORITY_KEYS = [
   "gen_ai.conversation.id",
-  "app.turn.id",
   "event.name",
   "app.log.source",
-  "error.message",
+  "exception.message",
   "messaging.message.id",
-  "app.trace_id",
-  "app.span_id",
-  "app.agent.id",
+  "trace_id",
+  "span_id",
   "messaging.message.conversation_id",
   "messaging.destination.name",
   "app.run.id",
@@ -90,7 +88,7 @@ var CONSOLE_ALWAYS_HIDDEN_KEYS = /* @__PURE__ */ new Set([
   "gen_ai.agent.name",
   "app.platform",
   "enduser.id",
-  "enduser.pseudo_id",
+  "enduser.pseudo.id",
   "http.request.method",
   "messaging.system",
   "url.full",
@@ -290,15 +288,13 @@ function sanitizeValue(value) {
 function contextToAttributes(context) {
   const attributes = {
     "gen_ai.conversation.id": context.conversationId,
-    "app.turn.id": context.turnId,
-    "app.agent.id": context.agentId,
     "app.platform": context.platform,
     "app.request.id": context.requestId,
     "messaging.system": context.platform === "slack" ? "slack" : context.platform,
     "messaging.message.conversation_id": context.slackThreadId,
     "messaging.destination.name": context.slackChannelId,
     "enduser.id": context.slackUserId,
-    "enduser.pseudo_id": context.slackUserName,
+    "enduser.pseudo.id": context.slackUserName,
     "app.run.id": context.runId,
     "gen_ai.agent.name": context.assistantUserName,
     "gen_ai.request.model": context.modelId,
@@ -539,9 +535,6 @@ function shouldHideConsoleAttribute(level, eventName, key, attributes) {
   if (CONSOLE_DROP_WHEN_COUNTED_KEYS.has(key)) {
     return true;
   }
-  if (key === "app.agent.id" && attributes[key] === attributes["app.turn.id"]) {
-    return true;
-  }
   if (key === "messaging.message.conversation_id" && attributes[key] === attributes["gen_ai.conversation.id"]) {
     return true;
   }
@@ -673,7 +666,6 @@ function getPrettyConsoleSummaryTokens(level, eventName, attributes) {
     const conversationId = toOptionalString(
       attributes["gen_ai.conversation.id"]
     );
-    const turnId = toOptionalString(attributes["app.turn.id"]);
     const messageId = toOptionalString(attributes["messaging.message.id"]);
     if (conversationId) {
       pushPrettyConsoleToken(
@@ -681,9 +673,6 @@ function getPrettyConsoleSummaryTokens(level, eventName, attributes) {
         `conv=${abbreviateConsoleId(conversationId)}`
       );
     }
-    if (turnId) {
-      pushPrettyConsoleToken(tokens, `turn=${abbreviateConsoleId(turnId)}`);
-    }
     if (messageId) {
       pushPrettyConsoleToken(tokens, `msg=${abbreviateConsoleId(messageId)}`);
     }
@@ -853,7 +842,6 @@ var log = {
       {
         ...attrs,
         "error.type": normalizedError.name,
-        "error.message": normalizedError.message,
         "exception.type": normalizedError.name,
         "exception.message": normalizedError.message,
         "exception.stacktrace": normalizedError.stack
@@ -1019,6 +1007,16 @@ function toSpanAttributeValue(value) {
   );
   return sanitized.length > 0 ? sanitized : void 0;
 }
+function normalizeSpanAttributes(attributes) {
+  const normalized = {};
+  for (const [rawKey, value] of Object.entries(attributes)) {
+    const normalizedValue = toSpanAttributeValue(value);
+    if (normalizedValue !== void 0) {
+      normalized[normalizeAttributeKey(rawKey)] = normalizedValue;
+    }
+  }
+  return normalized;
+}
 function logInfo(eventName, context = {}, attributes = {}, body) {
   log.info(eventName, { ...toSpanAttributes(context), ...attributes }, body);
 }
@@ -1048,13 +1046,7 @@ async function withContext(context, callback) {
   return withLogContext(context, callback);
 }
 async function withSpan(name, op, context, callback, attributes = {}) {
-  const normalizedAttributes = {};
-  for (const [key, value] of Object.entries(attributes)) {
-    const normalizedValue = toSpanAttributeValue(value);
-    if (normalizedValue !== void 0) {
-      normalizedAttributes[key] = normalizedValue;
-    }
-  }
+  const normalizedAttributes = normalizeSpanAttributes(attributes);
   return withLogContext(context, () => {
     const inheritedAttributes = getLogContextAttributes();
     return sentry_exports.startSpan(
@@ -1080,11 +1072,10 @@ function setSpanAttributes(attributes) {
   if (typeof setAttribute !== "function") {
     return;
   }
-  for (const [key, value] of Object.entries(attributes)) {
-    const normalizedValue = toSpanAttributeValue(value);
-    if (normalizedValue !== void 0) {
-      setAttribute.call(span, key, normalizedValue);
-    }
+  for (const [key, value] of Object.entries(
+    normalizeSpanAttributes(attributes)
+  )) {
+    setAttribute.call(span, key, value);
   }
 }
 function setSpanStatus(status) {
@@ -1189,6 +1180,18 @@ function toFiniteTokenCount(value) {
   const rounded = Math.floor(value);
   return rounded >= 0 ? rounded : void 0;
 }
+function sumTokenCounts(...values) {
+  let total = 0;
+  let hasValue = false;
+  for (const value of values) {
+    if (value === void 0) {
+      continue;
+    }
+    total += value;
+    hasValue = true;
+  }
+  return hasValue ? total : void 0;
+}
 var PI_USAGE_FIELDS = [
   ["input", "inputTokens"],
   ["output", "outputTokens"],
@@ -1204,7 +1207,7 @@ function readPiUsage(source) {
   const usage = asRecord(record.usage) ?? record;
   const summary = {};
   for (const [piKey, ourKey] of PI_USAGE_FIELDS) {
-    const value = toFiniteTokenCount(usage[piKey]);
+    const value = toFiniteTokenCount(usage[piKey]) ?? toFiniteTokenCount(usage[ourKey]);
     if (value !== void 0) {
       summary[ourKey] = value;
     }
@@ -1224,10 +1227,17 @@ function extractGenAiUsageSummary(...sources) {
   return summary;
 }
 function extractGenAiUsageAttributes(...sources) {
-  const { inputTokens, outputTokens } = extractGenAiUsageSummary(...sources);
+  const { inputTokens, outputTokens, cachedInputTokens, cacheCreationTokens } = extractGenAiUsageSummary(...sources);
+  const semanticInputTokens = sumTokenCounts(
+    inputTokens,
+    cachedInputTokens,
+    cacheCreationTokens
+  );
   return {
-    ...inputTokens !== void 0 ? { "gen_ai.usage.input_tokens": inputTokens } : {},
-    ...outputTokens !== void 0 ? { "gen_ai.usage.output_tokens": outputTokens } : {}
+    ...semanticInputTokens !== void 0 ? { "gen_ai.usage.input_tokens": semanticInputTokens } : {},
+    ...outputTokens !== void 0 ? { "gen_ai.usage.output_tokens": outputTokens } : {},
+    ...cachedInputTokens !== void 0 ? { "gen_ai.usage.cache_read.input_tokens": cachedInputTokens } : {},
+    ...cacheCreationTokens !== void 0 ? { "gen_ai.usage.cache_creation.input_tokens": cacheCreationTokens } : {}
   };
 }
 
@@ -2709,7 +2719,7 @@ function buildLoadedPluginState(source) {
         {},
         {
           "file.directory": pluginsRoot,
-          "error.message": error instanceof Error ? error.message : String(error)
+          "exception.message": error instanceof Error ? error.message : String(error)
         },
         "Failed to read plugin root"
       );
@@ -2737,7 +2747,7 @@ function buildLoadedPluginState(source) {
         {},
         {
           "file.directory": pluginsRoot,
-          "error.message": error instanceof Error ? error.message : String(error)
+          "exception.message": error instanceof Error ? error.message : String(error)
         },
         "Failed to read plugin root"
       );
@@ -2781,7 +2791,7 @@ function logLoadedPlugins(state) {
         "app.plugin.config_key_count": plugin.manifest.configKeys.length,
         "app.plugin.has_mcp": Boolean(plugin.manifest.mcp),
         "file.directory": plugin.dir,
-        "file.skill_directory": plugin.skillsDir
+        "app.file.skill_directory": plugin.skillsDir
       },
       "Loaded plugin"
     );

package/dist/{chunk-SY4ULGUN.js → chunk-Y3UO7NR6.js}

@@ -7,7 +7,7 @@ import {
   serializeGenAiAttribute,
   setSpanAttributes,
   withSpan
-} from "./chunk-EU6E7QU2.js";
+} from "./chunk-SCE5C645.js";
 
 // src/chat/state/adapter.ts
 import { createMemoryState } from "@chat-adapter/state-memory";
@@ -182,7 +182,7 @@ async function completeText(params) {
           {},
           {
             ...baseAttributes,
-            "error.message": providerMessage
+            "exception.message": providerMessage
           },
           "AI completion returned provider error"
         );
@@ -197,7 +197,6 @@ async function completeText(params) {
   );
 }
 async function completeObject(params) {
-  const startedAt = Date.now();
   let text = "";
   try {
     ({ text } = await completeText({
@@ -224,8 +223,7 @@ async function completeObject(params) {
       {
         "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
         "gen_ai.operation.name": GEN_AI_OPERATION_CHAT,
-        "gen_ai.request.model": params.modelId,
-        "app.ai.duration_ms": Date.now() - startedAt
+        "gen_ai.request.model": params.modelId
       },
       "AI object completion failed"
     );
@@ -242,7 +240,6 @@ async function completeObject(params) {
         "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
         "gen_ai.operation.name": GEN_AI_OPERATION_CHAT,
         "gen_ai.request.model": params.modelId,
-        "app.ai.duration_ms": Date.now() - startedAt,
         "app.ai.response_preview": preview
       },
       "AI object completion schema parse failed"

package/dist/cli/check.js

@@ -1,9 +1,9 @@
 import {
   parseSkillFile
-} from "../chunk-SPNY2HJJ.js";
+} from "../chunk-7QYONRLH.js";
 import {
   parsePluginManifest
-} from "../chunk-EU6E7QU2.js";
+} from "../chunk-SCE5C645.js";
 import "../chunk-Z3YD6NHK.js";
 import "../chunk-XPXD3FCE.js";
 import "../chunk-2KG3PWR4.js";

package/dist/cli/init.js

@@ -147,6 +147,7 @@ AI_VISION_MODEL=
 AI_WEB_SEARCH_MODEL=
 REDIS_URL=
 SENTRY_DSN=
+SENTRY_ORG_SLUG=
 `
   );
   writeServerEntry(target);

package/dist/cli/snapshot-warmup.js

@@ -1,12 +1,12 @@
 import {
   disconnectStateAdapter,
   resolveRuntimeDependencySnapshot
-} from "../chunk-SY4ULGUN.js";
+} from "../chunk-Y3UO7NR6.js";
 import {
   getPluginProviders,
   getPluginRuntimeDependencies,
   getPluginRuntimePostinstall
-} from "../chunk-EU6E7QU2.js";
+} from "../chunk-SCE5C645.js";
 import "../chunk-Z3YD6NHK.js";
 import "../chunk-XPXD3FCE.js";
 import "../chunk-2KG3PWR4.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "private": false,
   "publishConfig": {
     "access": "public"