@openclaw/discord 2026.5.28 → 2026.5.31-beta.1

package/dist/{manager.runtime-ClhnLsZf.js → manager.runtime-BWBENHRA.js}

@@ -1,12 +1,13 @@
-import { Ht as parseDiscordTarget, _ as VoiceStateUpdateListener, c as discord_exports, h as ResumedListener, jt as getGuildVoiceState, m as ReadyListener } from "./send.receipt-3y2lVFRf.js";
-import { c as resolveDiscordAccountAllowFrom } from "./accounts-dXTfmnSZ.js";
+import { Ht as parseDiscordTarget, _ as VoiceStateUpdateListener, c as discord_exports, h as ResumedListener, jt as getGuildVoiceState, m as ReadyListener } from "./send.receipt-CjsWpitW.js";
+import { c as resolveDiscordAccountAllowFrom } from "./accounts-P19jm1lf.js";
 import { a as normalizeDiscordSlug, b as formatDiscordUserTag, m as resolveDiscordOwnerAccess } from "./allow-list-BnkWtVpA.js";
-import { i as formatMention } from "./send.outbound-DZHJYmNF.js";
+import { o as formatMention } from "./send.outbound-DSKZbjML.js";
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import { f as buildDiscordGroupSystemPrompt, o as authorizeDiscordVoiceIngress, u as resolveDiscordVoiceEnabled } from "./provider-DCcqVFp-.js";
+import { f as buildDiscordGroupSystemPrompt, o as authorizeDiscordVoiceIngress, u as resolveDiscordVoiceEnabled } from "./provider-BK8hjk_y.js";
 import { createRequire } from "node:module";
 import { asBoolean, normalizeOptionalString, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveAgentRoute } from "openclaw/plugin-sdk/routing";
+import { asDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
 import { resolveFfmpegBin } from "openclaw/plugin-sdk/media-runtime";
 import { createSubsystemLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
@@ -1425,17 +1426,21 @@ var DiscordRealtimeVoiceSession = class {
 			logger$2.warn(`discord voice: realtime wake-name follow-up has no speaker context voiceSession=${this.params.entry.voiceSessionKey} agent=${this.params.entry.route.agentId}`);
 			return;
 		}
+		const expiresAt = resolveExpiresAtMsFromDurationMs(DISCORD_REALTIME_WAKE_NAME_FOLLOWUP_TTL_MS);
+		if (expiresAt === void 0) return;
 		this.pendingWakeNameFollowup = {
 			context,
 			startedAt: turn?.startedAt ?? Date.now(),
-			expiresAt: Date.now() + DISCORD_REALTIME_WAKE_NAME_FOLLOWUP_TTL_MS
+			expiresAt
 		};
 		logger$2.info(`discord voice: realtime wake-name follow-up armed speaker=${context.speakerLabel} voiceSession=${this.params.entry.voiceSessionKey} agent=${this.params.entry.route.agentId}`);
 	}
 	consumePendingWakeNameFollowup() {
 		const pending = this.pendingWakeNameFollowup;
 		this.pendingWakeNameFollowup = void 0;
-		if (!pending || Date.now() > pending.expiresAt) return;
+		const now = asDateTimestampMs(Date.now());
+		const expiresAt = pending ? asDateTimestampMs(pending.expiresAt) : void 0;
+		if (!pending || now === void 0 || expiresAt === void 0 || now > expiresAt) return;
 		const currentTurn = this.peekPendingSpeakerTurn();
 		if (currentTurn && currentTurn.context.userId !== pending.context.userId) return;
 		if (currentTurn) this.consumePendingSpeakerContext();
@@ -1949,7 +1954,9 @@ var DiscordVoiceSpeakerContextResolver = class {
 		const key = this.resolveCacheKey(guildId, userId);
 		const cached = this.cache.get(key);
 		if (!cached) return;
-		if (cached.expiresAt <= Date.now()) {
+		const now = asDateTimestampMs(Date.now());
+		const expiresAt = asDateTimestampMs(cached.expiresAt);
+		if (now === void 0 || expiresAt === void 0 || expiresAt <= now) {
 			this.cache.delete(key);
 			return;
 		}
@@ -1963,9 +1970,10 @@ var DiscordVoiceSpeakerContextResolver = class {
 	}
 	setCachedContext(guildId, userId, context) {
 		const key = this.resolveCacheKey(guildId, userId);
-		this.cache.set(key, {
+		const expiresAt = resolveExpiresAtMsFromDurationMs(SPEAKER_CONTEXT_CACHE_TTL_MS);
+		if (expiresAt !== void 0) this.cache.set(key, {
 			...context,
-			expiresAt: Date.now() + SPEAKER_CONTEXT_CACHE_TTL_MS
+			expiresAt
 		});
 	}
 };
@@ -2394,11 +2402,6 @@ var DiscordVoiceManager$1 = class {
 		logger.info(`discord voice: joining guild=${guildId} channel=${channelId} mode=${voiceMode} agent=${route.agentId} voiceSession=${voiceRoute.sessionKey} supervisorSession=${route.sessionKey} agentSessionMode=${agentSessionMode}${agentSessionTarget ? ` agentSessionTarget=${agentSessionTarget}` : ""} voiceModel=${voiceConfig?.model ?? "route-default"} realtimeProvider=${voiceConfig?.realtime?.provider ?? "auto"} realtimeModel=${voiceConfig?.realtime?.model ?? "provider-default"} realtimeVoice=${voiceConfig?.realtime?.voice ?? "provider-default"}`);
 		const player = voiceSdk.createAudioPlayer();
 		connection.subscribe(player);
-		let speakingHandler;
-		let speakingEndHandler;
-		let disconnectedHandler;
-		let destroyedHandler;
-		let playerErrorHandler;
 		let stopped = false;
 		const clearSessionIfCurrent = () => {
 			if (this.sessions.get(guildId)?.connection === connection) this.sessions.delete(guildId);
@@ -2474,15 +2477,15 @@ var DiscordVoiceManager$1 = class {
 				channelId
 			};
 		}
-		speakingHandler = (userId) => {
+		const speakingHandler = (userId) => {
 			this.handleSpeakingStart(entry, userId).catch((err) => {
 				logger.warn(`discord voice: capture failed: ${formatErrorMessage(err)}`);
 			});
 		};
-		speakingEndHandler = (userId) => {
+		const speakingEndHandler = (userId) => {
 			this.scheduleCaptureFinalize(entry, userId, "speaker end");
 		};
-		disconnectedHandler = async () => {
+		const disconnectedHandler = async () => {
 			try {
 				logVoiceVerbose(`disconnected: attempting recovery guild ${guildId} channel ${channelId} grace=${reconnectGraceMs}ms`);
 				await Promise.race([voiceSdk.entersState(connection, voiceSdk.VoiceConnectionStatus.Signalling, reconnectGraceMs), voiceSdk.entersState(connection, voiceSdk.VoiceConnectionStatus.Connecting, reconnectGraceMs)]);
@@ -2496,14 +2499,14 @@ var DiscordVoiceManager$1 = class {
 				});
 			}
 		};
-		destroyedHandler = () => {
+		const destroyedHandler = () => {
 			clearSessionIfCurrent();
 			stopEntry(entry, {
 				destroyConnection: false,
 				reason: `destroyed guild ${guildId} channel ${channelId}`
 			});
 		};
-		playerErrorHandler = (err) => {
+		const playerErrorHandler = (err) => {
 			logger.warn(`discord voice: playback error: ${formatErrorMessage(err)}`);
 		};
 		this.enableDaveReceivePassthrough(entry, "post-join warmup", 30);

package/dist/{message-handler-BnhAHqem.js → message-handler-HO8BbZmQ.js}

@@ -1,14 +1,15 @@
-import { I as createDiscordRestClient } from "./send.shared-Ddl21-Gt.js";
-import { d as resolveDiscordChannelNameSafe, l as resolveDiscordChannelIdSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-5QgEd_dW.js";
-import { a as mergeAbortSignals } from "./timeouts-l_PsHQvX.js";
-import { c as hasDiscordMessageStickers, d as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-CmB03FoF.js";
-import { t as sendTyping } from "./typing-B7bCMPJJ.js";
+import { I as createDiscordRestClient } from "./send.shared-Cluujl6W.js";
+import { d as resolveDiscordChannelNameSafe, l as resolveDiscordChannelIdSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjLUwwSP.js";
+import { a as mergeAbortSignals } from "./timeouts-CEJ3--Uw.js";
+import { c as hasDiscordMessageStickers, d as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-D_3KTxh_.js";
+import { t as sendTyping } from "./typing-CKW0i8du.js";
 import { danger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
-import { createChannelRunQueue } from "openclaw/plugin-sdk/channel-outbound";
+import { createChannelRunQueue, createTypingCallbacks, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-outbound";
 import { resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
 import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
 import { createChannelInboundDebouncer, shouldDebounceTextInbound } from "openclaw/plugin-sdk/channel-inbound";
 import { createClaimableDedupe } from "openclaw/plugin-sdk/persistent-dedupe";
+import { logTypingFailure } from "openclaw/plugin-sdk/channel-feedback";
 //#region extensions/discord/src/monitor/inbound-dedupe.ts
 const RECENT_DISCORD_MESSAGE_TTL_MS = 5 * 6e4;
 const RECENT_DISCORD_MESSAGE_MAX = 5e3;
@@ -59,7 +60,7 @@ function resolveDiscordInboundJobQueueKey(ctx) {
 	return ctx.messageChannelId;
 }
 function buildDiscordInboundJob(ctx, options) {
-	const { runtime, abortSignal, guildHistories, client, threadBindings, discordRestFetch, message, data, threadChannel, ...payload } = ctx;
+	const { runtime, abortSignal, guildHistories, client, threadBindings, replyTypingFeedback, discordRestFetch, message, data, threadChannel, ...payload } = ctx;
 	const sanitizedMessage = sanitizeDiscordInboundMessage(message);
 	return {
 		queueKey: resolveDiscordInboundJobQueueKey(ctx),
@@ -78,6 +79,7 @@ function buildDiscordInboundJob(ctx, options) {
 			guildHistories,
 			client,
 			threadBindings,
+			replyTypingFeedback,
 			discordRestFetch
 		},
 		replayKeys: options?.replayKeys ? [...options.replayKeys] : void 0
@@ -118,10 +120,65 @@ function applyImplicitReplyBatchGate(ctx, replyToMode, isBatched) {
 	ctx.ReplyThreading = replyThreading;
 }
 //#endregion
+//#region extensions/discord/src/monitor/message-handler.reply-typing-policy.ts
+function resolveDiscordSourceReplyDeliveryMode(ctx) {
+	return resolveChannelMessageSourceReplyDeliveryMode({
+		cfg: ctx.cfg,
+		ctx: {
+			ChatType: ctx.isDirectMessage ? "direct" : ctx.isGroupDm ? "group" : ctx.isGuildMessage ? "channel" : void 0,
+			InboundEventKind: ctx.inboundEventKind
+		}
+	});
+}
+function resolveDiscordAcceptedTypingPrestart(ctx) {
+	const sourceReplyDeliveryMode = resolveDiscordSourceReplyDeliveryMode(ctx);
+	if (ctx.abortSignal?.aborted) return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: false,
+		reason: "aborted"
+	};
+	if (!ctx.messageText.trim()) return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: false,
+		reason: "empty"
+	};
+	if (ctx.inboundEventKind === "room_event") return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: false,
+		reason: "room-event"
+	};
+	const configuredTypingMode = ctx.cfg.session?.typingMode ?? ctx.cfg.agents?.defaults?.typingMode;
+	if (configuredTypingMode !== void 0) return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: configuredTypingMode === "instant",
+		reason: configuredTypingMode === "instant" ? "configured-instant" : "configured-not-instant"
+	};
+	if (sourceReplyDeliveryMode === "message_tool_only") return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: true,
+		reason: "tool-only"
+	};
+	if (!ctx.isGuildMessage && !ctx.isGroupDm) return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: true,
+		reason: "direct"
+	};
+	if (ctx.effectiveWasMentioned) return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: true,
+		reason: "mentioned-group"
+	};
+	return {
+		sourceReplyDeliveryMode,
+		shouldPrestart: false,
+		reason: "defer-to-message"
+	};
+}
+//#endregion
 //#region extensions/discord/src/monitor/message-run-queue.ts
 let messageProcessRuntimePromise;
 async function loadMessageProcessRuntime() {
-	messageProcessRuntimePromise ??= import("./message-handler.process-B1ODKav3.js");
+	messageProcessRuntimePromise ??= import("./message-handler.process-Cq3j7A9k.js");
 	return await messageProcessRuntimePromise;
 }
 async function processDiscordQueuedMessage(params) {
@@ -146,8 +203,20 @@ async function processDiscordQueuedMessage(params) {
 		throw error;
 	}
 }
+function cleanupSkippedDiscordQueuedMessage(params) {
+	try {
+		params.job.runtime.replyTypingFeedback?.onCleanup?.();
+	} finally {
+		releaseDiscordInboundReplay({
+			replayKeys: params.job.replayKeys,
+			error: new DiscordRetryableInboundError("discord queued run skipped before processing"),
+			replayGuard: params.replayGuard
+		});
+	}
+}
 function createDiscordMessageRunQueue(params) {
 	const replayGuard = params.replayGuard ?? createDiscordInboundReplayGuard();
+	const skippedCleanup = /* @__PURE__ */ new Set();
 	const runQueue = createChannelRunQueue({
 		setStatus: params.setStatus,
 		abortSignal: params.abortSignal,
@@ -155,9 +224,31 @@ function createDiscordMessageRunQueue(params) {
 			params.runtime.error(danger(`discord message run failed: ${String(error)}`));
 		}
 	});
+	let lifecycleActive = !params.abortSignal?.aborted;
+	const cleanupSkippedQueuedMessages = () => {
+		if (!lifecycleActive && skippedCleanup.size === 0) return;
+		lifecycleActive = false;
+		const cleanups = [...skippedCleanup];
+		skippedCleanup.clear();
+		for (const cleanup of cleanups) cleanup();
+	};
+	if (params.abortSignal?.aborted) cleanupSkippedQueuedMessages();
+	else params.abortSignal?.addEventListener("abort", cleanupSkippedQueuedMessages, { once: true });
 	return {
 		enqueue(job) {
+			const cleanupSkipped = () => {
+				cleanupSkippedDiscordQueuedMessage({
+					job,
+					replayGuard
+				});
+			};
+			if (!lifecycleActive) {
+				cleanupSkipped();
+				return;
+			}
+			skippedCleanup.add(cleanupSkipped);
 			runQueue.enqueue(job.queueKey, async ({ lifecycleSignal }) => {
+				skippedCleanup.delete(cleanupSkipped);
 				await processDiscordQueuedMessage({
 					job,
 					lifecycleSignal,
@@ -166,39 +257,88 @@ function createDiscordMessageRunQueue(params) {
 				});
 			});
 		},
-		deactivate: runQueue.deactivate
+		deactivate() {
+			runQueue.deactivate();
+			cleanupSkippedQueuedMessages();
+		}
+	};
+}
+function createDiscordReplyTypingFeedback(params) {
+	let channelId = params.channelId;
+	const rest = params.rest ?? createDiscordRestClient({
+		cfg: params.cfg,
+		token: params.token,
+		accountId: params.accountId
+	}).rest;
+	const createCallbacks = () => createTypingCallbacks({
+		start: () => sendTyping({
+			rest,
+			channelId
+		}),
+		onStartError: (err) => {
+			logTypingFailure({
+				log: params.log,
+				channel: "discord",
+				target: channelId,
+				error: err
+			});
+		},
+		maxDurationMs: params.maxDurationMs ?? 12e5
+	});
+	const updateChannelId = (nextChannelId) => {
+		const trimmed = nextChannelId.trim();
+		if (trimmed) channelId = trimmed;
+	};
+	let callbacks = createCallbacks();
+	return {
+		onReplyStart: () => callbacks.onReplyStart(),
+		onIdle: () => callbacks.onIdle?.(),
+		onCleanup: () => callbacks.onCleanup?.(),
+		updateChannelId,
+		restartForDispatch: (nextChannelId) => {
+			updateChannelId(nextChannelId);
+			callbacks.onCleanup?.();
+			callbacks = createCallbacks();
+		},
+		getChannelId: () => channelId
 	};
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.ts
 let messagePreflightRuntimePromise;
 async function loadMessagePreflightRuntime() {
-	messagePreflightRuntimePromise ??= import("./message-handler.preflight-B1RTQ6ZO.js");
+	messagePreflightRuntimePromise ??= import("./message-handler.preflight-DxHBPQvD.js");
 	return await messagePreflightRuntimePromise;
 }
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
-function shouldSendAcceptedDiscordTypingCue(ctx) {
-	if (ctx.abortSignal?.aborted) return false;
-	if (!ctx.isDirectMessage || ctx.isGuildMessage || ctx.isGroupDm) return false;
-	if (!ctx.messageText.trim()) return false;
-	const configuredTypingMode = ctx.cfg.session?.typingMode ?? ctx.cfg.agents?.defaults?.typingMode;
-	return configuredTypingMode === void 0 || configuredTypingMode === "instant";
-}
-function queueAcceptedDiscordTypingCue(ctx) {
-	if (!shouldSendAcceptedDiscordTypingCue(ctx)) return;
-	const { rest } = createDiscordRestClient({
+function startAcceptedTypingFeedback(params) {
+	const { ctx, createFeedback, dedupeKey, activeFeedback } = params;
+	if (!resolveDiscordAcceptedTypingPrestart(ctx).shouldPrestart) return;
+	const channelId = ctx.messageChannelId.trim();
+	if (activeFeedback.get(dedupeKey)) return;
+	const replyTypingFeedback = ctx.replyTypingFeedback ?? (createFeedback ?? createDiscordReplyTypingFeedback)({
 		cfg: ctx.cfg,
 		token: ctx.token,
-		accountId: ctx.accountId
+		accountId: ctx.accountId,
+		channelId: ctx.messageChannelId,
+		log: logVerbose
+	});
+	const cleanup = replyTypingFeedback.onCleanup;
+	replyTypingFeedback.onCleanup = () => {
+		cleanup?.();
+		if (activeFeedback.get(dedupeKey)?.feedback === replyTypingFeedback) activeFeedback.delete(dedupeKey);
+	};
+	activeFeedback.set(dedupeKey, {
+		channelId,
+		feedback: replyTypingFeedback
 	});
-	sendTyping({
-		rest,
-		channelId: ctx.messageChannelId
-	}).catch((err) => {
-		logVerbose(`discord early typing cue failed for channel ${ctx.messageChannelId}: ${String(err)}`);
+	ctx.replyTypingFeedback = replyTypingFeedback;
+	replyTypingFeedback.onReplyStart().catch((err) => {
+		logVerbose(`discord accepted typing feedback failed: ${String(err)}`);
 	});
+	return replyTypingFeedback;
 }
 function createDiscordMessageHandler(params) {
 	const { groupPolicy } = resolveOpenProviderRuntimeGroupPolicy({
@@ -209,6 +349,7 @@ function createDiscordMessageHandler(params) {
 	const ackReactionScope = params.discordConfig?.ackReactionScope ?? params.cfg.messages?.ackReactionScope ?? "group-mentions";
 	const preflightDiscordMessageImpl = params.testing?.preflightDiscordMessage;
 	const replayGuard = createDiscordInboundReplayGuard();
+	const prestartedTypingFeedback = /* @__PURE__ */ new Map();
 	const messageRunQueue = createDiscordMessageRunQueue({
 		runtime: params.runtime,
 		setStatus: params.setStatus,
@@ -269,8 +410,14 @@ function createDiscordMessageHandler(params) {
 						});
 						return;
 					}
+					const queueKey = resolveDiscordInboundJobQueueKey(ctx);
+					startAcceptedTypingFeedback({
+						ctx,
+						createFeedback: params.testing?.createReplyTypingFeedback,
+						dedupeKey: queueKey,
+						activeFeedback: prestartedTypingFeedback
+					});
 					applyImplicitReplyBatchGate(ctx, params.replyToMode, false);
-					queueAcceptedDiscordTypingCue(ctx);
 					messageRunQueue.enqueue(buildDiscordInboundJob(ctx, { replayKeys }));
 					return;
 				}
@@ -322,6 +469,13 @@ function createDiscordMessageHandler(params) {
 					});
 					return;
 				}
+				const queueKey = resolveDiscordInboundJobQueueKey(ctx);
+				startAcceptedTypingFeedback({
+					ctx,
+					createFeedback: params.testing?.createReplyTypingFeedback,
+					dedupeKey: queueKey,
+					activeFeedback: prestartedTypingFeedback
+				});
 				applyImplicitReplyBatchGate(ctx, params.replyToMode, true);
 				if (entries.length > 1) {
 					const ids = entries.map((entry) => entry.data.message?.id).filter(isNonEmptyString);
@@ -332,7 +486,6 @@ function createDiscordMessageHandler(params) {
 						ctxBatch.MessageSidLast = ids[ids.length - 1];
 					}
 				}
-				queueAcceptedDiscordTypingCue(ctx);
 				messageRunQueue.enqueue(buildDiscordInboundJob(ctx, { replayKeys }));
 			} catch (error) {
 				if (error instanceof DiscordRetryableInboundError) releaseDiscordInboundReplay({
@@ -378,4 +531,4 @@ function createDiscordMessageHandler(params) {
 	return handler;
 }
 //#endregion
-export { createDiscordMessageHandler as t };
+export { createDiscordReplyTypingFeedback as n, createDiscordMessageHandler as t };

package/dist/{message-handler.preflight-B1RTQ6ZO.js → message-handler.preflight-DxHBPQvD.js}

@@ -1,12 +1,12 @@
-import { c as discord_exports, k as Message, mt as getChannelMessage } from "./send.receipt-3y2lVFRf.js";
-import { o as resolveDefaultDiscordAccountId } from "./accounts-dXTfmnSZ.js";
+import { c as discord_exports, k as Message, mt as getChannelMessage } from "./send.receipt-CjsWpitW.js";
+import { o as resolveDefaultDiscordAccountId } from "./accounts-P19jm1lf.js";
 import { S as resolveTimestampMs, _ as resolveGroupDmAllow, a as normalizeDiscordSlug, b as formatDiscordUserTag, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordGuildEntry, f as resolveDiscordMemberAccessState, g as resolveDiscordShouldRequireMention, i as normalizeDiscordDisplaySlug, n as isDiscordGroupAllowedByPolicy, x as resolveDiscordSystemLocation } from "./allow-list-BnkWtVpA.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-CsPV1Gjx.js";
-import { l as isRecentlyUnboundThreadWebhookMessage } from "./thread-bindings.state-BsOnj5NX.js";
-import { d as resolveDiscordChannelNameSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-5QgEd_dW.js";
-import "./thread-bindings-BBq-yzq2.js";
-import { D as resolveDiscordTextCommandAccess, E as resolveDiscordDmCommandAccess, _ as resolveDiscordEffectiveRoute, g as resolveDiscordConversationRoute, h as buildDiscordRoutePeer, v as shouldIgnoreStaleDiscordRouteBinding, y as handleDiscordDmCommandDecision } from "./provider-DCcqVFp-.js";
-import { d as resolveDiscordMessageChannelId, l as resolveDiscordMessageStickers, o as resolveMediaList, r as resolveDiscordMessageText, u as resolveDiscordChannelInfo } from "./message-utils-CmB03FoF.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BURFgcfI.js";
+import { l as isRecentlyUnboundThreadWebhookMessage } from "./thread-bindings.state-DYp4FVEB.js";
+import { d as resolveDiscordChannelNameSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjLUwwSP.js";
+import "./thread-bindings-CKruJE91.js";
+import { D as resolveDiscordTextCommandAccess, E as resolveDiscordDmCommandAccess, _ as resolveDiscordEffectiveRoute, g as resolveDiscordConversationRoute, h as buildDiscordRoutePeer, v as shouldIgnoreStaleDiscordRouteBinding, y as handleDiscordDmCommandDecision } from "./provider-BK8hjk_y.js";
+import { d as resolveDiscordMessageChannelId, l as resolveDiscordMessageStickers, o as resolveMediaList, r as resolveDiscordMessageText, u as resolveDiscordChannelInfo } from "./message-utils-D_3KTxh_.js";
 import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-BFp5w0F8.js";
 import { normalizeOptionalString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { getChildLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
@@ -28,9 +28,12 @@ async function loadConversationRuntime$1() {
 	return await conversationRuntimePromise$1;
 }
 async function loadDiscordSendRuntime() {
-	discordSendRuntimePromise ??= import("./send-CBxhnbKU.js").then((n) => n.t);
+	discordSendRuntimePromise ??= import("./send-BHkA8a-k.js").then((n) => n.t);
 	return await discordSendRuntimePromise;
 }
+function resolveDiscordDmPairingSenderId(sender) {
+	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
+}
 async function resolveDiscordDmPreflightAccess(params) {
 	if (params.dmPolicy === "disabled") {
 		logVerbose("discord: drop dm (dmPolicy: disabled)");
@@ -69,9 +72,9 @@ async function resolveDiscordDmPreflightAccess(params) {
 		senderAccess: dmAccess.senderAccess,
 		accountId: params.resolvedAccountId,
 		sender: {
-			id: params.author.id,
-			tag: formatDiscordUserTag(params.author),
-			name: params.author.username ?? void 0
+			id: resolveDiscordDmPairingSenderId(params.sender),
+			tag: params.sender.tag ?? formatDiscordUserTag(params.author),
+			name: params.sender.name ?? params.author.username ?? void 0
 		},
 		onPairingCreated: async (code) => {
 			logVerbose(`discord pairing request sender=${params.author.id} tag=${formatDiscordUserTag(params.author)} reason=${dmAccess.senderAccess.reasonCode}`);
@@ -423,7 +426,7 @@ let preflightAudioRuntimePromise;
 let systemEventsRuntimePromise;
 let discordThreadingRuntimePromise;
 async function loadPluralKitRuntime() {
-	pluralkitRuntimePromise ??= import("./pluralkit-DAZN3ZMK.js").then((n) => n.n);
+	pluralkitRuntimePromise ??= import("./pluralkit-Ds9aZAM4.js").then((n) => n.n);
 	return await pluralkitRuntimePromise;
 }
 async function loadPreflightAudioRuntime() {
@@ -431,11 +434,11 @@ async function loadPreflightAudioRuntime() {
 	return await preflightAudioRuntimePromise;
 }
 async function loadSystemEventsRuntime() {
-	systemEventsRuntimePromise ??= import("./system-events-Cw6Hp8RF.js");
+	systemEventsRuntimePromise ??= import("./system-events-BjuNA9Zs.js");
 	return await systemEventsRuntimePromise;
 }
 async function loadDiscordThreadingRuntime() {
-	discordThreadingRuntimePromise ??= import("./provider-DCcqVFp-.js").then((n) => n.x);
+	discordThreadingRuntimePromise ??= import("./provider-BK8hjk_y.js").then((n) => n.x);
 	return await discordThreadingRuntimePromise;
 }
 function isPreflightAborted(abortSignal) {
@@ -796,7 +799,11 @@ async function preflightDiscordMessage(params) {
 		logVerbose(`discord: drop bound-thread bot system message ${message.id}`);
 		return null;
 	}
-	const mentionRegexes = buildMentionRegexes(params.cfg, effectiveRoute.agentId);
+	const mentionRegexes = buildMentionRegexes(params.cfg, effectiveRoute.agentId, {
+		provider: "discord",
+		conversationId: messageChannelId,
+		providerPolicy: params.discordConfig?.mentionPatterns
+	});
 	const explicitlyMentioned = Boolean(botId && message.mentionedUsers?.some((user) => user.id === botId));
 	const hasAnyMention = !isDirectMessage && ((message.mentionedUsers?.length ?? 0) > 0 || (message.mentionedRoles?.length ?? 0) > 0 || message.mentionedEveryone && (!author.bot || sender.isPluralKit));
 	const hasUserOrRoleMention = !isDirectMessage && ((message.mentionedUsers?.length ?? 0) > 0 || (message.mentionedRoles?.length ?? 0) > 0);
@@ -809,7 +816,7 @@ async function preflightDiscordMessage(params) {
 		guildId: params.data.guild_id ?? void 0,
 		guildEntries: params.guildEntries
 	}) : null;
-	logDebug(`[discord-preflight] guild_id=${params.data.guild_id} guild_obj=${!!params.data.guild} guild_obj_id=${params.data.guild?.id} guildInfo=${!!guildInfo} guildEntries=${params.guildEntries ? Object.keys(params.guildEntries).join(",") : "none"}`);
+	logDebug(`[discord-preflight] guild_id=${params.data.guild_id} guild_obj=${Boolean(params.data.guild)} guild_obj_id=${params.data.guild?.id} guildInfo=${Boolean(guildInfo)} guildEntries=${params.guildEntries ? Object.keys(params.guildEntries).join(",") : "none"}`);
 	if (isGuildMessage && params.guildEntries && Object.keys(params.guildEntries).length > 0 && !guildInfo) {
 		logDebug(`[discord-preflight] guild blocked: guild_id=${params.data.guild_id} guildEntries keys=${Object.keys(params.guildEntries).join(",")}`);
 		logVerbose(`Blocked discord guild ${params.data.guild_id ?? "unknown"} (not in discord.guilds)`);

package/dist/{message-handler.process-B1ODKav3.js → message-handler.process-Cq3j7A9k.js}

@@ -1,17 +1,18 @@
-import { Ut as resolveDiscordChannelId, c as discord_exports, ft as editChannelMessage, s as chunkDiscordTextWithMode, st as createChannelMessage, ut as deleteChannelMessage } from "./send.receipt-3y2lVFRf.js";
-import { f as resolveDiscordMaxLinesPerMessage } from "./accounts-dXTfmnSZ.js";
-import { I as createDiscordRestClient, L as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-Ddl21-Gt.js";
+import { Ut as resolveDiscordChannelId, c as discord_exports, ft as editChannelMessage, s as chunkDiscordTextWithMode, st as createChannelMessage, ut as deleteChannelMessage } from "./send.receipt-CjsWpitW.js";
+import { f as resolveDiscordMaxLinesPerMessage, s as resolveDiscordAccount } from "./accounts-P19jm1lf.js";
+import { I as createDiscordRestClient, L as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-Cluujl6W.js";
 import { S as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-BnkWtVpA.js";
-import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-CBxhnbKU.js";
-import "./targets-BVKF5wbg.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-CsPV1Gjx.js";
+import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-BHkA8a-k.js";
+import { a as discordTextHasTargetedMention, i as discordTextHasBroadcastMention, s as rewriteDiscordKnownMentions } from "./send.outbound-DSKZbjML.js";
+import "./targets-BNDUOdvI.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BURFgcfI.js";
 import { t as beginDiscordInboundEventDeliveryCorrelation } from "./inbound-event-delivery-CEPlt2uz.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-DfY2Dtf3.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-BkPkILpq.js";
 import { t as resolveDiscordPreviewStreamMode } from "./preview-streaming-DXT8oJdo.js";
-import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-l_PsHQvX.js";
-import { S as resolveDiscordAutoThreadReplyPlan, a as resolveReplyContext, i as buildGuildLabel, m as createDiscordSupplementalContextAccessChecker, n as deliverDiscordReply, p as buildDiscordInboundAccessContext, r as buildDirectLabel, w as resolveDiscordThreadStarter } from "./provider-DCcqVFp-.js";
-import { a as resolveForwardedMediaList, o as resolveMediaList, r as resolveDiscordMessageText, s as resolveReferencedReplyMediaList } from "./message-utils-CmB03FoF.js";
-import { t as sendTyping } from "./typing-B7bCMPJJ.js";
+import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-CEJ3--Uw.js";
+import { S as resolveDiscordAutoThreadReplyPlan, a as resolveReplyContext, i as buildGuildLabel, m as createDiscordSupplementalContextAccessChecker, n as deliverDiscordReply, p as buildDiscordInboundAccessContext, r as buildDirectLabel, w as resolveDiscordThreadStarter } from "./provider-BK8hjk_y.js";
+import { a as resolveForwardedMediaList, o as resolveMediaList, r as resolveDiscordMessageText, s as resolveReferencedReplyMediaList } from "./message-utils-D_3KTxh_.js";
+import { n as createDiscordReplyTypingFeedback } from "./message-handler-HO8BbZmQ.js";
 import { buildAgentSessionKey, normalizeAccountId, resolveAccountEntry, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { MessageFlags } from "discord-api-types/v10";
 import path from "node:path";
@@ -30,7 +31,7 @@ import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { loadSessionStore, readLatestAssistantTextFromSessionTranscript, readSessionUpdatedAt, resolveAndPersistSessionFile, resolveSessionStoreEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { buildChannelInboundEventContext, dispatchChannelInboundReply, formatInboundEnvelope, hasFinalInboundReplyDispatch, recordChannelBotPairLoopAndCheckSuppression, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
-import { DEFAULT_TIMING, createStatusReactionController, logAckFailure, logTypingFailure, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
+import { DEFAULT_TIMING, createStatusReactionController, logAckFailure, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 //#region extensions/discord/src/monitor/ack-reactions.ts
@@ -286,6 +287,7 @@ async function buildDiscordMessageProcessContext(params) {
 			id: messageChannelId,
 			label: fromLabel,
 			spaceId: isGuildMessage ? (guildInfo?.id ?? guildSlug) || void 0 : void 0,
+			parentId: threadChannel ? threadParentId : void 0,
 			threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
 		},
 		route: {
@@ -848,7 +850,6 @@ function sleep(ms) {
 		setTimeout(resolve, ms);
 	});
 }
-const DISCORD_TYPING_MAX_DURATION_MS = 20 * 6e4;
 let replyRuntimePromise;
 async function loadReplyRuntime() {
 	replyRuntimePromise ??= import("openclaw/plugin-sdk/reply-runtime");
@@ -877,8 +878,15 @@ function readToolBooleanArg(args, key) {
 	return args[key] === true;
 }
 async function processDiscordMessage(ctx, observer) {
+	try {
+		await processDiscordMessageInner(ctx, observer);
+	} finally {
+		ctx.replyTypingFeedback?.onCleanup?.();
+	}
+}
+async function processDiscordMessageInner(ctx, observer) {
 	const dispatchStartedAt = Date.now();
-	const { cfg, discordConfig, accountId, token, runtime, guildHistories, historyLimit, mediaMaxBytes, textLimit, replyToMode, ackReactionScope, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, shouldRequireMention, canDetectMention, effectiveWasMentioned, shouldBypassMention, channelConfig, threadBindings, route, discordRestFetch, abortSignal, botLoopProtection } = ctx;
+	const { cfg, discordConfig, accountId, token, runtime, guildHistories, historyLimit, mediaMaxBytes, textLimit, replyToMode, ackReactionScope, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, shouldRequireMention, canDetectMention, effectiveWasMentioned, shouldBypassMention, channelConfig, threadBindings, route, discordRestFetch, abortSignal, botLoopProtection, replyTypingFeedback } = ctx;
 	if (isProcessAborted(abortSignal)) return;
 	if (botLoopProtection) {
 		const botLoopResult = recordChannelBotPairLoopAndCheckSuppression(botLoopProtection);
@@ -1050,26 +1058,22 @@ async function processDiscordMessage(ctx, observer) {
 		sessionKey: persistedSessionKey
 	});
 	const typingChannelId = deliverTarget.startsWith("channel:") ? deliverTarget.slice(8) : messageChannelId;
+	const typingFeedback = replyTypingFeedback ?? createDiscordReplyTypingFeedback({
+		cfg,
+		token,
+		accountId,
+		channelId: typingChannelId,
+		rest: feedbackRest,
+		log: logVerbose
+	});
+	if (replyTypingFeedback) replyTypingFeedback.restartForDispatch(typingChannelId);
+	else typingFeedback.updateChannelId(typingChannelId);
 	const { onModelSelected, ...replyPipeline } = createChannelMessageReplyPipeline({
 		cfg,
 		agentId: route.agentId,
 		channel: "discord",
 		accountId: route.accountId,
-		typing: {
-			start: () => sendTyping({
-				rest: feedbackRest,
-				channelId: typingChannelId
-			}),
-			onStartError: (err) => {
-				logTypingFailure({
-					log: logVerbose,
-					channel: "discord",
-					target: typingChannelId,
-					error: err
-				});
-			},
-			maxDurationMs: DISCORD_TYPING_MAX_DURATION_MS
-		}
+		typingCallbacks: typingFeedback
 	});
 	const tableMode = resolveMarkdownTableMode({
 		cfg,
@@ -1241,6 +1245,14 @@ async function processDiscordMessage(ctx, observer) {
 					},
 					buildFinalEdit: () => {
 						if (draftPreview.finalizedViaPreviewMessage || hasMedia && !ttsSupplement || typeof previewFinalText !== "string" || hasExplicitReplyDirective || payload.isError) return;
+						const rewrittenFinal = rewriteDiscordKnownMentions(previewFinalText, {
+							accountId,
+							mentionAliases: resolveDiscordAccount({
+								cfg,
+								accountId
+							}).config.mentionAliases
+						});
+						if (discordTextHasTargetedMention(rewrittenFinal) && !discordTextHasBroadcastMention(rewrittenFinal)) return;
 						return {
 							content: previewFinalText,
 							...finalPreviewFlags ? { flags: finalPreviewFlags } : {}