@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{approval-handler.runtime-DmnEa54W.mjs → approval-handler.runtime-D7FoZSn0.mjs}

@@ -1,12 +1,12 @@
-import { D as createDiscordMessageNonce, N as createDiscordClient } from "./send.shared-C4CN24D9.mjs";
-import { A as serializePayload, B as Container, J as Separator, K as Row, R as Button, X as TextDisplay, ct as deleteChannelMessage, lt as editChannelMessage, nt as createUserDmChannel, yt as stripUndefinedFields } from "./discord-9gysrhzp.mjs";
-import { x as findGraphemeChunkEnd } from "./send.receipt-DVOg2Oaw.mjs";
-import { s as buildExecApprovalCustomId } from "./components-DLJR0xU-.mjs";
-import { D as isDiscordExecApprovalClientEnabled, c as formatDiscordApprovalDisplayValue, s as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./outbound-session-route-BvBH4LC6.mjs";
-import { a as shouldHandleDiscordApprovalRequest } from "./channel-Dr-AUnGt.mjs";
-import { t as discordApprovalMessageUpdates } from "./approval-message-updates-B0jdSqOj.mjs";
+import { D as createDiscordMessageNonce, N as createDiscordClient } from "./send.shared-CjQ4jbMA.mjs";
+import { D as Row, K as serializePayload, bt as stripUndefinedFields, j as TextDisplay, k as Separator, lt as deleteChannelMessage, nt as createUserDmChannel, st as createChannelMessage, ut as editChannelMessage, x as Container, y as Button } from "./discord-BGqgx-yd.mjs";
+import { y as findGraphemeChunkEnd } from "./send.receipt-BAlzXd8e.mjs";
+import { s as buildExecApprovalCustomId } from "./components-HN9052L1.mjs";
+import { D as isDiscordExecApprovalClientEnabled, c as formatDiscordApprovalDisplayValue, s as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./outbound-session-route-B0Hpwn3Q.mjs";
+import { a as shouldHandleDiscordApprovalRequest } from "./channel-DI7DMzu0.mjs";
+import { t as discordApprovalMessageUpdates } from "./approval-message-updates-CIGByUcE.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { ButtonStyle, Routes } from "discord-api-types/v10";
+import { ButtonStyle } from "discord-api-types/v10";
 import { logDebug, logError } from "openclaw/plugin-sdk/logging-core";
 import { createChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-runtime";
 import { formatChannelApprovalResolvedLabel } from "openclaw/plugin-sdk/approval-runtime";
@@ -21,20 +21,13 @@ function resolveHandlerContext(params) {
 	};
 }
 var ExecApprovalActionButton = class extends Button {
-	constructor(params) {
+	constructor(view, descriptor) {
 		super();
-		this.customId = buildExecApprovalCustomId(params.approvalId, params.approvalKind, params.descriptor.decision);
-		this.label = params.descriptor.label;
-		this.style = params.descriptor.style === "success" ? ButtonStyle.Success : params.descriptor.style === "primary" ? ButtonStyle.Primary : params.descriptor.style === "danger" ? ButtonStyle.Danger : ButtonStyle.Secondary;
+		this.customId = buildExecApprovalCustomId(view.approvalId, view.approvalKind, descriptor.decision);
+		this.label = descriptor.label;
+		this.style = descriptor.style === "success" ? ButtonStyle.Success : descriptor.style === "primary" ? ButtonStyle.Primary : descriptor.style === "danger" ? ButtonStyle.Danger : ButtonStyle.Secondary;
 	}
 };
-function createApprovalActionRow(view) {
-	return new Row(view.actions.map((descriptor) => new ExecApprovalActionButton({
-		approvalId: view.approvalId,
-		approvalKind: view.approvalKind,
-		descriptor
-	})));
-}
 function buildExecApprovalPayload(container) {
 	return {
 		components: [container],
@@ -45,23 +38,14 @@ function formatCommandPreview(commandText, maxChars) {
 	const end = findGraphemeChunkEnd(commandText, 0, maxChars, maxChars, false);
 	return (end < commandText.length ? `${commandText.slice(0, end)}...` : commandText).replace(/`/g, "​`");
 }
-function formatOptionalCommandPreview(commandText, maxChars) {
-	if (!commandText) return null;
-	return formatCommandPreview(commandText, maxChars);
-}
-function createApprovalContainer(params) {
-	const { view } = params;
+function createApprovalContainer(view) {
 	const plugin = view.approvalKind === "plugin";
 	const systemAgent = view.approvalKind === "system-agent";
 	const pending = view.phase === "pending";
 	const approvalLabel = plugin ? "Plugin" : systemAgent ? "OpenClaw Change" : "Exec";
-	const { commandPreview, commandSecondaryPreview } = plugin ? {
-		commandPreview: formatCommandPreview(view.title, 700),
-		commandSecondaryPreview: formatOptionalCommandPreview(view.description, 1e3)
-	} : {
-		commandPreview: formatCommandPreview(view.commandText, pending ? 1e3 : 500),
-		commandSecondaryPreview: formatOptionalCommandPreview(view.commandPreview, pending ? 500 : 300)
-	};
+	const commandPreview = formatCommandPreview(plugin ? view.title : view.commandText, plugin ? 700 : pending ? 1e3 : 500);
+	const secondaryText = plugin ? view.description : view.commandPreview;
+	const commandSecondaryPreview = secondaryText ? formatCommandPreview(secondaryText, plugin ? 1e3 : pending ? 500 : 300) : null;
 	const decisionLabel = view.phase === "resolved" ? formatChannelApprovalResolvedLabel(view, (decision) => decision === "allow-once" ? "Allowed (once)" : decision === "allow-always" ? "Allowed (always)" : "Denied") : void 0;
 	const title = pending ? `${approvalLabel} Approval Required` : `${approvalLabel} Approval: ${view.phase === "expired" ? "Expired" : decisionLabel}`;
 	const description = pending ? plugin ? "A plugin action needs your approval." : systemAgent ? "An OpenClaw change needs your approval." : "A command needs your approval." : view.phase === "expired" ? "This approval request has expired." : view.resolvedBy ? `Resolved by ${formatDiscordApprovalDisplayValue(view.resolvedBy)}` : "Resolved";
@@ -79,7 +63,7 @@ function createApprovalContainer(params) {
 	];
 	if (commandSecondaryPreview) components.push(new TextDisplay(`### Shell Preview\n\`\`\`\n${commandSecondaryPreview}\n\`\`\``));
 	if (view.metadata.length) components.push(new TextDisplay(view.metadata.map((item) => `- ${item.label}: ${item.value}`).join("\n")));
-	if (params.actionRow) components.push(params.actionRow);
+	if (pending) components.push(new Row(view.actions.map((descriptor) => new ExecApprovalActionButton(view, descriptor))));
 	components.push(new Separator({
 		divider: false,
 		spacing: "small"
@@ -87,34 +71,30 @@ function createApprovalContainer(params) {
 	return new Container(components, { accentColor });
 }
 async function finalizeMessage(params) {
-	if (params.cleanupAfterResolve) try {
+	const operations = params.cleanupAfterResolve ? ["delete", "update"] : ["update"];
+	for (const operation of operations) try {
 		const { rest, request: discordRequest } = createDiscordClient({
 			cfg: params.cfg,
 			token: params.token,
 			accountId: params.accountId
 		});
-		await discordApprovalMessageUpdates.enqueue(params.messageId, () => discordRequest(() => deleteChannelMessage(rest, params.channelId, params.messageId), "delete-approval"));
+		let request;
+		if (operation === "delete") request = () => deleteChannelMessage(rest, params.channelId, params.messageId);
+		else {
+			const payload = buildExecApprovalPayload(params.container);
+			request = () => editChannelMessage(rest, params.channelId, params.messageId, { body: stripUndefinedFields(serializePayload(payload)) });
+		}
+		await discordApprovalMessageUpdates.enqueue(params.messageId, () => discordRequest(request, `${operation}-approval`));
 		return;
 	} catch (err) {
-		logError(`discord approvals: failed to delete message: ${String(err)}`);
-	}
-	try {
-		const { rest, request: discordRequest } = createDiscordClient({
-			cfg: params.cfg,
-			token: params.token,
-			accountId: params.accountId
-		});
-		const payload = buildExecApprovalPayload(params.container);
-		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)}`);
+		logError(`discord approvals: failed to ${operation} message: ${String(err)}`);
 	}
 }
 function buildTerminalApprovalResult(params) {
 	if (!resolveHandlerContext(params)) return { kind: "delete" };
 	return {
 		kind: "update",
-		payload: createApprovalContainer({ view: params.view })
+		payload: createApprovalContainer(params.view)
 	};
 }
 const discordApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
@@ -149,10 +129,7 @@ const discordApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 				accountId,
 				context
 			})) return { body: {} };
-			const container = createApprovalContainer({
-				view,
-				actionRow: createApprovalActionRow(view)
-			});
+			const container = createApprovalContainer(view);
 			return { body: stripUndefinedFields(serializePayload(buildExecApprovalPayload(container))) };
 		},
 		buildResolvedResult: buildTerminalApprovalResult,
@@ -209,7 +186,7 @@ const discordApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 				nonce: createDiscordMessageNonce(),
 				enforce_nonce: true
 			};
-			const message = await discordRequest(() => rest.post(Routes.channelMessages(preparedTarget.discordChannelId), { body }), plannedTarget.surface === "origin" ? "send-approval-channel" : "send-approval", { safety: "nonce-protected-create" });
+			const message = await discordRequest(() => createChannelMessage(rest, preparedTarget.discordChannelId, { body }), plannedTarget.surface === "origin" ? "send-approval-channel" : "send-approval", { safety: "nonce-protected-create" });
 			if (!message?.id) {
 				if (plannedTarget.surface === "origin") logError("discord approvals: failed to send to channel");
 				else if (preparedTarget.recipientUserId) logError(`discord approvals: failed to send message to user ${preparedTarget.recipientUserId}`);

package/dist/.setup/{approval-message-updates-B0jdSqOj.mjs → approval-message-updates-CIGByUcE.mjs}

@@ -1,5 +1,5 @@
-import { et as parseCustomId } from "./discord-9gysrhzp.mjs";
-import { c as parseExecApprovalData } from "./components-DLJR0xU-.mjs";
+import { et as parseCustomId } from "./discord-BGqgx-yd.mjs";
+import { c as parseExecApprovalData } from "./components-HN9052L1.mjs";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 //#region extensions/discord/src/approval-message-updates.ts
 const discordApprovalMessageUpdates = new KeyedAsyncQueue();

package/dist/.setup/{audit-BpikUwN_.mjs → audit-zSawfbsN.mjs}

@@ -1,18 +1,15 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { t as inspectDiscordAccount } from "./account-inspect-DsER5ILV.mjs";
-import { b as fetchChannelPermissionsDiscord } from "./send.shared-C4CN24D9.mjs";
-import "./send-CJk3VP5q.mjs";
-import { C as collectDiscordAuditChannelIdsForAccount, S as auditDiscordChannelPermissionsWithFetcher } from "./outbound-session-route-BvBH4LC6.mjs";
+import { t as inspectDiscordAccount } from "./account-inspect-8cCu6uPG.mjs";
+import { b as fetchChannelPermissionsDiscord } from "./send.shared-CjQ4jbMA.mjs";
+import "./send-DbILKgcm.mjs";
+import { C as collectDiscordAuditChannelIdsForAccount, S as auditDiscordChannelPermissionsWithFetcher } from "./outbound-session-route-B0Hpwn3Q.mjs";
 //#region extensions/discord/src/audit.ts
 var audit_exports = /* @__PURE__ */ __exportAll({
 	auditDiscordChannelPermissions: () => auditDiscordChannelPermissions,
 	collectDiscordAuditChannelIds: () => collectDiscordAuditChannelIds
 });
 function collectDiscordAuditChannelIds(params) {
-	const account = inspectDiscordAccount({
-		cfg: params.cfg,
-		accountId: params.accountId
-	});
+	const account = inspectDiscordAccount(params);
 	return collectDiscordAuditChannelIdsForAccount(account.config);
 }
 async function auditDiscordChannelPermissions(params) {