@sentry/junior 0.108.0 → 0.109.0

package/dist/{chunk-XKB7LGIW.js → chunk-FWJRXN4F.js}

@@ -3,17 +3,17 @@ import {
 } from "./chunk-CEA3A3UA.js";
 import {
   normalizeSlackConversationId
-} from "./chunk-VH6KWKG2.js";
+} from "./chunk-RGX4V75M.js";
 import {
   juniorConversationEvents,
   juniorConversations
-} from "./chunk-TE4QHJH4.js";
+} from "./chunk-TMBRFULF.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
 import {
   parseSlackThreadId
-} from "./chunk-RT5BUHR5.js";
+} from "./chunk-O3JMSZLI.js";
 import {
   getClient
 } from "./chunk-6GWA276C.js";

package/dist/{chunk-PUAMO4PI.js → chunk-HHVY4SMP.js}

@@ -80,6 +80,7 @@ var conversationReportMessageEventDataSchema = z2.object({
   type: z2.literal("message"),
   messageId: z2.string().min(1),
   role: z2.enum(["assistant", "system", "user"]),
+  eventType: z2.string().min(1).optional(),
   text: z2.string().optional(),
   redacted: z2.literal(true).optional()
 }).strict().superRefine((data, context) => {
@@ -96,8 +97,24 @@ var conversationReportMessageHandledEventDataSchema = z2.object({
 }).strict();
 var conversationReportToolStartedEventDataSchema = z2.object({
   type: z2.literal("tool_started"),
+  toolCallId: z2.string().min(1),
   name: z2.string().min(1)
 }).strict();
+var conversationReportToolCallSchema = z2.object({
+  toolCallId: z2.string().min(1),
+  name: z2.string().min(1),
+  input: z2.unknown().optional()
+}).strict();
+var conversationReportToolCallsEventDataSchema = z2.object({
+  type: z2.literal("tool_calls"),
+  calls: z2.array(conversationReportToolCallSchema).min(1)
+}).strict();
+var conversationReportToolResultEventDataSchema = z2.object({
+  type: z2.literal("tool_result"),
+  toolCallId: z2.string().min(1),
+  outcome: z2.enum(["completed", "error"]),
+  output: z2.unknown().optional()
+}).strict();
 var conversationReportTurnLifecycleEventDataSchema = z2.discriminatedUnion(
   "state",
   [
@@ -117,13 +134,13 @@ var conversationReportTurnLifecycleEventDataSchema = z2.discriminatedUnion(
 var conversationReportCompactionEventDataSchema = z2.object({ type: z2.literal("compaction") }).strict();
 var conversationReportHandoffEventDataSchema = z2.object({
   type: z2.literal("handoff"),
-  toolStartedSeq: z2.number().int().nonnegative().optional()
+  triggeringToolCallId: z2.string().min(1).optional()
 }).strict();
 var conversationReportSubagentStartedEventDataSchema = z2.object({
   type: z2.literal("subagent_started"),
   childConversationId: z2.string().min(1),
   subagentKind: z2.string().min(1),
-  toolStartedSeq: z2.number().int().nonnegative().optional()
+  parentToolCallId: z2.string().min(1).optional()
 }).strict();
 var conversationReportSubagentEndedEventDataSchema = z2.object({
   type: z2.literal("subagent_ended"),
@@ -134,6 +151,8 @@ var conversationReportEventDataSchema = z2.discriminatedUnion("type", [
   conversationReportMessageEventDataSchema,
   conversationReportMessageHandledEventDataSchema,
   conversationReportToolStartedEventDataSchema,
+  conversationReportToolCallsEventDataSchema,
+  conversationReportToolResultEventDataSchema,
   conversationReportTurnLifecycleEventDataSchema,
   conversationReportCompactionEventDataSchema,
   conversationReportHandoffEventDataSchema,
@@ -184,19 +203,34 @@ var conversationDetailReportSchema = conversationSummaryReportSchema.extend({
     }
   }
   for (const [index, event] of report.events.entries()) {
-    if (event.data.type !== "message") continue;
-    if (report.eventHistory.status === "redacted" && event.data.redacted !== true) {
+    if (event.data.type === "message") {
+      if (report.eventHistory.status === "redacted" && event.data.redacted !== true) {
+        context.addIssue({
+          code: "custom",
+          path: ["events", index, "data"],
+          message: "redacted event history must redact messages"
+        });
+      }
+      if (report.eventHistory.status === "available" && event.data.redacted === true) {
+        context.addIssue({
+          code: "custom",
+          path: ["events", index, "data"],
+          message: "available event history must expose messages"
+        });
+      }
+    }
+    if (report.eventHistory.status === "redacted" && event.data.type === "tool_calls" && event.data.calls.some((call) => call.input !== void 0)) {
       context.addIssue({
         code: "custom",
         path: ["events", index, "data"],
-        message: "redacted event history must redact messages"
+        message: "redacted event history must redact tool inputs"
       });
     }
-    if (report.eventHistory.status === "available" && event.data.redacted === true) {
+    if (report.eventHistory.status === "redacted" && event.data.type === "tool_result" && event.data.output !== void 0) {
       context.addIssue({
         code: "custom",
         path: ["events", index, "data"],
-        message: "available event history must expose messages"
+        message: "redacted event history must redact tool outputs"
       });
     }
   }

package/dist/{chunk-B5I5LMSP.js → chunk-HO5NT6OE.js}

@@ -1,21 +1,19 @@
 import {
-  SANDBOX_WORKSPACE_ROOT
-} from "./chunk-G3E7SCME.js";
-import {
+  SANDBOX_WORKSPACE_ROOT,
   getStateAdapter
-} from "./chunk-H3QYZL7K.js";
+} from "./chunk-OUHNWH46.js";
 import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
 import {
   toOptionalTrimmed
-} from "./chunk-SS67LUOK.js";
+} from "./chunk-JNAVF45E.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-YIPD3L6L.js";
+} from "./chunk-3SXUV423.js";
 import {
   withSpan
-} from "./chunk-O24R4DCK.js";
+} from "./chunk-ISMWX44P.js";
 
 // src/chat/sandbox/runtime-dependencies.ts
 var GLOBAL_RUNTIME_DEPENDENCIES = [

package/dist/{chunk-O24R4DCK.js → chunk-ISMWX44P.js}

@@ -13,10 +13,9 @@ import {
 } from "./chunk-6GWA276C.js";
 import {
   getDeploymentTelemetryAttributes
-} from "./chunk-7FBGKXPE.js";
+} from "./chunk-IVVGFRQQ.js";
 
 // src/chat/logging.ts
-import { AsyncLocalStorage } from "async_hooks";
 import path from "path";
 import { styleText } from "util";
 import {
@@ -26,6 +25,73 @@ import {
   getLogger
 } from "@logtape/logtape";
 
+// src/chat/log-context.ts
+import { AsyncLocalStorage } from "async_hooks";
+var logContextStorage = new AsyncLocalStorage();
+var typedLogContextStorage = new AsyncLocalStorage();
+function definedLogContext(context) {
+  return Object.fromEntries(
+    Object.entries(context).filter(([, value]) => value !== void 0)
+  );
+}
+function definedAttributes(attributes) {
+  return Object.fromEntries(
+    Object.entries(attributes).filter(
+      (entry) => entry[1] !== void 0
+    )
+  );
+}
+function logContextToAttributes(context) {
+  return definedAttributes({
+    "gen_ai.conversation.id": context.conversationId,
+    "app.platform": context.platform,
+    "app.request.id": context.requestId,
+    "messaging.system": context.platform === "slack" ? "slack" : context.platform,
+    "messaging.message.conversation_id": context.messageConversationId,
+    "messaging.destination.name": context.destinationName,
+    "enduser.id": context.userId,
+    "enduser.pseudo.id": context.userName,
+    "app.run.id": context.runId,
+    "app.actor.type": context.actorType,
+    "app.actor.id": context.actorId,
+    "gen_ai.agent.name": context.assistantUserName,
+    "gen_ai.request.model": context.modelId,
+    "app.skill.name": context.skillName,
+    "http.request.method": context.httpMethod,
+    "url.path": context.httpPath,
+    "url.full": context.urlFull,
+    "user_agent.original": context.userAgent
+  });
+}
+function runWithLogContext(context, attributes, callback) {
+  return typedLogContextStorage.run(
+    {
+      ...typedLogContextStorage.getStore(),
+      ...definedLogContext(context)
+    },
+    () => logContextStorage.run(
+      { ...logContextStorage.getStore(), ...attributes },
+      callback
+    )
+  );
+}
+function updateLogContext(context, attributes) {
+  const currentContext = typedLogContextStorage.getStore();
+  if (currentContext) {
+    Object.assign(currentContext, definedLogContext(context));
+  }
+  const currentAttributes = logContextStorage.getStore();
+  if (currentAttributes) {
+    Object.assign(currentAttributes, attributes);
+  }
+}
+function getBoundLogContext() {
+  return typedLogContextStorage.getStore() ?? {};
+}
+function getBoundLogAttributes() {
+  return logContextStorage.getStore() ?? {};
+}
+
 // src/chat/identities/identity.ts
 function normalizeIdentityEmail(email) {
   const normalized = email?.trim().toLowerCase();
@@ -89,7 +155,6 @@ function normalizeGenAiFinishReasons(value) {
     (reason) => typeof reason === "string" ? normalizeGenAiFinishReason(reason) : reason
   );
 }
-var contextStorage = new AsyncLocalStorage();
 var logRecordSinks = /* @__PURE__ */ new Set();
 var deploymentLogAttributes = getDeploymentTelemetryAttributes();
 var LOGTAPE_BODY_KEY = "__logtape_body";
@@ -322,32 +387,7 @@ function sanitizeValue(value) {
   return sanitizePrimitive(value);
 }
 function contextToAttributes(context) {
-  const attributes = {
-    "gen_ai.conversation.id": context.conversationId,
-    "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,
-    "app.run.id": context.runId,
-    "app.actor.type": context.actorType,
-    "app.actor.id": context.actorId,
-    "gen_ai.agent.name": context.assistantUserName,
-    "gen_ai.request.model": context.modelId,
-    "app.skill.name": context.skillName,
-    "http.request.method": context.httpMethod,
-    "url.path": context.httpPath,
-    "url.full": context.urlFull,
-    "user_agent.original": context.userAgent
-  };
-  const normalized = {};
-  for (const [key, value] of Object.entries(attributes)) {
-    const sanitized = sanitizeValue(value);
-    if (sanitized !== void 0) normalized[key] = sanitized;
-  }
-  return normalized;
+  return mergeAttributes(logContextToAttributes(context));
 }
 function getTraceCorrelationAttributes() {
   const sentry = sentry_exports;
@@ -479,7 +519,7 @@ function ensureLoggerBackend() {
           lowestLevel: "error"
         }
       ],
-      contextLocalStorage: contextStorage
+      contextLocalStorage: logContextStorage
     });
     ownsLogTapeBackend = true;
     rootLogger = getLogger([...ROOT_LOGGER_CATEGORY]);
@@ -835,7 +875,7 @@ function emitRecord(category, level, eventName, attrs = {}, body) {
   const normalizedEventName = toSnakeCase(eventName);
   const message = body ? redactSecrets(body) : normalizedEventName;
   const source = getLogSource([...ROOT_LOGGER_CATEGORY, ...category]);
-  const contextAttributes = ownsLogTapeBackend ? void 0 : contextStorage.getStore();
+  const contextAttributes = ownsLogTapeBackend ? void 0 : getBoundLogAttributes();
   const attributes = mergeAttributes(
     contextAttributes,
     traceAttributes,
@@ -905,11 +945,12 @@ var log = {
     const sentryCaptureException = captureException;
     if (typeof sentryWithScope === "function" && typeof sentryCaptureException === "function") {
       sentryWithScope((scope) => {
-        if (context) {
-          setSentryScopeContext(scope, context);
-        }
+        setSentryScopeContext(scope, {
+          ...getBoundLogContext(),
+          ...context
+        });
         for (const [key, value] of Object.entries(
-          mergeAttributes(contextStorage.getStore(), attrs)
+          mergeAttributes(getBoundLogAttributes(), attrs)
         )) {
           scope.setExtra(key, value);
         }
@@ -918,9 +959,12 @@ var log = {
       return eventId;
     }
     if (typeof sentryCaptureException === "function") {
-      if (context) {
-        setSentryUser(sentryUserIdentityFromContext(context));
-      }
+      setSentryUser(
+        sentryUserIdentityFromContext({
+          ...getBoundLogContext(),
+          ...context
+        })
+      );
       eventId = sentryCaptureException(normalizedError);
     }
     return eventId;
@@ -1004,21 +1048,14 @@ function createChatSdkLogger() {
   return createChatSdkLoggerImpl(["chat-sdk"], resolveChatSdkLogLevel());
 }
 function withLogContext(context, callback) {
-  const next = mergeAttributes(
-    contextStorage.getStore(),
-    contextToAttributes(context)
-  );
-  return contextStorage.run(next, callback);
-}
-function setLogContext(context) {
-  const merged = mergeAttributes(
-    contextStorage.getStore(),
-    contextToAttributes(context)
+  return runWithLogContext(
+    context,
+    contextToAttributes(context),
+    callback
   );
-  contextStorage.enterWith(merged);
 }
 function getLogContextAttributes() {
-  return contextStorage.getStore() ?? {};
+  return getBoundLogAttributes();
 }
 function getLogContextAttributesForSpan(op) {
   const attributes = { ...getLogContextAttributes() };
@@ -1066,11 +1103,11 @@ function setSentryTagsFromContext(context) {
   }
 }
 function sentryUserIdentityFromContext(context) {
-  if (context.slackUserId) {
-    const email = normalizeIdentityEmail(context.slackUserEmail);
+  if (context.userId) {
+    const email = normalizeIdentityEmail(context.userEmail);
     return {
-      id: context.slackUserId,
-      ...context.slackUserName ? { username: context.slackUserName } : {},
+      id: context.userId,
+      ...context.userName ? { username: context.userName } : {},
       ...email ? { email } : {}
     };
   }
@@ -1156,7 +1193,7 @@ function logException(error, eventName, context = {}, attributes = {}, body) {
   );
 }
 function setTags(context = {}) {
-  setLogContext(context);
+  updateLogContext(context, contextToAttributes(context));
   setSentryTagsFromContext(context);
   setSentryUser(sentryUserIdentityFromContext(context));
 }
@@ -1437,6 +1474,7 @@ export {
   normalizeGenAiFinishReason,
   summarizeMessageText,
   createChatSdkLogger,
+  withLogContext,
   getLogContextAttributesForSpan,
   setSentryUser,
   logInfo,

package/dist/{chunk-7FBGKXPE.js → chunk-IVVGFRQQ.js}

@@ -1,3 +1,7 @@
+import {
+  JUNIOR_VERSION
+} from "./chunk-OCD3OZRK.js";
+
 // src/deployment.ts
 var JUNIOR_HEARTBEAT_ROUTE = "/api/internal/heartbeat";
 var JUNIOR_HEARTBEAT_CRON_SCHEDULE = "* * * * *";
@@ -17,6 +21,7 @@ function getDeploymentTelemetryAttributes() {
   const attributes = {};
   const serviceVersion = getDeploymentServiceVersion();
   const deploymentId = toOptionalTrimmed(process.env.VERCEL_DEPLOYMENT_ID);
+  attributes["app.junior.version"] = JUNIOR_VERSION;
   if (serviceVersion) {
     attributes["service.version"] = serviceVersion;
   }