@openclaw/matrix 2026.5.12 → 2026.5.14-beta.2

package/dist/api.js

@@ -2,10 +2,10 @@ import { d as setMatrixThreadBindingIdleTimeoutBySessionKey, n as getMatrixThrea
 import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-BWwIruri.js";
 import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./env-vars-C7uQCTKn.js";
 import { a as resolveMatrixCredentialsPath, c as resolveMatrixLegacyFlatStoreRoot, i as resolveMatrixCredentialsFilename, l as sanitizeMatrixPathSegment, n as resolveMatrixAccountStorageRoot, o as resolveMatrixHomeserverKey, r as resolveMatrixCredentialsDir, s as resolveMatrixLegacyFlatStoragePaths, t as hashMatrixAccessToken } from "./storage-paths-BJLdnCjV.js";
-import { t as matrixPlugin } from "./channel-B-R2dceO.js";
-import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-B5X7HxAP.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-DuRQrrpU.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings--P1UYe7t.js";
+import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-CgOV8zmh.js";
+import { t as matrixPlugin } from "./channel-BLKRuTHs.js";
+import { n as matrixOnboardingAdapter } from "./setup-surface-BgUaEySF.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-8AyQOYDT.js";
 //#region extensions/matrix/api.ts
 const matrixSessionBindingAdapterChannels = ["matrix"];
 //#endregion

package/dist/{approval-handler.runtime-LpWmoFyw.js → approval-handler.runtime-Q8ZlmQv_.js}

@@ -1,10 +1,9 @@
 import { a as resolveMatrixTargetIdentity } from "./target-ids-80nQ2gql.js";
-import { i as resolveMatrixAccount } from "./accounts-Bm90Rzvp.js";
-import { c as shouldHandleMatrixApprovalRequest, r as isMatrixAnyApprovalClientEnabled } from "./exec-approvals-Crnh543m.js";
-import { a as sendMessageMatrix, i as reactMatrixMessage, s as sendSingleTextMessageMatrix } from "./send-Df-pDuG6.js";
-import { a as repairMatrixDirectRooms } from "./direct-management--Y8ypgLv.js";
-import { a as unregisterMatrixApprovalReactionTarget, n as listMatrixApprovalReactionBindings, r as registerMatrixApprovalReactionTarget, t as buildMatrixApprovalReactionHint } from "./approval-reactions-o2_tuH8D.js";
-import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-DQ8xXWiP.js";
+import { g as resolveMatrixAccount } from "./setup-core-CgOV8zmh.js";
+import { _ as shouldHandleMatrixApprovalRequest, g as isMatrixAnyApprovalClientEnabled } from "./channel-BLKRuTHs.js";
+import { a as sendMessageMatrix, i as reactMatrixMessage, p as repairMatrixDirectRooms, s as sendSingleTextMessageMatrix } from "./send-CdoJ1pZY.js";
+import { a as unregisterMatrixApprovalReactionTarget, n as listMatrixApprovalReactionBindings, r as registerMatrixApprovalReactionTarget, t as buildMatrixApprovalReactionHint } from "./approval-reactions-Cwd1PMCC.js";
+import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-BKTEUSwJ.js";
 import { listMessageReceiptPlatformIds, resolveMessageReceiptPrimaryId } from "openclaw/plugin-sdk/channel-message";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { setTimeout } from "node:timers/promises";

package/dist/{approval-ids-DoC2z7tR.js → approval-ids-D6IQvvRE.js}

@@ -1,4 +1,4 @@
-import { n as normalizeMatrixUserId } from "./allowlist-sTzpCn5d.js";
+import { a as normalizeMatrixUserId } from "./config-schema-BPCzSyjT.js";
 //#region extensions/matrix/src/approval-ids.ts
 function normalizeMatrixApproverId(value) {
 	return normalizeMatrixUserId(String(value)) || void 0;

package/dist/{approval-reaction-auth-DbcA1gGd.js → approval-reaction-auth-99PRu7rF.js}

@@ -1,5 +1,5 @@
-import { i as resolveMatrixAccount } from "./accounts-Bm90Rzvp.js";
-import { t as normalizeMatrixApproverId } from "./approval-ids-DoC2z7tR.js";
+import { g as resolveMatrixAccount } from "./setup-core-CgOV8zmh.js";
+import { t as normalizeMatrixApproverId } from "./approval-ids-D6IQvvRE.js";
 import { resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
 //#region extensions/matrix/src/approval-reaction-auth.ts
 function normalizeMatrixExecApproverId(value) {

package/dist/{channel-B-R2dceO.js → channel-BLKRuTHs.js}

@@ -1,21 +1,16 @@
 import { a as resolveMatrixTargetIdentity, i as resolveMatrixDirectUserId, n as normalizeMatrixMessagingTarget, r as normalizeMatrixResolvableTarget } from "./target-ids-80nQ2gql.js";
 import { d as setMatrixThreadBindingIdleTimeoutBySessionKey, p as setMatrixThreadBindingMaxAgeBySessionKey } from "./thread-bindings-shared-DK-d-oYX.js";
 import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-BWwIruri.js";
-import { a as resolveMatrixAccountConfig } from "./account-config-D2W-V1eQ.js";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-Bm90Rzvp.js";
-import { n as normalizeMatrixUserId } from "./allowlist-sTzpCn5d.js";
-import { t as normalizeMatrixApproverId } from "./approval-ids-DoC2z7tR.js";
-import { a as isMatrixExecApprovalAuthorizedSender, c as shouldHandleMatrixApprovalRequest, d as matrixApprovalAuth, 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-Crnh543m.js";
-import { t as formatMatrixErrorMessage } from "./errors-CTcpEDq-.js";
-import { n as DEFAULT_ACCOUNT_ID$2, r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-B975BYl0.js";
-import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-D4-64QuJ.js";
-import { n as resolveMatrixRoomConfig, t as resolveMatrixStoredSessionMeta } from "./session-store-metadata-DQXjgNLt.js";
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-DcrJWCQI.js";
-import { a as namedAccountPromotionKeys, o as resolveSingleAccountPromotionTarget, s as singleAccountKeysToMove } from "./setup-dm-policy-Ca3jA4YW.js";
-import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-B5X7HxAP.js";
-import { i as autoPrepareLegacyMatrixCrypto, o as autoMigrateLegacyMatrixState, r as resolveMatrixMigrationStatus } from "./matrix-migration.runtime-DfjNMeoX.js";
-import { t as maybeCreateMatrixMigrationSnapshot } from "./migration-snapshot-backup-DaCHTp8C.js";
-import { n as resolveMatrixInboundConversation } from "./thread-binding-api-Cq_E-E1K.js";
+import { c as resolveMatrixAccountConfig } from "./config-paths-msaDGRh6.js";
+import { d as resolveSingleAccountPromotionTarget, f as singleAccountKeysToMove, g as resolveMatrixAccount, h as resolveDefaultMatrixAccountId, n as matrixSetupAdapter, p as listMatrixAccountIds, t as createMatrixSetupWizardProxy, u as namedAccountPromotionKeys } from "./setup-core-CgOV8zmh.js";
+import { a as normalizeMatrixUserId, n as DEFAULT_ACCOUNT_ID$2, r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-BPCzSyjT.js";
+import { t as normalizeMatrixApproverId } from "./approval-ids-D6IQvvRE.js";
+import { t as formatMatrixErrorMessage } from "./errors-BpHgvm2o.js";
+import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-s4gUPmRN.js";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-e4SdhUtT.js";
+import { i as autoPrepareLegacyMatrixCrypto, o as autoMigrateLegacyMatrixState, r as resolveMatrixMigrationStatus } from "./matrix-migration.runtime-Cf_wX9mk.js";
+import { t as maybeCreateMatrixMigrationSnapshot } from "./migration-snapshot-backup-BWTIFXgQ.js";
+import { n as resolveMatrixInboundConversation } from "./thread-binding-api-Bx55B6hm.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { createScopedAccountReplyToModeResolver } from "openclaw/plugin-sdk/conversation-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -34,10 +29,18 @@ import { extractToolSend } from "openclaw/plugin-sdk/tool-send";
 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 { parseThreadSessionSuffix } from "openclaw/plugin-sdk/routing";
+import { createChannelNativeOriginTargetResolver, resolveApprovalRequestChannelAccountId, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
+import { createResolvedApproverActionAuthAdapter, resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
+import { addAllowlistUserEntriesFromConfigEntry, buildAllowlistResolutionSummary, canonicalizeAllowlistWithResolvedIds, patchAllowlistUsersInConfigEntries, summarizeMapping } from "openclaw/plugin-sdk/allow-from";
+import { createChannelExecApprovalProfile, getExecApprovalReplyMetadata, isChannelExecApprovalClientEnabledFromConfig, isChannelExecApprovalTargetRecipient, matchesApprovalRequestFilters } from "openclaw/plugin-sdk/approval-client-runtime";
+import { normalizeAccountId as normalizeAccountId$1, parseThreadSessionSuffix } from "openclaw/plugin-sdk/routing";
 import { createPairingPrefixStripper } from "openclaw/plugin-sdk/channel-pairing";
 import { PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk/channel-status";
+import { createReplyPrefixOptions, createTypingCallbacks } from "openclaw/plugin-sdk/channel-reply-options-runtime";
+import { formatLocationText, toLocationContext } from "openclaw/plugin-sdk/channel-location";
+import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/agent-media-payload";
+import { logInboundDrop, logTypingFailure } from "openclaw/plugin-sdk/channel-logging";
+import { buildChannelKeyCandidates, resolveChannelEntryMatch } from "openclaw/plugin-sdk/channel-targets";
 import { loadSessionStore, resolveSessionStoreEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 //#region extensions/matrix/src/actions.ts
 const MATRIX_PLUGIN_HANDLED_ACTIONS = new Set([
@@ -129,7 +132,7 @@ const matrixMessageActions = {
 		return extractToolSend(args, "sendMessage");
 	},
 	handleAction: async (ctx) => {
-		const { handleMatrixAction } = await import("./tool-actions.runtime-AFGhzK--.js");
+		const { handleMatrixAction } = await import("./tool-actions.runtime-BuCnleVD.js");
 		const { action, params, cfg, accountId, mediaLocalRoots } = ctx;
 		const dispatch = async (actionParams) => await handleMatrixAction({
 			...actionParams,
@@ -269,6 +272,194 @@ const matrixMessageActions = {
 	}
 };
 //#endregion
+//#region extensions/matrix/src/approval-auth.ts
+function getMatrixApprovalAuthApprovers(params) {
+	return resolveApprovalApprovers({
+		allowFrom: resolveMatrixAccount(params).config.dm?.allowFrom,
+		normalizeApprover: normalizeMatrixApproverId
+	});
+}
+const matrixApprovalAuth = createResolvedApproverActionAuthAdapter({
+	channelLabel: "Matrix",
+	resolveApprovers: ({ cfg, accountId }) => getMatrixApprovalAuthApprovers({
+		cfg,
+		accountId
+	}),
+	normalizeSenderId: (value) => normalizeMatrixApproverId(value)
+});
+//#endregion
+//#region extensions/matrix/src/exec-approvals.ts
+function normalizeMatrixExecApproverId(value) {
+	const normalized = normalizeMatrixApproverId(value);
+	return normalized === "*" ? void 0 : normalized;
+}
+function resolveMatrixExecApprovalConfig(params) {
+	const account = resolveMatrixAccount(params);
+	const config = account.config.execApprovals;
+	if (!config) return;
+	return {
+		...config,
+		enabled: account.enabled && account.configured ? config.enabled : false
+	};
+}
+function countMatrixExecApprovalEligibleAccounts(params) {
+	return listMatrixAccountIds(params.cfg).filter((accountId) => {
+		const account = resolveMatrixAccount({
+			cfg: params.cfg,
+			accountId
+		});
+		if (!account.enabled || !account.configured) return false;
+		const config = resolveMatrixExecApprovalConfig({
+			cfg: params.cfg,
+			accountId
+		});
+		const filters = config?.enabled ? {
+			agentFilter: config.agentFilter,
+			sessionFilter: config.sessionFilter
+		} : {
+			agentFilter: void 0,
+			sessionFilter: void 0
+		};
+		return isChannelExecApprovalClientEnabledFromConfig({
+			enabled: config?.enabled,
+			approverCount: getMatrixApprovalApprovers({
+				cfg: params.cfg,
+				accountId,
+				approvalKind: params.approvalKind
+			}).length
+		}) && matchesApprovalRequestFilters({
+			request: params.request.request,
+			agentFilter: filters.agentFilter,
+			sessionFilter: filters.sessionFilter
+		});
+	}).length;
+}
+function matchesMatrixRequestAccount(params) {
+	const turnSourceChannel = normalizeLowercaseStringOrEmpty(params.request.request.turnSourceChannel);
+	const boundAccountId = resolveApprovalRequestChannelAccountId({
+		cfg: params.cfg,
+		request: params.request,
+		channel: "matrix"
+	});
+	if (turnSourceChannel && turnSourceChannel !== "matrix" && !boundAccountId) return countMatrixExecApprovalEligibleAccounts({
+		cfg: params.cfg,
+		request: params.request,
+		approvalKind: params.approvalKind
+	}) <= 1;
+	return !boundAccountId || !params.accountId || normalizeAccountId$1(boundAccountId) === normalizeAccountId$1(params.accountId);
+}
+function getMatrixExecApprovalApprovers(params) {
+	const account = resolveMatrixAccount(params).config;
+	return resolveApprovalApprovers({
+		explicit: account.execApprovals?.approvers,
+		allowFrom: account.dm?.allowFrom,
+		normalizeApprover: normalizeMatrixExecApproverId
+	});
+}
+function resolveMatrixApprovalKind(request) {
+	return request.id.startsWith("plugin:") ? "plugin" : "exec";
+}
+function getMatrixApprovalApprovers(params) {
+	if (params.approvalKind === "plugin") return getMatrixApprovalAuthApprovers({
+		cfg: params.cfg,
+		accountId: params.accountId
+	});
+	return getMatrixExecApprovalApprovers(params);
+}
+function isMatrixExecApprovalTargetRecipient(params) {
+	return isChannelExecApprovalTargetRecipient({
+		...params,
+		channel: "matrix",
+		normalizeSenderId: normalizeMatrixApproverId,
+		matchTarget: ({ target, normalizedSenderId }) => normalizeMatrixApproverId(target.to) === normalizedSenderId
+	});
+}
+const matrixExecApprovalProfile = createChannelExecApprovalProfile({
+	resolveConfig: resolveMatrixExecApprovalConfig,
+	resolveApprovers: getMatrixExecApprovalApprovers,
+	normalizeSenderId: normalizeMatrixApproverId,
+	isTargetRecipient: isMatrixExecApprovalTargetRecipient,
+	matchesRequestAccount: (params) => matchesMatrixRequestAccount({
+		...params,
+		approvalKind: "exec"
+	})
+});
+const isMatrixExecApprovalClientEnabled = matrixExecApprovalProfile.isClientEnabled;
+matrixExecApprovalProfile.isApprover;
+const isMatrixExecApprovalAuthorizedSender = matrixExecApprovalProfile.isAuthorizedSender;
+const resolveMatrixExecApprovalTarget = matrixExecApprovalProfile.resolveTarget;
+matrixExecApprovalProfile.shouldHandleRequest;
+function isMatrixApprovalClientEnabled(params) {
+	if (params.approvalKind === "exec") return isMatrixExecApprovalClientEnabled(params);
+	return isChannelExecApprovalClientEnabledFromConfig({
+		enabled: resolveMatrixExecApprovalConfig(params)?.enabled,
+		approverCount: getMatrixApprovalApprovers(params).length
+	});
+}
+function isMatrixAnyApprovalClientEnabled(params) {
+	return isMatrixApprovalClientEnabled({
+		...params,
+		approvalKind: "exec"
+	}) || isMatrixApprovalClientEnabled({
+		...params,
+		approvalKind: "plugin"
+	});
+}
+function shouldHandleMatrixApprovalRequest(params) {
+	const approvalKind = resolveMatrixApprovalKind(params.request);
+	if (!matchesMatrixRequestAccount({
+		...params,
+		approvalKind
+	})) return false;
+	const config = resolveMatrixExecApprovalConfig(params);
+	if (!isChannelExecApprovalClientEnabledFromConfig({
+		enabled: config?.enabled,
+		approverCount: getMatrixApprovalApprovers({
+			...params,
+			approvalKind
+		}).length
+	})) return false;
+	return matchesApprovalRequestFilters({
+		request: params.request.request,
+		agentFilter: config?.agentFilter,
+		sessionFilter: config?.sessionFilter
+	});
+}
+function buildFilterCheckRequest(params) {
+	if (params.metadata.approvalKind === "plugin") return {
+		id: params.metadata.approvalId,
+		request: {
+			title: "Plugin Approval Required",
+			description: "",
+			agentId: params.metadata.agentId ?? null,
+			sessionKey: params.metadata.sessionKey ?? null
+		},
+		createdAtMs: 0,
+		expiresAtMs: 0
+	};
+	return {
+		id: params.metadata.approvalId,
+		request: {
+			command: "",
+			agentId: params.metadata.agentId ?? null,
+			sessionKey: params.metadata.sessionKey ?? null
+		},
+		createdAtMs: 0,
+		expiresAtMs: 0
+	};
+}
+function shouldSuppressLocalMatrixExecApprovalPrompt(params) {
+	if (!matrixExecApprovalProfile.shouldSuppressLocalPrompt(params)) return false;
+	const metadata = getExecApprovalReplyMetadata(params.payload);
+	if (!metadata) return false;
+	const request = buildFilterCheckRequest({ metadata });
+	return shouldHandleMatrixApprovalRequest({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		request
+	});
+}
+//#endregion
 //#region extensions/matrix/src/approval-native.ts
 function normalizeComparableTarget(value) {
 	const target = resolveMatrixTargetIdentity(value);
@@ -405,7 +596,7 @@ const matrixNativeApprovalCapability = createApproverRestrictedNativeApprovalCap
 			accountId,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-LpWmoFyw.js")).matrixApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-Q8ZlmQv_.js")).matrixApprovalNativeRuntime
 	})
 });
 const splitMatrixApprovalCapability = splitChannelApprovalCapability(matrixNativeApprovalCapability);
@@ -513,6 +704,30 @@ function createMatrixPairingText(sendMessageMatrix) {
 	};
 }
 //#endregion
+//#region extensions/matrix/src/matrix/monitor/rooms.ts
+function readLegacyRoomAllowAlias(room) {
+	const rawRoom = room;
+	return typeof rawRoom?.allow === "boolean" ? rawRoom.allow : void 0;
+}
+function resolveMatrixRoomConfig(params) {
+	const rooms = params.rooms ?? {};
+	const allowlistConfigured = Object.keys(rooms).length > 0;
+	const { entry: matched, key: matchedKey, wildcardEntry, wildcardKey } = resolveChannelEntryMatch({
+		entries: rooms,
+		keys: buildChannelKeyCandidates(params.roomId, `room:${params.roomId}`, ...params.aliases),
+		wildcardKey: "*"
+	});
+	const resolved = matched ?? wildcardEntry;
+	const legacyAllow = readLegacyRoomAllowAlias(resolved);
+	return {
+		allowed: resolved ? resolved.enabled !== false && legacyAllow !== false : false,
+		allowlistConfigured,
+		config: resolved,
+		matchKey: matchedKey ?? wildcardKey,
+		matchSource: matched ? "direct" : wildcardEntry ? "wildcard" : void 0
+	};
+}
+//#endregion
 //#region extensions/matrix/src/group-mentions.ts
 function resolveMatrixRoomConfigForGroup(params) {
 	const roomId = normalizeMatrixResolvableTarget(params.groupId?.trim() ?? "");
@@ -543,7 +758,7 @@ function resolveMatrixGroupToolPolicy(params) {
 }
 //#endregion
 //#region extensions/matrix/src/resolver.ts
-const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-BWFMWEsg.js"), "matrixResolverRuntime");
+const loadMatrixChannelRuntime$1 = createLazyRuntimeNamedExport(() => import("./resolver.runtime-C0RDK0VW.js"), "matrixResolverRuntime");
 const matrixResolverAdapter = { resolveTargets: async ({ cfg, accountId, inputs, kind, runtime }) => (await loadMatrixChannelRuntime$1()).resolveMatrixTargets({
 	cfg,
 	accountId,
@@ -552,6 +767,50 @@ const matrixResolverAdapter = { resolveTargets: async ({ cfg, accountId, inputs,
 	runtime
 }) };
 //#endregion
+//#region extensions/matrix/src/matrix/session-store-metadata.ts
+function trimMaybeString(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : void 0;
+}
+function resolveMatrixRoomTargetId(value) {
+	const trimmed = trimMaybeString(value);
+	if (!trimmed) return;
+	const target = resolveMatrixTargetIdentity(trimmed);
+	return target?.kind === "room" && target.id.startsWith("!") ? target.id : void 0;
+}
+function resolveMatrixSessionAccountId(value) {
+	const trimmed = trimMaybeString(value);
+	return trimmed ? normalizeAccountId(trimmed) : void 0;
+}
+function resolveMatrixStoredRoomId(params) {
+	return resolveMatrixRoomTargetId(params.deliveryTo) ?? resolveMatrixRoomTargetId(params.lastTo) ?? resolveMatrixRoomTargetId(params.originNativeChannelId) ?? resolveMatrixRoomTargetId(params.originTo);
+}
+function resolveMatrixStoredSessionMeta(entry) {
+	if (!entry) return null;
+	const channel = trimMaybeString(entry.deliveryContext?.channel) ?? trimMaybeString(entry.lastChannel) ?? trimMaybeString(entry.origin?.provider);
+	const accountId = resolveMatrixSessionAccountId(entry.deliveryContext?.accountId ?? entry.lastAccountId ?? entry.origin?.accountId) ?? void 0;
+	const roomId = resolveMatrixStoredRoomId({
+		deliveryTo: entry.deliveryContext?.to,
+		lastTo: entry.lastTo,
+		originNativeChannelId: entry.origin?.nativeChannelId,
+		originTo: entry.origin?.to
+	});
+	const chatType = trimMaybeString(entry.origin?.chatType) ?? trimMaybeString(entry.chatType) ?? void 0;
+	const directUserId = chatType === "direct" ? trimMaybeString(entry.origin?.nativeDirectUserId) ?? resolveMatrixDirectUserId({
+		from: trimMaybeString(entry.origin?.from),
+		to: (roomId ? `room:${roomId}` : void 0) ?? trimMaybeString(entry.deliveryContext?.to) ?? trimMaybeString(entry.lastTo) ?? trimMaybeString(entry.origin?.to),
+		chatType
+	}) : void 0;
+	if (!channel && !accountId && !roomId && !directUserId) return null;
+	return {
+		...channel ? { channel } : {},
+		...accountId ? { accountId } : {},
+		...roomId ? { roomId } : {},
+		...directUserId ? { directUserId } : {}
+	};
+}
+//#endregion
 //#region extensions/matrix/src/session-route.ts
 function resolveEffectiveMatrixAccountId(params) {
 	return normalizeAccountId(params.accountId ?? resolveDefaultMatrixAccountId(params.cfg));
@@ -688,8 +947,8 @@ async function runMatrixStartupMaintenance(params) {
 //#endregion
 //#region extensions/matrix/src/channel.ts
 let matrixStartupLock = Promise.resolve();
-const loadMatrixSetupWizard = createLazyRuntimeNamedExport(() => import("./setup-surface-DuRQrrpU.js").then((n) => n.t), "matrixSetupWizard");
-const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-DdtNY_To.js"), "matrixChannelRuntime");
+const loadMatrixSetupWizard = createLazyRuntimeNamedExport(() => import("./setup-surface-BgUaEySF.js").then((n) => n.t), "matrixSetupWizard");
+const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-9qwvlUwp.js"), "matrixChannelRuntime");
 const meta = {
 	id: "matrix",
 	label: "Matrix",
@@ -713,12 +972,12 @@ const matrixDoctor = {
 	warnOnEmptyGroupSenderAllowlist: true,
 	legacyConfigRules,
 	normalizeCompatibilityConfig,
-	runConfigSequence: async ({ cfg, env, shouldRepair }) => await (await import("./doctor-KjAvjAJu.js")).runMatrixDoctorSequence({
+	runConfigSequence: async ({ cfg, env, shouldRepair }) => await (await import("./doctor-KuNYX5N3.js")).runMatrixDoctorSequence({
 		cfg,
 		env,
 		shouldRepair
 	}),
-	cleanStaleConfig: async ({ cfg }) => await (await import("./doctor-KjAvjAJu.js")).cleanStaleMatrixPluginConfig(cfg)
+	cleanStaleConfig: async ({ cfg }) => await (await import("./doctor-KuNYX5N3.js")).cleanStaleMatrixPluginConfig(cfg)
 };
 const listMatrixDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister({
 	kind: "user",
@@ -1055,7 +1314,7 @@ const matrixPlugin = createChatChannelPlugin({
 			await previousLock;
 			let monitorMatrixProvider;
 			try {
-				monitorMatrixProvider = (await import("./monitor-C8cEvvTe.js")).monitorMatrixProvider;
+				monitorMatrixProvider = (await import("./monitor-k-b_TmCm.js")).monitorMatrixProvider;
 			} finally {
 				releaseLock();
 			}
@@ -1114,4 +1373,4 @@ const matrixPlugin = createChatChannelPlugin({
 	outbound: matrixChannelOutbound
 });
 //#endregion
-export { matrixPlugin as t };
+export { shouldHandleMatrixApprovalRequest as _, buildAllowlistResolutionSummary as a, createTypingCallbacks as c, logInboundDrop as d, logTypingFailure as f, isMatrixAnyApprovalClientEnabled as g, toLocationContext as h, addAllowlistUserEntriesFromConfigEntry as i, formatLocationText as l, summarizeMapping as m, resolveMatrixStoredSessionMeta as n, canonicalizeAllowlistWithResolvedIds as o, patchAllowlistUsersInConfigEntries as p, resolveMatrixRoomConfig as r, createReplyPrefixOptions as s, matrixPlugin as t, getAgentScopedMediaLocalRoots as u };

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as matrixPlugin } from "./channel-B-R2dceO.js";
+import { t as matrixPlugin } from "./channel-BLKRuTHs.js";
 export { matrixPlugin };

package/dist/{channel.runtime-DdtNY_To.js → channel.runtime-9qwvlUwp.js}

@@ -1,10 +1,10 @@
-import { a as sendMessageMatrix, c as sendTypingMatrix, o as sendPollMatrix } from "./send-Df-pDuG6.js";
-import { t as isBunRuntime } from "./runtime-C6X4h_SJ.js";
-import { n as resolveMatrixAuth } from "./config-BR4uLzNs.js";
-import "./client-CyxIx4Fv.js";
-import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-Bn66SRSD.js";
-import { f as resolveOutboundSendDep, n as chunkTextForOutbound } from "./runtime-api-DTKcXOhp.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-BbzYe9Qi.js";
+import { a as sendMessageMatrix, c as sendTypingMatrix, o as sendPollMatrix } from "./send-CdoJ1pZY.js";
+import { t as isBunRuntime } from "./runtime-lwTSy9Yt.js";
+import { l as resolveMatrixAuth } from "./shared-BlXw87Kp.js";
+import "./client-oci1tD6-.js";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-BCfx1C0G.js";
+import { f as resolveOutboundSendDep, n as chunkTextForOutbound } from "./runtime-api-C-QeChQj.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-DPqngj4V.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createReplyToFanout } from "openclaw/plugin-sdk/outbound-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -13,7 +13,7 @@ import { resolvePayloadMediaUrls } from "openclaw/plugin-sdk/reply-payload";
 //#region extensions/matrix/src/matrix/probe.ts
 let matrixProbeRuntimeDepsPromise;
 async function loadMatrixProbeRuntimeDeps() {
-	matrixProbeRuntimeDepsPromise ??= import("./probe.runtime-NE73hi9o.js").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient }));
+	matrixProbeRuntimeDepsPromise ??= import("./probe.runtime-zExLz3Ek.js").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient }));
 	return await matrixProbeRuntimeDepsPromise;
 }
 async function probeMatrix(params) {

package/dist/{cli-Cq80go7q.js → cli-BeWdjXLV.js}

@@ -1,18 +1,16 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-D2W-V1eQ.js";
+import { c as resolveMatrixAccountConfig } from "./config-paths-msaDGRh6.js";
 import { t as getMatrixRuntime } from "./runtime-Dog86njy.js";
-import { i as resolveMatrixAccount } from "./accounts-Bm90Rzvp.js";
-import { t as formatMatrixErrorMessage } from "./errors-CTcpEDq-.js";
-import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-wZX-HLMn.js";
-import { n as matrixSetupAdapter } from "./setup-core-B5X7HxAP.js";
-import { t as resolveMatrixRoomKeyBackupIssue } from "./backup-health-Cabu_WQC.js";
-import { i as setMatrixSdkLogMode, r as setMatrixSdkConsoleLogging } from "./logging-DZHSPP5N.js";
-import { n as withResolvedActionClient } from "./client-DzjShjVN.js";
-import { r as resolveMatrixAuthContext } from "./config-BR4uLzNs.js";
-import "./client-CyxIx4Fv.js";
-import { i as formatZonedTimestamp } from "./runtime-api-DTKcXOhp.js";
-import { isOpenClawManagedMatrixDevice, summarizeMatrixDeviceHealth } from "./device-health-UVYpbA_W.js";
-import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-DleMeUHj.js";
-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-BbGdzYQl.js";
+import { c as resolveMatrixConfigPath, g as resolveMatrixAccount, l as updateMatrixAccountConfig, n as matrixSetupAdapter } from "./setup-core-CgOV8zmh.js";
+import { t as formatMatrixErrorMessage } from "./errors-BpHgvm2o.js";
+import { t as resolveMatrixRoomKeyBackupIssue } from "./backup-health-3BHbHxyd.js";
+import { i as setMatrixSdkLogMode, r as setMatrixSdkConsoleLogging } from "./logging-bJ8EEe1G.js";
+import { n as withResolvedActionClient } from "./client-D6fFVbNM.js";
+import { u as resolveMatrixAuthContext } from "./shared-BlXw87Kp.js";
+import "./client-oci1tD6-.js";
+import { i as formatZonedTimestamp } from "./runtime-api-C-QeChQj.js";
+import { isOpenClawManagedMatrixDevice, summarizeMatrixDeviceHealth } from "./device-health-Di9MUzFj.js";
+import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-BAAflurI.js";
+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-DvC37Z_y.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/actions/devices.ts
 async function listMatrixOwnDevices(opts = {}) {
@@ -39,11 +37,11 @@ let matrixCliExitScheduled = false;
 let matrixActionClientModulePromise;
 let matrixDirectManagementModulePromise;
 function loadMatrixActionClientModule() {
-	matrixActionClientModulePromise ??= import("./client-DzjShjVN.js").then((n) => n.t);
+	matrixActionClientModulePromise ??= import("./client-D6fFVbNM.js").then((n) => n.t);
 	return matrixActionClientModulePromise;
 }
 function loadMatrixDirectManagementModule() {
-	matrixDirectManagementModulePromise ??= import("./direct-management--Y8ypgLv.js").then((n) => n.t);
+	matrixDirectManagementModulePromise ??= import("./send-CdoJ1pZY.js").then((n) => n.d);
 	return matrixDirectManagementModulePromise;
 }
 function scheduleMatrixCliExit() {
@@ -209,7 +207,7 @@ async function addMatrixAccount(params) {
 		backupVersion: null
 	};
 	if (accountConfig.encryption === true) {
-		const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-DXWxzR7A.js");
+		const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-krQU60Az.js");
 		verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
 			previousCfg: cfg,
 			cfg: updated,

package/dist/{cli-metadata-OtekEqAD.js → cli-metadata-B2_76YSe.js}

@@ -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-Cq80go7q.js");
+		const { registerMatrixCli } = await import("./cli-BeWdjXLV.js");
 		registerMatrixCli({ program });
 	}, { descriptors: [{
 		name: "matrix",

package/dist/cli-metadata.js

@@ -1,2 +1,2 @@
-import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-OtekEqAD.js";
+import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-B2_76YSe.js";
 export { cli_metadata_default as default, registerMatrixCliMetadata };

package/dist/{client-DzjShjVN.js → client-D6fFVbNM.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { u as resolveMatrixRoomId } from "./send-Df-pDuG6.js";
-import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-Am_ZEH3x.js";
+import { u as resolveMatrixRoomId } from "./send-CdoJ1pZY.js";
+import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-DBwUKgC3.js";
 //#region extensions/matrix/src/matrix/actions/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({
 	withResolvedActionClient: () => withResolvedActionClient,

package/dist/{client-bootstrap-Am_ZEH3x.js → client-bootstrap-DBwUKgC3.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { t as getActiveMatrixClient } from "./active-client-uhlxdhEy.js";
-import { t as isBunRuntime } from "./runtime-C6X4h_SJ.js";
+import { t as getActiveMatrixClient } from "./active-client-DUi-lumi.js";
+import { t as isBunRuntime } from "./runtime-lwTSy9Yt.js";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 //#region extensions/matrix/src/matrix/client-bootstrap.ts
 var client_bootstrap_exports = /* @__PURE__ */ __exportAll({
@@ -10,7 +10,7 @@ var client_bootstrap_exports = /* @__PURE__ */ __exportAll({
 });
 let matrixSharedClientRuntimeDepsPromise;
 async function loadMatrixSharedClientRuntimeDeps() {
-	matrixSharedClientRuntimeDepsPromise ??= Promise.all([import("./client-CyxIx4Fv.js").then((n) => n.t), import("./shared-CkbpEI5j.js").then((n) => n.a)]).then(([clientModule, sharedModule]) => ({
+	matrixSharedClientRuntimeDepsPromise ??= Promise.all([import("./client-oci1tD6-.js").then((n) => n.t), import("./shared-BlXw87Kp.js").then((n) => n.a)]).then(([clientModule, sharedModule]) => ({
 		acquireSharedMatrixClient: clientModule.acquireSharedMatrixClient,
 		resolveMatrixAuthContext: clientModule.resolveMatrixAuthContext,
 		releaseSharedClientInstance: sharedModule.releaseSharedClientInstance

package/dist/{client-CyxIx4Fv.js → client-oci1tD6-.js}

@@ -1,11 +1,10 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
 import { t as getMatrixScopedEnvVarNames } from "./env-vars-C7uQCTKn.js";
 import { i as resolveScopedMatrixEnvConfig, r as resolveMatrixEnvAuthReadiness, t as hasReadyMatrixEnvAuth } from "./env-auth-BJqGI8M6.js";
-import { n as validateMatrixHomeserverUrl, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-DiK9j7jz.js";
-import { t as isBunRuntime } from "./runtime-C6X4h_SJ.js";
-import { i as resolveMatrixConfigForAccount, n as resolveMatrixAuth, r as resolveMatrixAuthContext, t as backfillMatrixAuthDeviceIdAfterStartup } from "./config-BR4uLzNs.js";
-import { t as createMatrixClient } from "./create-client-DpoW106T.js";
-import { i as resolveSharedMatrixClient, n as releaseSharedClientInstance, o as stopSharedClientForAccount, r as removeSharedClientInstance, s as stopSharedClientInstance, t as acquireSharedMatrixClient } from "./shared-CkbpEI5j.js";
+import { n as validateMatrixHomeserverUrl, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-CBZBxN3F.js";
+import { t as isBunRuntime } from "./runtime-lwTSy9Yt.js";
+import { c as backfillMatrixAuthDeviceIdAfterStartup, d as resolveMatrixConfigForAccount, i as resolveSharedMatrixClient, l as resolveMatrixAuth, n as releaseSharedClientInstance, o as stopSharedClientForAccount, r as removeSharedClientInstance, s as stopSharedClientInstance, t as acquireSharedMatrixClient, u as resolveMatrixAuthContext } from "./shared-BlXw87Kp.js";
+import { t as createMatrixClient } from "./create-client-BahCtURn.js";
 //#region extensions/matrix/src/matrix/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({
 	acquireSharedMatrixClient: () => acquireSharedMatrixClient,

package/dist/{account-config-D2W-V1eQ.js → config-paths-msaDGRh6.js}

@@ -59,7 +59,8 @@ function resolveMatrixAccountConfig(params) {
 		nestedObjectKeys: [
 			"dm",
 			"actions",
-			"execApprovals"
+			"execApprovals",
+			"botLoopProtection"
 		]
 	});
 	const accountConfig = findMatrixAccountConfig(params.cfg, accountId);
@@ -93,4 +94,21 @@ function resolveMatrixAccountAllowlistConfig(params) {
 	};
 }
 //#endregion
-export { resolveMatrixAccountConfig as a, resolveMatrixAccountAllowlistConfig as i, hasExplicitMatrixAccountConfig as n, resolveMatrixBaseConfig as o, listNormalizedMatrixAccountIds as r, findMatrixAccountConfig as t };
+//#region extensions/matrix/src/matrix/config-paths.ts
+function shouldStoreMatrixAccountAtTopLevel(cfg, accountId) {
+	if (normalizeAccountId(accountId) !== DEFAULT_ACCOUNT_ID) return false;
+	const accounts = cfg.channels?.matrix?.accounts;
+	return !accounts || Object.keys(accounts).length === 0;
+}
+function resolveMatrixConfigPath(cfg, accountId) {
+	const normalizedAccountId = normalizeAccountId(accountId);
+	if (shouldStoreMatrixAccountAtTopLevel(cfg, normalizedAccountId)) return "channels.matrix";
+	return `channels.matrix.accounts.${normalizedAccountId}`;
+}
+function resolveMatrixConfigFieldPath(cfg, accountId, fieldPath) {
+	const suffix = fieldPath.trim().replace(/^\.+/, "");
+	if (!suffix) return resolveMatrixConfigPath(cfg, accountId);
+	return `${resolveMatrixConfigPath(cfg, accountId)}.${suffix}`;
+}
+//#endregion
+export { hasExplicitMatrixAccountConfig as a, resolveMatrixAccountConfig as c, findMatrixAccountConfig as i, resolveMatrixBaseConfig as l, resolveMatrixConfigPath as n, listNormalizedMatrixAccountIds as o, shouldStoreMatrixAccountAtTopLevel as r, resolveMatrixAccountAllowlistConfig as s, resolveMatrixConfigFieldPath as t };