@openclaw/discord 2026.8.1-beta.2 → 2026.8.1

package/dist/{message-handler-Unk_f10F.js → message-handler-C5By3yl5.js}

@@ -1,13 +1,15 @@
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import { c as resolveDiscordChannelInfoSafe, d as resolveDiscordChannelParentSafe, l as resolveDiscordChannelNameSafe, s as resolveDiscordChannelIdSafe } from "./thread-bindings.manager-DCIH6WDC.js";
-import { w as mapGatewayDispatchData } from "./provider-DvSNb-2v.js";
-import { f as resolveDiscordMessageChannelId, i as resolveDiscordMessageText, l as hasDiscordMessageStickers } from "./message-utils-BSCPVgy0.js";
-import { normalizeNullableString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { c as resolveDiscordChannelInfoSafe, d as resolveDiscordChannelParentSafe, l as resolveDiscordChannelNameSafe, s as resolveDiscordChannelIdSafe } from "./thread-bindings.manager-Clm77DBM.js";
+import { v as mapGatewayDispatchData } from "./provider-LXiOcJrH.js";
+import { d as resolveDiscordCdnPolicy, i as resolveDiscordMessageText, l as hasDiscordMessageStickers, p as resolveDiscordMessageChannelId } from "./message-text-Ca8M6TU8.js";
+import { logDebug } from "openclaw/plugin-sdk/logging-core";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { normalizeNullableString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { danger } from "openclaw/plugin-sdk/runtime-env";
 import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
 import { DEFAULT_INGRESS_RETRY_MAX_ATTEMPTS, createChannelIngressError, createChannelIngressMonitor, createChannelRunQueue } from "openclaw/plugin-sdk/channel-outbound";
+import { saveRemoteMedia } from "openclaw/plugin-sdk/media-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
 import { fanInChannelIngressLifecycles } from "openclaw/plugin-sdk/channel-ingress-runtime";
@@ -167,6 +169,77 @@ function normalizeDiscordThreadChannel(threadChannel) {
 	};
 }
 //#endregion
+//#region extensions/discord/src/monitor/message-avatar.ts
+const DISCORD_AVATAR_MAX_BYTES = 256 * 1024;
+const DISCORD_AVATAR_CACHE_MAX_ENTRIES = 128;
+const DISCORD_GUILD_ICON_TTL_MS = 5 * 6e4;
+function setBoundedEntry(map, key, value) {
+	map.delete(key);
+	map.set(key, value);
+	while (map.size > DISCORD_AVATAR_CACHE_MAX_ENTRIES) {
+		const oldest = map.keys().next().value;
+		if (oldest === void 0) break;
+		map.delete(oldest);
+	}
+}
+function discordAvatarUrl(owner, id, hash) {
+	return `https://cdn.discordapp.com/${owner}/${id}/${hash}.png?size=128`;
+}
+/** Dispatcher-lifetime resolver for eventually available Discord conversation images. */
+function createDiscordAvatarResolver() {
+	const saved = /* @__PURE__ */ new Map();
+	const pending = /* @__PURE__ */ new Set();
+	const guildIcons = /* @__PURE__ */ new Map();
+	const pendingGuilds = /* @__PURE__ */ new Set();
+	const resolveSavedAvatar = (key, url) => {
+		const cached = saved.get(key);
+		if (cached) {
+			saved.delete(key);
+			saved.set(key, cached);
+			return cached;
+		}
+		if (pending.has(key) || pending.size >= DISCORD_AVATAR_CACHE_MAX_ENTRIES) return;
+		pending.add(key);
+		saveRemoteMedia({
+			url,
+			filePathHint: "conversation-avatar.png",
+			maxBytes: DISCORD_AVATAR_MAX_BYTES,
+			ssrfPolicy: resolveDiscordCdnPolicy()
+		}).then((media) => {
+			setBoundedEntry(saved, key, media.path);
+		}).catch((error) => {
+			logDebug(`discord conversation avatar download failed: ${formatErrorMessage(error)}`);
+		}).finally(() => {
+			pending.delete(key);
+		});
+	};
+	const refreshGuildIcon = (client, guildId, conversationId) => {
+		if (pendingGuilds.has(guildId) || pendingGuilds.size >= DISCORD_AVATAR_CACHE_MAX_ENTRIES) return;
+		pendingGuilds.add(guildId);
+		client.fetchGuild(guildId).then((guild) => {
+			const hash = guild.icon ?? null;
+			setBoundedEntry(guildIcons, guildId, {
+				expiresAt: Date.now() + DISCORD_GUILD_ICON_TTL_MS,
+				hash
+			});
+			if (hash) resolveSavedAvatar(`${conversationId}\0${hash}`, discordAvatarUrl("icons", guildId, hash));
+		}).catch((error) => {
+			logDebug(`discord guild icon lookup failed: ${formatErrorMessage(error)}`);
+		}).finally(() => {
+			pendingGuilds.delete(guildId);
+		});
+	};
+	return { resolve(params) {
+		if (!params.guildId) {
+			const hash = params.author.avatar;
+			return hash ? resolveSavedAvatar(`${params.conversationId}\0${hash}`, discordAvatarUrl("avatars", params.author.id, hash)) : void 0;
+		}
+		const guildIcon = guildIcons.get(params.guildId);
+		if (!guildIcon || guildIcon.expiresAt <= Date.now()) refreshGuildIcon(params.client, params.guildId, params.conversationId);
+		return guildIcon?.hash ? resolveSavedAvatar(`${params.conversationId}\0${guildIcon.hash}`, discordAvatarUrl("icons", params.guildId, guildIcon.hash)) : void 0;
+	} };
+}
+//#endregion
 //#region extensions/discord/src/monitor/message-handler.batch-gate.ts
 function applyImplicitReplyBatchGate(ctx, replyToMode, isBatched) {
 	const replyThreading = resolveBatchedReplyThreadingPolicy(replyToMode, isBatched);
@@ -175,7 +248,7 @@ function applyImplicitReplyBatchGate(ctx, replyToMode, isBatched) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-run-queue.ts
-const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-DWQ6UHHu.js"));
+const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-DyFPDLCt.js"));
 async function processDiscordQueuedMessage(params) {
 	const abortSignal = params.job.runtime.abortSignal && params.lifecycleSignal ? AbortSignal.any([params.job.runtime.abortSignal, params.lifecycleSignal]) : params.job.runtime.abortSignal ?? params.lifecycleSignal;
 	try {
@@ -262,7 +335,7 @@ function createDiscordMessageRunQueue(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-dispatcher.ts
-const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-C9zecxR9.js"));
+const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-DrszWuHw.js"));
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
@@ -281,6 +354,7 @@ function createDiscordMessageDispatcher(params) {
 		testing: params.testing
 	});
 	const dispatcherShutdown = new AbortController();
+	const avatarResolver = createDiscordAvatarResolver();
 	const pendingDebounceEntries = /* @__PURE__ */ new Set();
 	const pendingCancellationSettlements = /* @__PURE__ */ new Set();
 	const resolveDebounceKey = (entry) => {
@@ -323,6 +397,7 @@ function createDiscordMessageDispatcher(params) {
 						if (entries.length === 1) {
 							const ctx = await (preflightDiscordMessageImpl ?? (await loadMessagePreflightRuntime()).preflightDiscordMessage)({
 								...params,
+								avatarResolver,
 								ackReactionScope,
 								groupPolicy,
 								abortSignal,
@@ -377,6 +452,7 @@ function createDiscordMessageDispatcher(params) {
 						};
 						const ctx = await (preflightDiscordMessageImpl ?? (await loadMessagePreflightRuntime()).preflightDiscordMessage)({
 							...params,
+							avatarResolver,
 							ackReactionScope,
 							groupPolicy,
 							abortSignal,

package/dist/{message-handler.preflight-C9zecxR9.js → message-handler.preflight-DrszWuHw.js}

@@ -1,18 +1,21 @@
-import { B as Message, Et as getChannelMessage, h as discord_exports } from "./retry-CLpJcXXf.js";
-import { o as resolveDefaultDiscordAccountId } from "./accounts-DJTf1LtA.js";
-import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, f as resolveDiscordGuildEntry, i as normalizeDiscordDisplaySlug, n as isDiscordGroupAllowedByPolicy, p as resolveDiscordMemberAccessState, v as resolveGroupDmAllow, x as formatDiscordUserTag } from "./allow-list-DnxIlPP2.js";
+import { W as Message, jt as getChannelMessage, y as discord_exports } from "./retry-DqHCW6PV.js";
+import { s as resolveDefaultDiscordAccountId } from "./accounts-CfQ-vSyf.js";
+import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, f as resolveDiscordGuildEntry, i as normalizeDiscordDisplaySlug, p as resolveDiscordMemberAccessState, x as formatDiscordUserTag } from "./allow-list-BDMimASD.js";
+import { t as isDiscordThreadChannelType } from "./channel-type-CVLZyGYS.js";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-B9cy6RvQ.js";
-import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-AcIxvrf3.js";
-import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-DCIH6WDC.js";
-import { C as handleDiscordDmCommandDecision, M as resolveDiscordTextCommandAccess, S as shouldIgnoreStaleDiscordRouteBinding, b as resolveDiscordConversationRoute, j as resolveDiscordDmCommandAccess, x as resolveDiscordEffectiveRoute, y as buildDiscordRoutePeer } from "./provider-DvSNb-2v.js";
-import { d as resolveDiscordChannelInfo, f as resolveDiscordMessageChannelId, i as resolveDiscordMessageText, o as resolveForwardedMediaList, r as resolveDiscordMessageHistoryText, s as resolveMediaList, u as resolveDiscordMessageStickers } from "./message-utils-BSCPVgy0.js";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-QtalnCYv.js";
+import { a as buildDiscordRoutePeer, c as resolveDiscordEffectiveRoute, f as resolveDiscordRuntimeBindingConversationId, s as resolveDiscordConversationRoute, u as resolveDiscordConversationIdentity } from "./outbound-session-route-Bn4uXaoE.js";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-BjvX4e35.js";
+import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-Clm77DBM.js";
+import { S as resolveDiscordTextCommandAccess, _ as handleDiscordDmCommandDecision, n as resolveDiscordPreflightChannelAccess, x as resolveDiscordDmCommandAccess } from "./provider-LXiOcJrH.js";
+import { f as resolveDiscordChannelInfo, i as resolveDiscordMessageText, o as resolveForwardedMediaList, p as resolveDiscordMessageChannelId, r as resolveDiscordMessageHistoryText, s as resolveMediaList, u as resolveDiscordMessageStickers } from "./message-text-Ca8M6TU8.js";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-BJtfyise.js";
 import { t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
-import { normalizeOptionalString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { logDebug } from "openclaw/plugin-sdk/logging-core";
 import { MessageReferenceType, MessageType } from "discord-api-types/v10";
-import { getChildLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { normalizeOptionalString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
+import { mimeTypeFromFilePath } from "openclaw/plugin-sdk/media-mime";
+import { getChildLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { formatAllowlistMatchMeta } from "openclaw/plugin-sdk/allow-from";
 import { findCodeRegions, isInsideCode } from "openclaw/plugin-sdk/text-chunking";
 import { isRecentOutboundMessageIdentity } from "openclaw/plugin-sdk/channel-outbound";
@@ -20,14 +23,13 @@ import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { enqueueRoutedSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
 import { buildMentionRegexes, classifyChannelInboundEvent, implicitMentionKindWhen, logInboundDrop, matchesMentionWithExplicit, recordChannelBotPairLoopAndCheckSuppression, resolveInboundMentionDecision, resolveUnmentionedGroupInboundPolicy, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
-import { mimeTypeFromFilePath } from "openclaw/plugin-sdk/media-mime";
 import { hasControlCommand } from "openclaw/plugin-sdk/command-detection";
 import { isAbortRequestText } from "openclaw/plugin-sdk/command-primitives-runtime";
 import { shouldHandleTextCommands } from "openclaw/plugin-sdk/command-surface";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 //#region extensions/discord/src/monitor/message-handler.dm-preflight.ts
 const loadConversationRuntime$1 = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/conversation-binding-runtime"));
-const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-B7Q6Oc1I.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-UJHiAm4C.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -52,7 +54,9 @@ async function resolveDiscordDmPreflightAccess(params) {
 		sender: {
 			id: params.sender.id,
 			name: params.sender.name,
-			tag: params.sender.tag
+			tag: params.sender.tag,
+			isPluralKit: params.sender.isPluralKit,
+			authorKind: params.author.bot ? "bot" : "user"
 		},
 		allowNameMatching: params.allowNameMatching,
 		cfg: params.preflight.cfg,
@@ -266,72 +270,6 @@ async function hydrateDiscordMessageIfNeeded(params) {
 	};
 }
 //#endregion
-//#region extensions/discord/src/monitor/message-handler.preflight-channel-access.ts
-function resolveDiscordPreflightChannelAccess(params) {
-	if (params.isGuildMessage && params.channelConfig?.enabled === false) {
-		logDebug(`[discord-preflight] drop: channel disabled`);
-		logVerbose(`Blocked discord channel ${params.messageChannelId} (channel disabled, ${params.channelMatchMeta})`);
-		return {
-			allowed: false,
-			channelAllowlistConfigured: false,
-			channelAllowed: false
-		};
-	}
-	const groupDmAllowed = params.isGroupDm && resolveGroupDmAllow({
-		channels: params.groupDmChannels,
-		channelId: params.messageChannelId,
-		channelName: params.displayChannelName,
-		channelSlug: params.displayChannelSlug
-	});
-	if (params.isGroupDm && !groupDmAllowed) return {
-		allowed: false,
-		channelAllowlistConfigured: false,
-		channelAllowed: false
-	};
-	const channelAllowlistConfigured = Boolean(params.guildInfo?.channels) && Object.keys(params.guildInfo?.channels ?? {}).length > 0;
-	const channelAllowed = params.channelConfig?.allowed !== false;
-	if (params.isGuildMessage && !isDiscordGroupAllowedByPolicy({
-		groupPolicy: params.groupPolicy,
-		guildAllowlisted: Boolean(params.guildInfo),
-		channelAllowlistConfigured,
-		channelAllowed
-	})) {
-		if (params.groupPolicy === "disabled") {
-			logDebug(`[discord-preflight] drop: groupPolicy disabled`);
-			logVerbose(`discord: drop guild message (groupPolicy: disabled, ${params.channelMatchMeta})`);
-		} else if (!channelAllowlistConfigured) {
-			logDebug(`[discord-preflight] drop: groupPolicy allowlist, no channel allowlist configured`);
-			logVerbose(`discord: drop guild message (groupPolicy: allowlist, no channel allowlist, ${params.channelMatchMeta})`);
-		} else {
-			logDebug(`[discord] Ignored message from channel ${params.messageChannelId} (not in guild allowlist). Add to guilds.<guildId>.channels to enable.`);
-			logVerbose(`Blocked discord channel ${params.messageChannelId} not in guild channel allowlist (groupPolicy: allowlist, ${params.channelMatchMeta})`);
-		}
-		return {
-			allowed: false,
-			channelAllowlistConfigured,
-			channelAllowed
-		};
-	}
-	if (params.isGuildMessage && params.channelConfig?.allowed === false) {
-		logDebug(`[discord-preflight] drop: channelConfig.allowed===false`);
-		logVerbose(`Blocked discord channel ${params.messageChannelId} not in guild channel allowlist (${params.channelMatchMeta})`);
-		return {
-			allowed: false,
-			channelAllowlistConfigured,
-			channelAllowed
-		};
-	}
-	if (params.isGuildMessage) {
-		logDebug(`[discord-preflight] pass: channel allowed`);
-		logVerbose(`discord: allow channel ${params.messageChannelId} (${params.channelMatchMeta})`);
-	}
-	return {
-		allowed: true,
-		channelAllowlistConfigured,
-		channelAllowed
-	};
-}
-//#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-channel-context.ts
 function resolveDiscordPreflightChannelContext(params) {
 	const threadName = params.threadChannel?.name;
@@ -400,9 +338,6 @@ function isBoundThreadBotSystemMessage(params) {
 	if (!text) return false;
 	return DISCORD_BOUND_THREAD_SYSTEM_PREFIXES.some((prefix) => text.startsWith(prefix));
 }
-function isDiscordThreadChannelType(type) {
-	return type === discord_exports.ChannelType.PublicThread || type === discord_exports.ChannelType.PrivateThread || type === discord_exports.ChannelType.AnnouncementThread;
-}
 function isDiscordThreadChannelMessage(params) {
 	if (!params.isGuildMessage) return false;
 	const channel = "channel" in params.message ? params.message.channel : void 0;
@@ -488,10 +423,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-DdiJ9KMK.js").then((n) => n.n));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-9EuEN4UD.js").then((n) => n.n));
 const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-DrnqFA8U.js"));
-const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-CTqDf6_s.js"));
-const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-DvSNb-2v.js").then((n) => n.E));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-BEmcj4xJ.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./threading-CXuu_7o9.js").then((n) => n.t));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -554,40 +489,21 @@ async function resolveDiscordPreflightRoute(params) {
 		}),
 		parentConversationId: params.earlyThreadParentId
 	});
-	const bindingConversationId = params.isDirectMessage ? resolveDiscordConversationIdentity({
-		isDirectMessage: true,
-		userId: params.author.id
-	}) ?? `user:${params.author.id}` : params.messageChannelId;
-	let runtimeRoute = conversationRuntime.resolveRuntimeConversationBindingRoute({
-		route,
-		conversation: {
-			channel: "discord",
-			accountId: params.preflight.accountId,
-			conversationId: bindingConversationId,
-			parentConversationId: params.earlyThreadParentId
-		}
+	const bindingConversationId = resolveDiscordRuntimeBindingConversationId({
+		isDirectMessage: params.isDirectMessage,
+		isGroupDm: params.isGroupDm,
+		userId: params.author.id,
+		channelId: params.messageChannelId
 	});
-	if (shouldIgnoreStaleDiscordRouteBinding({
-		bindingRecord: runtimeRoute.bindingRecord,
-		route
-	})) {
-		logVerbose(`discord: ignoring stale route binding for conversation ${bindingConversationId} (${runtimeRoute.bindingRecord?.targetSessionKey} -> ${route.sessionKey})`);
-		runtimeRoute = {
-			bindingRecord: null,
-			route
-		};
-	}
-	let threadBinding = runtimeRoute.bindingRecord ?? void 0;
-	const configuredRoute = threadBinding == null ? conversationRuntime.resolveConfiguredBindingRoute({
+	const { runtimeRoute, configuredRoute } = resolveDiscordConversationBindingRoute({
 		cfg: params.preflight.cfg,
 		route,
-		conversation: {
-			channel: "discord",
-			accountId: params.preflight.accountId,
-			conversationId: params.messageChannelId,
-			parentConversationId: params.earlyThreadParentId
-		}
-	}) : null;
+		accountId: params.preflight.accountId,
+		runtimeConversationId: bindingConversationId,
+		configuredConversationId: params.messageChannelId,
+		parentConversationId: params.earlyThreadParentId
+	});
+	let threadBinding = runtimeRoute.bindingRecord ?? void 0;
 	const configuredBinding = configuredRoute?.bindingResolution ?? null;
 	if (!threadBinding && configuredBinding) threadBinding = configuredBinding.record;
 	const boundSessionKey = conversationRuntime.isPluginOwnedSessionBindingRecord(threadBinding) ? "" : runtimeRoute.boundSessionKey ?? threadBinding?.targetSessionKey?.trim();
@@ -725,7 +641,7 @@ async function preflightDiscordMessage(params) {
 		channelType: channelInfo?.type
 	});
 	const messageText = resolveDiscordMessageText(message, { includeForwarded: true });
-	const injectedBoundThreadBinding = !isDirectMessage && !isGroupDm ? resolveInjectedBoundThreadLookupRecord({
+	const injectedBoundThreadBinding = !isDirectMessage && !isGroupDm && (webhookId || author.bot) ? resolveInjectedBoundThreadLookupRecord({
 		threadBindings: params.threadBindings,
 		threadId: messageChannelId
 	}) : void 0;
@@ -985,7 +901,9 @@ async function preflightDiscordMessage(params) {
 			sender: {
 				id: sender.id,
 				name: sender.name,
-				tag: sender.tag
+				tag: sender.tag,
+				isPluralKit: sender.isPluralKit,
+				authorKind: author.bot ? "bot" : "user"
 			},
 			memberAccessConfigured: hasAccessRestrictions,
 			memberAllowed,
@@ -1121,6 +1039,13 @@ async function preflightDiscordMessage(params) {
 			return null;
 		}
 	}
+	const guildId = isGuildMessage ? data.guild?.id ?? data.guild_id ?? message.guild_id : void 0;
+	const conversationAvatar = isDirectMessage || guildId ? params.avatarResolver?.resolve({
+		client: params.client,
+		conversationId: messageChannelId,
+		author,
+		...guildId ? { guildId } : {}
+	}) : void 0;
 	const mediaResolveOptions = {
 		fetchImpl: params.discordRestFetch,
 		ssrfPolicy: params.cfg.browser?.ssrfPolicy,
@@ -1157,6 +1082,7 @@ async function preflightDiscordMessage(params) {
 		...preflightTranscript !== void 0 ? { preflightAudioTranscript: preflightTranscript } : {},
 		preparedMedia,
 		wasMentioned,
+		conversationAvatar,
 		route: effectiveRoute,
 		threadBinding,
 		boundSessionKey: boundSessionKey || void 0,