@openclaw/matrix 2026.7.2-beta.7 → 2026.7.34

package/dist/{tool-actions.runtime-uu9blSqO.js → .setup/tool-actions.runtime-CXDLk2jg.mjs}

@@ -1,20 +1,17 @@
-import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-BZWN9tGS.js";
-import { i as resolveMatrixAccount } from "./accounts-DfngqebB.js";
-import { r as resolveMatrixRoomConfig } from "./channel-vj788dNZ.js";
-import { r as normalizeMatrixResolvableTarget } from "./target-ids-B-5aQxwn.js";
-import { E as parsePollStart, T as isPollStartType, b as buildPollResponseContent, c as resolveMatrixRoomId, h as readJoinedMatrixMembers, m as isStrictDirectMembership, n as reactMatrixMessage, p as hasDirectMatrixMemberFlag } from "./send-BldGYG8g.js";
-import { i as buildMatrixReactionRelationsPath, o as selectOwnMatrixReactionEventIds, s as summarizeMatrixReactionEvents } from "./reaction-common-DkrQdBSZ.js";
-import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-6eRENr7k.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-DxQJkhxs.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-D1xI_cvh.js";
-import { t as applyMatrixProfileUpdate } from "./profile-update-CffmyW_4.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-DYMQ1QpI.js";
-import { t as createMatrixRoomInfoResolver } from "./room-info-CAFZ3Z9J.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.mjs";
+import "./setup-core-bhdcEo7v.mjs";
+import { E as parsePollStart, T as isPollStartType, b as buildPollResponseContent, i as reactMatrixMessage, u as resolveMatrixRoomId } from "./send-CGgl0uTn.mjs";
+import { i as buildMatrixReactionRelationsPath, o as selectOwnMatrixReactionEventIds, s as summarizeMatrixReactionEvents } from "./reaction-common-DkrQdBSZ.mjs";
+import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-Ct0bUHCo.mjs";
+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-D4DYGHYX.mjs";
+import { a as jsonResult, c as readStringArrayParam, l as readStringParam, o as readPositiveIntegerParam, r as createActionGate, s as readReactionParams } from "./runtime-api-CEsWNdil.mjs";
+import { t as applyMatrixProfileUpdate } from "./profile-update-DzOL3Wiw.mjs";
+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-DeWOtZJr.mjs";
 import { normalizeOptionalLowercaseString, uniqueStrings, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#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));
@@ -45,7 +42,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] : []],
@@ -73,7 +71,8 @@ async function listMatrixReactionEvents(client, roomId, messageId, limit) {
 }
 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 = {}) {
@@ -120,10 +119,9 @@ async function listMatrixPins(roomId, opts = {}) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/actions/room.ts
-async function getMatrixMemberInfo(userId, opts) {
+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 roomId = opts.roomId ? await resolveMatrixRoomId(client, opts.roomId) : void 0;
 		const profile = await client.getUserProfile(userId);
 		return {
 			userId,
@@ -134,7 +132,7 @@ async function getMatrixMemberInfo(userId, opts) {
 			membership: null,
 			powerLevel: null,
 			displayName: profile?.displayname ?? null,
-			roomId
+			roomId: roomId ?? null
 		};
 	});
 }
@@ -170,126 +168,6 @@ async function getMatrixRoomInfo(roomId, opts = {}) {
 	});
 }
 //#endregion
-//#region extensions/matrix/src/matrix/read-policy.ts
-function normalizeRoomId(raw) {
-	return raw?.trim().replace(/^room:/i, "") ?? "";
-}
-function isCurrentRoom(params) {
-	return params.context?.currentChannelProvider?.trim().toLowerCase() === "matrix" && params.context.requesterAccountId?.trim() === params.accountId && normalizeRoomId(params.context.currentChannelId) === normalizeRoomId(params.roomId);
-}
-function includesEntry(entries, value) {
-	const normalized = value.trim().toLowerCase();
-	return (entries ?? []).some((entry) => {
-		const candidate = String(entry).replace(/^matrix:/i, "").trim().toLowerCase();
-		return candidate === "*" || candidate === normalized;
-	});
-}
-function hasWildcardEntry(entries) {
-	return (entries ?? []).some((entry) => String(entry).replace(/^matrix:/i, "").trim() === "*");
-}
-function resolveMatrixReadRoomPolicy(params) {
-	const room = resolveMatrixRoomConfig({
-		rooms: params.account.config.groups ?? params.account.config.rooms,
-		roomId: params.roomId,
-		aliases: params.aliases
-	});
-	const baseRoom = resolveMatrixRoomConfig({
-		rooms: params.baseConfig.groups ?? params.baseConfig.rooms,
-		roomId: params.roomId,
-		aliases: params.aliases
-	});
-	const baseRoomAccount = baseRoom.config?.account;
-	const explicitlyScopedToAnotherAccount = room.config === void 0 && baseRoom.matchSource === "direct" && typeof baseRoomAccount === "string" && normalizeAccountId(baseRoomAccount) !== params.account.accountId;
-	const accountMatches = !room.config?.account || room.config.account === params.account.accountId;
-	const configuredRoomBlocked = room.config !== void 0 && (!room.allowed || !accountMatches);
-	return {
-		blocked: explicitlyScopedToAnotherAccount || configuredRoomBlocked,
-		blockedBeforeProviderAccess: explicitlyScopedToAnotherAccount || room.matchSource === "direct" && configuredRoomBlocked,
-		room
-	};
-}
-async function classifyMatrixReadRoom(params) {
-	const members = await readJoinedMatrixMembers(params.client, params.roomId);
-	if (!members) return { kind: "unknown" };
-	if (members.length >= 3) return { kind: "group" };
-	if (members.length !== 2) return { kind: "unknown" };
-	const selfUserId = await params.client.getUserId().catch(() => null);
-	if (!selfUserId || !members.includes(selfUserId)) return { kind: "unknown" };
-	const remoteUserId = members.find((member) => member !== selfUserId);
-	if (!isStrictDirectMembership({
-		selfUserId,
-		remoteUserId,
-		joinedMembers: members
-	}) || !remoteUserId) return { kind: "unknown" };
-	const memberStateFlag = await hasDirectMatrixMemberFlag(params.client, params.roomId, selfUserId);
-	await params.client.dms.update().catch(() => false);
-	if (memberStateFlag === true || params.client.dms.isDm(params.roomId)) return {
-		kind: "direct",
-		remoteUserId
-	};
-	return memberStateFlag === false ? { kind: "group" } : { kind: "unknown" };
-}
-async function withAuthorizedMatrixReadTarget(params) {
-	const account = resolveMatrixAccount({
-		cfg: params.cfg,
-		accountId: params.accountId
-	});
-	const baseConfig = resolveMatrixBaseConfig(params.cfg);
-	if (resolveMatrixReadRoomPolicy({
-		account,
-		baseConfig,
-		roomId: normalizeMatrixResolvableTarget(params.roomId),
-		aliases: []
-	}).blockedBeforeProviderAccess) throw new ToolAuthorizationError("Matrix read target is not allowed.");
-	return await withResolvedActionClient(params.opts, async (client) => {
-		const roomId = await resolveMatrixRoomId(client, params.roomId);
-		const inputAlias = params.roomId.trim().startsWith("#") ? params.roomId.trim() : void 0;
-		const { getRoomInfo } = createMatrixRoomInfoResolver(client);
-		const roomInfo = await getRoomInfo(roomId, { includeAliases: true });
-		const mutableRoomName = account.config.dangerouslyAllowNameMatching === true ? roomInfo.name : void 0;
-		const aliases = [
-			inputAlias,
-			roomInfo.canonicalAlias,
-			...roomInfo.altAliases,
-			mutableRoomName
-		].filter((value) => Boolean(value));
-		const finalPolicy = resolveMatrixReadRoomPolicy({
-			account,
-			baseConfig,
-			roomId,
-			aliases
-		});
-		const room = finalPolicy.room;
-		const current = isCurrentRoom({
-			accountId: account.accountId,
-			context: params.context,
-			roomId
-		});
-		const currentChatType = params.context?.currentChatType?.trim().toLowerCase();
-		const trustedCurrentClassification = currentChatType === "direct" ? {
-			kind: "direct",
-			remoteUserId: ""
-		} : currentChatType === "group" || currentChatType === "channel" ? { kind: "group" } : null;
-		const classification = room.matchSource === "direct" ? { kind: "group" } : current && trustedCurrentClassification ? trustedCurrentClassification : await classifyMatrixReadRoom({
-			client,
-			roomId
-		});
-		const resolvedGroupPolicy = resolveAllowlistProviderRuntimeGroupPolicy({
-			providerConfigPresent: params.cfg.channels?.matrix !== void 0,
-			groupPolicy: account.config.groupPolicy,
-			defaultGroupPolicy: resolveDefaultGroupPolicy(params.cfg)
-		}).groupPolicy;
-		const groupPolicy = account.config.allowlistOnly && resolvedGroupPolicy === "open" ? "allowlist" : resolvedGroupPolicy;
-		const dmPolicy = account.config.allowlistOnly ? account.config.dm?.policy === "disabled" ? "disabled" : "allowlist" : account.config.dm?.policy ?? "pairing";
-		const directOperator = params.context?.conversationReadOrigin === "direct-operator";
-		if (!(finalPolicy.blocked ? false : directOperator ? classification.kind === "direct" ? account.config.dm?.enabled !== false && dmPolicy !== "disabled" : classification.kind === "group" ? groupPolicy !== "disabled" : groupPolicy !== "disabled" && dmPolicy !== "disabled" && account.config.dm?.enabled !== false : classification.kind === "direct" ? account.config.dm?.enabled !== false && dmPolicy !== "disabled" && (current || includesEntry(account.config.dm?.allowFrom, classification.remoteUserId)) : classification.kind === "group" ? groupPolicy !== "disabled" && (current || groupPolicy === "open" || room.config !== void 0) : current ? groupPolicy !== "disabled" && dmPolicy !== "disabled" && account.config.dm?.enabled !== false : groupPolicy === "open" && dmPolicy !== "disabled" && account.config.dm?.enabled !== false && hasWildcardEntry(account.config.dm?.allowFrom))) throw new ToolAuthorizationError("Matrix read target is not allowed.");
-		return await params.run({
-			client,
-			roomId
-		});
-	});
-}
-//#endregion
 //#region extensions/matrix/src/tool-actions.ts
 const messageActions = /* @__PURE__ */ new Set([
 	"sendMessage",
@@ -324,15 +202,6 @@ const verificationActions = /* @__PURE__ */ new Set([
 	"verificationBackupStatus",
 	"verificationBackupRestore"
 ]);
-function projectMatrixMessagesForDisplay(messages) {
-	return messages.map((message) => ({
-		...message,
-		...message.eventId ? { id: message.eventId } : {},
-		...message.sender ? { authorTag: message.sender } : {},
-		...message.body !== void 0 ? { content: message.body } : {},
-		...typeof message.timestamp === "number" && Number.isFinite(message.timestamp) && Math.abs(message.timestamp) <= 864e13 ? { ts: new Date(message.timestamp).toISOString() } : {}
-	}));
-}
 function readRoomId(params, required = true) {
 	const direct = readStringParam(params, "roomId") ?? readStringParam(params, "channelId");
 	if (direct) return direct;
@@ -381,51 +250,36 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 		cfg,
 		...accountId ? { accountId } : {}
 	};
-	const withReadTarget = async (roomId, run) => await withAuthorizedMatrixReadTarget({
-		cfg,
-		accountId,
-		roomId,
-		context: opts.readContext,
-		opts: clientOpts,
-		run
-	});
 	if (reactionActions.has(action)) {
 		if (!isActionEnabled("reactions")) throw new Error("Matrix reactions are disabled.");
 		const roomId = readRoomId(params);
 		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) => {
-					return await removeMatrixReactions(target.roomId, messageId, {
-						...clientOpts,
-						client: target.client,
-						emoji: remove ? emoji : void 0
-					});
-				})).removed
-			});
-			await withReadTarget(roomId, async (target) => {
-				await reactMatrixMessage(target.roomId, messageId, emoji, {
+			if (remove || isEmpty) {
+				const result = await removeMatrixReactions(roomId, messageId, {
 					...clientOpts,
-					client: target.client
+					emoji: remove ? emoji : void 0
 				});
-			});
+				return jsonResult({
+					ok: true,
+					removed: result.removed
+				});
+			}
+			await reactMatrixMessage(roomId, messageId, emoji, clientOpts);
 			return jsonResult({
 				ok: true,
 				added: emoji
 			});
 		}
 		const limit = readPositiveIntegerParam(params, "limit", { message: "limit must be a positive integer." });
+		const reactions = await listMatrixReactions(roomId, messageId, {
+			...clientOpts,
+			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)) {
@@ -436,16 +290,14 @@ 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 voteMatrixPoll(roomId, pollId, {
+			...clientOpts,
+			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)) {
@@ -461,42 +313,36 @@ 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,
+					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,
-						mediaLocalRoots: opts.mediaLocalRoots,
-						replyToId: replyToId ?? void 0,
-						threadId: threadId ?? void 0,
-						audioAsVoice,
-						...clientOpts
-					})
+					result
 				});
 			}
 			case "editMessage": {
 				const roomId = readRoomId(params);
 				const messageId = readStringParam(params, "messageId", { required: true });
 				const content = readStringParam(params, "content", { required: true });
+				const result = await editMatrixMessage(roomId, messageId, content, clientOpts);
 				return jsonResult({
 					ok: true,
-					result: await withReadTarget(roomId, async (target) => {
-						return await editMatrixMessage(target.roomId, messageId, content, {
-							...clientOpts,
-							client: target.client
-						});
-					})
+					result
 				});
 			}
 			case "deleteMessage": {
 				const roomId = readRoomId(params);
 				const messageId = readStringParam(params, "messageId", { required: true });
 				const reason = readStringParam(params, "reason");
-				await withReadTarget(roomId, async (target) => {
-					await deleteMatrixMessage(target.roomId, messageId, {
-						reason: reason ?? void 0,
-						...clientOpts,
-						client: target.client
-					});
+				await deleteMatrixMessage(roomId, messageId, {
+					reason: reason ?? void 0,
+					...clientOpts
 				});
 				return jsonResult({
 					ok: true,
@@ -509,122 +355,108 @@ async function handleMatrixAction(params, cfg, opts = {}) {
 				const before = readStringParam(params, "before");
 				const after = readStringParam(params, "after");
 				const threadId = readStringParam(params, "threadId");
+				const result = await readMatrixMessages(roomId, {
+					limit: limit ?? void 0,
+					before: before ?? void 0,
+					after: after ?? void 0,
+					threadId: threadId ?? void 0,
+					...clientOpts
+				});
 				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)) {
 		if (!isActionEnabled("pins")) throw new Error("Matrix pins are disabled.");
 		const roomId = readRoomId(params);
-		const request = action === "pinMessage" ? {
-			kind: "pin",
-			messageId: readStringParam(params, "messageId", { required: true })
-		} : action === "unpinMessage" ? {
-			kind: "unpin",
-			messageId: readStringParam(params, "messageId", { required: true })
-		} : { kind: "list" };
-		return await withReadTarget(roomId, async (target) => {
-			const actionOpts = {
-				...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({
+		if (action === "pinMessage") {
+			const result = await pinMatrixMessage(roomId, readStringParam(params, "messageId", { required: true }), clientOpts);
+			return jsonResult({
 				ok: true,
-				pinned: (await unpinMatrixMessage(target.roomId, request.messageId, actionOpts)).pinned
+				pinned: result.pinned
 			});
-			const result = await listMatrixPins(target.roomId, actionOpts);
+		}
+		if (action === "unpinMessage") {
+			const result = await unpinMatrixMessage(roomId, readStringParam(params, "messageId", { required: true }), clientOpts);
 			return jsonResult({
 				ok: true,
-				pinned: result.pinned,
-				events: result.events,
-				pins: projectMatrixMessagesForDisplay(result.events)
+				pinned: result.pinned
 			});
+		}
+		const result = await listMatrixPins(roomId, clientOpts);
+		return jsonResult({
+			ok: true,
+			pinned: result.pinned,
+			events: result.events
 		});
 	}
 	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 getMatrixMemberInfo(readStringParam(params, "userId", { required: true }), {
+			roomId: readStringParam(params, "roomId") ?? readStringParam(params, "channelId") ?? void 0,
+			...clientOpts
+		});
 		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 getMatrixRoomInfo(readRoomId(params), clientOpts);
 		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
 			});
@@ -634,7 +466,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);
@@ -643,13 +476,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({
@@ -657,79 +494,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}`);
 }