@sentry/junior 0.67.0 → 0.67.1

package/dist/app.js

@@ -47,13 +47,13 @@ import {
   validateAgentPlugins,
   verifySlackDirectCredentialSubject,
   withSlackRetries
-} from "./chunk-HFMZE67J.js";
+} from "./chunk-5UIDU7XR.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-YL5G5YC4.js";
+} from "./chunk-V47RLIO2.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -62,7 +62,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-KWEE2436.js";
+} from "./chunk-YGGH2742.js";
 import {
   ACTIVE_LOCK_TTL_MS,
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
@@ -85,6 +85,7 @@ import {
   getSlackClientSecret,
   getSlackSigningSecret,
   getStateAdapter,
+  normalizeSlackEmojiName,
   parseSlackThreadId,
   resolveConversationPrivacy,
   resolveGatewayModel,
@@ -97,9 +98,10 @@ import {
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes,
   toGenAiTextMetadata
-} from "./chunk-NWU2Z6SM.js";
+} from "./chunk-MT23VNOH.js";
 import {
   CredentialUnavailableError,
+  buildActorIdentity,
   buildOAuthTokenRequest,
   buildTurnFailureResponse,
   createChatSdkLogger,
@@ -116,6 +118,7 @@ import {
   getPluginOAuthConfig,
   getPluginProviders,
   hasRequiredOAuthScope,
+  isActorUserId,
   isPluginConfigKey,
   isPluginProvider,
   isRecord,
@@ -124,6 +127,7 @@ import {
   logInfo,
   logWarn,
   normalizeGenAiFinishReason,
+  parseActorUserId,
   parseCredentialContext,
   parseOAuthTokenResponse,
   resolveAuthTokenPlaceholder,
@@ -134,11 +138,12 @@ import {
   setSpanAttributes,
   setSpanStatus,
   setTags,
+  slackActorIdentity,
   toOptionalNumber,
   toOptionalString,
   withContext,
   withSpan
-} from "./chunk-6QWWMZCK.js";
+} from "./chunk-OIIXZOOC.js";
 import {
   sentry_exports
 } from "./chunk-Z3YD6NHK.js";
@@ -3335,17 +3340,6 @@ function createSlackChannelListMessagesTool(context) {
 // src/chat/tools/slack/channel-post-message.ts
 import { Type as Type14 } from "@sinclair/typebox";
 
-// src/chat/slack/emoji.ts
-var SLACK_EMOJI_NAME_RE = /^(?:[a-z0-9_+-]+)(?:::(?:skin-tone-[2-6]))?$/;
-function normalizeSlackEmojiName(value) {
-  const trimmed = value.trim().toLowerCase();
-  if (!trimmed) {
-    return null;
-  }
-  const normalized = trimmed.startsWith(":") && trimmed.endsWith(":") ? trimmed.slice(1, -1) : trimmed;
-  return SLACK_EMOJI_NAME_RE.test(normalized) ? normalized : null;
-}
-
 // src/chat/slack/outbound.ts
 var MAX_SLACK_MESSAGE_TEXT_CHARS = 4e4;
 function requireSlackConversationId(channelId, action) {
@@ -3453,7 +3447,7 @@ async function postSlackEphemeralMessage(input) {
     input.channelId,
     "Slack ephemeral message posting"
   );
-  const userId = input.userId.trim();
+  const userId = parseActorUserId(input.userId);
   if (!userId) {
     throw new Error("Slack ephemeral message posting requires a user ID");
   }
@@ -11224,13 +11218,17 @@ function extractSliceUsage(messages, beforeMessageCount) {
   return hasAgentTurnUsage(usage) ? usage : void 0;
 }
 function requesterFromContext(requester, requesterId) {
-  const identity = {
-    ...requester?.email ? { email: requester.email } : {},
-    ...requester?.fullName ? { fullName: requester.fullName } : {},
-    ...requesterId ?? requester?.userId ? { slackUserId: requesterId ?? requester?.userId } : {},
-    ...requester?.userName ? { slackUserName: requester.userName } : {}
+  const identity = actorRequesterFromContext(requester, requesterId);
+  const agentRequester = {
+    ...identity?.email ? { email: identity.email } : {},
+    ...identity?.fullName ? { fullName: identity.fullName } : {},
+    ...identity?.userId ? { slackUserId: identity.userId } : {},
+    ...identity?.userName ? { slackUserName: identity.userName } : {}
   };
-  return Object.keys(identity).length > 0 ? identity : void 0;
+  return Object.keys(agentRequester).length > 0 ? agentRequester : void 0;
+}
+function actorRequesterFromContext(requester, requesterId) {
+  return buildActorIdentity(requester, requesterId);
 }
 function surfaceFromContext(context) {
   if (context.surface) {
@@ -11364,6 +11362,10 @@ async function generateAssistantReply(messageText2, context = {}) {
     context.requester,
     context.correlation?.requesterId
   );
+  const actorRequester = actorRequesterFromContext(
+    context.requester,
+    context.correlation?.requesterId
+  );
   const surface = surfaceFromContext(context);
   const credentialActor = context.credentialContext?.actor;
   const credentialActorLogContext = credentialActor ? {
@@ -11493,7 +11495,7 @@ async function generateAssistantReply(messageText2, context = {}) {
     const authRequesterId = context.credentialContext?.actor.type === "user" ? context.credentialContext.actor.userId : void 0;
     const userTokenStore = createUserTokenStore();
     const agentPluginHooks = createAgentPluginHookRunner({
-      requester: context.requester
+      requester: actorRequester
     });
     sandboxExecutor = createSandboxExecutor({
       sandboxId: context.sandbox?.sandboxId,
@@ -11510,7 +11512,7 @@ async function generateAssistantReply(messageText2, context = {}) {
         const result = await maybeExecuteJrRpcCustomCommand(command, {
           activeSkill: skillSandbox.getActiveSkill(),
           channelConfiguration: context.channelConfiguration,
-          requesterId: context.requester?.userId,
+          requesterId: actorRequester?.userId,
           onConfigurationValueChanged: (key, value) => {
             if (value === void 0) {
               delete configurationValues[key];
@@ -11746,7 +11748,7 @@ async function generateAssistantReply(messageText2, context = {}) {
       {
         channelId: toolChannelId,
         channelCapabilities,
-        requester: context.requester,
+        requester: actorRequester,
         teamId: context.correlation?.teamId,
         messageTs: context.correlation?.messageTs,
         threadTs: context.correlation?.threadTs,
@@ -11809,7 +11811,7 @@ async function generateAssistantReply(messageText2, context = {}) {
         slackConversation: context.slackConversation
       },
       invocation: skillInvocation,
-      requester: context.requester,
+      requester: actorRequester,
       artifactState: context.artifactState,
       configuration: configurationValues
     }) : null;
@@ -12445,6 +12447,7 @@ var CONTEXT_MIN_LIVE_MESSAGES = 12;
 var CONTEXT_COMPACTION_BATCH_SIZE = 24;
 var CONTEXT_MAX_COMPACTIONS = 16;
 var CONTEXT_MAX_MESSAGE_CHARS = 3200;
+var SLACK_USER_ID_DISPLAY_PATTERN = /^[UW][A-Z0-9]{5,}$/;
 function generateConversationId(prefix) {
   return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
 }
@@ -12464,7 +12467,7 @@ function buildImageContextSuffix(message, conversation) {
   return ` [image context: ${summaries.join(" | ")}]`;
 }
 function renderConversationMessageLine(message, conversation) {
-  const displayName = message.author?.fullName || message.author?.userName || (message.role === "assistant" ? botConfig.userName : message.role);
+  const displayName = conversationAuthorDisplayName(message);
   const markers = [];
   if (message.meta?.replied === false) {
     markers.push(
@@ -12478,6 +12481,18 @@ function renderConversationMessageLine(message, conversation) {
   const imageContext = buildImageContextSuffix(message, conversation);
   return `[${message.role}] ${displayName}: ${message.text}${imageContext}${markerSuffix}`;
 }
+function conversationAuthorDisplayName(message) {
+  const author = message.author;
+  const fullName = authorDisplayField(author?.fullName, author?.userId);
+  const userName = authorDisplayField(author?.userName, author?.userId);
+  return fullName ?? userName ?? (message.role === "assistant" ? botConfig.userName : message.role);
+}
+function authorDisplayField(value, userId) {
+  if (!value || value === userId || SLACK_USER_ID_DISPLAY_PATTERN.test(value)) {
+    return void 0;
+  }
+  return value;
+}
 function updateConversationStats(conversation) {
   const contextText = buildConversationContext(conversation);
   conversation.stats.estimatedContextTokens = estimateTextTokens(
@@ -12547,11 +12562,12 @@ function buildConversationContext(conversation, options = {}) {
     }
     lines.push("<thread-transcript>");
     for (const [index, message] of messages.entries()) {
-      const author = escapeXml(message.author?.userName ?? message.role);
+      const author = escapeXml(conversationAuthorDisplayName(message));
+      const actorIdAttr = message.author?.userId ? ` actor_id="${escapeXml(message.author.userId)}"` : "";
       const ts = new Date(message.createdAtMs).toISOString();
       const slackTsAttr = message.meta?.slackTs ? ` slack_ts="${escapeXml(message.meta.slackTs)}"` : "";
       lines.push(
-        `  <message index="${index + 1}" ts="${ts}" role="${message.role}" author="${author}"${slackTsAttr}>`,
+        `  <message index="${index + 1}" ts="${ts}" role="${message.role}" author="${author}"${actorIdAttr}${slackTsAttr}>`,
         renderConversationMessageLine(message, conversation),
         "  </message>"
       );
@@ -14511,7 +14527,7 @@ function validateDispatchOptions(options) {
     if (options.credentialSubject.type !== "user") {
       throw new Error("Dispatch credentialSubject type must be user");
     }
-    if (!options.credentialSubject.userId.trim()) {
+    if (!isActorUserId(options.credentialSubject.userId)) {
       throw new Error("Dispatch credentialSubject userId is required");
     }
     if (options.credentialSubject.allowedWhen !== "private-direct-conversation") {
@@ -15464,15 +15480,13 @@ function getTeamId(message) {
 }
 
 // src/chat/runtime/processing-reaction.ts
-var PROCESSING_REACTION_EMOJI = "eyes";
-var COMPLETED_REACTION_EMOJI = "white_check_mark";
 var noProcessingReaction = {
   complete: async () => void 0,
   keep: () => void 0,
   stop: async () => void 0
 };
 function isProcessingReactionEmoji(value) {
-  return typeof value === "string" && normalizeSlackEmojiName(value) === PROCESSING_REACTION_EMOJI;
+  return typeof value === "string" && normalizeSlackEmojiName(value) === botConfig.processingReactionEmoji;
 }
 function shouldKeepProcessingReactionForToolInvocation(input) {
   return input.toolName === "slackMessageAddReaction" && isProcessingReactionEmoji(input.params.emoji);
@@ -15498,7 +15512,7 @@ async function startSlackProcessingReactionForMessage(args) {
     await addReactionToMessage({
       channelId: args.channelId,
       timestamp: args.timestamp,
-      emoji: PROCESSING_REACTION_EMOJI
+      emoji: botConfig.processingReactionEmoji
     });
   } catch (error) {
     args.logException(
@@ -15523,7 +15537,7 @@ async function startSlackProcessingReactionForMessage(args) {
       await removeReactionFromMessage({
         channelId: args.channelId,
         timestamp: args.timestamp,
-        emoji: PROCESSING_REACTION_EMOJI
+        emoji: botConfig.processingReactionEmoji
       });
       return true;
     } catch (error) {
@@ -15550,7 +15564,7 @@ async function startSlackProcessingReactionForMessage(args) {
         await addReactionToMessage({
           channelId: args.channelId,
           timestamp: args.timestamp,
-          emoji: COMPLETED_REACTION_EMOJI
+          emoji: botConfig.completedReactionEmoji
         });
       } catch (error) {
         args.logException(
@@ -15997,6 +16011,87 @@ function htmlCallbackResponse(title, message, status) {
   });
 }
 
+// src/chat/slack/user.ts
+var USER_CACHE_TTL_MS = 5 * 60 * 1e3;
+var userCache = /* @__PURE__ */ new Map();
+function readFromCache(userId) {
+  const hit = userCache.get(userId);
+  if (!hit) return null;
+  if (hit.expiresAt < Date.now()) {
+    userCache.delete(userId);
+    return null;
+  }
+  return hit.value;
+}
+function writeToCache(userId, value) {
+  userCache.set(userId, {
+    value,
+    expiresAt: Date.now() + USER_CACHE_TTL_MS
+  });
+}
+async function lookupSlackUser(userId) {
+  if (!userId) {
+    return null;
+  }
+  const cached = readFromCache(userId);
+  if (cached) {
+    return cached;
+  }
+  const token = getSlackBotToken();
+  if (!token) {
+    return null;
+  }
+  try {
+    const response = await fetch(
+      `https://slack.com/api/users.info?user=${encodeURIComponent(userId)}`,
+      {
+        headers: {
+          authorization: `Bearer ${token}`
+        }
+      }
+    );
+    if (!response.ok) {
+      logWarn(
+        "slack_user_lookup_failed",
+        {},
+        {
+          "enduser.id": userId,
+          "http.response.status_code": response.status
+        },
+        "Slack user lookup request failed"
+      );
+      return null;
+    }
+    const payload = await response.json();
+    if (!payload.ok || !payload.user) {
+      return null;
+    }
+    const userName = payload.user.name?.trim() || void 0;
+    const fullName = payload.user.profile?.display_name?.trim() || payload.user.profile?.real_name?.trim() || payload.user.real_name?.trim() || void 0;
+    const result = {
+      userName,
+      fullName,
+      email: payload.user.profile?.email?.trim() || void 0
+    };
+    writeToCache(userId, result);
+    return result;
+  } catch (error) {
+    logWarn(
+      "slack_user_lookup_failed",
+      {},
+      {
+        "enduser.id": userId,
+        "exception.message": error instanceof Error ? error.message : String(error)
+      },
+      "Slack user lookup failed with exception"
+    );
+    return null;
+  }
+}
+async function lookupSlackActorIdentity(userId) {
+  return slackActorIdentity(userId, await lookupSlackUser(userId));
+}
+
 // src/handlers/mcp-oauth-callback.ts
 var CALLBACK_PAGES = {
   missing_state: {
@@ -16197,6 +16292,7 @@ async function resumeAuthorizedMcpTurn(args) {
         }),
         ttlMs: THREAD_STATE_TTL_MS4
       });
+      const requester = await lookupSlackActorIdentity(authSession.userId);
       return {
         messageText: lockedUserMessage.text,
         messageTs: getTurnUserSlackMessageTs(lockedUserMessage),
@@ -16204,11 +16300,7 @@ async function resumeAuthorizedMcpTurn(args) {
           credentialContext: {
             actor: { type: "user", userId: authSession.userId }
           },
-          requester: {
-            userId: authSession.userId,
-            userName: lockedUserMessage.author?.userName,
-            fullName: lockedUserMessage.author?.fullName
-          },
+          requester,
           correlation: {
             conversationId: authSession.conversationId,
             turnId: lockedSessionId,
@@ -16691,6 +16783,9 @@ async function resumeOAuthSessionRecordTurn(stored) {
         }),
         ttlMs: THREAD_STATE_TTL_MS5
       });
+      const requester = await lookupSlackActorIdentity(
+        lockedUserMessage.author.userId
+      );
       return {
         messageText: stored.pendingMessage ?? lockedUserMessage.text,
         messageTs: getTurnUserSlackMessageTs(lockedUserMessage),
@@ -16701,11 +16796,7 @@ async function resumeOAuthSessionRecordTurn(stored) {
               userId: lockedUserMessage.author.userId
             }
           },
-          requester: {
-            userId: lockedUserMessage.author.userId,
-            userName: lockedUserMessage.author.userName,
-            fullName: lockedUserMessage.author.fullName
-          },
+          requester,
           correlation: {
             conversationId: stored.resumeConversationId,
             turnId: lockedSessionId,
@@ -16801,6 +16892,7 @@ async function resumePendingOAuthMessage(stored) {
   const conversationContext = buildConversationContext(conversation, {
     excludeMessageId: latestUserMessage?.id
   });
+  const requester = await lookupSlackActorIdentity(stored.userId);
   await resumeAuthorizedRequest({
     messageText: stored.pendingMessage,
     channelId: stored.channelId,
@@ -16811,7 +16903,7 @@ async function resumePendingOAuthMessage(stored) {
       credentialContext: {
         actor: { type: "user", userId: stored.userId }
       },
-      requester: { userId: stored.userId },
+      requester,
       conversationContext,
       piMessages: conversation.piMessages,
       configuration: stored.configuration
@@ -17690,6 +17782,9 @@ async function resumeTimedOutTurn(payload, options = {}) {
         excludeMessageId: userMessage2.id
       });
       const sandbox = getPersistedSandboxState(currentState);
+      const requester = await lookupSlackActorIdentity(
+        userMessage2.author.userId
+      );
       return {
         messageText: userMessage2.text,
         messageTs: getTurnUserSlackMessageTs(userMessage2),
@@ -17700,11 +17795,7 @@ async function resumeTimedOutTurn(payload, options = {}) {
               userId: userMessage2.author.userId
             }
           },
-          requester: {
-            userId: userMessage2.author.userId,
-            userName: userMessage2.author.userName,
-            fullName: userMessage2.author.fullName
-          },
+          requester,
           correlation: {
             conversationId: payload.conversationId,
             turnId: payload.sessionId,
@@ -18194,6 +18285,60 @@ function combineTurnText(queuedMessages, latestText) {
   };
 }
 
+// src/chat/services/message-actor-identity.ts
+var messageActors = /* @__PURE__ */ new WeakMap();
+function canonicalUserId(author, identity) {
+  const authorUserId = parseActorUserId(author.userId);
+  const identityUserId = parseActorUserId(identity.userId);
+  if (authorUserId && identityUserId && authorUserId !== identityUserId) {
+    throw new Error("Message actor identity user id mismatch");
+  }
+  const userId = authorUserId ?? identityUserId;
+  if (!userId) {
+    throw new Error("Message actor identity requires a user id");
+  }
+  return userId;
+}
+function actorIdentityFromAuthor(author) {
+  const userId = parseActorUserId(author.userId);
+  return userId ? { userId } : void 0;
+}
+function applyIdentityToAuthor(author, identity) {
+  if (!isActorUserId(identity.userId)) {
+    throw new Error("Message actor identity requires a user id");
+  }
+  author.userId = identity.userId;
+  author.userName = identity.userName ?? "";
+  author.fullName = identity.fullName ?? "";
+}
+function bindMessageActorIdentity(message, identity) {
+  const userId = canonicalUserId(message.author, identity);
+  const actorIdentity = buildActorIdentity(identity, userId);
+  if (!actorIdentity?.userId) {
+    throw new Error("Message actor identity requires a user id");
+  }
+  messageActors.set(message, actorIdentity);
+  applyIdentityToAuthor(message.author, actorIdentity);
+  return actorIdentity;
+}
+function getMessageActorIdentity(message) {
+  return messageActors.get(message) ?? actorIdentityFromAuthor(message.author);
+}
+async function ensureSlackMessageActorIdentity(message, lookupSlackUser2) {
+  const existing = messageActors.get(message);
+  if (existing) {
+    return existing;
+  }
+  const userId = parseActorUserId(message.author.userId);
+  if (!userId) {
+    throw new Error("Slack message actor identity requires a user id");
+  }
+  return bindMessageActorIdentity(
+    message,
+    slackActorIdentity(userId, await lookupSlackUser2(userId))
+  );
+}
+
 // src/chat/runtime/slack-runtime.ts
 var THREAD_OPTOUT_ACK = "Understood. I'll stay out of this thread unless someone @mentions me again.";
 async function maybeHandleThreadOptOutDecision(args) {
@@ -18253,6 +18398,9 @@ function buildLogContext(deps, args) {
     modelId: deps.modelId
   };
 }
+function requesterUserName(message) {
+  return getMessageActorIdentity(message)?.userName;
+}
 function createSlackTurnRuntime(deps) {
   const logContext = (args) => buildLogContext(deps, args);
   const createToolInvocationHook = (processingReaction, hooks) => {
@@ -18326,7 +18474,7 @@ function createSlackTurnRuntime(deps) {
       logContext({
         threadId: args.context.threadId,
         requesterId: args.context.requesterId,
-        requesterUserName: args.message.author.userName,
+        requesterUserName: requesterUserName(args.message),
         channelId: args.context.channelId,
         runId: args.context.runId
       }),
@@ -18368,7 +18516,7 @@ function createSlackTurnRuntime(deps) {
           threadId,
           channelId,
           requesterId: message.author.userId,
-          requesterUserName: message.author.userName,
+          requesterUserName: requesterUserName(message),
           runId
         });
         processingReaction = await processingReactions.start(context, message);
@@ -18428,7 +18576,7 @@ function createSlackTurnRuntime(deps) {
         const errorContext = logContext({
           threadId: deps.getThreadId(thread, message),
           requesterId: message.author.userId,
-          requesterUserName: message.author.userName,
+          requesterUserName: requesterUserName(message),
           channelId: deps.getChannelId(thread, message),
           runId: deps.getRunId(thread, message)
         });
@@ -18484,7 +18632,7 @@ function createSlackTurnRuntime(deps) {
         const turnContext = logContext({
           threadId,
           requesterId: message.author.userId,
-          requesterUserName: message.author.userName,
+          requesterUserName: requesterUserName(message),
           channelId,
           runId
         });
@@ -18634,7 +18782,7 @@ function createSlackTurnRuntime(deps) {
         const errorContext = logContext({
           threadId: deps.getThreadId(thread, message),
           requesterId: message.author.userId,
-          requesterUserName: message.author.userName,
+          requesterUserName: requesterUserName(message),
           channelId: deps.getChannelId(thread, message),
           runId: deps.getRunId(thread, message)
         });
@@ -18992,84 +19140,6 @@ function createContextCompactor(deps) {
   };
 }
 
-// src/chat/slack/user.ts
-var USER_CACHE_TTL_MS = 5 * 60 * 1e3;
-var userCache = /* @__PURE__ */ new Map();
-function readFromCache(userId) {
-  const hit = userCache.get(userId);
-  if (!hit) return null;
-  if (hit.expiresAt < Date.now()) {
-    userCache.delete(userId);
-    return null;
-  }
-  return hit.value;
-}
-function writeToCache(userId, value) {
-  userCache.set(userId, {
-    value,
-    expiresAt: Date.now() + USER_CACHE_TTL_MS
-  });
-}
-async function lookupSlackUser(userId) {
-  if (!userId) {
-    return null;
-  }
-  const cached = readFromCache(userId);
-  if (cached) {
-    return cached;
-  }
-  const token = getSlackBotToken();
-  if (!token) {
-    return null;
-  }
-  try {
-    const response = await fetch(
-      `https://slack.com/api/users.info?user=${encodeURIComponent(userId)}`,
-      {
-        headers: {
-          authorization: `Bearer ${token}`
-        }
-      }
-    );
-    if (!response.ok) {
-      logWarn(
-        "slack_user_lookup_failed",
-        {},
-        {
-          "enduser.id": userId,
-          "http.response.status_code": response.status
-        },
-        "Slack user lookup request failed"
-      );
-      return null;
-    }
-    const payload = await response.json();
-    if (!payload.ok || !payload.user) {
-      return null;
-    }
-    const userName = payload.user.name?.trim() || void 0;
-    const fullName = payload.user.profile?.display_name?.trim() || payload.user.profile?.real_name?.trim() || payload.user.real_name?.trim() || void 0;
-    const result = {
-      userName,
-      fullName,
-      email: payload.user.profile?.email?.trim() || void 0
-    };
-    writeToCache(userId, result);
-    return result;
-  } catch (error) {
-    logWarn(
-      "slack_user_lookup_failed",
-      {},
-      {
-        "enduser.id": userId,
-        "exception.message": error instanceof Error ? error.message : String(error)
-      },
-      "Slack user lookup failed with exception"
-    );
-    return null;
-  }
-}
-
 // src/chat/services/subscribed-reply-policy.ts
 function createSubscribedReplyPolicy(deps) {
   return async (args) => {
@@ -19793,14 +19863,14 @@ function collectCanvasUrls(artifacts) {
     ].filter((url) => typeof url === "string" && url !== "")
   );
 }
-function turnRequester(args) {
+function turnRequester(identity) {
   const requester = {
-    ...args.email ? { email: args.email } : {},
-    ...args.fullName ? { fullName: args.fullName } : {},
-    ...args.userId ? { slackUserId: args.userId } : {},
-    ...args.userName ? { slackUserName: args.userName } : {}
+    ...identity.email ? { email: identity.email } : {},
+    ...identity.fullName ? { fullName: identity.fullName } : {},
+    ...identity.userId ? { slackUserId: identity.userId } : {},
+    ...identity.userName ? { slackUserName: identity.userName } : {}
   };
-  return Object.keys(requester).length > 0 ? requester : void 0;
+  return requester;
 }
 async function resolveChannelName(thread) {
   const existingName = thread.channel.name?.trim();
@@ -19909,6 +19979,19 @@ function createReplyToThread(deps) {
           options.queuedMessages ?? [],
           currentText
         ).userText;
+        await Promise.all(
+          (options.queuedMessages ?? []).map(
+            (queued) => ensureSlackMessageActorIdentity(
+              queued.message,
+              deps.services.lookupSlackUser
+            )
+          )
+        );
+        const requesterIdentity = await ensureSlackMessageActorIdentity(
+          message,
+          deps.services.lookupSlackUser
+        );
+        const requester = turnRequester(requesterIdentity);
         const preparedState = options.preparedState ?? await deps.prepareTurnState({
           thread,
           message,
@@ -19926,15 +20009,6 @@ function createReplyToThread(deps) {
         });
         const slackMessageTs = getSlackMessageTs(message);
         const turnId = buildDeterministicTurnId(message.id);
-        const fallbackIdentity = await deps.services.lookupSlackUser(
-          message.author.userId
-        );
-        const requester = turnRequester({
-          email: fallbackIdentity?.email,
-          fullName: message.author.fullName ?? fallbackIdentity?.fullName,
-          userId: message.author.userId,
-          userName: message.author.userName ?? fallbackIdentity?.userName
-        });
         const turnTraceContext = {
           conversationId,
           slackThreadId: threadId,
@@ -20122,16 +20196,15 @@ function createReplyToThread(deps) {
           conversation: preparedState.conversation
         });
         await options.onTurnStatePersisted?.();
-        const resolvedUserName = message.author.userName ?? fallbackIdentity?.userName;
         if (message.author.userId) {
           setSentryUser({
             id: message.author.userId,
-            ...resolvedUserName ? { username: resolvedUserName } : {},
-            ...fallbackIdentity?.email ? { email: fallbackIdentity.email } : {}
+            ...requesterIdentity.userName ? { username: requesterIdentity.userName } : {},
+            ...requesterIdentity.email ? { email: requesterIdentity.email } : {}
           });
         }
-        if (resolvedUserName) {
-          setTags({ slackUserName: resolvedUserName });
+        if (requesterIdentity.userName) {
+          setTags({ slackUserName: requesterIdentity.userName });
         }
         const turnAttachments = collectTurnAttachments(
           message,
@@ -20261,12 +20334,7 @@ function createReplyToThread(deps) {
               credentialContext: {
                 actor: { type: "user", userId: message.author.userId }
               },
-              requester: {
-                userId: message.author.userId,
-                userName: message.author.userName ?? fallbackIdentity?.userName,
-                fullName: message.author.fullName ?? fallbackIdentity?.fullName,
-                email: fallbackIdentity?.email
-              },
+              requester: requesterIdentity,
               conversationContext: preparedState.conversationContext,
               artifactState: preparedState.artifacts,
               piMessages,
@@ -20673,6 +20741,7 @@ function resolveMessageText(args) {
   return text || NON_TEXT_MESSAGE_TEXT;
 }
 function toConversationMessage(args) {
+  const actor = getMessageActorIdentity(args.entry);
   const messageHasPotentialImageAttachment = hasPotentialImageAttachment(
     args.entry.attachments
   );
@@ -20683,9 +20752,9 @@ function toConversationMessage(args) {
     text: resolveMessageText(args),
     createdAtMs: args.entry.metadata.dateSent.getTime(),
     author: {
-      userId: args.entry.author.userId,
-      userName: args.entry.author.userName,
-      fullName: args.entry.author.fullName,
+      ...actor?.userId ? { userId: actor.userId } : {},
+      ...actor?.userName ? { userName: actor.userName } : {},
+      ...actor?.fullName ? { fullName: actor.fullName } : {},
       isBot: typeof args.entry.author.isBot === "boolean" ? args.entry.author.isBot : void 0
     },
     meta: {
@@ -21102,6 +21171,13 @@ async function runWithSlackInstallation(args) {
 }
 
 // src/chat/task-execution/slack-work.ts
+function requireSlackAuthorId(message) {
+  const authorId = parseActorUserId(message.author.userId);
+  if (!authorId) {
+    throw new Error("Slack message requires an actor user id");
+  }
+  return authorId;
+}
 function getConnectedState3(stateAdapter) {
   return stateAdapter ?? getStateAdapter();
 }
@@ -21126,6 +21202,23 @@ function restoreMessage(args) {
   rehydrateAttachmentFetchers(message);
   return message;
 }
+async function bindSlackActorIdentities(args) {
+  const byAuthorId = /* @__PURE__ */ new Map();
+  for (const message of args.messages) {
+    const authorId = requireSlackAuthorId(message);
+    byAuthorId.set(authorId, [...byAuthorId.get(authorId) ?? [], message]);
+  }
+  await Promise.all(
+    [...byAuthorId].map(async ([authorId, messages]) => {
+      const profile = await args.lookupSlackUser(authorId);
+      await Promise.all(
+        messages.map(
+          (message) => ensureSlackMessageActorIdentity(message, async () => profile)
+        )
+      );
+    })
+  );
+}
 function restoreThread(args) {
   const threadId = normalizeIncomingSlackThreadId(
     args.threadJson.id,
@@ -21205,6 +21298,7 @@ function getPendingRecords(work) {
 function createSlackConversationWorker(options) {
   return async (context) => {
     const adapter = options.getSlackAdapter();
+    const actorLookup = options.lookupSlackUser ?? lookupSlackUser;
     const state = getConnectedState3(options.state);
     await state.connect();
     const resumeContinuation = options.resumeAwaitingContinuation ?? resumeAwaitingContinuation;
@@ -21242,6 +21336,10 @@ function createSlackConversationWorker(options) {
         const messages = records.map(
           (record) => restoreMessage({ adapter, record })
         );
+        await bindSlackActorIdentities({
+          lookupSlackUser: actorLookup,
+          messages
+        });
         const latestMessage = messages[messages.length - 1];
         if (!latestMessage) {
           return;
@@ -21328,6 +21426,7 @@ function createSlackConversationWorker(options) {
   };
 }
 function buildSlackInboundMessage(args) {
+  const authorId = requireSlackAuthorId(args.message);
   return {
     conversationId: args.conversationId,
     inboundMessageId: [
@@ -21341,7 +21440,7 @@ function buildSlackInboundMessage(args) {
     receivedAtMs: args.receivedAtMs,
     input: {
       text: args.message.text || " ",
-      authorId: args.message.author.userId,
+      authorId,
       attachments: args.message.attachments,
       metadata: {
         platform: "slack",
@@ -21460,7 +21559,8 @@ function extractMessageChangedMention(body, botUserId, adapter) {
   const channelId = event.channel;
   const messageTs = event.message.ts;
   const threadTs = event.message.thread_ts ?? messageTs;
-  const userId = event.message.user ?? "unknown";
+  const userId = parseActorUserId(event.message.user);
+  if (!userId) return null;
   const threadId = `slack:${channelId}:${threadTs}`;
   const teamId = typeof body.team_id === "string" ? body.team_id : void 0;
   const userTeam = typeof event.message.user_team === "string" ? event.message.user_team : void 0;
@@ -21485,8 +21585,9 @@ function extractMessageChangedMention(body, botUserId, adapter) {
     raw,
     author: {
       userId,
-      userName: userId,
-      fullName: userId,
+      // Raw message_changed payloads do not include profile fields.
+      userName: "",
+      fullName: "",
       isBot: false,
       isMe: false
     }
@@ -21516,10 +21617,17 @@ function isExternalSlackUser(raw) {
 async function postEphemeral(event, text) {
   await event.channel.postEphemeral(event.user, text, { fallbackToDM: false });
 }
+function requireRequesterId(event) {
+  const userId = parseActorUserId(event.user.userId);
+  if (!userId) {
+    throw new Error("Slack slash command requires a requester user id");
+  }
+  return userId;
+}
 function getCommandName() {
   return getChatConfig().slack.slashCommand;
 }
-async function handleLink(event, provider) {
+async function handleLink(event, requesterId, provider) {
   if (!isPluginProvider(provider)) {
     await postEphemeral(event, `Unknown provider: \`${provider}\``);
     return;
@@ -21533,7 +21641,7 @@ async function handleLink(event, provider) {
   }
   const raw = event.raw;
   const result = await startOAuthFlow(provider, {
-    requesterId: event.user.userId,
+    requesterId,
     channelId: raw.channel_id
   });
   if (!result.ok) {
@@ -21552,7 +21660,7 @@ async function handleLink(event, provider) {
     );
   }
 }
-async function handleUnlink(event, provider) {
+async function handleUnlink(event, requesterId, provider) {
   if (!isPluginProvider(provider)) {
     await postEphemeral(event, `Unknown provider: \`${provider}\``);
     return;
@@ -21565,10 +21673,10 @@ async function handleUnlink(event, provider) {
     return;
   }
   const tokenStore = createUserTokenStore();
-  await tokenStore.delete(event.user.userId, provider);
+  await tokenStore.delete(requesterId, provider);
   logInfo(
     "slash_command_unlink",
-    { slackUserId: event.user.userId },
+    { slackUserId: requesterId },
     { "app.credential.provider": provider },
     `Unlinked ${formatProviderLabel(provider)} account via ${getCommandName()} slash command`
   );
@@ -21594,10 +21702,11 @@ async function handleSlashCommand(event) {
     return;
   }
   const normalized = provider.toLowerCase();
+  const requesterId = requireRequesterId(event);
   if (subcommand === "link") {
-    await handleLink(event, normalized);
+    await handleLink(event, requesterId, normalized);
   } else {
-    await handleUnlink(event, normalized);
+    await handleUnlink(event, requesterId, normalized);
   }
 }
 
@@ -21837,15 +21946,12 @@ async function handleSlackEvent(args) {
     })
   );
 }
-function buildAuthorFromInteractive(user) {
-  const userId = user?.id ?? "unknown";
-  return {
-    userId,
-    userName: user?.username ?? user?.name ?? userId,
-    fullName: user?.name ?? user?.username ?? userId,
-    isBot: false,
-    isMe: false
-  };
+function requireSlackPayloadUserId(value, source) {
+  const userId = parseActorUserId(value);
+  if (!userId) {
+    throw new Error(`${source} is missing a Slack user id`);
+  }
+  return userId;
 }
 async function handleSlashCommandForm(args) {
   const raw = Object.fromEntries(args.params);
@@ -21855,7 +21961,21 @@ async function handleSlashCommandForm(args) {
     adapter: args.adapter,
     stateAdapter: args.state
   });
-  const userId = args.params.get("user_id") || "unknown";
+  const userId = requireSlackPayloadUserId(
+    args.params.get("user_id"),
+    "Slack slash command payload"
+  );
+  const userIdentity = buildActorIdentity(
+    {
+      userId,
+      userName: args.params.get("user_name") ?? void 0,
+      fullName: args.params.get("user_name") ?? void 0
+    },
+    userId
+  );
+  if (!userIdentity?.userId) {
+    throw new Error("Slack slash command payload actor identity is invalid");
+  }
   await withSpan(
     "chat.slash_command",
     "chat.slash_command",
@@ -21870,8 +21990,8 @@ async function handleSlashCommandForm(args) {
         raw,
         user: {
           userId,
-          userName: args.params.get("user_name") || userId,
-          fullName: args.params.get("user_name") || userId,
+          userName: userIdentity.userName ?? "",
+          fullName: userIdentity.fullName ?? "",
           isBot: false,
           isMe: false
         },
@@ -21888,10 +22008,13 @@ async function handleInteractivePayload(args) {
     (candidate) => candidate.action_id === "app_home_disconnect"
   );
   const provider = action?.selected_option?.value ?? action?.value;
-  const userId = args.payload.user?.id;
-  if (!provider || !userId) {
+  if (!provider) {
     return;
   }
+  const userId = requireSlackPayloadUserId(
+    args.payload.user?.id,
+    "Slack app home disconnect payload"
+  );
   await withSpan(
     "chat.app_home_disconnect",
     "chat.app_home_disconnect",
@@ -21986,7 +22109,7 @@ async function handleSlackForm(args) {
       })
     ).catch((error) => {
       logException(error, "slack_interactive_payload_failed", {
-        slackUserId: buildAuthorFromInteractive(payload.user).userId
+        slackUserId: payload.user?.id?.trim() || void 0
       });
     })
   );