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

package/dist/{message-utils-BgTwT_q7.js → message-utils-BXLLnFl6.js}

@@ -1,12 +1,12 @@
-import { f as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BoDNqamb.js";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { c as resolveDiscordChannelInfoSafe } from "./thread-bindings.manager-CngsgErq.js";
 import { ComponentType, StickerFormatType } from "discord-api-types/v10";
 import { asDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
-import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { getFileExtension, normalizeMimeType } from "openclaw/plugin-sdk/media-mime";
+import { getChildLogger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { saveRemoteMedia } from "openclaw/plugin-sdk/media-runtime";
 import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { formatMediaPlaceholderText } from "openclaw/plugin-sdk/channel-inbound";
-import { getFileExtension, normalizeMimeType } from "openclaw/plugin-sdk/media-mime";
 //#region extensions/discord/src/monitor/message-channel-info-state.ts
 const discordChannelInfoCacheState = { entries: /* @__PURE__ */ new Map() };
 //#endregion
@@ -115,7 +115,7 @@ function formatDiscordSnapshotAuthor(author) {
 	if (author.id) return `@${author.id}`;
 }
 //#endregion
-//#region extensions/discord/src/monitor/message-media.ts
+//#region extensions/discord/src/monitor/media-ssrf-policy.ts
 const DISCORD_MEDIA_SSRF_POLICY = {
 	hostnameAllowlist: [
 		"cdn.discordapp.com",
@@ -125,6 +125,25 @@ const DISCORD_MEDIA_SSRF_POLICY = {
 	],
 	allowRfc2544BenchmarkRange: true
 };
+function mergeHostnameList(...lists) {
+	const merged = lists.flatMap((list) => list ?? []).map((value) => value.trim()).filter((value) => value.length > 0);
+	return merged.length > 0 ? uniqueStrings(merged) : void 0;
+}
+/** Merges caller network policy with the Discord-owned CDN allowlist. */
+function resolveDiscordCdnPolicy(policy) {
+	if (!policy) return DISCORD_MEDIA_SSRF_POLICY;
+	const hostnameAllowlist = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.hostnameAllowlist, policy.hostnameAllowlist);
+	const allowedHostnames = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.allowedHostnames, policy.allowedHostnames);
+	return {
+		...DISCORD_MEDIA_SSRF_POLICY,
+		...policy,
+		...allowedHostnames ? { allowedHostnames } : {},
+		...hostnameAllowlist ? { hostnameAllowlist } : {},
+		allowRfc2544BenchmarkRange: Boolean(DISCORD_MEDIA_SSRF_POLICY.allowRfc2544BenchmarkRange) || Boolean(policy.allowRfc2544BenchmarkRange)
+	};
+}
+//#endregion
+//#region extensions/discord/src/monitor/message-media.ts
 const AUDIO_ATTACHMENT_EXTENSIONS = /* @__PURE__ */ new Set([
 	".aac",
 	".caf",
@@ -171,26 +190,9 @@ function resolveDiscordMediaClassification(params) {
 		...kind ? { kind } : {}
 	};
 }
-function mergeHostnameList(...lists) {
-	const merged = lists.flatMap((list) => list ?? []).map((value) => value.trim()).filter((value) => value.length > 0);
-	if (merged.length === 0) return;
-	return uniqueStrings(merged);
-}
-function resolveDiscordMediaSsrFPolicy(policy) {
-	if (!policy) return DISCORD_MEDIA_SSRF_POLICY;
-	const hostnameAllowlist = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.hostnameAllowlist, policy.hostnameAllowlist);
-	const allowedHostnames = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.allowedHostnames, policy.allowedHostnames);
-	return {
-		...DISCORD_MEDIA_SSRF_POLICY,
-		...policy,
-		...allowedHostnames ? { allowedHostnames } : {},
-		...hostnameAllowlist ? { hostnameAllowlist } : {},
-		allowRfc2544BenchmarkRange: Boolean(DISCORD_MEDIA_SSRF_POLICY.allowRfc2544BenchmarkRange) || Boolean(policy.allowRfc2544BenchmarkRange)
-	};
-}
 async function resolveMediaList(message, maxBytes, options) {
 	const out = [];
-	const resolvedSsrFPolicy = resolveDiscordMediaSsrFPolicy(options?.ssrfPolicy);
+	const resolvedSsrFPolicy = resolveDiscordCdnPolicy(options?.ssrfPolicy);
 	await appendResolvedMediaFromAttachments({
 		attachments: message.attachments ?? [],
 		maxBytes,
@@ -218,7 +220,7 @@ async function resolveMediaList(message, maxBytes, options) {
 async function resolveForwardedMediaList(message, maxBytes, options) {
 	const snapshots = resolveDiscordMessageSnapshots(message);
 	const out = [];
-	const resolvedSsrFPolicy = resolveDiscordMediaSsrFPolicy(options?.ssrfPolicy);
+	const resolvedSsrFPolicy = resolveDiscordCdnPolicy(options?.ssrfPolicy);
 	if (snapshots.length > 0) {
 		for (const snapshot of snapshots) {
 			await appendResolvedMediaFromAttachments({
@@ -276,7 +278,7 @@ async function resolveReferencedReplyMediaList(message, maxBytes, options) {
 	const referencedReply = resolveDiscordReferencedReplyMessage(message);
 	const out = [];
 	if (!referencedReply) return out;
-	const resolvedSsrFPolicy = resolveDiscordMediaSsrFPolicy(options?.ssrfPolicy);
+	const resolvedSsrFPolicy = resolveDiscordCdnPolicy(options?.ssrfPolicy);
 	await appendResolvedMediaFromAttachments({
 		attachments: referencedReply.attachments,
 		maxBytes,
@@ -368,7 +370,7 @@ async function appendResolvedMediaFromAttachments(params) {
 			});
 		} catch (err) {
 			const id = attachment.id ?? attachmentUrl;
-			logVerbose(`${params.errorPrefix} ${id}: ${String(err)}`);
+			getChildLogger({ module: "discord-media" }).warn(`${params.errorPrefix} ${id}: ${String(err)}`);
 			const classification = resolveDiscordMediaClassification({ attachment });
 			params.out.push({ ...classification });
 		}
@@ -442,7 +444,7 @@ async function appendResolvedMediaFromStickers(params) {
 			lastError = err;
 		}
 		if (lastError) {
-			logVerbose(`${params.errorPrefix} ${sticker.id}: ${formatStickerError(lastError)}`);
+			getChildLogger({ module: "discord-media" }).warn(`${params.errorPrefix} ${sticker.id}: ${formatStickerError(lastError)}`);
 			if (candidates[0]) params.out.push({
 				contentType: inferStickerContentType(sticker),
 				kind: "sticker"
@@ -467,14 +469,11 @@ function formatDiscordMediaText(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-text.ts
-function resolveDiscordEmbedText(embed) {
-	const title = normalizeOptionalString(embed?.title) ?? "";
-	const description = normalizeOptionalString(embed?.description) ?? "";
-	if (title && description) return `${title}\n${description}`;
-	return title || description || "";
+function resolveDiscordEmbedText(embeds) {
+	return (embeds ?? []).flatMap(({ title, description }) => [normalizeOptionalString(title), normalizeOptionalString(description)]).filter(Boolean).join("\n");
 }
 function resolveDiscordMessageText(message, options) {
-	const embedText = resolveDiscordEmbedText(message.embeds?.[0] ?? null);
+	const embedText = resolveDiscordEmbedText(message.embeds);
 	const componentText = extractDiscordComponentsV2Text(resolveDiscordMessageComponents(message));
 	const baseText = resolveDiscordMentions(normalizeOptionalString(message.content) || embedText || componentText || normalizeOptionalString(options?.fallbackText) || "", message);
 	if (!options?.includeForwarded) return baseText;
@@ -557,9 +556,9 @@ function resolveDiscordSnapshotMessageText(snapshot) {
 		attachments: snapshot.attachments ?? void 0,
 		stickers: resolveDiscordSnapshotStickers(snapshot)
 	});
-	const embedText = resolveDiscordEmbedText(snapshot.embeds?.[0]);
+	const embedText = resolveDiscordEmbedText(snapshot.embeds);
 	const componentText = extractDiscordComponentsV2Text(snapshot.components);
 	return [content || embedText || componentText, attachmentText].filter(Boolean).join("\n");
 }
 //#endregion
-export { formatDiscordMediaText as a, resolveReferencedReplyMediaList as c, resolveDiscordChannelInfo as d, resolveDiscordMessageChannelId as f, resolveDiscordMessageText as i, hasDiscordMessageStickers as l, resolveDiscordForwardedMessagesTextFromSnapshots as n, resolveForwardedMediaList as o, resolveDiscordMessageHistoryText as r, resolveMediaList as s, resolveDiscordEmbedText as t, resolveDiscordMessageStickers as u };
+export { formatDiscordMediaText as a, resolveReferencedReplyMediaList as c, resolveDiscordMessageStickers as d, resolveDiscordChannelInfo as f, resolveDiscordMessageText as i, resolveDiscordCdnPolicy as l, resolveDiscordForwardedMessagesTextFromSnapshots as n, resolveForwardedMediaList as o, resolveDiscordMessageChannelId as p, resolveDiscordMessageHistoryText as r, resolveMediaList as s, resolveDiscordEmbedText as t, hasDiscordMessageStickers as u };

package/dist/{model-picker-preference-primitives-D25pnCOu.js → model-picker-preference-primitives-BHT1LkR_.js}

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { normalizeProviderId } from "openclaw/plugin-sdk/provider-model-shared";
+import { normalizeProviderId } from "openclaw/plugin-sdk/model-ref-parse";
 //#region extensions/discord/src/monitor/model-picker-preference-primitives.ts
 function normalizeModelRef(raw) {
 	const value = raw?.trim();
@@ -29,9 +29,9 @@ function hashSegment(value, length) {
 function buildPreferenceModelKey(scopeKey, modelRef) {
 	return `v1:${hashSegment(scopeKey, 32)}:${hashSegment(modelRef, 24)}`;
 }
-function timestampMs(value) {
+function preferenceTimestampMs(value) {
 	const parsed = typeof value === "string" ? Date.parse(value) : NaN;
 	return Number.isFinite(parsed) ? parsed : 0;
 }
 //#endregion
-export { timestampMs as i, normalizeModelRef as n, sanitizeRecentModels as r, buildPreferenceModelKey as t };
+export { sanitizeRecentModels as i, normalizeModelRef as n, preferenceTimestampMs as r, buildPreferenceModelKey as t };

package/dist/{outbound-adapter-DtE-i2OJ.js → outbound-adapter-DxHTOqiN.js}

@@ -1,15 +1,17 @@
-import { c as normalizeDiscordOutboundTarget, i as resolveDiscordReplyReference, t as chunkDiscordTextWithMode } from "./chunk-DX4jpFQP.js";
-import { t as createDiscordSendReceipt } from "./send.receipt-CuwRrpFz.js";
-import { n as formatDiscordApprovalDisplayValue } from "./approval-message-safety-DEyKVsAw.js";
-import { n as notifyDiscordInboundEventOutboundPayloadSuccess } from "./inbound-event-delivery-CEPlt2uz.js";
-import { a as sendDiscordComponentMessageLazy, i as resolveDiscordComponentSpec, n as buildDiscordPresentationPayload, t as DISCORD_PRESENTATION_CAPABILITIES } from "./outbound-components-C7GVyfPh.js";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { a as chunkDiscordTextWithMode, c as resolveDiscordReplyReference, f as normalizeDiscordOutboundTarget, r as hasDiscordMessageCreateAmbiguity } from "./retry-DNsVTeTo.js";
+import { t as createDiscordActionGate } from "./accounts-DNl-oCEw.js";
+import { i as toDiscordOutboundDeliveryResult, n as createDiscordSendReceiptFromResults, t as createDiscordSendReceipt } from "./send.receipt-Cnhoautb.js";
+import { n as formatDiscordApprovalDisplayValue } from "./approval-message-safety-XGFPbDoI.js";
+import { n as notifyDiscordInboundEventOutboundPayloadSuccess, t as discordInboundEventDelivery } from "./inbound-event-delivery-De2qxTrP.js";
+import { a as sendDiscordComponentMessageLazy, i as resolveDiscordComponentSpec, n as buildDiscordPresentationPayload, t as DISCORD_PRESENTATION_CAPABILITIES } from "./outbound-components-B2PL0ooH.js";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createReplyToFanout, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
+import { attachChannelToResult, createAttachedChannelResultAdapter } from "openclaw/plugin-sdk/channel-send-result";
 import { getReplyPayloadTtsSupplement, resolvePayloadMediaUrls, sendPayloadMediaSequenceOrFallback, sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { attachChannelToResult, createAttachedChannelResultAdapter } from "openclaw/plugin-sdk/channel-send-result";
 import { questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
 //#region extensions/discord/src/media-detection.ts
 const DISCORD_VIDEO_MEDIA_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -59,7 +61,7 @@ function normalizeDiscordApprovalPayload(payload) {
 }
 //#endregion
 //#region extensions/discord/src/outbound-send-context.ts
-const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-CdkZ6zeW.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-rQIffSYu.js").then((n) => n.t));
 function resolveDiscordOutboundTarget(params) {
 	if (params.threadId == null) return params.to;
 	const threadId = normalizeOptionalStringifiedId(params.threadId) ?? "";
@@ -95,9 +97,10 @@ async function createDiscordPayloadSendContext(ctx) {
 }
 //#endregion
 //#region extensions/discord/src/outbound-payload.ts
+const log$1 = createSubsystemLogger("discord/outbound");
 function resolveDiscordDeliveryProgress(ctx) {
 	return ctx.onDeliveryResult ? async (result) => {
-		await ctx.onDeliveryResult?.(attachChannelToResult("discord", result));
+		await ctx.onDeliveryResult?.(attachChannelToResult("discord", toDiscordOutboundDeliveryResult(result)));
 	} : void 0;
 }
 function createDiscordUnknownPayloadResult(target) {
@@ -116,7 +119,8 @@ function resolveDiscordDeliveryOptions(ctx, sendContext, reply = sendContext.res
 		reply,
 		accountId: ctx.accountId ?? void 0,
 		silent: ctx.silent ?? void 0,
-		cfg: ctx.cfg
+		cfg: ctx.cfg,
+		onPlatformSendDispatch: ctx.onPlatformSendDispatch
 	};
 }
 function resolveDiscordFormattedDeliveryOptions(ctx, sendContext, reply = sendContext.resolveReply()) {
@@ -144,37 +148,51 @@ async function sendDiscordOutboundPayload(params) {
 	const sendContext = await createDiscordPayloadSendContext(ctx);
 	if (payload.audioAsVoice && mediaUrls.length > 0) {
 		const voiceReply = sendContext.resolveReply();
-		let deliveredVoice = false;
-		let lastResult;
+		let voiceFailure;
+		let lastResult = createDiscordUnknownPayloadResult(sendContext.target);
 		try {
 			const voiceUrl = expectDefined(mediaUrls.at(0), "non-empty Discord voice media URLs");
-			lastResult = await sendContext.sendVoice(sendContext.target, voiceUrl, { ...resolveDiscordDeliveryOptions(ctx, sendContext, voiceReply) });
-			deliveredVoice = true;
+			lastResult = await sendContext.sendVoice(sendContext.target, voiceUrl, {
+				...resolveDiscordDeliveryOptions(ctx, sendContext, voiceReply),
+				mediaAccess: ctx.mediaAccess,
+				mediaLocalRoots: ctx.mediaLocalRoots,
+				mediaReadFile: ctx.mediaReadFile
+			});
 		} catch (err) {
+			if (hasDiscordMessageCreateAmbiguity(err)) throw err;
 			const supplement = getReplyPayloadTtsSupplement(payload);
 			const visibleFallbackText = payload.text?.trim() ? payload.text : void 0;
 			const hiddenFallbackText = supplement?.visibleTextAlreadyDelivered ? void 0 : supplement?.spokenText;
 			const fallbackText = visibleFallbackText ?? hiddenFallbackText;
-			if (!fallbackText) if (supplement?.visibleTextAlreadyDelivered) lastResult = createDiscordUnknownPayloadResult(sendContext.target);
-			else throw err;
-			else lastResult = await sendContext.send(sendContext.target, fallbackText, {
+			if (!fallbackText && !supplement?.visibleTextAlreadyDelivered) throw err;
+			log$1.warn("discord voice send failed; continuing without voice", { error: err });
+			if (fallbackText) await sendContext.send(sendContext.target, fallbackText, {
 				verbose: false,
 				...resolveDiscordFormattedDeliveryOptions(ctx, sendContext, voiceReply),
 				onDeliveryResult: resolveDiscordDeliveryProgress(ctx)
 			});
+			voiceFailure = { error: err };
 		}
-		if (deliveredVoice) await ctx.onDeliveryResult?.(attachChannelToResult("discord", lastResult));
-		if (deliveredVoice && payload.text?.trim()) lastResult = await sendContext.send(sendContext.target, payload.text, {
-			verbose: false,
-			...resolveDiscordFormattedDeliveryOptions(ctx, sendContext),
-			onDeliveryResult: resolveDiscordDeliveryProgress(ctx)
-		});
-		for (const mediaUrl of mediaUrls.slice(1)) lastResult = await sendContext.send(sendContext.target, "", {
-			verbose: false,
-			...resolveDiscordMediaDeliveryOptions(ctx, sendContext, mediaUrl),
-			onDeliveryResult: resolveDiscordDeliveryProgress(ctx)
-		});
-		return attachChannelToResult("discord", lastResult);
+		if (!voiceFailure) {
+			await ctx.onDeliveryResult?.(attachChannelToResult("discord", toDiscordOutboundDeliveryResult(lastResult)));
+			if (payload.text?.trim()) lastResult = await sendContext.send(sendContext.target, payload.text, {
+				verbose: false,
+				...resolveDiscordFormattedDeliveryOptions(ctx, sendContext),
+				onDeliveryResult: resolveDiscordDeliveryProgress(ctx)
+			});
+		}
+		for (const mediaUrl of mediaUrls.slice(1)) try {
+			lastResult = await sendContext.send(sendContext.target, "", {
+				verbose: false,
+				...resolveDiscordMediaDeliveryOptions(ctx, sendContext, mediaUrl),
+				onDeliveryResult: resolveDiscordDeliveryProgress(ctx)
+			});
+		} catch (err) {
+			if (!voiceFailure) throw err;
+			log$1.warn("discord remaining media send failed after voice failure", { error: err });
+		}
+		if (voiceFailure) throw voiceFailure.error;
+		return attachChannelToResult("discord", toDiscordOutboundDeliveryResult(lastResult));
 	}
 	const componentSpec = await resolveDiscordComponentSpec(payload);
 	if (!componentSpec) {
@@ -182,7 +200,7 @@ async function sendDiscordOutboundPayload(params) {
 		const nativeComponents = Array.isArray(discordData.components) ? discordData.components : void 0;
 		const embeds = Array.isArray(discordData.embeds) ? discordData.embeds : void 0;
 		const filename = normalizeOptionalString(discordData.filename);
-		if (nativeComponents || embeds?.length || filename) return attachChannelToResult("discord", await sendPayloadMediaSequenceOrFallback({
+		if (nativeComponents || embeds?.length || filename) return attachChannelToResult("discord", toDiscordOutboundDeliveryResult(await sendPayloadMediaSequenceOrFallback({
 			text: payload.text ?? "",
 			mediaUrls,
 			fallbackResult: createDiscordUnknownPayloadResult(sendContext.target),
@@ -202,17 +220,40 @@ async function sendDiscordOutboundPayload(params) {
 				filename: isFirst ? filename : void 0,
 				onDeliveryResult: resolveDiscordDeliveryProgress(ctx)
 			})
-		}));
-		return await sendTextMediaPayload({
+		})));
+		const payloadContext = {
+			...ctx,
+			payload
+		};
+		const deliveredResults = [];
+		let createdThreadId;
+		payloadContext.onDeliveryResult = async (result) => {
+			await ctx.onDeliveryResult?.(result);
+			const threadId = result.receipt?.threadId;
+			if (threadId && payloadContext.threadId == null) {
+				payloadContext.threadId = threadId;
+				createdThreadId = threadId;
+			}
+			if (createdThreadId && result.target?.kind === "channel" && result.receipt) deliveredResults.push({
+				messageId: result.messageId,
+				channelId: result.target.id,
+				receipt: result.receipt
+			});
+		};
+		const result = await sendTextMediaPayload({
 			channel: "discord",
-			ctx: {
-				...ctx,
-				payload
-			},
+			ctx: payloadContext,
 			adapter: params.fallbackAdapter
 		});
+		return createdThreadId ? {
+			...result,
+			receipt: createDiscordSendReceiptFromResults({
+				results: deliveredResults,
+				threadId: createdThreadId
+			})
+		} : result;
 	}
-	return attachChannelToResult("discord", await sendPayloadMediaSequenceOrFallback({
+	return attachChannelToResult("discord", toDiscordOutboundDeliveryResult(await sendPayloadMediaSequenceOrFallback({
 		text: payload.text ?? "",
 		mediaUrls,
 		fallbackResult: createDiscordUnknownPayloadResult(sendContext.target),
@@ -233,13 +274,14 @@ async function sendDiscordOutboundPayload(params) {
 				onDeliveryResult: resolveDiscordDeliveryProgress(ctx)
 			});
 		}
-	}));
+	})));
 }
 //#endregion
 //#region extensions/discord/src/outbound-adapter.ts
 const DISCORD_TEXT_CHUNK_LIMIT = 2e3;
-const loadDiscordThreadBindings = createLazyRuntimeModule(() => import("./thread-bindings-C-M-ly7P.js").then((n) => n.t));
-const loadDiscordComponentSendRuntime = createLazyRuntimeModule(() => import("./send.components-5uqwkjgE.js").then((n) => n.i));
+const log = createSubsystemLogger("discord/outbound");
+const loadDiscordThreadBindings = createLazyRuntimeModule(() => import("./thread-bindings-VlymUnbz.js").then((n) => n.t));
+const loadDiscordComponentSendRuntime = createLazyRuntimeModule(() => import("./send.components-ChK1wS7w.js").then((n) => n.i));
 function resolveDiscordWebhookIdentity(params) {
 	const usernameRaw = normalizeOptionalString(params.identity?.name);
 	const fallbackUsername = normalizeOptionalString(params.binding.label) ?? params.binding.agentId;
@@ -270,7 +312,8 @@ async function maybeSendDiscordWebhookText(params) {
 		cfg: params.cfg,
 		replyTo: params.replyToId ?? void 0,
 		username: persona.username,
-		avatarUrl: persona.avatarUrl
+		avatarUrl: persona.avatarUrl,
+		onPlatformSendDispatch: params.onPlatformSendDispatch
 	});
 }
 async function resolveDiscordOutboundMessageSend(params) {
@@ -294,8 +337,9 @@ async function resolveDiscordOutboundMessageSend(params) {
 			cfg: params.cfg,
 			...resolveDiscordFormattingOptions({ formatting: params.formatting }),
 			onDeliveryResult: params.onDeliveryResult ? async (result) => {
-				await params.onDeliveryResult?.(attachChannelToResult("discord", result));
-			} : void 0
+				await params.onDeliveryResult?.(attachChannelToResult("discord", toDiscordOutboundDeliveryResult(result)));
+			} : void 0,
+			onPlatformSendDispatch: params.onPlatformSendDispatch
 		}
 	};
 }
@@ -334,27 +378,41 @@ const discordOutbound = {
 		channel: "discord",
 		sendText: async (ctx) => {
 			if (!ctx.silent) {
-				const webhookResult = await maybeSendDiscordWebhookText({
-					cfg: ctx.cfg,
-					text: ctx.text,
-					threadId: ctx.threadId,
-					accountId: ctx.accountId,
-					identity: ctx.identity,
-					replyToId: ctx.replyToId
-				}).catch(() => null);
-				if (webhookResult) return webhookResult;
+				let webhookSelected = false;
+				try {
+					const webhookResult = await maybeSendDiscordWebhookText({
+						cfg: ctx.cfg,
+						text: ctx.text,
+						threadId: ctx.threadId,
+						accountId: ctx.accountId,
+						identity: ctx.identity,
+						replyToId: ctx.replyToId,
+						onPlatformSendDispatch: ctx.onPlatformSendDispatch ? async () => {
+							webhookSelected = true;
+							await ctx.onPlatformSendDispatch?.();
+						} : void 0
+					});
+					if (webhookResult) return toDiscordOutboundDeliveryResult(webhookResult);
+				} catch (error) {
+					if (webhookSelected) throw error;
+					log.warn("discord webhook persona send failed; falling back to bot send", { error });
+				}
 			}
 			const { send, target, options } = await resolveDiscordOutboundMessageSend(ctx);
-			return await send(target, ctx.text, options);
+			return toDiscordOutboundDeliveryResult(await send(target, ctx.text, options));
 		},
 		sendMedia: async (ctx) => {
 			const { send, target, options } = await resolveDiscordOutboundMessageSend(ctx);
-			if (ctx.audioAsVoice && ctx.mediaUrl) return await (resolveOutboundSendDep(ctx.deps, "discordVoice") ?? (await loadDiscordSendRuntime()).sendVoiceMessageDiscord)(target, ctx.mediaUrl, {
+			if (ctx.audioAsVoice && ctx.mediaUrl) return toDiscordOutboundDeliveryResult(await (resolveOutboundSendDep(ctx.deps, "discordVoice") ?? (await loadDiscordSendRuntime()).sendVoiceMessageDiscord)(target, ctx.mediaUrl, {
 				cfg: ctx.cfg,
 				reply: options.reply,
 				accountId: ctx.accountId ?? void 0,
-				silent: ctx.silent ?? void 0
-			});
+				silent: ctx.silent ?? void 0,
+				mediaAccess: ctx.mediaAccess,
+				mediaLocalRoots: ctx.mediaLocalRoots,
+				mediaReadFile: ctx.mediaReadFile,
+				onPlatformSendDispatch: ctx.onPlatformSendDispatch
+			}));
 			const mediaOptions = {
 				...options,
 				mediaUrl: ctx.mediaUrl,
@@ -363,23 +421,53 @@ const discordOutbound = {
 				mediaReadFile: ctx.mediaReadFile
 			};
 			if (ctx.text.trim() && ctx.mediaUrl && isLikelyDiscordVideoMedia(ctx.mediaUrl)) {
-				await send(target, ctx.text, options);
-				return await send(target, "", {
+				const captionResult = await send(target, ctx.text, options);
+				const mediaResult = await send(captionResult.receipt?.threadId ? `channel:${captionResult.receipt.threadId}` : target, "", {
 					...mediaOptions,
 					reply: options.reply?.scope === "all" ? options.reply : void 0
 				});
+				const threadId = captionResult.receipt?.threadId;
+				if (!threadId) return toDiscordOutboundDeliveryResult(mediaResult);
+				return toDiscordOutboundDeliveryResult({
+					...captionResult,
+					receipt: createDiscordSendReceiptFromResults({
+						results: [captionResult, mediaResult],
+						threadId
+					})
+				});
 			}
-			return await send(target, ctx.text, mediaOptions);
+			return toDiscordOutboundDeliveryResult(await send(target, ctx.text, mediaOptions));
 		},
-		sendPoll: async ({ cfg, to, poll, accountId, threadId, silent }) => await (await loadDiscordSendRuntime()).sendPollDiscord(resolveDiscordOutboundTarget({
-			to,
-			threadId
-		}), poll, {
-			accountId: accountId ?? void 0,
-			silent: silent ?? void 0,
-			cfg
-		})
+		sendPoll: async ({ cfg, to, poll, content, accountId, threadId, silent, sessionKey, inboundEventKind, onPlatformSendDispatch }) => {
+			if (!createDiscordActionGate({
+				cfg,
+				accountId
+			})("polls")) throw new Error("Discord polls are disabled.");
+			const outboundTo = resolveDiscordOutboundTarget({
+				to,
+				threadId
+			});
+			const result = await (await loadDiscordSendRuntime()).sendPollDiscord(outboundTo, poll, {
+				accountId: accountId ?? void 0,
+				content,
+				threadId: threadId ?? void 0,
+				silent: silent ?? void 0,
+				cfg,
+				onPlatformSendDispatch
+			});
+			discordInboundEventDelivery.notify({
+				sessionKey,
+				inboundEventKind,
+				to: outboundTo,
+				accountId
+			});
+			return result;
+		}
 	}),
+	adoptTargetFromDelivery: ({ result }) => {
+		const threadId = normalizeOptionalStringifiedId(result.receipt?.threadId);
+		return threadId ? { threadId } : null;
+	},
 	afterDeliverPayload: async ({ cfg, target, payload, results }) => {
 		notifyDiscordInboundEventOutboundPayloadSuccess({
 			payload,
@@ -397,9 +485,10 @@ const discordOutbound = {
 				to: target.to,
 				threadId: target.threadId
 			});
+			const channelId = result.target?.kind === "channel" ? result.target.id : to;
 			questionGatewayRuntime.registerChannelDelivery({
 				questionId,
-				deliveryId: `discord:${target.accountId ?? "default"}:${result.channelId ?? to}:${result.messageId}`,
+				deliveryId: `discord:${target.accountId ?? "default"}:${channelId}:${result.messageId}`,
 				finalize: async (statusLine) => {
 					const { editDiscordComponentMessage } = await loadDiscordComponentSendRuntime();
 					await editDiscordComponentMessage(to, result.messageId, {

package/dist/{outbound-components-C7GVyfPh.js → outbound-components-B2PL0ooH.js}

@@ -1,4 +1,4 @@
-import { h as readDiscordComponentSpec } from "./outbound-session-route-H-HoyH5U.js";
+import { m as readDiscordComponentSpec } from "./components-ezGKo_Yh.js";
 import { createLazyRuntimeModule, createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/discord/src/outbound-components.ts
 const DISCORD_MESSAGE_COMPONENT_LIMIT = 40;
@@ -30,11 +30,11 @@ const DISCORD_PRESENTATION_CAPABILITIES = {
 		}
 	}
 };
-const loadDiscordComponentSend = createLazyRuntimeNamedExport(() => import("./send.components-5uqwkjgE.js").then((n) => n.i), "sendDiscordComponentMessage");
+const loadDiscordComponentSend = createLazyRuntimeNamedExport(() => import("./send.components-ChK1wS7w.js").then((n) => n.i), "sendDiscordComponentMessage");
 async function sendDiscordComponentMessageLazy(...args) {
 	return await (await loadDiscordComponentSend())(...args);
 }
-const loadDiscordSharedInteractive = createLazyRuntimeModule(() => import("./outbound-session-route-H-HoyH5U.js").then((n) => n.o));
+const loadDiscordSharedInteractive = createLazyRuntimeModule(() => import("./components-ezGKo_Yh.js").then((n) => n.a));
 function addPayloadTextFallback(spec, payload) {
 	return spec.text ? spec : {
 		...spec,

package/dist/owner-access-Bg41VzAf.js

@@ -0,0 +1,107 @@
+import { l as resolveDiscordAccountAllowFrom } from "./accounts-DNl-oCEw.js";
+import { c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordCommandOwnerAllowFrom, f as resolveDiscordGuildEntry, n as isDiscordGroupAllowedByPolicy, p as resolveDiscordMemberAccessState, r as normalizeDiscordAllowList, t as allowListMatches } from "./allow-list-BDMimASD.js";
+import { resolveCommandAuthorizedFromAuthorizers } from "openclaw/plugin-sdk/command-auth-native";
+import { resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
+//#region extensions/discord/src/voice/access.ts
+async function authorizeDiscordVoiceIngress(params) {
+	const groupPolicy = params.groupPolicy ?? resolveOpenProviderRuntimeGroupPolicy({
+		providerConfigPresent: params.cfg.channels?.discord !== void 0,
+		groupPolicy: params.discordConfig.groupPolicy,
+		defaultGroupPolicy: params.cfg.channels?.defaults?.groupPolicy
+	}).groupPolicy;
+	const guildInfo = resolveDiscordGuildEntry({
+		guild: params.guild ?? {
+			id: params.guildId,
+			...params.guildName ? { name: params.guildName } : {}
+		},
+		guildId: params.guildId,
+		guildEntries: params.discordConfig.guilds
+	});
+	const channelConfig = params.channelId ? resolveDiscordChannelConfigWithFallback({
+		guildInfo,
+		channelId: params.channelId,
+		channelName: params.channelName,
+		channelSlug: params.channelSlug,
+		parentId: params.parentId,
+		parentName: params.parentName,
+		parentSlug: params.parentSlug,
+		scope: params.scope
+	}) : null;
+	if (channelConfig?.enabled === false) return {
+		ok: false,
+		message: "This channel is disabled."
+	};
+	const channelAllowlistConfigured = Boolean(guildInfo?.channels) && Object.keys(guildInfo?.channels ?? {}).length > 0;
+	if (!params.channelId && groupPolicy === "allowlist" && channelAllowlistConfigured) return {
+		ok: false,
+		message: `${params.channelLabel ?? "This channel"} is not allowlisted for voice commands.`
+	};
+	const channelAllowed = channelConfig ? channelConfig.allowed : !channelAllowlistConfigured;
+	if (!isDiscordGroupAllowedByPolicy({
+		groupPolicy,
+		guildAllowlisted: Boolean(guildInfo),
+		channelAllowlistConfigured,
+		channelAllowed
+	}) || channelConfig?.allowed === false) return {
+		ok: false,
+		message: `${params.channelLabel ?? "This channel"} is not allowlisted for voice commands.`
+	};
+	const { hasAccessRestrictions, memberAllowed } = resolveDiscordMemberAccessState({
+		channelConfig,
+		guildInfo,
+		memberRoleIds: params.memberRoleIds,
+		sender: params.sender,
+		allowNameMatching: false
+	});
+	const admissionAllowList = normalizeDiscordAllowList(params.admissionAllowFrom ?? params.discordConfig.allowFrom ?? params.discordConfig.allowFrom, [
+		"discord:",
+		"user:",
+		"pk:"
+	]);
+	const admissionAllowed = admissionAllowList ? allowListMatches(admissionAllowList, params.sender, { allowNameMatching: false }) : false;
+	const useAccessGroups = params.useAccessGroups ?? true;
+	return resolveCommandAuthorizedFromAuthorizers({
+		useAccessGroups,
+		authorizers: useAccessGroups ? [{
+			configured: admissionAllowList != null,
+			allowed: admissionAllowed
+		}, {
+			configured: hasAccessRestrictions,
+			allowed: memberAllowed
+		}] : [{
+			configured: hasAccessRestrictions,
+			allowed: memberAllowed
+		}],
+		modeWhenAccessGroupsOff: "configured"
+	}) ? {
+		ok: true,
+		channelConfig
+	} : {
+		ok: false,
+		message: "You are not authorized to use this command."
+	};
+}
+//#endregion
+//#region extensions/discord/src/voice/config.ts
+function resolveDiscordVoiceEnabled(voice) {
+	if (voice?.enabled !== void 0) return voice.enabled;
+	return voice !== void 0;
+}
+//#endregion
+//#region extensions/discord/src/voice/owner-access.ts
+function resolveDiscordVoiceAccess(params) {
+	const commandOwnerAllowFrom = resolveDiscordCommandOwnerAllowFrom(params.cfg);
+	if (commandOwnerAllowFrom) return {
+		admissionAllowFrom: commandOwnerAllowFrom,
+		ownerAllowFrom: commandOwnerAllowFrom
+	};
+	return {
+		admissionAllowFrom: resolveDiscordAccountAllowFrom({
+			cfg: params.cfg,
+			accountId: params.accountId
+		}) ?? params.discordConfig.allowFrom ?? [],
+		ownerAllowFrom: []
+	};
+}
+//#endregion
+export { resolveDiscordVoiceEnabled as n, authorizeDiscordVoiceIngress as r, resolveDiscordVoiceAccess as t };

package/dist/{pluralkit-CD4B11JB.js → pluralkit-dUl4v1X3.js}

@@ -1,4 +1,4 @@
-import { Yt as __exportAll } from "./chunk-DX4jpFQP.js";
+import { en as __exportAll } from "./retry-DNsVTeTo.js";
 import { readProviderJsonObjectResponse, readResponseTextLimited } from "openclaw/plugin-sdk/provider-http";
 import { resolveFetch } from "openclaw/plugin-sdk/fetch-runtime";
 import { buildTimeoutAbortSignal } from "openclaw/plugin-sdk/extension-shared";