@openclaw/discord 2026.7.1-beta.6 → 2026.7.2-beta.1

package/dist/{message-handler-DcgvugZt.js → message-handler-CIxWq5Yh.js}

@@ -1,8 +1,7 @@
-import { I as createDiscordRestClient } from "./send.shared-wAwMhHDN.js";
-import { o as mergeAbortSignals } from "./timeouts-C5TBc_9x.js";
-import { d as resolveDiscordChannelNameSafe, l as resolveDiscordChannelIdSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjIf9lGs.js";
-import { c as hasDiscordMessageStickers, d as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-B_3yA5bN.js";
-import { t as sendTyping } from "./typing-BVcJgILg.js";
+import { I as createDiscordRestClient } from "./send.shared-Xz7IMVpu.js";
+import { d as resolveDiscordChannelNameSafe, l as resolveDiscordChannelIdSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-DJD3qwIN.js";
+import { c as hasDiscordMessageStickers, d as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-D4j07taS.js";
+import { t as sendTyping } from "./typing-BnYT7Szq.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { danger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
@@ -178,10 +177,10 @@ function resolveDiscordAcceptedTypingPrestart(ctx) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-run-queue.ts
-const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-Cjf30P_B.js"));
+const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-bPS_9_tb.js"));
 async function processDiscordQueuedMessage(params) {
 	const processDiscordMessageImpl = params.testing?.processDiscordMessage ?? (await loadMessageProcessRuntime()).processDiscordMessage;
-	const abortSignal = mergeAbortSignals([params.job.runtime.abortSignal, params.lifecycleSignal]);
+	const abortSignal = params.job.runtime.abortSignal && params.lifecycleSignal ? AbortSignal.any([params.job.runtime.abortSignal, params.lifecycleSignal]) : params.job.runtime.abortSignal ?? params.lifecycleSignal;
 	try {
 		await processDiscordMessageImpl(materializeDiscordInboundJob(params.job, abortSignal));
 		await commitDiscordInboundReplay({
@@ -307,7 +306,7 @@ function createDiscordReplyTypingFeedback(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.ts
-const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-DvLXiYVH.js"));
+const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-BI86IbHz.js"));
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
@@ -530,4 +529,4 @@ function createDiscordMessageHandler(params) {
 	return handler;
 }
 //#endregion
-export { createDiscordReplyTypingFeedback as n, createDiscordMessageHandler as t };
+export { createDiscordReplyTypingFeedback as n, DiscordRetryableInboundError as r, createDiscordMessageHandler as t };

package/dist/{message-handler.preflight-DvLXiYVH.js → message-handler.preflight-BI86IbHz.js}

@@ -1,14 +1,14 @@
-import { N as Message, d as discord_exports, vt as getChannelMessage } from "./send.receipt-BpBQED_5.js";
+import { F as Message, bt as getChannelMessage, d as discord_exports } from "./send.receipt-aegk69an.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-C-MqM-B_.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-DWC5d8Sy.js";
-import { d as isRecentlyUnboundThreadWebhookMessage } from "./thread-bindings.state-iSWjCYjB.js";
-import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-C5TBc_9x.js";
-import { d as resolveDiscordChannelNameSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjIf9lGs.js";
-import "./thread-bindings-DsTxqu3E.js";
-import { D as resolveDiscordDmCommandAccess, O as resolveDiscordTextCommandAccess, _ as resolveDiscordConversationRoute, b as handleDiscordDmCommandDecision, g as buildDiscordRoutePeer, v as resolveDiscordEffectiveRoute, y as shouldIgnoreStaleDiscordRouteBinding } from "./provider-BkfbC9FQ.js";
-import { a as resolveForwardedMediaList, d as resolveDiscordMessageChannelId, l as resolveDiscordMessageStickers, o as resolveMediaList, r as resolveDiscordMessageText, u as resolveDiscordChannelInfo } from "./message-utils-B_3yA5bN.js";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-CEsfDF0L.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-B7qOH5xu.js";
+import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-ZRc9Lw4y.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BpkAzklg.js";
+import { d as isRecentlyUnboundThreadWebhookMessage } from "./thread-bindings.state-9VAxhVf6.js";
+import { d as resolveDiscordChannelNameSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-DJD3qwIN.js";
+import "./thread-bindings-BbzjUuNB.js";
+import { A as resolveDiscordTextCommandAccess, S as handleDiscordDmCommandDecision, b as resolveDiscordEffectiveRoute, k as resolveDiscordDmCommandAccess, v as buildDiscordRoutePeer, x as shouldIgnoreStaleDiscordRouteBinding, y as resolveDiscordConversationRoute } from "./provider-DWvDNb4J.js";
+import { a as resolveForwardedMediaList, d as resolveDiscordMessageChannelId, l as resolveDiscordMessageStickers, o as resolveMediaList, r as resolveDiscordMessageText, u as resolveDiscordChannelInfo } from "./message-utils-D4j07taS.js";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-C62lBe18.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { MessageReferenceType, MessageType } from "discord-api-types/v10";
@@ -25,7 +25,7 @@ import { isAbortRequestText } from "openclaw/plugin-sdk/command-primitives-runti
 import { shouldHandleTextCommands } from "openclaw/plugin-sdk/command-surface";
 //#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-iJ0B4bAX.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-BFpa_DHn.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -183,8 +183,7 @@ function copyRuntimeMessageFields(source, target) {
 	const channelDescriptor = Object.getOwnPropertyDescriptor(source, "channel");
 	if (channelDescriptor) Object.defineProperty(target, "channel", channelDescriptor);
 }
-function shouldHydrateDiscordMessage(params) {
-	if (hasMissingReferencedMessagePayload(params.message)) return true;
+function shouldHydrateDiscordMessagePayload(params) {
 	let currentText;
 	try {
 		currentText = resolveDiscordMessageText(params.message, { includeForwarded: true });
@@ -202,18 +201,42 @@ function hasMissingReferencedMessagePayload(message) {
 	if (message.type != null && message.type !== MessageType.Reply) return false;
 	return !Object.hasOwn(readMessageRawData(message), "referenced_message");
 }
+async function hydrateDiscordReplyReference(params) {
+	if (!hasMissingReferencedMessagePayload(params.message)) return params.message;
+	const reference = params.message.messageReference;
+	const referencedMessageId = reference?.message_id;
+	if (!referencedMessageId) return params.message;
+	const referencedChannelId = reference.channel_id ?? params.messageChannelId;
+	try {
+		const referenced = await getChannelMessage(params.client.rest, referencedChannelId, referencedMessageId);
+		if (!referenced) return params.message;
+		return mergeFetchedDiscordMessage(params.message, {
+			...readMessageRawData(params.message),
+			referenced_message: referenced
+		});
+	} catch (err) {
+		logVerbose(`discord: failed to hydrate referenced message ${referencedMessageId}: ${String(err)}`);
+		return params.message;
+	}
+}
 async function hydrateDiscordMessageIfNeeded(params) {
 	params.channelInfo;
-	if (!shouldHydrateDiscordMessage({ message: params.message })) return params.message;
-	try {
+	let hydrated = params.message;
+	if (shouldHydrateDiscordMessagePayload({ message: params.message })) try {
 		const fetched = await getChannelMessage(params.client.rest, params.messageChannelId, params.message.id);
-		if (!fetched) return params.message;
-		logVerbose(`discord: hydrated inbound payload via REST for ${params.message.id}`);
-		return mergeFetchedDiscordMessage(params.message, fetched);
+		if (fetched) {
+			logVerbose(`discord: hydrated inbound payload via REST for ${params.message.id}`);
+			hydrated = mergeFetchedDiscordMessage(params.message, fetched);
+		}
 	} catch (err) {
 		logVerbose(`discord: failed to hydrate message ${params.message.id}: ${String(err)}`);
 		return params.message;
 	}
+	return hydrateDiscordReplyReference({
+		client: params.client,
+		message: hydrated,
+		messageChannelId: params.messageChannelId
+	});
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-channel-access.ts
@@ -424,10 +447,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-DcD-3EcL.js").then((n) => n.n));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-UXq1OyUI.js").then((n) => n.n));
 const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-DYL2ABgA.js"));
-const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-DVnqSyTt.js"));
-const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-BkfbC9FQ.js").then((n) => n.S));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-DKwfE-2z.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-DWvDNb4J.js").then((n) => n.w));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -439,7 +462,8 @@ async function resolveDiscordPreflightPluralKitInfo(params) {
 		const { fetchPluralKitMessageInfo } = await loadPluralKitRuntime();
 		const info = await fetchPluralKitMessageInfo({
 			messageId: params.message.id,
-			config: params.config
+			config: params.config,
+			signal: params.abortSignal
 		});
 		return isPreflightAborted(params.abortSignal) ? null : info;
 	} catch (err) {