@openclaw/matrix 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{account-selection-BDeeqwwR.mjs → account-selection-Bs_jCAaG.mjs}

@@ -1,5 +1,5 @@
 import { i as __exportAll } from "./doctor-contract-CsTNmbMa.mjs";
-import { n as listMatrixEnvAccountIds, t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.mjs";
+import { n as listMatrixEnvAccountIds, t as getMatrixScopedEnvVarNames } from "./env-vars-aEBngJPa.mjs";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
 import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { listCombinedAccountIds, listConfiguredAccountIds, resolveListedDefaultAccountId, resolveNormalizedAccountEntry } from "openclaw/plugin-sdk/account-core";
@@ -14,9 +14,6 @@ const MATRIX_DEFAULT_ACCOUNT_AUTH_ONLY_FIELDS = /* @__PURE__ */ new Set([
 function resolveMatrixStringSourceValue(value) {
 	return typeof value === "string" ? value : "";
 }
-function shouldAllowBaseAuthFallback(accountId, field) {
-	return normalizeAccountId(accountId) === DEFAULT_ACCOUNT_ID || !MATRIX_DEFAULT_ACCOUNT_AUTH_ONLY_FIELDS.has(field);
-}
 function resolveMatrixAccountStringValues(params) {
 	const fields = [
 		"homeserver",
@@ -27,7 +24,8 @@ function resolveMatrixAccountStringValues(params) {
 		"deviceName"
 	];
 	const resolved = {};
-	for (const field of fields) resolved[field] = resolveMatrixStringSourceValue(params.account?.[field]) || resolveMatrixStringSourceValue(params.scopedEnv?.[field]) || (shouldAllowBaseAuthFallback(params.accountId, field) ? resolveMatrixStringSourceValue(params.channel?.[field]) || resolveMatrixStringSourceValue(params.globalEnv?.[field]) : "");
+	const isDefaultAccount = normalizeAccountId(params.accountId) === DEFAULT_ACCOUNT_ID;
+	for (const field of fields) resolved[field] = resolveMatrixStringSourceValue(params.account?.[field]) || resolveMatrixStringSourceValue(params.scopedEnv?.[field]) || (isDefaultAccount || !MATRIX_DEFAULT_ACCOUNT_AUTH_ONLY_FIELDS.has(field) ? resolveMatrixStringSourceValue(params.channel?.[field]) || resolveMatrixStringSourceValue(params.globalEnv?.[field]) : "");
 	return resolved;
 }
 //#endregion

package/dist/.setup/{approval-handler.runtime-QkHLH2az.mjs → approval-handler.runtime-rxLn8CbP.mjs}

@@ -1,12 +1,12 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { c as shouldHandleMatrixApprovalRequest, r as isMatrixAnyApprovalClientEnabled } from "./exec-approvals-BLDAMyHs.mjs";
-import { o as resolveMatrixTargetIdentity } from "./target-ids-Nwx7cMVE.mjs";
-import { a as repairMatrixDirectRooms } from "./direct-management-DJtQhLKH.mjs";
-import { a as sendSingleTextMessageMatrix, n as reactMatrixMessage, r as sendMessageMatrix } from "./send-B1Y2L4wj.mjs";
+import { c as shouldHandleMatrixApprovalRequest, r as isMatrixAnyApprovalClientEnabled } from "./exec-approvals-BgNWWJg1.mjs";
+import { s as resolveMatrixTargetIdentity } from "./target-ids-HhcaKX1n.mjs";
+import { a as repairMatrixDirectRooms } from "./direct-management-B3wYhx_M.mjs";
+import { a as sendSingleTextMessageMatrix, n as reactMatrixMessage, r as sendMessageMatrix } from "./send-LCOuTVc1.mjs";
 import { a as unregisterMatrixApprovalReactionTarget, n as listMatrixApprovalReactionBindings, r as registerMatrixApprovalReactionTarget, t as buildMatrixApprovalReactionHint } from "./approval-reactions-DhB6gNPU.mjs";
-import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-uCbwLRKS.mjs";
+import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-B1CZqU8u.mjs";
 import { listMessageReceiptPlatformIds, resolveMessageReceiptPrimaryId } from "openclaw/plugin-sdk/channel-outbound";
-import { normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeStringifiedOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { createChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-runtime";
@@ -23,7 +23,12 @@ function resolveHandlerContext(params) {
 	if (!context?.client || !accountId) return null;
 	return {
 		accountId,
-		context
+		context,
+		clientOptions: {
+			cfg: params.cfg,
+			accountId,
+			client: context.client
+		}
 	};
 }
 function normalizeReactionTargetRef(params) {
@@ -37,8 +42,13 @@ function normalizeReactionTargetRef(params) {
 		eventId
 	};
 }
-function normalizeThreadId(value) {
-	return (value == null ? "" : String(value).trim()) || void 0;
+function resolveEntryReactionTarget(params) {
+	const accountId = params.accountId?.trim();
+	return accountId ? normalizeReactionTargetRef({
+		accountId,
+		roomId: params.entry.roomId,
+		eventId: params.entry.reactionEventId
+	}) : null;
 }
 function isSingleMatrixMessageLimitError(error) {
 	return error instanceof Error && error.message.includes("Matrix single-message text exceeds limit");
@@ -50,36 +60,6 @@ async function retryMatrixApprovalDelivery(operation, params = {}) {
 		shouldRetry: (error) => params.shouldRetry?.(error) !== false
 	});
 }
-async function prepareTarget(params) {
-	const resolved = resolveHandlerContext(params);
-	if (!resolved) return null;
-	const target = resolveMatrixTargetIdentity(params.rawTarget.to);
-	if (!target) return null;
-	const threadId = normalizeThreadId(params.rawTarget.threadId);
-	if (target.kind === "user") {
-		const accountConfig = resolveMatrixAccountConfig({
-			cfg: params.cfg,
-			accountId: resolved.accountId
-		});
-		const repairDirectRooms = resolved.context.deps?.repairDirectRooms ?? repairMatrixDirectRooms;
-		const repaired = await retryMatrixApprovalDelivery(async () => await repairDirectRooms({
-			client: resolved.context.client,
-			remoteUserId: target.id,
-			encrypted: accountConfig.encryption === true
-		}));
-		if (!repaired.activeRoomId) return null;
-		return {
-			to: `room:${repaired.activeRoomId}`,
-			roomId: repaired.activeRoomId,
-			threadId
-		};
-	}
-	return {
-		to: `room:${target.id}`,
-		roomId: target.id,
-		threadId
-	};
-}
 function buildMatrixApprovalMetadata(params) {
 	const base = {
 		version: 1,
@@ -255,19 +235,42 @@ const matrixApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 		buildExpiredResult: () => ({ kind: "delete" })
 	},
 	transport: {
-		prepareTarget: ({ cfg, accountId, context, plannedTarget }) => {
-			return prepareTarget({
+		prepareTarget: async ({ cfg, accountId, context, plannedTarget }) => {
+			const resolved = resolveHandlerContext({
 				cfg,
 				accountId,
-				context,
-				rawTarget: plannedTarget.target
-			}).then((preparedTarget) => preparedTarget ? {
+				context
+			});
+			if (!resolved) return null;
+			const target = resolveMatrixTargetIdentity(plannedTarget.target.to);
+			if (!target) return null;
+			const threadId = normalizeStringifiedOptionalString(plannedTarget.target.threadId);
+			let roomId = target.id;
+			if (target.kind === "user") {
+				const accountConfig = resolveMatrixAccountConfig({
+					cfg,
+					accountId: resolved.accountId
+				});
+				const repairDirectRooms = resolved.context.deps?.repairDirectRooms ?? repairMatrixDirectRooms;
+				const repaired = await retryMatrixApprovalDelivery(() => repairDirectRooms({
+					client: resolved.context.client,
+					remoteUserId: target.id,
+					encrypted: accountConfig.encryption === true
+				}));
+				if (!repaired.activeRoomId) return null;
+				roomId = repaired.activeRoomId;
+			}
+			return {
 				dedupeKey: buildChannelApprovalNativeTargetKey({
-					to: preparedTarget.roomId,
-					threadId: preparedTarget.threadId
+					to: roomId,
+					threadId
 				}),
-				target: preparedTarget
-			} : null);
+				target: {
+					to: `room:${roomId}`,
+					roomId,
+					threadId
+				}
+			};
 		},
 		deliverPending: async ({ cfg, accountId, context, preparedTarget, pendingPayload, view }) => {
 			const resolved = resolveHandlerContext({
@@ -279,19 +282,17 @@ const matrixApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 			const sendSingleTextMessage = resolved.context.deps?.sendSingleTextMessage ?? sendSingleTextMessageMatrix;
 			const reactMessage = resolved.context.deps?.reactMessage ?? reactMatrixMessage;
 			const sendOptions = {
-				cfg,
-				accountId: resolved.accountId,
-				client: resolved.context.client,
+				...resolved.clientOptions,
 				threadId: preparedTarget.threadId,
 				extraContent: pendingPayload.extraContent
 			};
 			let result;
 			try {
-				result = await retryMatrixApprovalDelivery(async () => await sendSingleTextMessage(preparedTarget.to, pendingPayload.text, sendOptions), { shouldRetry: (error) => !isSingleMatrixMessageLimitError(error) });
+				result = await retryMatrixApprovalDelivery(() => sendSingleTextMessage(preparedTarget.to, pendingPayload.text, sendOptions), { shouldRetry: (error) => !isSingleMatrixMessageLimitError(error) });
 			} catch (error) {
 				if (!isSingleMatrixMessageLimitError(error)) throw error;
 				const sendMessage = resolved.context.deps?.sendMessage ?? sendMessageMatrix;
-				result = await retryMatrixApprovalDelivery(async () => await sendMessage(preparedTarget.to, pendingPayload.text, sendOptions));
+				result = await retryMatrixApprovalDelivery(() => sendMessage(preparedTarget.to, pendingPayload.text, sendOptions));
 			}
 			const receiptMessageIds = listMessageReceiptPlatformIds(result.receipt);
 			const platformMessageIds = receiptMessageIds.length ? receiptMessageIds : [result.messageId.trim()].filter(Boolean);
@@ -306,11 +307,7 @@ const matrixApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 				ttlMs: view.expiresAtMs - Date.now()
 			});
 			await Promise.allSettled(listMatrixApprovalReactionBindings(pendingPayload.allowedDecisions).map(async ({ emoji }) => {
-				await reactMessage(result.roomId, reactionEventId, emoji, {
-					cfg,
-					accountId: resolved.accountId,
-					client: resolved.context.client
-				});
+				await reactMessage(result.roomId, reactionEventId, emoji, resolved.clientOptions);
 			}));
 			return {
 				roomId: result.roomId,
@@ -329,15 +326,9 @@ const matrixApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 			const deleteMessage = resolved.context.deps?.deleteMessage ?? deleteMatrixMessage;
 			const [primaryMessageId, ...staleMessageIds] = normalizeUniqueStringEntries(entry.platformMessageIds);
 			if (!primaryMessageId) return;
-			await Promise.allSettled([editMessage(entry.roomId, primaryMessageId, payload, {
-				cfg,
-				accountId: resolved.accountId,
-				client: resolved.context.client
-			}), ...staleMessageIds.map(async (messageId) => {
+			await Promise.allSettled([editMessage(entry.roomId, primaryMessageId, payload, resolved.clientOptions), ...staleMessageIds.map(async (messageId) => {
 				await deleteMessage(entry.roomId, messageId, {
-					cfg,
-					accountId: resolved.accountId,
-					client: resolved.context.client,
+					...resolved.clientOptions,
 					reason: "approval resolved"
 				});
 			})]);
@@ -352,9 +343,7 @@ const matrixApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 			const deleteMessage = resolved.context.deps?.deleteMessage ?? deleteMatrixMessage;
 			await Promise.allSettled(normalizeUniqueStringEntries(entry.platformMessageIds).map(async (messageId) => {
 				await deleteMessage(entry.roomId, messageId, {
-					cfg,
-					accountId: resolved.accountId,
-					client: resolved.context.client,
+					...resolved.clientOptions,
 					reason: phase === "expired" ? "approval expired" : "approval resolved"
 				});
 			}));
@@ -362,13 +351,7 @@ const matrixApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 	},
 	interactions: {
 		bindPending: async (params) => {
-			const accountId = params.accountId?.trim();
-			if (!accountId) return null;
-			const target = normalizeReactionTargetRef({
-				accountId,
-				roomId: params.entry.roomId,
-				eventId: params.entry.reactionEventId
-			});
+			const target = resolveEntryReactionTarget(params);
 			if (!target) return null;
 			await registerMatrixApprovalReactionTarget({
 				accountId: target.accountId,
@@ -387,13 +370,7 @@ const matrixApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 			await unregisterMatrixApprovalReactionTarget(target);
 		},
 		cancelDelivered: async (params) => {
-			const accountId = params.accountId?.trim();
-			if (!accountId) return;
-			const target = normalizeReactionTargetRef({
-				accountId,
-				roomId: params.entry.roomId,
-				eventId: params.entry.reactionEventId
-			});
+			const target = resolveEntryReactionTarget(params);
 			if (!target) return;
 			await unregisterMatrixApprovalReactionTarget(target);
 		}

package/dist/.setup/{channel-CeRXEAEP.mjs → channel-BcwGspPw.mjs}

@@ -1,21 +1,24 @@
 import { i as __exportAll, n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-CsTNmbMa.mjs";
-import { i as requiresExplicitMatrixDefaultAccount, n as findMatrixAccountEntry, r as hasImplicitMatrixAccountConfig } from "./account-selection-BDeeqwwR.mjs";
+import { i as requiresExplicitMatrixDefaultAccount, n as findMatrixAccountEntry, r as hasImplicitMatrixAccountConfig } from "./account-selection-Bs_jCAaG.mjs";
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { a as resolveMatrixAccountAsync, i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-C_r0UlEm.mjs";
-import { i as normalizeMatrixUserId, t as matrixPluginBase } from "./channel.setup-DC2t7_PK.mjs";
-import { a as isMatrixExecApprovalAuthorizedSender, c as shouldHandleMatrixApprovalRequest, d as matrixApprovalAuth, f as normalizeMatrixApproverId, i as isMatrixApprovalClientEnabled, l as shouldSuppressLocalMatrixExecApprovalPrompt, n as getMatrixExecApprovalApprovers, o as isMatrixExecApprovalClientEnabled, r as isMatrixAnyApprovalClientEnabled, s as resolveMatrixExecApprovalTarget, t as getMatrixApprovalApprovers, u as getMatrixApprovalAuthApprovers } from "./exec-approvals-BLDAMyHs.mjs";
-import { a as resolveMatrixDirectUserId, i as normalizeMatrixResolvableTarget, n as isMatrixRoomId, o as resolveMatrixTargetIdentity, r as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.mjs";
-import { d as setMatrixThreadBindingMaxAgeBySessionKey, l as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings-shared-hxKkYC1W.mjs";
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-JlB6VmI3.mjs";
-import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-DRMC62cs.mjs";
+import { _ as resolveMatrixAccount, g as resolveDefaultMatrixAccountId, m as listMatrixAccountIds, v as resolveMatrixAccountAsync } from "./setup-core-CKnNTfgD.mjs";
+import { i as normalizeMatrixUserId, t as matrixPluginBase } from "./channel.setup-CwuYD_CT.mjs";
+import { a as isMatrixExecApprovalAuthorizedSender, c as shouldHandleMatrixApprovalRequest, d as matrixApprovalAuth, f as normalizeMatrixApproverId, i as isMatrixApprovalClientEnabled, l as shouldSuppressLocalMatrixExecApprovalPrompt, n as getMatrixExecApprovalApprovers, o as isMatrixExecApprovalClientEnabled, r as isMatrixAnyApprovalClientEnabled, s as resolveMatrixExecApprovalTarget, t as getMatrixApprovalApprovers, u as getMatrixApprovalAuthApprovers } from "./exec-approvals-BgNWWJg1.mjs";
+import { a as normalizeMatrixResolvableTarget, i as normalizeMatrixMessagingTarget, n as isMatrixQualifiedUserId, o as resolveMatrixDirectUserId, r as isMatrixRoomId, s as resolveMatrixTargetIdentity } from "./target-ids-HhcaKX1n.mjs";
+import { d as setMatrixThreadBindingMaxAgeBySessionKey, l as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings-shared-CbsFNbAY.mjs";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-DSBRvhdZ.mjs";
+import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-BvuaKpd0.mjs";
 import { createLazyRuntimeModule, createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { adaptScopedAccountAccessor, createScopedDmSecurityResolver } from "openclaw/plugin-sdk/channel-config-helpers";
 import { buildChannelOutboundSessionRoute, buildThreadAwareOutboundSessionRoute, createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { createChannelMessageAdapterFromOutbound, createRuntimeOutboundDelegates } from "openclaw/plugin-sdk/channel-outbound";
+import { createPairingPrefixStripper } from "openclaw/plugin-sdk/channel-pairing";
 import { createAllowlistProviderOpenWarningCollector, createConditionalWarningCollector, resolveScopeRequireMention, resolveScopeToolsPolicy } from "openclaw/plugin-sdk/channel-policy";
+import { PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk/channel-status";
 import { createScopedAccountReplyToModeResolver } from "openclaw/plugin-sdk/conversation-runtime";
 import { createChannelDirectoryAdapter, createResolvedDirectoryEntriesLister, createRuntimeDirectoryLiveAdapter } from "openclaw/plugin-sdk/directory-runtime";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { buildProbeChannelStatusSummary, collectStatusIssuesFromLastError, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { chunkTextForOutbound, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
@@ -25,9 +28,6 @@ import { Type } from "typebox";
 import { createApproverRestrictedNativeApprovalCapability, createChannelApprovalCapability, splitChannelApprovalCapability } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
 import { createChannelNativeOriginTargetResolver, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
-import { createPairingPrefixStripper } from "openclaw/plugin-sdk/channel-pairing";
-import { PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk/channel-status";
-import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { buildAgentSessionKey, deriveLastRoutePolicy, parseThreadSessionSuffix, resolveAgentIdFromSessionKey, resolveAgentRoute, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { buildChannelKeyCandidates } from "openclaw/plugin-sdk/channel-targets";
 import { resolveConfiguredAcpBindingRecord } from "openclaw/plugin-sdk/acp-binding-resolve-runtime";
@@ -61,25 +61,15 @@ const MATRIX_PROFILE_MEDIA_PROPERTIES = {
 const MATRIX_PROFILE_MEDIA_SOURCE_PARAMS = Object.freeze(["avatarUrl", "avatarPath"]);
 function createMatrixExposedActions(params) {
 	const actions = /* @__PURE__ */ new Set(["poll", "poll-vote"]);
-	if (params.gate("messages")) {
-		actions.add("send");
-		actions.add("read");
-		actions.add("edit");
-		actions.add("delete");
-	}
-	if (params.gate("reactions")) {
-		actions.add("react");
-		actions.add("reactions");
-		actions.add("emoji-list");
-	}
-	if (params.gate("pins")) {
-		actions.add("pin");
-		actions.add("unpin");
-		actions.add("list-pins");
-	}
+	const addGatedActions = (gate, ...names) => {
+		if (params.gate(gate)) for (const name of names) actions.add(name);
+	};
+	addGatedActions("messages", "send", "read", "edit", "delete");
+	addGatedActions("reactions", "react", "reactions", "emoji-list");
+	addGatedActions("pins", "pin", "unpin", "list-pins");
 	if (params.gate("profile") && params.senderIsOwner === true) actions.add("set-profile");
-	if (params.gate("memberInfo")) actions.add("member-info");
-	if (params.gate("channelInfo")) actions.add("channel-info");
+	addGatedActions("memberInfo", "member-info");
+	addGatedActions("channelInfo", "channel-info");
 	if (params.encryptionEnabled && params.gate("verification") && params.senderIsOwner === true) actions.add("permissions");
 	return actions;
 }
@@ -154,7 +144,7 @@ const matrixMessageActions = {
 		return account.enabled && account.configured && createActionGate(account.config.actions)("messages") ? payload : null;
 	},
 	handleAction: async (ctx) => {
-		const { handleMatrixAction } = await import("./tool-actions-BqlK2ilM.mjs");
+		const { handleMatrixAction } = await import("./tool-actions-DAp6_XSJ.mjs");
 		return await handleMatrixAction(ctx);
 	}
 };
@@ -285,7 +275,7 @@ const matrixNativeApprovalCapability = createApproverRestrictedNativeApprovalCap
 		],
 		isConfigured: isMatrixAnyApprovalClientEnabled,
 		shouldHandle: shouldHandleMatrixApprovalRequest,
-		load: async () => (await import("./approval-handler.runtime-QkHLH2az.mjs")).matrixApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-rxLn8CbP.mjs")).matrixApprovalNativeRuntime
 	})
 });
 const splitMatrixApprovalCapability = splitChannelApprovalCapability(matrixNativeApprovalCapability);
@@ -361,48 +351,6 @@ const matrixApprovalCapability = createChannelApprovalCapability({
 	render: matrixNativeApprovalCapability.render
 });
 //#endregion
-//#region extensions/matrix/src/channel-account-paths.ts
-function createMatrixProbeAccount(params) {
-	return async ({ account, timeoutMs, cfg }) => {
-		try {
-			const auth = await params.resolveMatrixAuth({
-				cfg,
-				accountId: account.accountId
-			});
-			return await params.probeMatrix({
-				homeserver: auth.homeserver,
-				accessToken: auth.accessToken,
-				userId: auth.userId,
-				deviceId: auth.deviceId,
-				timeoutMs: timeoutMs ?? 5e3,
-				accountId: account.accountId,
-				allowPrivateNetwork: auth.allowPrivateNetwork,
-				ssrfPolicy: auth.ssrfPolicy,
-				dispatcherPolicy: auth.dispatcherPolicy
-			});
-		} catch (err) {
-			return {
-				ok: false,
-				error: formatErrorMessage(err),
-				elapsedMs: 0
-			};
-		}
-	};
-}
-function createMatrixPairingText(sendMessageMatrix) {
-	return {
-		idLabel: "matrixUserId",
-		message: PAIRING_APPROVED_MESSAGE,
-		normalizeAllowEntry: createPairingPrefixStripper(/^matrix:/i),
-		notify: async ({ id, message, cfg, accountId }) => {
-			await sendMessageMatrix(`user:${id}`, message, {
-				cfg,
-				...accountId ? { accountId } : {}
-			});
-		}
-	};
-}
-//#endregion
 //#region extensions/matrix/src/channel-message-adapter.ts
 function createMatrixMessageAdapter(params) {
 	const base = createChannelMessageAdapterFromOutbound({
@@ -492,8 +440,8 @@ function resolveMatrixGroupScope(params) {
 		accountId: params.accountId
 	});
 	const tree = buildMatrixRoomScopeTree(matrixConfig.groups ?? matrixConfig.rooms);
-	const roomId = normalizeMatrixResolvableTarget(params.groupId?.trim() ?? "");
-	const groupChannel = normalizeMatrixResolvableTarget(params.groupChannel?.trim() ?? "");
+	const roomId = normalizeMatrixResolvableTarget(params.groupId ?? "");
+	const groupChannel = normalizeMatrixResolvableTarget(params.groupChannel ?? "");
 	return {
 		tree,
 		path: resolveMatrixRoomScopePath({
@@ -675,7 +623,7 @@ const matrixPresentationCapabilities = {
 };
 //#endregion
 //#region extensions/matrix/src/resolver.ts
-const loadMatrixResolver = createLazyRuntimeNamedExport(() => import("./resolve-targets-DFeU1Ww6.mjs").then((n) => n.n), "resolveMatrixTargets");
+const loadMatrixResolver = createLazyRuntimeNamedExport(() => import("./resolve-targets-BVVbbvP6.mjs").then((n) => n.n), "resolveMatrixTargets");
 const matrixResolverAdapter = { resolveTargets: async (params) => (await loadMatrixResolver())(params) };
 //#endregion
 //#region extensions/matrix/src/matrix/session-store-metadata.ts
@@ -787,8 +735,8 @@ function resolveMatrixOutboundSessionRoute(params) {
 }
 //#endregion
 //#region extensions/matrix/src/channel.ts
-const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-DBQA2y1F.mjs"), "matrixChannelRuntime");
-const loadMatrixMonitorModule = createLazyRuntimeModule(() => import("./monitor-skIntQVG.mjs").catch((error) => {
+const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-CUc6rbu1.mjs"), "matrixChannelRuntime");
+const loadMatrixMonitorModule = createLazyRuntimeModule(() => import("./monitor-Dk_fQL1k.mjs").catch((error) => {
 	loadMatrixMonitorModule.clear();
 	throw error;
 }));
@@ -800,39 +748,45 @@ const matrixDoctor = {
 	legacyConfigRules,
 	normalizeCompatibilityConfig
 };
-const listMatrixDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister({
-	kind: "user",
-	resolveAccount: (cfg, accountId) => resolveMatrixAccountConfig({
+function resolveMatrixDirectoryAccount(cfg, accountId) {
+	return resolveMatrixAccountConfig({
 		cfg,
 		accountId: accountId ?? resolveDefaultMatrixAccountId(cfg)
-	}),
+	});
+}
+function normalizeMatrixDirectoryId(entry, kind) {
+	const raw = entry.replace(/^matrix:/i, "").trim();
+	if (!raw || raw === "*") return null;
+	const lowered = normalizeLowercaseStringOrEmpty(raw);
+	if (kind === "user") {
+		const cleaned = lowered.startsWith("user:") ? raw.slice(5).trim() : raw;
+		return cleaned.startsWith("@") ? `user:${cleaned}` : cleaned;
+	}
+	if (lowered.startsWith("room:") || lowered.startsWith("channel:")) return raw;
+	return raw.startsWith("!") ? `room:${raw}` : raw;
+}
+const listMatrixDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister({
+	kind: "user",
+	resolveAccount: resolveMatrixDirectoryAccount,
 	resolveSources: (account) => [
 		account.dm?.allowFrom ?? [],
 		account.groupAllowFrom ?? [],
 		...Object.values(account.groups ?? account.rooms ?? {}).map((room) => room.users ?? [])
 	],
-	normalizeId: (entry) => {
-		const raw = entry.replace(/^matrix:/i, "").trim();
-		if (!raw || raw === "*") return null;
-		const cleaned = normalizeLowercaseStringOrEmpty(raw).startsWith("user:") ? raw.slice(5).trim() : raw;
-		return cleaned.startsWith("@") ? `user:${cleaned}` : cleaned;
-	}
+	normalizeId: (entry) => normalizeMatrixDirectoryId(entry, "user")
 });
 const listMatrixDirectoryGroupsFromConfig = createResolvedDirectoryEntriesLister({
 	kind: "group",
-	resolveAccount: (cfg, accountId) => resolveMatrixAccountConfig({
-		cfg,
-		accountId: accountId ?? resolveDefaultMatrixAccountId(cfg)
-	}),
+	resolveAccount: resolveMatrixDirectoryAccount,
 	resolveSources: (account) => [Object.keys(account.groups ?? account.rooms ?? {})],
-	normalizeId: (entry) => {
-		const raw = entry.replace(/^matrix:/i, "").trim();
-		if (!raw || raw === "*") return null;
-		const lowered = normalizeLowercaseStringOrEmpty(raw);
-		if (lowered.startsWith("room:") || lowered.startsWith("channel:")) return raw;
-		return raw.startsWith("!") ? `room:${raw}` : raw;
-	}
+	normalizeId: (entry) => normalizeMatrixDirectoryId(entry, "group")
 });
+async function sendMatrixHeartbeatTyping(to, isTyping, cfg, accountId) {
+	await (await loadMatrixChannelRuntime()).sendTypingMatrix(to, isTyping, {
+		cfg,
+		...accountId ? { accountId } : {}
+	});
+}
 function projectMatrixConversationBinding(binding) {
 	return {
 		boundAt: binding.boundAt,
@@ -1071,14 +1025,32 @@ const matrixPlugin = createChatChannelPlugin({
 			defaultRuntime: createDefaultChannelRuntimeState(DEFAULT_ACCOUNT_ID),
 			collectStatusIssues: (accounts) => collectStatusIssuesFromLastError("matrix", accounts),
 			buildChannelSummary: ({ snapshot }) => buildProbeChannelStatusSummary(snapshot, { baseUrl: snapshot.baseUrl ?? null }),
-			probeAccount: async ({ account, timeoutMs, cfg }) => await createMatrixProbeAccount({
-				resolveMatrixAuth: async (params) => (await loadMatrixChannelRuntime()).resolveMatrixAuth(params),
-				probeMatrix: async (params) => await (await loadMatrixChannelRuntime()).probeMatrix(params)
-			})({
-				account,
-				timeoutMs,
-				cfg
-			}),
+			probeAccount: async ({ account, timeoutMs, cfg }) => {
+				try {
+					const runtime = await loadMatrixChannelRuntime();
+					const auth = await runtime.resolveMatrixAuth({
+						cfg,
+						accountId: account.accountId
+					});
+					return await runtime.probeMatrix({
+						homeserver: auth.homeserver,
+						accessToken: auth.accessToken,
+						userId: auth.userId,
+						deviceId: auth.deviceId,
+						timeoutMs: timeoutMs ?? 5e3,
+						accountId: account.accountId,
+						allowPrivateNetwork: auth.allowPrivateNetwork,
+						ssrfPolicy: auth.ssrfPolicy,
+						dispatcherPolicy: auth.dispatcherPolicy
+					});
+				} catch (err) {
+					return {
+						ok: false,
+						error: formatErrorMessage(err),
+						elapsedMs: 0
+					};
+				}
+			},
 			resolveAccountSnapshot: ({ account, runtime }) => ({
 				accountId: account.accountId,
 				name: account.name,
@@ -1113,18 +1085,8 @@ const matrixPlugin = createChatChannelPlugin({
 		} },
 		doctor: matrixDoctor,
 		heartbeat: {
-			sendTyping: async ({ cfg, to, accountId }) => {
-				await (await loadMatrixChannelRuntime()).sendTypingMatrix(to, true, {
-					cfg,
-					...accountId ? { accountId } : {}
-				});
-			},
-			clearTyping: async ({ cfg, to, accountId }) => {
-				await (await loadMatrixChannelRuntime()).sendTypingMatrix(to, false, {
-					cfg,
-					...accountId ? { accountId } : {}
-				});
-			}
+			sendTyping: ({ cfg, to, accountId }) => sendMatrixHeartbeatTyping(to, true, cfg, accountId),
+			clearTyping: ({ cfg, to, accountId }) => sendMatrixHeartbeatTyping(to, false, cfg, accountId)
 		}
 	},
 	security: {
@@ -1134,7 +1096,17 @@ const matrixPlugin = createChatChannelPlugin({
 			cfg
 		})
 	},
-	pairing: { text: createMatrixPairingText(async (to, message, options) => await (await loadMatrixChannelRuntime()).sendMessageMatrix(to, message, options)) },
+	pairing: { text: {
+		idLabel: "matrixUserId",
+		message: PAIRING_APPROVED_MESSAGE,
+		normalizeAllowEntry: createPairingPrefixStripper(/^matrix:/i),
+		notify: async ({ id, message, cfg, accountId }) => {
+			await (await loadMatrixChannelRuntime()).sendMessageMatrix(`user:${id}`, message, {
+				cfg,
+				...accountId ? { accountId } : {}
+			});
+		}
+	} },
 	threading: {
 		matchesToolContextTarget: matchesMatrixToolContextRoom,
 		resolveAutoThreadId: ({ to, toolContext }) => {

package/dist/.setup/{channel.runtime-DBQA2y1F.mjs → channel.runtime-CUc6rbu1.mjs}

@@ -1,14 +1,14 @@
-import { S as reconcileMatrixUnknownSend, o as sendTypingMatrix, r as sendMessageMatrix, x as cleanupMatrixDeliveryPlans } from "./send-B1Y2L4wj.mjs";
-import { u as resolveMatrixAuth } from "./client-kmih04ng.mjs";
-import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-DW5UykLL.mjs";
-import { t as matrixOutbound } from "./outbound-CqQou3ny.mjs";
-import { t as resolveMatrixTargets } from "./resolve-targets-DFeU1Ww6.mjs";
+import { S as reconcileMatrixUnknownSend, o as sendTypingMatrix, r as sendMessageMatrix, x as cleanupMatrixDeliveryPlans } from "./send-LCOuTVc1.mjs";
+import { u as resolveMatrixAuth } from "./client-vPPbaxNp.mjs";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-B1WbfSHo.mjs";
+import { t as matrixOutbound } from "./outbound-LR3SqPIq.mjs";
+import { t as resolveMatrixTargets } from "./resolve-targets-BVVbbvP6.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { runChannelProbe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/matrix/src/matrix/probe.ts
-const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./client-kmih04ng.mjs").then((n) => n.t));
+const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./client-vPPbaxNp.mjs").then((n) => n.t));
 async function probeMatrix(params) {
 	return await runChannelProbe(void 0, async () => {
 		const result = {
@@ -26,7 +26,7 @@ async function probeMatrix(params) {
 		};
 		const { createMatrixClient } = await loadMatrixProbeRuntimeDeps();
 		const inputUserId = normalizeOptionalString(params.userId);
-		const userId = await (await createMatrixClient({
+		const client = await createMatrixClient({
 			homeserver: params.homeserver,
 			userId: void 0,
 			accessToken: params.accessToken,
@@ -37,16 +37,21 @@ async function probeMatrix(params) {
 			allowPrivateNetwork: params.allowPrivateNetwork,
 			ssrfPolicy: params.ssrfPolicy,
 			dispatcherPolicy: params.dispatcherPolicy
-		})).getUserId();
-		if (inputUserId && inputUserId !== userId) return {
-			...result,
-			error: "Matrix access token user does not match configured userId"
-		};
-		return {
-			...result,
-			ok: true,
-			userId
-		};
+		});
+		try {
+			const userId = await client.getUserId();
+			if (inputUserId && inputUserId !== userId) return {
+				...result,
+				error: "Matrix access token user does not match configured userId"
+			};
+			return {
+				...result,
+				ok: true,
+				userId
+			};
+		} finally {
+			await client.stopWithoutPersist();
+		}
 	}, (error) => ({
 		ok: false,
 		status: typeof error === "object" && error && "statusCode" in error ? Number(error.statusCode) : null,