@openclaw/matrix 2026.7.2-beta.5 → 2026.7.2-beta.7

package/dist/plugin-entry.handlers.runtime.js

@@ -2,7 +2,7 @@ import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/plugin-entry.runtime.ts
-const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-ZdAXdmuh.js").then((n) => n.y));
+const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-DYMQ1QpI.js").then((n) => n.y));
 function sendError(respond, err) {
 	respond(false, { error: formatMatrixErrorMessage(err) });
 }

package/dist/probe.runtime-BuieqmS3.js

@@ -0,0 +1,3 @@
+import { t as createMatrixClient } from "./create-client-BmSU-q-D.js";
+import "./client-Dbso3-0V.js";
+export { createMatrixClient };

package/dist/{profile-update-z3aM46KS.js → profile-update-CffmyW_4.js}

@@ -1,6 +1,6 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { l as resolveMatrixConfigPath, s as syncMatrixOwnProfile, u as updateMatrixAccountConfig } from "./setup-core-a542Ernq.js";
-import { n as withResolvedActionClient } from "./client-CitERujx.js";
+import { l as resolveMatrixConfigPath, s as syncMatrixOwnProfile, u as updateMatrixAccountConfig } from "./setup-core-BVfBv2ai.js";
+import { n as withResolvedActionClient } from "./client-6eRENr7k.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/actions/profile.ts
 async function updateMatrixOwnProfile(opts = {}) {

package/dist/{reaction-events-DrK9Zua7.js → reaction-events-B00WSi98.js}

@@ -6,9 +6,9 @@ import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { getSessionBindingService } from "openclaw/plugin-sdk/session-binding-runtime";
 //#region extensions/matrix/src/matrix/monitor/reaction-events.ts
-const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-CCAWWkbu.js"));
+const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-BjOpELxu.js"));
 const loadExecApprovalResolver = createLazyRuntimeModule(() => import("./exec-approval-resolver-BCgqRtZS.js"));
-const loadMatrixSend = createLazyRuntimeModule(() => import("./send-C9Ssx-iV.js").then((n) => n.s));
+const loadMatrixSend = createLazyRuntimeModule(() => import("./send-BldGYG8g.js").then((n) => n.s));
 function buildMatrixApprovalTerminalText(result) {
 	const approval = result.approval;
 	const terminalLabel = approval.status === "allowed" ? approval.decision === "allow-always" ? "Allowed always" : "Allowed once" : approval.status === "denied" ? "Denied" : approval.status === "expired" ? "Expired" : "Cancelled";

package/dist/{resolve-targets-nNMcrV3W.js → resolve-targets-nm2L48sh.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { n as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
-import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-YRgYDx2w.js";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-C8dVBiCc.js";
 import { normalizeOptionalLowercaseString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/resolve-targets.ts
 var resolve_targets_exports = /* @__PURE__ */ __exportAll({ resolveMatrixTargets: () => resolveMatrixTargets });

package/dist/{resolver.runtime-BvaFlVLg.js → resolver.runtime-DS6uPaEe.js}

@@ -1,4 +1,4 @@
-import { t as resolveMatrixTargets } from "./resolve-targets-nNMcrV3W.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-nm2L48sh.js";
 //#region extensions/matrix/src/resolver.runtime.ts
 const matrixResolverRuntime = { resolveMatrixTargets };
 //#endregion

package/dist/{sdk-UzPd8tst.js → sdk-bUytQHx7.js}

@@ -2,7 +2,7 @@ import { n as formatMatrixErrorReason, r as isMatrixNotFoundError, t as formatMa
 import { t as SqliteBackedMatrixSyncStore } from "./file-sync-store-DiiFsayX.js";
 import { n as LogService, r as noop, t as ConsoleLogger } from "./logger-D0GCSDQq.js";
 import { t as MATRIX_IDB_PERSIST_INTERVAL_MS } from "./idb-persistence-lock-DAJ49nZX.js";
-import { c as createMatrixStartupAbortError, u as throwIfMatrixStartupAborted } from "./shared-CUH5otj8.js";
+import { c as createMatrixStartupAbortError, u as throwIfMatrixStartupAborted } from "./shared-CUMWxcMz.js";
 import { a as matrixEventToRaw, n as createMatrixGuardedFetch, o as parseMxc, t as MatrixAuthedHttpClient } from "./http-client-CycYxU9-.js";
 import { n as resolveMatrixRoomKeyBackupReadinessError } from "./backup-health-Dm_YMVFT.js";
 import { t as createMatrixJsSdkClientLogger } from "./logging-DV-p52N0.js";

package/dist/{send-C9Ssx-iV.js → send-BldGYG8g.js}

@@ -1050,7 +1050,7 @@ function chunkMatrixText(text, opts) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/send/client.ts
-const loadMatrixSendClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-CkAnkzB6.js").then((n) => n.t));
+const loadMatrixSendClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-XsIkHNt0.js").then((n) => n.t));
 function resolveMediaMaxBytes(accountId, cfg) {
 	if (!cfg) throw new Error("Matrix media limits requires a resolved runtime config. Load and resolve config at the command or gateway boundary, then pass cfg through the runtime path.");
 	const matrixCfg = resolveMatrixAccountConfig({
@@ -1790,21 +1790,27 @@ async function sendMessageMatrix(to, message, opts) {
 			const contentWithExtra = withMatrixExtraContentFields(content, pendingExtraContent);
 			pendingExtraContent = void 0;
 			const eventId = await client.sendMessage(roomId, contentWithExtra);
-			if (eventId) await opts.onDeliveryResult?.({
-				messageId: eventId,
-				roomId,
-				primaryMessageId: eventId,
-				receipt: createMatrixSendReceipt({
+			const visibleContent = contentWithExtra.body ?? "";
+			if (eventId) {
+				acceptedContents.push(visibleContent);
+				await opts.onDeliveryResult?.({
+					messageId: eventId,
 					roomId,
-					platformMessageIds: [eventId],
-					kind,
-					replyToId: opts.replyToId,
-					threadId
-				})
-			});
+					primaryMessageId: eventId,
+					receipt: createMatrixSendReceipt({
+						roomId,
+						platformMessageIds: [eventId],
+						kind,
+						replyToId: opts.replyToId,
+						threadId
+					}),
+					content: visibleContent
+				});
+			}
 			return eventId;
 		};
 		const platformMessageIds = [];
+		const acceptedContents = [];
 		let lastMessageId = "";
 		let receiptKind = "text";
 		if (opts.mediaUrl) {
@@ -1902,7 +1908,8 @@ async function sendMessageMatrix(to, message, opts) {
 				kind: receiptKind,
 				replyToId: opts.replyToId,
 				threadId
-			})
+			}),
+			content: acceptedContents.join("\n")
 		};
 	});
 }
@@ -1994,7 +2001,8 @@ async function sendSingleTextMessageMatrix(roomId, text, opts) {
 				kind: "text",
 				replyToId: opts.replyToId,
 				threadId: normalizedThreadId
-			})
+			}),
+			content: content.body
 		};
 	});
 }

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-DGbl3vDW.js";
 export { createMatrixThreadBindingManager, resetMatrixThreadBindingsForTests, setMatrixRuntime };

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

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

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

@@ -1,140 +1,16 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { a as resolveMatrixDefaultOrOnlyAccountId, o as resolveMatrixAccountStringValues, r as resolveConfiguredMatrixAccountIds } from "./account-selection-kqquRzCf.js";
-import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig, t as findMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { i as resolveScopedMatrixEnvConfig, n as resolveGlobalMatrixEnvConfig, r as resolveMatrixEnvAuthReadiness } from "./env-auth-CQsYbz-p.js";
-import { o as loadMatrixCredentials, r as credentialsMatchConfig } from "./credentials-read-DVmFCm7X.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 { 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 { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 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 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
+import { coerceSecretRef } from "openclaw/plugin-sdk/secret-ref-runtime";
+import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 //#region extensions/matrix/src/setup-contract.ts
 const matrixSingleAccountKeysToMove = [
 	"homeserver",
@@ -230,7 +106,7 @@ function applyNullableSecretInputField(target, key, value, defaults) {
 		else delete target[key];
 		return;
 	}
-	const ref = coerceSecretRef$1(value, defaults);
+	const ref = coerceSecretRef(value, defaults);
 	if (!ref) throw new Error(`Invalid Matrix ${key} SecretInput.`);
 	target[key] = ref;
 }
@@ -578,15 +454,48 @@ 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 createMatrixSetupWizardProxy(loadWizardModule) {
 	let wizardPromise = null;
 	const loadWizard = () => {
@@ -606,41 +515,9 @@ function createMatrixSetupWizardProxy(loadWizardModule) {
 			return await (wizard.configureWhenConfigured ?? wizard.configureInteractive ?? wizard.configure)(ctx);
 		},
 		afterConfigWritten: async (ctx) => await (await loadWizard()).afterConfigWritten?.(ctx),
-		dmPolicy: createChannelDmPolicy({
-			label: "Matrix",
-			channel,
-			policyPath: "dm.policy",
-			allowFromPath: "dm.allowFrom",
-			resolveAccount: (cfg, accountId) => {
-				const accountIdResolved = resolveMatrixSetupWizardAccountId(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: async (params) => {
-				const promptAllowFrom = (await loadWizard()).dmPolicy?.promptAllowFrom;
-				return promptAllowFrom ? await promptAllowFrom(params) : params.cfg;
-			}
+		dmPolicy: createMatrixSetupDmPolicy(async (params) => {
+			const promptAllowFrom = (await loadWizard()).dmPolicy?.promptAllowFrom;
+			return promptAllowFrom ? await promptAllowFrom(params) : params.cfg;
 		}),
 		disable: (cfg) => ({
 			...cfg,
@@ -682,7 +559,7 @@ const matrixSetupAdapter = {
 		input
 	}),
 	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BBGpPKgy.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-Deleiibz.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,
@@ -769,4 +646,4 @@ const matrixSetupContract = defineChannelSetupContract({
 	legacyAdapter: matrixSetupAdapter
 });
 //#endregion
-export { resolveMatrixAccount as _, moveSingleMatrixAccountConfigToNamedAccount as a, config_update_exports as c, namedAccountPromotionKeys as d, resolveSingleAccountPromotionTarget as f, resolveDefaultMatrixAccountId as g, resolveConfiguredMatrixBotUserIds as h, resolveMatrixSetupDmAllowFrom as i, resolveMatrixConfigPath as l, listMatrixAccountIds as m, matrixSetupAdapter as n, profile_exports as o, singleAccountKeysToMove as p, matrixSetupContract as r, syncMatrixOwnProfile as s, createMatrixSetupWizardProxy as t, updateMatrixAccountConfig as u };
+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 };

package/dist/setup-plugin-api.js

@@ -1,5 +1,6 @@
-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 { i as resolveMatrixAccount } from "./accounts-DfngqebB.js";
+import { r as matrixConfigAdapter, t as MatrixChannelConfigSchema } from "./config-schema-Djxw3C6b.js";
+import { n as matrixSetupAdapter, r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-BVfBv2ai.js";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 const matrixSetupPlugin = {
 	id: "matrix",
@@ -13,7 +14,7 @@ const matrixSetupPlugin = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-BJrCI6KT.js").then((n) => n.t)).matrixSetupWizard })),
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-BBq3WeqX.js").then((n) => n.t)).matrixSetupWizard })),
 	setup: matrixSetupAdapter,
 	setupContract: matrixSetupContract,
 	capabilities: {

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

@@ -2,13 +2,12 @@ import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-kqquRzCf.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 { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-DfngqebB.js";
+import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy, u as updateMatrixAccountConfig } from "./setup-core-BVfBv2ai.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 +32,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 +89,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-nm2L48sh.js").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -124,16 +120,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 +157,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 +193,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 +207,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-C8dVBiCc.js").then((n) => n.t);
 				const matches = await listMatrixDirectoryGroupsLive({
 					cfg: next,
 					accountId: params.accountId,
@@ -237,8 +223,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 +235,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 +420,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 +451,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-Deleiibz.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,