@sentry/junior 0.91.0 → 0.92.1

package/dist/{chunk-2S7M37HY.js → chunk-NIFONS4W.js}

@@ -1,14 +1,14 @@
 import {
   getChatConfig
-} from "./chunk-HXL2ZV74.js";
+} from "./chunk-3F54A3YM.js";
 import {
   parseDestination,
   sameDestination
 } from "./chunk-GHGPTPBL.js";
 import {
   normalizeIdentityEmail,
-  parseStoredSlackRequester
-} from "./chunk-ZUK7BL63.js";
+  parseStoredSlackActor
+} from "./chunk-S6QKIGRM.js";
 
 // src/chat/conversations/sql/store.ts
 import { randomUUID as randomUUID2 } from "crypto";
@@ -139,16 +139,13 @@ var juniorConversations = pgTable4(
     actorIdentityId: text4("actor_identity_id").references(
       () => juniorIdentities.id
     ),
-    requesterIdentityId: text4("requester_identity_id").references(
-      () => juniorIdentities.id
-    ),
     creatorIdentityId: text4("creator_identity_id").references(
       () => juniorIdentities.id
     ),
     credentialSubjectIdentityId: text4(
       "credential_subject_identity_id"
     ).references(() => juniorIdentities.id),
-    requester: jsonb3("requester_json").$type(),
+    actor: jsonb3("actor_json").$type(),
     channelName: text4("channel_name"),
     title: text4("title"),
     createdAt: timestamptz("created_at").notNull(),
@@ -178,10 +175,6 @@ var juniorConversations = pgTable4(
       table.actorIdentityId,
       table.lastActivityAt.desc()
     ),
-    index3("junior_conversations_requester_activity_idx").on(
-      table.requesterIdentityId,
-      table.lastActivityAt.desc()
-    ),
     index3("junior_conversations_origin_idx").on(
       table.originType,
       table.originId,
@@ -546,13 +539,69 @@ CREATE INDEX IF NOT EXISTS junior_identities_verified_email_idx
     AND email_normalized IS NOT NULL
 `
 ];
+var actorCutoverStatements = [
+  `
+UPDATE junior_conversations
+  SET actor_identity_id = requester_identity_id
+  WHERE requester_identity_id IS NOT NULL
+`,
+  `
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_name = 'junior_conversations'
+      AND column_name = 'requester_json'
+  ) AND NOT EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_name = 'junior_conversations'
+      AND column_name = 'actor_json'
+  ) THEN
+    ALTER TABLE junior_conversations
+      RENAME COLUMN requester_json TO actor_json;
+  END IF;
+END $$;
+`,
+  `
+ALTER TABLE junior_conversations
+  ADD COLUMN IF NOT EXISTS actor_json JSONB
+`,
+  `
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_name = 'junior_conversations'
+      AND column_name = 'requester_json'
+  ) THEN
+    UPDATE junior_conversations
+      SET actor_json = COALESCE(actor_json, requester_json);
+  END IF;
+END $$;
+`,
+  `
+DROP INDEX IF EXISTS junior_conversations_requester_activity_idx
+`,
+  `
+ALTER TABLE junior_conversations
+  DROP COLUMN IF EXISTS requester_identity_id
+`,
+  `
+ALTER TABLE junior_conversations
+  DROP COLUMN IF EXISTS requester_json
+`
+];
 var migrations = [
   defineMigration("0001_conversation_core", coreMetadataStatements),
   defineMigration(
     "0002_slack_destination_visibility_backfill",
     destinationVisibilityBackfillStatements
   ),
-  defineMigration("0003_user_identities", userIdentityStatements)
+  defineMigration("0003_user_identities", userIdentityStatements),
+  defineMigration("0004_actor_cutover", actorCutoverStatements)
 ];
 function parseStoredMigrationRecord(value) {
   return migrationRecordSchema.parse(value);
@@ -629,18 +678,18 @@ function sourceFromValue(value) {
   }
   return void 0;
 }
-function identityFromRequester(requester) {
-  if (!requester?.slackUserId) {
+function identityFromActor(actor) {
+  if (!actor?.slackUserId) {
     return void 0;
   }
   return {
     kind: "user",
     provider: "slack",
-    providerTenantId: requester.teamId,
-    providerSubjectId: requester.slackUserId,
-    ...requester.fullName ? { displayName: requester.fullName } : {},
-    ...requester.slackUserName ? { handle: requester.slackUserName } : {},
-    ...requester.email ? { email: requester.email, emailVerified: true } : {},
+    providerTenantId: actor.teamId,
+    providerSubjectId: actor.slackUserId,
+    ...actor.fullName ? { displayName: actor.fullName } : {},
+    ...actor.slackUserName ? { handle: actor.slackUserName } : {},
+    ...actor.email ? { email: actor.email, emailVerified: true } : {},
     metadata: { platform: "slack" }
   };
 }
@@ -672,7 +721,7 @@ function systemIdentityFromSource(source) {
   return void 0;
 }
 function actorIdentityForConversation(conversation) {
-  return identityFromRequester(conversation.requester) ?? systemIdentityFromSource(conversation.source);
+  return identityFromActor(conversation.actor) ?? systemIdentityFromSource(conversation.source);
 }
 function originTypeFromSource(source) {
   return source;
@@ -722,7 +771,7 @@ function privacyFromRow(row) {
   }
   return row.destinationVisibility === "public" ? "public" : "private";
 }
-function requesterFromIdentityRow(identity, fallback) {
+function actorFromIdentityRow(identity, fallback) {
   if (!identity || identity.provider !== "slack") {
     return fallback;
   }
@@ -743,15 +792,15 @@ function conversationFromRow(readRow) {
     throw new Error("Conversation record schema version is invalid");
   }
   const destination = row.destination === void 0 || row.destination === null ? void 0 : parseDestination(row.destination);
-  const requester = requesterFromIdentityRow(
-    readRow.requesterIdentity,
-    parseStoredSlackRequester(row.requester)
+  const actor = actorFromIdentityRow(
+    readRow.actorIdentity,
+    parseStoredSlackActor(row.actor)
   );
   if (row.destination !== void 0 && row.destination !== null && !destination) {
     throw new Error("Conversation record destination is invalid");
   }
-  if (row.requester !== void 0 && row.requester !== null && !requester) {
-    throw new Error("Conversation record requester is invalid");
+  if (row.actor !== void 0 && row.actor !== null && !actor) {
+    throw new Error("Conversation record actor is invalid");
   }
   const source = row.source === void 0 || row.source === null ? void 0 : sourceFromValue(row.source);
   if (row.source !== void 0 && row.source !== null && !source) {
@@ -772,7 +821,7 @@ function conversationFromRow(readRow) {
     updatedAtMs: requiredMsFromDate(row.updatedAt),
     execution,
     ...destination ? { destination } : {},
-    ...requester ? { requester } : {},
+    ...actor ? { actor } : {},
     ...row.channelName ? { channelName: row.channelName } : {},
     ...source ? { source } : {},
     ...row.title ? { title: row.title } : {},
@@ -802,7 +851,7 @@ function assertSameConversationDestination(args) {
     `Conversation destination changed for ${args.conversationId}`
   );
 }
-function mergeRequester(current2, next) {
+function mergeActor(current2, next) {
   if (!current2) {
     return next;
   }
@@ -879,7 +928,7 @@ var SqlStore = class {
           destination: current2.destination ?? args.destination,
           source: current2.source ?? args.source,
           channelName: current2.channelName ?? args.channelName,
-          requester: mergeRequester(current2.requester, args.requester),
+          actor: mergeActor(current2.actor, args.actor),
           title: current2.title ?? args.title,
           lastActivityAtMs: Math.max(current2.lastActivityAtMs, activityAtMs),
           updatedAtMs: nowMs,
@@ -903,7 +952,7 @@ var SqlStore = class {
           updatedAtMs: args.updatedAtMs,
           ...args.channelName ? { channelName: args.channelName } : {},
           ...args.destination ? { destination: args.destination } : {},
-          ...args.requester ? { requester: args.requester } : {},
+          ...args.actor ? { actor: args.actor } : {},
           ...args.source ? { source: args.source } : {},
           ...args.title ? { title: args.title } : {},
           ...args.visibility ? { visibility: args.visibility } : {},
@@ -936,7 +985,7 @@ var SqlStore = class {
             existing.lastActivityAtMs,
             conversation.lastActivityAtMs
           ),
-          requester: existing.requester ?? conversation.requester,
+          actor: existing.actor ?? conversation.actor,
           source: existing.source ?? conversation.source,
           title: existing.title ?? conversation.title,
           updatedAtMs: Math.max(
@@ -953,13 +1002,13 @@ var SqlStore = class {
     const rows = await this.executor.db().select({
       conversation: juniorConversations,
       destinationVisibility: juniorDestinations.visibility,
-      requesterIdentity: juniorIdentities
+      actorIdentity: juniorIdentities
     }).from(juniorConversations).leftJoin(
       juniorDestinations,
       eq2(juniorDestinations.id, juniorConversations.destinationId)
     ).leftJoin(
       juniorIdentities,
-      eq2(juniorIdentities.id, juniorConversations.requesterIdentityId)
+      eq2(juniorIdentities.id, juniorConversations.actorIdentityId)
     ).orderBy(
       desc(juniorConversations.lastActivityAt),
       asc(juniorConversations.conversationId)
@@ -1003,13 +1052,13 @@ var SqlStore = class {
     const rows = await this.executor.db().select({
       conversation: juniorConversations,
       destinationVisibility: juniorDestinations.visibility,
-      requesterIdentity: juniorIdentities
+      actorIdentity: juniorIdentities
     }).from(juniorConversations).leftJoin(
       juniorDestinations,
       eq2(juniorDestinations.id, juniorConversations.destinationId)
     ).leftJoin(
       juniorIdentities,
-      eq2(juniorIdentities.id, juniorConversations.requesterIdentityId)
+      eq2(juniorIdentities.id, juniorConversations.actorIdentityId)
     ).where(eq2(juniorConversations.conversationId, conversationId));
     return rows[0];
   }
@@ -1028,14 +1077,6 @@ var SqlStore = class {
       }),
       conversation.updatedAtMs
     );
-    const requesterIdentityObservation = identityFromRequester(
-      conversation.requester
-    );
-    const requesterIdentity = requesterIdentityObservation ? await upsertIdentity(
-      this.executor,
-      requesterIdentityObservation,
-      conversation.updatedAtMs
-    ) : void 0;
     const actorIdentityObservation = actorIdentityForConversation(conversation);
     const actorIdentity = actorIdentityObservation ? await upsertIdentity(
       this.executor,
@@ -1052,10 +1093,9 @@ var SqlStore = class {
       destinationId: destinationId ?? null,
       destination: conversation.destination ?? null,
       actorIdentityId: actorIdentity?.id ?? null,
-      requesterIdentityId: requesterIdentity?.id ?? null,
       creatorIdentityId: null,
       credentialSubjectIdentityId: null,
-      requester: conversation.requester ?? null,
+      actor: conversation.actor ?? null,
       channelName: conversation.channelName ?? null,
       title: conversation.title ?? null,
       createdAt: dateFromMs2(conversation.createdAtMs),
@@ -1076,10 +1116,9 @@ var SqlStore = class {
         destinationId: sql4`coalesce(excluded.destination_id, ${juniorConversations.destinationId})`,
         destination: sql4`coalesce(excluded.destination_json, ${juniorConversations.destination})`,
         actorIdentityId: sql4`coalesce(excluded.actor_identity_id, ${juniorConversations.actorIdentityId})`,
-        requesterIdentityId: sql4`coalesce(excluded.requester_identity_id, ${juniorConversations.requesterIdentityId})`,
         creatorIdentityId: sql4`coalesce(excluded.creator_identity_id, ${juniorConversations.creatorIdentityId})`,
         credentialSubjectIdentityId: sql4`coalesce(excluded.credential_subject_identity_id, ${juniorConversations.credentialSubjectIdentityId})`,
-        requester: sql4`coalesce(excluded.requester_json, ${juniorConversations.requester})`,
+        actor: sql4`coalesce(excluded.actor_json, ${juniorConversations.actor})`,
         channelName: sql4`coalesce(excluded.channel_name, ${juniorConversations.channelName})`,
         title: sql4`coalesce(excluded.title, ${juniorConversations.title})`,
         createdAt: sql4`least(${juniorConversations.createdAt}, excluded.created_at)`,

package/dist/{chunk-AOISHLSF.js → chunk-O6ZYIHFC.js}

@@ -5,44 +5,49 @@ import {
 } from "./chunk-KNFROR7R.js";
 import {
   clearPendingAuth,
+  getPersistedThreadState,
   markTurnCompleted,
   mergeArtifactsState
-} from "./chunk-ONFOWI2D.js";
+} from "./chunk-Z4FOYQXW.js";
+import {
+  coerceThreadConversationState
+} from "./chunk-PFXC67GJ.js";
 import {
-  escapeXml,
   getAgentTurnSessionRecord,
   getInterruptionMarker
-} from "./chunk-GCWD2VHP.js";
+} from "./chunk-OQQU3SD6.js";
 import {
   createPluginEmbedder,
   createPluginModel,
   getPlugins
-} from "./chunk-DACFZ5CI.js";
+} from "./chunk-7K3JALTQ.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-NW7AXDA5.js";
+} from "./chunk-OZJXGX4U.js";
 import {
   getStateAdapter
-} from "./chunk-RS6ANWVT.js";
+} from "./chunk-ZATRYQLR.js";
 import {
   getDb
-} from "./chunk-2S7M37HY.js";
+} from "./chunk-NIFONS4W.js";
 import {
   GEN_AI_PROVIDER_NAME,
   botConfig,
+  escapeXml,
   getPiMessageRole,
+  instructionTextForProjection,
   isToolResultError,
   isToolResultMessage,
   normalizeToolNameFromResult,
   resolveGatewayModel,
   stripRuntimeTurnContext
-} from "./chunk-HXL2ZV74.js";
+} from "./chunk-3F54A3YM.js";
 import {
   buildTurnFailureResponse,
   logWarn,
   setSpanAttributes
-} from "./chunk-ZUK7BL63.js";
+} from "./chunk-S6QKIGRM.js";
 import {
   parseSlackMessageTs
 } from "./chunk-LFLTJQVR.js";
@@ -275,7 +280,7 @@ async function summarizeConversationChunk(messages, conversation, context, deps)
         modelId: botConfig.fastModelId,
         threadId: context.threadId ?? "",
         channelId: context.channelId ?? "",
-        requesterId: context.requesterId ?? "",
+        actorId: context.actorId ?? "",
         runId: context.runId ?? ""
       }
     });
@@ -288,7 +293,7 @@ async function summarizeConversationChunk(messages, conversation, context, deps)
       "conversation_compaction_summary_failed",
       {
         slackThreadId: context.threadId,
-        slackUserId: context.requesterId,
+        slackUserId: context.actorId,
         slackChannelId: context.channelId,
         runId: context.runId,
         assistantUserName: botConfig.userName,
@@ -456,7 +461,7 @@ function getAgentTurnDiagnosticsAttributes(reply) {
     "app.ai.tool_call_count": reply.diagnostics.toolCalls.length,
     "app.ai.used_primary_text": reply.diagnostics.usedPrimaryText,
     ...reply.diagnostics.thinkingLevel ? {
-      "app.ai.reasoning_effort": reply.diagnostics.thinkingLevel
+      "gen_ai.request.reasoning.level": reply.diagnostics.thinkingLevel
     } : {},
     ...reply.diagnostics.stopReason ? {
       "gen_ai.response.finish_reasons": [reply.diagnostics.stopReason]
@@ -496,7 +501,10 @@ function finalizeFailedTurnReply(args) {
 }
 
 // src/chat/plugins/task-runner.ts
-import { pluginRunContextSchema } from "@sentry/junior-plugin-api";
+import {
+  isPrivateSource,
+  pluginRunContextSchema
+} from "@sentry/junior-plugin-api";
 var PLUGIN_TASK_LOCK_TTL_MS = 5 * 60 * 1e3;
 function isRecord(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
@@ -540,14 +548,41 @@ function sanitizeText(text) {
     "[image data omitted]"
   ).replaceAll("\0", " ").trim();
 }
-function runTranscriptEntry(message) {
+function sameActorIdentity(left, right) {
+  if (!left || !right || left.platform !== right.platform) {
+    return false;
+  }
+  if (left.platform === "system" || right.platform === "system") {
+    return left.platform === "system" && right.platform === "system" && left.name === right.name;
+  }
+  if (left.platform === "slack" && right.platform === "slack") {
+    return left.teamId === right.teamId && left.userId === right.userId;
+  }
+  return left.userId === right.userId;
+}
+function messageProvenance(provenance) {
+  return {
+    authority: provenance.authority,
+    ...provenance.actor ? { actor: provenance.actor } : {}
+  };
+}
+function runTranscriptEntry(message, provenance, runActor) {
   const role = getPiMessageRole(message);
   if (role === "user" || role === "assistant") {
-    const text2 = messageText(message);
+    const text2 = role === "user" ? instructionTextForProjection(messageText(message)) : messageText(message);
     if (!text2) {
       return void 0;
     }
-    return { type: "message", role, text: text2 };
+    if (role === "assistant") {
+      return { type: "message", role, text: text2 };
+    }
+    return {
+      type: "message",
+      role,
+      text: text2,
+      provenance: messageProvenance(provenance),
+      isRunActor: sameActorIdentity(provenance.actor, runActor)
+    };
   }
   if (!isToolResultMessage(message)) {
     return void 0;
@@ -564,6 +599,85 @@ function runTranscriptEntry(message) {
     ...text ? { text } : {}
   };
 }
+function turnMessagesWithProvenance(record) {
+  const startIndex = record.turnStartMessageIndex ?? 0;
+  const messages = record.piMessages.slice(startIndex);
+  const provenance = record.piMessageProvenance.slice(startIndex);
+  const paired = [];
+  for (const [index, message] of messages.entries()) {
+    for (const stripped of stripRuntimeTurnContext([message])) {
+      paired.push({
+        message: stripped,
+        provenance: provenance[index] ?? { authority: "context" }
+      });
+    }
+  }
+  return paired;
+}
+function slackContextAuthor(source, message) {
+  const userId = message.author?.userId?.trim();
+  if (!userId) {
+    return void 0;
+  }
+  return {
+    platform: "slack",
+    teamId: source.teamId,
+    userId,
+    ...message.author?.userName ? { userName: message.author.userName } : {},
+    ...message.author?.fullName ? { fullName: message.author.fullName } : {}
+  };
+}
+function slackTimestampMs(value) {
+  const timestamp = parseSlackMessageTs(value);
+  if (!timestamp) {
+    return void 0;
+  }
+  const timestampMs = Number(timestamp) * 1e3;
+  return Number.isFinite(timestampMs) ? timestampMs : void 0;
+}
+function conversationMessageTimestampMs(message) {
+  if (message.meta?.slackTs !== void 0) {
+    return slackTimestampMs(message.meta.slackTs);
+  }
+  return Number.isFinite(message.createdAtMs) ? message.createdAtMs : void 0;
+}
+function messageExistedAtRunCompletion(message, completedAtMs) {
+  const messageTimestampMs = conversationMessageTimestampMs(message);
+  return messageTimestampMs !== void 0 && messageTimestampMs <= completedAtMs;
+}
+async function loadConversationContextTranscriptEntries(record) {
+  const source = record.source;
+  if (source?.platform !== "slack" || isPrivateSource(source)) {
+    return [];
+  }
+  const state = await getPersistedThreadState(record.conversationId);
+  const conversation = coerceThreadConversationState(state);
+  const entries = [];
+  for (const message of conversation.messages) {
+    if (message.role !== "user") {
+      continue;
+    }
+    if (!messageExistedAtRunCompletion(message, record.updatedAtMs)) {
+      continue;
+    }
+    const text = sanitizeText(message.text);
+    if (!text) {
+      continue;
+    }
+    const author = slackContextAuthor(source, message);
+    entries.push({
+      type: "message",
+      role: "user",
+      text,
+      provenance: {
+        authority: "context",
+        ...author ? { actor: author } : {}
+      },
+      isRunActor: sameActorIdentity(author, record.actor)
+    });
+  }
+  return entries;
+}
 async function withPluginTaskLock(taskId, callback) {
   const state = getStateAdapter();
   await state.connect();
@@ -596,17 +710,26 @@ async function loadPluginRun(params) {
       "Completed plugin task session record is missing source or destination"
     );
   }
-  const sessionMessages = stripRuntimeTurnContext(
-    record.piMessages.slice(record.turnStartMessageIndex ?? 0)
+  const runEntries = turnMessagesWithProvenance(record).map(
+    ({ message, provenance }) => runTranscriptEntry(message, provenance, record.actor)
+  ).filter((entry) => Boolean(entry));
+  const runMessageTexts = new Set(
+    runEntries.filter((entry) => entry.type === "message").map((entry) => entry.text)
+  );
+  const contextEntries = (await loadConversationContextTranscriptEntries(record)).filter(
+    (entry) => entry.type !== "message" || !runMessageTexts.has(entry.text)
   );
   return pluginRunContextSchema.parse({
     completedAtMs: record.updatedAtMs,
     conversationId: record.conversationId,
     destination: record.destination,
-    ...record.requester ? { requester: record.requester } : {},
+    // Derived from the full run provenance on the record, not the sliced or
+    // stripped transcript, so it reflects every committed instruction actor.
+    actors: record.actors,
+    ...record.actor ? { actor: record.actor } : {},
     runId: record.sessionId,
     source: record.source,
-    transcript: sessionMessages.map(runTranscriptEntry).filter((entry) => Boolean(entry))
+    transcript: [...contextEntries, ...runEntries]
   });
 }
 function taskPluginContext(plugin, message, options = {}) {