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

package/dist/{activities-api-DTKsuDxf.js → activities-api-KCBAmWxD.js}

@@ -1,19 +1,14 @@
-import { u as resolveDiscordChannelId$1 } from "./chunk-DX4jpFQP.js";
-import { n as isDiscordAccountEnabledForRuntime, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-DJTf1LtA.js";
-import { i as resolveDiscordActivitiesConfig, r as setDiscordActivitiesRuntime, t as DiscordActivitiesRuntime } from "./runtime-BmW_j_hl.js";
-import { S as parseDiscordActivityCustomId, a as buildDiscordPresentationComponents } from "./outbound-session-route-H-HoyH5U.js";
-import { r as sendDiscordComponentMessage } from "./send.components-5uqwkjgE.js";
+import { i as buildDiscordPresentationComponents, x as parseDiscordActivityCustomId } from "./components-ezGKo_Yh.js";
+import { A as resolveDiscordChannelId$1, c as resolveDiscordAccount } from "./accounts-DNl-oCEw.js";
+import { r as sendDiscordComponentMessage } from "./send.components-ChK1wS7w.js";
+import { r as setDiscordActivitiesRuntime, t as DiscordActivitiesRuntime } from "./runtime-CQovMsH3.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";
 import { fetchWithSsrFGuard as fetchWithSsrFGuard$1 } from "openclaw/plugin-sdk/ssrf-runtime";
-import { jsonResult, readStringParam } from "openclaw/plugin-sdk/channel-actions";
-import { escapeHtml } from "openclaw/plugin-sdk/text-utility-runtime";
-import { WidgetHtmlInputError, assertWidgetHtmlSize, isCompleteHtmlDocument } from "openclaw/plugin-sdk/widget-html";
 //#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";
@@ -440,6 +435,7 @@ function createDiscordActivityHttpHandler(deps) {
 	return { async handleHttpRequest(req, res) {
 		const url = new URL(req.url ?? "/", "http://localhost");
 		if (url.pathname !== "/discord/activity" && !url.pathname.startsWith(`/discord/activity/`)) return false;
+		if (!deps.runtime.hasEnabledAccounts()) return false;
 		const relative = url.pathname.slice(17) || "/";
 		if (req.method === "GET" && (relative === "/" || relative === "/index.html")) return respond(res, 200, DISCORD_ACTIVITY_SHELL_HTML, "text/html; charset=utf-8", { "Content-Security-Policy": DISCORD_ACTIVITY_SHELL_CSP });
 		if (req.method === "GET" && relative === "/shell.js") return respond(res, 200, DISCORD_ACTIVITY_SHELL_JS, "text/javascript; charset=utf-8");
@@ -468,6 +464,133 @@ function createDiscordActivityHttpHandler(deps) {
 	} };
 }
 //#endregion
+//#region extensions/discord/src/activities/presenter.ts
+const DISCORD_WIDGET_HTML_MAX_BYTES = 48 * 1024;
+function resolveDiscordChannelId(context) {
+	const raw = context.nativeChannelId?.trim() || context.currentMessagingTarget?.trim() || context.currentChannelId?.trim() || context.deliveryContext?.to?.trim();
+	if (!raw) return;
+	try {
+		return resolveDiscordChannelId$1(raw);
+	} catch {
+		return;
+	}
+}
+function resolveDiscordPresentationRoute(context, runtime) {
+	if (context.messageChannel !== "discord") return;
+	const cfg = runtime.currentConfig();
+	const account = resolveDiscordAccount({
+		cfg,
+		accountId: context.accountId ?? context.deliveryContext?.accountId
+	});
+	const channelId = resolveDiscordChannelId(context);
+	const activityAccount = runtime.resolveAccount(account.accountId, cfg);
+	if (!channelId || !activityAccount) return;
+	return {
+		account: activityAccount,
+		cfg,
+		channelId
+	};
+}
+/** Presents a canonical core widget document in the active Discord channel. */
+function createDiscordWidgetPresenter(runtime, deps = {}) {
+	return {
+		target: "current_channel",
+		description: "Post an Activity launch button in the current Discord channel",
+		capabilities: {
+			sourceKinds: ["html"],
+			maxSourceBytes: DISCORD_WIDGET_HTML_MAX_BYTES
+		},
+		match: (context) => resolveDiscordPresentationRoute(context, runtime) !== void 0,
+		async availability(context) {
+			return resolveDiscordPresentationRoute(context, runtime) ? {
+				ok: true,
+				value: { available: true }
+			} : {
+				ok: false,
+				error: {
+					code: "unavailable",
+					message: "Discord Activities are unavailable for the current channel and account."
+				}
+			};
+		},
+		async present({ context, document, title }) {
+			const route = resolveDiscordPresentationRoute(context, runtime);
+			if (!route) return {
+				ok: false,
+				error: {
+					code: "unavailable",
+					message: "Discord Activities are unavailable for the current channel and account."
+				}
+			};
+			if (title.length > 80) return {
+				ok: false,
+				error: {
+					code: "presentation_error",
+					message: "title must be 80 characters or fewer"
+				}
+			};
+			const widgetId = await runtime.store.createWidget({
+				html: document.html,
+				title,
+				channelId: route.channelId,
+				accountId: route.account.accountId,
+				createdAt: (deps.now ?? Date.now)()
+			});
+			let result;
+			let deliveredResult;
+			let deliveryRecord;
+			let deliveryRecordError;
+			const recordDelivery = async (deliveryResult) => {
+				deliveredResult = deliveryResult;
+				deliveryRecord ??= runtime.store.markWidgetDelivered(widgetId, deliveryResult.messageId);
+				try {
+					await deliveryRecord;
+				} catch (error) {
+					deliveryRecordError ??= new Error("Discord widget was delivered, but its delivery state could not be saved", { cause: error });
+					throw deliveryRecordError;
+				}
+			};
+			try {
+				const components = buildDiscordPresentationComponents({ blocks: [{
+					type: "buttons",
+					buttons: [{
+						label: "Open widget",
+						action: {
+							type: "web-app",
+							widgetId
+						}
+					}]
+				}] });
+				if (!components) throw new Error("Discord widget launch button could not be rendered");
+				result = await (deps.sendComponentMessage ?? sendDiscordComponentMessage)(`channel:${route.channelId}`, {
+					...components,
+					text: title
+				}, {
+					cfg: route.cfg,
+					accountId: route.account.accountId,
+					allowedMentions: { parse: [] },
+					onDeliveryResult: recordDelivery
+				});
+				await recordDelivery(result);
+			} catch (error) {
+				if (deliveryRecordError) throw deliveryRecordError;
+				if (!deliveredResult) {
+					await runtime.store.deleteWidget(widgetId);
+					throw error;
+				}
+				result = deliveredResult;
+			}
+			return {
+				ok: true,
+				value: {
+					kind: "message",
+					receipt: result.receipt
+				}
+			};
+		}
+	};
+}
+//#endregion
 //#region extensions/discord/src/activities/store.ts
 const DAY_MS = 1440 * 60 * 1e3;
 const DISCORD_EPOCH_MS = 14200704e5;
@@ -595,173 +718,9 @@ var DiscordActivityStore = class {
 	}
 };
 //#endregion
-//#region extensions/discord/src/activities/tool.ts
-const DISCORD_WIDGET_HTML_MAX_BYTES = 48 * 1024;
-const DiscordWidgetParameters = Type.Object({
-	html: Type.String({ description: "Self-contained HTML document or body fragment" }),
-	title: Type.String({
-		minLength: 1,
-		maxLength: 80
-	}),
-	button_label: Type.Optional(Type.String({
-		minLength: 1,
-		maxLength: 80
-	}))
-});
-const ShowWidgetParameters = Type.Object({
-	title: Type.String({
-		minLength: 1,
-		maxLength: 80
-	}),
-	widget_code: Type.String({ description: "Self-contained HTML document or body fragment" }),
-	button_label: Type.Optional(Type.String({
-		minLength: 1,
-		maxLength: 80
-	}))
-});
-function currentConfig(context, runtime) {
-	return context.getRuntimeConfig?.() ?? context.runtimeConfig ?? context.config ?? runtime.currentConfig();
-}
-function resolveDiscordChannelId(context) {
-	const raw = context.nativeChannelId?.trim() || context.deliveryContext?.to?.trim();
-	if (!raw) return;
-	try {
-		return resolveDiscordChannelId$1(raw);
-	} catch {
-		return;
-	}
-}
-function buildDiscordWidgetDocument(title, html) {
-	if (isCompleteHtmlDocument(html)) return html;
-	return `<!doctype html>
-<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>${escapeHtml(title)}</title>
-<style>:root{color-scheme:dark;background:#111214;color:#dbdee1;font:14px system-ui,sans-serif}*{box-sizing:border-box}html,body{margin:0;min-height:100%}body{padding:16px}</style></head><body>${html}</body></html>`;
-}
-const DISCORD_WIDGET_VARIANT = {
-	name: "discord_widget",
-	label: "Discord Widget",
-	description: "Deprecated: use show_widget. Show an interactive, self-contained HTML widget to the user in Discord.",
-	htmlParam: "html",
-	parameters: DiscordWidgetParameters
-};
-const SHOW_WIDGET_VARIANT = {
-	name: "show_widget",
-	label: "Show Widget",
-	description: "Show an interactive, self-contained HTML widget to the user on their current surface. In Discord, posts an Activity launch button.",
-	htmlParam: "widget_code",
-	parameters: ShowWidgetParameters
-};
-function createDiscordWidgetToolVariant(context, deps, variant) {
-	if (context.messageChannel !== "discord") return null;
-	const cfg = currentConfig(context, deps.runtime);
-	const account = resolveDiscordAccount({
-		cfg,
-		accountId: context.agentAccountId ?? context.deliveryContext?.accountId
-	});
-	if (!deps.runtime.isAccountEnabled(account.accountId, cfg)) return null;
-	return {
-		label: variant.label,
-		name: variant.name,
-		description: variant.description,
-		parameters: variant.parameters,
-		execute: async (_toolCallId, rawParams) => {
-			const params = rawParams;
-			const html = readStringParam(params, variant.htmlParam, {
-				required: true,
-				trim: false
-			});
-			const title = readStringParam(params, "title", { required: true });
-			const buttonLabel = readStringParam(params, "button_label") || "Open widget";
-			if (!html.trim()) throw new WidgetHtmlInputError(`${variant.htmlParam} is required`);
-			assertWidgetHtmlSize(html, DISCORD_WIDGET_HTML_MAX_BYTES, { inputName: variant.htmlParam });
-			if (title.length > 80) throw new WidgetHtmlInputError("title must be 80 characters or fewer");
-			if (!buttonLabel.trim() || buttonLabel.length > 80) throw new WidgetHtmlInputError("button_label must be 1 to 80 characters");
-			const channelId = resolveDiscordChannelId(context);
-			if (!channelId) throw new WidgetHtmlInputError(`${variant.name} requires a concrete Discord channel in the current session`);
-			const widgetId = await deps.runtime.store.createWidget({
-				html: buildDiscordWidgetDocument(title, html),
-				title,
-				channelId,
-				accountId: account.accountId,
-				createdAt: (deps.now ?? Date.now)()
-			});
-			let result;
-			let deliveredResult;
-			let deliveryRecord;
-			let deliveryRecordError;
-			const recordDelivery = async (deliveryResult) => {
-				deliveredResult = deliveryResult;
-				deliveryRecord ??= deps.runtime.store.markWidgetDelivered(widgetId, deliveryResult.messageId);
-				try {
-					await deliveryRecord;
-				} catch (error) {
-					deliveryRecordError ??= new Error("Discord widget was delivered, but its delivery state could not be saved", { cause: error });
-					throw deliveryRecordError;
-				}
-			};
-			try {
-				const components = buildDiscordPresentationComponents({ blocks: [{
-					type: "buttons",
-					buttons: [{
-						label: buttonLabel.trim(),
-						action: {
-							type: "web-app",
-							widgetId
-						}
-					}]
-				}] });
-				if (!components) throw new Error("Discord widget launch button could not be rendered");
-				result = await (deps.sendComponentMessage ?? sendDiscordComponentMessage)(`channel:${channelId}`, {
-					...components,
-					text: title
-				}, {
-					cfg,
-					accountId: account.accountId,
-					allowedMentions: { parse: [] },
-					onDeliveryResult: recordDelivery
-				});
-				await recordDelivery(result);
-			} catch (error) {
-				if (deliveryRecordError) throw deliveryRecordError;
-				if (!deliveredResult) {
-					await deps.runtime.store.deleteWidget(widgetId);
-					throw error;
-				}
-				result = deliveredResult;
-			}
-			return jsonResult({
-				widgetId,
-				messageId: result.messageId,
-				channelId: result.channelId
-			});
-		}
-	};
-}
-function createDiscordWidgetTool(context, deps) {
-	return createDiscordWidgetToolVariant(context, deps, DISCORD_WIDGET_VARIANT);
-}
-function createDiscordShowWidgetTool(context, deps) {
-	return createDiscordWidgetToolVariant(context, deps, SHOW_WIDGET_VARIANT);
-}
-//#endregion
 //#region extensions/discord/src/activities/register.ts
 function registerDiscordActivities$1(api) {
 	setDiscordActivitiesRuntime(void 0);
-	const enabledAccountIds = [];
-	for (const accountId of listDiscordAccountIds(api.config)) {
-		const account = resolveDiscordAccount({
-			cfg: api.config,
-			accountId
-		});
-		if (!isDiscordAccountEnabledForRuntime(account, api.config)) continue;
-		const resolution = resolveDiscordActivitiesConfig(account.config);
-		if (resolution.enabled) {
-			enabledAccountIds.push(account.accountId);
-			continue;
-		}
-		if (resolution.reason === "missing-client-secret") api.logger.warn(`[discord] activities configured for account ${account.accountId}, but no client secret resolved; feature disabled`);
-	}
-	if (enabledAccountIds.length === 0) return;
 	const runtime = new DiscordActivitiesRuntime(new DiscordActivityStore(openDiscordActivityStores((options) => api.runtime.state.openKeyedStore(options))), api.config, api.runtime.config?.current ? () => api.runtime.config.current() : void 0);
 	setDiscordActivitiesRuntime(runtime);
 	const http = createDiscordActivityHttpHandler({
@@ -774,8 +733,7 @@ function registerDiscordActivities$1(api) {
 		match: "prefix",
 		handler: async (req, res) => await http.handleHttpRequest(req, res)
 	});
-	api.registerTool((context) => createDiscordShowWidgetTool(context, { runtime }), { name: "show_widget" });
-	api.registerTool((context) => createDiscordWidgetTool(context, { runtime }), { name: "discord_widget" });
+	api.registerWidgetPresenter(createDiscordWidgetPresenter(runtime));
 }
 //#endregion
 //#region extensions/discord/activities-api.ts

package/dist/activities-api.js

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

package/dist/{allow-list-DzKrtfah.js → allow-list-BDMimASD.js}

@@ -1,3 +1,4 @@
+import { parseDateStringTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelKeyCandidates, resolveChannelEntryMatchWithFallback, resolveChannelMatchConfig } from "openclaw/plugin-sdk/channel-targets";
 import { resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
@@ -19,9 +20,7 @@ function formatDiscordUserTag(user) {
 	return user.username ?? user.id;
 }
 function resolveTimestampMs(timestamp) {
-	if (!timestamp) return;
-	const parsed = Date.parse(timestamp);
-	return Number.isNaN(parsed) ? void 0 : parsed;
+	return parseDateStringTimestampMs(timestamp);
 }
 //#endregion
 //#region extensions/discord/src/monitor/allow-list.ts

package/dist/{api-DnrK9gML.js → api-DNVbJyEy.js}

@@ -1,4 +1,5 @@
 import { t as parseDiscordRetryAfterBodySeconds } from "./retry-after-DdLPmPoa.js";
+import { redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { readResponseWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
 import { parseRetryAfterHeaderSeconds, resolveRetryConfig, retryAsync } from "openclaw/plugin-sdk/retry-runtime";
@@ -11,7 +12,7 @@ const DISCORD_RESPONSE_BODY_SUMMARY_MAX_CHARS = 240;
 function summarizeDiscordResponseBody(body, opts = {}) {
 	const summary = body.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, " ").replace(/<style\b[^>]*>[\s\S]*?<\/style>/gi, " ").replace(/<[^>]+>/g, " ").replace(/&nbsp;/gi, " ").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/\s+/g, " ").trim();
 	if (!summary) return opts.emptyText;
-	return truncateUtf16Safe(summary, DISCORD_RESPONSE_BODY_SUMMARY_MAX_CHARS);
+	return truncateUtf16Safe(redactToolPayloadText(summary), DISCORD_RESPONSE_BODY_SUMMARY_MAX_CHARS);
 }
 function isDiscordHtmlResponseBody(body, contentType) {
 	return /\bhtml\b/i.test(contentType ?? "") || /^\s*<!doctype\s+html\b/i.test(body) || /^\s*<html\b/i.test(body);
@@ -55,7 +56,7 @@ function formatRetryAfterSeconds(value) {
 	if (value === void 0 || !Number.isFinite(value) || value < 0) return;
 	return `${value < 10 ? value.toFixed(1) : Math.round(value).toString()}s`;
 }
-function formatDiscordApiErrorText(text, response) {
+function formatDiscordApiErrorTextUntrusted(text, response) {
 	const trimmed = text.trim();
 	if (!trimmed) return;
 	const payload = parseDiscordApiErrorPayload(trimmed);
@@ -72,6 +73,10 @@ function formatDiscordApiErrorText(text, response) {
 	const retryAfter = formatRetryAfterSeconds(parseDiscordRetryAfterBodySeconds(payload.retry_after));
 	return retryAfter ? `${message} (retry after ${retryAfter})` : message;
 }
+function formatDiscordApiErrorText(text, response) {
+	const detail = formatDiscordApiErrorTextUntrusted(text, response);
+	return detail ? redactToolPayloadText(detail) : detail;
+}
 var DiscordApiError = class extends Error {
 	constructor(message, status, retryAfter) {
 		super(message);

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-DX4jpFQP.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-DJTf1LtA.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-H-HoyH5U.js";
-import { i as requestDiscord, n as DiscordApiError, r as fetchDiscord } from "./api-DnrK9gML.js";
-import { i as parseDiscordSendTarget, n as resolveDiscordTarget } from "./target-resolver-C3s_2m0t.js";
-import { t as inspectDiscordAccount } from "./account-inspect-SXiCBCgP.js";
+import { d as normalizeDiscordMessagingTarget, f as normalizeDiscordOutboundTarget, u as looksLikeDiscordTargetId } from "./retry-DNsVTeTo.js";
+import { C as parseDiscordComponentCustomId, E as parseDiscordModalCustomIdForInteraction, T as parseDiscordModalCustomId, _ as DISCORD_MODAL_CUSTOM_ID_KEY, b as buildDiscordModalCustomId, d as buildDiscordComponentMessage, f as buildDiscordComponentMessageFlags, g as DISCORD_COMPONENT_CUSTOM_ID_KEY, h as resolveDiscordComponentAttachmentName, l as DiscordFormModal, m as readDiscordComponentSpec, n as formatDiscordComponentEventText, p as DISCORD_COMPONENT_ATTACHMENT_PREFIX, r as buildDiscordInteractiveComponents, u as createDiscordFormModal, w as parseDiscordComponentCustomIdForInteraction, y as buildDiscordComponentCustomId } from "./components-ezGKo_Yh.js";
+import { A as resolveDiscordChannelId, a as listEnabledDiscordAccounts, c as resolveDiscordAccount, k as parseDiscordTarget, o as mergeDiscordAccountConfig, p as resolveDiscordMaxLinesPerMessage, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId, t as createDiscordActionGate, u as resolveDiscordAccountConfig } from "./accounts-DNl-oCEw.js";
+import { i as requestDiscord, n as DiscordApiError, r as fetchDiscord } from "./api-DNVbJyEy.js";
+import { i as parseDiscordSendTarget, n as resolveDiscordTarget } from "./target-resolver-DIXShHaZ.js";
+import { t as inspectDiscordAccount } from "./account-inspect-D5xmUpnj.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-Dv_RN7vT.js";
-import { a as getDiscordExecApprovalApprovers, c as shouldSuppressLocalDiscordExecApprovalPrompt, o as isDiscordExecApprovalApprover, s as isDiscordExecApprovalClientEnabled } from "./approval-message-safety-DEyKVsAw.js";
-import { i as resolveDiscordGroupToolPolicy, n as collectDiscordStatusIssues, r as resolveDiscordGroupRequireMention, t as discordPlugin } from "./channel-vKa-76xY.js";
+import "./targets-B2pf49zc.js";
+import { f as getDiscordExecApprovalApprovers, h as shouldSuppressLocalDiscordExecApprovalPrompt, m as isDiscordExecApprovalClientEnabled, p as isDiscordExecApprovalApprover } from "./approval-message-safety-XGFPbDoI.js";
+import { i as resolveDiscordGroupToolPolicy, n as collectDiscordStatusIssues, r as resolveDiscordGroupRequireMention, t as discordPlugin } from "./channel-cXYzGc4L.js";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.js";
-import { t as discordSetupPlugin } from "./channel.setup-CmcwZ_qd.js";
-import { n as handleDiscordSubagentEnded, r as handleDiscordSubagentSpawning, t as handleDiscordSubagentDeliveryTarget } from "./subagent-hooks-Dxy7Fmnq.js";
-import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-D6VRRW-C.js";
-import { n as listDiscordDirectoryGroupsFromConfig, r as listDiscordDirectoryPeersFromConfig } from "./directory-config-D_LojtCe.js";
-import { t as fetchPluralKitMessageInfo } from "./pluralkit-CD4B11JB.js";
-import { a as resolveDiscordPrivilegedIntentsFromFlags, i as probeDiscord, n as fetchDiscordApplicationSummary, r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-BeWKhjqX.js";
-import { t as collectDiscordSecurityAuditFindings } from "./security-audit-jGnJF__m.js";
+import { t as discordSetupPlugin } from "./channel.setup-CSiwnMgs.js";
+import { n as handleDiscordSubagentEnded, t as handleDiscordSubagentDeliveryTarget } from "./subagent-hooks-CNT2ZJTJ.js";
+import { t as tryHandleDiscordMessageActionGuildAdmin } from "./handle-action.guild-admin-6Tvvinsa.js";
+import { n as listDiscordDirectoryGroupsFromConfig, r as listDiscordDirectoryPeersFromConfig } from "./directory-config-XyCfoqLg.js";
+import { t as fetchPluralKitMessageInfo } from "./pluralkit-dUl4v1X3.js";
+import { i as probeDiscord, n as fetchDiscordApplicationSummary, o as resolveDiscordPrivilegedIntentsFromFlags, r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-BTdtVRwU.js";
+import { t as collectDiscordSecurityAuditFindings } from "./security-audit-BfJhAXZp.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-CIYU90sl.js")).handleDiscordMessageAction(...args);
+const handleDiscordMessageAction = async (...args) => (await import("./channel-actions.runtime-CODTvo7c.js")).handleDiscordMessageAction(...args);
 /**
 * @deprecated Shipped `@openclaw/discord/api` compatibility only. Use native
 * `AbortSignal.any` after filtering optional signals. Removal with the next
@@ -29,4 +29,4 @@ function mergeAbortSignals(signals) {
 	return activeSignals.length > 1 ? AbortSignal.any(activeSignals) : activeSignals[0];
 }
 //#endregion
-export { DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS, DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, DISCORD_COMPONENT_ATTACHMENT_PREFIX, DISCORD_COMPONENT_CUSTOM_ID_KEY, DISCORD_DEFAULT_INBOUND_WORKER_TIMEOUT_MS, DISCORD_DEFAULT_LISTENER_TIMEOUT_MS, DISCORD_MODAL_CUSTOM_ID_KEY, DiscordApiError, DiscordFormModal, buildDiscordComponentCustomId, buildDiscordComponentMessage, buildDiscordComponentMessageFlags, buildDiscordInteractiveComponents, buildDiscordModalCustomId, collectDiscordSecurityAuditFindings, collectDiscordStatusIssues, createDiscordActionGate, createDiscordFormModal, discordPlugin, discordSetupPlugin, fetchDiscord, fetchDiscordApplicationId, fetchDiscordApplicationSummary, fetchPluralKitMessageInfo, formatDiscordComponentEventText, getDiscordExecApprovalApprovers, handleDiscordMessageAction, handleDiscordSubagentDeliveryTarget, handleDiscordSubagentEnded, handleDiscordSubagentSpawning, inspectDiscordAccount, isDiscordExecApprovalApprover, isDiscordExecApprovalClientEnabled, listDiscordAccountIds, listDiscordDirectoryGroupsFromConfig, listDiscordDirectoryPeersFromConfig, listEnabledDiscordAccounts, looksLikeDiscordTargetId, mergeAbortSignals, mergeDiscordAccountConfig, normalizeDiscordMessagingTarget, normalizeDiscordOutboundTarget, normalizeExplicitDiscordSessionKey, parseApplicationIdFromToken, parseDiscordComponentCustomId, parseDiscordComponentCustomIdForInteraction as parseDiscordComponentCustomIdForCarbon, parseDiscordComponentCustomIdForInteraction, parseDiscordModalCustomId, parseDiscordModalCustomIdForInteraction as parseDiscordModalCustomIdForCarbon, parseDiscordModalCustomIdForInteraction, parseDiscordSendTarget, parseDiscordTarget, probeDiscord, readDiscordComponentSpec, requestDiscord, resolveDefaultDiscordAccountId, resolveDiscordAccount, resolveDiscordAccountConfig, resolveDiscordChannelId, resolveDiscordComponentAttachmentName, resolveDiscordGroupRequireMention, resolveDiscordGroupToolPolicy, resolveDiscordMaxLinesPerMessage, resolveDiscordPrivilegedIntentsFromFlags, resolveDiscordRuntimeGroupPolicy, resolveDiscordTarget, shouldSuppressLocalDiscordExecApprovalPrompt, tryHandleDiscordMessageActionGuildAdmin };
+export { DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS, DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, DISCORD_COMPONENT_ATTACHMENT_PREFIX, DISCORD_COMPONENT_CUSTOM_ID_KEY, DISCORD_DEFAULT_INBOUND_WORKER_TIMEOUT_MS, DISCORD_DEFAULT_LISTENER_TIMEOUT_MS, DISCORD_MODAL_CUSTOM_ID_KEY, DiscordApiError, DiscordFormModal, buildDiscordComponentCustomId, buildDiscordComponentMessage, buildDiscordComponentMessageFlags, buildDiscordInteractiveComponents, buildDiscordModalCustomId, collectDiscordSecurityAuditFindings, collectDiscordStatusIssues, createDiscordActionGate, createDiscordFormModal, discordPlugin, discordSetupPlugin, fetchDiscord, fetchDiscordApplicationId, fetchDiscordApplicationSummary, fetchPluralKitMessageInfo, formatDiscordComponentEventText, getDiscordExecApprovalApprovers, handleDiscordMessageAction, handleDiscordSubagentDeliveryTarget, handleDiscordSubagentEnded, inspectDiscordAccount, isDiscordExecApprovalApprover, isDiscordExecApprovalClientEnabled, listDiscordAccountIds, listDiscordDirectoryGroupsFromConfig, listDiscordDirectoryPeersFromConfig, listEnabledDiscordAccounts, looksLikeDiscordTargetId, mergeAbortSignals, mergeDiscordAccountConfig, normalizeDiscordMessagingTarget, normalizeDiscordOutboundTarget, normalizeExplicitDiscordSessionKey, parseApplicationIdFromToken, parseDiscordComponentCustomId, parseDiscordComponentCustomIdForInteraction as parseDiscordComponentCustomIdForCarbon, parseDiscordComponentCustomIdForInteraction, parseDiscordModalCustomId, parseDiscordModalCustomIdForInteraction as parseDiscordModalCustomIdForCarbon, parseDiscordModalCustomIdForInteraction, parseDiscordSendTarget, parseDiscordTarget, probeDiscord, readDiscordComponentSpec, requestDiscord, resolveDefaultDiscordAccountId, resolveDiscordAccount, resolveDiscordAccountConfig, resolveDiscordChannelId, resolveDiscordComponentAttachmentName, resolveDiscordGroupRequireMention, resolveDiscordGroupToolPolicy, resolveDiscordMaxLinesPerMessage, resolveDiscordPrivilegedIntentsFromFlags, resolveDiscordRuntimeGroupPolicy, resolveDiscordTarget, shouldSuppressLocalDiscordExecApprovalPrompt, tryHandleDiscordMessageActionGuildAdmin };

package/dist/{approval-handler.runtime-HymvFTYn.js → approval-handler.runtime-B12RCYr8.js}

@@ -1,11 +1,11 @@
-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-DX4jpFQP.js";
-import { c as buildExecApprovalCustomId } from "./outbound-session-route-H-HoyH5U.js";
-import { P as createDiscordClient, b as stripUndefinedFields, g as createDiscordMessageNonce } from "./send.shared-jpvAG_u6.js";
-import { n as formatDiscordApprovalDisplayValue, s as isDiscordExecApprovalClientEnabled, t as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./approval-message-safety-DEyKVsAw.js";
-import { a as shouldHandleDiscordApprovalRequest } from "./channel-vKa-76xY.js";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { Ct as editChannelMessage, J as Button, V as serializePayload, X as Container, dt as stripUndefinedFields, it as Separator, nt as Row, ot as TextDisplay, pt as createUserDmChannel, vt as createChannelMessage, xt as deleteChannelMessage } from "./retry-DNsVTeTo.js";
+import { s as buildExecApprovalCustomId } from "./components-ezGKo_Yh.js";
+import { P as createDiscordClient, k as createDiscordMessageNonce } from "./send.shared-B3fpaLWJ.js";
+import { m as isDiscordExecApprovalClientEnabled, n as formatDiscordApprovalDisplayValue, t as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./approval-message-safety-XGFPbDoI.js";
+import { a as shouldHandleDiscordApprovalRequest } from "./channel-cXYzGc4L.js";
 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";
 import { createChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-runtime";
 //#region extensions/discord/src/ui-colors.ts
 const DEFAULT_DISCORD_ACCENT_COLOR = "#5865F2";

package/dist/{approval-message-safety-DEyKVsAw.js → approval-message-safety-XGFPbDoI.js}

@@ -1,5 +1,5 @@
-import { l as parseDiscordTarget } from "./chunk-DX4jpFQP.js";
-import { s as resolveDiscordAccount } from "./accounts-DJTf1LtA.js";
+import { c as resolveDiscordAccount, k as parseDiscordTarget } from "./accounts-DNl-oCEw.js";
+import { deriveLastRoutePolicy, isAcpSessionKey, isSubagentSessionKey, parseAgentSessionKey, resolveAgentIdFromSessionKey, resolveAgentRoute } from "openclaw/plugin-sdk/routing";
 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";
@@ -76,6 +76,10 @@ function buildDiscordConversationIdentity(kind, rawId) {
 function resolveDiscordConversationIdentity(params) {
 	return params.isDirectMessage ? buildDiscordConversationIdentity("user", params.userId) : buildDiscordConversationIdentity("channel", params.channelId);
 }
+function resolveDiscordRuntimeBindingConversationId(params) {
+	if (params.isDirectMessage && !params.isGroupDm) return buildDiscordConversationIdentity("user", params.userId) ?? params.channelId;
+	return params.channelId;
+}
 function resolveDiscordCurrentConversationIdentity(params) {
 	if (normalizeOptionalLowercaseString(params.chatType) === "direct") {
 		const senderTarget = normalizeDiscordTarget(params.from, "user");
@@ -91,6 +95,88 @@ function resolveDiscordCurrentConversationIdentity(params) {
 	}
 }
 //#endregion
+//#region extensions/discord/src/monitor/route-resolution.ts
+function buildDiscordRoutePeer(params) {
+	return {
+		kind: params.isGroupDm ? "group" : params.isDirectMessage ? "direct" : "channel",
+		id: params.isDirectMessage && !params.isGroupDm ? params.directUserId?.trim() || params.conversationId : params.conversationId
+	};
+}
+function buildDiscordConversationRouteContext(params) {
+	return {
+		ConversationRouteContextObserved: true,
+		ConversationRoutePeerId: buildDiscordRoutePeer(params).id,
+		NativeChannelId: params.conversationId,
+		InboundAccessAuthorized: true,
+		MessageThreadId: params.isThread ? params.conversationId : void 0,
+		ThreadParentId: params.isThread ? params.parentConversationId : void 0
+	};
+}
+function resolveDiscordConversationRoute(params) {
+	return resolveAgentRoute({
+		cfg: params.cfg,
+		channel: "discord",
+		accountId: params.accountId,
+		guildId: params.guildId ?? void 0,
+		memberRoleIds: params.memberRoleIds,
+		peer: params.peer,
+		parentPeer: params.parentConversationId ? {
+			kind: "channel",
+			id: params.parentConversationId
+		} : void 0
+	});
+}
+function resolveDiscordBoundConversationRoute(params) {
+	return resolveDiscordEffectiveRoute({
+		route: resolveDiscordConversationRoute({
+			cfg: params.cfg,
+			accountId: params.accountId,
+			guildId: params.guildId,
+			memberRoleIds: params.memberRoleIds,
+			peer: buildDiscordRoutePeer({
+				isDirectMessage: params.isDirectMessage,
+				isGroupDm: params.isGroupDm,
+				directUserId: params.directUserId,
+				conversationId: params.conversationId
+			}),
+			parentConversationId: params.parentConversationId
+		}),
+		boundSessionKey: params.boundSessionKey,
+		configuredRoute: params.configuredRoute,
+		matchedBy: params.matchedBy
+	});
+}
+function resolveDiscordEffectiveRoute(params) {
+	const boundSessionKey = params.boundSessionKey?.trim();
+	if (!boundSessionKey) return params.configuredRoute?.route ?? params.route;
+	return {
+		...params.route,
+		sessionKey: boundSessionKey,
+		agentId: resolveAgentIdFromSessionKey(boundSessionKey),
+		lastRoutePolicy: deriveLastRoutePolicy({
+			sessionKey: boundSessionKey,
+			mainSessionKey: params.route.mainSessionKey
+		}),
+		...params.matchedBy ? { matchedBy: params.matchedBy } : {}
+	};
+}
+function hasExplicitRuntimeBindingIntent(record) {
+	if (record.targetKind === "subagent") return true;
+	if (isAcpSessionKey(record.targetSessionKey) || isSubagentSessionKey(record.targetSessionKey)) return true;
+	const metadata = record.metadata;
+	if (!metadata || typeof metadata !== "object") return false;
+	return typeof metadata.boundBy === "string" || typeof metadata.label === "string" || typeof metadata.threadName === "string" || metadata.pluginBindingOwner === "plugin";
+}
+function shouldIgnoreStaleDiscordRouteBinding(params) {
+	const bindingRecord = params.bindingRecord;
+	const boundSessionKey = bindingRecord?.targetSessionKey?.trim();
+	if (!bindingRecord || !boundSessionKey || hasExplicitRuntimeBindingIntent(bindingRecord)) return false;
+	const bound = parseAgentSessionKey(boundSessionKey);
+	const routed = parseAgentSessionKey(params.route.sessionKey);
+	if (!bound || !routed || bound.rest !== routed.rest) return false;
+	return bound.agentId !== params.route.agentId;
+}
+//#endregion
 //#region extensions/discord/src/approval-message-safety.ts
 const DISCORD_APPROVAL_ALLOWED_MENTIONS = { parse: [] };
 const DISCORD_MARKDOWN_META_CHARACTERS = /* @__PURE__ */ new Set([
@@ -137,4 +223,4 @@ function formatDiscordApprovalDisplayValue(value, maxChars = 200) {
 	return `${bounded}...`;
 }
 //#endregion
-export { getDiscordExecApprovalApprovers as a, shouldSuppressLocalDiscordExecApprovalPrompt as c, createChannelNativeOriginTargetResolver as d, isChannelExecApprovalClientEnabledFromConfig as f, resolveDiscordCurrentConversationIdentity as i, createApproverRestrictedNativeApprovalCapability as l, formatDiscordApprovalDisplayValue as n, isDiscordExecApprovalApprover as o, matchesApprovalRequestFilters as p, resolveDiscordConversationIdentity as r, isDiscordExecApprovalClientEnabled as s, DISCORD_APPROVAL_ALLOWED_MENTIONS as t, createChannelApproverDmTargetResolver as u };
+export { createChannelApproverDmTargetResolver as _, resolveDiscordBoundConversationRoute as a, matchesApprovalRequestFilters as b, shouldIgnoreStaleDiscordRouteBinding as c, resolveDiscordRuntimeBindingConversationId as d, getDiscordExecApprovalApprovers as f, createApproverRestrictedNativeApprovalCapability as g, shouldSuppressLocalDiscordExecApprovalPrompt as h, buildDiscordRoutePeer as i, resolveDiscordConversationIdentity as l, isDiscordExecApprovalClientEnabled as m, formatDiscordApprovalDisplayValue as n, resolveDiscordConversationRoute as o, isDiscordExecApprovalApprover as p, buildDiscordConversationRouteContext as r, resolveDiscordEffectiveRoute as s, DISCORD_APPROVAL_ALLOWED_MENTIONS as t, resolveDiscordCurrentConversationIdentity as u, createChannelNativeOriginTargetResolver as v, isChannelExecApprovalClientEnabledFromConfig as y };

package/dist/{audit-CjsrabP8.js → audit-Yc7eZDd6.js}

@@ -1,8 +1,8 @@
-import { Yt as __exportAll } from "./chunk-DX4jpFQP.js";
-import { O as fetchChannelPermissionsDiscord } from "./send.shared-jpvAG_u6.js";
-import { t as inspectDiscordAccount } from "./account-inspect-SXiCBCgP.js";
-import "./send-CdkZ6zeW.js";
-import { n as collectDiscordAuditChannelIdsForAccount, t as auditDiscordChannelPermissionsWithFetcher } from "./audit-core-xwjIczO0.js";
+import { en as __exportAll } from "./retry-DNsVTeTo.js";
+import { x as fetchChannelPermissionsDiscord } from "./send.shared-B3fpaLWJ.js";
+import { t as inspectDiscordAccount } from "./account-inspect-D5xmUpnj.js";
+import "./send-rQIffSYu.js";
+import { n as collectDiscordAuditChannelIdsForAccount, t as auditDiscordChannelPermissionsWithFetcher } from "./audit-core-BCX8UeFH.js";
 //#region extensions/discord/src/audit.ts
 var audit_exports = /* @__PURE__ */ __exportAll({
 	auditDiscordChannelPermissions: () => auditDiscordChannelPermissions,