@openclaw/discord 2026.9.6 → 2026.9.8

package/dist/.setup/{message-handler.process-CCmIVnxy.mjs → message-handler.process-BNFFuChn.mjs}

@@ -1,33 +1,35 @@
-import { C as withDiscordRequestAuthority, D as Message, _t as listChannelMessages, ft as editChannelMessage, jt as getGuildMember, st as createChannelMessage, t as discord_exports, ut as deleteChannelMessage } from "./discord-BXpHW-cu.mjs";
-import { C as resolveTimestampMs, i as normalizeDiscordAllowList, o as normalizeDiscordSlug } from "./channel-type-DKnjV1XW.mjs";
-import { p as resolveDiscordMaxLinesPerMessage } from "./accounts-CwJQoLjM.mjs";
-import { b as resolveDiscordChannelId, o as chunkDiscordTextWithMode } from "./retry-BEYkDy0P.mjs";
-import { F as createDiscordRuntimeAccountContext, P as createDiscordRestClient, d as resolveDiscordTargetChannelId, k as resolveDiscordMessageFlags } from "./send.shared-VNvWfX2T.mjs";
-import { a as discordTextHasBroadcastMention } from "./send.outbound-QTyuFupn.mjs";
-import { O as resolveDiscordMessageStickers, S as formatDiscordMediaText, T as resolveReferencedReplyMediaList, b as resolveDiscordMessageMentionDocuments, g as resolveDiscordThreadStarter, m as resolveDiscordAutoThreadReplyPlan, x as resolveDiscordMessageText, y as resolveDiscordMessageHistoryText } from "./transcripts-source-DVegW0WI.mjs";
-import { a as removeReactionDiscord, r as reactMessageDiscord } from "./send-CIBzvXjS.mjs";
+import { C as withDiscordRequestAuthority, D as Message, Mt as getGuildMember, ct as createChannelMessage, dt as deleteChannelMessage, pt as editChannelMessage, t as discord_exports, vt as listChannelMessages } from "./discord-0xJYfdDD.mjs";
+import { i as normalizeDiscordAllowList, o as normalizeDiscordSlug, w as resolveTimestampMs } from "./channel-type-DRCrEMss.mjs";
+import { p as resolveDiscordMaxLinesPerMessage } from "./accounts-ChaMcixG.mjs";
+import { o as chunkDiscordTextWithMode, x as resolveDiscordChannelId } from "./retry-pz_cSha2.mjs";
+import { N as createDiscordRestClient, O as resolveDiscordMessageFlags, P as createDiscordRuntimeAccountContext, u as resolveDiscordTargetChannelId } from "./send.shared-DGFkbkQR.mjs";
+import { a as discordTextHasBroadcastMention } from "./send.outbound-BISKnb-a.mjs";
+import { C as resolveReferencedReplyMediaList, E as resolveDiscordMessageStickers, O as resolveDiscordReferencedReplyMessageId, _ as resolveDiscordMessageHistoryText, b as formatDiscordMediaText, f as resolveDiscordAutoThreadReplyPlan, m as resolveDiscordThreadStarter, y as resolveDiscordMessageText } from "./transcripts-source-p8EV179h.mjs";
+import { a as removeReactionDiscord, r as reactMessageDiscord } from "./send-CrfEI6Bs.mjs";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-D86uWLt_.mjs";
-import "./targets-CvemhN3i.mjs";
-import { b as discordInboundEventDelivery, h as resolveDiscordConversationIdentity, u as buildDiscordRoutePeer } from "./outbound-session-route-VulUE0yV.mjs";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-ClIgmu4F.mjs";
-import { a as formatDiscordReplySkip, c as buildGuildLabel, g as createDiscordSupplementalContextAccessChecker, h as buildDiscordInboundAccessContext, i as formatDiscordReplyDeliveryFailure, l as resolveReplyContext, o as sanitizeDiscordFrontChannelReplyPayloads, r as deliverDiscordReply, s as buildDirectLabel } from "./provider-iOf73HW-.mjs";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-0Ymgvmaj.mjs";
+import "./targets-0KUcEIYx.mjs";
+import { b as discordInboundEventDelivery, h as resolveDiscordConversationIdentity, u as buildDiscordRoutePeer } from "./outbound-session-route-zVGxxceg.mjs";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-BobT-kse.mjs";
+import { T as createDiscordSupplementalContextAccessChecker, a as formatDiscordReplySkip, c as buildGuildLabel, i as formatDiscordReplyDeliveryFailure, l as resolveReplyContext, o as sanitizeDiscordFrontChannelReplyPayloads, r as deliverDiscordReply, s as buildDirectLabel, w as buildDiscordInboundAccessContext } from "./provider-B_G5hASF.mjs";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-B9X5Vb9R.mjs";
 import { t as beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-fmHl1HNd.mjs";
-import { a as createDiscordHistorySenderProvenance, c as hasRawDiscordUserMention, d as matchesActiveDiscordMentionPatterns, h as shouldIgnoreBoundThreadWebhookMessage, l as isBoundThreadBotSystemMessage, o as filterDiscordHistoryEntriesForContext, s as resolveDiscordHistoryMediaIds, t as resolveDiscordPreflightPluralKitInfo } from "./message-handler.preflight-pluralkit-8Xji34AF.mjs";
-import { t as sendTyping } from "./typing-BKZL5fGj.mjs";
+import { a as createDiscordHistorySenderProvenance, h as shouldIgnoreBoundThreadWebhookMessage, l as isBoundThreadBotSystemMessage, o as filterDiscordHistoryEntriesForContext, s as resolveDiscordHistoryMediaIds, t as resolveDiscordPreflightPluralKitInfo } from "./message-handler.preflight-pluralkit-CWLUBVcx.mjs";
+import { t as sendTyping } from "./typing-BiHCzBRu.mjs";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { danger, logVerbose, shouldLogVerbose, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
+import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
 import { bindIngressLifecycleToReplyOptions, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftLifecycle, createLivePreviewLifecycle, createTypingCallbacks, isRecentOutboundMessageIdentity, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingProgressNarration, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
-import { buildChannelInboundEventContext, buildMentionRegexes, createCommandTurnContext, dispatchChannelInboundTurn, formatInboundEnvelope, formatInboundMediaUnavailableText, getGroupThreadDeliverySession, hasFinalInboundReplyDispatch, readAgentRunTerminalOutcome, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, createCommandTurnContext, dispatchChannelInboundTurn, formatInboundEnvelope, formatInboundMediaUnavailableText, getGroupThreadDeliverySession, hasFinalInboundReplyDispatch, readAgentRunTerminalOutcome, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
-import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/conversation-runtime";
+import { resolvePinnedMainDmOwnerFromAllowlist as resolvePinnedMainDmOwnerFromAllowlist$1 } from "openclaw/plugin-sdk/conversation-runtime";
 import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { EmbeddedBlockChunker, resolveAckReaction, resolveAgentConfig as resolveAgentConfig$1, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
@@ -52,11 +54,6 @@ async function recoverDiscordChannelHistory(params) {
 	const cachedMedia = new Map((ctx.guildHistories.get(ctx.messageChannelId) ?? []).map((entry) => [entry.messageId, entry]));
 	const members = /* @__PURE__ */ new Map();
 	const roleAllowList = ctx.channelConfig?.roles ?? ctx.guildInfo?.roles ?? [];
-	const mentionRegexes = ctx.discordConfig?.allowBots === "mentions" ? buildMentionRegexes(ctx.cfg, ctx.route.agentId, {
-		provider: "discord",
-		conversationId: ctx.messageChannelId,
-		providerPolicy: ctx.discordConfig.mentionPatterns
-	}) : [];
 	const entries = [];
 	try {
 		while (remaining > 0 && isCurrent()) {
@@ -103,14 +100,6 @@ async function recoverDiscordChannelHistory(params) {
 					member: row.member,
 					pluralkitInfo
 				});
-				if (row.author.bot && !sender.isPluralKit) {
-					const allowBots = ctx.discordConfig?.allowBots;
-					if (!allowBots) continue;
-					if (allowBots === "mentions") {
-						const documents = resolveDiscordMessageMentionDocuments(message);
-						if (!(row.mentions.some((user) => user.id === ctx.botUserId) && (row.type !== discord_exports.MessageType.Reply || documents.some((text) => hasRawDiscordUserMention(text, ctx.botUserId)))) && !documents.some((text) => matchesActiveDiscordMentionPatterns(text, mentionRegexes))) continue;
-					}
-				}
 				let member = row.member;
 				if (params.mode !== "all" && roleAllowList.length > 0 && !member && guildId && !params.isSenderAllowed({
 					...sender,
@@ -221,7 +210,7 @@ async function buildDiscordMessageProcessContext(params) {
 		isGuild: isGuildMessage,
 		channelTopic: channelInfo?.topic
 	});
-	const pinnedMainDmOwner = isDirectMessage ? resolvePinnedMainDmOwnerFromAllowlist({
+	const pinnedMainDmOwner = isDirectMessage ? resolvePinnedMainDmOwnerFromAllowlist$1({
 		dmScope: cfg.session?.dmScope,
 		allowFrom: channelConfig?.users ?? guildInfo?.users,
 		normalizeEntry: normalizeDiscordDmOwnerEntry
@@ -434,11 +423,11 @@ async function buildDiscordMessageProcessContext(params) {
 		threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
 	});
 	if (!isHistoryCurrent()) return null;
+	const batchMessageIds = ctx.sourceMessageIds && ctx.sourceMessageIds.length > 1 ? [...ctx.sourceMessageIds] : void 0;
 	const ctxPayload = await (ctx.buildContext ?? buildChannelInboundEventContext)({
 		channelIngress,
 		channel: "discord",
 		resolveSupplementalMedia: true,
-		suppressSelfQuoteBody: false,
 		contextVisibility: contextVisibilityMode,
 		accountId: route.accountId,
 		messageId: canonicalMessageId ?? message.id,
@@ -479,6 +468,7 @@ async function buildDiscordMessageProcessContext(params) {
 		},
 		reply: {
 			to: effectiveTo,
+			replyToId: resolveDiscordReferencedReplyMessageId(message) ?? void 0,
 			...originatingTo !== effectiveTo ? { originatingTo } : {}
 		},
 		message: {
@@ -534,6 +524,10 @@ async function buildDiscordMessageProcessContext(params) {
 			groupSystemPrompt: isGuildMessage ? groupSystemPrompt : void 0
 		},
 		extra: {
+			MessageSids: batchMessageIds,
+			MessageSidFirst: batchMessageIds?.[0],
+			MessageSidLast: batchMessageIds?.at(-1),
+			ReplyThreading: resolveBatchedReplyThreadingPolicy(replyToMode, batchMessageIds !== void 0),
 			GroupThread: ctx.groupThread,
 			...preflightAudioTranscript !== void 0 ? { Transcript: preflightAudioTranscript } : {},
 			GroupSubject: isDirectMessage ? void 0 : groupChannel,
@@ -642,6 +636,7 @@ function createDiscordMessageProgressRuntime(params) {
 		onQueuedFollowupAdmitted: draftPreview.draftStream ? () => {
 			if (draftPreview.handleQueuedFollowupAdmitted()) params.onTurnReset();
 		} : void 0,
+		onQueuedFollowupSettled: draftPreview.draftStream ? () => draftPreview.cleanup() : void 0,
 		suppressDefaultToolProgressMessages: params.sourceRepliesAreToolOnly && params.reactions.statusReactionsExplicitlyEnabled || draftPreview.suppressDefaultToolProgressMessages ? true : void 0,
 		allowToolLifecycleWhenProgressHidden: params.reactions.statusReactionsEnabled ? true : void 0,
 		commentaryProgressEnabled: draftPreview.isProgressMode ? draftPreview.commentaryProgressEnabled : void 0,
@@ -736,13 +731,6 @@ function queueInitialDiscordAckReaction(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.process-reactions.ts
-function readToolStringArg(args, key) {
-	const value = args[key];
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-function readToolBooleanArg(args, key) {
-	return args[key] === true;
-}
 function createDiscordMessageReactionRuntime(params) {
 	const { ctx } = params;
 	const { cfg, accountId, token, ackReactionScope, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, canDetectMention, effectiveWasMentioned, shouldBypassMention, route } = ctx;
@@ -784,10 +772,10 @@ function createDiscordMessageReactionRuntime(params) {
 	});
 	let statusReactionTarget = `${messageChannelId}/${message.id}`;
 	let statusReactionsActive = statusReactionsEnabled;
-	let statusReactions = createStatusReactionController({
-		enabled: statusReactionsEnabled,
-		adapter: discordAdapter,
-		initialEmoji: ackReaction,
+	const createController = (enabled, adapter, initialEmoji) => createStatusReactionController({
+		enabled,
+		adapter,
+		initialEmoji,
 		presentation: "acknowledgement",
 		onError: (err) => {
 			logAckFailure({
@@ -798,8 +786,9 @@ function createDiscordMessageReactionRuntime(params) {
 			});
 		}
 	});
+	let statusReactions = createController(statusReactionsEnabled, discordAdapter, ackReaction);
 	const resolveTrackedReactionChannelId = async (args) => {
-		const target = readToolStringArg(args, "channelId") ?? readToolStringArg(args, "channel_id") ?? readToolStringArg(args, "to");
+		const target = normalizeOptionalString(args.channelId) ?? normalizeOptionalString(args.channel_id) ?? normalizeOptionalString(args.to);
 		if (!target) return messageChannelId;
 		try {
 			return resolveDiscordChannelId(target);
@@ -814,11 +803,11 @@ function createDiscordMessageReactionRuntime(params) {
 	const maybeBindToToolReaction = async (payload) => {
 		if (params.sourceRepliesAreToolOnly || cfg.messages?.statusReactions?.enabled === false || payload.phase !== "start" || payload.name !== "message" || !payload.args) return;
 		const args = payload.args;
-		if (readToolStringArg(args, "action")?.toLowerCase() !== "react") return;
-		if (!(readToolBooleanArg(args, "trackToolCalls") || readToolBooleanArg(args, "track_tool_calls"))) return;
-		const emoji = readToolStringArg(args, "emoji");
-		if (!emoji || readToolBooleanArg(args, "remove")) return;
-		const trackedMessageId = readToolStringArg(args, "messageId") ?? readToolStringArg(args, "message_id") ?? message.id;
+		if (normalizeOptionalString(args.action)?.toLowerCase() !== "react") return;
+		if (!(args.trackToolCalls === true || args.track_tool_calls === true)) return;
+		const emoji = normalizeOptionalString(args.emoji);
+		if (!emoji || args.remove === true) return;
+		const trackedMessageId = normalizeOptionalString(args.messageId) ?? normalizeOptionalString(args.message_id) ?? message.id;
 		let trackedChannelId;
 		try {
 			trackedChannelId = await resolveTrackedReactionChannelId(args);
@@ -826,31 +815,18 @@ function createDiscordMessageReactionRuntime(params) {
 			logAckFailure({
 				log: logVerbose,
 				channel: "discord",
-				target: `${readToolStringArg(args, "to") ?? readToolStringArg(args, "channelId") ?? messageChannelId}/${trackedMessageId}`,
+				target: `${normalizeOptionalString(args.to) ?? normalizeOptionalString(args.channelId) ?? messageChannelId}/${trackedMessageId}`,
 				error: err
 			});
 			return;
 		}
 		statusReactionTarget = `${trackedChannelId}/${trackedMessageId}`;
 		if (statusReactionsActive) statusReactions.clear();
-		statusReactions = createStatusReactionController({
-			enabled: true,
-			adapter: createDiscordAckReactionAdapter({
-				channelId: trackedChannelId,
-				messageId: trackedMessageId,
-				reactionContext: ackReactionContext
-			}),
-			initialEmoji: emoji,
-			presentation: "acknowledgement",
-			onError: (err) => {
-				logAckFailure({
-					log: logVerbose,
-					channel: "discord",
-					target: statusReactionTarget,
-					error: err
-				});
-			}
-		});
+		statusReactions = createController(true, createDiscordAckReactionAdapter({
+			channelId: trackedChannelId,
+			messageId: trackedMessageId,
+			reactionContext: ackReactionContext
+		}), emoji);
 		statusReactionsActive = true;
 		statusReactions.setQueued();
 	};
@@ -858,7 +834,6 @@ function createDiscordMessageReactionRuntime(params) {
 	const queueInitialAckReactionAfterRecord = () => {
 		if (initialAckReactionQueued) return;
 		initialAckReactionQueued = true;
-		if (statusReactionsEnabled) statusReactionsActive = true;
 		queueInitialDiscordAckReaction({
 			enabled: statusReactionsEnabled,
 			shouldSendAckReaction,
@@ -936,12 +911,13 @@ function createDiscordDraftStream(params) {
 			if (trimmed.length < minInitialChars) return false;
 		}
 		try {
+			const body = {
+				content: trimmed,
+				allowed_mentions: DISCORD_PREVIEW_ALLOWED_MENTIONS,
+				...flags ? { flags } : {}
+			};
 			if (streamMessage !== void 0) {
-				await editChannelMessage(rest, streamMessage.channelId, streamMessage.messageId, { body: {
-					content: trimmed,
-					allowed_mentions: DISCORD_PREVIEW_ALLOWED_MENTIONS,
-					...flags ? { flags } : {}
-				} });
+				await editChannelMessage(rest, streamMessage.channelId, streamMessage.messageId, { body });
 				if (generation === streamGeneration) lastSentText = trimmed;
 				return true;
 			}
@@ -952,9 +928,7 @@ function createDiscordDraftStream(params) {
 			} : void 0;
 			activeCreateGeneration = generation;
 			const sentMessageId = (await createChannelMessage(rest, targetChannelId, { body: {
-				content: trimmed,
-				allowed_mentions: DISCORD_PREVIEW_ALLOWED_MENTIONS,
-				...flags ? { flags } : {},
+				...body,
 				...messageReference ? { message_reference: messageReference } : {}
 			} }))?.id;
 			const shouldDiscardStaleCreate = activeCreateGeneration === generation && discardActiveCreate;
@@ -1405,13 +1379,13 @@ function createDiscordMessageReplyRuntime(params) {
 	const { ctx, processContext } = params;
 	const { cfg, discordConfig, accountId, token, guildHistories, historyLimit, textLimit, messageChannelId, isDirectMessage, route } = ctx;
 	const { ctxPayload, deliverTarget, replyReference } = processContext;
-	const typingChannelId = deliverTarget.startsWith("channel:") ? deliverTarget.slice(8) : messageChannelId;
+	const deliverChannelId = deliverTarget.startsWith("channel:") ? deliverTarget.slice(8) : messageChannelId;
 	let typingFeedback;
 	const getTypingFeedback = () => typingFeedback ??= createDiscordReplyTypingFeedback({
 		cfg,
 		token,
 		accountId,
-		channelId: typingChannelId,
+		channelId: deliverChannelId,
 		rest: params.feedbackRest,
 		log: logVerbose,
 		keepaliveIntervalMs: params.shouldDisableCoreTypingKeepalive ? void 0 : 0
@@ -1475,7 +1449,6 @@ function createDiscordMessageReplyRuntime(params) {
 			return;
 		}
 	};
-	const deliverChannelId = deliverTarget.startsWith("channel:") ? deliverTarget.slice(8) : messageChannelId;
 	return {
 		replyPipeline,
 		onModelSelected,
@@ -1548,15 +1521,22 @@ function isFallbackOnlyToolWarningFinal(payload) {
 }
 async function processDiscordMessage(ctx, observer) {
 	const dispatchStartedAt = Date.now();
-	const { cfg, accountId, token, runtime, textLimit, replyToMode, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, threadBindings, route, abortSignal, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
-	if (abortSignal?.aborted) return;
+	const { cfg, accountId, token, runtime, textLimit, replyToMode, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, threadBindings, route, abortSignal, isPolicyCurrent, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
+	if (abortSignal?.aborted || isPolicyCurrent?.() === false) return;
 	const text = messageText;
 	if (!text && mediaList.length === 0) {
 		logVerbose("discord: drop message " + message.id + " (empty content)");
 		return;
 	}
 	const boundThreadId = ctx.threadBinding?.conversation?.conversationId?.trim();
-	if (boundThreadId && typeof threadBindings.touchThread === "function") threadBindings.touchThread({ threadId: boundThreadId });
+	if (boundThreadId && typeof threadBindings.touchThread === "function") {
+		try {
+			await threadBindings.touchThread({ threadId: boundThreadId });
+		} catch (error) {
+			runtime.error(danger(`discord: failed to refresh thread binding activity (${boundThreadId}): ${String(error)}`));
+		}
+		if (abortSignal?.aborted || isPolicyCurrent?.() === false) return;
+	}
 	const sourceReplyDeliveryMode = resolveChannelMessageSourceReplyDeliveryMode({
 		cfg,
 		ctx: {
@@ -1669,7 +1649,6 @@ async function processDiscordMessage(ctx, observer) {
 			token,
 			accountId,
 			rest: reactions.deliveryRest,
-			runtime,
 			replyToMode,
 			textLimit,
 			maxLinesPerMessage,
@@ -1817,7 +1796,7 @@ async function processDiscordMessage(ctx, observer) {
 		}
 	};
 	try {
-		if (abortSignal?.aborted) {
+		if (abortSignal?.aborted || isPolicyCurrent?.() === false) {
 			dispatchAborted = true;
 			return;
 		}
@@ -1921,4 +1900,4 @@ async function processDiscordMessage(ctx, observer) {
 	}
 }
 //#endregion
-export { formatDiscordReplySkip, processDiscordMessage };
+export { processDiscordMessage };

package/dist/.setup/{outbound-adapter-ClIgmu4F.mjs → outbound-adapter-BobT-kse.mjs}

@@ -1,6 +1,6 @@
-import { t as createDiscordActionGate } from "./accounts-CwJQoLjM.mjs";
-import { c as createDiscordSendReceiptFromResults, i as hasDiscordMessageCreateAmbiguity, o as chunkDiscordTextWithMode, p as resolveDiscordReplyReference, s as createDiscordSendReceipt, t as canFallbackDiscordWebhookSend, u as toDiscordOutboundDeliveryResult, v as normalizeDiscordOutboundTarget } from "./retry-BEYkDy0P.mjs";
-import { a as resolveDiscordComponentSpec, b as discordInboundEventDelivery, c as formatDiscordApprovalDisplayValue, n as DISCORD_PRESENTATION_CAPABILITIES, o as sendDiscordComponentMessageLazy, r as buildDiscordPresentationPayload, x as notifyDiscordInboundEventOutboundPayloadSuccess } from "./outbound-session-route-VulUE0yV.mjs";
+import { t as createDiscordActionGate } from "./accounts-ChaMcixG.mjs";
+import { b as parseDiscordTarget, c as createDiscordSendReceipt, d as toDiscordOutboundDeliveryResult, i as hasDiscordMessageCreateAmbiguity, l as createDiscordSendReceiptFromResults, m as resolveDiscordReplyReference, o as chunkDiscordTextWithMode, t as canFallbackDiscordWebhookSend, v as normalizeDiscordMessagingTarget, y as normalizeDiscordOutboundTarget } from "./retry-pz_cSha2.mjs";
+import { a as resolveDiscordComponentSpec, b as discordInboundEventDelivery, c as formatDiscordApprovalDisplayValue, g as resolveDiscordCurrentConversationIdentity, n as DISCORD_PRESENTATION_CAPABILITIES, o as sendDiscordComponentMessageLazy, r as buildDiscordPresentationPayload, x as notifyDiscordInboundEventOutboundPayloadSuccess } from "./outbound-session-route-zVGxxceg.mjs";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { getReplyPayloadTtsSupplement, resolvePayloadMediaUrls, sendPayloadMediaSequenceOrFallback, sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
@@ -10,6 +10,98 @@ import { createReplyToFanout, resolveOutboundSendDep } from "openclaw/plugin-sdk
 import { attachChannelToResult, createAttachedChannelResultAdapter } from "openclaw/plugin-sdk/channel-send-result";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
+//#region extensions/discord/src/channel.conversation.ts
+function resolveDiscordAttachedOutboundTarget(params) {
+	if (params.threadId == null) return params.to;
+	const threadId = normalizeOptionalStringifiedId(params.threadId) ?? "";
+	return threadId ? `channel:${threadId}` : params.to;
+}
+function buildDiscordCrossContextPresentation(params) {
+	return {
+		tone: "neutral",
+		blocks: [...params.message.trim() ? [{
+			type: "text",
+			text: params.message
+		}, { type: "divider" }] : [], {
+			type: "context",
+			text: `From ${params.originLabel}`
+		}]
+	};
+}
+function normalizeDiscordAcpConversationId(conversationId) {
+	const normalized = conversationId.trim();
+	return normalized ? { conversationId: normalized } : null;
+}
+function matchDiscordAcpConversation(params) {
+	if (params.bindingConversationId === params.conversationId) return {
+		conversationId: params.conversationId,
+		matchPriority: 2
+	};
+	if (params.parentConversationId && params.parentConversationId !== params.conversationId && params.bindingConversationId === params.parentConversationId) return {
+		conversationId: params.parentConversationId,
+		matchPriority: 1
+	};
+	return null;
+}
+function resolveDiscordConversationIdFromTargets(targets) {
+	for (const raw of targets) {
+		const trimmed = raw?.trim();
+		if (!trimmed) continue;
+		try {
+			const target = parseDiscordTarget(trimmed, { defaultKind: "channel" });
+			if (target?.normalized) return target.normalized;
+		} catch {}
+	}
+}
+function parseDiscordParentChannelFromSessionKey(raw) {
+	const sessionKey = normalizeLowercaseStringOrEmpty(raw);
+	if (!sessionKey) return;
+	const match = sessionKey.match(/(?:^|:)channel:([^:]+)$/);
+	return match?.[1] ? `channel:${match[1]}` : void 0;
+}
+function resolveDiscordCommandConversation(params) {
+	const threadConversation = resolveDiscordThreadConversationRef(params);
+	if (threadConversation) return threadConversation;
+	const conversationId = resolveDiscordCurrentConversationIdentity({
+		from: params.from,
+		chatType: params.chatType,
+		originatingTo: params.originatingTo,
+		commandTo: params.commandTo,
+		fallbackTo: params.fallbackTo
+	});
+	return conversationId ? { conversationId } : null;
+}
+function resolveDiscordThreadConversationRef(params) {
+	const threadId = normalizeOptionalStringifiedId(params.threadId);
+	if (!threadId) return null;
+	const targets = [
+		params.originatingTo ?? params.to,
+		params.commandTo,
+		params.fallbackTo ?? params.conversationId
+	];
+	const parentConversationId = normalizeDiscordMessagingTarget(normalizeOptionalStringifiedId(params.threadParentId) ?? "") || parseDiscordParentChannelFromSessionKey(params.parentSessionKey) || resolveDiscordConversationIdFromTargets(targets);
+	return {
+		conversationId: threadId,
+		...parentConversationId && parentConversationId !== threadId ? { parentConversationId } : {}
+	};
+}
+function resolveDiscordInboundConversation(params) {
+	const threadConversation = resolveDiscordThreadConversationRef({
+		to: params.to,
+		conversationId: params.conversationId,
+		threadId: params.threadId,
+		threadParentId: params.threadParentId
+	});
+	if (threadConversation) return threadConversation;
+	const conversationId = resolveDiscordCurrentConversationIdentity({
+		from: params.from,
+		chatType: params.isGroup ? "group" : "direct",
+		originatingTo: params.to,
+		fallbackTo: params.conversationId
+	});
+	return conversationId ? { conversationId } : null;
+}
+//#endregion
 //#region extensions/discord/src/media-detection.ts
 const DISCORD_VIDEO_MEDIA_EXTENSIONS = /* @__PURE__ */ new Set([
 	".avi",
@@ -59,13 +151,7 @@ function normalizeDiscordApprovalPayload(payload) {
 }
 //#endregion
 //#region extensions/discord/src/outbound-send-context.ts
-const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-CIBzvXjS.mjs").then((n) => n.t));
-function resolveDiscordOutboundTarget(params) {
-	if (params.threadId == null) return params.to;
-	const threadId = normalizeOptionalStringifiedId(params.threadId) ?? "";
-	if (!threadId) return params.to;
-	return `channel:${threadId}`;
-}
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-CrfEI6Bs.mjs").then((n) => n.t));
 function resolveDiscordFormattingOptions(ctx) {
 	const formatting = ctx.formatting;
 	return {
@@ -79,7 +165,7 @@ async function createDiscordPayloadSendContext(ctx) {
 	const runtime = await loadDiscordSendRuntime();
 	const nextReplyToId = createReplyToFanout(ctx);
 	return {
-		target: resolveDiscordOutboundTarget({
+		target: resolveDiscordAttachedOutboundTarget({
 			to: ctx.to,
 			threadId: ctx.threadId
 		}),
@@ -280,8 +366,8 @@ async function sendDiscordOutboundPayload(params) {
 const DISCORD_TEXT_CHUNK_LIMIT = 2e3;
 const DISCORD_PRECHUNK_MAX_LINES = Number.MAX_SAFE_INTEGER;
 const log = createSubsystemLogger("discord/outbound");
-const loadDiscordThreadBindings = createLazyRuntimeModule(() => import("./thread-bindings-CEh2dhqP.mjs").then((n) => n.t));
-const loadDiscordComponentSendRuntime = createLazyRuntimeModule(() => import("./send.components-ChY21qr-.mjs").then((n) => n.i));
+const loadDiscordThreadBindings = createLazyRuntimeModule(() => import("./thread-bindings-D7TfgjR_.mjs").then((n) => n.i));
+const loadDiscordComponentSendRuntime = createLazyRuntimeModule(() => import("./send.components-DxQAMfES.mjs").then((n) => n.i));
 function resolveDiscordDeliveryOptions(params) {
 	return {
 		onPlatformSendDispatch: params.onPlatformSendDispatch,
@@ -323,7 +409,7 @@ async function resolveDiscordOutboundMessageSend(params) {
 	});
 	return {
 		send,
-		target: resolveDiscordOutboundTarget({
+		target: resolveDiscordAttachedOutboundTarget({
 			to: params.to,
 			threadId: params.threadId
 		}),
@@ -427,7 +513,7 @@ const discordOutbound = {
 				cfg,
 				accountId
 			})("polls")) throw new Error("Discord polls are disabled.");
-			const outboundTo = resolveDiscordOutboundTarget({
+			const outboundTo = resolveDiscordAttachedOutboundTarget({
 				to,
 				threadId
 			});
@@ -456,7 +542,7 @@ const discordOutbound = {
 	afterDeliverPayload: async ({ cfg, target, payload, results }) => {
 		notifyDiscordInboundEventOutboundPayloadSuccess({
 			payload,
-			to: resolveDiscordOutboundTarget({
+			to: resolveDiscordAttachedOutboundTarget({
 				to: target.to,
 				threadId: target.threadId
 			}),
@@ -466,7 +552,7 @@ const discordOutbound = {
 		const result = results.find((candidate) => candidate.channel === "discord" && candidate.messageId);
 		const componentSpec = questionId ? await resolveDiscordComponentSpec(payload) : void 0;
 		if (questionId && result && componentSpec) {
-			const to = resolveDiscordOutboundTarget({
+			const to = resolveDiscordAttachedOutboundTarget({
 				to: target.to,
 				threadId: target.threadId
 			});
@@ -495,8 +581,8 @@ const discordOutbound = {
 		const { getThreadBindingManager } = await loadDiscordThreadBindings();
 		const manager = getThreadBindingManager(target.accountId ?? void 0);
 		if (!manager?.getByThreadId(threadId)) return;
-		manager.touchThread({ threadId });
+		await manager.touchThread({ threadId });
 	}
 };
 //#endregion
-export { discordOutbound as n, DISCORD_TEXT_CHUNK_LIMIT as t };
+export { normalizeDiscordAcpConversationId as a, resolveDiscordInboundConversation as c, matchDiscordAcpConversation as i, discordOutbound as n, resolveDiscordAttachedOutboundTarget as o, buildDiscordCrossContextPresentation as r, resolveDiscordCommandConversation as s, DISCORD_TEXT_CHUNK_LIMIT as t };