@openclaw/discord 2026.7.2-beta.3 → 2026.7.2-beta.4

package/dist/{account-inspect-dFV0JrnR.js → account-inspect-Dztmn4J4.js}

@@ -1,4 +1,4 @@
-import { a as mergeDiscordAccountConfig, l as resolveDiscordAccountConfig, o as resolveDefaultDiscordAccountId } from "./accounts-CMd4nzLB.js";
+import { a as mergeDiscordAccountConfig, l as resolveDiscordAccountConfig, o as resolveDefaultDiscordAccountId } from "./accounts-D2LKPukU.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { hasConfiguredSecretInput, normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";

package/dist/account-inspect-api.js

@@ -1,4 +1,4 @@
-import { t as inspectDiscordAccount } from "./account-inspect-dFV0JrnR.js";
+import { t as inspectDiscordAccount } from "./account-inspect-Dztmn4J4.js";
 //#region extensions/discord/account-inspect-api.ts
 function inspectDiscordReadOnlyAccount(cfg, accountId) {
 	return inspectDiscordAccount({

package/dist/{accounts-CMd4nzLB.js → accounts-D2LKPukU.js}

@@ -1,6 +1,6 @@
 import { createAccountActionGate, createAccountListHelpers, resolveMergedAccountConfig } from "openclaw/plugin-sdk/account-helpers";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import { mapAllowFromEntries, normalizeChannelDmPolicy, resolveChannelDmAllowFrom, resolveChannelDmPolicy } from "openclaw/plugin-sdk/channel-config-helpers";
+import { mapAllowFromEntries, normalizeChannelDmPolicy } from "openclaw/plugin-sdk/channel-config-helpers";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1, resolveAccountEntry } from "openclaw/plugin-sdk/routing";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { getRuntimeConfigSnapshot, getRuntimeConfigSourceSnapshot, selectApplicableRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
@@ -120,21 +120,14 @@ function resolveDiscordAccountAllowFrom(params) {
 	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultDiscordAccountId(params.cfg));
 	const accountConfig = resolveDiscordAccountConfig(params.cfg, accountId);
 	const rootConfig = params.cfg.channels?.discord;
-	const allowFrom = resolveChannelDmAllowFrom({
-		account: accountConfig,
-		parent: rootConfig
-	});
+	const allowFrom = accountConfig?.allowFrom ?? rootConfig?.allowFrom;
 	return allowFrom ? mapAllowFromEntries(allowFrom) : void 0;
 }
 function resolveDiscordAccountDmPolicy(params) {
 	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultDiscordAccountId(params.cfg));
 	const accountConfig = resolveDiscordAccountConfig(params.cfg, accountId);
 	const rootConfig = params.cfg.channels?.discord;
-	return normalizeChannelDmPolicy(resolveChannelDmPolicy({
-		account: accountConfig,
-		parent: rootConfig,
-		defaultPolicy: "pairing"
-	}));
+	return normalizeChannelDmPolicy(accountConfig?.dmPolicy ?? rootConfig?.dmPolicy ?? "pairing");
 }
 function createDiscordActionGate(params) {
 	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultDiscordAccountId(params.cfg));

package/dist/action-runtime-api.js

@@ -1,2 +1,2 @@
-import { t as handleDiscordAction } from "./runtime-Z2qkKakn.js";
+import { t as handleDiscordAction } from "./runtime-D-6AugWA.js";
 export { handleDiscordAction };

package/dist/{activities-api-DS1L7KRY.js → activities-api-8TMGXUH4.js}

@@ -1,11 +1,12 @@
-import { u as resolveDiscordChannelId$1 } from "./chunk-CWzmeWf_.js";
-import { n as isDiscordAccountEnabledForRuntime, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-CMd4nzLB.js";
-import { i as resolveDiscordActivitiesConfig, r as setDiscordActivitiesRuntime, t as DiscordActivitiesRuntime } from "./runtime-CD5MRZkD.js";
-import { S as parseDiscordActivityCustomId, a as buildDiscordPresentationComponents } from "./outbound-session-route-M2bEY9tI.js";
-import { r as sendDiscordComponentMessage } from "./send.components-DLqzOEPJ.js";
+import { u as resolveDiscordChannelId$1 } from "./chunk-BrZocpfs.js";
+import { n as isDiscordAccountEnabledForRuntime, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-D2LKPukU.js";
+import { i as resolveDiscordActivitiesConfig, r as setDiscordActivitiesRuntime, t as DiscordActivitiesRuntime } from "./runtime-TwM8IrZU.js";
+import { S as parseDiscordActivityCustomId, a as buildDiscordPresentationComponents } from "./outbound-session-route-D_nc_Ayk.js";
+import { r as sendDiscordComponentMessage } from "./send.components-V7cyCKbH.js";
 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 } from "openclaw/plugin-sdk/webhook-request-guards";
 import { randomBytes } from "node:crypto";
 import { Type } from "typebox";
 import { readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";
@@ -120,6 +121,8 @@ var TokenRateLimiter = class {
 //#endregion
 //#region extensions/discord/src/activities/shell.ts
 const DISCORD_ACTIVITY_ROUTE_PREFIX = "/discord/activity";
+const DISCORD_ACTIVITY_TOKEN_REQUEST_TIMEOUT_MS = 35e3;
+const DISCORD_ACTIVITY_WIDGET_REQUEST_TIMEOUT_MS = 2e4;
 const DISCORD_ACTIVITY_SHELL_CSP = "default-src 'none'; script-src 'self'; style-src 'unsafe-inline'; connect-src 'self'; frame-src 'self'; img-src data:; base-uri 'none'; frame-ancestors *";
 const DISCORD_ACTIVITY_SHELL_HTML = `<!doctype html>
 <html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
@@ -132,6 +135,8 @@ h1{font-size:18px;margin:0 0 8px;color:#f2f3f5}p{margin:0;color:#b5bac1;line-hei
 <script type="module" src="./shell.js"><\/script></body></html>`;
 const DISCORD_ACTIVITY_SHELL_JS = `import { DiscordSDK } from "./vendor/embedded-app-sdk.mjs";
 
+const tokenRequestTimeoutMs = ${DISCORD_ACTIVITY_TOKEN_REQUEST_TIMEOUT_MS};
+const widgetRequestTimeoutMs = ${DISCORD_ACTIVITY_WIDGET_REQUEST_TIMEOUT_MS};
 const app = document.querySelector("#app");
 function show(message, detail) {
   app.className = "";
@@ -157,7 +162,15 @@ function proxiedDocUrl(value) {
   return url.pathname + url.search;
 }
 async function readJson(response) {
-  const body = await response.json().catch(() => ({}));
+  let body;
+  try {
+    body = await response.json();
+  } catch (error) {
+    // Error responses may legitimately omit JSON details; successful responses must not
+    // turn an aborted or malformed body into an apparently valid empty payload.
+    if (response.ok) throw error;
+    body = {};
+  }
   if (!response.ok) {
     const error = new Error(typeof body.error === "string" ? body.error : "request failed");
     error.status = response.status;
@@ -165,6 +178,17 @@ async function readJson(response) {
   }
   return body;
 }
+async function fetchJsonWithDeadline(input, init, timeoutMs) {
+  // Activities also run in mobile webviews; avoid requiring the newer
+  // AbortSignal.timeout() static API just to enforce this request boundary.
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await readJson(await fetch(input, { ...init, signal: controller.signal }));
+  } finally {
+    clearTimeout(timeout);
+  }
+}
 async function run() {
   const match = window.location.hostname.match(/^(\\d+)\\.discordsays\\.com$/i);
   if (!match) {
@@ -181,19 +205,25 @@ async function run() {
     prompt: "none",
     scope: ["identify"],
   });
-  const auth = await readJson(await fetch("./api/token", {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ code }),
-  }));
+  const auth = await fetchJsonWithDeadline(
+    "./api/token",
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ code }),
+    },
+    tokenRequestTimeoutMs,
+  );
   await sdk.commands.authenticate({ access_token: auth.access_token });
   const query = new URLSearchParams({
     custom_id: sdk.customId ?? "",
     instance_id: sdk.instanceId,
   });
-  const widget = await readJson(await fetch("./api/widget?" + query, {
-    headers: { Authorization: "Bearer " + auth.session_token },
-  }));
+  const widget = await fetchJsonWithDeadline(
+    "./api/widget?" + query,
+    { headers: { Authorization: "Bearer " + auth.session_token } },
+    widgetRequestTimeoutMs,
+  );
   app.className = "widget";
   app.innerHTML = "";
   const bar = document.createElement("div");
@@ -240,22 +270,6 @@ function respondJson(res, statusCode, body) {
 function notFound(res, widgetDocument = false) {
 	return respond(res, 404, "not found", "text/plain; charset=utf-8", widgetDocument ? { "Content-Security-Policy": DISCORD_ACTIVITY_WIDGET_CSP } : void 0);
 }
-async function readJsonBody(req) {
-	const chunks = [];
-	let total = 0;
-	for await (const chunk of req) {
-		const data = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-		total += data.byteLength;
-		if (total > BODY_MAX_BYTES) return null;
-		chunks.push(data);
-	}
-	try {
-		const parsed = JSON.parse(Buffer.concat(chunks).toString("utf8"));
-		return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
-	} catch {
-		return null;
-	}
-}
 function readHeader(req, name) {
 	const value = req.headers[name];
 	return Array.isArray(value) ? value[0] : value;
@@ -281,6 +295,7 @@ function createDiscordActivityHttpHandler(deps) {
 	const limiter = new TokenRateLimiter(deps.now ?? Date.now);
 	const readVendorAsset = deps.readVendorAsset ?? ((assetPath) => fs.readFile(assetPath));
 	const reportError = deps.logError ?? logError;
+	const bodyTimeoutMs = deps.bodyTimeoutMs ?? WEBHOOK_BODY_READ_DEFAULTS.preAuth.timeoutMs;
 	let vendorAsset;
 	let pendingLaunchFailureLogged = false;
 	function logPendingLaunchFailure(error) {
@@ -295,7 +310,13 @@ 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 body = await readJsonBody(req);
+		const bodyResult = await readJsonBodyWithLimit(req, {
+			maxBytes: BODY_MAX_BYTES,
+			timeoutMs: bodyTimeoutMs,
+			emptyObjectOnEmpty: true
+		});
+		if (!bodyResult.ok && bodyResult.code === "REQUEST_BODY_TIMEOUT") return respondJson(res, 408, { error: "request body timeout" });
+		const body = bodyResult.ok && bodyResult.value && typeof bodyResult.value === "object" && !Array.isArray(bodyResult.value) ? bodyResult.value : null;
 		const code = typeof body?.code === "string" ? body.code.trim() : "";
 		if (!code) return respondJson(res, 401, { error: "invalid authorization code" });
 		const reservation = limiter.reserveGlobal();

package/dist/activities-api.js

@@ -1,2 +1,2 @@
-import { t as registerDiscordActivities } from "./activities-api-DS1L7KRY.js";
+import { t as registerDiscordActivities } from "./activities-api-8TMGXUH4.js";
 export { registerDiscordActivities };

package/dist/api.js

@@ -1,24 +1,24 @@
-import { c as normalizeDiscordOutboundTarget, l as parseDiscordTarget, o as looksLikeDiscordTargetId, s as normalizeDiscordMessagingTarget, u as resolveDiscordChannelId } from "./chunk-CWzmeWf_.js";
-import { a as mergeDiscordAccountConfig, f as resolveDiscordMaxLinesPerMessage, i as listEnabledDiscordAccounts, l as resolveDiscordAccountConfig, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount, t as createDiscordActionGate } from "./accounts-CMd4nzLB.js";
-import { D as parseDiscordModalCustomIdForInteraction, E as parseDiscordModalCustomId, T as parseDiscordComponentCustomIdForInteraction, _ as DISCORD_COMPONENT_CUSTOM_ID_KEY, b as buildDiscordComponentCustomId, d as createDiscordFormModal, f as buildDiscordComponentMessage, g as resolveDiscordComponentAttachmentName, h as readDiscordComponentSpec, i as buildDiscordInteractiveComponents, m as DISCORD_COMPONENT_ATTACHMENT_PREFIX, p as buildDiscordComponentMessageFlags, r as formatDiscordComponentEventText, u as DiscordFormModal, v as DISCORD_MODAL_CUSTOM_ID_KEY, w as parseDiscordComponentCustomId, x as buildDiscordModalCustomId } from "./outbound-session-route-M2bEY9tI.js";
+import { c as normalizeDiscordOutboundTarget, l as parseDiscordTarget, o as looksLikeDiscordTargetId, s as normalizeDiscordMessagingTarget, u as resolveDiscordChannelId } from "./chunk-BrZocpfs.js";
+import { a as mergeDiscordAccountConfig, f as resolveDiscordMaxLinesPerMessage, i as listEnabledDiscordAccounts, l as resolveDiscordAccountConfig, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount, t as createDiscordActionGate } from "./accounts-D2LKPukU.js";
+import { D as parseDiscordModalCustomIdForInteraction, E as parseDiscordModalCustomId, T as parseDiscordComponentCustomIdForInteraction, _ as DISCORD_COMPONENT_CUSTOM_ID_KEY, b as buildDiscordComponentCustomId, d as createDiscordFormModal, f as buildDiscordComponentMessage, g as resolveDiscordComponentAttachmentName, h as readDiscordComponentSpec, i as buildDiscordInteractiveComponents, m as DISCORD_COMPONENT_ATTACHMENT_PREFIX, p as buildDiscordComponentMessageFlags, r as formatDiscordComponentEventText, u as DiscordFormModal, v as DISCORD_MODAL_CUSTOM_ID_KEY, w as parseDiscordComponentCustomId, x as buildDiscordModalCustomId } from "./outbound-session-route-D_nc_Ayk.js";
 import { i as requestDiscord, n as DiscordApiError, r as fetchDiscord } from "./api-C43z8vUm.js";
-import { i as parseDiscordSendTarget, n as resolveDiscordTarget } from "./target-resolver-vqLA450R.js";
-import { t as inspectDiscordAccount } from "./account-inspect-dFV0JrnR.js";
+import { i as parseDiscordSendTarget, n as resolveDiscordTarget } from "./target-resolver-Bo1oWLPO.js";
+import { t as inspectDiscordAccount } from "./account-inspect-Dztmn4J4.js";
 import { i as DISCORD_DEFAULT_LISTENER_TIMEOUT_MS, n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, r as DISCORD_DEFAULT_INBOUND_WORKER_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-B9cy6RvQ.js";
-import "./targets-BjEMIe8t.js";
-import { a as getDiscordExecApprovalApprovers, c as shouldSuppressLocalDiscordExecApprovalPrompt, o as isDiscordExecApprovalApprover, s as isDiscordExecApprovalClientEnabled } from "./approval-message-safety-DrLlgIPz.js";
-import { i as resolveDiscordGroupToolPolicy, n as collectDiscordStatusIssues, r as resolveDiscordGroupRequireMention, t as discordPlugin } from "./channel-5MfaC2IE.js";
+import "./targets-CB8ahjZk.js";
+import { a as getDiscordExecApprovalApprovers, c as shouldSuppressLocalDiscordExecApprovalPrompt, o as isDiscordExecApprovalApprover, s as isDiscordExecApprovalClientEnabled } from "./approval-message-safety-LyND6GR3.js";
+import { i as resolveDiscordGroupToolPolicy, n as collectDiscordStatusIssues, r as resolveDiscordGroupRequireMention, t as discordPlugin } from "./channel-yq-so4jJ.js";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.js";
-import { t as discordSetupPlugin } from "./channel.setup-CJXfFclP.js";
-import { n as handleDiscordSubagentEnded, r as handleDiscordSubagentSpawning, t as handleDiscordSubagentDeliveryTarget } from "./subagent-hooks-Wrk61DwY.js";
-import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-Bsk2YBPs.js";
-import { n as listDiscordDirectoryGroupsFromConfig, r as listDiscordDirectoryPeersFromConfig } from "./directory-config-CmukHSms.js";
-import { t as fetchPluralKitMessageInfo } from "./pluralkit-CT0VRsZd.js";
-import { a as resolveDiscordPrivilegedIntentsFromFlags, i as probeDiscord, n as fetchDiscordApplicationSummary, r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-C3SCKyYU.js";
-import { t as collectDiscordSecurityAuditFindings } from "./security-audit-DtT0SIns.js";
+import { t as discordSetupPlugin } from "./channel.setup-Tn_O2B7F.js";
+import { n as handleDiscordSubagentEnded, r as handleDiscordSubagentSpawning, t as handleDiscordSubagentDeliveryTarget } from "./subagent-hooks-kFyJQ-MK.js";
+import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-DikBWer5.js";
+import { n as listDiscordDirectoryGroupsFromConfig, r as listDiscordDirectoryPeersFromConfig } from "./directory-config-DF85-bUY.js";
+import { t as fetchPluralKitMessageInfo } from "./pluralkit-CCovPs9s.js";
+import { a as resolveDiscordPrivilegedIntentsFromFlags, i as probeDiscord, n as fetchDiscordApplicationSummary, r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-Bci2pS8M.js";
+import { t as collectDiscordSecurityAuditFindings } from "./security-audit-njzOejQp.js";
 import { resolveOpenProviderRuntimeGroupPolicy as resolveDiscordRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
 //#region extensions/discord/api.ts
-const handleDiscordMessageAction = async (...args) => (await import("./channel-actions.runtime-D9Qadn-l.js")).handleDiscordMessageAction(...args);
+const handleDiscordMessageAction = async (...args) => (await import("./channel-actions.runtime-CgJy35O0.js")).handleDiscordMessageAction(...args);
 /**
 * @deprecated Shipped `@openclaw/discord/api` compatibility only. Use native
 * `AbortSignal.any` after filtering optional signals. Removal with the next

package/dist/{approval-handler.runtime-BbkfPoGc.js → approval-handler.runtime-ClZpan85.js}

@@ -1,9 +1,8 @@
-import { K as Container, L as serializePayload, Q as Row, W as Button, ct as createUserDmChannel, et as Separator, gt as deleteChannelMessage, nt as TextDisplay, pt as createChannelMessage, vt as editChannelMessage } from "./chunk-CWzmeWf_.js";
-import { c as buildExecApprovalCustomId } from "./outbound-session-route-M2bEY9tI.js";
-import { P as createDiscordClient, b as stripUndefinedFields, g as createDiscordMessageNonce } from "./send.shared-Dber6X57.js";
-import { t as inspectDiscordAccount } from "./account-inspect-dFV0JrnR.js";
-import { n as formatDiscordApprovalDisplayValue, s as isDiscordExecApprovalClientEnabled, t as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./approval-message-safety-DrLlgIPz.js";
-import { a as shouldHandleDiscordApprovalRequest } from "./channel-5MfaC2IE.js";
+import { K as Container, L as serializePayload, Q as Row, W as Button, ct as createUserDmChannel, et as Separator, gt as deleteChannelMessage, nt as TextDisplay, pt as createChannelMessage, vt as editChannelMessage } from "./chunk-BrZocpfs.js";
+import { c as buildExecApprovalCustomId } from "./outbound-session-route-D_nc_Ayk.js";
+import { P as createDiscordClient, b as stripUndefinedFields, g as createDiscordMessageNonce } from "./send.shared-Dfacnk-E.js";
+import { n as formatDiscordApprovalDisplayValue, s as isDiscordExecApprovalClientEnabled, t as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./approval-message-safety-LyND6GR3.js";
+import { a as shouldHandleDiscordApprovalRequest } from "./channel-yq-so4jJ.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { logDebug, logError } from "openclaw/plugin-sdk/logging-core";
 import { ButtonStyle } from "discord-api-types/v10";
@@ -17,11 +16,8 @@ function normalizeDiscordAccentColor(raw) {
 	if (!/^#[0-9a-fA-F]{6}$/.test(normalized)) return null;
 	return normalized.toUpperCase();
 }
-function resolveDiscordAccentColor(params) {
-	return normalizeDiscordAccentColor(inspectDiscordAccount({
-		cfg: params.cfg,
-		accountId: params.accountId
-	}).config.ui?.components?.accentColor) ?? DEFAULT_DISCORD_ACCENT_COLOR;
+function resolveDiscordAccentColor(_params) {
+	return DEFAULT_DISCORD_ACCENT_COLOR;
 }
 //#endregion
 //#region extensions/discord/src/ui.ts

package/dist/{approval-message-safety-DrLlgIPz.js → approval-message-safety-LyND6GR3.js}

@@ -1,5 +1,5 @@
-import { l as parseDiscordTarget } from "./chunk-CWzmeWf_.js";
-import { s as resolveDiscordAccount } from "./accounts-CMd4nzLB.js";
+import { l as parseDiscordTarget } from "./chunk-BrZocpfs.js";
+import { s as resolveDiscordAccount } from "./accounts-D2LKPukU.js";
 import { normalizeOptionalLowercaseString, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver } from "openclaw/plugin-sdk/approval-native-runtime";
 import { getExecApprovalReplyMetadata, isChannelExecApprovalClientEnabledFromConfig, matchesApprovalRequestFilters } from "openclaw/plugin-sdk/approval-client-runtime";

package/dist/{audit-BC6bgPMX.js → audit-CFfounXC.js}

@@ -1,7 +1,7 @@
-import { Yt as __exportAll } from "./chunk-CWzmeWf_.js";
-import { O as fetchChannelPermissionsDiscord } from "./send.shared-Dber6X57.js";
-import { t as inspectDiscordAccount } from "./account-inspect-dFV0JrnR.js";
-import "./send-CSRxNNgq.js";
+import { Yt as __exportAll } from "./chunk-BrZocpfs.js";
+import { O as fetchChannelPermissionsDiscord } from "./send.shared-Dfacnk-E.js";
+import { t as inspectDiscordAccount } from "./account-inspect-Dztmn4J4.js";
+import "./send-CfnXLUXq.js";
 import { n as collectDiscordAuditChannelIdsForAccount, t as auditDiscordChannelPermissionsWithFetcher } from "./audit-core-xwjIczO0.js";
 //#region extensions/discord/src/audit.ts
 var audit_exports = /* @__PURE__ */ __exportAll({

package/dist/{channel-actions-DicWTbYH.js → channel-actions-C8n1zWZ-.js}

@@ -1,6 +1,6 @@
-import { r as listDiscordAccountIds, t as createDiscordActionGate } from "./accounts-CMd4nzLB.js";
-import { h as readDiscordComponentSpec } from "./outbound-session-route-M2bEY9tI.js";
-import { t as inspectDiscordAccount } from "./account-inspect-dFV0JrnR.js";
+import { r as listDiscordAccountIds, t as createDiscordActionGate } from "./accounts-D2LKPukU.js";
+import { h as readDiscordComponentSpec } from "./outbound-session-route-D_nc_Ayk.js";
+import { t as inspectDiscordAccount } from "./account-inspect-Dztmn4J4.js";
 import { i as withDiscordInboundEventDeliveryMetadata } from "./inbound-event-delivery-CEPlt2uz.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createUnionActionGate } from "openclaw/plugin-sdk/channel-actions";
@@ -41,7 +41,7 @@ const localExecutionActions = /* @__PURE__ */ new Set([
 function resolveDiscordActionExecutionMode({ action }) {
 	return localExecutionActions.has(action) ? "local" : "gateway";
 }
-const loadDiscordChannelActionsRuntime = createLazyRuntimeModule(() => import("./channel-actions.runtime-D9Qadn-l.js"));
+const loadDiscordChannelActionsRuntime = createLazyRuntimeModule(() => import("./channel-actions.runtime-CgJy35O0.js"));
 function listDiscoverableDiscordAccounts(cfg) {
 	return listDiscordAccountIds(cfg).map((accountId) => inspectDiscordAccount({
 		cfg,

package/dist/{channel-actions.runtime-D9Qadn-l.js → channel-actions.runtime-CgJy35O0.js}

@@ -1,11 +1,11 @@
-import { u as resolveDiscordChannelId } from "./chunk-CWzmeWf_.js";
-import { a as buildDiscordPresentationComponents, i as buildDiscordInteractiveComponents } from "./outbound-session-route-M2bEY9tI.js";
-import { a as readDiscordAutoArchiveDurationParam, t as handleDiscordAction } from "./runtime-Z2qkKakn.js";
-import "./targets-BjEMIe8t.js";
+import { u as resolveDiscordChannelId } from "./chunk-BrZocpfs.js";
+import { a as buildDiscordPresentationComponents, i as buildDiscordInteractiveComponents } from "./outbound-session-route-D_nc_Ayk.js";
+import { a as readDiscordAutoArchiveDurationParam, t as handleDiscordAction } from "./runtime-D-6AugWA.js";
+import "./targets-CB8ahjZk.js";
 import "./action-runtime-api.js";
 import { r as notifyDiscordInboundEventOutboundSuccess } from "./inbound-event-delivery-CEPlt2uz.js";
-import { r as isDiscordComponentSpecWithinMessageLimit, t as DISCORD_PRESENTATION_CAPABILITIES } from "./outbound-components-BGhk6HI3.js";
-import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-Bsk2YBPs.js";
+import { r as isDiscordComponentSpecWithinMessageLimit, t as DISCORD_PRESENTATION_CAPABILITIES } from "./outbound-components-CTFDDcq5.js";
+import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-DikBWer5.js";
 import { normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveReactionMessageId } from "openclaw/plugin-sdk/channel-actions";
 import { adaptMessagePresentationForChannel, normalizeLegacyInteractiveReply, normalizeMessagePresentation, renderMessagePresentationFallbackText } from "openclaw/plugin-sdk/interactive-runtime";

package/dist/channel-config-api.js

@@ -1,2 +1,2 @@
-import { t as DiscordChannelConfigSchema } from "./config-schema-BxrgfSMD.js";
+import { t as DiscordChannelConfigSchema } from "./config-schema-D-YrV-5E.js";
 export { DiscordChannelConfigSchema };

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as discordPlugin } from "./channel-5MfaC2IE.js";
+import { t as discordPlugin } from "./channel-yq-so4jJ.js";
 export { discordPlugin };

package/dist/{channel-5MfaC2IE.js → channel-yq-so4jJ.js}

@@ -1,16 +1,16 @@
-import { l as parseDiscordTarget, o as looksLikeDiscordTargetId, s as normalizeDiscordMessagingTarget } from "./chunk-CWzmeWf_.js";
-import { c as resolveDiscordAccountAllowFrom, i as listEnabledDiscordAccounts, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-CMd4nzLB.js";
-import { t as resolveDiscordOutboundSessionRoute } from "./outbound-session-route-M2bEY9tI.js";
+import { l as parseDiscordTarget, o as looksLikeDiscordTargetId, s as normalizeDiscordMessagingTarget } from "./chunk-BrZocpfs.js";
+import { c as resolveDiscordAccountAllowFrom, i as listEnabledDiscordAccounts, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-D2LKPukU.js";
+import { t as resolveDiscordOutboundSessionRoute } from "./outbound-session-route-D_nc_Ayk.js";
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
 import { a as projectCredentialSnapshotFields, n as PAIRING_APPROVED_MESSAGE, o as resolveConfiguredFromCredentialStatuses, r as buildTokenChannelStatusSummary, t as DEFAULT_ACCOUNT_ID } from "./channel-api-CAJ0wMoV.js";
 import { u as withAbortTimeout } from "./timeouts-B9cy6RvQ.js";
-import { a as getDiscordExecApprovalApprovers, c as shouldSuppressLocalDiscordExecApprovalPrompt, d as createChannelNativeOriginTargetResolver, f as isChannelExecApprovalClientEnabledFromConfig, i as resolveDiscordCurrentConversationIdentity, l as createApproverRestrictedNativeApprovalCapability, o as isDiscordExecApprovalApprover, p as matchesApprovalRequestFilters, s as isDiscordExecApprovalClientEnabled, u as createChannelApproverDmTargetResolver } from "./approval-message-safety-DrLlgIPz.js";
+import { a as getDiscordExecApprovalApprovers, c as shouldSuppressLocalDiscordExecApprovalPrompt, d as createChannelNativeOriginTargetResolver, f as isChannelExecApprovalClientEnabledFromConfig, i as resolveDiscordCurrentConversationIdentity, l as createApproverRestrictedNativeApprovalCapability, o as isDiscordExecApprovalApprover, p as matchesApprovalRequestFilters, s as isDiscordExecApprovalClientEnabled, u as createChannelApproverDmTargetResolver } from "./approval-message-safety-LyND6GR3.js";
 import { r as resolveRequiredDiscordChannelPermissions } from "./audit-core-xwjIczO0.js";
-import { t as discordMessageActions$1 } from "./channel-actions-DicWTbYH.js";
+import { t as discordMessageActions$1 } from "./channel-actions-C8n1zWZ-.js";
 import { r as openDiscordCommandDeployHashStore } from "./command-deploy-store-DFkBTViB.js";
-import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-DnTpkroM.js";
-import { n as discordOutbound } from "./outbound-adapter-B2_oa-zV.js";
-import { a as discordSecurityAdapter, i as discordSetupAdapter, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-BEhmAdMY.js";
+import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-DAIlp7Px.js";
+import { n as discordOutbound } from "./outbound-adapter-XZWo4_HD.js";
+import { a as discordSetupContract, i as discordSetupAdapter, n as discordConfigAdapter, o as discordSecurityAdapter, t as createDiscordPluginBase } from "./shared-DMA7f3a8.js";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.js";
 import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -195,7 +195,7 @@ function createDiscordApprovalCapability(configOverride) {
 				request,
 				configOverride
 			}),
-			load: async () => (await import("./approval-handler.runtime-BbkfPoGc.js")).discordApprovalNativeRuntime
+			load: async () => (await import("./approval-handler.runtime-ClZpan85.js")).discordApprovalNativeRuntime
 		})
 	});
 }
@@ -302,22 +302,22 @@ function resolveDiscordInboundConversation(params) {
 }
 //#endregion
 //#region extensions/discord/src/channel.loaders.ts
-const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-CmukHSms.js").then((n) => n.t));
-const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-9KcG3mLg.js").then((n) => n.n));
-const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-GCGf3oV0.js").then((n) => n.n));
-const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-D1z8mK4b.js").then((n) => n.a));
-const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-vqLA450R.js").then((n) => n.r));
-const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-BWCRsVoT.js"));
-const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-D55QqC9u.js"));
+const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-DF85-bUY.js").then((n) => n.t));
+const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-CmFAdMeQ.js").then((n) => n.n));
+const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-Cmu75lZy.js").then((n) => n.n));
+const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-DlZEGvC1.js").then((n) => n.a));
+const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-Bo1oWLPO.js").then((n) => n.r));
+const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-DSzKjpKs.js"));
+const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-C88gnnXj.js"));
 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-BC6bgPMX.js").then((n) => n.n));
-const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CSRxNNgq.js").then((n) => n.t));
-const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-BYlCRO__.js").then((n) => n.t));
+const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-CFfounXC.js").then((n) => n.n));
+const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CfnXLUXq.js").then((n) => n.t));
+const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-CrMtTrb0.js").then((n) => n.t));
 //#endregion
 //#region extensions/discord/src/group-policy.ts
 function normalizeDiscordSlug(value) {
@@ -598,7 +598,10 @@ function toConversationLifecycleBinding(binding) {
 }
 const discordPlugin = createChatChannelPlugin({
 	base: {
-		...createDiscordPluginBase({ setup: discordSetupAdapter }),
+		...createDiscordPluginBase({
+			setup: discordSetupAdapter,
+			setupContract: discordSetupContract
+		}),
 		allowlist: {
 			...buildLegacyDmAccountAllowlistAdapter({
 				channelId: "discord",

package/dist/{channel.setup-CJXfFclP.js → channel.setup-Tn_O2B7F.js}

@@ -1,11 +1,11 @@
-import { a as mergeDiscordAccountConfig, c as resolveDiscordAccountAllowFrom, l as resolveDiscordAccountConfig, m as resolveDiscordToken, o as resolveDefaultDiscordAccountId } from "./accounts-CMd4nzLB.js";
-import { n as inspectDiscordConfiguredToken } from "./account-inspect-dFV0JrnR.js";
-import { i as discordSetupAdapter, t as createDiscordPluginBase } from "./shared-BEhmAdMY.js";
-import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-9KcG3mLg.js";
-import { t as resolveDiscordUserAllowlist } from "./resolve-users-GCGf3oV0.js";
+import { a as mergeDiscordAccountConfig, c as resolveDiscordAccountAllowFrom, l as resolveDiscordAccountConfig, m as resolveDiscordToken, o as resolveDefaultDiscordAccountId } from "./accounts-D2LKPukU.js";
+import { n as inspectDiscordConfiguredToken } from "./account-inspect-Dztmn4J4.js";
+import { a as discordSetupContract, i as discordSetupAdapter, t as createDiscordPluginBase } from "./shared-DMA7f3a8.js";
+import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-CmFAdMeQ.js";
+import { t as resolveDiscordUserAllowlist } from "./resolve-users-Cmu75lZy.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { createAccountScopedAllowFromSection, createAccountScopedGroupAccessSection, createLegacyCompatChannelDmPolicy, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, parseMentionOrPrefixedId, patchChannelConfigForAccount, promptLegacyChannelAllowFromForAccount, resolveEntriesWithOptionalToken, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup-runtime";
+import { createAccountScopedAllowFromSection, createAccountScopedGroupAccessSection, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, mergeAllowFromEntries, parseMentionOrPrefixedId, patchChannelConfigForAccount, promptResolvedAllowFrom, resolveEntriesWithOptionalToken, resolveSetupAccountId, setSetupChannelEnabled, splitSetupEntries } from "openclaw/plugin-sdk/setup-runtime";
 import { formatDocsLink } from "openclaw/plugin-sdk/setup-tools";
 //#region extensions/discord/src/setup-account-state.ts
 function resolveDefaultDiscordSetupAccountId(cfg) {
@@ -128,11 +128,43 @@ function parseDiscordAllowFromId(value) {
 	});
 }
 function createDiscordSetupWizardBase(handlers) {
-	const discordDmPolicy = createLegacyCompatChannelDmPolicy({
+	const discordDmPolicy = {
 		label: "Discord",
 		channel: channel$1,
+		policyKey: "channels.discord.dmPolicy",
+		allowFromKey: "channels.discord.allowFrom",
+		resolveConfigKeys: (_cfg, accountId) => accountId && accountId !== DEFAULT_ACCOUNT_ID ? {
+			policyKey: `channels.discord.accounts.${accountId}.dmPolicy`,
+			allowFromKey: `channels.discord.accounts.${accountId}.allowFrom`
+		} : {
+			policyKey: "channels.discord.dmPolicy",
+			allowFromKey: "channels.discord.allowFrom"
+		},
+		getCurrent: (cfg, accountId) => resolveDiscordSetupAccountConfig({
+			cfg,
+			accountId
+		}).config.dmPolicy ?? "pairing",
+		setPolicy: (cfg, policy, accountId) => {
+			const resolved = resolveDiscordSetupAccountConfig({
+				cfg,
+				accountId
+			});
+			return patchChannelConfigForAccount({
+				cfg,
+				channel: channel$1,
+				accountId: resolved.accountId,
+				patch: {
+					dmPolicy: policy,
+					...policy === "open" ? { allowFrom: mergeAllowFromEntries(resolved.config.allowFrom ?? [], ["*"]) } : {},
+					dm: {
+						...resolved.config.dm,
+						enabled: typeof resolved.config.dm?.enabled === "boolean" ? resolved.config.dm.enabled : true
+					}
+				}
+			});
+		},
 		promptAllowFrom: handlers.promptAllowFrom
-	});
+	};
 	return {
 		channel: channel$1,
 		status: createStandardChannelSetupStatus({
@@ -244,35 +276,37 @@ async function resolveDiscordAllowFromEntries(params) {
 	});
 }
 async function promptDiscordAllowFrom(params) {
-	return await promptLegacyChannelAllowFromForAccount({
+	const accountId = resolveSetupAccountId({
+		accountId: params.accountId,
+		defaultAccountId: resolveDefaultDiscordSetupAccountId(params.cfg)
+	});
+	const account = resolveDiscordSetupAccountConfig({
 		cfg: params.cfg,
-		channel,
+		accountId
+	});
+	const noteTitle = t("wizard.discord.allowlistTitle");
+	await params.prompter.note([
+		t("wizard.discord.allowlistIntro"),
+		t("wizard.discord.examples"),
+		"- 123456789012345678",
+		"- @alice",
+		"- alice#1234",
+		t("wizard.discord.multipleEntries"),
+		t("wizard.channels.docs", { link: formatDocsLink("/discord", "discord") })
+	].join("\n"), noteTitle);
+	const allowFrom = await promptResolvedAllowFrom({
 		prompter: params.prompter,
-		accountId: params.accountId,
-		defaultAccountId: resolveDefaultDiscordSetupAccountId(params.cfg),
-		resolveAccount: (cfg, accountId) => resolveDiscordSetupAccountConfig({
-			cfg,
+		existing: resolveDiscordAccountAllowFrom({
+			cfg: params.cfg,
 			accountId
-		}),
-		noteTitle: t("wizard.discord.allowlistTitle"),
-		noteLines: [
-			t("wizard.discord.allowlistIntro"),
-			t("wizard.discord.examples"),
-			"- 123456789012345678",
-			"- @alice",
-			"- alice#1234",
-			t("wizard.discord.multipleEntries"),
-			t("wizard.channels.docs", { link: formatDocsLink("/discord", "discord") })
-		],
+		}) ?? [],
+		token: resolveDiscordToken(params.cfg, { accountId }).token,
 		message: t("wizard.discord.allowFromPrompt"),
 		placeholder: "@alice, 123456789012345678",
+		label: noteTitle,
+		parseInputs: splitSetupEntries,
 		parseId: parseDiscordAllowFromId,
 		invalidWithoutTokenNote: t("wizard.discord.allowFromInvalidWithoutToken"),
-		resolveExisting: (account, cfg) => resolveDiscordAccountAllowFrom({
-			cfg,
-			accountId: account.accountId
-		}) ?? [],
-		resolveToken: (account) => resolveDiscordToken(params.cfg, { accountId: account.accountId }).token,
 		resolveEntries: async ({ token, entries }) => (await resolveDiscordUserAllowlist({
 			token,
 			entries
@@ -282,6 +316,18 @@ async function promptDiscordAllowFrom(params) {
 			id: entry.id ?? null
 		}))
 	});
+	return patchChannelConfigForAccount({
+		cfg: params.cfg,
+		channel,
+		accountId: account.accountId,
+		patch: {
+			allowFrom,
+			dm: {
+				...account.config.dm,
+				enabled: typeof account.config.dm?.enabled === "boolean" ? account.config.dm.enabled : true
+			}
+		}
+	});
 }
 async function resolveDiscordGroupAllowlist(params) {
 	return await resolveEntriesWithOptionalToken({
@@ -313,7 +359,8 @@ const discordSetupPlugin = { ...createDiscordPluginBase({
 			entries
 		})
 	}),
-	setup: discordSetupAdapter
+	setup: discordSetupAdapter,
+	setupContract: discordSetupContract
 }) };
 //#endregion
 export { discordSetupPlugin as t };