@openclaw/matrix 2026.9.5 → 2026.9.6

package/dist/.setup/{account-selection-5koohRSQ.mjs → account-selection-BHkfU1eC.mjs}

@@ -94,6 +94,7 @@ function resolveMatrixEnvAuthReadiness(accountId, env = process.env) {
 //#region extensions/matrix/src/account-selection.ts
 var account_selection_exports = /* @__PURE__ */ __exportAll({
 	findMatrixAccountEntry: () => findMatrixAccountEntry,
+	hasImplicitMatrixAccountConfig: () => hasImplicitMatrixAccountConfig,
 	requiresExplicitMatrixDefaultAccount: () => requiresExplicitMatrixDefaultAccount,
 	resolveConfiguredMatrixAccountIds: () => resolveConfiguredMatrixAccountIds,
 	resolveMatrixChannelConfig: () => resolveMatrixChannelConfig,
@@ -155,6 +156,14 @@ function findMatrixAccountEntry(cfg, accountId) {
 	const entry = resolveNormalizedAccountEntry(accounts, accountId, normalizeAccountId);
 	return isRecord(entry) ? entry : null;
 }
+function hasImplicitMatrixAccountConfig(cfg, accountId, env = process.env) {
+	const normalized = normalizeAccountId(accountId);
+	return (normalized === DEFAULT_ACCOUNT_ID || listMatrixEnvAccountIds(env).some((id) => normalizeAccountId(id) === normalized)) && hasUsableEffectiveMatrixAccountSource({
+		channel: resolveMatrixChannelConfig(cfg),
+		accountId: normalized,
+		env
+	});
+}
 function resolveConfiguredMatrixAccountIds(cfg, env = process.env) {
 	const channel = resolveMatrixChannelConfig(cfg);
 	const configuredAccountIds = listConfiguredAccountIds({
@@ -200,4 +209,4 @@ function requiresExplicitMatrixDefaultAccount(cfg, env = process.env) {
 	return !(configuredDefault && configuredAccountIds.includes(configuredDefault));
 }
 //#endregion
-export { resolveMatrixChannelConfig as a, resolveMatrixEnvAuthReadiness as c, resolveConfiguredMatrixAccountIds as i, resolveScopedMatrixEnvConfig as l, findMatrixAccountEntry as n, resolveMatrixDefaultOrOnlyAccountId as o, requiresExplicitMatrixDefaultAccount as r, resolveGlobalMatrixEnvConfig as s, account_selection_exports as t, resolveMatrixAccountStringValues as u };
+export { resolveConfiguredMatrixAccountIds as a, resolveGlobalMatrixEnvConfig as c, resolveMatrixAccountStringValues as d, requiresExplicitMatrixDefaultAccount as i, resolveMatrixEnvAuthReadiness as l, findMatrixAccountEntry as n, resolveMatrixChannelConfig as o, hasImplicitMatrixAccountConfig as r, resolveMatrixDefaultOrOnlyAccountId as s, account_selection_exports as t, resolveScopedMatrixEnvConfig as u };

package/dist/.setup/{accounts-BF5hyc-1.mjs → accounts-iThMol10.mjs}

@@ -1,6 +1,6 @@
-import { i as resolveConfiguredMatrixAccountIds, l as resolveScopedMatrixEnvConfig, o as resolveMatrixDefaultOrOnlyAccountId, s as resolveGlobalMatrixEnvConfig, u as resolveMatrixAccountStringValues } from "./account-selection-5koohRSQ.mjs";
+import { a as resolveConfiguredMatrixAccountIds, c as resolveGlobalMatrixEnvConfig, d as resolveMatrixAccountStringValues, s as resolveMatrixDefaultOrOnlyAccountId, u as resolveScopedMatrixEnvConfig } from "./account-selection-BHkfU1eC.mjs";
 import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig, t as findMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { i as loadMatrixCredentials, n as credentialsMatchConfig } from "./credentials-read-Dp7BoEdm.mjs";
+import { a as loadMatrixCredentials, o as loadMatrixCredentialsAsync, r as credentialsMatchConfig, t as captureMatrixCredentialsEnv } from "./credentials-read-Q5sHkkHv.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { hasConfiguredSecretInput } from "openclaw/plugin-sdk/secret-input";
@@ -40,16 +40,9 @@ function resolveMatrixAccountAuthView(params) {
 		password: resolvedStrings.password || void 0
 	};
 }
-function resolveMatrixAccountUserId(params) {
-	const env = params.env ?? process.env;
-	const authView = resolveMatrixAccountAuthView({
-		cfg: params.cfg,
-		accountId: params.accountId,
-		env
-	});
+function resolveMatrixAccountUserId(authView, stored) {
 	const configuredUserId = authView.userId.trim();
 	if (configuredUserId) return configuredUserId;
-	const stored = loadMatrixCredentials(env, params.accountId);
 	if (!stored) return null;
 	if (authView.homeserver && stored.homeserver !== authView.homeserver) return null;
 	if (authView.accessToken && stored.accessToken !== authView.accessToken) return null;
@@ -62,33 +55,27 @@ function listMatrixAccountIds(cfg) {
 function resolveDefaultMatrixAccountId(cfg) {
 	return normalizeAccountId(resolveMatrixDefaultOrOnlyAccountId(cfg));
 }
-function resolveConfiguredMatrixBotUserIds(params) {
+async function resolveConfiguredMatrixBotUserIds(params) {
 	const env = params.env ?? process.env;
 	const currentAccountId = normalizeAccountId(params.accountId);
-	const accountIds = new Set(resolveConfiguredMatrixAccountIds(params.cfg, env));
-	if (resolveMatrixAccount({
+	const accounts = [.../* @__PURE__ */ new Set([...resolveConfiguredMatrixAccountIds(params.cfg, env), DEFAULT_ACCOUNT_ID])].filter((accountId) => normalizeAccountId(accountId) !== currentAccountId).map((accountId) => prepareMatrixAccount({
 		cfg: params.cfg,
-		accountId: DEFAULT_ACCOUNT_ID,
+		accountId,
 		env
-	}).configured) accountIds.add(DEFAULT_ACCOUNT_ID);
+	}));
 	const ids = /* @__PURE__ */ new Set();
-	for (const accountId of accountIds) {
-		if (normalizeAccountId(accountId) === currentAccountId) continue;
-		if (!resolveMatrixAccount({
-			cfg: params.cfg,
-			accountId,
-			env
-		}).configured) continue;
-		const userId = resolveMatrixAccountUserId({
-			cfg: params.cfg,
-			accountId,
-			env
-		});
+	if (accounts.length === 0 || params.abortSignal?.aborted) return ids;
+	const credentialsEnv = captureMatrixCredentialsEnv(env);
+	for (const prepared of accounts) {
+		if (params.abortSignal?.aborted) break;
+		const stored = await loadMatrixCredentialsAsync(credentialsEnv, prepared.account.accountId);
+		if (!isMatrixAccountConfigured(prepared, stored)) continue;
+		const userId = resolveMatrixAccountUserId(prepared.authView, stored);
 		if (userId) ids.add(userId);
 	}
 	return ids;
 }
-function resolveMatrixAccount(params) {
+function prepareMatrixAccount(params) {
 	const env = params.env ?? process.env;
 	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultMatrixAccountId(params.cfg));
 	const matrixBase = resolveMatrixBaseConfig(params.cfg);
@@ -109,20 +96,34 @@ function resolveMatrixAccount(params) {
 	const hasAccessToken = Boolean(authView.accessToken) || hasConfiguredSecretInput(explicitAuthConfig.accessToken);
 	const hasPassword = Boolean(authView.password);
 	const hasPasswordAuth = hasUserId && (hasPassword || hasConfiguredSecretInput(explicitAuthConfig.password));
-	const stored = loadMatrixCredentials(env, accountId);
+	return {
+		authView,
+		hasHomeserver,
+		hasConfiguredAuth: hasAccessToken || hasPasswordAuth,
+		account: {
+			accountId,
+			enabled,
+			name: normalizeOptionalString(base.name),
+			homeserver: authView.homeserver || void 0,
+			userId: authView.userId || void 0,
+			config: base
+		}
+	};
+}
+function isMatrixAccountConfigured(prepared, stored) {
+	const { authView } = prepared;
 	const hasStored = stored && authView.homeserver ? credentialsMatchConfig(stored, {
 		homeserver: authView.homeserver,
 		userId: authView.userId || ""
 	}) : false;
-	const configured = hasHomeserver && (hasAccessToken || hasPasswordAuth || hasStored);
+	return prepared.hasHomeserver && (prepared.hasConfiguredAuth || hasStored);
+}
+function resolveMatrixAccount(params) {
+	const prepared = prepareMatrixAccount(params);
+	const stored = loadMatrixCredentials(params.env ?? process.env, prepared.account.accountId);
 	return {
-		accountId,
-		enabled,
-		name: normalizeOptionalString(base.name),
-		configured,
-		homeserver: authView.homeserver || void 0,
-		userId: authView.userId || void 0,
-		config: base
+		...prepared.account,
+		configured: isMatrixAccountConfigured(prepared, stored)
 	};
 }
 //#endregion

package/dist/.setup/{approval-handler.runtime-CoZCYGUH.mjs → approval-handler.runtime-9W7R2ZMq.mjs}

@@ -1,10 +1,10 @@
-import { i as resolveMatrixAccount } from "./accounts-BF5hyc-1.mjs";
-import { v as isMatrixAnyApprovalClientEnabled, y as shouldHandleMatrixApprovalRequest } from "./channel-q6TBKEiG.mjs";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
+import { v as isMatrixAnyApprovalClientEnabled, y as shouldHandleMatrixApprovalRequest } from "./channel-ConuJfxT.mjs";
 import { o as resolveMatrixTargetIdentity } from "./target-ids-Nwx7cMVE.mjs";
 import { a as repairMatrixDirectRooms } from "./direct-management-B2Bno2xL.mjs";
-import { a as sendSingleTextMessageMatrix, n as reactMatrixMessage, r as sendMessageMatrix } from "./send-h0gZ_-qk.mjs";
+import { a as sendSingleTextMessageMatrix, n as reactMatrixMessage, r as sendMessageMatrix } from "./send-aVdC5NJO.mjs";
 import { a as unregisterMatrixApprovalReactionTarget, n as listMatrixApprovalReactionBindings, r as registerMatrixApprovalReactionTarget, t as buildMatrixApprovalReactionHint } from "./approval-reactions-B0hfA6qz.mjs";
-import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-SW0NPYnR.mjs";
+import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-COuAcrz-.mjs";
 import { listMessageReceiptPlatformIds, resolveMessageReceiptPrimaryId } from "openclaw/plugin-sdk/channel-outbound";
 import { normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
@@ -60,7 +60,7 @@ async function prepareTarget(params) {
 	if (!target) return null;
 	const threadId = normalizeThreadId(params.rawTarget.threadId);
 	if (target.kind === "user") {
-		const account = resolveMatrixAccount({
+		const accountConfig = resolveMatrixAccountConfig({
 			cfg: params.cfg,
 			accountId: resolved.accountId
 		});
@@ -68,7 +68,7 @@ async function prepareTarget(params) {
 		const repaired = await retryMatrixApprovalDelivery(async () => await repairDirectRooms({
 			client: resolved.context.client,
 			remoteUserId: target.id,
-			encrypted: account.config.encryption === true
+			encrypted: accountConfig.encryption === true
 		}));
 		if (!repaired.activeRoomId) return null;
 		return {

package/dist/.setup/{approval-ids-CZOcdJ-5.mjs → approval-ids-j08q8LEG.mjs}

@@ -1,4 +1,4 @@
-import { a as normalizeMatrixUserId } from "./channel.setup-DZQ5rf9k.mjs";
+import { a as normalizeMatrixUserId } from "./channel.setup-C6KvBV8l.mjs";
 //#region extensions/matrix/src/approval-ids.ts
 function normalizeMatrixApproverId(value) {
 	return normalizeMatrixUserId(String(value)) || void 0;

package/dist/.setup/{approval-reaction-auth-B51E4ZDa.mjs → approval-reaction-auth-DMVE7VSp.mjs}

@@ -1,5 +1,6 @@
-import { i as resolveMatrixAccount } from "./accounts-BF5hyc-1.mjs";
-import { t as normalizeMatrixApproverId } from "./approval-ids-CZOcdJ-5.mjs";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
+import { r as resolveDefaultMatrixAccountId } from "./accounts-iThMol10.mjs";
+import { t as normalizeMatrixApproverId } from "./approval-ids-j08q8LEG.mjs";
 import { resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
 //#region extensions/matrix/src/approval-reaction-auth.ts
 function normalizeMatrixExecApproverId(value) {
@@ -7,7 +8,10 @@ function normalizeMatrixExecApproverId(value) {
 	return normalized === "*" ? void 0 : normalized;
 }
 function getMatrixApprovalReactionApprovers(params) {
-	const account = resolveMatrixAccount(params).config;
+	const account = resolveMatrixAccountConfig({
+		cfg: params.cfg,
+		accountId: params.accountId ?? resolveDefaultMatrixAccountId(params.cfg)
+	});
 	if (params.approvalKind === "plugin") return resolveApprovalApprovers({
 		allowFrom: account.dm?.allowFrom,
 		normalizeApprover: normalizeMatrixApproverId

package/dist/.setup/{channel-q6TBKEiG.mjs → channel-ConuJfxT.mjs}

@@ -1,8 +1,8 @@
-import { r as requiresExplicitMatrixDefaultAccount } from "./account-selection-5koohRSQ.mjs";
+import { i as requiresExplicitMatrixDefaultAccount, n as findMatrixAccountEntry, r as hasImplicitMatrixAccountConfig } from "./account-selection-BHkfU1eC.mjs";
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BF5hyc-1.mjs";
-import { a as normalizeMatrixUserId, r as DEFAULT_ACCOUNT_ID$2, t as matrixPluginBase } from "./channel.setup-DZQ5rf9k.mjs";
-import { t as normalizeMatrixApproverId } from "./approval-ids-CZOcdJ-5.mjs";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-iThMol10.mjs";
+import { a as normalizeMatrixUserId, r as DEFAULT_ACCOUNT_ID$2, t as matrixPluginBase } from "./channel.setup-C6KvBV8l.mjs";
+import { t as normalizeMatrixApproverId } from "./approval-ids-j08q8LEG.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 { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-HyWFZQVG.mjs";
 import { f as setMatrixThreadBindingMaxAgeBySessionKey, u as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings-shared-oNPiyMWY.mjs";
@@ -36,7 +36,8 @@ import { formatLocationText, logInboundDrop, toLocationContext } from "openclaw/
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-local-roots";
 import { buildChannelKeyCandidates } from "openclaw/plugin-sdk/channel-targets";
 import { resolveConfiguredAcpBindingRecord } from "openclaw/plugin-sdk/acp-binding-resolve-runtime";
-import { resolveRuntimeConversationBindingRoute } from "openclaw/plugin-sdk/conversation-binding-runtime";
+import { inspectConversationBinding } from "openclaw/plugin-sdk/conversation-binding-inspection-runtime";
+import { inspectRuntimeConversationBindingRoute } from "openclaw/plugin-sdk/conversation-binding-runtime";
 import { deliveryContextFromSession, getSessionEntry, resolveStorePath, sessionDeliveryOrigin } from "openclaw/plugin-sdk/session-store-runtime";
 //#region extensions/matrix/src/actions.ts
 const MATRIX_PLUGIN_HANDLED_ACTIONS = /* @__PURE__ */ new Set([
@@ -156,7 +157,7 @@ const matrixMessageActions = {
 		return account && createActionGate(account.config.actions)("messages") ? payload : null;
 	},
 	handleAction: async (ctx) => {
-		const { handleMatrixAction } = await import("./tool-actions.runtime-Dckttu43.mjs");
+		const { handleMatrixAction } = await import("./tool-actions.runtime-REzYTNxm.mjs");
 		return await handleMatrixAction(ctx);
 	}
 };
@@ -165,10 +166,10 @@ const matrixMessageActions = {
 const matrixApproval = createChannelApprovalAuth({
 	channelLabel: "Matrix",
 	resolveInputs: ({ cfg, accountId }) => {
-		return { allowFrom: resolveMatrixAccount({
+		return { allowFrom: resolveMatrixAccountConfig({
 			cfg,
-			accountId
-		}).config.dm?.allowFrom };
+			accountId: accountId ?? resolveDefaultMatrixAccountId(cfg)
+		}).dm?.allowFrom };
 	},
 	normalizeApprover: normalizeMatrixApproverId
 });
@@ -222,7 +223,10 @@ function matchesMatrixRequestAccount(params) {
 	});
 }
 function getMatrixExecApprovalApprovers(params) {
-	const account = resolveMatrixAccount(params).config;
+	const account = resolveMatrixAccountConfig({
+		cfg: params.cfg,
+		accountId: params.accountId ?? resolveDefaultMatrixAccountId(params.cfg)
+	});
 	return resolveApprovalApprovers({
 		explicit: account.execApprovals?.approvers,
 		allowFrom: account.dm?.allowFrom,
@@ -481,7 +485,7 @@ const matrixNativeApprovalCapability = createApproverRestrictedNativeApprovalCap
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-CoZCYGUH.mjs")).matrixApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-9W7R2ZMq.mjs")).matrixApprovalNativeRuntime
 	})
 });
 const splitMatrixApprovalCapability = splitChannelApprovalCapability(matrixNativeApprovalCapability);
@@ -756,10 +760,10 @@ function resolveMatrixInboundRoute(params) {
 		conversationId: bindingConversationId,
 		parentConversationId: bindingParentConversationId
 	};
-	const runtimeRoute = resolveRuntimeConversationBindingRoute({
+	const inspection = inspectConversationBinding(bindingRef);
+	const runtimeRoute = inspectRuntimeConversationBindingRoute({
 		route: baseRoute,
-		conversation: bindingRef,
-		touchBinding: false
+		inspection
 	});
 	const runtimeBinding = runtimeRoute.bindingRecord;
 	if (runtimeBinding && runtimeRoute.boundSessionKey) return {
@@ -776,7 +780,7 @@ function resolveMatrixInboundRoute(params) {
 		parentConversationId: bindingParentConversationId
 	}) : null;
 	const configuredSessionKey = configuredBinding?.record.targetSessionKey?.trim();
-	const effectiveRoute = configuredBinding && configuredSessionKey ? {
+	const configuredFallbackRoute = configuredBinding && configuredSessionKey ? {
 		...baseRoute,
 		sessionKey: configuredSessionKey,
 		agentId: resolveAgentIdFromSessionKey(configuredSessionKey, configuredBinding.spec.agentId),
@@ -785,7 +789,11 @@ function resolveMatrixInboundRoute(params) {
 			mainSessionKey: baseRoute.mainSessionKey
 		}),
 		matchedBy: "binding.channel"
-	} : baseRoute;
+	} : runtimeRoute.route;
+	const effectiveRoute = configuredBinding ? inspectRuntimeConversationBindingRoute({
+		route: configuredFallbackRoute,
+		inspection
+	}).route : configuredFallbackRoute;
 	const dmSessionKey = params.isDirectMessage && !configuredSessionKey ? resolveMatrixDmSessionKey({
 		accountId: params.accountId,
 		agentId: effectiveRoute.agentId,
@@ -831,7 +839,10 @@ function resolveMatrixInboundRoute(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/conversation-route-owner.ts
 function resolveMatrixConversationRouteOwner(params) {
-	const { cfg, accountId, conversation } = params;
+	const { cfg, conversation } = params;
+	const accountId = normalizeAccountId(params.accountId);
+	const accountConfig = findMatrixAccountEntry(cfg, accountId);
+	if (cfg.channels?.matrix?.enabled === false || accountConfig?.enabled === false || !accountConfig && !hasImplicitMatrixAccountConfig(cfg, accountId)) return null;
 	const roomId = conversation.nativeChannelId?.trim() || (conversation.kind === "direct" ? "" : conversation.peerId.trim());
 	if (!roomId) return null;
 	const isDirectMessage = conversation.kind === "direct";
@@ -841,10 +852,6 @@ function resolveMatrixConversationRouteOwner(params) {
 		roomId,
 		senderId: conversation.peerId,
 		isDirectMessage,
-		dmSessionScope: resolveMatrixAccount({
-			cfg,
-			accountId
-		}).config.dm?.sessionScope,
 		threadId: conversation.threadId,
 		resolveAgentRoute
 	});
@@ -861,7 +868,7 @@ function resolveMatrixConversationRouteOwner(params) {
 }
 //#endregion
 //#region extensions/matrix/src/resolver.ts
-const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-Ci6ddcPh.mjs"), "matrixResolverRuntime");
+const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-CuLQ2uHe.mjs"), "matrixResolverRuntime");
 const matrixResolverAdapter = { resolveTargets: async ({ cfg, accountId, inputs, kind, runtime }) => (await loadMatrixChannelRuntime$1()).resolveMatrixTargets({
 	cfg,
 	accountId,
@@ -990,7 +997,7 @@ function resolveMatrixOutboundSessionRoute(params) {
 //#endregion
 //#region extensions/matrix/src/channel.ts
 let matrixStartupLock = Promise.resolve();
-const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-DcDBdxe6.mjs"), "matrixChannelRuntime");
+const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-CnxR2JUK.mjs"), "matrixChannelRuntime");
 const loadMatrixDoctorModule = createLazyRuntimeModule(() => import("./doctor-BLCvdOFo.mjs"));
 function buildMatrixTrafficStatusSummary(snapshot) {
 	return {
@@ -1014,11 +1021,14 @@ const matrixDoctor = {
 };
 const listMatrixDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister({
 	kind: "user",
-	resolveAccount: adaptScopedAccountAccessor(resolveMatrixAccount),
+	resolveAccount: (cfg, accountId) => resolveMatrixAccountConfig({
+		cfg,
+		accountId: accountId ?? resolveDefaultMatrixAccountId(cfg)
+	}),
 	resolveSources: (account) => [
-		account.config.dm?.allowFrom ?? [],
-		account.config.groupAllowFrom ?? [],
-		...Object.values(account.config.groups ?? account.config.rooms ?? {}).map((room) => room.users ?? [])
+		account.dm?.allowFrom ?? [],
+		account.groupAllowFrom ?? [],
+		...Object.values(account.groups ?? account.rooms ?? {}).map((room) => room.users ?? [])
 	],
 	normalizeId: (entry) => {
 		const raw = entry.replace(/^matrix:/i, "").trim();
@@ -1029,8 +1039,11 @@ const listMatrixDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister(
 });
 const listMatrixDirectoryGroupsFromConfig = createResolvedDirectoryEntriesLister({
 	kind: "group",
-	resolveAccount: adaptScopedAccountAccessor(resolveMatrixAccount),
-	resolveSources: (account) => [Object.keys(account.config.groups ?? account.config.rooms ?? {})],
+	resolveAccount: (cfg, accountId) => resolveMatrixAccountConfig({
+		cfg,
+		accountId: accountId ?? resolveDefaultMatrixAccountId(cfg)
+	}),
+	resolveSources: (account) => [Object.keys(account.groups ?? account.rooms ?? {})],
 	normalizeId: (entry) => {
 		const raw = entry.replace(/^matrix:/i, "").trim();
 		if (!raw || raw === "*") return null;
@@ -1341,7 +1354,7 @@ const matrixPlugin = createChatChannelPlugin({
 			await previousLock;
 			let monitorMatrixProvider;
 			try {
-				monitorMatrixProvider = (await import("./monitor-DQfYX5rA.mjs")).monitorMatrixProvider;
+				monitorMatrixProvider = (await import("./monitor-CzE3myC_.mjs")).monitorMatrixProvider;
 			} finally {
 				releaseLock();
 			}

package/dist/.setup/{channel.runtime-DcDBdxe6.mjs → channel.runtime-CnxR2JUK.mjs}

@@ -1,14 +1,14 @@
-import { T as reconcileMatrixUnknownSend, o as sendTypingMatrix, r as sendMessageMatrix, w as cleanupMatrixDeliveryPlans } from "./send-h0gZ_-qk.mjs";
-import { u as resolveMatrixAuth } from "./client-DsJUnWlV.mjs";
-import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-CatwztQc.mjs";
-import { t as matrixOutbound } from "./outbound-DRWtSUe-.mjs";
-import { t as resolveMatrixTargets } from "./resolve-targets-drjgAdIe.mjs";
+import { T as reconcileMatrixUnknownSend, o as sendTypingMatrix, r as sendMessageMatrix, w as cleanupMatrixDeliveryPlans } from "./send-aVdC5NJO.mjs";
+import { d as resolveMatrixAuth } from "./client-ChrXpxos.mjs";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-CxqkcYbT.mjs";
+import { t as matrixOutbound } from "./outbound-B508VPBM.mjs";
+import { t as resolveMatrixTargets } from "./resolve-targets-BLz748lX.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 { runChannelProbe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/matrix/src/matrix/probe.ts
-const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./probe.runtime-qPRZE3Yf.mjs").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient })));
+const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./probe.runtime-C-NMeYk2.mjs").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient })));
 async function probeMatrix(params) {
 	return await runChannelProbe(void 0, async () => {
 		const result = {

package/dist/.setup/{channel.setup-DZQ5rf9k.mjs → channel.setup-C6KvBV8l.mjs}

@@ -1,6 +1,6 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BF5hyc-1.mjs";
-import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-BUcDAM7q.mjs";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-iThMol10.mjs";
+import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-D2hMbIi3.mjs";
 import { adaptScopedAccountAccessor, createScopedChannelConfigAdapter } from "openclaw/plugin-sdk/channel-config-helpers";
 import { createChannelConfigUiHints } from "openclaw/plugin-sdk/channel-core";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -318,7 +318,7 @@ const matrixPluginBase = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-V_Q-enq-.mjs").then((n) => n.t)).matrixSetupWizard })),
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-BL3ha1l-.mjs").then((n) => n.t)).matrixSetupWizard })),
 	setupContract: matrixSetupContract,
 	capabilities: {
 		chatTypes: [

package/dist/.setup/{cli-Cx_cNaXN.mjs → cli-O196sg8g.mjs}

@@ -1,15 +1,15 @@
 import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { i as resolveMatrixAccount } from "./accounts-BF5hyc-1.mjs";
+import { i as resolveMatrixAccount } from "./accounts-iThMol10.mjs";
 import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-B_4qZ5bV.mjs";
-import { n as matrixSetupAdapter } from "./setup-core-BUcDAM7q.mjs";
-import { n as withResolvedActionClient } from "./client-By2B3Wz4.mjs";
-import { d as resolveMatrixAuthContext } from "./client-DsJUnWlV.mjs";
+import { n as matrixSetupAdapter } from "./setup-core-D2hMbIi3.mjs";
+import { n as withResolvedActionClient } from "./client-C2yVkVdw.mjs";
+import { f as resolveMatrixAuthContext } from "./client-ChrXpxos.mjs";
 import { t as resolveMatrixRoomKeyBackupIssue } from "./backup-health-Dm_YMVFT.mjs";
 import { i as setMatrixSdkLogMode, r as setMatrixSdkConsoleLogging } from "./logging-rgm8ep9H.mjs";
 import { n as isOpenClawManagedMatrixDevice, r as summarizeMatrixDeviceHealth } from "./device-health-CWOuIirq.mjs";
-import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-DPttQz3-.mjs";
-import { a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, g as runMatrixSelfVerification, h as restoreMatrixRoomKeyBackup, l as getMatrixVerificationSas, m as resetMatrixRoomKeyBackup, n as bootstrapMatrixVerification, p as requestMatrixVerification, r as cancelMatrixVerification, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-CKqBZ9mI.mjs";
+import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-DrblJttE.mjs";
+import { a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, g as runMatrixSelfVerification, h as restoreMatrixRoomKeyBackup, l as getMatrixVerificationSas, m as resetMatrixRoomKeyBackup, n as bootstrapMatrixVerification, p as requestMatrixVerification, r as cancelMatrixVerification, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-0o8MOW9T.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -448,7 +448,7 @@ async function addMatrixAccount(params) {
 			backupVersion: null
 		};
 		if (accountConfig.encryption === true) {
-			const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-BYgBD504.mjs");
+			const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-A_WGFq1Y.mjs");
 			verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
 				previousCfg: cfg,
 				cfg: updated,
@@ -636,7 +636,7 @@ function registerMatrixDeviceCommands(root) {
 }
 //#endregion
 //#region extensions/matrix/src/cli-direct.ts
-const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-By2B3Wz4.mjs").then((n) => n.t));
+const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-C2yVkVdw.mjs").then((n) => n.t));
 const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./direct-management-B2Bno2xL.mjs").then((n) => n.t));
 function printDirectRoomCandidate(room) {
 	const members = room.joinedMembers === null ? "unavailable" : room.joinedMembers.map((member) => formatMatrixCliText(member)).join(", ") || "none";
@@ -678,7 +678,7 @@ async function inspectMatrixDirectRoom(params) {
 }
 async function repairMatrixDirectRoom(params) {
 	const cfg = getMatrixRuntime().config.current();
-	const account = resolveMatrixAccount({
+	const accountConfig = resolveMatrixAccountConfig({
 		cfg,
 		accountId: params.accountId
 	});
@@ -690,7 +690,7 @@ async function repairMatrixDirectRoom(params) {
 		const repaired = await repairMatrixDirectRooms({
 			client,
 			remoteUserId: params.userId,
-			encrypted: account.config.encryption === true
+			encrypted: accountConfig.encryption === true
 		});
 		return {
 			accountId: params.accountId,
@@ -700,7 +700,7 @@ async function repairMatrixDirectRoom(params) {
 			mappedRooms: repaired.mappedRooms.map(toCliDirectRoomCandidate),
 			discoveredStrictRoomIds: repaired.discoveredStrictRoomIds,
 			activeRoomId: repaired.activeRoomId,
-			encrypted: account.config.encryption === true,
+			encrypted: accountConfig.encryption === true,
 			createdRoomId: repaired.createdRoomId,
 			changed: repaired.changed,
 			directContentBefore: repaired.directContentBefore,

package/dist/.setup/{cli-metadata-DHU1H-Vr.mjs → cli-metadata-DFHQj5XR.mjs}

@@ -2,7 +2,7 @@ import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 //#region extensions/matrix/src/cli-metadata.ts
 function registerMatrixCliMetadata(api) {
 	api.registerCli(async ({ program }) => {
-		const { registerMatrixCli } = await import("./cli-Cx_cNaXN.mjs");
+		const { registerMatrixCli } = await import("./cli-O196sg8g.mjs");
 		registerMatrixCli({ program });
 	}, { descriptors: [{
 		name: "matrix",

package/dist/.setup/{client-By2B3Wz4.mjs → client-C2yVkVdw.mjs}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
-import { E as resolveMatrixRoomId } from "./send-h0gZ_-qk.mjs";
+import { E as resolveMatrixRoomId } from "./send-aVdC5NJO.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/matrix/src/matrix/actions/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({
@@ -7,7 +7,7 @@ var client_exports = /* @__PURE__ */ __exportAll({
 	withResolvedRoomAction: () => withResolvedRoomAction,
 	withStartedActionClient: () => withStartedActionClient
 });
-const loadMatrixActionClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-DGX0f-4x.mjs"));
+const loadMatrixActionClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-BSnUAoz1.mjs"));
 async function withResolvedActionClient(opts, run, mode = "stop") {
 	const { withResolvedRuntimeMatrixClient } = await loadMatrixActionClientRuntime();
 	return await withResolvedRuntimeMatrixClient(opts, run, mode);