@openclaw/discord 2026.9.8 → 2026.10.1-beta.2

package/dist/.setup/{runtime-FN000lxA.mjs → runtime-CwUA0RLr.mjs}

@@ -1,21 +1,83 @@
-import { h as readDiscordComponentSpec, m as coerceDiscordComponentParam } from "./components-Cq1PvIpN.mjs";
-import { l as resolveDiscordChannelConfigWithFallback, o as normalizeDiscordSlug, r as isDiscordGroupAllowedByPolicy, t as isDiscordThreadChannelType, y as resolveGroupDmAllow } from "./channel-type-DRCrEMss.mjs";
-import { o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId, t as createDiscordActionGate } from "./accounts-ChaMcixG.mjs";
-import { r as sendDiscordComponentMessage } from "./send.components-DxQAMfES.mjs";
-import { b as parseDiscordTarget, f as createReusableDiscordReplyReference, m as resolveDiscordReplyReference, x as resolveDiscordChannelId } from "./retry-pz_cSha2.mjs";
-import { C as hasAnyChannelPermissionDiscord, H as getGateway, P as createDiscordRuntimeAccountContext, _ as canManageGuildMemberRoleDiscord, b as fetchChannelPermissionsDiscord, n as buildDiscordTextChunks, u as resolveDiscordTargetChannelId, v as canManageGuildRoleDiscord, w as hasAnyGuildPermissionDiscord, y as canViewDiscordGuildChannel } from "./send.shared-DGFkbkQR.mjs";
-import { r as sendStickerDiscord, t as sendMessageDiscord } from "./send.outbound-BISKnb-a.mjs";
-import { n as getPresence } from "./presence-cache-Di3H3DIU.mjs";
-import { A as listScheduledEventsDiscord, B as moveChannelDiscord, C as fetchChannelInfoDiscord, D as fetchVoiceStatusDiscord, E as fetchRoleInfoDiscord, F as uploadEmojiDiscord, H as setChannelPermissionDiscord, I as uploadStickerDiscord, L as createChannelDiscord, M as resolveEventCoverImage, N as timeoutMemberDiscord, O as kickMemberDiscord, P as listGuildEmojisDiscord, R as deleteChannelDiscord, S as createScheduledEventDiscord, T as fetchMemberInfoDiscord, V as removeChannelPermissionDiscord, _ as readMessagesDiscord, a as removeReactionDiscord, b as addRoleDiscord, d as deleteMessageDiscord, f as editMessageDiscord, g as pinMessageDiscord, h as listThreadsDiscord, i as removeOwnReactionsDiscord, j as removeRoleDiscord, k as listGuildChannelsDiscord, l as DiscordThreadInitialMessageError, m as listPinsDiscord, n as fetchReactionsDiscord, p as fetchMessageDiscord, r as reactMessageDiscord, s as sendVoiceMessageDiscord, u as createThreadDiscord, v as searchMessagesDiscord, w as fetchGuildInfoDiscord, x as banMemberDiscord, y as unpinMessageDiscord, z as editChannelDiscord } from "./send-CrfEI6Bs.mjs";
-import "./targets-0KUcEIYx.mjs";
+import { h as readDiscordComponentSpec, m as coerceDiscordComponentParam } from "./components-CzXLR3QH.mjs";
+import { b as resolveGroupDmAllow, i as isDiscordGroupAllowedByPolicy, r as hasConfiguredDiscordChannels, s as normalizeDiscordSlug, t as isDiscordThreadChannelType, u as resolveDiscordChannelConfigWithFallback } from "./channel-type-D1_b5UhU.mjs";
+import { o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId, t as createDiscordActionGate } from "./accounts-DXHCL8Zm.mjs";
+import { r as sendDiscordComponentMessage } from "./send.components-RqvgmCs3.mjs";
+import { b as parseDiscordTarget, f as createReusableDiscordReplyReference, m as resolveDiscordReplyReference, x as resolveDiscordChannelId } from "./retry-BKzO25k4.mjs";
+import { C as hasAnyChannelPermissionDiscord, H as getGateway, P as createDiscordRuntimeAccountContext, _ as canManageGuildMemberRoleDiscord, b as fetchChannelPermissionsDiscord, n as buildDiscordTextChunks, u as resolveDiscordTargetChannelId, v as canManageGuildRoleDiscord, w as hasAnyGuildPermissionDiscord, y as canViewDiscordGuildChannel } from "./send.shared-BQIUh6Vn.mjs";
+import { r as sendStickerDiscord, t as sendMessageDiscord } from "./send.outbound-B4QHSEzm.mjs";
+import { n as getPresence } from "./presence-cache-Dg3_dADn.mjs";
+import { A as listScheduledEventsDiscord, B as moveChannelDiscord, C as fetchChannelInfoDiscord, D as fetchVoiceStatusDiscord, E as fetchRoleInfoDiscord, F as uploadEmojiDiscord, H as setChannelPermissionDiscord, I as uploadStickerDiscord, L as createChannelDiscord, M as resolveEventCoverImage, N as timeoutMemberDiscord, O as kickMemberDiscord, P as listGuildEmojisDiscord, R as deleteChannelDiscord, S as createScheduledEventDiscord, T as fetchMemberInfoDiscord, V as removeChannelPermissionDiscord, _ as readMessagesDiscord, a as removeReactionDiscord, b as addRoleDiscord, d as deleteMessageDiscord, f as editMessageDiscord, g as pinMessageDiscord, h as listThreadsDiscord, i as removeOwnReactionsDiscord, j as removeRoleDiscord, k as listGuildChannelsDiscord, l as DiscordThreadInitialMessageError, m as listPinsDiscord, n as fetchReactionsDiscord, p as fetchMessageDiscord, r as reactMessageDiscord, s as sendVoiceMessageDiscord, u as createThreadDiscord, v as searchMessagesDiscord, w as fetchGuildInfoDiscord, x as banMemberDiscord, y as unpinMessageDiscord, z as editChannelDiscord } from "./send-2X7m2Zmw.mjs";
+import "./targets-Lf8D55w-.mjs";
+import { asBoolean, asOptionalRecord, isRecord, normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ChannelType, PermissionFlagsBits } from "discord-api-types/v10";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { asBoolean, asOptionalRecord, isRecord, normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChannelProgressDraftCompositor } from "openclaw/plugin-sdk/channel-outbound";
 import { resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
 import { assertMediaNotDataUrl, jsonResult, parseAvailableTags, readNonNegativeIntegerParam, readPositiveIntegerParam, readReactionParams, readStringArrayParam, readStringParam, withNormalizedTimestamp } from "openclaw/plugin-sdk/channel-actions";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-resolution";
 import { readBooleanParam } from "openclaw/plugin-sdk/boolean-param";
+//#region extensions/discord/src/actions/runtime.messaging.thread-list.ts
+function readDiscordChannelStringField(value, ...keys) {
+	if (!value || typeof value !== "object") return;
+	const record = value;
+	for (const key of keys) {
+		const candidate = record[key];
+		if (typeof candidate === "string" && candidate.trim()) return candidate.trim();
+	}
+}
+function readDiscordChannelType(value) {
+	if (!value || typeof value !== "object") return;
+	const type = value.type;
+	return typeof type === "number" ? type : void 0;
+}
+function isDiscordThreadChannel(value) {
+	return isDiscordThreadChannelType(readDiscordChannelType(value));
+}
+function filterDiscordActiveThreadList(params) {
+	const response = asOptionalRecord(params.value);
+	if (!Array.isArray(response?.threads) || !Array.isArray(response.members)) throw new Error("Unexpected Discord response for active thread list.");
+	const { guildId, channelId, parent } = params;
+	const parentAncestor = {
+		channelId,
+		channelSlug: parent.channelSlug,
+		...parent.channelName ? { channelName: parent.channelName } : {}
+	};
+	const threads = [];
+	const threadIds = /* @__PURE__ */ new Set();
+	for (const thread of response.threads) {
+		const id = readDiscordChannelStringField(thread, "id");
+		const parentId = readDiscordChannelStringField(thread, "parent_id");
+		const threadGuildId = readDiscordChannelStringField(thread, "guild_id");
+		const channelType = readDiscordChannelType(thread);
+		if (!id || parentId !== channelId || threadGuildId !== guildId || !isDiscordThreadChannelType(channelType)) continue;
+		const channelName = readDiscordChannelStringField(thread, "name");
+		const target = {
+			channelId: id,
+			channelSlug: channelName ? normalizeDiscordSlug(channelName) : id,
+			guildId,
+			metadataKnown: true,
+			ancestryComplete: parent.ancestryComplete,
+			ancestors: [parentAncestor, ...parent.ancestors],
+			channelType,
+			scope: "thread",
+			parentId: channelId,
+			parentSlug: parent.channelSlug,
+			...channelName ? { channelName } : {},
+			...parent.channelName ? { parentName: parent.channelName } : {}
+		};
+		if (!params.isAllowed(target)) continue;
+		threads.push(thread);
+		threadIds.add(id);
+	}
+	return {
+		threads,
+		members: response.members.filter((member) => {
+			const id = readDiscordChannelStringField(member, "id");
+			return id !== void 0 && threadIds.has(id);
+		})
+	};
+}
+//#endregion
 //#region extensions/discord/src/actions/runtime.shared.ts
 /** Discord REST auto_archive_duration allowlist (minutes). */
 const DISCORD_AUTO_ARCHIVE_MINUTES = /* @__PURE__ */ new Set([
@@ -25,8 +87,7 @@ const DISCORD_AUTO_ARCHIVE_MINUTES = /* @__PURE__ */ new Set([
 	10080
 ]);
 function readDiscordParentIdParam(params) {
-	if (params.clearParent === true) return null;
-	if (params.parentId === null) return null;
+	if (params.clearParent === true || params.parentId === null) return null;
 	return readStringParam(params, "parentId");
 }
 /**
@@ -51,10 +112,10 @@ function readDiscordChannelCreateParams(params) {
 	return {
 		guildId: readStringParam(params, "guildId", { required: true }),
 		name: readStringParam(params, "name", { required: true }),
-		type: readNonNegativeIntegerParam(params, "channelType") ?? readNonNegativeIntegerParam(params, "type") ?? void 0,
+		type: readNonNegativeIntegerParam(params, "channelType") ?? readNonNegativeIntegerParam(params, "type"),
 		parentId: parentId ?? void 0,
-		topic: readStringParam(params, "topic") ?? void 0,
-		position: readNonNegativeIntegerParam(params, "position") ?? void 0,
+		topic: readStringParam(params, "topic"),
+		position: readNonNegativeIntegerParam(params, "position"),
 		nsfw: asBoolean(params.nsfw)
 	};
 }
@@ -62,12 +123,12 @@ function readDiscordChannelEditParams(params) {
 	const parentId = readDiscordParentIdParam(params);
 	return {
 		channelId: readStringParam(params, "channelId", { required: true }),
-		name: readStringParam(params, "name") ?? void 0,
-		topic: readStringParam(params, "topic") ?? void 0,
-		position: readNonNegativeIntegerParam(params, "position") ?? void 0,
-		parentId: parentId === void 0 ? void 0 : parentId,
+		name: readStringParam(params, "name"),
+		topic: readStringParam(params, "topic"),
+		position: readNonNegativeIntegerParam(params, "position"),
+		parentId,
 		nsfw: asBoolean(params.nsfw),
-		rateLimitPerUser: readNonNegativeIntegerParam(params, "rateLimitPerUser") ?? void 0,
+		rateLimitPerUser: readNonNegativeIntegerParam(params, "rateLimitPerUser"),
 		archived: asBoolean(params.archived),
 		locked: asBoolean(params.locked),
 		autoArchiveDuration: readDiscordAutoArchiveDurationParam(params, "autoArchiveDuration"),
@@ -79,15 +140,12 @@ function readDiscordChannelMoveParams(params) {
 	return {
 		guildId: readStringParam(params, "guildId", { required: true }),
 		channelId: readStringParam(params, "channelId", { required: true }),
-		parentId: parentId === void 0 ? void 0 : parentId,
-		position: readNonNegativeIntegerParam(params, "position") ?? void 0
+		parentId,
+		position: readNonNegativeIntegerParam(params, "position")
 	};
 }
 //#endregion
 //#region extensions/discord/src/actions/runtime.messaging.shared.ts
-function hasDiscordGuildEntries(guilds) {
-	return Boolean(guilds && Object.keys(guilds).length > 0);
-}
 function allowsAllDiscordGuildChannels(channels) {
 	const wildcard = channels?.["*"];
 	if (!wildcard || wildcard.enabled === false) return false;
@@ -157,21 +215,34 @@ async function resolveDiscordReadAncestry(params) {
 		complete: !parentId
 	};
 }
-function readDiscordChannelStringField(value, ...keys) {
-	if (!value || typeof value !== "object") return;
-	const record = value;
-	for (const key of keys) {
-		const candidate = record[key];
-		if (typeof candidate === "string" && candidate.trim()) return candidate.trim();
+async function buildDiscordReadTarget(params) {
+	const channelName = readDiscordChannelStringField(params.channelInfo, "name");
+	const channelType = readDiscordChannelType(params.channelInfo);
+	const target = {
+		channelId: params.channelId,
+		channelSlug: channelName ? normalizeDiscordSlug(channelName) : params.fallbackSlug,
+		metadataKnown: true,
+		ancestryComplete: true,
+		ancestors: [],
+		...params.guildId ? { guildId: params.guildId } : {},
+		...channelName ? { channelName } : {},
+		...channelType !== void 0 ? { channelType } : {},
+		...isDiscordThreadChannel(params.channelInfo) ? { scope: "thread" } : {}
+	};
+	const ancestry = await resolveDiscordReadAncestry({
+		channelId: params.channelId,
+		parentId: readDiscordChannelStringField(params.channelInfo, "parent_id", "parentId"),
+		loadChannel: params.loadChannel
+	});
+	target.ancestors = ancestry.ancestors;
+	target.ancestryComplete = ancestry.complete;
+	const immediateParent = target.ancestors[0];
+	if (immediateParent) {
+		target.parentId = immediateParent.channelId;
+		if (immediateParent.channelName) target.parentName = immediateParent.channelName;
+		target.parentSlug = immediateParent.channelSlug;
 	}
-}
-function readDiscordChannelType(value) {
-	if (!value || typeof value !== "object") return;
-	const type = value.type;
-	return typeof type === "number" ? type : void 0;
-}
-function isDiscordThreadChannel(value) {
-	return isDiscordThreadChannelType(readDiscordChannelType(value));
+	return target;
 }
 function isDiscordReadAncestryAllowed(params) {
 	for (const ancestor of params.target.ancestors) {
@@ -192,19 +263,13 @@ function isDiscordReadTargetAllowedInGuild(params) {
 	}
 	if (!isDiscordReadAncestryAllowed(params)) return false;
 	if (resolveDiscordChannelConfigWithFallback({
-		guildInfo: params.guildInfo,
-		channelId: params.target.channelId,
-		channelName: params.target.channelName,
-		channelSlug: params.target.channelSlug,
-		parentId: params.target.parentId,
-		parentName: params.target.parentName,
-		parentSlug: params.target.parentSlug,
-		scope: params.target.scope
+		...params.target,
+		guildInfo: params.guildInfo
 	})?.allowed === false) return false;
 	return isDiscordGroupAllowedByPolicy({
 		groupPolicy: params.groupPolicy,
 		guildAllowlisted: Boolean(params.guildInfo),
-		channelAllowlistConfigured: hasDiscordGuildEntries(params.guildInfo?.channels),
+		channelAllowlistConfigured: hasConfiguredDiscordChannels(params.guildInfo?.channels),
 		channelAllowed: true
 	});
 }
@@ -303,23 +368,11 @@ function createDiscordMessagingActionContext(params) {
 		} catch {
 			return fallback;
 		}
-		const channelName = readDiscordChannelStringField(channelInfo, "name");
-		const target = {
-			channelId,
-			channelSlug: channelName ? normalizeDiscordSlug(channelName) : fallback.channelSlug,
-			metadataKnown: true,
-			ancestryComplete: true,
-			ancestors: []
-		};
-		const channelType = readDiscordChannelType(channelInfo);
-		if (channelType !== void 0) target.channelType = channelType;
-		const targetGuildId = readDiscordChannelStringField(channelInfo, "guild_id", "guildId");
-		if (targetGuildId) target.guildId = targetGuildId;
-		if (channelName) target.channelName = channelName;
-		if (isDiscordThreadChannel(channelInfo)) target.scope = "thread";
-		const ancestry = await resolveDiscordReadAncestry({
+		return buildDiscordReadTarget({
 			channelId,
-			parentId: readDiscordChannelStringField(channelInfo, "parent_id", "parentId"),
+			channelInfo,
+			guildId: readDiscordChannelStringField(channelInfo, "guild_id", "guildId"),
+			fallbackSlug: fallback.channelSlug,
 			loadChannel: async (parentId) => {
 				try {
 					return await fetchChannelInfoDiscord(parentId, withOpts());
@@ -328,14 +381,6 @@ function createDiscordMessagingActionContext(params) {
 				}
 			}
 		});
-		target.ancestors = ancestry.ancestors;
-		target.ancestryComplete = ancestry.complete;
-		const immediateParent = target.ancestors[0];
-		if (!immediateParent) return target;
-		target.parentId = immediateParent.channelId;
-		if (immediateParent.channelName) target.parentName = immediateParent.channelName;
-		target.parentSlug = immediateParent.channelSlug;
-		return target;
 	};
 	const isExpandedReadTargetEnabled = (guildInfo, target, currentConversation) => {
 		const groupDmEnabled = accountConfig.dm?.groupEnabled === true && (currentConversation || resolveGroupDmAllow({
@@ -356,14 +401,8 @@ function createDiscordMessagingActionContext(params) {
 			target
 		})) return false;
 		const channelConfig = resolveDiscordChannelConfigWithFallback({
-			guildInfo,
-			channelId: target.channelId,
-			channelName: target.channelName,
-			channelSlug: target.channelSlug,
-			parentId: target.parentId,
-			parentName: target.parentName,
-			parentSlug: target.parentSlug,
-			scope: target.scope
+			...target,
+			guildInfo
 		});
 		return !channelConfig?.matchSource || channelConfig.allowed;
 	};
@@ -376,9 +415,10 @@ function createDiscordMessagingActionContext(params) {
 		options: params.options,
 		accountId,
 		resolveChannelId: () => resolveDiscordChannelId(readStringParam(params.input, "channelId", { required: true })),
-		assertReadTargetAllowed: async ({ guildId, channelId }) => {
+		assertReadTargetAllowed: async ({ guildId, channelId, requireGuildMetadata }) => {
 			const targetChannelId = resolveDiscordChannelId(channelId);
 			const target = await resolveReadTargetContext(targetChannelId);
+			if (requireGuildMetadata && (!guildId || !target.metadataKnown || target.guildId !== guildId)) throw new Error("Discord active thread parent metadata is unavailable.");
 			const currentConversation = isCurrentReadTarget(targetChannelId);
 			if (guildId && target.metadataKnown && target.guildId !== guildId) throw new Error("Discord read target channel is not allowed.");
 			const targetGuildId = guildId || target.guildId;
@@ -409,7 +449,23 @@ function createDiscordMessagingActionContext(params) {
 				channelAllowlistConfigured: false,
 				channelAllowed: true
 			})) throw new Error("Discord read target channel is not allowed.");
-			if (hasDiscordGuildEntries(guildInfo?.channels) && !allowsAllDiscordGuildChannels(guildInfo.channels)) throw new Error(channelTargetRequiredMessage ?? "Discord message search requires channelId or channelIds so each read target can be authorized.");
+			if (hasConfiguredDiscordChannels(guildInfo?.channels) && !allowsAllDiscordGuildChannels(guildInfo.channels)) throw new Error(channelTargetRequiredMessage ?? "Discord message search requires channelId or channelIds so each read target can be authorized.");
+		},
+		filterActiveThreadList: async ({ guildId, channelId, value }) => {
+			const parent = await resolveReadTargetContext(channelId);
+			if (!parent.metadataKnown || parent.guildId !== guildId) throw new Error("Discord active thread parent metadata is unavailable.");
+			const guildInfo = await resolveReadGuildEntry(guildId);
+			return filterDiscordActiveThreadList({
+				value,
+				guildId,
+				channelId,
+				parent,
+				isAllowed: (target) => directOperator && isExpandedReadTargetEnabled(guildInfo, target, false) || isCurrentReadTarget(target.channelId) && isExpandedReadTargetEnabled(guildInfo, target, true) || isDiscordReadTargetAllowedInGuild({
+					groupPolicy,
+					guildInfo,
+					target
+				})
+			});
 		},
 		filterGuildChannelList: async ({ guildId, channels }) => {
 			if (!directOperator) return channels;
@@ -422,45 +478,20 @@ function createDiscordMessagingActionContext(params) {
 			for (const channel of channels) {
 				const channelId = readDiscordChannelStringField(channel, "id");
 				if (!channelId) continue;
-				const channelName = readDiscordChannelStringField(channel, "name");
-				const channelType = readDiscordChannelType(channel);
-				const target = {
+				const target = await buildDiscordReadTarget({
 					channelId,
-					channelSlug: channelName ? normalizeDiscordSlug(channelName) : channelId,
+					channelInfo: channel,
 					guildId,
-					metadataKnown: true,
-					ancestryComplete: true,
-					ancestors: [],
-					...channelName ? { channelName } : {},
-					...channelType !== void 0 ? { channelType } : {},
-					...isDiscordThreadChannel(channel) ? { scope: "thread" } : {}
-				};
-				const ancestry = await resolveDiscordReadAncestry({
-					channelId,
-					parentId: readDiscordChannelStringField(channel, "parent_id", "parentId"),
+					fallbackSlug: channelId,
 					loadChannel: async (parentId) => channelById.get(parentId)
 				});
-				target.ancestors = ancestry.ancestors;
-				target.ancestryComplete = ancestry.complete;
-				const immediateParent = target.ancestors[0];
-				if (immediateParent) {
-					target.parentId = immediateParent.channelId;
-					if (immediateParent.channelName) target.parentName = immediateParent.channelName;
-					target.parentSlug = immediateParent.channelSlug;
-				}
 				if (!isDiscordReadAncestryAllowed({
 					guildInfo,
 					target
 				})) continue;
 				const channelConfig = resolveDiscordChannelConfigWithFallback({
-					guildInfo,
-					channelId,
-					channelName,
-					channelSlug: target.channelSlug,
-					parentId: target.parentId,
-					parentName: target.parentName,
-					parentSlug: target.parentSlug,
-					scope: target.scope
+					...target,
+					guildInfo
 				});
 				if (!channelConfig?.matchSource || channelConfig.allowed) visibleChannels.push(channel);
 			}
@@ -578,7 +609,6 @@ async function resolveGuildIdForGuildAdminAction(params) {
 	return "guild_id" in channel ? channel.guild_id ?? void 0 : void 0;
 }
 function readChannelScopedPermissionTargetId(action, values) {
-	if (action === "eventCreate") return readStringParam(values, "channelId");
 	if (action === "categoryEdit" || action === "categoryDelete") return readStringParam(values, "categoryId");
 	return readStringParam(values, "channelId");
 }
@@ -690,14 +720,16 @@ async function handleDiscordGuildAction(action, params, isActionEnabled, cfg, op
 				} : {}
 			});
 		}
-		case "roleInfo": {
-			if (!isActionEnabled("roleInfo")) throw new Error("Discord role info is disabled.");
+		case "roleInfo":
+		case "eventList": {
+			const roleInfo = action === "roleInfo";
+			if (!isActionEnabled(roleInfo ? "roleInfo" : "events")) throw new Error(roleInfo ? "Discord role info is disabled." : "Discord events are disabled.");
 			const guildId = readStringParam(params, "guildId", { required: true });
 			await assertGuildMetadataReadAllowed(guildId);
-			const roles = await fetchRoleInfoDiscord(guildId, withOpts());
+			const read = roleInfo ? fetchRoleInfoDiscord : listScheduledEventsDiscord;
 			return jsonResult({
 				ok: true,
-				roles
+				[roleInfo ? "roles" : "events"]: await read(guildId, withOpts())
 			});
 		}
 		case "emojiList": {
@@ -723,15 +755,15 @@ async function handleDiscordGuildAction(action, params, isActionEnabled, cfg, op
 			});
 		}
 		case "emojiUpload": {
-			const guildId = readStringParam(params, "guildId", { required: true });
-			const name = readStringParam(params, "name", { required: true });
-			const mediaUrl = readStringParam(params, "mediaUrl", { required: true });
-			const roleIds = readStringArrayParam(params, "roleIds");
+			const upload = {
+				guildId: readStringParam(params, "guildId", { required: true }),
+				name: readStringParam(params, "name", { required: true }),
+				mediaUrl: readStringParam(params, "mediaUrl", { required: true }),
+				roleIds: readStringArrayParam(params, "roleIds")
+			};
 			const emoji = await uploadEmojiDiscord({
-				guildId,
-				name,
-				mediaUrl,
-				roleIds: roleIds?.length ? roleIds : void 0
+				...upload,
+				roleIds: upload.roleIds?.length ? upload.roleIds : void 0
 			}, createDiscordActionOptions({
 				cfg,
 				accountId,
@@ -743,17 +775,12 @@ async function handleDiscordGuildAction(action, params, isActionEnabled, cfg, op
 			});
 		}
 		case "stickerUpload": {
-			const guildId = readStringParam(params, "guildId", { required: true });
-			const name = readStringParam(params, "name", { required: true });
-			const description = readStringParam(params, "description", { required: true });
-			const tags = readStringParam(params, "tags", { required: true });
-			const mediaUrl = readStringParam(params, "mediaUrl", { required: true });
 			const sticker = await uploadStickerDiscord({
-				guildId,
-				name,
-				description,
-				tags,
-				mediaUrl
+				guildId: readStringParam(params, "guildId", { required: true }),
+				name: readStringParam(params, "name", { required: true }),
+				description: readStringParam(params, "description", { required: true }),
+				tags: readStringParam(params, "tags", { required: true }),
+				mediaUrl: readStringParam(params, "mediaUrl", { required: true })
 			}, createDiscordActionOptions({
 				cfg,
 				accountId,
@@ -811,16 +838,6 @@ async function handleDiscordGuildAction(action, params, isActionEnabled, cfg, op
 				voice
 			});
 		}
-		case "eventList": {
-			if (!isActionEnabled("events")) throw new Error("Discord events are disabled.");
-			const guildId = readStringParam(params, "guildId", { required: true });
-			await assertGuildMetadataReadAllowed(guildId);
-			const events = await listScheduledEventsDiscord(guildId, withOpts());
-			return jsonResult({
-				ok: true,
-				events
-			});
-		}
 		case "eventCreate": {
 			const guildId = readStringParam(params, "guildId", { required: true });
 			const name = readStringParam(params, "name", { required: true });
@@ -1001,21 +1018,15 @@ async function handleDiscordMessageManagementAction(ctx) {
 				message
 			});
 		}
-		case "deleteMessage": {
-			if (!ctx.isActionEnabled("messages")) throw new Error("Discord message deletes are disabled.");
-			const channelId = ctx.resolveChannelId();
-			const messageId = readStringParam(ctx.params, "messageId", { required: true });
-			await ctx.assertReadTargetAllowed({ channelId });
-			await deleteMessageDiscord(channelId, messageId, ctx.withOpts());
-			return jsonResult({ ok: true });
-		}
+		case "deleteMessage":
 		case "pinMessage":
 		case "unpinMessage": {
-			if (!ctx.isActionEnabled("pins")) throw new Error("Discord pins are disabled.");
+			const deleting = ctx.action === "deleteMessage";
+			if (!ctx.isActionEnabled(deleting ? "messages" : "pins")) throw new Error(deleting ? "Discord message deletes are disabled." : "Discord pins are disabled.");
 			const channelId = ctx.resolveChannelId();
 			const messageId = readStringParam(ctx.params, "messageId", { required: true });
 			await ctx.assertReadTargetAllowed({ channelId });
-			await (ctx.action === "pinMessage" ? pinMessageDiscord : unpinMessageDiscord)(channelId, messageId, ctx.withOpts());
+			await (deleting ? deleteMessageDiscord : ctx.action === "pinMessage" ? pinMessageDiscord : unpinMessageDiscord)(channelId, messageId, ctx.withOpts());
 			return jsonResult({ ok: true });
 		}
 		case "listPins": {
@@ -1087,13 +1098,6 @@ async function handleDiscordReactionMessagingAction(ctx) {
 			const messageId = readStringParam(ctx.params, "messageId", { required: true });
 			const { emoji, remove, isEmpty } = readReactionParams(ctx.params, { removeErrorMessage: "Emoji is required to remove a Discord reaction." });
 			await ctx.assertReadTargetAllowed({ channelId });
-			if (remove) {
-				await removeReactionDiscord(channelId, messageId, emoji, ctx.withReactionRuntimeOptions());
-				return jsonResult({
-					ok: true,
-					removed: emoji
-				});
-			}
 			if (isEmpty) {
 				const removed = await removeOwnReactionsDiscord(channelId, messageId, ctx.withReactionRuntimeOptions());
 				return jsonResult({
@@ -1101,10 +1105,10 @@ async function handleDiscordReactionMessagingAction(ctx) {
 					removed: removed.removed
 				});
 			}
-			await reactMessageDiscord(channelId, messageId, emoji, ctx.withReactionRuntimeOptions());
+			await (remove ? removeReactionDiscord : reactMessageDiscord)(channelId, messageId, emoji, ctx.withReactionRuntimeOptions());
 			return jsonResult({
 				ok: true,
-				added: emoji
+				[remove ? "removed" : "added"]: emoji
 			});
 		}
 		case "reactions": {
@@ -1241,6 +1245,15 @@ async function handleDiscordMessageSendAction(ctx) {
 			const threadName = readStringParam(ctx.params, "threadName");
 			const sessionKey = readStringParam(ctx.params, "__sessionKey");
 			const agentId = readStringParam(ctx.params, "__agentId");
+			const sendOptions = {
+				...ctx.withOpts(),
+				reply: resolveActionReplyReference(ctx, replyTo),
+				silent,
+				mediaAccess: ctx.options?.mediaAccess,
+				mediaLocalRoots: ctx.options?.mediaLocalRoots,
+				mediaReadFile: ctx.options?.mediaReadFile
+			};
+			let result;
 			if (componentSpec) {
 				if (asVoice) throw new Error("Discord components cannot be sent as voice messages.");
 				if (embeds?.length) throw new Error("Discord components cannot include embeds.");
@@ -1249,70 +1262,34 @@ async function handleDiscordMessageSendAction(ctx) {
 					...componentSpec,
 					text: normalizedContent
 				};
-				const result = await sendDiscordComponentMessage(to, payload, {
-					...ctx.withOpts(),
-					silent,
-					reply: resolveActionReplyReference(ctx, replyTo),
-					sessionKey: sessionKey ?? void 0,
-					agentId: agentId ?? void 0,
-					mediaUrl: mediaUrl ?? void 0,
-					filename: filename ?? void 0,
-					mediaAccess: ctx.options?.mediaAccess,
-					mediaLocalRoots: ctx.options?.mediaLocalRoots,
-					mediaReadFile: ctx.options?.mediaReadFile,
+				result = await sendDiscordComponentMessage(to, payload, {
+					...sendOptions,
+					sessionKey,
+					agentId,
+					mediaUrl,
+					filename,
 					...suppressEmbeds === void 0 ? {} : { suppressEmbeds }
 				});
-				return jsonResult(await appendDiscordThreadRenameResult(ctx, {
-					payload: {
-						ok: true,
-						result,
-						components: true
-					},
-					target: result.receipt?.threadId ?? to,
-					threadName
-				}));
-			}
-			if (asVoice) {
+			} else if (asVoice) {
 				if (!mediaUrl) throw new Error("Voice messages require a media file reference (mediaUrl, path, or filePath).");
 				if (content && content.trim()) throw new Error("Voice messages cannot include text content (Discord limitation). Remove the content parameter.");
 				assertMediaNotDataUrl(mediaUrl);
-				const result = await sendVoiceMessageDiscord(to, mediaUrl, {
-					...ctx.withOpts(),
-					reply: resolveActionReplyReference(ctx, replyTo),
-					silent,
-					mediaAccess: ctx.options?.mediaAccess,
-					mediaLocalRoots: ctx.options?.mediaLocalRoots,
-					mediaReadFile: ctx.options?.mediaReadFile
-				});
-				return jsonResult(await appendDiscordThreadRenameResult(ctx, {
-					payload: {
-						ok: true,
-						result,
-						voiceMessage: true
-					},
-					target: to,
-					threadName
-				}));
-			}
-			const result = await sendMessageDiscord(to, content ?? "", {
-				...ctx.withOpts(),
-				mediaAccess: ctx.options?.mediaAccess,
+				result = await sendVoiceMessageDiscord(to, mediaUrl, sendOptions);
+			} else result = await sendMessageDiscord(to, content ?? "", {
+				...sendOptions,
 				mediaUrl,
-				filename: filename ?? void 0,
-				mediaLocalRoots: ctx.options?.mediaLocalRoots,
-				mediaReadFile: ctx.options?.mediaReadFile,
-				reply: resolveActionReplyReference(ctx, replyTo),
+				filename,
 				components,
 				embeds,
-				silent,
 				...suppressEmbeds === void 0 ? {} : { suppressEmbeds }
 			});
 			return jsonResult(await appendDiscordThreadRenameResult(ctx, {
 				payload: {
 					ok: true,
-					result
+					result,
+					...componentSpec ? { components: true } : asVoice ? { voiceMessage: true } : {}
 				},
-				target: result.receipt?.threadId ?? to,
+				target: asVoice ? to : result.receipt?.threadId ?? to,
 				threadName
 			}));
 		}
@@ -1357,25 +1334,32 @@ async function handleDiscordMessageSendAction(ctx) {
 		case "threadList": {
 			if (!ctx.isActionEnabled("threads")) throw new Error("Discord threads are disabled.");
 			const guildId = readStringParam(ctx.params, "guildId", { required: true });
-			const channelId = readStringParam(ctx.params, "channelId");
+			const rawChannelId = readStringParam(ctx.params, "channelId");
+			const channelId = rawChannelId ? resolveDiscordChannelId(rawChannelId) : void 0;
 			const includeArchived = readBooleanParam(ctx.params, "includeArchived");
 			const before = readStringParam(ctx.params, "before");
 			const limit = readPositiveIntegerParam(ctx.params, "limit");
-			if (channelId && includeArchived === true) await ctx.assertReadTargetAllowed({
+			if (channelId) await ctx.assertReadTargetAllowed({
 				guildId,
-				channelId
+				channelId,
+				requireGuildMetadata: includeArchived !== true
 			});
 			else await ctx.assertGuildReadTargetAllowed({
 				guildId,
 				channelTargetRequiredMessage: "Discord active thread lists require a wildcard channel allowlist so each read target can be authorized."
 			});
-			const threads = await listThreadsDiscord({
+			const response = await listThreadsDiscord({
 				guildId,
 				channelId,
 				includeArchived,
 				before,
 				limit
 			}, ctx.withOpts());
+			const threads = channelId && includeArchived !== true ? await ctx.filterActiveThreadList({
+				guildId,
+				channelId,
+				value: response
+			}) : response;
 			return jsonResult(normalizeDiscordThreadListActionResult({
 				value: threads,
 				guildId,
@@ -1481,37 +1465,31 @@ async function handleDiscordModerationAction(action, params, isActionEnabled, cf
 		accountId,
 		cfg
 	});
-	switch (command.action) {
-		case "timeout": {
-			const member = await timeoutMemberDiscord({
-				guildId: command.guildId,
-				userId: command.userId,
-				durationMinutes: command.durationMinutes,
-				until: command.until,
-				reason: command.reason
-			}, withOpts());
-			return jsonResult({
-				ok: true,
-				member
-			});
-		}
-		case "kick":
-			await kickMemberDiscord({
-				guildId: command.guildId,
-				userId: command.userId,
-				reason: command.reason
-			}, withOpts());
-			return jsonResult({ ok: true });
-		case "ban":
-			await banMemberDiscord({
-				guildId: command.guildId,
-				userId: command.userId,
-				reason: command.reason,
-				deleteMessageDays: command.deleteMessageDays
-			}, withOpts());
-			return jsonResult({ ok: true });
+	const target = {
+		guildId: command.guildId,
+		userId: command.userId,
+		reason: command.reason
+	};
+	if (command.action === "timeout") {
+		const member = await timeoutMemberDiscord({
+			...target,
+			durationMinutes: command.durationMinutes,
+			until: command.until
+		}, withOpts());
+		return jsonResult({
+			ok: true,
+			member
+		});
 	}
-	throw new Error("Unsupported Discord moderation action");
+	if (command.action === "kick") {
+		await kickMemberDiscord(target, withOpts());
+		return jsonResult({ ok: true });
+	}
+	await banMemberDiscord({
+		...target,
+		deleteMessageDays: command.deleteMessageDays
+	}, withOpts());
+	return jsonResult({ ok: true });
 }
 //#endregion
 //#region extensions/discord/src/actions/runtime.presence.ts
@@ -1618,11 +1596,6 @@ const guildActions = /* @__PURE__ */ new Set([
 	"channelPermissionSet",
 	"channelPermissionRemove"
 ]);
-const moderationActions = /* @__PURE__ */ new Set([
-	"timeout",
-	"kick",
-	"ban"
-]);
 async function handleDiscordAction(params, cfg, options) {
 	const action = readStringParam(params, "action", { required: true });
 	const accountId = readStringParam(params, "accountId");
@@ -1632,7 +1605,7 @@ async function handleDiscordAction(params, cfg, options) {
 	});
 	if (messagingActions.has(action)) return await handleDiscordMessagingAction(action, params, isActionEnabled, cfg, options);
 	if (guildActions.has(action)) return await handleDiscordGuildAction(action, params, isActionEnabled, cfg, options);
-	if (moderationActions.has(action)) return await handleDiscordModerationAction(action, params, isActionEnabled, cfg);
+	if (isDiscordModerationAction(action)) return await handleDiscordModerationAction(action, params, isActionEnabled, cfg);
 	if (action === "setPresence") return await handleDiscordPresenceAction(action, params, isActionEnabled, cfg);
 	throw new Error(`Unknown action: ${action}`);
 }