@sentry/junior 0.84.1 → 0.86.0

package/dist/reporting.js

@@ -6,31 +6,33 @@ import {
   getConversationDetails,
   getConversationDetailsForIds,
   resolveSlackConversationContextFromThreadId
-} from "./chunk-SVFA43LT.js";
+} from "./chunk-JRXCSSSU.js";
 import {
   buildSystemPrompt,
   getAgentTurnSessionRecord,
   listAgentTurnSessionSummariesForConversation,
   loadActivityEntries
-} from "./chunk-JK7376UT.js";
+} from "./chunk-37B2R2QJ.js";
 import {
   getPluginOperationalReports
-} from "./chunk-AL6ZFV7U.js";
-import "./chunk-CWMMGUWM.js";
+} from "./chunk-2NFV5FMB.js";
+import "./chunk-BRSQQRG6.js";
 import {
   getConversationStore
-} from "./chunk-QWKB6NJV.js";
+} from "./chunk-6I6HBOQM.js";
 import "./chunk-G3E7SCME.js";
 import {
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
-import "./chunk-BAPRSWNW.js";
-import "./chunk-ALL7GG6U.js";
+} from "./chunk-GB5DFM4D.js";
+import "./chunk-GGD6WK6V.js";
+import {
+  unwrapCurrentInstruction
+} from "./chunk-ZU2ALUVQ.js";
 import {
   canExposeConversationPayload,
   parseSlackThreadId,
   resolveConversationPrivacy
-} from "./chunk-DR75T7J3.js";
+} from "./chunk-L7OHKDOX.js";
 import {
   discoverSkills
 } from "./chunk-64ACM6AP.js";
@@ -65,6 +67,12 @@ var REQUESTER_PROFILE_SAMPLE_LIMIT = 5e3;
 var REQUESTER_PROFILE_RECENT_LIMIT = 25;
 var REQUESTER_PROFILE_ACTIVITY_DAYS = 366;
 var RECENT_CONVERSATION_STATS_WINDOW_MS = 7 * 24 * 60 * 60 * 1e3;
+function privateConversationLabel(slackConversation) {
+  if (!slackConversation) {
+    return PRIVATE_CONVERSATION_LABEL;
+  }
+  return slackConversation.visibility === "private" ? formatSlackConversationRedactedLabel(slackConversation) ?? PRIVATE_CONVERSATION_LABEL : PRIVATE_CONVERSATION_LABEL;
+}
 function conversationStore(options = {}) {
   return options.conversationStore ?? getConversationStore();
 }
@@ -120,17 +128,18 @@ function usageReport(usage) {
   };
   return Object.keys(report).length > 0 ? report : void 0;
 }
-function sessionReportFromSummary(summary, nowMs = Date.now(), details) {
+function sessionReportFromSummary(summary, nowMs = Date.now(), details, visibility) {
   const slackThread = parseSlackThreadId(summary.conversationId);
   const privacy = resolveConversationPrivacy({
-    conversationId: summary.conversationId
+    conversationId: summary.conversationId,
+    visibility
   });
   const effectiveChannelName = details?.channelName ?? summary.channelName;
   const slackConversation = resolveSlackConversationContextFromThreadId({
     threadId: summary.conversationId,
     channelName: effectiveChannelName
   });
-  const privateLabel = privacy !== "public" ? slackConversation ? formatSlackConversationRedactedLabel(slackConversation) : PRIVATE_CONVERSATION_LABEL : void 0;
+  const privateLabel = privacy !== "public" ? privateConversationLabel(slackConversation) : void 0;
   const channelName = privateLabel ?? effectiveChannelName;
   const effectiveSurface = details?.originSurface ?? surfaceFromSummary(summary);
   const displayTitle = privateLabel ?? details?.displayTitle ?? slackStatsLocationLabel({
@@ -155,6 +164,7 @@ function sessionReportFromSummary(summary, nowMs = Date.now(), details) {
     ...requesterIdentity ? { requesterIdentity } : {},
     ...slackThread ? { channel: slackThread.channelId } : {},
     ...channelName ? { channelName } : {},
+    ...privateLabel ? { channelNameRedacted: true } : {},
     ...summary.traceId ? { traceId: summary.traceId } : {},
     ...sentryTraceUrl ? { sentryTraceUrl } : {}
   };
@@ -183,8 +193,9 @@ function titleFromConversation(args) {
     channelName: effectiveChannelName
   });
   const privateLabel = resolveConversationPrivacy({
-    conversationId: args.conversation.conversationId
-  }) !== "public" ? slackConversation ? formatSlackConversationRedactedLabel(slackConversation) : PRIVATE_CONVERSATION_LABEL : void 0;
+    conversationId: args.conversation.conversationId,
+    visibility: args.conversation.visibility
+  }) !== "public" ? privateConversationLabel(slackConversation) : void 0;
   return privateLabel ?? args.details?.displayTitle ?? args.conversation.title ?? slackStatsLocationLabel({
     channel: slackThread?.channelId,
     channelName: effectiveChannelName
@@ -201,12 +212,24 @@ function channelNameFromConversation(conversation, details) {
     channelName: effectiveChannelName
   });
   if (resolveConversationPrivacy({
-    conversationId: conversation.conversationId
+    conversationId: conversation.conversationId,
+    visibility: conversation.visibility
   }) !== "public") {
-    return formatSlackConversationRedactedLabel(slackConversation) ?? (slackConversation ? void 0 : PRIVATE_CONVERSATION_LABEL);
+    return privateConversationLabel(slackConversation);
   }
   return effectiveChannelName;
 }
+function channelNameRedactedFromConversation(conversation, details) {
+  const effectiveChannelName = details?.channelName ?? conversation.channelName;
+  const slackThread = parseSlackThreadId(conversation.conversationId);
+  if (!effectiveChannelName && !slackThread) {
+    return false;
+  }
+  return resolveConversationPrivacy({
+    conversationId: conversation.conversationId,
+    visibility: conversation.visibility
+  }) !== "public";
+}
 function applyConversationIndexMetadata(args) {
   const surface = args.details?.originSurface ?? (args.conversation.source ? surfaceFromSource(
     args.conversation.source,
@@ -214,6 +237,10 @@ function applyConversationIndexMetadata(args) {
   ) : args.report.surface);
   const slackThread = parseSlackThreadId(args.conversation.conversationId);
   const effectiveChannelName = channelNameFromConversation(args.conversation, args.details) ?? args.report.channelName;
+  const channelNameRedacted = channelNameRedactedFromConversation(
+    args.conversation,
+    args.details
+  );
   const requesterIdentity = requesterIdentityReport(args.details?.originRequester) ?? args.report.requesterIdentity ?? requesterIdentityReport(args.conversation.requester);
   const status = statusFromConversation(
     args.conversation,
@@ -224,8 +251,9 @@ function applyConversationIndexMetadata(args) {
     reportTime(args.report.lastSeenAt) ?? 0,
     args.conversation.lastActivityAtMs
   );
+  const { channelNameRedacted: _oldChannelNameRedacted, ...report } = args.report;
   return {
-    ...args.report,
+    ...report,
     displayTitle: titleFromConversation({
       conversation: args.conversation,
       details: args.details,
@@ -236,7 +264,8 @@ function applyConversationIndexMetadata(args) {
     surface,
     ...requesterIdentity ? { requesterIdentity } : {},
     ...slackThread ? { channel: slackThread.channelId } : {},
-    ...effectiveChannelName ? { channelName: effectiveChannelName } : {}
+    ...effectiveChannelName ? { channelName: effectiveChannelName } : {},
+    ...channelNameRedacted ? { channelNameRedacted: true } : {}
   };
 }
 function sessionReportFromConversation(conversation, nowMs, details) {
@@ -246,6 +275,10 @@ function sessionReportFromConversation(conversation, nowMs, details) {
   );
   const slackThread = parseSlackThreadId(conversation.conversationId);
   const channelName = channelNameFromConversation(conversation, details);
+  const channelNameRedacted = channelNameRedactedFromConversation(
+    conversation,
+    details
+  );
   return {
     conversationId: conversation.conversationId,
     cumulativeDurationMs: 0,
@@ -260,7 +293,8 @@ function sessionReportFromConversation(conversation, nowMs, details) {
     surface,
     ...requesterIdentity ? { requesterIdentity } : {},
     ...slackThread ? { channel: slackThread.channelId } : {},
-    ...channelName ? { channelName } : {}
+    ...channelName ? { channelName } : {},
+    ...channelNameRedacted ? { channelNameRedacted: true } : {}
   };
 }
 function reportTime(value) {
@@ -332,6 +366,9 @@ function requesterLabel(requester) {
 function slackStatsLocationLabel(input) {
   const channelId = input.channel;
   if (!channelId) return void 0;
+  if (input.channelNameRedacted && input.channelName) {
+    return input.channelName;
+  }
   const name = input.channelName?.replace(/^#/, "");
   if (channelId.startsWith("D")) {
     return "Direct Message";
@@ -351,14 +388,14 @@ function surfaceFallbackLabel(surface) {
   if (surface === "internal") return "Internal";
   return "Conversation";
 }
-function displayTitleFromDetails(conversationId, details) {
+function displayTitleFromDetails(conversationId, details, visibility) {
   if (!details) return void 0;
   const slackThread = parseSlackThreadId(conversationId);
   const slackConversation = resolveSlackConversationContextFromThreadId({
     threadId: conversationId,
     channelName: details.channelName
   });
-  const privateLabel = resolveConversationPrivacy({ conversationId }) !== "public" ? formatSlackConversationRedactedLabel(slackConversation) ?? PRIVATE_CONVERSATION_LABEL : void 0;
+  const privateLabel = resolveConversationPrivacy({ conversationId, visibility }) !== "public" ? privateConversationLabel(slackConversation) : void 0;
   return privateLabel ?? details.displayTitle ?? slackStatsLocationLabel({
     channel: slackThread?.channelId,
     channelName: details.channelName
@@ -767,9 +804,10 @@ async function readRequesterProfileReport(email, options = {}) {
     windowStart: start.toISOString()
   };
 }
-function canExposeConversationTranscript(summary) {
+function canExposeConversationTranscript(summary, visibility) {
   return canExposeConversationPayload({
-    conversationId: summary.conversationId
+    conversationId: summary.conversationId,
+    visibility
   });
 }
 function textPart(text) {
@@ -783,9 +821,10 @@ function recordField(value, names) {
   }
   return void 0;
 }
-function normalizeTranscriptPart(part) {
+function normalizeTranscriptPart(part, options = {}) {
+  const displayText = (text) => options.unwrapCurrentTask ? unwrapCurrentInstruction(text) ?? text : text;
   if (typeof part === "string") {
-    return textPart(part);
+    return textPart(displayText(part));
   }
   if (!isRecord(part)) {
     return { type: "unknown", output: part };
@@ -794,7 +833,7 @@ function normalizeTranscriptPart(part) {
   if (rawType === "text") {
     const text = recordField(part, ["text", "content"]);
     return textPart(
-      typeof text === "string" ? text : JSON.stringify(text) ?? ""
+      typeof text === "string" ? displayText(text) : JSON.stringify(text) ?? ""
     );
   }
   if (rawType === "toolCall") {
@@ -851,7 +890,15 @@ function normalizeTranscriptMessage(message) {
   return {
     role,
     ...typeof record.timestamp === "number" ? { timestamp: record.timestamp } : {},
-    parts: role === "toolResult" ? [normalizeToolResultMessage(record)] : Array.isArray(content) ? content.map(normalizeTranscriptPart) : [normalizeTranscriptPart(content)]
+    parts: role === "toolResult" ? [normalizeToolResultMessage(record)] : Array.isArray(content) ? content.map(
+      (part) => normalizeTranscriptPart(part, {
+        unwrapCurrentTask: role === "user"
+      })
+    ) : [
+      normalizeTranscriptPart(content, {
+        unwrapCurrentTask: role === "user"
+      })
+    ]
   };
 }
 function transcriptRole(role) {
@@ -1161,7 +1208,12 @@ async function reportsFromConversations(args) {
         conversation,
         details,
         nowMs: args.nowMs,
-        report: sessionReportFromSummary(summary, args.nowMs, details)
+        report: sessionReportFromSummary(
+          summary,
+          args.nowMs,
+          details,
+          conversation.visibility
+        )
       })
     ) : [sessionReportFromConversation(conversation, args.nowMs, details)];
     reports.set(conversation.conversationId, conversationReports);
@@ -1241,6 +1293,10 @@ async function listRecentConversationSummaries(options = {}) {
       conversation.conversationId
     );
     const channelName = channelNameFromConversation(conversation, details);
+    const channelNameRedacted = channelNameRedactedFromConversation(
+      conversation,
+      details
+    );
     const report = newestRun(
       reportsByConversation.get(conversation.conversationId) ?? [
         sessionReportFromConversation(conversation, nowMs, details)
@@ -1255,6 +1311,7 @@ async function listRecentConversationSummaries(options = {}) {
       ).toISOString(),
       status: report.status,
       ...channelName ? { channelName } : {},
+      ...channelNameRedacted ? { channelNameRedacted: true } : {},
       ...conversation.source ? { source: conversation.source } : {}
     };
   });
@@ -1283,7 +1340,10 @@ async function readConversationReport(conversationId, options = {}) {
         sessionRecord.piMessages,
         sessionRecord.turnStartMessageIndex
       ) : { messages: [], startsAtRunBoundary: false };
-      const canExposeTranscript = canExposeConversationTranscript(summary);
+      const canExposeTranscript = canExposeConversationTranscript(
+        summary,
+        conversation?.visibility
+      );
       const normalizedTranscript = scopedMessages.messages.map(
         normalizeTranscriptMessage
       );
@@ -1301,7 +1361,12 @@ async function readConversationReport(conversationId, options = {}) {
       const traceId = summary.traceId ?? sessionRecord?.traceId ?? (canExposeTranscript ? traceIdFromTranscript(transcript) : void 0);
       const sentryTraceUrl = traceId ? buildSentryTraceUrl(traceId) : void 0;
       const report = {
-        ...sessionReportFromSummary(summary, nowMs, details),
+        ...sessionReportFromSummary(
+          summary,
+          nowMs,
+          details,
+          conversation?.visibility
+        ),
         ...traceId ? { traceId } : {},
         ...sentryTraceUrl ? { sentryTraceUrl } : {},
         activity,
@@ -1334,7 +1399,11 @@ async function readConversationReport(conversationId, options = {}) {
     }
   ];
   const firstRun = effectiveRuns[0];
-  const displayTitle = firstRun?.displayTitle ?? displayTitleFromDetails(conversationId, details) ?? surfaceFallbackLabel(firstRun?.surface ?? "slack");
+  const displayTitle = firstRun?.displayTitle ?? displayTitleFromDetails(
+    conversationId,
+    details,
+    conversation?.visibility
+  ) ?? surfaceFallbackLabel(firstRun?.surface ?? "slack");
   const sentryConversationUrl = buildSentryConversationUrl(conversationId);
   return {
     conversationId,
@@ -1344,8 +1413,12 @@ async function readConversationReport(conversationId, options = {}) {
     runs: effectiveRuns
   };
 }
-async function readConversationSubagentTranscriptReport(conversationId, runId, subagentId) {
-  const summaries = await listAgentTurnSessionSummariesForConversation(conversationId);
+async function readConversationSubagentTranscriptReport(conversationId, runId, subagentId, options = {}) {
+  const store = conversationStore(options);
+  const [summaries, conversation] = await Promise.all([
+    listAgentTurnSessionSummariesForConversation(conversationId),
+    store.get({ conversationId })
+  ]);
   const summary = summaries.find((candidate) => candidate.sessionId === runId);
   if (!summary) {
     return {
@@ -1381,7 +1454,10 @@ async function readConversationSubagentTranscriptReport(conversationId, runId, s
       unavailableReason: "not_found"
     };
   }
-  const canExposeTranscript = canExposeConversationTranscript(summary);
+  const canExposeTranscript = canExposeConversationTranscript(
+    summary,
+    conversation?.visibility
+  );
   const activity = subagentActivity(start, { canExposeTranscript, end });
   const conversationFields = subagentConversationFields(start.transcriptRef);
   if (!canExposeTranscript) {

package/dist/{runner-2XU6QQND.js → runner-HEBRPNN2.js}

@@ -2,6 +2,8 @@ import {
   buildConversationContext,
   buildDeliveredTurnStatePatch,
   coerceThreadArtifactsState,
+  completeDeliveredTurn,
+  finalizeFailedTurnReply,
   generateAssistantReply,
   getPersistedSandboxState,
   getPersistedThreadState,
@@ -14,27 +16,27 @@ import {
   startActiveTurn,
   updateConversationStats,
   upsertConversationMessage
-} from "./chunk-T2YRJZ5A.js";
+} from "./chunk-FPHA6GCQ.js";
 import {
   coerceThreadConversationState
 } from "./chunk-66NX7MNW.js";
-import "./chunk-LSG6PQF4.js";
+import "./chunk-RIB3M6YA.js";
 import "./chunk-KNFROR7R.js";
 import {
   commitMessages,
   loadProjection
-} from "./chunk-JK7376UT.js";
-import "./chunk-AL6ZFV7U.js";
-import "./chunk-CWMMGUWM.js";
-import "./chunk-QWKB6NJV.js";
+} from "./chunk-37B2R2QJ.js";
+import "./chunk-2NFV5FMB.js";
+import "./chunk-BRSQQRG6.js";
+import "./chunk-6I6HBOQM.js";
 import "./chunk-G3E7SCME.js";
-import "./chunk-MJ4E2PK7.js";
-import "./chunk-BAPRSWNW.js";
+import "./chunk-GB5DFM4D.js";
+import "./chunk-GGD6WK6V.js";
 import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages
-} from "./chunk-ALL7GG6U.js";
-import "./chunk-DR75T7J3.js";
+} from "./chunk-ZU2ALUVQ.js";
+import "./chunk-L7OHKDOX.js";
 import "./chunk-64ACM6AP.js";
 import "./chunk-BQ3ITJA6.js";
 import "./chunk-IXTBFABZ.js";
@@ -219,6 +221,11 @@ async function runLocalAgentTurn(input, deps) {
         await deps.onToolResult?.(result);
       }
     });
+    reply = finalizeFailedTurnReply({
+      reply,
+      logException,
+      context: { conversationId: input.conversationId }
+    });
     completedState = buildDeliveredTurnStatePatch({
       artifacts,
       conversation,
@@ -260,11 +267,18 @@ async function runLocalAgentTurn(input, deps) {
     sandboxId: reply.sandboxId ?? sandboxId,
     sandboxDependencyProfileHash: reply.sandboxDependencyProfileHash ?? sandboxDependencyProfileHash
   });
-  if (reply.piMessages) {
-    await commitMessages({
+  if (reply.piMessages?.length) {
+    await completeDeliveredTurn({
       conversationId: input.conversationId,
+      sessionId: turnId,
+      sliceId: 1,
       messages: reply.piMessages,
-      ttlMs: THREAD_STATE_TTL_MS
+      durationMs: reply.diagnostics.durationMs,
+      usage: reply.diagnostics.usage,
+      destination,
+      source,
+      surface: "internal",
+      logContext: { modelId: reply.diagnostics.modelId }
     });
   }
   if (reply.diagnostics.outcome === "success") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior",
-  "version": "0.84.1",
+  "version": "0.86.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -70,7 +70,7 @@
     "pg": "^8.16.3",
     "yaml": "^2.9.0",
     "zod": "^4.4.3",
-    "@sentry/junior-plugin-api": "0.84.1"
+    "@sentry/junior-plugin-api": "0.86.0"
   },
   "devDependencies": {
     "@emnapi/core": "^1.10.0",
@@ -86,10 +86,10 @@
     "typescript": "^6.0.3",
     "vercel": "^54.4.0",
     "vitest": "^4.1.7",
-    "@sentry/junior-github": "0.84.1",
+    "@sentry/junior-github": "0.86.0",
+    "@sentry/junior-memory": "0.86.0",
     "@sentry/junior-testing": "0.0.0",
-    "@sentry/junior-memory": "0.84.1",
-    "@sentry/junior-scheduler": "0.84.1"
+    "@sentry/junior-scheduler": "0.86.0"
   },
   "scripts": {
     "build": "tsup && tsc -p tsconfig.build.json --emitDeclarationOnly",