@openclaw/discord 2026.7.1-beta.6 → 2026.7.2-beta.1

package/dist/{provider-BkfbC9FQ.js → provider-DWvDNb4J.js}

@@ -1,23 +1,24 @@
-import { $ as StringSelectMenu, A as Command, H as Button, Jt as __exportAll, M as Guild, N as Message, P as User, Q as Separator, S as Plugin, T as RateLimitError, W as Container, X as Row, _ as ReadyListener, d as discord_exports, et as TextDisplay, f as InteractionCreateListener, ft as createThread, g as PresenceUpdateListener, h as MessageReactionRemoveListener, ht as editChannel, j as CommandWithSubcommands, m as MessageReactionAddListener, p as MessageCreateListener, rt as BaseMessageInteractiveComponent, u as chunkDiscordTextWithMode, vt as getChannelMessage, x as Client, y as ThreadUpdateListener, z as Modal } from "./send.receipt-BpBQED_5.js";
+import { C as Client, D as RateLimitError, F as Message, I as User, K as Container, M as Command, N as CommandWithSubcommands, P as Guild, Q as Row, V as Modal, W as Button, Xt as __exportAll, _ as MessageReactionRemoveListener, _t as editChannel, at as BaseMessageInteractiveComponent, bt as getChannelMessage, d as discord_exports, et as Separator, f as GuildCreateListener, g as MessageReactionAddListener, h as MessageCreateListener, m as InteractionCreateListener, mt as createThread, nt as TextDisplay, p as GuildDeleteListener, tt as StringSelectMenu, u as chunkDiscordTextWithMode, v as PresenceUpdateListener, w as Plugin, x as ThreadUpdateListener, y as ReadyListener } from "./send.receipt-aegk69an.js";
 import { c as resolveDiscordAccountAllowFrom, d as resolveDiscordAccountDmPolicy, f as resolveDiscordMaxLinesPerMessage, p as normalizeDiscordToken, s as resolveDiscordAccount } from "./accounts-P19jm1lf.js";
-import { _ as parseDiscordComponentCustomId, b as parseDiscordModalCustomIdForInteraction, v as parseDiscordComponentCustomIdForInteraction, y as parseDiscordModalCustomId } from "./components-BIBizbtZ.js";
-import { a as resolveDiscordComponentEntryWithPersistence, o as resolveDiscordModalEntryWithPersistence, t as editDiscordComponentMessage } from "./send.components-D0I39utR.js";
-import { i as setPresence } from "./presence-cache-z1N8MbJ3.js";
-import { B as DISCORD_REST_TIMEOUT_MS, D as canViewDiscordGuildChannel, G as registerGateway, H as withValidatedDiscordProxy, I as createDiscordRestClient, K as unregisterGateway, V as validateDiscordProxyUrl } from "./send.shared-wAwMhHDN.js";
-import { a as summarizeDiscordResponseBody, i as isDiscordRateLimitResponseBody } from "./api-DPRqYi4Z.js";
-import { S as resolveTimestampMs, _ as resolveGroupDmAllow, a as normalizeDiscordSlug, b as formatDiscordUserTag, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordGuildEntry, f as resolveDiscordMemberAccessState, h as resolveDiscordOwnerAllowFrom, i as normalizeDiscordDisplaySlug, l as resolveDiscordChannelPolicyCommandAuthorizer, m as resolveDiscordOwnerAccess, n as isDiscordGroupAllowedByPolicy, o as resolveDiscordAllowListMatch, p as resolveDiscordMemberAllowed, r as normalizeDiscordAllowList, v as shouldEmitDiscordReactionNotification, y as formatDiscordReactionEmoji } from "./allow-list-C-MqM-B_.js";
-import { s as sendVoiceMessageDiscord } from "./send-iJ0B4bAX.js";
-import { a as formatMention, t as sendMessageDiscord } from "./send.outbound-Bj61Q3a0.js";
+import { S as encodeCustomIdComponent, _ as parseDiscordComponentCustomId, b as parseDiscordModalCustomIdForInteraction, v as parseDiscordComponentCustomIdForInteraction, x as decodeCustomIdComponent, y as parseDiscordModalCustomId } from "./components-BVrfRS-F.js";
+import { a as resolveDiscordComponentEntryWithPersistence, o as resolveDiscordModalEntryWithPersistence, t as editDiscordComponentMessage } from "./send.components-BaXQJKWT.js";
+import { i as setPresence, t as clearPresences } from "./presence-cache-z1N8MbJ3.js";
+import { B as DISCORD_REST_TIMEOUT_MS, D as canViewDiscordGuildChannel, G as registerGateway, H as withValidatedDiscordProxy, I as createDiscordRestClient, K as unregisterGateway, V as validateDiscordProxyUrl } from "./send.shared-Xz7IMVpu.js";
+import { a as isDiscordRateLimitResponseBody, o as summarizeDiscordResponseBody } from "./api--f62GFaS.js";
+import { C as resolveTimestampMs, a as normalizeDiscordSlug, b as formatDiscordReactionEmoji, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordCommandOwnerAllowFrom, f as resolveDiscordGuildEntry, g as resolveDiscordOwnerAllowFrom, h as resolveDiscordOwnerAccess, i as normalizeDiscordDisplaySlug, l as resolveDiscordChannelPolicyCommandAuthorizer, m as resolveDiscordMemberAllowed, n as isDiscordGroupAllowedByPolicy, o as resolveDiscordAllowListMatch, p as resolveDiscordMemberAccessState, r as normalizeDiscordAllowList, v as resolveGroupDmAllow, x as formatDiscordUserTag, y as shouldEmitDiscordReactionNotification } from "./allow-list-B7qOH5xu.js";
+import { s as sendVoiceMessageDiscord } from "./send-BFpa_DHn.js";
+import { a as formatMention, t as sendMessageDiscord } from "./send.outbound-BlA6VzSE.js";
+import { d as withAbortTimeout, l as raceWithTimeout } from "./timeouts-ZRc9Lw4y.js";
+import { r as parseExecApprovalData } from "./approval-custom-id-NYPYj9Po.js";
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import { a as getDiscordExecApprovalApprovers, s as isDiscordExecApprovalClientEnabled, t as resolveDiscordConversationIdentity } from "./conversation-identity-DWC5d8Sy.js";
-import { d as withAbortTimeout, l as raceWithTimeout } from "./timeouts-C5TBc_9x.js";
-import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-CcpvWoRa.js";
-import { t as resolveDiscordUserAllowlist } from "./resolve-users-DJamun9s.js";
-import { _ as formatThreadBindingDurationLabel, a as isThreadArchived, d as resolveDiscordChannelNameSafe, f as resolveDiscordChannelParentIdSafe, l as resolveDiscordChannelIdSafe, m as resolveDiscordChannelTopicSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjIf9lGs.js";
-import { r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-D1ImJEo2.js";
-import { d as resolveDiscordMessageChannelId, n as resolveDiscordForwardedMessagesTextFromSnapshots, t as resolveDiscordEmbedText, u as resolveDiscordChannelInfo } from "./message-utils-B_3yA5bN.js";
-import { t as resolveDiscordSenderIdentity } from "./sender-identity-CEsfDF0L.js";
-import "./approval-handler.runtime-Bw2pZNk1.js";
+import { a as isDiscordExecApprovalClientEnabled, r as getDiscordExecApprovalApprovers, t as resolveDiscordConversationIdentity } from "./conversation-identity-BpkAzklg.js";
+import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-BrkWOKdG.js";
+import { t as resolveDiscordUserAllowlist } from "./resolve-users-OjrXXvJP.js";
+import { _ as formatThreadBindingDurationLabel, a as isThreadArchived, d as resolveDiscordChannelNameSafe, f as resolveDiscordChannelParentIdSafe, l as resolveDiscordChannelIdSafe, m as resolveDiscordChannelTopicSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-DJD3qwIN.js";
+import { r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-DxjMBeVG.js";
+import { d as resolveDiscordMessageChannelId, n as resolveDiscordForwardedMessagesTextFromSnapshots, t as resolveDiscordEmbedText, u as resolveDiscordChannelInfo } from "./message-utils-D4j07taS.js";
+import { t as resolveDiscordSenderIdentity } from "./sender-identity-C62lBe18.js";
+import { n as formatDiscordApprovalDisplayValue, t as DISCORD_APPROVAL_ALLOWED_MENTIONS } from "./approval-message-safety-C-8BL6Kv.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString, normalizeOptionalStringifiedId, normalizeStringEntries, normalizeStringEntriesLower, summarizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -28,6 +29,7 @@ import { MAX_DATE_TIMESTAMP_MS, asDateTimestampMs, parseFiniteNumber, parseStric
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";
 import { resolvePinnedMainDmOwnerFromAllowlist as resolvePinnedMainDmOwnerFromAllowlist$1 } from "openclaw/plugin-sdk/security-runtime";
+import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { Type } from "typebox";
 import { Check, Errors } from "typebox/value";
 import { inspect } from "node:util";
@@ -54,9 +56,10 @@ import { clearExpiredCooldowns, ensureAuthProfileStore, formatReasoningMessage,
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { resolveNativeCommandsEnabled, resolveNativeSkillsEnabled } from "openclaw/plugin-sdk/native-command-config-runtime";
 import { normalizeProviderId } from "openclaw/plugin-sdk/provider-model-shared";
+import { requestHeartbeat } from "openclaw/plugin-sdk/heartbeat-runtime";
 import { enqueueSystemEvent, enqueueSystemEvent as enqueueSystemEvent$1 } from "openclaw/plugin-sdk/system-event-runtime";
 import { createChannelIngressResolver, defineStableChannelIngressIdentity, readChannelIngressStoreAllowFromForDmPolicy } from "openclaw/plugin-sdk/channel-ingress-runtime";
-import { applyModelOverrideToSessionEntry, resolveChannelModelOverride } from "openclaw/plugin-sdk/model-session-runtime";
+import { ModelSelectionLockedError, applyModelOverrideToSessionEntry, resolveChannelModelOverride } from "openclaw/plugin-sdk/model-session-runtime";
 import { completeWithPreparedSimpleCompletionModel, extractAssistantText, prepareSimpleCompletionModelForAgent } from "openclaw/plugin-sdk/simple-completion-runtime";
 import { getSessionEntry, listSessionEntries, patchSessionEntry, readSessionUpdatedAt as readSessionUpdatedAt$1, resolveStorePath, resolveStorePath as resolveStorePath$1 } from "openclaw/plugin-sdk/session-store-runtime";
 import { formatInboundEnvelope, resolveEnvelopeFormatOptions, runChannelInboundEvent } from "openclaw/plugin-sdk/channel-inbound";
@@ -79,7 +82,8 @@ import { stripPlainTextToolCallBlocks } from "openclaw/plugin-sdk/tool-payload";
 import { resolveApprovalOverGateway } from "openclaw/plugin-sdk/approval-gateway-runtime";
 import { resolveStateDir } from "openclaw/plugin-sdk/state-paths";
 import { resolveRequestUrl } from "openclaw/plugin-sdk/request-url";
-import { Agent as Agent$1, fetch as fetch$1 } from "undici";
+import { fetchWithRuntimeDispatcher } from "openclaw/plugin-sdk/runtime-fetch";
+import { Agent as Agent$1 } from "undici";
 //#region extensions/discord/src/monitor/listeners.queue.ts
 const DISCORD_SLOW_LISTENER_THRESHOLD_MS = 3e4;
 const discordEventQueueLog = createSubsystemLogger("discord/event-queue");
@@ -1216,6 +1220,91 @@ async function handleDiscordReactionEvent(params) {
 	}
 }
 //#endregion
+//#region extensions/discord/src/monitor/presence-events.ts
+const DISCORD_PRESENCE_GREETING_COOLDOWN_MS = 480 * 60 * 1e3;
+function isDiscordOnlineStatus(status) {
+	return status === "online" || status === "idle" || status === "dnd";
+}
+function isDiscordOfflineStatus(status) {
+	return status === "offline";
+}
+function resolveDiscordOnlinePresenceEvent(params) {
+	const config = params.config;
+	const userId = params.data.user?.id?.trim();
+	if (!config || config.enabled === false || !userId || userId === params.botUserId || params.data.user.bot === true || !isDiscordOnlineStatus(params.data.status) || !params.availabilityKind) return null;
+	if (config.users !== void 0 && !config.users.includes(userId)) return null;
+	if (params.lastEmittedAtMs !== void 0 && params.nowMs - params.lastEmittedAtMs < 288e5) return null;
+	const lines = [
+		"Discord online-presence event:",
+		params.availabilityKind === "observed-offline" ? `A human member became available online after being observed offline in guild_id=${JSON.stringify(params.data.guild_id)} user_id=${JSON.stringify(userId)} status=${JSON.stringify(params.data.status)}.` : `A human member became newly visible online since the current guild snapshot in guild_id=${JSON.stringify(params.data.guild_id)} user_id=${JSON.stringify(userId)} status=${JSON.stringify(params.data.status)}. They may have come online or joined after the snapshot; do not claim an exact prior status.`,
+		`The authorized greeting target is channel_id=${JSON.stringify(config.channelId)}.`,
+		"Before greeting, retrieve relevant memory and wiki context for this immutable user_id, including a known timezone when available. Use their local time for the greeting; if their timezone is unknown, do not guess.",
+		"Send at most one short, natural greeting to the target channel. Do not reveal private memory. If no greeting is appropriate, stay silent."
+	];
+	return {
+		channelId: config.channelId,
+		userId,
+		text: lines.join("\n")
+	};
+}
+//#endregion
+//#region extensions/discord/src/monitor/presence-cooldown-store.ts
+const DISCORD_PRESENCE_COOLDOWN_MAX_ENTRIES = 25e3;
+function openDiscordPresenceCooldownStore() {
+	return getDiscordRuntime().state.openSyncKeyedStore({
+		namespace: "presence-greeting-cooldowns",
+		maxEntries: DISCORD_PRESENCE_COOLDOWN_MAX_ENTRIES,
+		overflowPolicy: "reject-new",
+		defaultTtlMs: DISCORD_PRESENCE_GREETING_COOLDOWN_MS
+	});
+}
+//#endregion
+//#region extensions/discord/src/monitor/presence-transition-cache.ts
+const DEFAULT_PRESENCE_BASELINE_MAX_ENTRIES = 75e3;
+var DiscordPresenceBaselineCache = class {
+	constructor(maxEntries = DEFAULT_PRESENCE_BASELINE_MAX_ENTRIES) {
+		this.maxEntries = maxEntries;
+		this.offlineByKey = /* @__PURE__ */ new Map();
+		this.onlineByKey = /* @__PURE__ */ new Map();
+	}
+	clear() {
+		this.offlineByKey.clear();
+		this.onlineByKey.clear();
+	}
+	clearScope(scope) {
+		for (const markers of [this.offlineByKey, this.onlineByKey]) for (const [key, markerScope] of markers) if (markerScope === scope) markers.delete(key);
+	}
+	isOffline(scope, key) {
+		return this.offlineByKey.get(key) === scope;
+	}
+	isOnline(scope, key) {
+		return this.onlineByKey.get(key) === scope;
+	}
+	observeOffline(scope, key) {
+		this.deleteMarker(this.onlineByKey, scope, key);
+		return this.observe(this.offlineByKey, scope, key);
+	}
+	observeOnline(scope, key) {
+		this.deleteMarker(this.offlineByKey, scope, key);
+		return this.observe(this.onlineByKey, scope, key);
+	}
+	deleteMarker(markers, scope, key) {
+		if (markers.get(key) === scope) markers.delete(key);
+	}
+	observe(markers, scope, key) {
+		markers.delete(key);
+		markers.set(key, scope);
+		let evictedScope;
+		while (markers.size > this.maxEntries) {
+			const oldestKey = markers.keys().next().value;
+			if (oldestKey === void 0) break;
+			evictedScope = markers.get(oldestKey);
+			markers.delete(oldestKey);
+		}
+		return evictedScope;
+	}
+};
+//#endregion
 //#region extensions/discord/src/monitor/thread-session-close.ts
 /**
 * Marks every session entry in the store whose key contains {@link threadId}
@@ -1294,18 +1383,194 @@ var DiscordInteractionListener = class extends InteractionCreateListener {
 var DiscordPresenceListener = class extends PresenceUpdateListener {
 	constructor(params) {
 		super();
-		this.logger = params.logger;
-		this.accountId = params.accountId;
+		this.params = params;
+		this.pendingByGuildUser = /* @__PURE__ */ new Map();
+		this.guildPresenceState = /* @__PURE__ */ new Map();
+		this.gatewayGeneration = 0;
+		this.cooldownStore = params.cooldownStore ?? openDiscordPresenceCooldownStore();
+		this.presenceBaseline = params.presenceBaseline ?? new DiscordPresenceBaselineCache();
+	}
+	seedGuildSnapshot(data) {
+		const config = resolveDiscordGuildEntry({
+			guildId: data.id,
+			guildEntries: this.params.guildEntries
+		})?.presenceEvents;
+		if (!config || config.enabled === false) return;
+		const keyPrefix = `${this.params.accountId}:${data.id}:`;
+		const generation = (this.guildPresenceState.get(data.id)?.generation ?? 0) + 1;
+		this.guildPresenceState.set(data.id, {
+			generation,
+			inferUnknownAsNewlyAvailable: false
+		});
+		this.detachPendingPrefix(keyPrefix);
+		this.presenceBaseline.clearScope(data.id);
+		if (data.unavailable === true || !("presences" in data) || !Array.isArray(data.presences)) return;
+		this.guildPresenceState.set(data.id, {
+			generation,
+			inferUnknownAsNewlyAvailable: data.member_count <= 75e3
+		});
+		for (const presence of data.presences) {
+			const userId = presence.user?.id;
+			if (!userId || config.users !== void 0 && !config.users.includes(userId)) continue;
+			const key = `${keyPrefix}${userId}`;
+			if (isDiscordOfflineStatus(presence.status)) this.recordPresenceBaseline(data.id, key, "offline");
+			else if (isDiscordOnlineStatus(presence.status)) this.recordPresenceBaseline(data.id, key, "online");
+		}
 	}
-	async handle(data) {
+	async handle(data, client) {
+		const userId = data.user?.id;
+		if (!userId) return;
+		setPresence(this.params.accountId, userId, data);
+		const presenceKey = `${this.params.accountId}:${data.guild_id}:${userId}`;
+		const gatewayGeneration = this.gatewayGeneration;
+		const guildGeneration = this.guildPresenceState.get(data.guild_id)?.generation ?? 0;
+		const run = (this.pendingByGuildUser.get(presenceKey) ?? Promise.resolve()).then(() => this.handleSerial(data, client, userId, presenceKey, gatewayGeneration, guildGeneration), () => this.handleSerial(data, client, userId, presenceKey, gatewayGeneration, guildGeneration));
+		this.pendingByGuildUser.set(presenceKey, run);
 		try {
-			const userId = "user" in data && data.user && typeof data.user === "object" && "id" in data.user ? data.user.id : void 0;
-			if (!userId) return;
-			setPresence(this.accountId, userId, data);
+			await run;
 		} catch (err) {
-			(this.logger ?? discordEventQueueLog).error(danger(`discord presence handler failed: ${String(err)}`));
+			(this.params.logger ?? discordEventQueueLog).error(danger(`discord presence handler failed: ${String(err)}`));
+		} finally {
+			if (this.pendingByGuildUser.get(presenceKey) === run) this.pendingByGuildUser.delete(presenceKey);
 		}
 	}
+	resetGatewaySession() {
+		this.gatewayGeneration += 1;
+		this.presenceBaseline.clear();
+		this.guildPresenceState.clear();
+		this.pendingByGuildUser.clear();
+		clearPresences(this.params.accountId);
+	}
+	invalidateGuild(guildId) {
+		const keyPrefix = `${this.params.accountId}:${guildId}:`;
+		const generation = (this.guildPresenceState.get(guildId)?.generation ?? 0) + 1;
+		this.guildPresenceState.set(guildId, {
+			generation,
+			inferUnknownAsNewlyAvailable: false
+		});
+		this.presenceBaseline.clearScope(guildId);
+		this.detachPendingPrefix(keyPrefix);
+	}
+	detachPendingPrefix(prefix) {
+		for (const key of this.pendingByGuildUser.keys()) if (key.startsWith(prefix)) this.pendingByGuildUser.delete(key);
+	}
+	async handleSerial(data, client, userId, presenceKey, gatewayGeneration, guildGeneration) {
+		if (!this.isCurrentGeneration(data.guild_id, gatewayGeneration, guildGeneration)) return;
+		const config = resolveDiscordGuildEntry({
+			guildId: data.guild_id,
+			guildEntries: this.params.guildEntries
+		})?.presenceEvents;
+		if (!config || config.enabled === false) return;
+		if (config.users !== void 0 && !config.users.includes(userId)) return;
+		const nowMs = this.params.nowMs?.() ?? Date.now();
+		const presenceScope = data.guild_id;
+		const presenceEvent = resolveDiscordOnlinePresenceEvent({
+			config,
+			data,
+			availabilityKind: this.presenceBaseline.isOffline(presenceScope, presenceKey) ? "observed-offline" : this.guildPresenceState.get(data.guild_id)?.inferUnknownAsNewlyAvailable === true && !this.presenceBaseline.isOnline(presenceScope, presenceKey) ? "first-seen-after-snapshot" : null,
+			botUserId: this.params.botUserId,
+			nowMs,
+			lastEmittedAtMs: this.cooldownStore.lookup(presenceKey)
+		});
+		if (!presenceEvent) {
+			if (isDiscordOfflineStatus(data.status)) this.recordPresenceBaseline(data.guild_id, presenceKey, "offline");
+			else if (isDiscordOnlineStatus(data.status)) this.recordPresenceBaseline(data.guild_id, presenceKey, "online");
+			return;
+		}
+		const fetchedUserIsBot = data.user.bot === void 0 && (await client.fetchUser(userId)).bot === true;
+		if (!this.isCurrentGeneration(data.guild_id, gatewayGeneration, guildGeneration)) return;
+		if (fetchedUserIsBot) {
+			this.recordPresenceBaseline(data.guild_id, presenceKey, "online");
+			return;
+		}
+		const route = resolveAgentRoute({
+			cfg: this.params.cfg,
+			channel: "discord",
+			accountId: this.params.accountId,
+			guildId: data.guild_id,
+			peer: {
+				kind: "channel",
+				id: presenceEvent.channelId
+			}
+		});
+		try {
+			if (!this.cooldownStore.registerIfAbsent(presenceKey, nowMs, { ttlMs: 288e5 })) {
+				this.recordPresenceBaseline(data.guild_id, presenceKey, "online");
+				return;
+			}
+		} catch (err) {
+			(this.params.logger ?? discordEventQueueLog).warn(danger(`discord presence cooldown persistence failed: ${String(err)}`));
+			return;
+		}
+		let queued;
+		try {
+			queued = enqueueSystemEvent(presenceEvent.text, {
+				sessionKey: route.sessionKey,
+				contextKey: `discord:presence-online:${this.params.accountId}:${data.guild_id}:${userId}`,
+				deliveryContext: {
+					channel: "discord",
+					to: `channel:${presenceEvent.channelId}`,
+					accountId: this.params.accountId
+				}
+			});
+		} catch (err) {
+			if (this.cooldownStore.lookup(presenceKey) === nowMs) this.cooldownStore.delete(presenceKey);
+			throw err;
+		}
+		if (!queued) {
+			if (this.cooldownStore.lookup(presenceKey) === nowMs) this.cooldownStore.delete(presenceKey);
+			return;
+		}
+		this.recordPresenceBaseline(data.guild_id, presenceKey, "online");
+		requestHeartbeat({
+			source: "notifications-event",
+			intent: "immediate",
+			reason: "wake",
+			agentId: route.agentId,
+			sessionKey: route.sessionKey,
+			heartbeat: {
+				target: "discord",
+				to: `channel:${presenceEvent.channelId}`,
+				accountId: this.params.accountId
+			}
+		});
+	}
+	isCurrentGeneration(guildId, gatewayGeneration, guildGeneration) {
+		return gatewayGeneration === this.gatewayGeneration && guildGeneration === (this.guildPresenceState.get(guildId)?.generation ?? 0);
+	}
+	recordPresenceBaseline(guildId, key, status) {
+		const evictedGuildId = status === "offline" ? this.presenceBaseline.observeOffline(guildId, key) : this.presenceBaseline.observeOnline(guildId, key);
+		if (!evictedGuildId) return;
+		const state = this.guildPresenceState.get(evictedGuildId);
+		if (state) state.inferUnknownAsNewlyAvailable = false;
+	}
+};
+var DiscordPresenceGuildCreateListener = class extends GuildCreateListener {
+	constructor(presenceListener) {
+		super();
+		this.presenceListener = presenceListener;
+	}
+	handle(data) {
+		this.presenceListener.seedGuildSnapshot(data);
+	}
+};
+var DiscordPresenceGuildDeleteListener = class extends GuildDeleteListener {
+	constructor(presenceListener) {
+		super();
+		this.presenceListener = presenceListener;
+	}
+	handle(data) {
+		this.presenceListener.invalidateGuild(data.id);
+	}
+};
+var DiscordPresenceReadyListener = class extends ReadyListener {
+	constructor(presenceListener) {
+		super();
+		this.presenceListener = presenceListener;
+	}
+	handle() {
+		this.presenceListener.resetGatewaySession();
+	}
 };
 var DiscordThreadUpdateListener = class extends ThreadUpdateListener {
 	constructor(cfg, accountId, logger) {
@@ -1754,27 +2019,6 @@ function resolveDiscordNativeCommandChannelAccessContext(params) {
 		}) : null
 	};
 }
-function resolveDiscordCommandOwnerAllowFrom(cfg) {
-	const raw = cfg.commands?.ownerAllowFrom;
-	if (!Array.isArray(raw) || raw.length === 0) return;
-	const entries = [];
-	for (const entry of raw) {
-		const trimmed = normalizeOptionalString(String(entry ?? "")) ?? "";
-		if (!trimmed) continue;
-		const separatorIndex = trimmed.indexOf(":");
-		if (separatorIndex > 0) {
-			const prefix = trimmed.slice(0, separatorIndex).toLowerCase();
-			if (prefix === "discord") {
-				const remainder = normalizeOptionalString(trimmed.slice(separatorIndex + 1)) ?? "";
-				if (remainder) entries.push(remainder);
-				continue;
-			}
-			if (prefix !== "user" && prefix !== "pk") continue;
-		}
-		entries.push(trimmed);
-	}
-	return entries.length > 0 ? entries : void 0;
-}
 async function resolveDiscordGuildNativeCommandAuthorized(params) {
 	const { groupPolicy } = resolveOpenProviderRuntimeGroupPolicy({
 		providerConfigPresent: params.cfg.channels?.discord !== void 0,
@@ -2121,22 +2365,12 @@ const DISCORD_COMMAND_ARG_CUSTOM_ID_KEY = "cmdarg";
 function createCommandArgsWithValue(params) {
 	return { values: { [params.argName]: params.value } };
 }
-function encodeDiscordCommandArgValue(value) {
-	return encodeURIComponent(value);
-}
-function decodeDiscordCommandArgValue(value) {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
-}
 function buildDiscordCommandArgCustomId(params) {
 	return [
-		`${DISCORD_COMMAND_ARG_CUSTOM_ID_KEY}:command=${encodeDiscordCommandArgValue(params.command)}`,
-		`arg=${encodeDiscordCommandArgValue(params.arg)}`,
-		`value=${encodeDiscordCommandArgValue(params.value)}`,
-		`user=${encodeDiscordCommandArgValue(params.userId)}`
+		`${DISCORD_COMMAND_ARG_CUSTOM_ID_KEY}:command=${encodeCustomIdComponent(params.command)}`,
+		`arg=${encodeCustomIdComponent(params.arg)}`,
+		`value=${encodeCustomIdComponent(params.value)}`,
+		`user=${encodeCustomIdComponent(params.userId)}`
 	].join(";");
 }
 function parseDiscordCommandArgData(data) {
@@ -2148,10 +2382,10 @@ function parseDiscordCommandArgData(data) {
 	const rawUser = coerce(data.user);
 	if (!rawCommand || !rawArg || !rawValue || !rawUser) return null;
 	return {
-		command: decodeDiscordCommandArgValue(rawCommand),
-		arg: decodeDiscordCommandArgValue(rawArg),
-		value: decodeDiscordCommandArgValue(rawValue),
-		userId: decodeDiscordCommandArgValue(rawUser)
+		command: decodeCustomIdComponent(rawCommand),
+		arg: decodeCustomIdComponent(rawArg),
+		value: decodeCustomIdComponent(rawValue),
+		userId: decodeCustomIdComponent(rawUser)
 	};
 }
 async function handleDiscordCommandArgInteraction(params) {
@@ -2384,6 +2618,10 @@ async function recordDiscordModelPickerRecentModel(params) {
 //#endregion
 //#region extensions/discord/src/monitor/model-picker.state.ts
 const DISCORD_MODEL_PICKER_CUSTOM_ID_KEY = "mdlpk";
+const DISCORD_CUSTOM_ID_MAX_CHARS = 100;
+const DISCORD_COMPONENT_MAX_SELECT_OPTIONS = 25;
+const DISCORD_MODEL_PICKER_PROVIDER_PAGE_SIZE = DISCORD_COMPONENT_MAX_SELECT_OPTIONS;
+const DISCORD_MODEL_PICKER_MODEL_PAGE_SIZE = DISCORD_COMPONENT_MAX_SELECT_OPTIONS;
 function compareBucketItems(left, right) {
 	const normalized = left.toLowerCase().localeCompare(right.toLowerCase());
 	return normalized === 0 ? left.localeCompare(right) : normalized;
@@ -2408,17 +2646,19 @@ const PICKER_VIEWS = [
 	"models",
 	"recents"
 ];
-const loadModelsProviderRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/models-provider-runtime"));
-function encodeCustomIdValue(value) {
-	return encodeURIComponent(value);
-}
-function decodeCustomIdValue$1(value) {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
+/**
+* Alpha buckets engage only when the sorted item list exceeds the single-page
+* select cap. Below this threshold the user gets the existing flat list +
+* prev/next behavior unchanged.
+*/
+const DISCORD_MODEL_PICKER_BUCKET_THRESHOLD = DISCORD_COMPONENT_MAX_SELECT_OPTIONS;
+/** Target items per alpha bucket. Discord caps selects at 25 options. */
+const DISCORD_MODEL_PICKER_BUCKET_TARGET_SIZE = 20;
+const DISCORD_MODEL_PICKER_MODEL_TOKEN_PATTERN = /^[A-Za-z0-9_-]{8}$/u;
+function createDiscordModelPickerModelToken(provider, model) {
+	return createHash("sha256").update(JSON.stringify([normalizeProviderId(provider), model]), "utf8").digest("base64url").slice(0, 8);
 }
+const loadModelsProviderRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/models-provider-runtime"));
 function isValidCommandContext(value) {
 	return COMMAND_CONTEXTS.includes(value);
 }
@@ -2479,44 +2719,51 @@ function buildDiscordModelPickerCustomId(params) {
 	const normalizedProvider = params.provider ? normalizeProviderId(params.provider) : void 0;
 	const modelIndex = typeof params.modelIndex === "number" && Number.isFinite(params.modelIndex) ? Math.max(1, Math.floor(params.modelIndex)) : void 0;
 	const recentSlot = typeof params.recentSlot === "number" && Number.isFinite(params.recentSlot) ? Math.max(1, Math.floor(params.recentSlot)) : void 0;
+	const modelToken = params.modelToken?.trim();
+	if (modelToken && !DISCORD_MODEL_PICKER_MODEL_TOKEN_PATTERN.test(modelToken)) throw new Error("Discord model picker model token is invalid");
 	const parts = [
-		`${DISCORD_MODEL_PICKER_CUSTOM_ID_KEY}:c=${encodeCustomIdValue(params.command)}`,
-		`a=${encodeCustomIdValue(params.action)}`,
-		`v=${encodeCustomIdValue(params.view)}`,
-		`u=${encodeCustomIdValue(userId)}`,
+		`${DISCORD_MODEL_PICKER_CUSTOM_ID_KEY}:c=${encodeCustomIdComponent(params.command)}`,
+		`a=${encodeCustomIdComponent(params.action)}`,
+		`v=${encodeCustomIdComponent(params.view)}`,
+		`u=${encodeCustomIdComponent(userId)}`,
 		`g=${String(page)}`
 	];
-	if (normalizedProvider) parts.push(`p=${encodeCustomIdValue(normalizedProvider)}`);
+	if (normalizedProvider) parts.push(`p=${encodeCustomIdComponent(normalizedProvider)}`);
 	const runtime = params.runtime?.trim();
-	if (runtime) parts.push(`r=${encodeCustomIdValue(runtime)}`);
+	if (runtime) parts.push(`r=${encodeCustomIdComponent(runtime)}`);
 	const runtimeIndex = typeof params.runtimeIndex === "number" && Number.isFinite(params.runtimeIndex) ? Math.max(1, Math.floor(params.runtimeIndex)) : void 0;
 	if (runtimeIndex) parts.push(`ri=${String(runtimeIndex)}`);
 	if (providerPage) parts.push(`pp=${String(providerPage)}`);
-	if (modelIndex) parts.push(`mi=${String(modelIndex)}`);
-	if (recentSlot) parts.push(`rs=${String(recentSlot)}`);
+	if (modelToken) parts.push(`m=${modelToken}`);
+	else {
+		if (modelIndex) parts.push(`mi=${String(modelIndex)}`);
+		if (recentSlot) parts.push(`rs=${String(recentSlot)}`);
+	}
 	const providerBucket = params.providerBucket?.trim().toLowerCase();
-	if (providerBucket) parts.push(`pb=${encodeCustomIdValue(providerBucket)}`);
+	if (providerBucket) parts.push(`pb=${encodeCustomIdComponent(providerBucket)}`);
 	const modelBucket = params.modelBucket?.trim().toLowerCase();
-	if (modelBucket) parts.push(`mb=${encodeCustomIdValue(modelBucket)}`);
+	if (modelBucket) parts.push(`mb=${encodeCustomIdComponent(modelBucket)}`);
 	const customId = parts.join(";");
-	if (customId.length > 100) throw new Error(`Discord model picker custom_id exceeds 100 chars (${customId.length})`);
+	if (customId.length > DISCORD_CUSTOM_ID_MAX_CHARS) throw new Error(`Discord model picker custom_id exceeds ${DISCORD_CUSTOM_ID_MAX_CHARS} chars (${customId.length})`);
 	return customId;
 }
 function parseDiscordModelPickerData(data) {
 	if (!data || typeof data !== "object") return null;
-	const command = decodeCustomIdValue$1(coerceString(data.c ?? data.cmd));
-	const action = decodeCustomIdValue$1(coerceString(data.a ?? data.act));
-	const view = decodeCustomIdValue$1(coerceString(data.v ?? data.view));
-	const userId = decodeCustomIdValue$1(coerceString(data.u));
-	const providerRaw = decodeCustomIdValue$1(coerceString(data.p));
-	const runtimeRaw = decodeCustomIdValue$1(coerceString(data.r));
+	const command = decodeCustomIdComponent(coerceString(data.c ?? data.cmd));
+	const action = decodeCustomIdComponent(coerceString(data.a ?? data.act));
+	const view = decodeCustomIdComponent(coerceString(data.v ?? data.view));
+	const userId = decodeCustomIdComponent(coerceString(data.u));
+	const providerRaw = decodeCustomIdComponent(coerceString(data.p));
+	const runtimeRaw = decodeCustomIdComponent(coerceString(data.r));
 	const runtimeIndex = parseRawPositiveInt(data.ri);
 	const page = parseRawPage(data.g ?? data.pg);
 	const providerPage = parseRawPositiveInt(data.pp);
 	const modelIndex = parseRawPositiveInt(data.mi);
+	const modelTokenRaw = coerceString(data.m).trim();
+	const modelToken = DISCORD_MODEL_PICKER_MODEL_TOKEN_PATTERN.test(modelTokenRaw) ? modelTokenRaw : void 0;
 	const recentSlot = parseRawPositiveInt(data.rs);
-	const providerBucketRaw = decodeCustomIdValue$1(coerceString(data.pb)).trim().toLowerCase();
-	const modelBucketRaw = decodeCustomIdValue$1(coerceString(data.mb)).trim().toLowerCase();
+	const providerBucketRaw = decodeCustomIdComponent(coerceString(data.pb)).trim().toLowerCase();
+	const modelBucketRaw = decodeCustomIdComponent(coerceString(data.mb)).trim().toLowerCase();
 	if (!isValidCommandContext(command) || !isValidPickerAction(action) || !isValidPickerView(view)) return null;
 	const trimmedUserId = userId.trim();
 	if (!trimmedUserId) return null;
@@ -2531,6 +2778,7 @@ function parseDiscordModelPickerData(data) {
 		page,
 		...typeof providerPage === "number" ? { providerPage } : {},
 		...typeof modelIndex === "number" ? { modelIndex } : {},
+		...modelToken ? { modelToken } : {},
 		...typeof recentSlot === "number" ? { recentSlot } : {},
 		...providerBucketRaw ? { providerBucket: providerBucketRaw } : {},
 		...modelBucketRaw ? { modelBucket: modelBucketRaw } : {}
@@ -2549,25 +2797,26 @@ function parseDiscordModelPickerData(data) {
 */
 function computeAlphaBuckets(sortedItems) {
 	if (sortedItems.length === 0) return [];
-	if (sortedItems.length <= 25) return [{
+	if (sortedItems.length <= DISCORD_MODEL_PICKER_BUCKET_THRESHOLD) return [{
 		id: "all",
 		label: `All (${sortedItems.length})`,
 		start: 0,
 		end: sortedItems.length
 	}];
 	const firstLetter = (value) => value.charAt(0).toLowerCase();
-	if (sortedItems.every((item) => firstLetter(item) === firstLetter(sortedItems[0]))) return chunkBucketsByCount(sortedItems);
+	const firstItem = expectDefined(sortedItems.at(0), "non-empty sorted model picker items");
+	if (sortedItems.every((item) => firstLetter(item) === firstLetter(firstItem))) return chunkBucketsByCount(sortedItems);
 	const buckets = [];
 	const target = computeBucketTargetSize(sortedItems.length);
 	let start = 0;
 	while (start < sortedItems.length) {
 		let end = Math.min(sortedItems.length, start + target);
 		if (end < sortedItems.length) {
-			const last = firstLetter(sortedItems[end - 1]);
-			while (end < sortedItems.length && firstLetter(sortedItems[end]) === last) end += 1;
+			const last = firstLetter(expectDefined(sortedItems[end - 1], "bucket end predecessor"));
+			while (end < sortedItems.length && firstLetter(expectDefined(sortedItems[end], "bucket extension index")) === last) end += 1;
 		}
-		const startLetter = firstLetter(sortedItems[start]);
-		const endLetter = firstLetter(sortedItems[end - 1]);
+		const startLetter = firstLetter(expectDefined(sortedItems[start], "bucket start index"));
+		const endLetter = firstLetter(expectDefined(sortedItems[end - 1], "bucket end predecessor"));
 		const id = startLetter === endLetter ? startLetter : `${startLetter}-${endLetter}`;
 		const label = startLetter === endLetter ? `${startLetter.toUpperCase()} (${end - start})` : `${startLetter.toUpperCase()}–${endLetter.toUpperCase()} (${end - start})`;
 		buckets.push({
@@ -2587,8 +2836,8 @@ function computeAlphaBuckets(sortedItems) {
 * for typical inputs and grows linearly for very large lists.
 */
 function computeBucketTargetSize(totalItems) {
-	const minTarget = 20;
-	const capByBucketCount = Math.ceil(totalItems / 25);
+	const minTarget = DISCORD_MODEL_PICKER_BUCKET_TARGET_SIZE;
+	const capByBucketCount = Math.ceil(totalItems / DISCORD_COMPONENT_MAX_SELECT_OPTIONS);
 	return Math.max(minTarget, capByBucketCount);
 }
 function chunkBucketsByCount(sortedItems) {
@@ -2613,8 +2862,8 @@ function chunkBucketsByCount(sortedItems) {
 */
 function resolveBucket(buckets, id) {
 	if (buckets.length === 0) return null;
-	if (!id) return buckets[0];
-	return buckets.find((bucket) => bucket.id === id) ?? buckets[0];
+	if (!id) return expectDefined(buckets.at(0), "non-empty model picker buckets");
+	return buckets.find((bucket) => bucket.id === id) ?? expectDefined(buckets.at(0), "non-empty model picker buckets");
 }
 /**
 * Derive the alpha-bucket id that contains a given provider id. Returns
@@ -2634,7 +2883,7 @@ function findProviderBucketLocation(data, provider) {
 	if (idx < 0) return;
 	const containing = computeAlphaBuckets(sorted).find((bucket) => idx >= bucket.start && idx < bucket.end);
 	if (!containing) return;
-	const page = Math.floor((idx - containing.start) / 25) + 1;
+	const page = Math.floor((idx - containing.start) / DISCORD_MODEL_PICKER_PROVIDER_PAGE_SIZE) + 1;
 	return {
 		...containing.id !== "all" ? { bucket: containing.id } : {},
 		page
@@ -2666,7 +2915,7 @@ function getDiscordModelPickerProviderPage(params) {
 	const buckets = computeAlphaBuckets(allItems.map((item) => item.id));
 	const bucket = resolveBucket(buckets, params.bucket);
 	const bucketItems = bucket ? allItems.slice(bucket.start, bucket.end) : allItems;
-	const pageSize = clampPageSize(params.pageSize, 25, 25);
+	const pageSize = clampPageSize(params.pageSize, DISCORD_MODEL_PICKER_PROVIDER_PAGE_SIZE, DISCORD_MODEL_PICKER_PROVIDER_PAGE_SIZE);
 	return {
 		...paginateItems({
 			items: bucketItems,
@@ -2685,7 +2934,7 @@ function getDiscordModelPickerModelPage(params) {
 	const buckets = computeAlphaBuckets(allModels);
 	const bucket = resolveBucket(buckets, params.bucket);
 	const bucketItems = bucket ? allModels.slice(bucket.start, bucket.end) : allModels;
-	const pageSize = clampPageSize(params.pageSize, 25, 25);
+	const pageSize = clampPageSize(params.pageSize, DISCORD_MODEL_PICKER_MODEL_PAGE_SIZE, DISCORD_MODEL_PICKER_MODEL_PAGE_SIZE);
 	return {
 		...paginateItems({
 			items: bucketItems,
@@ -2704,7 +2953,7 @@ function resolveDiscordModelPickerPageForModel(params) {
 	const sorted = [...modelSet].toSorted(compareBucketItems);
 	const index = sorted.indexOf(params.model);
 	if (index < 0) return { page: 1 };
-	const pageSize = clampPageSize(params.pageSize, 25, 25);
+	const pageSize = clampPageSize(params.pageSize, DISCORD_MODEL_PICKER_MODEL_PAGE_SIZE, DISCORD_MODEL_PICKER_MODEL_PAGE_SIZE);
 	const containingBucket = computeAlphaBuckets(sorted).find((bucket) => index >= bucket.start && index < bucket.end);
 	if (!containingBucket) return { page: Math.floor(index / pageSize) + 1 };
 	const offsetInBucket = index - containingBucket.start;
@@ -2719,8 +2968,10 @@ const DISCORD_MODEL_PICKER_PAGE_INDICATOR_CUSTOM_ID = "mdlpk:nav-indicator";
 function parseCurrentModelRef(raw) {
 	const match = (raw?.trim())?.match(/^([^/]+)\/(.+)$/u);
 	if (!match) return null;
-	const provider = normalizeProviderId(match[1]);
+	const providerText = match[1];
 	const model = match[2];
+	if (providerText === void 0 || model === void 0) return null;
+	const provider = normalizeProviderId(providerText);
 	if (!provider || !model) return null;
 	return {
 		provider,
@@ -2904,6 +3155,7 @@ function buildPaginationRow(params) {
 				page: Math.max(1, params.page - 1),
 				providerPage: params.providerPage,
 				modelIndex: params.modelIndex,
+				modelToken: params.modelToken,
 				providerBucket: params.providerBucket,
 				modelBucket: params.modelBucket,
 				userId: params.userId
@@ -2929,6 +3181,7 @@ function buildPaginationRow(params) {
 				page: Math.min(params.totalPages, params.page + 1),
 				providerPage: params.providerPage,
 				modelIndex: params.modelIndex,
+				modelToken: params.modelToken,
 				providerBucket: params.providerBucket,
 				modelBucket: params.modelBucket,
 				userId: params.userId
@@ -2939,6 +3192,7 @@ function buildPaginationRow(params) {
 function buildModelRows(params) {
 	const parsedCurrentModel = parseCurrentModelRef(params.currentModel);
 	const parsedPendingModel = parseCurrentModelRef(params.pendingModel);
+	const pendingModelToken = parsedPendingModel ? createDiscordModelPickerModelToken(parsedPendingModel.provider, parsedPendingModel.model) : void 0;
 	const rows = [];
 	const hasQuickModels = (params.quickModels ?? []).length > 0;
 	const providerPage = getDiscordModelPickerProviderPage({
@@ -2991,6 +3245,7 @@ function buildModelRows(params) {
 			page: params.modelPage.page,
 			providerPage: providerPage.page,
 			modelIndex: params.pendingModelIndex,
+			modelToken: pendingModelToken,
 			...params.pendingModelIndex === void 0 && activeModelBucket ? { modelBucket: activeModelBucket } : {},
 			userId: params.userId
 		}),
@@ -3037,6 +3292,7 @@ function buildModelRows(params) {
 		...compactRuntime,
 		providerPage: providerPage.page,
 		modelIndex: params.pendingModelIndex,
+		modelToken: pendingModelToken,
 		modelBucket: params.modelPage.bucket && params.modelPage.bucket.id !== "all" ? params.modelPage.bucket.id : void 0
 	});
 	if (modelNavRow) rows.push(modelNavRow);
@@ -3114,6 +3370,7 @@ function buildModelRows(params) {
 			page: params.modelPage.page,
 			providerPage: providerPage.page,
 			modelIndex: params.pendingModelIndex,
+			modelToken: pendingModelToken,
 			userId: params.userId
 		})
 	}));
@@ -3254,6 +3511,10 @@ function formatRecentsButtonLabel(modelRef, suffix) {
 	if (label.length <= maxLen) return label;
 	return suffix ? `${sliceUtf16Safe(modelRef, 0, maxLen - suffix.length - 2)}… ${suffix}` : `${sliceUtf16Safe(modelRef, 0, maxLen - 1)}…`;
 }
+function createModelRefToken(modelRef) {
+	const parsed = parseCurrentModelRef(modelRef);
+	return parsed ? createDiscordModelPickerModelToken(parsed.provider, parsed.model) : void 0;
+}
 function renderDiscordModelPickerRecentsView(params) {
 	const defaultModelRef = `${params.data.resolvedDefault.provider}/${params.data.resolvedDefault.model}`;
 	const rows = [];
@@ -3266,6 +3527,24 @@ function renderDiscordModelPickerRecentsView(params) {
 			action: "submit",
 			view: "recents",
 			recentSlot: 1,
+			modelToken: createModelRefToken(defaultModelRef),
+			provider: params.provider,
+			runtime: params.runtime,
+			runtimeIndex: params.runtimeIndex,
+			page: params.page,
+			providerPage: params.providerPage,
+			userId: params.userId
+		})
+	})]));
+	for (const [i, modelRef] of dedupedQuickModels.entries()) rows.push(new Row([createModelPickerButton({
+		label: formatRecentsButtonLabel(modelRef),
+		style: ButtonStyle.Secondary,
+		customId: buildDiscordModelPickerCustomId({
+			command: params.command,
+			action: "submit",
+			view: "recents",
+			recentSlot: i + 2,
+			modelToken: createModelRefToken(modelRef),
 			provider: params.provider,
 			runtime: params.runtime,
 			runtimeIndex: params.runtimeIndex,
@@ -3274,25 +3553,6 @@ function renderDiscordModelPickerRecentsView(params) {
 			userId: params.userId
 		})
 	})]));
-	for (let i = 0; i < dedupedQuickModels.length; i++) {
-		const modelRef = dedupedQuickModels[i];
-		rows.push(new Row([createModelPickerButton({
-			label: formatRecentsButtonLabel(modelRef),
-			style: ButtonStyle.Secondary,
-			customId: buildDiscordModelPickerCustomId({
-				command: params.command,
-				action: "submit",
-				view: "recents",
-				recentSlot: i + 2,
-				provider: params.provider,
-				runtime: params.runtime,
-				runtimeIndex: params.runtimeIndex,
-				page: params.page,
-				providerPage: params.providerPage,
-				userId: params.userId
-			})
-		})]));
-	}
 	const backRow = new Row([createModelPickerButton({
 		label: "Back",
 		style: ButtonStyle.Secondary,
@@ -3424,6 +3684,10 @@ async function applyDiscordModelPickerSelection(params) {
 				if (!persisted) logVerbose(`discord: direct session override persist failed — expected ${params.resolvedModelRef} but read ${effectiveModelRef} from session key ${fallbackRoute.sessionKey}`);
 				else if (!directlyPersisted) logVerbose(`discord: direct session override persist became a no-op because ${params.resolvedModelRef} was already present on re-read for session key ${fallbackRoute.sessionKey}`);
 			} catch (error) {
+				if (error instanceof ModelSelectionLockedError) return {
+					status: "rejected",
+					noticeMessage: `❌ ${error.message}`
+				};
 				const message = error instanceof Error ? error.message : String(error);
 				logVerbose(`discord: direct session override persist threw for session key ${fallbackRoute.sessionKey}: ${message}`);
 			}
@@ -3443,6 +3707,10 @@ async function applyDiscordModelPickerSelection(params) {
 			noticeMessage: `⚠️ Tried to set ${params.resolvedModelRef}, but current model is ${effectiveModelRef}.`
 		};
 	} catch (error) {
+		if (error instanceof ModelSelectionLockedError) return {
+			status: "rejected",
+			noticeMessage: `❌ ${error.message}`
+		};
 		if (error instanceof Error && error.message === "timeout") return {
 			status: "timeout",
 			noticeMessage: `⏳ Model change to ${params.resolvedModelRef} is still processing. Check /status in a few seconds.`
@@ -3715,11 +3983,14 @@ function resolveParsedRuntimeForSubmission(params) {
 }
 function resolveSubmittedModelRef(params) {
 	if (params.parsed.action === "reset") return `${params.data.resolvedDefault.provider}/${params.data.resolvedDefault.model}`;
+	if (params.parsed.modelToken) return resolveDiscordModelPickerModelRefByToken(params.data, params.parsed.modelToken);
 	if (params.parsed.action === "quick") {
+		if (params.requireModelToken) return null;
 		const slot = params.parsed.recentSlot ?? 0;
 		return slot >= 1 ? params.quickModels[slot - 1] ?? null : null;
 	}
 	if (params.parsed.view === "recents") {
+		if (params.requireModelToken) return null;
 		const defaultModelRef = `${params.data.resolvedDefault.provider}/${params.data.resolvedDefault.model}`;
 		const dedupedRecents = params.quickModels.filter((ref) => ref !== defaultModelRef);
 		const slot = params.parsed.recentSlot ?? 0;
@@ -3727,10 +3998,12 @@ function resolveSubmittedModelRef(params) {
 		return slot >= 2 ? dedupedRecents[slot - 2] ?? null : null;
 	}
 	const provider = params.parsed.provider;
-	const selectedModel = resolveDiscordModelPickerModelByIndex({
+	const selectedModel = resolveDiscordModelPickerModelSelection({
 		data: params.data,
 		provider: provider ?? "",
-		modelIndex: params.parsed.modelIndex
+		modelIndex: params.parsed.modelIndex,
+		modelToken: params.parsed.modelToken,
+		requireModelToken: params.requireModelToken
 	});
 	return provider && selectedModel ? `${provider}/${selectedModel}` : null;
 }
@@ -3752,6 +4025,11 @@ function listDiscordModelPickerProviderModels(data, provider) {
 	if (!modelSet) return [];
 	return [...modelSet].toSorted();
 }
+function resolveDiscordModelPickerModelRefByToken(data, modelToken) {
+	const matchingRefs = [];
+	for (const [provider, models] of data.byProvider) for (const model of models) if (createDiscordModelPickerModelToken(provider, model) === modelToken) matchingRefs.push(`${provider}/${model}`);
+	return matchingRefs.length === 1 ? matchingRefs[0] ?? null : null;
+}
 function resolveDiscordModelPickerModelIndex(params) {
 	const models = listDiscordModelPickerProviderModels(params.data, params.provider);
 	if (!models.length) return null;
@@ -3759,10 +4037,14 @@ function resolveDiscordModelPickerModelIndex(params) {
 	if (index < 0) return null;
 	return index + 1;
 }
-function resolveDiscordModelPickerModelByIndex(params) {
-	if (!params.modelIndex || params.modelIndex < 1) return null;
+function resolveDiscordModelPickerModelSelection(params) {
 	const models = listDiscordModelPickerProviderModels(params.data, params.provider);
 	if (!models.length) return null;
+	if (params.modelToken) {
+		const matchingModels = models.filter((model) => createDiscordModelPickerModelToken(params.provider, model) === params.modelToken);
+		return matchingModels.length === 1 ? matchingModels[0] ?? null : null;
+	}
+	if (params.requireModelToken || !params.modelIndex || params.modelIndex < 1) return null;
 	return models[params.modelIndex - 1] ?? null;
 }
 function resolveDiscordModelPickerRuntimeForProvider(params) {
@@ -3801,20 +4083,22 @@ async function handleDiscordModelPickerInteraction(params) {
 		if (await params.safeInteractionCall("model picker defer", () => interaction.acknowledge()) === null) return;
 		deferredUpdate = true;
 	}
+	const cfg = getRuntimeConfigSnapshot() ?? ctx.cfg;
+	const requireModelToken = cfg !== ctx.cfg;
 	const route = await resolveDiscordModelPickerRoute({
 		interaction,
-		cfg: ctx.cfg,
+		cfg,
 		accountId: ctx.accountId,
 		threadBindings: ctx.threadBindings
 	});
-	const pickerData = await loadDiscordModelPickerData(ctx.cfg, route.agentId);
+	const pickerData = await loadDiscordModelPickerData(cfg, route.agentId);
 	const currentModelRef = resolveDiscordModelPickerCurrentModel({
-		cfg: ctx.cfg,
+		cfg,
 		route,
 		data: pickerData
 	});
 	const currentRuntime = resolveDiscordModelPickerCurrentRuntime({
-		cfg: ctx.cfg,
+		cfg,
 		route
 	});
 	const allowedModelRefs = buildDiscordModelPickerAllowedModelRefs(pickerData);
@@ -3911,11 +4195,22 @@ async function handleDiscordModelPickerInteraction(params) {
 			currentModelRef,
 			data: pickerData
 		});
-		const pendingModel = resolveDiscordModelPickerModelByIndex({
+		const pendingModel = resolveDiscordModelPickerModelSelection({
 			data: pickerData,
 			provider,
-			modelIndex: parsed.modelIndex
+			modelIndex: parsed.modelIndex,
+			modelToken: parsed.modelToken,
+			requireModelToken
 		});
+		if ((parsed.modelIndex || parsed.modelToken) && !pendingModel) {
+			await showNotice("That selection expired. Please choose a model again.");
+			return;
+		}
+		const pendingModelIndex = pendingModel ? resolveDiscordModelPickerModelIndex({
+			data: pickerData,
+			provider,
+			model: pendingModel
+		}) : void 0;
 		await updatePicker(toDiscordModelPickerMessagePayload(renderDiscordModelPickerModelsView({
 			command: parsed.command,
 			userId: parsed.userId,
@@ -3928,7 +4223,7 @@ async function handleDiscordModelPickerInteraction(params) {
 			currentModel: currentModelRef,
 			currentRuntime,
 			...pendingModel ? { pendingModel: `${provider}/${pendingModel}` } : {},
-			pendingModelIndex: parsed.modelIndex,
+			pendingModelIndex: pendingModelIndex ?? void 0,
 			pendingRuntime: resolvePendingRuntime({
 				data: pickerData,
 				provider,
@@ -4032,12 +4327,23 @@ async function handleDiscordModelPickerInteraction(params) {
 			await showNotice("Sorry, that provider isn't available anymore.");
 			return;
 		}
-		const selectedModel = resolveDiscordModelPickerModelByIndex({
+		const selectedModel = resolveDiscordModelPickerModelSelection({
 			data: pickerData,
 			provider,
-			modelIndex: parsed.modelIndex
+			modelIndex: parsed.modelIndex,
+			modelToken: parsed.modelToken,
+			requireModelToken
 		});
+		if ((parsed.modelIndex || parsed.modelToken) && !selectedModel) {
+			await showNotice("That selection expired. Please choose a model again.");
+			return;
+		}
 		const pendingModel = selectedModel ? `${provider}/${selectedModel}` : void 0;
+		const pendingModelIndex = selectedModel ? resolveDiscordModelPickerModelIndex({
+			data: pickerData,
+			provider,
+			model: selectedModel
+		}) : void 0;
 		const derivedProviderBucket = parsed.providerBucket ?? findProviderBucketId(pickerData, provider);
 		const currentModelOnly = splitDiscordModelRef(currentModelRef ?? "");
 		const derivedModelBucket = parsed.modelBucket ?? (selectedModel ? findModelBucketId(pickerData, provider, selectedModel) : currentModelOnly && currentModelOnly.provider === provider ? findModelBucketId(pickerData, provider, currentModelOnly.model) : void 0);
@@ -4053,7 +4359,7 @@ async function handleDiscordModelPickerInteraction(params) {
 			currentModel: currentModelRef,
 			currentRuntime,
 			...pendingModel ? { pendingModel } : {},
-			pendingModelIndex: parsed.modelIndex,
+			pendingModelIndex: pendingModelIndex ?? void 0,
 			pendingRuntime: selectedRuntime,
 			quickModels
 		})));
@@ -4063,7 +4369,8 @@ async function handleDiscordModelPickerInteraction(params) {
 		const modelRef = resolveSubmittedModelRef({
 			data: pickerData,
 			parsed,
-			quickModels
+			quickModels,
+			requireModelToken
 		});
 		const parsedModelRef = modelRef ? splitDiscordModelRef(modelRef) : null;
 		if (!parsedModelRef || !pickerData.byProvider.get(parsedModelRef.provider)?.has(parsedModelRef.model)) {
@@ -4091,7 +4398,7 @@ async function handleDiscordModelPickerInteraction(params) {
 			interaction,
 			selectionCommand,
 			dispatchCommandInteraction: params.dispatchCommandInteraction,
-			cfg: ctx.cfg,
+			cfg,
 			discordConfig: ctx.discordConfig,
 			accountId: ctx.accountId,
 			sessionPrefix: ctx.sessionPrefix,
@@ -4106,7 +4413,7 @@ async function handleDiscordModelPickerInteraction(params) {
 			preferenceScope,
 			settleMs: ctx.postApplySettleMs ?? 250,
 			resolveCurrentModel: (currentRoute) => resolveDiscordModelPickerCurrentModel({
-				cfg: ctx.cfg,
+				cfg,
 				route: currentRoute,
 				data: pickerData
 			})
@@ -4960,6 +5267,22 @@ var GatewayReconnectTimer = class {
 	}
 };
 //#endregion
+//#region extensions/discord/src/internal/gateway-payload.ts
+function ensureGatewayParams(url) {
+	const parsed = new URL(url);
+	parsed.searchParams.set("v", parsed.searchParams.get("v") ?? "10");
+	parsed.searchParams.set("encoding", parsed.searchParams.get("encoding") ?? "json");
+	return parsed.toString();
+}
+function decodeGatewayMessage(incoming) {
+	const text = Buffer.isBuffer(incoming) ? incoming.toString("utf8") : incoming instanceof ArrayBuffer ? Buffer.from(incoming).toString("utf8") : Array.isArray(incoming) ? Buffer.concat(incoming.map((entry) => Buffer.from(entry))).toString("utf8") : String(incoming);
+	try {
+		return JSON.parse(text);
+	} catch {
+		return null;
+	}
+}
+//#endregion
 //#region extensions/discord/src/internal/gateway-rate-limit.ts
 const GATEWAY_SEND_LIMIT = 120;
 const GATEWAY_SEND_WINDOW_MS = 6e4;
@@ -5036,6 +5359,77 @@ var GatewaySendLimiter = class {
 	}
 };
 //#endregion
+//#region extensions/discord/src/internal/gateway-voice-state-cache.ts
+var DiscordGatewayVoiceStateCache = class {
+	constructor() {
+		this.statesByGuild = /* @__PURE__ */ new Map();
+		this.transitionsByState = /* @__PURE__ */ new WeakMap();
+	}
+	clear() {
+		this.statesByGuild.clear();
+		this.transitionsByState = /* @__PURE__ */ new WeakMap();
+	}
+	listVoiceChannelStates(guildId, channelId) {
+		const states = this.statesByGuild.get(guildId);
+		if (!states) return [];
+		const result = [];
+		for (const state of states.values()) if (state.channel_id === channelId) result.push({ ...state });
+		return result;
+	}
+	takeTransition(state) {
+		const transition = this.transitionsByState.get(state);
+		if (!transition) return null;
+		this.transitionsByState.delete(state);
+		return {
+			current: { ...transition.current },
+			...transition.previous ? { previous: { ...transition.previous } } : {}
+		};
+	}
+	apply(payload) {
+		if (payload.t === GatewayDispatchEvents.Ready) {
+			this.clear();
+			return;
+		}
+		if (payload.t === GatewayDispatchEvents.GuildCreate) {
+			const guild = payload.d;
+			if (guild.unavailable) {
+				this.statesByGuild.delete(guild.id);
+				return;
+			}
+			const states = /* @__PURE__ */ new Map();
+			for (const state of guild.voice_states) if (state.channel_id) states.set(state.user_id, {
+				...state,
+				guild_id: guild.id
+			});
+			this.statesByGuild.set(guild.id, states);
+			return;
+		}
+		if (payload.t === GatewayDispatchEvents.VoiceStateUpdate) {
+			const state = payload.d;
+			const guildId = state.guild_id?.trim();
+			if (!guildId) return;
+			const states = this.statesByGuild.get(guildId) ?? /* @__PURE__ */ new Map();
+			const previous = states.get(state.user_id);
+			const current = {
+				...state,
+				guild_id: guildId
+			};
+			this.transitionsByState.set(state, {
+				current,
+				...previous ? { previous: { ...previous } } : {}
+			});
+			if (state.channel_id) states.set(state.user_id, current);
+			else states.delete(state.user_id);
+			this.statesByGuild.set(guildId, states);
+			return;
+		}
+		if (payload.t === GatewayDispatchEvents.GuildDelete) {
+			const guild = payload.d;
+			this.statesByGuild.delete(guild.id);
+		}
+	}
+};
+//#endregion
 //#region extensions/discord/src/internal/gateway.ts
 const GatewayIntents = GatewayIntentBits;
 const READY_STATE_OPEN = 1;
@@ -5045,20 +5439,6 @@ const DISCORD_GATEWAY_WS_CLIENT_OPTIONS = Object.freeze({ maxPayload: 16 * 1024
 const INVALID_SESSION_MIN_DELAY_MS = 1e3;
 const INVALID_SESSION_JITTER_MS = 4e3;
 const RESUME_FAILURE_THRESHOLD = 3;
-function ensureGatewayParams(url) {
-	const parsed = new URL(url);
-	parsed.searchParams.set("v", parsed.searchParams.get("v") ?? "10");
-	parsed.searchParams.set("encoding", parsed.searchParams.get("encoding") ?? "json");
-	return parsed.toString();
-}
-function decodeGatewayMessage(incoming) {
-	const text = Buffer.isBuffer(incoming) ? incoming.toString("utf8") : incoming instanceof ArrayBuffer ? Buffer.from(incoming).toString("utf8") : Array.isArray(incoming) ? Buffer.concat(incoming.map((entry) => Buffer.from(entry))).toString("utf8") : String(incoming);
-	try {
-		return JSON.parse(text);
-	} catch {
-		return null;
-	}
-}
 var GatewayPlugin = class extends Plugin {
 	constructor(options, gatewayInfo) {
 		super();
@@ -5076,6 +5456,7 @@ var GatewayPlugin = class extends Plugin {
 		this.isConnecting = false;
 		this.heartbeatTimers = new GatewayHeartbeatTimers();
 		this.reconnectTimer = new GatewayReconnectTimer();
+		this.voiceStateCache = new DiscordGatewayVoiceStateCache();
 		this.outboundLimiter = new GatewaySendLimiter((payload) => this.sendSerializedGatewayEvent(payload), (error) => this.emitter.emit("error", error));
 		this.options = {
 			...options,
@@ -5091,6 +5472,12 @@ var GatewayPlugin = class extends Plugin {
 	get ping() {
 		return null;
 	}
+	listVoiceChannelStates(guildId, channelId) {
+		return this.voiceStateCache.listVoiceChannelStates(guildId, channelId);
+	}
+	takeVoiceStateTransition(state) {
+		return this.voiceStateCache.takeTransition(state);
+	}
 	get heartbeatInterval() {
 		return this.heartbeatTimers.heartbeatInterval;
 	}
@@ -5138,6 +5525,7 @@ var GatewayPlugin = class extends Plugin {
 		this.isConnected = false;
 		this.reconnectAttempts = 0;
 		this.consecutiveResumeFailures = 0;
+		this.voiceStateCache.clear();
 	}
 	createWebSocket(url) {
 		return new ws.WebSocket(url, DISCORD_GATEWAY_WS_CLIENT_OPTIONS);
@@ -5316,6 +5704,7 @@ var GatewayPlugin = class extends Plugin {
 			this.consecutiveResumeFailures = 0;
 			this.isConnected = true;
 		}
+		this.voiceStateCache.apply(payload);
 		dispatchVoiceGatewayEvent(this.client, payload.t, payload.d);
 		const data = mapGatewayDispatchData(this.client, payload.t, payload.d);
 		await this.client.dispatchGatewayEvent(payload.t, data);
@@ -5326,6 +5715,7 @@ var GatewayPlugin = class extends Plugin {
 		this.resumeGatewayUrl = null;
 		this.sequence = null;
 		this.consecutiveResumeFailures = 0;
+		this.voiceStateCache.clear();
 	}
 	getResumeState() {
 		return this.sessionId && this.sequence !== null ? {
@@ -5917,7 +6307,7 @@ function formatDiscordGatewayCloseReason(reason) {
 	const text = reason.toString("utf8").replaceAll(/\s+/g, " ").trim();
 	if (!text) return `<${reason.length} bytes>`;
 	if (text.length <= DISCORD_GATEWAY_CLOSE_REASON_LOG_MAX_CHARS) return text;
-	return `${text.slice(0, DISCORD_GATEWAY_CLOSE_REASON_LOG_MAX_CHARS)}...`;
+	return `${truncateUtf16Safe(text, DISCORD_GATEWAY_CLOSE_REASON_LOG_MAX_CHARS)}...`;
 }
 function formatDiscordGatewayTransportErrorLog(params) {
 	return `discord: gateway websocket error ${[
@@ -6131,6 +6521,26 @@ var DiscordGatewayLifecycleError = class extends Error {
 function getDiscordGatewayEmitter(gateway) {
 	return gateway?.emitter;
 }
+const discordGatewayLog = createSubsystemLogger("discord/gateway");
+const discordGatewayLateErrorGuards = /* @__PURE__ */ new WeakMap();
+function removeDiscordGatewayLateErrorGuard(emitter) {
+	const guard = discordGatewayLateErrorGuards.get(emitter);
+	if (!guard) return;
+	emitter.off("error", guard);
+	discordGatewayLateErrorGuards.delete(emitter);
+}
+function ensureDiscordGatewayLateErrorGuard(emitter) {
+	if (emitter.listenerCount("error") > 0) return;
+	const seenMessages = /* @__PURE__ */ new Set();
+	const guard = (err) => {
+		const message = formatDiscordGatewayErrorMessage(err);
+		if (seenMessages.has(message)) return;
+		seenMessages.add(message);
+		discordGatewayLog.error(`suppressed late gateway error after dispose: ${message}`);
+	};
+	discordGatewayLateErrorGuards.set(emitter, guard);
+	emitter.on("error", guard);
+}
 function readFirstStackFrame(err) {
 	const stack = err.stack;
 	if (!stack) return;
@@ -6212,6 +6622,7 @@ function createDiscordGatewaySupervisor(params) {
 			case "buffering": pending.push(event);
 		}
 	};
+	removeDiscordGatewayLateErrorGuard(emitter);
 	emitter.on("error", onGatewayError);
 	return {
 		emitter,
@@ -6232,6 +6643,8 @@ function createDiscordGatewaySupervisor(params) {
 		},
 		dispose: () => {
 			if (phase === "disposed") return;
+			emitter.off("error", onGatewayError);
+			ensureDiscordGatewayLateErrorGuard(emitter);
 			lifecycleHandler = void 0;
 			phase = "disposed";
 			pending.length = 0;
@@ -6344,11 +6757,12 @@ function formatDiscordChannelUnresolved(entry) {
 function formatDiscordUserResolved(entry) {
 	const displayName = entry.name?.trim();
 	const target = displayName || entry.id;
-	return formatResolutionLogDetails(formatResolvedBase(entry.input, target), [
-		displayName && entry.id ? `id:${entry.id}` : void 0,
+	const formatted = formatResolutionLogDetails(formatResolvedBase(entry.input, target), [
+		displayName && entry.id && entry.id !== entry.input ? `id:${entry.id}` : void 0,
 		entry.guildName ? `guild:${entry.guildName}` : void 0,
 		entry.note
 	]);
+	return formatted === entry.input ? null : formatted;
 }
 function formatDiscordUserUnresolved(entry) {
 	return formatResolutionLogDetails(entry.input, [
@@ -6634,9 +7048,9 @@ async function resolveDiscordProviderCommandSpecs(params) {
 			cfg: params.cfg,
 			getPluginCommandSpecs: params.getPluginCommandSpecs
 		});
-		params.runtime.log?.(warn(`discord: ${initialCommandCount} commands exceeds limit; removing per-skill commands and keeping /skill.`));
+		params.runtime.log?.(warn(`${initialCommandCount} commands exceed the ${maxDiscordCommands}-command Discord limit; removing per-skill commands and keeping /skill.`));
 	}
-	if (params.nativeEnabled && commandSpecs.length > maxDiscordCommands) params.runtime.log?.(warn(`discord: ${commandSpecs.length} commands exceeds limit; some commands may fail to deploy.`));
+	if (params.nativeEnabled && commandSpecs.length > maxDiscordCommands) params.runtime.log?.(warn(`${commandSpecs.length} commands exceed the ${maxDiscordCommands}-command Discord limit; some commands may fail to deploy.`));
 	return {
 		skillCommands,
 		commandSpecs
@@ -6714,9 +7128,6 @@ function readFiniteNumber(value) {
 function readNonNegativeInteger(value) {
 	return parseStrictNonNegativeInteger(value);
 }
-function formatDurationMs(ms) {
-	return formatDurationSeconds(ms, { decimals: ms >= 1e3 ? 1 : 0 });
-}
 function isAbortLikeError(err) {
 	if (!err || typeof err !== "object") return false;
 	const name = "name" in err && typeof err.name === "string" ? err.name : void 0;
@@ -6739,8 +7150,8 @@ function formatDiscordDeployErrorMessage(err) {
 	const operation = formatDiscordDeployRestOperation(deployErr);
 	if (!(requestMs !== void 0 || timeoutMs !== void 0 || deployErr.deployRestMethod !== void 0 || deployErr.deployRestPath !== void 0)) return "Discord REST request was aborted";
 	const timing = [];
-	if (timeoutMs !== void 0) timing.push(`timeout=${formatDurationMs(timeoutMs)}`);
-	if (requestMs !== void 0) timing.push(`observed=${formatDurationMs(requestMs)}`);
+	if (timeoutMs !== void 0) timing.push(`timeout=${formatDurationSeconds(timeoutMs, { decimals: timeoutMs >= 1e3 ? 1 : 0 })}`);
+	if (requestMs !== void 0) timing.push(`observed=${formatDurationSeconds(requestMs, { decimals: requestMs >= 1e3 ? 1 : 0 })}`);
 	const timingText = timing.length > 0 ? ` (${timing.join(", ")})` : "";
 	if (timeoutMs !== void 0 && requestMs !== void 0 && requestMs >= timeoutMs) return `Discord REST ${operation} timed out${timingText}`;
 	return `Discord REST ${operation} was aborted${timingText}`;
@@ -6774,7 +7185,7 @@ function formatDiscordDeployRateLimitDetails(err) {
 function formatDiscordDeployRateLimitWarning(err, accountId) {
 	const rateLimit = resolveDiscordDeployRateLimitDetails(err);
 	if (!rateLimit) return;
-	const parts = [`discord: native slash command deploy rate limited for ${accountId}`];
+	const parts = [`[${accountId}] slash command deploy rate limited`];
 	if (typeof rateLimit.retryAfterMs === "number") parts.push(`retry after ${formatDurationSeconds(rateLimit.retryAfterMs, { decimals: 1 })}`);
 	if (rateLimit.scope) parts.push(`scope=${rateLimit.scope}`);
 	if (typeof rateLimit.discordCode === "number" || typeof rateLimit.discordCode === "string") parts.push(`code=${rateLimit.discordCode}`);
@@ -6797,6 +7208,11 @@ function formatDiscordRejectedDeployEntries(params) {
 		return [parts.join(" ")];
 	});
 }
+function isRedundantDiscordDeployBody(rawBody) {
+	if (!rawBody || typeof rawBody !== "object" || Array.isArray(rawBody)) return false;
+	const keys = Object.keys(rawBody);
+	return keys.length > 0 && keys.every((key) => key === "message" || key === "code");
+}
 function formatDiscordDeployErrorDetails(err) {
 	if (!err || typeof err !== "object") return "";
 	const rateLimitDetails = formatDiscordDeployRateLimitDetails(err);
@@ -6808,7 +7224,7 @@ function formatDiscordDeployErrorDetails(err) {
 	const details = [];
 	if (typeof status === "number") details.push(`status=${status}`);
 	if (typeof discordCode === "number" || typeof discordCode === "string") details.push(`code=${discordCode}`);
-	if (rawBody !== void 0) {
+	if (rawBody !== void 0 && !isRedundantDiscordDeployBody(rawBody)) {
 		let bodyText;
 		try {
 			bodyText = JSON.stringify(rawBody);
@@ -6820,7 +7236,7 @@ function formatDiscordDeployErrorDetails(err) {
 		}
 		if (bodyText) {
 			const maxLen = 800;
-			const trimmed = bodyText.length > maxLen ? `${bodyText.slice(0, maxLen)}...` : bodyText;
+			const trimmed = bodyText.length > maxLen ? `${truncateUtf16Safe(bodyText, maxLen)}...` : bodyText;
 			details.push(`body=${trimmed}`);
 		}
 	}
@@ -6856,8 +7272,12 @@ function logDiscordStartupPhase$1(params) {
 function readDeployRequestBody(data) {
 	return data && typeof data === "object" && "body" in data ? data.body : void 0;
 }
+function isDeployCommandsPath(path) {
+	return path.startsWith("/applications/") && path.includes("/commands");
+}
 function wrapDeployRestMethod(params) {
 	return async (path, data, query) => {
+		if (!isDeployCommandsPath(path)) return params.original[params.method](path, data, query);
 		const startedAt = Date.now();
 		const body = readDeployRequestBody(data);
 		const commandCount = Array.isArray(body) ? body.length : void 0;
@@ -6879,7 +7299,7 @@ function wrapDeployRestMethod(params) {
 			const rateLimitDetails = formatDiscordDeployRateLimitDetails(err);
 			if (rateLimitDetails) {
 				if (params.shouldLogVerbose()) params.runtime.log?.(warn(`discord startup [${params.accountId}] native-slash-command-deploy-rest:${params.method}:rate-limited ${Math.max(0, Date.now() - params.startupStartedAt)}ms path=${path} requestMs=${requestMs}${rateLimitDetails}`));
-			} else {
+			} else if (params.shouldLogVerbose()) {
 				const details = formatDiscordDeployErrorDetails(err);
 				params.runtime.error?.(`discord startup [${params.accountId}] native-slash-command-deploy-rest:${params.method}:error ${Math.max(0, Date.now() - params.startupStartedAt)}ms path=${path} requestMs=${requestMs} error=${formatDiscordDeployErrorMessage(err)}${details}`);
 			}
@@ -6931,7 +7351,7 @@ async function deployDiscordCommands(params) {
 			await params.client.deployCommands({ mode: "reconcile" });
 		} catch (err) {
 			if (isDiscordDeployDailyCreateLimit(err)) {
-				params.runtime.log?.(warn(`discord: native slash command deploy skipped for ${accountId}; daily application command create limit reached. Existing slash commands stay active until Discord resets the quota. Message send/receive is unaffected.`));
+				params.runtime.log?.(warn(`[${accountId}] slash command deploy skipped: daily application command create limit reached. Existing slash commands stay active until Discord resets the quota; message send/receive is unaffected.`));
 				return;
 			}
 			const rateLimitWarning = formatDiscordDeployRateLimitWarning(err, accountId);
@@ -6942,7 +7362,7 @@ async function deployDiscordCommands(params) {
 			throw err;
 		}
 	} catch (err) {
-		params.runtime.log?.(warn(`discord: native slash command deploy warning (not message send): ${formatDiscordDeployErrorMessage(err)}${formatDiscordDeployErrorDetails(err)}`));
+		params.runtime.log?.(warn(`[${accountId}] slash command deploy failed (message send/receive unaffected): ${formatDiscordDeployErrorMessage(err)}${formatDiscordDeployErrorDetails(err)}`));
 	} finally {
 		restoreDeployRestLogging();
 	}
@@ -6967,7 +7387,7 @@ function runDiscordCommandDeployInBackground(params) {
 			isVerbose: params.isVerbose
 		});
 	}).catch((err) => {
-		params.runtime.log?.(warn(`discord: native slash command deploy background warning (not message send): ${formatErrorMessage$1(err)}`));
+		params.runtime.log?.(warn(`[${params.accountId}] slash command deploy failed in background (message send/receive unaffected): ${formatErrorMessage$1(err)}`));
 	});
 }
 //#endregion
@@ -7031,8 +7451,8 @@ async function authorizeDiscordVoiceIngress(params) {
 	return resolveCommandAuthorizedFromAuthorizers({
 		useAccessGroups,
 		authorizers: useAccessGroups ? [{
-			configured: ownerAllowList != null,
-			allowed: ownerAllowed
+			configured: params.ownerAllowAll === true || ownerAllowList != null,
+			allowed: params.ownerAllowAll === true || ownerAllowed
 		}, {
 			configured: hasAccessRestrictions,
 			allowed: memberAllowed
@@ -7050,6 +7470,22 @@ async function authorizeDiscordVoiceIngress(params) {
 	};
 }
 //#endregion
+//#region extensions/discord/src/voice/owner-access.ts
+function resolveDiscordVoiceOwnerAccess(params) {
+	const commandOwnerAllowFrom = resolveDiscordCommandOwnerAllowFrom(params.cfg);
+	if (commandOwnerAllowFrom) return {
+		ownerAllowFrom: commandOwnerAllowFrom,
+		ownerAllowAll: commandOwnerAllowFrom.includes("*")
+	};
+	return {
+		ownerAllowFrom: resolveDiscordAccountAllowFrom({
+			cfg: params.cfg,
+			accountId: params.accountId
+		}) ?? params.discordConfig.allowFrom ?? params.discordConfig.dm?.allowFrom ?? [],
+		ownerAllowAll: false
+	};
+}
+//#endregion
 //#region extensions/discord/src/voice/command.ts
 const VOICE_CHANNEL_TYPES = [ChannelType.GuildVoice, ChannelType.GuildStageVoice];
 async function authorizeVoiceCommand(interaction, params, options) {
@@ -7076,6 +7512,7 @@ async function authorizeVoiceCommand(interaction, params, options) {
 		author: user,
 		member: interaction.rawData.member
 	});
+	const ownerAccess = resolveDiscordVoiceOwnerAccess(params);
 	const access = await authorizeDiscordVoiceIngress({
 		cfg: params.cfg,
 		discordConfig: params.discordConfig,
@@ -7093,10 +7530,8 @@ async function authorizeVoiceCommand(interaction, params, options) {
 		scope: channelContext.isThreadChannel ? "thread" : "channel",
 		channelLabel: channelId ? formatMention({ channelId }) : "This channel",
 		memberRoleIds,
-		ownerAllowFrom: resolveDiscordAccountAllowFrom({
-			cfg: params.cfg,
-			accountId: params.accountId
-		}),
+		ownerAllowFrom: ownerAccess.ownerAllowFrom,
+		ownerAllowAll: ownerAccess.ownerAllowAll,
 		sender: {
 			id: sender.id,
 			name: sender.name,
@@ -7741,16 +8176,7 @@ function mapOptionLabels(options, values) {
 }
 function parseAgentComponentData(data) {
 	const raw = readParsedComponentId(data);
-	const decodeSafe = (value) => {
-		if (!value.includes("%")) return value;
-		if (!/%[0-9A-Fa-f]{2}/.test(value)) return value;
-		try {
-			return decodeURIComponent(value);
-		} catch {
-			return value;
-		}
-	};
-	const componentId = typeof raw === "string" ? decodeSafe(raw) : typeof raw === "number" ? String(raw) : null;
+	const componentId = typeof raw === "string" ? decodeCustomIdComponent(raw) : typeof raw === "number" ? String(raw) : null;
 	if (!componentId) return null;
 	return { componentId };
 }
@@ -7933,6 +8359,10 @@ function sanitizeDiscordFrontChannelReplyPayloads(payloads, options = {}) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/reply-delivery.ts
+function formatDiscordReplyDeliveryFailure(params) {
+	const context = [`target=${params.target}`, params.sessionKey ? `session=${params.sessionKey}` : void 0].filter(Boolean).join(" ");
+	return `discord ${params.kind} reply failed (${context}): ${String(params.err)}`;
+}
 function resolveTargetChannelId(target) {
 	if (!target.startsWith("channel:")) return;
 	return target.slice(8).trim() || void 0;
@@ -8037,7 +8467,7 @@ async function deliverDiscordReply(params) {
 //#endregion
 //#region extensions/discord/src/monitor/agent-components.dispatch.ts
 const loadConversationRuntime$1 = createLazyRuntimeModule(() => import("./agent-components.runtime-CEPrf2SY.js"));
-const loadTypingRuntime = createLazyRuntimeModule(() => import("./typing-BVcJgILg.js").then((n) => n.n));
+const loadTypingRuntime = createLazyRuntimeModule(() => import("./typing-BnYT7Szq.js").then((n) => n.n));
 function buildDiscordComponentConversationLabel(params) {
 	if (params.interactionCtx.isDirectMessage) return buildDirectLabel(params.interactionCtx.user);
 	if (params.interactionCtx.isGroupDm) return `Group DM #${params.channelCtx.channelName ?? params.interactionCtx.channelId} channel id:${params.interactionCtx.channelId}`;
@@ -8450,7 +8880,7 @@ async function dispatchPluginDiscordInteractiveEvent(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/agent-components.handlers.ts
-const loadComponentsRuntime = createLazyRuntimeModule(() => import("./components-BIBizbtZ.js").then((n) => n.t));
+const loadComponentsRuntime = createLazyRuntimeModule(() => import("./components-BVrfRS-F.js").then((n) => n.t));
 async function handleDiscordComponentEvent(params) {
 	const parsed = parseDiscordComponentData(params.data, resolveInteractionCustomId(params.interaction));
 	if (!parsed) {
@@ -9017,24 +9447,26 @@ function createDiscordComponentModal(ctx) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/exec-approvals.ts
-function decodeCustomIdValue(value) {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
-}
-function parseExecApprovalData(data) {
-	if (!data || typeof data !== "object") return null;
-	const coerce = (value) => typeof value === "string" || typeof value === "number" ? String(value) : "";
-	const rawId = coerce(data.id);
-	const rawAction = coerce(data.action);
-	if (!rawId || !rawAction) return null;
-	const action = rawAction;
-	if (action !== "allow-once" && action !== "allow-always" && action !== "deny") return null;
+function resolveTerminalLabel(approval) {
+	if (approval.status === "allowed") return approval.decision === "allow-always" ? "Allowed always" : "Allowed once";
+	if (approval.status === "denied") return "Denied";
+	return approval.status === "expired" ? "Expired" : "Cancelled";
+}
+function buildTerminalPayload(params) {
+	const { approval } = params;
+	const label = resolveTerminalLabel(approval);
+	const accentColor = approval.status === "denied" ? "#ED4245" : approval.status === "allowed" ? "#57F287" : "#99AAB5";
 	return {
-		approvalId: decodeCustomIdValue(rawId),
-		action
+		allowed_mentions: DISCORD_APPROVAL_ALLOWED_MENTIONS,
+		components: [new Container([
+			new TextDisplay(params.applied ? "## Approval resolved" : "## Approval already resolved"),
+			new TextDisplay(`Canonical result: **${label}**`),
+			new Separator({
+				divider: false,
+				spacing: "small"
+			}),
+			new TextDisplay(`-# ID: ${formatDiscordApprovalDisplayValue(approval.id)}`)
+		], { accentColor })]
 	};
 }
 function isStructuredApprovalNotFoundError(err) {
@@ -9067,7 +9499,7 @@ var ExecApprovalButton = class extends Button {
 		if (!approvers.some((id) => id === userId)) {
 			try {
 				await interaction.reply({
-					content: "⛔ You are not authorized to approve exec requests.",
+					content: "⛔ You are not authorized to approve requests.",
 					ephemeral: true
 				});
 			} catch {}
@@ -9077,10 +9509,28 @@ var ExecApprovalButton = class extends Button {
 		try {
 			await interaction.acknowledge();
 		} catch {}
-		const result = await this.ctx.resolveApproval(parsed.approvalId, parsed.action);
-		if (!result.ok) try {
+		const result = await this.ctx.resolveApproval(parsed.approvalId, parsed.approvalKind, parsed.action);
+		if (!result.ok) {
+			try {
+				await interaction.followUp({
+					content: result.reason === "not-found" ? `That approval request is no longer pending. It may have expired or already been resolved.` : `Failed to submit approval decision for **${decisionLabel}**. The request may have expired or already been resolved.`,
+					ephemeral: true
+				});
+			} catch {}
+			return;
+		}
+		const terminalLabel = resolveTerminalLabel(result.resolution.approval);
+		let terminalized = false;
+		try {
+			await interaction.editReply(buildTerminalPayload({
+				approval: result.resolution.approval,
+				applied: result.resolution.applied
+			}));
+			terminalized = true;
+		} catch {}
+		if (!terminalized || !result.resolution.applied) try {
 			await interaction.followUp({
-				content: result.reason === "not-found" ? `That approval request is no longer pending. It may have expired or already been resolved.` : `Failed to submit approval decision for **${decisionLabel}**. The request may have expired or already been resolved.`,
+				content: result.resolution.applied ? `Approval resolved: ${terminalLabel}.` : `This approval was already resolved: ${terminalLabel}.`,
 				ephemeral: true
 			});
 		} catch {}
@@ -9096,16 +9546,19 @@ function createDiscordExecApprovalButtonContext(params) {
 			accountId: params.accountId,
 			configOverride: params.config
 		}),
-		resolveApproval: async (approvalId, decision) => {
+		resolveApproval: async (approvalId, approvalKind, decision) => {
 			try {
-				await resolveApprovalOverGateway({
-					cfg: params.cfg,
-					approvalId,
-					decision,
-					gatewayUrl: params.gatewayUrl,
-					clientDisplayName: `Discord approval (${params.accountId})`
-				});
-				return { ok: true };
+				return {
+					ok: true,
+					resolution: await resolveApprovalOverGateway({
+						cfg: params.cfg,
+						approvalId,
+						approvalKind,
+						decision,
+						gatewayUrl: params.gatewayUrl,
+						clientDisplayName: `Discord approval (${params.accountId})`
+					})
+				};
 			} catch (err) {
 				return {
 					ok: false,
@@ -9143,6 +9596,11 @@ function createDiscordProviderInteractionSurface(params) {
 		accountId: params.accountId,
 		configOverride: execApprovalsConfig
 	});
+	const approvalActionsEnabled = getDiscordExecApprovalApprovers({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		configOverride: execApprovalsConfig
+	}).length > 0;
 	if (execApprovalsEnabled) registerChannelRuntimeContext({
 		channelRuntime: params.channelRuntime,
 		channelId: "discord",
@@ -9178,7 +9636,7 @@ function createDiscordProviderInteractionSurface(params) {
 		})
 	];
 	const modals = [];
-	if (execApprovalsEnabled) components.push(createExecApprovalButton(createDiscordExecApprovalButtonContext({
+	if (approvalActionsEnabled) components.push(createExecApprovalButton(createDiscordExecApprovalButtonContext({
 		cfg: params.cfg,
 		accountId: params.accountId,
 		config: execApprovalsConfig
@@ -9668,7 +10126,7 @@ async function runDiscordGatewayLifecycle(params) {
 		gatewayEmitter?.removeListener(DISCORD_GATEWAY_TRANSPORT_ACTIVITY_EVENT, onGatewayTransportActivity);
 		if (params.voiceManager) {
 			await params.voiceManager.destroy();
-			const { setDiscordTranscriptsVoiceManager } = await import("./transcripts-source-BvvM5Ns9.js").then((n) => n.n);
+			const { setDiscordTranscriptsVoiceManager } = await import("./transcripts-source-CLZ5X8fh.js").then((n) => n.n);
 			setDiscordTranscriptsVoiceManager({
 				accountId: params.accountId,
 				manager: null
@@ -9863,10 +10321,17 @@ function registerDiscordMonitorListeners(params) {
 	}
 	registerDiscordListener(params.client.listeners, new DiscordThreadUpdateListener(params.cfg, params.accountId, params.logger));
 	if (params.discordConfig.intents?.presence) {
-		registerDiscordListener(params.client.listeners, new DiscordPresenceListener({
+		const presenceListener = new DiscordPresenceListener({
+			cfg: params.cfg,
 			logger: params.logger,
-			accountId: params.accountId
-		}));
+			accountId: params.accountId,
+			botUserId: params.botUserId,
+			guildEntries: params.guildEntries
+		});
+		registerDiscordListener(params.client.listeners, presenceListener);
+		registerDiscordListener(params.client.listeners, new DiscordPresenceGuildCreateListener(presenceListener));
+		registerDiscordListener(params.client.listeners, new DiscordPresenceGuildDeleteListener(presenceListener));
+		registerDiscordListener(params.client.listeners, new DiscordPresenceReadyListener(presenceListener));
 		params.runtime.log?.("discord: GuildPresences intent enabled — presence listener registered");
 	}
 }
@@ -9900,7 +10365,7 @@ function createEnvProxyDiscordRestDispatcher(runtime) {
 	}
 }
 function createDiscordRestFetchWithDispatcher(dispatcher) {
-	return wrapFetchWithAbortSignal(((input, init) => fetch$1(input, {
+	return wrapFetchWithAbortSignal(((input, init) => fetchWithRuntimeDispatcher(input, {
 		...init,
 		dispatcher
 	}).then((response) => {
@@ -9946,7 +10411,7 @@ function logDiscordStartupPhase(params) {
 	});
 }
 async function loadDiscordVoiceRuntime() {
-	const promise = discordVoiceRuntimePromise ?? import("./manager.runtime-DaB-CTrt.js");
+	const promise = discordVoiceRuntimePromise ?? import("./manager.runtime-3RVMVkyx.js");
 	discordVoiceRuntimePromise = promise;
 	try {
 		return await promise;
@@ -9956,7 +10421,7 @@ async function loadDiscordVoiceRuntime() {
 	}
 }
 async function loadDiscordProviderSessionRuntime() {
-	const promise = discordProviderSessionRuntimePromise ?? import("./provider-session.runtime-BDjyFw6Y.js");
+	const promise = discordProviderSessionRuntimePromise ?? import("./provider-session.runtime-D5pCGibh.js");
 	discordProviderSessionRuntimePromise = promise;
 	try {
 		return await promise;
@@ -10218,7 +10683,7 @@ async function monitorDiscordProvider(opts = {}) {
 		});
 		let voiceManager = null;
 		if (voiceEnabled) {
-			const { DiscordVoiceManager, DiscordVoiceReadyListener, DiscordVoiceResumedListener, DiscordVoiceStateUpdateListener } = await loadDiscordVoiceRuntime();
+			const { DiscordVoiceGuildCreateListener, DiscordVoiceManager, DiscordVoiceReadyListener, DiscordVoiceResumedListener, DiscordVoiceStateUpdateListener } = await loadDiscordVoiceRuntime();
 			voiceManager = new DiscordVoiceManager({
 				client,
 				cfg,
@@ -10227,12 +10692,13 @@ async function monitorDiscordProvider(opts = {}) {
 				runtime,
 				botUserId
 			});
-			const { setDiscordTranscriptsVoiceManager } = await import("./transcripts-source-BvvM5Ns9.js").then((n) => n.n);
+			const { setDiscordTranscriptsVoiceManager } = await import("./transcripts-source-CLZ5X8fh.js").then((n) => n.n);
 			setDiscordTranscriptsVoiceManager({
 				accountId: account.accountId,
 				manager: voiceManager
 			});
 			voiceManagerRef.current = voiceManager;
+			registerDiscordListener(client.listeners, new DiscordVoiceGuildCreateListener(voiceManager));
 			registerDiscordListener(client.listeners, new DiscordVoiceReadyListener(voiceManager));
 			registerDiscordListener(client.listeners, new DiscordVoiceResumedListener(voiceManager));
 			registerDiscordListener(client.listeners, new DiscordVoiceStateUpdateListener(voiceManager));
@@ -10332,4 +10798,4 @@ async function monitorDiscordProvider(opts = {}) {
 	}
 }
 //#endregion
-export { resolveDiscordAutoThreadReplyPlan as C, resolveDiscordDmCommandAccess as D, sanitizeDiscordThreadName as E, resolveDiscordTextCommandAccess as O, threading_exports as S, resolveDiscordThreadStarter as T, resolveDiscordConversationRoute as _, buildGuildLabel as a, handleDiscordDmCommandDecision as b, createDiscordGatewayPlugin as c, resolveDiscordVoiceEnabled as d, createDiscordNativeCommand as f, buildDiscordRoutePeer as g, createDiscordSupplementalContextAccessChecker as h, buildDirectLabel as i, resolveDiscordGatewayIntents as l, buildDiscordInboundAccessContext as m, deliverDiscordReply as n, resolveReplyContext as o, buildDiscordGroupSystemPrompt as p, sanitizeDiscordFrontChannelReplyPayloads as r, authorizeDiscordVoiceIngress as s, monitorDiscordProvider as t, waitForDiscordGatewayPluginRegistration as u, resolveDiscordEffectiveRoute as v, resolveDiscordReplyTarget as w, registerDiscordListener as x, shouldIgnoreStaleDiscordRouteBinding as y };
+export { resolveDiscordTextCommandAccess as A, registerDiscordListener as C, resolveDiscordThreadStarter as D, resolveDiscordReplyTarget as E, sanitizeDiscordThreadName as O, handleDiscordDmCommandDecision as S, resolveDiscordAutoThreadReplyPlan as T, createDiscordSupplementalContextAccessChecker as _, buildDirectLabel as a, resolveDiscordEffectiveRoute as b, resolveDiscordVoiceOwnerAccess as c, resolveDiscordGatewayIntents as d, waitForDiscordGatewayPluginRegistration as f, buildDiscordInboundAccessContext as g, buildDiscordGroupSystemPrompt as h, sanitizeDiscordFrontChannelReplyPayloads as i, resolveDiscordDmCommandAccess as k, authorizeDiscordVoiceIngress as l, createDiscordNativeCommand as m, deliverDiscordReply as n, buildGuildLabel as o, resolveDiscordVoiceEnabled as p, formatDiscordReplyDeliveryFailure as r, resolveReplyContext as s, monitorDiscordProvider as t, createDiscordGatewayPlugin as u, buildDiscordRoutePeer as v, threading_exports as w, shouldIgnoreStaleDiscordRouteBinding as x, resolveDiscordConversationRoute as y };