@openclaw/discord 2026.7.2-beta.7 → 2026.8.1-beta.2

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

@@ -1,12 +1,13 @@
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import { d as resolveDiscordChannelIdSafe, f as resolveDiscordChannelInfoSafe, h as resolveDiscordChannelParentSafe, p as resolveDiscordChannelNameSafe } from "./thread-bindings.discord-api-BoDNqamb.js";
-import { w as mapGatewayDispatchData } from "./provider-DfQJX3z5.js";
-import { f as resolveDiscordMessageChannelId, i as resolveDiscordMessageText, l as hasDiscordMessageStickers } from "./message-utils-BgTwT_q7.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 { GatewayDispatchEvents } from "discord-api-types/v10";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { danger } from "openclaw/plugin-sdk/runtime-env";
 import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
-import { createChannelIngressError, createChannelIngressMonitor, createChannelRunQueue } from "openclaw/plugin-sdk/channel-outbound";
+import { DEFAULT_INGRESS_RETRY_MAX_ATTEMPTS, createChannelIngressError, createChannelIngressMonitor, createChannelRunQueue } from "openclaw/plugin-sdk/channel-outbound";
 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";
@@ -43,9 +44,6 @@ function decodeDiscordIngressPayload(payload, claimedId) {
 		}
 	};
 }
-function errorText(error) {
-	return error instanceof Error ? error.message : String(error);
-}
 function isDiscordAuthenticationFailure(error) {
 	let current = error;
 	const seen = /* @__PURE__ */ new Set();
@@ -87,6 +85,10 @@ function createDiscordIngressMonitor(params) {
 		},
 		appendRetryDelaysMs: [0],
 		drain: {
+			retryPolicy: {
+				maxAttempts: DEFAULT_INGRESS_RETRY_MAX_ATTEMPTS,
+				deadLetterMinAgeMs: 0
+			},
 			resolveNonRetryableFailure: (error) => {
 				if (error instanceof DiscordIngressPayloadError) return {
 					reason: "invalid-event",
@@ -94,13 +96,13 @@ function createDiscordIngressMonitor(params) {
 				};
 				if (isDiscordAuthenticationFailure(error)) return {
 					reason: "authentication-failed",
-					message: errorText(error)
+					message: formatErrorMessage(error)
 				};
 				return null;
 			},
 			onLog: (message) => params.runtime.error?.(danger(`discord ingress: ${message}`))
 		},
-		onError: (error) => params.runtime.error?.(danger(`discord ingress drain failed: ${errorText(error)}`))
+		onError: (error) => params.runtime.error?.(danger(`discord ingress drain failed: ${formatErrorMessage(error)}`))
 	});
 	return {
 		accept: async (rawMessage) => {
@@ -112,18 +114,10 @@ function createDiscordIngressMonitor(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/inbound-job.ts
-function resolveDiscordInboundJobQueueKey(ctx) {
-	const sessionKey = ctx.route.sessionKey?.trim();
-	if (sessionKey) return sessionKey;
-	const baseSessionKey = ctx.baseSessionKey?.trim();
-	if (baseSessionKey) return baseSessionKey;
-	return ctx.messageChannelId;
-}
 function buildDiscordInboundJob(ctx, options) {
 	const { runtime, abortSignal, guildHistories, client, turnAdoptionLifecycle, threadBindings, discordRestFetch, message, data, threadChannel, ...payload } = ctx;
 	const sanitizedMessage = sanitizeDiscordInboundMessage(message);
 	return {
-		queueKey: resolveDiscordInboundJobQueueKey(ctx),
 		payload: {
 			...payload,
 			message: sanitizedMessage,
@@ -181,20 +175,21 @@ function applyImplicitReplyBatchGate(ctx, replyToMode, isBatched) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-run-queue.ts
-const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-Dnc_oz9y.js"));
+const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-DWQ6UHHu.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 {
 		await (params.testing?.processDiscordMessage ?? (await loadMessageProcessRuntime()).processDiscordMessage)(materializeDiscordInboundJob(params.job, abortSignal));
-		if (abortSignal?.aborted) await params.job.ingressSettlement?.abandon(abortSignal.reason);
+		if (abortSignal?.aborted) await params.job.ingressSettlement?.cancel();
 		else await params.job.ingressSettlement?.settle();
 	} catch (error) {
-		await params.job.ingressSettlement?.abandon(error);
+		if (abortSignal?.aborted) await params.job.ingressSettlement?.cancel();
+		else await params.job.ingressSettlement?.abandon(error);
 		throw error;
 	}
 }
 async function cleanupSkippedDiscordQueuedMessage(params) {
-	await params.job.ingressSettlement?.abandon(/* @__PURE__ */ new Error("discord queued run skipped before processing"));
+	await params.job.ingressSettlement?.cancel();
 }
 function createDiscordMessageRunQueue(params) {
 	const skippedCleanup = /* @__PURE__ */ new Set();
@@ -232,6 +227,10 @@ function createDiscordMessageRunQueue(params) {
 			const cleanupSkipped = async () => {
 				try {
 					await cleanupSkippedDiscordQueuedMessage({ job });
+				} catch (error) {
+					try {
+						params.runtime.error(danger(`discord queued message cleanup failed: ${String(error)}`));
+					} catch {}
 				} finally {
 					settlePending();
 				}
@@ -241,7 +240,7 @@ function createDiscordMessageRunQueue(params) {
 				return;
 			}
 			skippedCleanup.add(cleanupSkipped);
-			runQueue.enqueue(job.queueKey, async ({ lifecycleSignal }) => {
+			runQueue.enqueue(job.payload.message.id, async ({ lifecycleSignal }) => {
 				skippedCleanup.delete(cleanupSkipped);
 				try {
 					await processDiscordQueuedMessage({
@@ -263,7 +262,7 @@ function createDiscordMessageRunQueue(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-dispatcher.ts
-const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-DibgQFf2.js"));
+const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-C9zecxR9.js"));
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
@@ -317,7 +316,7 @@ function createDiscordMessageDispatcher(params) {
 					if (!last) return;
 					const abortSignal = last.abortSignal;
 					if (abortSignal?.aborted) {
-						await admissionLifecycle.onAbandoned();
+						await ingress.cancel();
 						return;
 					}
 					try {
@@ -332,7 +331,7 @@ function createDiscordMessageDispatcher(params) {
 								turnAdoptionLifecycle: admissionLifecycle
 							});
 							if (abortSignal?.aborted) {
-								await ingress.abandon(abortSignal.reason);
+								await ingress.cancel();
 								return;
 							}
 							if (!ctx) {
@@ -386,7 +385,7 @@ function createDiscordMessageDispatcher(params) {
 							turnAdoptionLifecycle: admissionLifecycle
 						});
 						if (abortSignal?.aborted) {
-							await ingress.abandon(abortSignal.reason);
+							await ingress.cancel();
 							return;
 						}
 						if (!ctx) {
@@ -403,7 +402,10 @@ function createDiscordMessageDispatcher(params) {
 						}
 						messageRunQueue.enqueue(buildDiscordInboundJob(ctx, { ingressSettlement: ingress }));
 					} catch (error) {
-						await admissionLifecycle.onAbandoned();
+						if (abortSignal?.aborted) {
+							await ingress.cancel();
+							return;
+						}
 						throw error;
 					}
 				}
@@ -415,7 +417,7 @@ function createDiscordMessageDispatcher(params) {
 		onCancel: (entries) => {
 			for (const entry of entries) {
 				pendingDebounceEntries.delete(entry);
-				const settlement = Promise.resolve(entry.turnAdoptionLifecycle?.onAbandoned()).catch((error) => {
+				const settlement = fanInChannelIngressLifecycles([entry.turnAdoptionLifecycle]).cancel().catch((error) => {
 					params.runtime.error(danger(`discord ingress cancellation settlement failed: ${String(error)}`));
 				}).finally(() => {
 					pendingCancellationSettlements.delete(settlement);
@@ -426,10 +428,17 @@ function createDiscordMessageDispatcher(params) {
 	});
 	const dispatchMessage = async (data, client, options) => {
 		try {
-			if (dispatcherShutdown.signal.aborted || options?.abortSignal?.aborted) return {
-				kind: "failed-retryable",
-				error: dispatcherShutdown.signal.aborted ? dispatcherShutdown.signal.reason ?? /* @__PURE__ */ new Error("discord dispatcher shut down") : options?.abortSignal?.reason ?? /* @__PURE__ */ new Error("discord dispatch aborted")
-			};
+			if (dispatcherShutdown.signal.aborted || options?.abortSignal?.aborted) {
+				const reason = dispatcherShutdown.signal.aborted ? dispatcherShutdown.signal.reason ?? /* @__PURE__ */ new Error("discord dispatcher shut down") : options?.abortSignal?.reason ?? /* @__PURE__ */ new Error("discord dispatch aborted");
+				if (options?.turnAdoptionLifecycle) {
+					await fanInChannelIngressLifecycles([options.turnAdoptionLifecycle]).cancel();
+					return { kind: "deferred" };
+				}
+				return {
+					kind: "failed-retryable",
+					error: reason
+				};
+			}
 			const msgAuthorId = data.message?.author?.id ?? data.author?.id;
 			if (params.botUserId && msgAuthorId === params.botUserId) return { kind: "completed" };
 			const entry = {

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

@@ -1,12 +1,12 @@
-import { F as Message, bt as getChannelMessage, d as discord_exports } from "./chunk-DX4jpFQP.js";
+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-DzKrtfah.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 { 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-DEyKVsAw.js";
-import { f as resolveDiscordChannelInfoSafe, p as resolveDiscordChannelNameSafe } from "./thread-bindings.discord-api-BoDNqamb.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-DfQJX3z5.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-BgTwT_q7.js";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-mG_zsdox.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 { 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";
@@ -18,7 +18,7 @@ import { findCodeRegions, isInsideCode } from "openclaw/plugin-sdk/text-chunking
 import { isRecentOutboundMessageIdentity } from "openclaw/plugin-sdk/channel-outbound";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
-import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-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";
@@ -27,7 +27,7 @@ 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-CdkZ6zeW.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-B7Q6Oc1I.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -45,7 +45,7 @@ async function resolveDiscordDmPreflightAccess(params) {
 		accountId: params.preflight.accountId,
 		conversationId: directBindingConversationId
 	});
-	const dmAccess = await resolveDiscordDmCommandAccess({
+	const resolveChannelIngress = async (contextBinding, conversation) => await resolveDiscordDmCommandAccess({
 		accountId: params.resolvedAccountId,
 		dmPolicy: params.dmPolicy,
 		configuredAllowFrom: params.preflight.allowFrom ?? [],
@@ -57,13 +57,26 @@ async function resolveDiscordDmPreflightAccess(params) {
 		allowNameMatching: params.allowNameMatching,
 		cfg: params.preflight.cfg,
 		token: params.preflight.token,
-		rest: params.preflight.client.rest
+		rest: params.preflight.client.rest,
+		conversationId: params.conversationId,
+		conversationParentId: conversation?.parentId,
+		conversationThreadId: conversation?.threadId,
+		...contextBinding ? { contextBinding } : {}
 	});
+	const dmAccess = await resolveChannelIngress();
 	const commandAuthorized = dmAccess.senderAccess.allowed && dmAccess.commandAccess.authorized || directBindingRecord != null;
-	if (dmAccess.senderAccess.decision === "allow") return { commandAuthorized };
+	if (dmAccess.senderAccess.decision === "allow") return {
+		commandAuthorized,
+		channelIngress: dmAccess,
+		resolveChannelIngress
+	};
 	if (directBindingRecord) {
 		logVerbose(`discord: allow bound DM conversation ${directBindingConversationId} despite dmPolicy=${params.dmPolicy}`);
-		return { commandAuthorized };
+		return {
+			commandAuthorized,
+			channelIngress: dmAccess,
+			resolveChannelIngress
+		};
 	}
 	await handleDiscordDmCommandDecision({
 		senderAccess: dmAccess.senderAccess,
@@ -475,10 +488,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-CD4B11JB.js").then((n) => n.n));
-const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-BjnQZ5yS.js"));
-const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-DdUqf91B.js"));
-const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-DfQJX3z5.js").then((n) => n.E));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-DdiJ9KMK.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));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -771,6 +784,8 @@ async function preflightDiscordMessage(params) {
 	const resolvedAccountId = params.accountId ?? resolveDefaultDiscordAccountId(params.cfg);
 	const allowNameMatching = isDangerousNameMatchingEnabled(params.discordConfig);
 	let commandAuthorized = true;
+	let channelIngress;
+	let resolveChannelIngress;
 	if (isDirectMessage) {
 		const access = await resolveDiscordDmPreflightAccess({
 			preflight: params,
@@ -778,11 +793,14 @@ async function preflightDiscordMessage(params) {
 			sender,
 			dmPolicy,
 			resolvedAccountId,
-			allowNameMatching
+			allowNameMatching,
+			conversationId: messageChannelId
 		});
 		if (isPreflightAborted(params.abortSignal)) return null;
 		if (!access) return null;
 		commandAuthorized = access.commandAuthorized;
+		channelIngress = access.channelIngress;
+		resolveChannelIngress = access.resolveChannelIngress;
 	}
 	const botId = params.botUserId;
 	const baseText = resolveDiscordMessageText(message, { includeForwarded: false });
@@ -960,7 +978,7 @@ async function preflightDiscordMessage(params) {
 	const hasControlCommandInMessage = hasControlCommand(baseText, params.cfg);
 	const hasAbortRequest = isAbortRequestText(baseText);
 	if (!isDirectMessage) {
-		const commandAccess = await resolveDiscordTextCommandAccess({
+		const resolveCommandIngress = async (contextBinding, conversation) => await resolveDiscordTextCommandAccess({
 			accountId: params.accountId,
 			cfg: params.cfg,
 			ownerAllowFrom: params.allowFrom,
@@ -973,10 +991,17 @@ async function preflightDiscordMessage(params) {
 			memberAllowed,
 			allowNameMatching,
 			allowTextCommands,
-			hasControlCommand: hasControlCommandInMessage
+			hasControlCommand: hasControlCommandInMessage,
+			conversationId: messageChannelId,
+			conversationParentId: conversation?.parentId,
+			conversationThreadId: conversation?.threadId,
+			...contextBinding ? { contextBinding } : {}
 		});
-		commandAuthorized = commandAccess.authorized;
-		if (commandAccess.shouldBlockControlCommand) {
+		const commandAccess = await resolveCommandIngress();
+		commandAuthorized = commandAccess.commandAccess.authorized;
+		channelIngress = commandAccess;
+		resolveChannelIngress = resolveCommandIngress;
+		if (commandAccess.commandAccess.shouldBlockControlCommand) {
 			logInboundDrop({
 				log: logVerbose,
 				channel: "discord",
@@ -1060,10 +1085,7 @@ async function preflightDiscordMessage(params) {
 	const systemText = resolveDiscordSystemEvent(message, systemLocation);
 	if (systemText) {
 		logDebug(`[discord-preflight] drop: system event`);
-		enqueueSystemEvent(systemText, {
-			sessionKey: effectiveRoute.sessionKey,
-			contextKey: `discord:system:${messageChannelId}:${message.id}`
-		});
+		enqueueRoutedSystemEvent(systemText, effectiveRoute, { contextKey: `discord:system:${messageChannelId}:${message.id}` });
 		return null;
 	}
 	const hasNativeMedia = (message.attachments?.length ?? 0) > 0 || resolveDiscordMessageStickers(message).length > 0;
@@ -1128,6 +1150,8 @@ async function preflightDiscordMessage(params) {
 		isDirectMessage,
 		isGroupDm,
 		commandAuthorized,
+		channelIngress,
+		resolveChannelIngress,
 		baseText,
 		messageText,
 		...preflightTranscript !== void 0 ? { preflightAudioTranscript: preflightTranscript } : {},