@openclaw/discord 2026.9.4 → 2026.9.5

package/assets/activity.svg

@@ -0,0 +1,40 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<!--
+Source: simple-icons@16.31.0, icons/discord.svg
+https://www.npmjs.com/package/simple-icons/v/16.31.0
+https://github.com/simple-icons/simple-icons
+
+# CC0 1.0 Universal
+
+## Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an “owner”) of an original work of authorship and/or a database (each, a “Work”).
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works (“Commons”) that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the “Affirmer”), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights (“Copyright and Related Rights”). Copyright and Related Rights include, but are not limited to, the following:
+    1. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+    2. moral rights retained by the original author(s) and/or performer(s);
+    3. publicity and privacy rights pertaining to a person’s image or likeness depicted in a Work;
+    4. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(i), below;
+    5. rights protecting the extraction, dissemination, use and reuse of data in a Work;
+    6. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+    7. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer’s Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the “Waiver”). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer’s heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer’s express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer’s express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer’s Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the “License”). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer’s express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+    1. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+    2. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+    3. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person’s Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+    4. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
+
+For more information, please see <https://creativecommons.org/publicdomain/zero/1.0>.
+Names and marks remain the property of their respective owners.
+-->
+  <path fill="currentColor" stroke="none" d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z" />
+</svg>

package/dist/{account-inspect-BY-ve3yH.js → .setup/account-inspect-BwQj24ht.mjs}

@@ -1,4 +1,4 @@
-import { _ as inspectDiscordAccountTokenState, o as mergeDiscordAccountConfig, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig, v as resolveDiscordAccountAvailability } from "./accounts-CwJQoLjM.js";
+import { _ as inspectDiscordAccountTokenState, o as mergeDiscordAccountConfig, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig, v as resolveDiscordAccountAvailability } from "./accounts-CwJQoLjM.mjs";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";

package/dist/{activities-api-w8j7Elou.js → .setup/activities-api-DBwRt5ES.mjs}

@@ -1,19 +1,22 @@
-import { S as parseDiscordActivityCustomId, i as buildDiscordPresentationComponents } from "./components-DBFTIN6P.js";
-import { c as resolveDiscordAccount } from "./accounts-CwJQoLjM.js";
-import { r as sendDiscordComponentMessage } from "./send.components-BWnkX4QN.js";
-import { y as resolveDiscordChannelId$1 } from "./retry-DKeoT7UO.js";
-import { r as setDiscordActivitiesRuntime, t as DiscordActivitiesRuntime } from "./runtime-CbknwoBH.js";
+import { S as parseDiscordActivityCustomId, i as buildDiscordPresentationComponents } from "./components-MqMWUWnE.mjs";
+import { E as getDiscordEndpointRuntime } from "./channel-type-DKnjV1XW.mjs";
+import { c as resolveDiscordAccount } from "./accounts-CwJQoLjM.mjs";
+import { r as sendDiscordComponentMessage } from "./send.components-DWQjXhPV.mjs";
+import { b as resolveDiscordChannelId$1 } from "./retry-DBfcEgmO.mjs";
+import { r as setDiscordActivitiesRuntime, t as DiscordActivitiesRuntime } from "./runtime-BVoa7hhx.mjs";
 import fs from "node:fs/promises";
 import { logError } from "openclaw/plugin-sdk/logging-core";
 import { resolveRequestClientIp } from "openclaw/plugin-sdk/webhook-ingress";
 import { WEBHOOK_BODY_READ_DEFAULTS, readJsonBodyWithLimit, sendHttpRequestRejection } from "openclaw/plugin-sdk/webhook-request-guards";
+import { WIDGET_CDN_ORIGINS } from "openclaw/plugin-sdk/widget-html";
 import { randomBytes } from "node:crypto";
-import { readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";
 import { fetchWithSsrFGuard as fetchWithSsrFGuard$1 } from "openclaw/plugin-sdk/ssrf-runtime";
+import { readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";
 //#region extensions/discord/src/activities/discord-api.ts
 const DISCORD_TOKEN_URL = "https://discord.com/api/oauth2/token";
 const DISCORD_USER_URL = "https://discord.com/api/v10/users/@me";
 const DISCORD_HOST = "discord.com";
+const DISCORD_ACTIVITY_REQUEST_TIMEOUT_MS = 15e3;
 const JSON_MAX_BYTES = 65536;
 const INSTANCE_ID_MAX_LENGTH = 256;
 function normalizeInstanceId(value) {
@@ -30,13 +33,23 @@ function normalizeInstanceId(value) {
 	return instanceId;
 }
 async function fetchDiscordJson(params) {
-	const { response, release } = await params.fetchGuard({
+	const endpoint = Object.hasOwn(params, "endpointRuntime") ? params.endpointRuntime : getDiscordEndpointRuntime();
+	const liveUrl = new URL(params.url);
+	const endpointPath = liveUrl.pathname === "/api/oauth2/token" ? "/oauth2/token" : liveUrl.pathname.startsWith("/api/v10/") ? liveUrl.pathname.slice(8) : void 0;
+	if (endpoint && !endpointPath) throw new Error("Discord Activity request is outside the configured endpoint routes");
+	const { response, release } = endpoint ? {
+		response: await endpoint.fetch(`${endpoint.descriptor.restApiBaseUrl}${endpointPath}${liveUrl.search}`, {
+			...params.init,
+			signal: params.init.signal ? AbortSignal.any([params.init.signal, AbortSignal.timeout(DISCORD_ACTIVITY_REQUEST_TIMEOUT_MS)]) : AbortSignal.timeout(DISCORD_ACTIVITY_REQUEST_TIMEOUT_MS)
+		}),
+		release: async () => {}
+	} : await params.fetchGuard({
 		url: params.url,
 		fetchImpl: params.fetchImpl,
 		init: params.init,
 		policy: { allowedHostnames: [DISCORD_HOST] },
 		auditContext: params.auditContext,
-		timeoutMs: 15e3
+		timeoutMs: DISCORD_ACTIVITY_REQUEST_TIMEOUT_MS
 	});
 	try {
 		if (!response.ok) {
@@ -56,6 +69,7 @@ async function fetchDiscordJson(params) {
 	}
 }
 async function resolveActivityInstanceChannel(params) {
+	const endpointRuntime = getDiscordEndpointRuntime() ?? null;
 	let result;
 	try {
 		result = await fetchDiscordJson({
@@ -63,7 +77,8 @@ async function resolveActivityInstanceChannel(params) {
 			fetchImpl: params.proxyFetch,
 			url: `https://discord.com/api/v10/applications/${encodeURIComponent(params.applicationId)}/activity-instances/${encodeURIComponent(params.instanceId)}`,
 			init: { headers: { Authorization: `Bot ${params.botAuth}` } },
-			auditContext: "discord.activities.instance"
+			auditContext: "discord.activities.instance",
+			endpointRuntime
 		});
 	} catch {
 		return;
@@ -247,7 +262,7 @@ const BODY_MAX_BYTES = 8192;
 const JSON_CONTENT_TYPE = "application/json; charset=utf-8";
 const WIDGET_ID_PATTERN = /^[A-Za-z0-9_-]{22}$/;
 const DOC_TOKEN_PATTERN = /^[A-Za-z0-9_-]{43}$/;
-const DISCORD_ACTIVITY_WIDGET_CSP = "sandbox allow-scripts; default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'; img-src data: blob:; font-src data:; connect-src 'none'; frame-ancestors *";
+const DISCORD_ACTIVITY_WIDGET_CSP = `sandbox allow-scripts; default-src 'none'; script-src 'unsafe-inline' ${WIDGET_CDN_ORIGINS.join(" ")}; style-src 'unsafe-inline' ${WIDGET_CDN_ORIGINS.join(" ")}; img-src data: blob:; font-src data: ${WIDGET_CDN_ORIGINS.join(" ")}; connect-src 'none'; frame-ancestors *`;
 function setCommonHeaders(res) {
 	res.setHeader("Cache-Control", "no-store");
 	res.setHeader("Referrer-Policy", "no-referrer");
@@ -310,6 +325,7 @@ function createDiscordActivityHttpHandler(deps) {
 		const applicationId = extractApplicationId(req);
 		const account = deps.runtime.resolveHttpAccount(applicationId);
 		if (!account) return respondJson(res, 503, { error: "Discord Activities is not fully configured" });
+		const endpointRuntime = getDiscordEndpointRuntime() ?? null;
 		const bodyResult = await readJsonBodyWithLimit(req, {
 			maxBytes: BODY_MAX_BYTES,
 			timeoutMs: bodyTimeoutMs,
@@ -347,7 +363,8 @@ function createDiscordActivityHttpHandler(deps) {
 							code
 						})
 					},
-					auditContext: "discord.activities.oauth.token"
+					auditContext: "discord.activities.oauth.token",
+					endpointRuntime
 				});
 			} catch {
 				return respondJson(res, 503, { error: "Discord token exchange unavailable" });
@@ -361,7 +378,8 @@ function createDiscordActivityHttpHandler(deps) {
 					fetchImpl: account.proxyFetch,
 					url: DISCORD_USER_URL,
 					init: { headers: { Authorization: `Bearer ${granted}` } },
-					auditContext: "discord.activities.oauth.user"
+					auditContext: "discord.activities.oauth.user",
+					endpointRuntime
 				});
 			} catch {
 				return respondJson(res, 503, { error: "Discord user lookup unavailable" });
@@ -611,13 +629,13 @@ const WIDGET_TTL_MS = 7 * DAY_MS;
 const SESSION_TTL_MS = 9e5;
 const DOC_TOKEN_TTL_MS = 6e4;
 const PENDING_LAUNCH_TTL_MS = 12e4;
-function requireAtomicUpdate(store) {
-	if (!store.update) throw new Error("Discord Activities require atomic plugin state updates");
+function requireAtomicComparison(store) {
+	if (!store.observe || !store.compareAndApply) throw new Error("Discord Activities require atomic plugin state comparisons");
 	return store;
 }
 function openDiscordActivityStores(openKeyedStore) {
 	return {
-		widgets: requireAtomicUpdate(openKeyedStore({
+		widgets: requireAtomicComparison(openKeyedStore({
 			namespace: "activities-widgets",
 			maxEntries: 64,
 			overflowPolicy: "evict-oldest",
@@ -635,7 +653,7 @@ function openDiscordActivityStores(openKeyedStore) {
 			overflowPolicy: "evict-oldest",
 			defaultTtlMs: DOC_TOKEN_TTL_MS
 		}),
-		launches: requireAtomicUpdate(openKeyedStore({
+		launches: requireAtomicComparison(openKeyedStore({
 			namespace: "activities-launches",
 			maxEntries: 256,
 			overflowPolicy: "evict-oldest",
@@ -646,6 +664,35 @@ function openDiscordActivityStores(openKeyedStore) {
 function pendingLaunchKey(accountId, channelId, discordUserId) {
 	return `${accountId}:${channelId}:${discordUserId}`;
 }
+function deliveredWidgetIntent(widget, messageId) {
+	return widget ? {
+		operation: "update",
+		action: "set",
+		value: {
+			...widget,
+			deliveredMessageId: messageId
+		}
+	} : {
+		operation: "update",
+		action: "keep"
+	};
+}
+function pendingLaunchForWidget(existing, widgetId, createdAt) {
+	return existing && (existing.state === "ambiguous" || existing.widgetId !== widgetId) ? {
+		state: "ambiguous",
+		createdAt
+	} : {
+		state: "single",
+		widgetId,
+		createdAt
+	};
+}
+function retirePendingLaunchIntent(existing, widgetId) {
+	return {
+		operation: "delete",
+		action: existing?.state === "single" && existing.widgetId === widgetId ? "delete" : "keep"
+	};
+}
 var DiscordActivityStore = class {
 	constructor(stores) {
 		this.stores = stores;
@@ -664,10 +711,17 @@ var DiscordActivityStore = class {
 	}
 	async markWidgetDelivered(id, messageId) {
 		if (!/^\d+$/u.test(messageId)) throw new Error("Discord Activity delivery returned an invalid message ID");
-		if (!await this.stores.widgets.update(id, (widget) => widget ? {
-			...widget,
-			deliveredMessageId: messageId
-		} : void 0)) throw new Error("Discord Activity widget disappeared before delivery was recorded");
+		const widgets = this.stores.widgets;
+		let observed = await widgets.observe(id);
+		while (true) {
+			const result = await widgets.compareAndApply(id, observed.comparison, deliveredWidgetIntent(observed.value, messageId));
+			if (result.status === "conflict") {
+				observed = result.current;
+				continue;
+			}
+			if (result.status === "unchanged") throw new Error("Discord Activity widget disappeared before delivery was recorded");
+			return;
+		}
 	}
 	async deleteWidget(id) {
 		await this.stores.widgets.delete(id);
@@ -710,20 +764,28 @@ var DiscordActivityStore = class {
 	}
 	async recordPendingLaunch(params) {
 		const key = pendingLaunchKey(params.accountId, params.channelId, params.discordUserId);
-		await this.stores.launches.update(key, (existing) => {
-			return existing && (existing.state === "ambiguous" || existing.widgetId !== params.widgetId) ? {
-				state: "ambiguous",
-				createdAt: params.createdAt
-			} : {
-				state: "single",
-				widgetId: params.widgetId,
-				createdAt: params.createdAt
-			};
-		});
+		const { widgetId, createdAt } = params;
+		const launches = this.stores.launches;
+		let observed = await launches.observe(key);
+		while (true) {
+			const result = await launches.compareAndApply(key, observed.comparison, {
+				operation: "update",
+				action: "set",
+				value: pendingLaunchForWidget(observed.value, widgetId, createdAt)
+			});
+			if (result.status !== "conflict") return;
+			observed = result.current;
+		}
 	}
 	async retirePendingLaunch(accountId, channelId, discordUserId, widgetId) {
 		const key = pendingLaunchKey(accountId, channelId, discordUserId);
-		await this.stores.launches.update(key, (existing) => existing?.state === "single" && existing.widgetId === widgetId ? void 0 : existing);
+		const launches = this.stores.launches;
+		let observed = await launches.observe(key);
+		while (true) {
+			const result = await launches.compareAndApply(key, observed.comparison, retirePendingLaunchIntent(observed.value, widgetId));
+			if (result.status !== "conflict") return;
+			observed = result.current;
+		}
 	}
 	async consumePendingLaunch(accountId, channelId, discordUserId) {
 		const launch = await this.stores.launches.consume(pendingLaunchKey(accountId, channelId, discordUserId));

package/dist/{api-LIV--eMq.js → .setup/api-CBK9zcq5.mjs}

@@ -1,10 +1,10 @@
-import { C as parseDiscordRetryAfterBodySeconds } from "./allow-list-DWEio925.js";
+import { E as getDiscordEndpointRuntime, w as parseDiscordRetryAfterBodySeconds } from "./channel-type-DKnjV1XW.mjs";
 import { redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { captureChannelReadAuthority, resolveFetch } from "openclaw/plugin-sdk/fetch-runtime";
 import { readResponseWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
 import { parseRetryAfterHeaderSeconds, resolveRetryConfig, retryAsync } from "openclaw/plugin-sdk/retry-runtime";
 import { readResponseTextLimited } from "openclaw/plugin-sdk/provider-http";
-import { resolveFetch } from "openclaw/plugin-sdk/fetch-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/discord/src/error-body.ts
@@ -109,7 +109,9 @@ function createDiscordRequestSignal(options) {
 	};
 }
 async function requestDiscord(path, token, options) {
-	const fetchImpl = resolveFetch(options?.fetcher ?? fetch);
+	const assertReadAuthority = captureChannelReadAuthority();
+	const endpoint = options?.endpointRuntime === void 0 ? getDiscordEndpointRuntime() : options.endpointRuntime;
+	const fetchImpl = resolveFetch(endpoint ? (input, init) => endpoint.fetch(input, init, assertReadAuthority) : options?.fetcher ?? fetch);
 	if (!fetchImpl) throw new Error("fetch is not available");
 	const retryConfig = resolveRetryConfig(DISCORD_API_RETRY_DEFAULTS, options?.retry);
 	return retryAsync(async () => {
@@ -118,7 +120,8 @@ async function requestDiscord(path, token, options) {
 		const body = normalizeDiscordRequestBody(options?.body, headers);
 		const requestSignal = createDiscordRequestSignal(options ?? {});
 		try {
-			const res = await fetchImpl(`${DISCORD_API_BASE}${path}`, {
+			assertReadAuthority?.();
+			const res = await fetchImpl(`${endpoint?.descriptor.restApiBaseUrl ?? DISCORD_API_BASE}${path}`, {
 				method: options?.method ?? (body === void 0 ? "GET" : "POST"),
 				headers,
 				body,

package/dist/{approval-handler.runtime-BnPUU5NK.js → .setup/approval-handler.runtime-Du3n5ypX.mjs}

@@ -1,8 +1,9 @@
-import { $ as stripUndefinedFields, I as Button, J as TextDisplay, K as Separator, R as Container, W as Row, dt as editChannelMessage, k as serializePayload, lt as deleteChannelMessage, ot as createChannelMessage, tt as createUserDmChannel } from "./discord-CmL3ati-.js";
-import { s as buildExecApprovalCustomId } from "./components-DBFTIN6P.js";
-import { N as createDiscordClient, O as createDiscordMessageNonce } from "./send.shared-BHPM3CSl.js";
-import { S as isDiscordExecApprovalClientEnabled, n as DISCORD_APPROVAL_ALLOWED_MENTIONS, r as formatDiscordApprovalDisplayValue } from "./outbound-session-route-B0N6os97.js";
-import { a as shouldHandleDiscordApprovalRequest } from "./channel-C_OFFR5Y.js";
+import { A as serializePayload, G as Row, L as Button, Y as TextDisplay, et as stripUndefinedFields, ft as editChannelMessage, nt as createUserDmChannel, q as Separator, st as createChannelMessage, ut as deleteChannelMessage, z as Container } from "./discord-BXpHW-cu.mjs";
+import { s as buildExecApprovalCustomId } from "./components-MqMWUWnE.mjs";
+import { N as createDiscordClient, O as createDiscordMessageNonce } from "./send.shared-Zwx6BxQ5.mjs";
+import { D as isDiscordExecApprovalClientEnabled, c as formatDiscordApprovalDisplayValue, s as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./outbound-session-route-CqWbuMOm.mjs";
+import { a as shouldHandleDiscordApprovalRequest } from "./channel-ChKdlBgH.mjs";
+import { t as discordApprovalMessageUpdates } from "./approval-message-updates-BN7JtScm.mjs";
 import { logDebug, logError } from "openclaw/plugin-sdk/logging-core";
 import { ButtonStyle } from "discord-api-types/v10";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -176,7 +177,7 @@ async function updateMessage(params) {
 			accountId: params.accountId
 		});
 		const payload = buildExecApprovalPayload(params.container);
-		await discordRequest(() => editChannelMessage(rest, params.channelId, params.messageId, { body: stripUndefinedFields(serializePayload(payload)) }), "update-approval");
+		await discordApprovalMessageUpdates.enqueue(params.messageId, () => discordRequest(() => editChannelMessage(rest, params.channelId, params.messageId, { body: stripUndefinedFields(serializePayload(payload)) }), "update-approval"));
 	} catch (err) {
 		logError(`discord approvals: failed to update message: ${String(err)}`);
 	}
@@ -192,7 +193,7 @@ async function finalizeMessage(params) {
 			token: params.token,
 			accountId: params.accountId
 		});
-		await discordRequest(() => deleteChannelMessage(rest, params.channelId, params.messageId), "delete-approval");
+		await discordApprovalMessageUpdates.enqueue(params.messageId, () => discordRequest(() => deleteChannelMessage(rest, params.channelId, params.messageId), "delete-approval"));
 	} catch (err) {
 		logError(`discord approvals: failed to delete message: ${String(err)}`);
 		await updateMessage(params);

package/dist/.setup/approval-message-updates-BN7JtScm.mjs

@@ -0,0 +1,17 @@
+import { $ as parseCustomId } from "./discord-BXpHW-cu.mjs";
+import { c as parseExecApprovalData } from "./components-MqMWUWnE.mjs";
+import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
+//#region extensions/discord/src/approval-message-updates.ts
+const discordApprovalMessageUpdates = new KeyedAsyncQueue();
+/** Read the current control identity, rather than reconstructing delivery ownership. */
+function hasDiscordApprovalControl(message, approval) {
+	if (!message || typeof message !== "object") return false;
+	if ("custom_id" in message && typeof message.custom_id === "string") {
+		const customId = parseCustomId(message.custom_id);
+		const current = customId.key === "execapproval" ? parseExecApprovalData(customId.data) : null;
+		return current?.approvalId === approval.approvalId && current.approvalKind === approval.approvalKind && current.action === approval.action;
+	}
+	return "components" in message && Array.isArray(message.components) && message.components.some((component) => hasDiscordApprovalControl(component, approval));
+}
+//#endregion
+export { hasDiscordApprovalControl as n, discordApprovalMessageUpdates as t };

package/dist/{audit-BgAgIzwo.js → .setup/audit-C8uaKoa9.mjs}

@@ -1,8 +1,8 @@
-import { Ht as __exportAll } from "./discord-CmL3ati-.js";
-import { x as fetchChannelPermissionsDiscord } from "./send.shared-BHPM3CSl.js";
-import { t as inspectDiscordAccount } from "./account-inspect-BY-ve3yH.js";
-import "./send-CLpzfzJe.js";
-import { _ as auditDiscordChannelPermissionsWithFetcher, v as collectDiscordAuditChannelIdsForAccount } from "./outbound-session-route-B0N6os97.js";
+import { Ut as __exportAll } from "./discord-BXpHW-cu.mjs";
+import { x as fetchChannelPermissionsDiscord } from "./send.shared-Zwx6BxQ5.mjs";
+import { t as inspectDiscordAccount } from "./account-inspect-BwQj24ht.mjs";
+import "./send-CKDczUNL.mjs";
+import { C as collectDiscordAuditChannelIdsForAccount, S as auditDiscordChannelPermissionsWithFetcher } from "./outbound-session-route-CqWbuMOm.mjs";
 //#region extensions/discord/src/audit.ts
 var audit_exports = /* @__PURE__ */ __exportAll({
 	auditDiscordChannelPermissions: () => auditDiscordChannelPermissions,

package/dist/{channel-C_OFFR5Y.js → .setup/channel-ChKdlBgH.mjs}

@@ -1,15 +1,15 @@
-import { c as resolveDiscordAccount, i as listDiscordStartupAccountIds, l as resolveDiscordAccountAllowFrom, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId } from "./accounts-CwJQoLjM.js";
-import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import { g as normalizeDiscordMessagingTarget, h as looksLikeDiscordTargetId, v as parseDiscordTarget } from "./retry-DKeoT7UO.js";
-import { u as withAbortTimeout } from "./timeouts-D86uWLt_.js";
-import { C as shouldSuppressLocalDiscordExecApprovalPrompt, D as isChannelExecApprovalClientEnabledFromConfig, E as createChannelNativeOriginTargetResolver, O as matchesApprovalRequestFilters, S as isDiscordExecApprovalClientEnabled, T as createChannelApproverDmTargetResolver, b as getDiscordExecApprovalApprovers, d as resolveDiscordCurrentConversationIdentity, f as resolveDiscordRuntimeBindingConversationId, p as discordMessageActions, s as resolveDiscordConversationRoute, t as resolveDiscordOutboundSessionRoute, w as createApproverRestrictedNativeApprovalCapability, x as isDiscordExecApprovalApprover, y as resolveRequiredDiscordChannelPermissions } from "./outbound-session-route-B0N6os97.js";
-import { a as discordSecurityAdapter, c as buildTokenChannelStatusSummary, i as discordSetupContract, l as projectCredentialSnapshotFields, n as discordConfigAdapter, o as DEFAULT_ACCOUNT_ID, s as PAIRING_APPROVED_MESSAGE, t as createDiscordPluginBase, u as resolveConfiguredFromCredentialStatuses } from "./shared-CPPR0Xo4.js";
-import { r as openDiscordCommandDeployHashStore } from "./command-deploy-store-DFkBTViB.js";
-import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-CB9PRqgi.js";
-import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-BwkXpcy0.js";
-import { n as discordOutbound } from "./outbound-adapter-C8PTt7_p.js";
-import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.js";
-import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.js";
+import { c as resolveDiscordAccount, i as listDiscordStartupAccountIds, l as resolveDiscordAccountAllowFrom, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId } from "./accounts-CwJQoLjM.mjs";
+import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.mjs";
+import { _ as normalizeDiscordMessagingTarget, g as matchesDiscordToolContextTarget, h as looksLikeDiscordTargetId, y as parseDiscordTarget } from "./retry-DBfcEgmO.mjs";
+import { u as withAbortTimeout } from "./timeouts-D86uWLt_.mjs";
+import { A as createChannelApproverDmTargetResolver, D as isDiscordExecApprovalClientEnabled, E as isDiscordExecApprovalApprover, M as isChannelExecApprovalClientEnabledFromConfig, N as matchesApprovalRequestFilters, O as shouldSuppressLocalDiscordExecApprovalPrompt, T as getDiscordExecApprovalApprovers, _ as resolveDiscordRuntimeBindingConversationId, f as resolveDiscordConversationRoute, g as resolveDiscordCurrentConversationIdentity, j as createChannelNativeOriginTargetResolver, k as createApproverRestrictedNativeApprovalCapability, t as resolveDiscordOutboundSessionRoute, v as discordMessageActions, w as resolveRequiredDiscordChannelPermissions } from "./outbound-session-route-CqWbuMOm.mjs";
+import { a as discordSecurityAdapter, c as buildTokenChannelStatusSummary, i as discordSetupContract, l as projectCredentialSnapshotFields, n as discordConfigAdapter, o as DEFAULT_ACCOUNT_ID, s as PAIRING_APPROVED_MESSAGE, t as createDiscordPluginBase, u as resolveConfiguredFromCredentialStatuses } from "./shared-CaA3Vv4n.mjs";
+import { r as openDiscordCommandDeployHashStore } from "./command-deploy-store-DFkBTViB.mjs";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-_rz33QHO.mjs";
+import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-DCQq1WZ5.mjs";
+import { n as discordOutbound } from "./outbound-adapter-C8v79z9Z.mjs";
+import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.mjs";
+import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.mjs";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createRuntimeConfigReader } from "openclaw/plugin-sdk/runtime-config-snapshot";
@@ -199,7 +199,7 @@ function createDiscordApprovalCapability(configOverride) {
 				request,
 				configOverride
 			}),
-			load: async () => (await import("./approval-handler.runtime-BnPUU5NK.js")).discordApprovalNativeRuntime
+			load: async () => (await import("./approval-handler.runtime-Du3n5ypX.mjs")).discordApprovalNativeRuntime
 		})
 	});
 }
@@ -306,22 +306,22 @@ function resolveDiscordInboundConversation(params) {
 }
 //#endregion
 //#region extensions/discord/src/channel.loaders.ts
-const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-D1uDGbWh.js").then((n) => n.t));
-const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-VbpLmUS8.js").then((n) => n.n));
-const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-D-wRFsd5.js").then((n) => n.n));
-const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-BeUxc8nr.js").then((n) => n.i));
-const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-CoFQ7iSX.js").then((n) => n.r));
-const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-CqfE-RvC.js"));
-const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-BnuED0fI.js"));
+const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-BytTftz-.mjs").then((n) => n.t));
+const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-BbvsLQOZ.mjs").then((n) => n.n));
+const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-ByFlR7LQ.mjs").then((n) => n.n));
+const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-eexkKyrG.mjs").then((n) => n.a));
+const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-B6MrxbYv.mjs").then((n) => n.r));
+const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-DuhmKdDU.mjs"));
+const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-DBQ_AGPe.mjs"));
 async function probeDiscordStatusAccount(params) {
 	const startedAtMs = Date.now();
 	const runtime = await loadDiscordProbeRuntime();
 	const remainingMs = Math.max(1, params.timeoutMs - Math.max(0, Date.now() - startedAtMs));
 	return await runtime.probeDiscord(params.token, remainingMs, { includeApplication: true });
 }
-const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-BgAgIzwo.js").then((n) => n.n));
-const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CLpzfzJe.js").then((n) => n.t));
-const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-C5o1uKlw.js").then((n) => n.t));
+const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-C8uaKoa9.mjs").then((n) => n.n));
+const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CKDczUNL.mjs").then((n) => n.t));
+const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live--EGTH0DC.mjs").then((n) => n.t));
 //#endregion
 //#region extensions/discord/src/conversation-route-owner.ts
 function inspectDiscordConversationRouteOwner(params) {
@@ -770,7 +770,7 @@ const discordPlugin = createChatChannelPlugin({
 			supportsCurrentConversationBinding: true,
 			bindingStore: "adapter",
 			defaultTopLevelPlacement,
-			createManager: async ({ cfg, accountId }) => (await loadDiscordThreadBindingsManagerModule()).createThreadBindingManager({
+			createManager: async ({ cfg, accountId }) => (await loadDiscordThreadBindingsManagerModule()).createThreadBindingManagerAsync({
 				cfg,
 				accountId: accountId ?? void 0,
 				persist: false,
@@ -1014,6 +1014,7 @@ const discordPlugin = createChatChannelPlugin({
 	} },
 	security: discordSecurityAdapter,
 	threading: {
+		matchesToolContextTarget: matchesDiscordToolContextTarget,
 		scopedAccountReplyToMode: {
 			resolveAccount: (cfg, accountId) => resolveDiscordAccount({
 				cfg,
@@ -1024,9 +1025,10 @@ const discordPlugin = createChatChannelPlugin({
 		},
 		buildToolContext: ({ context, hasRepliedRef }) => {
 			const currentMessagingTarget = normalizeOptionalString(context.To);
+			const nativeChannelId = normalizeOptionalString(context.NativeChannelId);
 			const currentChatType = context.ChatType === "direct" || context.ChatType === "group" || context.ChatType === "channel" ? context.ChatType : void 0;
 			return {
-				currentChannelId: normalizeOptionalString(context.NativeChannelId) ?? currentMessagingTarget,
+				currentChannelId: nativeChannelId ? normalizeDiscordMessagingTarget(nativeChannelId) : currentMessagingTarget,
 				currentChatType,
 				currentMessagingTarget,
 				currentMessageId: context.CurrentMessageId,

package/dist/{channel-actions.runtime-tShzmemq.js → .setup/channel-actions.runtime-CJmiFfps.mjs}

@@ -1,12 +1,12 @@
-import { i as buildDiscordPresentationComponents, m as coerceDiscordComponentParam, r as buildDiscordInteractiveComponents } from "./components-DBFTIN6P.js";
-import { v as parseDiscordTarget, y as resolveDiscordChannelId } from "./retry-DKeoT7UO.js";
-import { a as readDiscordAutoArchiveDurationParam, t as handleDiscordAction } from "./runtime-Dxl-ZOvg.js";
-import "./targets-Cm6aV9nJ.js";
-import "./action-runtime-api.js";
-import { h as discordInboundEventDelivery } from "./outbound-session-route-B0N6os97.js";
-import { r as isDiscordComponentSpecWithinMessageLimit, t as DISCORD_PRESENTATION_CAPABILITIES } from "./outbound-components-DrlHcWfM.js";
-import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-CpEwox_X.js";
-import { n as notifyDiscordActiveTurnThreadCreated, r as notifyDiscordActiveTurnThreadReplyDelivered } from "./active-turn-thread-route-fmHl1HNd.js";
+import { C as withDiscordRequestAuthority } from "./discord-BXpHW-cu.mjs";
+import { i as buildDiscordPresentationComponents, m as coerceDiscordComponentParam, r as buildDiscordInteractiveComponents } from "./components-MqMWUWnE.mjs";
+import { b as resolveDiscordChannelId, y as parseDiscordTarget } from "./retry-DBfcEgmO.mjs";
+import "./targets-D1mAB5yO.mjs";
+import { a as readDiscordAutoArchiveDurationParam, t as handleDiscordAction } from "./runtime-SchNfUsQ.mjs";
+import "../action-runtime-api.js";
+import { b as discordInboundEventDelivery, i as isDiscordComponentSpecWithinMessageLimit, n as DISCORD_PRESENTATION_CAPABILITIES } from "./outbound-session-route-CqWbuMOm.mjs";
+import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-DAFyh_yV.mjs";
+import { n as notifyDiscordActiveTurnThreadCreated, r as notifyDiscordActiveTurnThreadReplyDelivered } from "./active-turn-thread-route-fmHl1HNd.mjs";
 import { normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { adaptMessagePresentationForChannel, normalizeLegacyInteractiveReply, normalizeMessagePresentation, renderMessagePresentationFallbackText } from "openclaw/plugin-sdk/interactive-runtime";
 import { resolveReactionMessageId } from "openclaw/plugin-sdk/channel-actions";
@@ -30,12 +30,18 @@ function readCurrentDiscordTarget(toolContext) {
 	return toolContext?.currentChannelId?.trim() || void 0;
 }
 async function handleDiscordMessageAction(ctx) {
+	ctx.assertDirectAdapterHandoff?.();
+	return await withDiscordRequestAuthority(ctx.assertDirectAdapterHandoff, () => dispatchDiscordMessageAction(ctx));
+}
+async function dispatchDiscordMessageAction(ctx) {
 	const { action, params, cfg } = ctx;
 	const accountId = ctx.accountId ?? readStringParam$1(params, "accountId");
 	const readContext = ctx.requesterAccountId && ctx.toolContext?.currentChannelProvider && ctx.toolContext.currentChannelId ? {
 		requesterAccountId: ctx.requesterAccountId,
 		currentChannelProvider: ctx.toolContext.currentChannelProvider,
-		currentChannelId: ctx.toolContext.currentChannelId
+		currentChannelId: ctx.toolContext.currentChannelId,
+		currentChatType: ctx.toolContext.currentChatType,
+		currentMessagingTarget: ctx.toolContext.currentMessagingTarget
 	} : void 0;
 	const readPolicyOptions = ctx.conversationReadOrigin || readContext ? {
 		...ctx.conversationReadOrigin ? { conversationReadOrigin: ctx.conversationReadOrigin } : {},
@@ -216,7 +222,8 @@ async function handleDiscordMessageAction(ctx) {
 			limit,
 			before: readStringParam$1(params, "before"),
 			after: readStringParam$1(params, "after"),
-			around: readStringParam$1(params, "around")
+			around: readStringParam$1(params, "around"),
+			messageId: readStringParam$1(params, "messageId")
 		}, cfg, actionOptions);
 	}
 	if (action === "edit" || action === "delete") {