@sentry/junior 0.124.2 → 0.126.0

package/dist/{chunk-NNKVDYXN.js → chunk-KISG7E24.js}

@@ -13,7 +13,7 @@ import {
   persistAuthPauseTurnState,
   requireTurnFailureEventId,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-4JW3YNQZ.js";
+} from "./chunk-YMSVBWBY.js";
 import {
   buildSentryConversationUrl
 } from "./chunk-4CODA7P5.js";
@@ -40,7 +40,7 @@ import {
   resolveBaseUrl,
   resolvePluginOAuthAccount,
   truncateStatusText
-} from "./chunk-L7EZRQ2J.js";
+} from "./chunk-4PV73JHH.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS,
   TurnSliceLimitExceededError,
@@ -73,7 +73,13 @@ import {
   recordDeliveredAssistantMessage,
   turnHasReply,
   updateConversationStats
-} from "./chunk-CMYDYVOD.js";
+} from "./chunk-WRH7DWFO.js";
+import {
+  parseSlackThreadId,
+  readSlackRawMessageContext,
+  resolveSlackChannelIdFromMessage,
+  resolveSlackChannelIdFromThreadId
+} from "./chunk-72SDEHFP.js";
 import {
   SlackActionError,
   getDashboardConversationLink,
@@ -82,19 +88,19 @@ import {
   getSlackClient,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-IXTIJQ7Z.js";
+} from "./chunk-6KWO5DU3.js";
 import {
   getConversationEventStore,
   getConversationStore,
   parseDestination,
   requireSlackDestination,
   sameDestination
-} from "./chunk-DW6SLS5F.js";
+} from "./chunk-KP7E267S.js";
 import {
   acquireActiveLock,
   getDefaultRedisStateAdapterFor,
   getStateAdapter
-} from "./chunk-KYKLQYSU.js";
+} from "./chunk-APYVVX2Y.js";
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   botConfig,
@@ -103,45 +109,37 @@ import {
   getRuntimeMetadata,
   normalizeSlackEmojiName,
   standardModelId
-} from "./chunk-574YK7QW.js";
-import {
-  parseSlackThreadId,
-  readSlackRawMessageContext,
-  resolveSlackChannelIdFromMessage,
-  resolveSlackChannelIdFromThreadId
-} from "./chunk-S7G34U75.js";
+} from "./chunk-XLIAQRDI.js";
 import {
   discoverSkills
-} from "./chunk-SMTAXLX4.js";
+} from "./chunk-ACJZZY5W.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-ZO6E537B.js";
+} from "./chunk-GHNO2WUH.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse
-} from "./chunk-EOSC6JOC.js";
+} from "./chunk-EFQX6XBW.js";
 import {
   createSlackResumeActor,
   isUserActor,
   parseStoredSlackActor
 } from "./chunk-HZF5P5UN.js";
+import {
+  parseSlackMessageTs
+} from "./chunk-F3B2YJ76.js";
 import {
   buildTurnFailureResponse,
+  isRecord,
   logException,
   logInfo,
   logWarn,
   setTags,
-  withLogContext
-} from "./chunk-ASK74NM6.js";
-import {
-  isRecord,
   toOptionalNumber,
-  toOptionalString
-} from "./chunk-OB42YVAE.js";
-import {
-  parseSlackMessageTs
-} from "./chunk-F3B2YJ76.js";
+  toOptionalString,
+  withLogContext
+} from "./chunk-JP2ZOSQK.js";
 import {
   homeDir
 } from "./chunk-H4HBKISO.js";
@@ -508,6 +506,9 @@ function createSlackWebApiAssistantStatusSession(args) {
 }
 
 // src/chat/slack/footer.ts
+function formatReplyAttribution(attribution) {
+  return attribution.detail ? `${attribution.label} \xB7 ${attribution.detail}` : attribution.label;
+}
 function buildSlackReplyFooter(args) {
   const items = [];
   const conversationId = args.conversationId?.trim();
@@ -522,7 +523,10 @@ function buildSlackReplyFooter(args) {
     }
     items.push(idItem);
   }
-  return items.length > 0 ? { items } : void 0;
+  return items.length > 0 || args.replyAttribution ? {
+    ...args.replyAttribution ? { attribution: args.replyAttribution } : {},
+    items
+  } : void 0;
 }
 function buildSlackReplyBlocks(text, footer) {
   if (!text.trim()) {
@@ -534,13 +538,22 @@ function buildSlackReplyBlocks(text, footer) {
       text
     }
   ];
-  if (footer?.items.length) {
+  if (footer && (footer.attribution || footer.items.length > 0)) {
+    const attributionElements = footer.attribution ? [
+      {
+        type: "plain_text",
+        text: formatReplyAttribution(footer.attribution)
+      }
+    ] : [];
     blocks.push({
       type: "context",
-      elements: footer.items.map((item) => ({
-        type: "mrkdwn",
-        text: item.url ? `*${escapeSlackMrkdwnText(item.label)}:* ${formatSlackLink(item.url, item.value)}` : `*${escapeSlackMrkdwnText(item.label)}:* ${escapeSlackMrkdwnText(item.value)}`
-      }))
+      elements: [
+        ...attributionElements,
+        ...footer.items.map((item) => ({
+          type: "mrkdwn",
+          text: item.url ? `*${escapeSlackMrkdwnText(item.label)}:* ${formatSlackLink(item.url, item.value)}` : `*${escapeSlackMrkdwnText(item.label)}:* ${escapeSlackMrkdwnText(item.value)}`
+        }))
+      ]
     });
   }
   return blocks;
@@ -754,18 +767,23 @@ function buildSlackOutputMessage(text) {
 async function sendSlackReply(args) {
   const chunks = splitSlackReplyText(args.text);
   const footer = buildSlackReplyFooter({
-    conversationId: args.conversationId
+    conversationId: args.conversationId,
+    replyAttribution: args.replyAttribution
   });
   let lastMessageTs;
   for (const [index, text] of chunks.entries()) {
+    const isFinalChunk = index === chunks.length - 1;
     const blocks = buildSlackReplyBlocks(
       text,
-      index === chunks.length - 1 ? footer : void 0
+      isFinalChunk ? footer : void 0
     );
+    const fallbackText = isFinalChunk && args.replyAttribution ? `${text}
+
+${escapeSlackMrkdwnText(formatReplyAttribution(args.replyAttribution))}` : text;
     const response = await postSlackMessage({
       channelId: args.channelId,
       threadTs: args.threadTs,
-      text,
+      text: fallbackText,
       ...blocks ? { blocks } : {}
     });
     lastMessageTs = response.ts;
@@ -1085,12 +1103,13 @@ function resolveReplyTimeoutMs(explicitTimeoutMs) {
   const parsed = Number.parseInt(raw, 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
 }
-async function postSlackMessageBestEffort(channelId, threadTs, text, conversationId) {
+async function postSlackMessageBestEffort(channelId, threadTs, text, conversationId, replyAttribution) {
   try {
     if (conversationId) {
       await sendSlackReply({
         channelId,
         conversationId,
+        replyAttribution,
         text,
         threadTs
       });
@@ -1408,6 +1427,7 @@ async function resumeSlackTurnInContext(args) {
         messageTs = await sendSlackReply({
           channelId: runArgs.channelId,
           conversationId: runArgs.conversationId,
+          replyAttribution: runArgs.replyContext?.routing.dispatch?.replyAttribution,
           text,
           threadTs: runArgs.threadTs
         });
@@ -1683,7 +1703,8 @@ async function resumeSlackTurnInContext(args) {
             deferredAuthInfo.providerDisplayName,
             deferredAuthInfo.requestText
           ),
-          runArgs.conversationId
+          runArgs.conversationId,
+          runArgs.replyContext?.routing.dispatch?.replyAttribution
         );
       }
       return true;

package/dist/{chunk-DW6SLS5F.js → chunk-KP7E267S.js}

@@ -4,22 +4,22 @@ import {
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-GCGJGSQL.js";
+} from "./chunk-S4PUICSB.js";
 import {
   TURN_REASONING_LEVELS,
   getChatConfig,
   modelProfileSchema
-} from "./chunk-574YK7QW.js";
+} from "./chunk-XLIAQRDI.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
-import {
-  normalizeIdentityEmail
-} from "./chunk-ASK74NM6.js";
 import {
   parseSlackChannelReferenceId,
   parseSlackTeamId
 } from "./chunk-F3B2YJ76.js";
+import {
+  normalizeIdentityEmail
+} from "./chunk-JP2ZOSQK.js";
 
 // src/chat/conversations/sql/store.ts
 import { randomUUID as randomUUID2 } from "crypto";
@@ -167,6 +167,36 @@ async function upsertIdentity(executor, identity, nowMs = Date.now()) {
   };
 }
 
+// src/chat/source.ts
+import { sourceSchema } from "@sentry/junior-plugin-api";
+function normalizeSessionSource(value) {
+  if (!value) {
+    return void 0;
+  }
+  if (value.platform === "local") {
+    return {
+      platform: "local",
+      visibility: "private",
+      conversationId: value.conversationId
+    };
+  }
+  const threadTs = value.threadTs?.trim();
+  if (!threadTs) {
+    return void 0;
+  }
+  return {
+    platform: "slack",
+    visibility: value.visibility,
+    teamId: value.teamId,
+    channelId: value.channelId,
+    threadTs
+  };
+}
+function parseSessionSource(value) {
+  const parsed = sourceSchema.safeParse(value);
+  return parsed.success ? normalizeSessionSource(parsed.data) : void 0;
+}
+
 // src/chat/conversations/sql/store.ts
 var CONVERSATION_MUTATION_LOCK_PREFIX = "junior_conversation";
 function now() {
@@ -264,7 +294,7 @@ function destinationUpsertFromDestination(args) {
       providerTenantId: destination.teamId,
       providerDestinationId: channelId,
       refreshVisibility: args.visibility !== void 0,
-      visibility: args.visibility ?? "private",
+      visibility: args.visibility ?? "unknown",
       ...args.channelName ? { displayName: args.channelName } : {},
       metadata: { platform: "slack" }
     };
@@ -343,6 +373,10 @@ function conversationFromRow(readRow) {
   if (row.source !== void 0 && row.source !== null && !source) {
     throw new Error("Conversation record source is invalid");
   }
+  const sessionSource = row.sessionSource === void 0 || row.sessionSource === null ? void 0 : parseSessionSource(row.sessionSource);
+  if (row.sessionSource !== void 0 && row.sessionSource !== null && !sessionSource) {
+    throw new Error("Conversation record session source is invalid");
+  }
   const execution = {
     status: executionStatusFromValue(row.executionStatus),
     lastCheckpointAtMs: msFromDate(row.lastCheckpointAt),
@@ -367,6 +401,7 @@ function conversationFromRow(readRow) {
     ...msFromDate(row.archivedAt) !== void 0 ? { archivedAtMs: msFromDate(row.archivedAt) } : {},
     ...row.channelName ? { channelName: row.channelName } : {},
     ...source ? { source } : {},
+    ...sessionSource ? { sessionSource } : {},
     ...row.title ? { title: row.title } : {},
     ...msFromDate(row.transcriptPurgedAt) !== void 0 ? { transcriptPurgedAtMs: msFromDate(row.transcriptPurgedAt) } : {},
     ...visibility ? { visibility } : {}
@@ -381,6 +416,7 @@ function emptyConversation(args) {
     updatedAtMs: args.nowMs,
     ...args.destination ? { destination: args.destination } : {},
     ...args.source ? { source: args.source } : {},
+    ...args.sessionSource ? { sessionSource: args.sessionSource } : {},
     execution: {
       status: "idle",
       updatedAtMs: args.nowMs
@@ -461,6 +497,7 @@ var SqlStore = class {
   async recordActivity(args) {
     const nowMs = args.nowMs ?? now();
     const activityAtMs = args.activityAtMs ?? nowMs;
+    const sessionSource = normalizeSessionSource(args.sessionSource);
     await this.withConversationMutation(args.conversationId, async () => {
       const existing = await this.get({
         conversationId: args.conversationId
@@ -476,14 +513,20 @@ var SqlStore = class {
         conversationId: args.conversationId,
         destination: args.destination,
         nowMs,
-        source: args.source
+        source: args.source,
+        ...sessionSource ? { sessionSource } : {}
       });
-      const { visibility: _persisted, ...currentWithoutVisibility } = current2;
+      const {
+        sessionSource: _persistedSessionSource,
+        visibility: _persistedVisibility,
+        ...currentWithoutPersistedSignals
+      } = current2;
       await this.upsertConversation({
         conversation: {
-          ...currentWithoutVisibility,
+          ...currentWithoutPersistedSignals,
           destination: current2.destination ?? args.destination,
           source: current2.source ?? args.source,
+          ...sessionSource ? { sessionSource } : {},
           channelName: current2.channelName ?? args.channelName,
           actor: mergeActor(current2.actor, args.actor),
           title: current2.title ?? args.title,
@@ -583,7 +626,10 @@ var SqlStore = class {
     if (!row) {
       return void 0;
     }
-    return row.visibility === "public" ? "public" : "private";
+    if (row.visibility === "public" || row.visibility === "private") {
+      return row.visibility;
+    }
+    return void 0;
   }
   /** Serialize all durable mutations for one conversation inside a SQL transaction. */
   async withConversationMutation(conversationId, callback) {
@@ -637,6 +683,7 @@ var SqlStore = class {
       conversationId: conversation.conversationId,
       schemaVersion: 1,
       source: conversation.source ?? null,
+      sessionSource: conversation.sessionSource ?? null,
       originType: originTypeFromSource(conversation.source) ?? null,
       originId: null,
       originRunId: null,
@@ -662,6 +709,7 @@ var SqlStore = class {
       target: juniorConversations.conversationId,
       set: {
         source: sql2`coalesce(excluded.source, ${juniorConversations.source})`,
+        sessionSource: sql2`coalesce(${juniorConversations.sessionSource}, excluded.source_json)`,
         originType: sql2`coalesce(excluded.origin_type, ${juniorConversations.originType})`,
         originId: sql2`coalesce(excluded.origin_id, ${juniorConversations.originId})`,
         originRunId: sql2`coalesce(excluded.origin_run_id, ${juniorConversations.originRunId})`,
@@ -714,9 +762,9 @@ var SqlStore = class {
       set: {
         kind: sql2`excluded.kind`,
         displayName: sql2`coalesce(excluded.display_name, ${juniorDestinations.displayName})`,
-        // Signal-less writes insert as private but must not clobber an
-        // existing public/private value. Live source signals refresh this
-        // field so converted channels converge on the next message.
+        // Signal-less writes remain unknown and must not clobber an existing
+        // public/private value. Live source signals refresh this field so
+        // converted channels converge on the next message.
         visibility: visibilityUpdate,
         metadata: sql2`coalesce(excluded.metadata_json, ${juniorDestinations.metadata})`,
         updatedAt: sql2`excluded.updated_at`
@@ -1099,15 +1147,22 @@ var newConversationEventSchema = z2.object({
 
 // src/chat/conversations/sql/conversation-row.ts
 import { sql as sql3 } from "drizzle-orm";
-async function ensureConversationRow(executor, conversationId, atMs) {
+async function ensureConversationRow(executor, conversationId, atMs, options = {}) {
   const at = new Date(atMs);
-  await executor.db().insert(juniorConversations).values({
+  const insert = executor.db().insert(juniorConversations).values({
     conversationId,
     createdAt: at,
     lastActivityAt: at,
     updatedAt: at,
     executionStatus: "idle"
-  }).onConflictDoUpdate({
+  });
+  if (options.activity === "preserve") {
+    await insert.onConflictDoNothing({
+      target: juniorConversations.conversationId
+    });
+    return;
+  }
+  await insert.onConflictDoUpdate({
     target: juniorConversations.conversationId,
     set: {
       lastActivityAt: sql3`greatest(${juniorConversations.lastActivityAt}, excluded.last_activity_at)`,
@@ -1192,7 +1247,7 @@ var SqlConversationEventStore = class {
     this.executor = executor;
   }
   executor;
-  async append(conversationId, events) {
+  async append(conversationId, events, options = {}) {
     const parsed = events.map(
       (event) => newConversationEventSchema.parse(event)
     );
@@ -1231,14 +1286,17 @@ var SqlConversationEventStore = class {
       await ensureConversationRow(
         this.executor,
         conversationId,
-        newestCreatedAtMs
-      );
-      await this.executor.db().update(juniorConversations).set({ archivedAt: null }).where(
-        and3(
-          eq3(juniorConversations.conversationId, conversationId),
-          isNotNull(juniorConversations.archivedAt)
-        )
+        newestCreatedAtMs,
+        options
       );
+      if (options.activity !== "preserve") {
+        await this.executor.db().update(juniorConversations).set({ archivedAt: null }).where(
+          and3(
+            eq3(juniorConversations.conversationId, conversationId),
+            isNotNull(juniorConversations.archivedAt)
+          )
+        );
+      }
       const cursor = await this.readCursor(conversationId);
       const historyVersion = cursor.maxHistoryVersion ?? 0;
       let seq = cursor.nextSeq;
@@ -1540,6 +1598,7 @@ export {
   parseDestination,
   requireSlackDestination,
   sameDestination,
+  parseSessionSource,
   instructionProvenanceFor,
   contextProvenance,
   sameActorIdentity,

package/dist/{chunk-VMRKIKGO.js → chunk-LCRWDMCH.js}

@@ -1,6 +1,6 @@
 import {
   JUNIOR_VERSION
-} from "./chunk-7LDOW4QA.js";
+} from "./chunk-JFW62B3Y.js";
 
 // src/deployment.ts
 var JUNIOR_HEARTBEAT_ROUTE = "/api/internal/heartbeat";

package/dist/{chunk-AQKVWIPR.js → chunk-LIDEU7QS.js}

@@ -2,18 +2,18 @@ import {
   SANDBOX_WORKSPACE_ROOT,
   getStateAdapter,
   sleep
-} from "./chunk-KYKLQYSU.js";
+} from "./chunk-APYVVX2Y.js";
 import {
   toOptionalTrimmed
-} from "./chunk-574YK7QW.js";
+} from "./chunk-XLIAQRDI.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-ZO6E537B.js";
+} from "./chunk-GHNO2WUH.js";
 import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-ASK74NM6.js";
+} from "./chunk-JP2ZOSQK.js";
 
 // src/chat/sandbox/snapshot/profile.ts
 import { createHash } from "crypto";

package/dist/{chunk-GCGJGSQL.js → chunk-S4PUICSB.js}

@@ -101,6 +101,8 @@ var juniorConversations = pgTable3(
     conversationId: text3("conversation_id").primaryKey(),
     schemaVersion: integer("schema_version").notNull().default(1),
     source: text3("source").$type(),
+    /** Structured session Source locator; set-once on the conversation root. */
+    sessionSource: jsonb2("source_json").$type(),
     originType: text3("origin_type"),
     originId: text3("origin_id"),
     originRunId: text3("origin_run_id"),