@openclaw/matrix 2026.8.1-beta.3 → 2026.8.2

package/dist/{tool-actions.runtime-ck6IJyP0.js → tool-actions.runtime-CFZZPG5g.js}

@@ -1,21 +1,24 @@
-import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-BZWN9tGS.js";
-import { i as resolveMatrixAccount } from "./accounts-BCzyubQt.js";
-import { l as resolveMatrixRoomConfig } from "./channel-CzQw5OZN.js";
+import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-CRsKoMqJ.js";
+import { i as resolveMatrixAccount } from "./accounts-DR1c4xF_.js";
+import { l as resolveMatrixRoomConfig } from "./channel-D6-ajB_u.js";
 import { i as normalizeMatrixResolvableTarget } from "./target-ids-Nwx7cMVE.js";
 import { i as buildMatrixReactionRelationsPath, o as selectOwnMatrixReactionEventIds, s as summarizeMatrixReactionEvents } from "./reaction-common-DkrQdBSZ.js";
-import { g as parsePollStart, h as isPollStartType, n as reactMatrixMessage, u as buildPollResponseContent, x as resolveMatrixRoomId } from "./send-ClHgDZLT.js";
+import { b as resolveMatrixRoomId, h as parsePollStart, l as buildPollResponseContent, m as isPollStartType, n as reactMatrixMessage } from "./send-DfS5ciUL.js";
 import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
-import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-D8XghqmX.js";
-import { a as fetchEventSummary, c as resolveMatrixActionLimit, i as sendMatrixMessage, n as editMatrixMessage, o as readPinnedEvents, r as readMatrixMessages, s as EventType, t as deleteMatrixMessage } from "./messages-DEqg7HVy.js";
-import { c as readReactionParams, d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, i as createActionGate, l as readStringArrayParam, n as ToolAuthorizationError, o as jsonResult, s as readPositiveIntegerParam, u as readStringParam } from "./runtime-api-BGO16Fu8.js";
-import { t as applyMatrixProfileUpdate } from "./profile-update-BQlE5s2J.js";
-import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-CabtBTtB.js";
-import { t as createMatrixRoomInfoResolver } from "./room-info-BXQA7y10.js";
-import { normalizeOptionalLowercaseString, uniqueStrings, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { a as fetchEventSummary, i as sendMatrixMessage, n as editMatrixMessage, o as readPinnedEvents, p as resolveMatrixActionLimit, r as readMatrixMessages, s as EventType, t as deleteMatrixMessage } from "./messages-DlMQaC02.js";
+import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-B0yMDho1.js";
+import { r as parseMxc } from "./event-helpers-XRfAbOIh.js";
+import { t as applyMatrixProfileUpdate } from "./profile-update-CsyKA9jI.js";
+import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-CD7k5vE9.js";
+import { n as getMatrixMemberInfo, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-DIU67XLP.js";
+import { isRecord, normalizeOptionalLowercaseString, uniqueStrings, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { ToolAuthorizationError, createActionGate, jsonResult, readPositiveIntegerParam, readReactionParams, readStringArrayParam, readStringParam } from "openclaw/plugin-sdk/channel-actions";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
+import { resolveAllowlistProviderRuntimeGroupPolicy, resolveDefaultGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
 //#region extensions/matrix/src/matrix/actions/polls.ts
 function normalizeOptionIndexes(indexes) {
-	return uniqueValues(indexes.map((index) => Math.trunc(index)).filter((index) => Number.isFinite(index) && index > 0));
+	const normalized = indexes.map((index) => Math.trunc(index)).filter((index) => Number.isFinite(index) && index > 0);
+	return uniqueValues(normalized);
 }
 function normalizeOptionIds(optionIds) {
 	return uniqueStrings(optionIds.map((optionId) => optionId.trim()).filter((optionId) => optionId.length > 0));
@@ -46,7 +49,8 @@ function resolveSelectedAnswerIds(params) {
 async function voteMatrixPoll(roomId, pollId, opts = {}) {
 	return await withResolvedRoomAction(roomId, opts, async (client, resolvedRoom) => {
 		const pollEvent = await client.getEvent(resolvedRoom, pollId);
-		if (!isPollStartType(typeof pollEvent.type === "string" ? pollEvent.type : "")) throw new Error(`Event ${pollId} is not a Matrix poll start event.`);
+		const eventType = typeof pollEvent.type === "string" ? pollEvent.type : "";
+		if (!isPollStartType(eventType)) throw new Error(`Event ${pollId} is not a Matrix poll start event.`);
 		const { answerIds, labels, maxSelections } = resolveSelectedAnswerIds({
 			optionIds: [...opts.optionIds ?? [], ...opts.optionId ? [opts.optionId] : []],
 			optionIndexes: [...opts.optionIndexes ?? [], ...opts.optionIndex !== void 0 ? [opts.optionIndex] : []],
@@ -65,6 +69,32 @@ async function voteMatrixPoll(roomId, pollId, opts = {}) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/actions/reactions.ts
+async function listMatrixEmojis(roomId, opts = {}) {
+	return await withResolvedRoomAction(roomId, opts, async (client, resolvedRoom) => {
+		const [roomState, personalPack] = await Promise.all([client.doRequest("GET", `/_matrix/client/v3/rooms/${encodeURIComponent(resolvedRoom)}/state`), client.getAccountData("im.ponies.user_emotes")]);
+		if (!Array.isArray(roomState)) throw new Error("Matrix room state response is invalid.");
+		const packs = roomState.filter((event) => isRecord(event) && event.type === "im.ponies.room_emotes" && typeof event.state_key === "string").map((event) => event.content);
+		if (personalPack) packs.push(personalPack);
+		const emojis = [];
+		for (const pack of packs) {
+			if (!isRecord(pack) || !isRecord(pack.images)) continue;
+			const packUsage = isRecord(pack.pack) ? pack.pack.usage : void 0;
+			for (const [rawName, image] of Object.entries(pack.images)) {
+				const name = rawName.trim();
+				if (!name || !isRecord(image) || typeof image.url !== "string") continue;
+				const url = image.url.trim();
+				const usage = image.usage === void 0 ? packUsage : image.usage;
+				if (!parseMxc(url) || usage !== void 0 && (!Array.isArray(usage) || usage.some((value) => typeof value !== "string") || !usage.includes("emoticon"))) continue;
+				emojis.push({
+					name,
+					identifier: name,
+					url
+				});
+			}
+		}
+		return emojis.toSorted((left, right) => left.name.localeCompare(right.name) || left.url.localeCompare(right.url)).slice(0, Math.min(resolveMatrixActionLimit(opts.limit, 100), 100));
+	});
+}
 async function listMatrixReactionEvents(client, roomId, messageId, limit, opts = {}) {
 	const events = [];
 	const seenCursors = /* @__PURE__ */ new Set();
@@ -85,7 +115,8 @@ async function listMatrixReactionEvents(client, roomId, messageId, limit, opts =
 }
 async function listMatrixReactions(roomId, messageId, opts = {}) {
 	return await withResolvedRoomAction(roomId, opts, async (client, resolvedRoom) => {
-		return summarizeMatrixReactionEvents(await listMatrixReactionEvents(client, resolvedRoom, messageId, resolveMatrixActionLimit(opts.limit, 100)));
+		const chunk = await listMatrixReactionEvents(client, resolvedRoom, messageId, resolveMatrixActionLimit(opts.limit, 100));
+		return summarizeMatrixReactionEvents(chunk);
 	});
 }
 async function removeMatrixReactions(roomId, messageId, opts = {}) {
@@ -131,57 +162,6 @@ async function listMatrixPins(roomId, opts = {}) {
 	});
 }
 //#endregion
-//#region extensions/matrix/src/matrix/actions/room.ts
-async function getMatrixMemberInfo(userId, opts) {
-	return await withResolvedActionClient(opts, async (client) => {
-		const roomId = await resolveMatrixRoomId(client, opts.roomId);
-		if (!(await client.getJoinedRoomMembers(roomId)).includes(userId)) throw new Error(`User ${userId} is not a member of room ${roomId}`);
-		const profile = await client.getUserProfile(userId);
-		return {
-			userId,
-			profile: {
-				displayName: profile?.displayname ?? null,
-				avatarUrl: profile?.avatar_url ?? null
-			},
-			membership: null,
-			powerLevel: null,
-			displayName: profile?.displayname ?? null,
-			roomId
-		};
-	});
-}
-async function getMatrixRoomInfo(roomId, opts = {}) {
-	return await withResolvedRoomAction(roomId, opts, async (client, resolvedRoom) => {
-		let name = null;
-		let topic = null;
-		let canonicalAlias = null;
-		let memberCount = null;
-		try {
-			const nameState = await client.getRoomStateEvent(resolvedRoom, "m.room.name", "");
-			name = typeof nameState?.name === "string" ? nameState.name : null;
-		} catch {}
-		try {
-			const topicState = await client.getRoomStateEvent(resolvedRoom, EventType.RoomTopic, "");
-			topic = typeof topicState?.topic === "string" ? topicState.topic : null;
-		} catch {}
-		try {
-			const aliasState = await client.getRoomStateEvent(resolvedRoom, "m.room.canonical_alias", "");
-			canonicalAlias = typeof aliasState?.alias === "string" ? aliasState.alias : null;
-		} catch {}
-		try {
-			memberCount = (await client.getJoinedRoomMembers(resolvedRoom)).length;
-		} catch {}
-		return {
-			roomId: resolvedRoom,
-			name,
-			topic,
-			canonicalAlias,
-			altAliases: [],
-			memberCount
-		};
-	});
-}
-//#endregion
 //#region extensions/matrix/src/matrix/read-policy.ts
 function normalizeRoomId(raw) {
 	return raw?.trim().replace(/^room:/i, "") ?? "";
@@ -200,8 +180,9 @@ function hasWildcardEntry(entries) {
 	return (entries ?? []).some((entry) => String(entry).replace(/^matrix:/i, "").trim() === "*");
 }
 function resolveMatrixReadRoomPolicy(params) {
+	const configuredRooms = params.account.config.groups ?? params.account.config.rooms;
 	const room = resolveMatrixRoomConfig({
-		rooms: params.account.config.groups ?? params.account.config.rooms,
+		rooms: configuredRooms,
 		roomId: params.roomId,
 		aliases: params.aliases
 	});
@@ -309,7 +290,11 @@ const messageActions = /* @__PURE__ */ new Set([
 	"deleteMessage",
 	"readMessages"
 ]);
-const reactionActions = /* @__PURE__ */ new Set(["react", "reactions"]);
+const reactionActions = /* @__PURE__ */ new Set([
+	"react",
+	"reactions",
+	"emoji-list"
+]);
 const pinActions = /* @__PURE__ */ new Set([
 	"pinMessage",
 	"unpinMessage",
@@ -404,19 +389,34 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 	if (reactionActions.has(action)) {
 		if (!isActionEnabled("reactions")) throw new Error("Matrix reactions are disabled.");
 		const roomId = readRoomId(params);
+		if (action === "emoji-list") {
+			const limit = readPositiveIntegerParam(params, "limit", { message: "limit must be a positive integer." });
+			const emojis = await withReadTarget(roomId, async (target) => listMatrixEmojis(target.roomId, {
+				...clientOpts,
+				client: target.client,
+				limit
+			}));
+			return jsonResult({
+				ok: true,
+				emojis
+			});
+		}
 		const messageId = readStringParam(params, "messageId", { required: true });
 		if (action === "react") {
 			const { emoji, remove, isEmpty } = readReactionParams(params, { removeErrorMessage: "Emoji is required to remove a Matrix reaction." });
-			if (remove || isEmpty) return jsonResult({
-				ok: true,
-				removed: (await withReadTarget(roomId, async (target) => {
+			if (remove || isEmpty) {
+				const result = await withReadTarget(roomId, async (target) => {
 					return await removeMatrixReactions(target.roomId, messageId, {
 						...clientOpts,
 						client: target.client,
 						emoji: remove ? emoji : void 0
 					});
-				})).removed
-			});
+				});
+				return jsonResult({
+					ok: true,
+					removed: result.removed
+				});
+			}
 			await withReadTarget(roomId, async (target) => {
 				await reactMatrixMessage(target.roomId, messageId, emoji, {
 					...clientOpts,
@@ -429,15 +429,16 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 			});
 		}
 		const limit = readPositiveIntegerParam(params, "limit", { message: "limit must be a positive integer." });
+		const reactions = await withReadTarget(roomId, async (target) => {
+			return await listMatrixReactions(target.roomId, messageId, {
+				...clientOpts,
+				client: target.client,
+				limit: limit ?? void 0
+			});
+		});
 		return jsonResult({
 			ok: true,
-			reactions: await withReadTarget(roomId, async (target) => {
-				return await listMatrixReactions(target.roomId, messageId, {
-					...clientOpts,
-					client: target.client,
-					limit: limit ?? void 0
-				});
-			})
+			reactions
 		});
 	}
 	if (pollActions.has(action)) {
@@ -448,16 +449,17 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 		const optionIndex = readPositiveIntegerParam(params, "pollOptionIndex", { message: "pollOptionIndex must be a positive integer." });
 		const optionIds = [...readStringArrayParam(params, "pollOptionIds") ?? [], ...optionId ? [optionId] : []];
 		const optionIndexes = [...readPositiveIntegerArrayParam(params, "pollOptionIndexes"), ...optionIndex !== void 0 ? [optionIndex] : []];
+		const result = await withReadTarget(roomId, async (target) => {
+			return await voteMatrixPoll(target.roomId, pollId, {
+				...clientOpts,
+				client: target.client,
+				optionIds,
+				optionIndexes
+			});
+		});
 		return jsonResult({
 			ok: true,
-			result: await withReadTarget(roomId, async (target) => {
-				return await voteMatrixPoll(target.roomId, pollId, {
-					...clientOpts,
-					client: target.client,
-					optionIds,
-					optionIndexes
-				});
-			})
+			result
 		});
 	}
 	if (messageActions.has(action)) {
@@ -474,17 +476,18 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 				const replyToId = readStringParam(params, "replyToId") ?? readStringParam(params, "replyTo");
 				const threadId = readStringParam(params, "threadId");
 				const audioAsVoice = typeof readRawParam(params, "audioAsVoice") === "boolean" ? readRawParam(params, "audioAsVoice") : typeof readRawParam(params, "asVoice") === "boolean" ? readRawParam(params, "asVoice") : void 0;
+				const result = await sendMatrixMessage(to, content, {
+					mediaUrl: mediaUrl ?? void 0,
+					...opts.mediaAccess ? { mediaAccess: opts.mediaAccess } : {},
+					mediaLocalRoots: opts.mediaLocalRoots,
+					replyToId: replyToId ?? void 0,
+					threadId: threadId ?? void 0,
+					audioAsVoice,
+					...clientOpts
+				});
 				return jsonResult({
 					ok: true,
-					result: await sendMatrixMessage(to, content, {
-						mediaUrl: mediaUrl ?? void 0,
-						...opts.mediaAccess ? { mediaAccess: opts.mediaAccess } : {},
-						mediaLocalRoots: opts.mediaLocalRoots,
-						replyToId: replyToId ?? void 0,
-						threadId: threadId ?? void 0,
-						audioAsVoice,
-						...clientOpts
-					})
+					result
 				});
 			}
 			case "editMessage": {
@@ -494,14 +497,15 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 					required: true,
 					trim: false
 				});
+				const result = await withReadTarget(roomId, async (target) => {
+					return await editMatrixMessage(target.roomId, messageId, content, {
+						...clientOpts,
+						client: target.client
+					});
+				});
 				return jsonResult({
 					ok: true,
-					result: await withReadTarget(roomId, async (target) => {
-						return await editMatrixMessage(target.roomId, messageId, content, {
-							...clientOpts,
-							client: target.client
-						});
-					})
+					result
 				});
 			}
 			case "deleteMessage": {
@@ -526,27 +530,27 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 				const before = readStringParam(params, "before");
 				const after = readStringParam(params, "after");
 				const threadId = readStringParam(params, "threadId");
+				const result = await withReadTarget(roomId, async (target) => {
+					const messages = await readMatrixMessages(target.roomId, {
+						limit: limit ?? void 0,
+						before: before ?? void 0,
+						after: after ?? void 0,
+						threadId: threadId ?? void 0,
+						...clientOpts,
+						client: target.client
+					});
+					return {
+						...messages,
+						messages: projectMatrixMessagesForDisplay(messages.messages),
+						roomId: target.roomId,
+						...threadId ? { threadId } : {}
+					};
+				});
 				return jsonResult({
 					ok: true,
-					...await withReadTarget(roomId, async (target) => {
-						const messages = await readMatrixMessages(target.roomId, {
-							limit: limit ?? void 0,
-							before: before ?? void 0,
-							after: after ?? void 0,
-							threadId: threadId ?? void 0,
-							...clientOpts,
-							client: target.client
-						});
-						return {
-							...messages,
-							messages: projectMatrixMessagesForDisplay(messages.messages),
-							roomId: target.roomId,
-							...threadId ? { threadId } : {}
-						};
-					})
+					...result
 				});
 			}
-			default: break;
 		}
 	}
 	if (pinActions.has(action)) {
@@ -564,14 +568,20 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 				...clientOpts,
 				client: target.client
 			};
-			if (request.kind === "pin") return jsonResult({
-				ok: true,
-				pinned: (await pinMatrixMessage(target.roomId, request.messageId, actionOpts)).pinned
-			});
-			if (request.kind === "unpin") return jsonResult({
-				ok: true,
-				pinned: (await unpinMatrixMessage(target.roomId, request.messageId, actionOpts)).pinned
-			});
+			if (request.kind === "pin") {
+				const result = await pinMatrixMessage(target.roomId, request.messageId, actionOpts);
+				return jsonResult({
+					ok: true,
+					pinned: result.pinned
+				});
+			}
+			if (request.kind === "unpin") {
+				const result = await unpinMatrixMessage(target.roomId, request.messageId, actionOpts);
+				return jsonResult({
+					ok: true,
+					pinned: result.pinned
+				});
+			}
 			const result = await listMatrixPins(target.roomId, actionOpts);
 			return jsonResult({
 				ok: true,
@@ -584,64 +594,76 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 	if (profileActions.has(action)) {
 		if (!isActionEnabled("profile")) throw new Error("Matrix profile updates are disabled.");
 		const avatarPath = readStringParam(params, "avatarPath") ?? readStringParam(params, "path") ?? readStringParam(params, "filePath");
+		const result = await applyMatrixProfileUpdate({
+			cfg,
+			account: accountId,
+			displayName: readStringParam(params, "displayName") ?? readStringParam(params, "name"),
+			avatarUrl: readStringParam(params, "avatarUrl"),
+			avatarPath,
+			mediaLocalRoots: opts.mediaLocalRoots
+		});
 		return jsonResult({
 			ok: true,
-			...await applyMatrixProfileUpdate({
-				cfg,
-				account: accountId,
-				displayName: readStringParam(params, "displayName") ?? readStringParam(params, "name"),
-				avatarUrl: readStringParam(params, "avatarUrl"),
-				avatarPath,
-				mediaLocalRoots: opts.mediaLocalRoots
-			})
+			...result
 		});
 	}
 	if (action === "memberInfo") {
 		if (!isActionEnabled("memberInfo")) throw new Error("Matrix member info is disabled.");
 		const userId = readStringParam(params, "userId", { required: true });
+		const result = await withReadTarget(readRoomId(params), async (target) => {
+			return await getMatrixMemberInfo(userId, {
+				roomId: target.roomId,
+				...clientOpts,
+				client: target.client
+			});
+		});
 		return jsonResult({
 			ok: true,
-			member: await withReadTarget(readRoomId(params), async (target) => {
-				return await getMatrixMemberInfo(userId, {
-					roomId: target.roomId,
-					...clientOpts,
-					client: target.client
-				});
-			})
+			member: result
 		});
 	}
 	if (action === "channelInfo") {
 		if (!isActionEnabled("channelInfo")) throw new Error("Matrix room info is disabled.");
+		const result = await withReadTarget(readRoomId(params), async (target) => {
+			return await getMatrixRoomInfo(target.roomId, {
+				...clientOpts,
+				client: target.client
+			});
+		});
 		return jsonResult({
 			ok: true,
-			room: await withReadTarget(readRoomId(params), async (target) => {
-				return await getMatrixRoomInfo(target.roomId, {
-					...clientOpts,
-					client: target.client
-				});
-			})
+			room: result
 		});
 	}
 	if (verificationActions.has(action)) {
 		if (!isActionEnabled("verification")) throw new Error("Matrix verification actions are disabled.");
 		const requestId = readStringParam(params, "requestId") ?? readStringParam(params, "verificationId") ?? readStringParam(params, "id");
-		if (action === "encryptionStatus") return jsonResult({
-			ok: true,
-			status: await getMatrixEncryptionStatus({
-				includeRecoveryKey: params.includeRecoveryKey === true,
+		if (action === "encryptionStatus") {
+			const includeRecoveryKey = params.includeRecoveryKey === true;
+			const status = await getMatrixEncryptionStatus({
+				includeRecoveryKey,
 				...clientOpts
-			})
-		});
-		if (action === "verificationStatus") return jsonResult({
-			ok: true,
-			status: await getMatrixVerificationStatus({
-				includeRecoveryKey: params.includeRecoveryKey === true,
+			});
+			return jsonResult({
+				ok: true,
+				status
+			});
+		}
+		if (action === "verificationStatus") {
+			const includeRecoveryKey = params.includeRecoveryKey === true;
+			const status = await getMatrixVerificationStatus({
+				includeRecoveryKey,
 				...clientOpts
-			})
-		});
+			});
+			return jsonResult({
+				ok: true,
+				status
+			});
+		}
 		if (action === "verificationBootstrap") {
+			const recoveryKey = readStringParam(params, "recoveryKey", { trim: false }) ?? readStringParam(params, "key", { trim: false });
 			const result = await bootstrapMatrixVerification({
-				recoveryKey: readStringParam(params, "recoveryKey", { trim: false }) ?? readStringParam(params, "key", { trim: false }) ?? void 0,
+				recoveryKey: recoveryKey ?? void 0,
 				forceResetCrossSigning: params.forceResetCrossSigning === true,
 				...clientOpts
 			});
@@ -651,7 +673,8 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 			});
 		}
 		if (action === "verificationRecoveryKey") {
-			const result = await verifyMatrixRecoveryKey(readStringParam({ recoveryKey: readStringParam(params, "recoveryKey", { trim: false }) ?? readStringParam(params, "key", { trim: false }) }, "recoveryKey", {
+			const recoveryKey = readStringParam(params, "recoveryKey", { trim: false }) ?? readStringParam(params, "key", { trim: false });
+			const result = await verifyMatrixRecoveryKey(readStringParam({ recoveryKey }, "recoveryKey", {
 				required: true,
 				trim: false
 			}), clientOpts);
@@ -660,13 +683,17 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 				result
 			});
 		}
-		if (action === "verificationBackupStatus") return jsonResult({
-			ok: true,
-			status: await getMatrixRoomKeyBackupStatus(clientOpts)
-		});
+		if (action === "verificationBackupStatus") {
+			const status = await getMatrixRoomKeyBackupStatus(clientOpts);
+			return jsonResult({
+				ok: true,
+				status
+			});
+		}
 		if (action === "verificationBackupRestore") {
+			const recoveryKey = readStringParam(params, "recoveryKey", { trim: false }) ?? readStringParam(params, "key", { trim: false });
 			const result = await restoreMatrixRoomKeyBackup({
-				recoveryKey: readStringParam(params, "recoveryKey", { trim: false }) ?? readStringParam(params, "key", { trim: false }) ?? void 0,
+				recoveryKey: recoveryKey ?? void 0,
 				...clientOpts
 			});
 			return jsonResult({
@@ -674,79 +701,106 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 				result
 			});
 		}
-		if (action === "verificationList") return jsonResult({
-			ok: true,
-			verifications: await listMatrixVerifications(clientOpts)
-		});
+		if (action === "verificationList") {
+			const verifications = await listMatrixVerifications(clientOpts);
+			return jsonResult({
+				ok: true,
+				verifications
+			});
+		}
 		if (action === "verificationRequest") {
 			const userId = readStringParam(params, "userId");
 			const deviceId = readStringParam(params, "deviceId");
 			const roomId = readStringParam(params, "roomId") ?? readStringParam(params, "channelId");
+			const ownUser = typeof params.ownUser === "boolean" ? params.ownUser : void 0;
+			const verification = await requestMatrixVerification({
+				ownUser,
+				userId: userId ?? void 0,
+				deviceId: deviceId ?? void 0,
+				roomId: roomId ?? void 0,
+				...clientOpts
+			});
 			return jsonResult({
 				ok: true,
-				verification: await requestMatrixVerification({
-					ownUser: typeof params.ownUser === "boolean" ? params.ownUser : void 0,
-					userId: userId ?? void 0,
-					deviceId: deviceId ?? void 0,
-					roomId: roomId ?? void 0,
-					...clientOpts
-				})
+				verification
+			});
+		}
+		if (action === "verificationAccept") {
+			const verification = await acceptMatrixVerification(readStringParam({ requestId }, "requestId", { required: true }), clientOpts);
+			return jsonResult({
+				ok: true,
+				verification
 			});
 		}
-		if (action === "verificationAccept") return jsonResult({
-			ok: true,
-			verification: await acceptMatrixVerification(readStringParam({ requestId }, "requestId", { required: true }), clientOpts)
-		});
 		if (action === "verificationCancel") {
 			const reason = readStringParam(params, "reason");
 			const code = readStringParam(params, "code");
+			const verification = await cancelMatrixVerification(readStringParam({ requestId }, "requestId", { required: true }), {
+				reason: reason ?? void 0,
+				code: code ?? void 0,
+				...clientOpts
+			});
 			return jsonResult({
 				ok: true,
-				verification: await cancelMatrixVerification(readStringParam({ requestId }, "requestId", { required: true }), {
-					reason: reason ?? void 0,
-					code: code ?? void 0,
-					...clientOpts
-				})
+				verification
 			});
 		}
 		if (action === "verificationStart") {
-			const method = normalizeOptionalLowercaseString(readStringParam(params, "method"));
+			const methodRaw = readStringParam(params, "method");
+			const method = normalizeOptionalLowercaseString(methodRaw);
 			if (method && method !== "sas") throw new Error("Matrix verificationStart only supports method=sas; use verificationGenerateQr/verificationScanQr for QR flows.");
+			const verification = await startMatrixVerification(readStringParam({ requestId }, "requestId", { required: true }), {
+				method: "sas",
+				...clientOpts
+			});
 			return jsonResult({
 				ok: true,
-				verification: await startMatrixVerification(readStringParam({ requestId }, "requestId", { required: true }), {
-					method: "sas",
-					...clientOpts
-				})
+				verification
+			});
+		}
+		if (action === "verificationGenerateQr") {
+			const qr = await generateMatrixVerificationQr(readStringParam({ requestId }, "requestId", { required: true }), clientOpts);
+			return jsonResult({
+				ok: true,
+				...qr
 			});
 		}
-		if (action === "verificationGenerateQr") return jsonResult({
-			ok: true,
-			...await generateMatrixVerificationQr(readStringParam({ requestId }, "requestId", { required: true }), clientOpts)
-		});
 		if (action === "verificationScanQr") {
 			const qrDataBase64 = readStringParam(params, "qrDataBase64") ?? readStringParam(params, "qrData") ?? readStringParam(params, "qr");
+			const verification = await scanMatrixVerificationQr(readStringParam({ requestId }, "requestId", { required: true }), readStringParam({ qrDataBase64 }, "qrDataBase64", { required: true }), clientOpts);
 			return jsonResult({
 				ok: true,
-				verification: await scanMatrixVerificationQr(readStringParam({ requestId }, "requestId", { required: true }), readStringParam({ qrDataBase64 }, "qrDataBase64", { required: true }), clientOpts)
+				verification
+			});
+		}
+		if (action === "verificationSas") {
+			const sas = await getMatrixVerificationSas(readStringParam({ requestId }, "requestId", { required: true }), clientOpts);
+			return jsonResult({
+				ok: true,
+				sas
+			});
+		}
+		if (action === "verificationConfirm") {
+			const verification = await confirmMatrixVerificationSas(readStringParam({ requestId }, "requestId", { required: true }), clientOpts);
+			return jsonResult({
+				ok: true,
+				verification
+			});
+		}
+		if (action === "verificationMismatch") {
+			const verification = await mismatchMatrixVerificationSas(readStringParam({ requestId }, "requestId", { required: true }), clientOpts);
+			return jsonResult({
+				ok: true,
+				verification
+			});
+		}
+		if (action === "verificationConfirmQr") {
+			const verification = await confirmMatrixVerificationReciprocateQr(readStringParam({ requestId }, "requestId", { required: true }), clientOpts);
+			return jsonResult({
+				ok: true,
+				verification
 			});
 		}
-		if (action === "verificationSas") return jsonResult({
-			ok: true,
-			sas: await getMatrixVerificationSas(readStringParam({ requestId }, "requestId", { required: true }), clientOpts)
-		});
-		if (action === "verificationConfirm") return jsonResult({
-			ok: true,
-			verification: await confirmMatrixVerificationSas(readStringParam({ requestId }, "requestId", { required: true }), clientOpts)
-		});
-		if (action === "verificationMismatch") return jsonResult({
-			ok: true,
-			verification: await mismatchMatrixVerificationSas(readStringParam({ requestId }, "requestId", { required: true }), clientOpts)
-		});
-		if (action === "verificationConfirmQr") return jsonResult({
-			ok: true,
-			verification: await confirmMatrixVerificationReciprocateQr(readStringParam({ requestId }, "requestId", { required: true }), clientOpts)
-		});
 	}
 	throw new Error(`Unsupported Matrix action: ${action}`);
 }