@openclaw/matrix 2026.7.2-beta.7 → 2026.7.34

package/dist/{setup-bootstrap-Deleiibz.js → .setup/setup-bootstrap-DUXBC8X2.mjs}

@@ -1,7 +1,7 @@
-import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import "./accounts-DfngqebB.js";
-import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { n as bootstrapMatrixVerification } from "./verification-DYMQ1QpI.js";
+import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-BZWN9tGS.mjs";
+import "./setup-core-bhdcEo7v.mjs";
+import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.mjs";
+import { n as bootstrapMatrixVerification } from "./verification-DeWOtZJr.mjs";
 //#region extensions/matrix/src/setup-bootstrap.ts
 async function maybeBootstrapNewEncryptedMatrixAccount(params) {
 	const accountConfig = resolveMatrixAccountConfig({

package/dist/{setup-core-BVfBv2ai.js → .setup/setup-core-bhdcEo7v.mjs}

@@ -1,34 +1,152 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { a as resolveMatrixAccountConfig, t as findMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { r as resolveMatrixEnvAuthReadiness } from "./env-auth-CQsYbz-p.js";
-import { r as resolveDefaultMatrixAccountId } from "./accounts-DfngqebB.js";
-import { n as resolveMatrixConfigPath$1, r as shouldStoreMatrixAccountAtTopLevel, t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { a as resolveMatrixDefaultOrOnlyAccountId, r as resolveConfiguredMatrixAccountIds, s as resolveMatrixAccountStringValues } from "./account-selection-BOQeTqax.mjs";
+import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig, t as findMatrixAccountConfig } from "./account-config-BZWN9tGS.mjs";
+import { n as resolveMatrixEnvAuthReadiness, r as resolveScopedMatrixEnvConfig, t as resolveGlobalMatrixEnvConfig } from "./env-auth-CYJL1jNl.mjs";
+import { i as loadMatrixCredentials, n as credentialsMatchConfig } from "./credentials-read-CRHg6XPm.mjs";
+import { n as resolveMatrixConfigPath$1, r as shouldStoreMatrixAccountAtTopLevel, t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.mjs";
 import { normalizeLowercaseStringOrEmpty, 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-runtime";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
-import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$2, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId as normalizeAccountId$2, normalizeAllowFromEntries, normalizeSecretInputString, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
 import { resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
-import { coerceSecretRef } from "openclaw/plugin-sdk/secret-ref-runtime";
-import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
+import { coerceSecretRef as coerceSecretRef$1 } from "openclaw/plugin-sdk/secret-ref-runtime";
+//#region extensions/matrix/src/matrix/accounts.ts
+function clean(value) {
+	return normalizeOptionalString(value) ?? "";
+}
+function resolveMatrixAccountAuthView(params) {
+	const normalizedAccountId = normalizeAccountId(params.accountId);
+	const matrix = resolveMatrixBaseConfig(params.cfg);
+	const account = findMatrixAccountConfig(params.cfg, normalizedAccountId) ?? {};
+	const resolvedStrings = resolveMatrixAccountStringValues({
+		accountId: normalizedAccountId,
+		account: {
+			homeserver: clean(account.homeserver),
+			userId: clean(account.userId),
+			accessToken: typeof account.accessToken === "string" ? clean(account.accessToken) : "",
+			password: typeof account.password === "string" ? clean(account.password) : "",
+			deviceId: clean(account.deviceId),
+			deviceName: clean(account.deviceName)
+		},
+		scopedEnv: resolveScopedMatrixEnvConfig(normalizedAccountId, params.env),
+		channel: {
+			homeserver: clean(matrix.homeserver),
+			userId: clean(matrix.userId),
+			accessToken: typeof matrix.accessToken === "string" ? clean(matrix.accessToken) : "",
+			password: typeof matrix.password === "string" ? clean(matrix.password) : "",
+			deviceId: clean(matrix.deviceId),
+			deviceName: clean(matrix.deviceName)
+		},
+		globalEnv: resolveGlobalMatrixEnvConfig(params.env)
+	});
+	return {
+		homeserver: resolvedStrings.homeserver,
+		userId: resolvedStrings.userId,
+		accessToken: resolvedStrings.accessToken || void 0,
+		password: resolvedStrings.password || void 0
+	};
+}
+function resolveMatrixAccountUserId(params) {
+	const env = params.env ?? process.env;
+	const authView = resolveMatrixAccountAuthView({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		env
+	});
+	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;
+	return stored.userId.trim() || null;
+}
+function listMatrixAccountIds(cfg) {
+	const ids = resolveConfiguredMatrixAccountIds(cfg, process.env);
+	return ids.length > 0 ? ids : [DEFAULT_ACCOUNT_ID];
+}
+function resolveDefaultMatrixAccountId(cfg) {
+	return normalizeAccountId(resolveMatrixDefaultOrOnlyAccountId(cfg));
+}
+function resolveConfiguredMatrixBotUserIds(params) {
+	const env = params.env ?? process.env;
+	const currentAccountId = normalizeAccountId(params.accountId);
+	const accountIds = new Set(resolveConfiguredMatrixAccountIds(params.cfg, env));
+	if (resolveMatrixAccount({
+		cfg: params.cfg,
+		accountId: DEFAULT_ACCOUNT_ID,
+		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 (userId) ids.add(userId);
+	}
+	return ids;
+}
+function resolveMatrixAccount(params) {
+	const env = params.env ?? process.env;
+	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultMatrixAccountId(params.cfg));
+	const matrixBase = resolveMatrixBaseConfig(params.cfg);
+	const base = resolveMatrixAccountConfig({
+		cfg: params.cfg,
+		accountId,
+		env
+	});
+	const explicitAuthConfig = accountId === DEFAULT_ACCOUNT_ID ? base : findMatrixAccountConfig(params.cfg, accountId) ?? {};
+	const enabled = base.enabled !== false && matrixBase.enabled !== false;
+	const authView = resolveMatrixAccountAuthView({
+		cfg: params.cfg,
+		accountId,
+		env
+	});
+	const hasHomeserver = Boolean(authView.homeserver);
+	const hasUserId = Boolean(authView.userId);
+	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);
+	const hasStored = stored && authView.homeserver ? credentialsMatchConfig(stored, {
+		homeserver: authView.homeserver,
+		userId: authView.userId || ""
+	}) : false;
+	const configured = hasHomeserver && (hasAccessToken || hasPasswordAuth || hasStored);
+	return {
+		accountId,
+		enabled,
+		name: normalizeOptionalString(base.name),
+		configured,
+		homeserver: authView.homeserver || void 0,
+		userId: authView.userId || void 0,
+		config: base
+	};
+}
+//#endregion
 //#region extensions/matrix/src/setup-contract.ts
 const matrixSingleAccountKeysToMove = [
-	"homeserver",
-	"userId",
-	"accessToken",
-	"password",
 	"deviceId",
-	"deviceName",
 	"avatarUrl",
 	"initialSyncLimit",
 	"encryption",
 	"allowlistOnly",
 	"dangerouslyAllowNameMatching",
 	"allowBots",
-	"streaming",
+	"blockStreaming",
 	"replyToMode",
 	"threadReplies",
 	"textChunkLimit",
+	"chunkMode",
 	"responsePrefix",
 	"ackReaction",
 	"ackReactionScope",
@@ -65,10 +183,7 @@ function resolveSingleAccountPromotionTarget(params) {
 	if (matchedAccountId) return matchedAccountId;
 	if (normalizedDefaultAccount) return DEFAULT_ACCOUNT_ID$1;
 	const namedAccounts = Object.entries(accounts).filter(([accountId, value]) => accountId && typeof value === "object" && value);
-	if (namedAccounts.length === 1) {
-		const onlyAccount = namedAccounts[0];
-		if (onlyAccount) return onlyAccount[0];
-	}
+	if (namedAccounts.length === 1) return namedAccounts[0][0];
 	if (namedAccounts.length > 1 && accounts[DEFAULT_ACCOUNT_ID$1] && typeof accounts[DEFAULT_ACCOUNT_ID$1] === "object") return DEFAULT_ACCOUNT_ID$1;
 	return DEFAULT_ACCOUNT_ID$1;
 }
@@ -106,7 +221,7 @@ function applyNullableSecretInputField(target, key, value, defaults) {
 		else delete target[key];
 		return;
 	}
-	const ref = coerceSecretRef(value, defaults);
+	const ref = coerceSecretRef$1(value, defaults);
 	if (!ref) throw new Error(`Invalid Matrix ${key} SecretInput.`);
 	target[key] = ref;
 }
@@ -135,11 +250,13 @@ function updateMatrixAccountConfig(cfg, accountId, patch) {
 	const matrix = cfg.channels?.matrix ?? {};
 	const normalizedAccountId = normalizeAccountId(accountId);
 	const nextAccount = { ...findMatrixAccountConfig(cfg, normalizedAccountId) ?? (normalizedAccountId === DEFAULT_ACCOUNT_ID ? matrix : {}) };
-	if (patch.name !== void 0) if (patch.name === null) delete nextAccount.name;
-	else {
-		const trimmed = patch.name.trim();
-		if (trimmed) nextAccount.name = trimmed;
-		else delete nextAccount.name;
+	if (patch.name !== void 0) {
+		if (patch.name === null) delete nextAccount.name;
+		else {
+			const trimmed = patch.name.trim();
+			if (trimmed) nextAccount.name = trimmed;
+			else delete nextAccount.name;
+		}
 	}
 	if (typeof patch.enabled === "boolean") nextAccount.enabled = patch.enabled;
 	else if (typeof nextAccount.enabled !== "boolean") nextAccount.enabled = true;
@@ -158,31 +275,47 @@ function updateMatrixAccountConfig(cfg, accountId, patch) {
 		if (Object.keys(nextNetwork).length > 0) nextAccount.network = nextNetwork;
 		else delete nextAccount.network;
 	}
-	if (patch.initialSyncLimit !== void 0) if (patch.initialSyncLimit === null) delete nextAccount.initialSyncLimit;
-	else {
-		const initialSyncLimit = resolveOptionalIntegerOption(patch.initialSyncLimit, { min: 0 });
-		if (initialSyncLimit === void 0) delete nextAccount.initialSyncLimit;
-		else nextAccount.initialSyncLimit = initialSyncLimit;
+	if (patch.initialSyncLimit !== void 0) {
+		if (patch.initialSyncLimit === null) delete nextAccount.initialSyncLimit;
+		else {
+			const initialSyncLimit = resolveOptionalIntegerOption(patch.initialSyncLimit, { min: 0 });
+			if (initialSyncLimit === void 0) delete nextAccount.initialSyncLimit;
+			else nextAccount.initialSyncLimit = initialSyncLimit;
+		}
+	}
+	if (patch.encryption !== void 0) {
+		if (patch.encryption === null) delete nextAccount.encryption;
+		else nextAccount.encryption = patch.encryption;
+	}
+	if (patch.allowBots !== void 0) {
+		if (patch.allowBots === null) delete nextAccount.allowBots;
+		else nextAccount.allowBots = patch.allowBots;
+	}
+	if (patch.autoJoin !== void 0) {
+		if (patch.autoJoin === null) delete nextAccount.autoJoin;
+		else nextAccount.autoJoin = patch.autoJoin;
 	}
-	if (patch.encryption !== void 0) if (patch.encryption === null) delete nextAccount.encryption;
-	else nextAccount.encryption = patch.encryption;
-	if (patch.allowBots !== void 0) if (patch.allowBots === null) delete nextAccount.allowBots;
-	else nextAccount.allowBots = patch.allowBots;
-	if (patch.autoJoin !== void 0) if (patch.autoJoin === null) delete nextAccount.autoJoin;
-	else nextAccount.autoJoin = patch.autoJoin;
 	applyNullableArrayField(nextAccount, "autoJoinAllowlist", patch.autoJoinAllowlist);
-	if (patch.dm !== void 0) if (patch.dm === null) delete nextAccount.dm;
-	else nextAccount.dm = cloneMatrixDmConfig({
-		...nextAccount.dm,
-		...patch.dm
-	});
-	if (patch.groupPolicy !== void 0) if (patch.groupPolicy === null) delete nextAccount.groupPolicy;
-	else nextAccount.groupPolicy = patch.groupPolicy;
+	if (patch.dm !== void 0) {
+		if (patch.dm === null) delete nextAccount.dm;
+		else nextAccount.dm = cloneMatrixDmConfig({
+			...nextAccount.dm,
+			...patch.dm
+		});
+	}
+	if (patch.groupPolicy !== void 0) {
+		if (patch.groupPolicy === null) delete nextAccount.groupPolicy;
+		else nextAccount.groupPolicy = patch.groupPolicy;
+	}
 	applyNullableArrayField(nextAccount, "groupAllowFrom", patch.groupAllowFrom);
-	if (patch.groups !== void 0) if (patch.groups === null) delete nextAccount.groups;
-	else nextAccount.groups = cloneMatrixRoomMap(patch.groups);
-	if (patch.rooms !== void 0) if (patch.rooms === null) delete nextAccount.rooms;
-	else nextAccount.rooms = cloneMatrixRoomMap(patch.rooms);
+	if (patch.groups !== void 0) {
+		if (patch.groups === null) delete nextAccount.groups;
+		else nextAccount.groups = cloneMatrixRoomMap(patch.groups);
+	}
+	if (patch.rooms !== void 0) {
+		if (patch.rooms === null) delete nextAccount.rooms;
+		else nextAccount.rooms = cloneMatrixRoomMap(patch.rooms);
+	}
 	const nextAccounts = Object.fromEntries(Object.entries(matrix.accounts ?? {}).filter(([rawAccountId]) => rawAccountId === normalizedAccountId || normalizeAccountId(rawAccountId) !== normalizedAccountId));
 	if (shouldStoreMatrixAccountAtTopLevel(cfg, normalizedAccountId)) {
 		const { accounts: _ignoredAccounts, defaultAccount } = matrix;
@@ -220,7 +353,7 @@ var profile_exports = /* @__PURE__ */ __exportAll({
 	isSupportedMatrixAvatarSource: () => isSupportedMatrixAvatarSource,
 	syncMatrixOwnProfile: () => syncMatrixOwnProfile
 });
-const MATRIX_PROFILE_AVATAR_MAX_BYTES = 10 * 1024 * 1024;
+const MATRIX_PROFILE_AVATAR_MAX_BYTES = 10485760;
 function isMatrixMxcUri(value) {
 	return normalizeLowercaseStringOrEmpty(normalizeOptionalString(value)).startsWith("mxc://");
 }
@@ -392,17 +525,16 @@ function moveSingleMatrixAccountConfigToNamedAccount(cfg) {
 	};
 }
 function validateMatrixSetupInput(params) {
-	const input = params.input;
-	const avatarUrl = resolveSetupAvatarUrl(input);
+	const avatarUrl = resolveSetupAvatarUrl(params.input);
 	if (avatarUrl && !isSupportedMatrixAvatarSource(avatarUrl)) return "Matrix avatar URL must be an mxc:// URI or an http(s) URL.";
-	if (input.useEnv) {
+	if (params.input.useEnv) {
 		const envReadiness = resolveMatrixEnvAuthReadiness(params.accountId, process.env);
 		return envReadiness.ready ? null : envReadiness.missingMessage;
 	}
-	if (!input.homeserver?.trim()) return "Matrix requires --homeserver";
-	const accessToken = input.accessToken?.trim();
-	const password = normalizeSecretInputString(input.password);
-	const userId = input.userId?.trim();
+	if (!params.input.homeserver?.trim()) return "Matrix requires --homeserver";
+	const accessToken = params.input.accessToken?.trim();
+	const password = normalizeSecretInputString(params.input.password);
+	const userId = params.input.userId?.trim();
 	if (!accessToken && !password) return "Matrix requires --access-token or --password";
 	if (!accessToken) {
 		if (!userId) return "Matrix requires --user-id when using --password";
@@ -411,16 +543,16 @@ function validateMatrixSetupInput(params) {
 	return null;
 }
 function applyMatrixSetupAccountConfig(params) {
-	const input = params.input;
 	const normalizedAccountId = normalizeAccountId$2(params.accountId);
+	const migratedCfg = normalizedAccountId !== DEFAULT_ACCOUNT_ID$2 ? moveSingleMatrixAccountConfigToNamedAccount(params.cfg) : params.cfg;
 	const next = applyAccountNameToChannelSection({
-		cfg: normalizedAccountId !== DEFAULT_ACCOUNT_ID$2 ? moveSingleMatrixAccountConfigToNamedAccount(params.cfg) : params.cfg,
+		cfg: migratedCfg,
 		channelKey: channel$1,
 		accountId: normalizedAccountId,
-		name: input.name
+		name: params.input.name
 	});
-	const avatarUrl = resolveSetupAvatarUrl(input);
-	if (input.useEnv) return updateMatrixAccountConfig(next, normalizedAccountId, {
+	const avatarUrl = resolveSetupAvatarUrl(params.input);
+	if (params.input.useEnv) return updateMatrixAccountConfig(next, normalizedAccountId, {
 		enabled: true,
 		homeserver: null,
 		allowPrivateNetwork: null,
@@ -432,20 +564,20 @@ function applyMatrixSetupAccountConfig(params) {
 		deviceName: null,
 		avatarUrl
 	});
-	const accessToken = input.accessToken?.trim();
-	const password = normalizeSecretInputString(input.password);
-	const userId = input.userId?.trim();
+	const accessToken = params.input.accessToken?.trim();
+	const password = normalizeSecretInputString(params.input.password);
+	const userId = params.input.userId?.trim();
 	return updateMatrixAccountConfig(next, normalizedAccountId, {
 		enabled: true,
-		homeserver: input.homeserver?.trim(),
-		allowPrivateNetwork: typeof input.dangerouslyAllowPrivateNetwork === "boolean" ? input.dangerouslyAllowPrivateNetwork : typeof input.allowPrivateNetwork === "boolean" ? input.allowPrivateNetwork : void 0,
-		proxy: normalizeOptionalString(input.proxy),
+		homeserver: params.input.homeserver?.trim(),
+		allowPrivateNetwork: typeof params.input.dangerouslyAllowPrivateNetwork === "boolean" ? params.input.dangerouslyAllowPrivateNetwork : typeof params.input.allowPrivateNetwork === "boolean" ? params.input.allowPrivateNetwork : void 0,
+		proxy: normalizeOptionalString(params.input.proxy),
 		userId: password && !userId ? null : userId,
 		accessToken: accessToken || (password ? null : void 0),
 		password: password || (accessToken ? null : void 0),
-		deviceName: input.deviceName?.trim(),
+		deviceName: params.input.deviceName?.trim(),
 		avatarUrl,
-		initialSyncLimit: input.initialSyncLimit
+		initialSyncLimit: params.input.initialSyncLimit
 	});
 }
 //#endregion
@@ -454,48 +586,28 @@ function resolveMatrixSetupDmAllowFrom(policy, allowFrom) {
 	if (policy === "open") return addWildcardAllowFrom(allowFrom);
 	return normalizeAllowFromEntries(allowFrom ?? []).filter((entry) => entry !== "*");
 }
-function createMatrixSetupDmPolicy(promptAllowFrom) {
-	return createChannelDmPolicy({
-		label: "Matrix",
-		channel: "matrix",
-		policyPath: "dm.policy",
-		allowFromPath: "dm.allowFrom",
-		resolveAccount: (cfg, accountId) => {
-			const resolvedCfg = cfg;
-			const resolvedAccountId = normalizeAccountId$2(accountId?.trim() || resolveDefaultMatrixAccountId(resolvedCfg) || DEFAULT_ACCOUNT_ID$2);
-			const config = resolveMatrixAccountConfig({
-				cfg: resolvedCfg,
-				accountId: resolvedAccountId
-			});
-			return {
-				accountId: resolvedAccountId,
-				config: {
-					dmPolicy: config.dm?.policy,
-					allowFrom: config.dm?.allowFrom,
-					dm: config.dm
-				}
-			};
-		},
-		resolveConfigKeys: ({ cfg, account }) => ({
-			policyKey: resolveMatrixConfigFieldPath(cfg, account.accountId, "dm.policy"),
-			allowFromKey: resolveMatrixConfigFieldPath(cfg, account.accountId, "dm.allowFrom")
-		}),
-		resolveAllowFrom: ({ policy, account }) => resolveMatrixSetupDmAllowFrom(policy, account.config.allowFrom),
-		buildPatch: ({ account, policy, allowFrom }) => ({ dm: {
-			...account.config.dm,
-			policy,
-			allowFrom
-		} }),
-		applyPatch: ({ cfg, account, patch }) => updateMatrixAccountConfig(cfg, account.accountId, patch),
-		promptAllowFrom
-	});
-}
 //#endregion
 //#region extensions/matrix/src/setup-core.ts
 const channel = "matrix";
 function resolveMatrixSetupAccountId(params) {
 	return normalizeAccountId$2(params.accountId?.trim() || params.name?.trim() || DEFAULT_ACCOUNT_ID$2);
 }
+function resolveMatrixSetupWizardAccountId(cfg, accountId) {
+	return normalizeAccountId$2(accountId?.trim() || resolveDefaultMatrixAccountId(cfg) || DEFAULT_ACCOUNT_ID$2);
+}
+function setMatrixDmPolicy(cfg, policy, accountId) {
+	const resolvedAccountId = resolveMatrixSetupWizardAccountId(cfg, accountId);
+	const existing = resolveMatrixAccountConfig({
+		cfg,
+		accountId: resolvedAccountId
+	});
+	const allowFrom = resolveMatrixSetupDmAllowFrom(policy, existing.dm?.allowFrom);
+	return updateMatrixAccountConfig(cfg, resolvedAccountId, { dm: {
+		...existing.dm,
+		policy,
+		allowFrom
+	} });
+}
 function createMatrixSetupWizardProxy(loadWizardModule) {
 	let wizardPromise = null;
 	const loadWizard = () => {
@@ -515,10 +627,28 @@ function createMatrixSetupWizardProxy(loadWizardModule) {
 			return await (wizard.configureWhenConfigured ?? wizard.configureInteractive ?? wizard.configure)(ctx);
 		},
 		afterConfigWritten: async (ctx) => await (await loadWizard()).afterConfigWritten?.(ctx),
-		dmPolicy: createMatrixSetupDmPolicy(async (params) => {
-			const promptAllowFrom = (await loadWizard()).dmPolicy?.promptAllowFrom;
-			return promptAllowFrom ? await promptAllowFrom(params) : params.cfg;
-		}),
+		dmPolicy: {
+			label: "Matrix",
+			channel,
+			policyKey: "channels.matrix.dm.policy",
+			allowFromKey: "channels.matrix.dm.allowFrom",
+			resolveConfigKeys: (cfg, accountId) => {
+				const resolvedAccountId = resolveMatrixSetupWizardAccountId(cfg, accountId);
+				return {
+					policyKey: resolveMatrixConfigFieldPath(cfg, resolvedAccountId, "dm.policy"),
+					allowFromKey: resolveMatrixConfigFieldPath(cfg, resolvedAccountId, "dm.allowFrom")
+				};
+			},
+			getCurrent: (cfg, accountId) => resolveMatrixAccountConfig({
+				cfg,
+				accountId: resolveMatrixSetupWizardAccountId(cfg, accountId)
+			}).dm?.policy ?? "pairing",
+			setPolicy: (cfg, policy, accountId) => setMatrixDmPolicy(cfg, policy, accountId),
+			promptAllowFrom: async (params) => {
+				const promptAllowFrom = (await loadWizard()).dmPolicy?.promptAllowFrom;
+				return promptAllowFrom ? await promptAllowFrom(params) : params.cfg;
+			}
+		},
 		disable: (cfg) => ({
 			...cfg,
 			channels: {
@@ -532,9 +662,6 @@ function createMatrixSetupWizardProxy(loadWizardModule) {
 	};
 }
 const matrixSetupAdapter = {
-	singleAccountKeysToMove,
-	namedAccountPromotionKeys,
-	resolveSingleAccountPromotionTarget,
 	resolveAccountId: ({ accountId, input }) => resolveMatrixSetupAccountId({
 		accountId,
 		name: input?.name
@@ -559,7 +686,7 @@ const matrixSetupAdapter = {
 		input
 	}),
 	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-Deleiibz.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-DUXBC8X2.mjs");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,
@@ -568,82 +695,5 @@ const matrixSetupAdapter = {
 		});
 	}
 };
-const matrixSetupContract = defineChannelSetupContract({
-	fields: {
-		homeserver: {
-			kind: "string",
-			cli: {
-				flags: "--homeserver <url>",
-				description: "Matrix homeserver URL"
-			}
-		},
-		userId: {
-			kind: "string",
-			cli: {
-				flags: "--user-id <id>",
-				description: "Matrix user id"
-			}
-		},
-		accessToken: {
-			kind: "string",
-			sensitive: true,
-			cli: {
-				flags: "--access-token <token>",
-				description: "Matrix access token"
-			}
-		},
-		password: {
-			kind: "string",
-			sensitive: true,
-			cli: {
-				flags: "--password <password>",
-				description: "Matrix password"
-			}
-		},
-		deviceName: {
-			kind: "string",
-			cli: {
-				flags: "--device-name <name>",
-				description: "Matrix device name"
-			}
-		},
-		avatarUrl: {
-			kind: "string",
-			cli: {
-				flags: "--avatar-url <url>",
-				description: "Matrix avatar URL"
-			}
-		},
-		initialSyncLimit: {
-			kind: "integer",
-			cli: {
-				flags: "--initial-sync-limit <n>",
-				description: "Matrix initial sync room limit"
-			}
-		},
-		proxy: {
-			kind: "string",
-			cli: {
-				flags: "--proxy <url>",
-				description: "Matrix proxy URL"
-			}
-		},
-		dangerouslyAllowPrivateNetwork: {
-			kind: "boolean",
-			cli: {
-				flags: "--dangerously-allow-private-network",
-				description: "Allow private-network Matrix homeservers"
-			}
-		},
-		useEnv: {
-			kind: "boolean",
-			cli: {
-				flags: "--use-env",
-				description: "Use Matrix environment credentials"
-			}
-		}
-	},
-	legacyAdapter: matrixSetupAdapter
-});
 //#endregion
-export { moveSingleMatrixAccountConfigToNamedAccount as a, config_update_exports as c, namedAccountPromotionKeys as d, resolveSingleAccountPromotionTarget as f, createMatrixSetupDmPolicy as i, resolveMatrixConfigPath as l, matrixSetupAdapter as n, profile_exports as o, singleAccountKeysToMove as p, matrixSetupContract as r, syncMatrixOwnProfile as s, createMatrixSetupWizardProxy as t, updateMatrixAccountConfig as u };
+export { profile_exports as a, resolveMatrixConfigPath as c, resolveSingleAccountPromotionTarget as d, singleAccountKeysToMove as f, resolveMatrixAccount as g, resolveDefaultMatrixAccountId as h, moveSingleMatrixAccountConfigToNamedAccount as i, updateMatrixAccountConfig as l, resolveConfiguredMatrixBotUserIds as m, matrixSetupAdapter as n, syncMatrixOwnProfile as o, listMatrixAccountIds as p, resolveMatrixSetupDmAllowFrom as r, config_update_exports as s, createMatrixSetupWizardProxy as t, namedAccountPromotionKeys as u };

package/dist/.setup/setup-plugin-api-CAwZ_Bi7.mjs

@@ -0,0 +1,43 @@
+import { g as resolveMatrixAccount, n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-bhdcEo7v.mjs";
+import { r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-D9J_vUF6.mjs";
+import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
+const matrixSetupPlugin = {
+	id: "matrix",
+	meta: {
+		id: "matrix",
+		label: "Matrix",
+		selectionLabel: "Matrix (plugin)",
+		docsPath: "/channels/matrix",
+		docsLabel: "matrix",
+		blurb: "open protocol; configure a homeserver + access token.",
+		order: 70,
+		quickstartAllowFrom: true
+	},
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-05_G-MnT.mjs").then((n) => n.t)).matrixSetupWizard })),
+	setup: matrixSetupAdapter,
+	capabilities: {
+		chatTypes: [
+			"direct",
+			"group",
+			"thread"
+		],
+		polls: true,
+		reactions: true,
+		threads: true,
+		media: true
+	},
+	reload: { configPrefixes: ["channels.matrix"] },
+	configSchema: MatrixChannelConfigSchema,
+	config: {
+		...matrixConfigAdapter,
+		isConfigured: (account) => account.configured,
+		describeAccount: (account) => describeAccountSnapshot({
+			account,
+			configured: account.configured,
+			extra: { baseUrl: account.homeserver }
+		}),
+		hasConfiguredState: ({ cfg }) => resolveMatrixAccount({ cfg }).configured
+	}
+};
+//#endregion
+export { matrixSetupPlugin as t };

package/dist/.setup/setup-plugin-api-DIFVsOs3.mjs

@@ -0,0 +1,2 @@
+import { t as matrixSetupPlugin } from "./setup-plugin-api-CAwZ_Bi7.mjs";
+export { matrixSetupPlugin };