@openclaw/matrix 2026.7.2-beta.5 → 2026.8.1-beta.2

package/dist/session-binding-contract-api.js

@@ -1,4 +1,4 @@
 import { r as setMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { s as resetMatrixThreadBindingsForTests } from "./thread-bindings-shared-CKnY4LSd.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-D3RfVgAF.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-CcHZP3w2.js";
 export { createMatrixThreadBindingManager, resetMatrixThreadBindingsForTests, setMatrixRuntime };

package/dist/{setup-bootstrap-BBGpPKgy.js → setup-bootstrap-BaXkhgJg.js}

@@ -1,7 +1,7 @@
 import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import "./setup-core-a542Ernq.js";
-import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { n as bootstrapMatrixVerification } from "./verification-ZdAXdmuh.js";
+import "./accounts-BCzyubQt.js";
+import { n as bootstrapMatrixVerification } from "./verification-C7ig-bQE.js";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 //#region extensions/matrix/src/setup-bootstrap.ts
 async function maybeBootstrapNewEncryptedMatrixAccount(params) {
 	const accountConfig = resolveMatrixAccountConfig({
@@ -36,7 +36,7 @@ async function maybeBootstrapNewEncryptedMatrixAccount(params) {
 			success: false,
 			recoveryKeyCreatedAt: null,
 			backupVersion: null,
-			error: formatMatrixErrorMessage(err)
+			error: formatErrorMessage(err)
 		};
 	}
 }

package/dist/setup-core-DQn6b5vi.js

@@ -0,0 +1,400 @@
+import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
+import { n as resolveMatrixEnvAuthReadiness } from "./env-auth-MVS-Vv41.js";
+import { r as resolveDefaultMatrixAccountId } from "./accounts-BCzyubQt.js";
+import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
+import { r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
+import { t as isSupportedMatrixAvatarSource } from "./profile-D-Wubo0A.js";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
+import { DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId, normalizeAllowFromEntries, normalizeSecretInputString, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
+import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
+import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
+//#region extensions/matrix/src/setup-contract.ts
+const matrixSingleAccountKeysToMove = [
+	"homeserver",
+	"userId",
+	"accessToken",
+	"password",
+	"deviceId",
+	"deviceName",
+	"avatarUrl",
+	"initialSyncLimit",
+	"encryption",
+	"allowlistOnly",
+	"dangerouslyAllowNameMatching",
+	"allowBots",
+	"streaming",
+	"replyToMode",
+	"threadReplies",
+	"textChunkLimit",
+	"responsePrefix",
+	"ackReaction",
+	"ackReactionScope",
+	"reactionNotifications",
+	"threadBindings",
+	"startupVerification",
+	"startupVerificationCooldownHours",
+	"mediaMaxMb",
+	"autoJoin",
+	"autoJoinAllowlist",
+	"dm",
+	"groups",
+	"rooms",
+	"actions"
+];
+const matrixNamedAccountPromotionKeys = [
+	"name",
+	"homeserver",
+	"userId",
+	"accessToken",
+	"password",
+	"deviceId",
+	"deviceName",
+	"avatarUrl",
+	"initialSyncLimit",
+	"encryption"
+];
+const singleAccountKeysToMove = [...matrixSingleAccountKeysToMove];
+const namedAccountPromotionKeys = [...matrixNamedAccountPromotionKeys];
+function resolveSingleAccountPromotionTarget(params) {
+	const accounts = typeof params.channel.accounts === "object" && params.channel.accounts ? params.channel.accounts : {};
+	const normalizedDefaultAccount = typeof params.channel.defaultAccount === "string" && params.channel.defaultAccount.trim() ? normalizeAccountId$1(params.channel.defaultAccount) : void 0;
+	const matchedAccountId = normalizedDefaultAccount ? Object.entries(accounts).find(([accountId, value]) => accountId && value && typeof value === "object" && normalizeAccountId$1(accountId) === normalizedDefaultAccount)?.[0] : void 0;
+	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 && accounts[DEFAULT_ACCOUNT_ID$1] && typeof accounts[DEFAULT_ACCOUNT_ID$1] === "object") return DEFAULT_ACCOUNT_ID$1;
+	return DEFAULT_ACCOUNT_ID$1;
+}
+//#endregion
+//#region extensions/matrix/src/setup-config.ts
+const channel$1 = "matrix";
+const COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE = /* @__PURE__ */ new Set([
+	"name",
+	"enabled",
+	"httpPort",
+	"webhookPath",
+	"webhookUrl",
+	"webhookSecret",
+	"service",
+	"region",
+	"homeserver",
+	"userId",
+	"accessToken",
+	"password",
+	"deviceName",
+	"url",
+	"code",
+	"dmPolicy",
+	"allowFrom",
+	"groupPolicy",
+	"groupAllowFrom",
+	"defaultTo"
+]);
+const MATRIX_SINGLE_ACCOUNT_KEYS_TO_MOVE = new Set(matrixSingleAccountKeysToMove);
+const MATRIX_NAMED_ACCOUNT_PROMOTION_KEYS = new Set(matrixNamedAccountPromotionKeys);
+function cloneIfObject(value) {
+	if (value && typeof value === "object") return structuredClone(value);
+	return value;
+}
+function resolveSetupAvatarUrl(input) {
+	const avatarUrl = input.avatarUrl;
+	if (typeof avatarUrl !== "string") return;
+	return avatarUrl.trim() || void 0;
+}
+function resolveExistingMatrixAccountKey(accounts, targetAccountId) {
+	const normalizedTargetAccountId = normalizeAccountId(targetAccountId);
+	return Object.keys(accounts).find((accountId) => normalizeAccountId(accountId) === normalizedTargetAccountId) ?? targetAccountId;
+}
+function moveSingleMatrixAccountConfigToNamedAccount(cfg) {
+	const baseConfig = cfg.channels?.[channel$1];
+	const base = typeof baseConfig === "object" && baseConfig ? baseConfig : void 0;
+	if (!base) return cfg;
+	const accounts = typeof base.accounts === "object" && base.accounts ? base.accounts : {};
+	const hasNamedAccounts = Object.keys(accounts).some(Boolean);
+	const keysToMove = Object.entries(base).filter(([key, value]) => {
+		if (key === "accounts" || key === "enabled" || value === void 0) return false;
+		if (!COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE.has(key) && !MATRIX_SINGLE_ACCOUNT_KEYS_TO_MOVE.has(key)) return false;
+		if (hasNamedAccounts && !MATRIX_NAMED_ACCOUNT_PROMOTION_KEYS.has(key)) return false;
+		return true;
+	}).map(([key]) => key);
+	if (keysToMove.length === 0) return cfg;
+	const resolvedTargetAccountId = resolveExistingMatrixAccountKey(accounts, resolveSingleAccountPromotionTarget({ channel: base }));
+	const nextAccount = { ...accounts[resolvedTargetAccountId] };
+	for (const key of keysToMove) nextAccount[key] = cloneIfObject(base[key]);
+	const nextChannel = { ...base };
+	for (const key of keysToMove) delete nextChannel[key];
+	return {
+		...cfg,
+		channels: {
+			...cfg.channels,
+			[channel$1]: {
+				...nextChannel,
+				accounts: {
+					...accounts,
+					[resolvedTargetAccountId]: nextAccount
+				}
+			}
+		}
+	};
+}
+function validateMatrixSetupInput(params) {
+	const input = params.input;
+	const avatarUrl = resolveSetupAvatarUrl(input);
+	if (avatarUrl && !isSupportedMatrixAvatarSource(avatarUrl)) return "Matrix avatar URL must be an mxc:// URI or an http(s) URL.";
+	if (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 (!accessToken && !password) return "Matrix requires --access-token or --password";
+	if (!accessToken) {
+		if (!userId) return "Matrix requires --user-id when using --password";
+		if (!password) return "Matrix requires --password when using --user-id";
+	}
+	return null;
+}
+function applyMatrixSetupAccountConfig(params) {
+	const input = params.input;
+	const normalizedAccountId = normalizeAccountId(params.accountId);
+	const next = applyAccountNameToChannelSection({
+		cfg: normalizedAccountId !== DEFAULT_ACCOUNT_ID ? moveSingleMatrixAccountConfigToNamedAccount(params.cfg) : params.cfg,
+		channelKey: channel$1,
+		accountId: normalizedAccountId,
+		name: input.name
+	});
+	const avatarUrl = resolveSetupAvatarUrl(input);
+	if (input.useEnv) return updateMatrixAccountConfig(next, normalizedAccountId, {
+		enabled: true,
+		homeserver: null,
+		allowPrivateNetwork: null,
+		proxy: null,
+		userId: null,
+		accessToken: null,
+		password: null,
+		deviceId: null,
+		deviceName: null,
+		avatarUrl
+	});
+	const accessToken = input.accessToken?.trim();
+	const password = normalizeSecretInputString(input.password);
+	const userId = 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),
+		userId: password && !userId ? null : userId,
+		accessToken: accessToken || (password ? null : void 0),
+		password: password || (accessToken ? null : void 0),
+		deviceName: input.deviceName?.trim(),
+		avatarUrl,
+		initialSyncLimit: input.initialSyncLimit
+	});
+}
+//#endregion
+//#region extensions/matrix/src/setup-dm-policy.ts
+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(accountId?.trim() || resolveDefaultMatrixAccountId(resolvedCfg) || DEFAULT_ACCOUNT_ID);
+			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(params.accountId?.trim() || params.name?.trim() || DEFAULT_ACCOUNT_ID);
+}
+function createMatrixSetupWizardProxy(loadWizardModule) {
+	let wizardPromise = null;
+	const loadWizard = () => {
+		wizardPromise ??= loadWizardModule().then((module) => module.matrixSetupWizard);
+		return wizardPromise;
+	};
+	return {
+		channel,
+		getStatus: async (ctx) => await (await loadWizard()).getStatus(ctx),
+		configure: async (ctx) => await (await loadWizard()).configure(ctx),
+		configureInteractive: async (ctx) => {
+			const wizard = await loadWizard();
+			return await (wizard.configureInteractive ?? wizard.configure)(ctx);
+		},
+		configureWhenConfigured: async (ctx) => {
+			const wizard = await loadWizard();
+			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;
+		}),
+		disable: (cfg) => ({
+			...cfg,
+			channels: {
+				...cfg.channels,
+				matrix: {
+					...cfg.channels?.matrix,
+					enabled: false
+				}
+			}
+		})
+	};
+}
+const matrixSetupAdapter = {
+	singleAccountKeysToMove,
+	namedAccountPromotionKeys,
+	resolveSingleAccountPromotionTarget,
+	resolveAccountId: ({ accountId, input }) => resolveMatrixSetupAccountId({
+		accountId,
+		name: input?.name
+	}),
+	resolveBindingAccountId: ({ accountId, agentId }) => resolveMatrixSetupAccountId({
+		accountId,
+		name: agentId
+	}),
+	applyAccountName: ({ cfg, accountId, name }) => prepareScopedSetupConfig({
+		cfg,
+		channelKey: channel,
+		accountId,
+		name
+	}),
+	validateInput: ({ accountId, input }) => validateMatrixSetupInput({
+		accountId,
+		input
+	}),
+	applyAccountConfig: ({ cfg, accountId, input }) => applyMatrixSetupAccountConfig({
+		cfg,
+		accountId,
+		input
+	}),
+	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BaXkhgJg.js");
+		await runMatrixSetupBootstrapAfterConfigWrite({
+			previousCfg,
+			cfg,
+			accountId,
+			runtime
+		});
+	}
+};
+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, singleAccountKeysToMove as c, createMatrixSetupDmPolicy as i, matrixSetupAdapter as n, namedAccountPromotionKeys as o, matrixSetupContract as r, resolveSingleAccountPromotionTarget as s, createMatrixSetupWizardProxy as t };

package/dist/setup-plugin-api.js

@@ -1,44 +1,2 @@
-import { _ as resolveMatrixAccount, n as matrixSetupAdapter, r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-a542Ernq.js";
-import { r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-BShrVROw.js";
-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-BJrCI6KT.js").then((n) => n.t)).matrixSetupWizard })),
-	setup: matrixSetupAdapter,
-	setupContract: matrixSetupContract,
-	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
+import { n as matrixSetupPlugin } from "./channel.setup-PpxRP9Du.js";
 export { matrixSetupPlugin };

package/dist/{setup-surface-BJrCI6KT.js → setup-surface-DlhJdrNI.js}

@@ -1,14 +1,14 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.js";
+import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-CWuhuFn1.js";
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { r as resolveMatrixEnvAuthReadiness } from "./env-auth-CQsYbz-p.js";
-import { _ as resolveMatrixAccount, a as moveSingleMatrixAccountConfigToNamedAccount, g as resolveDefaultMatrixAccountId, i as resolveMatrixSetupDmAllowFrom, m as listMatrixAccountIds, u as updateMatrixAccountConfig } from "./setup-core-a542Ernq.js";
-import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
+import { n as resolveMatrixEnvAuthReadiness } from "./env-auth-MVS-Vv41.js";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BCzyubQt.js";
+import { r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
+import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-DQn6b5vi.js";
 import { n as validateMatrixHomeserverUrl, r as isPrivateOrLoopbackHost, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
 import { n as ensureMatrixSdkInstalled, r as isMatrixSdkAvailable } from "./deps-CcVJfvRM.js";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
-import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 import { formatDocsLink, hasConfiguredSecretInput, mergeAllowFromEntries, normalizeAccountId as normalizeAccountId$1, promptAccountId, promptChannelAccessConfig, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 import { isPrivateNetworkOptInEnabled } from "openclaw/plugin-sdk/ssrf-policy";
 //#region extensions/matrix/src/onboarding.ts
@@ -33,9 +33,6 @@ function isMatrixInviteAutoJoinPolicy(value) {
 function isMatrixInviteAutoJoinTarget(entry) {
 	return entry === "*" || entry.startsWith("!") && entry.includes(":") || entry.startsWith("#") && entry.includes(":");
 }
-function normalizeMatrixInviteAutoJoinTargets(entries) {
-	return [...new Set(entries.map((entry) => normalizeOptionalString(entry)).filter((entry) => Boolean(entry)))];
-}
 function resolveMatrixOnboardingAccountId(cfg, accountId) {
 	return normalizeAccountId$1(normalizeOptionalString(accountId) || resolveDefaultMatrixAccountId(cfg) || DEFAULT_ACCOUNT_ID);
 }
@@ -93,7 +90,7 @@ async function promptMatrixAllowFrom(params) {
 			pending.push(part);
 		}
 		if (pending.length > 0) {
-			const { resolveMatrixTargets } = await import("./resolve-targets-nNMcrV3W.js").then((n) => n.n);
+			const { resolveMatrixTargets } = await import("./resolve-targets-BJAPY4Vb.js").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -124,16 +121,6 @@ async function promptMatrixAllowFrom(params) {
 		} });
 	}
 }
-function setMatrixGroupPolicy(cfg, groupPolicy, accountId) {
-	return updateMatrixAccountConfig(cfg, resolveMatrixOnboardingAccountId(cfg, accountId), { groupPolicy });
-}
-function setMatrixGroupRooms(cfg, roomKeys, accountId) {
-	const groups = Object.fromEntries(roomKeys.map((key) => [key, { enabled: true }]));
-	return updateMatrixAccountConfig(cfg, resolveMatrixOnboardingAccountId(cfg, accountId), {
-		groups,
-		rooms: null
-	});
-}
 function setMatrixAutoJoin(cfg, autoJoin, autoJoinAllowlist, accountId) {
 	return updateMatrixAccountConfig(cfg, resolveMatrixOnboardingAccountId(cfg, accountId), {
 		autoJoin,
@@ -171,7 +158,7 @@ async function configureMatrixInviteAutoJoin(params) {
 	}
 	if (policy === "always") return setMatrixAutoJoin(params.cfg, policy, [], accountId);
 	while (true) {
-		const allowlist = normalizeMatrixInviteAutoJoinTargets(splitSetupEntries(await params.prompter.text({
+		const allowlist = normalizeUniqueStringEntries(splitSetupEntries(await params.prompter.text({
 			message: "Matrix invite auto-join allowlist (comma-separated)",
 			placeholder: "!roomId:server, #alias:server, *",
 			initialValue: currentAllowlist[0] ? currentAllowlist.join(", ") : void 0,
@@ -207,7 +194,7 @@ async function configureMatrixAccessPrompts(params) {
 		placeholder: "!roomId:server, #alias:server, Project Room",
 		updatePrompt: Boolean(existingGroups)
 	});
-	if (accessConfig) if (accessConfig.policy !== "allowlist") next = setMatrixGroupPolicy(next, accessConfig.policy, params.accountId);
+	if (accessConfig) if (accessConfig.policy !== "allowlist") next = updateMatrixAccountConfig(next, params.accountId, { groupPolicy: accessConfig.policy });
 	else {
 		let roomKeys = accessConfig.entries;
 		if (accessConfig.entries.length > 0) try {
@@ -221,7 +208,7 @@ async function configureMatrixAccessPrompts(params) {
 					resolvedIds.push(cleaned);
 					continue;
 				}
-				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-YRgYDx2w.js").then((n) => n.t);
+				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-Bvg2wAnR.js").then((n) => n.t);
 				const matches = await listMatrixDirectoryGroupsLive({
 					cfg: next,
 					accountId: params.accountId,
@@ -237,8 +224,11 @@ async function configureMatrixAccessPrompts(params) {
 		} catch (err) {
 			await params.prompter.note(`Room lookup failed; keeping entries as typed. ${String(err)}`, "Matrix rooms");
 		}
-		next = setMatrixGroupPolicy(next, "allowlist", params.accountId);
-		next = setMatrixGroupRooms(next, roomKeys, params.accountId);
+		next = updateMatrixAccountConfig(next, params.accountId, {
+			groupPolicy: "allowlist",
+			groups: Object.fromEntries(roomKeys.map((key) => [key, { enabled: true }])),
+			rooms: null
+		});
 	}
 	return await configureMatrixInviteAutoJoin({
 		cfg: next,
@@ -246,39 +236,7 @@ async function configureMatrixAccessPrompts(params) {
 		accountId: params.accountId
 	});
 }
-const dmPolicy = createChannelDmPolicy({
-	label: "Matrix",
-	channel,
-	policyPath: "dm.policy",
-	allowFromPath: "dm.allowFrom",
-	resolveAccount: (cfg, accountId) => {
-		const accountIdResolved = resolveMatrixOnboardingAccountId(cfg, accountId);
-		const config = resolveMatrixAccountConfig({
-			cfg,
-			accountId: accountIdResolved
-		});
-		return {
-			accountId: accountIdResolved,
-			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: promptMatrixAllowFrom
-});
+const dmPolicy = createMatrixSetupDmPolicy(promptMatrixAllowFrom);
 async function runMatrixConfigure(params) {
 	let next = params.cfg;
 	await ensureMatrixSdkInstalled({
@@ -463,26 +421,18 @@ const matrixOnboardingAdapter = {
 			selectionHint: !sdkReady ? "install Matrix deps" : configured ? "configured" : "needs auth"
 		};
 	},
-	configure: async ({ cfg, runtime, prompter, forceAllowFrom, accountOverrides, shouldPromptAccountIds }) => await runMatrixConfigure({
-		cfg,
-		runtime,
-		prompter,
-		forceAllowFrom,
-		accountOverrides,
-		shouldPromptAccountIds,
+	configure: async (params) => await runMatrixConfigure({
+		...params,
+		cfg: params.cfg,
 		intent: "update"
 	}),
-	configureInteractive: async ({ cfg, runtime, prompter, forceAllowFrom, accountOverrides, shouldPromptAccountIds, configured }) => {
-		if (!configured) return await runMatrixConfigure({
-			cfg,
-			runtime,
-			prompter,
-			forceAllowFrom,
-			accountOverrides,
-			shouldPromptAccountIds,
+	configureInteractive: async (params) => {
+		if (!params.configured) return await runMatrixConfigure({
+			...params,
+			cfg: params.cfg,
 			intent: "update"
 		});
-		const action = await prompter.select({
+		const action = await params.prompter.select({
 			message: "Matrix already configured. What do you want to do?",
 			options: [
 				{
@@ -502,17 +452,13 @@ const matrixOnboardingAdapter = {
 		});
 		if (action === "skip") return "skip";
 		return await runMatrixConfigure({
-			cfg,
-			runtime,
-			prompter,
-			forceAllowFrom,
-			accountOverrides,
-			shouldPromptAccountIds,
+			...params,
+			cfg: params.cfg,
 			intent: action === "add-account" ? "add-account" : "update"
 		});
 	},
 	afterConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BBGpPKgy.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BaXkhgJg.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,
@@ -534,9 +480,6 @@ const matrixOnboardingAdapter = {
 };
 //#endregion
 //#region extensions/matrix/src/setup-surface.ts
-var setup_surface_exports = /* @__PURE__ */ __exportAll({
-	matrixOnboardingAdapter: () => matrixOnboardingAdapter,
-	matrixSetupWizard: () => matrixOnboardingAdapter
-});
+var setup_surface_exports = /* @__PURE__ */ __exportAll({ matrixSetupWizard: () => matrixOnboardingAdapter });
 //#endregion
 export { matrixOnboardingAdapter as n, setup_surface_exports as t };